diff options
author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:05:33 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 14:02:43 +0200 |
commit | 7cbee5629604aa49c618829c8e3e55fc64e94df7 (patch) | |
tree | d12041105160c1cb21226b365edb9653d87b5853 /config.tests/common | |
parent | e400b7e326c554ccd819448866265953d2a0f24d (diff) | |
parent | 5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmenu.cpp
Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308
Diffstat (limited to 'config.tests/common')
-rw-r--r-- | config.tests/common/c++1z/c++1z.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config.tests/common/c++1z/c++1z.cpp b/config.tests/common/c++1z/c++1z.cpp index a30196f57d..63c6fb5b8a 100644 --- a/config.tests/common/c++1z/c++1z.cpp +++ b/config.tests/common/c++1z/c++1z.cpp @@ -43,4 +43,6 @@ # error "__cplusplus must be > 201402L (the value for C++14)" #endif +#include <map> // https://bugs.llvm.org//show_bug.cgi?id=33117 + int main(int, char **) { return 0; } |