diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-08-22 16:36:42 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-10 18:01:27 +0100 |
| commit | 1cd494fbfb3eaf21717697c3c7df39b214b48ee3 (patch) | |
| tree | 6ec56567a6f3355b1814ac18169d354239a729fc /src/qmltest/qmltest.pro | |
| parent | 8550dff55c62b4f2b588513014b5cad8fe2c5f5b (diff) | |
Generate registrations for all imports
Now that we can generate all QML type information at build time, we
should also use it.
Move the types for QtTest into the testlib import plugin. They don't
need to be exported from QtQuickTest.
Trigger the resource initialization of the shapes library from the
plugin so that we retain a dependency and the linker doesn't optimize
the module initialization away.
Change-Id: Icc8cb338aa03ef1e3085e29356a5db7b73ba0a01
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qmltest/qmltest.pro')
| -rw-r--r-- | src/qmltest/qmltest.pro | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro index d6e4669769..6864203ba4 100644 --- a/src/qmltest/qmltest.pro +++ b/src/qmltest/qmltest.pro @@ -4,7 +4,7 @@ QMAKE_DOCS = $$PWD/doc/qtqmltest.qdocconf DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_FOREACH QT = core testlib-private -QT_PRIVATE = quick quick-private qml-private gui core-private gui-private +QT_PRIVATE = quick quick-private qml-private gui core-private # Testlib is only a private dependency, which results in our users not # inheriting testlibs's MODULE_CONFIG transitively. Make it explicit. @@ -17,18 +17,16 @@ qtHaveModule(widgets) { SOURCES += \ $$PWD/quicktest.cpp \ - $$PWD/quicktestevent.cpp \ - $$PWD/quicktestresult.cpp \ - $$PWD/quicktestutil.cpp + $$PWD/quicktestresult.cpp HEADERS += \ $$PWD/quicktestglobal.h \ $$PWD/quicktest.h \ - $$PWD/quicktestevent_p.h \ $$PWD/quicktestresult_p.h \ - $$PWD/quicktestutil_p.h \ $$PWD/qtestoptions_p.h qtConfig(qml-debug): DEFINES += QT_QML_DEBUG_NO_WARNING load(qt_module) + +CONFIG += metatypes install_metatypes |