diff options
| author | Dominik Holland <dominik.holland@qt.io> | 2022-04-21 13:14:36 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@qt.io> | 2022-04-26 13:33:26 +0000 |
| commit | a58939de5c5a917efef77365e04a14669404de06 (patch) | |
| tree | 1ce6f2c69d8f5992dd4bfa1eddb5f3378489f180 /tests/auto | |
| parent | b96a8e02fd05101e74fe1734ee2de5e89a2bc36f (diff) | |
| download | qtapplicationmanager-a58939de5c5a917efef77365e04a14669404de06.tar.gz | |
macos: Fix the appman-qmltestrunner
We cannot rely on the QTestRootObject::instance() method
as this function is inlined by the compiler and because
of that doesn't provide the same instance as used in QML.
Instead we use the new singletonInstance() method to
retrieve the instance from the QQmlEngine.
This also enables the qml tests on macos again.
Pick-to: 6.2 6.3
Fixes: QTBUG-102736
Change-Id: Ia73bb9ce54236a30683c1fa9f5fd51a1e456aad4
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/CMakeLists.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 495f8420..66d5d849 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -10,10 +10,7 @@ add_subdirectory(main) add_subdirectory(packagecreator) add_subdirectory(packageextractor) add_subdirectory(packager-tool) -# Disable until QTBUG-102736 is resolved -if (NOT MACOS) - add_subdirectory(qml) -endif() +add_subdirectory(qml) add_subdirectory(runtime) add_subdirectory(signature) add_subdirectory(utilities) |