From a8f3e79e2aaeaf450038ddfacc876fc254616f2e Mon Sep 17 00:00:00 2001 From: Andy Vandijck Date: Tue, 20 Feb 2024 21:16:56 +0100 Subject: [PATCH] Fix QT6 windows Fix QT6 --- src/drivers/Qt/ConsoleVideoConf.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/drivers/Qt/ConsoleVideoConf.cpp b/src/drivers/Qt/ConsoleVideoConf.cpp index 61fadd0b..608bb6cf 100644 --- a/src/drivers/Qt/ConsoleVideoConf.cpp +++ b/src/drivers/Qt/ConsoleVideoConf.cpp @@ -35,7 +35,7 @@ #include "Qt/ConsoleVideoConf.h" #include "Qt/nes_shm.h" -#ifdef WIN32 +#if defined(WIN32) && (QT_VERSION_MAJOR < 6) #include #endif @@ -132,7 +132,7 @@ ConsoleVideoConfDialog_t::ConsoleVideoConfDialog_t(QWidget *parent) vbox1->addWidget( gl_LF_chkBox ); -#ifdef WIN32 +#if defined(WIN32) && (QT_VERSION_MAJOR < 6) // 1px full screen border - hack fix for QOpenGLWidget fullscreen issues winFullScreenBorderCbx = new QCheckBox( tr("Fullscreen Border (1px)") ); winFullScreenBorderCbx->setToolTip(tr("Hack fix for QOpenGLWidget fullscreen issue. May not be needed.")); @@ -736,7 +736,7 @@ void ConsoleVideoConfDialog_t::openGL_linearFilterChanged( int value ) } } //---------------------------------------------------- -#ifdef WIN32 +#if defined(WIN32) && (QT_VERSION_MAJOR < 6) void ConsoleVideoConfDialog_t::winFullScreenBorderChanged(int value) { bool opt = (value != Qt::Unchecked);