Commit 744b4592 authored by Daniel Agar's avatar Daniel Agar

include qt plugins in linux package

 - fixes #2542
parent 438cf368
...@@ -100,7 +100,7 @@ WindowsBuild { ...@@ -100,7 +100,7 @@ WindowsBuild {
LinuxBuild { LinuxBuild {
installer { 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_INSTALL_LIBS
QT_LIB_LIST = \ QT_LIB_LIST = \
...@@ -129,22 +129,30 @@ LinuxBuild { ...@@ -129,22 +129,30 @@ LinuxBuild {
} }
for(QT_LIB, QT_LIB_LIST) { 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_INSTALL_PLUGINS
QT_PLUGIN_LIST = platforms QT_PLUGIN_LIST = \
bearer \
geoservices \
iconengines \
imageformats \
platforminputcontexts \
platforms \
platformthemes \
position
!contains(DEFINES, __rasp_pi2__) { !contains(DEFINES, __rasp_pi2__) {
QT_PLUGIN_LIST += xcbglintegrations QT_PLUGIN_LIST += xcbglintegrations
} }
for(QT_PLUGIN, QT_PLUGIN_LIST) { 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 # 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 # QGroundControl start script
QMAKE_POST_LINK += && $$QMAKE_COPY $$BASEDIR/deploy/qgroundcontrol-start.sh $$DESTDIR QMAKE_POST_LINK += && $$QMAKE_COPY $$BASEDIR/deploy/qgroundcontrol-start.sh $$DESTDIR
......
#!/bin/sh #!/bin/sh
export LD_LIBRARY_PATH=`pwd`/libs:$LD_LIBRARY_PATH export LD_LIBRARY_PATH=`pwd`/Qt/libs:$LD_LIBRARY_PATH
export QML_IMPORT_PATH=`pwd`/libs/qml export QML2_IMPORT_PATH=`pwd`/Qt/qml
export QML2_IMPORT_PATH=`pwd`/libs/qml export QT_PLUGIN_PATH=`pwd`/Qt/plugins
export QT_QPA_PLATFORM_PLUGIN_PATH=`pwd`/libs/platforms
./qgroundcontrol "$@" ./qgroundcontrol "$@"
File mode changed from 100644 to 100755
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