diff --git a/QGCSetup.pri b/QGCSetup.pri index c6bb37f6a1c3861f5f066cc0954d0bd254f0ac70..3afde80424ea4c0dcaa831df8aa46e0f900f33c7 100644 --- a/QGCSetup.pri +++ b/QGCSetup.pri @@ -99,6 +99,47 @@ WindowsBuild { } LinuxBuild { + QMAKE_POST_LINK += && mkdir -p $$DESTDIR/libs + + # QT_INSTALL_LIBS + QT_LIB_LIST = \ + libicudata.so.54 \ + libicui18n.so.54 \ + libicuuc.so.54 \ + libQt5Core.so.5 \ + libQt5DBus.so.5 \ + libQt5Gui.so.5 \ + libQt5Location.so.5 \ + libQt5Network.so.5 \ + libQt5OpenGL.so.5 \ + libQt5Positioning.so.5 \ + libQt5PrintSupport.so.5 \ + libQt5Qml.so.5 \ + libQt5Quick.so.5 \ + libQt5QuickWidgets.so.5 \ + libQt5SerialPort.so.5 \ + libQt5Svg.so.5 \ + libQt5Test.so.5 \ + libQt5Widgets.so.5 \ + libQt5XcbQpa.so.5 + + for(QT_LIB, QT_LIB_LIST) { + QMAKE_POST_LINK += && $$QMAKE_COPY --dereference $$[QT_INSTALL_LIBS]/$$QT_LIB $$DESTDIR/libs + } + + # QT_INSTALL_PLUGINS + QT_PLUGIN_LIST = \ + platforms \ + xcbglintegrations + + for(QT_PLUGIN, QT_PLUGIN_LIST) { + QMAKE_POST_LINK += && $$QMAKE_COPY --dereference --recursive $$[QT_INSTALL_PLUGINS]/$$QT_PLUGIN $$DESTDIR/libs + } + + # QT_INSTALL_QML + QMAKE_POST_LINK += && $$QMAKE_COPY --dereference --recursive $$[QT_INSTALL_QML] $$DESTDIR/libs + + # QGroundControl start script QMAKE_POST_LINK += && $$QMAKE_COPY $$BASEDIR/deploy/qgroundcontrol-start.sh $$DESTDIR } diff --git a/deploy/qgroundcontrol-start.sh b/deploy/qgroundcontrol-start.sh index 859626dc884319d359ddcb6dae4cb26a43ad7467..6cd22d28e582651681298189a433e008f89ddc85 100755 --- a/deploy/qgroundcontrol-start.sh +++ b/deploy/qgroundcontrol-start.sh @@ -1,6 +1,6 @@ #!/bin/sh -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/Qt/5.5/gcc_64/lib -export QML_IMPORT_PATH=$HOME/Qt/5.5/gcc_64/qml/ -export QML2_IMPORT_PATH=$HOME/Qt/5.5/gcc_64/qml/ -export QT_QPA_PLATFORM_PLUGIN_PATH=$HOME/Qt/5.5/gcc_64/plugins/platforms/ +export LD_LIBRARY_PATH=`pwd`/libs:$LD_LIBRARY_PATH +export QML_IMPORT_PATH=`pwd`/libs/qml +export QML2_IMPORT_PATH=`pwd`/libs/qml +export QT_QPA_PLATFORM_PLUGIN_PATH=`pwd`/libs/platforms ./qgroundcontrol "$@"