diff options
| -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@) |