diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-25 15:51:21 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-25 16:21:06 +0000 |
| commit | d183c21a2cde1b4d987e1f4497611b0fe586bdc1 (patch) | |
| tree | 47a307b8c74ba6bf1858bdea6f53bb14a3d01ffd | |
| parent | 9cd12fad8b065a0d12eab8f1c4a87616b6d7ddb8 (diff) | |
Fix declarative tests
e1fd6074935cd0be0df14d89eb0244fcbd1677cf in qtbase removed the
qml1 imports enum from qlibraryinfo.cpp, qconfig.cpp, etc.
With the recent merge from dev, this was not adjusted in
qt_generate_qconfig_cpp, and thus we generated one too many strings
in qconfig.cpp, which resulted in
QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath) returning
"imports" instead of "qml" subfolder, thus causing all qml modules
not being found.
Fix this by removing the extra qconfig.cpp entry, and all other
references to the location.
Change-Id: I128f667281138e2e0ef0fe1ced4af0405c532fef
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | cmake/QtBuild.cmake | 3 | ||||
| -rw-r--r-- | src/corelib/Qt6CoreConfigExtras.cmake.in | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 5df171850f..bb1cf3e414 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -23,8 +23,6 @@ endif() set(INSTALL_LIBEXECDIR "${_default_libexec}" CACHE STRING "Helper programs [ARCHDATADIR/bin on Windows, ARCHDATADIR/libexec otherwise]") -set(INSTALL_IMPORTDIR "${INSTALL_ARCHDATADIR}/imports" CACHE STRING - "QML1 imports [ARCHDATADIR/imports]") set(INSTALL_QMLDIR "${INSTALL_ARCHDATADIR}/qml" CACHE STRING "QML2 imports [ARCHDATADIR/qml]") set(INSTALL_DATADIR "." CACHE STRING "Arch-independent data [PREFIX]") @@ -3256,7 +3254,6 @@ function(qt_generate_qconfig_cpp) qt_add_string_to_qconfig_cpp("libexec") qt_add_string_to_qconfig_cpp("bin") qt_add_string_to_qconfig_cpp("plugins") - qt_add_string_to_qconfig_cpp("imports") qt_add_string_to_qconfig_cpp("qml") qt_add_string_to_qconfig_cpp(".") qt_add_string_to_qconfig_cpp(".") diff --git a/src/corelib/Qt6CoreConfigExtras.cmake.in b/src/corelib/Qt6CoreConfigExtras.cmake.in index 1c50c5bdef..6c6dcf39cd 100644 --- a/src/corelib/Qt6CoreConfigExtras.cmake.in +++ b/src/corelib/Qt6CoreConfigExtras.cmake.in @@ -43,7 +43,6 @@ set(QT@PROJECT_VERSION_MAJOR@_INSTALL_DATA ${QT@PROJECT_VERSION_MAJOR@_INSTALL_P set(QT@PROJECT_VERSION_MAJOR@_INSTALL_DOCS ${QT@PROJECT_VERSION_MAJOR@_INSTALL_PREFIX}/@INSTALL_DOCDIR@) set(QT@PROJECT_VERSION_MAJOR@_INSTALL_EXAMPLES ${QT@PROJECT_VERSION_MAJOR@_INSTALL_PREFIX}/@INSTALL_EXAMPLESDIR@) set(QT@PROJECT_VERSION_MAJOR@_INSTALL_HEADERS ${QT@PROJECT_VERSION_MAJOR@_INSTALL_PREFIX}/@INSTALL_INCLUDEDIR@) -set(QT@PROJECT_VERSION_MAJOR@_INSTALL_IMPORTS ${QT@PROJECT_VERSION_MAJOR@_INSTALL_PREFIX}/@INSTALL_IMPORTDIR@) set(QT@PROJECT_VERSION_MAJOR@_INSTALL_LIBS ${QT@PROJECT_VERSION_MAJOR@_INSTALL_PREFIX}/@INSTALL_LIBDIR@) set(QT@PROJECT_VERSION_MAJOR@_INSTALL_LIBEXECS ${QT@PROJECT_VERSION_MAJOR@_INSTALL_PREFIX}/@INSTALL_LIBEXECDIR@) set(QT@PROJECT_VERSION_MAJOR@_INSTALL_PLUGINS ${QT@PROJECT_VERSION_MAJOR@_INSTALL_PREFIX}/@INSTALL_PLUGINSDIR@) |