ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Drop Qt 6.7.0 workarounds 

Fedora 41 is out with Qt 6.8.0.
This commit is contained in:
Stenzek 2024-11-05 12:09:48 +10:00
parent ca2ed61dba
commit b5c83e671f
No known key found for this signature in database
4 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeModules/DuckStationDependencies.cmake
View File

@ -20,7 +20,7 @@ find_package(lunasvg 2.4.1 REQUIRED)
find_package(cpuinfo REQUIRED) find_package(cpuinfo REQUIRED)
find_package(DiscordRPC 3.4.0 REQUIRED) find_package(DiscordRPC 3.4.0 REQUIRED)
find_package(SoundTouch 2.3.3 REQUIRED) find_package(SoundTouch 2.3.3 REQUIRED)
find_package(libzip 1.10.1 REQUIRED) find_package(libzip 1.11.1 REQUIRED)
if(NOT WIN32) if(NOT WIN32)
find_package(CURL REQUIRED) find_package(CURL REQUIRED)
@ -40,7 +40,7 @@ if(ENABLE_WAYLAND)
endif() endif()
if(BUILD_QT_FRONTEND) if(BUILD_QT_FRONTEND)
find_package(Qt6 6.7.0 COMPONENTS Core Gui Widgets LinguistTools REQUIRED) find_package(Qt6 6.8.0 COMPONENTS Core Gui Widgets LinguistTools REQUIRED)
endif() endif()
find_package(Shaderc REQUIRED) find_package(Shaderc REQUIRED)

2
src/duckstation-qt/logwindow.cpp
View File

@ -269,7 +269,7 @@ void LogWindow::logCallback(void* pUserParam, const char* channelName, const cha
const QLatin1StringView qchannel((level <= Log::Level::Warning) ? functionName : channelName); const QLatin1StringView qchannel((level <= Log::Level::Warning) ? functionName : channelName);
if (EmuThread::isMainThread()) if (QThread::isMainThread())
{ {
this_ptr->appendMessage(qchannel, static_cast<u32>(level), qmessage); this_ptr->appendMessage(qchannel, static_cast<u32>(level), qmessage);
} }

16
src/duckstation-qt/qthost.cpp
View File

@ -131,20 +131,6 @@ EmuThread::EmuThread(QThread* ui_thread) : QThread(), m_ui_thread(ui_thread)
EmuThread::~EmuThread() = default; EmuThread::~EmuThread() = default;
#if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
bool EmuThread::isMainThread()
{
return (QThread::currentThread() == g_emu_thread->m_ui_thread);
}
bool EmuThread::isCurrentThread() const
{
return QThread::currentThread() == this;
}
#endif
void QtHost::RegisterTypes() void QtHost::RegisterTypes()
{ {
// Register any standard types we need elsewhere // Register any standard types we need elsewhere
@ -1757,7 +1743,7 @@ void EmuThread::queueAuxiliaryRenderWindowInputEvent(Host::AuxiliaryRenderWindow
Host::AuxiliaryRenderWindowEventParam param2, Host::AuxiliaryRenderWindowEventParam param2,
Host::AuxiliaryRenderWindowEventParam param3) Host::AuxiliaryRenderWindowEventParam param3)
{ {
DebugAssert(isMainThread()); DebugAssert(QThread::isMainThread());
QMetaObject::invokeMethod(this, "processAuxiliaryRenderWindowInputEvent", Qt::QueuedConnection, QMetaObject::invokeMethod(this, "processAuxiliaryRenderWindowInputEvent", Qt::QueuedConnection,
Q_ARG(void*, userdata), Q_ARG(quint32, static_cast<quint32>(event)), Q_ARG(void*, userdata), Q_ARG(quint32, static_cast<quint32>(event)),
Q_ARG(quint32, param1.uint_param), Q_ARG(quint32, param2.uint_param), Q_ARG(quint32, param1.uint_param), Q_ARG(quint32, param2.uint_param),

5
src/duckstation-qt/qthost.h
View File

@ -87,11 +87,6 @@ public:
static void start(); static void start();
static void stop(); static void stop();
#if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
static bool isMainThread();
bool isCurrentThread() const;
#endif
ALWAYS_INLINE QEventLoop* getEventLoop() const { return m_event_loop; } ALWAYS_INLINE QEventLoop* getEventLoop() const { return m_event_loop; }
ALWAYS_INLINE bool isFullscreen() const { return m_is_fullscreen; } ALWAYS_INLINE bool isFullscreen() const { return m_is_fullscreen; }