ensure that all public headers compile with CONFIG+=no_keywords

QTMOBILITY-363

24 files changed, 565 insertions, 53 deletions

diff --git a/src/contacts/qcontact.h b/src/contacts/qcontact.h
index 0e78f998f1..e1f241b7a1 100644
--- a/src/contacts/qcontact.h
+++ b/src/contacts/qcontact.h
@@ -142,8 +142,8 @@ public:
     {
         QList<QContactDetail> props = details(T::DefinitionName.latin1());
         QList<T> ret;
-        foreach(QContactDetail prop, props)
-            ret.append(T(prop));
+        for (int i=0; i<props.count(); i++)
+            ret.append(T(props.at(i)));
         return ret;
     }
 
@@ -152,8 +152,8 @@ public:
     {
         QList<QContactDetail> props = details(T::DefinitionName, fieldName, value);
         QList<T> ret;
-        foreach(QContactDetail prop, props)
-            ret.append(T(prop));
+        for (int i=0; i<props.count(); i++)
+            ret.append(T(props.at(i)));
         return ret;
     }
 
@@ -161,8 +161,8 @@ public:
     {
         QList<QContactDetail> props = details(T::DefinitionName.latin1(), fieldName, value);
         QList<T> ret;
-        foreach(QContactDetail prop, props)
-            ret.append(T(prop));
+        for (int i=0; i<props.count(); i++)
+            ret.append(T(props.at(i)));
         return ret;
     }
 
diff --git a/src/location/landmarks/qlandmarkabstractrequest.h b/src/location/landmarks/qlandmarkabstractrequest.h
index 0d521871da..8fc0c7ef46 100644
--- a/src/location/landmarks/qlandmarkabstractrequest.h
+++ b/src/location/landmarks/qlandmarkabstractrequest.h
@@ -89,12 +89,12 @@ public:
     QLandmarkManager * manager() const;
     void setManager(QLandmarkManager *manager);
 
-public slots:
+public Q_SLOTS:
     bool start();
     bool cancel();
     bool waitForFinished(int msecs = 0);
 
-signals:
+Q_SIGNALS:
     void resultsAvailable();
     void stateChanged(QLandmarkAbstractRequest::State newState);
 protected:
diff --git a/src/location/maps/qgeomapwidget.h b/src/location/maps/qgeomapwidget.h
index 29c9d5a782..4c1f75da5a 100644
--- a/src/location/maps/qgeomapwidget.h
+++ b/src/location/maps/qgeomapwidget.h
@@ -102,7 +102,7 @@ public:
 protected:
     void resizeEvent(QGraphicsSceneResizeEvent *event);
 
-signals:
+Q_SIGNALS:
     void zoomLevelChanged(qreal zoomLevel);
     void centered(const QGeoCoordinate &coordinate);
     void mapTypeChanged(QGeoMapWidget::MapType mapType);
diff --git a/src/location/maps/qgeonavigator.h b/src/location/maps/qgeonavigator.h
index 69d1e3a45e..3524e16a9f 100644
--- a/src/location/maps/qgeonavigator.h
+++ b/src/location/maps/qgeonavigator.h
@@ -121,20 +121,20 @@ public:
       less waypoints and a new origin
     */
 
-public slots:
+public Q_SLOTS:
     void calculate(const QGeoRouteRequest &request);
     void updateRoute(const QGeoRoute &route);
 
     void depart();
     void updateRoute();
 
-private slots:
+private Q_SLOTS:
     void positionUpdated(const QGeoPositionInfo &positionInfo);
     void positionTimeout();
     void calculateRouteFinished();
     void calculateRouteError(QGeoRouteReply::Error error, const QString &errorString);
 
-signals:
+Q_SIGNALS:
     void departed();
     void offCourse();
     void onCourse();
diff --git a/src/location/maps/qgeoroutereply.h b/src/location/maps/qgeoroutereply.h
index e7ac6598e3..1b9e653ef7 100644
--- a/src/location/maps/qgeoroutereply.h
+++ b/src/location/maps/qgeoroutereply.h
@@ -77,10 +77,10 @@ public:
     QGeoRouteRequest request() const;
     QList<QGeoRoute> routes() const;
 
-public slots:
+public Q_SLOTS:
     virtual void abort();
 
-signals:
+Q_SIGNALS:
     void finished();
     void error(QGeoRouteReply::Error error, const QString &errorString = QString());
 
diff --git a/src/location/maps/qgeoroutingmanager.h b/src/location/maps/qgeoroutingmanager.h
index 1475a7b1d4..731d6e6bc8 100644
--- a/src/location/maps/qgeoroutingmanager.h
+++ b/src/location/maps/qgeoroutingmanager.h
@@ -75,7 +75,7 @@ public:
     QGeoRouteRequest::SegmentDetails supportedSegmentDetails() const;
     QGeoRouteRequest::InstructionDetails supportedInstructionDetails() const;
 
-signals:
+Q_SIGNALS:
     void finished(QGeoRouteReply* reply);
     void error(QGeoRouteReply* reply, QGeoRouteReply::Error error, QString errorString = QString());
 
diff --git a/src/location/maps/qgeoroutingmanagerengine.h b/src/location/maps/qgeoroutingmanagerengine.h
index be8aa044c7..eed0974aa6 100644
--- a/src/location/maps/qgeoroutingmanagerengine.h
+++ b/src/location/maps/qgeoroutingmanagerengine.h
@@ -75,7 +75,7 @@ public:
     QGeoRouteRequest::SegmentDetails supportedSegmentDetails() const;
     QGeoRouteRequest::InstructionDetails supportedInstructionDetails() const;
 
-signals:
+Q_SIGNALS:
     void finished(QGeoRouteReply* reply);
     void error(QGeoRouteReply* reply, QGeoRouteReply::Error error, QString errorString = QString());
 
diff --git a/src/location/maps/qgeosearchmanager.h b/src/location/maps/qgeosearchmanager.h
index f347a4212e..15a9127929 100644
--- a/src/location/maps/qgeosearchmanager.h
+++ b/src/location/maps/qgeosearchmanager.h
@@ -92,7 +92,7 @@ public:
     QList<QLandmarkManager *> additionalLandmarkManagers() const;
     void addAdditionalLandmarkManager(QLandmarkManager *landmarkManager);
 
-signals:
+Q_SIGNALS:
     void finished(QGeoSearchReply* reply);
     void error(QGeoSearchReply* reply, QGeoSearchReply::Error error, QString errorString = QString());
 
diff --git a/src/location/maps/qgeosearchmanagerengine.h b/src/location/maps/qgeosearchmanagerengine.h
index d860346cdf..18f862f660 100644
--- a/src/location/maps/qgeosearchmanagerengine.h
+++ b/src/location/maps/qgeosearchmanagerengine.h
@@ -84,7 +84,7 @@ public:
     QList<QLandmarkManager *> additionalLandmarkManagers() const;
     void addAdditionalLandmarkManager(QLandmarkManager *landmarkManager);
 
-signals:
+Q_SIGNALS:
     void finished(QGeoSearchReply* reply);
     void error(QGeoSearchReply* reply, QGeoSearchReply::Error error, QString errorString = QString());
 
diff --git a/src/location/maps/qgeosearchreply.h b/src/location/maps/qgeosearchreply.h
index 9f069658fb..40031f8d7e 100644
--- a/src/location/maps/qgeosearchreply.h
+++ b/src/location/maps/qgeosearchreply.h
@@ -75,10 +75,10 @@ public:
     QGeoBoundingBox bounds() const;
     QList<QGeoPlace> places() const;
 
-public slots:
+public Q_SLOTS:
     virtual void abort();
 
-signals:
+Q_SIGNALS:
     void finished();
     void error(QGeoSearchReply::Error error, const QString &errorString = QString());
 
diff --git a/src/location/maps/tiled/qgeotiledmapdata.h b/src/location/maps/tiled/qgeotiledmapdata.h
index 60fc7c9541..cf833e9c13 100644
--- a/src/location/maps/tiled/qgeotiledmapdata.h
+++ b/src/location/maps/tiled/qgeotiledmapdata.h
@@ -91,7 +91,7 @@ protected:
     void paintMap(QPainter *painter, const QStyleOptionGraphicsItem *option);
     void paintMapObjects(QPainter *painter, const QStyleOptionGraphicsItem *option);
 
-private slots:
+private Q_SLOTS:
     void processRequests();
     void tileFinished();
     void tileError(QGeoTiledMapReply::Error error, QString errorString);
diff --git a/src/location/maps/tiled/qgeotiledmapreply.h b/src/location/maps/tiled/qgeotiledmapreply.h
index 4e39f81b26..a10c8351b8 100644
--- a/src/location/maps/tiled/qgeotiledmapreply.h
+++ b/src/location/maps/tiled/qgeotiledmapreply.h
@@ -79,10 +79,10 @@ public:
     QByteArray mapImageData() const;
     QString mapImageFormat() const;
 
-public slots:
+public Q_SLOTS:
     virtual void abort();
 
-signals:
+Q_SIGNALS:
     void finished();
     void error(QGeoTiledMapReply::Error error, const QString &errorString = QString());
 
diff --git a/src/messaging/qmessagemanager.h b/src/messaging/qmessagemanager.h
index 237da8b008..03f8dc4dd4 100644
--- a/src/messaging/qmessagemanager.h
+++ b/src/messaging/qmessagemanager.h
@@ -120,7 +120,7 @@ public:
     NotificationFilterId registerNotificationFilter(const QMessageFilter &filter);
     void unregisterNotificationFilter(NotificationFilterId filterId);
 
-signals:
+Q_SIGNALS:
     void messageAdded(const QMessageId &id, const QMessageManager::NotificationFilterIdSet &matchingFilterIds);
     void messageRemoved(const QMessageId &id, const QMessageManager::NotificationFilterIdSet &matchingFilterIds);
     void messageUpdated(const QMessageId &id, const QMessageManager::NotificationFilterIdSet &matchingFilterIds);
diff --git a/src/messaging/qmessageservice.h b/src/messaging/qmessageservice.h
index d112442b51..991237c5f0 100644
--- a/src/messaging/qmessageservice.h
+++ b/src/messaging/qmessageservice.h
@@ -83,10 +83,10 @@ public:
     State state() const;
     QMessageManager::Error error() const;
 
-public slots:
+public Q_SLOTS:
     void cancel();
 
-signals:
+Q_SIGNALS:
     void stateChanged(QMessageService::State newState);
     void messagesFound(const QMessageIdList &ids);
     void messagesCounted(int count);
diff --git a/src/messaging/qmessagestore.h b/src/messaging/qmessagestore.h
index a7a1363941..7418c6e65f 100644
--- a/src/messaging/qmessagestore.h
+++ b/src/messaging/qmessagestore.h
@@ -93,7 +93,7 @@ public:
 
     static QMessageStore* instance();
 
-signals:
+Q_SIGNALS:
     void messageAdded(const QMessageId &id, const QMessageManager::NotificationFilterIdSet &matchingFilterIds);
     void messageRemoved(const QMessageId &id, const QMessageManager::NotificationFilterIdSet &matchingFilterIds);
     void messageUpdated(const QMessageId &id, const QMessageManager::NotificationFilterIdSet &matchingFilterIds);
diff --git a/src/multimedia/qaudiocapturesource.h b/src/multimedia/qaudiocapturesource.h
index 1acf5dc2a4..1cdc863622 100644
--- a/src/multimedia/qaudiocapturesource.h
+++ b/src/multimedia/qaudiocapturesource.h
@@ -83,7 +83,7 @@ Q_SIGNALS:
     void activeAudioInputChanged(const QString& name);
     void availableAudioInputsChanged();
 
-private slots:
+private Q_SLOTS:
     void statusChanged();
 
 private:
diff --git a/src/organizer/details/qorganizeritemrecurrence.h b/src/organizer/details/qorganizeritemrecurrence.h
index a7e4b1f1c3..0a921f9077 100644
--- a/src/organizer/details/qorganizeritemrecurrence.h
+++ b/src/organizer/details/qorganizeritemrecurrence.h
@@ -73,8 +73,8 @@ public:
     void setRecurrenceRules(const QList<QOrganizerItemRecurrenceRule>& rrules)
     {
         QVariantList saveList;
-        foreach (const QOrganizerItemRecurrenceRule& rule, rrules) {
-            saveList << rule.variantValues();
+        for (int i = 0; i < rrules.count(); i++) {
+            saveList << rrules.at(i).variantValues();
         }
         setValue(FieldRecurrenceRules, saveList);
     }
@@ -83,8 +83,8 @@ public:
     {
         QList<QOrganizerItemRecurrenceRule> retn;
         QVariantList loadList = variantValue(FieldRecurrenceRules).toList();
-        foreach (const QVariant& currRule, loadList) {
-            QVariantMap ruleMap = currRule.toMap();
+        for (int i = 0; i < loadList.count(); i++) {
+            QVariantMap ruleMap = loadList.at(i).toMap();
             retn << QOrganizerItemRecurrenceRule::fromVariantValues(ruleMap);
         }
         return retn;
@@ -93,8 +93,8 @@ public:
     void setRecurrenceDates(const QList<QDate>& rdates)
     {
         QVariantList saveList;
-        foreach (const QDate& currDate, rdates) {
-            saveList << currDate;
+        for (int i = 0; i < rdates.count(); i++) {
+            saveList << rdates.at(i);
         }
         setValue(FieldRecurrenceDates, saveList);
     }
@@ -103,8 +103,8 @@ public:
     {
         QList<QDate> retn;
         QVariantList loadList = variantValue(FieldRecurrenceDates).toList();
-        foreach (const QVariant& currDate, loadList) {
-            retn << currDate.toDate();
+        for (int i = 0; i < loadList.count(); i++) {
+            retn << loadList.at(i).toDate();
         }
         return retn;
     }
@@ -112,8 +112,8 @@ public:
     void setExceptionRules(const QList<QOrganizerItemRecurrenceRule>& xrules)
     {
         QVariantList saveList;
-        foreach (const QOrganizerItemRecurrenceRule& rule, xrules) {
-            saveList << rule.variantValues();
+        for (int i=0; i < xrules.count(); i++) {
+            saveList << xrules.at(i).variantValues();
         }
         setValue(FieldExceptionRules, saveList);
     }
@@ -122,8 +122,8 @@ public:
     {
         QList<QOrganizerItemRecurrenceRule> retn;
         QVariantList loadList = variantValue(FieldExceptionRules).toList();
-        foreach (const QVariant& currRule, loadList) {
-            QVariantMap ruleMap = currRule.toMap();
+        for(int i = 0; i < loadList.count(); i++) {
+            QVariantMap ruleMap = loadList.at(i).toMap();
             retn << QOrganizerItemRecurrenceRule::fromVariantValues(ruleMap);
         }
         return retn;
@@ -132,8 +132,8 @@ public:
     void setExceptionDates(const QList<QDate>& xdates)
     {
         QVariantList saveList;
-        foreach (const QDate& currDate, xdates) {
-            saveList << currDate;
+        for(int i = 0; i < xdates.count(); i++) {
+            saveList << xdates.at(i);
         }
         setValue(FieldExceptionDates, saveList);
     }
@@ -142,8 +142,8 @@ public:
     {
         QList<QDate> retn;
         QVariantList loadList = variantValue(FieldExceptionDates).toList();
-        foreach (const QVariant& currDate, loadList) {
-            retn << currDate.toDate();
+        for( int i = 0; i < loadList.count(); i++) {
+            retn << loadList.at(i).toDate();
         }
         return retn;
     }
diff --git a/src/organizer/qorganizeritem.h b/src/organizer/qorganizeritem.h
index 4c520a8365..4a742ada9f 100644
--- a/src/organizer/qorganizeritem.h
+++ b/src/organizer/qorganizeritem.h
@@ -118,8 +118,8 @@ public:
     {
         QList<QOrganizerItemDetail> props = details(T::DefinitionName.latin1());
         QList<T> ret;
-        foreach(QOrganizerItemDetail prop, props)
-            ret.append(T(prop));
+        for (int i = 0; i < props.count(); i++)
+            ret.append(T(props.at(i)));
         return ret;
     }
 
@@ -128,8 +128,8 @@ public:
     {
         QList<QOrganizerItemDetail> props = details(T::DefinitionName, fieldName, value);
         QList<T> ret;
-        foreach(QOrganizerItemDetail prop, props)
-            ret.append(T(prop));
+        for (int i = 0; i < props.count(); i++)
+            ret.append(T(props.at(i)));
         return ret;
     }
 
@@ -137,8 +137,8 @@ public:
     {
         QList<QOrganizerItemDetail> props = details(T::DefinitionName.latin1(), fieldName, value);
         QList<T> ret;
-        foreach(QOrganizerItemDetail prop, props)
-            ret.append(T(prop));
+        for (int i = 0; i < props.count(); i++)
+            ret.append(T(props.at(i)));
         return ret;
     }
 
diff --git a/src/publishsubscribe/qvaluespacepublisher.h b/src/publishsubscribe/qvaluespacepublisher.h
index 0196011ed4..206a00e9f1 100644
--- a/src/publishsubscribe/qvaluespacepublisher.h
+++ b/src/publishsubscribe/qvaluespacepublisher.h
@@ -78,10 +78,10 @@ public:
 
     void sync();
 
-signals:
+Q_SIGNALS:
     void interestChanged(const QString &attribute, bool interested);
 
-public slots:
+public Q_SLOTS:
     void setValue(const QString &name, const QVariant &data);
     void resetValue(const QString &name);
 
diff --git a/src/publishsubscribe/qvaluespacesubscriber.h b/src/publishsubscribe/qvaluespacesubscriber.h
index 47eea6c60e..eb23ef2dd6 100644
--- a/src/publishsubscribe/qvaluespacesubscriber.h
+++ b/src/publishsubscribe/qvaluespacesubscriber.h
@@ -87,7 +87,7 @@ public:
     QVariant value(const QString &subPath = QString(), const QVariant &def = QVariant()) const;
 
 
-signals:
+Q_SIGNALS:
     void contentsChanged();
 
 protected:
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index fdf82bc550..93a38a77c4 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -2,6 +2,8 @@ TEMPLATE = subdirs
 
 include(../../staticconfig.pri)
 
+SUBDIRS += headers
+
 contains(mobility_modules,serviceframework) {
     SUBDIRS += servicemetadata \                   #service framework
            qserviceinterfacedescriptor \
diff --git a/tests/auto/headers/headers.pro b/tests/auto/headers/headers.pro
new file mode 100644
index 0000000000..09b31471a2
--- /dev/null
+++ b/tests/auto/headers/headers.pro
@@ -0,0 +1,34 @@
+TARGET = tst_headers
+INCLUDEPATH += ../../../src/publishsubscribe
+INCLUDEPATH += ../../../src/bearer
+INCLUDEPATH += ../../../src/contacts \
+                ../../../src/contacts/filters \
+                ../../../src/contacts/requests \
+                ../../../src/contacts/details \
+                ../../../src/feedback \
+                ../../../src/gallery \
+                ../../../src/location \
+                ../../../src/location/maps \
+                ../../../src/location/landmarks \
+                ../../../src/messaging\ 
+                ../../../src/multimedia \
+                ../../../src/multimedia/audio \
+                ../../../src/multimedia/video \
+                ../../../src/organizer \
+                ../../../src/organizer/details \
+                ../../../src/organizer/filters \
+                ../../../src/organizer/requests \
+                ../../../src/organizer/items \
+                ../../../src/sensors \
+                ../../../src/serviceframework \
+                ../../../src/systeminfo \
+                ../../../src/telephony \
+                ../../../src/versit
+
+CONFIG += testcase
+
+QT+= core network
+
+SOURCES += tst_headers.cpp headersclean.cpp
+
+include (../../../common.pri)
diff --git a/tests/auto/headers/headersclean.cpp b/tests/auto/headers/headersclean.cpp
new file mode 100644
index 0000000000..9aff9d4ea4
--- /dev/null
+++ b/tests/auto/headers/headersclean.cpp
@@ -0,0 +1,420 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#define QT_NO_KEYWORDS
+#define signals int
+#define slots int
+#define emit public:;
+#define foreach public:;
+#define forever public:;
+
+//include all public headers and ensure that they compile with CONFIG+=no_keywords
+//this is a bit messy as we have to manually mention every header
+
+//QtBearer
+#include <qnetworkconfiguration.h>
+#include <qnetworkconfigmanager.h>
+#include <qnetworksession.h>
+
+//QtContacts
+#include <qcontactabstractrequest.h>
+#include <details/qcontactnickname.h>
+#include <details/qcontactgeolocation.h>
+#include <details/qcontacttype.h>
+#include <details/qcontactanniversary.h>
+#include <details/qcontactname.h>
+#include <details/qcontacturl.h>
+#include <details/qcontacttag.h>
+#include <details/qcontactonlineaccount.h>
+#include <details/qcontacttimestamp.h>
+#include <details/qcontactglobalpresence.h>
+#include <details/qcontactguid.h>
+#include <details/qcontactaddress.h>
+#include <details/qcontactphonenumber.h>
+#include <details/qcontactthumbnail.h>
+#include <details/qcontactsynctarget.h>
+#include <details/qcontactgender.h>
+#include <details/qcontactdetails.h>
+#include <details/qcontactbirthday.h>
+#include <details/qcontactfamily.h>
+#include <details/qcontactpresence.h>
+#include <details/qcontactavatar.h>
+#include <details/qcontactnote.h>
+#include <details/qcontactorganization.h>
+#include <details/qcontactemailaddress.h>
+#include <details/qcontactdisplaylabel.h>
+#include <details/qcontactringtone.h>
+#include <qcontactsortorder.h>
+#include <filters/qcontactunionfilter.h>
+#include <filters/qcontactintersectionfilter.h>
+#include <filters/qcontactinvalidfilter.h>
+#include <filters/qcontactdetailfilter.h>
+#include <filters/qcontactdetailrangefilter.h>
+#include <filters/qcontactchangelogfilter.h>
+#include <filters/qcontactrelationshipfilter.h>
+#include <filters/qcontactfilters.h>
+#include <filters/qcontactlocalidfilter.h>
+#include <filters/qcontactactionfilter.h>
+#include <qcontactdetaildefinition.h>
+#include <qcontactmanagerenginefactory.h>
+#include <qtcontacts.h>
+#include <qcontactdetailfielddefinition.h>
+#include <qtcontactsglobal.h>
+#include <qcontactactionfactory.h>
+#include <qcontactid.h>
+#include <qcontactfilter.h>
+#include <qcontactaction.h>
+#include <qcontactchangeset.h>
+#include <qcontactmanagerengine.h>
+#include <requests/qcontactrelationshipremoverequest.h>
+#include <requests/qcontactdetaildefinitionremoverequest.h>
+#include <requests/qcontactlocalidfetchrequest.h>
+#include <requests/qcontactrequests.h>
+#include <requests/qcontactremoverequest.h>
+#include <requests/qcontactsaverequest.h>
+#include <requests/qcontactrelationshipfetchrequest.h>
+#include <requests/qcontactfetchrequest.h>
+#include <requests/qcontactrelationshipsaverequest.h>
+#include <requests/qcontactdetaildefinitionfetchrequest.h>
+#include <requests/qcontactdetaildefinitionsaverequest.h>
+#include <qcontactrelationship.h>
+#include <qcontactdetail.h>
+#include <qcontact.h>
+
+
+//QtFeedback
+#include <qfeedbackeffect.h>
+#include <qfeedbackplugininterfaces.h>
+#include <qfeedbackactuator.h>
+
+//QtGallery
+#include <qgallerytype.h>
+#include <qgalleryquerymodel.h>
+#include <qgallerytyperequest.h>
+#include <qgalleryfilter.h>
+#include <qdocumentgallery.h>
+#include <qgalleryabstractresponse.h>
+#include <qgalleryitemrequest.h>
+#include <qgalleryabstractrequest.h>
+#include <qabstractgallery.h>
+#include <qgalleryqueryrequest.h>
+#include <qgalleryresource.h>
+#include <qgalleryremoverequest.h>
+#include <qgalleryresultset.h>
+#include <qgalleryproperty.h>
+
+//QtLocation
+#include <qnmeapositioninfosource.h>
+#include <qgeoplace.h>
+#include <qgeocoordinate.h>
+#include <qgeopositioninfo.h>
+#include <qgeoaddress.h>
+#include <maps/qgeoroutesegment.h>
+#include <maps/qgeoserviceproviderfactory.h>
+#include <maps/qgeomappingmanagerengine.h>
+#include <maps/qgeoroutingmanager.h>
+#include <maps/qgeomapcircleobject.h>
+#include <maps/qgeoroutereply.h>
+#include <maps/qgeoserviceprovider.h>
+#include <maps/qgeosearchmanager.h>
+#include <maps/qgeomaprouteobject.h>
+#include <maps/qgeonavigationinstruction.h>
+#include <maps/qgeomapdata.h>
+#include <maps/qgeoroutingmanagerengine.h>
+#include <maps/qgeomappolygonobject.h>
+#include <maps/qgeonavigator.h>
+#include <maps/qgeoroute.h>
+#include <maps/qgeomappolylineobject.h>
+#include <maps/qgeomappingmanager.h>
+#include <maps/qgeomapmarkerobject.h>
+#include <maps/qgeosearchreply.h>
+#include <maps/tiled/qgeotiledmapreply.h>
+#include <maps/tiled/qgeotiledmapdata.h>
+#include <maps/tiled/qgeotiledmappingmanagerengine.h>
+#include <maps/tiled/qgeotiledmaprequest.h>
+#include <maps/qgeomaprectangleobject.h>
+#include <maps/qgeomapwidget.h>
+#include <maps/qgeomapobject.h>
+#include <maps/qgeorouterequest.h>
+#include <maps/qgeosearchmanagerengine.h>
+#include <qgeoareamonitor.h>
+#include <landmarks/qlandmarksortorder.h>
+#include <landmarks/qlandmarkfreetextfilter.h>
+#include <landmarks/qlandmarkabstractrequest.h>
+#include <landmarks/qlandmarkproximityfilter.h>
+#include <landmarks/qlandmarkmanager.h>
+#include <landmarks/qlandmarkexportrequest.h>
+#include <landmarks/qlandmark.h>
+#include <landmarks/qlandmarkfetchhint.h>
+#include <landmarks/qlandmarknamesort.h>
+#include <landmarks/qlandmarkcategorysaverequest.h>
+#include <landmarks/qlandmarkremoverequest.h>
+#include <landmarks/qlandmarksaverequest.h>
+#include <landmarks/qlandmarknamefilter.h>
+#include <landmarks/qlandmarkcategoryfilter.h>
+#include <landmarks/qlandmarkmanagerenginefactory.h>
+#include <landmarks/qlandmarkcategoryid.h>
+#include <landmarks/qlandmarkcategoryremoverequest.h>
+#include <landmarks/qlandmarkunionfilter.h>
+#include <landmarks/qlandmarkintersectionfilter.h>
+#include <landmarks/qlandmarkidfilter.h>
+#include <landmarks/qlandmarkdistancesort.h>
+#include <landmarks/qlandmarkmanagerengine.h>
+#include <landmarks/qlandmarkcategory.h>
+#include <landmarks/qlandmarkimportrequest.h>
+#include <landmarks/qlandmarkattributefilter.h>
+#include <landmarks/qlandmarkfetchrequest.h>
+#include <landmarks/qlandmarkidfetchrequest.h>
+#include <landmarks/qlandmarkfilter.h>
+#include <landmarks/qlandmarkid.h>
+#include <landmarks/qlandmarkboxfilter.h>
+#include <landmarks/qlandmarkcategoryfetchrequest.h>
+#include <landmarks/qlandmarkcategoryidfetchrequest.h>
+#include <qgeoboundingbox.h>
+#include <qgeosatelliteinfo.h>
+#include <qgeopositioninfosource.h>
+#include <qgeosatelliteinfosource.h>
+
+//QtMessaging
+#include <qmessagefolder.h>
+#include <qmessagedatacomparator.h>
+#include <qmessage.h>
+#include <qmessageaddress.h>
+#include <qmessageaccountid.h>
+#include <qmessageglobal.h>
+#include <qmessagefolderfilter.h>
+#include <qmessageaccountfilter.h>
+#include <qmessagefilter.h>
+#include <qmessageservice.h>
+#include <qmessagefoldersortorder.h>
+#include <qmessageaccountsortorder.h>
+#include <qmessagecontentcontainerid.h>
+#include <qmessageaccount.h>
+#include <qmessagefolderid.h>
+#include <qmessagecontentcontainer.h>
+#include <qmessagemanager.h>
+#include <qmessagestore.h>
+#include <qmessagesortorder.h>
+#include <qmessageid.h>
+
+//QtMobility
+
+//QtMultimediaKit
+#include <qmediarecorder.h>
+#include <qcameracontrol.h>
+#include <qmediaplaylistcontrol.h>
+#include <qmediaplaylistioplugin.h>
+#include <qcameraimagecapture.h>
+#include <qcameraflashcontrol.h>
+#include <qmetadatawritercontrol.h>
+#include <qlocalmediaplaylistprovider.h>
+#include <qmediacontainercontrol.h>
+#include <qradiotunercontrol.h>
+#include <qmediaserviceproviderplugin.h>
+#include <qmediatimerange.h>
+#include <qmediabindableinterface.h>
+#include <qvideodevicecontrol.h>
+#include <qmediaplaylistprovider.h>
+#include <qmediaobject.h>
+#include <video/qabstractvideosurface.h>
+#include <video/qabstractvideobuffer.h>
+#include <video/qvideosurfaceformat.h>
+#include <video/qvideoframe.h>
+#include <qvideowindowcontrol.h>
+#include <qmediastreamscontrol.h>
+#include <qcameralockscontrol.h>
+#include <qmediacontrol.h>
+#include <qmediaplayercontrol.h>
+#include <qmediaserviceprovider.h>
+#include <qcameraimagecapturecontrol.h>
+#include <qcameraexposure.h>
+#include <qcameraviewfinder.h>
+#include <qaudioencodercontrol.h>
+#include <audio/qaudioformat.h>
+#include <audio/qaudiosystem.h>
+#include <audio/qaudioinput.h>
+#include <audio/qaudiosystemplugin.h>
+#include <audio/qaudiodeviceinfo.h>
+#include <audio/qaudio.h>
+#include <audio/qaudiooutput.h>
+#include <qmediarecordercontrol.h>
+#include <qcamera.h>
+#include <qvideowidget.h>
+#include <qcameraexposurecontrol.h>
+#include <qradiotuner.h>
+#include <qaudiocapturesource.h>
+#include <qmediaplaylistnavigator.h>
+#include <qcamerafocuscontrol.h>
+#include <effects/qsoundeffect.h>
+#include <qmediacontent.h>
+#include <qmediaresource.h>
+#include <qtmedianamespace.h>
+#include <qvideowidgetcontrol.h>
+#include <qcameraimageprocessing.h>
+#include <qmediaencodersettings.h>
+#include <qcamerafocus.h>
+#include <qcameraimageprocessingcontrol.h>
+#include <qvideorenderercontrol.h>
+#include <qmediaplaylistsourcecontrol.h>
+#include <qmediaplayer.h>
+#include <qgraphicsvideoitem.h>
+#include <qimageencodercontrol.h>
+#include <qvideoencodercontrol.h>
+#include <qaudioendpointselector.h>
+#include <qmetadatareadercontrol.h>
+#include <qmediaplaylist.h>
+#include <qmediaservice.h>
+#include <qmediaimageviewer.h>
+
+//QtOrganizer
+#include <qorganizeritemrecurrencerule.h>
+#include <details/qorganizereventtimerange.h>
+#include <details/qorganizeritemtimestamp.h>
+#include <details/qorganizertodoprogress.h>
+#include <details/qorganizeritemrecurrence.h>
+#include <details/qorganizeritemdisplaylabel.h>
+#include <details/qorganizerjournaltimerange.h>
+#include <details/qorganizeritemguid.h>
+#include <details/qorganizeritemlocation.h>
+#include <details/qorganizeritemcomment.h>
+#include <details/qorganizertodotimerange.h>
+#include <details/qorganizeritemtype.h>
+#include <details/qorganizeritemdetails.h>
+#include <details/qorganizeritempriority.h>
+#include <details/qorganizeritemdescription.h>
+#include <details/qorganizeriteminstanceorigin.h>
+#include <qorganizeritemmanagerengine.h>
+#include <qorganizeritemabstractrequest.h>
+#include <qtorganizerglobal.h>
+#include <filters/qorganizeritemdatetimeperiodfilter.h>
+#include <filters/qorganizeritemdetailrangefilter.h>
+#include <filters/qorganizeritemlocalidfilter.h>
+#include <filters/qorganizeriteminvalidfilter.h>
+#include <filters/qorganizeritemintersectionfilter.h>
+#include <filters/qorganizeritemunionfilter.h>
+#include <filters/qorganizeritemdetailfilter.h>
+#include <filters/qorganizeritemfilters.h>
+#include <filters/qorganizeritemchangelogfilter.h>
+#include <qorganizeritemdetailfielddefinition.h>
+#include <qtorganizer.h>
+#include <qorganizeritemmanagerenginefactory.h>
+#include <qorganizeritemdetaildefinition.h>
+#include <qorganizeritemfetchhint.h>
+#include <qorganizeritemsortorder.h>
+#include <qorganizeritemchangeset.h>
+#include <requests/qorganizeritemsaverequest.h>
+#include <requests/qorganizeritemdetaildefinitionsaverequest.h>
+#include <requests/qorganizeritemremoverequest.h>
+#include <requests/qorganizeriteminstancefetchrequest.h>
+#include <requests/qorganizeritemdetaildefinitionremoverequest.h>
+#include <requests/qorganizeritemrequests.h>
+#include <requests/qorganizeritemfetchrequest.h>
+#include <requests/qorganizeritemlocalidfetchrequest.h>
+#include <requests/qorganizeritemdetaildefinitionfetchrequest.h>
+#include <qorganizeritemdetail.h>
+#include <qorganizeritemid.h>
+#include <qorganizeritem.h>
+#include <qorganizeritemmanager.h>
+#include <qorganizeritemfilter.h>
+#include <items/qorganizerevent.h>
+#include <items/qorganizereventoccurrence.h>
+#include <items/qorganizertodooccurrence.h>
+#include <items/qorganizeritems.h>
+#include <items/qorganizernote.h>
+#include <items/qorganizertodo.h>
+#include <items/qorganizerjournal.h>
+
+//QtPublishSubscribe
+#include <qvaluespace.h>
+#include <qvaluespacepublisher.h>
+#include <qvaluespacesubscriber.h>
+
+//QtSensors
+#include <qsensorplugin.h>
+#include <qsensormanager.h>
+#include <qaccelerometer.h>
+#include <qrotationsensor.h>
+#include <qorientationsensor.h>
+#include <qsensorbackend.h>
+#include <qsensor.h>
+#include <qcompass.h>
+#include <qtapsensor.h>
+#include <qmagnetometer.h>
+#include <qambientlightsensor.h>
+#include <qproximitysensor.h>
+
+//QtServiceFramework
+#include <qservicecontext.h>
+#include <qabstractsecuritysession.h>
+#include <qremoteserviceclassregister.h>
+#include <qserviceplugininterface.h>
+#include <qservicefilter.h>
+#include <qservice.h>
+#include <qserviceinterfacedescriptor.h>
+#include <qremoteservicecontrol.h>
+#include <qservicemanager.h>
+
+//QtSystemInfo
+#include <qsystemnetworkinfo.h>
+#include <qsysteminfo.h>
+#include <qsystemgeneralinfo.h>
+#include <qsystemdisplayinfo.h>
+#include <qsystemdeviceinfo.h>
+#include <qsystemscreensaver.h>
+#include <qsysteminfocommon.h>
+#include <qsystemstorageinfo.h>
+
+//QtTelephony
+#include <qtelephonycallinfo.h>
+#include <qtelephonycalllist.h>
+
+//QtVersit
+#include <qversitcontacthandler.h>
+#include <qversitproperty.h>
+#include <qversitcontactexporter.h>
+#include <qversitorganizerimporter.h>
+#include <qversitcontactimporter.h>
+#include <qversitwriter.h>
+#include <qversitreader.h>
+#include <qversitorganizerexporter.h>
+#include <qversitdocument.h>
+#include <qversitresourcehandler.h>
+
diff --git a/tests/auto/headers/tst_headers.cpp b/tests/auto/headers/tst_headers.cpp
new file mode 100644
index 0000000000..1540a27b5f
--- /dev/null
+++ b/tests/auto/headers/tst_headers.cpp
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+
+class tst_HeadersClean: public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void mocRun()
+    {
+        QVERIFY(true);
+    }
+};
+
+QTEST_MAIN(tst_HeadersClean)
+#include "tst_headers.moc"