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
771e60a4
Commit
771e60a4
authored
May 28, 2020
by
Aleksey Kontsevich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Deploy custom start script for custom build
parent
774154e3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
5 deletions
+30
-5
QGCSetup.pri
QGCSetup.pri
+8
-4
custom.pri
custom-example/custom.pri
+8
-0
custom_deploy.pri
custom-example/custom_deploy.pri
+3
-0
qgroundcontrol-start.sh
custom-example/deploy/qgroundcontrol-start.sh
+2
-1
qgroundcontrol.desktop
custom-example/deploy/qgroundcontrol.desktop
+9
-0
No files found.
QGCSetup.pri
View file @
771e60a4
...
...
@@ -90,7 +90,7 @@ LinuxBuild {
QMAKE_POST_LINK += && mkdir -p $$DESTDIR/Qt/libs && mkdir -p $$DESTDIR/Qt/plugins
# QT_INSTALL_LIBS
QT_LIB_LIST = \
QT_LIB_LIST
+
= \
libQt5Charts.so.5 \
libQt5Core.so.5 \
libQt5DBus.so.5 \
...
...
@@ -160,7 +160,11 @@ LinuxBuild {
}
# QGroundControl start script
QMAKE_POST_LINK += && $$QMAKE_COPY $$BASEDIR/deploy/qgroundcontrol-start.sh $$DESTDIR
QMAKE_POST_LINK += && $$QMAKE_COPY $$BASEDIR/deploy/qgroundcontrol.desktop $$DESTDIR
QMAKE_POST_LINK += && $$QMAKE_COPY $$BASEDIR/resources/icons/qgroundcontrol.png $$DESTDIR
contains (CONFIG, QGC_DISABLE_CUSTOM_BUILD) | !exists($$PWD/custom/custom.pri) {
QMAKE_POST_LINK += && $$QMAKE_COPY $$BASEDIR/deploy/qgroundcontrol-start.sh $$DESTDIR
QMAKE_POST_LINK += && $$QMAKE_COPY $$BASEDIR/deploy/qgroundcontrol.desktop $$DESTDIR
QMAKE_POST_LINK += && $$QMAKE_COPY $$BASEDIR/resources/icons/qgroundcontrol.png $$DESTDIR
} else {
include($$PWD/custom/custom_deploy.pri)
}
}
custom-example/custom.pri
View file @
771e60a4
...
...
@@ -55,6 +55,14 @@ RESOURCES += \
QML_IMPORT_PATH += \
$$PWD/res
LinuxBuild {
# Our QT_INSTALL_LIBS
QT_LIB_LIST += \
libQt5VirtualKeyboard.so.5 \
}
# Our own, custom sources
SOURCES += \
$$PWD/src/CustomPlugin.cc \
...
...
custom-example/custom_deploy.pri
0 → 100644
View file @
771e60a4
QMAKE_POST_LINK += && $$QMAKE_COPY $$PWD/deploy/qgroundcontrol-start.sh $$DESTDIR
QMAKE_POST_LINK += && $$QMAKE_COPY $$PWD/deploy/qgroundcontrol.desktop $$DESTDIR
QMAKE_POST_LINK += && $$QMAKE_COPY $$PWD/res/Images/CustomAppIcon.png $$DESTDIR
custom-example/deploy/qgroundcontrol-start.sh
View file @
771e60a4
...
...
@@ -3,8 +3,9 @@ HERE="$(dirname "$(readlink -f "${0}")")"
export
LD_LIBRARY_PATH
=
"
${
HERE
}
/usr/lib/x86_64-linux-gnu"
:
"
${
HERE
}
/Qt/libs"
:
$LD_LIBRARY_PATH
export
QML2_IMPORT_PATH
=
"
${
HERE
}
/Qt/qml"
export
QT_PLUGIN_PATH
=
"
${
HERE
}
/Qt/plugins"
export
QT_IM_MODULE
=
qtvirtualkeyboard
# hack until icon issue with AppImage is resolved
mkdir
-p
~/.icons
&&
\c
p
-f
${
HERE
}
/qgroundcontrol.png ~/.icons
"
${
HERE
}
/CustomQG
C
"
"
$@
"
"
${
HERE
}
/CustomQG
roundControl
"
"
$@
"
custom-example/deploy/qgroundcontrol.desktop
0 → 100644
View file @
771e60a4
[Desktop Entry]
Type=Application
Name=CustomQGroundControl
GenericName=Ground Control Station
Comment=UAS ground control station
Icon=CustomAppIcon
Exec=qgroundcontrol-start.sh
Terminal=false
Categories=Utility;
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