Changeset 846 for trunk/src/dbus/qdbusabstractinterface.h
- Timestamp:
- May 5, 2011, 5:36:53 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
-
trunk/src/dbus/qdbusabstractinterface.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) … … 52 52 #include <QtDBus/qdbusconnection.h> 53 53 54 55 54 56 QT_BEGIN_HEADER 55 57 … … 63 65 class QDBusAbstractInterfacePrivate; 64 66 65 class Q DBUS_EXPORT QDBusAbstractInterfaceBase: public QObject67 class QDBUS_EXPORT QDBusAbstractInterfaceBase: public QObject 66 68 { 67 69 public: … … 73 75 }; 74 76 75 class Q DBUS_EXPORT QDBusAbstractInterface:77 class QDBUS_EXPORT QDBusAbstractInterface: 76 78 #ifdef Q_QDOC 77 79 public QObject … … 160 162 QT_END_HEADER 161 163 164 162 165 #endif
Note:
See TracChangeset
for help on using the changeset viewer.