From 9ec0609ae502f05a08385690d2592b7aa84a5208 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 16 Dec 2017 13:23:42 -0500 Subject: [PATCH] citra_qt: Drop Qt 5 version checks in code We don't support Qt 4.x anymore. --- src/citra_qt/bootmanager.cpp | 14 +------------- .../debugger/graphics/graphics_cmdlists.cpp | 5 ----- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index a5ab0958b3..e370a2ab29 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -1,12 +1,8 @@ #include #include #include - -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) -// Required for screen DPI information #include #include -#endif #include "citra_qt/bootmanager.h" #include "common/microprofile.h" @@ -121,15 +117,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() { @@ -192,12 +186,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) { @@ -301,9 +291,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 } diff --git a/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp b/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp index ce2b9fa505..c2dc185829 100644 --- a/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp +++ b/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp @@ -192,12 +192,7 @@ GPUCommandListWidget::GPUCommandListWidget(QWidget* parent) list_widget->setFont(GetMonospaceFont()); list_widget->setRootIsDecorated(false); list_widget->setUniformRowHeights(true); - -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) list_widget->header()->setSectionResizeMode(QHeaderView::ResizeToContents); -#else - list_widget->header()->setResizeMode(QHeaderView::ResizeToContents); -#endif connect(list_widget->selectionModel(), SIGNAL(currentChanged(const QModelIndex&, const QModelIndex&)), this,