summaryrefslogtreecommitdiffstats
path: root/configure.pri
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-01-25 13:43:44 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-01-31 11:01:00 +0000
commit20dccb84e3518561d32237fee4ad11500c9bbe0f (patch)
tree2368d898fefc3b03e9942f72630f4e6442a939bf /configure.pri
parenteccf02a09ee5866fc971b5ff9f36aef5874bd25c (diff)
Fix build with 5.8 and make embedded configurable
Avoid checking features only available in 5.9 directly. This also changes the embedded-build configuration to being a feature that can be set at configure time. Change-Id: I9b42dcf696734a83e5c8d6e1cc07562cbeb3f993 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'configure.pri')
-rw-r--r--configure.pri9
1 files changed, 9 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri
index b6693aec..23f31686 100644
--- a/configure.pri
+++ b/configure.pri
@@ -23,3 +23,12 @@ defineTest(qtConfTest_detectGn) {
qtLog("Building own gn")
return(false)
}
+
+defineTest(qtConfTest_embedded) {
+ lessThan(QT_MINOR_VERSION, 9) {
+ cross_compile: return(true)
+ return(false)
+ }
+ $$qtConfEvaluate("features.cross_compile"): return(true)
+ return(false)
+}