qt6-bb10/tests/auto/dbus/qdbusconnection
Liang Qi b894a8def5 Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	mkspecs/features/qml_module.prf
	mkspecs/features/qt_common.prf
	src/gui/text/qzip.cpp
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/platforms/windows/array.h
	src/testlib/qtestcase.cpp
	src/widgets/dialogs/qfilesystemmodel.h

Change-Id: Ie41c5868415b81f7693c80e045497035504bb210
2016-04-29 17:55:20 +02:00
..
.gitignore
qdbusconnection.pro Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
tst_qdbusconnection.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-29 17:55:20 +02:00
tst_qdbusconnection.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-29 17:55:20 +02:00