From 2448ff715fcb1216db8a9d7c51087a4e8255015c Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 4 Apr 2015 14:17:06 -0700 Subject: [PATCH] Qt: Move Display setup code to common code --- src/platform/qt/Display.cpp | 7 +++++++ src/platform/qt/DisplayGL.cpp | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/platform/qt/Display.cpp b/src/platform/qt/Display.cpp index fd4870d21..8ee580cec 100644 --- a/src/platform/qt/Display.cpp +++ b/src/platform/qt/Display.cpp @@ -5,9 +5,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "Display.h" +extern "C" { +#include "gba/video.h" +} + using namespace QGBA; Display::Display(QWidget* parent) : QWidget(parent) { + setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + setMinimumSize(VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS); + setCursor(Qt::BlankCursor); } diff --git a/src/platform/qt/DisplayGL.cpp b/src/platform/qt/DisplayGL.cpp index f9847e5c5..62daeab0d 100644 --- a/src/platform/qt/DisplayGL.cpp +++ b/src/platform/qt/DisplayGL.cpp @@ -33,9 +33,6 @@ DisplayGL::DisplayGL(const QGLFormat& format, QWidget* parent) , m_painter(new Painter(format, this)) , m_started(false) { - setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); - setMinimumSize(VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS); - setCursor(Qt::BlankCursor); } void DisplayGL::startDrawing(const uint32_t* buffer, GBAThread* thread) {