Browse Source

include qt plugins in linux package

- fixes #2542
QGC4.4
Daniel Agar 9 years ago
parent
commit
744b459257
  1. 18
      QGCSetup.pri
  2. 7
      deploy/qgroundcontrol-start.sh
  3. 0
      qgroundcontrol.desktop

18
QGCSetup.pri

@ -100,7 +100,7 @@ WindowsBuild { @@ -100,7 +100,7 @@ WindowsBuild {
LinuxBuild {
installer {
QMAKE_POST_LINK += && mkdir -p $$DESTDIR/libs
QMAKE_POST_LINK += && mkdir -p $$DESTDIR/Qt/libs && mkdir -p $$DESTDIR/Qt/plugins
# QT_INSTALL_LIBS
QT_LIB_LIST = \
@ -129,22 +129,30 @@ LinuxBuild { @@ -129,22 +129,30 @@ LinuxBuild {
}
for(QT_LIB, QT_LIB_LIST) {
QMAKE_POST_LINK += && $$QMAKE_COPY --dereference $$[QT_INSTALL_LIBS]/$$QT_LIB $$DESTDIR/libs
QMAKE_POST_LINK += && $$QMAKE_COPY --dereference $$[QT_INSTALL_LIBS]/$$QT_LIB $$DESTDIR/Qt/libs/
}
# QT_INSTALL_PLUGINS
QT_PLUGIN_LIST = platforms
QT_PLUGIN_LIST = \
bearer \
geoservices \
iconengines \
imageformats \
platforminputcontexts \
platforms \
platformthemes \
position
!contains(DEFINES, __rasp_pi2__) {
QT_PLUGIN_LIST += xcbglintegrations
}
for(QT_PLUGIN, QT_PLUGIN_LIST) {
QMAKE_POST_LINK += && $$QMAKE_COPY --dereference --recursive $$[QT_INSTALL_PLUGINS]/$$QT_PLUGIN $$DESTDIR/libs
QMAKE_POST_LINK += && $$QMAKE_COPY --dereference --recursive $$[QT_INSTALL_PLUGINS]/$$QT_PLUGIN $$DESTDIR/Qt/plugins/
}
# QT_INSTALL_QML
QMAKE_POST_LINK += && $$QMAKE_COPY --dereference --recursive $$[QT_INSTALL_QML] $$DESTDIR/libs
QMAKE_POST_LINK += && $$QMAKE_COPY --dereference --recursive $$[QT_INSTALL_QML] $$DESTDIR/Qt/
# QGroundControl start script
QMAKE_POST_LINK += && $$QMAKE_COPY $$BASEDIR/deploy/qgroundcontrol-start.sh $$DESTDIR

7
deploy/qgroundcontrol-start.sh

@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
#!/bin/sh
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
export LD_LIBRARY_PATH=`pwd`/Qt/libs:$LD_LIBRARY_PATH
export QML2_IMPORT_PATH=`pwd`/Qt/qml
export QT_PLUGIN_PATH=`pwd`/Qt/plugins
./qgroundcontrol "$@"

0
qgroundcontrol.desktop

Loading…
Cancel
Save