diff options
author | Lars Knoll <lars.knoll@qt.io> | 2018-11-02 11:33:34 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2018-11-10 18:47:19 +0000 |
commit | c765d5945b75a54d61297b8923497a034020337a (patch) | |
tree | f898994c5783f71d9933db15b7e3387a303a34bf /src/qml/configure.json | |
parent | 06f4b3761acfa721e25da48fe4133fc5f75244bf (diff) |
Add a configure test for std::make_unique
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>
Diffstat (limited to 'src/qml/configure.json')
-rw-r--r-- | src/qml/configure.json | 18 |
1 files changed, 18 insertions, 0 deletions
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.", |