AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
231ac1b878
qt5base-lts/tests/auto/dbus/qdbusabstractadaptor
History
Liang Qi 305dd1b61f Merge remote-tracking branch 'origin/5.9' into 5.11 
Conflicts:
	.qmake.conf
	src/corelib/animation/qvariantanimation.cpp
	src/corelib/global/qglobal.cpp
	src/corelib/global/qlogging.cpp
	src/corelib/io/qprocess_win.cpp
	src/corelib/json/qjsonarray.cpp
	src/corelib/tools/qsimd_p.h
	src/corelib/tools/qtimezoneprivate_p.h
	src/corelib/xml/qxmlstream_p.h
	src/gui/kernel/qsimpledrag.cpp
	src/gui/kernel/qsimpledrag_p.h
	src/plugins/generic/generic.pro
	src/plugins/platforms/cocoa/qcocoamenu.mm
	src/widgets/styles/qmacstyle_mac.mm
	tests/auto/concurrent/qtconcurrentmap/BLACKLIST
	tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/kernel/qwindow/BLACKLIST
	tests/auto/widgets/dialogs/qmessagebox/BLACKLIST

Change-Id: I508d686cf20f7f8cc6a7119b9bc7c3bbb505c58e
2018-02-14 12:51:24 +01:00
..
qdbusabstractadaptor Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
qmyserver Add Intel copyright to files that Intel has had non-trivial contribution 2016-01-21 22:44:21 +00:00
.gitignore
BLACKLIST Extend flakeyness of tst_QDBusAbstractAdaptor::overloadedSignalEmission(int) 2015-06-20 15:26:10 +00:00
myobject.h Add Q_FALLTHROUGH to QtDBus tests 2017-05-17 16:16:02 +00:00
qdbusabstractadaptor.pro Use dependencies instead of CONFIG+=ordered 2017-12-02 11:09:15 +00:00
tst_qdbusabstractadaptor.cpp Skip tst_QDBusAbstractAdaptor peer tests 2018-02-09 18:45:15 +00:00