Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 20 Jan 2014 17:16:08 +0000 (18:16 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 20 Jan 2014 17:18:59 +0000 (18:18 +0100)
commit9033977d3971db5352a2bb51052a723a2ac57a8f
treed1a70bdf5e892cc391f7bbfd61ff5611fe25ce3d
parente5e43a2386fb4a4c2cb90d5a8d9bb5ca81a2675e
parent03b6a2f0f98b70b24c0cce645d6d58c084111f91
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
src/corelib/global/qglobal.h
src/corelib/tools/qstring.cpp
src/gui/image/image.pri
src/gui/image/qimage.cpp
src/plugins/platforms/cocoa/qcocoawindow.h
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/eglfs/qeglfshooks_stub.cpp
tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp

Change-Id: I3b9ba029c8f2263b011f204fdf68c3231c6d4ce5
43 files changed:
configure
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_objectmodel.cpp
src/corelib/corelib.pro
src/corelib/global/qcompilerdetection.h
src/corelib/global/qglobal.h
src/corelib/global/qlogging.cpp
src/corelib/io/io.pri
src/corelib/io/qdir.cpp
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qobject_p.h
src/corelib/thread/qthread_p.h
src/corelib/thread/qthread_win.cpp
src/corelib/tools/qdatetime.cpp
src/corelib/tools/qlocale_win.cpp
src/corelib/tools/qstring.cpp
src/corelib/tools/tools.pri
src/gui/image/image.pri
src/gui/image/qimage_conversions.cpp
src/gui/kernel/qguiapplication.cpp
src/gui/kernel/qguiapplication_p.h
src/gui/kernel/qwindowsysteminterface_p.h
src/gui/painting/qdrawhelper.cpp
src/network/socket/qabstractsocket.cpp
src/plugins/bearer/connman/qconnmanservice_linux_p.h
src/plugins/platforms/cocoa/qcocoatheme.mm
src/plugins/platforms/cocoa/qcocoawindow.h
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/eglfs/qeglfshooks.h
src/plugins/platforms/eglfs/qeglfshooks_stub.cpp
src/plugins/platforms/windows/qwindowsscreen.cpp
src/sql/drivers/sqlite/qsql_sqlite.cpp
src/widgets/kernel/qwidget.cpp
src/widgets/widgets/qtoolbar.cpp
tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/network/kernel/qhostinfo/qhostinfo.pro
tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
tests/auto/tools/moc/moc.pro
tests/auto/tools/moc/tst_moc.cpp