Cleaned up test naming and platform-specific tests.

When an autotest fails to compile, there's no way to determine which
testcase(s) have been prevented from running.

Our results parsing tools have been guessing, under the assumption that
a directory called `qdogwalker' always contains a testcase named
`tst_qdogwalker'.  That wasn't true for all our tests, so let's make it
true.

Also changed the platform-specific tests so that qmake will simply skip
those tests on unsupported platforms, instead of wasting time compiling
a useless QTEST_NOOP_MAIN test.

32 files changed, 194 insertions, 201 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index fd887fdd84..10257d90ad 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -4,7 +4,7 @@ TEMPLATE = subdirs
 !wince*:SUBDIRS += \
            headers
 
-SUBDIRS += _networkselftest \
+SUBDIRS += \
            bic \
            collections \
            compile \
@@ -17,6 +17,7 @@ SUBDIRS += _networkselftest \
 #	   mediaobject_wince_ds9 \   This is Windows CE only (we test the second phonon backend ds9 here)
            moc \
            modeltest \
+           networkselftest \
            q3accel \
            q3action \
            q3actiongroup \
@@ -224,8 +225,8 @@ SUBDIRS += _networkselftest \
            qpixmapfilter \
            qplaintextedit \
            qpoint \
-           qpointarray \
            qpointer \
+           qpolygon \
            qprinter \
            qprinterinfo \
            qprocess \
@@ -247,9 +248,9 @@ SUBDIRS += _networkselftest \
            qscriptcontextinfo \
            qscriptengine \
            qscriptengineagent \
+           qscriptextqobject \
            qscriptjstestsuite \
            qscriptv8testsuite \
-           qscriptqobject \
            qscriptstring \
            qscriptvalue \
            qscriptvalueiterator \
diff --git a/tests/auto/macgui/macgui.pro b/tests/auto/macgui/macgui.pro
index dc646278ab..0ed2350a48 100644
--- a/tests/auto/macgui/macgui.pro
+++ b/tests/auto/macgui/macgui.pro
@@ -4,12 +4,8 @@ DEPENDPATH += .
 INCLUDEPATH += .
 
 # Input
-SOURCES += tst_gui.cpp 
-
-mac {
-    SOURCES += guitest.cpp
-    HEADERS += guitest.h
-}
-
+SOURCES += tst_macgui.cpp guitest.cpp
+HEADERS += guitest.h
 
+requires(mac)
 
diff --git a/tests/auto/macgui/tst_gui.cpp b/tests/auto/macgui/tst_macgui.cpp
index 635023a3be..627dc82d56 100644
--- a/tests/auto/macgui/tst_gui.cpp
+++ b/tests/auto/macgui/tst_macgui.cpp
@@ -52,7 +52,7 @@
 
 #ifdef Q_OS_MAC
 
-class tst_gui : public GuiTester
+class tst_MacGui : public GuiTester
 {
 Q_OBJECT
 private slots:
@@ -76,7 +76,7 @@ QPixmap grabWindowContents(QWidget * widget)
     Test that vertical and horizontal mac-style scrollbars paint their
     entire area.
 */
-void tst_gui::scrollbarPainting()
+void tst_MacGui::scrollbarPainting()
 {
     ColorWidget colorWidget;
     colorWidget.resize(400, 400);
@@ -108,7 +108,7 @@ void tst_gui::scrollbarPainting()
 
 // When running the auto-tests on scruffy, the first enter-the-event-loop-and-wait-for-a-click
 // test that runs always times out, so we have this dummy test.
-void tst_gui::dummy()
+void tst_MacGui::dummy()
 {
     QPixmap pix(100, 100);
     QSplashScreen splash(pix);
@@ -133,7 +133,7 @@ void tst_gui::dummy()
 /*
     Test that a message box pops up in front of a QSplashScreen.
 */
-void tst_gui::splashScreenModality()
+void tst_MacGui::splashScreenModality()
 {
     QPixmap pix(300, 300);
     QSplashScreen splash(pix);
@@ -162,7 +162,7 @@ void tst_gui::splashScreenModality()
     Test that a non-modal dialog created as a child of a modal dialog is
     shown in front.
 */
-void tst_gui::dialogModality()
+void tst_MacGui::dialogModality()
 { 
     QDialog d;
     d.setModal(true);
@@ -222,7 +222,7 @@ void PrimaryWindowDialog::test()
     of the dialog even if the dialog becomes modal after the child window
     is created.
 */
-void tst_gui::nonModalOrder()
+void tst_MacGui::nonModalOrder()
 {
     clearSequence();
     PrimaryWindowDialog primary;
@@ -235,7 +235,7 @@ void tst_gui::nonModalOrder()
 /*
     Test that the QSpinBox buttons are correctly positioned with the Mac style.
 */
-void tst_gui::spinBoxArrowButtons()
+void tst_MacGui::spinBoxArrowButtons()
 {
     ColorWidget colorWidget;
     colorWidget.resize(200, 200);
@@ -266,7 +266,7 @@ void tst_gui::spinBoxArrowButtons()
     QVERIFY(noFocus.copy(compareRect) == focus.copy(compareRect));
 }
 
-QTEST_MAIN(tst_gui)
+QTEST_MAIN(tst_MacGui)
 
 #else
 
@@ -274,4 +274,5 @@ QTEST_NOOP_MAIN
 
 #endif
 
-#include "tst_gui.moc"
+#include "tst_macgui.moc"
+
diff --git a/tests/auto/_networkselftest/_networkselftest.pro b/tests/auto/networkselftest/networkselftest.pro
index 9e2ad0e91b..9e2ad0e91b 100644
--- a/tests/auto/_networkselftest/_networkselftest.pro
+++ b/tests/auto/networkselftest/networkselftest.pro
diff --git a/tests/auto/_networkselftest/tst_networkselftest.cpp b/tests/auto/networkselftest/tst_networkselftest.cpp
index cb82733214..cb82733214 100644
--- a/tests/auto/_networkselftest/tst_networkselftest.cpp
+++ b/tests/auto/networkselftest/tst_networkselftest.cpp
diff --git a/tests/auto/qaccessibility_mac/qaccessibility_mac.pro b/tests/auto/qaccessibility_mac/qaccessibility_mac.pro
index b6829dc2fe..b32a7e53e2 100644
--- a/tests/auto/qaccessibility_mac/qaccessibility_mac.pro
+++ b/tests/auto/qaccessibility_mac/qaccessibility_mac.pro
@@ -4,21 +4,20 @@ TARGET = tst_qaccessibility_mac
 
 RESOURCES = qaccessibility_mac.qrc
 
-mac {
+requires(mac)
+
 # this setup should support both building as an autotest
 # (where uilib isn't built by default), and when running shadow
 # builds (where QTDIR points to the build directory).
 # autotest + shadow build is not supported :)
-    exists($$(QTDIR)/tools/designer/src/lib/uilib/uilib.pri) {
-       include($$(QTDIR)/tools/designer/src/lib/uilib/uilib.pri)
-       INCLUDEPATH += $$(QTDIR)/tools/designer/src/uitools
-       SOURCES += $$(QTDIR)/tools/designer/src/uitools/quiloader.cpp
-       HEADERS += $$(QTDIR)/tools/designer/src/uitools/quiloader.h
-    } else {
-        CONFIG += uitools
-    }
-    QT += xml
-    LIBS += -framework ApplicationServices -framework Carbon
+exists($$(QTDIR)/tools/designer/src/lib/uilib/uilib.pri) {
+   include($$(QTDIR)/tools/designer/src/lib/uilib/uilib.pri)
+   INCLUDEPATH += $$(QTDIR)/tools/designer/src/uitools
+   SOURCES += $$(QTDIR)/tools/designer/src/uitools/quiloader.cpp
+   HEADERS += $$(QTDIR)/tools/designer/src/uitools/quiloader.h
+} else {
+    CONFIG += uitools
 }
-
+QT += xml
+LIBS += -framework ApplicationServices -framework Carbon
 
diff --git a/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp b/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp
index b81fa1239c..2af6813ca0 100644
--- a/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp
+++ b/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp
@@ -73,7 +73,7 @@ Q_DECLARE_METATYPE(AXUIElementRef);
 
 typedef QCFType<CFArrayRef> QCFArrayRef;
 
-class tst_accessibility_mac : public QObject
+class tst_qaccessibility_mac : public QObject
 {
 Q_OBJECT
 public slots:
@@ -665,7 +665,7 @@ void testAppAndForm(AXUIElementRef application)
     VERIFY_ELEMENT(form, application, "AXWindow");
 }
 
-void tst_accessibility_mac::printInfo()
+void tst_qaccessibility_mac::printInfo()
 {
     AXUIElementRef currentApplication = AXUIElementCreateApplication(getpid());
     printElementInfo(currentApplication);
@@ -674,7 +674,7 @@ void tst_accessibility_mac::printInfo()
 /*
     Tests for form.ui
 */
-void tst_accessibility_mac::testForm()
+void tst_qaccessibility_mac::testForm()
 {
     // Get reference to the current application.
     AXUIElementRef currentApplication = AXUIElementCreateApplication(getpid());
@@ -685,7 +685,7 @@ void tst_accessibility_mac::testForm()
 /*
     Tests for buttons.ui
 */
-void tst_accessibility_mac::testButtons()
+void tst_qaccessibility_mac::testButtons()
 {
     // Get reference to the current application.
     AXUIElementRef currentApplication = AXUIElementCreateApplication(getpid());
@@ -714,7 +714,7 @@ void tst_accessibility_mac::testButtons()
     VERIFY_ROLE_DESCRIPTION(brain, "button");
 }
 
-void tst_accessibility_mac::testLabel()
+void tst_qaccessibility_mac::testLabel()
 {
     // Get reference to the current application.
     AXUIElementRef currentApplication = AXUIElementCreateApplication(getpid());
@@ -731,7 +731,7 @@ void tst_accessibility_mac::testLabel()
 /*
     Tests for lineedit.ui
 */
-void tst_accessibility_mac::testLineEdit()
+void tst_qaccessibility_mac::testLineEdit()
 {
     // Get reference to the current application.
     AXUIElementRef currentApplication = AXUIElementCreateApplication(getpid());
@@ -746,7 +746,7 @@ void tst_accessibility_mac::testLineEdit()
 /*
     Tests for groups.ui
 */
-void tst_accessibility_mac::testGroups()
+void tst_qaccessibility_mac::testGroups()
 {
     // Get reference to the current application.
     AXUIElementRef currentApplication = AXUIElementCreateApplication(getpid());
@@ -769,7 +769,7 @@ void tst_accessibility_mac::testGroups()
 /*
     Tests for tabs.ui
 */
-void tst_accessibility_mac::testTabWidget()
+void tst_qaccessibility_mac::testTabWidget()
 {
     {   // Test that the QTabWidget hierarchy is what we expect it to be.
         QTabWidget tabWidget;
@@ -873,7 +873,7 @@ void tst_accessibility_mac::testTabWidget()
     }
 }
 
-void tst_accessibility_mac::testTabBar()
+void tst_qaccessibility_mac::testTabBar()
 {
     QTabBar tabBar;
     tabBar.addTab("Tab A");
@@ -924,7 +924,7 @@ void tst_accessibility_mac::testTabBar()
     }
 }
 
-void tst_accessibility_mac::testComboBox()
+void tst_qaccessibility_mac::testComboBox()
 {
     // Get reference to the current application.
     AXUIElementRef currentApplication = AXUIElementCreateApplication(getpid());
@@ -940,7 +940,7 @@ void tst_accessibility_mac::testComboBox()
     QVERIFY(performAction(comboBox, "AXPress"));
 }
 
-void tst_accessibility_mac::testDeleteWidget()
+void tst_qaccessibility_mac::testDeleteWidget()
 {
     const QString buttonTitle = "Hi there";
     QWidget *form = new QWidget(0, Qt::Window);
@@ -964,7 +964,7 @@ void tst_accessibility_mac::testDeleteWidget()
     delete form;
 }
 
-void tst_accessibility_mac::testDeleteWidgets()
+void tst_qaccessibility_mac::testDeleteWidgets()
 {
     const QString buttonTitle = "Hi there";
     const int repeats = 10;
@@ -1047,7 +1047,7 @@ void tst_accessibility_mac::testDeleteWidgets()
 
 }
 
-void tst_accessibility_mac::testMultipleWindows()
+void tst_qaccessibility_mac::testMultipleWindows()
 {
     const QString formATitle("FormA");
     const QString formBTitle("FormB");
@@ -1077,7 +1077,7 @@ void tst_accessibility_mac::testMultipleWindows()
     delete formA;
 }
 
-void tst_accessibility_mac::testHiddenWidgets()
+void tst_qaccessibility_mac::testHiddenWidgets()
 {
     const QString windowTitle ="a widget";
     QWidget * const window = new QWidget(0);
@@ -1108,7 +1108,7 @@ void tst_accessibility_mac::testHiddenWidgets()
     delete window;
 };
 
-void tst_accessibility_mac::testActions()
+void tst_qaccessibility_mac::testActions()
 {
     // create a window with a push button
     const QString windowTitle ="a widget";
@@ -1145,7 +1145,7 @@ void tst_accessibility_mac::testActions()
     delete window;
 };
 
-void tst_accessibility_mac::testChangeState()
+void tst_qaccessibility_mac::testChangeState()
 {
     const QString windowTitle ="a widget";
     QWidget * const window = new QWidget();
@@ -1215,7 +1215,7 @@ void tst_accessibility_mac::testChangeState()
     delete window;
 }
 
-void tst_accessibility_mac::testSlider()
+void tst_qaccessibility_mac::testSlider()
 {
     const QString windowTitle = "a widget";
     QWidget * const window = new QWidget();
@@ -1241,7 +1241,7 @@ void tst_accessibility_mac::testSlider()
     delete slider;
 }
 
-void tst_accessibility_mac::testScrollArea()
+void tst_qaccessibility_mac::testScrollArea()
 {
     QWidget window;
     const QString windowTitle = "window";
@@ -1368,7 +1368,7 @@ void tst_accessibility_mac::testScrollArea()
     }
 }
 
-void tst_accessibility_mac::testListView()
+void tst_qaccessibility_mac::testListView()
 {
     QWidget window;
     const QString windowTitle("window");
@@ -1451,7 +1451,7 @@ void tst_accessibility_mac::testListView()
     QVERIFY(contains(listElement, C));
 }
 
-void tst_accessibility_mac::testTableView()
+void tst_qaccessibility_mac::testTableView()
 {
     QWidget window;
     const QString windowTitle("window");
@@ -1647,7 +1647,7 @@ void tst_accessibility_mac::testTableView()
 //    QTest::qWait(1000000);
 }
 
-void tst_accessibility_mac::testScrollBar()
+void tst_qaccessibility_mac::testScrollBar()
 {
     {
         QScrollBar scrollBar;
@@ -1693,7 +1693,7 @@ void tst_accessibility_mac::testScrollBar()
     }
 }
 
-void tst_accessibility_mac::testSplitter()
+void tst_qaccessibility_mac::testSplitter()
 {
     const AXUIElementRef currentApplication = AXUIElementCreateApplication(getpid());
     testAppAndForm(currentApplication);
@@ -1730,7 +1730,7 @@ void tst_accessibility_mac::testSplitter()
     }
 }
 
-void tst_accessibility_mac::testTextEdit()
+void tst_qaccessibility_mac::testTextEdit()
 {
     QWidget window;
     const QString windowTitle("window");
@@ -1796,13 +1796,13 @@ void testModelLessItemView(QAbstractItemView *itemView, const QByteArray &role)
     delete itemView;
 }
 
-void tst_accessibility_mac::testItemViewsWithoutModel()
+void tst_qaccessibility_mac::testItemViewsWithoutModel()
 {
     testModelLessItemView(new QListView(), "AXList");
     testModelLessItemView(new QTableView(), "AXTable");
 }
 
-void tst_accessibility_mac::testQAElement()
+void tst_qaccessibility_mac::testQAElement()
 {
     {
         QAElement element;
@@ -1825,7 +1825,7 @@ void tst_accessibility_mac::testQAElement()
 
 }
 
-void tst_accessibility_mac::testQAInterface()
+void tst_qaccessibility_mac::testQAInterface()
 {
     {
         QAInterface interface;
@@ -1855,7 +1855,7 @@ void tst_accessibility_mac::testQAInterface()
     }
 }
 
-void tst_accessibility_mac::uitests_data()
+void tst_qaccessibility_mac::uitests_data()
 {
     QTest::addColumn<QString>("uiFilename");
     QTest::addColumn<QString>("testSlot");
@@ -1871,7 +1871,7 @@ void tst_accessibility_mac::uitests_data()
     QTest::newRow("splitters") << "splitters.ui" << SLOT(testSplitter());
 }
 
-void tst_accessibility_mac::uitests()
+void tst_qaccessibility_mac::uitests()
 {
     QFETCH(QString, uiFilename);
     QFETCH(QString, testSlot);
@@ -1901,7 +1901,7 @@ void tst_accessibility_mac::uitests()
     delete window;
 }
 
-void tst_accessibility_mac::tests_data()
+void tst_qaccessibility_mac::tests_data()
 {
     QTest::addColumn<QString>("testSlot");
     QTest::newRow("deleteWidget") << SLOT(testDeleteWidget());
@@ -1919,7 +1919,7 @@ void tst_accessibility_mac::tests_data()
     QTest::newRow("tabbar") << SLOT(testTabBar());
 }
 
-void tst_accessibility_mac::tests()
+void tst_qaccessibility_mac::tests()
 {
     QFETCH(QString, testSlot);
     runTest(testSlot);
@@ -1930,7 +1930,7 @@ void tst_accessibility_mac::tests()
     kAXErrorAPIDisabled error, indicating that the accessible API is disabled, which it isn't.)
     To work around this, we run the tests in a callback slot called from the main event loop.
 */
-void tst_accessibility_mac::runTest(const QString &testSlot)
+void tst_qaccessibility_mac::runTest(const QString &testSlot)
 {
     // The Accessibility interface must be enabled to run this test.
     if (!AXAPIEnabled())
@@ -1947,7 +1947,7 @@ void tst_accessibility_mac::runTest(const QString &testSlot)
 
 }
 
-QTEST_APPLESS_MAIN(tst_accessibility_mac)
+QTEST_APPLESS_MAIN(tst_qaccessibility_mac)
 
 #else // defined(Q_WS_MAC) && !defined (QT_MAC_USE_COCOA)
 
diff --git a/tests/auto/qcopchannel/qcopchannel.pro b/tests/auto/qcopchannel/qcopchannel.pro
index 29f78349a2..427430f620 100644
--- a/tests/auto/qcopchannel/qcopchannel.pro
+++ b/tests/auto/qcopchannel/qcopchannel.pro
@@ -3,4 +3,5 @@ SUBDIRS = testSend
 
 SUBDIRS += test
 
+requires(embedded)
 
diff --git a/tests/auto/qcopchannel/test/test.pro b/tests/auto/qcopchannel/test/test.pro
index 48a218ee0f..8c7cc5baaa 100644
--- a/tests/auto/qcopchannel/test/test.pro
+++ b/tests/auto/qcopchannel/test/test.pro
@@ -3,12 +3,4 @@ load(qttest_p4)
 SOURCES += ../tst_qcopchannel.cpp
 TARGET = ../tst_qcopchannel
 
-win32 {
-  CONFIG(debug, debug|release) {
-    TARGET = ../../debug/tst_qcopchannel
-} else {
-    TARGET = ../../release/tst_qcopchannel
-  }
-}
-
 
diff --git a/tests/auto/qcopchannel/testSend/testSend.pro b/tests/auto/qcopchannel/testSend/testSend.pro
index f78341c526..ebce3ddb4e 100644
--- a/tests/auto/qcopchannel/testSend/testSend.pro
+++ b/tests/auto/qcopchannel/testSend/testSend.pro
@@ -2,4 +2,5 @@ load(qttest_p4)
 SOURCES = main.cpp
 TARGET = testSend
 
+requires(embedded)
 
diff --git a/tests/auto/qcssparser/qcssparser.pro b/tests/auto/qcssparser/qcssparser.pro
index 57d6804aab..2f991428a5 100644
--- a/tests/auto/qcssparser/qcssparser.pro
+++ b/tests/auto/qcssparser/qcssparser.pro
@@ -1,5 +1,5 @@
 load(qttest_p4)
-SOURCES += tst_cssparser.cpp
+SOURCES += tst_qcssparser.cpp
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 QT += xml
 
diff --git a/tests/auto/qcssparser/tst_cssparser.cpp b/tests/auto/qcssparser/tst_qcssparser.cpp
index c905688b78..33d85faae9 100644
--- a/tests/auto/qcssparser/tst_cssparser.cpp
+++ b/tests/auto/qcssparser/tst_qcssparser.cpp
@@ -46,7 +46,7 @@
 
 #include "private/qcssparser_p.h"
 
-class tst_CssParser : public QObject
+class tst_QCssParser : public QObject
 {
     Q_OBJECT
 private slots:
@@ -93,7 +93,7 @@ private slots:
     void quotedAndUnquotedIdentifiers();
 };
 
-void tst_CssParser::scanner_data()
+void tst_QCssParser::scanner_data()
 {
     QTest::addColumn<QString>("input");
     QTest::addColumn<QString>("output");
@@ -125,7 +125,7 @@ static void debug(const QVector<QCss::Symbol> &symbols, int index = -1)
 
 //static void debug(const QCss::Parser &p) { debug(p.symbols); }
 
-void tst_CssParser::scanner()
+void tst_QCssParser::scanner()
 {
     QFETCH(QString, input);
     QFETCH(QString, output);
@@ -174,7 +174,7 @@ void tst_CssParser::scanner()
 
 Q_DECLARE_METATYPE(QCss::Value)
 
-void tst_CssParser::term_data()
+void tst_QCssParser::term_data()
 {
     QTest::addColumn<bool>("parseSuccess");
     QTest::addColumn<QString>("css");
@@ -289,7 +289,7 @@ void tst_CssParser::term_data()
     QTest::newRow("ItaLIc") << true << "ItaLIc" << val;
 }
 
-void tst_CssParser::term()
+void tst_QCssParser::term()
 {
     QFETCH(bool, parseSuccess);
     QFETCH(QString, css);
@@ -310,7 +310,7 @@ void tst_CssParser::term()
 
 Q_DECLARE_METATYPE(QVector<QCss::Value>)
 
-void tst_CssParser::expr_data()
+void tst_QCssParser::expr_data()
 {
     QTest::addColumn<bool>("parseSuccess");
     QTest::addColumn<QString>("css");
@@ -335,7 +335,7 @@ void tst_CssParser::expr_data()
     values.clear();
 }
 
-void tst_CssParser::expr()
+void tst_QCssParser::expr()
 {
     QFETCH(bool, parseSuccess);
     QFETCH(QString, css);
@@ -355,7 +355,7 @@ void tst_CssParser::expr()
     }
 }
 
-void tst_CssParser::import()
+void tst_QCssParser::import()
 {
     QCss::Parser parser("@import \"plainstring\";");
     QVERIFY(parser.testImport());
@@ -372,7 +372,7 @@ void tst_CssParser::import()
     QCOMPARE(rule.media.at(1), QString("screen"));
 }
 
-void tst_CssParser::media()
+void tst_QCssParser::media()
 {
     QCss::Parser parser("@media print/*comment*/,screen /*comment to ignore*/{ }");
     QVERIFY(parser.testMedia());
@@ -384,7 +384,7 @@ void tst_CssParser::media()
     QVERIFY(rule.styleRules.isEmpty());
 }
 
-void tst_CssParser::page()
+void tst_QCssParser::page()
 {
     QCss::Parser parser("@page :first/*comment to ignore*/{ }");
     QVERIFY(parser.testPage());
@@ -394,7 +394,7 @@ void tst_CssParser::page()
     QVERIFY(rule.declarations.isEmpty());
 }
 
-void tst_CssParser::ruleset()
+void tst_QCssParser::ruleset()
 {
     {
         QCss::Parser parser("p/*foo*/{ }");
@@ -442,7 +442,7 @@ void tst_CssParser::ruleset()
 
 Q_DECLARE_METATYPE(QCss::Selector)
 
-void tst_CssParser::selector_data()
+void tst_QCssParser::selector_data()
 {
     QTest::addColumn<QString>("css");
     QTest::addColumn<QCss::Selector>("expectedSelector");
@@ -644,7 +644,7 @@ void tst_CssParser::selector_data()
     }
 }
 
-void tst_CssParser::selector()
+void tst_QCssParser::selector()
 {
     QFETCH(QString, css);
     QFETCH(QCss::Selector, expectedSelector);
@@ -676,7 +676,7 @@ void tst_CssParser::selector()
     }
 }
 
-void tst_CssParser::prio()
+void tst_QCssParser::prio()
 {
     {
         QCss::Parser parser("!important");
@@ -698,14 +698,14 @@ void tst_CssParser::prio()
     }
 }
 
-void tst_CssParser::escapes()
+void tst_QCssParser::escapes()
 {
     QCss::Parser parser("\\hello");
     parser.test(QCss::IDENT);
     QCOMPARE(parser.lexem(), QString("hello"));
 }
 
-void tst_CssParser::malformedDeclarations_data()
+void tst_QCssParser::malformedDeclarations_data()
 {
     QTest::addColumn<QString>("css");
 
@@ -718,7 +718,7 @@ void tst_CssParser::malformedDeclarations_data()
     QTest::newRow("7") << QString("p { color:red;   color{;color:maroon}; color:green } /* same with recovery */");
 }
 
-void tst_CssParser::malformedDeclarations()
+void tst_QCssParser::malformedDeclarations()
 {
     QFETCH(QString, css);
     QCss::Parser parser(css);
@@ -737,7 +737,7 @@ void tst_CssParser::malformedDeclarations()
     QCOMPARE(rule.declarations.last().d->values.at(0).variant.toString(), QString("green"));
 }
 
-void tst_CssParser::invalidAtKeywords()
+void tst_QCssParser::invalidAtKeywords()
 {
     QCss::Parser parser(""
     "@three-dee {"
@@ -769,7 +769,7 @@ void tst_CssParser::invalidAtKeywords()
 
 Q_DECLARE_METATYPE(QColor)
 
-void tst_CssParser::colorValue_data()
+void tst_QCssParser::colorValue_data()
 {
     QTest::addColumn<QString>("css");
     QTest::addColumn<QColor>("expectedColor");
@@ -790,7 +790,7 @@ void tst_CssParser::colorValue_data()
     QTest::newRow("transparent") << "color: transparent" << QColor(Qt::transparent);
 }
 
-void tst_CssParser::colorValue()
+void tst_QCssParser::colorValue()
 {
     QFETCH(QString, css);
     QFETCH(QColor, expectedColor);
@@ -845,7 +845,7 @@ private:
 
 Q_DECLARE_METATYPE(QDomDocument);
 
-void tst_CssParser::marginValue_data()
+void tst_QCssParser::marginValue_data()
 {
     QTest::addColumn<QString>("css");
     QTest::addColumn<QString>("expectedMargin");
@@ -873,7 +873,7 @@ void tst_CssParser::marginValue_data()
     QTest::newRow("crap") << "margin: crap" << "0 0 0 0";
 }
 
-void tst_CssParser::marginValue()
+void tst_QCssParser::marginValue()
 {
     QFETCH(QString, css);
     QFETCH(QString, expectedMargin);
@@ -906,7 +906,7 @@ void tst_CssParser::marginValue()
     }
 }
 
-void tst_CssParser::styleSelector_data()
+void tst_QCssParser::styleSelector_data()
 {
     QTest::addColumn<bool>("match");
     QTest::addColumn<QString>("selector");
@@ -1021,7 +1021,7 @@ void tst_CssParser::styleSelector_data()
     QTest::newRow("unknown-pseudo") << false << QString("p:enabled:foobar") << QString("<p/>") << QString();
 }
 
-void tst_CssParser::styleSelector()
+void tst_QCssParser::styleSelector()
 {
     QFETCH(bool, match);
     QFETCH(QString, selector);
@@ -1065,7 +1065,7 @@ void tst_CssParser::styleSelector()
     }
 }
 
-void tst_CssParser::specificity_data()
+void tst_QCssParser::specificity_data()
 {
     QTest::addColumn<QString>("selector");
     QTest::addColumn<int>("specificity");
@@ -1088,7 +1088,7 @@ void tst_CssParser::specificity_data()
     QTest::newRow("id") << QString("#x34y") << 1 * 0x100;
 }
 
-void tst_CssParser::specificity()
+void tst_QCssParser::specificity()
 {
     QFETCH(QString, selector);
 
@@ -1105,7 +1105,7 @@ void tst_CssParser::specificity()
     QTEST(rule.selectors.at(0).specificity(), "specificity");
 }
 
-void tst_CssParser::specificitySort_data()
+void tst_QCssParser::specificitySort_data()
 {
     QTest::addColumn<QString>("firstSelector");
     QTest::addColumn<QString>("secondSelector");
@@ -1118,7 +1118,7 @@ void tst_CssParser::specificitySort_data()
     QTest::newRow("class") << QString("p") << QString(".hey") << QString("<p class=\"hey\" />");
 }
 
-void tst_CssParser::specificitySort()
+void tst_QCssParser::specificitySort()
 {
     QFETCH(QString, firstSelector);
     QFETCH(QString, secondSelector);
@@ -1164,7 +1164,7 @@ void tst_CssParser::specificitySort()
     }
 }
 
-void tst_CssParser::rulesForNode_data()
+void tst_QCssParser::rulesForNode_data()
 {
     QTest::addColumn<QString>("xml");
     QTest::addColumn<QString>("css");
@@ -1208,7 +1208,7 @@ void tst_CssParser::rulesForNode_data()
         << quint64(QCss::PseudoClass_Pressed) << 1 << "blue" << "";
 }
 
-void tst_CssParser::rulesForNode()
+void tst_QCssParser::rulesForNode()
 {
     QFETCH(QString, xml);
     QFETCH(QString, css);
@@ -1250,7 +1250,7 @@ void tst_CssParser::rulesForNode()
         QCOMPARE(decls.at(1).d->values.at(0).variant.toString(), value1);
 }
 
-void tst_CssParser::shorthandBackgroundProperty_data()
+void tst_QCssParser::shorthandBackgroundProperty_data()
 {
     QTest::addColumn<QString>("css");
     QTest::addColumn<QBrush>("expectedBrush");
@@ -1270,7 +1270,7 @@ void tst_CssParser::shorthandBackgroundProperty_data()
     QTest::newRow("multi3") << "background: url(blah.png) top right" << QBrush() << QString("blah.png") << int(QCss::Repeat_XY) << int(Qt::AlignTop | Qt::AlignRight);
 }
 
-void tst_CssParser::shorthandBackgroundProperty()
+void tst_QCssParser::shorthandBackgroundProperty()
 {
     QFETCH(QString, css);
 
@@ -1309,7 +1309,7 @@ void tst_CssParser::shorthandBackgroundProperty()
     QTEST(int(alignment), "expectedAlignment");
 }
 
-void tst_CssParser::pseudoElement_data()
+void tst_QCssParser::pseudoElement_data()
 {
     QTest::addColumn<QString>("css");
     QTest::addColumn<QString>("pseudoElement");
@@ -1343,7 +1343,7 @@ void tst_CssParser::pseudoElement_data()
       << "pe2" << 1;
 }
 
-void tst_CssParser::pseudoElement()
+void tst_QCssParser::pseudoElement()
 {
     QFETCH(QString, css);
     QFETCH(QString, pseudoElement);
@@ -1372,7 +1372,7 @@ void tst_CssParser::pseudoElement()
     QVERIFY(decls.count() == declCount);
 }
 
-void tst_CssParser::gradient_data()
+void tst_QCssParser::gradient_data()
 {
     QTest::addColumn<QString>("css");
     QTest::addColumn<QString>("type");
@@ -1417,7 +1417,7 @@ void tst_CssParser::gradient_data()
     */
 }
 
-void tst_CssParser::gradient()
+void tst_QCssParser::gradient()
 {
     QFETCH(QString, css);
     QFETCH(QString, type);
@@ -1465,7 +1465,7 @@ void tst_CssParser::gradient()
     QVERIFY(g->stops().at(1).second == color1);
 }
 
-void tst_CssParser::extractFontFamily_data()
+void tst_QCssParser::extractFontFamily_data()
 {
     QTest::addColumn<QString>("css");
     QTest::addColumn<QString>("expectedFamily");
@@ -1481,7 +1481,7 @@ void tst_CssParser::extractFontFamily_data()
     QTest::newRow("shorthand multiple") << "font: 12pt invalid, Times New Roman " << QString("Times New Roman");
 }
 
-void tst_CssParser::extractFontFamily()
+void tst_QCssParser::extractFontFamily()
 {
     QFETCH(QString, css);
     css.prepend("dummy {");
@@ -1506,7 +1506,7 @@ void tst_CssParser::extractFontFamily()
     QTEST(info.family(), "expectedFamily");
 }
 
-void tst_CssParser::extractBorder_data()
+void tst_QCssParser::extractBorder_data()
 {
     QTest::addColumn<QString>("css");
     QTest::addColumn<int>("expectedTopWidth");
@@ -1534,7 +1534,7 @@ void tst_CssParser::extractBorder_data()
     QTest::newRow("top-width+color") << "border-top: 3px green" << 3 << (int)QCss::BorderStyle_None << QColor("green");
 }
 
-void tst_CssParser::extractBorder()
+void tst_QCssParser::extractBorder()
 {
     QFETCH(QString, css);
     QFETCH(int, expectedTopWidth);
@@ -1566,7 +1566,7 @@ void tst_CssParser::extractBorder()
     QVERIFY(colors[QCss::TopEdge] == expectedTopColor);
 }
 
-void tst_CssParser::noTextDecoration()
+void tst_QCssParser::noTextDecoration()
 {
     QCss::Parser parser("dummy { text-decoration: none; }");
     QCss::StyleSheet sheet;
@@ -1591,7 +1591,7 @@ void tst_CssParser::noTextDecoration()
     QVERIFY(!f.strikeOut());
 }
 
-void tst_CssParser::quotedAndUnquotedIdentifiers()
+void tst_QCssParser::quotedAndUnquotedIdentifiers()
 {
     QCss::Parser parser("foo { font-style: \"italic\"; font-weight: bold }");
     QCss::StyleSheet sheet;
@@ -1612,5 +1612,6 @@ void tst_CssParser::quotedAndUnquotedIdentifiers()
     QCOMPARE(decls.at(1).d->values.first().toString(), QLatin1String("bold"));
 }
 
-QTEST_MAIN(tst_CssParser)
-#include "tst_cssparser.moc"
+QTEST_MAIN(tst_QCssParser)
+#include "tst_qcssparser.moc"
+
diff --git a/tests/auto/qdbuspendingcall/qdbuspendingcall.pro b/tests/auto/qdbuspendingcall/qdbuspendingcall.pro
index 65e8f139dc..dd8f14198d 100644
--- a/tests/auto/qdbuspendingcall/qdbuspendingcall.pro
+++ b/tests/auto/qdbuspendingcall/qdbuspendingcall.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
-QT = core
-contains(QT_CONFIG, dbus):QT += dbus
+requires(contains(QT_CONFIG, dbus))
+QT = core dbus
 SOURCES += tst_qdbuspendingcall.cpp
+
diff --git a/tests/auto/qdbuspendingreply/qdbuspendingreply.pro b/tests/auto/qdbuspendingreply/qdbuspendingreply.pro
index 94e7acfc6e..c649e4aaf5 100644
--- a/tests/auto/qdbuspendingreply/qdbuspendingreply.pro
+++ b/tests/auto/qdbuspendingreply/qdbuspendingreply.pro
@@ -1,4 +1,4 @@
 load(qttest_p4)
-QT = core
-contains(QT_CONFIG, dbus):QT += dbus
+requires(contains(QT_CONFIG, dbus))
+QT = core dbus
 SOURCES += tst_qdbuspendingreply.cpp
diff --git a/tests/auto/qdirectpainter/qdirectpainter.pro b/tests/auto/qdirectpainter/qdirectpainter.pro
index 89671942c5..e86b3427eb 100644
--- a/tests/auto/qdirectpainter/qdirectpainter.pro
+++ b/tests/auto/qdirectpainter/qdirectpainter.pro
@@ -1,7 +1,5 @@
-load(qttest_p4)
-SOURCES += tst_qdirectpainter.cpp
-
 TEMPLATE = subdirs
 SUBDIRS = test runDirectPainter
 
+requires(embedded)
 
diff --git a/tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro b/tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro
index 9e5131c20a..09524e90c3 100644
--- a/tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro
+++ b/tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro
@@ -2,4 +2,5 @@ load(qttest_p4)
 SOURCES = main.cpp
 TARGET = runDirectPainter
 
+requires(embedded)
 
diff --git a/tests/auto/qdirectpainter/test/test.pro b/tests/auto/qdirectpainter/test/test.pro
index 98c74e415a..6d820b1585 100644
--- a/tests/auto/qdirectpainter/test/test.pro
+++ b/tests/auto/qdirectpainter/test/test.pro
@@ -3,12 +3,5 @@ load(qttest_p4)
 SOURCES += ../tst_qdirectpainter.cpp
 TARGET = ../tst_qdirectpainter
 
-win32 {
-  CONFIG(debug, debug|release) {
-    TARGET = ../../debug/tst_qdirectpainter
-} else {
-    TARGET = ../../release/tst_qdirectpainter
-  }
-}
-
+requires(embedded)
 
diff --git a/tests/auto/qicoimageformat/qicoimageformat.pro b/tests/auto/qicoimageformat/qicoimageformat.pro
index 19c13b70ca..9a347d78b2 100644
--- a/tests/auto/qicoimageformat/qicoimageformat.pro
+++ b/tests/auto/qicoimageformat/qicoimageformat.pro
@@ -1,5 +1,5 @@
 load(qttest_p4)
-SOURCES+= tst_qticoimageformat.cpp
+SOURCES+= tst_qicoimageformat.cpp
 
 wince*: {
    DEFINES += SRCDIR=\\\".\\\"
diff --git a/tests/auto/qicoimageformat/tst_qticoimageformat.cpp b/tests/auto/qicoimageformat/tst_qicoimageformat.cpp
index 51ee4aace0..799a20b650 100644
--- a/tests/auto/qicoimageformat/tst_qticoimageformat.cpp
+++ b/tests/auto/qicoimageformat/tst_qicoimageformat.cpp
@@ -42,13 +42,13 @@
 #include <QtGui>
 #include <QtCore>
 
-class tst_QtIcoImageFormat : public QObject
+class tst_QIcoImageFormat : public QObject
 {
     Q_OBJECT
 
 public:
-    tst_QtIcoImageFormat();
-    virtual ~tst_QtIcoImageFormat();
+    tst_QIcoImageFormat();
+    virtual ~tst_QIcoImageFormat();
 
 
 public slots:
@@ -76,45 +76,45 @@ private:
 };
 
 
-tst_QtIcoImageFormat::tst_QtIcoImageFormat()
+tst_QIcoImageFormat::tst_QIcoImageFormat()
 {
     m_IconPath = QLatin1String(SRCDIR) + "/icons";
     qDebug() << m_IconPath;
 }
 
-tst_QtIcoImageFormat::~tst_QtIcoImageFormat()
+tst_QIcoImageFormat::~tst_QIcoImageFormat()
 {
 
 }
 
-void tst_QtIcoImageFormat::init()
+void tst_QIcoImageFormat::init()
 {
 
 }
 
-void tst_QtIcoImageFormat::cleanup()
+void tst_QIcoImageFormat::cleanup()
 {
 
 }
 
-void tst_QtIcoImageFormat::initTestCase()
+void tst_QIcoImageFormat::initTestCase()
 {
 
 }
 
-void tst_QtIcoImageFormat::cleanupTestCase()
+void tst_QIcoImageFormat::cleanupTestCase()
 {
 
 }
 
-void tst_QtIcoImageFormat::format()
+void tst_QIcoImageFormat::format()
 {
     QImageReader reader(m_IconPath + "/valid/35FLOPPY.ICO", "ico");
     QByteArray fmt = reader.format();
     QCOMPARE(const_cast<const char*>(fmt.data()), "ico" );
 }
 
-void tst_QtIcoImageFormat::canRead_data()
+void tst_QIcoImageFormat::canRead_data()
 {
     QTest::addColumn<QString>("fileName");
     QTest::addColumn<int>("isValid");
@@ -132,7 +132,7 @@ void tst_QtIcoImageFormat::canRead_data()
     QTest::newRow("includes 32BPP w/alpha") << "valid/semitransparent.ico" << 1;
 }
 
-void tst_QtIcoImageFormat::canRead()
+void tst_QIcoImageFormat::canRead()
 {
     QFETCH(QString, fileName);
     QFETCH(int, isValid);
@@ -154,7 +154,7 @@ public:
 
 };
 
-void tst_QtIcoImageFormat::SequentialFile_data()
+void tst_QIcoImageFormat::SequentialFile_data()
 {
     QTest::addColumn<QString>("fileName");
     QTest::addColumn<int>("isValid");
@@ -166,7 +166,7 @@ void tst_QtIcoImageFormat::SequentialFile_data()
 
 }
 
-void tst_QtIcoImageFormat::SequentialFile()
+void tst_QIcoImageFormat::SequentialFile()
 {
     QFETCH(QString, fileName);
     QFETCH(int, isValid);
@@ -184,7 +184,7 @@ void tst_QtIcoImageFormat::SequentialFile()
 }
 
 
-void tst_QtIcoImageFormat::imageCount_data()
+void tst_QIcoImageFormat::imageCount_data()
 {
     QTest::addColumn<QString>("fileName");
     QTest::addColumn<int>("count");
@@ -202,7 +202,7 @@ void tst_QtIcoImageFormat::imageCount_data()
 
 }
 
-void tst_QtIcoImageFormat::imageCount()
+void tst_QIcoImageFormat::imageCount()
 {
     QFETCH(QString, fileName);
     QFETCH(int, count);
@@ -212,7 +212,7 @@ void tst_QtIcoImageFormat::imageCount()
 
 }
 
-void tst_QtIcoImageFormat::jumpToNextImage_data()
+void tst_QIcoImageFormat::jumpToNextImage_data()
 {
     QTest::addColumn<QString>("fileName");
     QTest::addColumn<int>("count");
@@ -228,7 +228,7 @@ void tst_QtIcoImageFormat::jumpToNextImage_data()
     QTest::newRow("includes 32BPP w/alpha") << "valid/semitransparent.ico" << 9;
 }
 
-void tst_QtIcoImageFormat::jumpToNextImage()
+void tst_QIcoImageFormat::jumpToNextImage()
 {
     QFETCH(QString, fileName);
     QFETCH(int, count);
@@ -242,7 +242,7 @@ void tst_QtIcoImageFormat::jumpToNextImage()
     QCOMPARE(count, 0);
 }
 
-void tst_QtIcoImageFormat::loopCount_data()
+void tst_QIcoImageFormat::loopCount_data()
 {
     QTest::addColumn<QString>("fileName");
     QTest::addColumn<int>("count");
@@ -251,7 +251,7 @@ void tst_QtIcoImageFormat::loopCount_data()
     QTest::newRow("invalid floppy (first 8 bytes = 0xff)") << "invalid/35floppy.ico" << 0;
 }
 
-void tst_QtIcoImageFormat::loopCount()
+void tst_QIcoImageFormat::loopCount()
 {
     QFETCH(QString, fileName);
     QFETCH(int, count);
@@ -260,7 +260,7 @@ void tst_QtIcoImageFormat::loopCount()
     QCOMPARE(reader.loopCount(), count);
 }
 
-void tst_QtIcoImageFormat::nextImageDelay_data()
+void tst_QIcoImageFormat::nextImageDelay_data()
 {
     QTest::addColumn<QString>("fileName");
     QTest::addColumn<int>("count");
@@ -277,7 +277,7 @@ void tst_QtIcoImageFormat::nextImageDelay_data()
     QTest::newRow("includes 32BPP w/alpha") << "valid/semitransparent.ico" << 9;
 }
 
-void tst_QtIcoImageFormat::nextImageDelay()
+void tst_QIcoImageFormat::nextImageDelay()
 {
     QFETCH(QString, fileName);
     QFETCH(int, count);
@@ -294,5 +294,6 @@ void tst_QtIcoImageFormat::nextImageDelay()
     }
 }
 
-QTEST_MAIN(tst_QtIcoImageFormat)
-#include "tst_qticoimageformat.moc"
+QTEST_MAIN(tst_QIcoImageFormat)
+#include "tst_qicoimageformat.moc"
+
diff --git a/tests/auto/qmultiscreen/qmultiscreen.pro b/tests/auto/qmultiscreen/qmultiscreen.pro
index 810c05f7fc..30666d72da 100644
--- a/tests/auto/qmultiscreen/qmultiscreen.pro
+++ b/tests/auto/qmultiscreen/qmultiscreen.pro
@@ -1,5 +1,5 @@
 load(qttest_p4)
 SOURCES += tst_qmultiscreen.cpp
 
-
+requires(embedded)
 
diff --git a/tests/auto/qpointarray/.gitignore b/tests/auto/qpolygon/.gitignore
index 7c9d48c848..7c9d48c848 100644
--- a/tests/auto/qpointarray/.gitignore
+++ b/tests/auto/qpolygon/.gitignore
diff --git a/tests/auto/qpointarray/qpointarray.pro b/tests/auto/qpolygon/qpolygon.pro
index d864337546..311958de63 100644
--- a/tests/auto/qpointarray/qpointarray.pro
+++ b/tests/auto/qpolygon/qpolygon.pro
@@ -1,5 +1,5 @@
 load(qttest_p4)
-SOURCES  += tst_qpointarray.cpp
+SOURCES  += tst_qpolygon.cpp
 
 unix:!mac:LIBS+=-lm
 
diff --git a/tests/auto/qpointarray/tst_qpointarray.cpp b/tests/auto/qpolygon/tst_qpolygon.cpp
index f46c96d44f..6b20dae652 100644
--- a/tests/auto/qpointarray/tst_qpointarray.cpp
+++ b/tests/auto/qpolygon/tst_qpolygon.cpp
@@ -92,4 +92,4 @@ void tst_QPolygon::makeEllipse()
 }
 
 QTEST_APPLESS_MAIN(tst_QPolygon)
-#include "tst_qpointarray.moc"
+#include "tst_qpolygon.moc"
diff --git a/tests/auto/qresourceengine/qresourceengine.pro b/tests/auto/qresourceengine/qresourceengine.pro
index cdbbbd2622..f897d600ff 100644
--- a/tests/auto/qresourceengine/qresourceengine.pro
+++ b/tests/auto/qresourceengine/qresourceengine.pro
@@ -6,7 +6,7 @@ load(qttest_p4)
 load(resources)
 
 # Input
-SOURCES += tst_resourceengine.cpp
+SOURCES += tst_qresourceengine.cpp
 RESOURCES += testqrc/test.qrc 
 
 runtime_resource.target = runtime_resource.rcc 
diff --git a/tests/auto/qresourceengine/tst_resourceengine.cpp b/tests/auto/qresourceengine/tst_qresourceengine.cpp
index a5e701a551..d446562c84 100644
--- a/tests/auto/qresourceengine/tst_resourceengine.cpp
+++ b/tests/auto/qresourceengine/tst_qresourceengine.cpp
@@ -43,7 +43,7 @@
 #include <QtTest/QtTest>
 #include <QtCore>
 
-class tst_ResourceEngine: public QObject
+class tst_QResourceEngine: public QObject
 {
     Q_OBJECT
 
@@ -66,7 +66,7 @@ private:
 Q_DECLARE_METATYPE(QLocale)
 Q_DECLARE_METATYPE(qlonglong)
 
-void tst_ResourceEngine::initTestCase()
+void tst_QResourceEngine::initTestCase()
 {
     QVERIFY(QResource::registerResource("runtime_resource.rcc"));
     QVERIFY(QResource::registerResource("runtime_resource.rcc", "/secondary_root/"));
@@ -79,7 +79,7 @@ void tst_ResourceEngine::initTestCase()
     }
 }
 
-void tst_ResourceEngine::cleanupTestCase()
+void tst_QResourceEngine::cleanupTestCase()
 {
     if (!builddir.isEmpty()) {
         QDir::setCurrent(builddir);
@@ -90,7 +90,7 @@ void tst_ResourceEngine::cleanupTestCase()
     QVERIFY(QResource::unregisterResource("runtime_resource.rcc", "/secondary_root/"));
 }
 
-void tst_ResourceEngine::checkStructure_data()
+void tst_QResourceEngine::checkStructure_data()
 {
     QTest::addColumn<QString>("pathName");
     QTest::addColumn<QString>("contents");
@@ -306,7 +306,7 @@ void tst_ResourceEngine::checkStructure_data()
     }
 }
 
-void tst_ResourceEngine::checkStructure()
+void tst_QResourceEngine::checkStructure()
 {
     QFETCH(QString, pathName);
     QFETCH(QString, contents);
@@ -376,7 +376,7 @@ void tst_ResourceEngine::checkStructure()
     QLocale::setDefault(QLocale::system());
 }
 
-void tst_ResourceEngine::searchPath_data()
+void tst_QResourceEngine::searchPath_data()
 {
     QTest::addColumn<QString>("searchPath");
     QTest::addColumn<QString>("file");
@@ -396,7 +396,7 @@ void tst_ResourceEngine::searchPath_data()
                          << QByteArray("path2\n");
 }
 
-void tst_ResourceEngine::searchPath()
+void tst_QResourceEngine::searchPath()
 {
     QFETCH(QString, searchPath);
     QFETCH(QString, file);
@@ -414,7 +414,7 @@ void tst_ResourceEngine::searchPath()
     qf.close();
 }
 
-void tst_ResourceEngine::checkUnregisterResource_data()
+void tst_QResourceEngine::checkUnregisterResource_data()
 {
     QTest::addColumn<QString>("rcc_file");
     QTest::addColumn<QString>("root");
@@ -426,7 +426,7 @@ void tst_ResourceEngine::checkUnregisterResource_data()
                                     << (int)QFileInfo("testqrc/currentdir.txt").size();
 }
 
-void tst_ResourceEngine::checkUnregisterResource()
+void tst_QResourceEngine::checkUnregisterResource()
 {
     QFETCH(QString, rcc_file);
     QFETCH(QString, root);
@@ -450,12 +450,13 @@ void tst_ResourceEngine::checkUnregisterResource()
     QCOMPARE((int)fileInfo.size(), size);
 }
 
-void tst_ResourceEngine::doubleSlashInRoot()
+void tst_QResourceEngine::doubleSlashInRoot()
 {
     QVERIFY(QFile::exists(":/secondary_root/runtime_resource/search_file.txt"));
     QVERIFY(QFile::exists("://secondary_root/runtime_resource/search_file.txt"));
 }
 
-QTEST_MAIN(tst_ResourceEngine)
+QTEST_MAIN(tst_QResourceEngine)
+
+#include "tst_qresourceengine.moc"
 
-#include "tst_resourceengine.moc"
diff --git a/tests/auto/qscriptqobject/.gitignore b/tests/auto/qscriptextqobject/.gitignore
index bff799fd38..bff799fd38 100644
--- a/tests/auto/qscriptqobject/.gitignore
+++ b/tests/auto/qscriptextqobject/.gitignore
diff --git a/tests/auto/qscriptextqobject/qscriptextqobject.pro b/tests/auto/qscriptextqobject/qscriptextqobject.pro
new file mode 100644
index 0000000000..a5e9cab2e7
--- /dev/null
+++ b/tests/auto/qscriptextqobject/qscriptextqobject.pro
@@ -0,0 +1,5 @@
+load(qttest_p4)
+QT += script
+SOURCES  += tst_qscriptextqobject.cpp
+
+
diff --git a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
index 73400b2103..0d0f9272f5 100644
--- a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp
+++ b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
@@ -2731,4 +2731,4 @@ void tst_QScriptExtQObject::connectToDestroyedSignal()
 }
 
 QTEST_MAIN(tst_QScriptExtQObject)
-#include "tst_qscriptqobject.moc"
+#include "tst_qscriptextqobject.moc"
diff --git a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
index 66004f86d6..4f6f38ec5e 100644
--- a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
+++ b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
@@ -785,6 +785,8 @@ tst_Suite::tst_Suite()
     addFileExclusion("regress-322135-04.js", "takes forever");
     addFileExclusion("ecma_3/RegExp/regress-375715-04.js", "bug");
 
+    static const char klass[] = "tst_QScriptJsTestSuite";
+
     QVector<uint> *data = qt_meta_data_tst_Suite();
     // content:
     *data << 1 // revision
@@ -796,7 +798,7 @@ tst_Suite::tst_Suite()
         ;
 
     QVector<char> *stringdata = qt_meta_stringdata_tst_Suite();
-    appendCString(stringdata, "tst_Suite");
+    appendCString(stringdata, klass);
     appendCString(stringdata, "");
 
 // don't execute any tests on slow machines
@@ -814,11 +816,12 @@ tst_Suite::tst_Suite()
             // slot: signature, parameters, type, tag, flags
             QString data_slot = QString::fromLatin1("%0/%1_data()")
                            .arg(testSuiteDir.dirName()).arg(ssdi.fileName());
-            *data << stringdata->size() << 10 << 10 << 10 << 0x08;
+            static const int nullbyte = sizeof(klass);
+            *data << stringdata->size() << nullbyte << nullbyte << nullbyte << 0x08;
             appendCString(stringdata, data_slot.toLatin1());
             QString slot = QString::fromLatin1("%0/%1()")
                            .arg(testSuiteDir.dirName()).arg(ssdi.fileName());
-            *data << stringdata->size() << 10 << 10 << 10 << 0x08;
+            *data << stringdata->size() << nullbyte << nullbyte << nullbyte << 0x08;
             appendCString(stringdata, slot.toLatin1());
         }
     }
diff --git a/tests/auto/qscriptqobject/qscriptqobject.pro b/tests/auto/qscriptqobject/qscriptqobject.pro
deleted file mode 100644
index e4e2b56cff..0000000000
--- a/tests/auto/qscriptqobject/qscriptqobject.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-load(qttest_p4)
-QT += script
-SOURCES  += tst_qscriptqobject.cpp
-
-
diff --git a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
index 77bfeb5f05..2dfd157c5e 100644
--- a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
+++ b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
@@ -254,6 +254,8 @@ tst_Suite::tst_Suite()
     addTestExclusion("mul-exhaustive", "Demands too much memory on WinCE");
 #endif
 
+    static const char klass[] = "tst_QScriptV8TestSuite";
+
     QVector<uint> *data = qt_meta_data_tst_Suite();
     // content:
     *data << 1 // revision
@@ -265,7 +267,7 @@ tst_Suite::tst_Suite()
         ;
 
     QVector<char> *stringdata = qt_meta_stringdata_tst_Suite();
-    appendCString(stringdata, "tst_Suite");
+    appendCString(stringdata, klass);
     appendCString(stringdata, "");
 
     QFileInfoList testFileInfos;
@@ -275,7 +277,8 @@ tst_Suite::tst_Suite()
         QString name = tfi.baseName();
         // slot: signature, parameters, type, tag, flags
         QString slot = QString::fromLatin1("%0()").arg(name);
-        *data << stringdata->size() << 10 << 10 << 10 << 0x08;
+        static const int nullbyte = sizeof(klass);
+        *data << stringdata->size() << nullbyte << nullbyte << nullbyte << 0x08;
         appendCString(stringdata, slot.toLatin1());
         testNames.append(name);
     }
diff --git a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp
index 30f97ba745..13d0f34f22 100644
--- a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp
+++ b/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp
@@ -76,13 +76,13 @@
 // This test depends on the fonts in the following package being installed:
 // http://people.freedesktop.org/~hausmann/harfbuzz-test-fonts-0.1.tar.bz2
 
-class tst_QScriptEngine : public QObject
+class tst_QTextScriptEngine : public QObject
 {
 Q_OBJECT
 
 public:
-    tst_QScriptEngine();
-    virtual ~tst_QScriptEngine();
+    tst_QTextScriptEngine();
+    virtual ~tst_QTextScriptEngine();
 
 
 public slots:
@@ -104,19 +104,19 @@ private slots:
     void linearB();
 };
 
-tst_QScriptEngine::tst_QScriptEngine()
+tst_QTextScriptEngine::tst_QTextScriptEngine()
 {
 }
 
-tst_QScriptEngine::~tst_QScriptEngine()
+tst_QTextScriptEngine::~tst_QTextScriptEngine()
 {
 }
 
-void tst_QScriptEngine::init()
+void tst_QTextScriptEngine::init()
 {
 }
 
-void tst_QScriptEngine::cleanup()
+void tst_QTextScriptEngine::cleanup()
 {
 }
 
@@ -172,7 +172,7 @@ static bool shaping( const QFont &f, const ShapeTable *s)
 }
 #endif
 
-void tst_QScriptEngine::devanagari()
+void tst_QTextScriptEngine::devanagari()
 {
 #if defined(Q_WS_X11)
     {
@@ -284,7 +284,7 @@ void tst_QScriptEngine::devanagari()
 #endif
 }
 
-void tst_QScriptEngine::bengali()
+void tst_QTextScriptEngine::bengali()
 {
 #if defined(Q_WS_X11)
     {
@@ -531,7 +531,7 @@ void tst_QScriptEngine::bengali()
 #endif
 }
 
-void tst_QScriptEngine::gurmukhi()
+void tst_QTextScriptEngine::gurmukhi()
 {
 #if defined(Q_WS_X11)
     {
@@ -556,7 +556,7 @@ void tst_QScriptEngine::gurmukhi()
 #endif
 }
 
-void tst_QScriptEngine::oriya()
+void tst_QTextScriptEngine::oriya()
 {
 #if defined(Q_WS_X11)
     {
@@ -596,7 +596,7 @@ void tst_QScriptEngine::oriya()
 }
 
 
-void tst_QScriptEngine::tamil()
+void tst_QTextScriptEngine::tamil()
 {
 #if defined(Q_WS_X11)
     {
@@ -667,7 +667,7 @@ void tst_QScriptEngine::tamil()
 }
 
 
-void tst_QScriptEngine::telugu()
+void tst_QTextScriptEngine::telugu()
 {
 #if defined(Q_WS_X11)
     {
@@ -713,7 +713,7 @@ void tst_QScriptEngine::telugu()
 }
 
 
-void tst_QScriptEngine::kannada()
+void tst_QTextScriptEngine::kannada()
 {
 #if defined(Q_WS_X11)
     {
@@ -783,7 +783,7 @@ void tst_QScriptEngine::kannada()
 
 
 
-void tst_QScriptEngine::malayalam()
+void tst_QTextScriptEngine::malayalam()
 {
 #if defined(Q_WS_X11)
     {
@@ -838,7 +838,7 @@ void tst_QScriptEngine::malayalam()
 
 
 
-void tst_QScriptEngine::khmer()
+void tst_QTextScriptEngine::khmer()
 {
 #if defined(Q_WS_X11)
     {
@@ -881,7 +881,7 @@ void tst_QScriptEngine::khmer()
 #endif
 }
 
-void tst_QScriptEngine::linearB()
+void tst_QTextScriptEngine::linearB()
 {
 #if defined(Q_WS_X11)
     {
@@ -909,5 +909,5 @@ void tst_QScriptEngine::linearB()
 }
 
 
-QTEST_MAIN(tst_QScriptEngine)
+QTEST_MAIN(tst_QTextScriptEngine)
 #include "tst_qtextscriptengine.moc"