Merge remote-tracking branch 'origin/api_changes'

Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1

1 files changed, 10 insertions, 3 deletions

diff --git a/src/dbus/qdbuserror.h b/src/dbus/qdbuserror.h
index 0cea8e2cde..a6b3c9a70a 100644
--- a/src/dbus/qdbuserror.h
+++ b/src/dbus/qdbuserror.h
@@ -80,8 +80,10 @@ public:
         TimedOut,
         InvalidSignature,
         UnknownInterface,
-        InternalError,
         UnknownObject,
+        UnknownProperty,
+        PropertyReadOnly,
+        InternalError,
         InvalidService,
         InvalidObjectPath,
         InvalidInterface,
@@ -93,11 +95,16 @@ public:
 #endif
     };
 
-    QDBusError(const DBusError *error = 0);
-    QDBusError(const QDBusMessage& msg);
+#ifndef QT_BOOTSTRAPPED
+    explicit QDBusError(const DBusError *error = 0);
+    /*implicit*/ QDBusError(const QDBusMessage& msg);
+#endif
     QDBusError(ErrorType error, const QString &message);
     QDBusError(const QDBusError &other);
     QDBusError &operator=(const QDBusError &other);
+#ifndef QT_BOOTSTRAPPED
+    QDBusError &operator=(const QDBusMessage &msg);
+#endif
 
     ErrorType type() const;
     QString name() const;