Changeset 769 for trunk/src/corelib/kernel/qobjectdefs.h

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/kernel/qobjectdefs.h (modified) (2 diffs)

trunk/src/corelib/kernel/qobjectdefs.h

@@ -79 +79 @@
 #define Q_INTERFACES(x)
 #define Q_PROPERTY(text)
+
 #define Q_OVERRIDE(text)
 #define Q_ENUMS(x)
@@ -179 +180 @@
 #define Q_INTERFACES(x) Q_INTERFACES(x)
 #define Q_PROPERTY(text) Q_PROPERTY(text)
+
 #define Q_OVERRIDE(text) Q_OVERRIDE(text)
 #define Q_ENUMS(x) Q_ENUMS(x)