QT6, let's see how it goes

.gitmodules

@@ -3,8 +3,8 @@
 	url = https://github.com/KDAB/android_openssl.git
 [submodule "src/smtpclient"]
 	path = src/smtpclient
-	url = https://github.com/cagnulein/SmtpClient-for-Qt.git
-	branch = cagnulein-patch-2
+	url = https://github.com/bluetiger9/SmtpClient-for-Qt
+	branch = v2.0
 [submodule "tst/googletest"]
 	path = tst/googletest
 	url = https://github.com/google/googletest.git

CMakeLists.txt

@@ -0,0 +1,111 @@
+cmake_minimum_required(VERSION 3.23)
+project(qdomyos-zwift VERSION 2.20.5 LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# Set Qt6 path based on platform and compiler
+if(WIN32 AND NOT DEFINED CMAKE_PREFIX_PATH)
+    if(ANDROID)
+        # Android builds - use all Android ABIs
+        set(CMAKE_PREFIX_PATH "C:/Qt/6.8.2/android_armv7;C:/Qt/6.8.2/android_arm64_v8a;C:/Qt/6.8.2/android_x86;C:/Qt/6.8.2/android_x86_64")
+    elseif(MSVC)
+        # Windows MSVC builds
+        set(CMAKE_PREFIX_PATH "C:/Qt/6.8.2/msvc2022_64")
+    elseif(MINGW)
+        # Windows MinGW builds
+        set(CMAKE_PREFIX_PATH "C:/Qt/6.8.2/mingw_64")
+    else()
+        # Default Windows path
+        set(CMAKE_PREFIX_PATH "C:/Qt/6.8.2/msvc2022_64")
+    endif()
+endif()
+
+# Find required Qt6 components
+if(ANDROID)
+    # Android specific components (some modules not available)
+    find_package(Qt6 REQUIRED COMPONENTS 
+        Core 
+        Quick 
+        Qml
+        QuickControls2
+        Network 
+        Gui 
+        Xml 
+        Positioning 
+        NetworkAuth 
+        WebSockets 
+        Location 
+        Multimedia 
+        Charts
+    )
+    # Try to find optional Android modules
+    find_package(Qt6Bluetooth QUIET)
+    if(Qt6Bluetooth_FOUND)
+        message(STATUS "Qt6Bluetooth found for Android")
+    else()
+        message(WARNING "Qt6Bluetooth not found for Android - Bluetooth features will be disabled")
+    endif()
+
+    find_package(Qt6Core5Compat QUIET)
+    if(Qt6Core5Compat_FOUND)
+        message(STATUS "Qt6Core5Compat found for Android")
+    else()
+        message(WARNING "Qt6Core5Compat not found for Android - Qt5 compatibility features will be disabled")
+    endif()
+
+    find_package(Qt6TextToSpeech QUIET)
+    if(Qt6TextToSpeech_FOUND)
+        message(STATUS "Qt6TextToSpeech found for Android")
+    else()
+        message(WARNING "Qt6TextToSpeech not found for Android - Text-to-speech features will be disabled")
+    endif()
+else()
+    # Desktop/full components
+    find_package(Qt6 REQUIRED COMPONENTS 
+        Core 
+        Widgets 
+        Bluetooth 
+        Xml 
+        Positioning 
+        Quick 
+        Qml
+        QuickControls2
+        NetworkAuth 
+        WebSockets 
+        TextToSpeech 
+        Location 
+        Multimedia 
+        MultimediaWidgets 
+        Network 
+        Gui 
+        WebView
+        Charts
+        Core5Compat
+    )
+endif()
+
+# Qt6 policies
+qt_policy(SET QTP0001 NEW)
+
+# Android Multi-ABI support
+if(ANDROID)
+    # Enable multi-ABI only if explicitly requested
+    if(DEFINED QT_ANDROID_BUILD_ALL_ABIS AND QT_ANDROID_BUILD_ALL_ABIS)
+        message(STATUS "Configuring for Android Multi-ABI build")
+        set(QT_ANDROID_BUILD_ALL_ABIS TRUE CACHE BOOL "Build for all available Android ABIs")
+        set(QT_ANDROID_ABIS "armeabi-v7a;arm64-v8a;x86;x86_64" CACHE STRING "Android ABIs to build for")
+        message(STATUS "Target ABIs: ${QT_ANDROID_ABIS}")
+    else()
+        message(STATUS "Configuring for single Android ABI: ${ANDROID_ABI}")
+    endif()
+endif()
+
+# Add the main application
+add_subdirectory(src)
+
+# Add tests for non-mobile platforms
+if(NOT ANDROID AND NOT IOS)
+    enable_testing()
+    add_subdirectory(tst)
+endif()

CMakePresets.json

@@ -0,0 +1,97 @@
+{
+    "version": 3,
+    "configurePresets": [
+        {
+            "name": "android-multi-abi-debug",
+            "displayName": "Android Multi-ABI Debug",
+            "description": "Build for all Android architectures (Debug)",
+            "generator": "Ninja Multi-Config",
+            "binaryDir": "${sourceDir}/build-android-multi-debug",
+            "toolchainFile": "$env{ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+                "CMAKE_PREFIX_PATH": "C:/Qt/6.8.2/android_arm64_v8a",
+                "QT_HOST_PATH": "C:/Qt/6.8.2/msvc2022_64",
+                "QT_ANDROID_BUILD_ALL_ABIS": "TRUE",
+                "QT_ANDROID_ABIS": "armeabi-v7a;arm64-v8a;x86;x86_64",
+                "ANDROID_ABI": "arm64-v8a",
+                "ANDROID_PLATFORM": "android-23",
+                "ANDROID_STL": "c++_shared",
+                "ANDROID_CPP_FEATURES": "rtti exceptions",
+                "CMAKE_FIND_ROOT_PATH_MODE_PACKAGE": "BOTH"
+            },
+            "environment": {
+                "ANDROID_SDK_ROOT": "C:/Users/$env{USERNAME}/AppData/Local/Android/Sdk",
+                "ANDROID_NDK_ROOT": "C:/Users/$env{USERNAME}/AppData/Local/Android/Sdk/ndk/21.4.7075529"
+            }
+        },
+        {
+            "name": "android-multi-abi-release",
+            "displayName": "Android Multi-ABI Release",
+            "description": "Build for all Android architectures (Release)",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build-android-release",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release",
+                "CMAKE_PREFIX_PATH": "C:/Qt/6.8.2/android_armv7;C:/Qt/6.8.2/android_arm64_v8a;C:/Qt/6.8.2/android_x86;C:/Qt/6.8.2/android_x86_64",
+                "QT_HOST_PATH": "C:/Qt/6.8.2/msvc2022_64",
+                "QT_ANDROID_BUILD_ALL_ABIS": "ON",
+                "QT_ANDROID_ABIS": "armeabi-v7a;arm64-v8a;x86;x86_64",
+                "ANDROID_PLATFORM": "android-23",
+                "ANDROID_STL": "c++_shared"
+            },
+            "environment": {
+                "ANDROID_SDK_ROOT": "$env{ANDROID_SDK_ROOT}",
+                "ANDROID_NDK_ROOT": "$env{ANDROID_NDK_ROOT}",
+                "JAVA_HOME": "$env{JAVA_HOME}"
+            },
+            "condition": {
+                "type": "equals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Windows"
+            }
+        },
+        {
+            "name": "android-arm64-debug",
+            "displayName": "Android ARM64 Debug (Single ABI)",
+            "description": "Build for ARM64 only (Debug)",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build-android-arm64-debug",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+                "CMAKE_PREFIX_PATH": "C:/Qt/6.8.2/android_arm64_v8a",
+                "QT_HOST_PATH": "C:/Qt/6.8.2/msvc2022_64",
+                "ANDROID_ABI": "arm64-v8a",
+                "ANDROID_PLATFORM": "android-23",
+                "ANDROID_STL": "c++_shared"
+            },
+            "environment": {
+                "ANDROID_SDK_ROOT": "$env{ANDROID_SDK_ROOT}",
+                "ANDROID_NDK_ROOT": "$env{ANDROID_NDK_ROOT}",
+                "JAVA_HOME": "$env{JAVA_HOME}"
+            },
+            "condition": {
+                "type": "equals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Windows"
+            }
+        }
+    ],
+    "buildPresets": [
+        {
+            "name": "android-multi-abi-debug",
+            "configurePreset": "android-multi-abi-debug",
+            "displayName": "Build Android Multi-ABI Debug"
+        },
+        {
+            "name": "android-multi-abi-release",
+            "configurePreset": "android-multi-abi-release",
+            "displayName": "Build Android Multi-ABI Release"
+        },
+        {
+            "name": "android-arm64-debug",
+            "configurePreset": "android-arm64-debug",
+            "displayName": "Build Android ARM64 Debug"
+        }
+    ]
+}

amazon-store/src/android/AndroidManifest.xml

@@ -74,7 +74,7 @@
 		  <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
 		</application>
 
-<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
+<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29" />
 <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.ACCESS_CHECKIN_PROPERTIES"/>

configure-android-multiabi.bat

@@ -0,0 +1,108 @@
+@echo off
+REM Configure CMake for Android Multi-ABI and open in Qt Creator
+REM This script properly configures the project for multi-ABI build
+
+echo.
+echo ============================================
+echo  Configuring Android Multi-ABI Project
+echo ============================================
+echo.
+
+REM Set paths
+set QT_DIR=C:\Qt\6.8.2
+set ANDROID_SDK_ROOT=C:\Users\%USERNAME%\AppData\Local\Android\Sdk
+set ANDROID_NDK_ROOT=%ANDROID_SDK_ROOT%\ndk\25.1.8937393
+
+REM Fallback to other NDK versions if preferred one doesn't exist
+if not exist "%ANDROID_NDK_ROOT%" set ANDROID_NDK_ROOT=%ANDROID_SDK_ROOT%\ndk\26.1.10909125
+if not exist "%ANDROID_NDK_ROOT%" set ANDROID_NDK_ROOT=%ANDROID_SDK_ROOT%\ndk\21.3.6528147
+
+REM Verify paths
+if not exist "%QT_DIR%\android_arm64_v8a" (
+    echo ERROR: Qt Android not found at %QT_DIR%
+    pause
+    exit /b 1
+)
+
+if not exist "%ANDROID_NDK_ROOT%" (
+    echo ERROR: Android NDK not found at %ANDROID_NDK_ROOT%
+    echo Please install NDK 21.4.7075529 through Android Studio
+    pause
+    exit /b 1
+)
+
+echo Using Qt: %QT_DIR%
+echo Using NDK: %ANDROID_NDK_ROOT%
+echo.
+
+REM Clean previous build directories
+if exist build-android-multiabi (
+    echo Cleaning previous multi-ABI build...
+    rmdir /s /q build-android-multiabi
+)
+
+REM Create build directory
+mkdir build-android-multiabi
+cd build-android-multiabi
+
+echo.
+echo ============================================
+echo  Configuring CMake for Multi-ABI
+echo ============================================
+echo.
+
+REM Configure CMake with explicit multi-ABI settings
+cmake .. ^
+    -DCMAKE_TOOLCHAIN_FILE="%ANDROID_NDK_ROOT%\build\cmake\android.toolchain.cmake" ^
+    -DQT_HOST_PATH="%QT_DIR%\msvc2022_64" ^
+    -DCMAKE_PREFIX_PATH="%QT_DIR%\android_arm64_v8a" ^
+    -DANDROID_ABI=arm64-v8a ^
+    -DANDROID_PLATFORM=android-23 ^
+    -DANDROID_STL=c++_shared ^
+    -DCMAKE_BUILD_TYPE=Debug ^
+    -DQT_ANDROID_BUILD_ALL_ABIS=ON ^
+    -DQT_ANDROID_ABIS="armeabi-v7a;arm64-v8a;x86;x86_64" ^
+    -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=BOTH ^
+    -DANDROID_SDK_ROOT="%ANDROID_SDK_ROOT%" ^
+    -DANDROID_NDK_ROOT="%ANDROID_NDK_ROOT%"
+
+if errorlevel 1 (
+    echo.
+    echo ERROR: CMake configuration failed!
+    echo Check the error messages above.
+    cd ..
+    pause
+    exit /b 1
+)
+
+echo.
+echo ============================================
+echo  Configuration successful!
+echo ============================================
+echo.
+
+REM Go back to project root
+cd ..
+
+echo Project configured for Android Multi-ABI build.
+echo Build directory: build-android-multiabi
+echo.
+echo To build from command line:
+echo   cd build-android-multiabi
+echo   cmake --build . --parallel
+echo.
+echo To open in Qt Creator:
+echo   1. Open Qt Creator
+echo   2. File -^> Open File or Project
+echo   3. Select: %CD%\build-android-multiabi\CMakeCache.txt
+echo   4. Or just open the CMakeLists.txt and select the configured build
+echo.
+
+REM Ask if user wants to open Qt Creator
+set /p OPEN_QTC="Open Qt Creator now? (y/n): "
+if /i "%OPEN_QTC%"=="y" (
+    echo Opening Qt Creator...
+    start "" "%ProgramFiles%\Qt\QtCreator\bin\qtcreator.exe" "%CD%"
+)
+
+pause