ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Migrate to 6.5.0 on Windows

This commit is contained in:
Stenzek 2023-04-25 20:02:11 +10:00 committed by refractionpcsx2
parent 76014b7cb9
commit b3a88d6ea7
6 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/windows_build_qt.yml vendored
View File

@ -32,7 +32,7 @@ on:
qt_binary_url: qt_binary_url:
required: false required: false
type: string type: string
default: https://github.com/PCSX2/pcsx2-windows-dependencies/releases/download/2022-11-20/qt-6.4.0-x64.7z default: https://github.com/PCSX2/pcsx2-windows-dependencies/releases/download/2023-04-25/qt-6.5.0-x64.7z
qt_dir: qt_dir:
required: false required: false
type: string type: string

2
cmake/SearchForStuff.cmake
View File

@ -134,7 +134,7 @@ find_optional_system_library(libzip 3rdparty/libzip 1.8.0)
if(QT_BUILD) if(QT_BUILD)
# Default to bundled Qt6 for Windows. # Default to bundled Qt6 for Windows.
if(WIN32 AND NOT DEFINED Qt6_DIR) if(WIN32 AND NOT DEFINED Qt6_DIR)
set(Qt6_DIR ${CMAKE_SOURCE_DIR}/3rdparty/qt/6.4.0/msvc2022_64/lib/cmake/Qt6) set(Qt6_DIR ${CMAKE_SOURCE_DIR}/3rdparty/qt/6.5.0/msvc2022_64/lib/cmake/Qt6)
endif() endif()
# Find the Qt components that we need. # Find the Qt components that we need.

6
common/vsprops/QtCompile.props
View File

@ -2,11 +2,11 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros"> <PropertyGroup Label="UserMacros">
<BinaryOutputDir>$(SolutionDir)bin\</BinaryOutputDir> <BinaryOutputDir>$(SolutionDir)bin\</BinaryOutputDir>
<PCSX2QTDIRDefault Condition="'$(Platform)'=='x64'">$(SolutionDir)3rdparty\qt\6.4.0\msvc2022_64\</PCSX2QTDIRDefault> <PCSX2QTDIRDefault Condition="'$(Platform)'=='x64'">$(SolutionDir)3rdparty\qt\6.5.0\msvc2022_64\</PCSX2QTDIRDefault>
<PCSX2QTDIRDefault Condition="'$(Platform)'=='ARM64'">$(SolutionDir)3rdparty\qt\6.4.0\msvc2022_arm64\</PCSX2QTDIRDefault> <PCSX2QTDIRDefault Condition="'$(Platform)'=='ARM64'">$(SolutionDir)3rdparty\qt\6.5.0\msvc2022_arm64\</PCSX2QTDIRDefault>
<PCSX2QTDIR Condition="Exists('$(PCSX2QTDIRDefault)') And ('$(PCSX2QTDIR)'=='' Or !Exists('$(PCSX2QTDIR)'))">$(PCSX2QTDIRDefault)</PCSX2QTDIR> <PCSX2QTDIR Condition="Exists('$(PCSX2QTDIRDefault)') And ('$(PCSX2QTDIR)'=='' Or !Exists('$(PCSX2QTDIR)'))">$(PCSX2QTDIRDefault)</PCSX2QTDIR>
<PCSX2QTDIR Condition="Exists('$(PCSX2QTDIR)') And !HasTrailingSlash('$(PCSX2QTDIR)')">$(PCSX2QTDIR)\</PCSX2QTDIR> <PCSX2QTDIR Condition="Exists('$(PCSX2QTDIR)') And !HasTrailingSlash('$(PCSX2QTDIR)')">$(PCSX2QTDIR)\</PCSX2QTDIR>
<PCSX2QTDIRHost>$(SolutionDir)3rdparty\qt\6.4.0\msvc2022_64\</PCSX2QTDIRHost> <PCSX2QTDIRHost>$(SolutionDir)3rdparty\qt\6.5.0\msvc2022_64\</PCSX2QTDIRHost>
<QtDirValid>false</QtDirValid> <QtDirValid>false</QtDirValid>
<QtDirValid Condition="Exists('$(PCSX2QTDIR)')">true</QtDirValid> <QtDirValid Condition="Exists('$(PCSX2QTDIR)')">true</QtDirValid>
<QtIncludeDir>$(PCSX2QTDIR)include\</QtIncludeDir> <QtIncludeDir>$(PCSX2QTDIR)include\</QtIncludeDir>

2
pcsx2-qt/GameList/GameListWidget.cpp
View File

@ -181,7 +181,7 @@ void GameListWidget::initialize()
m_list_view = new GameListGridListView(m_ui.stack); m_list_view = new GameListGridListView(m_ui.stack);
m_list_view->setModel(m_sort_model); m_list_view->setModel(m_sort_model);
m_list_view->setModelColumn(GameListModel::Column_Cover); m_list_view->setModelColumn(GameListModel::Column_Cover);
m_list_view->setSelectionMode(QAbstractItemView::ExtendedSelection); m_list_view->setSelectionMode(QAbstractItemView::SingleSelection);
m_list_view->setViewMode(QListView::IconMode); m_list_view->setViewMode(QListView::IconMode);
m_list_view->setResizeMode(QListView::Adjust); m_list_view->setResizeMode(QListView::Adjust);
m_list_view->setUniformItemSizes(true); m_list_view->setUniformItemSizes(true);

14
pcsx2-qt/MainWindow.cpp
View File

@ -95,7 +95,6 @@ const char* MainWindow::DEFAULT_THEME_NAME = "darkfusion";
MainWindow* g_main_window = nullptr; MainWindow* g_main_window = nullptr;
static QString s_unthemed_style_name; static QString s_unthemed_style_name;
static QPalette s_unthemed_palette;
static bool s_unthemed_style_name_set; static bool s_unthemed_style_name_set;
#if defined(_WIN32) || defined(__APPLE__) #if defined(_WIN32) || defined(__APPLE__)
@ -509,7 +508,6 @@ void MainWindow::updateApplicationTheme()
{ {
s_unthemed_style_name_set = true; s_unthemed_style_name_set = true;
s_unthemed_style_name = QApplication::style()->objectName(); s_unthemed_style_name = QApplication::style()->objectName();
s_unthemed_palette = QApplication::style()->standardPalette();
} }
setStyleFromSettings(); setStyleFromSettings();
@ -522,9 +520,11 @@ void MainWindow::setStyleFromSettings()
if (theme == "fusion") if (theme == "fusion")
{ {
qApp->setPalette(s_unthemed_palette); // setPalette() shouldn't be necessary, as the documentation claims that setStyle() resets the palette, but it
qApp->setStyleSheet(QString()); // is here, to work around a bug in 6.4.x and 6.5.x where the palette doesn't restore after changing themes.
qApp->setPalette(QPalette());
qApp->setStyle(QStyleFactory::create("Fusion")); qApp->setStyle(QStyleFactory::create("Fusion"));
qApp->setStyleSheet(QString());
} }
else if (theme == "darkfusion") else if (theme == "darkfusion")
{ {
@ -938,9 +938,11 @@ void MainWindow::setStyleFromSettings()
} }
else else
{ {
qApp->setPalette(s_unthemed_palette); // setPalette() shouldn't be necessary, as the documentation claims that setStyle() resets the palette, but it
qApp->setStyleSheet(QString()); // is here, to work around a bug in 6.4.x and 6.5.x where the palette doesn't restore after changing themes.
qApp->setPalette(QPalette());
qApp->setStyle(s_unthemed_style_name); qApp->setStyle(s_unthemed_style_name);
qApp->setStyleSheet(QString());
} }
} }

2
pcsx2-qt/Settings/InterfaceSettingsWidget.cpp
View File

@ -24,7 +24,7 @@
static const char* THEME_NAMES[] = { static const char* THEME_NAMES[] = {
QT_TRANSLATE_NOOP("InterfaceSettingsWidget", "Native"), QT_TRANSLATE_NOOP("InterfaceSettingsWidget", "Native"),
//: Ignore what Crowdin says in this string about "[Light]/[Dark]" being untouchable here, these are not variables in this case and must be translated. //: Ignore what Crowdin says in this string about "[Light]/[Dark]" being untouchable here, these are not variables in this case and must be translated.
QT_TRANSLATE_NOOP("InterfaceSettingsWidget", "Fusion [Light]"), QT_TRANSLATE_NOOP("InterfaceSettingsWidget", "Fusion [Light/Dark]"),
//: Ignore what Crowdin says in this string about "[Light]/[Dark]" being untouchable here, these are not variables in this case and must be translated. //: Ignore what Crowdin says in this string about "[Light]/[Dark]" being untouchable here, these are not variables in this case and must be translated.
QT_TRANSLATE_NOOP("InterfaceSettingsWidget", "Dark Fusion (Gray) [Dark]"), QT_TRANSLATE_NOOP("InterfaceSettingsWidget", "Dark Fusion (Gray) [Dark]"),
//: Ignore what Crowdin says in this string about "[Light]/[Dark]" being untouchable here, these are not variables in this case and must be translated. //: Ignore what Crowdin says in this string about "[Light]/[Dark]" being untouchable here, these are not variables in this case and must be translated.