diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-25 10:45:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-25 10:45:56 (GMT) |
| commit | 9ef3be5d2e1b2777c2c79074d7d5efd89c653c7e (patch) | |
| tree | 46dfb4c809fb098db3cbf50977f121a38ea73cee /src/3rdparty/webkit/WebKit.pri | |
| parent | 55664a0ef4b88b67c9931c7d2f6853e5fa0a9716 (diff) | |
| parent | 559f44abace0203a1930c71ec1040855dd1db573 (diff) | |
| download | Qt-9ef3be5d2e1b2777c2c79074d7d5efd89c653c7e.zip Qt-9ef3be5d2e1b2777c2c79074d7d5efd89c653c7e.tar.gz Qt-9ef3be5d2e1b2777c2c79074d7d5efd89c653c7e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Updated WebKit to 807157e42add842605ec67d9363dd3f1861748ca
Diffstat (limited to 'src/3rdparty/webkit/WebKit.pri')
| -rw-r--r-- | src/3rdparty/webkit/WebKit.pri | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebKit.pri b/src/3rdparty/webkit/WebKit.pri index a3ccd9d..921a6e0 100644 --- a/src/3rdparty/webkit/WebKit.pri +++ b/src/3rdparty/webkit/WebKit.pri @@ -48,7 +48,12 @@ CONFIG(release, debug|release) { } BASE_DIR = $$PWD -INCLUDEPATH += $$OUTPUT_DIR/include/QtWebKit + +symbian { + INCLUDEPATH += $$PWD/include/QtWebKit +} else { + INCLUDEPATH += $$OUTPUT_DIR/include/QtWebKit +} CONFIG -= warn_on *-g++*:QMAKE_CXXFLAGS += -Wall -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self |