diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-16 13:02:51 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-16 14:04:13 +0100 |
| commit | 262a173ce6d8b513680d9f843b784a65684d6458 (patch) | |
| tree | 8de700289db5ec3bfabe1818e30402690fefebbf /src | |
| parent | d3a35b062ee8587d5c8caf3c5a3d4d54dd2a651f (diff) | |
CMake: Fix QtQuick test import failure in tests
testlogger.js was added to the generated qmldir file
with a 6.0 version, and that failed qmltests that tried
to import QtQuick with the following error
invalid version 6.0.0, expected <major>.<minor>
import QtTest 1.1
^
Until pro2cmake is fixed not to look at QML_FILES in
.qmake .pro files when generating the contents of the
qmldir file, add the js file to the static qmldir
file and regenerate the project.
Change-Id: I71d2dc34441f53f05c4eb3a108819913e809eb50
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/testlib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/imports/testlib/qmldir | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/imports/testlib/CMakeLists.txt b/src/imports/testlib/CMakeLists.txt index 03801d76eb..611180cab0 100644 --- a/src/imports/testlib/CMakeLists.txt +++ b/src/imports/testlib/CMakeLists.txt @@ -45,11 +45,9 @@ set_source_files_properties(TestCase.qml PROPERTIES set_source_files_properties(SignalSpy.qml PROPERTIES QT_QML_SOURCE_VERSION "1.0" ) -# special case begin set_source_files_properties(testlogger.js PROPERTIES - QT_QML_SOURCE_INSTALL TRUE + QT_QML_SOURCE_VERSION "1.0" ) -# special case end qt6_target_qml_files(qmltestplugin FILES diff --git a/src/imports/testlib/qmldir b/src/imports/testlib/qmldir index 9c1e8dd61f..446d84d443 100644 --- a/src/imports/testlib/qmldir +++ b/src/imports/testlib/qmldir @@ -4,4 +4,5 @@ classname QTestQmlModule typeinfo plugins.qmltypes TestCase 1.0 TestCase.qml SignalSpy 1.0 SignalSpy.qml +testlogger 1.0 testlogger.js depends QtQuick.Window 2.0 |