From b34e16fb756ed58c720fc7fdf750d1c392044465 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Thu, 1 Aug 2013 20:16:49 +0200 Subject: [PATCH] Revert "eliminate refs to nonexistent toolbar files" This reverts commit 09452414f7115e47e2a21d9e5911a8b472a7343c. --- qgroundcontrol.pri | 6 ++++++ qgroundcontrol.pro | 12 +++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri index 1ba7dbdbe6..fdf608780b 100644 --- a/qgroundcontrol.pri +++ b/qgroundcontrol.pri @@ -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 diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index eab224e442..5096f8451e 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -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 -- GitLab