From 5256d7424052054e1620ed069cf842f711cd9bdb Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 17 Apr 2024 23:40:45 +0200 Subject: [PATCH 1/3] Qt 6.7.0 Also fix new stylesheet issue: windows11 style is now default. This currently breaks custom stylesheets. Use windowsvista style as default --- .cirrus.yml | 4 ++-- BUILDING.md | 8 ++++---- azure-pipelines.yml | 6 +++--- rpcs3/rpcs3qt/gui_application.cpp | 11 ++++++++++- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index f37682774a..affb260f4a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -7,7 +7,7 @@ env: BUILD_SOURCEBRANCHNAME: $CIRRUS_BRANCH RPCS3_TOKEN: ENCRYPTED[!a4c3850e29ab150692286a74bec29819d25971a7ec431b86de2a35f7ed90c5b2ab3c93469f9298e30924d843599110e9!] QT_VER_MAIN: '6' - QT_VER: '6.6.3' + QT_VER: '6.7.0' # windows_task: # matrix: @@ -21,7 +21,7 @@ env: # COMPILER: msvc # BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}\artifacts\ # QT_VER_MSVC: 'msvc2019' -# QT_DATE: '202403191840' +# QT_DATE: '202403252230' # QTDIR: C:\Qt\${QT_VER}\${QT_VER_MSVC}_64 # VULKAN_VER: '1.3.268.0' # VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5' diff --git a/BUILDING.md b/BUILDING.md index 70ecae48f7..9d70db14f3 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -9,11 +9,11 @@ Other instructions may be found [here](https://wiki.rpcs3.net/index.php?title=Bu * [CMake 3.28.0+](https://www.cmake.org/download/) (add to PATH) * [Python 3.6+](https://www.python.org/downloads/) (add to PATH) -* [Qt 6.6.3](https://www.qt.io/download-qt-installer) +* [Qt 6.7.0](https://www.qt.io/download-qt-installer) * [Visual Studio 2022](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community) (or at least Visual Studio 2019 16.11.xx+ as C++20 is not included in previous versions) * [Vulkan SDK 1.3.268.0](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/windows/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.268.0. -**Either add the** `QTDIR` **environment variable, e.g.** `\6.6.3\msvc2019_64\` **, or use the [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2019)** +**Either add the** `QTDIR` **environment variable, e.g.** `\6.7.0\msvc2019_64\` **, or use the [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2019)** **NOTE: If you have issues with the Qt plugin, you may want to uninstall the Qt Plugin and install the [Legacy Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.LEGACYQtVisualStudioTools2019) instead.** @@ -23,7 +23,7 @@ These are the essentials tools to build RPCS3 on Linux. Some of them can be inst * Clang 12+ or GCC 11+ * [CMake 3.28.0+](https://www.cmake.org/download/) -* [Qt 6.6.3](https://www.qt.io/download-qt-installer) +* [Qt 6.7.0](https://www.qt.io/download-qt-installer) * [Vulkan SDK 1.3.268.0](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.268.0. * [SDL2](https://github.com/libsdl-org/SDL/releases) (for the FAudio backend) @@ -98,7 +98,7 @@ git submodule update --init #### Configuring the Qt plugin (if used) 1) Go to `Extensions->Qt VS Tools->Qt Versions`. -2) Add the path to your Qt installation with compiler e.g. `\6.6.3\msvc2019_64`, version will fill in automatically. +2) Add the path to your Qt installation with compiler e.g. `\6.7.0\msvc2019_64`, version will fill in automatically. 3) Go to `Extensions->Qt VS Tools->Options->Legacy Project Format`. (Only available in the legacy Qt plugin) 4) Set `Build: Run pre-build setup` to `true`. (Only available in the legacy Qt plugin) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2b1526a515..c36e28f140 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -69,9 +69,9 @@ jobs: variables: COMPILER: msvc QT_VER_MAIN: '6' - QT_VER: '6.6.3' + QT_VER: '6.7.0' QT_VER_MSVC: 'msvc2019' - QT_DATE: '202403191840' + QT_DATE: '202403252230' QTDIR: C:\Qt\$(QT_VER)\$(QT_VER_MSVC)_64 VULKAN_VER: '1.3.268.0' VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5' @@ -132,7 +132,7 @@ jobs: UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-mac" RELEASE_MESSAGE: "../GitHubReleaseMessage.txt" ARTDIR: $(Build.ArtifactStagingDirectory) - QT_VER: '6.6.3' + QT_VER: '6.7.0' QT_VER_MAIN: '6' pool: diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3qt/gui_application.cpp index 0373cfd451..3ee9e51024 100644 --- a/rpcs3/rpcs3qt/gui_application.cpp +++ b/rpcs3/rpcs3qt/gui_application.cpp @@ -889,8 +889,17 @@ void gui_application::OnChangeStyleSheetRequest() // Determine default style if (m_default_style.isEmpty()) { +#ifdef _WIN32 + // On windows, the custom stylesheets don't seem to work properly unless we use the windowsvista style as default + if (QStyleFactory::keys().contains("windowsvista")) + { + m_default_style = "windowsvista"; + gui_log.notice("Using '%s' as default style", m_default_style); + } +#endif + // Use the initial style as default style - if (const QStyle* style = QApplication::style()) + if (const QStyle* style = m_default_style.isEmpty() ? QApplication::style() : nullptr) { m_default_style = style->name(); gui_log.notice("Determined '%s' as default style", m_default_style); From a24ef68fba91305b4e26f71c03bdbdee035aa398 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 20 May 2024 11:14:10 +0200 Subject: [PATCH 2/3] Qt 6.7.1 --- .cirrus.yml | 4 ++-- BUILDING.md | 8 ++++---- azure-pipelines.yml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index affb260f4a..7c03cd5949 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -7,7 +7,7 @@ env: BUILD_SOURCEBRANCHNAME: $CIRRUS_BRANCH RPCS3_TOKEN: ENCRYPTED[!a4c3850e29ab150692286a74bec29819d25971a7ec431b86de2a35f7ed90c5b2ab3c93469f9298e30924d843599110e9!] QT_VER_MAIN: '6' - QT_VER: '6.7.0' + QT_VER: '6.7.1' # windows_task: # matrix: @@ -21,7 +21,7 @@ env: # COMPILER: msvc # BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}\artifacts\ # QT_VER_MSVC: 'msvc2019' -# QT_DATE: '202403252230' +# QT_DATE: '202405161205' # QTDIR: C:\Qt\${QT_VER}\${QT_VER_MSVC}_64 # VULKAN_VER: '1.3.268.0' # VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5' diff --git a/BUILDING.md b/BUILDING.md index 9d70db14f3..48f2612a3a 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -9,11 +9,11 @@ Other instructions may be found [here](https://wiki.rpcs3.net/index.php?title=Bu * [CMake 3.28.0+](https://www.cmake.org/download/) (add to PATH) * [Python 3.6+](https://www.python.org/downloads/) (add to PATH) -* [Qt 6.7.0](https://www.qt.io/download-qt-installer) +* [Qt 6.7.1](https://www.qt.io/download-qt-installer) * [Visual Studio 2022](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community) (or at least Visual Studio 2019 16.11.xx+ as C++20 is not included in previous versions) * [Vulkan SDK 1.3.268.0](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/windows/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.268.0. -**Either add the** `QTDIR` **environment variable, e.g.** `\6.7.0\msvc2019_64\` **, or use the [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2019)** +**Either add the** `QTDIR` **environment variable, e.g.** `\6.7.1\msvc2019_64\` **, or use the [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2019)** **NOTE: If you have issues with the Qt plugin, you may want to uninstall the Qt Plugin and install the [Legacy Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.LEGACYQtVisualStudioTools2019) instead.** @@ -23,7 +23,7 @@ These are the essentials tools to build RPCS3 on Linux. Some of them can be inst * Clang 12+ or GCC 11+ * [CMake 3.28.0+](https://www.cmake.org/download/) -* [Qt 6.7.0](https://www.qt.io/download-qt-installer) +* [Qt 6.7.1](https://www.qt.io/download-qt-installer) * [Vulkan SDK 1.3.268.0](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.268.0. * [SDL2](https://github.com/libsdl-org/SDL/releases) (for the FAudio backend) @@ -98,7 +98,7 @@ git submodule update --init #### Configuring the Qt plugin (if used) 1) Go to `Extensions->Qt VS Tools->Qt Versions`. -2) Add the path to your Qt installation with compiler e.g. `\6.7.0\msvc2019_64`, version will fill in automatically. +2) Add the path to your Qt installation with compiler e.g. `\6.7.1\msvc2019_64`, version will fill in automatically. 3) Go to `Extensions->Qt VS Tools->Options->Legacy Project Format`. (Only available in the legacy Qt plugin) 4) Set `Build: Run pre-build setup` to `true`. (Only available in the legacy Qt plugin) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c36e28f140..f3c07000cb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -69,9 +69,9 @@ jobs: variables: COMPILER: msvc QT_VER_MAIN: '6' - QT_VER: '6.7.0' + QT_VER: '6.7.1' QT_VER_MSVC: 'msvc2019' - QT_DATE: '202403252230' + QT_DATE: '202405161205' QTDIR: C:\Qt\$(QT_VER)\$(QT_VER_MSVC)_64 VULKAN_VER: '1.3.268.0' VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5' @@ -132,7 +132,7 @@ jobs: UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-mac" RELEASE_MESSAGE: "../GitHubReleaseMessage.txt" ARTDIR: $(Build.ArtifactStagingDirectory) - QT_VER: '6.7.0' + QT_VER: '6.7.1' QT_VER_MAIN: '6' pool: From c3c1ed1589bfc8e8787e2962896a8800d19f9fa5 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sun, 23 Jun 2024 07:40:18 +0200 Subject: [PATCH 3/3] Qt 6.7.2 --- .cirrus.yml | 4 ++-- BUILDING.md | 8 ++++---- azure-pipelines.yml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 7c03cd5949..0ff5b18158 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -7,7 +7,7 @@ env: BUILD_SOURCEBRANCHNAME: $CIRRUS_BRANCH RPCS3_TOKEN: ENCRYPTED[!a4c3850e29ab150692286a74bec29819d25971a7ec431b86de2a35f7ed90c5b2ab3c93469f9298e30924d843599110e9!] QT_VER_MAIN: '6' - QT_VER: '6.7.1' + QT_VER: '6.7.2' # windows_task: # matrix: @@ -21,7 +21,7 @@ env: # COMPILER: msvc # BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}\artifacts\ # QT_VER_MSVC: 'msvc2019' -# QT_DATE: '202405161205' +# QT_DATE: '202406110335' # QTDIR: C:\Qt\${QT_VER}\${QT_VER_MSVC}_64 # VULKAN_VER: '1.3.268.0' # VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5' diff --git a/BUILDING.md b/BUILDING.md index 48f2612a3a..4eef389699 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -9,11 +9,11 @@ Other instructions may be found [here](https://wiki.rpcs3.net/index.php?title=Bu * [CMake 3.28.0+](https://www.cmake.org/download/) (add to PATH) * [Python 3.6+](https://www.python.org/downloads/) (add to PATH) -* [Qt 6.7.1](https://www.qt.io/download-qt-installer) +* [Qt 6.7.2](https://www.qt.io/download-qt-installer) * [Visual Studio 2022](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community) (or at least Visual Studio 2019 16.11.xx+ as C++20 is not included in previous versions) * [Vulkan SDK 1.3.268.0](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/windows/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.268.0. -**Either add the** `QTDIR` **environment variable, e.g.** `\6.7.1\msvc2019_64\` **, or use the [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2019)** +**Either add the** `QTDIR` **environment variable, e.g.** `\6.7.2\msvc2019_64\` **, or use the [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2019)** **NOTE: If you have issues with the Qt plugin, you may want to uninstall the Qt Plugin and install the [Legacy Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.LEGACYQtVisualStudioTools2019) instead.** @@ -23,7 +23,7 @@ These are the essentials tools to build RPCS3 on Linux. Some of them can be inst * Clang 12+ or GCC 11+ * [CMake 3.28.0+](https://www.cmake.org/download/) -* [Qt 6.7.1](https://www.qt.io/download-qt-installer) +* [Qt 6.7.2](https://www.qt.io/download-qt-installer) * [Vulkan SDK 1.3.268.0](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.268.0. * [SDL2](https://github.com/libsdl-org/SDL/releases) (for the FAudio backend) @@ -98,7 +98,7 @@ git submodule update --init #### Configuring the Qt plugin (if used) 1) Go to `Extensions->Qt VS Tools->Qt Versions`. -2) Add the path to your Qt installation with compiler e.g. `\6.7.1\msvc2019_64`, version will fill in automatically. +2) Add the path to your Qt installation with compiler e.g. `\6.7.2\msvc2019_64`, version will fill in automatically. 3) Go to `Extensions->Qt VS Tools->Options->Legacy Project Format`. (Only available in the legacy Qt plugin) 4) Set `Build: Run pre-build setup` to `true`. (Only available in the legacy Qt plugin) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f3c07000cb..ca8500e402 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -69,9 +69,9 @@ jobs: variables: COMPILER: msvc QT_VER_MAIN: '6' - QT_VER: '6.7.1' + QT_VER: '6.7.2' QT_VER_MSVC: 'msvc2019' - QT_DATE: '202405161205' + QT_DATE: '202406110335' QTDIR: C:\Qt\$(QT_VER)\$(QT_VER_MSVC)_64 VULKAN_VER: '1.3.268.0' VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5' @@ -132,7 +132,7 @@ jobs: UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-mac" RELEASE_MESSAGE: "../GitHubReleaseMessage.txt" ARTDIR: $(Build.ArtifactStagingDirectory) - QT_VER: '6.7.1' + QT_VER: '6.7.2' QT_VER_MAIN: '6' pool: