archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-06 06:51:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

qt/gs_frame: Hotfix

Browse source 
- Dynamically check the loaded QT library version in case of mismatch
- Fixes using 5.11.1 builds with non-buggy libraries and vice versa
This commit is contained in:
kd-11 2018-11-21 21:13:46 +03:00 • committed by kd-11
parent 3c7f02d99d
commit f505ac7b63
2 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
rpcs3/rpcs3qt/gs_frame.cpp
View file

@ -1,4 +1,4 @@
#include "gs_frame.h" #include "gs_frame.h"
#include "Utilities/Config.h" #include "Utilities/Config.h"
#include "Utilities/Timer.h" #include "Utilities/Timer.h"
@ -7,6 +7,7 @@
#include <QKeyEvent> #include <QKeyEvent>
#include <QTimer> #include <QTimer>
#include <QThread> #include <QThread>
#include <QLibraryInfo>
#include <string> #include <string>
#include "rpcs3_version.h" #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) gs_frame::gs_frame(const QString& title, const QRect& geometry, QIcon appIcon, bool disableMouse)
: QWindow(), m_windowTitle(title), m_disable_mouse(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 //Get version by substringing VersionNumber-buildnumber-commithash to get just the part before the dash
std::string version = rpcs3::version.to_string(); std::string version = rpcs3::version.to_string();
version = version.substr(0 , version.find_last_of("-")); 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()); 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 // 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 = *reinterpret_cast<MSG**>(message);
MSG* msg = *reinterpret_cast<MSG**>(message); }
#else else
MSG* msg = reinterpret_cast<MSG*>(message); {
#endif msg = reinterpret_cast<MSG*>(message);
}
std::lock_guard lock(wm_event_lock);
switch (msg->message) switch (msg->message)
{ {

10
rpcs3/rpcs3qt/gs_frame.h
View file

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "stdafx.h" #include "stdafx.h"
#include "Emu/RSX/GSRender.h" #include "Emu/RSX/GSRender.h"
@ -36,11 +36,13 @@ private:
bool m_show_fps; bool m_show_fps;
bool m_disable_mouse; bool m_disable_mouse;
bool m_in_sizing_event = false; //a signal that the window is about to be resized was received 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_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_interactive_resize = false; // resize signal received while dragging window
bool m_minimized = false; bool m_minimized = false;
bool m_use_5_11_1_workaround = false; // QT ABI bug workaround
public: public:
gs_frame(const QString& title, const QRect& geometry, QIcon appIcon, bool disableMouse); gs_frame(const QString& title, const QRect& geometry, QIcon appIcon, bool disableMouse);
~gs_frame(); ~gs_frame();