From 361ab4fe86a375bf880536d161641a9725de70dd Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Sun, 7 Oct 2012 16:05:59 +0100 Subject: [PATCH] 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 --- .../auto/{widgets/widgets => gui/util}/qdoublevalidator/.gitignore | 0 .../widgets => gui/util}/qdoublevalidator/qdoublevalidator.pro | 2 +- .../widgets => gui/util}/qdoublevalidator/tst_qdoublevalidator.cpp | 0 tests/auto/{widgets/widgets => gui/util}/qintvalidator/.gitignore | 0 .../{widgets/widgets => gui/util}/qintvalidator/qintvalidator.pro | 0 .../widgets => gui/util}/qintvalidator/tst_qintvalidator.cpp | 0 .../auto/{widgets/widgets => gui/util}/qregexpvalidator/.gitignore | 0 .../widgets => gui/util}/qregexpvalidator/qregexpvalidator.pro | 0 .../widgets => gui/util}/qregexpvalidator/tst_qregexpvalidator.cpp | 0 tests/auto/gui/util/util.pro | 7 +++++-- tests/auto/widgets/widgets/widgets.pro | 3 --- 11 files changed, 6 insertions(+), 6 deletions(-) rename tests/auto/{widgets/widgets => gui/util}/qdoublevalidator/.gitignore (100%) rename tests/auto/{widgets/widgets => gui/util}/qdoublevalidator/qdoublevalidator.pro (87%) rename tests/auto/{widgets/widgets => gui/util}/qdoublevalidator/tst_qdoublevalidator.cpp (100%) rename tests/auto/{widgets/widgets => gui/util}/qintvalidator/.gitignore (100%) rename tests/auto/{widgets/widgets => gui/util}/qintvalidator/qintvalidator.pro (100%) rename tests/auto/{widgets/widgets => gui/util}/qintvalidator/tst_qintvalidator.cpp (100%) rename tests/auto/{widgets/widgets => gui/util}/qregexpvalidator/.gitignore (100%) rename tests/auto/{widgets/widgets => gui/util}/qregexpvalidator/qregexpvalidator.pro (100%) rename tests/auto/{widgets/widgets => gui/util}/qregexpvalidator/tst_qregexpvalidator.cpp (100%) 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 --- 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 --- 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 --- 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 \ -- 2.7.4