Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
09452414
Commit
09452414
authored
Jul 30, 2013
by
tstellanova
Browse files
eliminate refs to nonexistent toolbar files
parent
64cfb10b
Changes
2
Hide whitespace changes
Inline
Side-by-side
qgroundcontrol.pri
View file @
09452414
...
...
@@ -73,12 +73,6 @@ macx|macx-g++42|macx-g++|macx-llvm: {
QMAKE_POST_LINK += && mkdir -p $$TARGETDIR/qgroundcontrol.app/Contents/MacOS/qml/components/
QMAKE_POST_LINK += && cp -rf $$BASEDIR/qml/components/*.qml $$TARGETDIR/qgroundcontrol.app/Contents/MacOS/qml/components
QMAKE_POST_LINK += && mkdir -p $$TARGETDIR/qgroundcontrol.app/Contents/MacOS/qml/resources
QMAKE_POST_LINK += && mkdir -p $$TARGETDIR/qgroundcontrol.app/Contents/MacOS/qml/resources/qgroundcontrol
QMAKE_POST_LINK += && mkdir -p $$TARGETDIR/qgroundcontrol.app/Contents/MacOS/qml/resources/qgroundcontrol/toolbar
QMAKE_POST_LINK += && cp -rf $$BASEDIR/qml/resources/qgroundcontrol/toolbar/*.png $$TARGETDIR/qgroundcontrol.app/Contents/MacOS/qml/resources/qgroundcontrol/toolbar
# Fix library paths inside executable
QMAKE_POST_LINK += && install_name_tool -change libOpenThreads.dylib "@executable_path/../libs/libOpenThreads.dylib" $$TARGETDIR/qgroundcontrol.app/Contents/MacOS/qgroundcontrol
QMAKE_POST_LINK += && install_name_tool -change libosg.dylib "@executable_path/../libs/libosg.dylib" $$TARGETDIR/qgroundcontrol.app/Contents/MacOS/qgroundcontrol
...
...
qgroundcontrol.pro
View file @
09452414
...
...
@@ -804,17 +804,7 @@ OTHER_FILES += \
OTHER_FILES
+=
\
qml
/
ApmToolBar
.
qml
\
qml
/
components
/
Button
.
qml
\
qml
/
components
/
TextButton
.
qml
\
qml
/
resources
/
qgroundcontrol
/
toolbar
/
connect
.
png
\
qml
/
resources
/
qgroundcontrol
/
toolbar
/
flightplanner
.
png
\
qml
/
resources
/
qgroundcontrol
/
toolbar
/
helpwizard
.
png
\
qml
/
resources
/
qgroundcontrol
/
toolbar
/
softwareconfig
.
png
\
qml
/
resources
/
qgroundcontrol
/
toolbar
/
terminal
.
png
\
qml
/
resources
/
qgroundcontrol
/
toolbar
/
simulation
.
png
\
qml
/
resources
/
qgroundcontrol
/
toolbar
/
hardwareconfig
.
png
\
qml
/
resources
/
qgroundcontrol
/
toolbar
/
flightdata
.
png
\
qml
/
resources
/
qgroundcontrol
/
toolbar
/
disconnect
.
png
\
qml
/
resources
/
qgroundcontrol
/
toolbar
/
donate
.
png
\
qml
/
components
/
TextButton
.
qml
#
qmlcomponents
.
path
+=
$$
{
DESTDIR
}
$$
{
TARGET
}
/
components
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment