20 files changed, 20 insertions, 20 deletions
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 5441311..7834650 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -62,7 +62,7 @@ SUBDIRS += \
            qdeclarativexmlhttprequest \      # Cover
            qdeclarativeimageprovider \       # Cover
            qdeclarativestyledtext \          # Cover
-           sql \                      # Cover
+           qdeclarativesqldatabase \         # Cover
            qmlvisual                    # Cover
 
 contains(QT_CONFIG, webkit) {
diff --git a/tests/auto/declarative/sql/data/README b/tests/auto/declarative/qdeclarativesqldatabase/data/README
index 7efca3a..7efca3a 100644
--- a/tests/auto/declarative/sql/data/README
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/README
diff --git a/tests/auto/declarative/sql/data/changeversion.js b/tests/auto/declarative/qdeclarativesqldatabase/data/changeversion.js
index 680d7a6..680d7a6 100644
--- a/tests/auto/declarative/sql/data/changeversion.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/changeversion.js
diff --git a/tests/auto/declarative/sql/data/creation-a.js b/tests/auto/declarative/qdeclarativesqldatabase/data/creation-a.js
index bd7d5c5..bd7d5c5 100644
--- a/tests/auto/declarative/sql/data/creation-a.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/creation-a.js
diff --git a/tests/auto/declarative/sql/data/creation.js b/tests/auto/declarative/qdeclarativesqldatabase/data/creation.js
index 317b4c1..317b4c1 100644
--- a/tests/auto/declarative/sql/data/creation.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/creation.js
diff --git a/tests/auto/declarative/sql/data/error-a.js b/tests/auto/declarative/qdeclarativesqldatabase/data/error-a.js
index 10a23f6..10a23f6 100644
--- a/tests/auto/declarative/sql/data/error-a.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/error-a.js
diff --git a/tests/auto/declarative/sql/data/error-b.js b/tests/auto/declarative/qdeclarativesqldatabase/data/error-b.js
index 4dd0ecf..4dd0ecf 100644
--- a/tests/auto/declarative/sql/data/error-b.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/error-b.js
diff --git a/tests/auto/declarative/sql/data/error-creation.js b/tests/auto/declarative/qdeclarativesqldatabase/data/error-creation.js
index 0ab2a35..0ab2a35 100644
--- a/tests/auto/declarative/sql/data/error-creation.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/error-creation.js
diff --git a/tests/auto/declarative/sql/data/error-notransaction.js b/tests/auto/declarative/qdeclarativesqldatabase/data/error-notransaction.js
index b9cc647..b9cc647 100644
--- a/tests/auto/declarative/sql/data/error-notransaction.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/error-notransaction.js
diff --git a/tests/auto/declarative/sql/data/error-outsidetransaction.js b/tests/auto/declarative/qdeclarativesqldatabase/data/error-outsidetransaction.js
index a7af3bd..a7af3bd 100644
--- a/tests/auto/declarative/sql/data/error-outsidetransaction.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/error-outsidetransaction.js
diff --git a/tests/auto/declarative/sql/data/iteration-forwardonly.js b/tests/auto/declarative/qdeclarativesqldatabase/data/iteration-forwardonly.js
index 45947c0..45947c0 100644
--- a/tests/auto/declarative/sql/data/iteration-forwardonly.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/iteration-forwardonly.js
diff --git a/tests/auto/declarative/sql/data/iteration.js b/tests/auto/declarative/qdeclarativesqldatabase/data/iteration.js
index c34cbbb..c34cbbb 100644
--- a/tests/auto/declarative/sql/data/iteration.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/iteration.js
diff --git a/tests/auto/declarative/sql/data/readonly-error.js b/tests/auto/declarative/qdeclarativesqldatabase/data/readonly-error.js
index 69ec67f..69ec67f 100644
--- a/tests/auto/declarative/sql/data/readonly-error.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/readonly-error.js
diff --git a/tests/auto/declarative/sql/data/readonly.js b/tests/auto/declarative/qdeclarativesqldatabase/data/readonly.js
index 5ee862c..5ee862c 100644
--- a/tests/auto/declarative/sql/data/readonly.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/readonly.js
diff --git a/tests/auto/declarative/sql/data/reopen1.js b/tests/auto/declarative/qdeclarativesqldatabase/data/reopen1.js
index c1a8157..c1a8157 100644
--- a/tests/auto/declarative/sql/data/reopen1.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/reopen1.js
diff --git a/tests/auto/declarative/sql/data/reopen2.js b/tests/auto/declarative/qdeclarativesqldatabase/data/reopen2.js
index 4f7248f..4f7248f 100644
--- a/tests/auto/declarative/sql/data/reopen2.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/reopen2.js
diff --git a/tests/auto/declarative/sql/data/selection-bindnames.js b/tests/auto/declarative/qdeclarativesqldatabase/data/selection-bindnames.js
index 9786821..9786821 100644
--- a/tests/auto/declarative/sql/data/selection-bindnames.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/selection-bindnames.js
diff --git a/tests/auto/declarative/sql/data/selection.js b/tests/auto/declarative/qdeclarativesqldatabase/data/selection.js
index f116eff..f116eff 100644
--- a/tests/auto/declarative/sql/data/selection.js
+++ b/tests/auto/declarative/qdeclarativesqldatabase/data/selection.js
diff --git a/tests/auto/declarative/sql/sql.pro b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
index 7e4fdd8..3ff4529 100644
--- a/tests/auto/declarative/sql/sql.pro
+++ b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
@@ -3,7 +3,7 @@ contains(QT_CONFIG,declarative): QT += declarative
 QT += sql script
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_sql.cpp
+SOURCES += tst_qdeclarativesqldatabase.cpp
 
 # Define SRCDIR equal to test's source directory
 DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/sql/tst_sql.cpp b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp
index c8b8dc3..7486a4b 100644
--- a/tests/auto/declarative/sql/tst_sql.cpp
+++ b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp
@@ -53,19 +53,19 @@
 #include <QtCore/qdir.h>
 #include <QtCore/qfile.h>
 
-class tst_sql : public QObject
+class tst_qdeclarativesqldatabase : public QObject
 {
     Q_OBJECT
 public:
-    tst_sql()
+    tst_qdeclarativesqldatabase()
     {
-        qApp->setApplicationName("tst_sql");
+        qApp->setApplicationName("tst_qdeclarativesqldatabase");
         qApp->setOrganizationName("Nokia");
         qApp->setOrganizationDomain("nokia.com");
         engine = new QDeclarativeEngine;
     }
 
-    ~tst_sql()
+    ~tst_qdeclarativesqldatabase()
     {
         delete engine;
     }
@@ -108,33 +108,33 @@ void removeRecursive(const QString& dirname)
     QDir().rmdir(dirname);
 }
 
-void tst_sql::initTestCase()
+void tst_qdeclarativesqldatabase::initTestCase()
 {
     removeRecursive(dbDir());
     QDir().mkpath(dbDir());
 }
 
-void tst_sql::cleanupTestCase()
+void tst_qdeclarativesqldatabase::cleanupTestCase()
 {
     removeRecursive(dbDir());
 }
 
-QString tst_sql::dbDir() const
+QString tst_qdeclarativesqldatabase::dbDir() const
 {
-    static QString tmpd = QDir::tempPath()+"/tst_sql_output-"
+    static QString tmpd = QDir::tempPath()+"/tst_qdeclarativesqldatabase_output-"
         + QDateTime::currentDateTime().toString(QLatin1String("yyyyMMddhhmmss"));
     return tmpd;
 }
 
-void tst_sql::checkDatabasePath()
+void tst_qdeclarativesqldatabase::checkDatabasePath()
 {
     // Check default storage path (we can't use it since we don't want to mess with user's data)
-    QVERIFY(engine->offlineStoragePath().contains("tst_sql"));
+    QVERIFY(engine->offlineStoragePath().contains("tst_qdeclarativesqldatabase"));
     QVERIFY(engine->offlineStoragePath().contains("OfflineStorage"));
 }
 
 static const int total_databases_created_by_tests = 12;
-void tst_sql::testQml_data()
+void tst_qdeclarativesqldatabase::testQml_data()
 {
     QTest::addColumn<QString>("jsfile"); // The input file
 
@@ -161,7 +161,7 @@ void tst_sql::testQml_data()
 }
 
 /*
-void tst_sql::validateAgainstWebkit()
+void tst_qdeclarativesqldatabase::validateAgainstWebkit()
 {
     // Validates tests against WebKit (HTML5) support.
     //
@@ -188,7 +188,7 @@ void tst_sql::validateAgainstWebkit()
 }
 */
 
-void tst_sql::testQml()
+void tst_qdeclarativesqldatabase::testQml()
 {
     // Tests QML SQL Database support with tests
     // that have been validated against Webkit.
@@ -209,7 +209,7 @@ void tst_sql::testQml()
     QCOMPARE(text->text(),QString("passed"));
 }
 
-void tst_sql::testQml_cleanopen_data()
+void tst_qdeclarativesqldatabase::testQml_cleanopen_data()
 {
     QTest::addColumn<QString>("jsfile"); // The input file
     QTest::newRow("reopen1") << "data/reopen1.js";
@@ -217,7 +217,7 @@ void tst_sql::testQml_cleanopen_data()
     QTest::newRow("error-creation") << "data/error-creation.js"; // re-uses creation DB
 }
 
-void tst_sql::testQml_cleanopen()
+void tst_qdeclarativesqldatabase::testQml_cleanopen()
 {
     // Same as testQml, but clean connections between tests,
     // making it more like the tests are running in new processes.
@@ -229,11 +229,11 @@ void tst_sql::testQml_cleanopen()
     }
 }
 
-void tst_sql::totalDatabases()
+void tst_qdeclarativesqldatabase::totalDatabases()
 {
     QCOMPARE(QDir(dbDir()+"/Databases").entryInfoList(QDir::Files|QDir::NoDotAndDotDot).count(), total_databases_created_by_tests*2);
 }
 
-QTEST_MAIN(tst_sql)
+QTEST_MAIN(tst_qdeclarativesqldatabase)
 
-#include "tst_sql.moc"
+#include "tst_qdeclarativesqldatabase.moc"