Externals/Qt: Update to 5.13.1

dolphin-emu · Oct 13, 2019 · c0a210e · c0a210e
1 parent 6dbb5cc
commit c0a210e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 18 deletions.
diff --git 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
diff --git 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/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
@@ -19,6 +19,7 @@
 #include <QPalette>
 #include <QScreen>
 #include <QTimer>
+#include <QWindow>
 
 #include "imgui.h"
 
@@ -43,7 +44,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);
@@ -221,14 +222,9 @@ bool RenderWidget::event(QEvent* event)
     const QResizeEvent* se = static_cast<QResizeEvent*>(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
@@ -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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="UserMacros">
-    <QTDIRDefault>$(ExternalsDir)Qt\Qt5.11.1\5.11.1\msvc2017_64\</QTDIRDefault>
+    <QTDIRDefault>$(ExternalsDir)Qt\Qt5.13.1\5.13.1\msvc2017_64\</QTDIRDefault>
     <QTDIR Condition="Exists('$(QTDIRDefault)') And ('$(QTDIR)'=='' Or !Exists('$(QTDIR)'))">$(QTDIRDefault)</QTDIR>
     <QTDIR Condition="Exists('$(QTDIR)') And !HasTrailingSlash('$(QTDIR)')">$(QTDIR)\</QTDIR>
     <QtDirValid>false</QtDirValid>