qt6-bb10/src/dbus
Liang Qi a732576a66 Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
	config.tests/win/msvc_version.cpp
	configure.pri
	mkspecs/macx-ios-clang/features/default_post.prf
	mkspecs/macx-ios-clang/features/resolve_config.prf
	mkspecs/features/uikit/default_post.prf
	mkspecs/features/uikit/resolve_config.prf
	src/corelib/io/qsettings_mac.cpp
	src/corelib/json/qjsondocument.cpp
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/cocoa/qnswindowdelegate.h
	src/plugins/platforms/cocoa/qnswindowdelegate.mm
	src/plugins/platforms/ios/ios.pro
	src/plugins/platforms/ios/kernel.pro
	src/plugins/platforms/ios/qiosintegration.h
	src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
	tests/auto/gui/painting/qpainter/tst_qpainter.cpp
	tools/configure/environment.cpp

Change-Id: I654845e54e40f5951fb78aab349ca667e9f27843
2016-11-01 06:02:55 +01:00
..
doc Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
Qt5DBusConfigExtras.cmake.in
Qt5DBusMacros.cmake
dbus.pro remove unnecessary references to $$QMAKE_CFLAGS_DBUS 2016-10-04 20:21:28 +00:00
dbus_minimal_p.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-29 17:55:20 +02:00
qdbus_symbols.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
qdbus_symbols_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
qdbusabstractadaptor_p.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusabstractinterface.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-13 15:18:02 +02:00
qdbusabstractinterface.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
qdbusargument.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qdbusargument.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusargument_p.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusconnection.cpp Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-21 11:57:52 +02:00
qdbusconnection.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusconnection_p.h Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-21 11:57:52 +02:00
qdbusconnectioninterface.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qdbusconnectioninterface.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusconnectionmanager_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
qdbuscontext_p.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 Updated license headers 2016-01-15 12:25:24 +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.cpp Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-21 11:57:52 +02:00
qdbusintegrator_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 Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusinterface_p.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusinternalfilters.cpp Use QString::fromLatin1() less to avoid string allocations 2016-09-15 15:55:57 +00:00
qdbusintrospection.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qdbusintrospection_p.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusmarshaller.cpp Support C++17 fallthrough attribute 2016-08-19 18:38:53 +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
qdbusmessage_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
qdbusmetaobject_p.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusmetatype.cpp Support C++17 fallthrough attribute 2016-08-19 18:38:53 +00:00
qdbusmetatype.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusmetatype_p.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusmisc.cpp qDBusInterfaceFromMetaObject: avoid quadratic complexity. 2016-04-29 15:44:30 +00:00
qdbuspendingcall.cpp Updated license headers 2016-01-21 18:55:18 +00:00
qdbuspendingcall.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbuspendingcall_p.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +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 Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusreply.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qdbusreply.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusserver.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-22 21:19:57 +02:00
qdbusserver.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusservicewatcher.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qdbusservicewatcher.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qdbusthreaddebug_p.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +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.cpp DBus: use QStringRef to optimize memory allocation 2016-04-28 16:47:54 +00:00
qdbusutil_p.h Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-21 11:57:52 +02:00
qdbusvirtualobject.cpp Updated license headers 2016-01-15 12:25:24 +00:00
qdbusvirtualobject.h Cleanup QDBusVirtualObjectPrivate 2016-08-04 08:47:40 +00:00
qdbusxmlgenerator.cpp qdbusxmlgenerator.cpp: reduce allocations in typeNameToXml() 2016-08-23 05:08:05 +00:00
qdbusxmlparser.cpp qdbusxmlparser: Enabled error output 2016-09-27 15:48:45 +00:00
qdbusxmlparser_p.h qdbusxmlparser: Enabled error output 2016-09-27 15:48:45 +00:00
qtdbusglobal.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00
qtdbusglobal_p.h Add qtdbusglobal.h and qtdbusglobal_p.h 2016-07-14 06:06:43 +00:00