From 20dccb84e3518561d32237fee4ad11500c9bbe0f Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 25 Jan 2017 13:43:44 +0100
Subject: Fix build with 5.8 and make embedded configurable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 configure.pri | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'configure.pri')

diff --git a/configure.pri b/configure.pri
index b6693aecf..23f31686e 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)
+}
-- 
cgit v1.2.3