diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-10-04 00:57:13 -0400 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2016-01-30 03:21:12 +0000 |
| commit | ded11c503f06b9e97dc0a5a12e8fb5ba5581c2da (patch) | |
| tree | 12284751f9462ecd08c4c56e3ca48662e73a732d /src/dbus | |
| parent | 0ad153b76e061381ac1f1e2fa31687fd7cb7321a (diff) | |
QtDBus: Remove unnecessary #ifndef for QT_NO_PROPERTIES
qfeatures.txt says that it depends on PROPERTIES, so this condition will
never happen.
Change-Id: I42e7ef1a481840699a8dffff1409e2e63c6857fa
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusintegrator.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index f0b8f1b441..ebf42b0b06 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -807,7 +807,6 @@ bool QDBusConnectionPrivate::activateCall(QObject* object, int flags, const QDBu if (!object) return false; -#ifndef QT_NO_PROPERTIES Q_ASSERT_X(QThread::currentThread() == object->thread(), "QDBusConnection: internal threading error", "function called for an object that is in another thread!!"); @@ -866,7 +865,6 @@ bool QDBusConnectionPrivate::activateCall(QObject* object, int flags, const QDBu deliverCall(object, flags, msg, cacheIt->metaTypes, cacheIt->slotIdx); return true; } -#endif // QT_NO_PROPERTIES return false; } |