diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-09 11:49:43 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-09 11:49:47 +0100 |
| commit | 63f24f6ba8417e90294a1a90d01a3c3de80b7af4 (patch) | |
| tree | 27b5788a3e7c1e94b484e642142b1be8ff8da318 /src/dbus | |
| parent | ae2359d49e171c61450b17b1eb0e0dd7a20c7ca4 (diff) | |
| parent | 05659223bf02c8bac0463fe1e7a9364ef5677b75 (diff) | |
Merge branch 'stable' into dev
Change-Id: I7f0dab6bdb1f3cc1d3e6c30166ff6db9dfae37e9
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusmetatype.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusmetatype.h b/src/dbus/qdbusmetatype.h index 6db4ff2911..80d99e68d0 100644 --- a/src/dbus/qdbusmetatype.h +++ b/src/dbus/qdbusmetatype.h @@ -76,7 +76,7 @@ void qDBusDemarshallHelper(const QDBusArgument &arg, T *t) template<typename T> int qDBusRegisterMetaType( -#ifndef qdoc +#ifndef Q_QDOC T * /* dummy */ = 0 #endif ) |