Tests: some cleanup of pro files, marking of tested components.

10 files changed, 38 insertions, 42 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 67cd164df08..13a921daafb 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,17 +1,17 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
+    aggregation \
+    changeset \
     cplusplus \
     debugger \
     fakevim \
+    generichighlighter \
+#    icheckbuild \
 #    profilereader \
 #    profilewriter \
-    aggregation \
-    changeset \
-#    icheckbuild \
-    generichighlighter \
-    utils_stringutils \
-    qml
+    qml \
+    utils_stringutils
 
 contains (QT_CONFIG, declarative) {
 SUBDIRS += qml
diff --git a/tests/auto/cplusplus/cplusplus.pro b/tests/auto/cplusplus/cplusplus.pro
index 920f93f30cd..5e22168423e 100644
--- a/tests/auto/cplusplus/cplusplus.pro
+++ b/tests/auto/cplusplus/cplusplus.pro
@@ -3,10 +3,10 @@ CONFIG += ordered
 
 SUBDIRS = \
     ast \
-    semantic \
+    codeformatter \
+    codegen \
+    findusages \
     lookup \
     preprocessor \
-    findusages \
-    typeprettyprinter \
-    codeformatter \
-    codegen
+    semantic \
+    typeprettyprinter
diff --git a/tests/auto/generichighlighter/generichighlighter.pro b/tests/auto/generichighlighter/generichighlighter.pro
index 0656a4345d3..a4fea710612 100644
--- a/tests/auto/generichighlighter/generichighlighter.pro
+++ b/tests/auto/generichighlighter/generichighlighter.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS += specificrules highlighterengine
+SUBDIRS += highlighterengine specificrules
diff --git a/tests/auto/icheckbuild/icheckbuild.pro b/tests/auto/icheckbuild/icheckbuild.pro
index 6efeda9e835..93a2182f58d 100644
--- a/tests/auto/icheckbuild/icheckbuild.pro
+++ b/tests/auto/icheckbuild/icheckbuild.pro
@@ -1,3 +1,5 @@
+CONFIG += qtestlib testcase
+
 include(../../../qtcreator.pri)
 include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri)
 include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri)
@@ -10,8 +12,6 @@ INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus
 INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins
 LIBS += $$IDE_SOURCE_TREE/lib/qtcreator/plugins
 
-TARGET=tst_$$TARGET
-
 HEADERS += ichecklib.h \
            ichecklib_global.h \
            parsemanager.h
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index 4893248a47b..2a9535262d0 100644
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
 
-SUBDIRS += qmldesigner qmlprojectmanager
-
-# SUBDIRS += qmleditor
+SUBDIRS +=  qmldesigner \
+#            qmleditor \
+            qmlprojectmanager
diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
index e4bfd34f6ec..09e3d0e6b8f 100644
--- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
+++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
@@ -65,6 +65,7 @@
 #include <private/qdeclarativestate_p.h>
 #include <private/qdeclarativemetatype_p.h>
 
+//TESTED_COMPONENT=src/plugins/qmldesigner/designercore
 
 using namespace QmlDesigner;
 #include <cstdio>
diff --git a/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro b/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro
index 3da572999b2..7298d2675fd 100644
--- a/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro
+++ b/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro
@@ -1,11 +1,12 @@
+TEMPLATE = app
+QT += script declarative
+CONFIG += qtestlib testcase
+CONFIG += console
+CONFIG -= app_bundle
+
 include(../../../../../qtcreator.pri)
 include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri)
-# include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri)
 
-QT += testlib \
-    script \
-    declarative
-# DESTDIR = $$DESIGNER_BINARY_DIRECTORY
 include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/designercore.pri)
 include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs-lib.pri)
 HEADERS+=$$IDE_SOURCE_TREE/src/libs/utils/changeset.h
@@ -13,21 +14,11 @@ SOURCES+=$$IDE_SOURCE_TREE/src/libs/utils/changeset.cpp
 INCLUDEPATH+=$$IDE_SOURCE_TREE/src/libs
 #DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB
 
-DEPENDPATH += ..
-DEPENDPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore
 INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/include
-INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore
-
-TARGET = tst_propertyeditor
+INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/components/propertyeditor
 
-CONFIG += console
-CONFIG -= app_bundle
-TEMPLATE = app
 SOURCES += testpropertyeditor.cpp
 SOURCES += ../testview.cpp
 HEADERS += testpropertyeditor.h
 HEADERS += ../testview.h
 RESOURCES += ../data/testfiles.qrc
-
-HEADERS -= allpropertiesbox.h
-SOURCES -= allpropertiesbox.cpp
diff --git a/tests/auto/qml/qmldesigner/qmldesigner.pro b/tests/auto/qml/qmldesigner/qmldesigner.pro
index fe1b5c96293..301c6a6bacb 100644
--- a/tests/auto/qml/qmldesigner/qmldesigner.pro
+++ b/tests/auto/qml/qmldesigner/qmldesigner.pro
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
 
+#SUBDIRS += bauhaustests
 SUBDIRS += coretests
-# SUBDIRS += propertyeditortests
-# SUBDIRS += bauhaustests
+#SUBDIRS += propertyeditortests
diff --git a/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp b/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp
index 67e32a0c436..ac89ce956ae 100644
--- a/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp
+++ b/tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp
@@ -6,13 +6,15 @@
 #include <QDeclarativeEngine>
 #include <QtTest>
 
+//TESTED_COMPONENT=src/plugins/qmlprojectmanager/fileformat
+
 using namespace QmlProjectManager;
 
-class TestProject : public QObject
+class tst_FileFormat : public QObject
 {
     Q_OBJECT
 public:
-    TestProject();
+    tst_FileFormat();
 
 private slots:
     void testFileFilter();
@@ -20,14 +22,14 @@ private slots:
     void testLibraryPaths();
 };
 
-TestProject::TestProject()
+tst_FileFormat::tst_FileFormat()
 {
     QmlProjectFileFormat::registerDeclarativeTypes();
 }
 
 QString testDataDir = QLatin1String(SRCDIR "/data");
 
-void TestProject::testFileFilter()
+void tst_FileFormat::testFileFilter()
 {
     //
     // Search for qml files in directory + subdirectories
@@ -208,7 +210,7 @@ void TestProject::testFileFilter()
     }
 }
 
-void TestProject::testMatchesFile()
+void tst_FileFormat::testMatchesFile()
 {
     //
     // search for qml files in local directory
@@ -243,7 +245,7 @@ void TestProject::testMatchesFile()
     QVERIFY(!project->matchesFile(testDataDir + "/script.css"));
 }
 
-void TestProject::testLibraryPaths()
+void tst_FileFormat::testLibraryPaths()
 {
     //
     // search for qml files in local directory
@@ -274,5 +276,5 @@ void TestProject::testLibraryPaths()
 }
 
 
-QTEST_MAIN(TestProject);
+QTEST_MAIN(tst_FileFormat);
 #include "tst_fileformat.moc"
diff --git a/tests/auto/utils_stringutils/tst_stringutils.cpp b/tests/auto/utils_stringutils/tst_stringutils.cpp
index 31990ae29b7..d2dd5931ab3 100644
--- a/tests/auto/utils_stringutils/tst_stringutils.cpp
+++ b/tests/auto/utils_stringutils/tst_stringutils.cpp
@@ -31,6 +31,8 @@
 
 #include <QtTest/QtTest>
 
+//TESTED_COMPONENT=src/libs/utils
+
 class tst_StringUtils : public QObject
 {
     Q_OBJECT