diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-06-11 16:04:41 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-06-11 19:41:32 +0200 |
| commit | 44282b450b9b5ab90efcac449fa37613a0173bfe (patch) | |
| tree | 52b5439a6260d20a05769df595084c14c4406966 /cmake | |
| parent | 03107d0ccd4bed91b13f05c5ab36776e054dde8f (diff) | |
CMake: Do not generate qtbase/bin/qt.conf
In a qmake build this file serves the purpose of setting the right
prefixes for the build directory's qmake binary. This can be used to
build Qt repositories other than qtbase, esp. in a top-level build.
In the CMake build, we don't have qmake top-level builds, and we do not
support building Qt repositories with the build directory's qmake binary
(exception: non-prefix build).
To build a Qt module or user project with qmake, the installed qmake
must be used.
This fixes qmake for non-prefix top-level CMake builds.
Change-Id: Ibd10c36e8359225553d782d0c8117760db9f3370
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBaseGlobalTargets.cmake | 1 | ||||
| -rw-r--r-- | cmake/QtBuild.cmake | 22 |
2 files changed, 0 insertions, 23 deletions
diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake index 2496cc0d07..099d4328c6 100644 --- a/cmake/QtBaseGlobalTargets.cmake +++ b/cmake/QtBaseGlobalTargets.cmake @@ -255,7 +255,6 @@ qt_feature_module_end(GlobalConfig OUT_VAR_PREFIX "__GlobalConfig_") qt_generate_global_config_pri_file() qt_generate_global_module_pri_file() -qt_generate_qt_conf() add_library(Qt::GlobalConfig ALIAS GlobalConfig) diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 42a3c05f1c..ba08de5a98 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -1198,28 +1198,6 @@ CONFIG += ${private_config_joined} qt_install(FILES "${qmodule_pri_target_path}" DESTINATION ${INSTALL_MKSPECSDIR}) endfunction() -function(qt_generate_qt_conf) - qt_path_join(qt_conf__path ${PROJECT_BINARY_DIR} "bin" "qt.conf") - - file(GENERATE - OUTPUT "${qt_conf__path}" - CONTENT - "[EffectivePaths] -Prefix=.. -[DevicePaths] -Prefix=${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX} -[Paths] -Prefix=${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX} -HostPrefix=${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX} -Sysroot= -SysrootifyPrefix=false -TargetSpec=${QT_QMAKE_TARGET_MKSPEC} -HostSpec=${QT_QMAKE_HOST_MKSPEC} -[EffectiveSourcePaths] -Prefix=${CMAKE_SOURCE_DIR} -") -endfunction() - # Takes a list of path components and joins them into one path separated by forward slashes "/", # and saves the path in out_var. function(qt_path_join out_var) |