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
..
qmyserver	Autotest: fix a race condition in verifying a peer D-Bus connected	2015-01-06 17:36:58 +01:00
test	Fix handling of subprocesses for QtDBus unit tests on Windows	2014-12-20 07:37:12 +01:00
.gitignore	Moved dbus autotests into new directory structure	2011-09-01 09:37:08 +02:00
myobject.h	Remove the old QDBusConnection::sender functionality	2015-01-06 19:41:36 +01:00
qdbusinterface.pro	all remaining tests: eliminated usage of qttest_p4.prf	2011-10-25 08:42:23 +02:00
tst_qdbusinterface.cpp	Autotest: fix a race condition in verifying a peer D-Bus connected	2015-01-06 17:36:58 +01:00