From e5658a34159ae32cff7a6c0e1295171c00fe923a Mon Sep 17 00:00:00 2001
From: Alex Blasche <alexander.blasche@qt.io>
Date: Tue, 31 Mar 2020 13:46:43 +0200
Subject: Push dependency for qtdeclarative and fix resulting test failures

This enables other modules depending on quickcontrols and declarative
to resolve their conflicts.

Change-Id: Iea28fa75157034d85dc24f44491ca986902db547
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 dependencies.yaml                          | 5 +----
 tests/auto/controls/data/tst_combobox.qml  | 6 +++---
 tests/auto/controls/data/tst_textfield.qml | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/dependencies.yaml b/dependencies.yaml
index 834fab54..a9641a24 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,7 +1,4 @@
 dependencies:
-  ../qtdeclarative:
-    ref: 406f15ce0e2707452462ff73b2d660ece960623f
-    required: true
   ../qtgraphicaleffects:
-    ref: 554f6b98e27bf6ad50d663f2ce1b4726c223eb05
+    ref: 0e5719d4cd3b0dddeee8dae06d158f534293bd89
     required: false
diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml
index bccac8d2..01ebbf79 100644
--- a/tests/auto/controls/data/tst_combobox.qml
+++ b/tests/auto/controls/data/tst_combobox.qml
@@ -155,12 +155,12 @@ TestCase {
     }
 
     function test_validator() {
-        var comboBox = Qt.createQmlObject('import QtQuick 2.2;              \
+        var comboBox = Qt.createQmlObject('import QtQuick 2.14;              \
                                             import QtQuick.Controls 1.2;     \
                                             ComboBox {                       \
                                                 editable: true;              \
-                                                validator: RegExpValidator { \
-                                                                regExp: /(red|blue|green)?/ \
+                                                validator: RegularExpressionValidator { \
+                                                                regularExpression: /(red|blue|green)?/ \
                                             }}', testCase, '')
 
         comboBox.editText = "blu"
diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml
index 64b3fad0..111d01b4 100644
--- a/tests/auto/controls/data/tst_textfield.qml
+++ b/tests/auto/controls/data/tst_textfield.qml
@@ -141,7 +141,7 @@ TestCase {
     }
 
     function test_validator() {
-        var textfield = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; TextField {validator: RegExpValidator { regExp: /(red|blue|green)?/; }}', testCase, '')
+        var textfield = Qt.createQmlObject('import QtQuick 2.14; import QtQuick.Controls 1.2; TextField {validator: RegularExpressionValidator { regularExpression: /(red|blue|green)?/; }}', testCase, '')
 
         textfield.text = "blu"
         compare(textfield.acceptableInput, false)
-- 
cgit v1.2.1