philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Move isGammaray() into Platform_qt

Browse Source
This commit is contained in:
Sergio Martins
2022-04-29 15:52:46 +01:00
parent 721d344533
commit fcf02fc8bf
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/Testing.cpp
View File

@@ -11,6 +11,7 @@
#include "Testing.h"
#include "DockRegistry_p.h"
#include "qtcommon/Platform_qt.h"
#include <QGuiApplication>
#include <QTest>
@@ -23,17 +24,10 @@ using namespace KDDockWidgets;
using namespace KDDockWidgets::Controllers;
using namespace KDDockWidgets::Testing;
extern quintptr Q_CORE_EXPORT qtHookData[];
static QString s_expectedWarning;
static WarningObserver *s_warningObserver = nullptr;
static QtMessageHandler s_original = nullptr;
static bool isGammaray()
{
static bool is = qtHookData[3] != 0;
return is;
}
static bool shouldBlacklistWarning(const QString &msg, const QString &category)
{
if (category == QLatin1String("qt.qpa.xcb"))
@@ -70,7 +64,7 @@ static void fatalWarningsMessageHandler(QtMsgType t, const QMessageLogContext &c
if (!s_expectedWarning.isEmpty() && msg.contains(s_expectedWarning))
return;
if (!isGammaray() && !qEnvironmentVariableIsSet("NO_FATAL")) {
if (!Platform_qt::isGammaray() && !qEnvironmentVariableIsSet("NO_FATAL")) {
if (s_warningObserver)
s_warningObserver->onFatal();