From d183c21a2cde1b4d987e1f4497611b0fe586bdc1 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 25 Oct 2019 15:51:21 +0200 Subject: 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 Reviewed-by: Simon Hausmann --- cmake/QtBuild.cmake | 3 --- 1 file changed, 3 deletions(-) (limited to 'cmake/QtBuild.cmake') 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(".") -- cgit v1.2.3