Merge branch 'master' into feature/gimbal-max-speed

Author: Niki-dev12

.github/actions/qt-android/action.yml

@@ -14,7 +14,7 @@ inputs:
   abis:
     description: ABIs to Build
     required: false
-    default: 'armeabi-v7a;arm64-v8a'
+    default: 'arm64-v8a;armeabi-v7a'
   cpm-modules:
     description: CPM Cache Path
     required: false
@@ -35,14 +35,14 @@ runs:
       uses: android-actions/setup-android@v3
       with:
         cmdline-tools-version: 12266719
-        packages: 'platform-tools platforms;android-35 build-tools;35.0.0' # ndk;26.1.10909125'
+        packages: 'platform-tools platforms;android-36 build-tools;36.0.0' # ndk;26.1.10909125,27.2.12479018'
         log-accepted-android-sdk-licenses: false
 
     - name: Install Android NDK
       uses: nttld/setup-ndk@v1
       id: setup-ndk
       with:
-        ndk-version: ${{ inputs.version == '6.8.3' && 'r26b' || 'r25b' }}
+        ndk-version: r27c
         add-to-path: false
 
     - run: |
@@ -76,53 +76,53 @@ runs:
         setup-python: false
         cache: true
 
-    - name: Install Qt for Android (armv7)
-      if: contains( inputs.abis, 'armeabi-v7a')
+    - name: Install Qt for Android (arm64_v8a)
+      if: contains( inputs.abis, 'arm64-v8a')
       uses: jurplel/install-qt-action@v4
       with:
         version: ${{ inputs.version }}
         host: ${{ inputs.host }}
         target: android
-        arch: android_armv7
+        arch: android_arm64_v8a
         dir: ${{ runner.temp }}
         modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
         setup-python: false
         cache: true
 
-    - name: Install Qt for Android (arm64_v8a)
-      if: contains( inputs.abis, 'arm64-v8a')
+    - name: Install Qt for Android (armv7)
+      if: contains( inputs.abis, 'armeabi-v7a')
       uses: jurplel/install-qt-action@v4
       with:
         version: ${{ inputs.version }}
         host: ${{ inputs.host }}
         target: android
-        arch: android_arm64_v8a
+        arch: android_armv7
         dir: ${{ runner.temp }}
         modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
         setup-python: false
         cache: true
 
-    - name: Install Qt for Android (x86)
-      if: contains( inputs.abis, 'x86')
+    - name: Install Qt for Android (x86_64)
+      if: contains( inputs.abis, 'x86_64')
       uses: jurplel/install-qt-action@v4
       with:
         version: ${{ inputs.version }}
         host: ${{ inputs.host }}
         target: android
-        arch: android_x86
+        arch: android_x86_64
         dir: ${{ runner.temp }}
         modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
         setup-python: false
         cache: true
 
-    - name: Install Qt for Android (x86_64)
-      if: contains( inputs.abis, 'x86_64')
+    - name: Install Qt for Android (x86)
+      if: contains( inputs.abis, 'x86')
       uses: jurplel/install-qt-action@v4
       with:
         version: ${{ inputs.version }}
         host: ${{ inputs.host }}
         target: android
-        arch: android_x86_64
+        arch: android_x86
         dir: ${{ runner.temp }}
         modules: qtcharts qtlocation qtpositioning qtspeech qt5compat qtmultimedia qtserialport qtimageformats qtshadertools qtconnectivity qtquick3d qtsensors
         setup-python: false

.github/actions/upload/action.yml

@@ -13,6 +13,9 @@ inputs:
   aws_secret_access_key:
     description: AWS secret access key
     required: false
+  aws_distribution_id:
+    description: AWS distribution ID
+    required: false
   github_token:
     description: GitHub Token
     required: false
@@ -38,18 +41,42 @@ runs:
         aws-secret-access-key: ${{ inputs.aws_secret_access_key }}
         aws-region: us-west-2
 
-    - name: Upload stable build to S3 Bucket
+    - name: Upload all push builds to S3 Bucket
       if: ${{ inputs.upload_aws && github.event_name == 'push' && !github.event.pull_request.head.repo.fork && inputs.aws_key_id != '' && inputs.aws_secret_access_key != '' }}
       working-directory: ${{ runner.temp }}/build/${{ inputs.source }}
       run: aws s3 cp ${{ inputs.artifact_name }} s3://qgroundcontrol/builds/${{ github.ref_name }}/${{ inputs.artifact_name }} --acl public-read
       shell: bash
 
-    - name: Upload tagged stable build to S3 latest Bucket
+    - name: Invalidate daily/continuous push build CloudFront Cache
+      if: ${{ inputs.upload_aws && github.event_name == 'push' && github.ref_name == 'master' && !github.event.pull_request.head.repo.fork && inputs.aws_key_id != '' && inputs.aws_secret_access_key != '' && inputs.aws_distribution_id != '' }}
+      run: |
+        aws cloudfront create-invalidation \
+          --distribution-id ${{ inputs.aws_distribution_id }} \
+          --paths s3://qgroundcontrol/builds/${{ github.ref_name }}/${{ inputs.artifact_name }}
+      shell: bash
+      env:
+        AWS_ACCESS_KEY_ID: ${{ inputs.aws_key_id }}
+        AWS_SECRET_ACCESS_KEY: ${{ inputs.aws_secret_access_key }}
+        AWS_REGION: us-west-2
+
+    - name: Upload tagged stable push build to S3 latest Bucket
       if: ${{ inputs.upload_aws && github.event_name == 'push' && github.ref_type == 'tag' && !github.event.pull_request.head.repo.fork && inputs.aws_key_id != '' && inputs.aws_secret_access_key != '' }}
       working-directory: ${{ runner.temp }}/build/${{ inputs.source }}
       run: aws s3 cp ${{ inputs.artifact_name }} s3://qgroundcontrol/latest/${{ inputs.artifact_name }} --acl public-read
       shell: bash
 
+    - name: Invalidate tagged stable push build CloudFront Cache
+      if: ${{ inputs.upload_aws && github.event_name == 'push' && github.ref_type == 'tag' && !github.event.pull_request.head.repo.fork && inputs.aws_key_id != '' && inputs.aws_secret_access_key != '' && inputs.aws_distribution_id != '' }}
+      run: |
+        aws cloudfront create-invalidation \
+          --distribution-id ${{ inputs.aws_distribution_id }} \
+          --paths s3://qgroundcontrol/latest/${{ inputs.artifact_name }}
+      shell: bash
+      env:
+        AWS_ACCESS_KEY_ID: ${{ inputs.aws_key_id }}
+        AWS_SECRET_ACCESS_KEY: ${{ inputs.aws_secret_access_key }}
+        AWS_REGION: us-west-2
+
 # Commented out since it is 100% fail in CI
 #    - name: Create Continuous Release
 #      if: ${{ github.event_name != 'pull_request' && github.ref_name == 'master' && inputs.github_token != '' }}

.github/workflows/android-linux.yml

@@ -32,7 +32,7 @@ jobs:
       fail-fast: false
       matrix:
         build_type: [Release]
-        qt_version: [6.6.3, 6.8.3]
+        qt_version: [6.8.3]
 
     defaults:
       run:
@@ -45,7 +45,7 @@ jobs:
       QT_ANDROID_KEYSTORE_ALIAS: QGCAndroidKeyStore
       QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
       QT_ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
-      QT_ANDROID_ABIS: ${{ (matrix.build_type == 'Release' && matrix.qt_version == '6.8.3') && 'armeabi-v7a;arm64-v8a' || 'arm64-v8a' }}
+      QT_ANDROID_ABIS: ${{ matrix.build_type == 'Release' && 'arm64-v8a;armeabi-v7a' || 'arm64-v8a' }}
 
     steps:
       - name: Checkout repo
@@ -62,7 +62,7 @@ jobs:
         uses: ./.github/actions/qt-android
         with:
           host: linux
-          arch: ${{ matrix.qt_version == '6.6.3' && 'gcc_64' || 'linux_gcc_64' }}
+          arch: linux_gcc_64
           version: ${{ matrix.qt_version }}
           abis: ${{ env.QT_ANDROID_ABIS }}
           cpm-modules: ${{ runner.temp }}/build/cpm_modules
@@ -77,7 +77,6 @@ jobs:
               -DQT_HOST_PATH="${{ env.QT_ROOT_DIR }}/../gcc_64"
               -DQT_ANDROID_SIGN_APK=${{ env.QT_ANDROID_KEYSTORE_STORE_PASS != '' && 'ON' || 'OFF' }}
               -DQGC_STABLE_BUILD=${{ github.ref_type == 'tag' || contains(github.ref, 'Stable') && 'ON' || 'OFF' }}
-              -DQGC_ENABLE_HERELINK=${{ matrix.qt_version == '6.6.3' && 'ON' || 'OFF' }}
 
       - name: Build
         working-directory: ${{ runner.temp }}/build
@@ -86,15 +85,15 @@ jobs:
       - run: cp ${{ runner.temp }}/build/android-build/*.apk ${{ runner.temp }}/build/${{ env.PACKAGE }}.apk
 
       - name: Upload Build File
-        if: matrix.build_type == 'Release' && matrix.qt_version == '6.8.3'
+        if: matrix.build_type == 'Release'
         uses: ./.github/actions/upload
         with:
           artifact_name: ${{ env.PACKAGE }}.apk
           package_name: ${{ env.PACKAGE }}
           aws_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          upload_aws: ${{ matrix.qt_version == '6.8.3' && 'true' || 'false' }}
+          upload_aws: true
 
       # - name: Deploy to Play Store
       #   if: matrix.build_type == 'Release'

CMakeLists.txt

@@ -105,20 +105,6 @@ endif()
 #               Qt6 Configuration
 #######################################################
 
-# The values specified below are the ONLY supported configurations for this version of QGC.
-# Change these to something else at your own risk. Anything other than what is specified
-# here is unsupported so don't expect any help with problems.
-
-if(QGC_ENABLE_HERELINK AND ANDROID)
-    set(QGC_QT_MINIMUM_VERSION "6.6.3" CACHE STRING "Minimum Supported Qt Version")
-    set(QGC_QT_MAXIMUM_VERSION "6.6.3" CACHE STRING "Maximum Supported Qt Version")
-    set(QGC_QT_ANDROID_MIN_SDK_VERSION "25" CACHE STRING "Android Min SDK Version")
-else()
-    set(QGC_QT_MINIMUM_VERSION "6.8.3" CACHE STRING "Minimum Supported Qt Version")
-    set(QGC_QT_MAXIMUM_VERSION "6.8.3" CACHE STRING "Maximum Supported Qt Version")
-    set(QGC_QT_ANDROID_MIN_SDK_VERSION "28" CACHE STRING "Android Min SDK Version")
-endif()
-
 find_package(Qt6
     ${QGC_QT_MINIMUM_VERSION}...${QGC_QT_MAXIMUM_VERSION}
     REQUIRED
@@ -157,16 +143,10 @@ if(LINUX)
     find_package(Qt6 COMPONENTS WaylandClient)
 endif()
 
-# Set extra standard project setup options for Qt 6.7.0 and above
-set(EXTRA_STANDARD_PROJECT_SETUP_OPTIONS)
-if(Qt6_VERSION VERSION_GREATER_EQUAL 6.7.0)
-    list(APPEND EXTRA_STANDARD_PROJECT_SETUP_OPTIONS I18N_SOURCE_LANGUAGE en)
-endif()
-
 qt_standard_project_setup(
     REQUIRES ${QGC_QT_MINIMUM_VERSION}
     SUPPORTS_UP_TO ${QGC_QT_MAXIMUM_VERSION}
-    ${EXTRA_STANDARD_PROJECT_SETUP_OPTIONS}
+    I18N_SOURCE_LANGUAGE en
 )
 
 qt_policy(
@@ -194,19 +174,12 @@ endif()
 list(APPEND QGC_RESOURCES
     ${CMAKE_SOURCE_DIR}/qgcimages.qrc
     ${CMAKE_SOURCE_DIR}/qgcresources.qrc
-    ${CMAKE_SOURCE_DIR}/qgroundcontrol.qrc
 )
 
 list(APPEND QGC_RESOURCES
     ${CMAKE_SOURCE_DIR}/resources/InstrumentValueIcons/InstrumentValueIcons.qrc
-    ${CMAKE_SOURCE_DIR}/src/FirmwarePlugin/APM/APMResources.qrc
-    ${CMAKE_SOURCE_DIR}/src/FirmwarePlugin/PX4/PX4Resources.qrc
 )
 
-if(QGC_BUILD_TESTING)
-    list(APPEND QGC_RESOURCES ${CMAKE_SOURCE_DIR}/test/UnitTest.qrc)
-endif()
-
 #######################################################
 #               QGroundControl Target
 #######################################################
@@ -234,7 +207,6 @@ qt_add_qml_module(${CMAKE_PROJECT_NAME}
         QtQuick.Controls
         QtQuick.Dialogs
         QtQuick.Layouts
-        QtQuick.Window
 )
 
 add_subdirectory(src)
@@ -246,31 +218,20 @@ endif()
 file(GLOB TS_SOURCES ${CMAKE_SOURCE_DIR}/translations/qgc_*.ts)
 set_source_files_properties(${TS_SOURCES} PROPERTIES OUTPUT_LOCATION "${CMAKE_BINARY_DIR}/i18n")
 
-set(translations_options_arg)
-if(Qt6_VERSION VERSION_GREATER_EQUAL 6.7.0)
-    list(APPEND translations_options_arg TS_FILE_DIR "${CMAKE_SOURCE_DIR}/translations")
-    list(APPEND translations_options_arg TS_FILE_BASE ${CMAKE_PROJECT_NAME})
-endif()
 qt_add_translations(${CMAKE_PROJECT_NAME}
     TS_FILES ${TS_SOURCES}
     RESOURCE_PREFIX "/"
     LUPDATE_OPTIONS -no-obsolete
-    ${translations_options_arg}
+    TS_FILE_DIR "${CMAKE_SOURCE_DIR}/translations"
+    TS_FILE_BASE ${CMAKE_PROJECT_NAME}
 )
 
-qgc_set_qt_resource_alias(
-    ${CMAKE_SOURCE_DIR}/resources/qtquickcontrols2.conf
-    ${SDL_GAMECONTROLLERDB_PATH}
-)
+qgc_set_qt_resource_alias(${CMAKE_SOURCE_DIR}/resources/qtquickcontrols2.conf)
 
 qt_add_resources(${CMAKE_PROJECT_NAME} "qgcresources_cmake"
     PREFIX "/"
     FILES
-        ${CMAKE_SOURCE_DIR}/resources/qtquickcontrols2.conf
-        ${SDL_GAMECONTROLLERDB_PATH}
-        ${QGC_GSTREAMER_SHADER_RESOURCES}
-        ${QGC_ARDUPILOT_PARAMS_RESOURCES}
-        # ${QGC_TEST_RESOURCES}
+        "${CMAKE_SOURCE_DIR}/resources/qtquickcontrols2.conf"
 )
 
 # cmake_print_variables(QT_ALL_PLUGIN_TYPES_FOUND_VIA_FIND_PACKAGE)

CodingStyle.qml

@@ -12,7 +12,7 @@ import QtQuick
 import QtQuick.Controls
 
 import QGroundControl
-import QGroundControl.ScreenTools
+
 import QGroundControl.Controls
 
 

android/AndroidManifest.xml

@@ -1,16 +1,9 @@
 <?xml version="1.0"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.mavlink.qgroundcontrol"
     android:installLocation="auto"
     android:versionCode="-- %%INSERT_VERSION_CODE%% --"
     android:versionName="-- %%INSERT_VERSION_NAME%% --">
 
-    <supports-screens
-        android:anyDensity="true"
-        android:largeScreens="true"
-        android:normalScreens="true"
-        android:smallScreens="true" />
-
     <!-- %%INSERT_PERMISSIONS -->
 
     <uses-permission android:name="android.permission.USB_PERMISSION" />
@@ -33,6 +26,12 @@
     <uses-feature android:name="android.hardware.usb.host" android:required="false" />
     <uses-feature android:name="android.hardware.wifi" android:required="false" />
 
+    <supports-screens
+        android:anyDensity="true"
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:smallScreens="true" />
+
     <application
         android:name="org.qtproject.qt.android.bindings.QtApplication"
         android:hardwareAccelerated="true"
@@ -45,10 +44,8 @@
         android:networkSecurityConfig="@xml/network_security_config">
         <!-- android:theme="@style/AppTheme" -->
 
-        <!-- <meta-data android:name="android.app.system_libs_prefix" android:value="/system/lib/" /> -->
-
         <activity
-            android:name="org.mavlink.qgroundcontrol.QGCActivity"
+            android:name="org.qtproject.qt.android.bindings.QtActivity"
             android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density"
             android:label="-- %%INSERT_APP_NAME%% --"
             android:launchMode="singleTop"
@@ -64,11 +61,8 @@
                 <action android:name="android.hardware.usb.action.USB_DEVICE_DETACHED" />
                 <action android:name="android.bluetooth.device.action.ACL_CONNECTED" />
                 <action android:name="android.bluetooth.device.action.ACL_DISCONNECTED" />
-                <!-- TODO: CMake configure xml file -->
-                <!-- %%QGC_INSERT_ACTIVITY_INTENT_FILTER -->
             </intent-filter>
 
-            <!-- %%QGC_INSERT_ACTIVITY_META_DATA -->
             <meta-data
                 android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
                 android:resource="@xml/device_filter" />