diff --git a/pipelines/qwin64_build.bat b/pipelines/qwin64_build.bat
index 2bbf5c0a..688972ef 100644
--- a/pipelines/qwin64_build.bat
+++ b/pipelines/qwin64_build.bat
@@ -2,8 +2,8 @@
 set PROJECT_ROOT=%~dp0..
 set CWD=%CD%
 
-call "C:\Qt\5.15\msvc2019_64\bin\qtenv2.bat"
-REM call "C:\Qt\6.0\msvc2019_64\bin\qtenv2.bat"
+REM call "C:\Qt\5.15\msvc2019_64\bin\qtenv2.bat"
+call "C:\Qt\6.5\msvc2019_64\bin\qtenv2.bat"
 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
 
 cd /d %CWD%
@@ -50,7 +50,7 @@ IF DEFINED FCEU_RELEASE_VERSION (set PUBLIC_RELEASE=1)
 
 REM cmake -h
 REM cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DSDL_INSTALL_PREFIX=%SDL_INSTALL_PREFIX%  ..
-cmake -DQT6=0 -DPUBLIC_RELEASE=%PUBLIC_RELEASE% -DSDL_INSTALL_PREFIX=%SDL_INSTALL_PREFIX% -DLIBARCHIVE_INSTALL_PREFIX=%LIBARCHIVE_INSTALL_PREFIX% -DUSE_LIBAV=1 -DFFMPEG_INSTALL_PREFIX=%FFMPEG_INSTALL_PREFIX% -G"Visual Studio 16" -T"v142" ..
+cmake -DQT=6 -DPUBLIC_RELEASE=%PUBLIC_RELEASE% -DSDL_INSTALL_PREFIX=%SDL_INSTALL_PREFIX% -DLIBARCHIVE_INSTALL_PREFIX=%LIBARCHIVE_INSTALL_PREFIX% -DUSE_LIBAV=1 -DFFMPEG_INSTALL_PREFIX=%FFMPEG_INSTALL_PREFIX% -G"Visual Studio 16" -T"v142" ..
 
 REM nmake
 msbuild /m fceux.sln /p:Configuration=Release
diff --git a/src/drivers/Qt/ConsoleVideoConf.cpp b/src/drivers/Qt/ConsoleVideoConf.cpp
index c16b4115..80db0b9f 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 <QtPlatformHeaders/QWindowsWindowFunctions>
 #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);
diff --git a/src/drivers/Qt/ConsoleVideoConf.h b/src/drivers/Qt/ConsoleVideoConf.h
index 6df39a87..4258b7d4 100644
--- a/src/drivers/Qt/ConsoleVideoConf.h
+++ b/src/drivers/Qt/ConsoleVideoConf.h
@@ -55,7 +55,7 @@ class ConsoleVideoConfDialog_t : public QDialog
 		QCheckBox   *showFrameCount_cbx;
 		QCheckBox   *showLagCount_cbx;
 		QCheckBox   *showRerecordCount_cbx;
-		#ifdef WIN32
+		#if defined(WIN32) && (QT_VERSION_MAJOR < 6)
 		QCheckBox   *winFullScreenBorderCbx;
 		#endif
 		QDoubleSpinBox *xScaleBox;
@@ -114,7 +114,7 @@ class ConsoleVideoConfDialog_t : public QDialog
 		void  ntscEndScanLineChanged(int value);
 		void  palStartScanLineChanged(int value);
 		void  palEndScanLineChanged(int value);
-		#ifdef WIN32
+		#if defined(WIN32) && (QT_VERSION_MAJOR < 6)
 		void  winFullScreenBorderChanged(int value);
 		#endif
 
diff --git a/src/drivers/Qt/main.cpp b/src/drivers/Qt/main.cpp
index 6c0fe718..be890741 100644
--- a/src/drivers/Qt/main.cpp
+++ b/src/drivers/Qt/main.cpp
@@ -29,7 +29,7 @@
 #include "Qt/SplashScreen.h"
 #include "Qt/QtScriptManager.h"
 
-#ifdef WIN32
+#if defined(WIN32) && (QT_VERSION_MAJOR < 6)
 #include <QtPlatformHeaders/QWindowsWindowFunctions>
 #endif
 
@@ -159,7 +159,7 @@ int main( int argc, char *argv[] )
 	// Need to wait for window to initialize before video init can be called.
 	//consoleWindow->videoInit();
 
-#ifdef WIN32
+#if defined(WIN32) && (QT_VERSION_MAJOR < 6)
 	// This function is needed to fix the issue referenced below. It adds a 1-pixel border
 	// around the fullscreen window due to some limitation in windows.
 	// https://doc.qt.io/qt-5/windows-issues.html#fullscreen-opengl-based-windows