Frederik Gladhorn 4a8273a6fc Merge remote-tracking branch 'origin/stable' into dev ... For the conflicts in msvc_nmake.cpp the ifdefs are extended since we need to support windows phone in the target branch while it is not there in the current stable branch (as of Qt 5.2). Conflicts: configure qmake/generators/win32/msvc_nmake.cpp src/3rdparty/angle/src/libEGL/Surface.cpp src/angle/src/common/common.pri src/corelib/global/qglobal.h src/corelib/io/qstandardpaths.cpp src/plugins/platforms/qnx/qqnxintegration.cpp src/plugins/platforms/qnx/qqnxscreeneventhandler.h src/plugins/platforms/xcb/qglxintegration.h src/widgets/kernel/win.pri tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp tools/configure/configureapp.cpp Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812		2013-11-26 22:35:48 +01:00
..
qcolordialog	Revert Mac event loop changes.	2013-09-02 13:07:35 +02:00
qdialog	Move SnapToDefaultButton from QPlatformDialogHelper to QPlatformTheme	2013-08-23 08:42:35 +02:00
qerrormessage	QtWidgets tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-28 02:02:14 +01:00
qfiledialog	QFileDialog: don't create widgets if the platform dialog will be used	2013-10-15 08:14:48 +02:00
qfiledialog2	Fix temporary file leak in tst_qfiledialog2.	2013-10-03 21:43:56 +02:00
qfilesystemmodel	Merge remote-tracking branch 'origin/stable' into dev	2013-11-26 22:35:48 +01:00
qfontdialog	Revert Mac event loop changes.	2013-09-02 13:07:35 +02:00
qinputdialog	QtWidgets tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-28 02:02:14 +01:00
qmessagebox	xcb: QWindow never uses XCB_GRAVITY_CENTER	2013-09-16 14:15:06 +02:00
qprogressdialog	QProgressDialog: add unittest for the auto-show feature	2013-11-20 09:03:09 +01:00
qsidebar	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qwizard	QWizard: give all buttons an objectName	2013-10-28 12:05:22 +01:00
dialogs.pro	QPrintSupport: Move QAbstractPrintDialog test into QPrintSupport	2013-10-26 00:39:51 +02:00