1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-14 14:32:35 +02:00

Update Qt to 6.7 and vcpkg

This commit is contained in:
Elias Steurer 2024-04-02 17:38:08 +02:00
parent f9cafc891b
commit 2aedecb940
8 changed files with 14 additions and 24 deletions

View File

@ -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.6.1/gcc_64"
- cmake configure . -DCMAKE_PREFIX_PATH="./../../../aqt/6.7.0/gcc_64"
- make
- make install
- cd ..

2
.vscode/launch.json vendored
View File

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

View File

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

View File

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

View File

@ -36,23 +36,13 @@
"windows-base"
],
"cacheVariables": {
"CMAKE_PREFIX_PATH": "${sourceDir}/../aqt/6.6.1/msvc2019_64"
}
},
{
"name": "windows-base-qt",
"hidden": true,
"inherits": [
"windows-base"
],
"cacheVariables": {
"CMAKE_PREFIX_PATH": "C:/Qt/6.7.0/msvc2019_64"
"CMAKE_PREFIX_PATH": "${sourceDir}/../aqt/6.7.10/msvc2019_64"
}
},
{
"name": "windows-msvc-base",
"hidden": true,
"inherits": "windows-base-qt",
"inherits": "windows-base-aqt",
"cacheVariables": {
"CMAKE_C_COMPILER": "cl.exe",
"CMAKE_CXX_COMPILER": "cl.exe"
@ -121,4 +111,4 @@
]
}
]
}
}

View File

@ -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.6.1_MSVC_Debug/bin')
parser = argparse.ArgumentParser(description='Build K3000Map to the bin build folder: D:/Backup/Code/Qt/build_ScreenPlay_Qt_6.7.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')
@ -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.6.1_MSVC_Debug/bin/")
print("py build_godot.py --build_path D:/Backup/Code/Qt/build_ScreenPlay_Qt_6.7.0_MSVC_Debug/bin/")
exit()
# if build path exists and contains a index.html file, skip the build

View File

@ -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.6.1"
QT_VERSION = "6.7.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"
# 01.02.2024 https://github.com/microsoft/vcpkg :
VCPKG_VERSION = "10e0525"
# 01.04.2024 https://github.com/microsoft/vcpkg :
VCPKG_VERSION = "ce19164"
VCPKG_BASE_PACKAGES = [
"curl",
"openssl",

View File

@ -57,8 +57,8 @@ def download(aqt_path: Path, qt_platform: Path):
os = "linux"
qt_packages += "qt3d qtquick3d qtconnectivity qt5compat qtimageformats qtmultimedia qtshadertools qtwebchannel qtwebengine qtwebsockets qtwebview qtpositioning"
# Windows: python -m aqt list-qt windows desktop --modules 6.6.1 win64_msvc2019_64
# Linux: python3 -m aqt list-qt linux desktop --modules 6.6.1 gcc_64
# Windows: python -m aqt list-qt windows desktop --modules 6.7.0 win64_msvc2019_64
# Linux: python3 -m aqt list-qt linux desktop --modules 6.7.0 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}")