diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-29 16:31:53 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-30 21:15:40 +0200 |
| commit | cc692bb58c8a39f06eb30c04cfcb61fa466d18ae (patch) | |
| tree | 3e32794fa51a2d85356596710b11c8290388b8da /src/dbus | |
| parent | 47ae99a07ab5726e5316d56f0ca3ce958cd85ac5 (diff) | |
Get rid of some #ifdef qt6
None of this code is even compiled in qt6.
Change-Id: I5891cc9459320083ad3908fcbf646f3ba75b8a4d
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusmessage.cpp | 4 | ||||
| -rw-r--r-- | src/dbus/qdbusmessage.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp index eb3ca3a909..1ae6ea9c0c 100644 --- a/src/dbus/qdbusmessage.cpp +++ b/src/dbus/qdbusmessage.cpp @@ -496,11 +496,7 @@ QDBusMessage QDBusMessage::createReply(const QVariantList &arguments) const Constructs a new DBus message representing an error reply message, with the given \a name and \a msg. */ -#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) QDBusMessage QDBusMessage::createErrorReply(const QString &name, const QString &msg) const -#else -QDBusMessage QDBusMessage::createErrorReply(const QString name, const QString &msg) const -#endif { QDBusMessage reply = QDBusMessage::createError(name, msg); if (d_ptr->msg) diff --git a/src/dbus/qdbusmessage.h b/src/dbus/qdbusmessage.h index 17ca8cf06d..31ce8169a2 100644 --- a/src/dbus/qdbusmessage.h +++ b/src/dbus/qdbusmessage.h @@ -89,11 +89,7 @@ public: inline QDBusMessage createReply(const QVariant &argument) const { return createReply(QList<QVariant>() << argument); } -#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) QDBusMessage createErrorReply(const QString &name, const QString &msg) const; -#else - QDBusMessage createErrorReply(const QString name, const QString &msg) const; -#endif inline QDBusMessage createErrorReply(const QDBusError &err) const { return createErrorReply(err.name(), err.message()); } QDBusMessage createErrorReply(QDBusError::ErrorType type, const QString &msg) const; |