diff -r 2b40d63a9c3d -r 90517678cc4f qtmobility/tests/auto/qmessageservice/tst_qmessageservice.cpp
--- a/qtmobility/tests/auto/qmessageservice/tst_qmessageservice.cpp	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/tests/auto/qmessageservice/tst_qmessageservice.cpp	Mon May 03 13:18:40 2010 +0300
@@ -289,7 +289,7 @@
         ("path", "Innbox")
         ("name", "Innbox")
         ("parentFolderPath", "")
-#ifndef Q_OS_SYMBIAN
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
         << Params()("parentAccountName", "Work")
         ("path", "Innbox/X-Announce")
         ("name", "X-Announce")
@@ -322,7 +322,7 @@
     QList<Support::Parameters> messageParams;
     messageParams << Params()("parentAccountName", "Alter Ego")
         ("parentFolderPath", "My messages")
-#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN)) // SMS messages must be in SMS store on Windows and on Symbian
+#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)) // SMS messages must be in SMS store on Windows and on Symbian
         ("type", "email")
 #else
         ("type", "sms")
@@ -365,7 +365,7 @@
         ("status-hasAttachments", "true")
         ("attachments", attachmentPaths)
         ("custom-spam", "filter:no")
-#ifndef Q_OS_SYMBIAN                             
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
         << Params()("parentAccountName", "Work")
         ("parentFolderPath", "Innbox/X-Announce")
         ("type", "email")
@@ -448,7 +448,7 @@
 
         SignalCatcher sc(this);
         connect(testService,SIGNAL(messagesFound(const QMessageIdList&)),&sc,SLOT(messagesFound(const QMessageIdList&)));
-#ifdef Q_OS_SYMBIAN
+#if (defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
         connect(testService,SIGNAL(stateChanged(QMessageService::State)),&sc,SLOT(stateChanged(QMessageService::State)));
 #endif        
 
@@ -457,7 +457,7 @@
         if (body.isEmpty()) {
             sc.reset();
             QCOMPARE(testService->queryMessages(filter&~existingAccountsFilter),true);
-#ifdef Q_OS_SYMBIAN            
+#if (defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
             QTRY_VERIFY(sc.state == QMessageService::FinishedState);
 #else            
             while(testService->state() == QMessageService::ActiveState)
@@ -468,7 +468,7 @@
             sc.reset();
 
             QCOMPARE(testService->queryMessages(~filter&~existingAccountsFilter),true);
-#ifdef Q_OS_SYMBIAN            
+#if (defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
             QTRY_VERIFY(sc.state == QMessageService::FinishedState);
 #else            
             while(testService->state() == QMessageService::ActiveState)
@@ -481,7 +481,7 @@
             sc.reset();
 
             QCOMPARE(testService->queryMessages(filter&~existingAccountsFilter,body),true);
-#ifdef Q_OS_SYMBIAN            
+#if (defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
             QTRY_VERIFY(sc.state == QMessageService::FinishedState);
 #else            
             while(testService->state() == QMessageService::ActiveState)
@@ -492,7 +492,7 @@
             sc.reset();
 
             QCOMPARE(testService->queryMessages(~filter&~existingAccountsFilter,body),true);
-#ifdef Q_OS_SYMBIAN            
+#if (defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
             QTRY_VERIFY(sc.state == QMessageService::FinishedState);
 #else            
             while(testService->state() == QMessageService::ActiveState)
@@ -512,11 +512,13 @@
     QTest::addColumn<QMessageIdList>("negatedIds");
     QTest::addColumn<QString>("body");
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("empty filter")
         << QMessageFilter() 
         << messageIds
         << QMessageIdList()
         << "";
+#endif
 
     QTest::newRow("id equality 1")
         << QMessageFilter::byId(messageIds[0], QMessageDataComparator::Equal) 
@@ -572,11 +574,13 @@
         << ( QMessageIdList() << messageIds[2] << messageIds[3] << messageIds[4] )
         << "";
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("id list inclusion empty")
         << QMessageFilter::byId(QMessageIdList(), QMessageDataComparator::Includes) 
         << QMessageIdList()
         << messageIds
         << "";
+#endif
 
     QTest::newRow("id list exclusion 1")
         << QMessageFilter::byId(QMessageIdList() << messageIds[0], QMessageDataComparator::Excludes) 
@@ -596,12 +600,15 @@
         << ( QMessageIdList() << messageIds[0] << messageIds[1] )
         << "";
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("id list exclusion empty")
         << QMessageFilter::byId(QMessageIdList(), QMessageDataComparator::Excludes) 
         << messageIds
         << QMessageIdList()
         << "";
+#endif
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("id filter inclusion empty")
         << QMessageFilter::byId(QMessageFilter(), QMessageDataComparator::Includes) 
         << messageIds
@@ -620,10 +627,11 @@
         << ( QMessageIdList() << messageIds[4] )
         << ( QMessageIdList() << messageIds[0] << messageIds[1] << messageIds[2] << messageIds[3] )
         << "";
+#endif
 
     QTest::newRow("type equality 1")
         << QMessageFilter::byType(QMessage::Sms, QMessageDataComparator::Equal) 
-#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN))
+#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
         << QMessageIdList()
         << messageIds
 #else
@@ -634,7 +642,7 @@
 
     QTest::newRow("type equality 2")
         << QMessageFilter::byType(QMessage::Email, QMessageDataComparator::Equal) 
-#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN))
+#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
         << messageIds
         << QMessageIdList()
 #else
@@ -651,7 +659,7 @@
 
     QTest::newRow("type inequality 1")
         << QMessageFilter::byType(QMessage::Sms, QMessageDataComparator::NotEqual) 
-#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN))
+#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
         << messageIds
         << QMessageIdList()
 #else
@@ -662,7 +670,7 @@
 
     QTest::newRow("type inequality 2")
         << QMessageFilter::byType(QMessage::Email, QMessageDataComparator::NotEqual) 
-#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN))
+#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
         << QMessageIdList()
         << messageIds
 #else
@@ -679,7 +687,7 @@
 
     QTest::newRow("type mask inclusion 1")
         << QMessageFilter::byType(QMessage::Sms, QMessageDataComparator::Includes) 
-#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN))
+#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
         << QMessageIdList()
         << messageIds
 #else
@@ -690,7 +698,7 @@
 
     QTest::newRow("type mask inclusion 2")
         << QMessageFilter::byType(QMessage::Email, QMessageDataComparator::Includes) 
-#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN))
+#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
         << messageIds
         << QMessageIdList()
 #else
@@ -713,7 +721,7 @@
 
     QTest::newRow("type mask exclusion 1")
         << QMessageFilter::byType(QMessage::Sms, QMessageDataComparator::Excludes) 
-#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN))
+#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
         << messageIds
         << QMessageIdList()
 #else
@@ -724,7 +732,7 @@
 
     QTest::newRow("type mask exclusion 2")
         << QMessageFilter::byType(QMessage::Email, QMessageDataComparator::Excludes) 
-#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN))
+#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
         << QMessageIdList()
         << messageIds
 #else
@@ -745,6 +753,7 @@
         << QMessageIdList()
         << "";
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("sender equality 1")
         << QMessageFilter::bySender("Esteemed.Colleague@example.com", QMessageDataComparator::Equal) 
         << ( QMessageIdList() << messageIds[1] )
@@ -756,6 +765,7 @@
         << ( QMessageIdList() << messageIds[3] )
         << ( QMessageIdList() << messageIds[0] << messageIds[1] << messageIds[2] << messageIds[4] )
         << "";
+#endif
 
     QTest::newRow("sender equality non-matching")
         << QMessageFilter::bySender("Nonesuch", QMessageDataComparator::Equal) 
@@ -775,6 +785,7 @@
         << messageIds
         << "";
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("sender inequality 1")
         << QMessageFilter::bySender("Esteemed.Colleague@example.com", QMessageDataComparator::NotEqual) 
         << ( QMessageIdList() << messageIds[0] << messageIds[2] << messageIds[3] << messageIds[4] )
@@ -864,6 +875,7 @@
         << QMessageIdList()
         << messageIds
         << "";
+#endif
 
     QTest::newRow("recipients inclusion 1")
         << QMessageFilter::byRecipients("example", QMessageDataComparator::Includes) 
@@ -1045,6 +1057,7 @@
         << messageIds
         << "";
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("timeStamp equality 1")
         << QMessageFilter::byTimeStamp(QDateTime::fromString("1999-04-01T10:30:00Z", Qt::ISODate), QMessageDataComparator::Equal) 
         << ( QMessageIdList() << messageIds[4] )
@@ -1220,7 +1233,9 @@
         << ( QMessageIdList() << messageIds[0] << messageIds[1] << messageIds[2] << messageIds[3] )
         << ( QMessageIdList() << messageIds[4] )
         << "";
+#endif
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("status equality 1")
         << QMessageFilter::byStatus(QMessage::Read, QMessageDataComparator::Equal) 
         << ( QMessageIdList() << messageIds[0] << messageIds[3] << messageIds[4] )
@@ -1232,6 +1247,7 @@
         << ( QMessageIdList() << messageIds[1] << messageIds[2] << messageIds[4] )
         << ( QMessageIdList() << messageIds[0] << messageIds[3] )
         << "";
+#endif
 
     QTest::newRow("status equality 3")
         << QMessageFilter::byStatus(QMessage::Removed, QMessageDataComparator::Equal) 
@@ -1239,6 +1255,7 @@
         << messageIds
         << "";
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("status inequality 1")
         << QMessageFilter::byStatus(QMessage::Read, QMessageDataComparator::NotEqual) 
         << ( QMessageIdList() << messageIds[1] << messageIds[2] )
@@ -1250,6 +1267,7 @@
         << ( QMessageIdList() << messageIds[0] << messageIds[3] )
         << ( QMessageIdList() << messageIds[1] << messageIds[2] << messageIds[4] )
         << "";
+#endif
 
     QTest::newRow("status inequality 3")
         << QMessageFilter::byStatus(QMessage::Removed, QMessageDataComparator::NotEqual) 
@@ -1257,6 +1275,7 @@
         << QMessageIdList()
         << "";
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("status mask inclusion 1")
         << QMessageFilter::byStatus(QMessage::Read, QMessageDataComparator::Includes) 
         << ( QMessageIdList() << messageIds[0] << messageIds[3] << messageIds[4] )
@@ -1268,6 +1287,7 @@
         << ( QMessageIdList() << messageIds[4] )
         << ( QMessageIdList() << messageIds[0] << messageIds[1] << messageIds[2] << messageIds[3] )
         << "";
+#endif
 
     QTest::newRow("status mask inclusion 3")
         << QMessageFilter::byStatus(QMessage::Read | QMessage::Removed, QMessageDataComparator::Includes) 
@@ -1281,6 +1301,7 @@
         << messageIds
         << "";
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("status mask exclusion 1")
         << QMessageFilter::byStatus(QMessage::Read, QMessageDataComparator::Excludes) 
         << ( QMessageIdList() << messageIds[1] << messageIds[2] )
@@ -1298,6 +1319,7 @@
         << ( QMessageIdList() << messageIds[1] << messageIds[2] )
         << ( QMessageIdList() << messageIds[0] << messageIds[3] << messageIds[4] )
         << "";
+#endif
 
     QTest::newRow("status mask exclusion empty")
         << QMessageFilter::byStatus(static_cast<QMessage::StatusFlags>(0), QMessageDataComparator::Excludes) 
@@ -1305,6 +1327,7 @@
         << messageIds
         << "";
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("priority equality 1")
         << QMessageFilter::byPriority(QMessage::HighPriority, QMessageDataComparator::Equal) 
         << ( QMessageIdList() << messageIds[1] << messageIds[2] )
@@ -1340,6 +1363,7 @@
         << ( QMessageIdList() << messageIds[1] << messageIds[2] << messageIds[4] )
         << ( QMessageIdList() << messageIds[0] << messageIds[3] )
         << "";
+#endif
 
     QTest::newRow("size equality 1")
         << QMessageFilter::bySize(messageSizes[3], QMessageDataComparator::Equal) 
@@ -1446,6 +1470,7 @@
 #endif
         << "";
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("parentAccountId equality 1")
         << QMessageFilter::byParentAccountId(accountIds[0], QMessageDataComparator::Equal) 
         << ( QMessageIdList() << messageIds[1] << messageIds[2] << messageIds[3] << messageIds[4] )
@@ -1457,6 +1482,7 @@
         << ( QMessageIdList() << messageIds[0] )
         << ( QMessageIdList() << messageIds[1] << messageIds[2] << messageIds[3] << messageIds[4] )
         << "";
+#endif
 
     QTest::newRow("parentAccountId equality invalid")
         << QMessageFilter::byParentAccountId(QMessageAccountId(), QMessageDataComparator::Equal) 
@@ -1464,6 +1490,7 @@
         << messageIds
         << "";
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("parentAccountId inequality 1")
         << QMessageFilter::byParentAccountId(accountIds[0], QMessageDataComparator::NotEqual) 
         << ( QMessageIdList() << messageIds[0] )
@@ -1475,6 +1502,7 @@
         << ( QMessageIdList() << messageIds[1] << messageIds[2] << messageIds[3] << messageIds[4] )
         << ( QMessageIdList() << messageIds[0] )
         << "";
+#endif
 
     QTest::newRow("parentAccountId inequality invalid")
         << QMessageFilter::byParentAccountId(QMessageAccountId(), QMessageDataComparator::NotEqual) 
@@ -1482,6 +1510,7 @@
         << QMessageIdList()
         << "";
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("parentAccountId filter inclusion 1")
         << QMessageFilter::byParentAccountId(QMessageAccountFilter::byName("Alter Ego", QMessageDataComparator::Equal), QMessageDataComparator::Includes) 
         << ( QMessageIdList() << messageIds[0] )
@@ -1541,7 +1570,9 @@
         << messageIds
         << QMessageIdList()
         << "";
+#endif
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("standardFolder equality 1")
         << QMessageFilter::byStandardFolder(QMessage::InboxFolder, QMessageDataComparator::Equal)
 #ifndef Q_OS_SYMBIAN    
@@ -1556,10 +1587,10 @@
 
     QTest::newRow("standardFolder equality 2")
         << QMessageFilter::byStandardFolder(QMessage::TrashFolder, QMessageDataComparator::Equal) 
-#ifndef Q_OS_SYMBIAN    
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
         << ( QMessageIdList() )
         << messageIds
-#else // Created folders are not mapped to any Standard Folder in Symbian 
+#else // Created folders are not mapped to any Standard Folder in Symbian & Maemo
         // <=> No messages will be returned, if messages are searched using Standard Folder Filter     
         << ( QMessageIdList() )
         << ( QMessageIdList() )
@@ -1568,10 +1599,10 @@
 
     QTest::newRow("standardFolder inequality 1")
         << QMessageFilter::byStandardFolder(QMessage::InboxFolder, QMessageDataComparator::NotEqual) 
-#ifndef Q_OS_SYMBIAN    
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
         << ( QMessageIdList() )
         << messageIds
-#else // Created folders are not mapped to any Standard Folder in Symbian 
+#else // Created folders are not mapped to any Standard Folder in Symbian & Maemo
         // <=> No messages will be returned, if messages are searched using Standard Folder Filter     
         << ( QMessageIdList() )
         << ( QMessageIdList() )
@@ -1580,15 +1611,16 @@
 
     QTest::newRow("standardFolder inequality 2")
         << QMessageFilter::byStandardFolder(QMessage::TrashFolder, QMessageDataComparator::NotEqual) 
-#ifndef Q_OS_SYMBIAN    
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
         << messageIds
         << ( QMessageIdList() )
-#else // Created folders are not mapped to any Standard Folder in Symbian 
+#else // Created folders are not mapped to any Standard Folder in Symbian & Maemo
         // <=> No messages will be returned, if messages are searched using Standard Folder Filter     
         << ( QMessageIdList() )
         << ( QMessageIdList() )
 #endif        
         << "";
+#endif
 
     QTest::newRow("parentFolderId equality 1")
         << QMessageFilter::byParentFolderId(folderIds[0], QMessageDataComparator::Equal) 
@@ -1626,6 +1658,7 @@
         << QMessageIdList()
         << "";
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("parentFolderId filter inclusion 1")
         << QMessageFilter::byParentFolderId(QMessageFolderFilter::byPath("My messages", QMessageDataComparator::Equal), QMessageDataComparator::Includes)
         << ( QMessageIdList() << messageIds[0] )
@@ -1695,8 +1728,9 @@
         << messageIds
         << QMessageIdList()
         << "";
+#endif
 
-#ifndef Q_OS_SYMBIAN
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("ancestorFolderIds inclusion 1")
         << QMessageFilter::byAncestorFolderIds(folderIds[1], QMessageDataComparator::Includes)
         << ( QMessageIdList() << messageIds[3] << messageIds[4] )
@@ -1794,6 +1828,7 @@
         << "";
 #endif    
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     // Test some basic combinations
     QTest::newRow("status mask inclusion AND timeStamp greater than")
         << ( QMessageFilter::byStatus(QMessage::Read, QMessageDataComparator::Includes) &
@@ -1838,6 +1873,7 @@
         << ( QMessageIdList() << messageIds[2] )
         << ( QMessageIdList() << messageIds[0] << messageIds[1] << messageIds[3] << messageIds[4] )
         << "";
+#endif
 
     QMessageFilter orEquals(QMessageFilter::bySubject("agenda", QMessageDataComparator::Includes));
     orEquals |= QMessageFilter::bySubject("ee", QMessageDataComparator::Excludes);
@@ -1846,7 +1882,7 @@
         << ( QMessageIdList() << messageIds[1] << messageIds[2] << messageIds[3] )
         << ( QMessageIdList() << messageIds[0] << messageIds[4] )
         << "";
-
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("body")
         << QMessageFilter()
         << ( QMessageIdList() << messageIds[0] << messageIds[2] )
@@ -1858,7 +1894,9 @@
         << ( QMessageIdList() << messageIds[2] )
         << ( QMessageIdList() << messageIds[0] ) // contains body but does not match filter
         << "summer";
+#endif
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     // Test options
     QMessageFilter caseInsensitive1(QMessageFilter::bySubject("free beer", QMessageDataComparator::Equal));
     QTest::newRow("options:caseInsensitive 1")
@@ -1866,6 +1904,7 @@
         << ( QMessageIdList() << messageIds[4] )
         << ( QMessageIdList() << messageIds[0] << messageIds[1] << messageIds[2] << messageIds[3] )
         << "";
+#endif
 
     QMessageFilter caseSensitive1(QMessageFilter::bySubject("free beer", QMessageDataComparator::Equal));
     caseSensitive1.setMatchFlags(QMessageDataComparator::MatchCaseSensitive);