diff -r 90517678cc4f -r 453da2cfceef qtmobility/plugins/contacts/wince/contactconversions.cpp
--- a/qtmobility/plugins/contacts/wince/contactconversions.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/wince/contactconversions.cpp	Fri May 14 16:41:33 2010 +0300
@@ -219,7 +219,7 @@
     return false;
 }
 
-static bool loadAvatarData(IItem* contact, QByteArray* data)
+static bool loadThumbnailData(IItem* contact, QByteArray* data)
 {
     HRESULT   hr;
     SimpleComPointer<IStream>  pStream = NULL;
@@ -259,7 +259,7 @@
     return true;
 }
 
-static bool saveAvatarData(IItem* contact, const QByteArray& data)
+static bool saveThumbnailData(IItem* contact, const QByteArray& data)
 {
     HRESULT   hr;
     SimpleComPointer<IStream>  pStream = NULL;
@@ -289,33 +289,36 @@
 
 
 
-static void processAvatar(const QContactWinCEEngine* /*engine*/, IItem* contact, const QVariantList& values, QContact& ret)
+static void processAvatar(const QContactWinCEEngine* engine, IItem* contact, const QVariantList& values, QContact& ret)
 {
+    Q_UNUSED(engine);
+    Q_UNUSED(contact);
+
     QContactAvatar avatar;
+    QString imageUrl = values[0].toString();
+    QString videoUrl = values[1].toString();
+    setIfNotEmpty(avatar, QContactAvatar::FieldImageUrl, values[0].toString());
+    setIfNotEmpty(avatar, QContactAvatar::FieldVideoUrl, values[1].toString());
 
+    if (!avatar.isEmpty())
+        ret.saveDetail(&avatar);
+}
+
+static void processThumbnail(IItem* contact, QContact& ret)
+{
+    QContactThumbnail thumbnail;
+    
     QByteArray data;
-    if (loadAvatarData(contact, &data)) {
+    if (loadThumbnailData(contact, &data)) {
         if (!data.isEmpty()) {
-            QPixmap pixmap;
-            pixmap.loadFromData(data, "PNG");
-            //avatar.setPixmap(pixmap);
+            QImage image;
+            image.loadFromData(data, "PNG");
+            thumbnail.setThumbnail(image);
         }
     }
 
-    if (values[0].toString().isEmpty()) {
-        if (!data.isEmpty()) {
-            QUrl url(QUrl::fromEncoded(data.toPercentEncoding()));
-            url.setScheme("data");
-            avatar.setImageUrl(url.toString());
-        }
-    } else {
-        avatar.setImageUrl(values[0].toString());
-    }
-
-    
-        
-    if (!avatar.isEmpty())
-        ret.saveDetail(&avatar);
+    if (!thumbnail.isEmpty())
+        ret.saveDetail(&thumbnail);
 }
 
 static void processAddress(const QContactWinCEEngine*, const QString& context, const QVariantList& values, QContact& ret)
@@ -520,7 +523,7 @@
         ret.saveDetail(&family);
 }
 
-static void contactP2QTransforms(CEPROPID phoneMeta, CEPROPID emailMeta, CEPROPID avatarMeta, CEPROPID avatarTypeMeta, QHash<CEPROPID, PoomContactElement>& prophash, QVector<CEPROPID>& propids)
+static void contactP2QTransforms(CEPROPID phoneMeta, CEPROPID emailMeta, CEPROPID avatarImageMeta, CEPROPID avatarVideoMeta, QHash<CEPROPID, PoomContactElement>& prophash, QVector<CEPROPID>& propids)
 {
     static QHash<CEPROPID, PoomContactElement> hash;
     static QVector<CEPROPID> ids;
@@ -607,11 +610,10 @@
 
         // Avatar
         PoomContactElement avatar;
-        avatar.poom << avatarMeta << avatarTypeMeta; //PIMPR_PICTURE need to be handled inside the processAvatar() function separately.
+        avatar.poom << avatarImageMeta << avatarVideoMeta;
         avatar.func = processAvatar;
         list.append(avatar);
 
-
         // XXX Unhandled:
         //
         //  PIMPR_ACCOUNT_NAME
@@ -665,23 +667,33 @@
 
 static bool processQAvatar(const QContactWinCEEngine* engine, IItem* contact, const QContactDetail& detail, QVector<CEPROPVAL>& props)
 {
-    Q_UNUSED(engine);
     Q_UNUSED(contact);
-    Q_UNUSED(detail);
-    Q_UNUSED(props);
-    //QString avatarData = detail.value(QContactAvatar::FieldImageUrl);
-    //QPixmap avatarPixmap = detail.value<QPixmap>(QContactAvatar::FieldAvatarPixmap);
+    
+    QContactAvatar avatar(detail);
+    QUrl imageUrl = avatar.imageUrl();
+    QUrl videoUrl = avatar.videoUrl();
+    
+    addIfNotEmpty(engine->metaAvatarImage(), detail.value(QContactAvatar::FieldImageUrl), props);
+    addIfNotEmpty(engine->metaAvatarVideo(), detail.value(QContactAvatar::FieldVideoUrl), props);
+
+    return true;
+}
 
-    //FIXME:wince avatar should be processed as thumbnail
-    //addIfNotEmpty(engine->metaAvatar(), avatarData, props);
+static bool processQThumbnail(const QContactWinCEEngine* engine, IItem* contact, const QContactDetail& detail, QVector<CEPROPVAL>& props)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(props);
+    
+    QContactThumbnail thumbnail(detail);
+    QImage thumbnailImage = thumbnail.thumbnail();
 
-    //if (!avatarPixmap.isNull()) {
-    //    QByteArray data;
-    //    QBuffer buffer(&data);
-    //    buffer.open(QIODevice::WriteOnly);
-    //    if (!avatarPixmap.save(&buffer, "PNG") || !saveAvatarData(contact, data))
-    //        return false;
-    //}
+    if (!thumbnailImage.isNull()) {
+        QByteArray data;
+        QBuffer buffer(&data);
+        buffer.open(QIODevice::WriteOnly);
+        if (!thumbnailImage.save(&buffer, "PNG") || !saveThumbnailData(contact, data))
+            return false;
+    }
     return true;
 }
 
@@ -953,6 +965,7 @@
         hash.insert(QContactUrl::DefinitionName, processQWebpage);
         hash.insert(QContactFamily::DefinitionName, processQFamily);
         hash.insert(QContactAvatar::DefinitionName, processQAvatar);
+        hash.insert(QContactThumbnail::DefinitionName, processQThumbnail);
     }
     ret = hash;
 }
@@ -976,7 +989,7 @@
     QVector<CEPROPID> props;
 
     // Get our mapping tables
-    contactP2QTransforms(d->m_phonemeta, d->m_emailmeta, d->m_avatartypemeta, d->m_avatarmeta, hash, props);
+    contactP2QTransforms(d->m_phonemeta, d->m_emailmeta, d->m_avatarImageMeta, d->m_avatarVideoMeta, hash, props);
 
     CEPROPVAL *propvals = 0;
     HRESULT hr = contact->GetProps(props.constData(), CEDB_ALLOWREALLOC, props.count(), &propvals, &cbSize, GetProcessHeap());
@@ -1015,6 +1028,9 @@
         HeapFree(GetProcessHeap(), 0, propvals);
     }
 
+    // convert thumbnail by special way.
+    processThumbnail(contact, ret);
+
     // Synthesize the display label.
     QContactManager::Error error;
     QString synth = synthesizedDisplayLabel(ret, &error);
@@ -1412,32 +1428,6 @@
             break;
 
         case QContactFilter::ActionFilter:
-            {
-                // Find any matching actions, and do a union filter on their filter objects
-                QContactActionFilter af(filter);
-                QList<QContactActionDescriptor> descriptors = QContactAction::actionDescriptors(af.actionName(), af.vendorName(), af.implementationVersion());
-                
-                QString str;
-                QStringList strList;
-                for (int j = 0; j < descriptors.count(); j++) {
-                    QContactAction* action = QContactAction::action(descriptors.at(j));
-
-                    QContactFilter d = action->contactFilter(af.value());
-                    delete action; // clean up.
-                    if (!QContactManagerEngine::validateActionFilter(d))
-                        return QString();
-                    
-                    str = convertFilterToQueryString(d);
-                    if (str.isEmpty())
-                        return QString();
-                    strList << str;
-                }
-
-                if (!strList.isEmpty()) {
-                    ret =QString("(%1)").arg(strList.join(" OR "));
-                }
-                // Fall through to end
-            }
             break;
 
         case QContactFilter::IntersectionFilter:
@@ -1603,8 +1593,24 @@
             qDebug() << "Can't filter contacts with query string:" << query << ", HRESULT=" << HRESULT_CODE(hr);
         }
     }
+
     //Fail back to generic filtering
-    return QContactManagerEngine::contactIds(filter, sortOrders, error);
+    QList<QContactLocalId> ids = contactIds(QContactFilter(), QList<QContactSortOrder>(), error);
+    QList<QContact> sorted;
+    foreach(const QContactLocalId& id, ids) {
+        QContact c = contact(id, QContactFetchHint(), error);
+        if (*error != QContactManager::NoError)
+            break;
+        if (QContactManagerEngine::testFilter(filter, c))
+            QContactManagerEngine::addSorted(&sorted, c, sortOrders);
+    }
+
+    /* Extract the ids */
+    ids.clear();
+    foreach(const QContact& c, sorted)
+        ids.append(c.localId());
+
+    return ids;
 }