Bump Qt version to 6.6.1

Vertexwahn · Jan 12, 2024 · 690f590 · 690f590
1 parent 2df923d
commit 690f590
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 8 deletions.
diff --git a/docs/prebuild_qt_versions.md b/docs/prebuild_qt_versions.md
@@ -9,9 +9,16 @@ This document explains how the archive of the prebuilt version is generated.
 *Powershell*
 
 ```shell
-python3 -m pip install aqtinstall
-aqt list-qt windows desktop --arch 6.4.0
-aqt install-qt windows desktop 6.4.0 win64_msvc2019_64 -m all
+mkdir Qt
+cd Qt
+pip install -U pip
+pip install aqtinstall
+# List available architectures
+aqt list-qt windows desktop --arch 6.6.1
+# Install qt with all modules
+aqt install-qt windows desktop 6.6.1 win64_msvc2019_64 -m all
+# does not work sicne Compress-Archive does not support archives > 2GB
+#Compress-Archive -Path "6.6.1" -DestinationPath qt_6.6.1_windows_desktop_win64_msvc2019_64.zip
 ```
 
 *Bash using Ubuntu to prepare Qt for Windows build*

diff --git a/fetch_qt.bzl b/fetch_qt.bzl
@@ -9,10 +9,10 @@ def fetch_qt6():
     http_archive(
         name = "qt_windows_x86_64",
         urls = [
-            "https://vertexwahn.de/lfs/v1/qt_6.4.0_windows_desktop_win64_msvc2019_64.zip",
+             "https://vertexwahn.de/lfs/v1/qt_6.6.1_windows_desktop_win64_msvc2019_64.zip",,
         ],
-        sha256 = "e3c20b441ddd8bb803e46de32bf2fc5563fda125409d62dcd12b5647ae5a9c7e",
-        strip_prefix = "6.4.0/msvc2019_64",
+        sha256 = "88d0d3632d89970a8db69558b83b37d84686bb46820d77407d812a503b889e7f",
+        strip_prefix = "6.6.1/msvc2019_64",
         build_file = "@rules_qt//:qt_windows_x86_64.BUILD",
     )
 
@@ -27,7 +27,7 @@ def fetch_qt6():
         urls = [
             "https://vertexwahn.de/lfs/v1/qt_6.6.1_linux_desktop_gcc_64.tar.xz",
         ],
-        sha256 = "e782dcd5e6778088d03c1dedecccaca8df5d60a54efbdca121a5f969a88638f0",
+        sha256 = "661b82ba85836f1289a21bc48021a62da1586b59f8527b5928e55d555d9e42ef",
         strip_prefix = "6.6.1/gcc_64",
         build_file = "@rules_qt//:qt_linux_x86_64.BUILD",
     )

diff --git a/qt_libraries.bzl b/qt_libraries.bzl
@@ -107,6 +107,7 @@ QT_LIBRARIES = [
     ("quick_widgets", "QtQuickWidgets", "Qt6QuickWidgets", [":qt_quick", ":qt_qml", ":qt_widgets", ":qt_opengl", ":qt_gui", ":qt_core"]),
     ("quick_3d", "QtQuick3D", "Qt6Quick3D", [":qt_quick_3d_runtime_render", ":qt_quick", ":qt_qml_models", ":qt_qml", ":qt_quick_3d_utils", ":qt_gui", ":qt_core"]),
     ("quick_sensors", "QtSensorsQuick", "Qt6SensorsQuick", [":qt_sensors", ":qt_qml", ":qt_core"]),
+    ("quick_web_channel", "QtWebChannelQuick", "Qt6WebChannelQuick", [":qt_quick", ":qt_qml", ":qt_web_view", ":qt_gui", ":qt_core"]), # not sure if this is correct
     ("quick_web_view", "QtWebViewQuick", "Qt6WebViewQuick", [":qt_quick", ":qt_qml", ":qt_web_view", ":qt_gui", ":qt_core"]),
     ("3d_quick", "Qt3DQuick", "Qt63DQuick", [":qt_3d_core", ":qt_quick", ":qt_gui", ":qt_qml_models", ":qt_qml", ":qt_core"]),
     ("3d_quick_anomation", "Qt3DQuickAnimation", "Qt63DQuickAnimation", [":qt_3d_animation", ":qt_qml", ":qt_3d_core", ":qt_core"]),

diff --git a/tests/Spotify/spotifyapi.cpp b/tests/Spotify/spotifyapi.cpp
@@ -11,7 +11,7 @@ SpotifyAPI::SpotifyAPI(QObject *parent): QObject(parent), m_isAuthenticated(fals
 
     m_oauth2.setReplyHandler(new QOAuthHttpServerReplyHandler(8000, this));
 
-    connect(&m_oauth2, &QOAuth2AuthorizationCodeFlow::statusChanged, [=](QAbstractOAuth::Status status) {
+    connect(&m_oauth2, &QOAuth2AuthorizationCodeFlow::statusChanged, [=, this](QAbstractOAuth::Status status) {
         if (status == QAbstractOAuth::Status::Granted) {
             setAuthenticated(true);
         } else {

diff --git a/tests/hello_world/README.md b/tests/hello_world/README.md
@@ -0,0 +1,28 @@
+# How to run?
+
+## Ubuntu
+
+
+*Run Hello World demo with Ubuntu 20.04:*
+
+```shell
+bazel run --config=gcc9 //hello_world:hello_world
+```
+
+*Run Hello World demo with Ubuntu 22.04:*
+
+```shell
+bazel run --config=gcc11 //hello_world:hello_world
+```
+
+## Windows
+
+```shell
+bazel run --config=vs2019 //hello_world:hello_world
+```
+
+*Run Hello World demo with Windows 10/11 x64 with Visual Studio 2022:*
+
+```shell
+bazel run --config=vs2022 //hello_world:hello_world
+```