Changeset 561 for trunk/include/QtDBus
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
- 3 copied
-
. (modified) (1 prop)
-
include/QtDBus/QDBusAbstractInterfaceBase (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtDBus/QDBusAbstractInterfaceBase )
-
include/QtDBus/QDBusServiceWatcher (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtDBus/QDBusServiceWatcher )
-
include/QtDBus/QtDBus (modified) (2 diffs)
-
include/QtDBus/headers.pri (modified) (1 diff)
-
include/QtDBus/qdbusservicewatcher.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtDBus/qdbusservicewatcher.h )
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/include/QtDBus/QtDBus
r2 r561 2 2 #define QT_QTDBUS_MODULE_H 3 3 #include <QtCore/QtCore> 4 #include <QtXml/QtXml>5 4 #include "qdbusabstractadaptor.h" 6 5 #include "qdbusabstractinterface.h" … … 19 18 #include "qdbusreply.h" 20 19 #include "qdbusserver.h" 20 #include "qdbusservicewatcher.h" 21 21 #endif -
trunk/include/QtDBus/headers.pri
r2 r561 1 SYNCQT.HEADER_FILES = qdbusabstractadaptor.h qdbusabstractinterface.h qdbusargument.h qdbusconnection.h qdbusconnectioninterface.h qdbuscontext.h qdbuserror.h qdbusextratypes.h qdbusinterface.h qdbusmacros.h qdbusmessage.h qdbusmetatype.h qdbuspendingcall.h qdbuspendingreply.h qdbusreply.h qdbusserver.h ../../include/QtDBus/QtDBus 2 SYNCQT.HEADER_CLASSES = ../../include/QtDBus/QDBusAbstractAdaptor ../../include/QtDBus/QDBusAbstractInterface ../../include/QtDBus/QDBusArgument ../../include/QtDBus/QDBusConnection ../../include/QtDBus/QDBusConnectionInterface ../../include/QtDBus/QDBusContext ../../include/QtDBus/QDBusError ../../include/QtDBus/QDBusObjectPath ../../include/QtDBus/QDBusSignature ../../include/QtDBus/QDBusVariant ../../include/QtDBus/QDBusInterface ../../include/QtDBus/QDBusMessage ../../include/QtDBus/QDBusMetaType ../../include/QtDBus/QDBusPendingCall ../../include/QtDBus/QDBusPendingCallWatcher ../../include/QtDBus/QDBusPendingReplyData ../../include/QtDBus/QDBusPendingReply ../../include/QtDBus/QDBusReply ../../include/QtDBus/QDBusServer 1 SYNCQT.HEADER_FILES = qdbusabstractadaptor.h qdbusabstractinterface.h qdbusargument.h qdbusconnection.h qdbusconnectioninterface.h qdbuscontext.h qdbuserror.h qdbusextratypes.h qdbusinterface.h qdbusmacros.h qdbusmessage.h qdbusmetatype.h qdbuspendingcall.h qdbuspendingreply.h qdbusreply.h qdbusserver.h qdbusservicewatcher.h ../../include/QtDBus/QtDBus 2 SYNCQT.HEADER_CLASSES = ../../include/QtDBus/QDBusAbstractAdaptor ../../include/QtDBus/QDBusAbstractInterfaceBase ../../include/QtDBus/QDBusAbstractInterface ../../include/QtDBus/QDBusArgument ../../include/QtDBus/QDBusConnection ../../include/QtDBus/QDBusConnectionInterface ../../include/QtDBus/QDBusContext ../../include/QtDBus/QDBusError ../../include/QtDBus/QDBusObjectPath ../../include/QtDBus/QDBusSignature ../../include/QtDBus/QDBusVariant ../../include/QtDBus/QDBusInterface ../../include/QtDBus/QDBusMessage ../../include/QtDBus/QDBusMetaType ../../include/QtDBus/QDBusPendingCall ../../include/QtDBus/QDBusPendingCallWatcher ../../include/QtDBus/QDBusPendingReplyData ../../include/QtDBus/QDBusPendingReply ../../include/QtDBus/QDBusReply ../../include/QtDBus/QDBusServer ../../include/QtDBus/QDBusServiceWatcher 3 SYNCQT.PRIVATE_HEADER_FILES = qdbus_symbols_p.h qdbusabstractadaptor_p.h qdbusabstractinterface_p.h qdbusargument_p.h qdbusconnection_p.h qdbuscontext_p.h qdbusintegrator_p.h qdbusinterface_p.h qdbusintrospection_p.h qdbusmessage_p.h qdbusmetaobject_p.h qdbusmetatype_p.h qdbuspendingcall_p.h qdbusthreaddebug_p.h qdbusutil_p.h qdbusxmlparser_p.h
Note:
See TracChangeset
for help on using the changeset viewer.
