diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri index fdf6087..1ba7dbd 100644 --- a/qgroundcontrol.pri +++ b/qgroundcontrol.pri @@ -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 diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index e3030dc..83a962c 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -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