replace Q_AUTOTEST_EXPORT with QM_AUTOTEST_EXPORT

Otherwise a test enabled Qt will always force Mobility to build with
autotest symbols (ignores the -tests option)

Task-number: MOBILITY-1053

39 files changed, 164 insertions, 159 deletions

diff --git a/doc/src/qt-cpp-ignore.qdocconf b/doc/src/qt-cpp-ignore.qdocconf
index b78b51250e..8aee301519 100644
--- a/doc/src/qt-cpp-ignore.qdocconf
+++ b/doc/src/qt-cpp-ignore.qdocconf
@@ -35,6 +35,7 @@ Cpp.ignoretokens        = QAXFACTORY_EXPORT \
                           Q_EXPORT_PLUGIN \
                           Q_GFX_INLINE \
                           Q_AUTOTEST_EXPORT \
+                          QM_AUTOTEST_EXPORT \
                           Q_GUI_EXPORT \
                           Q_GUI_EXPORT_INLINE \
                           Q_GUI_EXPORT_STYLE_CDE \
diff --git a/src/gallery/maemo5/qgallerydbusinterface_p.h b/src/gallery/maemo5/qgallerydbusinterface_p.h
index a30a47d332..5b5ed573b1 100644
--- a/src/gallery/maemo5/qgallerydbusinterface_p.h
+++ b/src/gallery/maemo5/qgallerydbusinterface_p.h
@@ -60,7 +60,7 @@
 
 QTM_BEGIN_NAMESPACE
 
-class Q_AUTOTEST_EXPORT QGalleryDBusInterface : public QDBusAbstractInterface, public QSharedData
+class QM_AUTOTEST_EXPORT QGalleryDBusInterface : public QDBusAbstractInterface, public QSharedData
 {
     Q_OBJECT
 public:
diff --git a/src/gallery/maemo5/qgallerytrackerlistcolumn_p.h b/src/gallery/maemo5/qgallerytrackerlistcolumn_p.h
index 5bbe0ea216..f4afd90173 100644
--- a/src/gallery/maemo5/qgallerytrackerlistcolumn_p.h
+++ b/src/gallery/maemo5/qgallerytrackerlistcolumn_p.h
@@ -62,7 +62,7 @@
 
 QTM_BEGIN_NAMESPACE
 
-class Q_AUTOTEST_EXPORT QGalleryTrackerValueColumn
+class QM_AUTOTEST_EXPORT QGalleryTrackerValueColumn
 {
 public:
     virtual ~QGalleryTrackerValueColumn() {}
@@ -71,7 +71,7 @@ public:
     virtual QString toString(const QVariant &variant) const { return variant.toString(); }
 };
 
-class Q_AUTOTEST_EXPORT QGalleryTrackerCompositeColumn
+class QM_AUTOTEST_EXPORT QGalleryTrackerCompositeColumn
 {
 public:
     virtual ~QGalleryTrackerCompositeColumn() {}
@@ -79,7 +79,7 @@ public:
     virtual QVariant value(QVector<QVariant>::const_iterator row) const = 0;
 };
 
-class Q_AUTOTEST_EXPORT QGalleryTrackerImageColumn : public QObject
+class QM_AUTOTEST_EXPORT QGalleryTrackerImageColumn : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/gallery/maemo5/qgallerytrackerresultset_p.h b/src/gallery/maemo5/qgallerytrackerresultset_p.h
index 69ba5c7189..d078a0fa80 100644
--- a/src/gallery/maemo5/qgallerytrackerresultset_p.h
+++ b/src/gallery/maemo5/qgallerytrackerresultset_p.h
@@ -119,7 +119,7 @@ struct QGalleryTrackerResultSetArguments
     QVector<int> resourceKeys;
 };
 
-class Q_AUTOTEST_EXPORT QGalleryTrackerResultSet : public QGalleryResultSet
+class QM_AUTOTEST_EXPORT QGalleryTrackerResultSet : public QGalleryResultSet
 {
     Q_OBJECT
 public:
diff --git a/src/global/qmobilityglobal.h b/src/global/qmobilityglobal.h
index e5895a1905..be04f51af8 100644
--- a/src/global/qmobilityglobal.h
+++ b/src/global/qmobilityglobal.h
@@ -56,13 +56,17 @@
 
 #define QTM_PACKAGE_TAG ""
 
-#if defined(QTM_BUILD_UNITTESTS)
-# include <qconfig.h>
-# if !defined(QT_BUILD_INTERNAL)
-#   define QT_BUILD_INTERNAL
-# endif
-#endif
 #include <QtCore/qglobal.h>
+#if defined(QTM_BUILD_UNITTEST) && (defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)) && defined(QT_MAKEDLL)
+#    define QM_AUTOTEST_EXPORT Q_DECL_EXPORT
+#elif defined(QTM_BUILD_UNITTESTS) && (defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)) && defined(QT_DLL)
+#    define QM_AUTOTEST_EXPORT Q_DECL_IMPORT
+#elif defined(QTM_BUILD_UNITTESTS) && !(defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)) && defined(QT_SHARED)
+#    define QM_AUTOTEST_EXPORT Q_DECL_EXPORT
+#else
+#    define QM_AUTOTEST_EXPORT
+#endif
+
 
 #if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
 #  if defined(QT_NODLL)
@@ -204,10 +208,10 @@
 #    undef Q_SERVICEFW_EXPORT
 #  endif
 #  define Q_SERVICEFW_EXPORT
-#  ifdef Q_AUTOTEST_EXPORT
-#    undef Q_AUTOTEST_EXPORT
+#  ifdef QM_AUTOTEST_EXPORT
+#    undef QM_AUTOTEST_EXPORT
 #  endif
-#  define Q_AUTOTEST_EXPORT
+#  define QM_AUTOTEST_EXPORT
 #endif
 
 // The namespace is hardcoded as moc has issues resolving
diff --git a/src/location/qlocationutils_p.h b/src/location/qlocationutils_p.h
index 16d6dd8c6b..2c39aba0c4 100644
--- a/src/location/qlocationutils_p.h
+++ b/src/location/qlocationutils_p.h
@@ -81,23 +81,23 @@ public:
         - RMC reports date with a two-digit year so in this case the year
           is assumed to be after the year 2000.
     */
-    Q_AUTOTEST_EXPORT static bool getPosInfoFromNmea(const char *data, int size, QGeoPositionInfo *info, bool *hasFix = 0);
+    QM_AUTOTEST_EXPORT static bool getPosInfoFromNmea(const char *data, int size, QGeoPositionInfo *info, bool *hasFix = 0);
 
     /*
         Returns true if the given NMEA sentence has a valid checksum.
     */
-    Q_AUTOTEST_EXPORT static bool hasValidNmeaChecksum(const char *data, int size);
+    QM_AUTOTEST_EXPORT static bool hasValidNmeaChecksum(const char *data, int size);
 
     /*
         Returns time from a string in hhmmss or hhmmss.z+ format.
     */
-    Q_AUTOTEST_EXPORT static bool getNmeaTime(const QByteArray &bytes, QTime *time);
+    QM_AUTOTEST_EXPORT static bool getNmeaTime(const QByteArray &bytes, QTime *time);
 
     /*
         Accepts e.g. ("2734.7964", 'S', "15306.0124", 'E') and returns the
         lat-long values. Fails if lat or long fail isValidLat() or isValidLong().
     */
-    Q_AUTOTEST_EXPORT static bool getNmeaLatLong(const QByteArray &latString, char latDirection, const QByteArray &lngString, char lngDirection, double *lat, double *lon);
+    QM_AUTOTEST_EXPORT static bool getNmeaLatLong(const QByteArray &latString, char latDirection, const QByteArray &lngString, char lngDirection, double *lat, double *lon);
 };
 
 QTM_END_NAMESPACE
diff --git a/src/messaging/qmfhelpers_maemo6_p.h b/src/messaging/qmfhelpers_maemo6_p.h
index eecbc963e4..096eb81bc9 100644
--- a/src/messaging/qmfhelpers_maemo6_p.h
+++ b/src/messaging/qmfhelpers_maemo6_p.h
@@ -67,95 +67,95 @@ class QMessageFilter;
 
 namespace QmfHelpers {
 
-    Q_AUTOTEST_EXPORT QMessageId convert(const QMailMessageId &id);
-    Q_AUTOTEST_EXPORT QMailMessageId convert(const QMessageId &id);
+    QM_AUTOTEST_EXPORT QMessageId convert(const QMailMessageId &id);
+    QM_AUTOTEST_EXPORT QMailMessageId convert(const QMessageId &id);
 
-    Q_AUTOTEST_EXPORT QMessageAccountId convert(const QMailAccountId &id);
-    Q_AUTOTEST_EXPORT QMailAccountId convert(const QMessageAccountId &id);
+    QM_AUTOTEST_EXPORT QMessageAccountId convert(const QMailAccountId &id);
+    QM_AUTOTEST_EXPORT QMailAccountId convert(const QMessageAccountId &id);
 
-    Q_AUTOTEST_EXPORT QMessageFolderId convert(const QMailFolderId &id);
-    Q_AUTOTEST_EXPORT QMailFolderId convert(const QMessageFolderId &id);
+    QM_AUTOTEST_EXPORT QMessageFolderId convert(const QMailFolderId &id);
+    QM_AUTOTEST_EXPORT QMailFolderId convert(const QMessageFolderId &id);
 
-    Q_AUTOTEST_EXPORT QMessageContentContainerId convert(const QMailMessagePart::Location &location);
-    Q_AUTOTEST_EXPORT QMailMessagePart::Location convert(const QMessageContentContainerId &id);
+    QM_AUTOTEST_EXPORT QMessageContentContainerId convert(const QMailMessagePart::Location &location);
+    QM_AUTOTEST_EXPORT QMailMessagePart::Location convert(const QMessageContentContainerId &id);
 
-    Q_AUTOTEST_EXPORT QMessageContentContainerId bodyId(const QMailMessageId &id);
+    QM_AUTOTEST_EXPORT QMessageContentContainerId bodyId(const QMailMessageId &id);
 
-    Q_AUTOTEST_EXPORT QMessageIdList convert(const QList<QMailMessageId> &ids);
-    Q_AUTOTEST_EXPORT QList<QMailMessageId> convert(const QMessageIdList &ids);
+    QM_AUTOTEST_EXPORT QMessageIdList convert(const QList<QMailMessageId> &ids);
+    QM_AUTOTEST_EXPORT QList<QMailMessageId> convert(const QMessageIdList &ids);
 
-    Q_AUTOTEST_EXPORT QMessageAccountIdList convert(const QList<QMailAccountId> &ids);
-    Q_AUTOTEST_EXPORT QList<QMailAccountId> convert(const QMessageAccountIdList &ids);
+    QM_AUTOTEST_EXPORT QMessageAccountIdList convert(const QList<QMailAccountId> &ids);
+    QM_AUTOTEST_EXPORT QList<QMailAccountId> convert(const QMessageAccountIdList &ids);
 
-    Q_AUTOTEST_EXPORT QMessageFolderIdList convert(const QList<QMailFolderId> &ids);
-    Q_AUTOTEST_EXPORT QList<QMailFolderId> convert(const QMessageFolderIdList &ids);
+    QM_AUTOTEST_EXPORT QMessageFolderIdList convert(const QList<QMailFolderId> &ids);
+    QM_AUTOTEST_EXPORT QList<QMailFolderId> convert(const QMessageFolderIdList &ids);
 
-    Q_AUTOTEST_EXPORT QMessageContentContainerIdList convert(const QList<QMailMessagePart::Location> &locations);
+    QM_AUTOTEST_EXPORT QMessageContentContainerIdList convert(const QList<QMailMessagePart::Location> &locations);
     //QList<QMailMessagePart::Location> convert(const QMessageContentContainerIdList &ids);
 
-    Q_AUTOTEST_EXPORT QMailMessage::MessageType convert(QMessage::Type t);
-    Q_AUTOTEST_EXPORT QMessage::Type convert(QMailMessage::MessageType t);
+    QM_AUTOTEST_EXPORT QMailMessage::MessageType convert(QMessage::Type t);
+    QM_AUTOTEST_EXPORT QMessage::Type convert(QMailMessage::MessageType t);
 
-    Q_AUTOTEST_EXPORT QMailMessage::MessageType convert(QMessage::TypeFlags v);
+    QM_AUTOTEST_EXPORT QMailMessage::MessageType convert(QMessage::TypeFlags v);
 
-    Q_AUTOTEST_EXPORT QMessage::StatusFlags convert(quint64 v);
-    Q_AUTOTEST_EXPORT quint64 convert(QMessage::Status v);
+    QM_AUTOTEST_EXPORT QMessage::StatusFlags convert(quint64 v);
+    QM_AUTOTEST_EXPORT quint64 convert(QMessage::Status v);
 
-    Q_AUTOTEST_EXPORT quint64 convert(QMessage::StatusFlags v);
+    QM_AUTOTEST_EXPORT quint64 convert(QMessage::StatusFlags v);
 
-    Q_AUTOTEST_EXPORT QMessageManager::Error convert(QMailStore::ErrorCode v);
+    QM_AUTOTEST_EXPORT QMessageManager::Error convert(QMailStore::ErrorCode v);
     //QMailStore::ErrorCode convert(QMessageManager::Error v);
 
     //QMessageManager::RemovalOption convert(QMailStore::MessageRemovalOption v);
-    Q_AUTOTEST_EXPORT QMailStore::MessageRemovalOption convert(QMessageManager::RemovalOption v);
+    QM_AUTOTEST_EXPORT QMailStore::MessageRemovalOption convert(QMessageManager::RemovalOption v);
 
-    Q_AUTOTEST_EXPORT QMessageService::State convert(QMailServiceAction::Activity v);
-    Q_AUTOTEST_EXPORT QMailServiceAction::Activity convert(QMessageService::State v);
+    QM_AUTOTEST_EXPORT QMessageService::State convert(QMailServiceAction::Activity v);
+    QM_AUTOTEST_EXPORT QMailServiceAction::Activity convert(QMessageService::State v);
 
-    Q_AUTOTEST_EXPORT QMessageAddress convert(const QMailAddress &address);
-    Q_AUTOTEST_EXPORT QMailAddress convert(const QMessageAddress &address);
+    QM_AUTOTEST_EXPORT QMessageAddress convert(const QMailAddress &address);
+    QM_AUTOTEST_EXPORT QMailAddress convert(const QMessageAddress &address);
 
-    Q_AUTOTEST_EXPORT QMessageAddressList convert(const QList<QMailAddress> &list);
-    Q_AUTOTEST_EXPORT QList<QMailAddress> convert(const QMessageAddressList& list);
+    QM_AUTOTEST_EXPORT QMessageAddressList convert(const QList<QMailAddress> &list);
+    QM_AUTOTEST_EXPORT QList<QMailAddress> convert(const QMessageAddressList& list);
 
     //QMessageDataComparator::EqualityComparator convert(QMailDataComparator::EqualityComparator cmp);
-    Q_AUTOTEST_EXPORT QMailDataComparator::EqualityComparator convert(QMessageDataComparator::EqualityComparator cmp);
+    QM_AUTOTEST_EXPORT QMailDataComparator::EqualityComparator convert(QMessageDataComparator::EqualityComparator cmp);
 
     //QMessageDataComparator::InclusionComparator convert(QMailDataComparator::InclusionComparator cmp);
-    Q_AUTOTEST_EXPORT QMailDataComparator::InclusionComparator convert(QMessageDataComparator::InclusionComparator cmp);
+    QM_AUTOTEST_EXPORT QMailDataComparator::InclusionComparator convert(QMessageDataComparator::InclusionComparator cmp);
 
     //QMessageDataComparator::RelationComparator convert(QMailDataComparator::RelationComparator cmp);
-    Q_AUTOTEST_EXPORT QMailDataComparator::RelationComparator convert(QMessageDataComparator::RelationComparator cmp);
+    QM_AUTOTEST_EXPORT QMailDataComparator::RelationComparator convert(QMessageDataComparator::RelationComparator cmp);
 
     //QMessageAccountFilter convert(const QMailAccountKey &key);
-    Q_AUTOTEST_EXPORT QMailAccountKey convert(const QMessageAccountFilter &filter);
+    QM_AUTOTEST_EXPORT QMailAccountKey convert(const QMessageAccountFilter &filter);
 
     //QMessageFolderFilter convert(const QMailFolderKey &key);
-    Q_AUTOTEST_EXPORT QMailFolderKey convert(const QMessageFolderFilter &filter);
+    QM_AUTOTEST_EXPORT QMailFolderKey convert(const QMessageFolderFilter &filter);
 
     //QMessageFilter convert(const QMailMessageKey &key);
-    Q_AUTOTEST_EXPORT QMailMessageKey convert(const QMessageFilter &filter);
+    QM_AUTOTEST_EXPORT QMailMessageKey convert(const QMessageFilter &filter);
 
     //QMessageAccountSortOrder convert(const QMailAccountSortKey &key);
-    Q_AUTOTEST_EXPORT QMailAccountSortKey convert(const QMessageAccountSortOrder &sortOrder);
+    QM_AUTOTEST_EXPORT QMailAccountSortKey convert(const QMessageAccountSortOrder &sortOrder);
 
     //QMessageFolderSortOrder convert(const QMailFolderSortKey &key);
-    Q_AUTOTEST_EXPORT QMailFolderSortKey convert(const QMessageFolderSortOrder &sortOrder);
+    QM_AUTOTEST_EXPORT QMailFolderSortKey convert(const QMessageFolderSortOrder &sortOrder);
 
     //QMessageSortOrder convert(const QMailMessageSortKey &key);
-    Q_AUTOTEST_EXPORT QMailMessageSortKey convert(const QMessageSortOrder &sortOrder);
+    QM_AUTOTEST_EXPORT QMailMessageSortKey convert(const QMessageSortOrder &sortOrder);
 
-    Q_AUTOTEST_EXPORT QMessageAccount convert(const QMailAccount &account);
+    QM_AUTOTEST_EXPORT QMessageAccount convert(const QMailAccount &account);
     //QMailAccount convert(const QMessageAccount &account);
 
-    Q_AUTOTEST_EXPORT QMessageFolder convert(const QMailFolder &folder);
+    QM_AUTOTEST_EXPORT QMessageFolder convert(const QMailFolder &folder);
     //QMailFolder convert(const QMessageFolder &folder);
 
-    Q_AUTOTEST_EXPORT QMessage convert(const QMailMessage &message);
-    Q_AUTOTEST_EXPORT QMailMessage convert(const QMessage &message);
+    QM_AUTOTEST_EXPORT QMessage convert(const QMailMessage &message);
+    QM_AUTOTEST_EXPORT QMailMessage convert(const QMessage &message);
 
-    Q_AUTOTEST_EXPORT quint64 highPriorityMask();
-    Q_AUTOTEST_EXPORT quint64 lowPriorityMask();
+    QM_AUTOTEST_EXPORT quint64 highPriorityMask();
+    QM_AUTOTEST_EXPORT quint64 lowPriorityMask();
 
 };
 
diff --git a/src/messaging/qmfhelpers_p.h b/src/messaging/qmfhelpers_p.h
index 296aecf7ab..b2b3309cb2 100644
--- a/src/messaging/qmfhelpers_p.h
+++ b/src/messaging/qmfhelpers_p.h
@@ -68,104 +68,104 @@ class QMessageFilter;
 namespace QmfHelpers {
 
     QMailStore *mailStoreInstance();
-    Q_AUTOTEST_EXPORT QString stripIdentifierPrefix(const QString &s);
-    Q_AUTOTEST_EXPORT QString prefixIdentifier(const QString &s);
+    QM_AUTOTEST_EXPORT QString stripIdentifierPrefix(const QString &s);
+    QM_AUTOTEST_EXPORT QString prefixIdentifier(const QString &s);
 
-    Q_AUTOTEST_EXPORT QMessageId convert(const QMailMessageId &id);
-    Q_AUTOTEST_EXPORT QMailMessageId convert(const QMessageId &id);
+    QM_AUTOTEST_EXPORT QMessageId convert(const QMailMessageId &id);
+    QM_AUTOTEST_EXPORT QMailMessageId convert(const QMessageId &id);
 
-    Q_AUTOTEST_EXPORT QMessageAccountId convert(const QMailAccountId &id);
-    Q_AUTOTEST_EXPORT QMailAccountId convert(const QMessageAccountId &id);
+    QM_AUTOTEST_EXPORT QMessageAccountId convert(const QMailAccountId &id);
+    QM_AUTOTEST_EXPORT QMailAccountId convert(const QMessageAccountId &id);
 
-    Q_AUTOTEST_EXPORT QMessageFolderId convert(const QMailFolderId &id);
-    Q_AUTOTEST_EXPORT QMailFolderId convert(const QMessageFolderId &id);
+    QM_AUTOTEST_EXPORT QMessageFolderId convert(const QMailFolderId &id);
+    QM_AUTOTEST_EXPORT QMailFolderId convert(const QMessageFolderId &id);
 
-    Q_AUTOTEST_EXPORT QMessageContentContainerId convert(const QMailMessagePart::Location &location);
-    Q_AUTOTEST_EXPORT QMailMessagePart::Location convert(const QMessageContentContainerId &id);
+    QM_AUTOTEST_EXPORT QMessageContentContainerId convert(const QMailMessagePart::Location &location);
+    QM_AUTOTEST_EXPORT QMailMessagePart::Location convert(const QMessageContentContainerId &id);
 
-    Q_AUTOTEST_EXPORT QMessageContentContainerId bodyId(const QMailMessageId &id);
+    QM_AUTOTEST_EXPORT QMessageContentContainerId bodyId(const QMailMessageId &id);
 
-    Q_AUTOTEST_EXPORT QMessageIdList convert(const QList<QMailMessageId> &ids);
-    Q_AUTOTEST_EXPORT QList<QMailMessageId> convert(const QMessageIdList &ids);
+    QM_AUTOTEST_EXPORT QMessageIdList convert(const QList<QMailMessageId> &ids);
+    QM_AUTOTEST_EXPORT QList<QMailMessageId> convert(const QMessageIdList &ids);
 
-    Q_AUTOTEST_EXPORT QMessageAccountIdList convert(const QList<QMailAccountId> &ids);
-    Q_AUTOTEST_EXPORT QList<QMailAccountId> convert(const QMessageAccountIdList &ids);
+    QM_AUTOTEST_EXPORT QMessageAccountIdList convert(const QList<QMailAccountId> &ids);
+    QM_AUTOTEST_EXPORT QList<QMailAccountId> convert(const QMessageAccountIdList &ids);
 
-    Q_AUTOTEST_EXPORT QMessageFolderIdList convert(const QList<QMailFolderId> &ids);
-    Q_AUTOTEST_EXPORT QList<QMailFolderId> convert(const QMessageFolderIdList &ids);
+    QM_AUTOTEST_EXPORT QMessageFolderIdList convert(const QList<QMailFolderId> &ids);
+    QM_AUTOTEST_EXPORT QList<QMailFolderId> convert(const QMessageFolderIdList &ids);
 
-    Q_AUTOTEST_EXPORT QMessageContentContainerIdList convert(const QList<QMailMessagePart::Location> &locations);
+    QM_AUTOTEST_EXPORT QMessageContentContainerIdList convert(const QList<QMailMessagePart::Location> &locations);
     //QList<QMailMessagePart::Location> convert(const QMessageContentContainerIdList &ids);
 
-    Q_AUTOTEST_EXPORT QMailMessage::MessageType convert(QMessage::Type t);
-    Q_AUTOTEST_EXPORT QMessage::Type convert(QMailMessage::MessageType t);
+    QM_AUTOTEST_EXPORT QMailMessage::MessageType convert(QMessage::Type t);
+    QM_AUTOTEST_EXPORT QMessage::Type convert(QMailMessage::MessageType t);
 
-    Q_AUTOTEST_EXPORT QMailMessage::MessageType convert(QMessage::TypeFlags v);
+    QM_AUTOTEST_EXPORT QMailMessage::MessageType convert(QMessage::TypeFlags v);
 
-    Q_AUTOTEST_EXPORT QMessage::StatusFlags convert(quint64 v);
-    Q_AUTOTEST_EXPORT quint64 convert(QMessage::Status v);
+    QM_AUTOTEST_EXPORT QMessage::StatusFlags convert(quint64 v);
+    QM_AUTOTEST_EXPORT quint64 convert(QMessage::Status v);
 
-    Q_AUTOTEST_EXPORT quint64 convert(QMessage::StatusFlags v);
+    QM_AUTOTEST_EXPORT quint64 convert(QMessage::StatusFlags v);
 
-    Q_AUTOTEST_EXPORT QMessageManager::Error convert(QMailStore::ErrorCode v);
+    QM_AUTOTEST_EXPORT QMessageManager::Error convert(QMailStore::ErrorCode v);
     //QMailStore::ErrorCode convert(QMessageManager::Error v);
 
     //QMessageManager::RemovalOption convert(QMailStore::MessageRemovalOption v);
-    Q_AUTOTEST_EXPORT QMailStore::MessageRemovalOption convert(QMessageManager::RemovalOption v);
+    QM_AUTOTEST_EXPORT QMailStore::MessageRemovalOption convert(QMessageManager::RemovalOption v);
 
-    Q_AUTOTEST_EXPORT QMessageService::State convert(QMailServiceAction::Activity v);
-    Q_AUTOTEST_EXPORT QMailServiceAction::Activity convert(QMessageService::State v);
+    QM_AUTOTEST_EXPORT QMessageService::State convert(QMailServiceAction::Activity v);
+    QM_AUTOTEST_EXPORT QMailServiceAction::Activity convert(QMessageService::State v);
 
-    Q_AUTOTEST_EXPORT QMessageAddress convert(const QMailAddress &address);
-    Q_AUTOTEST_EXPORT QMailAddress convert(const QMessageAddress &address);
+    QM_AUTOTEST_EXPORT QMessageAddress convert(const QMailAddress &address);
+    QM_AUTOTEST_EXPORT QMailAddress convert(const QMessageAddress &address);
 
-    Q_AUTOTEST_EXPORT QMessageAddressList convert(const QList<QMailAddress> &list);
-    Q_AUTOTEST_EXPORT QList<QMailAddress> convert(const QMessageAddressList& list);
+    QM_AUTOTEST_EXPORT QMessageAddressList convert(const QList<QMailAddress> &list);
+    QM_AUTOTEST_EXPORT QList<QMailAddress> convert(const QMessageAddressList& list);
 
     //QMessageDataComparator::EqualityComparator convert(QMailDataComparator::EqualityComparator cmp);
-    Q_AUTOTEST_EXPORT QMailDataComparator::EqualityComparator convert(QMessageDataComparator::EqualityComparator cmp);
+    QM_AUTOTEST_EXPORT QMailDataComparator::EqualityComparator convert(QMessageDataComparator::EqualityComparator cmp);
 
     //QMessageDataComparator::InclusionComparator convert(QMailDataComparator::InclusionComparator cmp);
-    Q_AUTOTEST_EXPORT QMailDataComparator::InclusionComparator convert(QMessageDataComparator::InclusionComparator cmp);
+    QM_AUTOTEST_EXPORT QMailDataComparator::InclusionComparator convert(QMessageDataComparator::InclusionComparator cmp);
 
     //QMessageDataComparator::RelationComparator convert(QMailDataComparator::RelationComparator cmp);
-    Q_AUTOTEST_EXPORT QMailDataComparator::RelationComparator convert(QMessageDataComparator::RelationComparator cmp);
+    QM_AUTOTEST_EXPORT QMailDataComparator::RelationComparator convert(QMessageDataComparator::RelationComparator cmp);
 
     //QMessageAccountFilter convert(const QMailAccountKey &key);
-    Q_AUTOTEST_EXPORT QMailAccountKey convert(const QMessageAccountFilter &filter);
+    QM_AUTOTEST_EXPORT QMailAccountKey convert(const QMessageAccountFilter &filter);
 
     //QMessageFolderFilter convert(const QMailFolderKey &key);
-    Q_AUTOTEST_EXPORT QMailFolderKey convert(const QMessageFolderFilter &filter);
+    QM_AUTOTEST_EXPORT QMailFolderKey convert(const QMessageFolderFilter &filter);
 
     //QMessageFilter convert(const QMailMessageKey &key);
-    Q_AUTOTEST_EXPORT QMailMessageKey convert(const QMessageFilter &filter);
+    QM_AUTOTEST_EXPORT QMailMessageKey convert(const QMessageFilter &filter);
 
     //QMessageAccountSortOrder convert(const QMailAccountSortKey &key);
-    Q_AUTOTEST_EXPORT QMailAccountSortKey convert(const QMessageAccountSortOrder &sortOrder);
+    QM_AUTOTEST_EXPORT QMailAccountSortKey convert(const QMessageAccountSortOrder &sortOrder);
 
     //QMessageFolderSortOrder convert(const QMailFolderSortKey &key);
-    Q_AUTOTEST_EXPORT QMailFolderSortKey convert(const QMessageFolderSortOrder &sortOrder);
+    QM_AUTOTEST_EXPORT QMailFolderSortKey convert(const QMessageFolderSortOrder &sortOrder);
 
     //QMessageSortOrder convert(const QMailMessageSortKey &key);
-    Q_AUTOTEST_EXPORT QMailMessageSortKey convert(const QMessageSortOrder &sortOrder);
+    QM_AUTOTEST_EXPORT QMailMessageSortKey convert(const QMessageSortOrder &sortOrder);
 
-    Q_AUTOTEST_EXPORT QMessageAccount convert(const QMailAccount &account);
+    QM_AUTOTEST_EXPORT QMessageAccount convert(const QMailAccount &account);
     //QMailAccount convert(const QMessageAccount &account);
 
-    Q_AUTOTEST_EXPORT QMessageFolder convert(const QMailFolder &folder);
+    QM_AUTOTEST_EXPORT QMessageFolder convert(const QMailFolder &folder);
     //QMailFolder convert(const QMessageFolder &folder);
 
-    Q_AUTOTEST_EXPORT QMessage convert(const QMailMessage &message);
+    QM_AUTOTEST_EXPORT QMessage convert(const QMailMessage &message);
     QMailMessage convert(const QMessage &message);
 
-    Q_AUTOTEST_EXPORT QMailMessage* convert(QMessage *message);
+    QM_AUTOTEST_EXPORT QMailMessage* convert(QMessage *message);
     //const QMailMessage* convert(const QMessage *message);
 
-    Q_AUTOTEST_EXPORT QMailStore *convert(QMessageStore *store);
-    Q_AUTOTEST_EXPORT QMailStore *convert(QMessageManager &manager);
+    QM_AUTOTEST_EXPORT QMailStore *convert(QMessageStore *store);
+    QM_AUTOTEST_EXPORT QMailStore *convert(QMessageManager &manager);
 
-    Q_AUTOTEST_EXPORT quint64 highPriorityMask();
-    Q_AUTOTEST_EXPORT quint64 lowPriorityMask();
+    QM_AUTOTEST_EXPORT quint64 highPriorityMask();
+    QM_AUTOTEST_EXPORT quint64 lowPriorityMask();
 
 };
 
diff --git a/src/multimedia/qmediaimageviewerservice_p.h b/src/multimedia/qmediaimageviewerservice_p.h
index 145d257915..5457ceb973 100644
--- a/src/multimedia/qmediaimageviewerservice_p.h
+++ b/src/multimedia/qmediaimageviewerservice_p.h
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
 
 class QMediaImageViewerServicePrivate;
 
-class Q_AUTOTEST_EXPORT QMediaImageViewerService : public QMediaService
+class QM_AUTOTEST_EXPORT QMediaImageViewerService : public QMediaService
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/qmediapluginloader_p.h b/src/multimedia/qmediapluginloader_p.h
index 8cd4354a0d..a11f6de765 100644
--- a/src/multimedia/qmediapluginloader_p.h
+++ b/src/multimedia/qmediapluginloader_p.h
@@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
 
 class QMediaServiceProviderPlugin;
 
-class Q_AUTOTEST_EXPORT QMediaPluginLoader
+class QM_AUTOTEST_EXPORT QMediaPluginLoader
 {
 public:
     QMediaPluginLoader(const char *iid,
diff --git a/src/multimedia/qpaintervideosurface_p.h b/src/multimedia/qpaintervideosurface_p.h
index 5f3b79c6c1..d5c7c24a01 100644
--- a/src/multimedia/qpaintervideosurface_p.h
+++ b/src/multimedia/qpaintervideosurface_p.h
@@ -93,7 +93,7 @@ public:
 };
 
 
-class Q_AUTOTEST_EXPORT QPainterVideoSurface : public QAbstractVideoSurface
+class QM_AUTOTEST_EXPORT QPainterVideoSurface : public QAbstractVideoSurface
 {
     Q_OBJECT
 public:
diff --git a/src/publishsubscribe/qmallocpool_p.h b/src/publishsubscribe/qmallocpool_p.h
index 5ed4c8eaac..e224a0e3a9 100644
--- a/src/publishsubscribe/qmallocpool_p.h
+++ b/src/publishsubscribe/qmallocpool_p.h
@@ -50,7 +50,7 @@ QTM_BEGIN_NAMESPACE
 
 class QMallocPoolPrivate;
 
-class Q_AUTOTEST_EXPORT QMallocPool
+class QM_AUTOTEST_EXPORT QMallocPool
 {
 public:
     enum PoolType { Owned, NewShared, Shared };
diff --git a/src/publishsubscribe/qpacketprotocol_p.h b/src/publishsubscribe/qpacketprotocol_p.h
index dbc2bdce53..31a455d1c2 100644
--- a/src/publishsubscribe/qpacketprotocol_p.h
+++ b/src/publishsubscribe/qpacketprotocol_p.h
@@ -57,7 +57,7 @@ class QPacket;
 class QPacketAutoSend;
 class QPacketProtocolPrivate;
 
-class Q_AUTOTEST_EXPORT QPacketProtocol : public QObject
+class QM_AUTOTEST_EXPORT QPacketProtocol : public QObject
 {
 Q_OBJECT
 public:
@@ -87,7 +87,7 @@ private:
 };
 
 
-class Q_AUTOTEST_EXPORT QPacket : public QDataStream
+class QM_AUTOTEST_EXPORT QPacket : public QDataStream
 {
 public:
     QPacket();
@@ -104,7 +104,7 @@ protected:
     QBuffer * buf;
 };
 
-class Q_AUTOTEST_EXPORT QPacketAutoSend : public QPacket
+class QM_AUTOTEST_EXPORT QPacketAutoSend : public QPacket
 {
 public:
     virtual ~QPacketAutoSend();
diff --git a/src/publishsubscribe/qsystemreadwritelock_p.h b/src/publishsubscribe/qsystemreadwritelock_p.h
index 612ede7d39..42899b2435 100644
--- a/src/publishsubscribe/qsystemreadwritelock_p.h
+++ b/src/publishsubscribe/qsystemreadwritelock_p.h
@@ -48,7 +48,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QSystemReadWriteLockPrivate;
-class Q_AUTOTEST_EXPORT QSystemReadWriteLock
+class QM_AUTOTEST_EXPORT QSystemReadWriteLock
 {
 public:
     enum AccessMode{Create, Open};
diff --git a/src/publishsubscribe/qvaluespace_p.h b/src/publishsubscribe/qvaluespace_p.h
index 720e83d8f5..c58e052ae3 100644
--- a/src/publishsubscribe/qvaluespace_p.h
+++ b/src/publishsubscribe/qvaluespace_p.h
@@ -54,7 +54,7 @@ class QValueSpacePublisher;
 
 QString qCanonicalPath(const QString &path);
 
-class Q_AUTOTEST_EXPORT QAbstractValueSpaceLayer : public QObject
+class QM_AUTOTEST_EXPORT QAbstractValueSpaceLayer : public QObject
 {
     Q_OBJECT
 
@@ -108,8 +108,8 @@ signals:
 
 namespace QValueSpace {
     typedef QAbstractValueSpaceLayer *(*LayerCreateFunc)();
-    Q_AUTOTEST_EXPORT void installLayer(LayerCreateFunc func);
-    Q_AUTOTEST_EXPORT void installLayer(QAbstractValueSpaceLayer *layer);
+    QM_AUTOTEST_EXPORT void installLayer(LayerCreateFunc func);
+    QM_AUTOTEST_EXPORT void installLayer(QAbstractValueSpaceLayer *layer);
 
     struct AutoInstall {
         AutoInstall(LayerCreateFunc func) { installLayer(func); }
diff --git a/src/publishsubscribe/qvaluespacemanager_p.h b/src/publishsubscribe/qvaluespacemanager_p.h
index b2bef40a05..2fea939420 100644
--- a/src/publishsubscribe/qvaluespacemanager_p.h
+++ b/src/publishsubscribe/qvaluespacemanager_p.h
@@ -59,7 +59,7 @@ QT_USE_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
-class Q_AUTOTEST_EXPORT QValueSpaceManager
+class QM_AUTOTEST_EXPORT QValueSpaceManager
 {
 public:
     QValueSpaceManager();
diff --git a/src/sensors/qsensorpluginloader_p.h b/src/sensors/qsensorpluginloader_p.h
index 7007f40e90..9618631918 100644
--- a/src/sensors/qsensorpluginloader_p.h
+++ b/src/sensors/qsensorpluginloader_p.h
@@ -63,7 +63,7 @@ QTM_BEGIN_NAMESPACE
 
 class QSensorPluginInterface;
 
-class Q_AUTOTEST_EXPORT QSensorPluginLoader
+class QM_AUTOTEST_EXPORT QSensorPluginLoader
 {
 public:
     QSensorPluginLoader(const char *iid, const QString &suffix = QString());
diff --git a/src/serviceframework/databasemanager_p.h b/src/serviceframework/databasemanager_p.h
index 2ba2363531..17e6f74921 100644
--- a/src/serviceframework/databasemanager_p.h
+++ b/src/serviceframework/databasemanager_p.h
@@ -58,15 +58,15 @@
 #include <QObject>
 
 #ifdef QT_SFW_SERVICEDATABASE_GENERATE
-#undef Q_AUTOTEST_EXPORT
-#define Q_AUTOTEST_EXPORT
+#undef QM_AUTOTEST_EXPORT
+#define QM_AUTOTEST_EXPORT
 #endif
 
 QT_BEGIN_HEADER
 QTM_BEGIN_NAMESPACE
 
 class DatabaseFileWatcher;
-class Q_AUTOTEST_EXPORT DatabaseManager : public QObject
+class QM_AUTOTEST_EXPORT DatabaseManager : public QObject
 {
     Q_OBJECT
 
@@ -111,7 +111,7 @@ class Q_AUTOTEST_EXPORT DatabaseManager : public QObject
 };
 
 
-class Q_AUTOTEST_EXPORT DatabaseFileWatcher : public QObject
+class QM_AUTOTEST_EXPORT DatabaseFileWatcher : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/serviceframework/databasemanager_symbian_p.h b/src/serviceframework/databasemanager_symbian_p.h
index 38e4cf6d20..23ecf490b8 100644
--- a/src/serviceframework/databasemanager_symbian_p.h
+++ b/src/serviceframework/databasemanager_symbian_p.h
@@ -120,7 +120,7 @@ class RDatabaseManagerSession : public RSessionBase
 
 class DatabaseManagerSignalMonitor;
 
-class Q_AUTOTEST_EXPORT DatabaseManager : public QObject
+class QM_AUTOTEST_EXPORT DatabaseManager : public QObject
 {
     Q_OBJECT
 
diff --git a/src/serviceframework/dberror_p.h b/src/serviceframework/dberror_p.h
index 9ab50fa376..0867d1f954 100644
--- a/src/serviceframework/dberror_p.h
+++ b/src/serviceframework/dberror_p.h
@@ -58,7 +58,7 @@
 
 QTM_BEGIN_NAMESPACE
 
-class Q_AUTOTEST_EXPORT DBError
+class QM_AUTOTEST_EXPORT DBError
 {
     public:
         enum ErrorCode {
diff --git a/src/serviceframework/ipc/instancemanager_p.h b/src/serviceframework/ipc/instancemanager_p.h
index 215326ba67..5a5efd0f19 100644
--- a/src/serviceframework/ipc/instancemanager_p.h
+++ b/src/serviceframework/ipc/instancemanager_p.h
@@ -68,7 +68,7 @@ struct ServiceIdentDescriptor
     int sharedRefCount;
 };
 
-class Q_AUTOTEST_EXPORT InstanceManager 
+class QM_AUTOTEST_EXPORT InstanceManager
 {
 public:
     InstanceManager();
diff --git a/src/serviceframework/ipc/ipcendpoint_p.h b/src/serviceframework/ipc/ipcendpoint_p.h
index 00bfd54252..5a5d00705b 100644
--- a/src/serviceframework/ipc/ipcendpoint_p.h
+++ b/src/serviceframework/ipc/ipcendpoint_p.h
@@ -50,7 +50,7 @@
 
 QTM_BEGIN_NAMESPACE
 
-class Q_AUTOTEST_EXPORT QServiceIpcEndPoint : public QObject
+class QM_AUTOTEST_EXPORT QServiceIpcEndPoint : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/serviceframework/ipc/qmetaobjectbuilder_p.h b/src/serviceframework/ipc/qmetaobjectbuilder_p.h
index 042eec7c4c..78baa2b675 100644
--- a/src/serviceframework/ipc/qmetaobjectbuilder_p.h
+++ b/src/serviceframework/ipc/qmetaobjectbuilder_p.h
@@ -75,7 +75,7 @@ class QMetaPropertyBuilderPrivate;
 class QMetaEnumBuilder;
 class QMetaEnumBuilderPrivate;
 
-class Q_AUTOTEST_EXPORT QMetaObjectBuilder
+class QM_AUTOTEST_EXPORT QMetaObjectBuilder
 {
 public:
     enum AddMember
@@ -200,7 +200,7 @@ private:
     friend class QMetaEnumBuilder;
 };
 
-class Q_AUTOTEST_EXPORT  QMetaMethodBuilder
+class QM_AUTOTEST_EXPORT  QMetaMethodBuilder
 {
 public:
     QMetaMethodBuilder() : _mobj(0), _index(0) {}
@@ -238,7 +238,7 @@ private:
     QMetaMethodBuilderPrivate *d_func() const;
 };
 
-class Q_AUTOTEST_EXPORT QMetaPropertyBuilder
+class QM_AUTOTEST_EXPORT QMetaPropertyBuilder
 {
 public:
     QMetaPropertyBuilder() : _mobj(0), _index(0) {}
@@ -289,7 +289,7 @@ private:
     QMetaPropertyBuilderPrivate *d_func() const;
 };
 
-class Q_AUTOTEST_EXPORT QMetaEnumBuilder
+class QM_AUTOTEST_EXPORT QMetaEnumBuilder
 {
 public:
     QMetaEnumBuilder() : _mobj(0), _index(0) {}
diff --git a/src/serviceframework/ipc/qservicepackage_p.h b/src/serviceframework/ipc/qservicepackage_p.h
index c12147ec09..91c0b12f45 100644
--- a/src/serviceframework/ipc/qservicepackage_p.h
+++ b/src/serviceframework/ipc/qservicepackage_p.h
@@ -57,7 +57,7 @@ QT_END_NAMESPACE
 QTM_BEGIN_NAMESPACE
 
 class QServicePackagePrivate;
-class Q_AUTOTEST_EXPORT QServicePackage
+class QM_AUTOTEST_EXPORT QServicePackage
 {
 public:
     QServicePackage();
diff --git a/src/serviceframework/servicedatabase_p.h b/src/serviceframework/servicedatabase_p.h
index 6812497036..42ecdaeaaf 100644
--- a/src/serviceframework/servicedatabase_p.h
+++ b/src/serviceframework/servicedatabase_p.h
@@ -66,7 +66,7 @@ QTM_BEGIN_NAMESPACE
 
 class QServiceInterfaceDescriptor;
 
-class Q_AUTOTEST_EXPORT ServiceDatabase : public QObject
+class QM_AUTOTEST_EXPORT ServiceDatabase : public QObject
 {
     Q_OBJECT
 
diff --git a/src/serviceframework/servicemetadata_p.h b/src/serviceframework/servicemetadata_p.h
index c6e0cc575b..099950af31 100644
--- a/src/serviceframework/servicemetadata_p.h
+++ b/src/serviceframework/servicemetadata_p.h
@@ -61,8 +61,8 @@
 #include "qserviceinterfacedescriptor.h"
 
 #ifdef SERVICE_XML_GENERATOR
-#undef Q_AUTOTEST_EXPORT
-#define Q_AUTOTEST_EXPORT
+#undef QM_AUTOTEST_EXPORT
+#define QM_AUTOTEST_EXPORT
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -98,11 +98,11 @@ public:
 };
 
 #ifndef QT_NO_DATASTREAM
-Q_AUTOTEST_EXPORT QDataStream &operator<<(QDataStream &, const ServiceMetaDataResults &);
-Q_AUTOTEST_EXPORT QDataStream &operator>>(QDataStream &, ServiceMetaDataResults &);
+QM_AUTOTEST_EXPORT QDataStream &operator<<(QDataStream &, const ServiceMetaDataResults &);
+QM_AUTOTEST_EXPORT QDataStream &operator>>(QDataStream &, ServiceMetaDataResults &);
 #endif
 
-class Q_AUTOTEST_EXPORT ServiceMetaData 
+class QM_AUTOTEST_EXPORT ServiceMetaData
 {
 public:
 
diff --git a/src/telephony/maemo/qtelephonycallinfo_maemo_p.h b/src/telephony/maemo/qtelephonycallinfo_maemo_p.h
index de1dba4e7a..3c30d1d9e1 100644
--- a/src/telephony/maemo/qtelephonycallinfo_maemo_p.h
+++ b/src/telephony/maemo/qtelephonycallinfo_maemo_p.h
@@ -66,7 +66,7 @@
 QT_BEGIN_HEADER
 QTM_BEGIN_NAMESPACE
 
-class Q_AUTOTEST_EXPORT QTelephonyCallInfoPrivate : public QSharedData
+class QM_AUTOTEST_EXPORT QTelephonyCallInfoPrivate : public QSharedData
 {
 public:
     static bool isCall( const QVariantMap &properties);
diff --git a/src/telephony/qtelephonycallinfo_p.h b/src/telephony/qtelephonycallinfo_p.h
index 3e060a139a..76635af832 100644
--- a/src/telephony/qtelephonycallinfo_p.h
+++ b/src/telephony/qtelephonycallinfo_p.h
@@ -67,7 +67,7 @@ QTM_BEGIN_NAMESPACE
 
 using namespace QTelephonyEvents;
 
-struct Q_AUTOTEST_EXPORT QTelephonyCallInfoPrivate : public QSharedData
+struct QM_AUTOTEST_EXPORT QTelephonyCallInfoPrivate : public QSharedData
 {
 public:
     QTelephonyCallInfoPrivate()
diff --git a/src/telephony/qtelephonycalllist_win_p.h b/src/telephony/qtelephonycalllist_win_p.h
index f0417e16ef..2ecf7362e2 100644
--- a/src/telephony/qtelephonycalllist_win_p.h
+++ b/src/telephony/qtelephonycalllist_win_p.h
@@ -66,7 +66,7 @@ QTM_BEGIN_NAMESPACE
 struct QTelephonyCallInfoPrivate;
 class QTelephonyCallList;
 
-class Q_AUTOTEST_EXPORT QTelephonyCallListPrivate
+class QM_AUTOTEST_EXPORT QTelephonyCallListPrivate
 {
     friend class QTelephonyCallList;
 
diff --git a/src/versit/qvcard21writer_p.h b/src/versit/qvcard21writer_p.h
index 479d135995..9f13748be7 100644
--- a/src/versit/qvcard21writer_p.h
+++ b/src/versit/qvcard21writer_p.h
@@ -58,7 +58,7 @@
 
 QTM_BEGIN_NAMESPACE
 
-class Q_AUTOTEST_EXPORT QVCard21Writer : public QVersitDocumentWriter
+class QM_AUTOTEST_EXPORT QVCard21Writer : public QVersitDocumentWriter
 {
 public:
     QVCard21Writer();
diff --git a/src/versit/qvcard30writer_p.h b/src/versit/qvcard30writer_p.h
index 0040ea6407..e231441e50 100644
--- a/src/versit/qvcard30writer_p.h
+++ b/src/versit/qvcard30writer_p.h
@@ -58,7 +58,7 @@
 
 QTM_BEGIN_NAMESPACE
 
-class Q_AUTOTEST_EXPORT QVCard30Writer : public QVersitDocumentWriter
+class QM_AUTOTEST_EXPORT QVCard30Writer : public QVersitDocumentWriter
 {
 public:
     QVCard30Writer();
diff --git a/src/versit/qversitcontactexporter_p.h b/src/versit/qversitcontactexporter_p.h
index 7d15e24ed4..1362803f2a 100644
--- a/src/versit/qversitcontactexporter_p.h
+++ b/src/versit/qversitcontactexporter_p.h
@@ -66,7 +66,7 @@ class QContact;
 class QContactDetail;
 class QVersitContactHandler;
 
-class Q_AUTOTEST_EXPORT QVersitContactExporterPrivate
+class QM_AUTOTEST_EXPORT QVersitContactExporterPrivate
 {
 public:
     QVersitContactExporterPrivate(const QString& profile = QString());
diff --git a/src/versit/qversitcontactimporter_p.h b/src/versit/qversitcontactimporter_p.h
index 742e6d19d4..936b9bfdb4 100644
--- a/src/versit/qversitcontactimporter_p.h
+++ b/src/versit/qversitcontactimporter_p.h
@@ -71,7 +71,7 @@ class QVersitProperty;
 class QVersitDocument;
 class QVersitContactHandler;
 
-class Q_AUTOTEST_EXPORT QVersitContactImporterPrivate
+class QM_AUTOTEST_EXPORT QVersitContactImporterPrivate
 {
 public:
     QVersitContactImporterPrivate(const QString& profile = QString());
diff --git a/src/versit/qversitdocumentwriter_p.h b/src/versit/qversitdocumentwriter_p.h
index 91a6e71a12..16cda37f49 100644
--- a/src/versit/qversitdocumentwriter_p.h
+++ b/src/versit/qversitdocumentwriter_p.h
@@ -65,7 +65,7 @@ QT_END_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
 
-class Q_AUTOTEST_EXPORT QVersitDocumentWriter
+class QM_AUTOTEST_EXPORT QVersitDocumentWriter
 {
 public:
     QVersitDocumentWriter();
diff --git a/src/versit/qversitorganizerexporter_p.h b/src/versit/qversitorganizerexporter_p.h
index 13af003d15..b792f0499f 100644
--- a/src/versit/qversitorganizerexporter_p.h
+++ b/src/versit/qversitorganizerexporter_p.h
@@ -49,7 +49,7 @@
 
 QTM_BEGIN_NAMESPACE
 
-class Q_AUTOTEST_EXPORT QVersitOrganizerExporterPrivate
+class QM_AUTOTEST_EXPORT QVersitOrganizerExporterPrivate
 {
 public:
     QVersitOrganizerExporterPrivate(const QString& profile = QString());
diff --git a/src/versit/qversitorganizerimporter_p.h b/src/versit/qversitorganizerimporter_p.h
index c4911dbb94..072d1d50c8 100644
--- a/src/versit/qversitorganizerimporter_p.h
+++ b/src/versit/qversitorganizerimporter_p.h
@@ -101,7 +101,7 @@ class Duration
         bool mValid;
 };
 
-class Q_AUTOTEST_EXPORT QVersitOrganizerImporterPrivate
+class QM_AUTOTEST_EXPORT QVersitOrganizerImporterPrivate
 {
 public:
     QVersitOrganizerImporterPrivate(const QString& profile = QString());
diff --git a/src/versit/qversitreader_p.h b/src/versit/qversitreader_p.h
index 972e3baabf..9433456562 100644
--- a/src/versit/qversitreader_p.h
+++ b/src/versit/qversitreader_p.h
@@ -88,7 +88,7 @@ static const int MAX_OLD_BYTES_TO_KEEP = 8192;
  * 
  * It stores a QByteArray internally, plus a marker of where it starts and where it ends.
  */
-class Q_AUTOTEST_EXPORT LByteArray
+class QM_AUTOTEST_EXPORT LByteArray
 {
 public:
     LByteArray() : mStart(0), mEnd(0) {}
@@ -151,7 +151,7 @@ private:
     friend class LineReader;
 };
 
-class Q_AUTOTEST_EXPORT LineReader
+class QM_AUTOTEST_EXPORT LineReader
 {
 public:
     LineReader(QIODevice* device, QTextCodec* codec, int chunkSize = 1000);
@@ -174,7 +174,7 @@ private:
     int mSearchFrom;
 };
 
-class Q_AUTOTEST_EXPORT QVersitReaderPrivate : public QThread
+class QM_AUTOTEST_EXPORT QVersitReaderPrivate : public QThread
 {
     Q_OBJECT
 
diff --git a/src/versit/qversitwriter_p.h b/src/versit/qversitwriter_p.h
index 1fd3d49a1f..6fd034234b 100644
--- a/src/versit/qversitwriter_p.h
+++ b/src/versit/qversitwriter_p.h
@@ -72,7 +72,7 @@ QTM_BEGIN_NAMESPACE
 
 class QVersitDocumentWriter;
 
-class Q_AUTOTEST_EXPORT QVersitWriterPrivate : public QThread
+class QM_AUTOTEST_EXPORT QVersitWriterPrivate : public QThread
 {
     Q_OBJECT
 
diff --git a/src/versit/versitutils_p.h b/src/versit/versitutils_p.h
index 0dfc8f7a18..3510580c54 100644
--- a/src/versit/versitutils_p.h
+++ b/src/versit/versitutils_p.h
@@ -67,7 +67,7 @@ QTM_BEGIN_NAMESPACE
 class QVersitDocument;
 class QVersitProperty;
 
-class Q_AUTOTEST_EXPORT VersitUtils
+class QM_AUTOTEST_EXPORT VersitUtils
 {
 public:
     static QByteArray encode(const QByteArray& ba, QTextCodec* codec);