Revert "Merge remote-tracking branch 'origin/4.15'"

This reverts commit 888ca0dd20ff647970fc85340e108cfa34d78c3a.

Reason for revert: wrong patchset

Change-Id: I1291789938601aaf606c59917ff938e3c24c78dd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

1 files changed, 9 insertions, 15 deletions

diff --git a/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp
index 92ac7fdf8f..7032a26ef7 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.cpp
@@ -25,23 +25,22 @@
 
 #include "quick2propertyeditorview.h"
 
-#include "aligndistribute.h"
-#include "annotationeditor/annotationeditor.h"
-#include "bindingeditor/actioneditor.h"
-#include "bindingeditor/bindingeditor.h"
+#include "propertyeditorvalue.h"
 #include "fileresourcesmodel.h"
 #include "gradientmodel.h"
-#include "gradientpresetcustomlistmodel.h"
 #include "gradientpresetdefaultlistmodel.h"
+#include "gradientpresetcustomlistmodel.h"
 #include "itemfiltermodel.h"
-#include "propertyeditorcontextobject.h"
-#include "propertyeditorqmlbackend.h"
-#include "propertyeditorvalue.h"
-#include "qmlanchorbindingproxy.h"
-#include "richtexteditor/richtexteditorproxy.h"
 #include "simplecolorpalettemodel.h"
+#include "bindingeditor/bindingeditor.h"
+#include "bindingeditor/actioneditor.h"
+#include "annotationeditor/annotationeditor.h"
+#include "qmlanchorbindingproxy.h"
 #include "theme.h"
+#include "aligndistribute.h"
+#include "propertyeditorcontextobject.h"
 #include "tooltip.h"
+#include "richtexteditor/richtexteditorproxy.h"
 
 namespace QmlDesigner {
 
@@ -72,11 +71,6 @@ void Quick2PropertyEditorView::registerQmlTypes()
         Tooltip::registerDeclarativeType();
         EasingCurveEditor::registerDeclarativeType();
         RichTextEditorProxy::registerDeclarativeType();
-        QUrl regExpUrl = QUrl::fromLocalFile(PropertyEditorQmlBackend::propertyEditorResourcesPath()
-                                             + "/RegExpValidator.qml");
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-        qmlRegisterType(regExpUrl, "HelperWidgets", 2, 0, "RegExpValidator");
-#endif
     }
 }