AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Do not generate qtbase/bin/qt.conf

Browse Source 
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>
This commit is contained in:
Joerg Bornemann 2020-06-11 16:04:41 +02:00
parent 03107d0ccd
commit 44282b450b
2 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/QtBaseGlobalTargets.cmake
View File

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

22
cmake/QtBuild.cmake
View File

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