Merge remote-tracking branch 'upstream/heads/4.8' into alpha4
authorBogDan Vatra <bog_dan_ro@yahoo.com>
Sat, 3 Mar 2012 19:27:35 +0000 (21:27 +0200)
committerBogDan Vatra <bog_dan_ro@yahoo.com>
Sat, 3 Mar 2012 19:27:35 +0000 (21:27 +0200)
commitf987bb3c2fc758bd5c0d45218cfc3423d921dad4
treee935882bc63a85b9bea91c874012c8caf79cb443
parent200468b9031a296fe154a94f71cf51ad07e91182
parentedc6fae534835a2c72edffb52255fe522a37928f
Merge remote-tracking branch 'upstream/heads/4.8' into alpha4

Conflicts:
.commit-template
mkspecs/win32-g++/qmake.conf
src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
tests/auto/script.pro
tests/benchmarks/corelib/tools/tools.pro
82 files changed:
.commit-template
bin/syncqt
config.tests/unix/getaddrinfo/getaddrinfotest.cpp
configure
demos/declarative/webbrowser/qml/webbrowser/webbrowser.qml
examples/animation/animatedtiles/main.cpp
examples/examples.pro
examples/graphicsview/elasticnodes/graphwidget.cpp
examples/network/http/httpwindow.cpp
examples/widgets/wiggly/dialog.cpp
mkspecs/features/qt.prf
mkspecs/win32-g++/qmake.conf
qmake/generators/unix/unixmake2.cpp
qmake/option.cpp
src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
src/3rdparty/sqlite/sqlite3.c
src/corelib/arch/arm/qatomic_arm.cpp
src/corelib/arch/qatomic_arch.h
src/corelib/codecs/codecs.pri
src/corelib/codecs/qiconvcodec.cpp
src/corelib/codecs/qiconvcodec_p.h
src/corelib/codecs/qtextcodec.cpp
src/corelib/global/qglobal.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/kernel/qeventdispatcher_unix.cpp
src/corelib/kernel/qeventdispatcher_unix_p.h
src/corelib/kernel/qsharedmemory.cpp
src/corelib/kernel/qsharedmemory_p.h
src/corelib/kernel/qsystemsemaphore.cpp
src/corelib/kernel/qsystemsemaphore_p.h
src/corelib/thread/qthread_p.h
src/corelib/thread/qthread_unix.cpp
src/corelib/tools/qlocale.cpp
src/corelib/tools/qsimd.cpp
src/gui/dialogs/qfiledialog_p.h
src/gui/embedded/qwssocket_qws.cpp
src/gui/image/qimage_neon.cpp
src/gui/kernel/qapplication_qpa.cpp
src/gui/kernel/qeventdispatcher_qpa.cpp
src/gui/kernel/qplatformintegration_qpa.cpp
src/gui/kernel/qplatformintegration_qpa.h
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_qpa.cpp
src/gui/styles/qcommonstyle.cpp
src/gui/styles/qstylefactory.cpp
src/gui/text/qfontdatabase.cpp
src/gui/text/qfontdatabase_qpa.cpp
src/gui/text/qfontdatabase_qws.cpp
src/gui/util/qdesktopservices.cpp
src/gui/widgets/qmenubar.cpp
src/network/kernel/qhostaddress.cpp
src/network/kernel/qhostinfo_unix.cpp
src/network/kernel/qnetworkinterface_unix.cpp
src/network/socket/qnativesocketengine_p.h
src/network/socket/qnet_unix_p.h
src/network/ssl/qsslcertificate.cpp
src/network/ssl/qsslsocket_openssl.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/opengl/qpixmapdata_gl.cpp
src/opengl/qwindowsurface_gl.cpp
src/plugins/platforms/eglconvenience/qeglconvenience.cpp
src/plugins/platforms/fb_base/fb_base.cpp
src/plugins/platforms/fb_base/fb_base.h
src/plugins/platforms/minimal/qminimalwindowsurface.cpp
src/plugins/platforms/minimal/qminimalwindowsurface.h
src/plugins/platforms/platforms.pro
src/src.pro
src/tools/moc/moc.cpp
tests/auto/corelib.pro
tests/auto/gui.pro
tests/auto/network.pro
tests/auto/qfileinfo/tst_qfileinfo.cpp
tests/auto/script.pro
tests/auto/xmlpatterns.pro
tests/benchmarks/corelib/io/io.pro
tests/benchmarks/corelib/tools/tools.pro