Merge remote-tracking branch 'upstream/tags/v4.8.0-rc1' into experimental
authorBogDan Vatra <bog_dan_ro@yahoo.com>
Fri, 14 Oct 2011 13:15:30 +0000 (16:15 +0300)
committerBogDan Vatra <bog_dan_ro@yahoo.com>
Fri, 14 Oct 2011 13:15:30 +0000 (16:15 +0300)
commit2a983bca339dbc446cc06c6b217eeac7698d871a
tree3be8ebed7d00fc10895027897a3097d03100cc10
parentafbe6f5741d64b9f47b7067cd71c27b209a5e10a
parent92f06c223ba2457e74944a786bed629bdf00ca4b
Merge remote-tracking branch 'upstream/tags/v4.8.0-rc1' into experimental

Conflicts:
src/3rdparty/webkit/Source/WebCore/config.h
25 files changed:
configure
examples/webkit/fancybrowser/fancybrowser.pro
mkspecs/features/qt.prf
mkspecs/features/qt_functions.prf
mkspecs/features/qttest_p4.prf
qmake/option.cpp
src/3rdparty/sqlite/sqlite3.c
src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
src/corelib/codecs/qtextcodec.cpp
src/corelib/global/qglobal.h
src/corelib/io/qdir.cpp
src/corelib/io/qfilesystemengine_unix.cpp
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/io/qurl.cpp
src/corelib/tools/qlocale.cpp
src/gui/kernel/qeventdispatcher_qpa.cpp
src/gui/kernel/qwidget.cpp
src/gui/styles/qcommonstyle.cpp
src/gui/text/qfontdatabase.cpp
src/gui/util/qdesktopservices.cpp
src/network/ssl/qsslcertificate.cpp
src/network/ssl/qsslsocket_openssl.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
tests/benchmarks/corelib/tools/tools.pro