Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-25 04:02:50 +01:00
Code Issues Projects Releases Activity

Update to Qt 6.6.0

Browse Source
This commit is contained in:
Elias Steurer 2023-10-22 17:29:34 +02:00
parent 1441998435
commit fae6555f5a
10 changed files with 183 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@ -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"

46
CMakePresets.json
View File

@ -19,7 +19,7 @@
},
"environment": {
"qt_path": "${sourceDir}/../aqt",
"qt_version": "6.5.2"
"qt_version": "6.6.0"
},
"toolset": {
"value": "host=x64",
@ -38,36 +38,36 @@
}
},
{
"name": "windows-debug-qt-6.5.2",
"name": "windows-debug-qt-6.6.0",
"inherits": "default-windows",
"displayName": "MSVC SP Qt 6.5.2 Debug",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.2_MSVC_Debug",
"displayName": "MSVC SP Qt 6.6.0 Debug",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_MSVC_Debug",
"environment": {
"qt_version": "6.5.2"
"qt_version": "6.6.0"
},
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
}
},
{
"name": "windows-relwithdebinfo-qt-6.5.2",
"name": "windows-relwithdebinfo-qt-6.6.0",
"inherits": "default-windows",
"displayName": "MSVC SP Qt 6.5.2 RelWithDebInfo",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.2_MSVC_RelWithDebInfo",
"displayName": "MSVC SP Qt 6.6.0 RelWithDebInfo",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_MSVC_RelWithDebInfo",
"environment": {
"qt_version": "6.5.2"
"qt_version": "6.6.0"
},
"cacheVariables": {
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
}
},
{
"name": "windows-release-qt-6.5.2",
"name": "windows-release-qt-6.6.0",
"inherits": "default-windows",
"displayName": "MSVC SP Qt 6.5.2 Release",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.2_MSVC_Release",
"displayName": "MSVC SP Qt 6.6.0 Release",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_MSVC_Release",
"environment": {
"qt_version": "6.5.2"
"qt_version": "6.6.0"
},
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release"
@ -78,7 +78,7 @@
"displayName": "ScreenPlay 64bit Debug Linux",
"description": "Linux only!",
"generator": "Ninja",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.2_GCC_Debug",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_GCC_Debug",
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
@ -95,7 +95,7 @@
"CMAKE_CXX_COMPILER": "g++",
"CMAKE_C_COMPILER": "gcc",
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_PREFIX_PATH": "$env{qt_path}/6.5.2/gcc_64",
"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"
}
@ -104,7 +104,7 @@
"name": "linux-relwithdebinfo",
"displayName": "ScreenPlay 64bit RelWithDebInfo Linux",
"inherits": "linux-debug",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.2_GCC_RelWithDebInfo",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_GCC_RelWithDebInfo",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
}
@ -114,7 +114,7 @@
"displayName": "ScreenPlay 64bit Debug osx",
"description": "Osx only!",
"generator": "Ninja",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.2_Clang_Debug",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_Clang_Debug",
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
@ -129,7 +129,7 @@
"CMAKE_CXX_COMPILER": "clang++",
"CMAKE_C_COMPILER": "clang",
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_PREFIX_PATH": "$env{qt_path}/6.5.2/macos",
"CMAKE_PREFIX_PATH": "$env{qt_path}/6.6.0/macos",
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../vcpkg/scripts/buildsystems/vcpkg.cmake"
}
},
@ -137,7 +137,7 @@
"name": "osx-relwithdebinfo",
"displayName": "ScreenPlay 64bit RelWithDebInfo osx",
"inherits": "osx-debug",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.2_Clang_RelWithDebInfo",
"binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.6.0_Clang_RelWithDebInfo",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
}
@ -156,5 +156,13 @@
"name": "osx-debug",
"configurePreset": "osx-debug"
}
],
"testPresets": [
{
"name": "Test",
"description": "",
"displayName": "",
"configurePreset": "windows-release-qt-6.6.0"
}
]
}

8
ScreenPlay/qml/Installed/ScreenPlayItem.qml
View File

@ -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;
}

10
ScreenPlay/qml/Installed/Sidebar.qml
View File

@ -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"
@ -350,7 +350,7 @@ Item {
const item = App.installedListModel.get(root.contentFolderName);
const absoluteStoragePath = item.m_absoluteStoragePath;
const previewImage = item.m_preview;
if (JSUtil.isWallpaper(root.type)) {
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();

2
ScreenPlay/qml/Monitors/MonitorSelection.qml
View File

@ -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();

2
ScreenPlay/qml/Monitors/Monitors.qml
View File

@ -72,7 +72,7 @@ Util.Popup {
MonitorSelection {
id: monitorSelection
radius: 3
bgRadius: 3
height: 200
width: parent.width * 0.9
multipleMonitorsSelectable: false

1
ScreenPlayWallpaper/src/basewindow.cpp
View File

@ -35,7 +35,6 @@ BaseWindow::BaseWindow()
"VideoCodec",
"Error: only enums");
qmlRegisterType<BaseWindow>("ScreenPlay.Wallpaper", 1, 0, "Wallpaper");
setOSVersion(QSysInfo::productVersion());
}

4
Tools/build_godot.py
View File

@ -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

2
Tools/defines.py
View File

@ -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"

2
Tools/setup.py
View File

@ -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}")