Update dependencies

6.7.2 is no longer available to download

.gitlab/ci/base_jobs.yml

@@ -35,7 +35,7 @@
     - cd ..
     - git clone https://invent.kde.org/plasma/layer-shell-qt.git
     - cd layer-shell-qt
-    - cmake configure . -DCMAKE_PREFIX_PATH="./../../../aqt/6.7.2/gcc_64"
+    - cmake configure . -DCMAKE_PREFIX_PATH="./../../../aqt/6.7.3/gcc_64"
     - make
     - make install
     - cd ..

.vscode/launch.json

@@ -17,7 +17,7 @@
             "environment": [
                 {
                     "name": "Path",
-                    "value": "${env:Path};${workspaceFolder}\\..\\aqt\\6.7.2\\msvc2019_64\\bin\\;${workspaceFolder}\\..\\aqt\\6.7.2\\msvc2019_64\\modules\\;${workspaceFolder}\\..\\aqt\\6.7.2\\msvc2019_64\\qml\\;${workspaceFolder}\\..\\vcpkg\\installed\\x64-windows\\debug\\bin;"
+                    "value": "${env:Path};${workspaceFolder}\\..\\aqt\\6.7.3\\msvc2019_64\\bin\\;${workspaceFolder}\\..\\aqt\\6.7.3\\msvc2019_64\\modules\\;${workspaceFolder}\\..\\aqt\\6.7.3\\msvc2019_64\\qml\\;${workspaceFolder}\\..\\vcpkg\\installed\\x64-windows\\debug\\bin;"
                 }
             ],
             "visualizerFile": "${workspaceFolder}/.vscode/qt.natvis.xml"

CMake/Platform/Common/CMakePresets.json

@@ -12,6 +12,7 @@
             "hidden": true,
             "cacheVariables": {
                 "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../vcpkg/scripts/buildsystems/vcpkg.cmake",
+                "QT_QML_GENERATE_QMLLS_INI": "ON",
                 "QCORO_BUILD_EXAMPLES": "OFF",
                 "BUILD_TESTING": "OFF"
             }
@@ -21,6 +22,7 @@
             "description": "Specifies build type for single-configuration generators: debug",
             "hidden": true,
             "cacheVariables": {
+                "QT_QML_DEBUG": "ON",
                 "CMAKE_BUILD_TYPE": {
                     "type": "STRING",
                     "value": "Debug"
@@ -32,6 +34,7 @@
             "description": "Specifies build type for single-configuration generators: RelWithDebInfo",
             "hidden": true,
             "cacheVariables": {
+                "QT_QML_DEBUG": "ON",
                 "CMAKE_BUILD_TYPE": {
                     "type": "STRING",
                     "value": "RelWithDebInfo"
@@ -43,6 +46,7 @@
             "description": "Specifies build type for single-configuration generators: release",
             "hidden": true,
             "cacheVariables": {
+                "QT_QML_DEBUG": "OFF",
                 "CMAKE_BUILD_TYPE": {
                     "type": "STRING",
                     "value": "Release"
@@ -54,6 +58,7 @@
             "description": "Specifies build type for single-configuration generators: profile",
             "hidden": true,
             "cacheVariables": {
+                "QT_QML_DEBUG": "OFF",
                 "CMAKE_BUILD_TYPE": {
                     "type": "STRING",
                     "value": "Profile"
@@ -167,4 +172,4 @@
             }
         }
     ]
-}
+}

CMake/Platform/Linux/CMakePresets.json

@@ -18,7 +18,7 @@
                 "host-linux"
             ],
             "cacheVariables": {
-                "CMAKE_PREFIX_PATH": "${sourceDir}/../aqt/6.7.2/gcc_64",
+                "CMAKE_PREFIX_PATH": "${sourceDir}/../aqt/6.7.3/gcc_64",
                 "VCPKG_TARGET_TRIPLET": "x64-linux"
             }
         },

CMake/Platform/Mac/CMakePresets.json

@@ -18,7 +18,7 @@
                 "host-mac"
             ],
             "cacheVariables": {
-                "CMAKE_PREFIX_PATH": "${sourceDir}/../aqt/6.7.2/macos",
+                "CMAKE_PREFIX_PATH": "${sourceDir}/../aqt/6.7.3/macos",
                 "VCPKG_OSX_ARCHITECTURES": "arm64;x86_64",
                 "VCPKG_TARGET_TRIPLET": "64-osx-universal"
             }

CMake/Platform/Windows/CMakePresets.json

@@ -36,7 +36,7 @@
                 "windows-base"
             ],
             "cacheVariables": {
-                "CMAKE_PREFIX_PATH": "${sourceDir}/../aqt/6.7.2/msvc2019_64"
+                "CMAKE_PREFIX_PATH": "${sourceDir}/../aqt/6.7.3/msvc2019_64"
             }
         },
         {

Tools/build_godot.py

@@ -12,7 +12,7 @@ import argparse
 def main():
     # Parse build folder as arugment
 
-    parser = argparse.ArgumentParser(description='Build K3000Map to the bin build folder: D:/Backup/Code/Qt/build_ScreenPlay_Qt_6.7.2_MSVC_Debug/bin')
+    parser = argparse.ArgumentParser(description='Build K3000Map to the bin build folder: D:/Backup/Code/Qt/build_ScreenPlay_Qt_6.7.3_MSVC_Debug/bin')
     parser.add_argument('--build_path', dest="build_path", type=str,  help='Build folder')
     parser.add_argument('--skip_if_exists', dest="skip_if_exists", default=False, action="store_true",   help='Skips the build if the index.html file exists. This is used for faster CMake configure')
  
@@ -20,7 +20,7 @@ def main():
 
     if not args.build_path:
         print("ERROR: Please specify the build folder")
-        print("py build_godot.py --build_path D:/Backup/Code/Qt/build_ScreenPlay_Qt_6.7.2_MSVC_Debug/bin/")
+        print("py build_godot.py --build_path D:/Backup/Code/Qt/build_ScreenPlay_Qt_6.7.3_MSVC_Debug/bin/")
         exit()
 
     # if build path exists and contains a index.html file, skip the build

Tools/defines.py

@@ -21,12 +21,12 @@ elif sys.platform == "linux":
 REPO_PATH =  Path(__file__, "../../").resolve()
 THIRDPATH_PATH =  Path(REPO_PATH, "ThirdParty").resolve()
 QT_PATH = path = Path(REPO_PATH, "../aqt").resolve()
-QT_VERSION = "6.7.2"
+QT_VERSION = "6.7.3"
 QT_BIN_PATH = QT_PATH.joinpath(f"{QT_VERSION}/{QT_PLATFORM}/bin")
 QT_TOOLS_PATH = QT_PATH.joinpath("Tools/")
-QT_IFW_VERSION = "4.6"
+QT_IFW_VERSION = "4.8.1"
-# 04.07.2024 https://github.com/microsoft/vcpkg :
+# 25.10.2024 https://github.com/microsoft/vcpkg :
-VCPKG_VERSION = "0dab813"
+VCPKG_VERSION = "cff6ed4"
 VCPKG_BASE_PACKAGES =  [
         "curl",
         "openssl",
@@ -35,11 +35,11 @@ VCPKG_BASE_PACKAGES =  [
         "catch2"
     ]
 PYTHON_EXECUTABLE = "python" if sys.platform == "win32" else "python3"
-FFMPEG_VERSION_MAC = "6.1.1"
+FFMPEG_VERSION_MAC = "7.1"
-FFMPEG_VERSION_WIN = "7.0"
+FFMPEG_VERSION_WIN = "7.1"
-# None stable version omit patch: 4.3-rc1
+# None stable version omit patch: 4.3-rc2 or stable
 GODOT_VERSION = "4.3"
-GODOT_RELEASE_TYPE = "rc1"
+GODOT_RELEASE_TYPE = "stable"
 GODOT_DOWNLOAD_SERVER = "https://github.com/godotengine/godot-builds/releases/download"
 if sys.platform == "win32":
     SCREENPLAYWALLPAPER_GODOT_EXECUTABLE = "ScreenPlayWallpaperGodot.exe"

Tools/setup.py

@@ -58,8 +58,8 @@ def download(aqt_path: Path, qt_platform: Path):
 
     qt_packages += "qt3d qtquick3d qtconnectivity qt5compat qtimageformats qtmultimedia qtshadertools qtwebchannel qtwebengine qtwebsockets qtwebview qtpositioning "
     qt_packages += "debug_info"
-    # Windows: python -m aqt list-qt windows desktop --modules 6.7.2 win64_msvc2019_64
+    # Windows: python -m aqt list-qt windows desktop --modules 6.7.3 win64_msvc2019_64
-    # Linux: python3 -m aqt list-qt linux  desktop --modules 6.7.2 gcc_64
+    # Linux: python3 -m aqt list-qt linux  desktop --modules 6.7.3 gcc_64
     print(f"Downloading: {qt_packages} to {aqt_path}")
     execute(f"{defines.PYTHON_EXECUTABLE} -m aqt install-qt -O  {aqt_path} {os} desktop {defines.QT_VERSION} {qt_platform} -m {qt_packages}")