diff --git a/CMakeSettings.json b/CMakeSettings.json index 0157a0940b..0d7f714b96 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -11,7 +11,7 @@ "variables": [ { "name": "Qt5_DIR", - "value": "${workspaceRoot}\\Externals\\Qt\\Qt5.11.1\\5.11.1\\msvc2017_64\\lib\\cmake\\Qt5" + "value": "${workspaceRoot}\\Externals\\Qt\\Qt5.13.1\\5.13.1\\msvc2017_64\\lib\\cmake\\Qt5" } ] }, @@ -24,13 +24,9 @@ "buildRoot": "${workspaceRoot}\\Build\\${name}", "cmakeCommandArgs": "", "variables": [ - { - "name": "CMAKE_BUILD_TYPE", - "value": "Debug" - }, { "name": "Qt5_DIR", - "value": "${workspaceRoot}\\Externals\\Qt\\Qt5.11.1\\5.11.1\\msvc2017_64\\lib\\cmake\\Qt5" + "value": "${workspaceRoot}\\Externals\\Qt\\Qt5.13.1\\5.13.1\\msvc2017_64\\lib\\cmake\\Qt5" } ] } diff --git a/Externals/Qt b/Externals/Qt index e5b972af93..f800f81477 160000 --- a/Externals/Qt +++ b/Externals/Qt @@ -1 +1 @@ -Subproject commit e5b972af9368c8498546151a6961cd0fe87f13b2 +Subproject commit f800f81477438e7bdb8773c9411ad545963f70e7 diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt index 1bf9844ff6..52b13c981d 100644 --- a/Source/Core/DolphinQt/CMakeLists.txt +++ b/Source/Core/DolphinQt/CMakeLists.txt @@ -1,5 +1,5 @@ if (NOT Qt5_DIR AND MSVC) -set(Qt5_DIR "${CMAKE_SOURCE_DIR}/Externals/Qt5.11.1/5.11.1/msvc2017_64/lib/cmake/Qt5") +set(Qt5_DIR "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt5.13.1/5.13.1/msvc2017_64/lib/cmake/Qt5") endif() find_package(Qt5 5.9 REQUIRED COMPONENTS Gui Widgets) diff --git a/Source/Core/DolphinQt/RenderWidget.cpp b/Source/Core/DolphinQt/RenderWidget.cpp index a2c78f242d..a1d0c43c53 100644 --- a/Source/Core/DolphinQt/RenderWidget.cpp +++ b/Source/Core/DolphinQt/RenderWidget.cpp @@ -7,7 +7,6 @@ #include #include -#include #include #include #include @@ -19,6 +18,7 @@ #include #include #include +#include #include "imgui.h" @@ -43,7 +43,7 @@ RenderWidget::RenderWidget(QWidget* parent) : QWidget(parent) setAcceptDrops(true); QPalette p; - p.setColor(QPalette::Background, Qt::black); + p.setColor(QPalette::Window, Qt::black); setPalette(p); connect(Host::GetInstance(), &Host::RequestTitle, this, &RenderWidget::setWindowTitle); @@ -162,8 +162,9 @@ void RenderWidget::showFullScreen() { QWidget::showFullScreen(); - const auto dpr = - QGuiApplication::screens()[QApplication::desktop()->screenNumber(this)]->devicePixelRatio(); + QScreen* screen = window()->windowHandle()->screen(); + + const auto dpr = screen->devicePixelRatio(); emit SizeChanged(width() * dpr, height() * dpr); } @@ -221,14 +222,9 @@ bool RenderWidget::event(QEvent* event) const QResizeEvent* se = static_cast(event); QSize new_size = se->size(); - auto* desktop = QApplication::desktop(); + QScreen* screen = window()->windowHandle()->screen(); - int screen_nr = desktop->screenNumber(this); - - if (screen_nr == -1) - screen_nr = desktop->screenNumber(parentWidget()); - - const auto dpr = desktop->screen(screen_nr)->devicePixelRatio(); + const auto dpr = screen->devicePixelRatio(); emit SizeChanged(new_size.width() * dpr, new_size.height() * dpr); break; diff --git a/Source/Core/DolphinQt/ResourcePackManager.cpp b/Source/Core/DolphinQt/ResourcePackManager.cpp index fa232bc8b4..a45984758c 100644 --- a/Source/Core/DolphinQt/ResourcePackManager.cpp +++ b/Source/Core/DolphinQt/ResourcePackManager.cpp @@ -142,7 +142,7 @@ void ResourcePackManager::RepopulateTable() if (ResourcePack::IsInstalled(pack)) { - item->setBackgroundColor(QColor(Qt::green)); + item->setBackground(QColor(Qt::green)); auto font = item->font(); font.setBold(true); diff --git a/Source/VSProps/QtCompile.props b/Source/VSProps/QtCompile.props index a09f0d1178..b4c3b80a92 100644 --- a/Source/VSProps/QtCompile.props +++ b/Source/VSProps/QtCompile.props @@ -1,7 +1,7 @@ - $(ExternalsDir)Qt\Qt5.11.1\5.11.1\msvc2017_64\ + $(ExternalsDir)Qt\Qt5.13.1\5.13.1\msvc2017_64\ $(QTDIRDefault) $(QTDIR)\ false