diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-08-03 10:53:57 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-08-03 10:53:57 (GMT) |
| commit | d5491ecdde14659a913c9f476f18c45f1d9489bb (patch) | |
| tree | 06cc52249feda9bd9e50ca47abb8ebd676c8a309 /src/dbus/qdbuserror.h | |
| parent | 42cdfaf86d34afeb6448723839fef70fe477deed (diff) | |
| parent | a41128af5373a0225c3548abd3eb82cd7e8f7a0e (diff) | |
| download | Qt-d5491ecdde14659a913c9f476f18c45f1d9489bb.zip Qt-d5491ecdde14659a913c9f476f18c45f1d9489bb.tar.gz Qt-d5491ecdde14659a913c9f476f18c45f1d9489bb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouse
Conflicts:
configure
Diffstat (limited to 'src/dbus/qdbuserror.h')
| -rw-r--r-- | src/dbus/qdbuserror.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbuserror.h b/src/dbus/qdbuserror.h index ff9d1df..72736d0 100644 --- a/src/dbus/qdbuserror.h +++ b/src/dbus/qdbuserror.h @@ -57,7 +57,7 @@ QT_MODULE(DBus) class QDBusMessage; -class QDBUS_EXPORT QDBusError +class Q_DBUS_EXPORT QDBusError { public: enum ErrorType { @@ -115,7 +115,7 @@ private: }; #ifndef QT_NO_DEBUG_STREAM -QDBUS_EXPORT QDebug operator<<(QDebug, const QDBusError &); +Q_DBUS_EXPORT QDebug operator<<(QDebug, const QDBusError &); #endif QT_END_NAMESPACE |