2016-11-18 17:17:49 +00:00
|
|
|
# this must be done outside any function
|
|
|
|
QT_SOURCE_TREE = $$PWD
|
|
|
|
QT_BUILD_TREE = $$shadowed($$PWD)
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
# custom command line handling
|
|
|
|
|
replace mechanism to override variables from the mkspecs
it is sometimes desirable to override values from the mkspec without
modifying (or wrapping) the spec itself. linux distributors do this on a
regular basis.
so far, we'd pick up CFLAGS, etc. from the environment, in a somewhat
autoconf-like fashion. however, over time, this approach proved
problematic: the concept doesn't mix particularly well with mkspecs to
start with, is unexpected (and therefore causes frustration), and
doesn't mix well with cross-building (at least the way it was realized).
ironically, it was implemented this way (quite a while ago) upon my
explicit request ...
the new mechanism uses explicit variable manipulations on the configure
command line, just like qmake itself understands. as it happens, this is
again quite similar to autoconf-generated configure scripts. however,
this time around we don't pretend to be actually autoconf-like, so we
also don't try to map any variable names (some of which have different
semantics anyway).
this commit also eliminates the last use of the QMakeVar() function,
so delete it and the underlying infrastructure.
Task-number: QTBUG-32530
Task-number: QTBUG-42962
Change-Id: Id31a6b80e1add08ca21f5b178614bda530d12374
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-07-06 11:58:53 +00:00
|
|
|
defineTest(qtConfCommandline_qmakeArgs) {
|
2018-06-28 02:25:41 +00:00
|
|
|
contains(1, QMAKE_[A-Z0-9_]+ *[-+]?=.*) {
|
replace mechanism to override variables from the mkspecs
it is sometimes desirable to override values from the mkspec without
modifying (or wrapping) the spec itself. linux distributors do this on a
regular basis.
so far, we'd pick up CFLAGS, etc. from the environment, in a somewhat
autoconf-like fashion. however, over time, this approach proved
problematic: the concept doesn't mix particularly well with mkspecs to
start with, is unexpected (and therefore causes frustration), and
doesn't mix well with cross-building (at least the way it was realized).
ironically, it was implemented this way (quite a while ago) upon my
explicit request ...
the new mechanism uses explicit variable manipulations on the configure
command line, just like qmake itself understands. as it happens, this is
again quite similar to autoconf-generated configure scripts. however,
this time around we don't pretend to be actually autoconf-like, so we
also don't try to map any variable names (some of which have different
semantics anyway).
this commit also eliminates the last use of the QMakeVar() function,
so delete it and the underlying infrastructure.
Task-number: QTBUG-32530
Task-number: QTBUG-42962
Change-Id: Id31a6b80e1add08ca21f5b178614bda530d12374
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-07-06 11:58:53 +00:00
|
|
|
config.input.qmakeArgs += $$1
|
|
|
|
export(config.input.qmakeArgs)
|
|
|
|
return(true)
|
|
|
|
}
|
|
|
|
return(false)
|
|
|
|
}
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
defineTest(qtConfCommandline_cxxstd) {
|
2016-08-14 07:48:55 +00:00
|
|
|
msvc: \
|
|
|
|
qtConfAddError("Command line option -c++std is not supported with MSVC compilers.")
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
arg = $${1}
|
|
|
|
val = $${2}
|
|
|
|
isEmpty(val): val = $$qtConfGetNextCommandlineArg()
|
|
|
|
!contains(val, "^-.*"):!isEmpty(val) {
|
|
|
|
contains(val, "(c\+\+)?11") {
|
|
|
|
qtConfCommandlineSetInput("c++14", "no")
|
|
|
|
} else: contains(val, "(c\+\+)?(14|1y)") {
|
|
|
|
qtConfCommandlineSetInput("c++14", "yes")
|
|
|
|
qtConfCommandlineSetInput("c++1z", "no")
|
|
|
|
} else: contains(val, "(c\+\+)?(1z)") {
|
|
|
|
qtConfCommandlineSetInput("c++14", "yes")
|
|
|
|
qtConfCommandlineSetInput("c++1z", "yes")
|
|
|
|
} else {
|
2016-08-01 08:10:32 +00:00
|
|
|
qtConfAddError("Invalid argument $$val to command line parameter $$arg")
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
} else {
|
2016-08-01 08:10:32 +00:00
|
|
|
qtConfAddError("Missing argument to command line parameter $$arg")
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfCommandline_sanitize) {
|
|
|
|
arg = $${1}
|
|
|
|
val = $${2}
|
|
|
|
isEmpty(val): val = $$qtConfGetNextCommandlineArg()
|
|
|
|
!contains(val, "^-.*"):!isEmpty(val) {
|
|
|
|
equals(val, "address") {
|
|
|
|
qtConfCommandlineSetInput("sanitize_address", "yes")
|
|
|
|
} else: equals(val, "thread") {
|
|
|
|
qtConfCommandlineSetInput("sanitize_thread", "yes")
|
|
|
|
} else: equals(val, "memory") {
|
|
|
|
qtConfCommandlineSetInput("sanitize_memory", "yes")
|
|
|
|
} else: equals(val, "undefined") {
|
|
|
|
qtConfCommandlineSetInput("sanitize_undefined", "yes")
|
|
|
|
} else {
|
2016-08-01 08:10:32 +00:00
|
|
|
qtConfAddError("Invalid argument $$val to command line parameter $$arg")
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
} else {
|
2016-08-01 08:10:32 +00:00
|
|
|
qtConfAddError("Missing argument to command line parameter $$arg")
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
# callbacks
|
|
|
|
|
|
|
|
defineReplace(qtConfFunc_crossCompile) {
|
2016-11-03 06:22:34 +00:00
|
|
|
!isEmpty(config.input.sysroot): return(true)
|
2016-06-11 20:49:01 +00:00
|
|
|
spec = $$[QMAKE_SPEC]
|
|
|
|
!equals(spec, $$[QMAKE_XSPEC]): return(true)
|
|
|
|
return(false)
|
|
|
|
}
|
|
|
|
|
2016-11-18 17:17:49 +00:00
|
|
|
defineReplace(qtConfFunc_licenseCheck) {
|
2018-06-01 13:13:30 +00:00
|
|
|
exists($$QT_SOURCE_TREE/LICENSE.LGPL3)|exists($$QT_SOURCE_TREE/LICENSE.GPL2)|exists($$QT_SOURCE_TREE/LICENSE.GPL3): \
|
2016-11-18 17:17:49 +00:00
|
|
|
hasOpenSource = true
|
|
|
|
else: \
|
|
|
|
hasOpenSource = false
|
2018-06-08 09:41:04 +00:00
|
|
|
exists($$QT_SOURCE_TREE/LICENSE.QT-LICENSE-AGREEMENT-4.0): \
|
2016-11-18 17:17:49 +00:00
|
|
|
hasCommercial = true
|
|
|
|
else: \
|
|
|
|
hasCommercial = false
|
|
|
|
|
|
|
|
commercial = $$config.input.commercial
|
|
|
|
isEmpty(commercial) {
|
|
|
|
$$hasOpenSource {
|
|
|
|
$$hasCommercial {
|
|
|
|
logn()
|
|
|
|
logn("Selecting Qt Edition.")
|
|
|
|
logn()
|
|
|
|
logn("Type 'c' if you want to use the Commercial Edition.")
|
|
|
|
logn("Type 'o' if you want to use the Open Source Edition.")
|
|
|
|
logn()
|
|
|
|
for(ever) {
|
|
|
|
val = $$lower($$prompt("Which edition of Qt do you want to use? ", false))
|
|
|
|
equals(val, c) {
|
|
|
|
commercial = yes
|
2016-11-15 19:49:43 +00:00
|
|
|
QMAKE_SAVED_ARGS += -commercial
|
2016-11-18 17:17:49 +00:00
|
|
|
} else: equals(val, o) {
|
|
|
|
commercial = no
|
2016-11-15 19:49:43 +00:00
|
|
|
QMAKE_SAVED_ARGS += -opensource
|
2016-11-18 17:17:49 +00:00
|
|
|
} else {
|
|
|
|
next()
|
|
|
|
}
|
2016-11-15 19:49:43 +00:00
|
|
|
export(QMAKE_SAVED_ARGS)
|
2016-11-18 17:17:49 +00:00
|
|
|
break()
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
commercial = no
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
!$$hasCommercial: \
|
2018-10-15 09:02:12 +00:00
|
|
|
qtConfFatalError("No license files. Cannot proceed. Try re-installing Qt.")
|
2016-11-18 17:17:49 +00:00
|
|
|
commercial = yes
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
equals(commercial, no) {
|
|
|
|
!$$hasOpenSource: \
|
|
|
|
qtConfFatalError("This is the Qt Commercial Edition." \
|
|
|
|
"Cannot proceed with -opensource.")
|
|
|
|
|
|
|
|
logn()
|
|
|
|
logn("This is the Qt Open Source Edition.")
|
|
|
|
|
|
|
|
EditionString = "Open Source"
|
|
|
|
config.input.qt_edition = OpenSource
|
|
|
|
export(config.input.qt_edition)
|
|
|
|
} else {
|
|
|
|
!$$hasCommercial: \
|
|
|
|
qtConfFatalError("This is the Qt Open Source Edition." \
|
|
|
|
"Cannot proceed with -commercial.")
|
|
|
|
|
2018-06-08 09:41:04 +00:00
|
|
|
!exists($$QT_SOURCE_TREE/.release-timestamp) {
|
|
|
|
# Build from git
|
|
|
|
|
2016-11-18 17:17:49 +00:00
|
|
|
logn()
|
2018-06-08 09:41:04 +00:00
|
|
|
logn("This is the Qt Commercial Edition.")
|
2016-11-18 17:17:49 +00:00
|
|
|
|
2018-06-08 09:41:04 +00:00
|
|
|
EditionString = "Commercial"
|
|
|
|
config.input.qt_edition = Commercial
|
2016-11-18 17:17:49 +00:00
|
|
|
export(config.input.qt_edition)
|
|
|
|
} else {
|
2018-06-08 09:41:04 +00:00
|
|
|
# Build from a released source package
|
|
|
|
|
2016-11-18 17:17:49 +00:00
|
|
|
equals(QMAKE_HOST.os, Linux) {
|
2017-05-26 12:34:48 +00:00
|
|
|
!equals(QMAKE_HOST.arch, x86_64): \
|
2016-11-18 17:17:49 +00:00
|
|
|
Licheck = licheck32
|
|
|
|
else: \
|
|
|
|
Licheck = licheck64
|
|
|
|
} else: equals(QMAKE_HOST.os, Darwin) {
|
|
|
|
Licheck = licheck_mac
|
|
|
|
} else: equals(QMAKE_HOST.os, Windows) {
|
|
|
|
Licheck = licheck.exe
|
|
|
|
} else {
|
|
|
|
qtConfFatalError("Host operating system not supported by this edition of Qt.")
|
|
|
|
}
|
|
|
|
|
|
|
|
!qtRunLoggedCommand("$$system_quote($$QT_SOURCE_TREE/bin/$$Licheck) \
|
2017-05-26 10:12:47 +00:00
|
|
|
$$system_quote($$eval(config.input.confirm-license)) \
|
2016-11-18 17:17:49 +00:00
|
|
|
$$system_quote($$QT_SOURCE_TREE) $$system_quote($$QT_BUILD_TREE) \
|
|
|
|
$$[QMAKE_SPEC] $$[QMAKE_XSPEC]", \
|
2017-05-26 10:17:37 +00:00
|
|
|
LicheckOutput, false): \
|
2016-11-18 17:17:49 +00:00
|
|
|
return(false)
|
2017-04-24 15:59:49 +00:00
|
|
|
logn()
|
|
|
|
for (o, LicheckOutput) {
|
|
|
|
contains(o, "\\w+=.*"): \
|
|
|
|
eval($$o)
|
|
|
|
else: \
|
|
|
|
logn($$o)
|
|
|
|
}
|
2016-11-18 17:17:49 +00:00
|
|
|
config.input.qt_edition = $$Edition
|
|
|
|
config.input.qt_licheck = $$Licheck
|
|
|
|
config.input.qt_release_date = $$ReleaseDate
|
|
|
|
export(config.input.qt_edition)
|
|
|
|
export(config.input.qt_licheck)
|
|
|
|
export(config.input.qt_release_date)
|
|
|
|
return(true)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
!isEmpty(config.input.confirm-license) {
|
|
|
|
logn()
|
|
|
|
logn("You have already accepted the terms of the $$EditionString license.")
|
|
|
|
return(true)
|
|
|
|
}
|
|
|
|
|
|
|
|
affix = the
|
|
|
|
equals(commercial, no) {
|
|
|
|
theLicense = "GNU Lesser General Public License (LGPL) version 3"
|
|
|
|
showWhat = "Type 'L' to view the GNU Lesser General Public License version 3 (LGPLv3)."
|
|
|
|
gpl2Ok = false
|
2018-06-01 13:13:30 +00:00
|
|
|
gpl3Ok = false
|
2016-11-18 17:17:49 +00:00
|
|
|
winrt {
|
|
|
|
notTheLicense = "Note: GPL version 2 is not available on WinRT."
|
2018-06-01 13:13:30 +00:00
|
|
|
} else: wasm {
|
|
|
|
gpl3Ok = true
|
|
|
|
theLicense = "GNU General Public License (GPL) version 3"
|
|
|
|
showWhat = "Type 'G' to view the GNU General Public License version 3 (GPLv3)."
|
2016-11-18 17:17:49 +00:00
|
|
|
} else: $$qtConfEvaluate("features.android-style-assets") {
|
|
|
|
notTheLicense = "Note: GPL version 2 is not available due to using Android style assets."
|
|
|
|
} else {
|
|
|
|
theLicense += "or the GNU General Public License (GPL) version 2"
|
|
|
|
showWhat += "Type 'G' to view the GNU General Public License version 2 (GPLv2)."
|
|
|
|
gpl2Ok = true
|
|
|
|
affix = either
|
|
|
|
}
|
|
|
|
} else {
|
2018-06-08 09:41:04 +00:00
|
|
|
theLicense = $$cat($$QT_SOURCE_TREE/LICENSE.QT-LICENSE-AGREEMENT-4.0, lines)
|
2016-11-18 17:17:49 +00:00
|
|
|
theLicense = $$first(theLicense)
|
|
|
|
showWhat = "Type '?' to view the $${theLicense}."
|
|
|
|
}
|
|
|
|
msg = \
|
|
|
|
" " \
|
|
|
|
"You are licensed to use this software under the terms of" \
|
|
|
|
"the "$$theLicense"." \
|
|
|
|
$$notTheLicense \
|
|
|
|
" " \
|
|
|
|
$$showWhat \
|
|
|
|
"Type 'y' to accept this license offer." \
|
|
|
|
"Type 'n' to decline this license offer." \
|
|
|
|
" "
|
|
|
|
|
|
|
|
for(ever) {
|
|
|
|
logn($$join(msg, $$escape_expand(\\n)))
|
|
|
|
for(ever) {
|
|
|
|
val = $$lower($$prompt("Do you accept the terms of $$affix license? ", false))
|
|
|
|
equals(val, y)|equals(val, yes) {
|
|
|
|
logn()
|
2016-11-15 19:49:43 +00:00
|
|
|
QMAKE_SAVED_ARGS += -confirm-license
|
|
|
|
export(QMAKE_SAVED_ARGS)
|
2016-11-18 17:17:49 +00:00
|
|
|
return(true)
|
|
|
|
} else: equals(val, n)|equals(val, no) {
|
|
|
|
return(false)
|
|
|
|
} else: equals(commercial, yes):equals(val, ?) {
|
2018-06-08 09:41:04 +00:00
|
|
|
licenseFile = $$QT_SOURCE_TREE/LICENSE.QT-LICENSE-AGREEMENT-4.0
|
2016-11-18 17:17:49 +00:00
|
|
|
} else: equals(commercial, no):equals(val, l) {
|
|
|
|
licenseFile = $$QT_SOURCE_TREE/LICENSE.LGPL3
|
|
|
|
} else: equals(commercial, no):equals(val, g):$$gpl2Ok {
|
|
|
|
licenseFile = $$QT_SOURCE_TREE/LICENSE.GPL2
|
2018-06-01 13:13:30 +00:00
|
|
|
} else: equals(commercial, no):equals(val, g):$$gpl3Ok {
|
|
|
|
licenseFile = $$QT_SOURCE_TREE/LICENSE.GPL3
|
2016-11-18 17:17:49 +00:00
|
|
|
} else {
|
|
|
|
next()
|
|
|
|
}
|
|
|
|
break()
|
|
|
|
}
|
|
|
|
system("more $$system_quote($$system_path($$licenseFile))")
|
|
|
|
logn()
|
|
|
|
logn()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
# custom tests
|
|
|
|
|
2016-11-24 17:41:57 +00:00
|
|
|
# this is meant for linux device specs only
|
|
|
|
defineTest(qtConfTest_machineTuple) {
|
|
|
|
qtRunLoggedCommand("$$QMAKE_CXX -dumpmachine", $${1}.tuple)|return(false)
|
|
|
|
$${1}.cache += tuple
|
|
|
|
export($${1}.cache)
|
|
|
|
return(true)
|
|
|
|
}
|
|
|
|
|
2018-06-29 15:34:14 +00:00
|
|
|
defineTest(qtConfTest_verifySpec) {
|
|
|
|
qtConfTest_compile($$1): return(true)
|
|
|
|
qtConfFatalError("Cannot compile a minimal program. The toolchain or QMakeSpec is broken.", log)
|
|
|
|
}
|
|
|
|
|
2016-06-29 09:39:27 +00:00
|
|
|
defineTest(qtConfTest_architecture) {
|
|
|
|
!qtConfTest_compile($${1}): \
|
2016-08-26 19:10:56 +00:00
|
|
|
error("Could not determine $$eval($${1}.label). See config.log for details.")
|
2016-06-29 09:39:27 +00:00
|
|
|
|
|
|
|
test = $$eval($${1}.test)
|
2017-05-15 12:14:28 +00:00
|
|
|
test_out_dir = $$OUT_PWD/$$basename(QMAKE_CONFIG_TESTS_DIR)/$$test
|
2016-07-15 16:23:05 +00:00
|
|
|
unix:exists($$test_out_dir/arch): \
|
2016-06-29 09:39:27 +00:00
|
|
|
content = $$cat($$test_out_dir/arch, blob)
|
2016-07-15 16:23:05 +00:00
|
|
|
else: win32:exists($$test_out_dir/arch.exe): \
|
2016-06-29 09:39:27 +00:00
|
|
|
content = $$cat($$test_out_dir/arch.exe, blob)
|
2016-07-15 16:23:05 +00:00
|
|
|
else: android:exists($$test_out_dir/libarch.so): \
|
2016-06-29 09:39:27 +00:00
|
|
|
content = $$cat($$test_out_dir/libarch.so, blob)
|
2018-06-01 13:13:30 +00:00
|
|
|
else: wasm:exists($$test_out_dir/arch.wasm): \
|
|
|
|
content = $$cat($$test_out_dir/arch.wasm, blob)
|
2016-06-29 09:39:27 +00:00
|
|
|
else: \
|
2016-08-26 19:10:56 +00:00
|
|
|
error("$$eval($${1}.label) detection binary not found.")
|
2016-06-29 09:39:27 +00:00
|
|
|
|
|
|
|
arch_magic = ".*==Qt=magic=Qt== Architecture:([^\\0]*).*"
|
|
|
|
subarch_magic = ".*==Qt=magic=Qt== Sub-architecture:([^\\0]*).*"
|
2017-03-27 08:54:59 +00:00
|
|
|
buildabi_magic = ".*==Qt=magic=Qt== Build-ABI:([^\\0]*).*"
|
2016-06-29 09:39:27 +00:00
|
|
|
|
2017-03-27 08:54:59 +00:00
|
|
|
!contains(content, $$arch_magic)|!contains(content, $$subarch_magic)|!contains(content, $$buildabi_magic): \
|
2016-08-26 19:10:56 +00:00
|
|
|
error("$$eval($${1}.label) detection binary does not contain expected data.")
|
2016-06-29 09:39:27 +00:00
|
|
|
|
|
|
|
$${1}.arch = $$replace(content, $$arch_magic, "\\1")
|
|
|
|
$${1}.subarch = $$replace(content, $$subarch_magic, "\\1")
|
|
|
|
$${1}.subarch = $$split($${1}.subarch, " ")
|
2017-03-27 08:54:59 +00:00
|
|
|
$${1}.buildabi = $$replace(content, $$buildabi_magic, "\\1")
|
2016-06-29 09:39:27 +00:00
|
|
|
export($${1}.arch)
|
|
|
|
export($${1}.subarch)
|
2017-03-27 08:54:59 +00:00
|
|
|
export($${1}.buildabi)
|
2016-06-29 09:39:27 +00:00
|
|
|
qtLog("Detected architecture: $$eval($${1}.arch) ($$eval($${1}.subarch))")
|
|
|
|
|
2017-04-28 11:54:41 +00:00
|
|
|
$${1}.cache += arch subarch buildabi
|
2016-08-16 18:03:54 +00:00
|
|
|
export($${1}.cache)
|
2016-06-29 09:39:27 +00:00
|
|
|
return(true)
|
|
|
|
}
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
defineTest(qtConfTest_gnumake) {
|
|
|
|
make = $$qtConfFindInPath("gmake")
|
|
|
|
isEmpty(make): make = $$qtConfFindInPath("make")
|
|
|
|
!isEmpty(make) {
|
2016-08-01 11:04:24 +00:00
|
|
|
qtRunLoggedCommand("$$make -v", version)|return(false)
|
2016-06-11 20:49:01 +00:00
|
|
|
contains(version, "^GNU Make.*"): return(true)
|
|
|
|
}
|
|
|
|
return(false)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfTest_detectPkgConfig) {
|
|
|
|
pkgConfig = $$getenv("PKG_CONFIG")
|
|
|
|
!isEmpty(pkgConfig): {
|
|
|
|
qtLog("Found pkg-config from environment variable: $$pkgConfig")
|
|
|
|
} else {
|
2016-10-27 13:10:09 +00:00
|
|
|
pkgConfig = $$QMAKE_PKG_CONFIG
|
2016-06-11 20:49:01 +00:00
|
|
|
|
|
|
|
!isEmpty(pkgConfig) {
|
|
|
|
qtLog("Found pkg-config from mkspec: $$pkgConfig")
|
|
|
|
} else {
|
|
|
|
pkgConfig = $$qtConfFindInPath("pkg-config")
|
|
|
|
|
|
|
|
isEmpty(pkgConfig): \
|
|
|
|
return(false)
|
|
|
|
|
|
|
|
qtLog("Found pkg-config from path: $$pkgConfig")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
$$qtConfEvaluate("features.cross_compile") {
|
|
|
|
# cross compiling, check that pkg-config is set up sanely
|
|
|
|
sysroot = $$config.input.sysroot
|
|
|
|
|
|
|
|
pkgConfigLibdir = $$getenv("PKG_CONFIG_LIBDIR")
|
|
|
|
isEmpty(pkgConfigLibdir) {
|
|
|
|
isEmpty(sysroot) {
|
|
|
|
qtConfAddWarning("Cross compiling without sysroot. Disabling pkg-config")
|
|
|
|
return(false)
|
|
|
|
}
|
|
|
|
!exists("$$sysroot/usr/lib/pkgconfig") {
|
|
|
|
qtConfAddWarning( \
|
|
|
|
"Disabling pkg-config since PKG_CONFIG_LIBDIR is not set and" \
|
|
|
|
"the host's .pc files would be used (even if you set PKG_CONFIG_PATH)." \
|
|
|
|
"Set this variable to the directory that contains target .pc files" \
|
|
|
|
"for pkg-config to function correctly when cross-compiling or" \
|
|
|
|
"use -pkg-config to override this test.")
|
|
|
|
return(false)
|
|
|
|
}
|
|
|
|
|
|
|
|
pkgConfigLibdir = $$sysroot/usr/lib/pkgconfig:$$sysroot/usr/share/pkgconfig
|
2016-11-24 17:41:57 +00:00
|
|
|
machineTuple = $$eval($${currentConfig}.tests.machineTuple.tuple)
|
|
|
|
!isEmpty(machineTuple): \
|
|
|
|
pkgConfigLibdir = "$$pkgConfigLibdir:$$sysroot/usr/lib/$$machineTuple/pkgconfig"
|
2016-06-11 20:49:01 +00:00
|
|
|
|
|
|
|
qtConfAddNote("PKG_CONFIG_LIBDIR automatically set to $$pkgConfigLibdir")
|
|
|
|
}
|
|
|
|
pkgConfigSysrootDir = $$getenv("PKG_CONFIG_SYSROOT_DIR")
|
|
|
|
isEmpty(pkgConfigSysrootDir) {
|
|
|
|
isEmpty(sysroot) {
|
|
|
|
qtConfAddWarning( \
|
|
|
|
"Disabling pkg-config since PKG_CONFIG_SYSROOT_DIR is not set." \
|
|
|
|
"Set this variable to your sysroot for pkg-config to function correctly when" \
|
|
|
|
"cross-compiling or use -pkg-config to override this test.")
|
|
|
|
return(false)
|
|
|
|
}
|
|
|
|
|
|
|
|
pkgConfigSysrootDir = $$sysroot
|
|
|
|
qtConfAddNote("PKG_CONFIG_SYSROOT_DIR automatically set to $$pkgConfigSysrootDir")
|
|
|
|
}
|
|
|
|
$${1}.pkgConfigLibdir = $$pkgConfigLibdir
|
|
|
|
export($${1}.pkgConfigLibdir)
|
|
|
|
$${1}.pkgConfigSysrootDir = $$pkgConfigSysrootDir
|
|
|
|
export($${1}.pkgConfigSysrootDir)
|
2016-08-16 18:03:54 +00:00
|
|
|
$${1}.cache += pkgConfigLibdir pkgConfigSysrootDir
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
$${1}.pkgConfig = $$pkgConfig
|
|
|
|
export($${1}.pkgConfig)
|
2016-08-16 18:03:54 +00:00
|
|
|
$${1}.cache += pkgConfig
|
|
|
|
export($${1}.cache)
|
2016-06-11 20:49:01 +00:00
|
|
|
|
|
|
|
return(true)
|
|
|
|
}
|
|
|
|
|
2016-06-22 07:52:41 +00:00
|
|
|
defineTest(qtConfTest_buildParts) {
|
|
|
|
parts = $$config.input.make
|
|
|
|
isEmpty(parts) {
|
|
|
|
parts = libs examples
|
|
|
|
|
|
|
|
$$qtConfEvaluate("features.developer-build"): \
|
|
|
|
parts += tests
|
|
|
|
!$$qtConfEvaluate("features.cross_compile"): \
|
|
|
|
parts += tools
|
|
|
|
}
|
|
|
|
|
|
|
|
parts -= $$config.input.nomake
|
|
|
|
|
|
|
|
# always add libs, as it's required to build Qt
|
|
|
|
parts *= libs
|
|
|
|
|
|
|
|
$${1}.value = $$parts
|
|
|
|
export($${1}.value)
|
2016-08-24 11:39:15 +00:00
|
|
|
$${1}.cache = -
|
2016-08-16 18:03:54 +00:00
|
|
|
export($${1}.cache)
|
2016-06-22 07:52:41 +00:00
|
|
|
return(true)
|
|
|
|
}
|
|
|
|
|
2017-11-16 05:31:30 +00:00
|
|
|
defineTest(qtConfTest_x86Simd) {
|
|
|
|
simd = $$section(1, ".", -1) # last component
|
|
|
|
$${1}.args = CONFIG+=add_cflags DEFINES+=NO_ATTRIBUTE SIMD=$$simd
|
|
|
|
$${1}.test = x86_simd
|
|
|
|
qtConfTest_compile($${1})
|
|
|
|
}
|
|
|
|
|
2017-11-16 05:01:15 +00:00
|
|
|
defineTest(qtConfTest_x86SimdAlways) {
|
|
|
|
configs =
|
|
|
|
fpfx = $${currentConfig}.features
|
2017-11-16 05:31:30 +00:00
|
|
|
tpfx = $${currentConfig}.tests
|
|
|
|
|
|
|
|
# Make a list of all passing features whose tests have type=x86Simd
|
|
|
|
for (f, $${tpfx}._KEYS_) {
|
|
|
|
!equals($${tpfx}.$${f}.type, "x86Simd"): \
|
|
|
|
next()
|
2017-11-16 05:01:15 +00:00
|
|
|
qtConfCheckFeature($$f)
|
|
|
|
equals($${fpfx}.$${f}.available, true): configs += $$f
|
|
|
|
}
|
2018-04-17 16:19:50 +00:00
|
|
|
$${1}.literal_args = SIMD=$$join(configs, " ")
|
2017-11-16 05:01:15 +00:00
|
|
|
qtConfTest_compile($${1})
|
|
|
|
}
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
# custom outputs
|
|
|
|
|
2016-11-24 17:41:57 +00:00
|
|
|
# this reloads the qmakespec as completely as reasonably possible.
|
|
|
|
defineTest(reloadSpec) {
|
|
|
|
bypassNesting() {
|
|
|
|
for (f, QMAKE_INTERNAL_INCLUDED_FILES) {
|
|
|
|
contains(f, .*/mkspecs/.*):\
|
|
|
|
!contains(f, .*/(qt_build_config|qt_parts|qt_configure|configure_base)\\.prf): \
|
|
|
|
discard_from($$f)
|
|
|
|
}
|
|
|
|
# nobody's going to try to re-load the features above,
|
|
|
|
# so don't bother with being selective.
|
2017-01-17 15:50:59 +00:00
|
|
|
QMAKE_INTERNAL_INCLUDED_FEATURES = \
|
|
|
|
# loading it gets simulated below.
|
2017-01-17 16:10:21 +00:00
|
|
|
$$[QT_HOST_DATA/src]/mkspecs/features/device_config.prf \
|
|
|
|
# must be delayed until qdevice.pri is ready.
|
|
|
|
$$[QT_HOST_DATA/src]/mkspecs/features/mac/toolchain.prf \
|
|
|
|
$$[QT_HOST_DATA/src]/mkspecs/features/toolchain.prf
|
2016-11-24 17:41:57 +00:00
|
|
|
|
2019-03-13 09:34:46 +00:00
|
|
|
saved_variables = CONFIG QMAKE_CXXFLAGS
|
|
|
|
for (name, saved_variables): \
|
|
|
|
_SAVED_$$name = $$eval($$name)
|
2016-11-24 17:41:57 +00:00
|
|
|
load(spec_pre)
|
|
|
|
# qdevice.pri gets written too late (and we can't write it early
|
|
|
|
# enough, as it's populated in stages, with later ones depending
|
|
|
|
# on earlier ones). so inject its variables manually.
|
|
|
|
for (l, $${currentConfig}.output.devicePro): \
|
|
|
|
eval($$l)
|
|
|
|
include($$QMAKESPEC/qmake.conf)
|
|
|
|
load(spec_post)
|
2019-03-13 09:34:46 +00:00
|
|
|
for (name, saved_variables): \
|
|
|
|
$$name += $$eval(_SAVED_$$name)
|
2018-05-02 10:24:59 +00:00
|
|
|
load(default_pre)
|
2016-11-24 17:41:57 +00:00
|
|
|
|
|
|
|
# ensure pristine environment for configuration. again.
|
|
|
|
discard_from($$[QT_HOST_DATA/get]/mkspecs/qconfig.pri)
|
|
|
|
discard_from($$[QT_HOST_DATA/get]/mkspecs/qmodule.pri)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-11-16 14:13:52 +00:00
|
|
|
defineTest(qtConfOutput_prepareSpec) {
|
|
|
|
device = $$eval(config.input.device)
|
|
|
|
!isEmpty(device) {
|
|
|
|
devices = $$files($$[QT_HOST_DATA/src]/mkspecs/devices/*$$device*)
|
|
|
|
isEmpty(devices): \
|
|
|
|
qtConfFatalError("No device matching '$$device'.")
|
|
|
|
!count(devices, 1) {
|
|
|
|
err = "Multiple matches for device '$$device'. Candidates are:"
|
|
|
|
for (d, devices): \
|
|
|
|
err += " $$basename(d)"
|
|
|
|
qtConfFatalError($$err)
|
|
|
|
}
|
|
|
|
XSPEC = $$relative_path($$devices, $$[QT_HOST_DATA/src]/mkspecs)
|
|
|
|
}
|
|
|
|
xspec = $$eval(config.input.xplatform)
|
|
|
|
!isEmpty(xspec) {
|
|
|
|
!exists($$[QT_HOST_DATA/src]/mkspecs/$$xspec/qmake.conf): \
|
|
|
|
qtConfFatalError("Invalid target platform '$$xspec'.")
|
|
|
|
XSPEC = $$xspec
|
|
|
|
}
|
|
|
|
isEmpty(XSPEC): \
|
|
|
|
XSPEC = $$[QMAKE_SPEC]
|
|
|
|
export(XSPEC)
|
|
|
|
QMAKESPEC = $$[QT_HOST_DATA/src]/mkspecs/$$XSPEC
|
|
|
|
export(QMAKESPEC)
|
|
|
|
|
2017-01-03 15:59:36 +00:00
|
|
|
notes = $$cat($$OUT_PWD/.config.notes, lines)
|
|
|
|
!isEmpty(notes): \
|
|
|
|
qtConfAddNote("Also available for $$notes")
|
|
|
|
|
2016-11-16 14:13:52 +00:00
|
|
|
# deviceOptions() below contains conditionals coming form the spec,
|
|
|
|
# so this cannot be delayed for a batch reload.
|
|
|
|
reloadSpec()
|
|
|
|
}
|
|
|
|
|
2016-11-24 17:41:57 +00:00
|
|
|
defineTest(qtConfOutput_prepareOptions) {
|
|
|
|
$${currentConfig}.output.devicePro += \
|
|
|
|
$$replace(config.input.device-option, "^([^=]+) *= *(.*)$", "\\1 = \\2")
|
|
|
|
darwin:!isEmpty(config.input.sdk) {
|
|
|
|
$${currentConfig}.output.devicePro += \
|
|
|
|
"QMAKE_MAC_SDK = $$val_escape(config.input.sdk)"
|
|
|
|
}
|
|
|
|
android {
|
2016-12-16 14:21:35 +00:00
|
|
|
sdk_root = $$eval(config.input.android-sdk)
|
|
|
|
isEmpty(sdk_root): \
|
|
|
|
sdk_root = $$getenv(ANDROID_SDK_ROOT)
|
|
|
|
isEmpty(sdk_root) {
|
|
|
|
for(ever) {
|
|
|
|
equals(QMAKE_HOST.os, Linux): \
|
|
|
|
sdk_root = $$(HOME)/Android/Sdk
|
|
|
|
else: equals(QMAKE_HOST.os, Darwin): \
|
|
|
|
sdk_root = $$(HOME)/Library/Android/sdk
|
|
|
|
else: \
|
|
|
|
break()
|
|
|
|
!exists($$sdk_root): \
|
|
|
|
sdk_root =
|
|
|
|
break()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
isEmpty(sdk_root): \
|
|
|
|
qtConfFatalError("Cannot find Android SDK." \
|
|
|
|
"Please use -android-sdk option to specify one.")
|
|
|
|
|
2016-11-24 17:41:57 +00:00
|
|
|
ndk_root = $$eval(config.input.android-ndk)
|
|
|
|
isEmpty(ndk_root): \
|
|
|
|
ndk_root = $$getenv(ANDROID_NDK_ROOT)
|
2016-12-16 14:21:35 +00:00
|
|
|
isEmpty(ndk_root) {
|
|
|
|
for(ever) {
|
|
|
|
exists($$sdk_root/ndk-bundle) {
|
|
|
|
ndk_root = $$sdk_root/ndk-bundle
|
|
|
|
break()
|
|
|
|
}
|
|
|
|
equals(QMAKE_HOST.os, Linux): \
|
|
|
|
ndk_root = $$(HOME)/Android/Sdk/ndk-bundle
|
|
|
|
else: equals(QMAKE_HOST.os, Darwin): \
|
|
|
|
ndk_root = $$(HOME)/Library/Android/sdk/ndk-bundle
|
|
|
|
else: \
|
|
|
|
break()
|
|
|
|
!exists($$ndk_root): \
|
|
|
|
ndk_root =
|
|
|
|
break()
|
|
|
|
}
|
|
|
|
}
|
2016-11-24 17:41:57 +00:00
|
|
|
isEmpty(ndk_root): \
|
|
|
|
qtConfFatalError("Cannot find Android NDK." \
|
|
|
|
"Please use -android-ndk option to specify one.")
|
|
|
|
|
|
|
|
ndk_tc_ver = $$eval(config.input.android-toolchain-version)
|
|
|
|
isEmpty(ndk_tc_ver): \
|
|
|
|
ndk_tc_ver = 4.9
|
|
|
|
!exists($$ndk_root/toolchains/arm-linux-androideabi-$$ndk_tc_ver/prebuilt/*): \
|
|
|
|
qtConfFatalError("Cannot detect Android NDK toolchain." \
|
|
|
|
"Please use -android-toolchain-version to specify it.")
|
|
|
|
|
|
|
|
ndk_tc_pfx = $$ndk_root/toolchains/arm-linux-androideabi-$$ndk_tc_ver/prebuilt
|
|
|
|
ndk_host = $$eval(config.input.android-ndk-host)
|
|
|
|
isEmpty(ndk_host): \
|
|
|
|
ndk_host = $$getenv(ANDROID_NDK_HOST)
|
|
|
|
isEmpty(ndk_host) {
|
|
|
|
equals(QMAKE_HOST.os, Linux) {
|
|
|
|
ndk_host_64 = linux-x86_64
|
|
|
|
ndk_host_32 = linux-x86
|
|
|
|
} else: equals(QMAKE_HOST.os, Darwin) {
|
|
|
|
ndk_host_64 = darwin-x86_64
|
|
|
|
ndk_host_32 = darwin-x86
|
|
|
|
} else: equals(QMAKE_HOST.os, Windows) {
|
|
|
|
ndk_host_64 = windows-x86_64
|
|
|
|
ndk_host_32 = windows
|
|
|
|
} else {
|
|
|
|
qtConfFatalError("Host operating system not supported by Android.")
|
|
|
|
}
|
|
|
|
!exists($$ndk_tc_pfx/$$ndk_host_64/*): ndk_host_64 =
|
|
|
|
!exists($$ndk_tc_pfx/$$ndk_host_32/*): ndk_host_32 =
|
|
|
|
equals(QMAKE_HOST.arch, x86_64):!isEmpty(ndk_host_64) {
|
|
|
|
ndk_host = $$ndk_host_64
|
|
|
|
} else: equals(QMAKE_HOST.arch, x86):!isEmpty(ndk_host_32) {
|
|
|
|
ndk_host = $$ndk_host_32
|
|
|
|
} else {
|
|
|
|
!isEmpty(ndk_host_64): \
|
|
|
|
ndk_host = $$ndk_host_64
|
|
|
|
else: !isEmpty(ndk_host_32): \
|
|
|
|
ndk_host = $$ndk_host_32
|
|
|
|
else: \
|
|
|
|
qtConfFatalError("Cannot detect the Android host." \
|
|
|
|
"Please use -android-ndk-host option to specify one.")
|
2017-11-15 09:35:50 +00:00
|
|
|
qtConfAddNote("Available Android host does not match host architecture.")
|
2016-11-24 17:41:57 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
!exists($$ndk_tc_pfx/$$ndk_host/*): \
|
|
|
|
qtConfFatalError("Specified Android NDK host is invalid.")
|
|
|
|
}
|
|
|
|
|
|
|
|
target_arch = $$eval(config.input.android-arch)
|
|
|
|
isEmpty(target_arch): \
|
|
|
|
target_arch = armeabi-v7a
|
|
|
|
|
|
|
|
platform = $$eval(config.input.android-ndk-platform)
|
2018-08-31 08:06:18 +00:00
|
|
|
isEmpty(platform): equals(target_arch, arm64-v8a): \
|
|
|
|
platform = android-21
|
|
|
|
|
2019-01-07 12:46:02 +00:00
|
|
|
isEmpty(platform): equals(target_arch, x86_64): \
|
|
|
|
platform = android-21
|
|
|
|
|
2016-11-24 17:41:57 +00:00
|
|
|
isEmpty(platform): \
|
|
|
|
platform = android-16 ### the windows configure disagrees ...
|
|
|
|
|
|
|
|
$${currentConfig}.output.devicePro += \
|
|
|
|
"DEFAULT_ANDROID_SDK_ROOT = $$val_escape(sdk_root)" \
|
|
|
|
"DEFAULT_ANDROID_NDK_ROOT = $$val_escape(ndk_root)" \
|
|
|
|
"DEFAULT_ANDROID_PLATFORM = $$platform" \
|
|
|
|
"DEFAULT_ANDROID_NDK_HOST = $$ndk_host" \
|
|
|
|
"DEFAULT_ANDROID_TARGET_ARCH = $$target_arch" \
|
|
|
|
"DEFAULT_ANDROID_NDK_TOOLCHAIN_VERSION = $$ndk_tc_ver"
|
|
|
|
}
|
|
|
|
|
|
|
|
export($${currentConfig}.output.devicePro)
|
|
|
|
|
2016-12-20 15:32:59 +00:00
|
|
|
# if any settings were made, the spec will be reloaded later
|
|
|
|
# to make them take effect.
|
2016-11-24 17:41:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfOutput_machineTuple) {
|
|
|
|
$${currentConfig}.output.devicePro += \
|
|
|
|
"GCC_MACHINE_DUMP = $$eval($${currentConfig}.tests.machineTuple.tuple)"
|
|
|
|
export($${currentConfig}.output.devicePro)
|
|
|
|
|
|
|
|
# for completeness, one could reload the spec here,
|
|
|
|
# but no downstream users actually need that.
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfOutput_commitOptions) {
|
|
|
|
# qdevice.pri needs to be written early, because the compile tests require it.
|
|
|
|
write_file($$QT_BUILD_TREE/mkspecs/qdevice.pri, $${currentConfig}.output.devicePro)|error()
|
|
|
|
}
|
|
|
|
|
2016-11-24 17:41:48 +00:00
|
|
|
# type (empty or 'host'), option name, default value
|
|
|
|
defineTest(processQtPath) {
|
|
|
|
out_var = config.rel_input.$${2}
|
|
|
|
path = $$eval(config.input.$${2})
|
|
|
|
isEmpty(path) {
|
|
|
|
$$out_var = $$3
|
|
|
|
} else {
|
|
|
|
path = $$absolute_path($$path, $$OUT_PWD)
|
|
|
|
rel = $$relative_path($$path, $$eval(config.input.$${1}prefix))
|
|
|
|
isEmpty(rel) {
|
|
|
|
$$out_var = .
|
|
|
|
} else: contains(rel, \.\..*) {
|
|
|
|
!equals(2, sysconfdir) {
|
|
|
|
PREFIX_COMPLAINTS += "-$$2 is not a subdirectory of -$${1}prefix."
|
|
|
|
export(PREFIX_COMPLAINTS)
|
|
|
|
!$$eval(have_$${1}prefix) {
|
|
|
|
PREFIX_REMINDER = true
|
|
|
|
export(PREFIX_REMINDER)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$$out_var = $$path
|
|
|
|
} else {
|
|
|
|
$$out_var = $$rel
|
|
|
|
}
|
|
|
|
}
|
|
|
|
export($$out_var)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(addConfStr) {
|
|
|
|
QT_CONFIGURE_STR_OFFSETS += " $$QT_CONFIGURE_STR_OFF,"
|
|
|
|
QT_CONFIGURE_STRS += " \"$$1\\0\""
|
|
|
|
QT_CONFIGURE_STR_OFF = $$num_add($$QT_CONFIGURE_STR_OFF, $$str_size($$1), 1)
|
|
|
|
export(QT_CONFIGURE_STR_OFFSETS)
|
|
|
|
export(QT_CONFIGURE_STRS)
|
|
|
|
export(QT_CONFIGURE_STR_OFF)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineReplace(printInstallPath) {
|
|
|
|
val = $$eval(config.rel_input.$$2)
|
|
|
|
equals(val, $$3): return()
|
|
|
|
return("$$1=$$val")
|
|
|
|
}
|
|
|
|
|
|
|
|
defineReplace(printInstallPaths) {
|
|
|
|
ret = \
|
|
|
|
$$printInstallPath(Documentation, docdir, doc) \
|
|
|
|
$$printInstallPath(Headers, headerdir, include) \
|
|
|
|
$$printInstallPath(Libraries, libdir, lib) \
|
|
|
|
$$printInstallPath(LibraryExecutables, libexecdir, $$DEFAULT_LIBEXEC) \
|
|
|
|
$$printInstallPath(Binaries, bindir, bin) \
|
|
|
|
$$printInstallPath(Plugins, plugindir, plugins) \
|
|
|
|
$$printInstallPath(Imports, importdir, imports) \
|
|
|
|
$$printInstallPath(Qml2Imports, qmldir, qml) \
|
|
|
|
$$printInstallPath(ArchData, archdatadir, .) \
|
|
|
|
$$printInstallPath(Data, datadir, .) \
|
|
|
|
$$printInstallPath(Translations, translationdir, translations) \
|
|
|
|
$$printInstallPath(Examples, examplesdir, examples) \
|
|
|
|
$$printInstallPath(Tests, testsdir, tests)
|
|
|
|
return($$ret)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineReplace(printHostPaths) {
|
|
|
|
ret = \
|
|
|
|
"HostPrefix=$$config.input.hostprefix" \
|
|
|
|
$$printInstallPath(HostBinaries, hostbindir, bin) \
|
|
|
|
$$printInstallPath(HostLibraries, hostlibdir, lib) \
|
|
|
|
$$printInstallPath(HostData, hostdatadir, .) \
|
|
|
|
"Sysroot=$$config.input.sysroot" \
|
2016-12-20 11:34:20 +00:00
|
|
|
"SysrootifyPrefix=$$qmake_sysrootify" \
|
2016-11-16 14:13:52 +00:00
|
|
|
"TargetSpec=$$XSPEC" \
|
2016-11-24 17:41:48 +00:00
|
|
|
"HostSpec=$$[QMAKE_SPEC]"
|
|
|
|
return($$ret)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfOutput_preparePaths) {
|
|
|
|
isEmpty(config.input.prefix) {
|
2017-11-01 12:21:21 +00:00
|
|
|
$$qtConfEvaluate("features.developer-build") {
|
2016-11-24 17:41:48 +00:00
|
|
|
config.input.prefix = $$QT_BUILD_TREE # In Development, we use sandboxed builds by default
|
2017-11-01 12:21:21 +00:00
|
|
|
} else {
|
|
|
|
win32: \
|
|
|
|
config.input.prefix = C:/Qt/Qt-$$[QT_VERSION]
|
|
|
|
else: \
|
|
|
|
config.input.prefix = /usr/local/Qt-$$[QT_VERSION]
|
|
|
|
}
|
2016-11-24 17:41:48 +00:00
|
|
|
have_prefix = false
|
|
|
|
} else {
|
|
|
|
config.input.prefix = $$absolute_path($$config.input.prefix, $$OUT_PWD)
|
|
|
|
have_prefix = true
|
|
|
|
}
|
|
|
|
|
|
|
|
isEmpty(config.input.extprefix) {
|
|
|
|
config.input.extprefix = $$config.input.prefix
|
|
|
|
!isEmpty(config.input.sysroot): \
|
|
|
|
qmake_sysrootify = true
|
|
|
|
else: \
|
|
|
|
qmake_sysrootify = false
|
|
|
|
} else {
|
|
|
|
config.input.extprefix = $$absolute_path($$config.input.extprefix, $$OUT_PWD)
|
|
|
|
qmake_sysrootify = false
|
|
|
|
}
|
|
|
|
|
|
|
|
isEmpty(config.input.hostprefix) {
|
|
|
|
$$qmake_sysrootify: \
|
|
|
|
config.input.hostprefix = $$config.input.sysroot$$config.input.extprefix
|
|
|
|
else: \
|
|
|
|
config.input.hostprefix = $$config.input.extprefix
|
|
|
|
have_hostprefix = false
|
|
|
|
} else {
|
|
|
|
isEqual(config.input.hostprefix, yes): \
|
|
|
|
config.input.hostprefix = $$QT_BUILD_TREE
|
|
|
|
else: \
|
|
|
|
config.input.hostprefix = $$absolute_path($$config.input.hostprefix, $$OUT_PWD)
|
|
|
|
have_hostprefix = true
|
|
|
|
}
|
|
|
|
|
|
|
|
PREFIX_COMPLAINTS =
|
|
|
|
PREFIX_REMINDER = false
|
|
|
|
win32: \
|
|
|
|
DEFAULT_LIBEXEC = bin
|
|
|
|
else: \
|
|
|
|
DEFAULT_LIBEXEC = libexec
|
|
|
|
darwin: \
|
|
|
|
DEFAULT_SYSCONFDIR = /Library/Preferences/Qt
|
|
|
|
else: \
|
|
|
|
DEFAULT_SYSCONFDIR = etc/xdg
|
|
|
|
|
|
|
|
processQtPath("", headerdir, include)
|
|
|
|
processQtPath("", libdir, lib)
|
|
|
|
processQtPath("", bindir, bin)
|
|
|
|
processQtPath("", datadir, .)
|
|
|
|
!equals(config.rel_input.datadir, .): \
|
|
|
|
data_pfx = $$config.rel_input.datadir/
|
|
|
|
processQtPath("", docdir, $${data_pfx}doc)
|
|
|
|
processQtPath("", translationdir, $${data_pfx}translations)
|
|
|
|
processQtPath("", examplesdir, $${data_pfx}examples)
|
|
|
|
processQtPath("", testsdir, tests)
|
|
|
|
processQtPath("", archdatadir, .)
|
|
|
|
!equals(config.rel_input.archdatadir, .): \
|
|
|
|
archdata_pfx = $$config.rel_input.archdatadir/
|
|
|
|
processQtPath("", libexecdir, $${archdata_pfx}$$DEFAULT_LIBEXEC)
|
|
|
|
processQtPath("", plugindir, $${archdata_pfx}plugins)
|
|
|
|
processQtPath("", importdir, $${archdata_pfx}imports)
|
|
|
|
processQtPath("", qmldir, $${archdata_pfx}qml)
|
|
|
|
processQtPath("", sysconfdir, $$DEFAULT_SYSCONFDIR)
|
|
|
|
$$have_hostprefix {
|
|
|
|
processQtPath(host, hostbindir, bin)
|
|
|
|
processQtPath(host, hostlibdir, lib)
|
|
|
|
processQtPath(host, hostdatadir, .)
|
|
|
|
} else {
|
|
|
|
processQtPath(host, hostbindir, $$config.rel_input.bindir)
|
|
|
|
processQtPath(host, hostlibdir, $$config.rel_input.libdir)
|
|
|
|
processQtPath(host, hostdatadir, $$config.rel_input.archdatadir)
|
|
|
|
}
|
|
|
|
|
|
|
|
!isEmpty(PREFIX_COMPLAINTS) {
|
|
|
|
PREFIX_COMPLAINTS = "$$join(PREFIX_COMPLAINTS, "$$escape_expand(\\n)Note: ")"
|
|
|
|
$$PREFIX_REMINDER: \
|
|
|
|
PREFIX_COMPLAINTS += "Maybe you forgot to specify -prefix/-hostprefix?"
|
|
|
|
qtConfAddNote($$PREFIX_COMPLAINTS)
|
|
|
|
}
|
|
|
|
|
|
|
|
# populate qconfig.cpp (for qtcore)
|
|
|
|
|
|
|
|
QT_CONFIGURE_STR_OFF = 0
|
|
|
|
QT_CONFIGURE_STR_OFFSETS =
|
|
|
|
QT_CONFIGURE_STRS =
|
|
|
|
|
|
|
|
addConfStr($$config.rel_input.docdir)
|
|
|
|
addConfStr($$config.rel_input.headerdir)
|
|
|
|
addConfStr($$config.rel_input.libdir)
|
|
|
|
addConfStr($$config.rel_input.libexecdir)
|
|
|
|
addConfStr($$config.rel_input.bindir)
|
|
|
|
addConfStr($$config.rel_input.plugindir)
|
|
|
|
addConfStr($$config.rel_input.importdir)
|
|
|
|
addConfStr($$config.rel_input.qmldir)
|
|
|
|
addConfStr($$config.rel_input.archdatadir)
|
|
|
|
addConfStr($$config.rel_input.datadir)
|
|
|
|
addConfStr($$config.rel_input.translationdir)
|
|
|
|
addConfStr($$config.rel_input.examplesdir)
|
|
|
|
addConfStr($$config.rel_input.testsdir)
|
|
|
|
|
2017-01-03 15:40:30 +00:00
|
|
|
QT_CONFIGURE_STR_OFFSETS_ALL = $$QT_CONFIGURE_STR_OFFSETS
|
|
|
|
QT_CONFIGURE_STRS_ALL = $$QT_CONFIGURE_STRS
|
|
|
|
QT_CONFIGURE_STR_OFFSETS =
|
|
|
|
QT_CONFIGURE_STRS =
|
|
|
|
|
|
|
|
addConfStr($$config.input.sysroot)
|
|
|
|
addConfStr($$qmake_sysrootify)
|
|
|
|
addConfStr($$config.rel_input.hostbindir)
|
|
|
|
addConfStr($$config.rel_input.hostlibdir)
|
|
|
|
addConfStr($$config.rel_input.hostdatadir)
|
|
|
|
addConfStr($$XSPEC)
|
|
|
|
addConfStr($$[QMAKE_SPEC])
|
|
|
|
|
2016-11-24 17:41:48 +00:00
|
|
|
$${currentConfig}.output.qconfigSource = \
|
|
|
|
"/* Installation date */" \
|
|
|
|
"static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \
|
|
|
|
"" \
|
|
|
|
"/* Installation Info */" \
|
|
|
|
"static const char qt_configure_prefix_path_str [12+256] = \"qt_prfxpath=$$config.input.prefix\";" \
|
2017-01-03 15:40:30 +00:00
|
|
|
"$${LITERAL_HASH}ifdef QT_BUILD_QMAKE" \
|
|
|
|
"static const char qt_configure_ext_prefix_path_str [12+256] = \"qt_epfxpath=$$config.input.extprefix\";" \
|
|
|
|
"static const char qt_configure_host_prefix_path_str [12+256] = \"qt_hpfxpath=$$config.input.hostprefix\";" \
|
|
|
|
"$${LITERAL_HASH}endif" \
|
2016-11-24 17:41:48 +00:00
|
|
|
"" \
|
|
|
|
"static const short qt_configure_str_offsets[] = {" \
|
2017-01-03 15:40:30 +00:00
|
|
|
$$QT_CONFIGURE_STR_OFFSETS_ALL \
|
|
|
|
"$${LITERAL_HASH}ifdef QT_BUILD_QMAKE" \
|
2016-11-24 17:41:48 +00:00
|
|
|
$$QT_CONFIGURE_STR_OFFSETS \
|
2017-01-03 15:40:30 +00:00
|
|
|
"$${LITERAL_HASH}endif" \
|
2016-11-24 17:41:48 +00:00
|
|
|
"};" \
|
|
|
|
"static const char qt_configure_strs[] =" \
|
2017-01-03 15:40:30 +00:00
|
|
|
$$QT_CONFIGURE_STRS_ALL \
|
|
|
|
"$${LITERAL_HASH}ifdef QT_BUILD_QMAKE" \
|
2016-11-24 17:41:48 +00:00
|
|
|
$$QT_CONFIGURE_STRS \
|
2017-01-03 15:40:30 +00:00
|
|
|
"$${LITERAL_HASH}endif" \
|
2016-11-24 17:41:48 +00:00
|
|
|
";" \
|
|
|
|
"" \
|
|
|
|
"$${LITERAL_HASH}define QT_CONFIGURE_SETTINGS_PATH \"$$config.rel_input.sysconfdir\"" \
|
|
|
|
"" \
|
2017-01-03 15:40:30 +00:00
|
|
|
"$${LITERAL_HASH}ifdef QT_BUILD_QMAKE" \
|
|
|
|
"$${LITERAL_HASH} define QT_CONFIGURE_SYSROOTIFY_PREFIX $$qmake_sysrootify" \
|
|
|
|
"$${LITERAL_HASH}endif" \
|
|
|
|
"" \
|
|
|
|
"$${LITERAL_HASH}define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12" \
|
|
|
|
"$${LITERAL_HASH}ifdef QT_BUILD_QMAKE" \
|
|
|
|
"$${LITERAL_HASH} define QT_CONFIGURE_EXT_PREFIX_PATH qt_configure_ext_prefix_path_str + 12" \
|
|
|
|
"$${LITERAL_HASH} define QT_CONFIGURE_HOST_PREFIX_PATH qt_configure_host_prefix_path_str + 12" \
|
|
|
|
"$${LITERAL_HASH}endif"
|
2016-11-24 17:41:48 +00:00
|
|
|
export($${currentConfig}.output.qconfigSource)
|
|
|
|
|
|
|
|
# create bin/qt.conf. this doesn't use the regular file output
|
|
|
|
# mechanism, as the file is relied upon by configure tests.
|
|
|
|
|
|
|
|
cont = \
|
|
|
|
"[EffectivePaths]" \
|
|
|
|
"Prefix=.." \
|
|
|
|
"[DevicePaths]" \
|
|
|
|
"Prefix=$$config.input.prefix" \
|
|
|
|
$$printInstallPaths() \
|
|
|
|
"[Paths]" \
|
|
|
|
"Prefix=$$config.input.extprefix" \
|
|
|
|
$$printInstallPaths() \
|
|
|
|
$$printHostPaths()
|
|
|
|
!equals(QT_SOURCE_TREE, $$QT_BUILD_TREE): \
|
|
|
|
cont += \
|
|
|
|
"[EffectiveSourcePaths]" \
|
2017-02-17 08:45:05 +00:00
|
|
|
"Prefix=$$[QT_INSTALL_PREFIX/src]"
|
2016-11-24 17:41:48 +00:00
|
|
|
write_file($$QT_BUILD_TREE/bin/qt.conf, cont)|error()
|
|
|
|
reload_properties()
|
2016-12-20 15:32:59 +00:00
|
|
|
|
|
|
|
# if a sysroot was configured, the spec will be reloaded later,
|
|
|
|
# as some specs contain $$[SYSROOT] references.
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfOutput_reloadSpec) {
|
|
|
|
!isEmpty($${currentConfig}.output.devicePro)| \
|
|
|
|
!isEmpty(config.input.sysroot): \
|
|
|
|
reloadSpec()
|
2017-01-17 16:10:21 +00:00
|
|
|
|
2017-02-03 17:23:04 +00:00
|
|
|
# toolchain.prf uses this.
|
|
|
|
dummy = $$qtConfEvaluate("features.cross_compile")
|
|
|
|
|
2017-01-17 16:10:21 +00:00
|
|
|
bypassNesting() {
|
|
|
|
QMAKE_INTERNAL_INCLUDED_FEATURES -= \
|
|
|
|
$$[QT_HOST_DATA/src]/mkspecs/features/mac/toolchain.prf \
|
|
|
|
$$[QT_HOST_DATA/src]/mkspecs/features/toolchain.prf
|
|
|
|
load(toolchain)
|
|
|
|
}
|
2016-11-24 17:41:48 +00:00
|
|
|
}
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
defineTest(qtConfOutput_shared) {
|
|
|
|
!$${2}: return()
|
|
|
|
|
|
|
|
# export this here, so later tests can use it
|
|
|
|
CONFIG += shared
|
|
|
|
export(CONFIG)
|
|
|
|
}
|
|
|
|
|
2017-12-14 15:23:22 +00:00
|
|
|
defineTest(qtConfOutput_sanitizer) {
|
|
|
|
!$${2}: return()
|
|
|
|
|
|
|
|
# Export this here, so that WebEngine can access it at configure time.
|
|
|
|
CONFIG += sanitizer
|
|
|
|
$$qtConfEvaluate("features.sanitize_address"): CONFIG += sanitize_address
|
|
|
|
$$qtConfEvaluate("features.sanitize_thread"): CONFIG += sanitize_thread
|
|
|
|
$$qtConfEvaluate("features.sanitize_memory"): CONFIG += sanitize_memory
|
|
|
|
$$qtConfEvaluate("features.sanitize_undefined"): CONFIG += sanitize_undefined
|
|
|
|
|
|
|
|
export(CONFIG)
|
|
|
|
}
|
|
|
|
|
2016-06-29 09:39:27 +00:00
|
|
|
defineTest(qtConfOutput_architecture) {
|
|
|
|
arch = $$qtConfEvaluate("tests.architecture.arch")
|
2018-02-20 11:33:23 +00:00
|
|
|
subarch = $$qtConfEvaluate('tests.architecture.subarch')
|
2017-03-27 08:54:59 +00:00
|
|
|
buildabi = $$qtConfEvaluate("tests.architecture.buildabi")
|
2016-06-29 09:39:27 +00:00
|
|
|
|
|
|
|
$$qtConfEvaluate("features.cross_compile") {
|
|
|
|
host_arch = $$qtConfEvaluate("tests.host_architecture.arch")
|
2017-03-27 08:54:59 +00:00
|
|
|
host_buildabi = $$qtConfEvaluate("tests.host_architecture.buildabi")
|
2016-06-29 09:39:27 +00:00
|
|
|
|
|
|
|
privatePro = \
|
|
|
|
"host_build {" \
|
|
|
|
" QT_CPU_FEATURES.$$host_arch = $$qtConfEvaluate('tests.host_architecture.subarch')" \
|
|
|
|
"} else {" \
|
2018-02-20 11:33:23 +00:00
|
|
|
" QT_CPU_FEATURES.$$arch = $$subarch" \
|
2016-06-29 09:39:27 +00:00
|
|
|
"}"
|
|
|
|
publicPro = \
|
|
|
|
"host_build {" \
|
|
|
|
" QT_ARCH = $$host_arch" \
|
2017-04-28 11:54:41 +00:00
|
|
|
" QT_BUILDABI = $$host_buildabi" \
|
2016-06-29 09:39:27 +00:00
|
|
|
" QT_TARGET_ARCH = $$arch" \
|
2017-03-27 08:54:59 +00:00
|
|
|
" QT_TARGET_BUILDABI = $$buildabi" \
|
2016-06-29 09:39:27 +00:00
|
|
|
"} else {" \
|
|
|
|
" QT_ARCH = $$arch" \
|
2017-04-28 11:54:41 +00:00
|
|
|
" QT_BUILDABI = $$buildabi" \
|
2016-06-29 09:39:27 +00:00
|
|
|
"}"
|
|
|
|
|
|
|
|
} else {
|
|
|
|
privatePro = \
|
2018-02-20 11:33:23 +00:00
|
|
|
"QT_CPU_FEATURES.$$arch = $$subarch"
|
2016-06-29 09:39:27 +00:00
|
|
|
publicPro = \
|
2017-03-27 08:54:59 +00:00
|
|
|
"QT_ARCH = $$arch" \
|
|
|
|
"QT_BUILDABI = $$buildabi"
|
2016-06-29 09:39:27 +00:00
|
|
|
}
|
|
|
|
|
Modularize the new configure system (infrastructure part)
This change implements the required infrastructure to modularize the new
configuration system.
This requires a hierarchy of configuration files, both for handling
multiple repositories and for individual modules inside the same
repository.
When configuring, they all need to get loaded first, as command line
processing needs to know about all possible command line options.
When the command line has been processed, the individual configuration
files need to get processed one after the other and independently from
each other.
Configure is now automatically invoked when building the a project
tree's "root" project; this works with both modular and top-level builds
of Qt (the latter with an according change in the super repo). As an
immediate consequence, the -skip option moves to the super repo with a
different implementation, as configuration is now done after the repo
list is determined. The option belongs there anyway.
This commit also adds an optional testDir entry to the json file. Like
this, we can still have all configure tests in qtbase/config.tests and
the configuration file in, e.g., corelib can reference those.
The files section can now be left out as long as a 'module' entry is
present, specifying the module name. The names of the files to generate
can then be deduced from that name. We still need to be able to specify
names directly for the global configuration files.
qtConfig() now also queries features which are module-specific. As it is
sometimes necessary to query the configuration of modules which should
not be actually linked (and cannot in the case of subdirs projects), the
new variable QT_FOR_CONFIG which allows specifying configuration-only
dependencies is introduced.
Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Change-Id: Id1b518a3aa34044748b87fb8fac14d79653f6b18
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-08-25 13:45:44 +00:00
|
|
|
$${currentConfig}.output.publicPro += $$publicPro
|
|
|
|
export($${currentConfig}.output.publicPro)
|
|
|
|
$${currentConfig}.output.privatePro += $$privatePro
|
|
|
|
export($${currentConfig}.output.privatePro)
|
2016-06-29 09:39:27 +00:00
|
|
|
|
2018-02-20 11:33:23 +00:00
|
|
|
# setup QT_ARCH and QT_CPU_FEATURES variables used by qtConfEvaluate
|
2016-06-29 09:39:27 +00:00
|
|
|
QT_ARCH = $$arch
|
|
|
|
export(QT_ARCH)
|
2018-02-20 11:33:23 +00:00
|
|
|
QT_CPU_FEATURES.$$arch = $$subarch
|
|
|
|
export(QT_CPU_FEATURES.$$arch)
|
2016-06-29 09:39:27 +00:00
|
|
|
}
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
defineTest(qtConfOutput_qreal) {
|
|
|
|
qreal = $$config.input.qreal
|
|
|
|
isEmpty(qreal): qreal = "double"
|
|
|
|
qreal_string = $$replace(qreal, [^a-zA-Z0-9], "_")
|
|
|
|
qtConfOutputVar(assign, "privatePro", "QT_COORD_TYPE", $$qreal)
|
|
|
|
!equals(qreal, "double") {
|
|
|
|
qtConfOutputSetDefine("publicHeader", "QT_COORD_TYPE", $$qreal)
|
|
|
|
qtConfOutputSetDefine("publicHeader", "QT_COORD_TYPE_STRING", "\"$$qreal_string\"")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfOutput_pkgConfig) {
|
|
|
|
!$${2}: return()
|
|
|
|
|
2016-10-26 11:42:24 +00:00
|
|
|
PKG_CONFIG_EXECUTABLE = $$eval($${currentConfig}.tests.pkg-config.pkgConfig)
|
|
|
|
qtConfOutputVar(assign, "privatePro", "PKG_CONFIG_EXECUTABLE", $$PKG_CONFIG_EXECUTABLE)
|
|
|
|
export(PKG_CONFIG_EXECUTABLE)
|
2016-06-11 20:49:01 +00:00
|
|
|
# this method also exports PKG_CONFIG_(LIB|SYSROOT)DIR, so that tests using pkgConfig will work correctly
|
Modularize the new configure system (infrastructure part)
This change implements the required infrastructure to modularize the new
configuration system.
This requires a hierarchy of configuration files, both for handling
multiple repositories and for individual modules inside the same
repository.
When configuring, they all need to get loaded first, as command line
processing needs to know about all possible command line options.
When the command line has been processed, the individual configuration
files need to get processed one after the other and independently from
each other.
Configure is now automatically invoked when building the a project
tree's "root" project; this works with both modular and top-level builds
of Qt (the latter with an according change in the super repo). As an
immediate consequence, the -skip option moves to the super repo with a
different implementation, as configuration is now done after the repo
list is determined. The option belongs there anyway.
This commit also adds an optional testDir entry to the json file. Like
this, we can still have all configure tests in qtbase/config.tests and
the configuration file in, e.g., corelib can reference those.
The files section can now be left out as long as a 'module' entry is
present, specifying the module name. The names of the files to generate
can then be deduced from that name. We still need to be able to specify
names directly for the global configuration files.
qtConfig() now also queries features which are module-specific. As it is
sometimes necessary to query the configuration of modules which should
not be actually linked (and cannot in the case of subdirs projects), the
new variable QT_FOR_CONFIG which allows specifying configuration-only
dependencies is introduced.
Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Change-Id: Id1b518a3aa34044748b87fb8fac14d79653f6b18
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-08-25 13:45:44 +00:00
|
|
|
PKG_CONFIG_SYSROOT_DIR = $$eval($${currentConfig}.tests.pkg-config.pkgConfigSysrootDir)
|
2016-06-11 20:49:01 +00:00
|
|
|
!isEmpty(PKG_CONFIG_SYSROOT_DIR) {
|
|
|
|
qtConfOutputVar(assign, "publicPro", "PKG_CONFIG_SYSROOT_DIR", $$PKG_CONFIG_SYSROOT_DIR)
|
|
|
|
export(PKG_CONFIG_SYSROOT_DIR)
|
|
|
|
}
|
Modularize the new configure system (infrastructure part)
This change implements the required infrastructure to modularize the new
configuration system.
This requires a hierarchy of configuration files, both for handling
multiple repositories and for individual modules inside the same
repository.
When configuring, they all need to get loaded first, as command line
processing needs to know about all possible command line options.
When the command line has been processed, the individual configuration
files need to get processed one after the other and independently from
each other.
Configure is now automatically invoked when building the a project
tree's "root" project; this works with both modular and top-level builds
of Qt (the latter with an according change in the super repo). As an
immediate consequence, the -skip option moves to the super repo with a
different implementation, as configuration is now done after the repo
list is determined. The option belongs there anyway.
This commit also adds an optional testDir entry to the json file. Like
this, we can still have all configure tests in qtbase/config.tests and
the configuration file in, e.g., corelib can reference those.
The files section can now be left out as long as a 'module' entry is
present, specifying the module name. The names of the files to generate
can then be deduced from that name. We still need to be able to specify
names directly for the global configuration files.
qtConfig() now also queries features which are module-specific. As it is
sometimes necessary to query the configuration of modules which should
not be actually linked (and cannot in the case of subdirs projects), the
new variable QT_FOR_CONFIG which allows specifying configuration-only
dependencies is introduced.
Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Change-Id: Id1b518a3aa34044748b87fb8fac14d79653f6b18
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-08-25 13:45:44 +00:00
|
|
|
PKG_CONFIG_LIBDIR = $$eval($${currentConfig}.tests.pkg-config.pkgConfigLibdir)
|
2016-06-11 20:49:01 +00:00
|
|
|
!isEmpty(PKG_CONFIG_LIBDIR) {
|
|
|
|
qtConfOutputVar(assign, "publicPro", "PKG_CONFIG_LIBDIR", $$PKG_CONFIG_LIBDIR)
|
|
|
|
export(PKG_CONFIG_LIBDIR)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-03 17:23:04 +00:00
|
|
|
defineTest(qtConfOutput_crossCompile) {
|
|
|
|
!$${2}: return()
|
|
|
|
|
|
|
|
# We need to preempt the output here, as subsequent tests rely on it
|
|
|
|
CONFIG += cross_compile
|
|
|
|
export(CONFIG)
|
|
|
|
}
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
defineTest(qtConfOutput_useGoldLinker) {
|
|
|
|
!$${2}: return()
|
|
|
|
|
|
|
|
# We need to preempt the output here, so that qtConfTest_linkerSupportsFlag can work properly in qtbase
|
|
|
|
CONFIG += use_gold_linker
|
|
|
|
export(CONFIG)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfOutput_debugAndRelease) {
|
|
|
|
$$qtConfEvaluate("features.debug") {
|
|
|
|
qtConfOutputVar(append, "publicPro", "CONFIG", "debug")
|
|
|
|
$${2}: qtConfOutputVar(append, "publicPro", "QT_CONFIG", "release")
|
|
|
|
qtConfOutputVar(append, "publicPro", "QT_CONFIG", "debug")
|
|
|
|
} else {
|
|
|
|
qtConfOutputVar(append, "publicPro", "CONFIG", "release")
|
|
|
|
$${2}: qtConfOutputVar(append, "publicPro", "QT_CONFIG", "debug")
|
|
|
|
qtConfOutputVar(append, "publicPro", "QT_CONFIG", "release")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfOutput_compilerFlags) {
|
|
|
|
# this output also exports the variables locally, so that subsequent compiler tests can use them
|
|
|
|
|
|
|
|
output =
|
|
|
|
!isEmpty(config.input.wflags) {
|
|
|
|
wflags = $$join(config.input.wflags, " -W", "-W")
|
|
|
|
QMAKE_CFLAGS_WARN_ON += $$wflags
|
|
|
|
QMAKE_CXXFLAGS_WARN_ON += $$wflags
|
|
|
|
export(QMAKE_CFLAGS_WARN_ON)
|
|
|
|
export(QMAKE_CXXFLAGS_WARN_ON)
|
|
|
|
output += \
|
|
|
|
"QMAKE_CFLAGS_WARN_ON += $$wflags" \
|
|
|
|
"QMAKE_CXXFLAGS_WARN_ON += $$wflags"
|
|
|
|
}
|
|
|
|
!isEmpty(config.input.defines) {
|
|
|
|
EXTRA_DEFINES += $$config.input.defines
|
|
|
|
export(EXTRA_DEFINES)
|
2016-07-14 19:13:11 +00:00
|
|
|
output += "EXTRA_DEFINES += $$val_escape(config.input.defines)"
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
!isEmpty(config.input.includes) {
|
|
|
|
EXTRA_INCLUDEPATH += $$config.input.includes
|
|
|
|
export(EXTRA_INCLUDEPATH)
|
2016-07-14 19:13:11 +00:00
|
|
|
output += "EXTRA_INCLUDEPATH += $$val_escape(config.input.includes)"
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
2016-07-07 11:47:49 +00:00
|
|
|
!isEmpty(config.input.lpaths) {
|
|
|
|
EXTRA_LIBDIR += $$config.input.lpaths
|
|
|
|
export(EXTRA_LIBDIR)
|
2016-07-14 19:13:11 +00:00
|
|
|
output += "EXTRA_LIBDIR += $$val_escape(config.input.lpaths)"
|
2016-07-07 11:47:49 +00:00
|
|
|
}
|
|
|
|
darwin:!isEmpty(config.input.fpaths) {
|
|
|
|
EXTRA_FRAMEWORKPATH += $$config.input.fpaths
|
|
|
|
export(EXTRA_FRAMEWORKPATH)
|
2016-07-14 19:13:11 +00:00
|
|
|
output += "EXTRA_FRAMEWORKPATH += $$val_escape(config.input.fpaths)"
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
Modularize the new configure system (infrastructure part)
This change implements the required infrastructure to modularize the new
configuration system.
This requires a hierarchy of configuration files, both for handling
multiple repositories and for individual modules inside the same
repository.
When configuring, they all need to get loaded first, as command line
processing needs to know about all possible command line options.
When the command line has been processed, the individual configuration
files need to get processed one after the other and independently from
each other.
Configure is now automatically invoked when building the a project
tree's "root" project; this works with both modular and top-level builds
of Qt (the latter with an according change in the super repo). As an
immediate consequence, the -skip option moves to the super repo with a
different implementation, as configuration is now done after the repo
list is determined. The option belongs there anyway.
This commit also adds an optional testDir entry to the json file. Like
this, we can still have all configure tests in qtbase/config.tests and
the configuration file in, e.g., corelib can reference those.
The files section can now be left out as long as a 'module' entry is
present, specifying the module name. The names of the files to generate
can then be deduced from that name. We still need to be able to specify
names directly for the global configuration files.
qtConfig() now also queries features which are module-specific. As it is
sometimes necessary to query the configuration of modules which should
not be actually linked (and cannot in the case of subdirs projects), the
new variable QT_FOR_CONFIG which allows specifying configuration-only
dependencies is introduced.
Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Change-Id: Id1b518a3aa34044748b87fb8fac14d79653f6b18
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-08-25 13:45:44 +00:00
|
|
|
$${currentConfig}.output.privatePro += $$output
|
|
|
|
export($${currentConfig}.output.privatePro)
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfOutput_gccSysroot) {
|
|
|
|
!$${2}: return()
|
|
|
|
|
|
|
|
# This variable also needs to be exported immediately, so the compilation tests
|
|
|
|
# can pick it up.
|
replace mechanism to override variables from the mkspecs
it is sometimes desirable to override values from the mkspec without
modifying (or wrapping) the spec itself. linux distributors do this on a
regular basis.
so far, we'd pick up CFLAGS, etc. from the environment, in a somewhat
autoconf-like fashion. however, over time, this approach proved
problematic: the concept doesn't mix particularly well with mkspecs to
start with, is unexpected (and therefore causes frustration), and
doesn't mix well with cross-building (at least the way it was realized).
ironically, it was implemented this way (quite a while ago) upon my
explicit request ...
the new mechanism uses explicit variable manipulations on the configure
command line, just like qmake itself understands. as it happens, this is
again quite similar to autoconf-generated configure scripts. however,
this time around we don't pretend to be actually autoconf-like, so we
also don't try to map any variable names (some of which have different
semantics anyway).
this commit also eliminates the last use of the QMakeVar() function,
so delete it and the underlying infrastructure.
Task-number: QTBUG-32530
Task-number: QTBUG-42962
Change-Id: Id31a6b80e1add08ca21f5b178614bda530d12374
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-07-06 11:58:53 +00:00
|
|
|
EXTRA_QMAKE_ARGS += \
|
2016-06-11 20:49:01 +00:00
|
|
|
"\"QMAKE_CFLAGS += --sysroot=$$config.input.sysroot\"" \
|
|
|
|
"\"QMAKE_CXXFLAGS += --sysroot=$$config.input.sysroot\"" \
|
|
|
|
"\"QMAKE_LFLAGS += --sysroot=$$config.input.sysroot\""
|
|
|
|
export(EXTRA_QMAKE_ARGS)
|
|
|
|
|
2018-06-25 19:08:57 +00:00
|
|
|
# This one is for qtConfToolchainSupportsFlag().
|
|
|
|
QMAKE_CXXFLAGS += --sysroot=$$config.input.sysroot
|
|
|
|
export(QMAKE_CXXFLAGS)
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
output = \
|
|
|
|
"!host_build {" \
|
|
|
|
" QMAKE_CFLAGS += --sysroot=\$\$[QT_SYSROOT]" \
|
|
|
|
" QMAKE_CXXFLAGS += --sysroot=\$\$[QT_SYSROOT]" \
|
|
|
|
" QMAKE_LFLAGS += --sysroot=\$\$[QT_SYSROOT]" \
|
|
|
|
"}"
|
Modularize the new configure system (infrastructure part)
This change implements the required infrastructure to modularize the new
configuration system.
This requires a hierarchy of configuration files, both for handling
multiple repositories and for individual modules inside the same
repository.
When configuring, they all need to get loaded first, as command line
processing needs to know about all possible command line options.
When the command line has been processed, the individual configuration
files need to get processed one after the other and independently from
each other.
Configure is now automatically invoked when building the a project
tree's "root" project; this works with both modular and top-level builds
of Qt (the latter with an according change in the super repo). As an
immediate consequence, the -skip option moves to the super repo with a
different implementation, as configuration is now done after the repo
list is determined. The option belongs there anyway.
This commit also adds an optional testDir entry to the json file. Like
this, we can still have all configure tests in qtbase/config.tests and
the configuration file in, e.g., corelib can reference those.
The files section can now be left out as long as a 'module' entry is
present, specifying the module name. The names of the files to generate
can then be deduced from that name. We still need to be able to specify
names directly for the global configuration files.
qtConfig() now also queries features which are module-specific. As it is
sometimes necessary to query the configuration of modules which should
not be actually linked (and cannot in the case of subdirs projects), the
new variable QT_FOR_CONFIG which allows specifying configuration-only
dependencies is introduced.
Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Change-Id: Id1b518a3aa34044748b87fb8fac14d79653f6b18
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-08-25 13:45:44 +00:00
|
|
|
$${currentConfig}.output.publicPro += $$output
|
|
|
|
export($${currentConfig}.output.publicPro)
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
replace mechanism to override variables from the mkspecs
it is sometimes desirable to override values from the mkspec without
modifying (or wrapping) the spec itself. linux distributors do this on a
regular basis.
so far, we'd pick up CFLAGS, etc. from the environment, in a somewhat
autoconf-like fashion. however, over time, this approach proved
problematic: the concept doesn't mix particularly well with mkspecs to
start with, is unexpected (and therefore causes frustration), and
doesn't mix well with cross-building (at least the way it was realized).
ironically, it was implemented this way (quite a while ago) upon my
explicit request ...
the new mechanism uses explicit variable manipulations on the configure
command line, just like qmake itself understands. as it happens, this is
again quite similar to autoconf-generated configure scripts. however,
this time around we don't pretend to be actually autoconf-like, so we
also don't try to map any variable names (some of which have different
semantics anyway).
this commit also eliminates the last use of the QMakeVar() function,
so delete it and the underlying infrastructure.
Task-number: QTBUG-32530
Task-number: QTBUG-42962
Change-Id: Id31a6b80e1add08ca21f5b178614bda530d12374
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-07-06 11:58:53 +00:00
|
|
|
defineTest(qtConfOutput_qmakeArgs) {
|
|
|
|
!$${2}: return()
|
|
|
|
|
2017-08-18 13:43:37 +00:00
|
|
|
$${currentConfig}.output.privatePro += "!host_build|!cross_compile {"
|
replace mechanism to override variables from the mkspecs
it is sometimes desirable to override values from the mkspec without
modifying (or wrapping) the spec itself. linux distributors do this on a
regular basis.
so far, we'd pick up CFLAGS, etc. from the environment, in a somewhat
autoconf-like fashion. however, over time, this approach proved
problematic: the concept doesn't mix particularly well with mkspecs to
start with, is unexpected (and therefore causes frustration), and
doesn't mix well with cross-building (at least the way it was realized).
ironically, it was implemented this way (quite a while ago) upon my
explicit request ...
the new mechanism uses explicit variable manipulations on the configure
command line, just like qmake itself understands. as it happens, this is
again quite similar to autoconf-generated configure scripts. however,
this time around we don't pretend to be actually autoconf-like, so we
also don't try to map any variable names (some of which have different
semantics anyway).
this commit also eliminates the last use of the QMakeVar() function,
so delete it and the underlying infrastructure.
Task-number: QTBUG-32530
Task-number: QTBUG-42962
Change-Id: Id31a6b80e1add08ca21f5b178614bda530d12374
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-07-06 11:58:53 +00:00
|
|
|
for (a, config.input.qmakeArgs) {
|
Modularize the new configure system (infrastructure part)
This change implements the required infrastructure to modularize the new
configuration system.
This requires a hierarchy of configuration files, both for handling
multiple repositories and for individual modules inside the same
repository.
When configuring, they all need to get loaded first, as command line
processing needs to know about all possible command line options.
When the command line has been processed, the individual configuration
files need to get processed one after the other and independently from
each other.
Configure is now automatically invoked when building the a project
tree's "root" project; this works with both modular and top-level builds
of Qt (the latter with an according change in the super repo). As an
immediate consequence, the -skip option moves to the super repo with a
different implementation, as configuration is now done after the repo
list is determined. The option belongs there anyway.
This commit also adds an optional testDir entry to the json file. Like
this, we can still have all configure tests in qtbase/config.tests and
the configuration file in, e.g., corelib can reference those.
The files section can now be left out as long as a 'module' entry is
present, specifying the module name. The names of the files to generate
can then be deduced from that name. We still need to be able to specify
names directly for the global configuration files.
qtConfig() now also queries features which are module-specific. As it is
sometimes necessary to query the configuration of modules which should
not be actually linked (and cannot in the case of subdirs projects), the
new variable QT_FOR_CONFIG which allows specifying configuration-only
dependencies is introduced.
Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Change-Id: Id1b518a3aa34044748b87fb8fac14d79653f6b18
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-08-25 13:45:44 +00:00
|
|
|
$${currentConfig}.output.privatePro += " $$a"
|
replace mechanism to override variables from the mkspecs
it is sometimes desirable to override values from the mkspec without
modifying (or wrapping) the spec itself. linux distributors do this on a
regular basis.
so far, we'd pick up CFLAGS, etc. from the environment, in a somewhat
autoconf-like fashion. however, over time, this approach proved
problematic: the concept doesn't mix particularly well with mkspecs to
start with, is unexpected (and therefore causes frustration), and
doesn't mix well with cross-building (at least the way it was realized).
ironically, it was implemented this way (quite a while ago) upon my
explicit request ...
the new mechanism uses explicit variable manipulations on the configure
command line, just like qmake itself understands. as it happens, this is
again quite similar to autoconf-generated configure scripts. however,
this time around we don't pretend to be actually autoconf-like, so we
also don't try to map any variable names (some of which have different
semantics anyway).
this commit also eliminates the last use of the QMakeVar() function,
so delete it and the underlying infrastructure.
Task-number: QTBUG-32530
Task-number: QTBUG-42962
Change-Id: Id31a6b80e1add08ca21f5b178614bda530d12374
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-07-06 11:58:53 +00:00
|
|
|
EXTRA_QMAKE_ARGS += $$system_quote($$a)
|
|
|
|
}
|
Modularize the new configure system (infrastructure part)
This change implements the required infrastructure to modularize the new
configuration system.
This requires a hierarchy of configuration files, both for handling
multiple repositories and for individual modules inside the same
repository.
When configuring, they all need to get loaded first, as command line
processing needs to know about all possible command line options.
When the command line has been processed, the individual configuration
files need to get processed one after the other and independently from
each other.
Configure is now automatically invoked when building the a project
tree's "root" project; this works with both modular and top-level builds
of Qt (the latter with an according change in the super repo). As an
immediate consequence, the -skip option moves to the super repo with a
different implementation, as configuration is now done after the repo
list is determined. The option belongs there anyway.
This commit also adds an optional testDir entry to the json file. Like
this, we can still have all configure tests in qtbase/config.tests and
the configuration file in, e.g., corelib can reference those.
The files section can now be left out as long as a 'module' entry is
present, specifying the module name. The names of the files to generate
can then be deduced from that name. We still need to be able to specify
names directly for the global configuration files.
qtConfig() now also queries features which are module-specific. As it is
sometimes necessary to query the configuration of modules which should
not be actually linked (and cannot in the case of subdirs projects), the
new variable QT_FOR_CONFIG which allows specifying configuration-only
dependencies is introduced.
Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Change-Id: Id1b518a3aa34044748b87fb8fac14d79653f6b18
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-08-25 13:45:44 +00:00
|
|
|
$${currentConfig}.output.privatePro += "}"
|
replace mechanism to override variables from the mkspecs
it is sometimes desirable to override values from the mkspec without
modifying (or wrapping) the spec itself. linux distributors do this on a
regular basis.
so far, we'd pick up CFLAGS, etc. from the environment, in a somewhat
autoconf-like fashion. however, over time, this approach proved
problematic: the concept doesn't mix particularly well with mkspecs to
start with, is unexpected (and therefore causes frustration), and
doesn't mix well with cross-building (at least the way it was realized).
ironically, it was implemented this way (quite a while ago) upon my
explicit request ...
the new mechanism uses explicit variable manipulations on the configure
command line, just like qmake itself understands. as it happens, this is
again quite similar to autoconf-generated configure scripts. however,
this time around we don't pretend to be actually autoconf-like, so we
also don't try to map any variable names (some of which have different
semantics anyway).
this commit also eliminates the last use of the QMakeVar() function,
so delete it and the underlying infrastructure.
Task-number: QTBUG-32530
Task-number: QTBUG-42962
Change-Id: Id31a6b80e1add08ca21f5b178614bda530d12374
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-07-06 11:58:53 +00:00
|
|
|
export(EXTRA_QMAKE_ARGS)
|
Modularize the new configure system (infrastructure part)
This change implements the required infrastructure to modularize the new
configuration system.
This requires a hierarchy of configuration files, both for handling
multiple repositories and for individual modules inside the same
repository.
When configuring, they all need to get loaded first, as command line
processing needs to know about all possible command line options.
When the command line has been processed, the individual configuration
files need to get processed one after the other and independently from
each other.
Configure is now automatically invoked when building the a project
tree's "root" project; this works with both modular and top-level builds
of Qt (the latter with an according change in the super repo). As an
immediate consequence, the -skip option moves to the super repo with a
different implementation, as configuration is now done after the repo
list is determined. The option belongs there anyway.
This commit also adds an optional testDir entry to the json file. Like
this, we can still have all configure tests in qtbase/config.tests and
the configuration file in, e.g., corelib can reference those.
The files section can now be left out as long as a 'module' entry is
present, specifying the module name. The names of the files to generate
can then be deduced from that name. We still need to be able to specify
names directly for the global configuration files.
qtConfig() now also queries features which are module-specific. As it is
sometimes necessary to query the configuration of modules which should
not be actually linked (and cannot in the case of subdirs projects), the
new variable QT_FOR_CONFIG which allows specifying configuration-only
dependencies is introduced.
Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Change-Id: Id1b518a3aa34044748b87fb8fac14d79653f6b18
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-08-25 13:45:44 +00:00
|
|
|
export($${currentConfig}.output.privatePro)
|
replace mechanism to override variables from the mkspecs
it is sometimes desirable to override values from the mkspec without
modifying (or wrapping) the spec itself. linux distributors do this on a
regular basis.
so far, we'd pick up CFLAGS, etc. from the environment, in a somewhat
autoconf-like fashion. however, over time, this approach proved
problematic: the concept doesn't mix particularly well with mkspecs to
start with, is unexpected (and therefore causes frustration), and
doesn't mix well with cross-building (at least the way it was realized).
ironically, it was implemented this way (quite a while ago) upon my
explicit request ...
the new mechanism uses explicit variable manipulations on the configure
command line, just like qmake itself understands. as it happens, this is
again quite similar to autoconf-generated configure scripts. however,
this time around we don't pretend to be actually autoconf-like, so we
also don't try to map any variable names (some of which have different
semantics anyway).
this commit also eliminates the last use of the QMakeVar() function,
so delete it and the underlying infrastructure.
Task-number: QTBUG-32530
Task-number: QTBUG-42962
Change-Id: Id31a6b80e1add08ca21f5b178614bda530d12374
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-07-06 11:58:53 +00:00
|
|
|
}
|
|
|
|
|
2016-11-08 17:50:54 +00:00
|
|
|
defineReplace(qtConfOutputPostProcess_publicPro) {
|
2016-06-11 20:49:01 +00:00
|
|
|
qt_version = $$[QT_VERSION]
|
|
|
|
output = \
|
2016-11-08 17:50:54 +00:00
|
|
|
$$1 \
|
2016-06-11 20:49:01 +00:00
|
|
|
"QT_VERSION = $$qt_version" \
|
|
|
|
"QT_MAJOR_VERSION = $$section(qt_version, '.', 0, 0)" \
|
|
|
|
"QT_MINOR_VERSION = $$section(qt_version, '.', 1, 1)" \
|
2016-06-29 09:39:27 +00:00
|
|
|
"QT_PATCH_VERSION = $$section(qt_version, '.', 2, 2)"
|
2016-06-11 20:49:01 +00:00
|
|
|
|
|
|
|
#libinfix and namespace
|
|
|
|
!isEmpty(config.input.qt_libinfix): output += "QT_LIBINFIX = $$config.input.qt_libinfix"
|
|
|
|
!isEmpty(config.input.qt_namespace): output += "QT_NAMESPACE = $$config.input.qt_namespace"
|
|
|
|
|
2017-06-08 12:30:33 +00:00
|
|
|
!isEmpty(QMAKE_GCC_MAJOR_VERSION) {
|
|
|
|
output += \
|
|
|
|
"QT_GCC_MAJOR_VERSION = $$QMAKE_GCC_MAJOR_VERSION" \
|
|
|
|
"QT_GCC_MINOR_VERSION = $$QMAKE_GCC_MINOR_VERSION" \
|
|
|
|
"QT_GCC_PATCH_VERSION = $$QMAKE_GCC_PATCH_VERSION"
|
|
|
|
}
|
2018-08-31 10:33:08 +00:00
|
|
|
!isEmpty(QMAKE_MAC_SDK_VERSION): \
|
|
|
|
output += "QT_MAC_SDK_VERSION = $$QMAKE_MAC_SDK_VERSION"
|
2017-06-08 12:30:33 +00:00
|
|
|
!isEmpty(QMAKE_CLANG_MAJOR_VERSION) {
|
|
|
|
output += \
|
|
|
|
"QT_CLANG_MAJOR_VERSION = $$QMAKE_CLANG_MAJOR_VERSION" \
|
|
|
|
"QT_CLANG_MINOR_VERSION = $$QMAKE_CLANG_MINOR_VERSION" \
|
|
|
|
"QT_CLANG_PATCH_VERSION = $$QMAKE_CLANG_PATCH_VERSION"
|
|
|
|
}
|
|
|
|
!isEmpty(QMAKE_APPLE_CLANG_MAJOR_VERSION) {
|
|
|
|
output += \
|
|
|
|
"QT_APPLE_CLANG_MAJOR_VERSION = $$QMAKE_APPLE_CLANG_MAJOR_VERSION" \
|
|
|
|
"QT_APPLE_CLANG_MINOR_VERSION = $$QMAKE_APPLE_CLANG_MINOR_VERSION" \
|
|
|
|
"QT_APPLE_CLANG_PATCH_VERSION = $$QMAKE_APPLE_CLANG_PATCH_VERSION"
|
|
|
|
}
|
|
|
|
!isEmpty(QMAKE_MSC_VER) {
|
|
|
|
output += \
|
|
|
|
"QT_MSVC_MAJOR_VERSION = $$replace(QMAKE_MSC_FULL_VER, "(..)(..)(.*)", "\\1")" \
|
|
|
|
"QT_MSVC_MINOR_VERSION = $$format_number($$replace(QMAKE_MSC_FULL_VER, "(..)(..)(.*)", "\\2"))" \
|
|
|
|
"QT_MSVC_PATCH_VERSION = $$replace(QMAKE_MSC_FULL_VER, "(..)(..)(.*)", "\\3")"
|
|
|
|
}
|
|
|
|
!isEmpty(QMAKE_ICC_VER) {
|
|
|
|
output += \
|
|
|
|
"QT_ICC_MAJOR_VERSION = $$replace(QMAKE_ICC_VER, "(..)(..)", "\\1")" \
|
|
|
|
"QT_ICC_MINOR_VERSION = $$format_number($$replace(QMAKE_ICC_VER, "(..)(..)", "\\2"))" \
|
|
|
|
"QT_ICC_PATCH_VERSION = $$QMAKE_ICC_UPDATE_VER"
|
|
|
|
}
|
2018-08-09 14:05:51 +00:00
|
|
|
!isEmpty(QMAKE_GHS_VERSION) {
|
|
|
|
output += \
|
|
|
|
"QT_GHS_MAJOR_VERSION = $$replace(QMAKE_GHS_VERSION, "(.*)(.)(.)", "\\1")" \
|
|
|
|
"QT_GHS_MINOR_VERSION = $$replace(QMAKE_GHS_VERSION, "(.*)(.)(.)", "\\2")" \
|
|
|
|
"QT_GHS_PATCH_VERSION = $$replace(QMAKE_GHS_VERSION, "(.*)(.)(.)", "\\3")"
|
|
|
|
}
|
2017-06-08 12:30:33 +00:00
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
output += "QT_EDITION = $$config.input.qt_edition"
|
|
|
|
!contains(config.input.qt_edition, "(OpenSource|Preview)") {
|
|
|
|
output += \
|
|
|
|
"QT_LICHECK = $$config.input.qt_licheck" \
|
|
|
|
"QT_RELEASE_DATE = $$config.input.qt_release_date"
|
|
|
|
}
|
|
|
|
|
2016-11-08 17:50:54 +00:00
|
|
|
return($$output)
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
2016-11-23 20:11:11 +00:00
|
|
|
defineReplace(qtConfOutputPostProcess_privatePro) {
|
|
|
|
output = $$1
|
|
|
|
|
|
|
|
!isEmpty(config.input.external-hostbindir): \
|
|
|
|
output += "HOST_QT_TOOLS = $$val_escape(config.input.external-hostbindir)"
|
|
|
|
|
|
|
|
return($$output)
|
|
|
|
}
|
|
|
|
|
2016-11-08 17:50:54 +00:00
|
|
|
defineReplace(qtConfOutputPostProcess_publicHeader) {
|
2016-06-11 20:49:01 +00:00
|
|
|
qt_version = $$[QT_VERSION]
|
|
|
|
output = \
|
2016-11-08 17:50:54 +00:00
|
|
|
$$1 \
|
2016-06-11 20:49:01 +00:00
|
|
|
"$${LITERAL_HASH}define QT_VERSION_STR \"$$qt_version\"" \
|
|
|
|
"$${LITERAL_HASH}define QT_VERSION_MAJOR $$section(qt_version, '.', 0, 0)" \
|
|
|
|
"$${LITERAL_HASH}define QT_VERSION_MINOR $$section(qt_version, '.', 1, 1)" \
|
|
|
|
"$${LITERAL_HASH}define QT_VERSION_PATCH $$section(qt_version, '.', 2, 2)"
|
|
|
|
|
|
|
|
!$$qtConfEvaluate("features.shared") {
|
|
|
|
output += \
|
|
|
|
"/* Qt was configured for a static build */" \
|
|
|
|
"$${LITERAL_HASH}if !defined(QT_SHARED) && !defined(QT_STATIC)" \
|
|
|
|
"$${LITERAL_HASH} define QT_STATIC" \
|
|
|
|
"$${LITERAL_HASH}endif"
|
|
|
|
}
|
|
|
|
|
|
|
|
!isEmpty(config.input.qt_libinfix): \
|
|
|
|
output += "$${LITERAL_HASH}define QT_LIBINFIX \"$$eval(config.input.qt_libinfix)\""
|
|
|
|
|
2016-11-08 17:50:54 +00:00
|
|
|
return($$output)
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
# custom reporting
|
|
|
|
|
|
|
|
defineTest(qtConfReport_buildParts) {
|
2016-06-22 07:52:41 +00:00
|
|
|
qtConfReportPadded($${1}, $$qtConfEvaluate("tests.build_parts.value"))
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
2016-12-05 15:13:40 +00:00
|
|
|
defineReplace(qtConfReportArch) {
|
|
|
|
arch = $$qtConfEvaluate('tests.$${1}.arch')
|
|
|
|
subarch = $$qtConfEvaluate('tests.$${1}.subarch')
|
|
|
|
isEmpty(subarch): subarch = <none>
|
|
|
|
return("$$arch, CPU features: $$subarch")
|
|
|
|
}
|
|
|
|
|
2018-09-18 08:42:12 +00:00
|
|
|
defineReplace(qtConfReportCompiler) {
|
|
|
|
clang_cl: {
|
|
|
|
return("clang-cl $${QMAKE_CLANG_MAJOR_VERSION}.$${QMAKE_CLANG_MINOR_VERSION}.$${QMAKE_CLANG_PATCH_VERSION}")
|
|
|
|
} else: clang {
|
|
|
|
!isEmpty(QMAKE_APPLE_CLANG_MAJOR_VERSION) {
|
|
|
|
return("clang (Apple) $${QMAKE_APPLE_CLANG_MAJOR_VERSION}.$${QMAKE_APPLE_CLANG_MINOR_VERSION}.$${QMAKE_APPLE_CLANG_PATCH_VERSION}")
|
|
|
|
} else {
|
|
|
|
return("clang $${QMAKE_CLANG_MAJOR_VERSION}.$${QMAKE_CLANG_MINOR_VERSION}.$${QMAKE_CLANG_PATCH_VERSION}")
|
|
|
|
}
|
|
|
|
} else: intel_icc {
|
|
|
|
return("intel_icc $$QMAKE_ICC_VER")
|
|
|
|
} else: intel_icl {
|
|
|
|
return("intel_icl $$QMAKE_ICC_VER")
|
|
|
|
} else: rim_qcc {
|
|
|
|
return("rim_qcc $${QMAKE_GCC_MAJOR_VERSION}.$${QMAKE_GCC_MINOR_VERSION}.$${QMAKE_GCC_PATCH_VERSION}")
|
|
|
|
} else: gcc {
|
|
|
|
return("gcc $${QMAKE_GCC_MAJOR_VERSION}.$${QMAKE_GCC_MINOR_VERSION}.$${QMAKE_GCC_PATCH_VERSION}")
|
|
|
|
} else: msvc {
|
|
|
|
return("msvc $$QMAKE_MSC_FULL_VER")
|
|
|
|
} else: ghs {
|
|
|
|
return("ghs $$QMAKE_GHS_VERSION")
|
|
|
|
} else {
|
|
|
|
return("unknown ($$QMAKE_COMPILER)")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
defineTest(qtConfReport_buildTypeAndConfig) {
|
2016-06-29 09:39:27 +00:00
|
|
|
!$$qtConfEvaluate("features.cross_compile") {
|
2016-12-05 15:13:40 +00:00
|
|
|
qtConfAddReport("Build type: $$[QMAKE_SPEC] ($$qtConfReportArch(architecture))")
|
2018-09-18 08:42:12 +00:00
|
|
|
qtConfAddReport("Compiler: $$qtConfReportCompiler()")
|
2016-06-11 20:49:01 +00:00
|
|
|
} else {
|
2016-12-05 15:13:40 +00:00
|
|
|
qtConfAddReport("Building on: $$[QMAKE_SPEC] ($$qtConfReportArch(host_architecture))")
|
|
|
|
qtConfAddReport("Building for: $$[QMAKE_XSPEC] ($$qtConfReportArch(architecture))")
|
2018-09-18 08:42:12 +00:00
|
|
|
qtConfAddReport("Target compiler: $$qtConfReportCompiler()")
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
2018-09-18 08:42:12 +00:00
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
qtConfAddReport()
|
Modularize the new configure system (infrastructure part)
This change implements the required infrastructure to modularize the new
configuration system.
This requires a hierarchy of configuration files, both for handling
multiple repositories and for individual modules inside the same
repository.
When configuring, they all need to get loaded first, as command line
processing needs to know about all possible command line options.
When the command line has been processed, the individual configuration
files need to get processed one after the other and independently from
each other.
Configure is now automatically invoked when building the a project
tree's "root" project; this works with both modular and top-level builds
of Qt (the latter with an according change in the super repo). As an
immediate consequence, the -skip option moves to the super repo with a
different implementation, as configuration is now done after the repo
list is determined. The option belongs there anyway.
This commit also adds an optional testDir entry to the json file. Like
this, we can still have all configure tests in qtbase/config.tests and
the configuration file in, e.g., corelib can reference those.
The files section can now be left out as long as a 'module' entry is
present, specifying the module name. The names of the files to generate
can then be deduced from that name. We still need to be able to specify
names directly for the global configuration files.
qtConfig() now also queries features which are module-specific. As it is
sometimes necessary to query the configuration of modules which should
not be actually linked (and cannot in the case of subdirs projects), the
new variable QT_FOR_CONFIG which allows specifying configuration-only
dependencies is introduced.
Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Change-Id: Id1b518a3aa34044748b87fb8fac14d79653f6b18
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-08-25 13:45:44 +00:00
|
|
|
qtConfAddReport("Configuration: $$eval($${currentConfig}.output.privatePro.append.CONFIG) $$eval($${currentConfig}.output.publicPro.append.QT_CONFIG)")
|
2016-06-11 20:49:01 +00:00
|
|
|
qtConfAddReport()
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfReport_buildMode) {
|
|
|
|
$$qtConfEvaluate("features.force_debug_info"): \
|
|
|
|
release = "release (with debug info)"
|
|
|
|
else: \
|
|
|
|
release = "release"
|
|
|
|
|
2016-11-02 16:42:56 +00:00
|
|
|
$$qtConfEvaluate("features.debug") {
|
2016-06-11 20:49:01 +00:00
|
|
|
build_mode = "debug"
|
2016-11-02 16:42:56 +00:00
|
|
|
raw_build_mode = "debug"
|
|
|
|
} else {
|
2016-06-11 20:49:01 +00:00
|
|
|
build_mode = $$release
|
2016-11-02 16:42:56 +00:00
|
|
|
raw_build_mode = "release"
|
|
|
|
}
|
2016-06-11 20:49:01 +00:00
|
|
|
|
|
|
|
$$qtConfEvaluate("features.debug_and_release"): \
|
2016-11-02 16:42:56 +00:00
|
|
|
build_mode = "debug and $$release; default link: $$raw_build_mode"
|
2016-06-11 20:49:01 +00:00
|
|
|
|
|
|
|
$$qtConfEvaluate("features.release_tools"): \
|
|
|
|
build_mode = "$$build_mode; optimized tools"
|
|
|
|
|
|
|
|
qtConfReportPadded($$1, $$build_mode)
|
|
|
|
}
|
|
|
|
|
2016-08-23 12:22:19 +00:00
|
|
|
# ensure pristine environment for configuration
|
|
|
|
discard_from($$[QT_HOST_DATA/get]/mkspecs/qconfig.pri)
|
|
|
|
discard_from($$[QT_HOST_DATA/get]/mkspecs/qmodule.pri)
|
Modularize the new configure system (infrastructure part)
This change implements the required infrastructure to modularize the new
configuration system.
This requires a hierarchy of configuration files, both for handling
multiple repositories and for individual modules inside the same
repository.
When configuring, they all need to get loaded first, as command line
processing needs to know about all possible command line options.
When the command line has been processed, the individual configuration
files need to get processed one after the other and independently from
each other.
Configure is now automatically invoked when building the a project
tree's "root" project; this works with both modular and top-level builds
of Qt (the latter with an according change in the super repo). As an
immediate consequence, the -skip option moves to the super repo with a
different implementation, as configuration is now done after the repo
list is determined. The option belongs there anyway.
This commit also adds an optional testDir entry to the json file. Like
this, we can still have all configure tests in qtbase/config.tests and
the configuration file in, e.g., corelib can reference those.
The files section can now be left out as long as a 'module' entry is
present, specifying the module name. The names of the files to generate
can then be deduced from that name. We still need to be able to specify
names directly for the global configuration files.
qtConfig() now also queries features which are module-specific. As it is
sometimes necessary to query the configuration of modules which should
not be actually linked (and cannot in the case of subdirs projects), the
new variable QT_FOR_CONFIG which allows specifying configuration-only
dependencies is introduced.
Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Change-Id: Id1b518a3aa34044748b87fb8fac14d79653f6b18
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-08-25 13:45:44 +00:00
|
|
|
# ... and cause them to be reloaded afterwards
|
|
|
|
QMAKE_POST_CONFIGURE += \
|
|
|
|
"include(\$\$[QT_HOST_DATA/get]/mkspecs/qconfig.pri)" \
|
|
|
|
"include(\$\$[QT_HOST_DATA/get]/mkspecs/qmodule.pri)"
|
2016-11-15 19:49:43 +00:00
|
|
|
|
|
|
|
defineTest(createConfigStatus) {
|
|
|
|
$$QMAKE_REDO_CONFIG: return()
|
|
|
|
cfg = $$relative_path($$_PRO_FILE_PWD_/configure, $$OUT_PWD)
|
|
|
|
ext =
|
|
|
|
equals(QMAKE_HOST.os, Windows) {
|
|
|
|
ext = .bat
|
|
|
|
cont = \
|
|
|
|
"$$system_quote($$system_path($$cfg)$$ext) -redo %*"
|
|
|
|
} else {
|
2018-10-12 13:34:36 +00:00
|
|
|
!contains(cfg, .*/.*): cfg = ./$$cfg
|
2016-11-15 19:49:43 +00:00
|
|
|
cont = \
|
|
|
|
"$${LITERAL_HASH}!/bin/sh" \
|
|
|
|
"exec $$system_quote($$cfg) -redo \"$@\""
|
|
|
|
}
|
|
|
|
write_file($$OUT_PWD/config.status$$ext, cont, exe)|error()
|
|
|
|
}
|
|
|
|
|
|
|
|
QMAKE_POST_CONFIGURE += \
|
|
|
|
"createConfigStatus()"
|