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

Externals/Qt: Update to 5.13.1

This commit is contained in:
spycrab 2019-10-13 03:36:17 +02:00
parent 6dbb5cc4ea
commit ec526fee56
6 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeSettings.json
View File

@ -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"
}
]
}

2
Externals/Qt vendored

@ -1 +1 @@
Subproject commit e5b972af9368c8498546151a6961cd0fe87f13b2
Subproject commit f800f81477438e7bdb8773c9411ad545963f70e7

2
Source/Core/DolphinQt/CMakeLists.txt
View File

@ -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)

18
Source/Core/DolphinQt/RenderWidget.cpp
View File

@ -7,7 +7,6 @@
#include <array>
#include <QApplication>
#include <QDesktopWidget>
#include <QDragEnterEvent>
#include <QDropEvent>
#include <QFileInfo>
@ -19,6 +18,7 @@
#include <QPalette>
#include <QScreen>
#include <QTimer>
#include <QWindow>
#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<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;

2
Source/Core/DolphinQt/ResourcePackManager.cpp
View File

@ -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);

2
Source/VSProps/QtCompile.props
View File

@ -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>