From 9cda8d4384825bd93b949f31953548beda165ef8 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Fri, 26 Aug 2016 11:51:06 +0200
Subject: Restore ability to build with Qt 5.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Defines the qtConfig() test for older Qt versions, and fix
conflict between two QSGRectangle definitions.

Change-Id: Icf4ef2f88d9e98e7aea4e88d777827bf69a4c281
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
 tools/qmake/mkspecs/features/functions.prf | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'tools/qmake/mkspecs/features/functions.prf')

diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index 590d521e8..f6d4f676b 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -1,3 +1,18 @@
+defineTest(isQtMinimum) {
+    !equals(QT_MAJOR_VERSION, $$1): return(false)
+    count(ARGS, 1, greaterThan) {
+        lessThan(QT_MINOR_VERSION, $$2): return(false)
+    }
+    return(true)
+}
+
+!isQtMinimum(5, 8) {
+    defineTest(qtConfig) {
+        contains(QT_CONFIG, $$1): return(true)
+        return(false)
+    }
+}
+
 defineTest(isPlatformSupported) {
   linux {
     !gcc:!clang {
-- 
cgit v1.2.3