Move QValidator tests to QtGui

Q*Validator classes are not in QtWidgets,
so move them where they should stay.

Change-Id: Ie6ea45a026e640fad131002bc9762c575235f3f4
Reviewed-by: David Faure <david.faure@kdab.com>

diff --git a/tests/auto/widgets/widgets/qdoublevalidator/.gitignore b/tests/auto/gui/util/qdoublevalidator/.gitignore
similarity index 100%
rename from tests/auto/widgets/widgets/qdoublevalidator/.gitignore
rename to tests/auto/gui/util/qdoublevalidator/.gitignore

diff --git a/tests/auto/widgets/widgets/qdoublevalidator/qdoublevalidator.pro b/tests/auto/gui/util/qdoublevalidator/qdoublevalidator.pro
similarity index 87%
rename from tests/auto/widgets/widgets/qdoublevalidator/qdoublevalidator.pro
rename to tests/auto/gui/util/qdoublevalidator/qdoublevalidator.pro
index 3e2ecfe..1941bea 100644 (file)
--- a/tests/auto/widgets/widgets/qdoublevalidator/qdoublevalidator.pro
+++ b/tests/auto/gui/util/qdoublevalidator/qdoublevalidator.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 CONFIG += parallel_test
 TARGET = tst_qdoublevalidator
-QT += widgets testlib
+QT += testlib
 SOURCES += tst_qdoublevalidator.cpp
 
 

diff --git a/tests/auto/widgets/widgets/qdoublevalidator/tst_qdoublevalidator.cpp b/tests/auto/gui/util/qdoublevalidator/tst_qdoublevalidator.cpp
similarity index 100%
rename from tests/auto/widgets/widgets/qdoublevalidator/tst_qdoublevalidator.cpp
rename to tests/auto/gui/util/qdoublevalidator/tst_qdoublevalidator.cpp

diff --git a/tests/auto/widgets/widgets/qintvalidator/.gitignore b/tests/auto/gui/util/qintvalidator/.gitignore
similarity index 100%
rename from tests/auto/widgets/widgets/qintvalidator/.gitignore
rename to tests/auto/gui/util/qintvalidator/.gitignore

diff --git a/tests/auto/widgets/widgets/qintvalidator/qintvalidator.pro b/tests/auto/gui/util/qintvalidator/qintvalidator.pro
similarity index 100%
rename from tests/auto/widgets/widgets/qintvalidator/qintvalidator.pro
rename to tests/auto/gui/util/qintvalidator/qintvalidator.pro

diff --git a/tests/auto/widgets/widgets/qintvalidator/tst_qintvalidator.cpp b/tests/auto/gui/util/qintvalidator/tst_qintvalidator.cpp
similarity index 100%
rename from tests/auto/widgets/widgets/qintvalidator/tst_qintvalidator.cpp
rename to tests/auto/gui/util/qintvalidator/tst_qintvalidator.cpp

diff --git a/tests/auto/widgets/widgets/qregexpvalidator/.gitignore b/tests/auto/gui/util/qregexpvalidator/.gitignore
similarity index 100%
rename from tests/auto/widgets/widgets/qregexpvalidator/.gitignore
rename to tests/auto/gui/util/qregexpvalidator/.gitignore

diff --git a/tests/auto/widgets/widgets/qregexpvalidator/qregexpvalidator.pro b/tests/auto/gui/util/qregexpvalidator/qregexpvalidator.pro
similarity index 100%
rename from tests/auto/widgets/widgets/qregexpvalidator/qregexpvalidator.pro
rename to tests/auto/gui/util/qregexpvalidator/qregexpvalidator.pro

diff --git a/tests/auto/widgets/widgets/qregexpvalidator/tst_qregexpvalidator.cpp b/tests/auto/gui/util/qregexpvalidator/tst_qregexpvalidator.cpp
similarity index 100%
rename from tests/auto/widgets/widgets/qregexpvalidator/tst_qregexpvalidator.cpp
rename to tests/auto/gui/util/qregexpvalidator/tst_qregexpvalidator.cpp

diff --git a/tests/auto/gui/util/util.pro b/tests/auto/gui/util/util.pro
index 91313ab..a096398 100644 (file)
--- a/tests/auto/gui/util/util.pro
+++ b/tests/auto/gui/util/util.pro
@@ -1,4 +1,7 @@
 TEMPLATE=subdirs
-SUBDIRS=\
-   qdesktopservices \
+SUBDIRS= \
+    qdesktopservices \
+    qdoublevalidator \
+    qintvalidator \
+    qregexpvalidator \
 

diff --git a/tests/auto/widgets/widgets/widgets.pro b/tests/auto/widgets/widgets/widgets.pro
index 0497cd2..12dfc8f 100644 (file)
--- a/tests/auto/widgets/widgets/widgets.pro
+++ b/tests/auto/widgets/widgets/widgets.pro
@@ -14,11 +14,9 @@ SUBDIRS=\
    qdialogbuttonbox \
    qdockwidget \
    qdoublespinbox \
-   qdoublevalidator \
    qfocusframe \
    qfontcombobox \
    qgroupbox \
-   qintvalidator \
    qlabel \
    qlcdnumber \
    qlineedit \
@@ -31,7 +29,6 @@ SUBDIRS=\
    qprogressbar \
    qpushbutton \
    qradiobutton \
-   qregexpvalidator \
    qscrollarea \
    qscrollbar \
    qsizegrip \