Update to Qt 6.7.2 (#7)

Author: karliss

.github/workflows/package-build.yml

@@ -24,15 +24,13 @@ jobs:
         ]
         include:
           - name: linux-x86_64
-            os: ubuntu-latest
-            container:
-              image: ubuntu:18.04
+            os: ubuntu-20.04
             arch: x86_64
           - name: macos-x86_64
-            os: macos-11
+            os: macos-12
             arch: x86_64
           - name: macos-arm64
-            os: macos-11
+            os: macos-14
             arch: arm64
           - name: windows-x86_64
             os: windows-2019
@@ -51,13 +49,25 @@ jobs:
       if: contains(matrix.os, 'macos')
       run: |
         xcode-select --print-path
-        make ARCH=${{ matrix.arch }}
+        make ARCH=${{ matrix.arch }} BUILD_THREADS=1
         echo UPLOAD_FILE=cutter-deps-qt-macos-${{ matrix.arch }}.tar.gz >> $GITHUB_ENV
         echo UPLOAD_ASSET_TYPE=application/gzip >> $GITHUB_ENV
-    - name: build linux
+    - name: build linux outputs
       if: contains(matrix.os, 'ubuntu')
       run: |
-        sudo apt-get install libxcb1-dev libxkbcommon-dev libxkbcommon-x11-dev libgtk-3-dev libgl1-mesa-dev libglu1-mesa-dev libxcb-*-dev
+        sudo apt-get update
+        sudo apt-get install \
+          libxcb1-dev \
+          libxkbcommon-dev \
+          libxkbcommon-x11-dev \
+          libgtk-3-dev \
+          libgl1-mesa-dev \
+          libglu1-mesa-dev \
+          libxcb-*-dev \
+          libclang-12-dev \
+          llvm-12
+        apt list --installed
+        sudo apt remove llvm-10 clang-10
         make ARCH=${{ matrix.arch }}
         echo UPLOAD_FILE=cutter-deps-qt-linux-${{ matrix.arch }}.tar.gz >> $GITHUB_ENV
         echo UPLOAD_ASSET_TYPE=application/gzip >> $GITHUB_ENV

Makefile

@@ -24,22 +24,22 @@ endif
 #BASE_URL=http://www.mirrorservice.org/sites/download.qt-project.org
 BASE_URL=https://download.qt.io
 
+QT_VER_FULL=6.7.2
+QT_VER_SHORT=6.7
 ifeq (${PLATFORM},win)
-QT_SRC_FILE=qt-everywhere-opensource-src-5.15.5.zip
-QT_SRC_MD5=7f4ec67f41635ba338f505f09b68fe02
-QT_SRC_URL=${BASE_URL}/official_releases/qt/5.15/5.15.5/single/qt-everywhere-opensource-src-5.15.5.zip
+QT_SRC_FILE=qt-everywhere-src-${QT_VER_FULL}.zip
+QT_SRC_MD5=69c87bb306ab78b988fb69819c32f3de
+QT_SRC_URL=${BASE_URL}/official_releases/qt/${QT_VER_SHORT}/${QT_VER_FULL}/single/${QT_SRC_FILE}
 else
-QT_SRC_FILE=qt-everywhere-opensource-src-5.15.5.tar.xz
-QT_SRC_MD5=0fbcde36556a366df8ecf24a7ea1f7ec
-QT_SRC_URL=${BASE_URL}/official_releases/qt/5.15/5.15.5/single/qt-everywhere-opensource-src-5.15.5.tar.xz
+QT_SRC_FILE=qt-everywhere-src-${QT_VER_FULL}.tar.xz
+QT_SRC_MD5=06d35b47349c7c0a45710daad359e07b
+QT_SRC_URL=${BASE_URL}/official_releases/qt/${QT_VER_SHORT}/${QT_VER_FULL}/single/${QT_SRC_FILE}
 endif
 
-QT_SRC_DIR=qt-everywhere-src-5.15.5
+QT_SRC_DIR=qt-everywhere-src-${QT_VER_FULL}
 QT_BUILD_DIR=${QT_SRC_DIR}/build
 QT_PREFIX=${ROOT_DIR}/qt
 
-JOM_URL=https://download.qt.io/official_releases/jom/jom.zip
-
 ifeq (${PLATFORM},linux)
 PLATFORM_QT_CONFIGURE=configure
 #-ccache
@@ -123,23 +123,8 @@ define download_extract
 	$(call extract,$2)
 endef
 
-ifeq (${PLATFORM},win)
-PLATFORM_QT_DEPS=jom
-PLATFORM_CLEAN_DEPS=clean-jom
-
-jom:
-	mkdir -p jom
-	curl -fL "${JOM_URL}" -o jom/jom.zip
-	cd jom && 7z x jom.zip
-
-.PHONY: clean-jom
-clean-jom:
-	rm -rf jom
-
-else
 PLATFORM_QT_DEPS=
 PLATFORM_CLEAN_DEPS=
-endif
 
 .PHONY: clean
 clean: clean-qt ${PLATFORM_CLEAN_DEPS}
@@ -155,9 +140,6 @@ ${QT_SRC_DIR}:
 	@echo ""
 	$(call download_extract,${QT_SRC_URL},${QT_SRC_FILE},${QT_SRC_MD5})
 	# Add patches here if required
-	patch ${QT_SRC_DIR}/qtbase/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h qiosurfacegraphicsbuffer.h.patch
-	# https://github.com/macports/macports-ports/blob/d2a7c094acba41c84dbe792480f6a1b32371d5e7/aqua/qt5/Portfile#L1057-L1059
-	cd ${QT_SRC_DIR}/qtbase && patch -p0 < ../../patch-qmake-dont-hard-code-x86_64-as-the-architecture-when-using-qmake.diff
 
 .PHONY: src
 src: ${QT_SRC_DIR}
@@ -169,6 +151,7 @@ qt: ${QT_SRC_DIR} ${PLATFORM_QT_DEPS}
 	@echo "#########################"
 	@echo ""
 
+	# -nomake tools 
 	mkdir -p "${QT_BUILD_DIR}"
 	cd "${QT_BUILD_DIR}" && \
 		../${PLATFORM_QT_CONFIGURE} \
@@ -185,47 +168,52 @@ qt: ${QT_SRC_DIR} ${PLATFORM_QT_DEPS}
 			-no-sql-oci \
 			-no-sql-odbc \
 			-no-sql-psql \
-			-no-sql-sqlite2 \
 			-no-sql-sqlite \
-			-no-sql-tds \
+			-no-feature-assistant \
+			-no-feature-designer \
 			-nomake tests \
 			-nomake examples \
-			-nomake tools \
-			-skip qtwebengine \
 			-skip qt3d \
-			-skip qtcanvas3d \
+			-skip qtactiveqt \
 			-skip qtcharts \
+			-skip qtcoap \
 			-skip qtconnectivity \
+			-skip qtdatavis3d \
 			-skip qtdeclarative \
 			-skip qtdoc \
-			-skip qtscript \
-			-skip qtdatavis3d \
-			-skip qtgamepad \
+			-skip qtgraphs \
+			-skip qtgrpc \
+			-skip qthttpserver \
+			-skip qtlanguageserver \
 			-skip qtlocation \
-			-skip qtgraphicaleffects \
+			-skip qtlottie \
+			-skip qtmqtt \
 			-skip qtmultimedia \
-			-skip qtpurchasing \
+			-skip qtnetworkauth \
+			-skip qtopcua \
+			-skip qtpositioning \
+			-skip qtquick3d \
+			-skip qtquick3dphysics \
+			-skip qtquickeffectmaker \
+			-skip qtquicktimeline \
+			-skip qtremoteobjects \
 			-skip qtscxml \
 			-skip qtsensors \
 			-skip qtserialbus \
 			-skip qtserialport \
+			-skip qtshadertools \
 			-skip qtspeech \
 			-skip qttranslations \
 			-skip qtvirtualkeyboard \
-			-skip qtwebglplugin \
+			-skip qtwebchannel \
+			-skip qtwebengine \
 			-skip qtwebsockets \
 			-skip qtwebview \
-			-skip qtquickcontrols \
-			-skip qtquickcontrols2 \
+			-DCMAKE_WrapClang_FOUND=false \
 			${PLATFORM_QT_OPTIONS}
 
-ifeq (${PLATFORM},win)
-	cd "${QT_BUILD_DIR}" && "${ROOT_DIR}/jom/jom.exe" -J ${BUILD_THREADS}
-	cd "${QT_BUILD_DIR}" && "${ROOT_DIR}/jom/jom.exe" install
-else
-	cd "${QT_BUILD_DIR}" && make -j${BUILD_THREADS} | awk "NR%10==1" # Travis doesn't like too much and too little output
-	cd "${QT_BUILD_DIR}" && make install
-endif
+	cmake --build "${QT_BUILD_DIR}" -j ${BUILD_THREADS} 
+	cmake --install "${QT_BUILD_DIR}"
 
 ifeq (${PLATFORM},macos)
 	cd "${QT_PREFIX}/include" && \

build_windows.ps1

@@ -68,25 +68,19 @@ function DownloadAndCheckFile() {
 
 SetupVsEnv
 
-$version_base = "5.15"
-$version_full = "5.15.2"
+$version_base = "6.7"
+$version_full = "6.7.2"
 #$url = "https://download.qt.io/official_releases/qt/$version_base/$version_full/single/qt-everywhere-src-$version_full.zip"
 $url = "http://master.qt.io/archive/qt/$version_base/$version_full/single/qt-everywhere-src-$version_full.zip"
 $output = "qt-everywhere-src-$version_full.zip"
-$hash_expected = "6c5d37aa96f937eb59fd4e9ce5ec97f45fbf2b5de138b086bdeff782ec661733"
+$hash_expected = "e71c1f1b453b2b5a34173307d2ba9d35d3383e9727fbc34dc7eef189f351bca5"
 $QT_SRC_DIR = "qt-everywhere-src-$version_full"
 $qt_build_dir = "$QT_SRC_DIR/build"
 $QT_PREFIX = "$PSScriptRoot/qt"
 $BUILD_THREADS = 3
 $PACKAGE_FILE = "cutter-deps-qt-win-x86_64.tar.gz"
 
 
-# https://download.qt.io/official_releases/jom/jom.zip
-$jom_url = "http://master.qt.io/official_releases/jom/jom_1_1_3.zip"
-$jom_archive = "jom.zip"
-$jom_hash = "128fdd846fe24f8594eed37d1d8929a0ea78df563537c0c1b1861a635013fff8"
-
-
 DownloadAndCheckFile $url $output $hash_expected
 
 Write-Output "File hash correct"
@@ -126,31 +120,23 @@ if (-not $?) {
     Fatal-Error "Failed to extract source"
 }
 
-DownloadAndCheckFile $jom_url $jom_archive $jom_hash
-
-Write-Output "Extracting jom"
-7z.exe x -bt -aos -bsp1 -ojom "$jom_archive"
-if (-not $?) {
-    Fatal-Error "Failed to extract jom"
-}
-
 Write-Output "Building Qt"
 New-Item -Path . -Name $qt_build_dir -ItemType Directory
 Write-Output "build dir '$qt_build_dir'"
 Set-Location -Path $qt_build_dir
 Write-Output "Current dir"
 Get-Location
-cmd /c "..\configure.bat -prefix `"${QT_PREFIX}`" -opensource -confirm-license  -release  -qt-libpng  -qt-libjpeg  -schannel  -no-feature-cups  -no-feature-icu  -no-sql-db2  -no-sql-ibase  -no-sql-mysql  -no-sql-oci  -no-sql-odbc  -no-sql-psql  -no-sql-sqlite2  -no-sql-sqlite  -no-sql-tds  -nomake tests  -nomake examples  -nomake tools  -skip qtwebengine  -skip qt3d  -skip qtcanvas3d  -skip qtcharts  -skip qtconnectivity  -skip qtdeclarative  -skip qtdoc  -skip qtscript  -skip qtdatavis3d  -skip qtgamepad  -skip qtlocation  -skip qtgraphicaleffects  -skip qtmultimedia  -skip qtpurchasing  -skip qtscxml  -skip qtsensors  -skip qtserialbus  -skip qtserialport  -skip qtspeech  -skip qtvirtualkeyboard  -skip qtwebglplugin  -skip qtwebsockets  -skip qtwebview  -skip qtquickcontrols  -skip qtquickcontrols2  -skip qtwayland -skip qtmacextras -skip qtx11extras 2>&1"
+cmd /c "..\configure.bat -prefix `"${QT_PREFIX}`" -opensource -confirm-license -release -qt-libpng -qt-libjpeg -no-feature-cups -no-feature-icu -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-feature-assistant -no-feature-clang -no-feature-designer -nomake tests -nomake examples -skip qt3d -skip qtactiveqt -skip qtcharts -skip qtcoap -skip qtconnectivity -skip qtdatavis3d -skip qtdeclarative -skip qtdoc -skip qtgrpc -skip qtgraphs -skip qthttpserver -skip qtlanguageserver -skip qtlocation -skip qtlottie -skip qtmqtt -skip qtmultimedia -skip qtnetworkauth -skip qtopcua -skip qtpositioning -skip qtquick3d -skip qtquick3dphysics -skip qtquickeffectmaker -skip qtquicktimeline -skip qtremoteobjects -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtshadertools -skip qtspeech -skip qttranslations -skip qtvirtualkeyboard -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip qtwayland -skip qtmacextras -skip qtx11extras 2>&1"
 if (-not $?) {
      Fatal-Error "Failed to configure qt"
 }
 
 Write-Output "Running jom"
-cmd /c "`"$PSScriptRoot/jom/jom.exe`" -J $BUILD_THREADS 2>&1"
+cmd /c "cmake --build . --parallel"
 if (-not $?) {
     Fatal-Error "Qt compilation failed"
 }
-cmd /c "`"$PSScriptRoot/jom/jom.exe`" install 2>&1"
+cmd /c "cmake --install ."
 if (-not $?) {
     Fatal-Error "Qt file installation failed"
 }