From c765d5945b75a54d61297b8923497a034020337a Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Fri, 2 Nov 2018 11:33:34 +0100
Subject: Add a configure test for std::make_unique
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Seems like this is the only reliable way to determine whether we
have std::make_unique() or need to provide our own version.

Change-Id: I5b162e0a2d2448d7bc519958c6e85a075812135a
Fixes: QTBUG-71448
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/qml/configure.json | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'src/qml/configure.json')

diff --git a/src/qml/configure.json b/src/qml/configure.json
index aea62c3439..878ec0119b 100644
--- a/src/qml/configure.json
+++ b/src/qml/configure.json
@@ -12,7 +12,25 @@
         }
     },
 
+    "tests": {
+        "cxx14_make_unique": {
+            "label": "C++14 make_unique()",
+            "type": "compile",
+            "test": {
+                "include": "memory",
+                "main": [
+                    "std::unique_ptr<int> ptr = std::make_unique<int>();"
+                ]
+            }
+        }
+    },
+
     "features": {
+        "cxx14_make_unique": {
+            "label": "C++14 make_unique",
+            "condition": "tests.cxx14_make_unique",
+            "output": [ "privateFeature" ]
+        },
         "qml-network": {
             "label": "QML network support",
             "purpose": "Provides network transparency.",
-- 
cgit v1.2.3