diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:37:31 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:37:31 +0100 |
| commit | 3b67ec7abdb3056f259eb0aa819de9b5bbf8ec3a (patch) | |
| tree | 84345fc1b93e153313c367abc1e8eac1ced51631 /src/qml/configure.json | |
| parent | ede9a8285858873e644083bbad9a71da26276dce (diff) | |
| parent | 3795904e3831722e222fa32a1e52aeb6b3e6ba87 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I6b2539bf17d3e9bc66d96b53c1bce95680113ed8
Diffstat (limited to 'src/qml/configure.json')
| -rw-r--r-- | src/qml/configure.json | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/configure.json b/src/qml/configure.json index c7b145f46f..55bc1a7c4d 100644 --- a/src/qml/configure.json +++ b/src/qml/configure.json @@ -21,7 +21,8 @@ "include": "memory", "main": [ "std::unique_ptr<int> ptr = std::make_unique<int>();" - ] + ], + "qmake": "CONFIG += c++11" } } }, @@ -29,7 +30,7 @@ "features": { "cxx14_make_unique": { "label": "C++14 make_unique", - "condition": "tests.cxx14_make_unique", + "condition": "features.c++14 || tests.cxx14_make_unique", "output": [ "privateFeature" ] }, "qml-network": { |