* Update bootmanager.cpp * This *should* fix the clang error
This commit is contained in:
		| @@ -1,12 +1,8 @@ | ||||
| #include <QApplication> | ||||
| #include <QHBoxLayout> | ||||
| #include <QKeyEvent> | ||||
|  | ||||
| #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) | ||||
| // Required for screen DPI information | ||||
| #include <QScreen> | ||||
| #include <QWindow> | ||||
| #endif | ||||
|  | ||||
| #include "common/microprofile.h" | ||||
| #include "common/scm_rev.h" | ||||
| @@ -120,15 +116,13 @@ GRenderWindow::~GRenderWindow() { | ||||
|  | ||||
| void GRenderWindow::moveContext() { | ||||
|     DoneCurrent(); | ||||
| // We need to move GL context to the swapping thread in Qt5 | ||||
| #if QT_VERSION > QT_VERSION_CHECK(5, 0, 0) | ||||
|  | ||||
|     // If the thread started running, move the GL Context to the new thread. Otherwise, move it | ||||
|     // back. | ||||
|     auto thread = (QThread::currentThread() == qApp->thread() && emu_thread != nullptr) | ||||
|                       ? emu_thread | ||||
|                       : qApp->thread(); | ||||
|     child->context()->moveToThread(thread); | ||||
| #endif | ||||
| } | ||||
|  | ||||
| void GRenderWindow::SwapBuffers() { | ||||
| @@ -191,12 +185,8 @@ QByteArray GRenderWindow::saveGeometry() { | ||||
| } | ||||
|  | ||||
| qreal GRenderWindow::windowPixelRatio() { | ||||
| #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) | ||||
|     // windowHandle() might not be accessible until the window is displayed to screen. | ||||
|     return windowHandle() ? windowHandle()->screen()->devicePixelRatio() : 1.0f; | ||||
| #else | ||||
|     return 1.0f; | ||||
| #endif | ||||
| } | ||||
|  | ||||
| void GRenderWindow::closeEvent(QCloseEvent* event) { | ||||
| @@ -299,9 +289,7 @@ void GRenderWindow::OnEmulationStopping() { | ||||
| void GRenderWindow::showEvent(QShowEvent* event) { | ||||
|     QWidget::showEvent(event); | ||||
|  | ||||
| #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) | ||||
|     // windowHandle() is not initialized until the Window is shown, so we connect it here. | ||||
|     connect(this->windowHandle(), SIGNAL(screenChanged(QScreen*)), this, | ||||
|             SLOT(OnFramebufferSizeChanged()), Qt::UniqueConnection); | ||||
| #endif | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user