diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 18:59:49 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | 4ff1d0e1e73e6467aeed9313afe09ec6ece4884d (patch) | |
| tree | dad9de015fe52a1761086d2f8885e93d7028ff83 /Source/ThirdParty | |
| parent | 83f0f6747f5ecf1143335b1719892de4b7a292bb (diff) | |
| download | qtwebkit-4ff1d0e1e73e6467aeed9313afe09ec6ece4884d.tar.gz | |
Fix build with clang
Forcing C++11 on clang does not work on older versions of clang. Instead
fix https://bugs.webkit.org/show_bug.cgi?id=115741 by disabling rvalue
references if clang is using a too old version of libstdc++11.
Avoid compile_asserts unless we have the same C++11 static asserts used in trunk.
Finally build ANGLE with the same C++11 state as the rest, otherwise it will expect
libstdc++ symbols instead of libc++ symbols.
Change-Id: Ifa49325a73d6dc17bc67bccd79813b25860df915
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/ThirdParty')
| -rw-r--r-- | Source/ThirdParty/ANGLE/ANGLE.pri | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Source/ThirdParty/ANGLE/ANGLE.pri b/Source/ThirdParty/ANGLE/ANGLE.pri index fcb4a44da..e069b141f 100644 --- a/Source/ThirdParty/ANGLE/ANGLE.pri +++ b/Source/ThirdParty/ANGLE/ANGLE.pri @@ -7,8 +7,6 @@ SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/ThirdParty/ANGLE -*clang: QT_CONFIG -= c++11 - INCLUDEPATH += \ $$SOURCE_DIR/include/GLSLANG \ $$SOURCE_DIR/include/KHR |