From f505ac7b638c36354e40d35dfb9a31edadc44af6 Mon Sep 17 00:00:00 2001
From: kd-11 <karokidii@gmail.com>
Date: Wed, 21 Nov 2018 21:13:46 +0300
Subject: [PATCH] qt/gs_frame: Hotfix - Dynamically check the loaded QT library
 version in case of mismatch - Fixes using 5.11.1 builds with non-buggy
 libraries and vice versa

---
 rpcs3/rpcs3qt/gs_frame.cpp | 24 ++++++++++++++++--------
 rpcs3/rpcs3qt/gs_frame.h   | 10 ++++++----
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/rpcs3/rpcs3qt/gs_frame.cpp b/rpcs3/rpcs3qt/gs_frame.cpp
index e50bb034ac..fe2c25cb46 100644
--- a/rpcs3/rpcs3qt/gs_frame.cpp
+++ b/rpcs3/rpcs3qt/gs_frame.cpp
@@ -1,4 +1,4 @@
-#include "gs_frame.h"
+#include "gs_frame.h"
 
 #include "Utilities/Config.h"
 #include "Utilities/Timer.h"
@@ -7,6 +7,7 @@
 #include <QKeyEvent>
 #include <QTimer>
 #include <QThread>
+#include <QLibraryInfo>
 #include <string>
 
 #include "rpcs3_version.h"
@@ -28,6 +29,9 @@ constexpr auto qstr = QString::fromStdString;
 gs_frame::gs_frame(const QString& title, const QRect& geometry, QIcon appIcon, bool disableMouse)
 	: QWindow(), m_windowTitle(title), m_disable_mouse(disableMouse)
 {
+	// Workaround for a Qt bug affecting 5.11.1 binaries
+	m_use_5_11_1_workaround = QLibraryInfo::version() == QVersionNumber(5, 11, 1);
+
 	//Get version by substringing VersionNumber-buildnumber-commithash to get just the part before the dash
 	std::string version = rpcs3::version.to_string();
 	version = version.substr(0 , version.find_last_of("-"));
@@ -329,14 +333,18 @@ bool gs_frame::nativeEvent(const QByteArray &eventType, void *message, long *res
 		while (wm_event_raised.load(std::memory_order_consume) && !Emu.IsStopped());
 
 		{
-			std::lock_guard lock(wm_event_lock);
+			MSG* msg;
+			if (m_use_5_11_1_workaround)
+			{
+				// https://bugreports.qt.io/browse/QTBUG-69074?focusedCommentId=409797&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-409797
+				msg = *reinterpret_cast<MSG**>(message);
+			}
+			else
+			{
+				msg = reinterpret_cast<MSG*>(message);
+			}
 
-			// https://bugreports.qt.io/browse/QTBUG-69074?focusedCommentId=409797&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-409797
-#if (QT_VERSION == QT_VERSION_CHECK(5, 11, 1))
-			MSG* msg = *reinterpret_cast<MSG**>(message);
-#else
-			MSG* msg = reinterpret_cast<MSG*>(message);
-#endif
+			std::lock_guard lock(wm_event_lock);
 
 			switch (msg->message)
 			{
diff --git a/rpcs3/rpcs3qt/gs_frame.h b/rpcs3/rpcs3qt/gs_frame.h
index bfb6ea02c4..a7426d56e2 100644
--- a/rpcs3/rpcs3qt/gs_frame.h
+++ b/rpcs3/rpcs3qt/gs_frame.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "stdafx.h"
 #include "Emu/RSX/GSRender.h"
@@ -36,11 +36,13 @@ private:
 	bool m_show_fps;
 	bool m_disable_mouse;
 
-	bool m_in_sizing_event = false; //a signal that the window is about to be resized was received
-	bool m_user_interaction_active = false; //a signal indicating the window is being manually moved/resized was received
-	bool m_interactive_resize = false; //resize signal received while dragging window
+	bool m_in_sizing_event = false;         // a signal that the window is about to be resized was received
+	bool m_user_interaction_active = false; // a signal indicating the window is being manually moved/resized was received
+	bool m_interactive_resize = false;      // resize signal received while dragging window
 	bool m_minimized = false;
 
+	bool m_use_5_11_1_workaround = false;   // QT ABI bug workaround
+
 public:
 	gs_frame(const QString& title, const QRect& geometry, QIcon appIcon, bool disableMouse);
 	~gs_frame();