diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-08-31 07:37:17 (GMT) |
|---|---|---|
| committer | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-08-31 07:37:17 (GMT) |
| commit | 76d680844382ea24d40caaf9e0349e7b5af69ada (patch) | |
| tree | 624744baeccc3948b4583d812d77bce4a0879110 /src/3rdparty/webkit/Source/WebKit.pri | |
| parent | 5cd6323211aac99599f38a6c7363ae52b2b5bd02 (diff) | |
| parent | d448205c2e7ae31ae0814696c2c1d38ff56385bd (diff) | |
| download | Qt-76d680844382ea24d40caaf9e0349e7b5af69ada.zip Qt-76d680844382ea24d40caaf9e0349e7b5af69ada.tar.gz Qt-76d680844382ea24d40caaf9e0349e7b5af69ada.tar.bz2 | |
Merge remote branch 'qt-doc-review/master'
Conflicts:
doc/src/declarative/righttoleft.qdoc
tools/qdoc3/generator.h
Diffstat (limited to 'src/3rdparty/webkit/Source/WebKit.pri')
| -rw-r--r-- | src/3rdparty/webkit/Source/WebKit.pri | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/Source/WebKit.pri b/src/3rdparty/webkit/Source/WebKit.pri index 309357c..be1c7b7 100644 --- a/src/3rdparty/webkit/Source/WebKit.pri +++ b/src/3rdparty/webkit/Source/WebKit.pri @@ -2,6 +2,9 @@ contains(QT_CONFIG, qpa)|contains(QT_CONFIG, embedded): CONFIG += embedded +contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols +unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions + # Detect that we are building as a standalone package by the presence of # either the generated files directory or as part of the Qt package through # QTDIR_build @@ -71,6 +74,7 @@ CONFIG(release, debug|release) { INCLUDEPATH += \ $$PWD \ + $$PWD/../include \ $$OUTPUT_DIR/include/QtWebKit \ $$OUTPUT_DIR/include \ $$QT.script.includes @@ -157,6 +161,7 @@ disable_uitools: DEFINES *= QT_NO_UITOOLS # Disable a few warnings on Windows. The warnings are also # disabled in WebKitLibraries/win/tools/vsprops/common.vsprops win32-msvc*|wince*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4396 -wd4503 -wd4800 -wd4819 -wd4996 +win32-icc: QMAKE_CXXFLAGS += -wd873 CONFIG(qt_minimal) { DEFINES *= QT_NO_ANIMATION |