Merge pull request #4584 from nextcloud/feature/qt6

Migrate to Qt 6

.drone.yml

@@ -1,19 +1,19 @@
 ---
 kind: pipeline
-name: qt-5.15
+name: drone desktop client
 
 steps:
 - name: cmake
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-15
+  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-2
   volumes:
     - name: build
       path: /drone/build
   commands:
     - cd /drone/build
-    - cmake -G Ninja -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_BUILD_TYPE=Debug -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DADD_E2E_TESTS=ON -DECM_ENABLE_SANITIZERS=address -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64 ../src
+    - cmake -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt6.6.3 -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_BUILD_TYPE=Debug -DQT_MAJOR_VERSION=6 -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DADD_E2E_TESTS=ON -DECM_ENABLE_SANITIZERS=address -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64 ../src
 
 - name: compile
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-15
+  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-2
   volumes:
     - name: build
       path: /drone/build
@@ -22,7 +22,7 @@ steps:
     - ninja
 
 - name: test
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-15
+  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-2
   volumes:
     - name: build
       path: /drone/build
@@ -79,23 +79,23 @@ name: qt-5.15-clang
 
 steps:
 - name: cmake
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-15
+  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-2
   volumes:
     - name: build
       path: /drone/build
   commands:
     - cd /drone/build
-    - cmake -G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang-14 -DCMAKE_CXX_COMPILER=clang++-14 -DCMAKE_BUILD_TYPE=Debug -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DADD_E2E_TESTS=ON -DECM_ENABLE_SANITIZERS=address -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64 ../src
+    - cmake -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt6.6.3 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang-14 -DCMAKE_CXX_COMPILER=clang++-14 -DCMAKE_BUILD_TYPE=Debug -DQT_MAJOR_VERSION=6 -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DADD_E2E_TESTS=ON -DECM_ENABLE_SANITIZERS=address -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64 ../src
 - name: compile
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-15
+  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-2
   volumes:
     - name: build
       path: /drone/build
   commands:
     - cd /drone/build
     - ninja
 - name: test
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-15
+  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-2
   volumes:
     - name: build
       path: /drone/build
@@ -152,7 +152,7 @@ name: AppImage
 
 steps:
 - name: build
-  image: ghcr.io/nextcloud/continuous-integration-client-appimage:client-appimage-10
+  image: ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-6.6.3-2
   environment:
     CI_UPLOAD_GIT_TOKEN:
       from_secret: CI_UPLOAD_GIT_TOKEN
@@ -206,6 +206,6 @@ trigger:
     - push
 ---
 kind: signature
-hmac: 52e9470231175367dbb83f5aa33659332e977546cf1a9db3d942401778f53d68
+hmac: 418915bcd7a880be3656a8c09aef0f6e7b3721d13f196838f8c5a9de6020f786
 
 ...

.github/workflows/linux-clang-compile-tests.yml

@@ -6,7 +6,7 @@ jobs:
   build:
     name: Linux Clang compilation and tests
     runs-on: ubuntu-latest
-    container: ghcr.io/nextcloud/continuous-integration-client:client-5.15-15
+    container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-2
     steps:
       - uses: actions/checkout@v4
         with:
@@ -15,7 +15,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -G Ninja -DCMAKE_C_COMPILER=clang-14 -DCMAKE_CXX_COMPILER=clang++-14 -DCMAKE_BUILD_TYPE=Debug -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64
+          cmake .. -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt6.6.3 -DCMAKE_C_COMPILER=clang-14 -DCMAKE_CXX_COMPILER=clang++-14 -DCMAKE_BUILD_TYPE=Debug -DQT_MAJOR_VERSION=6 -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64
           ninja
       - name: Run tests
         run: |

.github/workflows/linux-gcc-compile-tests.yml

@@ -6,7 +6,7 @@ jobs:
   build:
     name: Linux GCC compilation and tests
     runs-on: ubuntu-latest
-    container: ghcr.io/nextcloud/continuous-integration-client:client-5.15-15
+    container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-2
     steps:
       - uses: actions/checkout@v4
         with:
@@ -15,7 +15,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -G Ninja -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_BUILD_TYPE=Debug -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64
+          cmake .. -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt6.6.3 -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_BUILD_TYPE=Debug -DQT_MAJOR_VERSION=6 -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64
           ninja
       - name: Run tests
         run: |

.github/workflows/sonarcloud.yml

@@ -6,7 +6,7 @@ jobs:
   build:
     name: SonarCloud analysis
     runs-on: ubuntu-latest
-    container: ghcr.io/nextcloud/continuous-integration-client:client-5.15-15
+    container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-2
     env:
       SONAR_SERVER_URL: "https://sonarcloud.io"
       BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
@@ -25,7 +25,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -G Ninja -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_BUILD_TYPE=Debug -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64 -DBUILD_COVERAGE=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+          cmake .. -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt6.6.3 -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_BUILD_TYPE=Debug -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DQT_MAJOR_VERSION=6 -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64 -DBUILD_COVERAGE=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
           build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} ninja
       - name: Run tests
         run: |

CMakeLists.txt

@@ -23,6 +23,9 @@ set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
 include(${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake)
 
+set(QT_VERSION_MAJOR "6")
+set(REQUIRED_QT_VERSION "6.0.0")
+
 # CfAPI Shell Extensions
 set( CFAPI_SHELL_EXTENSIONS_LIB_NAME CfApiShellExtensions )
 
@@ -108,7 +111,8 @@ include(GetGitRevisionDescription)
 get_git_head_revision(GIT_REFSPEC GIT_SHA1)
 
 add_definitions(
-    -DQT_DISABLE_DEPRECATED_BEFORE=0x000000
+    -DQT_DISABLE_DEPRECATED_BEFORE=0x051200
+    -DQT_DEPRECATED_WARNINGS
     -DQT_USE_QSTRINGBUILDER
     -DQT_MESSAGELOGCONTEXT #enable function name and line number in debug output
 )
@@ -138,7 +142,7 @@ if(APPLE AND BUILD_OWNCLOUD_OSX_BUNDLE)
     add_definitions(-DBUILD_OWNCLOUD_OSX_BUNDLE)
 endif()
 
-
+find_package(Qt${QT_MAJOR_VERSION} COMPONENTS Core)
 option(QUICK_COMPILER "Use QtQuick compiler to improve performance" OFF)
 
 # this option removes Http authentication, keychain, shibboleth etc and is intended for

VERSION.cmake

@@ -37,3 +37,5 @@ set( MIRALL_VERSION_STRING "${MIRALL_VERSION}${MIRALL_VERSION_SUFFIX}" )
 if( MIRALL_VERSION_BUILD )
     set( MIRALL_VERSION_STRING "${MIRALL_VERSION_STRING} (build ${MIRALL_VERSION_BUILD})" )
 endif( MIRALL_VERSION_BUILD )
+
+set(QT_MAJOR_VERSION 6)

admin/linux/build-appimage.sh

@@ -2,17 +2,12 @@
 
 set -xe
 
-export APPNAME=${APPNAME:-nextcloud}
+export APPNAME=${APPNAME:-Nextcloud}
+export EXECUTABLE_NAME=${EXECUTABLE_NAME:-nextcloud}
 export BUILD_UPDATER=${BUILD_UPDATER:-OFF}
 export BUILDNR=${BUILDNR:-0000}
 export DESKTOP_CLIENT_ROOT=${DESKTOP_CLIENT_ROOT:-/home/user}
 
-#Set Qt-5.15
-export QT_BASE_DIR=/opt/kdeqt5.15
-
-export QTDIR=$QT_BASE_DIR
-export PATH=$QT_BASE_DIR/bin:$PATH
-
 # Set defaults
 export SUFFIX=${DRONE_PULL_REQUEST:=master}
 if [ $SUFFIX != "master" ]; then
@@ -29,12 +24,14 @@ mkdir build-client
 cd build-client
 cmake \
     -G Ninja \
-    -D CMAKE_INSTALL_PREFIX=/usr \
-    -D BUILD_TESTING=OFF \
-    -D BUILD_UPDATER=$BUILD_UPDATER \
-    -D MIRALL_VERSION_BUILD=$BUILDNR \
-    -D MIRALL_VERSION_SUFFIX="$VERSION_SUFFIX" \
-    -D CMAKE_UNITY_BUILD=ON \
+    -DCMAKE_PREFIX_PATH=/opt/qt6.6.3 \
+    -DOPENSSL_ROOT_DIR=/usr/local/lib64 \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_TESTING=OFF \
+    -DBUILD_UPDATER=$BUILD_UPDATER \
+    -DMIRALL_VERSION_BUILD=$BUILDNR \
+    -DMIRALL_VERSION_SUFFIX="$VERSION_SUFFIX" \
+    -DCMAKE_UNITY_BUILD=ON \
     ${DESKTOP_CLIENT_ROOT}
 cmake --build . --target all
 DESTDIR=/app cmake --install .
@@ -64,48 +61,37 @@ rm -rf etc
 
 # com.nextcloud.desktopclient.nextcloud.desktop
 DESKTOP_FILE=$(ls /app/usr/share/applications/*.desktop)
-sed -i -e 's|Icon=nextcloud|Icon=Nextcloud|g' ${DESKTOP_FILE} # Bug in desktop file?
-cp ./usr/share/icons/hicolor/512x512/apps/*.png . # Workaround for linuxeployqt bug, FIXME
-
-# Because distros need to get their shit together
-cp -R /usr/lib/x86_64-linux-gnu/libssl.so* ./usr/lib/
-cp -R /usr/lib/x86_64-linux-gnu/libcrypto.so* ./usr/lib/
-cp -P /usr/local/lib*/libssl.so* ./usr/lib/
-cp -P /usr/local/lib*/libcrypto.so* ./usr/lib/
-cp -P /usr/local/lib*/libsqlite*.so* ./usr/lib/
-
-# NSS fun
-cp -P -r /usr/lib/x86_64-linux-gnu/nss ./usr/lib/
-
-# Use linuxdeployqt to deploy
-LINUXDEPLOYQT_VERSION="continuous"
-wget -O linuxdeployqt.AppImage --ca-directory=/etc/ssl/certs -c "https://github.com/probonopd/linuxdeployqt/releases/download/${LINUXDEPLOYQT_VERSION}/linuxdeployqt-continuous-x86_64.AppImage"
-chmod a+x linuxdeployqt.AppImage
-./linuxdeployqt.AppImage --appimage-extract
-rm ./linuxdeployqt.AppImage
-cp -r ./squashfs-root ./linuxdeployqt-squashfs-root
-unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib/x86_64-linux-gnu
-./squashfs-root/AppRun ${DESKTOP_FILE} -bundle-non-qt-libs -qmldir=${DESKTOP_CLIENT_ROOT}/src/gui
-
-# Set origin
-./squashfs-root/usr/bin/patchelf --set-rpath '$ORIGIN/' /app/usr/lib/lib*sync.so.0
-
-# Build AppImage
-./squashfs-root/AppRun ${DESKTOP_FILE} -appimage -updateinformation="gh-releases-zsync|nextcloud-releases|desktop|latest|Nextcloud-*-x86_64.AppImage.zsync"
-
-# Workaround issue #103
-rm -rf ./squashfs-root
-APPIMAGE=$(ls *.AppImage)
-"./${APPIMAGE}" --appimage-extract
-rm "./${APPIMAGE}"
-rm ./squashfs-root/usr/lib/libglib-2.0.so.0
-rm ./squashfs-root/usr/lib/libgobject-2.0.so.0
-PATH=./linuxdeployqt-squashfs-root/usr/bin:$PATH appimagetool -n ./squashfs-root "$APPIMAGE"
+
+# Use linuxdeploy to deploy
+export APPIMAGE_NAME=linuxdeploy-x86_64.AppImage
+wget -O ${APPIMAGE_NAME} --ca-directory=/etc/ssl/certs -c "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
+chmod a+x ${APPIMAGE_NAME}
+./${APPIMAGE_NAME} --appimage-extract
+rm ./${APPIMAGE_NAME}
+cp -r ./squashfs-root ./linuxdeploy-squashfs-root
+
+export LD_LIBRARY_PATH=/app/usr/lib:/opt/qt6.6.3/lib:/usr/local/lib/x86_64-linux-gnu:/usr/local/lib:/usr/local/lib64
+./linuxdeploy-squashfs-root/AppRun --desktop-file=${DESKTOP_FILE} --icon-file=usr/share/icons/hicolor/512x512/apps/${APPNAME}.png --executable=usr/bin/${EXECUTABLE_NAME} --appdir=AppDir
+
+# Use linuxdeploy-plugin-qt to deploy qt dependencies
+export APPIMAGE_NAME=linuxdeploy-plugin-qt-x86_64.AppImage
+wget -O ${APPIMAGE_NAME} --ca-directory=/etc/ssl/certs -c "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage"
+chmod a+x ${APPIMAGE_NAME}
+./${APPIMAGE_NAME} --appimage-extract
+rm ./${APPIMAGE_NAME}
+cp -r ./squashfs-root ./linuxdeploy-plugin-qt-squashfs-root
+
+export PATH=/opt/qt6.6.3/bin:${PATH}
+export QML_SOURCES_PATHS=${DESKTOP_CLIENT_ROOT}/src/gui
+./linuxdeploy-plugin-qt-squashfs-root/AppRun --appdir=AppDir
+
+./linuxdeploy-squashfs-root/AppRun --desktop-file=${DESKTOP_FILE} --icon-file=usr/share/icons/hicolor/512x512/apps/${APPNAME}.png --executable=usr/bin/${EXECUTABLE_NAME} --appdir=AppDir --output appimage
 
 #move AppImage
 if [ ! -z "$DRONE_COMMIT" ]
 then
-    mv *.AppImage ${APPNAME}-${SUFFIX}-${DRONE_COMMIT}-x86_64.AppImage
+    mv *.AppImage ${EXECUTABLE_NAME}-${SUFFIX}-${DRONE_COMMIT}-x86_64.AppImage
+else
+    mv *.AppImage ${EXECUTABLE_NAME}-${SUFFIX}-x86_64.AppImage
 fi
 mv *.AppImage ${DESKTOP_CLIENT_ROOT}/

admin/osx/CMakeLists.txt

@@ -9,7 +9,7 @@ else()
   set(MAC_INSTALLER_DO_CUSTOM_BACKGROUND "0")
 endif()
 
-find_package(Qt5 5.15 COMPONENTS Core REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} ${REQUIRED_QT_VERSION} COMPONENTS Core REQUIRED)
 configure_file(create_mac.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
 configure_file(macosx.pkgproj.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
 configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh)

shell_integration/libcloudproviders/CMakeLists.txt

@@ -25,8 +25,13 @@ macro(libcloudproviders_add_config _sources)
 endmacro(libcloudproviders_add_config _sources)
 
 
-find_package(Qt5 5.15 COMPONENTS DBus)
-IF (Qt5DBus_FOUND)
+if (Qt6_FOUND)
+    find_package(Qt6 COMPONENTS COMPONENTS DBus)
+else()
+    set(REQUIRED_QT_VERSION "5.15.0")
+    find_package(Qt5 ${REQUIRED_QT_VERSION} COMPONENTS DBus)
+endif()
+IF (Qt5DBus_FOUND OR Qt6DBus_FOUND)
     STRING(TOLOWER "${APPLICATION_VENDOR}" DBUS_VENDOR)
     STRING(REGEX REPLACE "[^A-z0-9]" "" DBUS_VENDOR "${DBUS_VENDOR}")
     STRING(REGEX REPLACE "[^A-z0-9]" "" DBUS_APPLICATION_NAME "${APPLICATION_SHORTNAME}")