diff options
author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 15:49:28 +0100 |
---|---|---|
committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-24 12:30:00 +0000 |
commit | 7c229d3cf80d66c0261f7e63ac9b918e2cea4e57 (patch) | |
tree | 514e825d7b33de388ce1558efa9bc327141d363a /src/imports/testlib | |
parent | 1d333d3375874efb8d37df37dc5ef561573794ad (diff) |
Post merge fixes
Change-Id: Ie8aca222809f35174fb6c6488832ec3ff5432272
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/imports/testlib')
-rw-r--r-- | src/imports/testlib/.prev_CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/imports/testlib/CMakeLists.txt | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/imports/testlib/.prev_CMakeLists.txt b/src/imports/testlib/.prev_CMakeLists.txt index 6e54d1ffcc..d08507f597 100644 --- a/src/imports/testlib/.prev_CMakeLists.txt +++ b/src/imports/testlib/.prev_CMakeLists.txt @@ -6,14 +6,18 @@ qt_add_qml_module(qmltestplugin URI "QtTest" - VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "1.15" CLASSNAME QTestQmlModule DEPENDENCIES QtQuick.Window/2.0 SOURCES main.cpp + quicktestevent.cpp quicktestevent_p.h + quicktestresultforeign_p.h + quicktestutil.cpp quicktestutil_p.h LIBRARIES Qt::CorePrivate + Qt::GuiPrivate Qt::QmlPrivate Qt::QuickTestPrivate PUBLIC_LIBRARIES @@ -27,7 +31,7 @@ qt_add_qml_module(qmltestplugin #### Keys ignored in scope 1:.:.:testlib.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.$$QT_MINOR_VERSION" +# IMPORT_VERSION = "1.15" # OTHER_FILES = "testlib.json" # QML_FILES = "TestCase.qml" "SignalSpy.qml" "testlogger.js" # TARGETPATH = "QtTest" diff --git a/src/imports/testlib/CMakeLists.txt b/src/imports/testlib/CMakeLists.txt index eada3b6df6..37db859180 100644 --- a/src/imports/testlib/CMakeLists.txt +++ b/src/imports/testlib/CMakeLists.txt @@ -6,14 +6,18 @@ qt_add_qml_module(qmltestplugin URI "QtTest" - VERSION "1.${CMAKE_PROJECT_VERSION_MINOR}" + VERSION "1.15" CLASSNAME QTestQmlModule DEPENDENCIES QtQuick.Window/2.0 SOURCES main.cpp + quicktestevent.cpp quicktestevent_p.h + quicktestresultforeign_p.h + quicktestutil.cpp quicktestutil_p.h LIBRARIES Qt::CorePrivate + Qt::GuiPrivate Qt::QmlPrivate Qt::QuickTestPrivate PUBLIC_LIBRARIES @@ -27,7 +31,7 @@ qt_add_qml_module(qmltestplugin #### Keys ignored in scope 1:.:.:testlib.pro:<TRUE>: # CXX_MODULE = "qml" -# IMPORT_VERSION = "1.$$QT_MINOR_VERSION" +# IMPORT_VERSION = "1.15" # OTHER_FILES = "testlib.json" # QML_FILES = "TestCase.qml" "SignalSpy.qml" "testlogger.js" # TARGETPATH = "QtTest" |