Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
744b4592
Commit
744b4592
authored
Jan 11, 2016
by
Daniel Agar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
include qt plugins in linux package
- fixes #2542
parent
438cf368
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
9 deletions
+16
-9
QGCSetup.pri
QGCSetup.pri
+13
-5
qgroundcontrol-start.sh
deploy/qgroundcontrol-start.sh
+3
-4
qgroundcontrol.desktop
qgroundcontrol.desktop
+0
-0
No files found.
QGCSetup.pri
View file @
744b4592
...
...
@@ -100,7 +100,7 @@ WindowsBuild {
LinuxBuild {
installer {
QMAKE_POST_LINK += && mkdir -p $$DESTDIR/
lib
s
QMAKE_POST_LINK += && mkdir -p $$DESTDIR/
Qt/libs && mkdir -p $$DESTDIR/Qt/plugin
s
# QT_INSTALL_LIBS
QT_LIB_LIST = \
...
...
@@ -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
...
...
deploy/qgroundcontrol-start.sh
View file @
744b4592
#!/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
"
$@
"
qgroundcontrol.desktop
100644 → 100755
View file @
744b4592
File mode changed from 100644 to 100755
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment