diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-20 23:31:17 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-20 23:32:32 (GMT) |
| commit | 59f1e6b6ac569ae50ec657795454e4910aa0075f (patch) | |
| tree | 871573eb417d7a38279e1a04790df97a049ca807 | |
| parent | 1aca37afd10fbb4c440f7a66fb7ad3f23e47a312 (diff) | |
| download | Qt-59f1e6b6ac569ae50ec657795454e4910aa0075f.zip Qt-59f1e6b6ac569ae50ec657795454e4910aa0075f.tar.gz Qt-59f1e6b6ac569ae50ec657795454e4910aa0075f.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/WebCore/WebCore.pro | 3 | ||||
| -rw-r--r-- | src/script/script.pro | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index a80eed4..2f85100 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -3424,3 +3424,6 @@ symbian { } } } + +# WebKit doesn't compile in C++0x mode +*-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x diff --git a/src/script/script.pro b/src/script/script.pro index 2a74a66..55217e0 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -80,3 +80,6 @@ INCLUDEPATH += $$PWD include(script.pri) symbian:TARGET.UID3=0x2001B2E1 + +# WebKit doesn't compile in C++0x mode +*-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x |