3 files changed, 10 insertions, 19 deletions
diff --git a/src/corelib/kernel/qproperty.cpp b/src/corelib/kernel/qproperty.cpp
index beba05c01e..92c9afc6d8 100644
--- a/src/corelib/kernel/qproperty.cpp
+++ b/src/corelib/kernel/qproperty.cpp
@@ -384,11 +384,16 @@ void QPropertyObserverPointer::observeProperty(QPropertyBasePointer property)
     property.addObserver(ptr);
 }
 
-QPropertyBindingError::QPropertyBindingError(Type type)
+QPropertyBindingError::QPropertyBindingError()
+{
+}
+
+QPropertyBindingError::QPropertyBindingError(Type type, const QString &description)
 {
     if (type != NoError) {
         d = new QPropertyBindingErrorPrivate;
         d->type = type;
+        d->description = description;
     }
 }
 
@@ -425,13 +430,6 @@ QPropertyBindingError::Type QPropertyBindingError::type() const
     return d->type;
 }
 
-void QPropertyBindingError::setDescription(const QString &description)
-{
-    if (!d)
-        d = new QPropertyBindingErrorPrivate;
-    d->description = description;
-}
-
 QString QPropertyBindingError::description() const
 {
     if (!d)
@@ -439,13 +437,6 @@ QString QPropertyBindingError::description() const
     return d->description;
 }
 
-QPropertyBindingSourceLocation QPropertyBindingError::location() const
-{
-    if (!d)
-        return QPropertyBindingSourceLocation();
-    return d->location;
-}
-
 /*!
   \class QProperty
   \inmodule QtCore
diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h
index 994eb24cea..986c6afbc9 100644
--- a/src/corelib/kernel/qproperty.h
+++ b/src/corelib/kernel/qproperty.h
@@ -99,17 +99,18 @@ public:
         UnknownError
     };
 
-    QPropertyBindingError(Type type = NoError);
+    QPropertyBindingError();
+    QPropertyBindingError(Type type, const QString &description = QString());
+
     QPropertyBindingError(const QPropertyBindingError &other);
     QPropertyBindingError &operator=(const QPropertyBindingError &other);
     QPropertyBindingError(QPropertyBindingError &&other);
     QPropertyBindingError &operator=(QPropertyBindingError &&other);
     ~QPropertyBindingError();
 
+    bool hasError() const { return d.get() != nullptr; }
     Type type() const;
-    void setDescription(const QString &description);
     QString description() const;
-    QPropertyBindingSourceLocation location() const;
 
 private:
     QSharedDataPointer<QPropertyBindingErrorPrivate> d;
diff --git a/src/corelib/kernel/qproperty_p.h b/src/corelib/kernel/qproperty_p.h
index f15181a0ae..7b9d7c207f 100644
--- a/src/corelib/kernel/qproperty_p.h
+++ b/src/corelib/kernel/qproperty_p.h
@@ -103,7 +103,6 @@ class QPropertyBindingErrorPrivate : public QSharedData
 public:
     QPropertyBindingError::Type type = QPropertyBindingError::NoError;
     QString description;
-    QPropertyBindingSourceLocation location;
 };
 
 struct BindingEvaluationState