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
379bf957
Commit
379bf957
authored
Aug 26, 2020
by
Remek Zajac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "automated android version"
This reverts commit
c53e0765
.
parent
d2a5dc01
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
16 deletions
+11
-16
QGCCommon.pri
QGCCommon.pri
+6
-11
AndroidManifest.xml
android/AndroidManifest.xml
+5
-5
No files found.
QGCCommon.pri
View file @
379bf957
...
...
@@ -25,7 +25,7 @@ linux {
CONFIG += LinuxBuild
DEFINES += __STDC_LIMIT_MACROS
DEFINES += QGC_GST_TAISYNC_ENABLED
DEFINES += QGC_GST_MICROHARD_ENABLED
DEFINES += QGC_GST_MICROHARD_ENABLED
DEFINES += QGC_ENABLE_MAVLINK_INSPECTOR
linux-clang {
message("Linux clang")
...
...
@@ -41,14 +41,14 @@ linux {
CONFIG += LinuxBuild
DEFINES += __STDC_LIMIT_MACROS __rasp_pi2__
DEFINES += QGC_GST_TAISYNC_ENABLED
DEFINES += QGC_GST_MICROHARD_ENABLED
DEFINES += QGC_GST_MICROHARD_ENABLED
} else : android-clang {
CONFIG += AndroidBuild MobileBuild
DEFINES += __android__
DEFINES += __STDC_LIMIT_MACROS
DEFINES += QGC_ENABLE_BLUETOOTH
DEFINES += QGC_GST_TAISYNC_ENABLED
DEFINES += QGC_GST_MICROHARD_ENABLED
DEFINES += QGC_GST_MICROHARD_ENABLED
QMAKE_CXXFLAGS_WARN_ON += -Werror \
-Wno-unused-parameter \ # gst_plugins-good has these errors
-Wno-implicit-fallthrough \ # gst_plugins-good has these errors
...
...
@@ -82,7 +82,7 @@ linux {
CONFIG += WindowsBuild
DEFINES += __STDC_LIMIT_MACROS
DEFINES += QGC_GST_TAISYNC_ENABLED
DEFINES += QGC_GST_MICROHARD_ENABLED
DEFINES += QGC_GST_MICROHARD_ENABLED
DEFINES += QGC_ENABLE_MAVLINK_INSPECTOR
QMAKE_CFLAGS -= -Zc:strictStrings
QMAKE_CFLAGS_RELEASE -= -Zc:strictStrings
...
...
@@ -106,7 +106,7 @@ linux {
CONFIG += x86_64
CONFIG -= x86
DEFINES += QGC_GST_TAISYNC_ENABLED
DEFINES += QGC_GST_MICROHARD_ENABLED
DEFINES += QGC_GST_MICROHARD_ENABLED
DEFINES += QGC_ENABLE_MAVLINK_INSPECTOR
equals(QT_MAJOR_VERSION, 5) | greaterThan(QT_MINOR_VERSION, 5) {
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
...
...
@@ -188,18 +188,13 @@ exists ($$PWD/.git) {
} else {
# development version "Development branch:sha date"
GIT_VERSION = "Development $${GIT_BRANCH}:$${GIT_HASH} $${GIT_TIME}"
VERSION = 0.0.0
VERSION
= 0.0.0
}
MacBuild {
MAC_VERSION = $$section(VERSION, ".", 0, 2)
MAC_BUILD = $$section(VERSION, ".", 3, 3)
message(QGroundControl version $${MAC_VERSION} build $${MAC_BUILD} describe $${GIT_VERSION})
} AndroidBuild {
ANDROID_VERSION_NAME = $${GIT_VERSION}
ANDROID_VERSION_CODE = $$split(VERSION, .)
ANDROID_VERSION_CODE = $$system(echo $((100000*$$member(ANDROID_VERSION_CODE, 0)+10000*$$member(ANDROID_VERSION_CODE, 1)+1000*$$member(ANDROID_VERSION_CODE, 2))))
message(QGroundControl ANDROID_VERSION_NAME \'$${ANDROID_VERSION_NAME}\' ANDROID_VERSION_CODE \'$${ANDROID_VERSION_CODE}\')
} else {
message(QGroundControl $${GIT_VERSION})
}
...
...
android/AndroidManifest.xml
View file @
379bf957
<?xml version="1.0"?>
<manifest
package=
"org.mavlink.qgroundcontrol"
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:versionName=
"
-- %%INSERT_VERSION_NAME%% --"
android:versionCode=
"-- %%INSERT_VERSION_CODE%% --
"
android:installLocation=
"auto"
>
<manifest
package=
"org.mavlink.qgroundcontrol"
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:versionName=
"
3.0.0-243-gd759437"
android:versionCode=
"300243
"
android:installLocation=
"auto"
>
<application
android:hardwareAccelerated=
"true"
android:name=
"org.qtproject.qt5.android.bindings.QtApplication"
android:label=
"-- %%INSERT_APP_NAME%% --"
android:icon=
"@drawable/icon"
>
<activity
android:configChanges=
"orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
android:name=
"org.mavlink.qgroundcontrol.QGCActivity"
android:label=
"-- %%INSERT_APP_NAME%% --"
android:screenOrientation=
"sensorLandscape"
android:launchMode=
"singleTask"
android:keepScreenOn=
"true"
>
<intent-filter>
...
...
@@ -63,20 +63,20 @@
<!-- Support devices without USB host mode since there are other connection types -->
<uses-feature
android:name=
"android.hardware.usb.host"
android:required=
"false"
/>
<!-- Support devices without Bluetooth since there are other connection types -->
<uses-feature
android:name=
"android.hardware.bluetooth"
android:required=
"false"
/>
<!-- Support devices that don't have location services -->
<uses-feature
android:name=
"android.hardware.location.gps"
android:required=
"false"
/>
<uses-feature
android:name=
"android.hardware.location.network"
android:required=
"false"
/>
<uses-feature
android:name=
"android.hardware.location"
android:required=
"false"
/>
<uses-feature
android:name=
"android.hardware.usb.accessory"
/>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.WRITE_INTERNAL_STORAGE"
/>
<uses-permission
android:name=
"android.permission.WRITE_EXTERNAL_STORAGE"
/>
<!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
Remove the comment if you do not require these default features. -->
<!-- %%INSERT_FEATURES -->
...
...
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