Skip to content

Q
qgroundcontrol
Commit b34e16fb authored by Lorenz Meier's avatar Lorenz Meier
Browse files
Options

Revert "eliminate refs to nonexistent toolbar files" 

This reverts commit 09452414.
parent a250190a
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 1 deletion
qgroundcontrol.pri
View file @ b34e16fb
......@@ -73,6 +73,12 @@ 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 @ b34e16fb
......@@ -811,7 +811,17 @@ OTHER_FILES += \
OTHER_FILES += \
qml/ApmToolBar.qml \
qml/components/Button.qml \
qml/components/TextButton.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 \
#qmlcomponents.path += $${DESTDIR}$${TARGET}/components
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment