diff options
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 39 |
1 files changed, 32 insertions, 7 deletions
diff --git a/configure.pri b/configure.pri index 629ca78ff1..d92653885f 100644 --- a/configure.pri +++ b/configure.pri @@ -58,6 +58,21 @@ defineTest(qtConfCommandline_sanitize) { } } +defineTest(qtConfCommandline_coverage) { + arg = $${1} + val = $${2} + isEmpty(val): val = $$qtConfGetNextCommandlineArg() + !contains(val, "^-.*"):!isEmpty(val) { + equals(val, "trace-pc-guard") { + qtConfCommandlineSetInput("coverage_trace_pc_guard", "yes") + } else { + qtConfAddError("Invalid argument $$val to command line parameter $$arg") + } + } else { + qtConfAddError("Missing argument to command line parameter $$arg") + } +} + # callbacks defineReplace(qtConfFunc_crossCompile) { @@ -603,14 +618,8 @@ defineTest(qtConfOutput_prepareOptions) { target_arch = armeabi-v7a platform = $$eval(config.input.android-ndk-platform) - isEmpty(platform): equals(target_arch, arm64-v8a): \ - platform = android-21 - - isEmpty(platform): equals(target_arch, x86_64): \ - platform = android-21 - isEmpty(platform): \ - platform = android-16 ### the windows configure disagrees ... + platform = android-21 $${currentConfig}.output.devicePro += \ "DEFAULT_ANDROID_SDK_ROOT = $$val_escape(sdk_root)" \ @@ -1017,6 +1026,14 @@ defineTest(qtConfOutput_crossCompile) { export(CONFIG) } +defineTest(qtConfOutput_useBFDLinker) { + !$${2}: return() + + # We need to preempt the output here, so that qtConfTest_linkerSupportsFlag can work properly in qtbase + CONFIG += use_bfd_linker + export(CONFIG) +} + defineTest(qtConfOutput_useGoldLinker) { !$${2}: return() @@ -1025,6 +1042,14 @@ defineTest(qtConfOutput_useGoldLinker) { export(CONFIG) } +defineTest(qtConfOutput_useLLDLinker) { + !$${2}: return() + + # We need to preempt the output here, so that qtConfTest_linkerSupportsFlag can work properly in qtbase + CONFIG += use_lld_linker + export(CONFIG) +} + defineTest(qtConfOutput_debugAndRelease) { $$qtConfEvaluate("features.debug") { qtConfOutputVar(append, "publicPro", "CONFIG", "debug") |