diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-10 09:11:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-09-10 12:12:46 +0200 |
| commit | 683e144efbd91163795dc582aedc210c7d78de4d (patch) | |
| tree | 2211fffdbaad8bad9569f63e017e7caf85eec2b6 /configure.json | |
| parent | b66357e3ebf3e3dbda04f880e87184e247882843 (diff) | |
| parent | 1f1e2aa57b480f0b227e11d0cff0b3cfcffb1f39 (diff) | |
| download | qtbase-683e144efbd91163795dc582aedc210c7d78de4d.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
mkspecs/common/macx.conf
Change-Id: I8576493b417912fa5e5501bc2c1b935d186ac209
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 03b1353e5b..3d78039a9f 100644 --- a/configure.json +++ b/configure.json @@ -310,7 +310,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" } |