diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-09 15:29:58 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-10 18:57:11 +0100 |
| commit | a07d3fb9bda20d85123d46a301c4957307100c8b (patch) | |
| tree | 2605755c0fa292ff193545f861c06fe0f01e99b8 /src/qmltest | |
| parent | 732e3b1e5629eb4a8facb5f341fb56961fe06e06 (diff) | |
QmlTest: Move declaration of helper qWaitForSignal() to a header
Otherwise, the default parameter declaration causes a clash in CMake
Unity (Jumbo) builds.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: Ida72b30debfa97b6fc2e523b19ef219425c2a0c2
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qmltest')
| -rw-r--r-- | src/qmltest/quicktest.cpp | 2 | ||||
| -rw-r--r-- | src/qmltest/quicktest_p.h | 2 | ||||
| -rw-r--r-- | src/qmltest/quicktestresult.cpp | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp index 1fd36edd62..0ecb48dd10 100644 --- a/src/qmltest/quicktest.cpp +++ b/src/qmltest/quicktest.cpp @@ -223,7 +223,7 @@ static void handleCompileErrors( results.stopLogging(); } -bool qWaitForSignal(QObject *obj, const char* signal, int timeout = 5000) +bool qWaitForSignal(QObject *obj, const char* signal, int timeout) { QSignalSpy spy(obj, signal); QElapsedTimer timer; diff --git a/src/qmltest/quicktest_p.h b/src/qmltest/quicktest_p.h index 938ae6cdfc..0cb1aae831 100644 --- a/src/qmltest/quicktest_p.h +++ b/src/qmltest/quicktest_p.h @@ -83,6 +83,8 @@ private: QQmlPropertyMap *m_defined; }; +bool qWaitForSignal(QObject *obj, const char* signal, int timeout = 5000); + QT_END_NAMESPACE #endif // QUICKTEST_P_H diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp index e248625e01..263c63c581 100644 --- a/src/qmltest/quicktestresult.cpp +++ b/src/qmltest/quicktestresult.cpp @@ -4,6 +4,7 @@ #include "quicktestresult_p.h" #include "quicktest.h" +#include "quicktest_p.h" #include <QtTest/qtestcase.h> #include <QtTest/qtestsystem.h> #include <QtTest/private/qtestblacklist_p.h> @@ -45,8 +46,6 @@ static const char *globalProgramName = nullptr; static bool loggingStarted = false; static QBenchmarkGlobalData globalBenchmarkData; -extern bool qWaitForSignal(QObject *obj, const char* signal, int timeout = 5000); - class Q_QUICK_TEST_EXPORT QuickTestImageObject : public QObject { Q_OBJECT |