diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-30 09:33:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-30 09:33:03 (GMT) |
| commit | d448205c2e7ae31ae0814696c2c1d38ff56385bd (patch) | |
| tree | 601e9edf2832834f0ffef9c7b5c54303ce2f70d2 /src/3rdparty/webkit/Source/WebKit.pri | |
| parent | 041ffd15a7e91581a79115d3d6ce52237f5ca5ef (diff) | |
| parent | 214a26fbde1c5600a10db59217ae9b63a46bce9e (diff) | |
| download | Qt-d448205c2e7ae31ae0814696c2c1d38ff56385bd.zip Qt-d448205c2e7ae31ae0814696c2c1d38ff56385bd.tar.gz Qt-d448205c2e7ae31ae0814696c2c1d38ff56385bd.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (193 commits)
qdoc3: Updates to qdoc to print error message in ALL CAPS
Fix conversion of QAbstractItemModel::rowsMoved() parameters
Do not unconditionally use pkg-config in .pro files
Updated WebKit to dda59e50379214c098f365a39c4d64b39ced427e
Revert "Don't second-guess the "engine"; call cleanPath on absolutePaths"
Revert "In 4.7 QFileInfo::absolute(File)Path returned clean paths"
In 4.7 QFileInfo::absolute(File)Path returned clean paths
Porting the QTBUG-21084 fix to 4.7.4
ret is an "internal" path, no need to re-process it
We prefer capitalized drive letters, make it so sooner
Don't second-guess the "engine"; call cleanPath on absolutePaths
Compare non-canonical paths before falling back on expensive computation
Fix QDir::operator==(const QDir &) const
Fixed use of deleted object in XmlPatterns EvaluationCache
Check if bridge plugin vector is still valid.
Updated WebKit to 85d4df147ac7b239497b05979a51fd6fde7580fd
Updated WebKit to 836fa24be73978fb292e954abb151fb46b1d97e0
uikit: get rid of the "min 30fps" for event handling.
uikit: update README
Doc: Added a note to Code Editor example docs
...
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 |