diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-09 12:13:01 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-09 12:13:02 +0200 |
| commit | 1f1e2aa57b480f0b227e11d0cff0b3cfcffb1f39 (patch) | |
| tree | 9d5a045b3fea13486cf6108fd9ef641f3a1f5135 /configure.json | |
| parent | 3bac18da8ef9f5750207ddf47192b5db3137c4ac (diff) | |
| parent | 9da5b6f7432dc1d87cec94040ede69cb2f7ff537 (diff) | |
Merge remote-tracking branch 'origin/5.11.2' into 5.11
Change-Id: I2fa26fa061cbf5d2bded203a299a19b7d1c31d0a
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.json b/configure.json index 07514992d1..2dc79137e8 100644 --- a/configure.json +++ b/configure.json @@ -283,7 +283,13 @@ "#else", "# error __cplusplus must be > 201402L (the value for C++14)", "#endif", - "#include <map> // https://bugs.llvm.org//show_bug.cgi?id=33117" + "#include <map> // https://bugs.llvm.org//show_bug.cgi?id=33117", + "#include <variant>" + ], + "main": [ + "std::variant<int> v(42);", + "int i = std::get<int>(v);", + "std::visit([](const auto &) { return 1; }, v);" ], "qmake": "CONFIG += c++11 c++14 c++1z" } |