Update to Qt 6.6.0

2024-10-06 09:17:07 +02:00 · 2023-10-22 17:29:34 +02:00 · 2023-10-22 17:29:34 +02:00 · fae6555f5a
commit fae6555f5a
parent 1441998435
10 changed files with 183 additions and 176 deletions
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -17,7 +17,7 @@
            "environment": [
                {
                    "name": "Path",
-                    "value": "${env:Path};${workspaceFolder}\\..\\aqt\\6.5.2\\msvc2019_64\\bin\\;${workspaceFolder}\\..\\aqt\\6.5.2\\msvc2019_64\\modules\\;${workspaceFolder}\\..\\aqt\\6.5.2\\msvc2019_64\\qml\\;${workspaceFolder}\\..\\vcpkg\\installed\\x64-windows\\debug\\bin;"
+                    "value": "${env:Path};${workspaceFolder}\\..\\aqt\\6.6.0\\msvc2019_64\\bin\\;${workspaceFolder}\\..\\aqt\\6.6.0\\msvc2019_64\\modules\\;${workspaceFolder}\\..\\aqt\\6.6.0\\msvc2019_64\\qml\\;${workspaceFolder}\\..\\vcpkg\\installed\\x64-windows\\debug\\bin;"
                }
            ],
            "visualizerFile": "${workspaceFolder}/.vscode/qt.natvis.xml"
--- a/CMakePresets.json
+++ b/CMakePresets.json
@ -1,160 +1,168 @@
 {
-  "version": 5,
-  "cmakeMinimumRequired": {
-    "major": 3,
-    "minor": 23,
-    "patch": 0
-  },
-  "configurePresets": [
-    {
-      "name": "default-windows",
-      "displayName": "ScreenPlay 64bit Windows",
-      "description": "Windows only!",
-      "generator": "Ninja",
-      "hidden": true,
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Windows"
-      },
-      "environment": {
-        "qt_path": "${sourceDir}/../aqt",
-        "qt_version": "6.5.2"
-      },
-      "toolset": {
-        "value": "host=x64",
-        "strategy": "external"
-      },
-      "architecture": {
-        "value": "x64",
-        "strategy": "external"
-      },
-      "cacheVariables": {
-        "CMAKE_PREFIX_PATH": "$env{qt_path}/$env{qt_version}/msvc2019_64",
-        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../vcpkg/scripts/buildsystems/vcpkg.cmake",
-        "VCPKG_TARGET_TRIPLET": "x64-windows",
-        "CMAKE_C_COMPILER": "cl.exe",
-        "CMAKE_CXX_COMPILER": "cl.exe"
-      }
+    "version": 5,
+    "cmakeMinimumRequired": {
+        "major": 3,
+        "minor": 23,
+        "patch": 0
    },
-    {
-      "name": "windows-debug-qt-6.5.2",
-      "inherits": "default-windows",
-      "displayName": "MSVC SP Qt 6.5.2 Debug",
-      "binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.2_MSVC_Debug",
-      "environment": {
-        "qt_version": "6.5.2"
-      },
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug"
-      }
-    },
-    {
-      "name": "windows-relwithdebinfo-qt-6.5.2",
-      "inherits": "default-windows",
-      "displayName": "MSVC SP Qt 6.5.2 RelWithDebInfo",
-      "binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.2_MSVC_RelWithDebInfo",
-      "environment": {
-        "qt_version": "6.5.2"
-      },
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
-      }
-    },
-    {
-      "name": "windows-release-qt-6.5.2",
-      "inherits": "default-windows",
-      "displayName": "MSVC SP Qt 6.5.2 Release",
-      "binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.2_MSVC_Release",
-      "environment": {
-        "qt_version": "6.5.2"
-      },
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release"
-      }
-    },
-    {
-      "name": "linux-debug",
-      "displayName": "ScreenPlay 64bit Debug Linux",
-      "description": "Linux only!",
-      "generator": "Ninja",
-      "binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.2_GCC_Debug",
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Linux"
-      },
-      "environment": {
-        "qt_path": "${sourceDir}/../aqt"
-      },
-      "architecture": {
-        "value": "x64",
-        "strategy": "external"
-      },
-      "cacheVariables": {
-        "CMAKE_CXX_COMPILER": "g++",
-        "CMAKE_C_COMPILER": "gcc",
-        "CMAKE_BUILD_TYPE": "Debug",
-        "CMAKE_PREFIX_PATH": "$env{qt_path}/6.5.2/gcc_64",
-        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../vcpkg/scripts/buildsystems/vcpkg.cmake",
-        "VCPKG_TARGET_TRIPLET": "x64-linux"
-      }
-    },
-    {
-      "name": "linux-relwithdebinfo",
-      "displayName": "ScreenPlay 64bit RelWithDebInfo Linux",
-      "inherits": "linux-debug",
-      "binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.2_GCC_RelWithDebInfo",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
-      }
-    },
-    {
-      "name": "osx-debug",
-      "displayName": "ScreenPlay 64bit Debug osx",
-      "description": "Osx only!",
-      "generator": "Ninja",
-      "binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.2_Clang_Debug",
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Darwin"
-      },
-      "environment": {
-        "qt_path": "${sourceDir}/../aqt"
-      },
-      "cacheVariables": {
-        "VCPKG_OSX_ARCHITECTURES": "arm64;x86_64",
-        "VCPKG_TARGET_TRIPLET": "64-osx-universal",
-        "CMAKE_CXX_COMPILER": "clang++",
-        "CMAKE_C_COMPILER": "clang",
-        "CMAKE_BUILD_TYPE": "Debug",
-        "CMAKE_PREFIX_PATH": "$env{qt_path}/6.5.2/macos",
-        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../vcpkg/scripts/buildsystems/vcpkg.cmake"
-      }
-    },
-    {
-      "name": "osx-relwithdebinfo",
-      "displayName": "ScreenPlay 64bit RelWithDebInfo osx",
-      "inherits": "osx-debug",
-      "binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.2_Clang_RelWithDebInfo",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
-      }
-    }
-  ],
-  "buildPresets": [
-    {
-      "name": "linux-debug",
-      "configurePreset": "linux-debug"
-    },
-    {
-      "name": "default-windows",
-      "configurePreset": "default-windows"
-    },
-    {
-      "name": "osx-debug",
-      "configurePreset": "osx-debug"
-    }
-  ]
-}
+    "configurePresets": [
+        {
+            "name": "default-windows",
+            "displayName": "ScreenPlay 64bit Windows",
+            "description": "Windows only!",
+            "generator": "Ninja",
+            "hidden": true,
+            "condition": {
+                "type": "equals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Windows"
+            },
+            "environment": {
+                "qt_path": "${sourceDir}/../aqt",
+                "qt_version": "6.6.0"
+            },
+            "toolset": {
+                "value": "host=x64",
+                "strategy": "external"
+            },
+            "architecture": {
+                "value": "x64",
+                "strategy": "external"
+            },
+            "cacheVariables": {
+                "CMAKE_PREFIX_PATH": "$env{qt_path}/$env{qt_version}/msvc2019_64",
+                "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../vcpkg/scripts/buildsystems/vcpkg.cmake",
+                "VCPKG_TARGET_TRIPLET": "x64-windows",
+                "CMAKE_C_COMPILER": "cl.exe",
+                "CMAKE_CXX_COMPILER": "cl.exe"
+            }
+        },
+        {
+            "name": "windows-debug-qt-6.6.0",
+            "inherits": "default-windows",
+            "displayName": "MSVC SP Qt 6.6.0 Debug",
+            "binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_MSVC_Debug",
+            "environment": {
+                "qt_version": "6.6.0"
+            },
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug"
+            }
+        },
+        {
+            "name": "windows-relwithdebinfo-qt-6.6.0",
+            "inherits": "default-windows",
+            "displayName": "MSVC SP Qt 6.6.0 RelWithDebInfo",
+            "binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_MSVC_RelWithDebInfo",
+            "environment": {
+                "qt_version": "6.6.0"
+            },
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+            }
+        },
+        {
+            "name": "windows-release-qt-6.6.0",
+            "inherits": "default-windows",
+            "displayName": "MSVC SP Qt 6.6.0 Release",
+            "binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_MSVC_Release",
+            "environment": {
+                "qt_version": "6.6.0"
+            },
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release"
+            }
+        },
+        {
+            "name": "linux-debug",
+            "displayName": "ScreenPlay 64bit Debug Linux",
+            "description": "Linux only!",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_GCC_Debug",
+            "condition": {
+                "type": "equals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Linux"
+            },
+            "environment": {
+                "qt_path": "${sourceDir}/../aqt"
+            },
+            "architecture": {
+                "value": "x64",
+                "strategy": "external"
+            },
+            "cacheVariables": {
+                "CMAKE_CXX_COMPILER": "g++",
+                "CMAKE_C_COMPILER": "gcc",
+                "CMAKE_BUILD_TYPE": "Debug",
+                "CMAKE_PREFIX_PATH": "$env{qt_path}/6.6.0/gcc_64",
+                "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../vcpkg/scripts/buildsystems/vcpkg.cmake",
+                "VCPKG_TARGET_TRIPLET": "x64-linux"
+            }
+        },
+        {
+            "name": "linux-relwithdebinfo",
+            "displayName": "ScreenPlay 64bit RelWithDebInfo Linux",
+            "inherits": "linux-debug",
+            "binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_GCC_RelWithDebInfo",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+            }
+        },
+        {
+            "name": "osx-debug",
+            "displayName": "ScreenPlay 64bit Debug osx",
+            "description": "Osx only!",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_Clang_Debug",
+            "condition": {
+                "type": "equals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Darwin"
+            },
+            "environment": {
+                "qt_path": "${sourceDir}/../aqt"
+            },
+            "cacheVariables": {
+                "VCPKG_OSX_ARCHITECTURES": "arm64;x86_64",
+                "VCPKG_TARGET_TRIPLET": "64-osx-universal",
+                "CMAKE_CXX_COMPILER": "clang++",
+                "CMAKE_C_COMPILER": "clang",
+                "CMAKE_BUILD_TYPE": "Debug",
+                "CMAKE_PREFIX_PATH": "$env{qt_path}/6.6.0/macos",
+                "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../vcpkg/scripts/buildsystems/vcpkg.cmake"
+            }
+        },
+        {
+            "name": "osx-relwithdebinfo",
+            "displayName": "ScreenPlay 64bit RelWithDebInfo osx",
+            "inherits": "osx-debug",
+            "binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_Clang_RelWithDebInfo",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+            }
+        }
+    ],
+    "buildPresets": [
+        {
+            "name": "linux-debug",
+            "configurePreset": "linux-debug"
+        },
+        {
+            "name": "default-windows",
+            "configurePreset": "default-windows"
+        },
+        {
+            "name": "osx-debug",
+            "configurePreset": "osx-debug"
+        }
+    ],
+    "testPresets": [
+        {
+            "name": "Test",
+            "description": "",
+            "displayName": "",
+            "configurePreset": "windows-release-qt-6.6.0"
+        }
+    ]
+}
--- a/ScreenPlay/qml/Installed/ScreenPlayItem.qml
+++ b/ScreenPlay/qml/Installed/ScreenPlayItem.qml
@ -5,7 +5,7 @@ import QtQuick.Controls.Material
 import ScreenPlayApp
 import ScreenPlay
 import ScreenPlay.Enums.InstalledType
-import ScreenPlayUtil
+import ScreenPlayUtil as Util

 Item {
    id: root
@ -25,15 +25,15 @@ Item {
    width: 320
    height: 180
    onTypeChanged: {
-        if (JSUtil.isWidget(type)) {
+        if (Util.JSUtil.isWidget(type)) {
            icnType.source = "qrc:/qml/ScreenPlayApp/assets/icons/icon_widgets.svg";
            return;
        }
-        if (JSUtil.isScene(type)) {
+        if (Util.JSUtil.isScene(type)) {
            icnType.source = "qrc:/qml/ScreenPlayApp/assets/icons/icon_code.svg";
            return;
        }
-        if (JSUtil.isVideo(type)) {
+        if (Util.JSUtil.isVideo(type)) {
            icnType.source = "qrc:/qml/ScreenPlayApp/assets/icons/icon_movie.svg";
            return;
        }
--- a/ScreenPlay/qml/Installed/Sidebar.qml
+++ b/ScreenPlay/qml/Installed/Sidebar.qml
@ -51,7 +51,7 @@ Item {
        } else {
            imagePreview.source = previewImageFilePath;
        }
-        if (JSUtil.isWidget(root.type) || (monitorSelection.activeMonitors.length > 0)) {
+        if (Util.JSUtil.isWidget(root.type) || (monitorSelection.activeMonitors.length > 0)) {
            btnLaunchContent.enabled = true;
            return;
        }
@ -68,7 +68,7 @@ Item {
            }
            root.contentFolderName = folderName;
            root.type = type;
-            if (JSUtil.isWallpaper(root.type)) {
+            if (Util.JSUtil.isWallpaper(root.type)) {
                if (type === InstalledType.VideoWallpaper)
                    root.state = "activeWallpaper";
                else
@ -340,7 +340,7 @@ Item {
            Button {
                id: btnLaunchContent
                objectName: "btnLaunchContent"
-                enabled: JSUtil.isWidget(root.type) ? true : monitorSelection.isSelected
+                enabled: Util.JSUtil.isWidget(root.type) ? true : monitorSelection.isSelected
                Material.background: Material.accent
                Material.foreground: "white"
                icon.source: "qrc:/qml/ScreenPlayApp/assets/icons/icon_plus.svg"
@ -349,8 +349,8 @@ Item {
                onClicked: {
                    const item = App.installedListModel.get(root.contentFolderName);
                    const absoluteStoragePath = item.m_absoluteStoragePath;
-                    const previewImage =item.m_preview;
-                    if (JSUtil.isWallpaper(root.type)) {
+                    const previewImage = item.m_preview;
+                    if (Util.JSUtil.isWallpaper(root.type)) {
                        let activeMonitors = monitorSelection.getActiveMonitors();
                        // TODO Alert user to choose a monitor
                        if (activeMonitors.length === 0)
@ -363,7 +363,7 @@ Item {
                        const screenFile = item.m_file;
                        let success = App.screenPlayManager.createWallpaper(root.type, cbVideoFillMode.currentValue, absoluteStoragePath, previewImage, screenFile, activeMonitors, volume, 1, {}, true);
                    }
-                    if (JSUtil.isWidget(root.type))
+                    if (Util.JSUtil.isWidget(root.type))
                        App.screenPlayManager.createWidget(type, Qt.point(0, 0), absoluteStoragePath, previewImage, {}, true);
                    root.state = "inactive";
                    monitorSelection.reset();
--- a/ScreenPlay/qml/Monitors/MonitorSelection.qml
+++ b/ScreenPlay/qml/Monitors/MonitorSelection.qml
@ -17,7 +17,7 @@ Rectangle {
    // We preselect the main monitor
    property var activeMonitors: []
    property alias background: root.color
-    property alias radius: root.radius
+    property alias bgRadius: root.radius

    Component.onCompleted: {
        resize();
--- a/ScreenPlay/qml/Monitors/Monitors.qml
+++ b/ScreenPlay/qml/Monitors/Monitors.qml
@ -72,7 +72,7 @@ Util.Popup {
            MonitorSelection {
                id: monitorSelection

-                radius: 3
+                bgRadius: 3
                height: 200
                width: parent.width * 0.9
                multipleMonitorsSelectable: false
--- a/ScreenPlayWallpaper/src/basewindow.cpp
+++ b/ScreenPlayWallpaper/src/basewindow.cpp
@ -35,7 +35,6 @@ BaseWindow::BaseWindow()
        "VideoCodec",
        "Error: only enums");

-    qmlRegisterType<BaseWindow>("ScreenPlay.Wallpaper", 1, 0, "Wallpaper");

    setOSVersion(QSysInfo::productVersion());
 }
--- a/Tools/build_godot.py
+++ b/Tools/build_godot.py
@ -11,7 +11,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.5.2_MSVC_Debug/bin')
+    parser = argparse.ArgumentParser(description='Build K3000Map to the bin build folder: D:/Backup/Code/Qt/build_ScreenPlay_Qt_6.6.0_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')
 
@ -19,7 +19,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.5.2_MSVC_Debug/bin/")
+        print("py build_godot.py --build_path D:/Backup/Code/Qt/build_ScreenPlay_Qt_6.6.0_MSVC_Debug/bin/")
        exit()

    # if build path exists and contains a index.html file, skip the build
--- a/Tools/defines.py
+++ b/Tools/defines.py
@ -20,7 +20,7 @@ elif sys.platform == "linux":

 QT_PATH = path = Path(os.path.join(
    os.path.realpath(__file__), "../../../aqt")).resolve()
-QT_VERSION = "6.5.2"
+QT_VERSION = "6.6.0"
 QT_BIN_PATH = QT_PATH.joinpath(f"{QT_VERSION}/{QT_PLATFORM}/bin")
 QT_TOOLS_PATH = QT_PATH.joinpath("Tools/")
 QT_IFW_VERSION = "4.6"
--- a/Tools/setup.py
+++ b/Tools/setup.py
@ -53,7 +53,7 @@ def download(aqt_path: Path, qt_platform: Path):
    elif system() == "Linux":
        os = "linux"

-    #  python -m aqt list-qt windows desktop --modules 6.5.2 win64_msvc2019_64
+    #  python -m aqt list-qt windows desktop --modules 6.6.0 win64_msvc2019_64
    qt_packages = "qt3d qtquick3d qtconnectivity qt5compat qtimageformats qtmultimedia qtshadertools qtwebchannel qtwebengine qtwebsockets qtwebview qtpositioning"
    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}")