Frederik Gladhorn b6191b16d4 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/global/global.pri src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.h src/corelib/tools/qdatetime.cpp src/plugins/platforms/xcb/qxcbscreen.h src/plugins/platforms/xcb/qxcbwindow.h src/widgets/dialogs/qcolordialog.cpp src/widgets/dialogs/qcolordialog_p.h tools/configure/configureapp.cpp Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af		2015-01-21 11:10:14 +01:00
..
ipc	QNX: Enable QSharedMemory and QSystemSemaphore support.	2015-01-13 11:54:12 +01:00
json	Move Qt Core examples under a common subdirectory	2014-10-17 14:57:13 +02:00
threads	Merge remote-tracking branch 'origin/5.4' into dev	2015-01-21 11:10:14 +01:00
tools	Merge remote-tracking branch 'origin/5.4' into dev	2014-10-20 19:12:25 +02:00
corelib.pro	Move Qt Core examples under a common subdirectory	2014-10-17 14:57:13 +02:00