diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-02-13 09:14:09 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-13 18:31:40 +0100 |
| commit | 6b2535ea15cdbdb2355416b604f072fc13ff36b2 (patch) | |
| tree | 4bf1560bab77c8b315850c5337ba31a0ea87b5f0 /src/testlib/qtestlog_p.h | |
| parent | 54c2cebabdda0280b8443c6947b6fee02445e138 (diff) | |
| parent | 67491e2df5357706dbf88ddaf1f030ff095b4528 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
examples/widgets/graphicsview/boxes/scene.h
src/corelib/Qt5CoreMacros.cmake
src/corelib/Qt6CoreMacros.cmake
src/network/ssl/qsslsocket.cpp
src/network/ssl/qsslsocket.h
src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
src/testlib/CMakeLists.txt
src/testlib/.prev_CMakeLists.txt
tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp
Disabled building manual tests with CMake for now, because qmake
doesn't do it, and it confuses people.
Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152
Diffstat (limited to 'src/testlib/qtestlog_p.h')
| -rw-r--r-- | src/testlib/qtestlog_p.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h index fff36f290d..ddaf14ed9b 100644 --- a/src/testlib/qtestlog_p.h +++ b/src/testlib/qtestlog_p.h @@ -57,6 +57,8 @@ #include <QtCore/private/qcore_mac_p.h> #endif +#include <QtCore/qobjectdefs.h> + QT_BEGIN_NAMESPACE class QBenchmarkResult; @@ -65,13 +67,14 @@ class QTestData; class Q_TESTLIB_EXPORT QTestLog { + Q_GADGET public: QTestLog() = delete; ~QTestLog() = delete; Q_DISABLE_COPY_MOVE(QTestLog) enum LogMode { - Plain = 0, XML, LightXML, XunitXML, CSV, TeamCity, TAP + Plain = 0, XML, LightXML, JUnitXML, CSV, TeamCity, TAP #if defined(QT_USE_APPLE_UNIFIED_LOGGING) , Apple #endif @@ -79,6 +82,7 @@ public: , XCTest #endif }; + Q_ENUM(LogMode); static void enterTestFunction(const char* function); static void leaveTestFunction(); |