1 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/compiler/qqmlpropertyvalidator.cpp b/src/qml/compiler/qqmlpropertyvalidator.cpp
index d20efe616b..1812ad6546 100644
--- a/src/qml/compiler/qqmlpropertyvalidator.cpp
+++ b/src/qml/compiler/qqmlpropertyvalidator.cpp
@@ -41,6 +41,7 @@
 
 #include <private/qqmlcustomparser_p.h>
 #include <private/qqmlstringconverters_p.h>
+#include <private/qqmlpropertyresolver_p.h>
 #include <QtCore/qdatetime.h>
 
 QT_BEGIN_NAMESPACE
@@ -121,7 +122,7 @@ QVector<QQmlCompileError> QQmlPropertyValidator::validateObject(int objectIndex,
         groupProperties.insert(pos, binding);
     }
 
-    QmlIR::PropertyResolver propertyResolver(propertyCache);
+    QQmlPropertyResolver propertyResolver(propertyCache);
 
     QString defaultPropertyName;
     QQmlPropertyData *defaultProperty = nullptr;
@@ -164,7 +165,7 @@ QVector<QQmlCompileError> QQmlPropertyValidator::validateObject(int objectIndex,
                 pd = propertyResolver.signal(name, &notInRevision);
             } else {
                 pd = propertyResolver.property(name, &notInRevision,
-                                               QmlIR::PropertyResolver::CheckRevision);
+                                               QQmlPropertyResolver::CheckRevision);
             }
 
             if (notInRevision) {
@@ -558,6 +559,7 @@ QQmlCompileError QQmlPropertyValidator::validateLiteralBinding(QQmlPropertyCache
     }
     break;
     case QVariant::RegExp:
+    case QVariant::RegularExpression:
         return warnOrError(tr("Invalid property assignment: regular expression expected; use /pattern/ syntax"));
     default: {
         // generate single literal value assignment to a list property if required