diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2021-08-06 12:27:35 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2021-09-13 21:17:04 +0200 |
| commit | e310dadef779b28845b41fb091634cd001cda9de (patch) | |
| tree | 610be234e82cc53752f58521ae3beba4693ff78f /tests/auto/quick/qquickview_extra | |
| parent | de0c1c8a4c834dcc080d1b374186a82cd86921ca (diff) | |
Consolidate test helpers into private libraries
Previously each test would include and build sources from the shared
folder. Now we make those sources a library, build it once, then have
each test link to it instead.
We also take the opportunity to move some helpers that qtquickcontrols2
had added into the quicktestutils library where it makes sense, and
for the helpers that don't make sense to be there, move them into
quickcontrolstestutils.
We add the libraries to src/ so that they are internal modules built as
part of Qt, rather than tests. That way we can use them in a standalone
test outside of qtdeclarative.
Task-number: QTBUG-95621
Pick-to: 6.2
Change-Id: I0a2ab3976fdbff2e4414df7bdc0808f16453b80a
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests/auto/quick/qquickview_extra')
| -rw-r--r-- | tests/auto/quick/qquickview_extra/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tests/auto/quick/qquickview_extra/tst_qquickview_extra.cpp | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/tests/auto/quick/qquickview_extra/CMakeLists.txt b/tests/auto/quick/qquickview_extra/CMakeLists.txt index 4fa75da811..6713ddae61 100644 --- a/tests/auto/quick/qquickview_extra/CMakeLists.txt +++ b/tests/auto/quick/qquickview_extra/CMakeLists.txt @@ -12,21 +12,16 @@ list(APPEND test_data ${test_data_glob}) qt_internal_add_test(tst_qquickview_extra SOURCES - ../../shared/util.cpp ../../shared/util.h - ../shared/geometrytestutil.cpp ../shared/geometrytestutil.h - ../shared/viewtestutil.cpp ../shared/viewtestutil.h - ../shared/visualtestutil.cpp ../shared/visualtestutil.h tst_qquickview_extra.cpp DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" - INCLUDE_DIRECTORIES - ../../shared PUBLIC_LIBRARIES Qt::CorePrivate Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate + Qt::QuickTestUtilsPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickview_extra/tst_qquickview_extra.cpp b/tests/auto/quick/qquickview_extra/tst_qquickview_extra.cpp index f697a438bd..1ad248d899 100644 --- a/tests/auto/quick/qquickview_extra/tst_qquickview_extra.cpp +++ b/tests/auto/quick/qquickview_extra/tst_qquickview_extra.cpp @@ -30,7 +30,7 @@ #include <QtQuick/qquickview.h> #include <QtQuick/qquickitem.h> #include <QtQml/qqmlengine.h> -#include "../../shared/util.h" +#include <QtQuickTestUtils/private/qmlutils_p.h> #include <QtCore/QDebug> #include <QtCore/QTimer> @@ -45,7 +45,7 @@ private slots: void qtbug_87228(); }; -tst_QQuickViewExtra::tst_QQuickViewExtra() { } +tst_QQuickViewExtra::tst_QQuickViewExtra() : QQmlDataTest(QT_QMLTEST_DATADIR) { } void tst_QQuickViewExtra::qtbug_87228() { |