diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-17 01:01:00 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-17 01:01:00 +0100 |
| commit | 24dfffe33b22c07adfbc4bbaf8ca6048808cb145 (patch) | |
| tree | ae90325d0acdb7ad2d55d3eaf7ccd8f76cb3c83a /src/qml/configure.json | |
| parent | 0ae32e678eedf7450a0d7291bfb27925874de462 (diff) | |
| parent | e56df5d505b92de46840d24e84650f92c7c24431 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ic5a0c02ab45aac18c218dbeb8cd4b4cd3b609eb6
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 50fdf56048..c7b145f46f 100644 --- a/src/qml/configure.json +++ b/src/qml/configure.json @@ -13,7 +13,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.", |