update to qt 6.5.0

README.md

@@ -44,7 +44,7 @@ Then, prefix this to `%PATH%` in your current shell.
 
 For example:
 ```
-set PATH=%LOCALAPPDATA%\Programs\Python\Python310;%PATH%
+set PATH=%LOCALAPPDATA%\Programs\Python\Python311;%PATH%
 ```
 
 ## License

examples/dolphin-arm64.yml

@@ -1,5 +1,5 @@
-release: 6.3.0
-host_path: ..\dist\dolphin.x64_6.3.0
+release: 6.5.0
+host_path: ..\dist\dolphin.x64_6.5.0
 platform: win32-arm64-msvc
 name: dolphin.arm64
 
@@ -10,7 +10,7 @@ compiler:
     vcvarsall: x64_arm64
 
 configure:
-    additional_parameters: -c++std c++20 -debug-and-release -force-debug-info -ltcg -no-opengl -no-pch
+    additional_parameters: -c++std c++2b -debug-and-release -force-debug-info -ltcg -no-opengl -no-pch
     nomake:
         - examples
         - tests
@@ -24,6 +24,10 @@ configure:
         - qtdatavis3d
         - qtdeclarative
         - qtdoc
+        - qtgrpc
+        - qthttpserver
+        - qtlanguageserver
+        - qtlocation
         - qtlottie
         - qtmqtt
         - qtmultimedia
@@ -31,6 +35,8 @@ configure:
         - qtopcua
         - qtpositioning
         - qtquick3d
+        - qtquick3dphysics
+        - qtquickeffectmaker
         - qtquicktimeline
         - qtremoteobjects
         - qtscxml
@@ -38,6 +44,7 @@ configure:
         - qtserialbus
         - qtserialport
         - qtshadertools
+        - qtspeech
         - qtsvg
         - qttools
         - qttranslations

examples/dolphin-x64.yml

@@ -1,4 +1,4 @@
-release: 6.3.0
+release: 6.5.0
 platform: win32-msvc
 name: dolphin.x64
 
@@ -9,7 +9,7 @@ compiler:
     vcvarsall: x64
 
 configure:
-    additional_parameters: -c++std c++20 -debug-and-release -force-debug-info -ltcg -no-opengl -no-pch
+    additional_parameters: -c++std c++2b -debug-and-release -force-debug-info -ltcg -no-opengl -no-pch
     nomake:
         - examples
         - tests
@@ -23,6 +23,10 @@ configure:
         - qtdatavis3d
         - qtdeclarative
         - qtdoc
+        - qtgrpc
+        - qthttpserver
+        - qtlanguageserver
+        - qtlocation
         - qtlottie
         - qtmqtt
         - qtmultimedia
@@ -30,6 +34,8 @@ configure:
         - qtopcua
         - qtpositioning
         - qtquick3d
+        - qtquick3dphysics
+        - qtquickeffectmaker
         - qtquicktimeline
         - qtremoteobjects
         - qtscxml
@@ -37,6 +43,7 @@ configure:
         - qtserialbus
         - qtserialport
         - qtshadertools
+        - qtspeech
         - qtsvg
         - qttools
         - qttranslations

gzip_timestamp.diff

@@ -0,0 +1,14 @@
+diff --git a/QtCompressMimeDatabase.cmake.orig b/QtCompressMimeDatabase.cmake
+index 718d330..d6fc4be 100644
+--- a/QtCompressMimeDatabase.cmake.orig
++++ b/QtCompressMimeDatabase.cmake
+@@ -134,6 +134,9 @@ endif()
+ 
+ string(REGEX MATCHALL "([a-f0-9][a-f0-9])" qmime_db_hex "${qmime_db_data}")
+ 
++list(REMOVE_AT qmime_db_hex 4 5 6 7)
++list(INSERT qmime_db_hex 4 "00" "00" "00" "00")
++
+ list(TRANSFORM qmime_db_hex PREPEND "0x")
+ math(EXPR qmime_db_data_size "${qmime_db_data_size} - 1")
+ foreach(index RANGE 0 ${qmime_db_data_size} 12)

gzip_timestamp.patch

@@ -1,6 +0,0 @@
-Left base folder: E:\qsc\archives\qt-everywhere-src-6.3.0
-Right base folder: E:\qsc\qt-everywhere-src-6.3.0
-diff -r qtbase\src\corelib\CMakeLists.txt qtbase\src\corelib\CMakeLists.txt
-1241a1242,1243
->             list(REMOVE_AT qmime_db_hex 4 5 6 7)
->             list(INSERT qmime_db_hex 4 "00" "00" "00" "00")

qsc/__main__.py

@@ -142,4 +142,10 @@ if __name__ == "__main__":
     # Post process output
     postprocess_dir(output_path, config.get("postprocess", {}))
 
+    # Bit of a hack: Qt cmake files rely on mkspec dirs being present
+    # even though the contents aren't really used. Ensure they exist.
+    # see lib\cmake\Qt6\QtBuild.cmake
+    if compiler.get("name") == "visual_studio":
+        os.makedirs(os.path.join(output_path, "mkspecs/win32-msvc"), exist_ok=True)
+
     print("Done. Result in {}".format(output_path))

qsc/data/winbuild.bat

@@ -26,6 +26,7 @@ IF "%USE_VS%"=="1" (
 
 
 :configure
+rem TODO find a way to shove in /pathmap:%VCToolsInstallDir%=v:\
 set DETERMINISM_COMPILE="/experimental:deterministic"
 rem incremental:no only really needed for debug target, which defaults it on
 set DETERMINISM_LINK="/experimental:deterministic /INCREMENTAL:NO"