diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-14 08:53:22 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-14 09:31:03 (GMT) |
| commit | e994f52db07ee71de6093ff2172696fa1d2a3af4 (patch) | |
| tree | 0ee741ef1653fb98a9cb02f259d2b3568f6dd87a | |
| parent | ba9241a7a4e795f92a71a6989db3ff972a3ec571 (diff) | |
| download | Qt-e994f52db07ee71de6093ff2172696fa1d2a3af4.zip Qt-e994f52db07ee71de6093ff2172696fa1d2a3af4.tar.gz Qt-e994f52db07ee71de6093ff2172696fa1d2a3af4.tar.bz2 | |
Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro | 3 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro index f04d4a5..967dd52 100644 --- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro +++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro @@ -221,3 +221,6 @@ SOURCES += \ !contains(DEFINES, USE_SYSTEM_MALLOC) { SOURCES += wtf/TCSystemAlloc.cpp } + +# JavaScriptCore is not going to build with C++0x any time soon +*-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index bdb3f83..50319bc 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -2946,3 +2946,6 @@ symbian { } } } + +# WebKit doesn't compile in C++0x mode +*-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x |