Fixed inconsistent test naming.

TARGET and test class name should always match.

4 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 36eade8..eb74244 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -1,7 +1,6 @@
 TEMPLATE = subdirs
 SUBDIRS += \
            graphicswidgets \        # Cover
-           layouts \                # Cover
            parserstress \           # Cover
            qmetaobjectbuilder \     # Cover
            qdeclarativeanimations \          # Cover
@@ -29,6 +28,7 @@ SUBDIRS += \
            qdeclarativeitem \        # Cover
            qdeclarativelistview \    # Cover
            qdeclarativeloader \      # Cover
+           qdeclarativelayouts \     # Cover
            qdeclarativemousearea \   # Cover
            qdeclarativeparticles \   # Cover
            qdeclarativepathview \    # Cover
diff --git a/tests/auto/declarative/layouts/data/layouts.qml b/tests/auto/declarative/qdeclarativelayouts/data/layouts.qml
index 1792500..1792500 100644
--- a/tests/auto/declarative/layouts/data/layouts.qml
+++ b/tests/auto/declarative/qdeclarativelayouts/data/layouts.qml
diff --git a/tests/auto/declarative/layouts/layouts.pro b/tests/auto/declarative/qdeclarativelayouts/qdeclarativelayouts.pro
index f38e155..7276162 100644
--- a/tests/auto/declarative/layouts/layouts.pro
+++ b/tests/auto/declarative/qdeclarativelayouts/qdeclarativelayouts.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_layouts.cpp
+SOURCES += tst_qdeclarativelayouts.cpp
 macx:CONFIG -= app_bundle
 
 # Define SRCDIR equal to test's source directory
diff --git a/tests/auto/declarative/layouts/tst_layouts.cpp b/tests/auto/declarative/qdeclarativelayouts/tst_qdeclarativelayouts.cpp
index 942125f..879047e 100644
--- a/tests/auto/declarative/layouts/tst_layouts.cpp
+++ b/tests/auto/declarative/qdeclarativelayouts/tst_qdeclarativelayouts.cpp
@@ -144,4 +144,4 @@ QDeclarativeView *tst_QDeclarativeLayouts::createView(const QString &filename)
 
 QTEST_MAIN(tst_QDeclarativeLayouts)
 
-#include "tst_layouts.moc"
+#include "tst_qdeclarativelayouts.moc"