Skip to content
Permalink
Browse files

Merge pull request #8401 from spycrab/qt_5.13.1

Externals/Qt: Update to 5.13.1
  • Loading branch information...
spycrab committed Oct 13, 2019
2 parents 5be061e + ec526fe commit aba23c8d87872836de73dcded82a01c03295d93f
@@ -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"
}
]
}
Submodule Qt updated 4218 files
@@ -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)
@@ -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();

int screen_nr = desktop->screenNumber(this);

if (screen_nr == -1)
screen_nr = desktop->screenNumber(parentWidget());
QScreen* screen = window()->windowHandle()->screen();

const auto dpr = desktop->screen(screen_nr)->devicePixelRatio();
const auto dpr = screen->devicePixelRatio();

emit SizeChanged(new_size.width() * dpr, new_size.height() * dpr);
break;
@@ -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);
@@ -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>

0 comments on commit aba23c8

Please sign in to comment.
You can’t perform that action at this time.