[DONT MERGE] Stable v4.4 vs Stable v4.3

.github/workflows/android_release.yml

@@ -76,6 +76,7 @@ jobs:
             ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --uninstall "platforms;android-34"
             ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --uninstall "platforms;android-34-ext8"
             ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --uninstall "platforms;android-34-ext10"
+            ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --uninstall "platforms;android-34-ext11"
 
       - name: Install ccache
         run:  sudo apt-get install ccache
@@ -106,9 +107,9 @@ jobs:
       - name:               Install gstreamer
         working-directory:  ${{ github.workspace }}
         run: |
-            wget --quiet https://gstreamer.freedesktop.org/data/pkg/android/1.18.5/gstreamer-1.0-android-universal-1.18.5.tar.xz
-            mkdir gstreamer-1.0-android-universal-1.18.5
-            tar xf gstreamer-1.0-android-universal-1.18.5.tar.xz -C gstreamer-1.0-android-universal-1.18.5
+            wget --quiet https://gstreamer.freedesktop.org/data/pkg/android/1.18.6/gstreamer-1.0-android-universal-1.18.6.tar.xz
+            mkdir gstreamer-1.0-android-universal-1.18.6
+            tar xf gstreamer-1.0-android-universal-1.18.6.tar.xz -C gstreamer-1.0-android-universal-1.18.6
 
       - name: Update android manifest
         if: github.ref_name != 'Stable'
@@ -136,18 +137,12 @@ jobs:
           name: ${{ matrix.ARTIFACT }}
           path: ${{ runner.temp }}/shadow_build_dir/package/${{ matrix.ARTIFACT }}
 
-      - name: Upload build to S3 Bucket
-        if:                 github.event_name == 'push'
-        working-directory:  ${{ runner.temp }}/shadow_build_dir/package
-        run: |
-              aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }}
-              aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-              aws s3 cp ${{ matrix.ARTIFACT }} s3://qgroundcontrol/builds/${{ github.ref_name }}/${{ matrix.ARTIFACT }} --region us-west-2 --acl public-read
-
-      - name: Upload tagged stable build to S3 latest Bucket
-        if:                 github.event_name == 'push' && github.ref_type == 'tag'
-        working-directory:  ${{ runner.temp }}/shadow_build_dir/package
-        run: |
-              aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }}
-              aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-              aws s3 cp ${{ matrix.ARTIFACT }} s3://qgroundcontrol/latest/${{ matrix.ARTIFACT }} --region us-west-2 --acl public-read
+      - name: Publish artifact to GitHub release
+        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ runner.temp }}/shadow_build_dir/package/${{ matrix.ARTIFACT }}
+          asset_name: ${{ matrix.ARTIFACT }}
+          tag: ${{ github.ref }}
+          overwrite: true

.github/workflows/linux_release.yml

@@ -106,18 +106,12 @@ jobs:
           name: ${{ env.ARTIFACT }}
           path: ${{ runner.temp }}/shadow_build_dir/package/${{ env.ARTIFACT }}
 
-      - name: Upload build to S3 Bucket
-        if:                 github.event_name == 'push'
-        working-directory:  ${{ runner.temp }}/shadow_build_dir/package
-        run: |
-              aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }}
-              aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-              aws s3 cp ${ARTIFACT} s3://qgroundcontrol/builds/${{ github.ref_name }}/${ARTIFACT} --region us-west-2 --acl public-read
-
-      - name: Upload tagged stable build to S3 latest Bucket
-        if:                 github.event_name == 'push' && github.ref_type == 'tag'
-        working-directory:  ${{ runner.temp }}/shadow_build_dir/package
-        run: |
-              aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }}
-              aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-              aws s3 cp ${ARTIFACT} s3://qgroundcontrol/latest/${ARTIFACT} --region us-west-2 --acl public-read
+      - name: Publish artifact to GitHub release
+        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ runner.temp }}/shadow_build_dir/package/${{ env.ARTIFACT }}
+          asset_name: ${{ env.ARTIFACT }}
+          tag: ${{ github.ref }}
+          overwrite: true

.github/workflows/macos_release.yml

@@ -29,7 +29,7 @@ env:
 
 jobs:
   build:
-    runs-on:  macos-latest
+    runs-on:  macos-12
 
     steps:
       - name: Checkout repo
@@ -46,11 +46,12 @@ jobs:
         uses: jurplel/install-qt-action@v3
         with:
           version:      ${{ env.QT_VERSION }}
+          aqtversion:   ==3.1.*
           host:         mac
           target:       desktop
           dir:          ${{ runner.temp }}
           modules:      qtcharts
-          setup-python: false
+          setup-python: true
 
       - name: Install Gstreamer
         run: |
@@ -102,18 +103,12 @@ jobs:
           name: ${{ env.ARTIFACT }}
           path: ${{ runner.temp }}/shadow_build_dir/package/${{ env.ARTIFACT }}
 
-      - name: Upload build to S3 Bucket
-        if:                 github.event_name == 'push'
-        working-directory:  ${{ runner.temp }}/shadow_build_dir/package
-        run: |
-              aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }}
-              aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-              aws s3 cp ${ARTIFACT} s3://qgroundcontrol/builds/${{ github.ref_name }}/${ARTIFACT} --region us-west-2 --acl public-read
-
-      - name: Upload tagged stable build to S3 latest Bucket
-        if:                 github.event_name == 'push' && github.ref_type == 'tag'
-        working-directory:  ${{ runner.temp }}/shadow_build_dir/package
-        run: |
-              aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }}
-              aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-              aws s3 cp ${ARTIFACT} s3://qgroundcontrol/latest/${ARTIFACT} --region us-west-2 --acl public-read
+      - name: Publish artifact to GitHub release
+        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ runner.temp }}/shadow_build_dir/package/${{ env.ARTIFACT }}
+          asset_name: ${{ env.ARTIFACT }}
+          tag: ${{ github.ref }}
+          overwrite: true

.github/workflows/windows_release.yml

@@ -107,19 +107,22 @@ jobs:
           name: qgroundcontrol.pdb
           path: ${{ runner.temp }}\shadow_build_dir\staging\qgroundcontrol.pdb
 
-      - name: Upload build to S3 Bucket
-        if:                 github.event_name == 'push'
-        working-directory:  ${{ runner.temp }}\shadow_build_dir\staging
-        run: |
-              aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }}
-              aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-              aws s3 cp ${{ env.ARTIFACT }} s3://qgroundcontrol/builds/${{ github.ref_name }}/${{ env.ARTIFACT }} --region us-west-2 --acl public-read
-
-      - name: Upload tagged stable build to S3 latest Bucket
-        if:                 github.event_name == 'push' && github.ref_type == 'tag'
-        working-directory:  ${{ runner.temp }}\shadow_build_dir\staging
-        run: |
-              aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }}
-              aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-              aws s3 cp ${{ env.ARTIFACT }} s3://qgroundcontrol/latest/${{ env.ARTIFACT }} --region us-west-2 --acl public-read
-
+      - name: Publish installer artifact to GitHub release
+        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ runner.temp }}\shadow_build_dir\staging\${{ env.ARTIFACT }}
+          asset_name: ${{ env.ARTIFACT }}
+          tag: ${{ github.ref }}
+          overwrite: true
+
+      - name: Publish PDB artifact to GitHub release
+        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ runner.temp }}\shadow_build_dir\staging\qgroundcontrol.pdb
+          asset_name: qgroundcontrol.pdb
+          tag: ${{ github.ref }}
+          overwrite: true

QGCCommon.pri

@@ -233,6 +233,10 @@ AndroidBuild {
         DEV_VERSION = $$join(DEV_VERSION, "", "0")
     }
 
+    # Use a shell command to strip "rc" and everything after it.
+    # Otherwise rc version tags will break the Android build.
+    PATCH_VERSION = $$system(echo $$PATCH_VERSION | sed 's/rc.*//')
+
     # Bitness for android version number is 66/34 instead of 64/32 in because of a required version number bump screw-up ages ago
     equals(ANDROID_TARGET_ARCH, arm64-v8a)  {
         ANDROID_TRUE_BITNESS = 64

android/src/org/mavlink/qgroundcontrol/QGCActivity.java

@@ -225,7 +225,11 @@ public void onCreate(Bundle savedInstanceState)
         _instance.registerReceiver(_instance._usbReceiver, filter);
 
         // Create intent for usb permission request
-        _usbPermissionIntent = PendingIntent.getBroadcast(_instance, 0, new Intent(ACTION_USB_PERMISSION), 0);
+        int intentFlags = 0;
+        if (android.os.Build.VERSION.SDK_INT >= 23) {
+            intentFlags = PendingIntent.FLAG_IMMUTABLE;
+        }
+        _usbPermissionIntent = PendingIntent.getBroadcast(_instance, 0, new Intent(ACTION_USB_PERMISSION), intentFlags);
 
 	// Workaround for QTBUG-73138
 	if (_wifiMulticastLock == null)

crowdin_docs.yml

@@ -0,0 +1,3 @@
+files:
+  - source: /docs/en/**/*.md
+    translation: /docs/%two_letters_code%/**/%original_file_name%

docs/.vitepress/config.mjs

@@ -3,7 +3,7 @@ import { defineConfig } from "vitepress";
 
 // https://vitepress.dev/reference/site-config
 export default defineConfig({
-  title: "QGC Guide (4.3)",
+  title: "QGC Guide (4.4)",
   description:
     "How to use and develop QGroundControl for PX4 or ArduPilot powered vehicles.",
   ignoreDeadLinks: true, // Do this for stable, where we don't yet have all translations
@@ -152,6 +152,10 @@ export default defineConfig({
             text: "v4.3",
             link: "https://docs.qgroundcontrol.com/Stable_V4.3/en/",
           },
+          {
+            text: "v4.4",
+            link: "https://docs.qgroundcontrol.com/Stable_V4.4/en/",
+          },
         ],
       },
     ],

docs/en/qgc-dev-guide/command_line_options.md

@@ -8,38 +8,38 @@ You will need to open a command prompt or terminal, change directory to where **
 
 Windows Command Prompt:
 
-```bash
+```sh
 cd "\Program Files (x86)\qgroundcontrol"
 qgroundcontrol --logging:full
 ```
 
 OSX Terminal app (**Applications/Utilities**):
 
-```bash
+```sh
 cd /Applications/qgroundcontrol.app/Contents/MacOS/
 ./qgroundcontrol --logging:full
 ```
 
 Linux Terminal:
 
-```bash
+```sh
 ./qgroundcontrol-start.sh --logging:full
 ```
 
 ## Options
 
 The options/command line arguments are listed in the table below.
 
-| Option                                                    | Description                                                                                                                                       |
-| --------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `--clear-settings`                                        | Clears the app settings (reverts _QGroundControl_ back to default settings).                                                                      |
-| `--logging:full`                                          | Turns on full logging. See [Console Logging](https://docs.qgroundcontrol.com/en/settings_view/console_logging.html#logging-from-the-command-line). |
-| `--logging:full,LinkManagerVerboseLog,ParameterLoaderLog` | Turns on full logging and turns off the following listed comma-separated logging options.                                                         |
-| `--logging:LinkManagerLog,ParameterLoaderLog`             | Turns on the specified comma separated logging options                                                                                            |
-| `--unittest:name`                                         | (Debug builds only) Runs the specified unit test. Leave off `:name` to run all tests.                                                             |
-| `--unittest-stress:name`                                  | (Debug builds only) Runs the specified unit test 20 times in a row. Leave off :name to run all tests.                                             |
-| `--fake-mobile`                                           | Simulates running on a mobile device.                                                                                                             |
-| `--test-high-dpi`                                         | Simulates running _QGroundControl_ on a high DPI device.                                                                                          |
+| Option                                                    | Description                                                                                                                          |
+| --------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ |
+| `--clear-settings`                                        | Clears the app settings (reverts _QGroundControl_ back to default settings).                                                         |
+| `--logging:full`                                          | Turns on full logging. See [Console Logging](../../qgc-user-guide/settings_view/console_logging.html#logging-from-the-command-line). |
+| `--logging:full,LinkManagerVerboseLog,ParameterLoaderLog` | Turns on full logging and turns off the following listed comma-separated logging options.                                            |
+| `--logging:LinkManagerLog,ParameterLoaderLog`             | Turns on the specified comma separated logging options                                                                               |
+| `--unittest:name`                                         | (Debug builds only) Runs the specified unit test. Leave off `:name` to run all tests.                                                |
+| `--unittest-stress:name`                                  | (Debug builds only) Runs the specified unit test 20 times in a row. Leave off :name to run all tests.                                |
+| `--fake-mobile`                                           | Simulates running on a mobile device.                                                                                                |
+| `--test-high-dpi`                                         | Simulates running _QGroundControl_ on a high DPI device.                                                                             |
 
 Notes:
 

docs/en/qgc-dev-guide/getting_started/index.md

@@ -2,14 +2,15 @@
 qt_version: 5.15.2
 ---
 
-# Getting Started
+# Getting Started with Source and Builds
 
 This topic explains how to get the _QGroundControl_ source code and build it either natively or within a _Vagrant_ environment.
 It also provides information about optional or OS specific functionality.
 
 ## Daily Builds
 
-If you just want to test (and not debug) a recent build of _QGroundControl_ you can use the [Daily Build](https://docs.qgroundcontrol.com/en/releases/daily_builds.html). Versions are provided for all platforms.
+If you just want to test (and not debug) a recent build of _QGroundControl_ you can use the [Daily Build](../../qgc-user-guide/releases/daily_builds.md).
+Versions are provided for all platforms.
 
 ## Source Code
 
@@ -19,11 +20,14 @@ It is [dual-licensed under Apache 2.0 and GPLv3](https://github.com/mavlink/qgro
 To get the source files:
 
 1. Clone the repo (or your fork) including submodules:
-   ```
+
+   ```sh
    git clone --recursive -j8 https://github.com/mavlink/qgroundcontrol.git
    ```
+
 2. Update submodules (required each time you pull new source code):
-   ```
+
+   ```sh
    git submodule update --recursive
    ```
 
@@ -133,9 +137,11 @@ To install Qt:
    :::
 
    - **Ubuntu:**
+
      - Airmap: Create a file named **user_config.pri** (in the repo root directory) containing the text `DEFINES += DISABLE_AIRMAP`.
        This can be done in a bash terminal using the command:
-       ```
+
+       ```sh
        echo -e "DEFINES += DISABLE_AIRMAP\r\n" | tee user_config.pri
        ```
 
@@ -165,37 +171,44 @@ To install Qt:
 Example commands to build a default QGC and run it afterwards:
 
 1. Make sure you cloned the repository and updated the submodules before, see chapter _Source Code_ above and switch into the repository folder:
-   ```
+
+   ```sh
    cd qgroundcontrol
    ```
+
 1. Create and enter a shadow build directory:
-   ```
+
+   ```sh
    mkdir build
    cd build
    ```
+
 1. Configure the build using the qmake script in the root of the repository:
-   ```
+
+   ```sh
    qmake ../
    ```
+
 1. Run make to compile and link.
    To accelerate the process things you can use the `-j{number of threads}` parameter.
 
-   ```
+   ```sh
    make -j12
    ```
 
    ::: info
    You can also specify build time flags here.
    For example, you could disable airmap inclusion using the command:
 
-   ```
+   ```sh
    DEFINES+=DISABLE_AIRMAP make build
    ```
 
    :::
 
 1. Run the QGroundcontrol binary that was just built:
-   ```
+
+   ```sh
    ./staging/QGroundControl
    ```
 

docs/en/qgc-dev-guide/tools/index.md

@@ -11,10 +11,6 @@ and accessing the System Shell over MAVLink.
 Tools include:
 
 - **[Mock Link](../tools/mock_link.md)** (Daily Builds only) - Creates and stops multiple simulated vehicle links.
-- **[Replay Flight Data](https://docs.qgroundcontrol.com/en/app_menu/replay_flight_data.html)** - Replay a telemetry log (User Guide).
-- **[MAVLink Inspector](https://docs.qgroundcontrol.com/en/app_menu/mavlink_inspector.html)** - Display received MAVLink messages/values.
-- **[MAVLink Analyzer](https://docs.qgroundcontrol.com/en/app_menu/mavlink_analyzer.html)** - Plot trends for MAVLink messages/values.
-- **[Custom Command Widget](https://docs.qgroundcontrol.com/en/app_menu/custom_command_widget.html)** - Load custom/test QML UI at runtime.
-- **[Onboard Files](https://docs.qgroundcontrol.com/en/app_menu/onboard_files.html)** - Navigate vehicle file system and upload/download files.
-- **[HIL Config Widget](https://docs.qgroundcontrol.com/en/app_menu/hil_config.html)** - Settings for HIL simulators.
-- **[MAVLink Console](https://docs.qgroundcontrol.com/en/analyze_view/mavlink_console.html)** (PX4 Only) - Connect to the PX4 nsh shell and send commands.
+- **[Replay Flight Data](../../qgc-user-guide/fly_view/replay_flight_data.md)** - Replay a telemetry log (User Guide).
+- **[MAVLink Inspector](../../qgc-user-guide/analyze_view/mavlink_inspector.html)** - Display received MAVLink messages/values and plot trends.
+- **[MAVLink Console](../../qgc-user-guide/analyze_view/mavlink_console.html)** (PX4 Only) - Connect to the PX4 nsh shell and send commands.

docs/en/qgc-user-guide/getting_started/download_and_install.md

@@ -36,7 +36,7 @@ It is possible to manually build 32 bit versions (this is not supported by the d
 
 _QGroundControl_ can be installed on macOS 10.11 or later:
 
-<!-- match version using https://dev.qgroundcontrol.com/master/en/getting_started/#native-builds -->
+<!-- match version using https://docs.qgroundcontrol.com/master/en/qgc-dev-guide/getting_started/#native-builds -->
 <!-- usually based on Qt macOS dependency -->
 
 1. Download [QGroundControl.dmg](https://d176tv9ibo4jno.cloudfront.net/latest/QGroundControl.dmg).