AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
153e8b49ad
qt5base-lts/src/dbus
History
Liang Qi 153e8b49ad Merge remote-tracking branch 'origin/5.10' into dev 
Conflicts:
	src/network/access/qhttp2protocolhandler_p.h
	src/network/kernel/kernel.pri
	src/network/ssl/qsslkey_qt.cpp
	src/plugins/platforms/cocoa/qcocoascreen.mm
	src/plugins/platforms/windows/accessible/iaccessible2.cpp
	src/plugins/platforms/windows/accessible/iaccessible2.h
	src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
	src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp
	src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h
	src/widgets/widgets/qmenu_p.h
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/other/qaccessibility/tst_qaccessibility.cpp
	tests/auto/testlib/selftests/expected_cmptest.lightxml
	tests/auto/testlib/selftests/expected_cmptest.teamcity
	tests/auto/testlib/selftests/expected_cmptest.txt
	tests/auto/testlib/selftests/expected_cmptest.xml

Done-with: Edward Welbourne <edward.welbourne@qt.io>
Change-Id: I4217cc7d840cbae3e3dd28574741544469c4c6b9
2017-11-23 09:36:03 +01:00
..
doc Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
dbus_minimal_p.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-29 17:55:20 +02:00
dbus.pro Remove remains of wince in .pro files 2017-07-03 05:32:51 +00:00
qdbus_symbols_p.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbus_symbols.cpp Use QT_CONFIG(library) instead of QT_NO_LIBRARY 2017-03-06 11:27:20 +00:00
qdbusabstractadaptor_p.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusabstractadaptor.cpp Add Intel copyright to files that Intel has had non-trivial contribution 2016-01-21 22:44:21 +00:00
qdbusabstractadaptor.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusabstractinterface_p.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusabstractinterface.cpp Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
qdbusabstractinterface.h Replace Q_DECL_OVERRIDE with override where possible 2017-09-19 11:53:42 +00:00
qdbusargument_p.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusargument.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qdbusargument.h Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
qdbusconnection_p.h Remove obsolete DBus dispatch lock 2017-11-08 05:38:39 +00:00
qdbusconnection.cpp Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
qdbusconnection.h Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
qdbusconnectioninterface.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qdbusconnectioninterface.h Replace Q_DECL_OVERRIDE with override where possible 2017-09-19 11:53:42 +00:00
qdbusconnectionmanager_p.h Replace Q_DECL_OVERRIDE with override where possible 2017-09-19 11:53:42 +00:00
qdbuscontext_p.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbuscontext.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qdbuscontext.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusdemarshaller.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-08 17:15:55 +02:00
qdbuserror.cpp Fix documentation for QDBusError::Other 2017-07-24 06:14:10 +00:00
qdbuserror.h Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-21 11:57:52 +02:00
qdbusextratypes.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qdbusextratypes.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusintegrator_p.h Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
qdbusintegrator.cpp Remove obsolete DBus dispatch lock 2017-11-08 05:38:39 +00:00
qdbusinterface_p.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusinterface.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qdbusinterface.h Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
qdbusinternalfilters.cpp Fix clazy-strict-iterators 2017-10-25 09:19:19 +00:00
qdbusintrospection_p.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusintrospection.cpp Replace 'an unique' with 'a unique' 2017-10-11 18:44:57 +00:00
qdbusmarshaller.cpp Support C++17 fallthrough attribute 2016-08-19 18:38:53 +00:00
qdbusmessage_p.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusmessage.cpp Add Intel copyright to files that Intel has had non-trivial contribution 2016-01-21 22:44:21 +00:00
qdbusmessage.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusmetaobject_p.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusmetaobject.cpp Add Intel copyright to files that Intel has had non-trivial contribution 2016-01-21 22:44:21 +00:00
qdbusmetatype_p.h Revert "Merge the QDBusMetaType's custom information to QDBusConnectionManager" 2017-05-17 13:42:47 +00:00
qdbusmetatype.cpp Merge remote-tracking branch 'origin/5.10' into dev 2017-10-24 13:40:55 +02:00
qdbusmetatype.h Use nullptr in qDBusRegisterMetaType 2017-02-03 20:24:45 +00:00
qdbusmisc.cpp Revert "Merge the QDBusMetaType's custom information to QDBusConnectionManager" 2017-05-17 13:42:47 +00:00
qdbuspendingcall_p.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbuspendingcall.cpp Updated license headers 2016-01-21 18:55:18 +00:00
qdbuspendingcall.h Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
qdbuspendingreply.cpp Add Intel copyright to files that Intel has had non-trivial contribution 2016-01-21 22:44:21 +00:00
qdbuspendingreply.h Fix using 0 as null pointer 2016-12-06 15:32:26 +00:00
qdbusreply.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qdbusreply.h Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
qdbusserver.cpp Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
qdbusserver.h Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
qdbusservicewatcher.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qdbusservicewatcher.h Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
qdbusthreaddebug_p.h Remove obsolete DBus dispatch lock 2017-11-08 05:38:39 +00:00
qdbusunixfiledescriptor.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qdbusunixfiledescriptor.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusutil_p.h Doc: bool inline to inline bool 2016-10-04 13:13:09 +00:00
qdbusutil.cpp DBus: use QStringRef to optimize memory allocation 2016-04-28 16:47:54 +00:00
qdbusvirtualobject.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qdbusvirtualobject.h Replace Q_NULLPTR with nullptr where possible 2017-09-19 11:53:55 +00:00
qdbusxmlgenerator.cpp Use QString::asprintf(), QStringBuilder, and the multi-arg overload of QString::arg() 2017-01-12 17:54:28 +00:00
qdbusxmlparser_p.h qdbusxmlparser: Enabled error output 2016-09-27 15:48:45 +00:00
qdbusxmlparser.cpp Silence bogus whitespace "errors" from the DBus XML parser 2017-01-02 07:56:29 +00:00
Qt5DBusConfigExtras.cmake.in Check that files we expect to find actually exist when using a cmake package. 2013-05-20 15:20:26 +02:00
Qt5DBusMacros.cmake Fix Qt5DBusMacros.cmake for CMake 3.9 2017-07-05 17:11:59 +00:00
qtdbusglobal_p.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qtdbusglobal.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00