Added TESTED_COMPONENT info

94 files changed, 220 insertions, 0 deletions

diff --git a/tests/auto/databasemanager/tst_databasemanager.cpp b/tests/auto/databasemanager/tst_databasemanager.cpp
index af4e01bce3..7d1def99e8 100644
--- a/tests/auto/databasemanager/tst_databasemanager.cpp
+++ b/tests/auto/databasemanager/tst_databasemanager.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/serviceframework
+
 #include <QtTest/QtTest>
 #include <QtCore>
 #define private public
diff --git a/tests/auto/databasemanager/tst_databasemanager_symbian.cpp b/tests/auto/databasemanager/tst_databasemanager_symbian.cpp
index 2f26a913bf..450230331d 100644
--- a/tests/auto/databasemanager/tst_databasemanager_symbian.cpp
+++ b/tests/auto/databasemanager/tst_databasemanager_symbian.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/serviceframework
+
 #include <QtTest/QtTest>
 #include <QtCore>
 #include <QThread>
diff --git a/tests/auto/icheck/tst_icheck.cpp b/tests/auto/icheck/tst_icheck.cpp
index b3817ea62e..c29ff096a9 100644
--- a/tests/auto/icheck/tst_icheck.cpp
+++ b/tests/auto/icheck/tst_icheck.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=tools/icheck
+
 #include <QtTest/QtTest>
 #include "../../../tools/icheck/ichecklib.h"
 #include <qmobilityglobal.h>
diff --git a/tests/auto/maemo6/qsystemdeviceinfo_maemo/tst_qsystemdeviceinfo_maemo.cpp b/tests/auto/maemo6/qsystemdeviceinfo_maemo/tst_qsystemdeviceinfo_maemo.cpp
index 01900b5170..e3bfb56970 100644
--- a/tests/auto/maemo6/qsystemdeviceinfo_maemo/tst_qsystemdeviceinfo_maemo.cpp
+++ b/tests/auto/maemo6/qsystemdeviceinfo_maemo/tst_qsystemdeviceinfo_maemo.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/systeminfo
+
 #include <QtTest/QtTest>
 #include <QDebug>
 #include <QDBusInterface>
diff --git a/tests/auto/maemo6/qsystemnetworkinfo_maemo/tst_qsystemnetworkinfo_maemo.cpp b/tests/auto/maemo6/qsystemnetworkinfo_maemo/tst_qsystemnetworkinfo_maemo.cpp
index 6b1d1eb1e9..3de43b9d4d 100644
--- a/tests/auto/maemo6/qsystemnetworkinfo_maemo/tst_qsystemnetworkinfo_maemo.cpp
+++ b/tests/auto/maemo6/qsystemnetworkinfo_maemo/tst_qsystemnetworkinfo_maemo.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/systeminfo
+
 #include <QtTest/QtTest>
 #include <QDebug>
 #include <QDBusInterface>
diff --git a/tests/auto/maemo6/qsystemscreensaver_maemo/tst_qsystemscreensaver_maemo.cpp b/tests/auto/maemo6/qsystemscreensaver_maemo/tst_qsystemscreensaver_maemo.cpp
index de0b18eac3..e9c839eab3 100644
--- a/tests/auto/maemo6/qsystemscreensaver_maemo/tst_qsystemscreensaver_maemo.cpp
+++ b/tests/auto/maemo6/qsystemscreensaver_maemo/tst_qsystemscreensaver_maemo.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/systeminfo
+
 #include <QtTest/QtTest>
 #include <QDebug>
 #include "qsysteminfo.h"
diff --git a/tests/auto/qabstractsecuritysession/tst_qabstractsecuritysession.cpp b/tests/auto/qabstractsecuritysession/tst_qabstractsecuritysession.cpp
index 10d967759f..7eeeafc05b 100644
--- a/tests/auto/qabstractsecuritysession/tst_qabstractsecuritysession.cpp
+++ b/tests/auto/qabstractsecuritysession/tst_qabstractsecuritysession.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/serviceframework
+
 #include "../qsfwtestutil.h"
 
 #include <QtTest/QtTest>
diff --git a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
index bb68a8ab53..aec2279ba9 100755
--- a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
+++ b/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/multimedia
+
 #include <QtTest/QtTest>
 #include <QtCore/qlocale.h>
 
diff --git a/tests/auto/qcamera/tst_qcamera.cpp b/tests/auto/qcamera/tst_qcamera.cpp
index c8ba37eec1..edc6f06251 100644
--- a/tests/auto/qcamera/tst_qcamera.cpp
+++ b/tests/auto/qcamera/tst_qcamera.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/multimedia
+
 #include <QtTest/QtTest>
 #include <QDebug>
 
diff --git a/tests/auto/qcontactactions/unittest/tst_qcontactactions.cpp b/tests/auto/qcontactactions/unittest/tst_qcontactactions.cpp
index c75b3f8ecf..82f1fb4470 100644
--- a/tests/auto/qcontactactions/unittest/tst_qcontactactions.cpp
+++ b/tests/auto/qcontactactions/unittest/tst_qcontactactions.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/contacts
+
 #define QT_STATICPLUGIN
 #include <QtTest/QtTest>
 #include <QApplication>
diff --git a/tests/auto/qcontactrelationship/tst_qcontactrelationship.cpp b/tests/auto/qcontactrelationship/tst_qcontactrelationship.cpp
index 4672fcac95..870e0cbaf5 100644
--- a/tests/auto/qcontactrelationship/tst_qcontactrelationship.cpp
+++ b/tests/auto/qcontactrelationship/tst_qcontactrelationship.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/contacts
+
 #include <QtTest/QtTest>
 
 #include "qtcontacts.h"
diff --git a/tests/auto/qcrmlparser/tst_qcrmlparser.cpp b/tests/auto/qcrmlparser/tst_qcrmlparser.cpp
index 9a697bf19e..81bf272684 100644
--- a/tests/auto/qcrmlparser/tst_qcrmlparser.cpp
+++ b/tests/auto/qcrmlparser/tst_qcrmlparser.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/publishsubscribe
+
 #include "../../../src/publishsubscribe/psmapperserver_symbian/qcrmlparser_p.h"
 
 #include <qmobilityglobal.h>
diff --git a/tests/auto/qdocumentgallery/tst_qdocumentgallery.cpp b/tests/auto/qdocumentgallery/tst_qdocumentgallery.cpp
index 0e1444975e..71d8d3af30 100644
--- a/tests/auto/qdocumentgallery/tst_qdocumentgallery.cpp
+++ b/tests/auto/qdocumentgallery/tst_qdocumentgallery.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/documentgallery
+
 #include <QtTest/QtTest>
 
 #include <qdocumentgallery.h>
diff --git a/tests/auto/qgalleryabstractrequest/tst_qgalleryabstractrequest.cpp b/tests/auto/qgalleryabstractrequest/tst_qgalleryabstractrequest.cpp
index f7aed1c491..14cac5b7c5 100644
--- a/tests/auto/qgalleryabstractrequest/tst_qgalleryabstractrequest.cpp
+++ b/tests/auto/qgalleryabstractrequest/tst_qgalleryabstractrequest.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/documentgallery
+
 #include <QtTest/QtTest>
 
 #include <qgalleryabstractrequest.h>
diff --git a/tests/auto/qgalleryabstractresponse/tst_qgalleryabstractresponse.cpp b/tests/auto/qgalleryabstractresponse/tst_qgalleryabstractresponse.cpp
index 654b4828c0..7e2fad423b 100644
--- a/tests/auto/qgalleryabstractresponse/tst_qgalleryabstractresponse.cpp
+++ b/tests/auto/qgalleryabstractresponse/tst_qgalleryabstractresponse.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/documentgallery
+
 #include <QtTest/QtTest>
 
 #include <qgalleryabstractresponse.h>
diff --git a/tests/auto/qgallerybaseresponse/tst_qgallerybaseresponse.cpp b/tests/auto/qgallerybaseresponse/tst_qgallerybaseresponse.cpp
index 682836b12f..c3876884ac 100644
--- a/tests/auto/qgallerybaseresponse/tst_qgallerybaseresponse.cpp
+++ b/tests/auto/qgallerybaseresponse/tst_qgallerybaseresponse.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/documentgallery
+
 #include <QtTest/QtTest>
 
 #include <qgallerybaseresponse_p.h>
diff --git a/tests/auto/qgallerycountrequest/tst_qgallerycountrequest.cpp b/tests/auto/qgallerycountrequest/tst_qgallerycountrequest.cpp
index bbf4c9f1ca..ff64359bb0 100644
--- a/tests/auto/qgallerycountrequest/tst_qgallerycountrequest.cpp
+++ b/tests/auto/qgallerycountrequest/tst_qgallerycountrequest.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/documentgallery
+
 #include <QtTest/QtTest>
 
 #include <qgallerycountrequest.h>
diff --git a/tests/auto/qgalleryfilter/tst_qgalleryfilter.cpp b/tests/auto/qgalleryfilter/tst_qgalleryfilter.cpp
index 7df0139edf..01ec58deab 100644
--- a/tests/auto/qgalleryfilter/tst_qgalleryfilter.cpp
+++ b/tests/auto/qgalleryfilter/tst_qgalleryfilter.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/documentgallery
+
 #include <QtTest/QtTest>
 
 #include <qgalleryfilter.h>
diff --git a/tests/auto/qgalleryitemlist/tst_qgalleryitemlist.cpp b/tests/auto/qgalleryitemlist/tst_qgalleryitemlist.cpp
index d5691288ed..7b51104d6c 100644
--- a/tests/auto/qgalleryitemlist/tst_qgalleryitemlist.cpp
+++ b/tests/auto/qgalleryitemlist/tst_qgalleryitemlist.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/documentgallery
+
 #include <QtTest/QtTest>
 
 #include <qgalleryitemlist.h>
diff --git a/tests/auto/qgalleryitemlistmodel/tst_qgalleryitemlistmodel.cpp b/tests/auto/qgalleryitemlistmodel/tst_qgalleryitemlistmodel.cpp
index 5d26790450..3220cdfdd4 100644
--- a/tests/auto/qgalleryitemlistmodel/tst_qgalleryitemlistmodel.cpp
+++ b/tests/auto/qgalleryitemlistmodel/tst_qgalleryitemlistmodel.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/documentgallery
+
 #include <QtTest/QtTest>
 
 #include <qgalleryitemlistmodel.h>
diff --git a/tests/auto/qgalleryitemrequest/tst_qgalleryitemrequest.cpp b/tests/auto/qgalleryitemrequest/tst_qgalleryitemrequest.cpp
index c20d094727..a4079d2206 100644
--- a/tests/auto/qgalleryitemrequest/tst_qgalleryitemrequest.cpp
+++ b/tests/auto/qgalleryitemrequest/tst_qgalleryitemrequest.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/documentgallery
+
 #include <QtTest/QtTest>
 
 #include <qgalleryitemrequest.h>
diff --git a/tests/auto/qgalleryqueryrequest/tst_qgalleryqueryrequest.cpp b/tests/auto/qgalleryqueryrequest/tst_qgalleryqueryrequest.cpp
index ad46b6a74d..b5026fb806 100644
--- a/tests/auto/qgalleryqueryrequest/tst_qgalleryqueryrequest.cpp
+++ b/tests/auto/qgalleryqueryrequest/tst_qgalleryqueryrequest.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/documentgallery
+
 #include <QtTest/QtTest>
 
 #include <qgalleryqueryrequest.h>
diff --git a/tests/auto/qgalleryremoverequest/tst_qgalleryremoverequest.cpp b/tests/auto/qgalleryremoverequest/tst_qgalleryremoverequest.cpp
index 1ddd51c6a9..e8404cdc23 100644
--- a/tests/auto/qgalleryremoverequest/tst_qgalleryremoverequest.cpp
+++ b/tests/auto/qgalleryremoverequest/tst_qgalleryremoverequest.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/documentgallery
+
 #include <QtTest/QtTest>
 
 #include <qgalleryremoverequest.h>
diff --git a/tests/auto/qgalleryresource/tst_qgalleryresource.cpp b/tests/auto/qgalleryresource/tst_qgalleryresource.cpp
index b6cd7776a7..86960875ab 100644
--- a/tests/auto/qgalleryresource/tst_qgalleryresource.cpp
+++ b/tests/auto/qgalleryresource/tst_qgalleryresource.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/documentgallery
+
 #include <QtTest/QtTest>
 
 #include <qgalleryitemlist.h>
diff --git a/tests/auto/qgallerytrackeritemlist_maemo5/tst_qgallerytrackeritemlist.cpp b/tests/auto/qgallerytrackeritemlist_maemo5/tst_qgallerytrackeritemlist.cpp
index fe86e7ff0b..29a501383f 100644
--- a/tests/auto/qgallerytrackeritemlist_maemo5/tst_qgallerytrackeritemlist.cpp
+++ b/tests/auto/qgallerytrackeritemlist_maemo5/tst_qgallerytrackeritemlist.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/documentgallery
+
 #include <QtTest/QtTest>
 
 #include <maemo5/qgallerytrackeritemlist_p.h>
diff --git a/tests/auto/qgalleryurlrequest/tst_qgalleryurlrequest.cpp b/tests/auto/qgalleryurlrequest/tst_qgalleryurlrequest.cpp
index c4e6afcaa4..694affe7ce 100644
--- a/tests/auto/qgalleryurlrequest/tst_qgalleryurlrequest.cpp
+++ b/tests/auto/qgalleryurlrequest/tst_qgalleryurlrequest.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/documentgallery
+
 #include <QtTest/QtTest>
 
 #include <qgalleryurlrequest.h>
diff --git a/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp b/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp
index 0bcab28482..75117c24a2 100644
--- a/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp
+++ b/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/location
+
 #include <QTest>
 #include <QMetaType>
 #include <QSignalSpy>
diff --git a/tests/auto/qgeoboundingbox/tst_qgeoboundingbox.cpp b/tests/auto/qgeoboundingbox/tst_qgeoboundingbox.cpp
index 075215afb8..c08cd89b17 100644
--- a/tests/auto/qgeoboundingbox/tst_qgeoboundingbox.cpp
+++ b/tests/auto/qgeoboundingbox/tst_qgeoboundingbox.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/location
+
 #include <QtTest/QtTest>
 #include <qgeoboundingbox.h>
 #include <qgeocoordinate.h>
diff --git a/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp b/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp
index f1fca9e4d4..bbedd8ffee 100644
--- a/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp
+++ b/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/location
+
 #include "../qlocationtestutils_p.h"
 
 #include <qgeocoordinate.h>
diff --git a/tests/auto/qgeoinfosources_wince/tst_qgeoinfosources_wince.cpp b/tests/auto/qgeoinfosources_wince/tst_qgeoinfosources_wince.cpp
index 1f50423ad8..4c2f3f9d85 100644
--- a/tests/auto/qgeoinfosources_wince/tst_qgeoinfosources_wince.cpp
+++ b/tests/auto/qgeoinfosources_wince/tst_qgeoinfosources_wince.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/location
+
 #include <QTest>
 #include <QMetaType>
 #include <QSignalSpy>
diff --git a/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp b/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp
index 238920893e..94069a1fc7 100644
--- a/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp
+++ b/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/location
+
 #include <qgeopositioninfo.h>
 
 #include <QMetaType>
diff --git a/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp b/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp
index 0731930abb..b517cea81e 100644
--- a/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp
+++ b/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/location
+
 #include <qgeosatelliteinfo.h>
 
 #include <QMetaType>
diff --git a/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp b/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
index dab19fe71a..cb92fb11e3 100644
--- a/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
+++ b/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/multimedia
+
 #include <qmobilityglobal.h>
 #include "qgraphicsvideoitem.h"
 #include <QtTest/QtTest>
diff --git a/tests/auto/qlandmark/tst_qlandmark.cpp b/tests/auto/qlandmark/tst_qlandmark.cpp
index ff845f5ef8..0908b70102 100644
--- a/tests/auto/qlandmark/tst_qlandmark.cpp
+++ b/tests/auto/qlandmark/tst_qlandmark.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/location
+
 #include <qlandmark.h>
 
 #include <qtest.h>
diff --git a/tests/auto/qlandmarkcategory/tst_qlandmarkcategory.cpp b/tests/auto/qlandmarkcategory/tst_qlandmarkcategory.cpp
index 595f00883f..cbf8916954 100644
--- a/tests/auto/qlandmarkcategory/tst_qlandmarkcategory.cpp
+++ b/tests/auto/qlandmarkcategory/tst_qlandmarkcategory.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/location
+
 #include <qlandmark.h>
 
 #include <qtest.h>
diff --git a/tests/auto/qlandmarkfilehandler_gpx/tst_qlandmarkfilehandler_gpx.cpp b/tests/auto/qlandmarkfilehandler_gpx/tst_qlandmarkfilehandler_gpx.cpp
index 78514f4d05..ef836c1279 100644
--- a/tests/auto/qlandmarkfilehandler_gpx/tst_qlandmarkfilehandler_gpx.cpp
+++ b/tests/auto/qlandmarkfilehandler_gpx/tst_qlandmarkfilehandler_gpx.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/location
+
 #include "qgeocoordinate.h"
 
 #include <qtest.h>
diff --git a/tests/auto/qlandmarkfilehandler_lmx/tst_qlandmarkfilehandler_lmx.cpp b/tests/auto/qlandmarkfilehandler_lmx/tst_qlandmarkfilehandler_lmx.cpp
index dbbaee3806..8e903e1ecf 100644
--- a/tests/auto/qlandmarkfilehandler_lmx/tst_qlandmarkfilehandler_lmx.cpp
+++ b/tests/auto/qlandmarkfilehandler_lmx/tst_qlandmarkfilehandler_lmx.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/location
+
 #include "qgeoaddress.h"
 #include "qgeocoordinate.h"
 #include "qlandmarkcategory.h"
diff --git a/tests/auto/qlandmarkmanagerengine/tst_qlandmarkmanagerengine.cpp b/tests/auto/qlandmarkmanagerengine/tst_qlandmarkmanagerengine.cpp
index cb68444e1d..4fdf0778a6 100644
--- a/tests/auto/qlandmarkmanagerengine/tst_qlandmarkmanagerengine.cpp
+++ b/tests/auto/qlandmarkmanagerengine/tst_qlandmarkmanagerengine.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/location
+
 #include <QtTest/QtTest>
 #include <QtTest/QSignalSpy>
 #include <qlandmark.h>
diff --git a/tests/auto/qlandmarkmanagerengine_sqlite/tst_qlandmarkmanagerengine_sqlite.cpp b/tests/auto/qlandmarkmanagerengine_sqlite/tst_qlandmarkmanagerengine_sqlite.cpp
index f597a71d76..aa657403c9 100644
--- a/tests/auto/qlandmarkmanagerengine_sqlite/tst_qlandmarkmanagerengine_sqlite.cpp
+++ b/tests/auto/qlandmarkmanagerengine_sqlite/tst_qlandmarkmanagerengine_sqlite.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/location
+
 #include <QtTest/QtTest>
 #include <QtTest/QSignalSpy>
 
diff --git a/tests/auto/qlandmarkmanagerplugins/unittest/tst_qlandmarkmanagerplugins.cpp b/tests/auto/qlandmarkmanagerplugins/unittest/tst_qlandmarkmanagerplugins.cpp
index 909fdb19b3..172643aa1f 100644
--- a/tests/auto/qlandmarkmanagerplugins/unittest/tst_qlandmarkmanagerplugins.cpp
+++ b/tests/auto/qlandmarkmanagerplugins/unittest/tst_qlandmarkmanagerplugins.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/location
+
 #include <QtTest/QtTest>
 #include <QApplication>
 
diff --git a/tests/auto/qlatin1constant/tst_qlatin1constant.cpp b/tests/auto/qlatin1constant/tst_qlatin1constant.cpp
index 37a16a6223..43e585282f 100644
--- a/tests/auto/qlatin1constant/tst_qlatin1constant.cpp
+++ b/tests/auto/qlatin1constant/tst_qlatin1constant.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/contacts
+
 #include <QtTest/QtTest>
 
 #include "qtcontactsglobal.h"
diff --git a/tests/auto/qlocationutils/tst_qlocationutils.cpp b/tests/auto/qlocationutils/tst_qlocationutils.cpp
index 78e9b874f6..557d3bca51 100644
--- a/tests/auto/qlocationutils/tst_qlocationutils.cpp
+++ b/tests/auto/qlocationutils/tst_qlocationutils.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/location
+
 //#include "../../../src/location/qlocationutils_p.h"
 #include "qlocationutils_p.h"
 #include "qgeopositioninfo.h"
diff --git a/tests/auto/qmallocpool/tst_qmallocpool.cpp b/tests/auto/qmallocpool/tst_qmallocpool.cpp
index b3752afbda..78c0b0f990 100644
--- a/tests/auto/qmallocpool/tst_qmallocpool.cpp
+++ b/tests/auto/qmallocpool/tst_qmallocpool.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/publishsubscribe
+
 #include <qmallocpool_p.h>
 
 #include <QtTest/QTest>
diff --git a/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp b/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp
index 261ca6b560..3092285d74 100644
--- a/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp
+++ b/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/messaging
+
 #include <QObject>
 #include <QTest>
 #include <QDebug>
diff --git a/tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
index 91ef5fd2d6..18c9961498 100644
--- a/tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
+++ b/tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/serviceframework
+
 #include <QtTest/QtTest>
 #include <QtCore/qlocale.h>
 #include <qmetaobjectbuilder_p.h>
diff --git a/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp b/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp
index 517138a98f..ab0da602ea 100644
--- a/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp
+++ b/tests/auto/qnetworkconfigmanager/tst_qnetworkconfigmanager.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/bearer
+
 #include <QtTest/QtTest>
 #include "../qbearertestcommon.h"
 #include "../../../src/bearer/qnetworkconfiguration.h"
diff --git a/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp b/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
index 3c3732deb5..acd665da9d 100644
--- a/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
+++ b/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/bearer
+
 #include <QtTest/QtTest>
 #include "../qbearertestcommon.h"
 #include "../../../src/bearer/qnetworkconfiguration.h"
diff --git a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp
index a8dc100de3..97149cea09 100644
--- a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp
+++ b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/bearer
+
 #include <QtTest/QtTest>
 #include <QLocalServer>
 #include <QLocalSocket>
diff --git a/tests/auto/qnmeapositioninfosource/tst_dummynmeapositioninfosource.cpp b/tests/auto/qnmeapositioninfosource/tst_dummynmeapositioninfosource.cpp
index d58c6529b6..caeb7a6456 100644
--- a/tests/auto/qnmeapositioninfosource/tst_dummynmeapositioninfosource.cpp
+++ b/tests/auto/qnmeapositioninfosource/tst_dummynmeapositioninfosource.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/location
+
 #include "qnmeapositioninfosourceproxyfactory.h"
 #include "../testqgeopositioninfosource_p.h"
 #include "../qlocationtestutils_p.h"
diff --git a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.cpp b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.cpp
index b26eb2e9ef..4ceee20776 100644
--- a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.cpp
+++ b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/location
+
 #include "tst_qnmeapositioninfosource.h"
 
 tst_QNmeaPositionInfoSource::tst_QNmeaPositionInfoSource(QNmeaPositionInfoSource::UpdateMode mode, QObject *parent)
diff --git a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_realtime.cpp b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_realtime.cpp
index ee5e1a70db..0941734664 100644
--- a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_realtime.cpp
+++ b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_realtime.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/location
+
 #include "tst_qnmeapositioninfosource.h"
 
 class tst_QNmeaPositionInfoSource_RealTime : public tst_QNmeaPositionInfoSource
diff --git a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_realtime_generic.cpp b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_realtime_generic.cpp
index 73ae4397b6..475b314c50 100644
--- a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_realtime_generic.cpp
+++ b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_realtime_generic.cpp
@@ -40,6 +40,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/location
+
 #include "tst_qnmeapositioninfosource.h"
 
 class tst_QNmeaPositionInfoSource_RealTime_Generic : public TestQGeoPositionInfoSource
diff --git a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_simulation.cpp b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_simulation.cpp
index d42f042e2d..b41d94b644 100644
--- a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_simulation.cpp
+++ b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_simulation.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/location
+
 #include "tst_qnmeapositioninfosource.h"
 
 class tst_QNmeaPositionInfoSource_Simulation : public tst_QNmeaPositionInfoSource
diff --git a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_simulation_generic.cpp b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_simulation_generic.cpp
index ae8ce89814..71d5073413 100644
--- a/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_simulation_generic.cpp
+++ b/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_simulation_generic.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/location
+
 #include "tst_qnmeapositioninfosource.h"
 
 class tst_QNmeaPositionInfoSource_Simulation_Generic : public TestQGeoPositionInfoSource
diff --git a/tests/auto/qorganizeritemmanager/tst_qorganizeritemmanager.cpp b/tests/auto/qorganizeritemmanager/tst_qorganizeritemmanager.cpp
index 92822d552b..9e00d6fe4d 100644
--- a/tests/auto/qorganizeritemmanager/tst_qorganizeritemmanager.cpp
+++ b/tests/auto/qorganizeritemmanager/tst_qorganizeritemmanager.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/organizer
+
 #include <QtTest/QtTest>
 
 #include "qtorganizer.h"
diff --git a/tests/auto/qpacket/tst_qpacket.cpp b/tests/auto/qpacket/tst_qpacket.cpp
index a9a4790aef..e3ea63cf9b 100644
--- a/tests/auto/qpacket/tst_qpacket.cpp
+++ b/tests/auto/qpacket/tst_qpacket.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/publishsubscribe
+
 #include <qpacketprotocol_p.h>
 
 #include <QtTest/QTest>
diff --git a/tests/auto/qpacketprotocol/tst_qpacketprotocol.cpp b/tests/auto/qpacketprotocol/tst_qpacketprotocol.cpp
index eb4aae9ab1..c3eadb3a16 100644
--- a/tests/auto/qpacketprotocol/tst_qpacketprotocol.cpp
+++ b/tests/auto/qpacketprotocol/tst_qpacketprotocol.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/publishsubscribe
+
 #include <qpacketprotocol_p.h>
 
 #include <QByteArray>
diff --git a/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp
index df278e46c2..56b389b3dc 100644
--- a/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp
+++ b/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/multimedia
 
 #include <qpaintervideosurface_p.h>
 #include <QtTest/QtTest>
diff --git a/tests/auto/qremoteserviceclassregister/tst_qremoteserviceclassregister.cpp b/tests/auto/qremoteserviceclassregister/tst_qremoteserviceclassregister.cpp
index 727204a161..24f38435ad 100644
--- a/tests/auto/qremoteserviceclassregister/tst_qremoteserviceclassregister.cpp
+++ b/tests/auto/qremoteserviceclassregister/tst_qremoteserviceclassregister.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/serviceframework
+
 #include <qservicemanager.h>
 #include <qremoteserviceclassregister.h>
 
diff --git a/tests/auto/qservicecontext/tst_qservicecontext.cpp b/tests/auto/qservicecontext/tst_qservicecontext.cpp
index dd3df18423..e9f221d89d 100644
--- a/tests/auto/qservicecontext/tst_qservicecontext.cpp
+++ b/tests/auto/qservicecontext/tst_qservicecontext.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/serviceframework
+
 #include <QtTest/QtTest>
 #include <QtCore>
 #include <qservicecontext.h>
diff --git a/tests/auto/qservicefilter/tst_qservicefilter.cpp b/tests/auto/qservicefilter/tst_qservicefilter.cpp
index 8b3143c61b..ec0c80f0dd 100644
--- a/tests/auto/qservicefilter/tst_qservicefilter.cpp
+++ b/tests/auto/qservicefilter/tst_qservicefilter.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/serviceframework
+
 #include <QtTest/QtTest>
 #include <QtCore>
 #include <qservicefilter.h>
diff --git a/tests/auto/qserviceinterfacedescriptor/tst_qserviceinterfacedescriptor.cpp b/tests/auto/qserviceinterfacedescriptor/tst_qserviceinterfacedescriptor.cpp
index 0b179c2b24..8e146dcf09 100644
--- a/tests/auto/qserviceinterfacedescriptor/tst_qserviceinterfacedescriptor.cpp
+++ b/tests/auto/qserviceinterfacedescriptor/tst_qserviceinterfacedescriptor.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/serviceframework
+
 #include <QtTest/QtTest>
 #include <QtCore>
 #ifndef QT_NO_DEBUG_STREAM
diff --git a/tests/auto/qservicemanager/tst_qservicemanager.cpp b/tests/auto/qservicemanager/tst_qservicemanager.cpp
index 6c2b379430..928c4aded3 100644
--- a/tests/auto/qservicemanager/tst_qservicemanager.cpp
+++ b/tests/auto/qservicemanager/tst_qservicemanager.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/serviceframework
+
 #include <qservicemanager.h>
 #include <qservicecontext.h>
 #include <qabstractsecuritysession.h>
diff --git a/tests/auto/qservicemanager_ipc/client/tst_qservicemanager_ipc.cpp b/tests/auto/qservicemanager_ipc/client/tst_qservicemanager_ipc.cpp
index 1b3570b388..7e1842fc1b 100644
--- a/tests/auto/qservicemanager_ipc/client/tst_qservicemanager_ipc.cpp
+++ b/tests/auto/qservicemanager_ipc/client/tst_qservicemanager_ipc.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/serviceframework
+
 #include <QCoreApplication>
 #include "qservicemanager.h"
 #include "qservicefilter.h"
diff --git a/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp b/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp
index 66ab6fb695..f5fdc5f6e4 100644
--- a/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp
+++ b/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/systeminfo
+
 #include <QtTest/QtTest>
 #include "qsysteminfo.h"
 #include "../qsysteminfotestcommon.h"
diff --git a/tests/auto/qsystemdisplayinfo/tst_qsystemdisplayinfo.cpp b/tests/auto/qsystemdisplayinfo/tst_qsystemdisplayinfo.cpp
index c01878939a..bf58f08e20 100644
--- a/tests/auto/qsystemdisplayinfo/tst_qsystemdisplayinfo.cpp
+++ b/tests/auto/qsystemdisplayinfo/tst_qsystemdisplayinfo.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/systeminfo
+
 #include <QtTest/QtTest>
 #include "qsysteminfo.h"
 
diff --git a/tests/auto/qsysteminfo/tst_qsysteminfo.cpp b/tests/auto/qsysteminfo/tst_qsysteminfo.cpp
index 4a96d11a15..5637244c2e 100644
--- a/tests/auto/qsysteminfo/tst_qsysteminfo.cpp
+++ b/tests/auto/qsysteminfo/tst_qsysteminfo.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/systeminfo
+
 #include <QtTest/QtTest>
 #include "qsysteminfo.h"
 #include <QDebug>
diff --git a/tests/auto/qsystemnetworkinfo/tst_qsystemnetworkinfo.cpp b/tests/auto/qsystemnetworkinfo/tst_qsystemnetworkinfo.cpp
index 50e3c801aa..d732947170 100644
--- a/tests/auto/qsystemnetworkinfo/tst_qsystemnetworkinfo.cpp
+++ b/tests/auto/qsystemnetworkinfo/tst_qsystemnetworkinfo.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/systeminfo
+
 #include <QtTest/QtTest>
 #include "qsysteminfo.h"
 
diff --git a/tests/auto/qsystemreadwritelock/tst_qsystemreadwritelock.cpp b/tests/auto/qsystemreadwritelock/tst_qsystemreadwritelock.cpp
index 42c6f6f9eb..026af32a27 100644
--- a/tests/auto/qsystemreadwritelock/tst_qsystemreadwritelock.cpp
+++ b/tests/auto/qsystemreadwritelock/tst_qsystemreadwritelock.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/publishsubscribe
+
 #include <QtTest/QtTest>
 #include "qsystemreadwritelock_p.h"
 #include <QThread>
diff --git a/tests/auto/qsystemreadwritelock_oop/tst_qsystemreadwritelock_oop.cpp b/tests/auto/qsystemreadwritelock_oop/tst_qsystemreadwritelock_oop.cpp
index 113eb60145..e41a9f9fb4 100644
--- a/tests/auto/qsystemreadwritelock_oop/tst_qsystemreadwritelock_oop.cpp
+++ b/tests/auto/qsystemreadwritelock_oop/tst_qsystemreadwritelock_oop.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/publishsubscribe
+
 #include <QtTest/QtTest>
 #include <QDir>
 #include <QProcess>
diff --git a/tests/auto/qsystemscreensaver/tst_qsystemscreensaver.cpp b/tests/auto/qsystemscreensaver/tst_qsystemscreensaver.cpp
index afa0951c83..22ab62a7e4 100644
--- a/tests/auto/qsystemscreensaver/tst_qsystemscreensaver.cpp
+++ b/tests/auto/qsystemscreensaver/tst_qsystemscreensaver.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/systeminfo
+
 #include <QtTest/QtTest>
 #include "qsysteminfo.h"
 
diff --git a/tests/auto/qsystemstorageinfo/tst_qsystemstorageinfo.cpp b/tests/auto/qsystemstorageinfo/tst_qsystemstorageinfo.cpp
index c58ae593b7..871e3c208a 100644
--- a/tests/auto/qsystemstorageinfo/tst_qsystemstorageinfo.cpp
+++ b/tests/auto/qsystemstorageinfo/tst_qsystemstorageinfo.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/systeminfo
+
 #include <QtTest/QtTest>
 #include "qsysteminfo.h"
 
diff --git a/tests/auto/qtelephony/tst_telephony_linux.cpp b/tests/auto/qtelephony/tst_telephony_linux.cpp
index 17bfc55292..e614e270d8 100644
--- a/tests/auto/qtelephony/tst_telephony_linux.cpp
+++ b/tests/auto/qtelephony/tst_telephony_linux.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/telephony
+
 #include <qmobilityglobal.h>
 #include <QtTest/QtTest>
 #include <QtCore>
diff --git a/tests/auto/qtelephony/tst_telephony_maemo.cpp b/tests/auto/qtelephony/tst_telephony_maemo.cpp
index 72808cc2fd..edbe33564d 100644
--- a/tests/auto/qtelephony/tst_telephony_maemo.cpp
+++ b/tests/auto/qtelephony/tst_telephony_maemo.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/telephony
+
 #include <qmobilityglobal.h>
 #include <QtTest/QtTest>
 #include <QtCore>
diff --git a/tests/auto/qtelephony/tst_telephony_s60.cpp b/tests/auto/qtelephony/tst_telephony_s60.cpp
index 75370c1e1e..51a302da20 100644
--- a/tests/auto/qtelephony/tst_telephony_s60.cpp
+++ b/tests/auto/qtelephony/tst_telephony_s60.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/telephony
+
 #include <qmobilityglobal.h>
 #include <QtTest/QtTest>
 #include <QtCore>
diff --git a/tests/auto/qtelephony/tst_telephony_win.cpp b/tests/auto/qtelephony/tst_telephony_win.cpp
index 76cee57097..b54e410113 100644
--- a/tests/auto/qtelephony/tst_telephony_win.cpp
+++ b/tests/auto/qtelephony/tst_telephony_win.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/telephony
+
 #include <qmobilityglobal.h>
 #include <qtelephonycalllist_win_p.h>
 #include <qtelephonycallinfo_p.h>
diff --git a/tests/auto/qvaluespace/tst_qvaluespace.cpp b/tests/auto/qvaluespace/tst_qvaluespace.cpp
index 5231b72e62..5145efa5bb 100644
--- a/tests/auto/qvaluespace/tst_qvaluespace.cpp
+++ b/tests/auto/qvaluespace/tst_qvaluespace.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/publishsubscribe
+
 #include <qvaluespace_p.h>
 #include <qvaluespacesubscriber.h>
 #include <qvaluespacepublisher.h>
diff --git a/tests/auto/qvaluespacepublisher/tst_qvaluespacepublisher.cpp b/tests/auto/qvaluespacepublisher/tst_qvaluespacepublisher.cpp
index 9510604f81..d2bb22d7cf 100644
--- a/tests/auto/qvaluespacepublisher/tst_qvaluespacepublisher.cpp
+++ b/tests/auto/qvaluespacepublisher/tst_qvaluespacepublisher.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/publishsubscribe
+
 #include <qvaluespacesubscriber.h>
 #include <qvaluespacemanager_p.h>
 #include <qvaluespacepublisher.h>
diff --git a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.cpp b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.cpp
index 26e0c638bd..d4a5b64424 100644
--- a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.cpp
+++ b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/publishsubscribe
+
 #include "tst_qvaluespacesubscribershared.h"
 
 #include <QTest>
diff --git a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscribershared.cpp b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscribershared.cpp
index e29fc75c7d..854ab2b16c 100644
--- a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscribershared.cpp
+++ b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscribershared.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/publishsubscribe
+
 #include "tst_qvaluespacesubscribershared.h"
 
 #include <qvaluespacesubscriber.h>
diff --git a/tests/auto/qversitorganizerexporter/tst_qversitorganizerexporter.cpp b/tests/auto/qversitorganizerexporter/tst_qversitorganizerexporter.cpp
index aa59f1b86a..056fdeb165 100644
--- a/tests/auto/qversitorganizerexporter/tst_qversitorganizerexporter.cpp
+++ b/tests/auto/qversitorganizerexporter/tst_qversitorganizerexporter.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/versit
+
 #include "tst_qversitorganizerexporter.h"
 #include <QtTest/QtTest>
 
diff --git a/tests/auto/qversitorganizerimporter/tst_qversitorganizerimporter.cpp b/tests/auto/qversitorganizerimporter/tst_qversitorganizerimporter.cpp
index 2fb08e387f..ffd48019de 100644
--- a/tests/auto/qversitorganizerimporter/tst_qversitorganizerimporter.cpp
+++ b/tests/auto/qversitorganizerimporter/tst_qversitorganizerimporter.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/versit
+
 #include "tst_qversitorganizerimporter.h"
 #include <QtTest/QtTest>
 
diff --git a/tests/auto/qvideoframe/tst_qvideoframe.cpp b/tests/auto/qvideoframe/tst_qvideoframe.cpp
index 334e21ba08..18a3b504af 100644
--- a/tests/auto/qvideoframe/tst_qvideoframe.cpp
+++ b/tests/auto/qvideoframe/tst_qvideoframe.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/multimedia
+
 #include <QtTest/QtTest>
 
 #include <qvideoframe.h>
diff --git a/tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp b/tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp
index c936ce1c09..db5bb1baae 100644
--- a/tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp
+++ b/tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/multimedia
+
 #include <QtTest/QtTest>
 
 #include <qvideosurfaceformat.h>
diff --git a/tests/auto/qvideowidget/tst_qvideowidget.cpp b/tests/auto/qvideowidget/tst_qvideowidget.cpp
index a5ef561abe..3d12ba9bde 100644
--- a/tests/auto/qvideowidget/tst_qvideowidget.cpp
+++ b/tests/auto/qvideowidget/tst_qvideowidget.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/multimedia
+
 #include <qmobilityglobal.h>
 #include <QtTest/QtTest>
 
diff --git a/tests/auto/servicedatabase/tst_servicedatabase.cpp b/tests/auto/servicedatabase/tst_servicedatabase.cpp
index 0e0660593e..1acc764a74 100644
--- a/tests/auto/servicedatabase/tst_servicedatabase.cpp
+++ b/tests/auto/servicedatabase/tst_servicedatabase.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/serviceframework
+
 #include <QtTest/QtTest>
 #include <QtCore>
 #define private public
diff --git a/tests/auto/servicemetadata/tst_servicemetadata.cpp b/tests/auto/servicemetadata/tst_servicemetadata.cpp
index 5ba579084c..6f6e119638 100644
--- a/tests/auto/servicemetadata/tst_servicemetadata.cpp
+++ b/tests/auto/servicemetadata/tst_servicemetadata.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/serviceframework
+
 #include <QtTest/QtTest>
 #include <QtCore>
 #define private public
diff --git a/tests/auto/symbian/qmediarecorder_xa/tst_qmediarecorder_xa_amr.cpp b/tests/auto/symbian/qmediarecorder_xa/tst_qmediarecorder_xa_amr.cpp
index c7e7ba9113..c68d299520 100644
--- a/tests/auto/symbian/qmediarecorder_xa/tst_qmediarecorder_xa_amr.cpp
+++ b/tests/auto/symbian/qmediarecorder_xa/tst_qmediarecorder_xa_amr.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/multimedia
+
 #include "tst_qmediarecorder_xa.h"
 #include "tst_qmediarecorder_xa_macros.h"
 
diff --git a/tests/auto/testqgeopositioninfosource.cpp b/tests/auto/testqgeopositioninfosource.cpp
index d35504cd9d..cb9777fcb6 100644
--- a/tests/auto/testqgeopositioninfosource.cpp
+++ b/tests/auto/testqgeopositioninfosource.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/location
+
 #include <QTest>
 #include <QMetaType>
 #include <QSignalSpy>
diff --git a/tests/auto/testqgeosatelliteinfosource.cpp b/tests/auto/testqgeosatelliteinfosource.cpp
index cbc3d5b747..abf0eb2424 100644
--- a/tests/auto/testqgeosatelliteinfosource.cpp
+++ b/tests/auto/testqgeosatelliteinfosource.cpp
@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+//TESTED_COMPONENT=src/location
+
 #include <QTest>
 #include <QMetaType>
 #include <QSignalSpy>
diff --git a/tests/benchmarks/contacts/tst_bm_contacts.cpp b/tests/benchmarks/contacts/tst_bm_contacts.cpp
index b0d1bb8d1a..5a36419701 100644
--- a/tests/benchmarks/contacts/tst_bm_contacts.cpp
+++ b/tests/benchmarks/contacts/tst_bm_contacts.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/contacts
+
 #include <QApplication>
 #include <QtTest/QtTest>
 //#include "contact.h"
diff --git a/tests/benchmarks/location/tst_bm_location.cpp b/tests/benchmarks/location/tst_bm_location.cpp
index aad8d2abc9..6ad9af3eda 100644
--- a/tests/benchmarks/location/tst_bm_location.cpp
+++ b/tests/benchmarks/location/tst_bm_location.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/location
+
 #include <QApplication>
 #include <QtTest/QtTest>
 #include <QDebug>
diff --git a/tests/benchmarks/messaging/tst_messaging.cpp b/tests/benchmarks/messaging/tst_messaging.cpp
index 5144875321..2caa0c7811 100644
--- a/tests/benchmarks/messaging/tst_messaging.cpp
+++ b/tests/benchmarks/messaging/tst_messaging.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/messaging
+
 #include <QApplication>
 #include <QtTest/QtTest>
 #include <QDebug>
diff --git a/tests/benchmarks/qsysteminfo/tst_qsysteminfo.cpp b/tests/benchmarks/qsysteminfo/tst_qsysteminfo.cpp
index 9dc4d61b76..9a7c651396 100644
--- a/tests/benchmarks/qsysteminfo/tst_qsysteminfo.cpp
+++ b/tests/benchmarks/qsysteminfo/tst_qsysteminfo.cpp
@@ -38,6 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+//TESTED_COMPONENT=src/systeminfo
+
 #include <QtTest/QtTest>
 #include "qsysteminfo.h"
 #include <QDebug>