Merge pull request #90 from janbar/qt6

Using the latest Qt framework 6.9.0

Author: janbar

.github/workflows/build_android_x64.yml

@@ -5,13 +5,11 @@ on:
     branches:
       - debug
       - master
-      - dev/1.13
 
   push:
     branches:
       - debug
       - master
-      - dev/1.13
 
 jobs:
   build:
@@ -25,7 +23,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: zulu
-          java-version: 17
+          java-version: 21
       - name: Setup Android SDK tools
         uses: android-actions/setup-android@v3
         with:
@@ -36,40 +34,48 @@ jobs:
       - name: Configure ENV
         run:  |
             echo "ANDROID_NDK=${ANDROID_HOME}/ndk/27.2.12479018" >> $GITHUB_ENV
-            echo "QT_DIR=${HOME}/Qt/5.15.16/android" >> $GITHUB_ENV
+            echo "QT_DIR=${HOME}/Qt/6.9.0/android_x86_64" >> $GITHUB_ENV
+            echo "QT_HOST_PATH=${HOME}/Qt/6.9.0/gcc_64" >> $GITHUB_ENV
 
       - name: Cache Qt
         id: cache-qt
         uses: actions/cache@v3
         env:
           cache-name: cache-qt
         with:
-          path: ~/Qt/5.15.16/android
-          key: qtandroid-51516-ndk23
+          path: |
+              ~/Qt/6.9.0
+              ~/Qt/android_openssl
+          key: qtandroid_x86_64-60900-ndk26
 
       - if: ${{ steps.cache-qt.outputs.cache-hit != 'true' }}
         name: Install Qt
         continue-on-error: true
         run: |
-            wget -q ${{secrets.PRIVATE_URL_DOWNLOAD}}/qt/qt-5.15.16-android-ndk23-linux64.tar.xz
+            wget -q ${{secrets.PRIVATE_URL_DOWNLOAD}}/qt/qt-6.9.0-android_x86_64-ndk26-linux64.tar.xz
+            wget -q ${{secrets.PRIVATE_URL_DOWNLOAD}}/qt/android_openssl-20240915.tar.xz
             mkdir -p ~/Qt
-            tar xfJ qt-5.15.16-android-ndk23-linux64.tar.xz -C ~/Qt/
-            rm -f qt-5.15.16-android-ndk23-linux64.tar.xz
+            tar xfJ qt-6.9.0-android_x86_64-ndk26-linux64.tar.xz -C ~/Qt/
+            tar xfJ android_openssl-20240915.tar.xz -C ~/Qt/
+            rm -f *.tar.xz
+
+      - name: Configure Android OpenSSL
+        run: ln -s ~/Qt/android_openssl ${ANDROID_SDK_ROOT}/android_openssl
 
       - name: Fetch submodules
         run: git submodule init && git submodule update
       - name: Configure build
         run: |
             cmake -B build -DCMAKE_SYSTEM_NAME=Android \
-                  -DCMAKE_PREFIX_PATH=${Qt5_DIR} \
+                  -DCMAKE_PREFIX_PATH=${QT_DIR} \
                   -DCMAKE_FIND_ROOT_PATH=${QT_DIR} \
                   -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake \
                   -DCMAKE_MAKE_PROGRAM=${ANDROID_NDK}/prebuilt/linux-x86_64/bin/make \
-                  -DANDROID_ABI=x86_64 -DANDROID_SDK_MINVER=24 -DANDROID_SDK_TARGET=26 \
-                  -DANDROID_NATIVE_API_LEVEL=24 -DANDROID_SDK_BUILD_TOOLS_REVISION=34.0.0 \
+                  -DANDROID_ABI=x86_64 -DANDROID_SDK_MINVER=26 -DANDROID_SDK_TARGET=26 \
+                  -DANDROID_NATIVE_API_LEVEL=24 \
+                  -DANDROID_SDK_BUILD_TOOLS_REVISION=31.0.0 \
                   -DANDROID_SDK_ROOT=${ANDROID_SDK_ROOT} \
                   -DANDROID_NDK=${ANDROID_NDK} \
-                  -DANDROID_STL=c++_static \
                   -DQT_ANDROID_PLATFORM_LEVEL=34 \
                   -Wno-dev
       - name: Build

.github/workflows/build_ubuntu_24.yml

@@ -28,23 +28,40 @@ jobs:
         run: |
           sudo apt-get install -y \
               libc++-dev libomp-dev zlib1g-dev liblzma-dev libxml2-dev \
-              libdbus-1-dev libprotobuf-dev protobuf-compiler\
-              libqt5remoteobjects5-bin libqt5quickwidgets5 \
-              libqt5quickcontrols2-5 libqt5qmlmodels5 libqt5qml5 \
-              libqt5positioning5 libqt5dbus5 libqt5remoteobjects5-dev \
-              libqt5svg5-dev libqt5sensors5-dev \
-              qttools5-dev qttools5-dev-tools qtdeclarative5-dev \
-              qtquickcontrols2-5-dev qtmultimedia5-dev qtpositioning5-dev \
-              qml-module-qtquick2 qml-module-qtgraphicaleffects \
-              qml-module-qtquick-layouts qml-module-qtquick-controls2 \
-              qml-module-qt-labs-settings \
-              libreadline-dev
+              libdbus-1-dev libprotobuf-dev protobuf-compiler libssl-dev \
+              libgl1-mesa-dev libreadline-dev libpulse0 mesa-vulkan-drivers
+
+      - name: Configure ENV
+        run:  |
+            echo "QT_DIR=${HOME}/Qt/6.9.0/gcc_64" >> $GITHUB_ENV
+            echo "QT_HOST_PATH=${HOME}/Qt/6.9.0/gcc_64" >> $GITHUB_ENV
+
+      - name: Cache Qt
+        id: cache-qt
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-qt
+        with:
+          path: |
+              ~/Qt/6.9.0
+          key: qtgcc_64-60900
+
+      - if: ${{ steps.cache-qt.outputs.cache-hit != 'true' }}
+        name: Install Qt
+        continue-on-error: true
+        run: |
+            wget -q ${{secrets.PRIVATE_URL_DOWNLOAD}}/qt/qt-6.9.0-gcc_64-linux64.tar.xz
+            mkdir -p ~/Qt
+            tar xfJ qt-6.9.0-gcc_64-linux64.tar.xz -C ~/Qt/
+            rm -f *.tar.xz
 
       - name: Fetch submodules
         run: git submodule init && git submodule update
       - name: Configure build
         run: |
           cmake -B build \
+              -DCMAKE_PREFIX_PATH=${QT_DIR} \
+              -DCMAKE_FIND_ROOT_PATH=${QT_DIR} \
               -DBUILD_DEVICE_MOBILE=ON \
               -DBUILD_SIMULATOR=ON -DBUILD_SIMULATOR_WITH_READLINE=ON \
               -Wno-dev

CMakeLists.txt

@@ -8,7 +8,7 @@ option(BUILD_DEVICE_MOBILE "Enable behaviors for mobile devices" OFF)
 option(BUILD_SIMULATOR "Build the simulation tool for OSMIN" OFF)
 
 set(APP_VERSION       "1.14.0")
-set(APP_VERSION_CODE  87)
+set(APP_VERSION_CODE  90)
 set(APP_ID            "io.github.janbar.osmin")
 set(APP_NAME          "osmin")
 
@@ -95,27 +95,23 @@ else()
     set(CMAKE_IGNORE_PATH "/opt/local/bin;/opt/local/include;/opt/local/lib")
 endif()
 
-set(QT_VERSION_PREFERRED "5" CACHE STRING "preferred Qt version" FORCE)
+set(QT_VERSION_PREFERRED "6" CACHE STRING "preferred Qt version" FORCE)
 include(qtchooser)
 if(NOT QT_FOUND)
     message(FATAL_ERROR "Qt${QT_VERSION_PREFERRED} NOT found")
-elseif(Qt5Core_VERSION VERSION_LESS 5.15.2)
-    message(FATAL_ERROR "Qt version not supported")
 endif()
 
 add_subdirectory(backend)
 
 set(CMAKE_AUTOMOC ON)
-find_package(Qt5 ${QT_VERSION} COMPONENTS
+find_package(Qt6 ${QT_VERSION} COMPONENTS
     Core Gui Qml Quick QuickControls2 Widgets Xml Svg Network Sensors
-    Multimedia RemoteObjects Positioning REQUIRED)
+    Multimedia RemoteObjects Positioning Core5Compat REQUIRED)
 
-if(ANDROID)
-    find_package(Qt5AndroidExtras REQUIRED)
-elseif(UNIX AND NOT APPLE)
+if(UNIX AND NOT APPLE)
     find_library(DBUS_LIBRARIES dbus-1)
     if(DBUS_LIBRARIES)
-        find_package(Qt5 ${QT_VERSION} COMPONENTS DBus REQUIRED)
+        find_package(Qt6 ${QT_VERSION} COMPONENTS DBus REQUIRED)
         set(HAVE_DBUS 1)
     endif()
 endif()
@@ -189,43 +185,49 @@ add_definitions(-DQT_STATICPLUGIN)
 
 include_directories(${PROJECT_BINARY_DIR} ${LIBOSMSCOUT_INCLUDE_DIRS})
 
-qt5_generate_repc(osmin_SOURCES src/servicemessenger.rep SOURCE)
-qt5_generate_repc(osmin_SOURCES src/servicemessenger.rep REPLICA)
-qt5_add_resources(osmin-resources gui/osmin_controls2_515.qrc)
+qt_add_resources(osmin-resources gui/osmin_controls2_690.qrc)
 
+#qt_add_executable(osmin ${osmin_SOURCES} ${osmin_HEADERS} ${osmin-resources} MANUAL_FINALIZATION)
 if(ANDROID)
     add_library(osmin SHARED ${osmin_SOURCES} ${osmin_HEADERS} ${osmin-resources})
 else()
-    add_executable(osmin ${osmin_SOURCES} ${osmin_HEADERS} ${osmin-resources})
+  add_executable(osmin ${osmin_SOURCES} ${osmin_HEADERS} ${osmin-resources})
 endif()
+qt6_add_repc_sources(osmin src/servicemessenger.rep)
+qt6_add_repc_replicas(osmin src/servicemessenger.rep)
 
 target_link_libraries(osmin PRIVATE ${LIBOSMSCOUT_LIBRARIES})
 target_link_libraries(osmin PRIVATE
-                      Qt5::QuickControls2 Qt5::RemoteObjects Qt5::Positioning
-                      Qt5::Qml Qt5::Quick Qt5::Widgets Qt5::Gui Qt5::Xml Qt5::Svg
-                      Qt5::Network Qt5::Sensors Qt5::Multimedia Qt5::Core)
+    Qt::RemoteObjects Qt::Positioning
+    Qt::QuickControls2 Qt::Qml Qt::Quick
+    Qt::Widgets Qt::Gui Qt::Xml
+    Qt::Svg Qt::Network Qt::Sensors
+    Qt::Multimedia Qt::Core
+    Qt6::Core5Compat)
 
 if(ANDROID)
     add_definitions(-DDEVICE_MOBILE)
     add_definitions(-frtti) # dynamic_cast: https://github.com/android/ndk/issues/519
-    target_link_libraries(osmin PRIVATE Qt5::AndroidExtras android log)
+    set_property(TARGET osmin PROPERTY SUFFIX "_${ANDROID_ABI}.so")
+#set_property(TARGET osmin APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android/package-sources")
+    target_link_libraries(osmin PRIVATE android log Qt6::CorePrivate)
+
+    # Provides dependency openssl
+    if(NOT ANDROID_SDK_ROOT)
+        set(ANDROID_SDK_ROOT "$ENV{ANDROID_SDK_ROOT}")
+        if(NOT ANDROID_SDK_ROOT)
+            message(FATAL_ERROR "The ANDROID_SDK_ROOT environment variable is not set")
+        endif()
+    endif()
+    include(${ANDROID_SDK_ROOT}/android_openssl/android_openssl.cmake)
+    add_android_openssl_libraries(osmin)
+    get_target_property(ANDROID_EXTRA_LIBS osmin QT_ANDROID_EXTRA_LIBS)
+
     # Fix import of shared omp with android ndk rev 21
     if(OpenMP_CXX_LIBRARIES MATCHES libomp.so)
-       set(SHARED_LIBOMP ${OpenMP_CXX_LIBRARIES})
+        list(APPEND ANDROID_EXTRA_LIBS ${OpenMP_CXX_LIBRARIES})
     endif()
-    add_dependencies(osmin ssl crypto)
 
-    include(android/AddQtAndroidApk.cmake)
-    add_qt_android_apk(osmin-apk osmin
-        NAME ${APP_NAME}
-        VERSION_CODE ${APP_VERSION_CODE}
-        PACKAGE_NAME ${APP_ID}
-        PACKAGE_SOURCES ${PROJECT_SOURCE_DIR}/android/package-sources
-        DEPENDS ssl crypto ${SHARED_LIBOMP}
-        ASSETS ${PROJECT_SOURCE_DIR}/resources
-        KEYSTORE ${KEYSTORE_FILE} ${KEYSTORE_ALIAS}
-        KEYSTORE_PASSWORD ${KEYSTORE_PASSWORD}
-    )
 else()
     if(BUILD_DEVICE_MOBILE)
         message(STATUS "Enable Device Mobile")
@@ -234,7 +236,7 @@ else()
     if(HAVE_DBUS)
         message(STATUS "Enable DBus interfaces")
         add_definitions(-DHAVE_DBUS)
-        target_link_libraries(osmin PRIVATE Qt5::DBus)
+        target_link_libraries(osmin PRIVATE Qt::DBus)
     endif()
 
     set_target_properties(osmin PROPERTIES OUTPUT_NAME "${EXEC}")
@@ -278,3 +280,21 @@ else()
         ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
     )
 endif()
+
+#qt_finalize_executable(osmin)
+
+if(ANDROID)
+    include(android/AddQtAndroidApk.cmake)
+    add_qt_android_apk(osmin-apk osmin
+        NAME ${APP_NAME}
+        VERSION_CODE ${APP_VERSION_CODE}
+        PACKAGE_NAME ${APP_ID}
+        PACKAGE_SOURCES ${PROJECT_SOURCE_DIR}/android/package-sources
+        DEPENDS ${ANDROID_EXTRA_LIBS}
+        PLUGINS platforms tls iconengines imageformats multimedia
+                position sensors networkinformation qmltooling styles
+        ASSETS ${PROJECT_SOURCE_DIR}/resources
+        KEYSTORE ${KEYSTORE_FILE} ${KEYSTORE_ALIAS}
+        KEYSTORE_PASSWORD ${KEYSTORE_PASSWORD}
+  )
+endif()

README.md

@@ -19,19 +19,20 @@ The APKs are available on the Release page, for armv7(32bits) and arm64(64bits)
 Alternatively you can install osmin through the [IzzyOnDroid](https://apt.izzysoft.de/fdroid/index/apk/io.github.janbar.osmin) F-Droid repo, which should be available by enabling IzzyOnDroid from Settings > Repositories, otherwise, please refer to instructions at [IzzyOnDroid](https://apt.izzysoft.de/fdroid/) main page.
 
 ## Develop/debug osmin
-You can build and test osmin on Unix (Linux, BSD) supported by Qt 5.15. Before build from source you have to install the following dependencies.
+You can build and test osmin on Unix (Linux, BSD) supported by Qt 6.9. Before build from source you have to install the following dependencies.
 
-git, cmake (**>=3.20), clang/clang++ (**>=18.0** standard C++20), OpenMP, Qt5Core (**>=5.15**), Qt5Gui, Qt5Qml, Qt5Quick, Qt5QuickControls2, Qt5Widgets, Qt5Xml, Qt5Svg, Qt5Network, Qt5Sensors, Qt5Multimedia, Qt5RemoteObjects, Qt5Positioning, Qt5DBus, libdbus-1, zlib1g, libxml2, liblzma, OpenSSL
+git, cmake (**>=3.20), clang/clang++ (**>=18.0** standard C++20), OpenMP, Qt5Core (**>=6.9.0**), Qt6Gui, Qt6Qml, Qt6Quick, Qt6QuickControls2, Qt6Widgets, Qt6Xml, Qt6Svg, Qt6Network, Qt6Sensors, Qt6Multimedia, Qt6RemoteObjects, Qt6Positioning, Qt6DBus, libdbus-1, zlib1g, libxml2, liblzma, OpenSSL
 
 
-As example type the following on Ubuntu (>=24.04) to install all requirements.
+As example type the following on Ubuntu (>=24.04) to install the base requirements.
 ```
-sudo apt install git cmake clang curl wget libomp-dev zlib1g-dev libxml2-dev liblzma-dev libdbus-1-dev libssl-dev libreadline-dev libqt5remoteobjects5-bin libqt5quickwidgets5 libqt5quickcontrols2-5 libqt5qmlmodels5 libqt5qml5 libqt5positioning5 libqt5remoteobjects5-dev libqt5svg5-dev libqt5sensors5-dev libqt5dbus5 qtquickcontrols2-5-dev qtmultimedia5-dev qtpositioning5-dev qml-module-qtgraphicaleffects qml-module-qtquick2 qml-module-qtquick-layouts qml-module-qtquick-controls2 qml-module-qt-labs-settings
+sudo apt install git cmake clang curl wget libomp-dev zlib1g-dev libxml2-dev liblzma-dev libdbus-1-dev libssl-dev libgl1-mesa-dev libreadline-dev libpulse0 mesa-vulkan-drivers
 ```
 Or type the following on Fedora 40.
 ```
-sudo dnf install git cmake clang curl wget libomp-devel zlib-ng-compat-devel libxml2-devel dbus-devel readline-devel openssl-devel qt5-qtbase-devel qt5-qtremoteobjects-devel qt5-qtsensors-devel qt5-qtsvg-devel qt5-qtdeclarative-devel qt5-qtmultimedia-devel qt5-qtquickcontrols2-devel qt5-qtlocation-devel qt5-qtdeclarative qt5-qtbase qt5-qtsvg qt5-qtbase-gui qt5-qtgraphicaleffects qt5-qtremoteobjects qt5-qtsensors qt5-qtquickcontrols2 qt5-qtimageformats qt5-qtlocation qt5-qtmultimedia qt5-qttools qt5-qtxmlpatterns qt5-qtmultimedia-devel qt5-qtlocation-devel qt5-linguist qt5-qttranslations
+sudo dnf install git cmake clang curl wget libomp-devel zlib-ng-compat-devel libxml2-devel dbus-devel openssl-devel mesa-libGL-devel readline-devel pulseaudio-libs mesa-vulkan-drivers
 ```
+If your distribution doesn't provide the Qt-6.9 libraries, you have to install them using the Qt Online Installer.
 
 ## Build on Unix from source
 
@@ -45,14 +46,15 @@ cd osmin
 git submodule init
 git submodule update --force
 mkdir build
+export QT_ROOT=$HOME/Qt/6.9.0/gcc_64
 ```
-To build for desktop including the simulation tool, use the following command.
+To build arch x86_64 for desktop including the simulation tool, use the following command.
 ```
-cmake -B build -DBUILD_SIMULATOR=ON -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ .
+cmake -B build -DBUILD_SIMULATOR=ON -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_PREFIX_PATH=${QT_ROOT} -DCMAKE_FIND_ROOT_PATH=${QT_ROOT} .
 ```
 If the target device is a mobile, you should use the following command to **enable behaviors for mobile**.
 ```
-cmake -B build -DBUILD_DEVICE_MOBILE=ON -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ .
+cmake -B build -DBUILD_DEVICE_MOBILE=ON -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_PREFIX_PATH=${QT_ROOT} -DCMAKE_FIND_ROOT_PATH=${QT_ROOT} .
 ```
 You could mix the options `BUILD_SIMULATOR` and `BUILD_DEVICE_MOBILE` to test the behaviors for mobile device with the simulation tool.
 Finally build it to make the target binary `osmin`.