update: modified qtest include

2026-05-08 14:33:23 +00:00 · 2026-04-27 13:42:31 +03:00
parent 2f9f0ee50d
commit c965aba61d
18 changed files with 108 additions and 18 deletions
--- a/client/tests/testAdminSelfHostedExport.cpp
+++ b/client/tests/testAdminSelfHostedExport.cpp
@@ -1,4 +1,3 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
@@ -7,6 +6,12 @@
 #include <QUuid>
 #include <QSignalSpy>

+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "vpnConnection.h"
--- a/client/tests/testComplexOperations.cpp
+++ b/client/tests/testComplexOperations.cpp
@@ -1,9 +1,14 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>

+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "vpnConnection.h"
--- a/client/tests/testDefaultServerChange.cpp
+++ b/client/tests/testDefaultServerChange.cpp
@@ -1,9 +1,14 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>

+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "ui/models/serversModel.h"
--- a/client/tests/testGatewayStacks.cpp
+++ b/client/tests/testGatewayStacks.cpp
@@ -1,9 +1,14 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>

+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "vpnConnection.h"
--- a/client/tests/testMultipleExports.cpp
+++ b/client/tests/testMultipleExports.cpp
@@ -2,10 +2,15 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QSignalSpy>
-#include <QTest>
 #include <QUuid>
 #include <QProcessEnvironment>

+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "secureQSettings.h"
--- a/client/tests/testMultipleImports.cpp
+++ b/client/tests/testMultipleImports.cpp
@@ -1,10 +1,15 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QDebug>
 #include <QUuid>
 #include <QSignalSpy>

+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "vpnConnection.h"
--- a/client/tests/testSelfHostedServerSetup.cpp
+++ b/client/tests/testSelfHostedServerSetup.cpp
@@ -1,4 +1,3 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QUuid>
@@ -6,6 +5,12 @@
 #include <QProcessEnvironment>
 #include <QDebug>

+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "core/models/selfhosted/selfHostedServerConfig.h"
--- a/client/tests/testSerialization.cpp
+++ b/client/tests/testSerialization.cpp
@@ -3,9 +3,14 @@
 #include <QJsonObject>
 #include <QProcessEnvironment>
 #include <QSignalSpy>
-#include <QTest>
 #include <QUuid>

+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "core/utils/serialization/serialization.h"
--- a/client/tests/testServerEdgeCases.cpp
+++ b/client/tests/testServerEdgeCases.cpp
@@ -1,9 +1,14 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>

+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "vpnConnection.h"
--- a/client/tests/testServerEdit.cpp
+++ b/client/tests/testServerEdit.cpp
@@ -1,9 +1,14 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>

+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "ui/models/serversModel.h"
--- a/client/tests/testServersModelSync.cpp
+++ b/client/tests/testServersModelSync.cpp
@@ -1,9 +1,14 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>

+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "ui/models/serversModel.h"
--- a/client/tests/testSettingsSignals.cpp
+++ b/client/tests/testSettingsSignals.cpp
@@ -1,10 +1,15 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>
 #include <QLocale>

+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "ui/controllers/settingsUiController.h"
--- a/client/tests/testSignalOrder.cpp
+++ b/client/tests/testSignalOrder.cpp
@@ -1,9 +1,14 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QUuid>
 #include <QSignalSpy>

+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "vpnConnection.h"
--- a/client/tests/testUiAllowedDnsModelAndController.cpp
+++ b/client/tests/testUiAllowedDnsModelAndController.cpp
@@ -3,9 +3,14 @@
 #include <QJsonObject>
 #include <QProcessEnvironment>
 #include <QSignalSpy>
-#include <QTest>
 #include <QUuid>

+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "secureQSettings.h"
--- a/client/tests/testUiAppSTModelAndController.cpp
+++ b/client/tests/testUiAppSTModelAndController.cpp
@@ -3,9 +3,14 @@
 #include <QJsonObject>
 #include <QProcessEnvironment>
 #include <QSignalSpy>
-#include <QTest>
 #include <QUuid>

+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "secureQSettings.h"
--- a/client/tests/testUiLanguageModelAndController.cpp
+++ b/client/tests/testUiLanguageModelAndController.cpp
@@ -3,9 +3,14 @@
 #include <QJsonObject>
 #include <QProcessEnvironment>
 #include <QSignalSpy>
-#include <QTest>
 #include <QUuid>

+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "secureQSettings.h"
--- a/client/tests/testUiServersModelAndController.cpp
+++ b/client/tests/testUiServersModelAndController.cpp
@@ -1,4 +1,3 @@
-#include <QTest>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
@@ -7,6 +6,12 @@
 #include <QSignalSpy>
 #include <QModelIndex>

+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "core/controllers/selfhosted/importController.h"
--- a/client/tests/testUiSitesModelAndController.cpp
+++ b/client/tests/testUiSitesModelAndController.cpp
@@ -3,9 +3,14 @@
 #include <QJsonObject>
 #include <QProcessEnvironment>
 #include <QSignalSpy>
-#include <QTest>
 #include <QUuid>

+#ifdef Q_OS_WIN
+    #include <QTest>
+#else
+    #include <QtTest/qtest.h>
+#endif
+
 #include "core/controllers/coreController.h"
 #include "core/models/serverConfig.h"
 #include "secureQSettings.h"