FCL/sf/mw/qtextensions: changeset 5:453da2cfceef

--- a/.hgtags	Mon May 03 13:18:40 2010 +0300
+++ b/.hgtags	Fri May 14 16:41:33 2010 +0300
@@ -30,3 +30,4 @@
 b7af6dc67fe0e5c4811d3d0ec3367675a9549146 rel-1014-1
 e2211009c3b2ac59feba403cb2a44333f2a03b38 rel-1014-2
 c555635e12cbde91384eae046da7b13a8009e20d rel-1014-3
+111b06c4b3c73e0c11d59d060dcb81be4b4857aa rel-1016

--- a/VERSION.SHA1	Mon May 03 13:18:40 2010 +0300
+++ b/VERSION.SHA1	Fri May 14 16:41:33 2010 +0300
@@ -1,1 +1,1 @@
-b3298803d5feffa69a4ed08b17c98e4350b6bf8e
+e5e2775c6cda698f5d10741ed16f00de19248412

--- a/qtecomplugins/examples/testapp/inc/qtracker.h	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published by
-* the Free Software Foundation, version 2.1 of the License.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License
-* along with this program.  If not, 
-* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
-*
-* Description:  
-*
-*/
-
-#ifndef QTRACKER_H_
-#define QTRACKER_H_
-
-class QString;
-class QTracker
-{
-public:
-    static void log( const QString& );
-};
-
-#endif /*QTRACKER_H_*/

--- a/qtecomplugins/examples/testapp/src/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/examples/testapp/src/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -29,27 +29,36 @@
 #include <xqpluginloader.h>
 #include <xqplugininfo.h>
 
-#include "qtracker.h"
+#include <stdio.h>
 
 #include <testplugininterface.h>
 
+void log(const QString& aString)
+{
+    FILE* poFile = fopen( "c:/trace.log", "a" );
+    if( !poFile )
+        return;
+    fprintf( poFile, "%s\n", aString.toAscii().constData() );
+    fclose( poFile );
+}
+
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
-    QTracker::log("--- Start ---");
+    log("--- Start ---");
     QList<XQPluginInfo> impls;
     
     XQPluginLoader::listImplementations("org.nokia.mmdt.TestPlugin/1.0", impls);
 
-    QTracker::log("list plugins:");
+    log("list plugins:");
     
     for (int i=0; i<impls.size(); i++) {
-        QTracker::log("plugin found...");
+        log("plugin found...");
         QString fmtStr("%1: %2");
-        QTracker::log(fmtStr.arg("dll: ").arg(impls[i].dllName()));
-        QTracker::log(fmtStr.arg("opaque data: ").arg(impls[i].opaqueData()));
-        QTracker::log(fmtStr.arg("uid: ").arg(impls[i].uid()));
-        QTracker::log("---");
+        log(fmtStr.arg("dll: ").arg(impls[i].dllName()));
+        log(fmtStr.arg("opaque data: ").arg(impls[i].opaqueData()));
+        log(fmtStr.arg("uid: ").arg(impls[i].uid()));
+        log("---");
     }
 
     XQPluginLoader pluginLoader;
@@ -58,16 +67,16 @@
     QObject *plugin = pluginLoader.instance();
 
     QString pluginFmt("Plugin instance: %1");
-    QTracker::log(pluginFmt.arg(reinterpret_cast<int>(plugin)));
+    log(pluginFmt.arg(reinterpret_cast<int>(plugin)));
 
     TestPluginInterface *pluginCast = qobject_cast<TestPluginInterface*>(plugin);
-    QTracker::log(pluginFmt.arg(reinterpret_cast<int>(pluginCast)));
+    log(pluginFmt.arg(reinterpret_cast<int>(pluginCast)));
 
 
     if (pluginCast!=0)
-    	QTracker::log(pluginFmt.arg(pluginCast->test()));
+    	log(pluginFmt.arg(pluginCast->test()));
     
-    QTracker::log("--- Stop ---");
+    log("--- Stop ---");
 //    return app.exec();
 }

--- a/qtecomplugins/examples/testapp/src/qtracker.cpp	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published by
-* the Free Software Foundation, version 2.1 of the License.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License
-* along with this program.  If not, 
-* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
-*
-* Description:
-*
-*/
-
-#include "QTracker.h"
-#include <QString>
-#include <stdio.h>
-
-void QTracker::log( const QString& aString )
-{
-    FILE* poFile = fopen( "c:/trace.log", "a" );
-    if( !poFile )
-        return;
-    fprintf( poFile, "%s\n", aString.toAscii().constData() );
-    fclose( poFile );
-}

--- a/qtecomplugins/examples/testapp/testapp.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/examples/testapp/testapp.pro	Fri May 14 16:41:33 2010 +0300
@@ -39,11 +39,9 @@
 LIBS += -lxqplugins
 
 SOURCES += \
-           src/main.cpp \
-           src/qtracker.cpp
+           src/main.cpp
           
-HEADERS += \
-		   inc\qtracker.h
+HEADERS +=

--- a/qtecomplugins/supplements/qmake/4.5/symmake.cpp	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1674 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the $MODULE$ 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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** 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.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "symmake.h"
-#include "initprojectdeploy_symbian.h"
-
-#include <qstring.h>
-#include <qhash.h>
-#include <qstringlist.h>
-#include <qdir.h>
-#include <qdatetime.h>
-#include <stdlib.h>
-#include <qdebug.h>
-
-#define RESOURCE_DIRECTORY_MMP "/resource/apps"
-#define RESOURCE_DIRECTORY_RESOURCE "\\\\resource\\\\apps\\\\"
-#define REGISTRATION_RESOURCE_DIRECTORY_HW "/private/10003a3f/import/apps"
-#define PLUGIN_COMMON_DEF_FILE_FOR_MMP "./plugin_common.def"
-#define PLUGIN_COMMON_DEF_FILE_ACTUAL "plugin_commonU.def"
-#define BLD_INF_FILENAME_LEN (sizeof(BLD_INF_FILENAME) - 1)
-
-#define BLD_INF_RULES_BASE "BLD_INF_RULES."
-#define BLD_INF_TAG_PLATFORMS "prj_platforms"
-#define BLD_INF_TAG_MMPFILES "prj_mmpfiles"
-#define BLD_INF_TAG_TESTMMPFILES "prj_testmmpfiles"
-#define BLD_INF_TAG_EXTENSIONS "prj_extensions"
-#define RSS_RULES "RSS_RULES"
-#define RSS_RULES_BASE "RSS_RULES."
-#define RSS_TAG_NBROFICONS "number_of_icons"
-#define RSS_TAG_ICONFILE "icon_file"
-
-#define DUMP_VAR(v) \
-{ \
-    QString s(v); \
-    QStringList list = project->values(s); \
-    printf("----------------------------------\n", qPrintable(s)); \
-    printf("Dumping %s (%d items) from %s, %d\n", \
-            qPrintable(s), \
-            list.count(), \
-            __FILE__, \
-            __LINE__); \
-    foreach(QString l, list) \
-        printf("\t%s\n", qPrintable(l)); \
-}
-
-QString SymbianMakefileGenerator::fixPathForMmp(const QString& origPath, const QDir& parentDir)
-{
-    static QString epocRootStr;
-    if (epocRootStr.isEmpty()) {
-        QFileInfo efi(epocRoot());
-        epocRootStr = efi.canonicalFilePath();
-        if (epocRootStr.isEmpty()) {
-            fprintf(stderr, "Unable to resolve epocRoot '%s' to real dir on current drive, defaulting to '/' for mmp paths\n", qPrintable(epocRoot()));
-            epocRootStr = "/";
-        }
-        if (!epocRootStr.endsWith("/"))
-            epocRootStr += "/";
-
-        epocRootStr += "epoc32/";
-    }
-
-    QString resultPath = origPath;
-
-    // Make it relative, unless it starts with "%epocroot%/epoc32/"
-    if (resultPath.startsWith(epocRootStr, Qt::CaseInsensitive)) {
-        resultPath.replace(epocRootStr, "/epoc32/", Qt::CaseInsensitive);
-    } else {
-        resultPath = parentDir.relativeFilePath(resultPath);
-    }
-    resultPath = QDir::cleanPath(resultPath);
-
-    if (resultPath.isEmpty())
-        resultPath = ".";
-
-    return resultPath;
-}
-
-QString SymbianMakefileGenerator::canonizePath(const QString& origPath)
-{
-    // Since current path gets appended almost always anyway, use it as default
-    // for nonexisting paths.
-    static QString defaultPath;
-    if (defaultPath.isEmpty()) {
-        QFileInfo fi(".");
-        defaultPath = fi.canonicalFilePath();
-    }
-
-    // Prepend epocroot to any paths beginning with "/epoc32/"
-    QString resultPath = QDir::fromNativeSeparators(origPath);
-    QString tempPath(resultPath);
-    bool isEpoc = false;
-    if (resultPath.startsWith("/epoc32/", Qt::CaseInsensitive)) {
-        isEpoc = true;
-        resultPath = QDir::fromNativeSeparators(epocRoot()) + resultPath.mid(1);
-    }
-
-    QFileInfo fi(fileInfo(resultPath));
-    if(fi.isDir()) {
-        if (isEpoc)
-            resultPath = fi.absoluteFilePath();//canonicalFilePath();
-        else
-            resultPath = fi.canonicalFilePath();            
-    } else {
-        if (isEpoc)
-            resultPath = fi.absolutePath();//canonicalPath();
-        else
-            resultPath = fi.canonicalPath();
-    }
-    //some fix for the not existed EPOC32\include folder
-    if (isEpoc) {
-        int index = resultPath.lastIndexOf("/epoc32/"); 
-        QString tmpRes = resultPath.mid(index);
-        if (tmpRes != tempPath) {
-            //we have the problems for not existed include directory
-            //change the path
-            resultPath.replace(tmpRes, tempPath);
-            }
-    }
-
-    resultPath = QDir::cleanPath(resultPath);
-
-    if (resultPath.isEmpty())
-        resultPath = defaultPath;
-
-    return resultPath;
-}
-
-SymbianMakefileGenerator::SymbianMakefileGenerator() : MakefileGenerator() { }
-SymbianMakefileGenerator::~SymbianMakefileGenerator() { }
-
-void SymbianMakefileGenerator::writeHeader(QTextStream &t) {
-    t << "// ============================================================================" << endl;
-    t << "// * Makefile for building: " << escapeFilePath(var("TARGET")) << endl;
-    t << "// * Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
-    t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
-    t << "// * This file is generated by qmake and should not be modified by the" << endl;
-    t << "// * user." << endl;
-    t << "// * Project:  " << fileFixify(project->projectFile()) << endl;
-    t << "// * Template: " << var("TEMPLATE") << endl;
-    //if(!project->isActiveConfig("build_pass"))
-    //    t << "// = Command: " << build_args().replace("$(QMAKE)",
-    //                  (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : var("QMAKE_QMAKE"))) << endl;
-    t << "// ============================================================================" << endl;
-    t << endl;
-
-    // defining define for bld.inf
-
-    QString shortProFilename = project->projectFile();
-    shortProFilename.replace(0, shortProFilename.lastIndexOf("/") + 1, QString(""));
-    shortProFilename.replace(QString(".pro"), QString(""));
-
-    QString bldinfDefine = shortProFilename;
-    bldinfDefine.append("_");
-    bldinfDefine.append(generate_uid(project->projectFile()));
-
-    bldinfDefine.prepend("BLD_INF_");
-    removeSpecialCharacters(bldinfDefine);
-
-    t << "#define " << bldinfDefine.toUpper() << endl << endl;
-}
-
-bool SymbianMakefileGenerator::writeMakefile(QTextStream &t) {
-    writeHeader(t);
-
-    QString numberOfIcons;
-    QString iconFile;
-    QStringList userRssRules;
-    readRssRules(numberOfIcons, iconFile, userRssRules);
-
-    // Get the application translations and convert to symbian OS lang code, i.e. decical number
-    QStringList symbianLangCodes = symbianLangCodesFromTsFiles();
-
-    // Generate pkg files if there are any actual files to deploy
-    bool generatePkg = false;
-    if (getTargetExtension() == "exe") {
-        generatePkg = true;
-    } else {
-        foreach(QString item, project->values("DEPLOYMENT")) {
-            if (!project->values(item + ".sources").isEmpty()) {
-                generatePkg = true;
-                break;
-            }
-        }
-    }
-
-    if (generatePkg) {
-        QStringList platformList = project->values("SYMBIAN_PLATFORMS");
-        foreach(QString platform, platformList) {
-            if(platform.compare("WINSCW", Qt::CaseInsensitive)) {
-                generatePkgFile(platform.toLower(), "udeb", iconFile);
-                generatePkgFile(platform.toLower(), "urel", iconFile);
-            }
-        }
-    }
-
-    writeBldInfContent(t, generatePkg);
-
-    // Generate empty wrapper makefile here, because wrapper makefile must exist before writeMkFile,
-    // but all required data is not yet available.
-    bool isPrimaryMakefile = true;
-    QString wrapperFileName("Makefile");
-    QString outputFileName = fileInfo(Option::output.fileName()).fileName();
-    if (outputFileName != BLD_INF_FILENAME) {
-        wrapperFileName.append(".").append((outputFileName.size() > BLD_INF_FILENAME_LEN && outputFileName.left(BLD_INF_FILENAME_LEN) == BLD_INF_FILENAME) ? outputFileName.mid(8) : outputFileName);
-        isPrimaryMakefile = false;
-    }
-
-    QFile wrapperMakefile(wrapperFileName);
-    if(wrapperMakefile.open(QIODevice::WriteOnly)) {
-        generatedFiles << wrapperFileName;
-    } else {
-        fprintf(stderr, "Error: Could not open wrapper makefile '%s'\n", qPrintable(wrapperFileName));
-        return false;
-    }
-
-    if (getTargetExtension() == "subdirs") {
-            // If we have something to deploy, generate extension makefile for just that, since
-            // normal extension makefile is not getting generated and we need emulator deployment to be done.
-            if (generatePkg)
-                writeMkFile(wrapperFileName, true);
-            writeWrapperMakefile(wrapperMakefile, isPrimaryMakefile);
-            return true;
-        }
-
-    writeMkFile(wrapperFileName, false);
-
-    QString shortProFilename = project->projectFile();
-    shortProFilename.replace(0, shortProFilename.lastIndexOf("/") + 1, QString(""));
-    shortProFilename.replace(QString(".pro"), QString(""));
-
-    QString mmpFilename = shortProFilename;
-    mmpFilename.append("_");
-    mmpFilename.append(uid3);
-    mmpFilename.append(".mmp");
-    writeMmpFile(mmpFilename, symbianLangCodes);
-
-    if (getTargetExtension() == "exe") {
-        if (!project->values("CONFIG").contains("no_icon", Qt::CaseInsensitive)) {
-            QString appname = escapeFilePath(fileFixify(project->first("TARGET")));
-            appname = removePathSeparators(appname);
-            writeRegRssFile(appname, userRssRules);
-            writeRssFile(appname, numberOfIcons, iconFile);
-            writeLocFile(appname, symbianLangCodes);
-        }
-    }
-
-    writeCustomDefFile();
-    writeWrapperMakefile(wrapperMakefile, isPrimaryMakefile);
-
-    return true;
-}
-
-bool SymbianMakefileGenerator::generatePkgFile(const QString &compiler, const QString &config, const QString &iconFile) {
-    QString pkgFilename = QString("%1_%2_%3.%4")
-                          .arg(fileInfo(project->projectFile()).completeBaseName())
-                          .arg(compiler)
-                          .arg(config)
-                          .arg("pkg");
-    QFile pkgFile(pkgFilename);
-    if (!pkgFile.open(QIODevice::WriteOnly | QIODevice::Text))
-        return false;
-
-    generatedFiles << pkgFile.fileName();
-
-    //   header info
-    QTextStream t(&pkgFile);
-    t << QString("; %1 generated by qmake at %2").arg(pkgFilename).arg(QDateTime::currentDateTime().toString(Qt::ISODate))  << endl;
-    t << "; This file is generated by qmake and should not be modified by the user" << endl;
-    t << ";" << endl << endl;
-
-    // language, (*** hardcoded to english atm)
-    t << "; Language" << endl;
-    t << "&EN" << endl << endl;
-
-    // name of application, UID and version
-    QString applicationName = project->first("TARGET");
-    int last = applicationName.lastIndexOf(QLatin1Char('/'));
-    applicationName = applicationName.mid( last == -1 ? 0 : last+1 );
-
-    QString applicationVersion = project->first("VERSION").isEmpty() ? "1,0,0" : project->first("VERSION").replace('.', ',');
-
-    t << "; SIS header: name, uid, version" << endl;
-    t << QString("#{\"%1\"},(%2),%3").arg(applicationName).arg(uid3).arg(applicationVersion) << endl << endl;
-
-    // vendor names (*** hardcoded for now)
-    t << "; Localised Vendor name" << endl;
-    t << "%{\"Nokia, Qt Software\"}" << endl << endl;
-    t << "; Unique Vendor name" << endl;
-    t << ":\"Nokia, Qt Software\"" << endl << endl;
-
-    // Dependencies
-    t << "; Dependencies" << endl;
-    foreach(QString item, project->values("DEPLOYMENT")) {
-        QStringList dependencies = project->values(item + ".depends");
-        foreach(QString dependency, dependencies) {
-            t << dependency << endl;
-        }
-    }
-    t << endl;
-
-    // install paths on the phone *** should be dynamic at some point
-    QString installPathBin = "!:\\sys\\bin";
-    QString installPathResource = "!:\\resource\\apps";
-    QString installPathRegResource = "!:\\private\\10003a3f\\import\\apps";
-
-    // find location of builds
-    QString epocReleasePath = QString("%1epoc32/release/%2/%3")
-                              .arg(epocRoot())
-                              .arg(compiler)
-                              .arg(config);
-
-
-    if (getTargetExtension() == "exe") {
-        // deploy .exe file
-        t << "; Executable and default resource files" << endl;
-        QString exeFile = applicationName + ".exe";
-        t << QString("\"%1/%2\"    - \"%3\\%4\"")
-             .arg(epocReleasePath)
-             .arg(exeFile)
-             .arg(installPathBin)
-             .arg(exeFile) << endl;
-
-        // deploy rsc & reg_rsc file
-        if (!project->values("CONFIG").contains("no_icon", Qt::CaseInsensitive)) {
-            t << QString("\"%1epoc32/data/z/resource/apps/%2\"    - \"%3\\%4\"")
-                 .arg(epocRoot())
-                 .arg(applicationName + ".rsc")
-                 .arg(installPathResource)
-                 .arg(applicationName + ".rsc") << endl;
-
-            t << QString("\"%1epoc32/data/z/private/10003a3f/import/apps/%2\"    - \"%3\\%4\"")
-                 .arg(epocRoot())
-                 .arg(applicationName + "_reg.rsc")
-                 .arg(installPathRegResource)
-                 .arg(applicationName + "_reg.rsc") << endl;
-
-            QString myIconFile = iconFile;
-            myIconFile = myIconFile.replace("\\\\", "\\");
-
-            if (!iconFile.isEmpty())  {
-                t << QString("\"%1epoc32/data/z%2\"    - \"!:%3\"")
-                         .arg(epocRoot())
-                         .arg(QString(myIconFile).replace('\\','/'))
-                         .arg(myIconFile) << endl << endl;
-            }
-        }
-    }
-
-    // deploy any additional DEPLOYMENT  files
-    DeploymentList depList;
-    QString remoteTestPath;
-    remoteTestPath = QString("!:\\private\\%1").arg(privateDirUid);
-
-    initProjectDeploySymbian( project, depList, remoteTestPath, true, compiler, config, generatedDirs, generatedFiles );
-    if (depList.size())
-        t << "; DEPLOYMENT" << endl;
-    for (int i=0; i<depList.size(); ++i)  {
-        t << QString("\"%1\"    - \"%2\"")
-             .arg(QString(depList.at(i).from).replace('\\','/'))
-             .arg(depList.at(i).to) << endl;
-    }
-
-    return true;
-}
-
-bool SymbianMakefileGenerator::writeCustomDefFile() {
-    if(targetType.compare("plugin", Qt::CaseInsensitive) == 0 && !project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive)) {
-        // Create custom def file for plugin
-        QFile ft(QLatin1String(PLUGIN_COMMON_DEF_FILE_ACTUAL));
-
-        if(ft.open(QIODevice::WriteOnly)) {
-            generatedFiles << ft.fileName();
-            QTextStream t(&ft);
-
-            t << "; ==============================================================================" << endl;
-            t << "; Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
-            t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
-            t << "; This file is generated by qmake and should not be modified by the" << endl;
-            t << "; user." << endl;
-            t << ";  Name        : " PLUGIN_COMMON_DEF_FILE_ACTUAL << endl;
-            t << ";  Part of     : " << project->values("TARGET").join(" ") << endl;
-            t << ";  Description : Fixes common plugin symbols to known ordinals" << endl;
-            t << ";  Version     : " << endl;
-            t << ";" << endl;
-            t << "; ==============================================================================" << "\n" << endl;
-
-            t << endl;
-
-            t << "EXPORTS" << endl;
-            t << "\tqt_plugin_query_verification_data @ 1 NONAME" << endl;
-            t << "\tqt_plugin_instance @ 2 NONAME" << endl;
-            t << endl;
-        } else {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-void SymbianMakefileGenerator::init()
-{
-    MakefileGenerator::init();
-/*
-    DUMP_VAR("GENERATED_SOURCES");
-*/
-    // fixing again !!!
-    if(0 != project->values("QMAKE_PLATFORM").size())
-        platform = varGlue("QMAKE_PLATFORM", "", " ", "");
-
-    if(0 == project->values("QMAKESPEC").size())
-        project->values("QMAKESPEC").append(qgetenv("QMAKESPEC"));
-
-    if(!isConfigSetToSymbian())
-        project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS"));
-
-
-    // bld.inf
-    project->values("MAKEFILE") += BLD_INF_FILENAME;
-
-    // .mmp
-    initMmpVariables();
-
-    // UID1
-    uid1 = generateUID1();
-
-    // check TARGET.UID2 and TARGET.UID3 presence
-    if(0 != project->values("TARGET.UID3").size()) {
-        uid3 = project->first("TARGET.UID3");
-    } else {
-        uid3 = generateUID3();
-    }
-
-    // some fix
-    if((project->values("TEMPLATE")).contains("app"))
-        targetType = "exe";
-    else if((project->values("TEMPLATE")).contains("lib")) {
-        // check CONFIG to see if we are to build staticlib or dll
-        if(project->values("CONFIG").contains("staticlib") || project->values("CONFIG").contains("static"))
-            targetType = "staticlib";
-        else if (project->values("CONFIG").contains("plugin"))
-            targetType = "plugin";
-        else // for now it will be default
-            targetType = "dll";
-    }
-    else // fix
-        targetType = "subdirs";
-
-    if(0 != project->values("TARGET.UID2").size()) {
-        uid2 = project->first("TARGET.UID2");
-    } else if (project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive)) {
-        uid2 = "0x20004C45";
-    } else {
-        if(getTargetExtension() == "exe") {
-            if(project->values("QT").contains("gui", Qt::CaseInsensitive)) {
-                // exe and also gui
-                uid2 = "0x100039CE";
-            } else {
-                // exe but not gui.. uid2 is ignored anyway
-                // set it to 0
-                uid2 = "0";
-            }
-        } else if(getTargetExtension() == "dll" || getTargetExtension() == "lib") {
-            uid2 = "0x1000008d";
-        }
-    }
-
-    uid2 = uid2.trimmed();
-    uid3 = uid3.trimmed();
-
-    // UID is valid as either hex or decimal, so just convert it to number and back to hex
-    // to get proper string for private dir
-    bool conversionOk = false;
-    uint uidNum = uid3.toUInt(&conversionOk, 0);
-
-    if (!conversionOk) {
-        fprintf(stderr, "Error: Invalid UID \"%s\".", uid3.toUtf8().constData());
-    } else {
-        privateDirUid.setNum(uidNum, 16);
-        while (privateDirUid.length() < 8)
-            privateDirUid.insert(0,QLatin1Char('0'));
-    }
-}
-
-QString SymbianMakefileGenerator::getTargetExtension() {
-    QString ret;
-    if(targetType.compare("exe", Qt::CaseInsensitive) == 0 || targetType.compare("app", Qt::CaseInsensitive) == 0) {
-        ret.append("exe");
-    } else if (targetType.compare("staticlib",Qt::CaseInsensitive) == 0) {
-        ret.append("lib");
-    } else if (targetType.compare("dll", Qt::CaseInsensitive) == 0 || targetType.compare("plugin", Qt::CaseInsensitive) == 0) {
-        ret.append("dll");
-    } else if (targetType.compare("subdirs", Qt::CaseInsensitive) == 0) {
-        // just fix
-        ret.append("subdirs");
-    } else {
-        // if nothing said then assume "exe"
-        ret.append("exe");
-    }
-
-    return ret;
-}
-
-bool SymbianMakefileGenerator::isConfigSetToSymbian() {
-    return project->values("CONFIG").contains("symbian", Qt::CaseInsensitive);
-}
-
-QString SymbianMakefileGenerator::generateUID1() {
-    // just for now
-    return QString("");
-}
-
-QString SymbianMakefileGenerator::generateUID2() {
-    // standard stuff; picked form symbian
-    // later meybe read from somewhere
-    return QString("");
-}
-
-QString SymbianMakefileGenerator::generateUID3() {
-
-    QString target = project->first("TARGET");
-    QString currPath = qmake_getpwd();
-    target.prepend("/").prepend(currPath);
-    return generate_test_uid(target);
-
-}
-
-bool SymbianMakefileGenerator::initMmpVariables() {
-    QStringList sysincspaths;
-    QStringList srcincpaths;
-    QStringList srcpaths;
-
-    srcpaths << project->values("SOURCES") << project->values("GENERATED_SOURCES");
-    srcpaths << project->values("UNUSED_SOURCES") << project->values("UI_SOURCES_DIR");
-    srcpaths << project->values("UI_DIR");
-
-    QDir current = QDir::current();
-    QString canonizedCurrent = canonizePath(".");
-
-    for(int j = 0; j < srcpaths.size(); ++j) {
-        QFileInfo fi(fileInfo(srcpaths.at(j)));
-        // Sometimes sources have other than *.c* files (e.g. *.moc); prune them.
-        if (fi.suffix().startsWith("c")) {
-            if(fi.filePath().length() > fi.fileName().length() ) {
-                appendIfnotExist(srcincpaths, fi.path() );
-                sources[canonizePath(fi.path())] += fi.fileName();
-            } else {
-                sources[canonizedCurrent] += fi.fileName();
-                appendIfnotExist(srcincpaths, canonizedCurrent);
-            }
-        }
-    }
-
-    QStringList incpaths;
-    incpaths << project->values("INCLUDEPATH");
-    incpaths << QLibraryInfo::location(QLibraryInfo::HeadersPath);
-    incpaths << project->values("HEADERS");
-    incpaths << srcincpaths;
-    incpaths << project->values("UI_HEADERS_DIR");
-    incpaths << project->values("UI_DIR");
-
-    QString epocPath("epoc32");
-    for(int j = 0; j < incpaths.size(); ++j) {
-        QString includepath = canonizePath(incpaths.at(j));
-        appendIfnotExist(sysincspaths, includepath);
-        if (!includepath.contains(epocPath)) // No temp dirs for epoc includes
-            appendIfnotExist(sysincspaths, includepath + QString("/tmp"));
-    }
-
-    // remove duplicate include path entries
-    // convert to native directory separators
-    // to check if includepaths are same
-    QStringList temporary;
-    for(int i = 0; i < sysincspaths.size(); ++i) {
-        QString origPath = sysincspaths.at(i);
-        QFileInfo origPathInfo(fileInfo(origPath));
-        bool bFound = false;
-
-        for(int j = 0; j < temporary.size(); ++j) {
-            QString tmpPath = temporary.at(j);
-            QFileInfo tmpPathInfo(fileInfo(tmpPath));
-
-            if(origPathInfo.absoluteFilePath() == tmpPathInfo.absoluteFilePath()) {
-                bFound = true;
-                if(!tmpPathInfo.isRelative() && origPathInfo.isRelative()) {
-                    // we keep the relative notation
-                    temporary.removeOne(tmpPath);
-                    temporary << origPath;
-                }
-            }
-        }
-
-        if(!bFound)
-            temporary << origPath;
-
-    }
-
-    sysincspaths.clear();
-    sysincspaths << temporary;
-
-    systeminclude.insert("SYSTEMINCLUDE", sysincspaths);
-
-    return true;
-}
-
-bool SymbianMakefileGenerator::removeDuplicatedStrings(QStringList& stringList) {
-
-    QStringList tmpStringList;
-
-    for(int i = 0; i < stringList.size(); ++i) {
-        QString string = stringList.at(i);
-        if(tmpStringList.contains(string))
-            continue;
-        else
-            tmpStringList.append(string);
-    }
-
-    stringList.clear();
-    stringList = tmpStringList;
-    return true;
-}
-
-bool SymbianMakefileGenerator::writeMmpFileHeader(QTextStream &t){
-    t << "// ==============================================================================" << endl;
-    t << "// Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
-    t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
-    t << "// This file is generated by qmake and should not be modified by the" << endl;
-    t << "// user." << endl;
-    t << "//  Name        : " << escapeFilePath(fileFixify(project->projectFile().remove(project->projectFile().length()-4,4))) << ".mmp" << endl;
-    t << "// ==============================================================================" << endl << endl;
-
-    return true;
-}
-
-bool SymbianMakefileGenerator::writeMmpFile(QString &filename, QStringList &symbianLangCodes)
-{
-    QFile ft(filename);
-    if(ft.open(QIODevice::WriteOnly)) {
-        generatedFiles << ft.fileName();
-
-        //printf("WRITING: %s \n", qPrintable(filename));
-
-        QTextStream t(&ft);
-
-        writeMmpFileHeader(t);
-
-        writeMmpFileTargetPart(t);
-
-        writeMmpFileResourcePart(t, symbianLangCodes);
-
-        writeMmpFileMacrosPart(t);
-
-        writeMmpFileIncludePart(t);
-
-        QDir current = QDir::current();
-
-        for(QMap<QString, QStringList>::iterator it = sources.begin(); it != sources.end(); ++it) {
-            QStringList values = it.value();
-            QString currentSourcePath = it.key();
-
-            if (values.size())
-                t << "SOURCEPATH \t" <<  fixPathForMmp(currentSourcePath, current) << endl;
-
-            for (int i = 0; i < values.size(); ++i) {
-                QString sourceFileName = values.at(i);
-                t << "SOURCE\t\t" << sourceFileName << endl;
-            }
-            t << endl;
-        }
-        t << endl;
-
-        writeMmpFileLibraryPart(t);
-
-        writeMmpFileCapabilityPart(t);
-
-        writeMmpFileCompilerOptionPart(t);
-
-        writeMmpFileBinaryVersionPart(t);
-
-        writeMmpFileRulesPart(t);
-    } else {
-        return false;
-    }
-
-    return true;
-}
-
-bool SymbianMakefileGenerator::writeMmpFileMacrosPart(QTextStream& t) {
-
-    t << endl;
-
-    if(isConfigSetToSymbian())
-        return true;
-
-    QStringList &defines = project->values("DEFINES");
-    if (defines.size())
-        t << "// Qt Macros" << endl;
-    for(int i = 0; i < defines.size(); ++i) {
-        QString def = defines.at(i);
-        addMacro(t, def);
-    }
-
-    // These are required in order that all methods will be correctly exported e.g from qtestlib
-    QStringList &exp_defines = project->values("PRL_EXPORT_DEFINES");
-    if (exp_defines.size())
-        t << endl << "// Qt Export Defines" << endl;
-    for(int i = 0; i < exp_defines.size(); ++i) {
-        QString def = exp_defines.at(i);
-        addMacro(t, def);
-    }
-
-    t << endl;
-
-    return true;
-}
-
-bool SymbianMakefileGenerator::addMacro(QTextStream& t, const QString& value) {
-     t << "MACRO" << "\t\t" <<  value << endl;
-     return true;
-}
-
-
-bool SymbianMakefileGenerator::writeMmpFileTargetPart(QTextStream& t) {
-    QString targetTypeValue("");
-    if(getTargetExtension() == "exe") {
-        t << "TARGET" << "\t\t" << removePathSeparators(escapeFilePath(fileFixify(project->first("TARGET"))).append(".exe")) << "\n";
-        if (project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive))
-	    targetTypeValue = QString("STDEXE");
-        else
-	    targetTypeValue = QString("EXE");
-    }  else if (getTargetExtension() == "dll"){
-        t << "TARGET" << "\t\t" << removePathSeparators(escapeFilePath(fileFixify(project->first("TARGET"))).append(".dll")) << "\n";
-        if (project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive))
-	    targetTypeValue = QString("STDDLL");
-        else
-	    targetTypeValue = QString("DLL");
-    }   else if (getTargetExtension() == "lib"){
-        t << "TARGET" << "\t\t" << removePathSeparators(escapeFilePath(fileFixify(project->first("TARGET"))).append(".lib")) << "\n";
-        if (project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive))
-	    targetTypeValue = QString("STDLIB");
-        else
-	    targetTypeValue = QString("LIB");
-    }   else {
-        printf("unexpected target and targettype %s\n", getTargetExtension().toAscii().data());
-    }
-    if (0 != project->values("TARGETTYPE_OVERRIDE").size()) {
-        targetTypeValue = project->first("TARGETTYPE_OVERRIDE");
-    }
-
-    t << "TARGETTYPE" << "\t\t" << targetTypeValue << endl;
-
-    t << endl;
-
-    t << "UID" << "\t\t" << uid2 << " " << uid3 << endl;
-
-    if(0 != project->values("TARGET.SID").size()) {
-        t << "SECUREID" << "\t\t" << project->values("TARGET.SID").join(" ") << endl;
-    } else {
-        if(0 == uid3.size())
-            t << "SECUREID" << "\t\t" << "0" << endl;
-        else
-            t << "SECUREID" << "\t\t" << uid3 << endl;
-    }
-
-    // default value used from mkspecs..qconfig.h is 0
-    if(0 != project->values("TARGET.VID").size()) {
-        t << "VENDORID" << "\t\t" << project->values("TARGET.VID").join(" ") << endl;
-    }
-
-    t << endl;
-
-    if(0 != project->first("TARGET.EPOCSTACKSIZE").size())
-        t << "EPOCSTACKSIZE" << "\t\t" << project->first("TARGET.EPOCSTACKSIZE") << endl;
-    if(0 != project->values("TARGET.EPOCHEAPSIZE").size())
-        t << "EPOCHEAPSIZE" << "\t\t" << project->values("TARGET.EPOCHEAPSIZE").join(" ") << endl;
-    if(0 != project->values("TARGET.EPOCALLOWDLLDATA").size())
-        t << "EPOCALLOWDLLDATA" << endl;
-
-    if(targetType.compare("plugin", Qt::CaseInsensitive) == 0 && !project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive)) {
-        // use custom def file for Qt plugins
-        t << "DEFFILE " PLUGIN_COMMON_DEF_FILE_FOR_MMP << endl;
-    }
-
-    t << endl;
-
-    return true;
-}
-
-
-/*
-    Application registration resource files
-    should be installed to the
-
-    \private\10003a3f\import\apps directory.
-*/
-bool SymbianMakefileGenerator::writeMmpFileResourcePart(QTextStream& t, QStringList &symbianLangCodes) {
-    if((getTargetExtension() == "exe") &&
-        !project->values("CONFIG").contains("no_icon", Qt::CaseInsensitive)) {
-        QString target = escapeFilePath(fileFixify(project->first("TARGET")));
-        target = removePathSeparators(target);
-
-        QString locTarget = target;
-        locTarget.append(".rss");
-
-        t << "SOURCEPATH\t\t\t. " << endl;
-        t << "LANG SC ";    // no endl
-        foreach(QString lang, symbianLangCodes) {
-            t << lang << " "; // no endl
-        }
-        t << endl;
-        t << "START RESOURCE\t\t" << locTarget << endl;
-        t << "HEADER" << endl;
-        t << "TARGETPATH\t\t\t" RESOURCE_DIRECTORY_MMP<< endl;
-        t << "END" << endl << endl;
-
-        // now append extension
-        QString regTarget = target;
-        regTarget.append("_reg.rss");
-        // must state SOURCEPATH for resources
-        // relative placement (relative to dir where .mmp located)
-        // absolute placement (!RELATIVE! to EPOCROOT dir)
-
-
-        t << "SOURCEPATH\t\t\t. " << endl;
-        t << "START RESOURCE\t\t" << regTarget << endl;
-        if (isForSymbianSbsv2())
-            t << "DEPENDS " << target << ".rsg" << endl;
-        t << "TARGETPATH\t\t" REGISTRATION_RESOURCE_DIRECTORY_HW << endl;
-        t << "END" << endl << endl;
-     }
-     return true;
-}
-
-bool SymbianMakefileGenerator::writeMmpFileSystemIncludePart(QTextStream& t) {
-
-    QDir current = QDir::current();
-
-    for(QMap<QString, QStringList>::iterator it = systeminclude.begin(); it != systeminclude.end(); ++it) {
-        QStringList values = it.value();
-        for (int i = 0; i < values.size(); ++i) {
-            QString handledPath = values.at(i);
-            t << "SYSTEMINCLUDE" << "\t\t" << fixPathForMmp(handledPath, current) << endl;
-        }
-    }
-
-    t << endl;
-
-    return true;
-}
-
-bool SymbianMakefileGenerator::writeMmpFileIncludePart(QTextStream& t) {
-
-    writeMmpFileSystemIncludePart(t);
-
-    return true;
-}
-
-bool SymbianMakefileGenerator::writeMmpFileLibraryPart(QTextStream& t) {
-    QStringList &libs = project->values("LIBS");
-    libs << project->values("QMAKE_LIBS");
-
-    removeDuplicatedStrings(libs);
-
-    for(int i = 0; i < libs.size(); ++i) {
-        QString lib = libs.at(i);
-        // The -L flag is uninteresting, since all symbian libraries exist in the
-        // same directory.
-        if(lib.startsWith("-l")) {
-            lib.remove(0,2);
-            QString mmpStatement;
-            if (lib.endsWith(".dll")) {
-                lib.chop(4);
-                mmpStatement = "LIBRARY\t\t";
-            } else if (lib.endsWith(".lib")) {
-                lib.chop(4);
-                mmpStatement = "STATICLIBRARY\t";
-            } else {
-                // Hacky way to find out what kind of library it is. Check the
-                // ARMV5 build directory for library type. We default to shared
-                // library, since that is probably more common.
-                QString udebStaticLibLocation(epocRoot());
-                QString urelStaticLibLocation(udebStaticLibLocation);
-                udebStaticLibLocation += QString("epoc32/release/armv5/udeb/%1.lib").arg(lib);
-                urelStaticLibLocation += QString("epoc32/release/armv5/urel/%1.lib").arg(lib);
-                if (QFile::exists(udebStaticLibLocation) || QFile::exists(urelStaticLibLocation)) {
-                    mmpStatement = "STATICLIBRARY\t";
-                } else {
-                    mmpStatement = "LIBRARY\t\t";
-                }
-            }
-            t << mmpStatement <<  lib << ".lib" << endl;
-        }
-    }
-
-    t << endl;
-
-    return true;
-}
-
-bool SymbianMakefileGenerator::writeMmpFileCapabilityPart(QTextStream& t) {
-    if(0 != project->first("TARGET.CAPABILITY").size()) {
-        QStringList &capabilities = project->values("TARGET.CAPABILITY");
-        t << "CAPABILITY" << "\t\t";
-
-        for(int i = 0; i < capabilities.size(); ++i) {
-            QString cap = capabilities.at(i);
-            t << cap << " ";
-        }
-    }
-    else {
-        t << "CAPABILITY" << "\t\t" << "None";
-    }
-    t << endl << endl;
-
-    return true;
-}
-
-bool SymbianMakefileGenerator::writeMmpFileCompilerOptionPart(QTextStream& t) {
-    QString cw, armcc;
-
-    if(0 != project->values("QMAKE_CXXFLAGS.CW").size()) {
-        cw.append(project->values("QMAKE_CXXFLAGS.CW").join(" "));
-        cw.append(" ");
-    }
-
-    if(0 != project->values("QMAKE_CXXFLAGS.ARMCC").size()) {
-        armcc.append(project->values("QMAKE_CXXFLAGS.ARMCC").join(" "));
-        armcc.append(" ");
-    }
-
-    if(0 != project->values("QMAKE_CFLAGS.CW").size()) {
-        cw.append(project->values("QMAKE_CFLAGS.CW").join(" "));
-        cw.append(" ");
-    }
-
-    if(0 != project->values("QMAKE_CFLAGS.ARMCC").size()) {
-        armcc.append(project->values("QMAKE_CFLAGS.ARMCC").join(" "));
-        armcc.append(" ");
-    }
-
-    if(0 != project->values("QMAKE_CXXFLAGS").size()) {
-        cw.append(project->values("QMAKE_CXXFLAGS").join(" "));
-        cw.append(" ");
-        armcc.append(project->values("QMAKE_CXXFLAGS").join(" "));
-        armcc.append(" ");
-    }
-
-    if(0 != project->values("QMAKE_CFLAGS").size()) {
-        cw.append(project->values("QMAKE_CFLAGS").join(" "));
-        cw.append(" ");
-        armcc.append(project->values("QMAKE_CFLAGS").join(" "));
-        armcc.append(" ");
-    }
-
-    if (!cw.isEmpty() && cw[cw.size()-1] == ' ')
-        cw.chop(1);
-    if (!armcc.isEmpty() && armcc[armcc.size()-1] == ' ')
-        armcc.chop(1);
-
-    if (!cw.isEmpty())
-        t << "OPTION" << '\t' << " CW " << cw <<  endl;
-    if (!armcc.isEmpty())
-        t << "OPTION" << '\t' << " ARMCC "<< armcc <<  endl;
-    // others to come
-
-    t <<  endl;
-    return true;
-}
-
-bool SymbianMakefileGenerator::writeMmpFileBinaryVersionPart(QTextStream& t) {
-    QString applicationVersion = project->first("VERSION");
-    QStringList verNumList = applicationVersion.split('.');
-    uint major = 0;
-    uint minor = 0;
-    uint patch = 0;
-    bool success = false;
-
-    if (verNumList.size() > 0) {
-        major = verNumList[0].toUInt(&success);
-        if (success && verNumList.size() > 1) {
-            minor = verNumList[1].toUInt(&success);
-            if (success && verNumList.size() > 2) {
-                patch = verNumList[2].toUInt(&success);
-            }
-        }
-    }
-
-    QString mmpVersion;
-    if (success && major <= 0xFFFF && minor <= 0xFF && patch <= 0xFF) {
-        // Symbian binary version only has major and minor components, so compress
-        // Qt's minor and patch values into the minor component. Since Symbian's minor
-        // component is a 16 bit value, only allow 8 bits for each to avoid overflow.
-        mmpVersion.append(QString::number(major))
-            .append('.')
-            .append(QString::number((minor << 8) + patch));
-    } else {
-        if (!applicationVersion.isEmpty())
-            fprintf(stderr, "Invalid VERSION string: %s\n", qPrintable(applicationVersion));
-        mmpVersion = "10.0"; // Default binary version for symbian is 10.0
-    }
-
-    t << "VERSION " << mmpVersion  << endl;
-
-    return true;
-}
-
-bool SymbianMakefileGenerator::writeMmpFileRulesPart(QTextStream& t) {
-    foreach(QString item, project->values("MMP_RULES")) {
-        t << endl;
-        // If there is no stringlist defined for a rule, use rule name directly
-        // This is convenience for defining single line mmp statements
-        if (project->values(item).isEmpty()) {
-            t << item << endl;
-        } else {
-            foreach(QString itemRow, project->values(item)) {
-                t << itemRow << endl;
-            }
-        }
-    }
-    return true;
-}
-
-bool SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploymentExtension) {
-    // Read user defined bld inf rules
-    QMap<QString, QStringList> userBldInfRules;
-    for(QMap<QString, QStringList>::iterator it = project->variables().begin(); it != project->variables().end(); ++it) {
-        if (it.key().startsWith(BLD_INF_RULES_BASE)) {
-            QString newKey = it.key().mid(sizeof(BLD_INF_RULES_BASE)-1);
-            if (newKey.isEmpty()) {
-                fprintf(stderr, "Warning: Empty BLD_INF_RULES key encountered\n");
-                continue;
-            }
-            QStringList newValues;
-            QStringList values = it.value();
-            foreach(QString item, values) {
-                // If there is no stringlist defined for a rule, use rule name directly
-                // This is convenience for defining single line statements
-                if (project->values(item).isEmpty()) {
-                    newValues << item;
-                } else {
-                    foreach(QString itemRow, project->values(item)) {
-                        newValues << itemRow;
-                    }
-                }
-            }
-            userBldInfRules.insert(newKey, newValues);
-        }
-    }
-
-    // Add includes of subdirs bld.inf files
-
-    QString mmpfilename = escapeFilePath(fileFixify(project->projectFile()));
-    mmpfilename = mmpfilename.replace(mmpfilename.lastIndexOf(".")+1, 3, "mmp");
-    QString currentPath = qmake_getpwd();
-
-    if(!currentPath.endsWith(QString("/")))
-        currentPath.append("/");
-
-    QStringList mmpProjects = project->values("MMPFILES_DIRECT_DEPENDS");
-    QStringList shadowProjects = project->values("SHADOW_BLD_INFS");
-
-    removeDuplicatedStrings(mmpProjects);
-    removeDuplicatedStrings(shadowProjects);
-
-    // go in reverse order ... as that is the way how I build the list
-    QListIterator<QString> iT(mmpProjects);
-    iT.toBack();
-    while(iT.hasPrevious()) {
-        QString fullMmpName = iT.previous();
-        QString relativePath;
-        QString bldinfFilename;
-
-        QString fullProFilename = fullMmpName;
-        fullProFilename.replace(QString(".mmp"), QString(".pro"));
-        QString uid = generate_uid(fullProFilename);
-
-        QString cleanMmpName = fullProFilename;
-        cleanMmpName.replace(QString(".pro"), QString(""));
-        cleanMmpName.replace(0, cleanMmpName.lastIndexOf("/") + 1, QString(""));
-
-        if(shadowProjects.contains(BLD_INF_FILENAME "." + cleanMmpName)) { // shadow project
-            QDir directory(currentPath);
-            relativePath = directory.relativeFilePath(fullProFilename);
-            bldinfFilename = BLD_INF_FILENAME "." + cleanMmpName;
-            if(relativePath.contains("/")) {
-                // shadow .pro not in same
-                // directory as parent .pro
-                if(relativePath.startsWith("..")) {
-                    // shadow .pro out of parent .pro
-                    relativePath.replace(relativePath.lastIndexOf("/"), relativePath.length(), QString(""));
-                    bldinfFilename.prepend("/").prepend(relativePath);
-                } else {
-                    relativePath.replace(relativePath.lastIndexOf("/"), relativePath.length(), QString(""));
-                    bldinfFilename.prepend("/").prepend(relativePath);
-                }
-            } else {
-                // shadow .pro and parent .pro in same directory
-                bldinfFilename.prepend("./");
-            }
-        } else { // regular project
-            // calc relative path
-            QDir directory(currentPath);
-            relativePath = directory.relativeFilePath(fullProFilename);
-            relativePath.replace(relativePath.lastIndexOf("/"), relativePath.length(), QString(""));
-            bldinfFilename = relativePath.append("/").append(BLD_INF_FILENAME);
-        }
-
-        QString bldinfDefine = QString("BLD_INF_") + cleanMmpName + QString("_") + uid;
-        bldinfDefine = bldinfDefine.toUpper();
-        removeSpecialCharacters(bldinfDefine);
-
-        t << "#ifndef " << bldinfDefine << endl;
-        t << "\t#include \"" << QDir::toNativeSeparators(bldinfFilename) << "\"" << endl;
-        t << "#endif // " << bldinfDefine << endl;
-    }
-
-    // Add supported project platforms
-
-    t << endl << BLD_INF_TAG_PLATFORMS << endl << endl;
-    if(0 != project->values("SYMBIAN_PLATFORMS").size())
-        t << project->values("SYMBIAN_PLATFORMS").join(" ") << endl;
-
-    QStringList userItems = userBldInfRules.value(BLD_INF_TAG_PLATFORMS);
-    foreach(QString item, userItems)
-        t << item << endl;
-    userBldInfRules.remove(BLD_INF_TAG_PLATFORMS);
-    t << endl;
-
-    // Add project mmps and old style extension makefiles
-    QString mmpTag;
-    if (project->values("CONFIG").contains("symbian_test", Qt::CaseInsensitive))
-        mmpTag = QLatin1String(BLD_INF_TAG_TESTMMPFILES);
-    else
-        mmpTag = QLatin1String(BLD_INF_TAG_MMPFILES);
-
-    t << endl << mmpTag << endl << endl;
-
-    writeBldInfMkFilePart(t, addDeploymentExtension);
-    if (getTargetExtension() == "subdirs") {
-        mmpProjects.removeOne(mmpfilename);
-    }
-
-    if(getTargetExtension() != "subdirs") {
-        QString shortProFilename = project->projectFile();
-        shortProFilename.replace(0, shortProFilename.lastIndexOf("/") + 1, QString(""));
-        shortProFilename.replace(QString(".pro"), QString(""));
-
-        QString mmpFilename = shortProFilename + QString("_") + uid3 + QString(".mmp");
-
-        t << mmpFilename << endl;
-    }
-
-    userItems = userBldInfRules.value(mmpTag);
-    foreach(QString item, userItems)
-        t << item << endl;
-    userBldInfRules.remove(mmpTag);
-
-    t << endl << BLD_INF_TAG_EXTENSIONS << endl << endl;
-
-    // Generate extension rules
-    writeBldInfExtensionRulesPart(t);
-
-    userItems = userBldInfRules.value(BLD_INF_TAG_EXTENSIONS);
-    foreach(QString item, userItems)
-        t << item << endl;
-    userBldInfRules.remove(BLD_INF_TAG_EXTENSIONS);
-
-    // Add rest of the user defined content
-
-    for(QMap<QString, QStringList>::iterator it = userBldInfRules.begin(); it != userBldInfRules.end(); ++it) {
-        t << endl << endl << it.key() << endl << endl;
-        userItems = it.value();
-        foreach(QString item, userItems)
-            t << item << endl;
-    }
-
-    return true;
-}
-
-bool SymbianMakefileGenerator::writeRegRssFile(QString &appName, QStringList &userItems) {
-    QString filename(appName);
-    filename.append("_reg.rss");
-    QFile ft(filename);
-    if(ft.open(QIODevice::WriteOnly)) {
-        generatedFiles << ft.fileName();
-		QTextStream t(&ft);
-        t << "// ============================================================================" << endl;
-        t << "// * Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
-        t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
-        t << "// * This file is generated by qmake and should not be modified by the" << endl;
-        t << "// * user." << endl;
-        t << "// ============================================================================" << endl;
-        t << endl;
-		t << "#include <" << appName << ".rsg>" << endl;
-		t << "#include <appinfo.rh>" << endl;
-        t << endl;
-		//t << "#include <data_caging_paths.hrh>" << "\n" << endl;
-		t << "UID2 " << "KUidAppRegistrationResourceFile" << endl;
-		t << "UID3 " << uid3 << endl << endl;
-		t << "RESOURCE APP_REGISTRATION_INFO" << endl;
-		t << "\t{" << endl;
-		t << "\tapp_file=\"" << appName << "\";" << endl;
-		t << "\tlocalisable_resource_file=\"" RESOURCE_DIRECTORY_RESOURCE << appName << "\";" << endl;
-		t << endl;
-
-        foreach(QString item, userItems)
-            t << "\t" << item << endl;
-		t << "\t}" << endl;
-    } else {
-        return false;
-    }
-    return true;
-}
-
-bool SymbianMakefileGenerator::writeRssFile(QString &appName, QString &numberOfIcons, QString &iconFile) {
-    QString filename(appName);
-    filename.append(".rss");
-    QFile ft(filename);
-    if(ft.open(QIODevice::WriteOnly)) {
-        generatedFiles << ft.fileName();
-		QTextStream t(&ft);
-        t << "// ============================================================================" << endl;
-        t << "// * Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
-        t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
-        t << "// * This file is generated by qmake and should not be modified by the" << endl;
-        t << "// * user." << endl;
-        t << "// ============================================================================" << endl;
-        t << endl;
-        t << "#include <appinfo.rh>" << endl;
-        t << "#include \"" << appName << ".loc\"" << endl;
-        t << endl;
-        t << "RESOURCE LOCALISABLE_APP_INFO r_localisable_app_info" << endl;
-		t << "\t{" << endl;
-        t << "\tshort_caption = STRING_r_short_caption;" << endl;
-        t << "\tcaption_and_icon =" << endl;
-        t << "\tCAPTION_AND_ICON_INFO" << endl;
-		t << "\t\t{" << endl;
-        t << "\t\tcaption = STRING_r_caption;" << endl;
-
-        if(numberOfIcons.isEmpty() || iconFile.isEmpty() ) {
-            // There can be maximum one item in this tag, validated when parsed
-            t << "\t\tnumber_of_icons = 0;" << endl;
-            t << "\t\ticon_file = \"\";" << endl;
-        }
-        else {
-            // There can be maximum one item in this tag, validated when parsed
-            t << "\t\tnumber_of_icons = " << numberOfIcons << ";" << endl;
-            t << "\t\ticon_file = \"" << iconFile << "\";" << endl;
-        }
-		t << "\t\t};" << endl;
-		t << "\t}" << endl;
-		t << endl;
-	} else {
-        return false;
-    }
-    return true;
-}
-
-bool SymbianMakefileGenerator::writeLocFile(QString &appName, QStringList &symbianLangCodes) {
-    QString filename(appName);
-    filename.append(".loc");
-    QFile ft(filename);
-    if(ft.open(QIODevice::WriteOnly)) {
-        generatedFiles << ft.fileName();
-		QTextStream t(&ft);
-        t << "// ============================================================================" << endl;
-        t << "// * Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
-        t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
-        t << "// * This file is generated by qmake and should not be modified by the" << endl;
-        t << "// * user." << endl;
-        t << "// ============================================================================" << endl;
-        t << endl;
-        t << "#ifdef LANGUAGE_SC" << endl;
-        //t << "#include \"" << appName << ".l01\"" << endl;
-        t << "#define STRING_r_short_caption \"" << appName  << "\"" << endl;
-        t << "#define STRING_r_caption \"" << appName  << "\"" << endl;
-        foreach(QString lang, symbianLangCodes) {
-            t << "#elif defined LANGUAGE_" << lang << endl;
-            //t << "#include \"" << appName << ".l" << lang << "\"" << endl;
-            t << "#define STRING_r_short_caption \"" << appName  << "\"" << endl;
-            t << "#define STRING_r_caption \"" << appName  << "\"" << endl;
-        }
-        t << "#else" << endl;
-        t << "#define STRING_r_short_caption \"" << appName  << "\"" << endl;
-        t << "#define STRING_r_caption \"" << appName  << "\"" << endl;
-        t << "#endif" << endl;
-    } else {
-        return false;
-    }
-    return true;
-}
-
-void SymbianMakefileGenerator::readRssRules(QString &numberOfIcons, QString &iconFile, QStringList &userRssRules) {
-    for(QMap<QString, QStringList>::iterator it = project->variables().begin(); it != project->variables().end(); ++it) {
-        if (it.key().startsWith(RSS_RULES_BASE)) {
-            QString newKey = it.key().mid(sizeof(RSS_RULES_BASE)-1);
-            if (newKey.isEmpty()) {
-                fprintf(stderr, "Warning: Empty RSS_RULES_BASE key encountered\n");
-                continue;
-            }
-            QStringList newValues;
-            QStringList values = it.value();
-            foreach(QString item, values) {
-                // If there is no stringlist defined for a rule, use rule name directly
-                // This is convenience for defining single line statements
-                if (project->values(item).isEmpty()) {
-                    newValues << item;
-                } else {
-                    foreach(QString itemRow, project->values(item)) {
-                        newValues << itemRow;
-                    }
-                }
-            }
-            // Verify thet there is exactly one value in RSS_TAG_NBROFICONS
-            if (newKey == RSS_TAG_NBROFICONS) {
-                if (newValues.count() == 1) {
-                    numberOfIcons = newValues[0];
-                } else {
-                    fprintf(stderr, "Warning: There must be exactly one value in '%s%s'\n",
-                        RSS_RULES_BASE, RSS_TAG_NBROFICONS);
-                    continue;
-                }
-            // Verify thet there is exactly one value in RSS_TAG_ICONFILE
-            } else if (newKey == RSS_TAG_ICONFILE) {
-                if (newValues.count() == 1) {
-                    iconFile = newValues[0];
-                } else {
-                    fprintf(stderr, "Warning: There must be exactly one value in '%s%s'\n",
-                        RSS_RULES_BASE, RSS_TAG_ICONFILE);
-                    continue;
-                }
-            } else {
-                fprintf(stderr, "Warning: Unsupported key:'%s%s'\n",
-                    RSS_RULES_BASE, newKey.toLatin1().constData());
-                continue;
-            }
-        }
-    }
-
-    foreach(QString item, project->values(RSS_RULES)) {
-        // If there is no stringlist defined for a rule, use rule name directly
-        // This is convenience for defining single line mmp statements
-        if (project->values(item).isEmpty()) {
-            userRssRules << item;
-        } else {
-            userRssRules << project->values(item);
-        }
-    }
-
-    // Validate that either both RSS_TAG_NBROFICONS and RSS_TAG_ICONFILE keys exist
-    // or neither of them exist
-    if ( !((numberOfIcons.isEmpty() && iconFile.isEmpty()) ||
-        (!numberOfIcons.isEmpty() && !iconFile.isEmpty())) ) {
-        numberOfIcons.clear();
-        iconFile.clear();
-        fprintf(stderr, "Warning: Both or neither of '%s%s' and '%s%s' keys must exist.\n",
-            RSS_RULES_BASE, RSS_TAG_NBROFICONS, RSS_RULES_BASE, RSS_TAG_ICONFILE );
-    }
-
-    // Validate that RSS_TAG_NBROFICONS contains only numbers
-    if( !numberOfIcons.isEmpty() ) {
-        bool ok;
-        numberOfIcons = numberOfIcons.simplified();
-        int tmp = numberOfIcons.toInt(&ok);
-        if (!ok) {
-            numberOfIcons.clear();
-            iconFile.clear();
-            fprintf(stderr, "Warning: '%s%s' must be integer in decimal format.\n",
-                RSS_RULES_BASE, RSS_TAG_NBROFICONS );
-        }
-    }
-}
-
-QStringList SymbianMakefileGenerator::symbianLangCodesFromTsFiles() {
-    QStringList tsfiles;
-    QStringList symbianLangCodes;
-    tsfiles << project->values("TRANSLATIONS");
-
-    fillQt2S60LangMapTable();
-
-    foreach(QString file, tsfiles) {
-        int extIndex = file.lastIndexOf(".");
-        int langIndex = file.lastIndexOf("_", (extIndex - file.length()));
-        langIndex += 1;
-        QString qtlang = file.mid(langIndex, extIndex - langIndex );
-        QString s60lang = qt2S60LangMapTable.value(qtlang, QString("SC"));
-
-        if( !symbianLangCodes.contains(s60lang) && s60lang != "SC" )
-            symbianLangCodes += s60lang;
-    }
-
-    return symbianLangCodes;
-}
-
-void SymbianMakefileGenerator::fillQt2S60LangMapTable() {
-    qt2S60LangMapTable.reserve(170); // 165 items at time of writing.
-    qt2S60LangMapTable.insert("ab", "SC");            //Abkhazian                     //
-    qt2S60LangMapTable.insert("om", "SC");            //Afan                          //
-    qt2S60LangMapTable.insert("aa", "SC");            //Afar	                         //
-    qt2S60LangMapTable.insert("af", "34");            //Afrikaans	                 //Afrikaans
-    qt2S60LangMapTable.insert("sq", "35");            //Albanian                      //Albanian
-    qt2S60LangMapTable.insert("am", "36");            //Amharic                       //Amharic
-    qt2S60LangMapTable.insert("ar", "37");            //Arabic                        //Arabic
-    qt2S60LangMapTable.insert("hy", "38");            //Armenian                      //Armenian
-    qt2S60LangMapTable.insert("as", "SC");            //Assamese                      //
-    qt2S60LangMapTable.insert("ay", "SC");            //Aymara                        //
-    qt2S60LangMapTable.insert("az", "SC");            //Azerbaijani                   //
-    qt2S60LangMapTable.insert("ba", "SC");            //Bashkir                       //
-    qt2S60LangMapTable.insert("eu", "SC");            //Basque                        //
-    qt2S60LangMapTable.insert("bn", "41");            //Bengali                       //Bengali
-    qt2S60LangMapTable.insert("dz", "SC");            //Bhutani                       //
-    qt2S60LangMapTable.insert("bh", "SC");            //Bihari                        //
-    qt2S60LangMapTable.insert("bi", "SC");            //Bislama                       //
-    qt2S60LangMapTable.insert("br", "SC");            //Breton                        //
-    qt2S60LangMapTable.insert("bg", "42");            //Bulgarian                     //Bulgarian
-    qt2S60LangMapTable.insert("my", "43");            //Burmese                       //Burmese
-    qt2S60LangMapTable.insert("be", "40");            //Byelorussian                  //Belarussian
-    qt2S60LangMapTable.insert("km", "SC");            //Cambodian                     //
-    qt2S60LangMapTable.insert("ca", "44");            //Catalan                       //Catalan
-    qt2S60LangMapTable.insert("zh", "SC");            //Chinese                       //
-    qt2S60LangMapTable.insert("co", "SC");            //Corsican                      //
-    qt2S60LangMapTable.insert("hr", "45");            //Croatian                      //Croatian
-    qt2S60LangMapTable.insert("cs", "25");            //Czech                         //Czech
-    qt2S60LangMapTable.insert("da", "07");            //Danish                        //Danish
-    qt2S60LangMapTable.insert("nl", "18");            //Dutch                         //Dutch
-    qt2S60LangMapTable.insert("en", "01");            //English                       //English(UK)
-    qt2S60LangMapTable.insert("eo", "SC");            //Esperanto                     //
-    qt2S60LangMapTable.insert("et", "49");            //Estonian                      //Estonian
-    qt2S60LangMapTable.insert("fo", "SC");            //Faroese                       //
-    qt2S60LangMapTable.insert("fj", "SC");            //Fiji                          //
-    qt2S60LangMapTable.insert("fi", "09");            //Finnish                       //Finnish
-    qt2S60LangMapTable.insert("fr", "02");            //French                        //French
-    qt2S60LangMapTable.insert("fy", "SC");            //Frisian                       //
-    qt2S60LangMapTable.insert("gd", "52");            //Gaelic                        //Gaelic
-    qt2S60LangMapTable.insert("gl", "SC");            //Galician                      //
-    qt2S60LangMapTable.insert("ka", "53");            //Georgian                      //Georgian
-    qt2S60LangMapTable.insert("de", "03");            //German                        //German
-    qt2S60LangMapTable.insert("el", "54");            //Greek                         //Greek
-    qt2S60LangMapTable.insert("kl", "SC");            //Greenlandic                   //
-    qt2S60LangMapTable.insert("gn", "SC");            //Guarani                       //
-    qt2S60LangMapTable.insert("gu", "56");            //Gujarati                      //Gujarati
-    qt2S60LangMapTable.insert("ha", "SC");            //Hausa                         //
-    qt2S60LangMapTable.insert("he", "57");            //Hebrew                        //Hebrew
-    qt2S60LangMapTable.insert("hi", "58");            //Hindi                         //Hindi
-    qt2S60LangMapTable.insert("hu", "17");            //Hungarian                     //Hungarian
-    qt2S60LangMapTable.insert("is", "15");            //Icelandic                     //Icelandic
-    qt2S60LangMapTable.insert("id", "59");            //Indonesian                    //Indonesian
-    qt2S60LangMapTable.insert("ia", "SC");            //Interlingua                   //
-    qt2S60LangMapTable.insert("ie", "SC");            //Interlingue                   //
-    qt2S60LangMapTable.insert("iu", "SC");            //Inuktitut                     //
-    qt2S60LangMapTable.insert("ik", "SC");            //Inupiak                       //
-    qt2S60LangMapTable.insert("ga", "60");            //Irish                         //Irish
-    qt2S60LangMapTable.insert("it", "05");            //Italian                       //Italian
-    qt2S60LangMapTable.insert("ja", "32");            //Japanese                      //Japanese
-    qt2S60LangMapTable.insert("jv", "SC");            //Javanese                      //
-    qt2S60LangMapTable.insert("kn", "62");            //Kannada                       //Kannada
-    qt2S60LangMapTable.insert("ks", "SC");            //Kashmiri                      //
-    qt2S60LangMapTable.insert("kk", "63");            //Kazakh                        //Kazakh
-    qt2S60LangMapTable.insert("rw", "SC");            //Kinyarwanda                   //
-    qt2S60LangMapTable.insert("ky", "SC");            //Kirghiz                       //
-    qt2S60LangMapTable.insert("ko", "65");            //Korean                        //Korean
-    qt2S60LangMapTable.insert("ku", "SC");            //Kurdish                       //
-    qt2S60LangMapTable.insert("rn", "SC");            //Kurundi                       //
-    qt2S60LangMapTable.insert("lo", "66");            //Laothian                      //Laothian
-    qt2S60LangMapTable.insert("la", "SC");            //Latin                         //
-    qt2S60LangMapTable.insert("lv", "67");            //Latvian                       //Latvian
-    qt2S60LangMapTable.insert("ln", "SC");            //Lingala                       //
-    qt2S60LangMapTable.insert("lt", "68");            //Lithuanian                    //Lithuanian
-    qt2S60LangMapTable.insert("mk", "69");            //Macedonian                    //Macedonian
-    qt2S60LangMapTable.insert("mg", "SC");            //Malagasy                      //
-    qt2S60LangMapTable.insert("ms", "70");            //Malay                         //Malay
-    qt2S60LangMapTable.insert("ml", "71");            //Malayalam                     //Malayalam
-    qt2S60LangMapTable.insert("mt", "SC");            //Maltese                       //
-    qt2S60LangMapTable.insert("mi", "SC");            //Maori                         //
-    qt2S60LangMapTable.insert("mr", "72");            //Marathi                       //Marathi
-    qt2S60LangMapTable.insert("mo", "73");            //Moldavian                     //Moldovian
-    qt2S60LangMapTable.insert("mn", "74");            //Mongolian                     //Mongolian
-    qt2S60LangMapTable.insert("na", "SC");            //Nauru                         //
-    qt2S60LangMapTable.insert("ne", "SC");            //Nepali                        //
-    qt2S60LangMapTable.insert("nb", "08");            //Norwegian                     //Norwegian
-    qt2S60LangMapTable.insert("oc", "SC");            //Occitan                       //
-    qt2S60LangMapTable.insert("or", "SC");            //Oriya                         //
-    qt2S60LangMapTable.insert("ps", "SC");            //Pashto                        //
-    qt2S60LangMapTable.insert("fa", "SC");            //Persian                       //
-    qt2S60LangMapTable.insert("pl", "27");            //Polish                        //Polish
-    qt2S60LangMapTable.insert("pt", "13");            //Portuguese                    //Portuguese
-    qt2S60LangMapTable.insert("pa", "77");            //Punjabi                       //Punjabi
-    qt2S60LangMapTable.insert("qu", "SC");            //Quechua                       //
-    qt2S60LangMapTable.insert("rm", "SC");            //RhaetoRomance                 //
-    qt2S60LangMapTable.insert("ro", "78");            //Romanian                      //Romanian
-    qt2S60LangMapTable.insert("ru", "16");            //Russian                       //Russian
-    qt2S60LangMapTable.insert("sm", "SC");            //Samoan                        //
-    qt2S60LangMapTable.insert("sg", "SC");            //Sangho                        //
-    qt2S60LangMapTable.insert("sa", "SC");            //Sanskrit                      //
-    qt2S60LangMapTable.insert("sr", "79");            //Serbian                       //Serbian
-    qt2S60LangMapTable.insert("sh", "SC");            //SerboCroatian                 //
-    qt2S60LangMapTable.insert("st", "SC");            //Sesotho                       //
-    qt2S60LangMapTable.insert("tn", "SC");            //Setswana                      //
-    qt2S60LangMapTable.insert("sn", "SC");            //Shona                         //
-    qt2S60LangMapTable.insert("sd", "SC");            //Sindhi                        //
-    qt2S60LangMapTable.insert("si", "80");            //Singhalese                    //Sinhalese
-    qt2S60LangMapTable.insert("ss", "SC");            //Siswati                       //
-    qt2S60LangMapTable.insert("sk", "26");            //Slovak                        //Slovak
-    qt2S60LangMapTable.insert("sl", "28");            //Slovenian                     //Slovenian
-    qt2S60LangMapTable.insert("so", "81");            //Somali                        //Somali
-    qt2S60LangMapTable.insert("es", "04");            //Spanish                       //Spanish
-    qt2S60LangMapTable.insert("su", "SC");            //Sundanese                     //
-    qt2S60LangMapTable.insert("sw", "84");            //Swahili                       //Swahili
-    qt2S60LangMapTable.insert("sv", "06");            //Swedish                       //Swedish
-    qt2S60LangMapTable.insert("tl", "39");            //Tagalog                       //Tagalog
-    qt2S60LangMapTable.insert("tg", "SC");            //Tajik                         //
-    qt2S60LangMapTable.insert("ta", "87");            //Tamil                         //Tamil
-    qt2S60LangMapTable.insert("tt", "SC");            //Tatar                         //
-    qt2S60LangMapTable.insert("te", "88");            //Telugu                        //Telugu
-    qt2S60LangMapTable.insert("th", "33");            //Thai                          //Thai
-    qt2S60LangMapTable.insert("bo", "89");            //Tibetan                       //Tibetan
-    qt2S60LangMapTable.insert("ti", "90");            //Tigrinya                      //Tigrinya
-    qt2S60LangMapTable.insert("to", "SC");            //Tonga                         //
-    qt2S60LangMapTable.insert("ts", "SC");            //Tsonga                        //
-    qt2S60LangMapTable.insert("tr", "14");            //Turkish                       //Turkish
-    qt2S60LangMapTable.insert("tk", "92");            //Turkmen                       //Turkmen
-    qt2S60LangMapTable.insert("tw", "SC");            //Twi                           //
-    qt2S60LangMapTable.insert("ug", "SC");            //Uigur                         //
-    qt2S60LangMapTable.insert("uk", "93");            //Ukrainian                     //Ukrainian
-    qt2S60LangMapTable.insert("ur", "94");            //Urdu                          //Urdu
-    qt2S60LangMapTable.insert("uz", "SC");            //Uzbek                         //
-    qt2S60LangMapTable.insert("vi", "96");            //Vietnamese                    //Vietnamese
-    qt2S60LangMapTable.insert("vo", "SC");            //Volapuk                       //
-    qt2S60LangMapTable.insert("cy", "97");            //Welsh                         //Welsh
-    qt2S60LangMapTable.insert("wo", "SC");            //Wolof                         //
-    qt2S60LangMapTable.insert("xh", "SC");            //Xhosa                         //
-    qt2S60LangMapTable.insert("yi", "SC");            //Yiddish                       //
-    qt2S60LangMapTable.insert("yo", "SC");            //Yoruba                        //
-    qt2S60LangMapTable.insert("za", "SC");            //Zhuang                        //
-    qt2S60LangMapTable.insert("zu", "98");            //Zulu                          //Zulu
-    qt2S60LangMapTable.insert("nn", "75");            //Nynorsk                       //NorwegianNynorsk
-    qt2S60LangMapTable.insert("bs", "SC");            //Bosnian                       //
-    qt2S60LangMapTable.insert("dv", "SC");            //Divehi                        //
-    qt2S60LangMapTable.insert("gv", "SC");            //Manx                          //
-    qt2S60LangMapTable.insert("kw", "SC");            //Cornish                       //
-    qt2S60LangMapTable.insert("ak", "SC");            //Akan                          //
-    qt2S60LangMapTable.insert("kok", "SC");           //Konkani                       //
-    qt2S60LangMapTable.insert("gaa", "SC");           //Ga                            //
-    qt2S60LangMapTable.insert("ig", "SC");            //Igbo                          //
-    qt2S60LangMapTable.insert("kam", "SC");           //Kamba                         //
-    qt2S60LangMapTable.insert("syr", "SC");           //Syriac                        //
-    qt2S60LangMapTable.insert("byn", "SC");           //Blin                          //
-    qt2S60LangMapTable.insert("gez", "SC");           //Geez                          //
-    qt2S60LangMapTable.insert("kfo", "SC");           //Koro                          //
-    qt2S60LangMapTable.insert("sid", "SC");           //Sidamo                        //
-    qt2S60LangMapTable.insert("cch", "SC");           //Atsam                         //
-    qt2S60LangMapTable.insert("tig", "SC");           //Tigre                         //
-    qt2S60LangMapTable.insert("kaj", "SC");           //Jju                           //
-    qt2S60LangMapTable.insert("fur", "SC");           //Friulian	                     //
-    qt2S60LangMapTable.insert("ve", "SC");            //Venda	                     //
-    qt2S60LangMapTable.insert("ee", "SC");            //Ewe	                         //
-    qt2S60LangMapTable.insert("wa", "SC");            //Walamo	                     //
-    qt2S60LangMapTable.insert("haw", "SC");           //Hawaiian	                     //
-    qt2S60LangMapTable.insert("kcg", "SC");           //Tyap	                         //
-    qt2S60LangMapTable.insert("ny", "SC");            //Chewa	                     //
-}
-
-void SymbianMakefileGenerator::appendIfnotExist(QStringList &list, QString value)
-{
-    if(!list.contains(value))
-        list += value;
-}
-
-void SymbianMakefileGenerator::appendIfnotExist(QStringList &list, QStringList values)
-{
-    foreach(QString item, values)
-        appendIfnotExist(list, item);
-}
-
-QString SymbianMakefileGenerator::removePathSeparators(QString &file)
-{
-    QString ret = file;
-    while(ret.indexOf(QDir::separator()) > 0) {
-        ret.remove(0, ret.indexOf(QDir::separator())+1);
-    }
-
-    return ret;
-}
-
-
-QString SymbianMakefileGenerator::removeTrailingPathSeparators(QString &file)
-{
-    QString ret = file;
-    if(ret.endsWith(QDir::separator())) {
-        ret.remove(ret.length()-1,1);
-    }
-
-    return ret;
-}
-
-bool SymbianMakefileGenerator::generateCleanCommands(QTextStream& t,
-                                                     const QStringList& toClean,
-                                                     const QString& cmd,
-                                                     const QString& cmdOptions,
-                                                     const QString& itemPrefix,
-                                                     const QString& itemSuffix) {
-    for (int i = 0; i < toClean.size(); ++i) {
-        QString item = toClean.at(i);
-        item.prepend(itemPrefix).append(itemSuffix);
-#if defined(Q_OS_WIN)
-        t << "\t-@ if EXIST \"" << QDir::toNativeSeparators(item) << "\" ";
-        t << cmd << " " << cmdOptions << " \"" << QDir::toNativeSeparators(item) << "\"" << endl;
-#else
-        t << "\t-if test -f " << QDir::toNativeSeparators(item) << "; then ";
-        t << cmd << " " << cmdOptions << " " << QDir::toNativeSeparators(item) << "; fi" << endl;
-#endif
-    }
-
-    return true;
-}
-
-QString SymbianMakefileGenerator::getWithoutSpecialCharacters(QString& str) {
-    QString tmp = str;
-
-    tmp.replace(QString("/"), QString("_"));
-    tmp.replace(QString("\\"), QString("_"));
-    tmp.replace(QString("-"), QString("_"));
-    tmp.replace(QString(":"), QString("_"));
-    tmp.replace(QString("."), QString("_"));
-
-    return tmp;
-}
-
-void SymbianMakefileGenerator::removeSpecialCharacters(QString& str) {
-    str.replace(QString("/"), QString("_"));
-    str.replace(QString("\\"), QString("_"));
-    str.replace(QString("-"), QString("_"));
-    str.replace(QString(":"), QString("_"));
-    str.replace(QString("."), QString("_"));
-    str.replace(QString(" "), QString("_"));
-}

--- a/qtecomplugins/supplements/qmake/4.6/symmake.cpp	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1733 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the qmake application 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$
-**
-****************************************************************************/
-
-#include "symmake.h"
-#include "initprojectdeploy_symbian.h"
-
-#include <qstring.h>
-#include <qhash.h>
-#include <qstringlist.h>
-#include <qdir.h>
-#include <qdatetime.h>
-#include <stdlib.h>
-#include <qdebug.h>
-
-#define RESOURCE_DIRECTORY_MMP "/resource/apps"
-#define RESOURCE_DIRECTORY_RESOURCE "\\\\resource\\\\apps\\\\"
-#define REGISTRATION_RESOURCE_DIRECTORY_HW "/private/10003a3f/import/apps"
-#define PLUGIN_COMMON_DEF_FILE_FOR_MMP "./plugin_common.def"
-#define PLUGIN_COMMON_DEF_FILE_ACTUAL "plugin_commonU.def"
-#define BLD_INF_FILENAME_LEN (sizeof(BLD_INF_FILENAME) - 1)
-
-#define BLD_INF_RULES_BASE "BLD_INF_RULES."
-#define BLD_INF_TAG_PLATFORMS "prj_platforms"
-#define BLD_INF_TAG_MMPFILES "prj_mmpfiles"
-#define BLD_INF_TAG_TESTMMPFILES "prj_testmmpfiles"
-#define BLD_INF_TAG_EXTENSIONS "prj_extensions"
-
-#define RSS_RULES "RSS_RULES"
-#define RSS_RULES_BASE "RSS_RULES."
-#define RSS_TAG_NBROFICONS "number_of_icons"
-#define RSS_TAG_ICONFILE "icon_file"
-
-#define MMP_TARGET "TARGET"
-#define MMP_TARGETTYPE "TARGETTYPE"
-#define MMP_SECUREID "SECUREID"
-
-#define SIS_TARGET "sis"
-#define OK_SIS_TARGET "ok_sis"
-#define FAIL_SIS_NOPKG_TARGET "fail_sis_nopkg"
-#define FAIL_SIS_NOCACHE_TARGET "fail_sis_nocache"
-#define RESTORE_BUILD_TARGET "restore_build"
-
-#define PRINT_FILE_CREATE_ERROR(filename) fprintf(stderr, "Error: Could not create '%s'\n", qPrintable(filename));
-
-QString SymbianMakefileGenerator::fixPathForMmp(const QString& origPath, const QDir& parentDir)
-{
-    static QString epocRootStr;
-    if (epocRootStr.isEmpty()) {
-        QFileInfo efi(epocRoot());
-        epocRootStr = efi.canonicalFilePath();
-        if (epocRootStr.isEmpty()) {
-            fprintf(stderr, "Unable to resolve epocRoot '%s' to real dir on current drive, defaulting to '/' for mmp paths\n", qPrintable(epocRoot()));
-            epocRootStr = "/";
-        }
-        if (!epocRootStr.endsWith("/"))
-            epocRootStr += "/";
-
-        epocRootStr += "epoc32/";
-    }
-
-    QString resultPath = origPath;
-
-    // Make it relative, unless it starts with "%epocroot%/epoc32/"
-    if (resultPath.startsWith(epocRootStr, Qt::CaseInsensitive)) {
-        resultPath.replace(epocRootStr, "/epoc32/", Qt::CaseInsensitive);
-    } else {
-        resultPath = parentDir.relativeFilePath(resultPath);
-    }
-    resultPath = QDir::cleanPath(resultPath);
-
-    if (resultPath.isEmpty())
-        resultPath = ".";
-
-    return resultPath;
-}
-
-QString SymbianMakefileGenerator::canonizePath(const QString& origPath)
-{
-    // Since current path gets appended almost always anyway, use it as default
-    // for nonexisting paths.
-    static QString defaultPath;
-    if (defaultPath.isEmpty()) {
-        QFileInfo fi(".");
-        defaultPath = fi.canonicalFilePath();
-    }
-
-    // Prepend epocroot to any paths beginning with "/epoc32/"
-    QString resultPath = QDir::fromNativeSeparators(origPath);
-    if (resultPath.startsWith("/epoc32/", Qt::CaseInsensitive))
-        resultPath = QDir::fromNativeSeparators(epocRoot()) + resultPath.mid(1);
-
-    QFileInfo fi(fileInfo(resultPath));
-    if (fi.isDir()) {
-        resultPath = fi.canonicalFilePath();
-    } else {
-        resultPath = fi.canonicalPath();
-    }
-
-    resultPath = QDir::cleanPath(resultPath);
-
-    if (resultPath.isEmpty())
-        resultPath = defaultPath;
-
-    return resultPath;
-}
-
-SymbianMakefileGenerator::SymbianMakefileGenerator() : MakefileGenerator() { }
-SymbianMakefileGenerator::~SymbianMakefileGenerator() { }
-
-void SymbianMakefileGenerator::writeHeader(QTextStream &t)
-{
-    t << "// ============================================================================" << endl;
-    t << "// * Makefile for building: " << escapeFilePath(var("TARGET")) << endl;
-    t << "// * Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
-    t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
-    t << "// * This file is generated by qmake and should not be modified by the" << endl;
-    t << "// * user." << endl;
-    t << "// * Project:  " << fileFixify(project->projectFile()) << endl;
-    t << "// * Template: " << var("TEMPLATE") << endl;
-    t << "// ============================================================================" << endl;
-    t << endl;
-
-    // Defining define for bld.inf
-
-    QString shortProFilename = project->projectFile();
-    shortProFilename.replace(0, shortProFilename.lastIndexOf("/") + 1, QString(""));
-    shortProFilename.replace(Option::pro_ext, QString(""));
-
-    QString bldinfDefine = shortProFilename;
-    bldinfDefine.append("_");
-    bldinfDefine.append(generate_uid(project->projectFile()));
-
-    bldinfDefine.prepend("BLD_INF_");
-    removeSpecialCharacters(bldinfDefine);
-
-    t << "#define " << bldinfDefine.toUpper() << endl << endl;
-}
-
-bool SymbianMakefileGenerator::writeMakefile(QTextStream &t)
-{
-    writeHeader(t);
-
-    QString numberOfIcons;
-    QString iconFile;
-    QStringList userRssRules;
-    readRssRules(numberOfIcons, iconFile, userRssRules);
-
-    // Get the application translations and convert to symbian OS lang code, i.e. decical number
-    QStringList symbianLangCodes = symbianLangCodesFromTsFiles();
-
-    // Generate pkg files if there are any actual files to deploy
-    bool generatePkg = false;
-    if (targetType == TypeExe) {
-        generatePkg = true;
-    } else {
-        foreach(QString item, project->values("DEPLOYMENT")) {
-            if (!project->values(item + ".sources").isEmpty()) {
-                generatePkg = true;
-                break;
-            }
-        }
-    }
-
-    if (generatePkg) {
-        generatePkgFile(iconFile);
-    }
-
-    writeBldInfContent(t, generatePkg);
-
-    // Generate empty wrapper makefile here, because wrapper makefile must exist before writeMkFile,
-    // but all required data is not yet available.
-    bool isPrimaryMakefile = true;
-    QString wrapperFileName("Makefile");
-    QString outputFileName = fileInfo(Option::output.fileName()).fileName();
-    if (outputFileName != BLD_INF_FILENAME) {
-        wrapperFileName.append(".").append((outputFileName.size() > BLD_INF_FILENAME_LEN && outputFileName.left(BLD_INF_FILENAME_LEN) == BLD_INF_FILENAME) ? outputFileName.mid(8) : outputFileName);
-        isPrimaryMakefile = false;
-    }
-
-    QFile wrapperMakefile(wrapperFileName);
-    if (wrapperMakefile.open(QIODevice::WriteOnly)) {
-        generatedFiles << wrapperFileName;
-    } else {
-        PRINT_FILE_CREATE_ERROR(wrapperFileName);
-        return false;
-    }
-
-    if (targetType == TypeSubdirs) {
-        // If we have something to deploy, generate extension makefile for just that, since
-        // normal extension makefile is not getting generated and we need emulator deployment to be done.
-        if (generatePkg)
-            writeMkFile(wrapperFileName, true);
-        writeWrapperMakefile(wrapperMakefile, isPrimaryMakefile);
-        return true;
-    }
-
-    writeMkFile(wrapperFileName, false);
-
-    QString shortProFilename = project->projectFile();
-    shortProFilename.replace(0, shortProFilename.lastIndexOf("/") + 1, QString(""));
-    shortProFilename.replace(Option::pro_ext, QString(""));
-
-    QString mmpFilename = shortProFilename;
-    mmpFilename.append("_");
-    mmpFilename.append(uid3);
-    mmpFilename.append(Option::mmp_ext);
-    writeMmpFile(mmpFilename, symbianLangCodes);
-
-    if (targetType == TypeExe) {
-        if (!project->values("CONFIG").contains("no_icon", Qt::CaseInsensitive)) {
-            writeRegRssFile(userRssRules);
-            writeRssFile(numberOfIcons, iconFile);
-            writeLocFile(symbianLangCodes);
-        }
-    }
-
-    writeCustomDefFile();
-    writeWrapperMakefile(wrapperMakefile, isPrimaryMakefile);
-
-    return true;
-}
-
-void SymbianMakefileGenerator::generatePkgFile(const QString &iconFile)
-{
-    QString pkgFilename = QString("%1_template.%2")
-                          .arg(fixedTarget)
-                          .arg("pkg");
-    QFile pkgFile(pkgFilename);
-    if (!pkgFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-        PRINT_FILE_CREATE_ERROR(pkgFilename);
-        return;
-    }
-
-    generatedFiles << pkgFile.fileName();
-
-    // Header info
-    QTextStream t(&pkgFile);
-    t << QString("; %1 generated by qmake at %2").arg(pkgFilename).arg(QDateTime::currentDateTime().toString(Qt::ISODate))  << endl;
-    t << "; This file is generated by qmake and should not be modified by the user" << endl;
-    t << ";" << endl << endl;
-
-    // Construct QStringList from pkg_prerules since we need search it before printed to file
-    QStringList rawPkgPreRules;
-    foreach(QString deploymentItem, project->values("DEPLOYMENT")) {
-        foreach(QString pkgrulesItem, project->values(deploymentItem + ".pkg_prerules")) {
-            QStringList pkgrulesValue = project->values(pkgrulesItem);
-            // If there is no stringlist defined for a rule, use rule name directly
-            // This is convenience for defining single line mmp statements
-            if (pkgrulesValue.isEmpty()) {
-                rawPkgPreRules << pkgrulesItem;
-            } else {
-                foreach(QString pkgrule, pkgrulesValue) {
-                    rawPkgPreRules << pkgrule;
-                }
-            }
-        }
-    }
-
-    // Apply some defaults if specific data does not exist in PKG pre-rules
-
-    if (!containsStartWithItem('&', rawPkgPreRules)) {
-        // language, (*** hardcoded to english atm, should be parsed from TRANSLATIONS)
-        t << "; Language" << endl;
-        t << "&EN" << endl << endl;
-    } else {
-        // In case user defines langs, he must take care also about SIS header
-        if (!containsStartWithItem('#', rawPkgPreRules))
-            fprintf(stderr, "Warning: If language is defined with DEPLOYMENT pkg_prerules, also the SIS header must be defined\n");
-    }
-
-    // name of application, UID and version
-    QString applicationVersion = project->first("VERSION").isEmpty() ? "1,0,0" : project->first("VERSION").replace('.', ',');
-
-    if (!containsStartWithItem('#', rawPkgPreRules)) {
-        QString visualTarget = escapeFilePath(fileFixify(project->first("TARGET")));
-        visualTarget = removePathSeparators(visualTarget);
-
-        t << "; SIS header: name, uid, version" << endl;
-        t << QString("#{\"%1\"},(%2),%3").arg(visualTarget).arg(uid3).arg(applicationVersion) << endl << endl;
-    }
-
-    // Localized vendor name
-    if (!containsStartWithItem('%', rawPkgPreRules)) {
-        t << "; Localised Vendor name" << endl;
-        t << "%{\"Vendor\"}" << endl << endl;
-    }
-
-    // Unique vendor name
-    if (!containsStartWithItem(':', rawPkgPreRules)) {
-        t << "; Unique Vendor name" << endl;
-        t << ":\"Vendor\"" << endl << endl;
-    }
-
-    // PKG pre-rules - these are added before actual file installations i.e. SIS package body
-    if (rawPkgPreRules.size()) {
-        t << "; Manual PKG pre-rules from PRO files" << endl;
-        foreach(QString item, rawPkgPreRules) {
-            t << item << endl;
-        }
-        t << endl;
-    }
-
-    // Install paths on the phone *** should be dynamic at some point
-    QString installPathBin = "!:\\sys\\bin";
-    QString installPathResource = "!:\\resource\\apps";
-    QString installPathRegResource = "!:\\private\\10003a3f\\import\\apps";
-
-    // Find location of builds
-    QString epocReleasePath = QString("%1epoc32/release/$(PLATFORM)/$(TARGET)")
-                              .arg(epocRoot());
-
-
-    if (targetType == TypeExe) {
-        // deploy .exe file
-        t << "; Executable and default resource files" << endl;
-        QString exeFile = fixedTarget + ".exe";
-        t << QString("\"%1/%2\"    - \"%3\\%4\"")
-             .arg(epocReleasePath)
-             .arg(exeFile)
-             .arg(installPathBin)
-             .arg(exeFile) << endl;
-
-        // deploy rsc & reg_rsc file
-        if (!project->values("CONFIG").contains("no_icon", Qt::CaseInsensitive)) {
-            t << QString("\"%1epoc32/data/z/resource/apps/%2\"    - \"%3\\%4\"")
-                 .arg(epocRoot())
-                 .arg(fixedTarget + ".rsc")
-                 .arg(installPathResource)
-                 .arg(fixedTarget + ".rsc") << endl;
-
-            t << QString("\"%1epoc32/data/z/private/10003a3f/import/apps/%2\"    - \"%3\\%4\"")
-                 .arg(epocRoot())
-                 .arg(fixedTarget + "_reg.rsc")
-                 .arg(installPathRegResource)
-                 .arg(fixedTarget + "_reg.rsc") << endl;
-
-            QString myIconFile = iconFile;
-            myIconFile = myIconFile.replace("\\\\", "\\");
-
-            if (!iconFile.isEmpty())  {
-                t << QString("\"%1epoc32/data/z%2\"    - \"!:%3\"")
-                     .arg(epocRoot())
-                     .arg(QString(myIconFile).replace('\\','/'))
-                     .arg(myIconFile) << endl << endl;
-            }
-        }
-    }
-
-    // deploy any additional DEPLOYMENT  files
-    DeploymentList depList;
-    QString remoteTestPath;
-    remoteTestPath = QString("!:\\private\\%1").arg(privateDirUid);
-
-    initProjectDeploySymbian(project, depList, remoteTestPath, true, "$(PLATFORM)", "$(TARGET)", generatedDirs, generatedFiles);
-    if (depList.size())
-        t << "; DEPLOYMENT" << endl;
-    for (int i = 0; i < depList.size(); ++i)  {
-        t << QString("\"%1\"    - \"%2\"")
-             .arg(QString(depList.at(i).from).replace('\\','/'))
-             .arg(depList.at(i).to) << endl;
-    }
-    t << endl;
-
-    // PKG post-rules - these are added after actual file installations i.e. SIS package body
-    t << "; Manual PKG post-rules from PRO files" << endl;
-    foreach(QString deploymentItem, project->values("DEPLOYMENT")) {
-        foreach(QString pkgrulesItem, project->values(deploymentItem + ".pkg_postrules")) {
-            QStringList pkgrulesValue = project->values(pkgrulesItem);
-            // If there is no stringlist defined for a rule, use rule name directly
-            // This is convenience for defining single line statements
-            if (pkgrulesValue.isEmpty()) {
-                t << pkgrulesItem << endl;
-            } else {
-                foreach(QString pkgrule, pkgrulesValue) {
-                    t << pkgrule << endl;
-                }
-            }
-            t << endl;
-        }
-    }
-}
-
-bool SymbianMakefileGenerator::containsStartWithItem(const QChar &c, const QStringList& src)
-{
-    bool result = false;
-    foreach(QString str, src) {
-        if (str.startsWith(c)) {
-            result =  true;
-            break;
-        }
-    }
-    return result;
-}
-
-void SymbianMakefileGenerator::writeCustomDefFile()
-{
-    if (targetType == TypePlugin && !project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive)) {
-        // Create custom def file for plugin
-        QFile ft(QLatin1String(PLUGIN_COMMON_DEF_FILE_ACTUAL));
-
-        if (ft.open(QIODevice::WriteOnly)) {
-            generatedFiles << ft.fileName();
-            QTextStream t(&ft);
-
-            t << "; ==============================================================================" << endl;
-            t << "; Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
-            t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
-            t << "; This file is generated by qmake and should not be modified by the" << endl;
-            t << "; user." << endl;
-            t << ";  Name        : " PLUGIN_COMMON_DEF_FILE_ACTUAL << endl;
-            t << ";  Part of     : " << project->values("TARGET").join(" ") << endl;
-            t << ";  Description : Fixes common plugin symbols to known ordinals" << endl;
-            t << ";  Version     : " << endl;
-            t << ";" << endl;
-            t << "; ==============================================================================" << "\n" << endl;
-
-            t << endl;
-
-            t << "EXPORTS" << endl;
-            t << "\tqt_plugin_query_verification_data @ 1 NONAME" << endl;
-            t << "\tqt_plugin_instance @ 2 NONAME" << endl;
-            t << endl;
-        } else {
-            PRINT_FILE_CREATE_ERROR(QString(PLUGIN_COMMON_DEF_FILE_ACTUAL))
-        }
-    }
-}
-
-void SymbianMakefileGenerator::init()
-{
-    MakefileGenerator::init();
-    fixedTarget = escapeFilePath(fileFixify(project->first("TARGET")));
-    fixedTarget = removePathSeparators(fixedTarget);
-    removeSpecialCharacters(fixedTarget);
-
-    if (0 != project->values("QMAKE_PLATFORM").size())
-        platform = varGlue("QMAKE_PLATFORM", "", " ", "");
-
-    if (0 == project->values("QMAKESPEC").size())
-        project->values("QMAKESPEC").append(qgetenv("QMAKESPEC"));
-
-    project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS"));
-    project->values("QMAKE_LIBS_PRIVATE") += escapeFilePaths(project->values("LIBS_PRIVATE"));
-
-    // bld.inf
-    project->values("MAKEFILE") += BLD_INF_FILENAME;
-
-    // .mmp
-    initMmpVariables();
-
-    // Check TARGET.UID3 presence
-    if (0 != project->values("TARGET.UID3").size()) {
-        uid3 = project->first("TARGET.UID3");
-    } else {
-        uid3 = generateUID3();
-    }
-
-    if ((project->values("TEMPLATE")).contains("app"))
-        targetType = TypeExe;
-    else if ((project->values("TEMPLATE")).contains("lib")) {
-        // Check CONFIG to see if we are to build staticlib or dll
-        if (project->values("CONFIG").contains("staticlib") || project->values("CONFIG").contains("static"))
-            targetType = TypeLib;
-        else if (project->values("CONFIG").contains("plugin"))
-            targetType = TypePlugin;
-        else
-            targetType = TypeDll;
-    } else {
-        targetType = TypeSubdirs;
-    }
-
-    if (0 != project->values("TARGET.UID2").size()) {
-        uid2 = project->first("TARGET.UID2");
-    } else if (project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive)) {
-        uid2 = "0x20004C45";
-    } else {
-        if (targetType == TypeExe) {
-            if (project->values("QT").contains("gui", Qt::CaseInsensitive)) {
-                // exe and gui -> uid2 needed
-                uid2 = "0x100039CE";
-            } else {
-                // exe but not gui: uid2 is ignored anyway -> set it to 0
-                uid2 = "0";
-            }
-        } else if (targetType == TypeDll || targetType == TypeLib || targetType == TypePlugin) {
-            uid2 = "0x1000008d";
-        }
-    }
-
-    uid2 = uid2.trimmed();
-    uid3 = uid3.trimmed();
-
-    // UID is valid as either hex or decimal, so just convert it to number and back to hex
-    // to get proper string for private dir
-    bool conversionOk = false;
-    uint uidNum = uid3.toUInt(&conversionOk, 0);
-
-    if (!conversionOk) {
-        fprintf(stderr, "Error: Invalid UID \"%s\".\n", uid3.toUtf8().constData());
-    } else {
-        privateDirUid.setNum(uidNum, 16);
-        while (privateDirUid.length() < 8)
-            privateDirUid.insert(0, QLatin1Char('0'));
-    }
-}
-
-QString SymbianMakefileGenerator::getTargetExtension()
-{
-    QString ret;
-    if (targetType == TypeExe) {
-        ret.append("exe");
-    } else if (targetType == TypeLib) {
-        ret.append("lib");
-    } else if (targetType == TypeDll || targetType == TypePlugin) {
-        ret.append("dll");
-    } else if (targetType == TypeSubdirs) {
-        // Not actually usable, so return empty
-    } else {
-        // If nothing else set, default to exe
-        ret.append("exe");
-    }
-
-    return ret;
-}
-
-QString SymbianMakefileGenerator::generateUID3()
-{
-    QString target = project->first("TARGET");
-    QString currPath = qmake_getpwd();
-    target.prepend("/").prepend(currPath);
-    return generate_test_uid(target);
-}
-
-void SymbianMakefileGenerator::initMmpVariables()
-{
-    QStringList sysincspaths;
-    QStringList srcincpaths;
-    QStringList srcpaths;
-
-    srcpaths << project->values("SOURCES") << project->values("GENERATED_SOURCES");
-    srcpaths << project->values("UNUSED_SOURCES") << project->values("UI_SOURCES_DIR");
-    srcpaths << project->values("UI_DIR");
-
-    QDir current = QDir::current();
-    QString canonizedCurrent = canonizePath(".");
-
-    for (int j = 0; j < srcpaths.size(); ++j) {
-        QFileInfo fi(fileInfo(srcpaths.at(j)));
-        // Sometimes sources have other than *.c* files (e.g. *.moc); prune them.
-        if (fi.suffix().startsWith("c")) {
-            if (fi.filePath().length() > fi.fileName().length()) {
-                appendIfnotExist(srcincpaths, fi.path());
-                sources[canonizePath(fi.path())] += fi.fileName();
-            } else {
-                sources[canonizedCurrent] += fi.fileName();
-                appendIfnotExist(srcincpaths, canonizedCurrent);
-            }
-        }
-    }
-
-    QStringList incpaths;
-    incpaths << project->values("INCLUDEPATH");
-    incpaths << QLibraryInfo::location(QLibraryInfo::HeadersPath);
-    incpaths << project->values("HEADERS");
-    incpaths << srcincpaths;
-    incpaths << project->values("UI_HEADERS_DIR");
-    incpaths << project->values("UI_DIR");
-
-    QString epocPath("epoc32");
-    for (int j = 0; j < incpaths.size(); ++j) {
-        QString includepath = canonizePath(incpaths.at(j));
-        appendIfnotExist(sysincspaths, includepath);
-        // As a workaround for Symbian toolchain insistence to treat include
-        // statements as relative to source file rather than the file they appear in,
-        // we generate extra temporary include directories to make
-        // relative include paths used in various headers to work properly.
-        // Note that this is not a fix-all solution; it's just a stop-gap measure
-        // to make Qt itself build until toolchain can support relative includes in
-        // a way that Qt expects.
-        if (!includepath.contains(epocPath)) // No temp dirs for epoc includes
-            appendIfnotExist(sysincspaths, includepath + QString("/" QT_EXTRA_INCLUDE_DIR));
-    }
-
-    // Remove duplicate include path entries
-    QStringList temporary;
-    for (int i = 0; i < sysincspaths.size(); ++i) {
-        QString origPath = sysincspaths.at(i);
-        QFileInfo origPathInfo(fileInfo(origPath));
-        bool bFound = false;
-
-        for (int j = 0; j < temporary.size(); ++j) {
-            QString tmpPath = temporary.at(j);
-            QFileInfo tmpPathInfo(fileInfo(tmpPath));
-
-            if (origPathInfo.absoluteFilePath() == tmpPathInfo.absoluteFilePath()) {
-                bFound = true;
-                if (!tmpPathInfo.isRelative() && origPathInfo.isRelative()) {
-                    // We keep the relative notation
-                    temporary.removeOne(tmpPath);
-                    temporary << origPath;
-                }
-            }
-        }
-
-        if (!bFound)
-            temporary << origPath;
-
-    }
-
-    sysincspaths.clear();
-    sysincspaths << temporary;
-
-    systeminclude.insert("SYSTEMINCLUDE", sysincspaths);
-}
-
-bool SymbianMakefileGenerator::removeDuplicatedStrings(QStringList& stringList)
-{
-    QStringList tmpStringList;
-
-    for (int i = 0; i < stringList.size(); ++i) {
-        QString string = stringList.at(i);
-        if (tmpStringList.contains(string))
-            continue;
-        else
-            tmpStringList.append(string);
-    }
-
-    stringList.clear();
-    stringList = tmpStringList;
-    return true;
-}
-
-void SymbianMakefileGenerator::writeMmpFileHeader(QTextStream &t)
-{
-    t << "// ==============================================================================" << endl;
-    t << "// Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
-    t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
-    t << "// This file is generated by qmake and should not be modified by the" << endl;
-    t << "// user." << endl;
-    t << "//  Name        : " << escapeFilePath(fileFixify(project->projectFile().remove(project->projectFile().length() - 4, 4))) << Option::mmp_ext << endl;
-    t << "// ==============================================================================" << endl << endl;
-}
-
-void SymbianMakefileGenerator::writeMmpFile(QString &filename, QStringList &symbianLangCodes)
-{
-    QFile ft(filename);
-    if (ft.open(QIODevice::WriteOnly)) {
-        generatedFiles << ft.fileName();
-
-        QTextStream t(&ft);
-
-        writeMmpFileHeader(t);
-
-        writeMmpFileTargetPart(t);
-
-        writeMmpFileResourcePart(t, symbianLangCodes);
-
-        writeMmpFileMacrosPart(t);
-
-        writeMmpFileIncludePart(t);
-
-        QDir current = QDir::current();
-
-        for (QMap<QString, QStringList>::iterator it = sources.begin(); it != sources.end(); ++it) {
-            QStringList values = it.value();
-            QString currentSourcePath = it.key();
-
-            if (values.size())
-                t << "SOURCEPATH \t" <<  fixPathForMmp(currentSourcePath, current) << endl;
-
-            for (int i = 0; i < values.size(); ++i) {
-                QString sourceFileName = values.at(i);
-                t << "SOURCE\t\t" << sourceFileName << endl;
-            }
-            t << endl;
-        }
-        t << endl;
-
-        if (!project->values("CONFIG").contains("static") && !project->values("CONFIG").contains("staticlib")) {
-            writeMmpFileLibraryPart(t);
-        }
-
-        writeMmpFileCapabilityPart(t);
-
-        writeMmpFileCompilerOptionPart(t);
-
-        writeMmpFileBinaryVersionPart(t);
-
-        writeMmpFileRulesPart(t);
-    } else {
-        PRINT_FILE_CREATE_ERROR(filename)
-    }
-}
-
-void SymbianMakefileGenerator::writeMmpFileMacrosPart(QTextStream& t)
-{
-    t << endl;
-
-    QStringList &defines = project->values("DEFINES");
-    if (defines.size())
-        t << "// Qt Macros" << endl;
-    for (int i = 0; i < defines.size(); ++i) {
-        QString def = defines.at(i);
-        addMacro(t, def);
-    }
-
-    // These are required in order that all methods will be correctly exported e.g from qtestlib
-    QStringList &exp_defines = project->values("PRL_EXPORT_DEFINES");
-    if (exp_defines.size())
-        t << endl << "// Qt Export Defines" << endl;
-    for (int i = 0; i < exp_defines.size(); ++i) {
-        QString def = exp_defines.at(i);
-        addMacro(t, def);
-    }
-
-    t << endl;
-}
-
-void SymbianMakefileGenerator::addMacro(QTextStream& t, const QString& value)
-{
-    t << "MACRO" << "\t\t" <<  value << endl;
-}
-
-
-void SymbianMakefileGenerator::writeMmpFileTargetPart(QTextStream& t)
-{
-    QString targetTypeValue("");
-
-    if (targetType == TypeExe) {
-        t << MMP_TARGET << "\t\t" << fixedTarget << ".exe" << endl;
-        if (project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive))
-	    targetTypeValue = QString("STDEXE");
-        else
-	    targetTypeValue = QString("EXE");
-    } else if (targetType == TypeDll || targetType == TypePlugin) {
-        t << MMP_TARGET << "\t\t" << fixedTarget << ".dll" << endl;
-        if (project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive))
-	    targetTypeValue = QString("STDDLL");
-        else
-	    targetTypeValue = QString("DLL");
-    } else if (targetType == TypeLib) {
-        t << MMP_TARGET << "\t\t" << fixedTarget << ".lib" << endl;
-        if (project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive))
-	    targetTypeValue = QString("STDLIB");
-        else
-	    targetTypeValue = QString("LIB");
-    } else {
-        fprintf(stderr, "Error: Unexpected targettype (%d) in SymbianMakefileGenerator::writeMmpFileTargetPart\n", targetType);
-    }
-
-    if (0 != project->values("TARGETTYPE_OVERRIDE").size()) {
-        targetTypeValue = project->first("TARGETTYPE_OVERRIDE");
-    }
-
-    t << MMP_TARGETTYPE << "\t\t" << targetTypeValue << endl;
-
-    t << endl;
-
-    t << "UID" << "\t\t" << uid2 << " " << uid3 << endl;
-
-    if (0 != project->values("TARGET.SID").size()) {
-        t << MMP_SECUREID << "\t\t" << project->values("TARGET.SID").join(" ") << endl;
-    } else {
-        if (0 == uid3.size())
-            t << MMP_SECUREID << "\t\t" << "0" << endl;
-        else
-            t << MMP_SECUREID << "\t\t" << uid3 << endl;
-    }
-
-    // default value used from mkspecs is 0
-    if (0 != project->values("TARGET.VID").size()) {
-        t << "VENDORID" << "\t\t" << project->values("TARGET.VID").join(" ") << endl;
-    }
-
-    t << endl;
-
-    if (0 != project->first("TARGET.EPOCSTACKSIZE").size())
-        t << "EPOCSTACKSIZE" << "\t\t" << project->first("TARGET.EPOCSTACKSIZE") << endl;
-    if (0 != project->values("TARGET.EPOCHEAPSIZE").size())
-        t << "EPOCHEAPSIZE" << "\t\t" << project->values("TARGET.EPOCHEAPSIZE").join(" ") << endl;
-    if (0 != project->values("TARGET.EPOCALLOWDLLDATA").size())
-        t << "EPOCALLOWDLLDATA" << endl;
-
-    if (targetType == TypePlugin && !project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive)) {
-        // Use custom def file for Qt plugins
-        t << "DEFFILE " PLUGIN_COMMON_DEF_FILE_FOR_MMP << endl;
-    }
-
-    t << endl;
-}
-
-
-/*
-    Application registration resource files should be installed to the
-    \private\10003a3f\import\apps directory.
-*/
-void SymbianMakefileGenerator::writeMmpFileResourcePart(QTextStream& t, QStringList &symbianLangCodes)
-{
-    if ((targetType == TypeExe) &&
-            !project->values("CONFIG").contains("no_icon", Qt::CaseInsensitive)) {
-
-        QString locTarget = fixedTarget;
-        locTarget.append(".rss");
-
-        t << "SOURCEPATH\t\t\t. " << endl;
-        t << "LANG SC ";    // no endl
-        foreach(QString lang, symbianLangCodes) {
-            t << lang << " "; // no endl
-        }
-        t << endl;
-        t << "START RESOURCE\t\t" << locTarget << endl;
-        t << "HEADER" << endl;
-        t << "TARGETPATH\t\t\t" RESOURCE_DIRECTORY_MMP << endl;
-        t << "END" << endl << endl;
-
-        QString regTarget = fixedTarget;
-        regTarget.append("_reg.rss");
-
-        t << "SOURCEPATH\t\t\t." << endl;
-        t << "START RESOURCE\t\t" << regTarget << endl;
-        if (isForSymbianSbsv2())
-            t << "DEPENDS " << fixedTarget << ".rsg" << endl;
-        t << "TARGETPATH\t\t" REGISTRATION_RESOURCE_DIRECTORY_HW << endl;
-        t << "END" << endl << endl;
-    }
-}
-
-void SymbianMakefileGenerator::writeMmpFileSystemIncludePart(QTextStream& t)
-{
-    QDir current = QDir::current();
-
-    for (QMap<QString, QStringList>::iterator it = systeminclude.begin(); it != systeminclude.end(); ++it) {
-        QStringList values = it.value();
-        for (int i = 0; i < values.size(); ++i) {
-            QString handledPath = values.at(i);
-            t << "SYSTEMINCLUDE" << "\t\t" << fixPathForMmp(handledPath, current) << endl;
-        }
-    }
-
-    t << endl;
-}
-
-void SymbianMakefileGenerator::writeMmpFileIncludePart(QTextStream& t)
-{
-    writeMmpFileSystemIncludePart(t);
-}
-
-void SymbianMakefileGenerator::writeMmpFileLibraryPart(QTextStream& t)
-{
-    QStringList &libs = project->values("LIBS");
-    libs << project->values("QMAKE_LIBS") << project->values("QMAKE_LIBS_PRIVATE");
-
-    removeDuplicatedStrings(libs);
-
-    for (int i = 0; i < libs.size(); ++i) {
-        QString lib = libs.at(i);
-        // The -L flag is uninteresting, since all symbian libraries exist in the same directory.
-        if (lib.startsWith("-l")) {
-            lib.remove(0, 2);
-            QString mmpStatement;
-            if (lib.endsWith(".dll")) {
-                lib.chop(4);
-                mmpStatement = "LIBRARY\t\t";
-            } else if (lib.endsWith(".lib")) {
-                lib.chop(4);
-                mmpStatement = "STATICLIBRARY\t";
-            } else {
-                // Hacky way to find out what kind of library it is. Check the
-                // ARMV5 build directory for library type. We default to shared
-                // library, since that is more common.
-                QString udebStaticLibLocation(epocRoot());
-                QString urelStaticLibLocation(udebStaticLibLocation);
-                udebStaticLibLocation += QString("epoc32/release/armv5/udeb/%1.lib").arg(lib);
-                urelStaticLibLocation += QString("epoc32/release/armv5/urel/%1.lib").arg(lib);
-                if (QFile::exists(udebStaticLibLocation) || QFile::exists(urelStaticLibLocation)) {
-                    mmpStatement = "STATICLIBRARY\t";
-                } else {
-                    mmpStatement = "LIBRARY\t\t";
-                }
-            }
-            t << mmpStatement <<  lib << ".lib" << endl;
-        }
-    }
-
-    t << endl;
-}
-
-void SymbianMakefileGenerator::writeMmpFileCapabilityPart(QTextStream& t)
-{
-    if (0 != project->first("TARGET.CAPABILITY").size()) {
-        QStringList &capabilities = project->values("TARGET.CAPABILITY");
-        t << "CAPABILITY" << "\t\t";
-
-        for (int i = 0; i < capabilities.size(); ++i) {
-            QString cap = capabilities.at(i);
-            t << cap << " ";
-        }
-    } else {
-        t << "CAPABILITY" << "\t\t" << "None";
-    }
-    t << endl << endl;
-}
-
-void SymbianMakefileGenerator::writeMmpFileCompilerOptionPart(QTextStream& t)
-{
-    QString cw, armcc;
-
-    if (0 != project->values("QMAKE_CXXFLAGS.CW").size()) {
-        cw.append(project->values("QMAKE_CXXFLAGS.CW").join(" "));
-        cw.append(" ");
-    }
-
-    if (0 != project->values("QMAKE_CXXFLAGS.ARMCC").size()) {
-        armcc.append(project->values("QMAKE_CXXFLAGS.ARMCC").join(" "));
-        armcc.append(" ");
-    }
-
-    if (0 != project->values("QMAKE_CFLAGS.CW").size()) {
-        cw.append(project->values("QMAKE_CFLAGS.CW").join(" "));
-        cw.append(" ");
-    }
-
-    if (0 != project->values("QMAKE_CFLAGS.ARMCC").size()) {
-        armcc.append(project->values("QMAKE_CFLAGS.ARMCC").join(" "));
-        armcc.append(" ");
-    }
-
-    if (0 != project->values("QMAKE_CXXFLAGS").size()) {
-        cw.append(project->values("QMAKE_CXXFLAGS").join(" "));
-        cw.append(" ");
-        armcc.append(project->values("QMAKE_CXXFLAGS").join(" "));
-        armcc.append(" ");
-    }
-
-    if (0 != project->values("QMAKE_CFLAGS").size()) {
-        cw.append(project->values("QMAKE_CFLAGS").join(" "));
-        cw.append(" ");
-        armcc.append(project->values("QMAKE_CFLAGS").join(" "));
-        armcc.append(" ");
-    }
-
-    if (!cw.isEmpty() && cw[cw.size()-1] == ' ')
-        cw.chop(1);
-    if (!armcc.isEmpty() && armcc[armcc.size()-1] == ' ')
-        armcc.chop(1);
-
-    if (!cw.isEmpty())
-        t << "OPTION" << '\t' << " CW " << cw <<  endl;
-    if (!armcc.isEmpty())
-        t << "OPTION" << '\t' << " ARMCC " << armcc <<  endl;
-
-    t <<  endl;
-}
-
-void SymbianMakefileGenerator::writeMmpFileBinaryVersionPart(QTextStream& t)
-{
-    QString applicationVersion = project->first("VERSION");
-    QStringList verNumList = applicationVersion.split('.');
-    uint major = 0;
-    uint minor = 0;
-    uint patch = 0;
-    bool success = false;
-
-    if (verNumList.size() > 0) {
-        major = verNumList[0].toUInt(&success);
-        if (success && verNumList.size() > 1) {
-            minor = verNumList[1].toUInt(&success);
-            if (success && verNumList.size() > 2) {
-                patch = verNumList[2].toUInt(&success);
-            }
-        }
-    }
-
-    QString mmpVersion;
-    if (success && major <= 0xFFFF && minor <= 0xFF && patch <= 0xFF) {
-        // Symbian binary version only has major and minor components, so compress
-        // Qt's minor and patch values into the minor component. Since Symbian's minor
-        // component is a 16 bit value, only allow 8 bits for each to avoid overflow.
-        mmpVersion.append(QString::number(major))
-            .append('.')
-            .append(QString::number((minor << 8) + patch));
-    } else {
-        if (!applicationVersion.isEmpty())
-            fprintf(stderr, "Invalid VERSION string: %s\n", qPrintable(applicationVersion));
-        mmpVersion = "10.0"; // Default binary version for symbian is 10.0
-    }
-
-    t << "VERSION " << mmpVersion  << endl;
-}
-
-void SymbianMakefileGenerator::writeMmpFileRulesPart(QTextStream& t)
-{
-    foreach(QString item, project->values("MMP_RULES")) {
-        t << endl;
-        // If there is no stringlist defined for a rule, use rule name directly
-        // This is convenience for defining single line mmp statements
-        if (project->values(item).isEmpty()) {
-            t << item << endl;
-        } else {
-            foreach(QString itemRow, project->values(item)) {
-                t << itemRow << endl;
-            }
-        }
-    }
-}
-
-void SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploymentExtension)
-{
-    // Read user defined bld inf rules
-    QMap<QString, QStringList> userBldInfRules;
-    for (QMap<QString, QStringList>::iterator it = project->variables().begin(); it != project->variables().end(); ++it) {
-        if (it.key().startsWith(BLD_INF_RULES_BASE)) {
-            QString newKey = it.key().mid(sizeof(BLD_INF_RULES_BASE) - 1);
-            if (newKey.isEmpty()) {
-                fprintf(stderr, "Warning: Empty BLD_INF_RULES key encountered\n");
-                continue;
-            }
-            QStringList newValues;
-            QStringList values = it.value();
-            foreach(QString item, values) {
-                // If there is no stringlist defined for a rule, use rule name directly
-                // This is convenience for defining single line statements
-                if (project->values(item).isEmpty()) {
-                    newValues << item;
-                } else {
-                    foreach(QString itemRow, project->values(item)) {
-                        newValues << itemRow;
-                    }
-                }
-            }
-            userBldInfRules.insert(newKey, newValues);
-        }
-    }
-
-    // Add includes of subdirs bld.inf files
-
-    QString mmpfilename = escapeFilePath(fileFixify(project->projectFile()));
-    mmpfilename = mmpfilename.replace(mmpfilename.lastIndexOf("."), 4, Option::mmp_ext);
-    QString currentPath = qmake_getpwd();
-
-    if (!currentPath.endsWith(QString("/")))
-        currentPath.append("/");
-
-    QStringList mmpProjects = project->values("MMPFILES_DIRECT_DEPENDS");
-    QStringList shadowProjects = project->values("SHADOW_BLD_INFS");
-
-    removeDuplicatedStrings(mmpProjects);
-    removeDuplicatedStrings(shadowProjects);
-
-    // Go in reverse order as that is the way how we build the list
-    QListIterator<QString> iT(mmpProjects);
-    iT.toBack();
-    while (iT.hasPrevious()) {
-        QString fullMmpName = iT.previous();
-        QString relativePath;
-        QString bldinfFilename;
-
-        QString fullProFilename = fullMmpName;
-        fullProFilename.replace(Option::mmp_ext, Option::pro_ext);
-        QString uid = generate_uid(fullProFilename);
-
-        QString cleanMmpName = fullProFilename;
-        cleanMmpName.replace(Option::pro_ext, QString(""));
-        cleanMmpName.replace(0, cleanMmpName.lastIndexOf("/") + 1, QString(""));
-
-        if (shadowProjects.contains(BLD_INF_FILENAME "." + cleanMmpName)) { // shadow project
-            QDir directory(currentPath);
-            relativePath = directory.relativeFilePath(fullProFilename);
-            bldinfFilename = BLD_INF_FILENAME "." + cleanMmpName;
-            if (relativePath.contains("/")) {
-                // Shadow .pro not in same directory as parent .pro
-                if (relativePath.startsWith("..")) {
-                    // Shadow .pro out of parent .pro
-                    relativePath.replace(relativePath.lastIndexOf("/"), relativePath.length(), QString(""));
-                    bldinfFilename.prepend("/").prepend(relativePath);
-                } else {
-                    relativePath.replace(relativePath.lastIndexOf("/"), relativePath.length(), QString(""));
-                    bldinfFilename.prepend("/").prepend(relativePath);
-                }
-            } else {
-                // Shadow .pro and parent .pro in same directory
-                bldinfFilename.prepend("./");
-            }
-        } else { // regular project
-            QDir directory(currentPath);
-            relativePath = directory.relativeFilePath(fullProFilename);
-            relativePath.replace(relativePath.lastIndexOf("/"), relativePath.length(), QString(""));
-            bldinfFilename = relativePath.append("/").append(BLD_INF_FILENAME);
-        }
-
-        QString bldinfDefine = QString("BLD_INF_") + cleanMmpName + QString("_") + uid;
-        bldinfDefine = bldinfDefine.toUpper();
-        removeSpecialCharacters(bldinfDefine);
-
-        t << "#ifndef " << bldinfDefine << endl;
-        t << "\t#include \"" << QDir::toNativeSeparators(bldinfFilename) << "\"" << endl;
-        t << "#endif // " << bldinfDefine << endl;
-    }
-
-    // Add supported project platforms
-
-    t << endl << BLD_INF_TAG_PLATFORMS << endl << endl;
-    if (0 != project->values("SYMBIAN_PLATFORMS").size())
-        t << project->values("SYMBIAN_PLATFORMS").join(" ") << endl;
-
-    QStringList userItems = userBldInfRules.value(BLD_INF_TAG_PLATFORMS);
-    foreach(QString item, userItems)
-        t << item << endl;
-    userBldInfRules.remove(BLD_INF_TAG_PLATFORMS);
-    t << endl;
-
-    // Add project mmps and old style extension makefiles
-    QString mmpTag;
-    if (project->values("CONFIG").contains("symbian_test", Qt::CaseInsensitive))
-        mmpTag = QLatin1String(BLD_INF_TAG_TESTMMPFILES);
-    else
-        mmpTag = QLatin1String(BLD_INF_TAG_MMPFILES);
-
-    t << endl << mmpTag << endl << endl;
-
-    writeBldInfMkFilePart(t, addDeploymentExtension);
-    if (targetType == TypeSubdirs) {
-        mmpProjects.removeOne(mmpfilename);
-    } else {
-        QString shortProFilename = project->projectFile();
-        shortProFilename.replace(0, shortProFilename.lastIndexOf("/") + 1, QString(""));
-        shortProFilename.replace(Option::pro_ext, QString(""));
-
-        QString mmpFilename = shortProFilename + QString("_") + uid3 + Option::mmp_ext;
-
-        t << mmpFilename << endl;
-    }
-
-    userItems = userBldInfRules.value(mmpTag);
-    foreach(QString item, userItems)
-        t << item << endl;
-    userBldInfRules.remove(mmpTag);
-
-    t << endl << BLD_INF_TAG_EXTENSIONS << endl << endl;
-
-    // Generate extension rules
-    writeBldInfExtensionRulesPart(t);
-
-    userItems = userBldInfRules.value(BLD_INF_TAG_EXTENSIONS);
-    foreach(QString item, userItems)
-        t << item << endl;
-    userBldInfRules.remove(BLD_INF_TAG_EXTENSIONS);
-
-    // Add rest of the user defined content
-
-    for (QMap<QString, QStringList>::iterator it = userBldInfRules.begin(); it != userBldInfRules.end(); ++it) {
-        t << endl << endl << it.key() << endl << endl;
-        userItems = it.value();
-        foreach(QString item, userItems)
-            t << item << endl;
-    }
-}
-
-void SymbianMakefileGenerator::writeRegRssFile(QStringList &userItems)
-{
-    QString filename(fixedTarget);
-    filename.append("_reg.rss");
-    QFile ft(filename);
-    if (ft.open(QIODevice::WriteOnly)) {
-        generatedFiles << ft.fileName();
-        QTextStream t(&ft);
-        t << "// ============================================================================" << endl;
-        t << "// * Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
-        t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
-        t << "// * This file is generated by qmake and should not be modified by the" << endl;
-        t << "// * user." << endl;
-        t << "// ============================================================================" << endl;
-        t << endl;
-        t << "#include <" << fixedTarget << ".rsg>" << endl;
-        t << "#include <appinfo.rh>" << endl;
-        t << endl;
-        //t << "#include <data_caging_paths.hrh>" << "\n" << endl;
-        t << "UID2 " << "KUidAppRegistrationResourceFile" << endl;
-        t << "UID3 " << uid3 << endl << endl;
-        t << "RESOURCE APP_REGISTRATION_INFO" << endl;
-        t << "\t{" << endl;
-        t << "\tapp_file=\"" << fixedTarget << "\";" << endl;
-        t << "\tlocalisable_resource_file=\"" RESOURCE_DIRECTORY_RESOURCE << fixedTarget << "\";" << endl;
-        t << endl;
-
-        foreach(QString item, userItems)
-            t << "\t" << item << endl;
-        t << "\t}" << endl;
-    } else {
-        PRINT_FILE_CREATE_ERROR(filename)
-    }
-}
-
-void SymbianMakefileGenerator::writeRssFile(QString &numberOfIcons, QString &iconFile)
-{
-    QString filename(fixedTarget);
-    filename.append(".rss");
-    QFile ft(filename);
-    if (ft.open(QIODevice::WriteOnly)) {
-        generatedFiles << ft.fileName();
-        QTextStream t(&ft);
-        t << "// ============================================================================" << endl;
-        t << "// * Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
-        t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
-        t << "// * This file is generated by qmake and should not be modified by the" << endl;
-        t << "// * user." << endl;
-        t << "// ============================================================================" << endl;
-        t << endl;
-        t << "#include <appinfo.rh>" << endl;
-        t << "#include \"" << fixedTarget << ".loc\"" << endl;
-        t << endl;
-        t << "RESOURCE LOCALISABLE_APP_INFO r_localisable_app_info" << endl;
-        t << "\t{" << endl;
-        t << "\tshort_caption = STRING_r_short_caption;" << endl;
-        t << "\tcaption_and_icon =" << endl;
-        t << "\tCAPTION_AND_ICON_INFO" << endl;
-        t << "\t\t{" << endl;
-        t << "\t\tcaption = STRING_r_caption;" << endl;
-
-        if (numberOfIcons.isEmpty() || iconFile.isEmpty()) {
-            // There can be maximum one item in this tag, validated when parsed
-            t << "\t\tnumber_of_icons = 0;" << endl;
-            t << "\t\ticon_file = \"\";" << endl;
-        } else {
-            // There can be maximum one item in this tag, validated when parsed
-            t << "\t\tnumber_of_icons = " << numberOfIcons << ";" << endl;
-            t << "\t\ticon_file = \"" << iconFile << "\";" << endl;
-        }
-        t << "\t\t};" << endl;
-        t << "\t}" << endl;
-        t << endl;
-    } else {
-        PRINT_FILE_CREATE_ERROR(filename);
-    }
-}
-
-void SymbianMakefileGenerator::writeLocFile(QStringList &symbianLangCodes)
-{
-    QString filename(fixedTarget);
-    filename.append(".loc");
-    QFile ft(filename);
-    if (ft.open(QIODevice::WriteOnly)) {
-        generatedFiles << ft.fileName();
-        QTextStream t(&ft);
-        t << "// ============================================================================" << endl;
-        t << "// * Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
-        t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
-        t << "// * This file is generated by qmake and should not be modified by the" << endl;
-        t << "// * user." << endl;
-        t << "// ============================================================================" << endl;
-        t << endl;
-        t << "#ifdef LANGUAGE_SC" << endl;
-        t << "#define STRING_r_short_caption \"" << fixedTarget  << "\"" << endl;
-        t << "#define STRING_r_caption \"" << fixedTarget  << "\"" << endl;
-        foreach(QString lang, symbianLangCodes) {
-            t << "#elif defined LANGUAGE_" << lang << endl;
-            t << "#define STRING_r_short_caption \"" << fixedTarget  << "\"" << endl;
-            t << "#define STRING_r_caption \"" << fixedTarget  << "\"" << endl;
-        }
-        t << "#else" << endl;
-        t << "#define STRING_r_short_caption \"" << fixedTarget  << "\"" << endl;
-        t << "#define STRING_r_caption \"" << fixedTarget  << "\"" << endl;
-        t << "#endif" << endl;
-    } else {
-        PRINT_FILE_CREATE_ERROR(filename);
-    }
-}
-
-void SymbianMakefileGenerator::readRssRules(QString &numberOfIcons, QString &iconFile, QStringList &userRssRules)
-{
-    for (QMap<QString, QStringList>::iterator it = project->variables().begin(); it != project->variables().end(); ++it) {
-        if (it.key().startsWith(RSS_RULES_BASE)) {
-            QString newKey = it.key().mid(sizeof(RSS_RULES_BASE) - 1);
-            if (newKey.isEmpty()) {
-                fprintf(stderr, "Warning: Empty RSS_RULES_BASE key encountered\n");
-                continue;
-            }
-            QStringList newValues;
-            QStringList values = it.value();
-            foreach(QString item, values) {
-                // If there is no stringlist defined for a rule, use rule name directly
-                // This is convenience for defining single line statements
-                if (project->values(item).isEmpty()) {
-                    newValues << item;
-                } else {
-                    foreach(QString itemRow, project->values(item)) {
-                        newValues << itemRow;
-                    }
-                }
-            }
-            // Verify thet there is exactly one value in RSS_TAG_NBROFICONS
-            if (newKey == RSS_TAG_NBROFICONS) {
-                if (newValues.count() == 1) {
-                    numberOfIcons = newValues[0];
-                } else {
-                    fprintf(stderr, "Warning: There must be exactly one value in '%s%s'\n",
-                            RSS_RULES_BASE, RSS_TAG_NBROFICONS);
-                    continue;
-                }
-            // Verify thet there is exactly one value in RSS_TAG_ICONFILE
-            } else if (newKey == RSS_TAG_ICONFILE) {
-                if (newValues.count() == 1) {
-                    iconFile = newValues[0];
-                } else {
-                    fprintf(stderr, "Warning: There must be exactly one value in '%s%s'\n",
-                            RSS_RULES_BASE, RSS_TAG_ICONFILE);
-                    continue;
-                }
-            } else {
-                fprintf(stderr, "Warning: Unsupported key:'%s%s'\n",
-                        RSS_RULES_BASE, newKey.toLatin1().constData());
-                continue;
-            }
-        }
-    }
-
-    foreach(QString item, project->values(RSS_RULES)) {
-        // If there is no stringlist defined for a rule, use rule name directly
-        // This is convenience for defining single line mmp statements
-        if (project->values(item).isEmpty()) {
-            userRssRules << item;
-        } else {
-            userRssRules << project->values(item);
-        }
-    }
-
-    // Validate that either both RSS_TAG_NBROFICONS and RSS_TAG_ICONFILE keys exist
-    // or neither of them exist
-    if (!((numberOfIcons.isEmpty() && iconFile.isEmpty()) ||
-            (!numberOfIcons.isEmpty() && !iconFile.isEmpty()))) {
-        numberOfIcons.clear();
-        iconFile.clear();
-        fprintf(stderr, "Warning: Both or neither of '%s%s' and '%s%s' keys must exist.\n",
-                RSS_RULES_BASE, RSS_TAG_NBROFICONS, RSS_RULES_BASE, RSS_TAG_ICONFILE);
-    }
-
-    // Validate that RSS_TAG_NBROFICONS contains only numbers
-    if (!numberOfIcons.isEmpty()) {
-        bool ok;
-        numberOfIcons = numberOfIcons.simplified();
-        int tmp = numberOfIcons.toInt(&ok);
-        if (!ok) {
-            numberOfIcons.clear();
-            iconFile.clear();
-            fprintf(stderr, "Warning: '%s%s' must be integer in decimal format.\n",
-                    RSS_RULES_BASE, RSS_TAG_NBROFICONS);
-        }
-    }
-}
-
-QStringList SymbianMakefileGenerator::symbianLangCodesFromTsFiles()
-{
-    QStringList tsfiles;
-    QStringList symbianLangCodes;
-    tsfiles << project->values("TRANSLATIONS");
-
-    fillQt2S60LangMapTable();
-
-    foreach(QString file, tsfiles) {
-        int extIndex = file.lastIndexOf(".");
-        int langIndex = file.lastIndexOf("_", (extIndex - file.length()));
-        langIndex += 1;
-        QString qtlang = file.mid(langIndex, extIndex - langIndex);
-        QString s60lang = qt2S60LangMapTable.value(qtlang, QString("SC"));
-
-        if (!symbianLangCodes.contains(s60lang) && s60lang != "SC")
-            symbianLangCodes += s60lang;
-    }
-
-    return symbianLangCodes;
-}
-
-void SymbianMakefileGenerator::fillQt2S60LangMapTable()
-{
-    qt2S60LangMapTable.reserve(170); // 165 items at time of writing.
-    qt2S60LangMapTable.insert("ab", "SC");            //Abkhazian                     //
-    qt2S60LangMapTable.insert("om", "SC");            //Afan                          //
-    qt2S60LangMapTable.insert("aa", "SC");            //Afar                          //
-    qt2S60LangMapTable.insert("af", "34");            //Afrikaans                     //Afrikaans
-    qt2S60LangMapTable.insert("sq", "35");            //Albanian                      //Albanian
-    qt2S60LangMapTable.insert("am", "36");            //Amharic                       //Amharic
-    qt2S60LangMapTable.insert("ar", "37");            //Arabic                        //Arabic
-    qt2S60LangMapTable.insert("hy", "38");            //Armenian                      //Armenian
-    qt2S60LangMapTable.insert("as", "SC");            //Assamese                      //
-    qt2S60LangMapTable.insert("ay", "SC");            //Aymara                        //
-    qt2S60LangMapTable.insert("az", "SC");            //Azerbaijani                   //
-    qt2S60LangMapTable.insert("ba", "SC");            //Bashkir                       //
-    qt2S60LangMapTable.insert("eu", "SC");            //Basque                        //
-    qt2S60LangMapTable.insert("bn", "41");            //Bengali                       //Bengali
-    qt2S60LangMapTable.insert("dz", "SC");            //Bhutani                       //
-    qt2S60LangMapTable.insert("bh", "SC");            //Bihari                        //
-    qt2S60LangMapTable.insert("bi", "SC");            //Bislama                       //
-    qt2S60LangMapTable.insert("br", "SC");            //Breton                        //
-    qt2S60LangMapTable.insert("bg", "42");            //Bulgarian                     //Bulgarian
-    qt2S60LangMapTable.insert("my", "43");            //Burmese                       //Burmese
-    qt2S60LangMapTable.insert("be", "40");            //Byelorussian                  //Belarussian
-    qt2S60LangMapTable.insert("km", "SC");            //Cambodian                     //
-    qt2S60LangMapTable.insert("ca", "44");            //Catalan                       //Catalan
-    qt2S60LangMapTable.insert("zh", "SC");            //Chinese                       //
-    qt2S60LangMapTable.insert("co", "SC");            //Corsican                      //
-    qt2S60LangMapTable.insert("hr", "45");            //Croatian                      //Croatian
-    qt2S60LangMapTable.insert("cs", "25");            //Czech                         //Czech
-    qt2S60LangMapTable.insert("da", "07");            //Danish                        //Danish
-    qt2S60LangMapTable.insert("nl", "18");            //Dutch                         //Dutch
-    qt2S60LangMapTable.insert("en", "01");            //English                       //English(UK)
-    qt2S60LangMapTable.insert("eo", "SC");            //Esperanto                     //
-    qt2S60LangMapTable.insert("et", "49");            //Estonian                      //Estonian
-    qt2S60LangMapTable.insert("fo", "SC");            //Faroese                       //
-    qt2S60LangMapTable.insert("fj", "SC");            //Fiji                          //
-    qt2S60LangMapTable.insert("fi", "09");            //Finnish                       //Finnish
-    qt2S60LangMapTable.insert("fr", "02");            //French                        //French
-    qt2S60LangMapTable.insert("fy", "SC");            //Frisian                       //
-    qt2S60LangMapTable.insert("gd", "52");            //Gaelic                        //Gaelic
-    qt2S60LangMapTable.insert("gl", "SC");            //Galician                      //
-    qt2S60LangMapTable.insert("ka", "53");            //Georgian                      //Georgian
-    qt2S60LangMapTable.insert("de", "03");            //German                        //German
-    qt2S60LangMapTable.insert("el", "54");            //Greek                         //Greek
-    qt2S60LangMapTable.insert("kl", "SC");            //Greenlandic                   //
-    qt2S60LangMapTable.insert("gn", "SC");            //Guarani                       //
-    qt2S60LangMapTable.insert("gu", "56");            //Gujarati                      //Gujarati
-    qt2S60LangMapTable.insert("ha", "SC");            //Hausa                         //
-    qt2S60LangMapTable.insert("he", "57");            //Hebrew                        //Hebrew
-    qt2S60LangMapTable.insert("hi", "58");            //Hindi                         //Hindi
-    qt2S60LangMapTable.insert("hu", "17");            //Hungarian                     //Hungarian
-    qt2S60LangMapTable.insert("is", "15");            //Icelandic                     //Icelandic
-    qt2S60LangMapTable.insert("id", "59");            //Indonesian                    //Indonesian
-    qt2S60LangMapTable.insert("ia", "SC");            //Interlingua                   //
-    qt2S60LangMapTable.insert("ie", "SC");            //Interlingue                   //
-    qt2S60LangMapTable.insert("iu", "SC");            //Inuktitut                     //
-    qt2S60LangMapTable.insert("ik", "SC");            //Inupiak                       //
-    qt2S60LangMapTable.insert("ga", "60");            //Irish                         //Irish
-    qt2S60LangMapTable.insert("it", "05");            //Italian                       //Italian
-    qt2S60LangMapTable.insert("ja", "32");            //Japanese                      //Japanese
-    qt2S60LangMapTable.insert("jv", "SC");            //Javanese                      //
-    qt2S60LangMapTable.insert("kn", "62");            //Kannada                       //Kannada
-    qt2S60LangMapTable.insert("ks", "SC");            //Kashmiri                      //
-    qt2S60LangMapTable.insert("kk", "63");            //Kazakh                        //Kazakh
-    qt2S60LangMapTable.insert("rw", "SC");            //Kinyarwanda                   //
-    qt2S60LangMapTable.insert("ky", "SC");            //Kirghiz                       //
-    qt2S60LangMapTable.insert("ko", "65");            //Korean                        //Korean
-    qt2S60LangMapTable.insert("ku", "SC");            //Kurdish                       //
-    qt2S60LangMapTable.insert("rn", "SC");            //Kurundi                       //
-    qt2S60LangMapTable.insert("lo", "66");            //Laothian                      //Laothian
-    qt2S60LangMapTable.insert("la", "SC");            //Latin                         //
-    qt2S60LangMapTable.insert("lv", "67");            //Latvian                       //Latvian
-    qt2S60LangMapTable.insert("ln", "SC");            //Lingala                       //
-    qt2S60LangMapTable.insert("lt", "68");            //Lithuanian                    //Lithuanian
-    qt2S60LangMapTable.insert("mk", "69");            //Macedonian                    //Macedonian
-    qt2S60LangMapTable.insert("mg", "SC");            //Malagasy                      //
-    qt2S60LangMapTable.insert("ms", "70");            //Malay                         //Malay
-    qt2S60LangMapTable.insert("ml", "71");            //Malayalam                     //Malayalam
-    qt2S60LangMapTable.insert("mt", "SC");            //Maltese                       //
-    qt2S60LangMapTable.insert("mi", "SC");            //Maori                         //
-    qt2S60LangMapTable.insert("mr", "72");            //Marathi                       //Marathi
-    qt2S60LangMapTable.insert("mo", "73");            //Moldavian                     //Moldovian
-    qt2S60LangMapTable.insert("mn", "74");            //Mongolian                     //Mongolian
-    qt2S60LangMapTable.insert("na", "SC");            //Nauru                         //
-    qt2S60LangMapTable.insert("ne", "SC");            //Nepali                        //
-    qt2S60LangMapTable.insert("nb", "08");            //Norwegian                     //Norwegian
-    qt2S60LangMapTable.insert("oc", "SC");            //Occitan                       //
-    qt2S60LangMapTable.insert("or", "SC");            //Oriya                         //
-    qt2S60LangMapTable.insert("ps", "SC");            //Pashto                        //
-    qt2S60LangMapTable.insert("fa", "SC");            //Persian                       //
-    qt2S60LangMapTable.insert("pl", "27");            //Polish                        //Polish
-    qt2S60LangMapTable.insert("pt", "13");            //Portuguese                    //Portuguese
-    qt2S60LangMapTable.insert("pa", "77");            //Punjabi                       //Punjabi
-    qt2S60LangMapTable.insert("qu", "SC");            //Quechua                       //
-    qt2S60LangMapTable.insert("rm", "SC");            //RhaetoRomance                 //
-    qt2S60LangMapTable.insert("ro", "78");            //Romanian                      //Romanian
-    qt2S60LangMapTable.insert("ru", "16");            //Russian                       //Russian
-    qt2S60LangMapTable.insert("sm", "SC");            //Samoan                        //
-    qt2S60LangMapTable.insert("sg", "SC");            //Sangho                        //
-    qt2S60LangMapTable.insert("sa", "SC");            //Sanskrit                      //
-    qt2S60LangMapTable.insert("sr", "79");            //Serbian                       //Serbian
-    qt2S60LangMapTable.insert("sh", "SC");            //SerboCroatian                 //
-    qt2S60LangMapTable.insert("st", "SC");            //Sesotho                       //
-    qt2S60LangMapTable.insert("tn", "SC");            //Setswana                      //
-    qt2S60LangMapTable.insert("sn", "SC");            //Shona                         //
-    qt2S60LangMapTable.insert("sd", "SC");            //Sindhi                        //
-    qt2S60LangMapTable.insert("si", "80");            //Singhalese                    //Sinhalese
-    qt2S60LangMapTable.insert("ss", "SC");            //Siswati                       //
-    qt2S60LangMapTable.insert("sk", "26");            //Slovak                        //Slovak
-    qt2S60LangMapTable.insert("sl", "28");            //Slovenian                     //Slovenian
-    qt2S60LangMapTable.insert("so", "81");            //Somali                        //Somali
-    qt2S60LangMapTable.insert("es", "04");            //Spanish                       //Spanish
-    qt2S60LangMapTable.insert("su", "SC");            //Sundanese                     //
-    qt2S60LangMapTable.insert("sw", "84");            //Swahili                       //Swahili
-    qt2S60LangMapTable.insert("sv", "06");            //Swedish                       //Swedish
-    qt2S60LangMapTable.insert("tl", "39");            //Tagalog                       //Tagalog
-    qt2S60LangMapTable.insert("tg", "SC");            //Tajik                         //
-    qt2S60LangMapTable.insert("ta", "87");            //Tamil                         //Tamil
-    qt2S60LangMapTable.insert("tt", "SC");            //Tatar                         //
-    qt2S60LangMapTable.insert("te", "88");            //Telugu                        //Telugu
-    qt2S60LangMapTable.insert("th", "33");            //Thai                          //Thai
-    qt2S60LangMapTable.insert("bo", "89");            //Tibetan                       //Tibetan
-    qt2S60LangMapTable.insert("ti", "90");            //Tigrinya                      //Tigrinya
-    qt2S60LangMapTable.insert("to", "SC");            //Tonga                         //
-    qt2S60LangMapTable.insert("ts", "SC");            //Tsonga                        //
-    qt2S60LangMapTable.insert("tr", "14");            //Turkish                       //Turkish
-    qt2S60LangMapTable.insert("tk", "92");            //Turkmen                       //Turkmen
-    qt2S60LangMapTable.insert("tw", "SC");            //Twi                           //
-    qt2S60LangMapTable.insert("ug", "SC");            //Uigur                         //
-    qt2S60LangMapTable.insert("uk", "93");            //Ukrainian                     //Ukrainian
-    qt2S60LangMapTable.insert("ur", "94");            //Urdu                          //Urdu
-    qt2S60LangMapTable.insert("uz", "SC");            //Uzbek                         //
-    qt2S60LangMapTable.insert("vi", "96");            //Vietnamese                    //Vietnamese
-    qt2S60LangMapTable.insert("vo", "SC");            //Volapuk                       //
-    qt2S60LangMapTable.insert("cy", "97");            //Welsh                         //Welsh
-    qt2S60LangMapTable.insert("wo", "SC");            //Wolof                         //
-    qt2S60LangMapTable.insert("xh", "SC");            //Xhosa                         //
-    qt2S60LangMapTable.insert("yi", "SC");            //Yiddish                       //
-    qt2S60LangMapTable.insert("yo", "SC");            //Yoruba                        //
-    qt2S60LangMapTable.insert("za", "SC");            //Zhuang                        //
-    qt2S60LangMapTable.insert("zu", "98");            //Zulu                          //Zulu
-    qt2S60LangMapTable.insert("nn", "75");            //Nynorsk                       //NorwegianNynorsk
-    qt2S60LangMapTable.insert("bs", "SC");            //Bosnian                       //
-    qt2S60LangMapTable.insert("dv", "SC");            //Divehi                        //
-    qt2S60LangMapTable.insert("gv", "SC");            //Manx                          //
-    qt2S60LangMapTable.insert("kw", "SC");            //Cornish                       //
-    qt2S60LangMapTable.insert("ak", "SC");            //Akan                          //
-    qt2S60LangMapTable.insert("kok", "SC");           //Konkani                       //
-    qt2S60LangMapTable.insert("gaa", "SC");           //Ga                            //
-    qt2S60LangMapTable.insert("ig", "SC");            //Igbo                          //
-    qt2S60LangMapTable.insert("kam", "SC");           //Kamba                         //
-    qt2S60LangMapTable.insert("syr", "SC");           //Syriac                        //
-    qt2S60LangMapTable.insert("byn", "SC");           //Blin                          //
-    qt2S60LangMapTable.insert("gez", "SC");           //Geez                          //
-    qt2S60LangMapTable.insert("kfo", "SC");           //Koro                          //
-    qt2S60LangMapTable.insert("sid", "SC");           //Sidamo                        //
-    qt2S60LangMapTable.insert("cch", "SC");           //Atsam                         //
-    qt2S60LangMapTable.insert("tig", "SC");           //Tigre                         //
-    qt2S60LangMapTable.insert("kaj", "SC");           //Jju                           //
-    qt2S60LangMapTable.insert("fur", "SC");           //Friulian                      //
-    qt2S60LangMapTable.insert("ve", "SC");            //Venda                         //
-    qt2S60LangMapTable.insert("ee", "SC");            //Ewe                           //
-    qt2S60LangMapTable.insert("wa", "SC");            //Walamo                        //
-    qt2S60LangMapTable.insert("haw", "SC");           //Hawaiian                      //
-    qt2S60LangMapTable.insert("kcg", "SC");           //Tyap                          //
-    qt2S60LangMapTable.insert("ny", "SC");            //Chewa                         //
-}
-
-void SymbianMakefileGenerator::appendIfnotExist(QStringList &list, QString value)
-{
-    if (!list.contains(value))
-        list += value;
-}
-
-void SymbianMakefileGenerator::appendIfnotExist(QStringList &list, QStringList values)
-{
-    foreach(QString item, values)
-        appendIfnotExist(list, item);
-}
-
-QString SymbianMakefileGenerator::removePathSeparators(QString &file)
-{
-    QString ret = file;
-    while (ret.indexOf(QDir::separator()) > 0) {
-        ret.remove(0, ret.indexOf(QDir::separator()) + 1);
-    }
-
-    return ret;
-}
-
-
-QString SymbianMakefileGenerator::removeTrailingPathSeparators(QString &file)
-{
-    QString ret = file;
-    if (ret.endsWith(QDir::separator())) {
-        ret.remove(ret.length() - 1, 1);
-    }
-
-    return ret;
-}
-
-void SymbianMakefileGenerator::generateCleanCommands(QTextStream& t,
-        const QStringList& toClean,
-        const QString& cmd,
-        const QString& cmdOptions,
-        const QString& itemPrefix,
-        const QString& itemSuffix)
-{
-    for (int i = 0; i < toClean.size(); ++i) {
-        QString item = toClean.at(i);
-        item.prepend(itemPrefix).append(itemSuffix);
-#if defined(Q_OS_WIN)
-        t << "\t-@ if EXIST \"" << QDir::toNativeSeparators(item) << "\" ";
-        t << cmd << " " << cmdOptions << " \"" << QDir::toNativeSeparators(item) << "\"" << endl;
-#else
-        t << "\t-if test -f " << QDir::toNativeSeparators(item) << "; then ";
-        t << cmd << " " << cmdOptions << " " << QDir::toNativeSeparators(item) << "; fi" << endl;
-#endif
-    }
-}
-
-void SymbianMakefileGenerator::removeSpecialCharacters(QString& str)
-{
-    str.replace(QString("/"), QString("_"));
-    str.replace(QString("\\"), QString("_"));
-    str.replace(QString("-"), QString("_"));
-    str.replace(QString(":"), QString("_"));
-    str.replace(QString("."), QString("_"));
-    str.replace(QString(" "), QString("_"));
-}
-
-void SymbianMakefileGenerator::writeSisTargets(QTextStream &t)
-{
-    t << SIS_TARGET ": " RESTORE_BUILD_TARGET << endl;
-    QString siscommand = QString("\t$(if $(wildcard %1_template.%2),$(if $(wildcard %3)," \
-                                  "$(MAKE) -s -f $(MAKEFILE) %4,$(MAKE) -s -f $(MAKEFILE) %5)," \
-                                  "$(MAKE) -s -f $(MAKEFILE) %6)")
-                          .arg(fixedTarget)
-                          .arg("pkg")
-                          .arg(MAKE_CACHE_NAME)
-                          .arg(OK_SIS_TARGET)
-                          .arg(FAIL_SIS_NOCACHE_TARGET)
-                          .arg(FAIL_SIS_NOPKG_TARGET);    
-    t << siscommand << endl;         
-    t << endl;
-
-    t << OK_SIS_TARGET ":" << endl;
-
-    QString pkgcommand = QString("\tcreatepackage.bat $(QT_SIS_OPTIONS) %1_template.%2 $(QT_SIS_TARGET) " \
-                                 "$(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)")
-                          .arg(fixedTarget)
-                          .arg("pkg");
-    t << pkgcommand << endl;
-    t << endl;
-    
-    t << FAIL_SIS_NOPKG_TARGET ":" << endl;  
-    t << "\t$(error PKG file does not exist, 'SIS' target is only supported for executables or projects with DEPLOYMENT statement)" << endl;  
-    t << endl;
-    
-    t << FAIL_SIS_NOCACHE_TARGET ":" << endl;  
-    t << "\t$(error Project has to be build before calling 'SIS' target)" << endl;  
-    t << endl;
-    
-
-    t << RESTORE_BUILD_TARGET ":" << endl;
-    t << "-include " MAKE_CACHE_NAME << endl;
-    t << endl;
-}
-
-void SymbianMakefileGenerator::generateDistcleanTargets(QTextStream& t)
-{
-    t << "dodistclean:" << endl;
-    foreach(QString item, project->values("SUBDIRS")) {
-        bool fromFile = false;
-        QString fixedItem;
-        if (!project->isEmpty(item + ".file")) {
-            fixedItem = project->first(item + ".file");
-            fromFile = true;
-        } else if (!project->isEmpty(item + ".subdir")) {
-            fixedItem = project->first(item + ".subdir");
-            fromFile = false;
-        } else {
-            fromFile = item.endsWith(Option::pro_ext);
-            fixedItem = item;
-        }
-        QFileInfo fi(fileInfo(fixedItem));
-        if (!fromFile) {
-            t << "\t-$(MAKE) -f \"" << Option::fixPathToTargetOS(fi.absoluteFilePath() + "/Makefile") << "\" dodistclean" << endl;
-        } else {
-            QString itemName = fi.fileName();
-            int extIndex = itemName.lastIndexOf(Option::pro_ext);
-            if (extIndex)
-                fixedItem = fi.absolutePath() + "/" + QString("Makefile.") + itemName.mid(0, extIndex);
-            t << "\t-$(MAKE) -f \"" << Option::fixPathToTargetOS(fixedItem) << "\" dodistclean" << endl;
-        }
-
-    }
-
-    generatedFiles << Option::fixPathToTargetOS(fileInfo(Option::output.fileName()).absoluteFilePath()); // bld.inf
-    generatedFiles << project->values("QMAKE_INTERNAL_PRL_FILE"); // Add generated prl files for cleanup
-    generatedFiles << project->values("QMAKE_DISTCLEAN"); // Add any additional files marked for distclean
-    QStringList fixedFiles;
-    QStringList fixedDirs;
-    foreach(QString item, generatedFiles) {
-        QString fixedItem = Option::fixPathToTargetOS(fileInfo(item).absoluteFilePath());
-        if (!fixedFiles.contains(fixedItem)) {
-            fixedFiles << fixedItem;
-        }
-    }
-    foreach(QString item, generatedDirs) {
-        QString fixedItem = Option::fixPathToTargetOS(fileInfo(item).absoluteFilePath());
-        if (!fixedDirs.contains(fixedItem)) {
-            fixedDirs << fixedItem;
-        }
-    }
-    generateCleanCommands(t, fixedFiles, "$(DEL_FILE)", "", "", "");
-    generateCleanCommands(t, fixedDirs, "$(DEL_DIR)", "", "", "");
-    t << endl;
-
-    t << "distclean: clean dodistclean" << endl;
-    t << endl;
-}

--- a/qtecomplugins/supplements/qmake/NOTE.txt	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Those patches should be regarded as hints how to change symmake.cpp in qmake sources as different snapshots of qt could vary here much (even if from the same branch).
\ No newline at end of file

--- a/qtecomplugins/xqplugins/inc/xqpluginhandle.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/xqplugins/inc/xqpluginhandle.h	Fri May 14 16:41:33 2010 +0300
@@ -15,32 +15,20 @@
 * along with this program.  If not, 
 * see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
 *
-* Description:  Class is responsible for unload ECom resources
+* Description:  This class is responsible for unload ECom resources
 *
 */
 
 #ifndef XQPLUGINHANDLE_H
 #define XQPLUGINHANDLE_H
 
-// INCLUDES
 #include <QObject>
 
-
-/**
- *  QPluginHandle
- * 
- */
 class XQPluginHandle : public QObject
     {
 public:
-    /**
-     * Constructor
-     */
     XQPluginHandle(int pluginContextId, QObject* parentPtr);
     
-    /**
-     * Destructor.
-     */
     ~XQPluginHandle();
     
 private:

--- a/qtecomplugins/xqplugins/inc/xqplugininfoprivate.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/xqplugins/inc/xqplugininfoprivate.h	Fri May 14 16:41:33 2010 +0300
@@ -28,44 +28,20 @@
 class XQPluginInfoPrivate
 {
 public:
-    /**
-     * Constructor
-     */
     XQPluginInfoPrivate();
     
-    /**
-     * Copy constuctor
-     */
     XQPluginInfoPrivate(const XQPluginInfoPrivate &pluginInfoPrivate);
     
-    /**
-     * Initialization constructor
-     */
     XQPluginInfoPrivate(quint32 id, quint32 version, const QString &dllName, const QString &opaqueData);
     
-    /**
-     * Destructor
-     */
     ~XQPluginInfoPrivate();
     
-    /**
-     * Plugin implementation UID
-     */
     inline quint32 uid() const;
     
-    /**
-     * Plugin implementation version
-     */
     inline quint32 version() const;
     
-    /**
-     * Plugin file name
-     */
     inline const QString& dllName() const;
     
-    /**
-     * Plugin meta data
-     */
     inline const QString& opaqueData() const;
     
 private:

--- a/qtecomplugins/xqplugins/inc/xqpluginloaderprivate.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/xqplugins/inc/xqpluginloaderprivate.h	Fri May 14 16:41:33 2010 +0300
@@ -15,7 +15,7 @@
 * along with this program.  If not, 
 * see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
 *
-* Description:  Private plugin loader implementation
+* Description: Private plugin's loader implementation.
 *
 */
 
@@ -29,14 +29,11 @@
 #include <QLibrary>
 #include <QSettings>
 
-//Incudes
 #include <ecom/implementationinformation.h>
 #include <ecom/ecom.h>
 
-//Forward class declaration
 class XQPluginInfo;
 
-//Class declaration
 class XQPluginLoaderPrivate
 {
 public:

--- a/qtecomplugins/xqplugins/include/xqplugin.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/xqplugins/include/xqplugin.h	Fri May 14 16:41:33 2010 +0300
@@ -1,49 +1,29 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module 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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** 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.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, 
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
+*
+* Description:  
+*
+*/
 
 #ifndef XQPLUGIN_H
 #define XQPLUGIN_H
 
 #include <xqpluginfactory.h>
-#include <ecom/ImplementationProxy.h>
+#include <ecom/implementationproxy.h>
 
 #  define XQ_PLUGIN_ECOM_HEADER(PLUGIN) \
         class C##PLUGIN##Factory : public CPluginFactory { \
@@ -57,7 +37,7 @@
     C##PLUGIN##Factory * C##PLUGIN##Factory::NewL() {return new(ELeave) C##PLUGIN##Factory;} \
     QObject* C##PLUGIN##Factory::constructPlugin(){ return new PLUGINCLASS;}
 
-// left for convenience
+// convenience macro
 #  define XQ_EXPORT_PLUGIN(PLUGIN, PLUGINCLASS) \
         XQ_EXPORT_PLUGIN2(PLUGIN, PLUGINCLASS)

--- a/qtecomplugins/xqplugins/include/xqpluginfactory.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/xqplugins/include/xqpluginfactory.h	Fri May 14 16:41:33 2010 +0300
@@ -1,43 +1,23 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module 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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** 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.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, 
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
+*
+* Description:  
+*
+*/
 
 #ifndef XQPLUGINFACTORY_H
 #define XQPLUGINFACTORY_H

--- a/qtecomplugins/xqplugins/include/xqplugininfo.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/xqplugins/include/xqplugininfo.h	Fri May 14 16:41:33 2010 +0300
@@ -15,7 +15,7 @@
 * along with this program.  If not, 
 * see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
 *
-* Description:  Class implement plugin description
+* Description: This class implements a plugin's description (metadata).
 *
 */
 
@@ -35,57 +35,20 @@
 class DLL_EXPORT XQPluginInfo
     {
 public:
-    /**
-     * Constructor
-     */
+
     XQPluginInfo();
-    
-    /**
-     * Copy constuctor
-     */
     XQPluginInfo(const XQPluginInfo &pluginInfo);
-    
-    /**
-     * Initialization constructor
-     */
     XQPluginInfo(quint32 uid, quint32 version, const QString &dllName, const QString &opaqueData);
-    
-    /**
-     * Destructor
-     */
     ~XQPluginInfo();
-    
-    /**
-     * Assignment operator
-     */
     XQPluginInfo &operator=(const XQPluginInfo &other);
-    
-    /**
-     * Plugin implementation UID
-     */
     quint32 uid() const;
-    
-    /**
-     * Plugin implementation version
-     */
     quint32 version() const;
-    
-    /**
-     * Plugin file name
-     */
     const QString& dllName() const;
-    
-    /**
-     * Plugin meta data
-     */
     const QString& opaqueData() const;
     
 private:
-    /**
-     * Plugin info private implementation.
-     * Own
-     */
+
     XQPluginInfoPrivate *d_ptr;
     };
+	
 #endif /* XQPLUGININFO_H_ */
-

--- a/qtecomplugins/xqplugins/include/xqpluginloader.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/xqplugins/include/xqpluginloader.h	Fri May 14 16:41:33 2010 +0300
@@ -22,12 +22,11 @@
 #ifndef XQPLUGINLOADER_H
 #define XQPLUGINLOADER_H
 
-//Incudes
 #include <QtGlobal>
 #include <QObject>
 #include <QList>
 #include <QString>
-//Forward class declarations
+
 class XQPluginInfo;
 class XQPluginLoaderPrivate;
 
@@ -37,79 +36,31 @@
 #define DLL_EXPORT Q_DECL_IMPORT
 #endif
 
-
-//Class declaration
 class DLL_EXPORT XQPluginLoader : public QObject
 {
 public:
-    /**
-     * Constructor
-     * @param parent - address of class instance parent 
-     */
+
     XQPluginLoader(QObject* parent = 0);
     
-    /**
-     * Constructor
-     * @param uid - UID of plugin that should be loaded
-     * @param parent - address of class instance parent 
-     */
     XQPluginLoader(int uid, QObject* parent = 0);
     
-    /**
-     * Destructor
-     */
     virtual ~XQPluginLoader();
     
-    /**
-     * List available plugins which implement requested interface. 
-     * Function resolve plugins using interface name
-     * @param interfaceName - requested interface name
-     * @param impls - destination list where resolved plugins info will be stored
-     * @return true on success, false on any error
-     */
     static bool listImplementations(const QString &interfaceName, 
                              QList<XQPluginInfo > &impls);
     
-    
-    /**
-     * Function return UID of requested plugin
-     */
     int uid()const;
     
-    
-    /**
-     * Function return pointer to plugin root-component instance
-     * @return instance address on success, 0 otherwise  
-     */
     QObject* instance();
     
-    /**
-     * Function return information if plugin have been loaded
-     * @return true if plugin have been loaded, false otherwise 
-     */
     bool isLoaded() const;
     
-    /**
-     * Function load requested plugin
-     * @return true on success, false otherwise
-     */
     bool load();
     
-    
-    /**
-     * Function unload plugin
-     * @return true on success, false otherwise 
-     */
     bool unload();
     
-    /**
-     * 
-     */
     void setUid ( int uid );
     
-    /**
-     * 
-     */
     QString errorString () const;
     
 private:

--- a/qtecomplugins/xqplugins/src/xqpluginfactory.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/xqplugins/src/xqpluginfactory.cpp	Fri May 14 16:41:33 2010 +0300
@@ -1,43 +1,23 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module 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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** 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.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, 
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
+*
+* Description: This class implements plugins factory.
+*
+*/
 
 #include <xqpluginfactory.h>
 
@@ -46,6 +26,9 @@
 #include <QString>
 #include <QObject>
 
+/*!
+ Constructs plugin factory.
+*/
 CPluginFactory* CPluginFactory::NewL(int aUid)
 {
     TUid requestedUid(KNullUid);
@@ -56,6 +39,9 @@
                                                             iDtor_ID_Key)));
 }
 
+/*!
+  Destroys plugin factory.
+*/
 EXPORT_C CPluginFactory::~CPluginFactory()
 {
     if (KNullUid != iDtor_ID_Key) {
@@ -63,6 +49,10 @@
     }
 }
 
+
+/*!
+  Plugin factorizatoin method.
+*/
 QObject* CPluginFactory::createQtPlugin()
 {
     QObject* retVal(NULL);

--- a/qtecomplugins/xqplugins/src/xqpluginhandle.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/xqplugins/src/xqpluginhandle.cpp	Fri May 14 16:41:33 2010 +0300
@@ -15,17 +15,16 @@
 * along with this program.  If not, 
 * see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
 *
-* Description:
+* Description: This class implements a plugin handle.
 *
 */
 
 #include "xqpluginhandle.h"
 #include <ecom/ecom.h>
 
-// -----------------------------------------------------------------------------
-// QPluginHandle
-// -----------------------------------------------------------------------------
-//
+/*!
+  QPluginHandle.
+*/
 XQPluginHandle::XQPluginHandle(int contextId, QObject* parentPtr)
 :
 QObject(parentPtr),
@@ -34,10 +33,9 @@
     //No implementation required
 }
 
-// -----------------------------------------------------------------------------
-// ~QPluginHandle
-// -----------------------------------------------------------------------------
-//
+/*!
+  ~QPluginHandle.
+*/
 XQPluginHandle::~XQPluginHandle()
 {
     if( KNullUid != TUid::Uid(pluginContextId) ){

--- a/qtecomplugins/xqplugins/src/xqplugininfo.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/xqplugins/src/xqplugininfo.cpp	Fri May 14 16:41:33 2010 +0300
@@ -15,25 +15,35 @@
 * along with this program.  If not, 
 * see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
 *
-* Description:  Class implement plugin description
+* Description: This class implements a plugin's description (metadata).
 *
 */
 
 #include "xqplugininfo.h"
 #include "xqplugininfoprivate.h"
 
+
+/*!
+  Constructs plugin info object. 
+*/
 XQPluginInfo::XQPluginInfo()
 :
 d_ptr(new XQPluginInfoPrivate())
 {
 }
 
+/*!
+  Constructs copy of plugin info object.
+*/
 XQPluginInfo::XQPluginInfo(const XQPluginInfo &pluginInfo)
 :
 d_ptr(new XQPluginInfoPrivate(*pluginInfo.d_ptr))
 {
 }
 
+/*!
+  Constructs plugin info object with given data. 
+*/
 XQPluginInfo::XQPluginInfo(quint32 id, 
                            quint32 version, 
                            const QString &dllName, 
@@ -43,6 +53,9 @@
 {
 }
 
+/*!
+  Assignment operator.
+*/
 XQPluginInfo &XQPluginInfo::operator=(const XQPluginInfo &other)
 {
     if (this != &other) {
@@ -54,6 +67,9 @@
     return *this;
 }
 
+/*!
+  Destroys plugin info object.
+*/
 XQPluginInfo::~XQPluginInfo()
 {
     if (d_ptr != 0){
@@ -61,21 +77,33 @@
     }
 }
 
+/*!
+  Returns plugin implementation UID.
+*/
 quint32 XQPluginInfo::uid() const
 {
     return d_ptr->uid();
 }
 
+/*!
+  Returns plugin implementation version.
+*/
 quint32 XQPluginInfo::version() const
 {
     return d_ptr->version();
 }
 
+/*!
+  Returns plugin dll name.
+*/
 const QString& XQPluginInfo::dllName() const
 {
     return d_ptr->dllName();
 }
 
+/*!
+  Returns plugin implementation opaque data. This is given by SERVICE.CONFIGURATION variable in pro file of the plugin.
+*/
 const QString& XQPluginInfo::opaqueData() const
 {
     return d_ptr->opaqueData();

--- a/qtecomplugins/xqplugins/src/xqplugininfoprivate.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/xqplugins/src/xqplugininfoprivate.cpp	Fri May 14 16:41:33 2010 +0300
@@ -15,12 +15,15 @@
 * along with this program.  If not, 
 * see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
 *
-* Description:  Private implementation of plugin description
+* Description: This is a private implementation of a plugin's description.
 *
 */
 
 #include "xqplugininfoprivate.h"
 
+/*!
+  Default constructor.
+*/
 XQPluginInfoPrivate::XQPluginInfoPrivate()
 :
 iUid(),
@@ -30,6 +33,9 @@
 {
 }
 
+/*!
+  Constructor.
+*/
 XQPluginInfoPrivate::XQPluginInfoPrivate(
         const XQPluginInfoPrivate &pluginInfoPrivate)
 :
@@ -40,6 +46,9 @@
 {
 }
 
+/*!
+  Constructor.
+*/
 XQPluginInfoPrivate::XQPluginInfoPrivate(quint32 id, 
                                          quint32 version, 
                                          const QString &dllName, 
@@ -52,6 +61,9 @@
 {
 }
 
+/*!
+  Destructor.
+*/
 XQPluginInfoPrivate::~XQPluginInfoPrivate()
 {
 }

--- a/qtecomplugins/xqplugins/src/xqpluginloader.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/xqplugins/src/xqpluginloader.cpp	Fri May 14 16:41:33 2010 +0300
@@ -15,7 +15,7 @@
 * along with this program.  If not, 
 * see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
 *
-* Description:  Class implement extended wrapper for ECom framework
+* Description:  This class implements an extended wrapper for the ECOM framework.
 *
 */
 
@@ -24,10 +24,11 @@
 
 #include <qfileinfo.h>
 #include "qdebug.h"
-// -----------------------------------------------------------------------------
-// XQPluginLoader()
-// -----------------------------------------------------------------------------
-//
+
+/*!
+  Constructs plugin loader with the given parent.
+  @param parent - address of class instance parent 
+*/
 XQPluginLoader::XQPluginLoader(QObject* parent) 
 : 
 QObject(parent),
@@ -36,10 +37,11 @@
 {
 }
 
-// -----------------------------------------------------------------------------
-// XQPluginLoader(int, QObject*)
-// -----------------------------------------------------------------------------
-//
+/*!
+  Constructs plugin loader with the given parent and plugin implementation UID.
+  @param uid - UID of plugin that should be loaded
+  @param parent - address of class instance parent 
+ */
 XQPluginLoader::XQPluginLoader(int requestedUid, QObject* parent) 
 : 
 QObject(parent),
@@ -48,10 +50,9 @@
 {
 }
 
-// -----------------------------------------------------------------------------
-// ~XQPluginLoader2()
-// -----------------------------------------------------------------------------
-//
+/*!
+  Destroys plugin loader. Unless unload() was called explicitly, plugins still stays in memory.
+*/
 XQPluginLoader::~XQPluginLoader()
 {
     if(d) {
@@ -59,10 +60,13 @@
     }
 }
 
-// -----------------------------------------------------------------------------
-// listImplementations(const QString &interfaceName, QList<XQPluginInfo> &impls)
-// -----------------------------------------------------------------------------
-//
+/*!
+  List available plugins which implement requested interface. Plugins are resolved using interface name.
+  
+  @param interfaceName - requested interface name
+  @param impls - destination list where resolved plugins info will be stored
+  @return true on success, false on any error
+*/
 bool XQPluginLoader::listImplementations(
         const QString &interfaceName, 
         QList< XQPluginInfo > &impls)
@@ -73,19 +77,18 @@
     return ( KErrNone == errCode );
 }
 
-// -----------------------------------------------------------------------------
-// uid()
-// -----------------------------------------------------------------------------
-//
+/*!
+  Returns UID of requested plugin.
+ */
 int XQPluginLoader::uid()const
 {
     return ( d ? d->uid : KNullUid.iUid );
 }
 
-// -----------------------------------------------------------------------------
-// instance()
-// -----------------------------------------------------------------------------
-//
+/*!
+  Return pointer to plugin root-component instance
+  @return instance address on success, 0 otherwise  
+ */
 QObject* XQPluginLoader::instance()
 {
     if (!load())
@@ -101,10 +104,10 @@
     
 }
 
-// -----------------------------------------------------------------------------
-// isLoaded()
-// -----------------------------------------------------------------------------
-//
+/*!
+  Return information if plugin have been loaded
+  @return true if plugin have been loaded, false otherwise 
+ */
 bool XQPluginLoader::isLoaded() const
 {
     return d && d->pHnd
@@ -115,10 +118,10 @@
 #endif    
 }
 
-// -----------------------------------------------------------------------------
-// load()
-// -----------------------------------------------------------------------------
-//
+/*!
+  Load requested plugin.
+  @return true on success, false otherwise
+ */
 bool XQPluginLoader::load()
 {
     if (!d)
@@ -129,10 +132,12 @@
     return d->loadPlugin();
 }
 
-// -----------------------------------------------------------------------------
-// unload()
-// -----------------------------------------------------------------------------
-//
+/*!
+  Unloads the plugin and returns true if plugin could be unloaded. All plugins are unloaded at aplication exit 
+  so calling this method is not mandatory. 
+  Actual unloading will succed only when all instances of given plugin loaders calls unload.
+  @return true on success, false otherwise
+ */
 bool XQPluginLoader::unload()
 {
     if (did_load) {
@@ -144,10 +149,9 @@
     return false;
 }
 
-// -----------------------------------------------------------------------------
-// setUid ( int )
-// -----------------------------------------------------------------------------
-//
+/*!
+  Setter for UID of plugin. It is the same UID that may be specified in constructor.
+*/
 void XQPluginLoader::setUid ( int uid )
 {
     if (d) {
@@ -158,10 +162,10 @@
     d = XQPluginLoaderPrivate::findOrCreate( uid );
 }
 
-// -----------------------------------------------------------------------------
-// errorString ()
-// -----------------------------------------------------------------------------
-//
+/*!
+  Return string.with description of last error that occured.
+  @return error description
+*/
 QString XQPluginLoader::errorString () const
 {
     return (!d || d->errorString.isEmpty()) ? tr("Unknown error") : d->errorString;

--- a/qtecomplugins/xqplugins/src/xqpluginloaderprivate.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/xqplugins/src/xqpluginloaderprivate.cpp	Fri May 14 16:41:33 2010 +0300
@@ -15,7 +15,7 @@
 * along with this program.  If not, 
 * see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
 *
-* Description:
+* Description: This is the private implementation of the XQPluginLoader class.
 *
 */

--- a/qtecomplugins/xqplugins/tests/auto/xqpluginloader/almostplugin/almostplugin.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/xqplugins/tests/auto/xqpluginloader/almostplugin/almostplugin.cpp	Fri May 14 16:41:33 2010 +0300
@@ -1,43 +1,21 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** 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.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, 
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
+*/ 
+
 #include <QtCore/QString>
 #include "almostplugin.h"
 #include <QtCore/qplugin.h>

--- a/qtecomplugins/xqplugins/tests/auto/xqpluginloader/almostplugin/almostplugin.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/xqplugins/tests/auto/xqpluginloader/almostplugin/almostplugin.h	Fri May 14 16:41:33 2010 +0300
@@ -1,43 +1,21 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** 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.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, 
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
+*/ 
+
 #ifndef ALMOSTPLUGIN_H
 #define ALMOSTPLUGIN_H

--- a/qtecomplugins/xqplugins/tests/auto/xqpluginloader/theplugin/plugininterface.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/xqplugins/tests/auto/xqpluginloader/theplugin/plugininterface.h	Fri May 14 16:41:33 2010 +0300
@@ -1,43 +1,21 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** 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.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, 
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
+*/ 
+
 #ifndef PLUGININTERFACE_H
 #define PLUGININTERFACE_H

--- a/qtecomplugins/xqplugins/tests/auto/xqpluginloader/theplugin/theplugin.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/xqplugins/tests/auto/xqpluginloader/theplugin/theplugin.cpp	Fri May 14 16:41:33 2010 +0300
@@ -1,43 +1,21 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** 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.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, 
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
+*/ 
+
 #include <QString>
 #include <xqplugin.h>
 #include "theplugin.h"

--- a/qtecomplugins/xqplugins/tests/auto/xqpluginloader/theplugin/theplugin.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/xqplugins/tests/auto/xqpluginloader/theplugin/theplugin.h	Fri May 14 16:41:33 2010 +0300
@@ -1,43 +1,21 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** 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.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, 
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
+*/ 
+
 #ifndef THEPLUGIN_H
 #define THEPLUGIN_H

--- a/qtecomplugins/xqplugins/tests/auto/xqpluginloader/tst_xqpluginloader.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/xqplugins/tests/auto/xqpluginloader/tst_xqpluginloader.cpp	Fri May 14 16:41:33 2010 +0300
@@ -1,44 +1,20 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** 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.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, 
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
+*/ 
 
 #include <QtTest/QtTest>
 #include <qdir.h>

--- a/qtecomplugins/xqplugins/xqplugins.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/xqplugins/xqplugins.pro	Fri May 14 16:41:33 2010 +0300
@@ -27,9 +27,7 @@
 QT -= gui
 LIBS += -lecom.dll
 LIBS += -lcharconv.dll
-INCLUDEPATH += /epoc32/include/domain \
-    /epoc32/include/domain/middleware \
-    /epoc32/include/domain/applications
+INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
 HEADERS = include/xqplugin.h \
     include/xqpluginloader.h \
     include/xqtecom.hrh \
@@ -47,7 +45,6 @@
 symbian { 
     TARGET.CAPABILITY = All -TCB
     TARGET.EPOCALLOWDLLDATA = 1
-
     defFilePath=..
 
 #    deploy.path = /

--- a/qthighway/examples/appmgrclient/src/appmgrclient.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qthighway/examples/appmgrclient/src/appmgrclient.cpp	Fri May 14 16:41:33 2010 +0300
@@ -561,8 +561,15 @@
 {
     qDebug() << mAppName << " test5 START";
 
-    // E0022E73 == ServiceApp
-    QUrl uri(XQURI_SCHEME_ACTIVITY + "://E0022E73?" + XQURI_KEY_ACTIVITY_NAME + "=emailView&view=myview"); 
+    QString str("e0022e70");
+    uint ui = str.toUInt();
+    qDebug() << mAppName << " toUInt value=" << ui;
+    bool b=false;
+    ui=str.toUInt(&b,16);
+    qDebug() << mAppName << " toUInt status=" << b <<  ",value=" << ui;
+    
+    
+    QUrl uri(XQURI_SCHEME_ACTIVITY + "://E0022E70?" + XQURI_KEY_ACTIVITY_NAME + "=MainView&key1=data1&key2=data2"); 
     qDebug() << mAppName << " Uri=" << uri.toString();
     qDebug() << mAppName << " isValid=" << uri.isValid();
     qDebug() << mAppName << " Uri authority=" << uri.authority();

--- a/qthighway/examples/hbserviceclient/src/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qthighway/examples/hbserviceclient/src/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -20,7 +20,6 @@
 */
 
 #include "xqservicelog.h"
-
 #include <hbapplication.h>
 #include "hbserviceclientmainwindow.h"
 
@@ -28,12 +27,45 @@
 {
     // qInstallMsgHandler(XQSERVICEMESSAGEHANDLER);
     XQSERVICE_DEBUG_PRINT("HbServiceClient::main");
-    HbApplication a( argc, argv ); 
+    HbApplication app( argc, argv ); 
 
+    
     HbServiceClientMainWindow mainWindow;
 
+    // Let's figure out why application was started?
+    if(app.activateReason()== Hb::ActivationReasonActivity )
+    {
+        QString id = app.activateId();
+        QVariant data = app.activateData();
+        XQSERVICE_DEBUG_PRINT("HbServiceClient::main Hb::ActivationReasonActivity=%s,data=%s",
+                             qPrintable(id), qPrintable(data.toString()));
+        QVariantHash params = app.activateParams();
+        QHashIterator<QString, QVariant> i(params);
+        while (i.hasNext())
+        {
+            i.next();
+            XQSERVICE_DEBUG_PRINT("HbServiceClient::param key=%s,value=%s",
+                                  qPrintable(i.key()), qPrintable(i.value().toString()));
+        }        
+    }
+    else if (app.activateReason() == Hb::ActivationReasonNormal)
+    {
+        XQSERVICE_DEBUG_PRINT("HbServiceClient::main Hb::ActivationReasonNormal");
+    }
+    else if(app.activateReason() == Hb::ActivationReasonService)
+    {
+        // This applicatiob does not support services
+        XQSERVICE_DEBUG_PRINT("HbServiceClient::main Hb::ActivationReasonService");
+    }
+    else
+    {
+        // This applicatiob does not support services
+        XQSERVICE_DEBUG_PRINT("HbServiceClient::main UNKNOWN reason");
+    }
+        
+    
     mainWindow.show();
 
-    return a.exec();     
+    return app.exec();     
 }

--- a/qthighway/examples/hbserviceprovider/hbserviceprovider.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qthighway/examples/hbserviceprovider/hbserviceprovider.pro	Fri May 14 16:41:33 2010 +0300
@@ -38,4 +38,4 @@
 libFiles.path = "!:\sys\bin"
 DEPLOYMENT += libFiles
 
-TRANSLATIONS=hbserviceprovider.ts
+# TRANSLATIONS=hbserviceprovider.ts

--- a/qthighway/examples/hbserviceprovider/src/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qthighway/examples/hbserviceprovider/src/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -27,14 +27,45 @@
 int main(int argc, char **argv)
 {
     // qInstallMsgHandler(XQSERVICEMESSAGEHANDLER);
-    XQSERVICE_DEBUG_PRINT("HbServicePrivder::main");
+    XQSERVICE_DEBUG_PRINT("HbServiceProvider::main");
     
-    HbApplication a( argc, argv ); 
+    HbApplication app( argc, argv ); 
 
+    // Let's figure out why application was started?
+    if(app.activateReason()== Hb::ActivationReasonActivity )
+    {
+        QString id = app.activateId();
+        QVariant data = app.activateData();
+        XQSERVICE_DEBUG_PRINT("HbServiceProvider::main Hb::ActivationReasonActivity=%s,data=%s",
+                              qPrintable(id), qPrintable(data.toString()));
+        QVariantHash params = app.activateParams();
+        QHashIterator<QString, QVariant> i(params);
+        while (i.hasNext())
+        {
+            i.next();
+            XQSERVICE_DEBUG_PRINT("HbServiceProvider::param key=%s,value=%s",
+                                  qPrintable(i.key()), qPrintable(i.value().toString()));
+        }        
+    }
+    else if (app.activateReason() == Hb::ActivationReasonNormal)
+    {
+        XQSERVICE_DEBUG_PRINT("HbServiceProvider::main Hb::ActivationReasonNormal");
+    }
+    else if(app.activateReason() == Hb::ActivationReasonService)
+    {
+        // Does not come here: Bug MPAN-84QL7V entered for this
+        XQSERVICE_DEBUG_PRINT("HbServiceProvider::main Hb::ActivationReasonService");
+    }
+    else
+    {
+        // This applicatiob does not support services
+        XQSERVICE_DEBUG_PRINT("HbServiceProvider::main UNKNOWN reason");
+    }
+    
     HbServiceProviderMainWindow mainWindow;
 
     mainWindow.show();
 
-    return a.exec();     
+    return app.exec();     
 }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qthighway/examples/mimetestapp2/mimetestapp2.pro	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,49 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+# All rights reserved.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, version 2.1 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, 
+# see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
+#
+# Description:
+#
+
+TEMPLATE=app
+TARGET=mimetestapp2
+CONFIG += service
+
+symbian:TARGET.UID3 = 0xE0022E77
+symbian: TARGET.CAPABILITY = CAP_APPLICATION
+
+SERVICE.FILE = service_conf.xml
+
+XQSERVICE_ROOT=../..
+include(../../xqservicebase.pri)
+include(src/mimetestapp.pri)
+
+LIBS+=-lxqservice -lxqserviceutil
+
+libFiles.sources = xqservice.dll
+libFiles.path = "!:\sys\bin"
+DEPLOYMENT += libFiles
+
+RSS_RULES += \
+  "datatype_list = " \
+  "      {" \
+  "      DATATYPE" \
+  "          {" \
+  "          priority = EDataTypePriorityNormal;" \
+  "          type = \"text/plain\";" \
+  "          }" \
+  "      };" \
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qthighway/examples/mimetestapp2/service_conf.xml	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<service>
+  <name>mimetestapp2</name>
+  <filepath>No path</filepath>
+  <description>File viewer test app</description>
+  <interface>
+     <name>com.nokia.symbian.IFileView</name>
+     <version>1.0</version>
+     <description>Interface for showing files</description>
+   </interface>
+</service>
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qthighway/examples/mimetestapp2/src/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,43 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, 
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
+*
+* Description:
+*
+*/
+
+#include <QApplication>
+#include <QDebug>
+
+#include "mimetestapp.h"
+
+int main(int argc, char **argv)
+{
+    QApplication a( argc, argv );
+
+    QStringList args = QApplication::arguments();
+    
+    foreach (QString arg, args) {
+        qDebug() << "MimeTestApp2: cmdline arg=" << qPrintable(arg);
+    }
+    
+    MimeTestApp *cl = new MimeTestApp();
+    cl->show();
+    int rv = a.exec();
+    delete cl;
+    return rv;
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qthighway/examples/mimetestapp2/src/mimetestapp.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,161 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, 
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
+*
+* Description:
+*
+*/
+
+#include <QtGlobal>
+#include <QApplication>
+#include <QKeyEvent>
+#include <QLabel>
+#include <QStackedWidget>
+#include <QImageReader>
+#include <QDebug>
+#include <QTimer>
+#include <QPushButton>
+#include <QList>
+#include <QLineEdit>
+#include <QString>
+#include <QCheckBox>
+#include <QAction>
+#include <QListView>
+#include <QUrl>
+#include <math.h>
+#include "xqservicelog.h"
+
+#include "mimetestapp.h"
+
+MimeTestApp::MimeTestApp(QWidget *parent, Qt::WFlags f)
+    : QWidget(parent, f), mFileService(0), mLabel(0), mVl(0)
+{
+    /* Adjust the palette */
+#if defined(Q_WS_S60)
+    QPalette p = qApp->palette();
+    QColor color(192,192,192);
+    QColor bg(201,250,250);
+    p.setColor(QPalette::Highlight, color.lighter(200));
+    p.setColor(QPalette::Text, Qt::black);
+    p.setColor(QPalette::Base, bg);
+    p.setColor(QPalette::WindowText, Qt::black);
+    p.setColor(QPalette::Window, bg);
+    p.setColor(QPalette::ButtonText, Qt::black);
+    p.setColor(QPalette::Button, color.lighter(150));
+    p.setColor(QPalette::Link, QColor(240,40,40));
+
+    qApp->setPalette(p);
+#endif
+
+    QPushButton *quitButton = new QPushButton(tr("quit"));
+    connect(quitButton, SIGNAL(clicked()), qApp, SLOT(quit()));
+
+    mVl = new QVBoxLayout;
+    mVl->setMargin(0);
+    mVl->setSpacing(0);
+
+    mLabel = new QLabel("");
+    mVl->addWidget(mLabel);
+    
+    QStringList args = QApplication::arguments();
+    QString argsTxt;
+    foreach (QString arg, args)
+    {
+        argsTxt += arg + "\n";
+    }
+
+    QLabel *cmdArgsLabel = new QLabel(argsTxt);
+    mVl->addWidget(cmdArgsLabel);
+    
+    mVl->addWidget(quitButton);
+    setLayout(mVl);
+
+#if defined(Q_WS_X11) || defined(Q_WS_WIN)
+    setFixedSize(QSize(360,640)); // nHD
+#elif defined(Q_WS_S60)
+    showMaximized();
+    showFullScreen();
+#endif
+
+    // Activate service
+    mFileService = new FileService(this);
+    
+}
+
+MimeTestApp::~MimeTestApp()
+{
+    delete mFileService;
+}
+
+void MimeTestApp::setLabel(QString label)
+{
+    XQSERVICE_DEBUG_PRINT("MimeTestApp2::setLabel");
+    mLabel->setText(label);
+}
+
+
+// ----------FileService---------------
+
+FileService::FileService(MimeTestApp* parent)
+: XQServiceProvider(QLatin1String("mimetestapp2.com.nokia.symbian.IFileView"),parent),
+  mMimeTestApp(parent)
+
+{
+    XQSERVICE_DEBUG_PRINT("MimeTestApp2::FileService (mimetestapp2)");
+    publishAll();
+}
+
+FileService::~FileService()
+{
+    XQSERVICE_DEBUG_PRINT("MimeTestApp2::~FileService  (mimetestapp2)");
+}
+
+bool FileService::view(QString file)
+{
+    XQSERVICE_DEBUG_PRINT("MimeTestApp2::view(QString) (mimetestapp2) %s",
+                         qPrintable(file));
+
+    QString label = "IFileView:" + QString ("File=%1\n").arg(file);
+    mMimeTestApp->setLabel(label);
+    
+    return true;
+}
+
+
+bool FileService::view(XQSharableFile sf)
+{
+    XQSERVICE_DEBUG_PRINT("MimeTestApp2::view(XQSharebleFile) (mimetestapp2)");
+    QString label = "IFileView:" + QString ("File=%1\n").arg(sf.fileName());
+
+    RFile file;
+    bool ok = sf.getHandle( file );
+    if (ok)
+    {
+        HBufC8* data = HBufC8::NewL(100);
+        TPtr8 ptr = data->Des();
+        TInt err  = file.Read( ptr );
+        QString text = QString::fromUtf8((const char *)(data->Ptr()), data->Length());
+        XQSERVICE_DEBUG_PRINT("MimeTestApp2::file read,%d,%s", err, qPrintable(text));
+        sf.close();
+        delete data;
+    }
+
+    mMimeTestApp->setLabel(label);
+    
+    return true;
+}
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qthighway/examples/mimetestapp2/src/mimetestapp.h	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,67 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, 
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
+*
+* Description:
+*
+*/
+
+#ifndef MIMETESTAPP_H
+#define MIMETESTAPP_H
+
+#include <QVBoxLayout>
+#include <QWidget>
+#include <QLabel>
+#include <xqserviceprovider.h>
+#include <xqsharablefile.h>
+
+class FileService;
+class MimeTestApp : public QWidget
+{
+    Q_OBJECT
+            
+public:
+        MimeTestApp( QWidget *parent = 0, Qt::WFlags f = 0 );
+        ~MimeTestApp();
+        
+        void setLabel(QString label);
+
+private slots:
+
+private:
+        QVBoxLayout *mVl;
+        QLabel *mLabel;
+        FileService *mFileService;
+};
+
+
+class FileService : public XQServiceProvider
+{
+    Q_OBJECT
+    public:
+        FileService( MimeTestApp *parent = 0 );
+        ~FileService();
+
+    public slots:
+        bool view(QString file);
+        bool view(XQSharableFile file);
+
+    private:
+        MimeTestApp* mMimeTestApp;
+};
+
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qthighway/examples/mimetestapp2/src/mimetestapp.pri	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+# All rights reserved.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, version 2.1 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, 
+# see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
+#
+# Description:
+#
+
+SOURCES=\
+    src/main.cpp\
+    src/mimetestapp.cpp
+
+HEADERS=\
+    src/mimetestapp.h

--- a/qthighway/xqservice/xqservice.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qthighway/xqservice/xqservice.pro	Fri May 14 16:41:33 2010 +0300
@@ -43,7 +43,7 @@
 include(../xqservicebase.pri)
 include(src/xqservice.pri)
 
-LIBS+=-lxqserviceutil -lxqserviceipcclient -lxqserviceipcserver -lqtgui -lqtserviceframework -lws32 -lefsrv -lapparc -lapgrfx
+LIBS+=-lxqserviceutil -lxqserviceipcclient -lxqserviceipcserver -lQtGui -lQtServiceFramework -lws32 -lefsrv -lapparc -lapgrfx
 LIBS+=-lcaf
 LIBS+=-lxqsettingsmanager

--- a/qthighway/xqserviceipc/xqserviceipcserver/xqserviceipcrequest.h	Mon May 03 13:18:40 2010 +0300
+++ b/qthighway/xqserviceipc/xqserviceipcserver/xqserviceipcrequest.h	Fri May 14 16:41:33 2010 +0300
@@ -23,7 +23,7 @@
 #define XQ_SERVICEIPC_REQUEST_H
 
 #include <QtCore>
-#include <List>
+#include <QList>
 #include <xqserviceipcdefs.h>
 #include <xqrequestinfo.h>
 #include <xqsharablefile.h>

--- a/qthighway/xqserviceutil/src/xqservicemanager.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qthighway/xqserviceutil/src/xqservicemanager.cpp	Fri May 14 16:41:33 2010 +0300
@@ -526,14 +526,16 @@
                 if ((!serviceName.compare(sn,Qt::CaseInsensitive)) ||
                     (deprNameExists && !serviceName.compare(snDeprecated,Qt::CaseInsensitive)))
                     {
+                    TUid appUid = implArray[ii].Uid();
                     if (!firstUidPicked)
                         {
-                        aAppUid = implArray[ii].Uid();
+                        aAppUid = appUid;
                         firstUidPicked = ETrue;
+                        XQSERVICE_DEBUG_PRINT("First service found UID3=%x", appUid.iUid);
                         }
-                    XQSERVICE_DEBUG_PRINT("Service found %x", aAppUid);
+                    XQSERVICE_DEBUG_PRINT("Service found UID3=%x", appUid.iUid);
                     //  Add impl. UID to interface
-                    interface.setProperty(XQAiwInterfaceDescriptor::ImplementationId, (int)aAppUid.iUid);
+                    interface.setProperty(XQAiwInterfaceDescriptor::ImplementationId, (int)appUid.iUid);
                     found = ETrue;
 
                     // Add the matched interface to result set

--- a/qthighway/xqserviceutil/src/xqsharablefile.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qthighway/xqserviceutil/src/xqsharablefile.cpp	Fri May 14 16:41:33 2010 +0300
@@ -20,7 +20,7 @@
 */
 
 #include "xqservicelog.h"
-#include "xqSharableFile.h"
+#include "xqsharablefile.h"
 #include <QVariant>

--- a/qtmobileextensions/src/bwins/xqkeycaptureu.def	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobileextensions/src/bwins/xqkeycaptureu.def	Fri May 14 16:41:33 2010 +0300
@@ -15,4 +15,16 @@
 	?captureLongKey@XqKeyCapture@@QAE_NIV?$QFlags@W4KeyboardModifier@Qt@@@@0W4LongFlags@1@@Z @ 14 NONAME ; bool XqKeyCapture::captureLongKey(unsigned int, class QFlags<enum Qt::KeyboardModifier>, class QFlags<enum Qt::KeyboardModifier>, enum XqKeyCapture::LongFlags)
 	?cancelCaptureKey@XqKeyCapture@@QAE_NIV?$QFlags@W4KeyboardModifier@Qt@@@@0@Z @ 15 NONAME ; bool XqKeyCapture::cancelCaptureKey(unsigned int, class QFlags<enum Qt::KeyboardModifier>, class QFlags<enum Qt::KeyboardModifier>)
 	?cancelCaptureLongKey@XqKeyCapture@@QAE_NIV?$QFlags@W4KeyboardModifier@Qt@@@@0W4LongFlags@1@@Z @ 16 NONAME ; bool XqKeyCapture::cancelCaptureLongKey(unsigned int, class QFlags<enum Qt::KeyboardModifier>, class QFlags<enum Qt::KeyboardModifier>, enum XqKeyCapture::LongFlags)
+	?captureKey@XqKeyCapture@@QAE_NV?$QList@W4Key@Qt@@@@V?$QFlags@W4KeyboardModifier@Qt@@@@1@Z @ 17 NONAME ; bool XqKeyCapture::captureKey(class QList<enum Qt::Key>, class QFlags<enum Qt::KeyboardModifier>, class QFlags<enum Qt::KeyboardModifier>)
+	?cancelCaptureKeyUpAndDowns@XqKeyCapture@@QAE_NV?$QList@I@@V?$QFlags@W4KeyboardModifier@Qt@@@@1@Z @ 18 NONAME ; bool XqKeyCapture::cancelCaptureKeyUpAndDowns(class QList<unsigned int>, class QFlags<enum Qt::KeyboardModifier>, class QFlags<enum Qt::KeyboardModifier>)
+	?cancelCaptureLongKey@XqKeyCapture@@QAE_NV?$QList@W4Key@Qt@@@@V?$QFlags@W4KeyboardModifier@Qt@@@@1W4LongFlags@1@@Z @ 19 NONAME ; bool XqKeyCapture::cancelCaptureLongKey(class QList<enum Qt::Key>, class QFlags<enum Qt::KeyboardModifier>, class QFlags<enum Qt::KeyboardModifier>, enum XqKeyCapture::LongFlags)
+	?captureLongKey@XqKeyCapture@@QAE_NV?$QList@W4Key@Qt@@@@V?$QFlags@W4KeyboardModifier@Qt@@@@1W4LongFlags@1@@Z @ 20 NONAME ; bool XqKeyCapture::captureLongKey(class QList<enum Qt::Key>, class QFlags<enum Qt::KeyboardModifier>, class QFlags<enum Qt::KeyboardModifier>, enum XqKeyCapture::LongFlags)
+	?captureKeyUpAndDowns@XqKeyCapture@@QAE_NV?$QList@W4Key@Qt@@@@V?$QFlags@W4KeyboardModifier@Qt@@@@1@Z @ 21 NONAME ; bool XqKeyCapture::captureKeyUpAndDowns(class QList<enum Qt::Key>, class QFlags<enum Qt::KeyboardModifier>, class QFlags<enum Qt::KeyboardModifier>)
+	?captureKeyUpAndDowns@XqKeyCapture@@QAE_NV?$QList@I@@V?$QFlags@W4KeyboardModifier@Qt@@@@1@Z @ 22 NONAME ; bool XqKeyCapture::captureKeyUpAndDowns(class QList<unsigned int>, class QFlags<enum Qt::KeyboardModifier>, class QFlags<enum Qt::KeyboardModifier>)
+	?cancelCaptureKey@XqKeyCapture@@QAE_NV?$QList@W4Key@Qt@@@@V?$QFlags@W4KeyboardModifier@Qt@@@@1@Z @ 23 NONAME ; bool XqKeyCapture::cancelCaptureKey(class QList<enum Qt::Key>, class QFlags<enum Qt::KeyboardModifier>, class QFlags<enum Qt::KeyboardModifier>)
+	?captureLongKey@XqKeyCapture@@QAE_NV?$QList@I@@V?$QFlags@W4KeyboardModifier@Qt@@@@1W4LongFlags@1@@Z @ 24 NONAME ; bool XqKeyCapture::captureLongKey(class QList<unsigned int>, class QFlags<enum Qt::KeyboardModifier>, class QFlags<enum Qt::KeyboardModifier>, enum XqKeyCapture::LongFlags)
+	?cancelCaptureKey@XqKeyCapture@@QAE_NV?$QList@I@@V?$QFlags@W4KeyboardModifier@Qt@@@@1@Z @ 25 NONAME ; bool XqKeyCapture::cancelCaptureKey(class QList<unsigned int>, class QFlags<enum Qt::KeyboardModifier>, class QFlags<enum Qt::KeyboardModifier>)
+	?cancelCaptureLongKey@XqKeyCapture@@QAE_NV?$QList@I@@V?$QFlags@W4KeyboardModifier@Qt@@@@1W4LongFlags@1@@Z @ 26 NONAME ; bool XqKeyCapture::cancelCaptureLongKey(class QList<unsigned int>, class QFlags<enum Qt::KeyboardModifier>, class QFlags<enum Qt::KeyboardModifier>, enum XqKeyCapture::LongFlags)
+	?cancelCaptureKeyUpAndDowns@XqKeyCapture@@QAE_NV?$QList@W4Key@Qt@@@@V?$QFlags@W4KeyboardModifier@Qt@@@@1@Z @ 27 NONAME ; bool XqKeyCapture::cancelCaptureKeyUpAndDowns(class QList<enum Qt::Key>, class QFlags<enum Qt::KeyboardModifier>, class QFlags<enum Qt::KeyboardModifier>)
+	?captureKey@XqKeyCapture@@QAE_NV?$QList@I@@V?$QFlags@W4KeyboardModifier@Qt@@@@1@Z @ 28 NONAME ; bool XqKeyCapture::captureKey(class QList<unsigned int>, class QFlags<enum Qt::KeyboardModifier>, class QFlags<enum Qt::KeyboardModifier>)

--- a/qtmobileextensions/src/eabi/xqkeycaptureu.def	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobileextensions/src/eabi/xqkeycaptureu.def	Fri May 14 16:41:33 2010 +0300
@@ -17,4 +17,16 @@
 	_ZN12XqKeyCapture20cancelCaptureLongKeyEj6QFlagsIN2Qt16KeyboardModifierEES3_NS_9LongFlagsE @ 16 NONAME
 	_ZN12XqKeyCapture20captureKeyUpAndDownsEj6QFlagsIN2Qt16KeyboardModifierEES3_ @ 17 NONAME
 	_ZN12XqKeyCapture26cancelCaptureKeyUpAndDownsEj6QFlagsIN2Qt16KeyboardModifierEES3_ @ 18 NONAME
+	_ZN12XqKeyCapture10captureKeyE5QListIN2Qt3KeyEE6QFlagsINS1_16KeyboardModifierEES6_ @ 19 NONAME
+	_ZN12XqKeyCapture10captureKeyE5QListIjE6QFlagsIN2Qt16KeyboardModifierEES5_ @ 20 NONAME
+	_ZN12XqKeyCapture14captureLongKeyE5QListIN2Qt3KeyEE6QFlagsINS1_16KeyboardModifierEES6_NS_9LongFlagsE @ 21 NONAME
+	_ZN12XqKeyCapture14captureLongKeyE5QListIjE6QFlagsIN2Qt16KeyboardModifierEES5_NS_9LongFlagsE @ 22 NONAME
+	_ZN12XqKeyCapture16cancelCaptureKeyE5QListIN2Qt3KeyEE6QFlagsINS1_16KeyboardModifierEES6_ @ 23 NONAME
+	_ZN12XqKeyCapture16cancelCaptureKeyE5QListIjE6QFlagsIN2Qt16KeyboardModifierEES5_ @ 24 NONAME
+	_ZN12XqKeyCapture20cancelCaptureLongKeyE5QListIN2Qt3KeyEE6QFlagsINS1_16KeyboardModifierEES6_NS_9LongFlagsE @ 25 NONAME
+	_ZN12XqKeyCapture20cancelCaptureLongKeyE5QListIjE6QFlagsIN2Qt16KeyboardModifierEES5_NS_9LongFlagsE @ 26 NONAME
+	_ZN12XqKeyCapture20captureKeyUpAndDownsE5QListIN2Qt3KeyEE6QFlagsINS1_16KeyboardModifierEES6_ @ 27 NONAME
+	_ZN12XqKeyCapture20captureKeyUpAndDownsE5QListIjE6QFlagsIN2Qt16KeyboardModifierEES5_ @ 28 NONAME
+	_ZN12XqKeyCapture26cancelCaptureKeyUpAndDownsE5QListIN2Qt3KeyEE6QFlagsINS1_16KeyboardModifierEES6_ @ 29 NONAME
+	_ZN12XqKeyCapture26cancelCaptureKeyUpAndDownsE5QListIjE6QFlagsIN2Qt16KeyboardModifierEES5_ @ 30 NONAME

--- a/qtmobileextensions/src/keycapture/tsrc/test_xqkeycapture.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobileextensions/src/keycapture/tsrc/test_xqkeycapture.cpp	Fri May 14 16:41:33 2010 +0300
@@ -43,40 +43,76 @@
 
     void testCaptureKey_data();
     void testCaptureKey();
-	
+
+    void testCaptureKeyList_data();
+    void testCaptureKeyList();
+
 	void testCaptureKey_S60_data();
 	void testCaptureKey_S60();
 
+    void testCaptureKeyList_S60_data();
+	void testCaptureKeyList_S60();
+
     void testCaptureKeyUpAndDowns_data();
     void testCaptureKeyUpAndDowns();
-	
+
+    void testCaptureKeyUpAndDownsList_data();
+    void testCaptureKeyUpAndDownsList();
+
     void testCaptureKeyUpAndDowns_S60_data();
     void testCaptureKeyUpAndDowns_S60();
-    
+
+    void testCaptureKeyUpAndDownsList_S60_data();
+    void testCaptureKeyUpAndDownsList_S60();
+
     void testCaptureLongKey_data();
     void testCaptureLongKey();
-	
+
+    void testCaptureLongKeyList_data();
+    void testCaptureLongKeyList();
+
     void testCaptureLongKey_S60_data();
     void testCaptureLongKey_S60();
-    
+
+    void testCaptureLongKeyList_S60_data();
+    void testCaptureLongKeyList_S60();
+
     void testCancelCaptureKey_data();
     void testCancelCaptureKey();
-	
+
+    void testCancelCaptureKeyList_data();
+    void testCancelCaptureKeyList();
+
     void testCancelCaptureKey_S60_data();
     void testCancelCaptureKey_S60();
 
+    void testCancelCaptureKeyList_S60_data();
+    void testCancelCaptureKeyList_S60();
+
     void testCancelCaptureKeyUpAndDowns_data();
     void testCancelCaptureKeyUpAndDowns();
-	
+
+    void testCancelCaptureKeyUpAndDownsList_data();
+    void testCancelCaptureKeyUpAndDownsList();
+
     void testCancelCaptureKeyUpAndDowns_S60_data();
     void testCancelCaptureKeyUpAndDowns_S60();
-    
+
+    void testCancelCaptureKeyUpAndDownsList_S60_data();
+    void testCancelCaptureKeyUpAndDownsList_S60();
+
     void testCancelCaptureLongKey_data();
     void testCancelCaptureLongKey();
-	
+
+    void testCancelCaptureLongKeyList_data();
+    void testCancelCaptureLongKeyList();
+
     void testCancelCaptureLongKey_S60_data();
     void testCancelCaptureLongKey_S60();
 
+    void testCancelCaptureLongKeyList_S60_data();
+    void testCancelCaptureLongKeyList_S60();
+
     void testErrorString();
     void testErrorId();
 	
@@ -256,103 +292,21 @@
     additionalResults << additionalSymbianKey << symbianMask << symbianModifier;
     
     MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
+
     keyCapture->captureKey( static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+
+//    keyCapture->captureKey( QList<Qt::Key>() << static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
 }
 
-////////////////////////////////////////////////////////////////
-//Capture Key Up And Downs
-////////////////////////////////////////////////////////////////
-void TestXqKeyCapture::testCaptureKeyUpAndDowns_data()
+void TestXqKeyCapture::testCaptureKeyList_data() 
 {
-    QTest::addColumn<unsigned int>("qtKey");
-    QTest::addColumn<unsigned int>("qtMask");
-    QTest::addColumn<unsigned int>("qtModifier");
-
-    QTest::addColumn<unsigned int>("symbianKey");
-    QTest::addColumn<unsigned int>("symbianMask");
-    QTest::addColumn<unsigned int>("symbianModifier");
-        
-    QTest::addColumn<long int>("reqNum");
-    
-    QTest::addColumn<bool>("additional");
-    QTest::addColumn<unsigned int>("additionalSymbianKey");
-    
-    QTest::newRow("esc_key") << static_cast<unsigned int> ( Qt::Key_Escape ) 
-                            << static_cast<unsigned int> ( Qt::NoModifier )
-                            << static_cast<unsigned int> ( Qt::NoModifier ) 
-                            << static_cast<unsigned int> ( EStdKeyEscape )
-                            << static_cast<unsigned int> ( 0 )
-                            << static_cast<unsigned int> ( 0 )
-                            << static_cast<long int> ( 12 )
-                            << false
-                            << static_cast<unsigned int> ( 0 );
+    testCaptureKey_data();
 }
 
-void TestXqKeyCapture::testCaptureKeyUpAndDowns()
+void TestXqKeyCapture::testCaptureKeyList()
 {
     numOfArgs = 3;
-    actionType = WGATCaptureKeyUpAndDowns;
-    additionalResult = false;
-    ignoreWindowGroupAction = false;
-    
-    QFETCH(unsigned int, qtKey);
-    QFETCH(unsigned int, qtMask);
-    QFETCH(unsigned int, qtModifier);
-
-    QFETCH(unsigned int, symbianKey);
-    QFETCH(unsigned int, symbianMask);
-    QFETCH(unsigned int, symbianModifier);
-
-    QFETCH(long int, reqNum);
-    
-    QFETCH(bool, additional);
-    QFETCH(unsigned int, additionalSymbianKey);
-    
-    willBeAdditionalRequest = additional;
-    
-    results.clear();
-    results << symbianKey << symbianMask << symbianModifier;
-    
-    additionalResults.clear();
-    additionalResults << additionalSymbianKey << symbianMask << symbianModifier;
-    
-    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
-    keyCapture->captureKeyUpAndDowns( static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
-}
-
-////////////////////////////////////////////////////////////////
-//Capture Key Up And Downs
-////////////////////////////////////////////////////////////////
-void TestXqKeyCapture::testCaptureKeyUpAndDowns_S60_data()
-{
-    QTest::addColumn<unsigned int>("qtKey");
-    QTest::addColumn<unsigned int>("qtMask");
-    QTest::addColumn<unsigned int>("qtModifier");
-
-    QTest::addColumn<unsigned int>("symbianKey");
-    QTest::addColumn<unsigned int>("symbianMask");
-    QTest::addColumn<unsigned int>("symbianModifier");
-        
-    QTest::addColumn<long int>("reqNum");
-    
-    QTest::addColumn<bool>("additional");
-    QTest::addColumn<unsigned int>("additionalSymbianKey");
-    
-    QTest::newRow("esc_key") << static_cast<unsigned int> ( EStdKeyEscape ) 
-                            << static_cast<unsigned int> ( Qt::NoModifier )
-                            << static_cast<unsigned int> ( Qt::NoModifier ) 
-                            << static_cast<unsigned int> ( EStdKeyEscape )
-                            << static_cast<unsigned int> ( 0 )
-                            << static_cast<unsigned int> ( 0 )
-                            << static_cast<long int> ( 12 )
-                            << false
-                            << static_cast<unsigned int> ( 0 );
-}
-
-void TestXqKeyCapture::testCaptureKeyUpAndDowns_S60()
-{
-    numOfArgs = 3;
-    actionType = WGATCaptureKeyUpAndDowns;
+    actionType = WGATCaptureKey;
     additionalResult = false;
     ignoreWindowGroupAction = false;
     
@@ -378,570 +332,13 @@
     additionalResults << additionalSymbianKey << symbianMask << symbianModifier;
     
     MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
-    keyCapture->captureKeyUpAndDowns( static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
-}
 
-////////////////////////////////////////////////////////////////
-//Capture Long Key
-////////////////////////////////////////////////////////////////
-void TestXqKeyCapture::testCaptureLongKey_data()
-{
-    QTest::addColumn<unsigned int>("qtKey");
-    QTest::addColumn<unsigned int>("qtMask");
-    QTest::addColumn<unsigned int>("qtModifier");
-    QTest::addColumn<int>("longFlags");
-    
-    QTest::addColumn<unsigned int>("symbianKey");
-    QTest::addColumn<unsigned int>("symbianMask");
-    QTest::addColumn<unsigned int>("symbianModifier");
-    QTest::addColumn<int>("symbianPriority");
-    QTest::addColumn<int>("symbianLongFlags");
-        
-    QTest::addColumn<long int>("reqNum");
-    
-    QTest::addColumn<bool>("additional");
-    QTest::addColumn<unsigned int>("additionalSymbianKey");
-    
-    
-    QTest::newRow("esc_key") << static_cast<unsigned int> ( Qt::Key_Escape ) 
-                            << static_cast<unsigned int> ( Qt::NoModifier )
-                            << static_cast<unsigned int> ( Qt::NoModifier ) 
-                            << static_cast<int> ( XqKeyCapture::LongNormal ) 
-                            << static_cast<unsigned int> ( EKeyEscape )
-                            << static_cast<unsigned int> ( 0 )
-                            << static_cast<unsigned int> ( 0 )
-                            << static_cast<int> ( 0 ) //priority
-                            << static_cast<int> ( XqKeyCapture::LongNormal ) 
-                            << static_cast<long int> ( 12 )
-                            << false
-                            << static_cast<unsigned int> ( 0 );
-
-}
-
-void TestXqKeyCapture::testCaptureLongKey()
-{
-    numOfArgs = 6;
-    actionType = WGATCaptureLongKey;
-    additionalResult = false;
-    ignoreWindowGroupAction = false;
-    
-    QFETCH(unsigned int, qtKey);
-    QFETCH(unsigned int, qtMask);
-    QFETCH(unsigned int, qtModifier);
-    QFETCH(int, longFlags);
-    
-    QFETCH(unsigned int, symbianKey);
-    QFETCH(unsigned int, symbianMask);
-    QFETCH(unsigned int, symbianModifier);
-    QFETCH(int, symbianPriority);
-    QFETCH(int, symbianLongFlags);
-    
-    QFETCH(long int, reqNum);
-    
-    QFETCH(bool, additional);
-    QFETCH(unsigned int, additionalSymbianKey);
-    
-    willBeAdditionalRequest = additional;
-    
-    results.clear();
-    results << symbianKey << symbianKey << symbianMask << symbianModifier << symbianPriority << symbianLongFlags;
-    
-    additionalResults.clear();
-    additionalResults << additionalSymbianKey << symbianMask << symbianModifier << symbianPriority << symbianLongFlags;
-    
-    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
-    keyCapture->captureLongKey( static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ), static_cast<XqKeyCapture::LongFlags> (longFlags) );
-}
-
-////////////////////////////////////////////////////////////////
-//Capture Long Key
-////////////////////////////////////////////////////////////////
-void TestXqKeyCapture::testCaptureLongKey_S60_data()
-{
-    QTest::addColumn<unsigned int>("qtKey");
-    QTest::addColumn<unsigned int>("qtMask");
-    QTest::addColumn<unsigned int>("qtModifier");
-    QTest::addColumn<int>("longFlags");
-    
-    QTest::addColumn<unsigned int>("symbianKey");
-    QTest::addColumn<unsigned int>("symbianMask");
-    QTest::addColumn<unsigned int>("symbianModifier");
-    QTest::addColumn<int>("symbianPriority");
-    QTest::addColumn<int>("symbianLongFlags");
-        
-    QTest::addColumn<long int>("reqNum");
-    
-    QTest::addColumn<bool>("additional");
-    QTest::addColumn<unsigned int>("additionalSymbianKey");
-    
-    
-    QTest::newRow("esc_key") << static_cast<unsigned int> ( EKeyEscape ) 
-                            << static_cast<unsigned int> ( Qt::NoModifier )
-                            << static_cast<unsigned int> ( Qt::NoModifier ) 
-                            << static_cast<int> ( XqKeyCapture::LongNormal ) 
-                            << static_cast<unsigned int> ( EKeyEscape )
-                            << static_cast<unsigned int> ( 0 )
-                            << static_cast<unsigned int> ( 0 )
-                            << static_cast<int> ( 0 ) //priority
-                            << static_cast<int> ( XqKeyCapture::LongNormal ) 
-                            << static_cast<long int> ( 12 )
-                            << false
-                            << static_cast<unsigned int> ( 0 );
-
-}
-
-void TestXqKeyCapture::testCaptureLongKey_S60()
-{
-    numOfArgs = 6;
-    actionType = WGATCaptureLongKey;
-    additionalResult = false;
-    ignoreWindowGroupAction = false;
-    
-    QFETCH(unsigned int, qtKey);
-    QFETCH(unsigned int, qtMask);
-    QFETCH(unsigned int, qtModifier);
-    QFETCH(int, longFlags);
-    
-    QFETCH(unsigned int, symbianKey);
-    QFETCH(unsigned int, symbianMask);
-    QFETCH(unsigned int, symbianModifier);
-    QFETCH(int, symbianPriority);
-    QFETCH(int, symbianLongFlags);
-    
-    QFETCH(long int, reqNum);
-    
-    QFETCH(bool, additional);
-    QFETCH(unsigned int, additionalSymbianKey);
-    
-    willBeAdditionalRequest = additional;
-    
-    results.clear();
-    results << symbianKey << symbianKey << symbianMask << symbianModifier << symbianPriority << symbianLongFlags;
-    
-    additionalResults.clear();
-    additionalResults << additionalSymbianKey << symbianMask << symbianModifier << symbianPriority << symbianLongFlags;
-    
-    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
-    keyCapture->captureLongKey( static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ), static_cast<XqKeyCapture::LongFlags> (longFlags) );
-}
-
-////////////////////////////////////////////////////////////////
-// CANCEL
-//Cancel Capture Key
-////////////////////////////////////////////////////////////////
-void TestXqKeyCapture::testCancelCaptureKey_data()
-{
-    QTest::addColumn<unsigned int>("qtKey");
-    QTest::addColumn<unsigned int>("qtMask");
-    QTest::addColumn<unsigned int>("qtModifier");
-
-    QTest::addColumn<long int>("reqNum");
-    
-    QTest::addColumn<bool>("additional");
-    QTest::addColumn<long int>("additionalReqNum");
-    
-    QTest::newRow("esc_key") << static_cast<unsigned int> ( Qt::Key_Escape ) 
-                            << static_cast<unsigned int> ( Qt::NoModifier )
-                            << static_cast<unsigned int> ( Qt::NoModifier ) 
-                            << static_cast<long int> ( 12 )
-                            << false
-                            << static_cast<long int> ( 0 );
-
-    QTest::newRow("esc_key_not_supported") << static_cast<unsigned int> ( Qt::Key_Escape ) 
-                            << static_cast<unsigned int> ( Qt::NoModifier )
-                            << static_cast<unsigned int> ( Qt::NoModifier ) 
-                            << static_cast<long int> ( KErrNotSupported )
-                            << false
-                            << static_cast<long int> ( 0 );
-    
-    QTest::newRow("esc_key_modifiers") << static_cast<unsigned int> ( Qt::Key_Escape ) 
-                            << static_cast<unsigned int> ( Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier | Qt:: KeypadModifier )
-                            << static_cast<unsigned int> ( Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier | Qt:: KeypadModifier ) 
-                            << static_cast<long int> ( 13 )
-                            << false
-                            << static_cast<long int> ( 0 );
-    
-    QTest::newRow("shift_key") << static_cast<unsigned int> ( Qt::Key_Shift ) 
-                            << static_cast<unsigned int> ( Qt::ShiftModifier )
-                            << static_cast<unsigned int> ( Qt::ControlModifier ) 
-                            << static_cast<long int> ( 15 )
-                            << true
-                            << static_cast<long int> ( 16 );
-
-    QTest::newRow("control_key") << static_cast<unsigned int> ( Qt::Key_Control ) 
-                            << static_cast<unsigned int> ( Qt::ControlModifier )
-                            << static_cast<unsigned int> ( Qt::ShiftModifier ) 
-                            << static_cast<long int> ( 17 )
-                            << true
-                            << static_cast<long int> ( 18 );
-                            
-    QTest::newRow("meta_key") << static_cast<unsigned int> ( Qt::Key_Meta ) 
-                            << static_cast<unsigned int> ( Qt::NoModifier )
-                            << static_cast<unsigned int> ( Qt::NoModifier ) 
-                            << static_cast<long int> ( 19 )
-                            << true
-                            << static_cast<long int> ( 20 );
-
-
-}
-
-void TestXqKeyCapture::testCancelCaptureKey()
-{
-    numOfArgs = 1;
-    actionType = WGATCancelCaptureKey;
-    additionalResult = false;
-    
-    QFETCH(unsigned int, qtKey);
-    QFETCH(unsigned int, qtMask);
-    QFETCH(unsigned int, qtModifier);
-
-    QFETCH(long int, reqNum);
-    
-    QFETCH(bool, additional);
-    QFETCH(long int, additionalReqNum);
-    
-    willBeAdditionalRequest = additional;
-    additionalRequestHandle = additionalReqNum;
-    
-    cancelResults.clear();
-    cancelResults << reqNum;
-    
-    cancelAdditionalResults.clear();
-    cancelAdditionalResults << additionalReqNum;
-    
-    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
-    ignoreWindowGroupAction = true;
-    keyCapture->captureKey( static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
-    ignoreWindowGroupAction = false;
-    willBeAdditionalRequest = additional;
-    keyCapture->cancelCaptureKey( static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+    keyCapture->captureKey( QList<Qt::Key>() << static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
 }
 
 ////////////////////////////////////////////////////////////////
-// CANCEL
-//Cancel Capture Key
-////////////////////////////////////////////////////////////////
-void TestXqKeyCapture::testCancelCaptureKey_S60_data()
-{
-    QTest::addColumn<unsigned int>("qtKey");
-    QTest::addColumn<unsigned int>("qtMask");
-    QTest::addColumn<unsigned int>("qtModifier");
-
-    QTest::addColumn<long int>("reqNum");
-    
-    QTest::addColumn<bool>("additional");
-    QTest::addColumn<long int>("additionalReqNum");
-    
-    QTest::newRow("esc_key") << static_cast<unsigned int> ( EKeyEscape ) 
-                            << static_cast<unsigned int> ( Qt::NoModifier )
-                            << static_cast<unsigned int> ( Qt::NoModifier ) 
-                            << static_cast<long int> ( 12 )
-                            << false
-                            << static_cast<long int> ( 0 );
-
-    QTest::newRow("esc_key_not_supported") << static_cast<unsigned int> ( EKeyEscape ) 
-                            << static_cast<unsigned int> ( Qt::NoModifier )
-                            << static_cast<unsigned int> ( Qt::NoModifier ) 
-                            << static_cast<long int> ( KErrNotSupported )
-                            << false
-                            << static_cast<long int> ( 0 );
-    
-    QTest::newRow("esc_key_modifiers") << static_cast<unsigned int> ( EKeyEscape ) 
-                            << static_cast<unsigned int> ( Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier | Qt:: KeypadModifier )
-                            << static_cast<unsigned int> ( Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier | Qt:: KeypadModifier ) 
-                            << static_cast<long int> ( 13 )
-                            << false
-                            << static_cast<long int> ( 0 );
-    
-    QTest::newRow("shift_key") << static_cast<unsigned int> ( EKeyLeftShift ) 
-                            << static_cast<unsigned int> ( Qt::ShiftModifier )
-                            << static_cast<unsigned int> ( Qt::ControlModifier ) 
-                            << static_cast<long int> ( 15 )
-                            << true
-                            << static_cast<long int> ( 16 );
-
-    QTest::newRow("control_key") << static_cast<unsigned int> ( EKeyLeftCtrl ) 
-                            << static_cast<unsigned int> ( Qt::ControlModifier )
-                            << static_cast<unsigned int> ( Qt::ShiftModifier ) 
-                            << static_cast<long int> ( 17 )
-                            << true
-                            << static_cast<long int> ( 18 );
-                            
-    QTest::newRow("meta_key") << static_cast<unsigned int> ( EKeyRightCtrl ) 
-                            << static_cast<unsigned int> ( Qt::NoModifier )
-                            << static_cast<unsigned int> ( Qt::NoModifier ) 
-                            << static_cast<long int> ( 19 )
-                            << true
-                            << static_cast<long int> ( 20 );
-
-
-}
-
-void TestXqKeyCapture::testCancelCaptureKey_S60()
-{
-    numOfArgs = 1;
-    actionType = WGATCancelCaptureKey;
-    additionalResult = false;
-    
-    QFETCH(unsigned int, qtKey);
-    QFETCH(unsigned int, qtMask);
-    QFETCH(unsigned int, qtModifier);
-
-    QFETCH(long int, reqNum);
-    
-    QFETCH(bool, additional);
-    QFETCH(long int, additionalReqNum);
-    
-    willBeAdditionalRequest = additional;
-    additionalRequestHandle = additionalReqNum;
-    
-    cancelResults.clear();
-    cancelResults << reqNum;
-    
-    cancelAdditionalResults.clear();
-    cancelAdditionalResults << additionalReqNum;
-    
-    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
-    ignoreWindowGroupAction = true;
-    keyCapture->captureKey( static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
-    ignoreWindowGroupAction = false;
-    willBeAdditionalRequest = additional;
-    keyCapture->cancelCaptureKey( static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
-}
-
-////////////////////////////////////////////////////////////////
-//Cancel Capture Key Up And Downs
-////////////////////////////////////////////////////////////////
-void TestXqKeyCapture::testCancelCaptureKeyUpAndDowns_data()
-{
-    QTest::addColumn<unsigned int>("qtKey");
-    QTest::addColumn<unsigned int>("qtMask");
-    QTest::addColumn<unsigned int>("qtModifier");
-
-    QTest::addColumn<long int>("reqNum");
-    
-    QTest::addColumn<bool>("additional");
-    QTest::addColumn<long int>("additionalReqNum");
-    
-    QTest::newRow("esc_key") << static_cast<unsigned int> ( Qt::Key_Escape ) 
-                            << static_cast<unsigned int> ( Qt::NoModifier )
-                            << static_cast<unsigned int> ( Qt::NoModifier ) 
-                            << static_cast<long int> ( 34 )
-                            << false
-                            << static_cast<long int> ( 35 );
-
-}
-
-void TestXqKeyCapture::testCancelCaptureKeyUpAndDowns()
-{
-    numOfArgs = 1;
-    actionType = WGATCancelCaptureKeyUpAndDowns;
-    additionalResult = false;
-    
-    QFETCH(unsigned int, qtKey);
-    QFETCH(unsigned int, qtMask);
-    QFETCH(unsigned int, qtModifier);
-
-    QFETCH(long int, reqNum);
-    
-    QFETCH(bool, additional);
-    QFETCH(long int, additionalReqNum);
-    
-    willBeAdditionalRequest = additional;
-    additionalRequestHandle = additionalReqNum;
-    
-    cancelResults.clear();
-    cancelResults << reqNum;
-    
-    cancelAdditionalResults.clear();
-    cancelAdditionalResults << additionalReqNum;
-    
-    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
-    ignoreWindowGroupAction = true;
-    keyCapture->captureKeyUpAndDowns( static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
-    ignoreWindowGroupAction = false;
-    willBeAdditionalRequest = additional;
-    keyCapture->cancelCaptureKeyUpAndDowns( static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
-}
-
-////////////////////////////////////////////////////////////////
-//Cancel Capture Key Up And Downs
+//Capture Key Up And Downs
 ////////////////////////////////////////////////////////////////
-void TestXqKeyCapture::testCancelCaptureKeyUpAndDowns_S60_data()
-{
-    QTest::addColumn<unsigned int>("qtKey");
-    QTest::addColumn<unsigned int>("qtMask");
-    QTest::addColumn<unsigned int>("qtModifier");
-
-    QTest::addColumn<long int>("reqNum");
-    
-    QTest::addColumn<bool>("additional");
-    QTest::addColumn<long int>("additionalReqNum");
-    
-    QTest::newRow("esc_key") << static_cast<unsigned int> ( EKeyEscape ) 
-                            << static_cast<unsigned int> ( Qt::NoModifier )
-                            << static_cast<unsigned int> ( Qt::NoModifier ) 
-                            << static_cast<long int> ( 34 )
-                            << false
-                            << static_cast<long int> ( 35 );
-
-}
-
-void TestXqKeyCapture::testCancelCaptureKeyUpAndDowns_S60()
-{
-    numOfArgs = 1;
-    actionType = WGATCancelCaptureKeyUpAndDowns;
-    additionalResult = false;
-    
-    QFETCH(unsigned int, qtKey);
-    QFETCH(unsigned int, qtMask);
-    QFETCH(unsigned int, qtModifier);
-
-    QFETCH(long int, reqNum);
-    
-    QFETCH(bool, additional);
-    QFETCH(long int, additionalReqNum);
-    
-    willBeAdditionalRequest = additional;
-    additionalRequestHandle = additionalReqNum;
-    
-    cancelResults.clear();
-    cancelResults << reqNum;
-    
-    cancelAdditionalResults.clear();
-    cancelAdditionalResults << additionalReqNum;
-    
-    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
-    ignoreWindowGroupAction = true;
-    keyCapture->captureKeyUpAndDowns( static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
-    ignoreWindowGroupAction = false;
-    willBeAdditionalRequest = additional;
-    keyCapture->cancelCaptureKeyUpAndDowns( static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
-}
-
-////////////////////////////////////////////////////////////////
-//Cancel Capture Long Key
-////////////////////////////////////////////////////////////////
-void TestXqKeyCapture::testCancelCaptureLongKey_data()
-{
-    QTest::addColumn<unsigned int>("qtKey");
-    QTest::addColumn<unsigned int>("qtMask");
-    QTest::addColumn<unsigned int>("qtModifier");
-    QTest::addColumn<int>("longFlags");
-    
-    QTest::addColumn<long int>("reqNum");
-    
-    QTest::addColumn<bool>("additional");
-    QTest::addColumn<long int>("additionalReqNum");
-    
-    QTest::newRow("esc_key") << static_cast<unsigned int> ( Qt::Key_Escape ) 
-                            << static_cast<unsigned int> ( Qt::NoModifier )
-                            << static_cast<unsigned int> ( Qt::NoModifier )
-                            << static_cast<int> ( XqKeyCapture::LongNormal ) 
-                            << static_cast<long int> ( 22 )
-                            << false
-                            << static_cast<long int> ( 23 );
-
-
-
-
-
-}
-
-void TestXqKeyCapture::testCancelCaptureLongKey()
-{
-    numOfArgs = 1;
-    actionType = WGATCancelCaptureLongKey;
-    additionalResult = false;
-    
-    QFETCH(unsigned int, qtKey);
-    QFETCH(unsigned int, qtMask);
-    QFETCH(unsigned int, qtModifier);
-    QFETCH(int, longFlags);
-
-    QFETCH(long int, reqNum);
-    
-    QFETCH(bool, additional);
-    QFETCH(long int, additionalReqNum);
-    
-    willBeAdditionalRequest = additional;
-    additionalRequestHandle = additionalReqNum;
-    
-    cancelResults.clear();
-    cancelResults << reqNum;
-    
-    cancelAdditionalResults.clear();
-    cancelAdditionalResults << additionalReqNum;
-    
-    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
-    ignoreWindowGroupAction = true;
-    keyCapture->captureLongKey( static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ), static_cast<XqKeyCapture::LongFlags> (longFlags) );
-    ignoreWindowGroupAction = false;
-    willBeAdditionalRequest = additional;
-    keyCapture->cancelCaptureLongKey( static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ), static_cast<XqKeyCapture::LongFlags> (longFlags) );
-}
-
-////////////////////////////////////////////////////////////////
-//Cancel Capture Long Key
-////////////////////////////////////////////////////////////////
-void TestXqKeyCapture::testCancelCaptureLongKey_S60_data()
-{
-    QTest::addColumn<unsigned int>("qtKey");
-    QTest::addColumn<unsigned int>("qtMask");
-    QTest::addColumn<unsigned int>("qtModifier");
-    QTest::addColumn<int>("longFlags");
-    
-    QTest::addColumn<long int>("reqNum");
-    
-    QTest::addColumn<bool>("additional");
-    QTest::addColumn<long int>("additionalReqNum");
-    
-    QTest::newRow("esc_key") << static_cast<unsigned int> ( EKeyEscape ) 
-                            << static_cast<unsigned int> ( Qt::NoModifier )
-                            << static_cast<unsigned int> ( Qt::NoModifier )
-                            << static_cast<int> ( XqKeyCapture::LongNormal ) 
-                            << static_cast<long int> ( 22 )
-                            << false
-                            << static_cast<long int> ( 23 );
-
-
-
-
-
-}
-
-void TestXqKeyCapture::testCancelCaptureLongKey_S60()
-{
-    numOfArgs = 1;
-    actionType = WGATCancelCaptureLongKey;
-    additionalResult = false;
-    
-    QFETCH(unsigned int, qtKey);
-    QFETCH(unsigned int, qtMask);
-    QFETCH(unsigned int, qtModifier);
-    QFETCH(int, longFlags);
-
-    QFETCH(long int, reqNum);
-    
-    QFETCH(bool, additional);
-    QFETCH(long int, additionalReqNum);
-    
-    willBeAdditionalRequest = additional;
-    additionalRequestHandle = additionalReqNum;
-    
-    cancelResults.clear();
-    cancelResults << reqNum;
-    
-    cancelAdditionalResults.clear();
-    cancelAdditionalResults << additionalReqNum;
-    
-    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
-    ignoreWindowGroupAction = true;
-    keyCapture->captureLongKey( static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ), static_cast<XqKeyCapture::LongFlags> (longFlags) );
-    ignoreWindowGroupAction = false;
-    willBeAdditionalRequest = additional;
-    keyCapture->cancelCaptureLongKey( static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ), static_cast<XqKeyCapture::LongFlags> (longFlags) );
-}
 
 void TestXqKeyCapture::testCaptureKey_S60_data()
 {
@@ -1053,6 +450,1107 @@
     keyCapture->captureKey( static_cast<TUint> (s60Key), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
 }
 
+void TestXqKeyCapture::testCaptureKeyList_S60_data()
+{
+    testCaptureKey_S60_data();
+}
+
+void TestXqKeyCapture::testCaptureKeyList_S60()
+{
+    numOfArgs = 3;
+    actionType = WGATCaptureKey;
+    additionalResult = false;
+    ignoreWindowGroupAction = false;
+    
+    QFETCH(unsigned int, s60Key);
+    QFETCH(unsigned int, qtMask);
+    QFETCH(unsigned int, qtModifier);
+
+    QFETCH(unsigned int, symbianKey);
+    QFETCH(unsigned int, symbianMask);
+    QFETCH(unsigned int, symbianModifier);
+
+    QFETCH(long int, reqNum);
+    
+    QFETCH(bool, additional);
+    QFETCH(unsigned int, additionalSymbianKey);
+    
+    willBeAdditionalRequest = additional;
+    
+    results.clear();
+    results << symbianKey << symbianMask << symbianModifier;
+    
+    additionalResults.clear();
+    additionalResults << additionalSymbianKey << symbianMask << symbianModifier;
+    
+    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
+    keyCapture->captureKey(QList<TUint>() << static_cast<TUint> (s60Key), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+}
+
+////////////////////////////////////////////////////////////////
+//Capture Key Up And Downs
+////////////////////////////////////////////////////////////////
+void TestXqKeyCapture::testCaptureKeyUpAndDowns_data()
+{
+    QTest::addColumn<unsigned int>("qtKey");
+    QTest::addColumn<unsigned int>("qtMask");
+    QTest::addColumn<unsigned int>("qtModifier");
+
+    QTest::addColumn<unsigned int>("symbianKey");
+    QTest::addColumn<unsigned int>("symbianMask");
+    QTest::addColumn<unsigned int>("symbianModifier");
+        
+    QTest::addColumn<long int>("reqNum");
+    
+    QTest::addColumn<bool>("additional");
+    QTest::addColumn<unsigned int>("additionalSymbianKey");
+    
+    QTest::newRow("esc_key") << static_cast<unsigned int> ( Qt::Key_Escape ) 
+                            << static_cast<unsigned int> ( Qt::NoModifier )
+                            << static_cast<unsigned int> ( Qt::NoModifier ) 
+                            << static_cast<unsigned int> ( EStdKeyEscape )
+                            << static_cast<unsigned int> ( 0 )
+                            << static_cast<unsigned int> ( 0 )
+                            << static_cast<long int> ( 12 )
+                            << false
+                            << static_cast<unsigned int> ( 0 );
+}
+
+void TestXqKeyCapture::testCaptureKeyUpAndDowns()
+{
+    numOfArgs = 3;
+    actionType = WGATCaptureKeyUpAndDowns;
+    additionalResult = false;
+    ignoreWindowGroupAction = false;
+    
+    QFETCH(unsigned int, qtKey);
+    QFETCH(unsigned int, qtMask);
+    QFETCH(unsigned int, qtModifier);
+
+    QFETCH(unsigned int, symbianKey);
+    QFETCH(unsigned int, symbianMask);
+    QFETCH(unsigned int, symbianModifier);
+
+    QFETCH(long int, reqNum);
+    
+    QFETCH(bool, additional);
+    QFETCH(unsigned int, additionalSymbianKey);
+    
+    willBeAdditionalRequest = additional;
+    
+    results.clear();
+    results << symbianKey << symbianMask << symbianModifier;
+    
+    additionalResults.clear();
+    additionalResults << additionalSymbianKey << symbianMask << symbianModifier;
+    
+    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
+    keyCapture->captureKeyUpAndDowns( static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+}
+
+void TestXqKeyCapture::testCaptureKeyUpAndDownsList_data()
+{
+    testCaptureKeyUpAndDowns_data();
+}
+
+void TestXqKeyCapture::testCaptureKeyUpAndDownsList()
+{
+    numOfArgs = 3;
+    actionType = WGATCaptureKeyUpAndDowns;
+    additionalResult = false;
+    ignoreWindowGroupAction = false;
+    
+    QFETCH(unsigned int, qtKey);
+    QFETCH(unsigned int, qtMask);
+    QFETCH(unsigned int, qtModifier);
+
+    QFETCH(unsigned int, symbianKey);
+    QFETCH(unsigned int, symbianMask);
+    QFETCH(unsigned int, symbianModifier);
+
+    QFETCH(long int, reqNum);
+    
+    QFETCH(bool, additional);
+    QFETCH(unsigned int, additionalSymbianKey);
+    
+    willBeAdditionalRequest = additional;
+    
+    results.clear();
+    results << symbianKey << symbianMask << symbianModifier;
+    
+    additionalResults.clear();
+    additionalResults << additionalSymbianKey << symbianMask << symbianModifier;
+    
+    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
+    keyCapture->captureKeyUpAndDowns( QList<Qt::Key>() << static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+}
+
+////////////////////////////////////////////////////////////////
+//Capture Key Up And Downs
+////////////////////////////////////////////////////////////////
+void TestXqKeyCapture::testCaptureKeyUpAndDowns_S60_data()
+{
+    QTest::addColumn<unsigned int>("qtKey");
+    QTest::addColumn<unsigned int>("qtMask");
+    QTest::addColumn<unsigned int>("qtModifier");
+
+    QTest::addColumn<unsigned int>("symbianKey");
+    QTest::addColumn<unsigned int>("symbianMask");
+    QTest::addColumn<unsigned int>("symbianModifier");
+        
+    QTest::addColumn<long int>("reqNum");
+    
+    QTest::addColumn<bool>("additional");
+    QTest::addColumn<unsigned int>("additionalSymbianKey");
+    
+    QTest::newRow("esc_key") << static_cast<unsigned int> ( EStdKeyEscape ) 
+                            << static_cast<unsigned int> ( Qt::NoModifier )
+                            << static_cast<unsigned int> ( Qt::NoModifier ) 
+                            << static_cast<unsigned int> ( EStdKeyEscape )
+                            << static_cast<unsigned int> ( 0 )
+                            << static_cast<unsigned int> ( 0 )
+                            << static_cast<long int> ( 12 )
+                            << false
+                            << static_cast<unsigned int> ( 0 );
+}
+
+void TestXqKeyCapture::testCaptureKeyUpAndDowns_S60()
+{
+    numOfArgs = 3;
+    actionType = WGATCaptureKeyUpAndDowns;
+    additionalResult = false;
+    ignoreWindowGroupAction = false;
+    
+    QFETCH(unsigned int, qtKey);
+    QFETCH(unsigned int, qtMask);
+    QFETCH(unsigned int, qtModifier);
+
+    QFETCH(unsigned int, symbianKey);
+    QFETCH(unsigned int, symbianMask);
+    QFETCH(unsigned int, symbianModifier);
+
+    QFETCH(long int, reqNum);
+    
+    QFETCH(bool, additional);
+    QFETCH(unsigned int, additionalSymbianKey);
+    
+    willBeAdditionalRequest = additional;
+    
+    results.clear();
+    results << symbianKey << symbianMask << symbianModifier;
+    
+    additionalResults.clear();
+    additionalResults << additionalSymbianKey << symbianMask << symbianModifier;
+    
+    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
+    keyCapture->captureKeyUpAndDowns( static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+}
+
+void TestXqKeyCapture::testCaptureKeyUpAndDownsList_S60_data()
+{
+    testCaptureKeyUpAndDowns_S60_data();
+}
+
+void TestXqKeyCapture::testCaptureKeyUpAndDownsList_S60()
+{
+    numOfArgs = 3;
+    actionType = WGATCaptureKeyUpAndDowns;
+    additionalResult = false;
+    ignoreWindowGroupAction = false;
+    
+    QFETCH(unsigned int, qtKey);
+    QFETCH(unsigned int, qtMask);
+    QFETCH(unsigned int, qtModifier);
+
+    QFETCH(unsigned int, symbianKey);
+    QFETCH(unsigned int, symbianMask);
+    QFETCH(unsigned int, symbianModifier);
+
+    QFETCH(long int, reqNum);
+    
+    QFETCH(bool, additional);
+    QFETCH(unsigned int, additionalSymbianKey);
+    
+    willBeAdditionalRequest = additional;
+    
+    results.clear();
+    results << symbianKey << symbianMask << symbianModifier;
+    
+    additionalResults.clear();
+    additionalResults << additionalSymbianKey << symbianMask << symbianModifier;
+    
+    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
+    keyCapture->captureKeyUpAndDowns( QList<TUint>() << static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+}
+
+////////////////////////////////////////////////////////////////
+//Capture Long Key
+////////////////////////////////////////////////////////////////
+void TestXqKeyCapture::testCaptureLongKey_data()
+{
+    QTest::addColumn<unsigned int>("qtKey");
+    QTest::addColumn<unsigned int>("qtMask");
+    QTest::addColumn<unsigned int>("qtModifier");
+    QTest::addColumn<int>("longFlags");
+    
+    QTest::addColumn<unsigned int>("symbianKey");
+    QTest::addColumn<unsigned int>("symbianMask");
+    QTest::addColumn<unsigned int>("symbianModifier");
+    QTest::addColumn<int>("symbianPriority");
+    QTest::addColumn<int>("symbianLongFlags");
+        
+    QTest::addColumn<long int>("reqNum");
+    
+    QTest::addColumn<bool>("additional");
+    QTest::addColumn<unsigned int>("additionalSymbianKey");
+    
+    
+    QTest::newRow("esc_key") << static_cast<unsigned int> ( Qt::Key_Escape ) 
+                            << static_cast<unsigned int> ( Qt::NoModifier )
+                            << static_cast<unsigned int> ( Qt::NoModifier ) 
+                            << static_cast<int> ( XqKeyCapture::LongNormal ) 
+                            << static_cast<unsigned int> ( EKeyEscape )
+                            << static_cast<unsigned int> ( 0 )
+                            << static_cast<unsigned int> ( 0 )
+                            << static_cast<int> ( 0 ) //priority
+                            << static_cast<int> ( XqKeyCapture::LongNormal ) 
+                            << static_cast<long int> ( 12 )
+                            << false
+                            << static_cast<unsigned int> ( 0 );
+
+}
+
+void TestXqKeyCapture::testCaptureLongKey()
+{
+    numOfArgs = 6;
+    actionType = WGATCaptureLongKey;
+    additionalResult = false;
+    ignoreWindowGroupAction = false;
+    
+    QFETCH(unsigned int, qtKey);
+    QFETCH(unsigned int, qtMask);
+    QFETCH(unsigned int, qtModifier);
+    QFETCH(int, longFlags);
+    
+    QFETCH(unsigned int, symbianKey);
+    QFETCH(unsigned int, symbianMask);
+    QFETCH(unsigned int, symbianModifier);
+    QFETCH(int, symbianPriority);
+    QFETCH(int, symbianLongFlags);
+    
+    QFETCH(long int, reqNum);
+    
+    QFETCH(bool, additional);
+    QFETCH(unsigned int, additionalSymbianKey);
+    
+    willBeAdditionalRequest = additional;
+    
+    results.clear();
+    results << symbianKey << symbianKey << symbianMask << symbianModifier << symbianPriority << symbianLongFlags;
+    
+    additionalResults.clear();
+    additionalResults << additionalSymbianKey << symbianMask << symbianModifier << symbianPriority << symbianLongFlags;
+    
+    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
+    keyCapture->captureLongKey( static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ), static_cast<XqKeyCapture::LongFlags> (longFlags) );
+}
+
+void TestXqKeyCapture::testCaptureLongKeyList_data()
+{
+    testCaptureLongKey_data();
+}
+
+void TestXqKeyCapture::testCaptureLongKeyList()
+{
+    numOfArgs = 6;
+    actionType = WGATCaptureLongKey;
+    additionalResult = false;
+    ignoreWindowGroupAction = false;
+    
+    QFETCH(unsigned int, qtKey);
+    QFETCH(unsigned int, qtMask);
+    QFETCH(unsigned int, qtModifier);
+    QFETCH(int, longFlags);
+    
+    QFETCH(unsigned int, symbianKey);
+    QFETCH(unsigned int, symbianMask);
+    QFETCH(unsigned int, symbianModifier);
+    QFETCH(int, symbianPriority);
+    QFETCH(int, symbianLongFlags);
+    
+    QFETCH(long int, reqNum);
+    
+    QFETCH(bool, additional);
+    QFETCH(unsigned int, additionalSymbianKey);
+    
+    willBeAdditionalRequest = additional;
+    
+    results.clear();
+    results << symbianKey << symbianKey << symbianMask << symbianModifier << symbianPriority << symbianLongFlags;
+    
+    additionalResults.clear();
+    additionalResults << additionalSymbianKey << symbianMask << symbianModifier << symbianPriority << symbianLongFlags;
+    
+    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
+    keyCapture->captureLongKey( QList<Qt::Key>() << static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ), static_cast<XqKeyCapture::LongFlags> (longFlags) );
+}
+
+////////////////////////////////////////////////////////////////
+//Capture Long Key
+////////////////////////////////////////////////////////////////
+void TestXqKeyCapture::testCaptureLongKey_S60_data()
+{
+    QTest::addColumn<unsigned int>("qtKey");
+    QTest::addColumn<unsigned int>("qtMask");
+    QTest::addColumn<unsigned int>("qtModifier");
+    QTest::addColumn<int>("longFlags");
+    
+    QTest::addColumn<unsigned int>("symbianKey");
+    QTest::addColumn<unsigned int>("symbianMask");
+    QTest::addColumn<unsigned int>("symbianModifier");
+    QTest::addColumn<int>("symbianPriority");
+    QTest::addColumn<int>("symbianLongFlags");
+        
+    QTest::addColumn<long int>("reqNum");
+    
+    QTest::addColumn<bool>("additional");
+    QTest::addColumn<unsigned int>("additionalSymbianKey");
+    
+    
+    QTest::newRow("esc_key") << static_cast<unsigned int> ( EKeyEscape ) 
+                            << static_cast<unsigned int> ( Qt::NoModifier )
+                            << static_cast<unsigned int> ( Qt::NoModifier ) 
+                            << static_cast<int> ( XqKeyCapture::LongNormal ) 
+                            << static_cast<unsigned int> ( EKeyEscape )
+                            << static_cast<unsigned int> ( 0 )
+                            << static_cast<unsigned int> ( 0 )
+                            << static_cast<int> ( 0 ) //priority
+                            << static_cast<int> ( XqKeyCapture::LongNormal ) 
+                            << static_cast<long int> ( 12 )
+                            << false
+                            << static_cast<unsigned int> ( 0 );
+
+}
+
+void TestXqKeyCapture::testCaptureLongKey_S60()
+{
+    numOfArgs = 6;
+    actionType = WGATCaptureLongKey;
+    additionalResult = false;
+    ignoreWindowGroupAction = false;
+    
+    QFETCH(unsigned int, qtKey);
+    QFETCH(unsigned int, qtMask);
+    QFETCH(unsigned int, qtModifier);
+    QFETCH(int, longFlags);
+    
+    QFETCH(unsigned int, symbianKey);
+    QFETCH(unsigned int, symbianMask);
+    QFETCH(unsigned int, symbianModifier);
+    QFETCH(int, symbianPriority);
+    QFETCH(int, symbianLongFlags);
+    
+    QFETCH(long int, reqNum);
+    
+    QFETCH(bool, additional);
+    QFETCH(unsigned int, additionalSymbianKey);
+    
+    willBeAdditionalRequest = additional;
+    
+    results.clear();
+    results << symbianKey << symbianKey << symbianMask << symbianModifier << symbianPriority << symbianLongFlags;
+    
+    additionalResults.clear();
+    additionalResults << additionalSymbianKey << symbianMask << symbianModifier << symbianPriority << symbianLongFlags;
+    
+    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
+    keyCapture->captureLongKey( static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ), static_cast<XqKeyCapture::LongFlags> (longFlags) );
+}
+
+void TestXqKeyCapture::testCaptureLongKeyList_S60_data()
+{
+    testCaptureLongKey_S60_data();
+}
+
+void TestXqKeyCapture::testCaptureLongKeyList_S60()
+{
+    numOfArgs = 6;
+    actionType = WGATCaptureLongKey;
+    additionalResult = false;
+    ignoreWindowGroupAction = false;
+    
+    QFETCH(unsigned int, qtKey);
+    QFETCH(unsigned int, qtMask);
+    QFETCH(unsigned int, qtModifier);
+    QFETCH(int, longFlags);
+    
+    QFETCH(unsigned int, symbianKey);
+    QFETCH(unsigned int, symbianMask);
+    QFETCH(unsigned int, symbianModifier);
+    QFETCH(int, symbianPriority);
+    QFETCH(int, symbianLongFlags);
+    
+    QFETCH(long int, reqNum);
+    
+    QFETCH(bool, additional);
+    QFETCH(unsigned int, additionalSymbianKey);
+    
+    willBeAdditionalRequest = additional;
+    
+    results.clear();
+    results << symbianKey << symbianKey << symbianMask << symbianModifier << symbianPriority << symbianLongFlags;
+    
+    additionalResults.clear();
+    additionalResults << additionalSymbianKey << symbianMask << symbianModifier << symbianPriority << symbianLongFlags;
+    
+    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
+    keyCapture->captureLongKey( QList<TUint>() << static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ), static_cast<XqKeyCapture::LongFlags> (longFlags) );
+}
+
+////////////////////////////////////////////////////////////////
+// CANCEL
+//Cancel Capture Key
+////////////////////////////////////////////////////////////////
+void TestXqKeyCapture::testCancelCaptureKey_data()
+{
+    QTest::addColumn<unsigned int>("qtKey");
+    QTest::addColumn<unsigned int>("qtMask");
+    QTest::addColumn<unsigned int>("qtModifier");
+
+    QTest::addColumn<long int>("reqNum");
+    
+    QTest::addColumn<bool>("additional");
+    QTest::addColumn<long int>("additionalReqNum");
+    
+    QTest::newRow("esc_key") << static_cast<unsigned int> ( Qt::Key_Escape ) 
+                            << static_cast<unsigned int> ( Qt::NoModifier )
+                            << static_cast<unsigned int> ( Qt::NoModifier ) 
+                            << static_cast<long int> ( 12 )
+                            << false
+                            << static_cast<long int> ( 0 );
+
+    QTest::newRow("esc_key_not_supported") << static_cast<unsigned int> ( Qt::Key_Escape ) 
+                            << static_cast<unsigned int> ( Qt::NoModifier )
+                            << static_cast<unsigned int> ( Qt::NoModifier ) 
+                            << static_cast<long int> ( KErrNotSupported )
+                            << false
+                            << static_cast<long int> ( 0 );
+    
+    QTest::newRow("esc_key_modifiers") << static_cast<unsigned int> ( Qt::Key_Escape ) 
+                            << static_cast<unsigned int> ( Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier | Qt:: KeypadModifier )
+                            << static_cast<unsigned int> ( Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier | Qt:: KeypadModifier ) 
+                            << static_cast<long int> ( 13 )
+                            << false
+                            << static_cast<long int> ( 0 );
+    
+    QTest::newRow("shift_key") << static_cast<unsigned int> ( Qt::Key_Shift ) 
+                            << static_cast<unsigned int> ( Qt::ShiftModifier )
+                            << static_cast<unsigned int> ( Qt::ControlModifier ) 
+                            << static_cast<long int> ( 15 )
+                            << true
+                            << static_cast<long int> ( 16 );
+
+    QTest::newRow("control_key") << static_cast<unsigned int> ( Qt::Key_Control ) 
+                            << static_cast<unsigned int> ( Qt::ControlModifier )
+                            << static_cast<unsigned int> ( Qt::ShiftModifier ) 
+                            << static_cast<long int> ( 17 )
+                            << true
+                            << static_cast<long int> ( 18 );
+                            
+    QTest::newRow("meta_key") << static_cast<unsigned int> ( Qt::Key_Meta ) 
+                            << static_cast<unsigned int> ( Qt::NoModifier )
+                            << static_cast<unsigned int> ( Qt::NoModifier ) 
+                            << static_cast<long int> ( 19 )
+                            << true
+                            << static_cast<long int> ( 20 );
+
+
+}
+
+void TestXqKeyCapture::testCancelCaptureKey()
+{
+    numOfArgs = 1;
+    actionType = WGATCancelCaptureKey;
+    additionalResult = false;
+    
+    QFETCH(unsigned int, qtKey);
+    QFETCH(unsigned int, qtMask);
+    QFETCH(unsigned int, qtModifier);
+
+    QFETCH(long int, reqNum);
+    
+    QFETCH(bool, additional);
+    QFETCH(long int, additionalReqNum);
+    
+    willBeAdditionalRequest = additional;
+    additionalRequestHandle = additionalReqNum;
+    
+    cancelResults.clear();
+    cancelResults << reqNum;
+    
+    cancelAdditionalResults.clear();
+    cancelAdditionalResults << additionalReqNum;
+    
+    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
+    ignoreWindowGroupAction = true;
+    keyCapture->captureKey( static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+    ignoreWindowGroupAction = false;
+    willBeAdditionalRequest = additional;
+    keyCapture->cancelCaptureKey( static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+}
+
+void TestXqKeyCapture::testCancelCaptureKeyList_data()
+{
+    testCancelCaptureKey_data();
+}
+
+void TestXqKeyCapture::testCancelCaptureKeyList()
+{
+    numOfArgs = 1;
+    actionType = WGATCancelCaptureKey;
+    additionalResult = false;
+    
+    QFETCH(unsigned int, qtKey);
+    QFETCH(unsigned int, qtMask);
+    QFETCH(unsigned int, qtModifier);
+
+    QFETCH(long int, reqNum);
+    
+    QFETCH(bool, additional);
+    QFETCH(long int, additionalReqNum);
+    
+    willBeAdditionalRequest = additional;
+    additionalRequestHandle = additionalReqNum;
+    
+    cancelResults.clear();
+    cancelResults << reqNum;
+    
+    cancelAdditionalResults.clear();
+    cancelAdditionalResults << additionalReqNum;
+    
+    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
+    ignoreWindowGroupAction = true;
+    keyCapture->captureKey( static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+    ignoreWindowGroupAction = false;
+    willBeAdditionalRequest = additional;
+    keyCapture->cancelCaptureKey( QList<Qt::Key>() << static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+}
+
+////////////////////////////////////////////////////////////////
+// CANCEL
+//Cancel Capture Key
+////////////////////////////////////////////////////////////////
+void TestXqKeyCapture::testCancelCaptureKey_S60_data()
+{
+    QTest::addColumn<unsigned int>("qtKey");
+    QTest::addColumn<unsigned int>("qtMask");
+    QTest::addColumn<unsigned int>("qtModifier");
+
+    QTest::addColumn<long int>("reqNum");
+    
+    QTest::addColumn<bool>("additional");
+    QTest::addColumn<long int>("additionalReqNum");
+    
+    QTest::newRow("esc_key") << static_cast<unsigned int> ( EKeyEscape ) 
+                            << static_cast<unsigned int> ( Qt::NoModifier )
+                            << static_cast<unsigned int> ( Qt::NoModifier ) 
+                            << static_cast<long int> ( 12 )
+                            << false
+                            << static_cast<long int> ( 0 );
+
+    QTest::newRow("esc_key_not_supported") << static_cast<unsigned int> ( EKeyEscape ) 
+                            << static_cast<unsigned int> ( Qt::NoModifier )
+                            << static_cast<unsigned int> ( Qt::NoModifier ) 
+                            << static_cast<long int> ( KErrNotSupported )
+                            << false
+                            << static_cast<long int> ( 0 );
+    
+    QTest::newRow("esc_key_modifiers") << static_cast<unsigned int> ( EKeyEscape ) 
+                            << static_cast<unsigned int> ( Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier | Qt:: KeypadModifier )
+                            << static_cast<unsigned int> ( Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier | Qt:: KeypadModifier ) 
+                            << static_cast<long int> ( 13 )
+                            << false
+                            << static_cast<long int> ( 0 );
+    
+    QTest::newRow("shift_key") << static_cast<unsigned int> ( EKeyLeftShift ) 
+                            << static_cast<unsigned int> ( Qt::ShiftModifier )
+                            << static_cast<unsigned int> ( Qt::ControlModifier ) 
+                            << static_cast<long int> ( 15 )
+                            << true
+                            << static_cast<long int> ( 16 );
+
+    QTest::newRow("control_key") << static_cast<unsigned int> ( EKeyLeftCtrl ) 
+                            << static_cast<unsigned int> ( Qt::ControlModifier )
+                            << static_cast<unsigned int> ( Qt::ShiftModifier ) 
+                            << static_cast<long int> ( 17 )
+                            << true
+                            << static_cast<long int> ( 18 );
+                            
+    QTest::newRow("meta_key") << static_cast<unsigned int> ( EKeyRightCtrl ) 
+                            << static_cast<unsigned int> ( Qt::NoModifier )
+                            << static_cast<unsigned int> ( Qt::NoModifier ) 
+                            << static_cast<long int> ( 19 )
+                            << true
+                            << static_cast<long int> ( 20 );
+
+
+}
+
+void TestXqKeyCapture::testCancelCaptureKey_S60()
+{
+    numOfArgs = 1;
+    actionType = WGATCancelCaptureKey;
+    additionalResult = false;
+    
+    QFETCH(unsigned int, qtKey);
+    QFETCH(unsigned int, qtMask);
+    QFETCH(unsigned int, qtModifier);
+
+    QFETCH(long int, reqNum);
+    
+    QFETCH(bool, additional);
+    QFETCH(long int, additionalReqNum);
+    
+    willBeAdditionalRequest = additional;
+    additionalRequestHandle = additionalReqNum;
+    
+    cancelResults.clear();
+    cancelResults << reqNum;
+    
+    cancelAdditionalResults.clear();
+    cancelAdditionalResults << additionalReqNum;
+    
+    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
+    ignoreWindowGroupAction = true;
+    keyCapture->captureKey( static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+    ignoreWindowGroupAction = false;
+    willBeAdditionalRequest = additional;
+    keyCapture->cancelCaptureKey( static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+}
+
+void TestXqKeyCapture::testCancelCaptureKeyList_S60_data()
+{
+    testCancelCaptureKey_S60_data();
+}
+
+void TestXqKeyCapture::testCancelCaptureKeyList_S60()
+{
+    numOfArgs = 1;
+    actionType = WGATCancelCaptureKey;
+    additionalResult = false;
+    
+    QFETCH(unsigned int, qtKey);
+    QFETCH(unsigned int, qtMask);
+    QFETCH(unsigned int, qtModifier);
+
+    QFETCH(long int, reqNum);
+    
+    QFETCH(bool, additional);
+    QFETCH(long int, additionalReqNum);
+    
+    willBeAdditionalRequest = additional;
+    additionalRequestHandle = additionalReqNum;
+    
+    cancelResults.clear();
+    cancelResults << reqNum;
+    
+    cancelAdditionalResults.clear();
+    cancelAdditionalResults << additionalReqNum;
+    
+    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
+    ignoreWindowGroupAction = true;
+    keyCapture->captureKey( static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+    ignoreWindowGroupAction = false;
+    willBeAdditionalRequest = additional;
+    keyCapture->cancelCaptureKey( QList<TUint>() << static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+}
+
+////////////////////////////////////////////////////////////////
+//Cancel Capture Key Up And Downs
+////////////////////////////////////////////////////////////////
+void TestXqKeyCapture::testCancelCaptureKeyUpAndDowns_data()
+{
+    QTest::addColumn<unsigned int>("qtKey");
+    QTest::addColumn<unsigned int>("qtMask");
+    QTest::addColumn<unsigned int>("qtModifier");
+
+    QTest::addColumn<long int>("reqNum");
+    
+    QTest::addColumn<bool>("additional");
+    QTest::addColumn<long int>("additionalReqNum");
+    
+    QTest::newRow("esc_key") << static_cast<unsigned int> ( Qt::Key_Escape ) 
+                            << static_cast<unsigned int> ( Qt::NoModifier )
+                            << static_cast<unsigned int> ( Qt::NoModifier ) 
+                            << static_cast<long int> ( 34 )
+                            << false
+                            << static_cast<long int> ( 35 );
+
+}
+
+void TestXqKeyCapture::testCancelCaptureKeyUpAndDowns()
+{
+    numOfArgs = 1;
+    actionType = WGATCancelCaptureKeyUpAndDowns;
+    additionalResult = false;
+    
+    QFETCH(unsigned int, qtKey);
+    QFETCH(unsigned int, qtMask);
+    QFETCH(unsigned int, qtModifier);
+
+    QFETCH(long int, reqNum);
+    
+    QFETCH(bool, additional);
+    QFETCH(long int, additionalReqNum);
+    
+    willBeAdditionalRequest = additional;
+    additionalRequestHandle = additionalReqNum;
+    
+    cancelResults.clear();
+    cancelResults << reqNum;
+    
+    cancelAdditionalResults.clear();
+    cancelAdditionalResults << additionalReqNum;
+    
+    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
+    ignoreWindowGroupAction = true;
+    keyCapture->captureKeyUpAndDowns( static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+    ignoreWindowGroupAction = false;
+    willBeAdditionalRequest = additional;
+    keyCapture->cancelCaptureKeyUpAndDowns( static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+}
+
+void TestXqKeyCapture::testCancelCaptureKeyUpAndDownsList_data()
+{
+    testCancelCaptureKeyUpAndDowns_data();
+}
+
+void TestXqKeyCapture::testCancelCaptureKeyUpAndDownsList()
+{
+    numOfArgs = 1;
+    actionType = WGATCancelCaptureKeyUpAndDowns;
+    additionalResult = false;
+    
+    QFETCH(unsigned int, qtKey);
+    QFETCH(unsigned int, qtMask);
+    QFETCH(unsigned int, qtModifier);
+
+    QFETCH(long int, reqNum);
+    
+    QFETCH(bool, additional);
+    QFETCH(long int, additionalReqNum);
+    
+    willBeAdditionalRequest = additional;
+    additionalRequestHandle = additionalReqNum;
+    
+    cancelResults.clear();
+    cancelResults << reqNum;
+    
+    cancelAdditionalResults.clear();
+    cancelAdditionalResults << additionalReqNum;
+    
+    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
+    ignoreWindowGroupAction = true;
+    keyCapture->captureKeyUpAndDowns( static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+    ignoreWindowGroupAction = false;
+    willBeAdditionalRequest = additional;
+    keyCapture->cancelCaptureKeyUpAndDowns(QList<Qt::Key>() << static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+}
+
+////////////////////////////////////////////////////////////////
+//Cancel Capture Key Up And Downs
+////////////////////////////////////////////////////////////////
+void TestXqKeyCapture::testCancelCaptureKeyUpAndDowns_S60_data()
+{
+    QTest::addColumn<unsigned int>("qtKey");
+    QTest::addColumn<unsigned int>("qtMask");
+    QTest::addColumn<unsigned int>("qtModifier");
+
+    QTest::addColumn<long int>("reqNum");
+    
+    QTest::addColumn<bool>("additional");
+    QTest::addColumn<long int>("additionalReqNum");
+    
+    QTest::newRow("esc_key") << static_cast<unsigned int> ( EKeyEscape ) 
+                            << static_cast<unsigned int> ( Qt::NoModifier )
+                            << static_cast<unsigned int> ( Qt::NoModifier ) 
+                            << static_cast<long int> ( 34 )
+                            << false
+                            << static_cast<long int> ( 35 );
+
+}
+
+void TestXqKeyCapture::testCancelCaptureKeyUpAndDowns_S60()
+{
+    numOfArgs = 1;
+    actionType = WGATCancelCaptureKeyUpAndDowns;
+    additionalResult = false;
+    
+    QFETCH(unsigned int, qtKey);
+    QFETCH(unsigned int, qtMask);
+    QFETCH(unsigned int, qtModifier);
+
+    QFETCH(long int, reqNum);
+    
+    QFETCH(bool, additional);
+    QFETCH(long int, additionalReqNum);
+    
+    willBeAdditionalRequest = additional;
+    additionalRequestHandle = additionalReqNum;
+    
+    cancelResults.clear();
+    cancelResults << reqNum;
+    
+    cancelAdditionalResults.clear();
+    cancelAdditionalResults << additionalReqNum;
+    
+    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
+    ignoreWindowGroupAction = true;
+    keyCapture->captureKeyUpAndDowns( static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+    ignoreWindowGroupAction = false;
+    willBeAdditionalRequest = additional;
+    keyCapture->cancelCaptureKeyUpAndDowns( static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+}
+
+void TestXqKeyCapture::testCancelCaptureKeyUpAndDownsList_S60_data()
+{
+    testCancelCaptureKeyUpAndDowns_S60_data();
+}
+
+void TestXqKeyCapture::testCancelCaptureKeyUpAndDownsList_S60()
+{
+    numOfArgs = 1;
+    actionType = WGATCancelCaptureKeyUpAndDowns;
+    additionalResult = false;
+    
+    QFETCH(unsigned int, qtKey);
+    QFETCH(unsigned int, qtMask);
+    QFETCH(unsigned int, qtModifier);
+
+    QFETCH(long int, reqNum);
+    
+    QFETCH(bool, additional);
+    QFETCH(long int, additionalReqNum);
+    
+    willBeAdditionalRequest = additional;
+    additionalRequestHandle = additionalReqNum;
+    
+    cancelResults.clear();
+    cancelResults << reqNum;
+    
+    cancelAdditionalResults.clear();
+    cancelAdditionalResults << additionalReqNum;
+    
+    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
+    ignoreWindowGroupAction = true;
+    keyCapture->captureKeyUpAndDowns( static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+    ignoreWindowGroupAction = false;
+    willBeAdditionalRequest = additional;
+    keyCapture->cancelCaptureKeyUpAndDowns(QList<TUint>() << static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ) );
+}
+
+////////////////////////////////////////////////////////////////
+//Cancel Capture Long Key
+////////////////////////////////////////////////////////////////
+void TestXqKeyCapture::testCancelCaptureLongKey_data()
+{
+    QTest::addColumn<unsigned int>("qtKey");
+    QTest::addColumn<unsigned int>("qtMask");
+    QTest::addColumn<unsigned int>("qtModifier");
+    QTest::addColumn<int>("longFlags");
+    
+    QTest::addColumn<long int>("reqNum");
+    
+    QTest::addColumn<bool>("additional");
+    QTest::addColumn<long int>("additionalReqNum");
+    
+    QTest::newRow("esc_key") << static_cast<unsigned int> ( Qt::Key_Escape ) 
+                            << static_cast<unsigned int> ( Qt::NoModifier )
+                            << static_cast<unsigned int> ( Qt::NoModifier )
+                            << static_cast<int> ( XqKeyCapture::LongNormal ) 
+                            << static_cast<long int> ( 22 )
+                            << false
+                            << static_cast<long int> ( 23 );
+
+
+
+
+
+}
+
+void TestXqKeyCapture::testCancelCaptureLongKey()
+{
+    numOfArgs = 1;
+    actionType = WGATCancelCaptureLongKey;
+    additionalResult = false;
+    
+    QFETCH(unsigned int, qtKey);
+    QFETCH(unsigned int, qtMask);
+    QFETCH(unsigned int, qtModifier);
+    QFETCH(int, longFlags);
+
+    QFETCH(long int, reqNum);
+    
+    QFETCH(bool, additional);
+    QFETCH(long int, additionalReqNum);
+    
+    willBeAdditionalRequest = additional;
+    additionalRequestHandle = additionalReqNum;
+    
+    cancelResults.clear();
+    cancelResults << reqNum;
+    
+    cancelAdditionalResults.clear();
+    cancelAdditionalResults << additionalReqNum;
+    
+    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
+    ignoreWindowGroupAction = true;
+    keyCapture->captureLongKey( static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ), static_cast<XqKeyCapture::LongFlags> (longFlags) );
+    ignoreWindowGroupAction = false;
+    willBeAdditionalRequest = additional;
+    keyCapture->cancelCaptureLongKey( static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ), static_cast<XqKeyCapture::LongFlags> (longFlags) );
+}
+
+void TestXqKeyCapture::testCancelCaptureLongKeyList_data()
+{
+    testCancelCaptureLongKey_data();
+}
+
+void TestXqKeyCapture::testCancelCaptureLongKeyList()
+{
+    numOfArgs = 1;
+    actionType = WGATCancelCaptureLongKey;
+    additionalResult = false;
+    
+    QFETCH(unsigned int, qtKey);
+    QFETCH(unsigned int, qtMask);
+    QFETCH(unsigned int, qtModifier);
+    QFETCH(int, longFlags);
+
+    QFETCH(long int, reqNum);
+    
+    QFETCH(bool, additional);
+    QFETCH(long int, additionalReqNum);
+    
+    willBeAdditionalRequest = additional;
+    additionalRequestHandle = additionalReqNum;
+    
+    cancelResults.clear();
+    cancelResults << reqNum;
+    
+    cancelAdditionalResults.clear();
+    cancelAdditionalResults << additionalReqNum;
+    
+    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
+    ignoreWindowGroupAction = true;
+    keyCapture->captureLongKey( static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ), static_cast<XqKeyCapture::LongFlags> (longFlags) );
+    ignoreWindowGroupAction = false;
+    willBeAdditionalRequest = additional;
+    keyCapture->cancelCaptureLongKey( QList<Qt::Key>() << static_cast<Qt::Key> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ), static_cast<XqKeyCapture::LongFlags> (longFlags) );
+}
+
+////////////////////////////////////////////////////////////////
+//Cancel Capture Long Key
+////////////////////////////////////////////////////////////////
+void TestXqKeyCapture::testCancelCaptureLongKey_S60_data()
+{
+    QTest::addColumn<unsigned int>("qtKey");
+    QTest::addColumn<unsigned int>("qtMask");
+    QTest::addColumn<unsigned int>("qtModifier");
+    QTest::addColumn<int>("longFlags");
+    
+    QTest::addColumn<long int>("reqNum");
+    
+    QTest::addColumn<bool>("additional");
+    QTest::addColumn<long int>("additionalReqNum");
+    
+    QTest::newRow("esc_key") << static_cast<unsigned int> ( EKeyEscape ) 
+                            << static_cast<unsigned int> ( Qt::NoModifier )
+                            << static_cast<unsigned int> ( Qt::NoModifier )
+                            << static_cast<int> ( XqKeyCapture::LongNormal ) 
+                            << static_cast<long int> ( 22 )
+                            << false
+                            << static_cast<long int> ( 23 );
+
+
+
+
+
+}
+
+void TestXqKeyCapture::testCancelCaptureLongKey_S60()
+{
+    numOfArgs = 1;
+    actionType = WGATCancelCaptureLongKey;
+    additionalResult = false;
+    
+    QFETCH(unsigned int, qtKey);
+    QFETCH(unsigned int, qtMask);
+    QFETCH(unsigned int, qtModifier);
+    QFETCH(int, longFlags);
+
+    QFETCH(long int, reqNum);
+    
+    QFETCH(bool, additional);
+    QFETCH(long int, additionalReqNum);
+    
+    willBeAdditionalRequest = additional;
+    additionalRequestHandle = additionalReqNum;
+    
+    cancelResults.clear();
+    cancelResults << reqNum;
+    
+    cancelAdditionalResults.clear();
+    cancelAdditionalResults << additionalReqNum;
+    
+    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
+    ignoreWindowGroupAction = true;
+    keyCapture->captureLongKey( static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ), static_cast<XqKeyCapture::LongFlags> (longFlags) );
+    ignoreWindowGroupAction = false;
+    willBeAdditionalRequest = additional;
+    keyCapture->cancelCaptureLongKey( static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ), static_cast<XqKeyCapture::LongFlags> (longFlags) );
+}
+
+void TestXqKeyCapture::testCancelCaptureLongKeyList_S60_data()
+{
+    testCancelCaptureLongKey_S60_data();
+}
+
+void TestXqKeyCapture::testCancelCaptureLongKeyList_S60()
+{
+    numOfArgs = 1;
+    actionType = WGATCancelCaptureLongKey;
+    additionalResult = false;
+    
+    QFETCH(unsigned int, qtKey);
+    QFETCH(unsigned int, qtMask);
+    QFETCH(unsigned int, qtModifier);
+    QFETCH(int, longFlags);
+
+    QFETCH(long int, reqNum);
+    
+    QFETCH(bool, additional);
+    QFETCH(long int, additionalReqNum);
+    
+    willBeAdditionalRequest = additional;
+    additionalRequestHandle = additionalReqNum;
+    
+    cancelResults.clear();
+    cancelResults << reqNum;
+    
+    cancelAdditionalResults.clear();
+    cancelAdditionalResults << additionalReqNum;
+    
+    MyTestWindowGroup::Instance()->setRequestNumber(reqNum);
+    ignoreWindowGroupAction = true;
+    keyCapture->captureLongKey( static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ), static_cast<XqKeyCapture::LongFlags> (longFlags) );
+    ignoreWindowGroupAction = false;
+    willBeAdditionalRequest = additional;
+    keyCapture->cancelCaptureLongKey(QList<TUint>() << static_cast<TUint> (qtKey), Qt::KeyboardModifier( qtMask ), Qt::KeyboardModifier( qtModifier ), static_cast<XqKeyCapture::LongFlags> (longFlags) );
+}
+
+
+
 ////////////////////////////////////////////////////////////////
 // ERRORS
 //errorString
@@ -1090,10 +1588,10 @@
     QStringList qt;
     QStringList kc;
 
-    QFile qtFile("c:\qkeymapper_s60.cpp");
+    QFile qtFile("c:\\qkeymapper_s60.cpp");
     QVERIFY(qtFile.open(QIODevice::ReadOnly | QIODevice::Text));
     
-    QFile kcFile("c:\keymapper.cpp");
+    QFile kcFile("c:\\keymapper.cpp");
     QVERIFY(kcFile.open(QIODevice::ReadOnly | QIODevice::Text));
     
     QTextStream inQtFile(&qtFile);

--- a/qtmobileextensions/src/keycapture/xqkeycapture.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobileextensions/src/keycapture/xqkeycapture.cpp	Fri May 14 16:41:33 2010 +0300
@@ -44,41 +44,41 @@
 /*!
  Selects a given key for capturing key pressing. Requires a Qt key code.
  \param aKey A Qt key.
- \param aModifiersMap
+ \param aModifiersMask
  \param aModifier 
  \retval Returns true if aKey was succesfully added to the capturing system, otherwise returns false.
  */
 bool XqKeyCapture::captureKey(Qt::Key aKey,
-    Qt::KeyboardModifiers aModifiersMap, Qt::KeyboardModifiers aModifier)
+    Qt::KeyboardModifiers aModifiersMask, Qt::KeyboardModifiers aModifier)
 {
-    return d->captureKey(aKey, aModifiersMap, aModifier);
+    return d->captureKey(aKey, aModifiersMask, aModifier);
 }
 
 /*!
  Selects a given key for capturing key pressing. Requires a S60 key code (TKeyCode).
  \param aKey A S60 key code (TKeyCode).
- \param aModifiersMap
+ \param aModifiersMask
  \param aModifier 
  \retval Returns true if aKey was succesfully added to the capturing system, otherwise returns false.
  */
 bool XqKeyCapture::captureKey(TUint aKey,
-    Qt::KeyboardModifiers aModifiersMap, Qt::KeyboardModifiers aModifier)
+    Qt::KeyboardModifiers aModifiersMask, Qt::KeyboardModifiers aModifier)
 {
-    return d->captureKey(aKey, aModifiersMap, aModifier);
+    return d->captureKey(aKey, aModifiersMask, aModifier);
 }
 
 /*!
  Selects a given key for capturing long pressing. Requires a Qt key code.
  \param aKey A Qt key.
- \param aModifiersMap
+ \param aModifiersMask
  \param aModifier 
  \retval Returns true if aKey was succesfully added to the capturing system, otherwise returns false.
  */
 bool XqKeyCapture::captureLongKey(Qt::Key aKey,
-    Qt::KeyboardModifiers aModifiersMap, Qt::KeyboardModifiers aModifier,
+    Qt::KeyboardModifiers aModifiersMask, Qt::KeyboardModifiers aModifier,
     XqKeyCapture::LongFlags aLongType)
 {
-    return d->captureLongKey(aKey, aModifiersMap, aModifier, aLongType);
+    return d->captureLongKey(aKey, aModifiersMask, aModifier, aLongType);
 }
 
 /*!
@@ -98,109 +98,109 @@
 /*!
  Selects a given key for capturing pressing up and down. Requires a Qt key code.
  \param aKey A Qt key.
- \param aModifiersMap
+ \param aModifiersMask
  \param aModifier 
  \retval Returns true if aKey was succesfully added to the capturing system, otherwise returns false.
  */
 bool XqKeyCapture::captureKeyUpAndDowns(Qt::Key aKey,
-    Qt::KeyboardModifiers aModifiersMap, Qt::KeyboardModifiers aModifier)
+    Qt::KeyboardModifiers aModifiersMask, Qt::KeyboardModifiers aModifier)
 {
-    return d->captureKeyUpAndDowns(aKey, aModifiersMap, aModifier);
+    return d->captureKeyUpAndDowns(aKey, aModifiersMask, aModifier);
 }
 
 /*!
  Selects a given key for capturing pressing up and down. Requires a S60 key scan code (TStdScanCode).
  \param aKey A S60 key scan code (TStdScanCode).
- \param aModifiersMap
+ \param aModifiersMask
  \param aModifier 
  \retval Returns true if aKey was succesfully added to the capturing system, otherwise returns false.
  */
 bool XqKeyCapture::captureKeyUpAndDowns(TUint aKey,
-    Qt::KeyboardModifiers aModifiersMap, Qt::KeyboardModifiers aModifier)
+    Qt::KeyboardModifiers aModifiersMask, Qt::KeyboardModifiers aModifier)
 {
-    return d->captureKeyUpAndDowns(aKey, aModifiersMap, aModifier);
+    return d->captureKeyUpAndDowns(aKey, aModifiersMask, aModifier);
 }
 
 /*!
  Deselects a given key from key capturing. Requires a Qt key code.
  \param aKey A Qt key.
- \param aModifiersMap
+ \param aModifiersMask
  \param aModifier 
  \retval Returns true if aKey was succesfully removed from the capturing system, otherwise returns false.
  */
 bool XqKeyCapture::cancelCaptureKey(Qt::Key aKey,
-    Qt::KeyboardModifiers aModifiersMap, Qt::KeyboardModifiers aModifier)
+    Qt::KeyboardModifiers aModifiersMask, Qt::KeyboardModifiers aModifier)
 {
-    return d->cancelCaptureKey(aKey, aModifiersMap, aModifier);
+    return d->cancelCaptureKey(aKey, aModifiersMask, aModifier);
 }
 
 /*!
  Deselects a given key from key capturing. Requires a S60 key code (TKeyCode).
  \param aKey A S60 key code (TKeyCode).
- \param aModifiersMap
+ \param aModifiersMask
  \param aModifier 
  \retval Returns true if aKey was succesfully removed from the capturing system, otherwise returns false.
  */
 bool XqKeyCapture::cancelCaptureKey(TUint aKey,
-    Qt::KeyboardModifiers aModifiersMap, Qt::KeyboardModifiers aModifier)
+    Qt::KeyboardModifiers aModifiersMask, Qt::KeyboardModifiers aModifier)
 {
-    return d->cancelCaptureKey(aKey, aModifiersMap, aModifier);
+    return d->cancelCaptureKey(aKey, aModifiersMask, aModifier);
 }
 
 /*!
  Deselects a given key from capturing long pressing. Requires a Qt key code.
  \param aKey A Qt key.
- \param aModifiersMap
+ \param aModifiersMask
  \param aModifier 
  \retval Returns true if aKey was succesfully removed from the capturing system, otherwise returns false.
  */
 bool XqKeyCapture::cancelCaptureLongKey(Qt::Key aKey,
-    Qt::KeyboardModifiers aModifiersMap, Qt::KeyboardModifiers aModifier,
+    Qt::KeyboardModifiers aModifiersMask, Qt::KeyboardModifiers aModifier,
     XqKeyCapture::LongFlags aLongType)
 {
-    return d->cancelCaptureLongKey(aKey, aModifiersMap, aModifier,
+    return d->cancelCaptureLongKey(aKey, aModifiersMask, aModifier,
         aLongType);
 }
 
 /*!
  Deselects a given key from capturing long pressing. Requires a S60 key code (TKeyCode).
  \param aKey A S60 key code (TKeyCode).
- \param aModifiersMap
+ \param aModifiersMask
  \param aModifier 
  \retval Returns true if aKey was succesfully removed from the capturing system, otherwise returns false.
  */
 bool XqKeyCapture::cancelCaptureLongKey(TUint aKey,
-    Qt::KeyboardModifiers aModifiersMap, Qt::KeyboardModifiers aModifier,
+    Qt::KeyboardModifiers aModifiersMask, Qt::KeyboardModifiers aModifier,
     XqKeyCapture::LongFlags aLongType)
 {
-    return d->cancelCaptureLongKey(aKey, aModifiersMap, aModifier,
+    return d->cancelCaptureLongKey(aKey, aModifiersMask, aModifier,
         aLongType);
 }
 
 /*!
  Deselects a given key from capturing pressing up and down. Requires a Qt key code.
  \param aKey A Qt key.
- \param aModifiersMap
+ \param aModifiersMask
  \param aModifier 
  \retval Returns true if aKey was succesfully removed from the capturing system, otherwise returns false.
  */
 bool XqKeyCapture::cancelCaptureKeyUpAndDowns(Qt::Key aKey,
-    Qt::KeyboardModifiers aModifiersMap, Qt::KeyboardModifiers aModifier)
+    Qt::KeyboardModifiers aModifiersMask, Qt::KeyboardModifiers aModifier)
 {
-    return d->cancelCaptureKeyUpAndDowns(aKey, aModifiersMap, aModifier);
+    return d->cancelCaptureKeyUpAndDowns(aKey, aModifiersMask, aModifier);
 }
 
 /*!
  Deselects a given key from capturing pressing up and down. Requires a S60 key scan code (TStdScanCode).
  \param aKey A S60 key scan code (TStdScanCode).
- \param aModifiersMap
+ \param aModifiersMask
  \param aModifier 
  \retval Returns true if aKey was succesfully removed from the capturing system, otherwise returns false.
  */
 bool XqKeyCapture::cancelCaptureKeyUpAndDowns(TUint aKey,
-    Qt::KeyboardModifiers aModifiersMap, Qt::KeyboardModifiers aModifier)
+    Qt::KeyboardModifiers aModifiersMask, Qt::KeyboardModifiers aModifier)
 {
-    return d->cancelCaptureKeyUpAndDowns(aKey, aModifiersMap, aModifier);
+    return d->cancelCaptureKeyUpAndDowns(aKey, aModifiersMask, aModifier);
 }
 
 /*!
@@ -220,3 +220,235 @@
 {
     return d->errorId();
 }
+
+/*!
+ Selects a given keys for capturing key pressing. Requires a Qt key code.
+ \param list A Qt keys list.
+ \param aModifiersMask
+ \param aModifier 
+ \retval Returns true if aKey was succesfully added to the capturing system, otherwise returns false.
+ */
+bool XqKeyCapture::captureKey(XQKeyCaptureKeyList list, 
+        Qt::KeyboardModifiers aModifiersMask,
+        Qt::KeyboardModifiers aModifier)
+{
+    Qt::Key key;
+    bool result = true;
+    foreach (key, list) {
+        bool result = result & d->captureKey(key, aModifiersMask, aModifier);
+    }
+    return result;
+}
+
+/*!
+ Selects a given keys for capturing key pressing. Requires a S60 key code (TKeyCode).
+ \param list A S60 list of keys (TKeyCode codes).
+ \param aModifiersMask
+ \param aModifier 
+ \retval Returns true if aKey was succesfully added to the capturing system, otherwise returns false.
+ */
+bool XqKeyCapture::captureKey(XQKeyCaptureNativeKeyList list, 
+        Qt::KeyboardModifiers aModifiersMask,
+        Qt::KeyboardModifiers aModifier)
+{
+    TUint key;
+    bool result = true;
+    foreach (key, list) {
+        bool result = result & d->captureKey(key, aModifiersMask, aModifier);
+    }
+    return result;
+}
+
+/*!
+ Selects a given keys for capturing long pressing. Requires a Qt key code.
+ \param aKey A Qt  list of keys.
+ \param aModifiersMask
+ \param aModifier 
+ \retval Returns true if aKey was succesfully added to the capturing system, otherwise returns false.
+ */
+bool XqKeyCapture::captureLongKey(XQKeyCaptureKeyList list, 
+        Qt::KeyboardModifiers aModifiersMask,
+        Qt::KeyboardModifiers aModifier,
+        XqKeyCapture::LongFlags aLongType)
+{
+    Qt::Key key;
+    bool result = true;
+    foreach (key, list) {
+        bool result = result & d->captureLongKey(key, aModifiersMask, aModifier, aLongType);
+    }
+    return result;
+}
+
+/*!
+ Selects a given keys for capturing long pressing. Requires a S60 key code (TKeyCode).
+ \param list A S60 list of keys (TKeyCode codes).
+ \param aModifiersMap
+ \param aModifier 
+ \retval Returns true if aKey was succesfully added to the capturing system, otherwise returns false.
+ */
+ bool XqKeyCapture::captureLongKey(XQKeyCaptureNativeKeyList list, 
+        Qt::KeyboardModifiers aModifiersMask,
+        Qt::KeyboardModifiers aModifier,
+        XqKeyCapture::LongFlags aLongType)
+{
+    TUint key;
+    bool result = true;
+    foreach (key, list) {
+        bool result = result & d->captureLongKey(key, aModifiersMask, aModifier, aLongType);
+    }
+    return result;
+}
+
+/*!
+ Selects a given keys for capturing pressing up and down. Requires a Qt key code.
+ \param list A Qt list of keys.
+ \param aModifiersMask
+ \param aModifier 
+ \retval Returns true if aKey was succesfully added to the capturing system, otherwise returns false.
+ */
+bool XqKeyCapture::captureKeyUpAndDowns(XQKeyCaptureKeyList list, 
+        Qt::KeyboardModifiers aModifiersMask,
+        Qt::KeyboardModifiers aModifier)
+{
+    Qt::Key key;
+    bool result = true;
+    foreach (key, list) {
+        bool result = result & d->captureKeyUpAndDowns(key, aModifiersMask, aModifier);
+    }
+    return result;
+}
+
+/*!
+ Selects a given keys for capturing pressing up and down. Requires a S60 key scan code (TStdScanCode).
+ \param list A list of S60 key scan codes (TStdScanCode).
+ \param aModifiersMask
+ \param aModifier 
+ \retval Returns true if aKey was succesfully added to the capturing system, otherwise returns false.
+ */
+bool XqKeyCapture::captureKeyUpAndDowns(XQKeyCaptureNativeKeyList list, 
+        Qt::KeyboardModifiers aModifiersMask,
+        Qt::KeyboardModifiers aModifier)
+{
+    TUint key;
+    bool result = true;
+    foreach (key, list) {
+        bool result = result & d->captureKeyUpAndDowns(key, aModifiersMask, aModifier);
+    }
+    return result;
+}
+
+/*!
+ Deselects a given list of keys from key capturing. Requires a Qt key code.
+ \param list  A Qt list of keys.
+ \param aModifiersMask
+ \param aModifier 
+ \retval Returns true if aKey was succesfully removed from the capturing system, otherwise returns false.
+ */
+bool XqKeyCapture::cancelCaptureKey(XQKeyCaptureKeyList list, 
+        Qt::KeyboardModifiers aModifiersMask,
+        Qt::KeyboardModifiers aModifier)
+{
+    Qt::Key key;
+    bool result = true;
+    foreach (key, list) {
+        bool result = result & d->cancelCaptureKey(key, aModifiersMask, aModifier);
+    }
+    return result;
+}
+
+/*!
+ Deselects a given list of keys from key capturing. Requires a S60 key code (TKeyCode).
+ \param list  A S60 list of key codes (TKeyCode).
+ \param aModifiersMask
+ \param aModifier 
+ \retval Returns true if aKey was succesfully removed from the capturing system, otherwise returns false.
+ */
+bool XqKeyCapture::cancelCaptureKey(XQKeyCaptureNativeKeyList list, 
+        Qt::KeyboardModifiers aModifiersMask,
+        Qt::KeyboardModifiers aModifier)
+{
+    TUint key;
+    bool result = true;
+    foreach (key, list) {
+        bool result = result & d->cancelCaptureKey(key, aModifiersMask, aModifier);
+    }
+    return result;
+}
+
+/*!
+ Deselects a given list of keys from capturing long pressing. Requires a Qt key code.
+ \param list A list of Qt keys.
+ \param aModifiersMask
+ \param aModifier 
+ \retval Returns true if aKey was succesfully removed from the capturing system, otherwise returns false.
+ */
+bool XqKeyCapture::cancelCaptureLongKey(XQKeyCaptureKeyList list, 
+        Qt::KeyboardModifiers aModifiersMask,
+        Qt::KeyboardModifiers aModifier,
+        XqKeyCapture::LongFlags aLongType)
+{
+    Qt::Key key;
+    bool result = true;
+    foreach (key, list) {
+        bool result = result & d->cancelCaptureLongKey(key, aModifiersMask, aModifier, aLongType);
+    }
+    return result;
+}
+
+/*!
+ Deselects a given key from capturing long pressing. Requires a S60 key code (TKeyCode).
+ \paramlist A list of S60 key codes (TKeyCode).
+ \param aModifiersMask
+ \param aModifier 
+ \retval Returns true if aKey was succesfully removed from the capturing system, otherwise returns false.
+ */
+bool XqKeyCapture::cancelCaptureLongKey(XQKeyCaptureNativeKeyList list, 
+        Qt::KeyboardModifiers aModifiersMask,
+        Qt::KeyboardModifiers aModifier,
+        XqKeyCapture::LongFlags aLongType)
+{
+    TUint key;
+    bool result = true;
+    foreach (key, list) {
+        bool result = result & d->cancelCaptureLongKey(key, aModifiersMask, aModifier, aLongType);
+    }
+    return result;
+}
+
+/*!
+ Deselects a list of given keys from capturing pressing up and down. Requires a Qt key codes.
+ \param list A list of Qt keys.
+ \param aModifiersMask
+ \param aModifier 
+ \retval Returns true if aKey was succesfully removed from the capturing system, otherwise returns false.
+ */
+bool XqKeyCapture::cancelCaptureKeyUpAndDowns(XQKeyCaptureKeyList list, 
+        Qt::KeyboardModifiers aModifiersMask,
+        Qt::KeyboardModifiers aModifier)
+{
+    Qt::Key key;
+    bool result = true;
+    foreach (key, list) {
+        bool result = result & d->cancelCaptureKeyUpAndDowns(key, aModifiersMask, aModifier);
+    }
+    return result;
+}
+
+/*!
+ Deselects a given list of keys from capturing pressing up and down. Requires a S60 key scan code (TStdScanCode).
+ \param aKey A S60 key scan code (TStdScanCode).
+ \param aModifiersMask
+ \param aModifier 
+ \retval Returns true if aKey was succesfully removed from the capturing system, otherwise returns false.
+ */
+ bool XqKeyCapture::cancelCaptureKeyUpAndDowns(XQKeyCaptureNativeKeyList list, 
+        Qt::KeyboardModifiers aModifiersMask,
+        Qt::KeyboardModifiers aModifier)
+{
+    TUint key;
+    bool result = true;
+    foreach (key, list) {
+        bool result = result & d->cancelCaptureKeyUpAndDowns(key, aModifiersMask, aModifier);
+    }
+    return result;
+}

--- a/qtmobileextensions/src/keycapture/xqkeycapture.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobileextensions/src/keycapture/xqkeycapture.h	Fri May 14 16:41:33 2010 +0300
@@ -25,6 +25,7 @@
 #include <qnamespace.h>
 #include <QString>
 #include <QObject>
+#include <QList>
 
 #include <w32std.h>
 
@@ -36,6 +37,9 @@
 
 class KeyCapturePrivate;
 
+typedef QList<Qt::Key> XQKeyCaptureKeyList; 
+typedef QList<TUint> XQKeyCaptureNativeKeyList; 
+
 class XQKEYCAPTURE_EXPORT XqKeyCapture {
 
 public:
@@ -46,64 +50,115 @@
     LongWaitShort = ELongCaptureWaitShort,
     LongWaitNotApplicable = 0
     };
-
+    
 public:
     XqKeyCapture();
 
     ~XqKeyCapture();
 
     bool captureKey(Qt::Key aKey,
-        Qt::KeyboardModifiers aModifiersMap = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
         Qt::KeyboardModifiers aModifier = Qt::NoModifier);
     
     bool captureKey(TUint aKey,
-        Qt::KeyboardModifiers aModifiersMap = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
         Qt::KeyboardModifiers aModifier = Qt::NoModifier);
 
     bool captureLongKey(Qt::Key aKey,
-        Qt::KeyboardModifiers aModifiersMap = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
         Qt::KeyboardModifiers aModifier = Qt::NoModifier,
         XqKeyCapture::LongFlags aLongType = XqKeyCapture::LongNormal);
-    
+
     bool captureLongKey(TUint aKey,
-        Qt::KeyboardModifiers aModifiersMap = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
         Qt::KeyboardModifiers aModifier = Qt::NoModifier,
         XqKeyCapture::LongFlags aLongType = XqKeyCapture::LongNormal);
 
     bool captureKeyUpAndDowns(Qt::Key aKey,
-        Qt::KeyboardModifiers aModifiersMap = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
         Qt::KeyboardModifiers aModifier = Qt::NoModifier);
     
     bool captureKeyUpAndDowns(TUint aKey,
-        Qt::KeyboardModifiers aModifiersMap = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
         Qt::KeyboardModifiers aModifier = Qt::NoModifier);
 
+    bool captureKey(XQKeyCaptureKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier);
     
+    bool captureKey(XQKeyCaptureNativeKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+    
+    bool captureLongKey(XQKeyCaptureKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier,
+            XqKeyCapture::LongFlags aLongType = XqKeyCapture::LongNormal);
+    
+    bool captureLongKey(XQKeyCaptureNativeKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier,
+            XqKeyCapture::LongFlags aLongType = XqKeyCapture::LongNormal);
+    
+    bool captureKeyUpAndDowns(XQKeyCaptureKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+    
+    bool captureKeyUpAndDowns(XQKeyCaptureNativeKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+		
     bool cancelCaptureKey(Qt::Key aKey,
-        Qt::KeyboardModifiers aModifiersMap = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
         Qt::KeyboardModifiers aModifier = Qt::NoModifier);
-    
+
     bool cancelCaptureKey(TUint aKey,
-        Qt::KeyboardModifiers aModifiersMap = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
         Qt::KeyboardModifiers aModifier = Qt::NoModifier);
 
     bool cancelCaptureLongKey(Qt::Key aKey,
-        Qt::KeyboardModifiers aModifiersMap = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
         Qt::KeyboardModifiers aModifier = Qt::NoModifier,
         XqKeyCapture::LongFlags aLongType = XqKeyCapture::LongNormal);
-    
+
     bool cancelCaptureLongKey(TUint aKey,
-        Qt::KeyboardModifiers aModifiersMap = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
         Qt::KeyboardModifiers aModifier = Qt::NoModifier,
         XqKeyCapture::LongFlags aLongType = XqKeyCapture::LongNormal);
 
     bool cancelCaptureKeyUpAndDowns(Qt::Key aKey,
-        Qt::KeyboardModifiers aModifiersMap = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
         Qt::KeyboardModifiers aModifier = Qt::NoModifier);
 
     bool cancelCaptureKeyUpAndDowns(TUint aKey,
-        Qt::KeyboardModifiers aModifiersMap = Qt::NoModifier,
+        Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
         Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+    
+    bool cancelCaptureKey(XQKeyCaptureKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+    
+    bool cancelCaptureKey(XQKeyCaptureNativeKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+    
+    bool cancelCaptureLongKey(XQKeyCaptureKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier,
+            XqKeyCapture::LongFlags aLongType = XqKeyCapture::LongNormal);
+    
+    bool cancelCaptureLongKey(XQKeyCaptureNativeKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier,
+            XqKeyCapture::LongFlags aLongType = XqKeyCapture::LongNormal);
+    
+    bool cancelCaptureKeyUpAndDowns(XQKeyCaptureKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier);
+    
+    bool cancelCaptureKeyUpAndDowns(XQKeyCaptureNativeKeyList list, 
+            Qt::KeyboardModifiers aModifiersMask = Qt::NoModifier,
+            Qt::KeyboardModifiers aModifier = Qt::NoModifier);
 
     QString errorString() const;

--- a/qtmobileextensions/src/settingsmanager/settingsmanager.pri	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobileextensions/src/settingsmanager/settingsmanager.pri	Fri May 14 16:41:33 2010 +0300
@@ -49,4 +49,4 @@
     xqpublishandsubscribesecuritypolicy.cpp \
 
 symbian:LIBS += -lcentralrepository \
-    -lcommonengine
+    -lCommonEngine

--- a/qtmobileextensions/src/utils/utils.pri	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobileextensions/src/utils/utils.pri	Fri May 14 16:41:33 2010 +0300
@@ -29,6 +29,6 @@
     xqconversions.cpp
 
 symbian:LIBS += -lapmime \
-    -lcommonui \
+    -lCommonUI \
     -lplatformenv \
     -lcharconv

--- a/qtmobility/.gitignore	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/.gitignore	Fri May 14 16:41:33 2010 +0300
@@ -28,6 +28,7 @@
 bin/sysinfo*
 bin/qcrmlgen*
 bin/icheck*
+src/global/qbuildcfg.h
 install/*
 lib/*
 *.app

--- a/qtmobility/bin/rununittests.sh	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/bin/rununittests.sh	Fri May 14 16:41:33 2010 +0300
@@ -142,7 +142,6 @@
 ./tst_qversitproperty
 ./tst_qversitreader
 ./tst_qversitwriter
-./tst_versitutils
 
 #QMessaging
 ./tst_qmessage

--- a/qtmobility/common.pri	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/common.pri	Fri May 14 16:41:33 2010 +0300
@@ -13,6 +13,10 @@
 
 include(staticconfig.pri)
 
+# use only $$QT_MOBILITY_BUILD_TREE. If you add an subfolder it will create a relative path!!!
+# $$QT_MOBILITY_BUILD_TREE/src/global will become ../global
+INCLUDEPATH += $$QT_MOBILITY_BUILD_TREE
+
 symbian:contains(symbian_symbols_unfrozen,1) {
     #see configure.bat for details
     MMP_RULES+="EXPORTUNFROZEN"

--- a/qtmobility/config.pri	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/config.pri	Fri May 14 16:41:33 2010 +0300
@@ -13,4 +13,5 @@
 snap_enabled = yes 
 occ_enabled = yes 
 symbiancntsim_enabled = yes 
-MOBILITY_SD_MCL_BUILD = yes
\ No newline at end of file
+MOBILITY_SD_MCL_BUILD = yes
+sensors_symbian_enabled = yes
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/config.tests/sensors_s60_31/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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$
+**
+****************************************************************************/
+
+int main(int, char**)
+{
+    return 0;
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/config.tests/sensors_s60_31/sensors_s60_31.pro	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,9 @@
+CONFIG -= qt
+TEMPLATE = app
+
+# Input
+SOURCES += main.cpp
+
+#INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+LIBS += -lRRSensorApi
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/config.tests/sensors_symbian/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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$
+**
+****************************************************************************/
+
+int main(int, char**)
+{
+    return 0;
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/config.tests/sensors_symbian/sensors_symbian.pro	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,9 @@
+CONFIG -= qt
+TEMPLATE = app
+
+# Input
+SOURCES += main.cpp
+
+#INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+LIBS += -lSensrvClient
+

--- a/qtmobility/configure	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/configure	Fri May 14 16:41:33 2010 +0300
@@ -42,7 +42,7 @@
 
 # return status of 1 if absolute path as first argument
 # also prints the return status
-function isAbsPath() {
+isAbsPath() {
     slash=$(echo $1 | cut -c 1)
     if [ "$slash" != "/" ]; then
         echo 0
@@ -57,7 +57,7 @@
 # This is required because when building in scratchbox for
 # maemo we do not want to follow symbolic links that are 
 # introduced by scratchbox
-function absPath() {
+absPath() {
     
     if [ "$2" = "maemo5" -o "$2" = "maemo6" ]; then
         if [ `isAbsPath $1` = '1' ]; then
@@ -89,6 +89,7 @@
 BUILD_UNITTESTS=
 BUILD_EXAMPLES=
 BUILD_DOCS=yes
+BUILD_TOOLS=yes
 RELEASEMODE=
 BUILD_SILENT=
 LINUX_TARGET=
@@ -103,7 +104,8 @@
 {
     echo "Usage: configure [-prefix <dir>] [headerdir <dir>] [libdir <dir>]"
     echo "                 [-bindir <dir>] [-tests] [-examples] [-no-docs]"
-    echo "                 [-debug] [-release] [-silent] [-modules <list>]"
+    echo "                 [-no-tools] [-debug] [-release] [-silent]"
+    echo "                 [-modules <list>]"
     echo
     echo "Options:"
     echo
@@ -123,6 +125,7 @@
     echo "                    and should not be used for release builds."
     echo "-examples ......... Build example applications"
     echo "-no-docs .......... Do not build documentation (build by default)"
+    echo "-no-tools ......... Do not build tools (build by default)"
     echo "-modules <list> ... Restrict list of modules to build (default all supported)"
     echo "                    Choose from: bearer contacts location publishsubscribe"
     echo "                    messaging multimedia systeminfo serviceframework versit"
@@ -175,6 +178,9 @@
         -no-docs)
             BUILD_DOCS=
             ;;
+        -no-tools)
+            BUILD_TOOLS=
+            ;;
         -debug)
             RELEASEMODE=debug
             ;;
@@ -352,6 +358,12 @@
     echo "build_docs = yes" >> "$CONFIG_IN"
 fi
 
+if [ -z "$BUILD_TOOLS" ]; then
+    echo "build_tools = no" >> "$CONFIG_IN"
+else
+    echo "build_tools = yes" >> "$CONFIG_IN"
+fi
+
 echo "Configuring Qt Mobility"
 echo

--- a/qtmobility/configure.bat	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/configure.bat	Fri May 14 16:41:33 2010 +0300
@@ -461,6 +461,8 @@
 call :compileTest SNAP snap
 call :compileTest OCC occ
 call :compileTest SymbianContactSIM symbiancntsim
+call :compileTest S60_Sensor_API sensors_s60_31
+call :compileTest Symbian_Sensor_Framework sensors_symbian
 echo End of compile tests
 echo.
 echo.
@@ -495,7 +497,6 @@
     perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\messaging
 ) else if %FIRST% == multimedia (
     perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\multimedia
-    perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\multimedia\experimental
 ) else if %FIRST% == publishsubscribe (
     perl -S %SOURCE_PATH%\bin\syncheaders %BUILD_PATH%\include %SOURCE_PATH%\src\publishsubscribe
 ) else if %FIRST% == systeminfo (

--- a/qtmobility/dist/changes-1.0.0	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/dist/changes-1.0.0	Fri May 14 16:41:33 2010 +0300
@@ -44,14 +44,51 @@
 QtBearer
 ------
 
- - foo
-    * bar
+ - Fixed MOBILITY-748: Private Qt header usage has been removed
+ - Fixed MOBILITY-600: Memory leak on Mac fixed
+ - Multiple optimizations on Mac OS
+ - Maemo 5 and Maemo 6 use exact same code base
+ - ConnectInBackground support for Symbian added
+ - Maemo 5 (Fremantle) specific fixes
+    * Fixed QTMOBILITY-70: bearermonitor application has serious layout issues
+      preventing any use of the app
+    * Fixed MOBILITY-723: BearerEx test application isn't usable in N900
+    * Fixed MOBILITY-600: QNetworkSession is not asynchronous on Maemo and
+      leads to crashes
+ - Static analysis errors fixed
+    
 
 QtContacts
 ------
 
- - foo
-    * bar
+ - A large number of API changes have been made.  These were largely
+   cosmetic or minor structural changes - the overall structure of the
+   API is similar to the beta, with more consistency between different
+   parts (particularly related to returning bool and using a map of
+   errors)
+    * The QContactAction (& related classes and APIs) has been removed - the
+      intent is to re-add them once their design and implementation has been
+      stabilized.
+    * Some functionality has been removed (relationship ordering, action
+      preferences for details).
+    * QContactAvatar has been split into QContactThumbnail and QContactAvatar.
+    * QContactOnlineAccount has been split into QContactPresence and QCOA
+ - A number of new functions have been added (QCM::compatibleContact, 
+      QCM::synthesizeContactDisplayLabel)
+ - The API uses QImage instead of QPixmap, to avoid non-gui thread
+   issues with QPixmap usage.
+ - The names of details, and the keys of fields in details are now
+   restricted to Latin 1 (for performance and memory usage optimization).
+ - Bugs fixed etc
+
+QtVersit
+------
+
+ - A number of API changes have been made, to make it easier to use
+   the QtVersit library for simple tasks (like reading directly from
+   a QByteArray), and to make the API more consistent with QtContacts
+ - The API uses QImage instead of QPixmap, to avoid non-gui thread
+   issues with QPixmap usage.
 
 QtLocation
 ------
@@ -59,10 +96,20 @@
  - API change
     * QGeoPositionInfo::dateTime()/setDateTime() changed into
       QGeoPositionInfo::timestamp()/setTimestamp() respectively.
+    * Added serialization functions for QGeoSatelliteInfo
+ - Maemo 5 (Fremantle) backend implemented
 
 QtMessaging
 ------
 
+ - Maemo 5 (Fremantle) backend implemented
+    * SMS and Email message types supported.
+    * modest process must be restarted before Fremantle backend is fully
+      operational. This can be achieved by restarting the device.
+ - API changes
+    * QMessageAddress::recipient()/setRecipient renamed to 
+      QMessageAddress::addressee()/setAddressee respectively.
+    * QMessage::XMPP renamed to QMessage::InstantMessage.
  - Symbian specific fixes
     * Notifications which are related to internal folders (0x100001
       and 0x100002) are ignored.
@@ -79,30 +126,78 @@
       registerNotificationFilter(
           QMessageFilter::byStandardFolder(QMessage::InboxFolder) &
           QMessageFilter::byType(QMessage::Mms))
+ - Regression in keepintouch example fixed, incorrect results were returned 
+   when 'but not last' checkbox was unchecked.
+ - Format of identifiers changed
+   * For forwards compatibility.
 
 QtMedia
 ------
-
- - foo
-    * bar
+ - Symbian backend improvements
+    * AudioCapture
+      - Bug fixes and codec support improvements
+    * Mediaplayer
+      - Audio routing implemented (destinations speaker, headphones, default)
+    * Camera
+      - Camera bug fixes and feature improvements
+      - Note: Camera eventually separated from QtMedia API (has its own plugin)
+ - Symbian^3 backend for audio recording (uses OpenMaxAL)
+ - Tweaked few examples to have more features
+ - Maemo 5 (Fremantle) backend implemented
+ - AudioCapture
+ - API changes
+    * Added CoverArtImage, PosterImage, and ThumbnailImage meta-data keys to
+      address embedded images.
+    * Changed QVideoWidget to use the Qt::AspectRatioMode enumeration instead
+      of defining its own enumeration of the same name.
+ - Behavioural changes
+   * Changed to QVideoWidget to consistently not fill the background with black
+     by default.
 
 QtPublishSubscribe
 ------
 
- - foo
-    * bar
+ - Maemo 5 (Fremantle) GConf backend finalized
+    * Support for monitoring changes in GConf
+    * Serialize unsupported QVariant data types in string with BASE64 encoding
+    * Autotests
+    * Example application modified to be usable in N900
 
 QtServiceFramework
 ------
 
- - foo
-    * bar
+ - Symbian backend improvements
+    * Mainly security fixes
+       - Security token usage in databases, db server in protected namespace etc.
+    * Capability fixes (reduced)
 
 QtSystemInfo
 ------
+ - Mac
+    * Implemented remaining backend.
+    * Fix memory leakage.
 
- - foo
-    * bar
+ - Maemo 5 (Fremantle)
+    * Implemented remaining backend.
+    * Improved implementation of Maemo's WLAN networkSignalStrengthChanged().
+    * Improved network mode and network status.
+    * Example application modified to better fit in N900's horizontal screen
+    * Screensaver inhibit implemented
+
+ - Linux
+    * Storage volume names are now more consistant across the platforms.
+
+ - Symbian
+    * Improved colorDepth detection on some versions.
+    * Improved power state detection.
+    * Fix network name on some versions.
+
+ - Signals/timers/event loops not started unless something is connected to the Q_SIGNAL.
+ - Improved QML support.
+ - rssi timers now fire every 5 seconds on all platforms.
+ - Added currentMode to API.
+ - currentMode() added in network info
+ - Fixed MOBILITY-748: Private Qt header usage has been removed
 
 QtSensors
 ------

--- a/qtmobility/examples/audiorecorder/audiorecorder.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/audiorecorder/audiorecorder.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -44,6 +43,7 @@
 #include <qaudiocapturesource.h>
 #include <qmediarecorder.h>
 #include <qmediaservice.h>
+#include <qaudioencodercontrol.h>
 
 #include <QtMultimedia/qaudioformat.h>
 
@@ -56,8 +56,8 @@
 
     if (capture->supportedAudioCodecs().size() > 0) {
         QAudioEncoderSettings audioSettings;
-        audioSettings.setQuality(QtMedia::LowQuality);
-        audioSettings.setEncodingMode(QtMedia::ConstantQualityEncoding);
+        audioSettings.setQuality(QtMediaServices::LowQuality);
+        audioSettings.setEncodingMode(QtMediaServices::ConstantQualityEncoding);
         audioSettings.setCodec(capture->supportedAudioCodecs().first());
         capture->setEncodingSettings(audioSettings,QVideoEncoderSettings(),
                 capture->supportedContainers().first());
@@ -65,7 +65,7 @@
 
     // set a default file
 #ifdef Q_OS_SYMBIAN
-    capture->setOutputLocation(QUrl("c:\\data\\test.wav"));
+    capture->setOutputLocation(recordPathAudio(QUrl()));    
 #else
     capture->setOutputLocation(QUrl("test.raw"));
 #endif
@@ -92,8 +92,20 @@
     codecLabel->setText(tr("Audio Codec"));
     codecsBox = new QComboBox(this);
     codecsBox->setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Fixed);
-    codecsBox->setMinimumSize(200,10);
-
+    codecsBox->setMinimumSize(200,10);    
+    
+    QLabel* sampleRateLabel = new QLabel;
+    sampleRateLabel->setText(tr("Sample Rate"));
+    sampleRateBox = new QComboBox(this);
+    sampleRateBox->setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Fixed);
+    sampleRateBox->setMinimumSize(200,10);
+    
+    QLabel* channelLabel = new QLabel;
+    channelLabel->setText(tr("Channel count"));
+    channelBox = new QComboBox(this);
+    channelBox->setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Fixed);
+    channelBox->setMinimumSize(200,10);
+    
     QLabel* qualityLabel = new QLabel;
     qualityLabel->setText(tr("Audio Quality"));
     qualityBox = new QComboBox(this);
@@ -112,6 +124,19 @@
     for(int i = 0; i < containers.count(); i++)
         containersBox->addItem(containers.at(i));
 
+    QList<int> samplerates = capture->supportedAudioSampleRates();    
+    for(int i = 0; i < samplerates.count(); i++) {        
+        QString rateString = QString("%1").arg(samplerates.at(i));
+        sampleRateBox->addItem(rateString, QVariant(samplerates.at(i))); 
+    }
+    
+    QList<int> channels;
+    channels <<1<<2;     
+    for(int i = 0; i < channels.count(); i++) {        
+        QString channelString = QString("%1").arg(channels.at(i));
+        channelBox->addItem(channelString, QVariant(channels.at(i))); 
+    }
+      
     qualityBox->addItem(tr("Low"));
     qualityBox->addItem(tr("Medium"));
     qualityBox->addItem(tr("High"));
@@ -130,41 +155,75 @@
 
     layout->addWidget(codecLabel,2,0,Qt::AlignHCenter);
     connect(codecsBox,SIGNAL(activated(int)),SLOT(codecChanged(int)));
-    layout->addWidget(codecsBox,2,1,1,3,Qt::AlignLeft);
-
-    layout->addWidget(qualityLabel,3,0,Qt::AlignHCenter);
+    layout->addWidget(codecsBox,2,1,1,3,Qt::AlignLeft);   
+    
+    layout->addWidget(sampleRateLabel,3,0,Qt::AlignHCenter);
+    connect(sampleRateBox,SIGNAL(activated(int)),SLOT(sampleRateChanged(int)));
+    layout->addWidget(sampleRateBox,3,1,1,3,Qt::AlignLeft);
+    
+    layout->addWidget(channelLabel,4,0,Qt::AlignHCenter);
+    connect(channelBox,SIGNAL(activated(int)),SLOT(channelCountChanged(int)));
+    layout->addWidget(channelBox,4,1,1,3,Qt::AlignLeft);
+    
+    layout->addWidget(qualityLabel,5,0,Qt::AlignHCenter);
     connect(qualityBox,SIGNAL(activated(int)),SLOT(qualityChanged(int)));
-    layout->addWidget(qualityBox,3,1,1,3,Qt::AlignLeft);
+    layout->addWidget(qualityBox,5,1,1,3,Qt::AlignLeft);
 
     fileButton = new QPushButton(this);
-    fileButton->setText(tr("Output File"));
+    fileButton->setText(tr("Output File"));    
     connect(fileButton,SIGNAL(clicked()),SLOT(selectOutputFile()));
-    layout->addWidget(fileButton,4,0,Qt::AlignHCenter);
+    layout->addWidget(fileButton,6,0,Qt::AlignHCenter);
+    
+    pauseButton = new QPushButton(this);    
+    pauseButton->setText(tr("Pause"));
+    connect(pauseButton,SIGNAL(clicked()),SLOT(togglePause()));
+    layout->addWidget(pauseButton,6,1,Qt::AlignHCenter);
 
     button = new QPushButton(this);
     button->setText(tr("Record"));
     connect(button,SIGNAL(clicked()),SLOT(toggleRecord()));
-    layout->addWidget(button,4,1,Qt::AlignHCenter);
-
-    QLabel* durationLabel = new QLabel;
-    durationLabel->setText(tr("Duration"));
-    layout->addWidget(durationLabel,4,2,Qt::AlignRight);
-
-    recTime = new QLabel;
-    layout->addWidget(recTime,4,3,Qt::AlignLeft);
+    layout->addWidget(button,6,2,Qt::AlignHCenter);
 
     statusLabel = new QLabel;
     statusLabel->setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Fixed);
-    statusLabel->setMinimumSize(270,10);
+    statusLabel->setMinimumSize(130,10);
     statusLabel->setFrameStyle(QFrame::Panel | QFrame::Sunken);
     statusLabel->setLineWidth(1);
-    layout->addWidget(statusLabel,5,0,1,4,Qt::AlignHCenter);
+    layout->addWidget(statusLabel,7,0,Qt::AlignHCenter);
+    
+    QLabel* durationLabel = new QLabel;
+    durationLabel->setText(tr("Duration"));
+    layout->addWidget(durationLabel,7,1,Qt::AlignRight);
 
+    recTime = new QLabel;
+    layout->addWidget(recTime,7,2,Qt::AlignLeft);
+    
     window->setLayout(layout);
     setCentralWidget(window);
     window->show();
 
     active = false;
+    paused = false;
+}
+
+QUrl AudioRecorder::recordPathAudio(QUrl filePath)
+{   
+    if (!filePath.isEmpty())
+        return filePath;  
+    
+    QDir outputDir(QDir::rootPath());
+    
+    int lastImage = 0;  
+    int fileCount = 0;
+    foreach(QString fileName, outputDir.entryList(QStringList() << "testclip_*")) {        
+        int imgNumber = fileName.mid(5, fileName.size()-9).toInt();
+        lastImage = qMax(lastImage, imgNumber);
+        if (outputDir.exists(fileName))             
+            fileCount+=1;        
+    }    
+    lastImage+=fileCount;    
+    QUrl location(QDir::toNativeSeparators(outputDir.canonicalPath()+QString("/testclip_%1").arg(lastImage+1,4,10,QLatin1Char('0'))));
+    return location;
 }
 
 AudioRecorder::~AudioRecorder()
@@ -192,6 +251,11 @@
             button->setText(tr("Stop"));
             break;
         }
+        case QMediaRecorder::PausedState: {
+            statusLabel->setText(tr("Paused"));
+            button->setText(tr("Record"));
+            break;
+        }
         default: {
             statusLabel->setText(tr("Stopped"));
             button->setText(tr("Record"));
@@ -212,23 +276,41 @@
 
 void AudioRecorder::codecChanged(int idx)
 {
+    updateSamplerates(idx);
+    updateChannelCount(idx);
+    updateQuality(idx);
     QAudioEncoderSettings settings = capture->audioSettings();
     settings.setCodec(codecsBox->itemText(idx));
     capture->setEncodingSettings(settings);
 }
 
+void AudioRecorder::sampleRateChanged(int idx)
+{    
+    QAudioEncoderSettings settings = capture->audioSettings();
+    settings.setSampleRate((sampleRateBox->itemData(idx).toInt()));
+    capture->setEncodingSettings(settings);
+}
+
+void AudioRecorder::channelCountChanged(int idx)
+{    
+    QAudioEncoderSettings settings = capture->audioSettings();
+    settings.setChannelCount((channelBox->itemData(idx).toInt()));
+    capture->setEncodingSettings(settings);
+}
+
 void AudioRecorder::qualityChanged(int idx)
-{
-    QAudioEncoderSettings settings = capture->audioSettings();
+{ 
+    QAudioEncoderSettings settings = capture->audioSettings();    
+    
     switch(idx) {
-        case 0:
-            settings.setQuality(QtMedia::LowQuality);
-            break;
-        case 1:
-            settings.setQuality(QtMedia::NormalQuality);
-            break;
-        default:
-            settings.setQuality(QtMedia::HighQuality);
+    case 0:
+        settings.setQuality(QtMediaServices::LowQuality);
+        break;
+    case 1:
+        settings.setQuality(QtMediaServices::NormalQuality);
+        break;
+    default:
+        settings.setQuality(QtMediaServices::HighQuality);
     }
     capture->setEncodingSettings(settings);
 }
@@ -236,16 +318,31 @@
 void AudioRecorder::toggleRecord()
 {
     if(!active) {
-        recTime->setText("0");
-        currentTime = 0;
+        if(!paused) {
+            recTime->setText("0");
+            currentTime = 0;
+        }
+#ifdef Q_OS_SYMBIAN    
+    capture->setOutputLocation(recordPathAudio(destination));
+#endif
         capture->record();        
         active = true;
+        paused = false;
     } else {
         capture->stop();        
         active = false;
     }
 }
 
+void AudioRecorder::togglePause()
+{
+    if(active && !paused) {       
+        capture->pause();        
+        active = false;
+        paused = true;
+    }
+}
+
 void AudioRecorder::selectOutputFile()
 {
     QStringList fileNames;
@@ -257,7 +354,12 @@
         fileNames = dialog.selectedFiles();
 
     if(fileNames.size() > 0)
+#ifdef Q_OS_SYMBIAN
+        destination = QUrl(fileNames.first());
+#else    
         capture->setOutputLocation(QUrl(fileNames.first()));
+        
+#endif    
 }
 
 void AudioRecorder::errorChanged(QMediaRecorder::Error err)
@@ -267,4 +369,46 @@
     statusLabel->setText(capture->errorString());
 }
 
+void AudioRecorder::updateSamplerates(int idx)
+{
+    QAudioEncoderSettings settings;
+    settings.setCodec(codecsBox->itemText(idx));
+    
+    QList<int> supportedSampleRates = capture->supportedAudioSampleRates(settings);
+    sampleRateBox->clear();    
+    for(int i = 0; i < supportedSampleRates.count(); i++) {        
+        QString rateString = QString("%1").arg(supportedSampleRates.at(i));
+        sampleRateBox->addItem(rateString, QVariant(supportedSampleRates.at(i))); 
+    }    
+}
 
+void AudioRecorder::updateChannelCount(int idx)
+{    
+    QAudioEncoderControl *audioEncoder = qobject_cast<QAudioEncoderControl*>(capture->service()->control(QAudioEncoderControl_iid));
+    channelBox->clear();
+    QStringList list = audioEncoder->supportedEncodingOptions(codecsBox->itemText(idx));
+    QList<int> channels;
+    if (list.contains("channels"))
+        channels <<1<<2;
+    else
+        channels <<1;
+    for(int i = 0; i < channels.count(); i++) {        
+        QString channelString = QString("%1").arg(channels.at(i));
+        channelBox->addItem(channelString, QVariant(channels.at(i))); 
+    }        
+}
+
+void AudioRecorder::updateQuality(int idx)
+{    
+    QAudioEncoderControl *audioEncoder = qobject_cast<QAudioEncoderControl*>(capture->service()->control(QAudioEncoderControl_iid));
+    qualityBox->clear();
+    QStringList list = audioEncoder->supportedEncodingOptions(codecsBox->itemText(idx));
+    QList<int> channels;
+    if (list.contains("quality")) {
+        qualityBox->addItem(tr("Low"));
+        qualityBox->addItem(tr("Medium"));
+        qualityBox->addItem(tr("High"));
+    }else {
+        qualityBox->addItem(tr("Low"));
+    }           
+}

--- a/qtmobility/examples/audiorecorder/audiorecorder.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/audiorecorder/audiorecorder.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -50,13 +49,11 @@
 QT_BEGIN_NAMESPACE
 class QComboBox;
 class QLabel;
+
+class QAudioCaptureSource;
 QT_END_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
-class QAudioCaptureSource;
-QTM_END_NAMESPACE
-
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class AudioRecorder : public QMainWindow
 {
@@ -65,12 +62,21 @@
     AudioRecorder();
     ~AudioRecorder();
 
+private:
+    QUrl recordPathAudio(QUrl filePath);
+    void updateSamplerates(int idx);
+    void updateChannelCount(int idx);
+    void updateQuality(int idx);
+    
 private slots:
     void deviceChanged(int idx);
     void containerChanged(int idx);
     void codecChanged(int idx);
     void qualityChanged(int idx);
+    void sampleRateChanged(int idx);
+    void channelCountChanged(int idx);
     void selectOutputFile();
+    void togglePause();
     void toggleRecord();
     void stateChanged(QMediaRecorder::State);
     void updateProgress(qint64 pos);
@@ -84,13 +90,17 @@
     QComboBox*     containersBox;
     QComboBox*     codecsBox;
     QComboBox*     qualityBox;
+    QComboBox*     sampleRateBox; 
+    QComboBox*     channelBox;
     QLabel*        recTime;
     QLabel*        statusLabel;
     QPushButton*   button;
     QPushButton*   fileButton;
+    QPushButton*   pauseButton;
     bool           active;
     int            currentTime;
     QUrl           destination;
+    bool           paused; 
 };
 
 #endif

--- a/qtmobility/examples/audiorecorder/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/audiorecorder/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/battery-charge/battery-publisher/batterypublisher.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/battery-charge/battery-publisher/batterypublisher.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/battery-charge/battery-publisher/batterypublisher.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/battery-charge/battery-publisher/batterypublisher.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/battery-charge/battery-publisher/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/battery-charge/battery-publisher/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/battery-charge/battery-subscriber/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/battery-charge/battery-subscriber/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/bearercloud/bearercloud.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/bearercloud/bearercloud.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/bearercloud/bearercloud.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/bearercloud/bearercloud.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/bearercloud/cloud.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/bearercloud/cloud.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/bearercloud/cloud.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/bearercloud/cloud.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/bearercloud/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/bearercloud/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/bearermonitor/bearermonitor.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/bearermonitor/bearermonitor.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -255,6 +254,7 @@
 void BearerMonitor::registerNetwork()
 {
     QTreeWidgetItem *item = treeWidget->currentItem();
+    if (!item) return;
 
     QNetworkConfiguration configuration =
         manager.configurationFromIdentifier(item->data(0, Qt::UserRole).toString());
@@ -276,6 +276,7 @@
 void BearerMonitor::unregisterNetwork()
 {
     QTreeWidgetItem *item = treeWidget->currentItem();
+    if (!item) return;
 
     QNetworkConfiguration configuration =
         manager.configurationFromIdentifier(item->data(0, Qt::UserRole).toString());
@@ -384,6 +385,7 @@
 void BearerMonitor::createNewSession()
 {
     QTreeWidgetItem *item = treeWidget->currentItem();
+    if (!item) return;
 
     createSessionFor(item);
 }

--- a/qtmobility/examples/bearermonitor/bearermonitor.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/bearermonitor/bearermonitor.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/bearermonitor/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/bearermonitor/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/bearermonitor/sessionwidget.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/bearermonitor/sessionwidget.cpp	Fri May 14 16:41:33 2010 +0300
@@ -1,40 +1,39 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -52,7 +51,7 @@
     connect(session, SIGNAL(stateChanged(QNetworkSession::State)),
             this, SLOT(updateSession()));
     connect(session, SIGNAL(error(QNetworkSession::SessionError)),
-            this, SLOT(updateSession()));
+            this, SLOT(updateSessionError(QNetworkSession::SessionError)));
 
     updateSession();
 
@@ -89,7 +88,6 @@
 void SessionWidget::updateSession()
 {
     updateSessionState(session->state());
-    updateSessionError(session->error());
 
     if (session->configuration().type() == QNetworkConfiguration::InternetAccessPoint)
         bearer->setText(session->configuration().bearerName());
@@ -105,12 +103,14 @@
 
 void SessionWidget::openSession()
 {
+    clearError();
     session->open();
     updateSession();
 }
 
 void SessionWidget::openSyncSession()
 {
+    clearError();
     session->open();
     session->waitForOpened();
     updateSession();
@@ -118,12 +118,14 @@
 
 void SessionWidget::closeSession()
 {
+    clearError();
     session->close();
     updateSession();
 }
 
 void SessionWidget::stopSession()
 {
+    clearError();
     session->stop();
     updateSession();
 }
@@ -172,3 +174,8 @@
     errorString->setText(session->errorString());
 }
 
+void SessionWidget::clearError()
+{
+    lastError->clear();
+    errorString->clear();
+}

--- a/qtmobility/examples/bearermonitor/sessionwidget.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/bearermonitor/sessionwidget.h	Fri May 14 16:41:33 2010 +0300
@@ -1,40 +1,39 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -61,7 +60,7 @@
 
 private:
     void updateSessionState(QNetworkSession::State state);
-    void updateSessionError(QNetworkSession::SessionError error);
+    void clearError();
 
 private Q_SLOTS:
     void openSession();
@@ -69,9 +68,12 @@
     void closeSession();
     void stopSession();
     void updateSession();
+    void updateSessionError(QNetworkSession::SessionError error);
 #if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
     void deleteSession();
 #endif
+
+
 private:
     QNetworkSession *session;
 };

--- a/qtmobility/examples/bearermonitor/sessionwidget.ui	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/bearermonitor/sessionwidget.ui	Fri May 14 16:41:33 2010 +0300
@@ -195,7 +195,7 @@
        <item>
         <widget class="QLabel" name="errorStringLabel">
          <property name="text">
-          <string>Error String</string>
+          <string>Error String:</string>
          </property>
         </widget>
        </item>

--- a/qtmobility/examples/bluetoothtransferplugin/bluetoothtransfer.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/bluetoothtransferplugin/bluetoothtransfer.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -48,7 +47,9 @@
 {
 }
 
+//! [sendFile]
 void BluetoothTransfer::sendFile(const QString &path)
 {
     qDebug() << "BluetoothTransfer::sendFile()" << path;
 }
+//! [sendFile]

--- a/qtmobility/examples/bluetoothtransferplugin/bluetoothtransfer.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/bluetoothtransferplugin/bluetoothtransfer.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/bluetoothtransferplugin/bluetoothtransferplugin.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/bluetoothtransferplugin/bluetoothtransferplugin.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -51,7 +50,9 @@
     Q_UNUSED(descriptor);
     Q_UNUSED(context);
     Q_UNUSED(session);
+    //! [createinstance]
     return new BluetoothTransfer(this);
+    //! [createinstance]
 }
 
 Q_EXPORT_PLUGIN2(serviceframework_bluetoothtransferplugin, BluetoothTransferPlugin)

--- a/qtmobility/examples/bluetoothtransferplugin/bluetoothtransferplugin.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/bluetoothtransferplugin/bluetoothtransferplugin.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.pro	Fri May 14 16:41:33 2010 +0300
@@ -14,11 +14,11 @@
 MOBILITY = serviceframework
 
 symbian {
-    TARGET.CAPABILITY = LocalServices Location NetworkServices ReadUserData UserEnvironment WriteUserData
+    TARGET.CAPABILITY = ALL -TCB
 }
 
 xml.path = $$DESTDIR/xmldata
-xml.files = ../landlinedialerservice.xml
+xml.files = landlinedialerservice.xml
 xml.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean
 INSTALLS += xml
 build_pass:ALL_DEPS+=install_xml

--- a/qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialerplugin.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialerplugin.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialerplugin.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialerplugin.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialerservice.xml	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<service>
+    <name>LandlineDialer</name>
+    <filepath>serviceframework_landlinedialerservice</filepath>
+    <description>Landline Dialer</description>
+    <interface>
+        <name>com.nokia.qt.examples.Dialer</name>
+        <version>1.0</version>
+        <description>Landline based implementation of Dialer</description>
+    </interface>
+    <interface>
+        <name>com.nokia.qt.examples.Dialer</name>
+        <version>2.0</version>
+        <description>Landline based implementation of Dialer</description>
+        <capabilities>encrypted</capabilities>
+    </interface>
+</service>

--- a/qtmobility/examples/declarative-sfw-dialer/landlinedialerservice.xml	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<service>
-    <name>LandlineDialer</name>
-    <filepath>serviceframework_landlinedialerservice</filepath>
-    <description>Landline Dialer</description>
-    <interface>
-        <name>com.nokia.qt.examples.Dialer</name>
-        <version>1.0</version>
-        <description>Landline based implementation of Dialer</description>
-    </interface>
-    <interface>
-        <name>com.nokia.qt.examples.Dialer</name>
-        <version>2.0</version>
-        <description>Landline based implementation of Dialer</description>
-        <capabilities>encrypted</capabilities>
-    </interface>
-</service>

--- a/qtmobility/examples/declarative-sfw-dialer/sfwexample/DialButton.qml	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-import Qt 4.6
-
-//Implementation of the dialButton control.
-Item {
-    id: dialButton
-    width: 50
-    height: 50
-    property alias buttonText: innerText.text;
-    property alias color: rectangleButton.color
-    property color hoverColor: "lightsteelblue"
-    property color pressColor: "slategray"
-    signal clicked
-
-    Rectangle {
-        id: rectangleButton
-        anchors.fill: parent
-        radius: 5
-        color: "steelblue"
-        border.width: 3
-        border.color: "black"
-
-        Text {
-            id: innerText
-            font.pointSize: 20
-            anchors.centerIn: parent
-        }
-    }
-   
-    states: [
-        State {
-            name: "Hovering"
-            PropertyChanges {
-                target: rectangleButton
-                color: hoverColor
-            }
-        },
-        State {
-            name: "Pressed"
-            PropertyChanges {
-                target: rectangleButton
-                color: pressColor
-            }
-        }
-    ]
-   
-   
-    transitions: [
-        Transition {
-            from: ""; to: "Hovering"
-            ColorAnimation { duration: 100 }
-        },
-        Transition {
-            from: "*"; to: "Pressed"
-            ColorAnimation { duration: 10 }
-        }
-    ]
-   
-    MouseArea {
-        hoverEnabled: true
-        anchors.fill: dialButton
-        onEntered: { dialButton.state='Hovering'}
-        onExited: { dialButton.state=''}
-        onClicked: { dialButton.clicked();}
-        onPressed: { dialButton.state="Pressed" }
-        onReleased: {
-            if (containsMouse)
-            dialButton.state="Hovering";
-            else
-            dialButton.state="";
-        }
-    }
-}

--- a/qtmobility/examples/declarative-sfw-dialer/sfwexample/DialScreen.qml	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-import Qt 4.6
-
-//Layout of the DialScreen control
-//------------------------------------
-//|DialScreen                        |  
-//| ---------------------  ____  numberPad
-//| |dialNumber         | /          |
-//| ---------------------/          _|__  hangUpButton
-//| --------------------/- ------- / |
-//| |      |      |      | |     |/  |      
-//| |   1  |   2  |   3  | |     |   |    
-//| |      |      |      | |     |   |    
-//| ---------------------- |     |   |
-//| |      |      |      | |     |   |    
-//| |   4  |   5  |   6  | |     |   |    
-//| |      |      |      | -------   |         
-//| ----------------------          _|__  callButton
-//| |      |      |      | ------- / |          
-//| |   7  |   8  |   9  | |     |/  |
-//| |      |      |      | |     |   |         
-//| ---------------------- |     |   |
-//| |      |      |      | |     |   |         
-//| |   *  |   0  |   #  | |     |   |         
-//| |      |      |      | |     |   |         
-//| ---------------------- -------   |
-//|                                  |
-//------------------------------------
-
-//! [0]
-Item {
-    width: childrenRect.width
-    height: childrenRect.height
-    property string dialString
-    signal dial(string numberToDial)
-    signal hangup
-    //! [0]
-
-    Rectangle {
-        id: dialNumber
-        height: 20
-        width: numberPad.width
-        anchors.top: parent.top
-        anchors.left: parent.left
-        color: "white"
-        radius: 5
-        border.width: 3
-        border.color: "black"
-        
-        Text { 
-            text: dialString
-            anchors.centerIn: parent
-        }
-    }
-
-    Grid {
-        id: numberPad
-        width: childrenRect.width
-        height: childrenRect.height
-        anchors.top: dialNumber.bottom
-        anchors.left: parent.left
-        anchors.topMargin: 5
-        columns: 3
-        spacing: 5
-        
-        DialButton { buttonText: "1"; onClicked: { dialString += "1";} }
-        DialButton { buttonText: "2"; onClicked: { dialString += "2";} }
-        DialButton { buttonText: "3"; onClicked: { dialString += "3";} }
-        DialButton { buttonText: "4"; onClicked: { dialString += "4";} }
-        DialButton { buttonText: "5"; onClicked: { dialString += "5";} }
-        DialButton { buttonText: "6"; onClicked: { dialString += "6";} }
-        DialButton { buttonText: "7"; onClicked: { dialString += "7";} }
-        DialButton { buttonText: "8"; onClicked: { dialString += "8";} }
-        DialButton { buttonText: "9"; onClicked: { dialString += "9";} }
-        DialButton { buttonText: "*"; onClicked: { dialString += "*";} }
-        DialButton { buttonText: "0"; onClicked: { dialString += "0";} }
-        DialButton { buttonText: "#"; onClicked: { dialString += "#";} }
-    }
-    
-    //! [1]
-    DialButton {
-        id: hangUpButton
-        height: { (numberPad.height / 2) - 2 }
-        width: 50
-        anchors.top: numberPad.top
-        anchors.left: numberPad.right
-        anchors.leftMargin: 5
-        hoverColor: "red"
-        color: "crimson"
-        onClicked: {
-            dialString = ""
-            hangup()
-        }
-        //! [1]       
-        Image {
-            anchors.centerIn: parent
-            source: "hangup.png"
-            transformOrigin: "Center"
-        }
-    }
-    
-    //! [2]
-    DialButton {
-        id: callButton
-        width: 50
-        height: {(numberPad.height/2) -2}
-        anchors.top: hangUpButton.bottom
-        anchors.left: numberPad.right
-        anchors.leftMargin: 5
-        anchors.topMargin: 4
-        color: "mediumseagreen"
-        hoverColor: "lightgreen"
-        onClicked: {
-            if (dialString != "") {
-                dial(dialString)
-                dialString = ""
-            }
-        }
-        //! [2]
-        
-        Image {
-            anchors.centerIn: parent
-            source: "call.png"
-            transformOrigin: "Center"
-        }
-    }
-}

--- a/qtmobility/examples/declarative-sfw-dialer/sfwexample/ServiceList.qml	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-import Qt 4.6
-import QtSFW 1.0
-
-//Layout of the ServiceList control
-//---------------------------------
-//|ServiceList                    |
-//| ----------------------------- |
-//| |title                      | |
-//| ----------------------------- |
-//| ----------------------------- |
-//| |listFrame                  | |
-//| |-------------------------- | |
-//| ||serviceListView         | | |
-//| ||- listItem              | | |
-//| ||- listItem              | | |
-//| ||- listItem              | | |
-//| |---------------------------| |
-//| ----------------------------- |
-//---------------------------------
-    
-Rectangle {
-    property variant dialService: 0
-    signal serviceSelected
-    
-    Text {
-        id: title
-        height: 20
-        width: 200
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.topMargin: 5
-        anchors.leftMargin: 5
-        text: "<b>Select dial service:</b>"
-    }
-    
-    Rectangle {
-        id : listFrame
-        width: childrenRect.width
-        height: childrenRect.height
-        anchors.top: title.bottom
-        anchors.left: parent.left;
-        anchors.topMargin: 5
-        anchors.leftMargin: 5
-        anchors.rightMargin: 5
-        border.color: "black"
-        border.width: 3
-        property bool nohighlightlistitem : true
-        //! [1]
-        Component {
-            id: delegate
-            //! [1]
-            //Rectangle item to draw a list view item
-            //This includes 2 line of text:
-            // ------------------------------------------
-            // |Service: LandDialer (1.0)               |
-            // |Interface: com.nokia.qt.examples Dialer |
-            // ------------------------------------------
-            Rectangle {
-                id: listItem
-                width: serviceListView.width
-                height: 40
-                border.color: "black"
-                border.width: 1
-                opacity: 0.6
-
-                //! [2]
-                MouseArea {
-                    id: listItemMouseArea
-                    anchors.fill: parent
-                    onClicked: {
-                        if(listFrame.nohighlightlistitem){
-                            serviceListView.highlight = highlight
-                            listFrame.nohighlightlistitem = false;
-                        }
-                        serviceListView.currentIndex = index;
-                        dialService = model.modelData;
-                        serviceSelected()
-                    }
-                }
-
-                Text { 
-                    id: serviceItemInfo
-                    anchors.top: parent.top
-                    anchors.left: parent.left
-                    anchors.topMargin: 5
-                    anchors.leftMargin: 3
-                    text: " <b>Service:</b> " + serviceName + "  (" + version + ")"
-                }
-                
-                Text { 
-                    id: serviceItemInterfaceName
-                    anchors.top: serviceItemInfo.bottom
-                    anchors.left: parent.left
-                    anchors.topMargin: 2
-                    anchors.leftMargin: 3
-                    text: " <b>Interface:</b> " + interfaceName;
-                }
-                //! [2]
-            }
-        }
-        
-        //! [3]
-        Component {
-            id: highlight
-            
-            Rectangle {
-                width: childrenRect.width
-                border.color: "black"; border.width: 2
-                height: 30
-                color : "lightsteelblue"
-                gradient: Gradient {
-                    GradientStop {position: 0.0; color: "steelblue"}
-                    GradientStop {position: 0.5; color: "lightsteelblue"}
-                    GradientStop {position: 1.0; color: "steelblue"}
-                }
-            }
-        }
-        //! [3]
-        
-        //! [0]
-        ListView {
-            id: serviceListView
-            height: 100
-            width: 260
-            anchors.topMargin: 5
-            anchors.leftMargin: 5
-            anchors.rightMargin: 5
-            model: services.registeredservices
-         //! [0]
-            opacity: 1
-            delegate: delegate
-            currentIndex: -1
-            clip: true
-        }
-    }
-
-    Services {
-        id: services
-    }
-}

Binary file qtmobility/examples/declarative-sfw-dialer/sfwexample/call.png has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-dialer/sfwexample/content/DialButton.qml	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,72 @@
+import Qt 4.6
+
+//Implementation of the dialButton control.
+Item {
+    id: dialButton
+    width: 50
+    height: 50
+    property alias buttonText: innerText.text;
+    property alias color: rectangleButton.color
+    property color hoverColor: "lightsteelblue"
+    property color pressColor: "slategray"
+    signal clicked
+
+    Rectangle {
+        id: rectangleButton
+        anchors.fill: parent
+        radius: 5
+        color: "steelblue"
+        border.width: 3
+        border.color: "black"
+
+        Text {
+            id: innerText
+            font.pointSize: 20
+            anchors.centerIn: parent
+        }
+    }
+   
+    states: [
+        State {
+            name: "Hovering"
+            PropertyChanges {
+                target: rectangleButton
+                color: hoverColor
+            }
+        },
+        State {
+            name: "Pressed"
+            PropertyChanges {
+                target: rectangleButton
+                color: pressColor
+            }
+        }
+    ]
+   
+   
+    transitions: [
+        Transition {
+            from: ""; to: "Hovering"
+            ColorAnimation { duration: 100 }
+        },
+        Transition {
+            from: "*"; to: "Pressed"
+            ColorAnimation { duration: 10 }
+        }
+    ]
+   
+    MouseArea {
+        hoverEnabled: true
+        anchors.fill: dialButton
+        onEntered: { dialButton.state='Hovering'}
+        onExited: { dialButton.state=''}
+        onClicked: { dialButton.clicked();}
+        onPressed: { dialButton.state="Pressed" }
+        onReleased: {
+            if (containsMouse)
+            dialButton.state="Hovering";
+            else
+            dialButton.state="";
+        }
+    }
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-dialer/sfwexample/content/DialScreen.qml	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,126 @@
+import Qt 4.6
+
+//Layout of the DialScreen control
+//------------------------------------
+//|DialScreen                        |  
+//| ---------------------  ____  numberPad
+//| |dialNumber         | /          |
+//| ---------------------/          _|__  hangUpButton
+//| --------------------/- ------- / |
+//| |      |      |      | |     |/  |      
+//| |   1  |   2  |   3  | |     |   |    
+//| |      |      |      | |     |   |    
+//| ---------------------- |     |   |
+//| |      |      |      | |     |   |    
+//| |   4  |   5  |   6  | |     |   |    
+//| |      |      |      | -------   |         
+//| ----------------------          _|__  callButton
+//| |      |      |      | ------- / |          
+//| |   7  |   8  |   9  | |     |/  |
+//| |      |      |      | |     |   |         
+//| ---------------------- |     |   |
+//| |      |      |      | |     |   |         
+//| |   *  |   0  |   #  | |     |   |         
+//| |      |      |      | |     |   |         
+//| ---------------------- -------   |
+//|                                  |
+//------------------------------------
+
+//! [0]
+Item {
+    width: childrenRect.width
+    height: childrenRect.height
+    property string dialString
+    signal dial(string numberToDial)
+    signal hangup
+    //! [0]
+
+    Rectangle {
+        id: dialNumber
+        height: 20
+        width: numberPad.width
+        anchors.top: parent.top
+        anchors.left: parent.left
+        color: "white"
+        radius: 5
+        border.width: 3
+        border.color: "black"
+        
+        Text { 
+            text: dialString
+            anchors.centerIn: parent
+        }
+    }
+
+    Grid {
+        id: numberPad
+        width: childrenRect.width
+        height: childrenRect.height
+        anchors.top: dialNumber.bottom
+        anchors.left: parent.left
+        anchors.topMargin: 5
+        columns: 3
+        spacing: 5
+        
+        DialButton { buttonText: "1"; onClicked: { dialString += "1";} }
+        DialButton { buttonText: "2"; onClicked: { dialString += "2";} }
+        DialButton { buttonText: "3"; onClicked: { dialString += "3";} }
+        DialButton { buttonText: "4"; onClicked: { dialString += "4";} }
+        DialButton { buttonText: "5"; onClicked: { dialString += "5";} }
+        DialButton { buttonText: "6"; onClicked: { dialString += "6";} }
+        DialButton { buttonText: "7"; onClicked: { dialString += "7";} }
+        DialButton { buttonText: "8"; onClicked: { dialString += "8";} }
+        DialButton { buttonText: "9"; onClicked: { dialString += "9";} }
+        DialButton { buttonText: "*"; onClicked: { dialString += "*";} }
+        DialButton { buttonText: "0"; onClicked: { dialString += "0";} }
+        DialButton { buttonText: "#"; onClicked: { dialString += "#";} }
+    }
+    
+    //! [1]
+    DialButton {
+        id: hangUpButton
+        height: { (numberPad.height / 2) - 2 }
+        width: 50
+        anchors.top: numberPad.top
+        anchors.left: numberPad.right
+        anchors.leftMargin: 5
+        hoverColor: "red"
+        color: "crimson"
+        onClicked: {
+            dialString = ""
+            hangup()
+        }
+        //! [1]       
+        Image {
+            anchors.centerIn: parent
+            source: "hangup.png"
+            transformOrigin: "Center"
+        }
+    }
+    
+    //! [2]
+    DialButton {
+        id: callButton
+        width: 50
+        height: {(numberPad.height/2) -2}
+        anchors.top: hangUpButton.bottom
+        anchors.left: numberPad.right
+        anchors.leftMargin: 5
+        anchors.topMargin: 4
+        color: "mediumseagreen"
+        hoverColor: "lightgreen"
+        onClicked: {
+            if (dialString != "") {
+                dial(dialString)
+                dialString = ""
+            }
+        }
+        //! [2]
+        
+        Image {
+            anchors.centerIn: parent
+            source: "call.png"
+            transformOrigin: "Center"
+        }
+    }
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-dialer/sfwexample/content/DialerList.qml	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,146 @@
+import Qt 4.7
+// ![4]
+import QtMobility.serviceframework 1.0
+// ![4]
+
+//Layout of the ServiceList control
+//---------------------------------
+//|ServiceList                    |
+//| ----------------------------- |
+//| |title                      | |
+//| ----------------------------- |
+//| ----------------------------- |
+//| |listFrame                  | |
+//| |-------------------------- | |
+//| ||serviceListView         | | |
+//| ||- listItem              | | |
+//| ||- listItem              | | |
+//| ||- listItem              | | |
+//| |---------------------------| |
+//| ----------------------------- |
+//---------------------------------
+    
+Rectangle {
+    property var dialService: 0
+    signal signalSelected
+    
+    Text {
+        id: title
+        height: 20
+        width: 200
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.topMargin: 5
+        anchors.leftMargin: 5
+        text: "<b>Select dial service:</b>"
+    }
+    
+    Rectangle {
+        id : listFrame
+        width: childrenRect.width
+        height: childrenRect.height
+        anchors.top: title.bottom
+        anchors.left: parent.left;
+        anchors.topMargin: 5
+        anchors.leftMargin: 5
+        anchors.rightMargin: 5
+        border.color: "black"
+        border.width: 3
+        property bool nohighlightlistitem : true
+        //! [1]
+        Component {
+            id: delegate
+            //! [1]
+            //Rectangle item to draw a list view item
+            //This includes 2 line of text:
+            // ------------------------------------------
+            // |Service: LandDialer (1.0)               |
+            // |Interface: com.nokia.qt.examples Dialer |
+            // ------------------------------------------
+            Rectangle {
+                id: listItem
+                width: serviceListView.width
+                height: 40
+                border.color: "black"
+                border.width: 1
+                opacity: 0.6
+
+                //! [2]
+                MouseArea {
+                    id: listItemMouseRegion
+                    anchors.fill: parent
+                    onClicked: {
+                        if(listFrame.nohighlightlistitem){
+                            serviceListView.highlight = highlight
+                            listFrame.nohighlightlistitem = false;
+                        }
+                        serviceListView.currentIndex = index;
+                        dialService = model.modelData;
+                        signalSelected()
+                    }
+                }
+
+                Text { 
+                    id: serviceItemInfo
+                    anchors.top: parent.top
+                    anchors.left: parent.left
+                    anchors.topMargin: 5
+                    anchors.leftMargin: 3
+                    text: " <b>Service:</b> " + serviceName + "  (" + versionNumber + ")"
+                }
+                
+                Text { 
+                    id: serviceItemInterfaceName
+                    anchors.top: serviceItemInfo.bottom
+                    anchors.left: parent.left
+                    anchors.topMargin: 2
+                    anchors.leftMargin: 3
+                    text: " <b>Interface:</b> " + interfaceName;
+                }
+                //! [2]
+            }
+        }
+        
+        //! [3]
+        Component {
+            id: highlight
+            
+            Rectangle {
+                width: childrenRect.width
+                border.color: "black"; border.width: 2
+                height: 30
+                color : "lightsteelblue"
+                gradient: Gradient {
+                    GradientStop {position: 0.0; color: "steelblue"}
+                    GradientStop {position: 0.5; color: "lightsteelblue"}
+                    GradientStop {position: 1.0; color: "steelblue"}
+                }
+            }
+        }
+        //! [3]
+        
+        //! [0]
+        ListView {
+            id: serviceListView
+            height: 100
+            width: 260
+            anchors.topMargin: 5
+            anchors.leftMargin: 5
+            anchors.rightMargin: 5
+            model: dialerServiceList.services
+            opacity: 1
+            delegate: delegate
+            currentIndex: -1
+            clip: true
+        }
+        //! [0]
+    }
+
+    //! [5]
+    ServiceList {
+        id: dialerServiceList
+        interfaceName: "com.nokia.qt.examples.Dialer"
+        minVersion: "1.0"
+    }
+    //! [5]
+}

Binary file qtmobility/examples/declarative-sfw-dialer/sfwexample/content/call.png has changed

Binary file qtmobility/examples/declarative-sfw-dialer/sfwexample/content/hangup.png has changed

Binary file qtmobility/examples/declarative-sfw-dialer/sfwexample/hangup.png has changed

--- a/qtmobility/examples/declarative-sfw-dialer/sfwexample/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/sfwexample/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -1,4 +1,4 @@
-/****************************************************************************
+/***************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -42,34 +41,33 @@
 #include <QApplication>
 #include <QUrl>
 #include <QtCore>
-#include <QDebug>
 
 //! [0]
-//Includes for using the QML objects
-#include <QtDeclarative/QDeclarativeView>
+//Includes for using the declarative viewer
+#include <QDeclarativeView>
 
-//Includes for using the service framework
-#include <qserviceinterfacedescriptor.h>
-#include <qservicemanager.h>
+//Includes for using the service framework wrapper
+#include "qdeclarativeservice.h"
 //! [0]
 
 #include "sfwexample.h"
 
 int main(int argc, char* argv[])
 {
-    qmlRegisterType<ServiceWrapper>("QtSFW", 1, 0, "Service");
-    qmlRegisterType<ServiceRegister>("QtSFW", 1, 0, "Services");
-        
+    //! [1]
+    qmlRegisterType<QServiceWrapper>("QtMobility.serviceframework", 1, 0, "Service");
+    qmlRegisterType<QServiceListWrapper>("QtMobility.serviceframework", 1, 0, "ServiceList");
+    //! [1]
+
     QApplication app(argc, argv);
 
-    //! [1]
+    DialerServices *ds = new DialerServices();
+
+    //! [2]
     QDeclarativeView canvas;
     canvas.setSource(QUrl("qrc:/sfwexample.qml"));
-
-    //![3]
     canvas.show();
-    //![3]
-    //! [1]
+    //! [2]
 
     return app.exec();
 }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-dialer/sfwexample/qdeclarativeservice.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,167 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeservice.h"
+
+QServiceWrapper::QServiceWrapper()
+: serviceInstance(0)
+{
+    serviceManager = new QServiceManager();
+}
+
+QServiceWrapper::~QServiceWrapper()
+{
+    delete serviceInstance;
+}
+
+bool QServiceWrapper::isValid() const
+{
+    return m_descriptor.isValid();
+}
+
+void QServiceWrapper::setInterfaceDesc(const QServiceInterfaceDescriptor &desc)
+{
+    if (desc == m_descriptor)
+        return;
+
+    m_descriptor = desc;
+
+    if (serviceInstance)
+        delete serviceInstance;
+
+    serviceInstance = 0;
+}
+
+QServiceInterfaceDescriptor QServiceWrapper::interfaceDesc() const
+{
+    return m_descriptor;
+}
+
+void QServiceWrapper::setInterfaceName(const QString &interface)
+{
+    m_descriptor = serviceManager->interfaceDefault(interface);
+
+    if (!isValid())
+        qWarning() << "WARNING: No default service found for interface name: " << interface;
+}
+
+QString QServiceWrapper::interfaceName() const
+{
+    if (isValid())
+        return m_descriptor.interfaceName();
+    else
+        return "No Interface";
+}
+
+QString QServiceWrapper::serviceName() const
+{
+    if (isValid())
+        return m_descriptor.serviceName();
+    else
+        return "No Service";
+}
+
+QString QServiceWrapper::versionNumber() const
+{
+    if (isValid())
+        return (QString::number(m_descriptor.majorVersion())+"."+QString::number(m_descriptor.minorVersion()));
+    else
+        return "0.0";
+}
+
+QObject* QServiceWrapper::serviceObject()
+{
+    if (serviceInstance) {
+        return serviceInstance;
+    }
+
+    if (isValid()) {
+        QServiceManager manager;
+        serviceInstance = manager.loadInterface(m_descriptor);
+        return serviceInstance;
+    } else {
+        return 0;
+    }
+}
+
+QServiceListWrapper::QServiceListWrapper()
+{
+    serviceManager = new QServiceManager();
+}
+
+QServiceListWrapper::~QServiceListWrapper()
+{
+}
+
+void QServiceListWrapper::setInterfaceName(const QString &interface)
+{
+    m_interface = interface;
+
+    // ![0]
+    QServiceWrapper *service;
+    QServiceFilter filter(m_interface, m_version);
+    QList<QServiceInterfaceDescriptor> list = serviceManager->findInterfaces(filter);
+    for (int i = 0; i < list.size(); i++) {
+        service = new QServiceWrapper();
+        service->setInterfaceDesc(list.at(i));
+        m_services.append(service);
+    }
+    // ![0]
+}
+
+QString QServiceListWrapper::interfaceName() const
+{
+    return m_interface;
+}
+
+void QServiceListWrapper::setMinVersion(const QString &version)
+{
+    m_version = version;
+}
+
+QString QServiceListWrapper::minVersion() const
+{
+    return m_version;
+}
+
+QDeclarativeListProperty<QServiceWrapper> QServiceListWrapper::services()
+{
+    return QDeclarativeListProperty<QServiceWrapper>(this, m_services);
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-dialer/sfwexample/qdeclarativeservice.h	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,125 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+***************************************************************************/
+
+#ifndef QDECLARATIVESERVICE_H
+#define QDECLARATIVESERVICE_H
+
+#include <QtCore>
+#include <qserviceinterfacedescriptor.h>
+#include <qservicemanager.h>
+#include <qdeclarative.h>
+#include <qdeclarativelist.h>
+
+QTM_USE_NAMESPACE
+
+Q_DECLARE_METATYPE(QServiceInterfaceDescriptor)
+
+class QServiceWrapper : public QObject {
+    Q_OBJECT
+    // ![0]
+    Q_PROPERTY(QString interfaceName READ interfaceName WRITE setInterfaceName);
+    Q_PROPERTY(QString serviceName READ serviceName);
+    Q_PROPERTY(QString versionNumber READ versionNumber);
+    Q_PROPERTY(bool valid READ isValid NOTIFY validChanged);
+    Q_PROPERTY(QObject* serviceObject READ serviceObject NOTIFY serviceObjectChanged);
+    // ![0]
+
+public:
+    QServiceWrapper();
+    ~QServiceWrapper();
+
+    void setInterfaceDesc(const QServiceInterfaceDescriptor& desc);
+    QServiceInterfaceDescriptor interfaceDesc() const;
+
+    void setInterfaceName(const QString& interface);
+    QString interfaceName() const;
+    QString serviceName() const;
+    QString versionNumber() const;
+
+    bool isValid() const;
+    QObject* serviceObject();
+
+Q_SIGNALS:
+    void validChanged();
+    void serviceObjectChanged();
+
+private:
+    QServiceManager* serviceManager;
+
+    QServiceInterfaceDescriptor m_descriptor;
+    QObject* serviceInstance;
+};
+
+QML_DECLARE_TYPE(QServiceWrapper);
+
+class QServiceListWrapper : public QObject {
+    Q_OBJECT
+    // ![1]
+    Q_PROPERTY(QString interfaceName READ interfaceName WRITE setInterfaceName);
+    Q_PROPERTY(QString minVersion READ minVersion WRITE setMinVersion);
+    Q_PROPERTY(QDeclarativeListProperty<QServiceWrapper> services READ services NOTIFY servicesChanged);
+    // ![1]
+
+public:
+    QServiceListWrapper();
+    ~QServiceListWrapper();
+
+    QDeclarativeListProperty<QServiceWrapper> services();
+    
+    void setInterfaceName(const QString& interface);
+    QString interfaceName() const;
+
+    void setMinVersion(const QString& interface);
+    QString minVersion() const;
+    
+private:
+    QServiceManager* serviceManager;
+    QList<QServiceWrapper *> m_services;
+    QString m_interface;
+    QString m_version;
+
+Q_SIGNALS:
+    void servicesChanged(const QDeclarativeListProperty<QServiceWrapper>&);
+};
+
+QML_DECLARE_TYPE(QServiceListWrapper)
+
+#endif
+

--- a/qtmobility/examples/declarative-sfw-dialer/sfwexample/resource.qrc	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/sfwexample/resource.qrc	Fri May 14 16:41:33 2010 +0300
@@ -1,8 +1,10 @@
 <RCC>
     <qresource prefix="/" >
         <file>sfwexample.qml</file>
-        <file>DialScreen.qml</file>
-        <file>DialButton.qml</file>
-        <file>ServiceList.qml</file>
+        <file>content/DialScreen.qml</file>
+        <file>content/DialButton.qml</file>
+        <file>content/DialerList.qml</file>
+        <file>content/call.png</file>
+        <file>content/hangup.png</file>
     </qresource>
 </RCC>

--- a/qtmobility/examples/declarative-sfw-dialer/sfwexample/sfwexample.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/sfwexample/sfwexample.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,157 +6,67 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
 #include "sfwexample.h"
 
-ServiceWrapper::ServiceWrapper() 
-: serviceInstance(0)
-{
-}
-
-ServiceWrapper::~ServiceWrapper()
-{
-    delete serviceInstance;
-}
-
-bool ServiceWrapper::isValid() const
-{
-    return m_descriptor.isValid();
-}
-
-QString ServiceWrapper::interfaceName() const
+DialerServices::DialerServices()
 {
-    if (isValid())
-        return m_descriptor.interfaceName();
-    else
-        return "No Interface";
-}
+    serviceManager = new QServiceManager();
 
-QString ServiceWrapper::serviceName() const
-{
-    if (isValid()) {
-        return m_descriptor.serviceName();
-    } else
-        return "No Service";
-}
-
-QString ServiceWrapper::version() const
-{
-    if (isValid())
-        return QString(QString::number(m_descriptor.majorVersion())+"."+QString::number(m_descriptor.minorVersion()));
-    else
-        return QString("0.0");
+    registerExampleServices();
 }
 
-void ServiceWrapper::setNativeDescriptor(const QServiceInterfaceDescriptor &d)
-{
-    if (d == m_descriptor)
-        return;
-
-    m_descriptor = d;
-    
-    if (serviceInstance)
-        delete serviceInstance;
-
-    serviceInstance = 0;
-}
-
-void ServiceWrapper::setDescriptor(QVariant &newDescriptor)
-{
-    QServiceInterfaceDescriptor d = newDescriptor.value<QServiceInterfaceDescriptor>();
-    setNativeDescriptor(d);
-}
-
-
-QObject* ServiceWrapper::serviceObject()
-{
-    qDebug() << "called serviceObject";
-    if (serviceInstance) {
-        return serviceInstance;
-    }
-
-    if (isValid()) {
-        QServiceManager manager;
-        serviceInstance = manager.loadInterface(m_descriptor);
-        return serviceInstance;
-    } else {
-        return 0;
-    }
-}
-
-ServiceRegister::ServiceRegister()
-{
-    serviceManager = new QServiceManager();
-    unregisterExampleServices();
-    registerExampleServices();
-
-    //! [1]
-    ServiceWrapper *service;
-    QServiceFilter filter("com.nokia.qt.examples.Dialer");
-    QList<QServiceInterfaceDescriptor> allImpl = serviceManager->findInterfaces(filter);
-    for (int i = 0; i < allImpl.count(); i++) {
-        qDebug() << "Found service:" << allImpl.at(i).serviceName() << "(" << allImpl.at(i).interfaceName() << ")";
-        service = new ServiceWrapper();
-        service->setNativeDescriptor(allImpl.at(i));
-        m_services.append(service);
-    }
-    //! [1]
-}
-
-ServiceRegister::~ServiceRegister() 
+DialerServices::~DialerServices()
 {
     unregisterExampleServices();
 }
 
-void ServiceRegister::registerExampleServices()
+void DialerServices::registerExampleServices()
 {
-    //! [0]
+    // ![0]
     QStringList exampleXmlFiles;
-    exampleXmlFiles << "voipdialerservice.xml" << "landlinedialerservice.xml";
+    exampleXmlFiles << "landlinedialerservice.xml" << "voipdialerservice.xml";
     foreach (const QString &fileName, exampleXmlFiles) {
         QString path = QCoreApplication::applicationDirPath() + "/xmldata/" + fileName;
         serviceManager->addService(path);
     }
-    //! [0]
+    // ![0]
 }
 
-void ServiceRegister::unregisterExampleServices()
+void DialerServices::unregisterExampleServices()
 {
+    serviceManager->removeService("LandlineDialer");
     serviceManager->removeService("VoipDialer");
-    serviceManager->removeService("LandlineDialer");
 }
 
-
-

--- a/qtmobility/examples/declarative-sfw-dialer/sfwexample/sfwexample.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/sfwexample/sfwexample.h	Fri May 14 16:41:33 2010 +0300
@@ -6,108 +6,60 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ***************************************************************************/
 
+#ifndef SFWEXAMPLE_H
+#define SFWEXAMPLE_H
+
 #include <QtCore>
 #include <qserviceinterfacedescriptor.h>
 #include <qservicemanager.h>
-#include <qdeclarative.h>
 
 QTM_USE_NAMESPACE
 
-Q_DECLARE_METATYPE(QServiceInterfaceDescriptor)
-
-//! [0]
-class ServiceWrapper : public QObject {
+class DialerServices : public QObject {
     Q_OBJECT
-    Q_PROPERTY(bool isValid READ isValid);
-    Q_PROPERTY(QString serviceName READ serviceName CONSTANT);
-    Q_PROPERTY(QString interfaceName READ interfaceName CONSTANT);
-    Q_PROPERTY(QString version READ version NOTIFY versionChanged);
-//! [0]
 
 public:
-    ServiceWrapper();
-    
-    ~ServiceWrapper() ;
-
-    bool isValid() const;
-
-    QString serviceName() const;
-
-    QString interfaceName() const;
-
-    void setNativeDescriptor(const QServiceInterfaceDescriptor& desc);
-
-    void setDescriptor(QVariant& newDescriptor);
-
-    QString version() const;
-
-    Q_INVOKABLE QObject* serviceObject();
+    DialerServices();
+    ~DialerServices();
 
 private:
-    QServiceInterfaceDescriptor m_descriptor;
-    QObject* serviceInstance;
+    void registerExampleServices();
+    void unregisterExampleServices();
+
+    QServiceManager* serviceManager;
 };
 
-QML_DECLARE_TYPE(ServiceWrapper)
-
-//! [1]
-class ServiceRegister : public QObject {
-    Q_OBJECT
-    Q_PROPERTY(QList<ServiceWrapper*>* registeredservices READ registeredservices NOTIFY modelChanged CONSTANT);
-//! [1]
-
-public:
-    ServiceRegister();
-    ~ServiceRegister();
-    
-    QList<ServiceWrapper*> *registeredservices() {return &m_services; }
+#endif
 
-    void registerExampleServices();
-
-    void unregisterExampleServices();
-
-    void serviceStateChange(int state);
-
-private:
-    QServiceManager* serviceManager;
-    QList<ServiceWrapper *> m_services;
-
-signals:
-    void modelChanged();
-};
-
-QML_DECLARE_TYPE(ServiceRegister)
-

--- a/qtmobility/examples/declarative-sfw-dialer/sfwexample/sfwexample.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/sfwexample/sfwexample.pro	Fri May 14 16:41:33 2010 +0300
@@ -1,14 +1,15 @@
-TEMPLATE=app
-TARGET=declarative-sfw-dialer
+TEMPLATE = app
+TARGET = declarative-sfw-dialer
 INCLUDEPATH += ../../../src/serviceframework
 
 include(../../examples.pri)
 
 QT += gui declarative
 
-# Input 
-HEADERS += sfwexample.h
+HEADERS += sfwexample.h \
+           qdeclarativeservice.h
 SOURCES += sfwexample.cpp \
+           qdeclarativeservice.cpp \
            main.cpp
 
 CONFIG += mobility
@@ -17,10 +18,5 @@
 RESOURCES += resource.qrc
 
 symbian {
-    # There are platsec warnings about missing 'AllFiles' 
-    # capabilities, but application works regardless 
-    # (they come from QDeclarativeView::setSource).
-    # The unnecessary need for 'AllFiles' is being analyzed.
-    # Comment date: 18-Mar-2010
-    TARGET.CAPABILITY = ReadUserData WriteUserData
+    TARGET.CAPABILITY = ALL -TCB
 }

--- a/qtmobility/examples/declarative-sfw-dialer/sfwexample/sfwexample.qml	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/sfwexample/sfwexample.qml	Fri May 14 16:41:33 2010 +0300
@@ -1,9 +1,11 @@
-import Qt 4.6
+import Qt 4.7
+import QtMobility.serviceframework 1.0
+import "content"
 
 //Layout of the mainPage
 //----------------------------------------------  ____ mainPage
 //| ------------------- ---------------------- | /
-//| | serviceList     | | dialScreen         | |/
+//| | dialerList     | | dialScreen         | |/
 //| |                 | |                    | |
 //| |                 | |                    | |
 //| |                 | |                    | |
@@ -21,13 +23,15 @@
 //----------------------------------------------
 
 Rectangle {
+    property var dialerObject: defaultService.serviceObject
+    
     id: mainPage
     width: 500
     height: 250
     color: "white"
 
-    ServiceList {
-        id: serviceList
+    DialerList {
+        id: dialerList
         height: childrenRect.height + 10
         width: childrenRect.width
         anchors.top: parent.top
@@ -52,16 +56,16 @@
                     color: "steelblue"
                 }
             }
-        onServiceSelected: { ServiceSelected(); }
+        onSignalSelected: { serviceSelected(); }
     }
 
-    Script {
-        function ServiceSelected()
-        {
-            serviceDetails.text = "Selected dial service:" + "\n   " + 
-                                   serviceList.dialService.serviceName + 
-                                   "\n   (" + serviceList.dialService.version + ")";
-        }
+    function serviceSelected()
+    {
+        dialerObject = dialerList.dialService.serviceObject
+
+        serviceDetails.text = "Selected dial service:" + "\n   " + 
+                               dialerList.dialService.serviceName + 
+                               "\n   (" + dialerList.dialService.versionNumber + ")";
     }
     
     Text {
@@ -71,7 +75,7 @@
         anchors.leftMargin: 5
         anchors.rightMargin: 5;
         anchors.left: parent.left
-        anchors.top: serviceList.bottom
+        anchors.top: dialerList.bottom
     }
     
     Text {
@@ -104,8 +108,8 @@
         anchors.top: parent.top
         onDial: {
             if (activeCall == false) {
-                if (serviceList.dialService != 0) {
-                    var o = serviceList.dialService.serviceObject();
+                if (dialerList.dialService != 0) {
+                    var o = dialerObject;
                     status.text = "Dialing " + numberToDial +"...";
                     dialScreen.currentDialer = o;
                     o.dialNumber(numberToDial);
@@ -126,8 +130,9 @@
 
     //! [1]
     Connections {
-        target: dialScreen
-        onStateChanged: { 
+        target: dialerObject
+        
+        onStateChanged: {
             if (dialScreen.currentDialer.state == 1) {
                 status.text += "\nRinging";
             } 
@@ -145,4 +150,9 @@
         }
     }
     //! [1]
+
+    Service {
+        id: defaultService
+        interfaceName: "com.nokia.qt.examples.Dialer"
+    }
 }

--- a/qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialer.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialer.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialer.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialer.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialer.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialer.pro	Fri May 14 16:41:33 2010 +0300
@@ -1,24 +1,24 @@
 TEMPLATE = lib
 CONFIG += plugin
 INCLUDEPATH += ../../../src/serviceframework
+HEADERS += voipdialer.h \
+           voipdialerplugin.h
+SOURCES += voipdialer.cpp \
+           voipdialerplugin.cpp
+QT += gui
 TARGET = serviceframework_voipdialerservice
-include(../../examples.pri)
-
-QT += gui
+DESTDIR = .
 
-# Input 
-HEADERS += voipdialer.h voipdialerplugin.h
-SOURCES += voipdialer.cpp voipdialerplugin.cpp
-
+include(../../examples.pri)
 CONFIG += mobility
 MOBILITY = serviceframework
 
 symbian {
-    TARGET.CAPABILITY = LocalServices Location NetworkServices ReadUserData UserEnvironment WriteUserData
+    TARGET.CAPABILITY = ALL -TCB
 }
 
 xml.path = $$DESTDIR/xmldata
-xml.files = ../voipdialerservice.xml
+xml.files = voipdialerservice.xml
 xml.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean
 INSTALLS += xml
 build_pass:ALL_DEPS+=install_xml

--- a/qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialerplugin.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialerplugin.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialerplugin.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialerplugin.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialerservice.xml	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<service>
+    <name>VoipDialer</name>
+    <filepath>serviceframework_voipdialerservice</filepath>
+    <description>Voip Dialer</description>
+    <interface>
+        <name>com.nokia.qt.examples.Dialer</name>
+        <version>1.0</version>
+        <description>VoIP based implementation Dialer</description>
+    </interface>
+</service>

--- a/qtmobility/examples/declarative-sfw-dialer/voipdialerservice.xml	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<service>
-    <name>VoipDialer</name>
-    <filepath>serviceframework_voipdialerservice</filepath>
-    <description>Voip Dialer</description>
-    <interface>
-        <name>com.nokia.qt.examples.Dialer</name>
-        <version>1.0</version>
-        <description>VoIP based implementation Dialer</description>
-    </interface>
-</service>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-notes/content/Button.qml	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,32 @@
+import Qt 4.7
+
+Rectangle {
+    id: container
+
+    signal clicked
+    property string image: ""
+    property string text: ""
+
+    color: activePalette.button; smooth: true
+    border.width: 1; border.color: Qt.darker(activePalette.button); radius: 8;
+
+    gradient: Gradient {
+        GradientStop {
+            id: topGrad; position: 0.0
+            color :if (mr.pressed) { activePalette.dark } else { activePalette.light } }
+        GradientStop { position: 1.0; color: activePalette.button }
+    }
+
+    Image {
+        id: imgItem;
+        smooth: true
+        width: 16; height: 16;
+        source: container.image; anchors.centerIn: container
+    }
+
+    MouseArea { id: mr; anchors.fill: parent; onClicked: container.clicked() }
+
+    Text {
+        id: txtItem; text: container.text; anchors.centerIn: container; color: activePalette.buttonText
+    }
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-notes/content/Dialog.qml	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,58 @@
+import Qt 4.7
+
+Rectangle {
+    property string text: ""
+    property bool cancelable: true
+    signal confirmed();
+
+    id: page
+    opacity: 0
+    border.width: 1; color: "lightgray"; radius: 5
+
+    width: 200; height: dialogText.height + okButton.height + 35
+    anchors.verticalCenter: mainWindow.verticalCenter
+    anchors.horizontalCenter: mainWindow.horizontalCenter
+
+    Text {
+        id: dialogText
+        text: page.text
+        wrapMode: Text.WordWrap
+        x: 15; y: 15
+        color: activePalette.buttonText
+        anchors.horizontalCenter: page.horizontalCenter
+    }
+
+    Button {
+        id: okButton
+        text: "Ok"
+        width: 75; height: 25
+        anchors.top: dialogText.bottom; anchors.topMargin: 7
+
+        onClicked: {
+            page.confirmed();
+            page.opacity = 0;
+        }
+    }
+
+    Button {
+        id: noButton
+        text: "Cancel"
+        width: 75; height: 25
+        anchors.left: page.horizontalCenter; anchors.leftMargin: 5
+        anchors.top: dialogText.bottom; anchors.topMargin: 7
+    
+        onClicked: {
+            page.opacity = 0;
+        }
+    }
+
+    Component.onCompleted: {
+        if (cancelable == false) {
+            noButton.opacity = 0;
+            okButton.anchors.horizontalCenter = page.horizontalCenter;
+        } else {
+            okButton.anchors.right = page.horizontalCenter; 
+            okButton.anchors.rightMargin = 5;
+        }
+    }
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-notes/content/InputDialog.qml	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,83 @@
+import Qt 4.7
+
+Rectangle {
+    property string text: ""
+    property string defaultText: ""
+    property bool cancelable: true
+    property int size: 0
+    signal confirmed(string input);
+    
+    id: page
+    opacity: 0
+
+    width: dialogText.width + 30 + size; height: dialogText.height + okButton.height + inputText.height + 44
+    anchors.verticalCenter: mainWindow.verticalCenter
+    anchors.horizontalCenter: mainWindow.horizontalCenter
+
+    border.width: 1; color: "lightgray"; radius: 5
+
+    Text {
+        id: dialogText
+        text: page.text
+        x: 15; y: 15
+        color: activePalette.buttonText
+    }
+
+    Rectangle {
+        id: inputArea
+        width: page.width - 30 
+        height: inputText.height + 4
+        border.width: 1; color: "white"; radius: 1
+        anchors.left: dialogText.left
+        anchors.top: dialogText.bottom; anchors.topMargin: 7
+    }
+
+    TextEdit {
+        id: inputText
+        text: page.defaultText
+        width: inputArea.width - 10
+        anchors.verticalCenter: inputArea.verticalCenter
+        anchors.horizontalCenter: inputArea.horizontalCenter
+    }
+
+    Button {
+        id: okButton
+        text: "Ok"
+        width: 75; height: 25
+        anchors.top: inputArea.bottom; anchors.topMargin: 10
+
+        onClicked: {
+            page.confirmed(inputText.text);
+            forceClose(); 
+        }
+    }
+
+    Button {
+        id: noButton
+        text: "Cancel"
+        width: 75; height: 25
+        anchors.left: page.horizontalCenter; anchors.leftMargin: 5
+        anchors.top: inputArea.bottom; anchors.topMargin: 10
+    
+        onClicked: {
+            forceClose();
+        }
+    }
+
+    function forceClose()
+    {
+        page.opacity = 0;
+        inputText.text = "";
+    }
+
+    Component.onCompleted: {
+        if (cancelable == false) {
+            noButton.opacity = 0;
+            okButton.anchors.horizontalCenter = page.horizontalCenter;
+        } else {
+            okButton.anchors.right = page.horizontalCenter;
+            okButton.anchors.rightMargin = 5;
+        }
+        
+    }
+}

Binary file qtmobility/examples/declarative-sfw-notes/content/icons/addIcon.png has changed

Binary file qtmobility/examples/declarative-sfw-notes/content/icons/deleteIcon.png has changed

Binary file qtmobility/examples/declarative-sfw-notes/content/icons/nextIcon.png has changed

Binary file qtmobility/examples/declarative-sfw-notes/content/icons/prevIcon.png has changed

Binary file qtmobility/examples/declarative-sfw-notes/content/icons/searchIcon.png has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-notes/content/qmldir	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,3 @@
+Button Button.qml
+Dialog Dialog.qml
+InputDialog InputDialog.qml

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-notes/declarative-sfw-notes.pro	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,20 @@
+TEMPLATE = app
+TARGET = declarative-sfw-notes
+INCLUDEPATH += ../../src/serviceframework
+
+include(../examples.pri)
+
+QT += declarative
+
+HEADERS += sfwnotes.h \
+           qdeclarativeservice.h
+SOURCES += sfwnotes.cpp \
+           qdeclarativeservice.cpp \
+           main.cpp
+
+CONFIG += mobility
+MOBILITY = serviceframework
+
+RESOURCES += sfwnotes.qrc
+
+OTHER_FILES = declarative-sfw-notes.qml

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-notes/declarative-sfw-notes.qml	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,290 @@
+import Qt 4.7
+// ![0]
+import QtMobility.serviceframework 1.0
+// ![0]
+import "content"
+
+Rectangle {
+    property int size: 0
+    property int curr: 0
+    property string searchText: ""
+    property bool validService: false
+
+    // ![1]
+    property var notesManager: notesService.serviceObject
+    // ![1]
+
+    id: mainWindow
+    color: "lightgray"
+    width: 220; height: 265
+
+    SystemPalette { id: activePalette }
+
+    Rectangle {
+        id: datetimeArea
+        width: 160; height: 20
+        x: 30; y: 120
+        color: "#FFFF7F"
+    }
+
+    Rectangle {
+        id: noteArea
+        width: 160; height: 110
+        x: 30; y: 140
+        color: "#FFFF7F"
+    }
+
+    Text {
+        id: title
+        text: "ToDoTool"
+        font.pointSize: 24; font.family: "Nimbus Roman No9 L"; font.bold: true; font.italic:true 
+        color: "blue"
+        y: 5; anchors.horizontalCenter: mainWindow.horizontalCenter
+    }
+
+    Text {
+        id: countLabel
+        text: curr + "/" + size
+        font.pointSize:10
+        y: 90
+        anchors.horizontalCenter: mainWindow.horizontalCenter
+    }
+
+    Text {
+        id: datetimeLabel
+        text: ""
+        font.pointSize:10
+        x: 30; y: 120
+        anchors.right: datetimeArea.right
+    }
+
+    Text {
+        id: noteLabel
+        text: ""
+        font.pointSize: 18; font.family: "Comic Sans MS"; font.italic:true
+        horizontalAlignment: Text.AlignHCenter
+        wrapMode: Text.WordWrap
+        width: noteArea.width
+        anchors.verticalCenter: noteArea.verticalCenter
+        anchors.horizontalCenter: title.horizontalCenter
+    }
+
+    Button {
+        id: addButton
+        image: "icons/addIcon.png"
+        width: 60; height: 30
+        x: 20; y: 40
+
+        onClicked: {
+            if (validService) { addDialog.opacity = 1; }
+        }
+    }
+
+    Button {
+        id: deleteButton
+        image: "icons/deleteIcon.png"
+        width: 60; height: 30
+        x: 80; y: 40
+
+        onClicked: {
+            if (validService && size > 0) { deleteDialog.opacity = 1; }
+        }
+    }
+
+    Button {
+        id: searchButton
+        image: "icons/searchIcon.png"
+        width: 60; height: 30
+        x: 140; y: 40
+
+        onClicked: {
+            if (validService) { searchDialog.opacity = 1; }
+        }
+    }
+
+    Button {
+        id: nextButton
+        image: "icons/nextIcon.png"
+        width: 40; height: 30
+        x: 130; y: 80
+
+        onClicked: { 
+            if (validService && curr < size) { 
+                curr++;
+                refreshNotes();
+            }
+        }
+    }
+
+    Button {
+        id: prevButton
+        image: "icons/prevIcon.png"
+        width: 40; height: 30
+        x: 50; y: 80
+
+        onClicked: {
+            if (validService && curr > 1) {
+                curr--;
+                refreshNotes();
+            }
+        }
+    }
+
+    InputDialog {
+        id: interfaceDialog
+        text: "Specify Notes Manager Interface"
+        defaultText: "com.nokia.qt.examples.NotesManager"
+        cancelable: false
+        opacity: 1
+
+        onConfirmed: {
+            interfaceDialog.defaultText = input;
+            
+            // ![2]
+            notesService.interfaceName = input;
+
+            if (notesService.valid) {
+                notesManager = notesService.serviceObject;
+            // ![2]
+                var list = notesManager.noteSet;
+                if (list.length > 0) {curr = 1;}
+
+                refreshNotes();
+                
+                validService = true;
+            } else {
+                invalidDialog.opacity = 1;
+                noteLabel.text = "Notes Manager service not found"
+            }
+        }
+    }
+
+    InputDialog {
+        id: addDialog
+        text: "Add a new note + alarm of format:\nnote#yyyy-mm-dd#hh:mm"
+
+        onConfirmed: {
+            var note = input.split("#");
+
+            if (note.length == 3) {
+                var date = note[1].split("-");
+                var time = note[2].split(":");
+
+                if (date.length == 3 && time.length ==2) {
+                    notesManager.addNote(note[0], note[1] + " " + note[2] + ":00");
+                }
+            } else {
+                    notesManager.addNote(note[0], currentDateTime() + ":00");
+            }
+
+            refreshNotes();
+        }
+    }
+
+    InputDialog {
+        id: searchDialog
+        text: "Find a note:"
+        size: 100
+
+        onConfirmed: {
+            searchText = input;
+            curr = 1; 
+            refreshNotes()
+        }
+    }
+
+    Connections {
+        target: notesManager
+        
+        onSoundAlarm: {
+            alarmDialog.text = "ALERT SOUNDED!!!" + "\n\n" + 
+                               formatDateTime(alarm) + "\n\n" + notesManager.alarmMessage;
+            alarmDialog.opacity = 1;
+        }
+    }
+
+    Dialog {
+        id: deleteDialog
+        text: "Confirm removing this note item?"
+
+        onConfirmed: {
+            // ![3]
+            var list = notesManager.noteSet;
+            notesManager.removeNote(list[curr-1].index);
+            // ![3]
+
+            if (curr > 1) { curr--; }
+
+            refreshNotes();
+        }
+    }
+
+    Dialog {
+        id: alarmDialog
+        text: "ALERT SOUNDED!!!"
+        cancelable: false
+    }
+
+    Dialog {
+        id: invalidDialog
+        text: "No valid default interface for:\n\n\"" + interfaceDialog.defaultText + "\""
+        cancelable: false
+    }
+
+    function refreshNotes()
+    {
+        // ![4]
+        notesManager.setSearch(searchText);
+        var list = notesManager.noteSet;
+        size = list.length;
+        
+        // ![4]
+       
+        if (size < 1) curr = 0;
+        else if (size > 0 && curr == 0) curr = 1;
+      
+        // ![5]
+        if (size > 0) {
+            noteLabel.text = list[curr-1].message;
+            datetimeLabel.text = formatDateTime(list[curr-1].alarm);
+        }
+        // ![5]
+        else {
+            noteLabel.text = "Click + to add a new note";
+            datetimeLabel.text = "";
+        }
+    }
+
+    function formatDateTime(datetime)
+    {
+        var dt = new Date(datetime);
+
+        var month = (dt.getMonth() + 1) + ""; 
+        if (month.length == 1)  month = "0" + month;
+
+        var date = dt.getDate() + ""; 
+        if (date.length == 1)  date= "0" + date;
+            
+        var hour = dt.getHours() + ""; 
+        if (hour.length == 1)  hour = "0" + hour;
+            
+        var mins = dt.getMinutes() + ""; 
+        if (mins.length == 1)  mins = "0" + mins;
+
+        return (dt.getFullYear() + "-" + month + "-" + date + " " + hour + ":" + mins);
+    }
+
+    function currentDateTime()
+    {
+        var dt = new Date();
+
+        return formatDateTime(dt);
+    }
+
+    // ![6]
+    Service {
+        id: notesService
+        interfaceName: "com.nokia.qt.examples.NotesManager"
+    }
+    // ![6]
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-notes/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QUrl>
+#include <QtCore>
+
+#include <QDeclarativeView>
+#include <qdeclarative.h>
+
+#include "sfwnotes.h"
+#include "qdeclarativeservice.h"
+
+int main(int argc, char* argv[])
+{
+    qmlRegisterType<QServiceWrapper>("QtMobility.serviceframework", 1, 0, "Service");
+
+    QApplication app(argc, argv);
+
+    ToDoTool *td = new ToDoTool();
+
+    QDeclarativeView canvas;
+    canvas.setSource(QUrl("qrc:/declarative-sfw-notes.qml"));
+    canvas.show();
+
+    return app.exec();
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-notes/qdeclarativeservice.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,165 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeservice.h"
+
+QServiceWrapper::QServiceWrapper()
+: serviceInstance(0)
+{
+    serviceManager = new QServiceManager();
+}
+
+QServiceWrapper::~QServiceWrapper()
+{
+    delete serviceInstance;
+}
+
+bool QServiceWrapper::isValid() const
+{
+    return m_descriptor.isValid();
+}
+
+void QServiceWrapper::setInterfaceDesc(const QServiceInterfaceDescriptor &desc)
+{
+    if (desc == m_descriptor)
+        return;
+
+    m_descriptor = desc;
+
+    if (serviceInstance)
+        delete serviceInstance;
+
+    serviceInstance = 0;
+}
+
+QServiceInterfaceDescriptor QServiceWrapper::interfaceDesc() const
+{
+    return m_descriptor;
+}
+
+void QServiceWrapper::setInterfaceName(const QString &interface)
+{
+    m_descriptor = serviceManager->interfaceDefault(interface);
+
+    if (!isValid())
+        qWarning() << "WARNING: No default service found for interface name: " << interface;
+}
+
+QString QServiceWrapper::interfaceName() const
+{
+    if (isValid())
+        return m_descriptor.interfaceName();
+    else
+        return "No Interface";
+}
+
+QString QServiceWrapper::serviceName() const
+{
+    if (isValid())
+        return m_descriptor.serviceName();
+    else
+        return "No Service";
+}
+
+QString QServiceWrapper::versionNumber() const
+{
+    if (isValid())
+        return (QString::number(m_descriptor.majorVersion())+"."+QString::number(m_descriptor.minorVersion()));
+    else
+        return "0.0";
+}
+
+QObject* QServiceWrapper::serviceObject()
+{
+    if (serviceInstance) {
+        return serviceInstance;
+    }
+
+    if (isValid()) {
+        QServiceManager manager;
+        serviceInstance = manager.loadInterface(m_descriptor);
+        return serviceInstance;
+    } else {
+        return 0;
+    }
+}
+
+QServiceListWrapper::QServiceListWrapper()
+{
+    serviceManager = new QServiceManager();
+}
+
+QServiceListWrapper::~QServiceListWrapper()
+{
+}
+
+void QServiceListWrapper::setInterfaceName(const QString &interface)
+{
+    m_interface = interface;
+
+    QServiceWrapper *service;
+    QServiceFilter filter(m_interface, m_version);
+    QList<QServiceInterfaceDescriptor> list = serviceManager->findInterfaces(filter);
+    for (int i = 0; i < list.size(); i++) {
+        service = new QServiceWrapper();
+        service->setInterfaceDesc(list.at(i));
+        m_services.append(service);
+    }
+}
+
+QString QServiceListWrapper::interfaceName() const
+{
+    return m_interface;
+}
+
+void QServiceListWrapper::setMinVersion(const QString &version)
+{
+    m_version = version;
+}
+
+QString QServiceListWrapper::minVersion() const
+{
+    return m_version;
+}
+
+QDeclarativeListProperty<QServiceWrapper> QServiceListWrapper::services()
+{
+    return QDeclarativeListProperty<QServiceWrapper>(this, m_services);
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-notes/qdeclarativeservice.h	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+***************************************************************************/
+
+#ifndef QDECLARATIVESERVICE_H
+#define QDECLARATIVESERVICE_H
+
+#include <QtCore>
+#include <qserviceinterfacedescriptor.h>
+#include <qservicemanager.h>
+#include <qdeclarative.h>
+#include <qdeclarativelist.h>
+
+QTM_USE_NAMESPACE
+
+Q_DECLARE_METATYPE(QServiceInterfaceDescriptor)
+
+class QServiceWrapper : public QObject {
+    Q_OBJECT
+    Q_PROPERTY(QString interfaceName READ interfaceName WRITE setInterfaceName);
+    Q_PROPERTY(QString serviceName READ serviceName);
+    Q_PROPERTY(QString versionNumber READ versionNumber);
+    Q_PROPERTY(bool valid READ isValid NOTIFY validChanged);
+    Q_PROPERTY(QObject* serviceObject READ serviceObject NOTIFY serviceObjectChanged);
+
+public:
+    QServiceWrapper();
+    ~QServiceWrapper();
+
+    void setInterfaceDesc(const QServiceInterfaceDescriptor& desc);
+    QServiceInterfaceDescriptor interfaceDesc() const;
+
+    void setInterfaceName(const QString& interface);
+    QString interfaceName() const;
+    QString serviceName() const;
+    QString versionNumber() const;
+
+    bool isValid() const;
+    QObject* serviceObject();
+
+Q_SIGNALS:
+    void validChanged();
+    void serviceObjectChanged();
+
+private:
+    QServiceManager* serviceManager;
+
+    QServiceInterfaceDescriptor m_descriptor;
+    QObject* serviceInstance;
+};
+
+QML_DECLARE_TYPE(QServiceWrapper);
+
+class QServiceListWrapper : public QObject {
+    Q_OBJECT
+    Q_PROPERTY(QString interfaceName READ interfaceName WRITE setInterfaceName);
+    Q_PROPERTY(QString minVersion READ minVersion WRITE setMinVersion);
+    Q_PROPERTY(QDeclarativeListProperty<QServiceWrapper> services READ services NOTIFY servicesChanged);
+
+public:
+    QServiceListWrapper();
+    ~QServiceListWrapper();
+
+    QDeclarativeListProperty<QServiceWrapper> services();
+    
+    void setInterfaceName(const QString& interface);
+    QString interfaceName() const;
+
+    void setMinVersion(const QString& interface);
+    QString minVersion() const;
+    
+private:
+    QServiceManager* serviceManager;
+    QList<QServiceWrapper *> m_services;
+    QString m_interface;
+    QString m_version;
+
+Q_SIGNALS:
+    void servicesChanged(const QDeclarativeListProperty<QServiceWrapper>&);
+};
+
+QML_DECLARE_TYPE(QServiceListWrapper)
+
+#endif
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-notes/sfwnotes.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "sfwnotes.h"
+
+ToDoTool::ToDoTool()
+{
+    serviceManager = new QServiceManager();
+    
+    registerExampleServices();
+}
+
+ToDoTool::~ToDoTool()
+{
+    unregisterExampleServices();
+}
+
+void ToDoTool::registerExampleServices()
+{
+    QStringList exampleXmlFiles;
+    exampleXmlFiles << "notesmanagerservice.xml";
+    foreach (const QString &fileName, exampleXmlFiles) {
+        QString path = QCoreApplication::applicationDirPath() + "/xmldata/" + fileName;
+        serviceManager->addService(path);
+    }
+}
+
+void ToDoTool::unregisterExampleServices()
+{
+    serviceManager->removeService("NotesManagerService");
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-notes/sfwnotes.h	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+***************************************************************************/
+
+#ifndef SFWNOTES_H
+#define SFWNOTES_H
+
+#include <QtCore>
+#include <qserviceinterfacedescriptor.h>
+#include <qservicemanager.h>
+
+QTM_USE_NAMESPACE
+
+class ToDoTool : public QObject {
+    Q_OBJECT
+
+public:
+    ToDoTool();
+    ~ToDoTool();
+    
+private:
+    void registerExampleServices();
+    void unregisterExampleServices();
+    
+    QServiceManager* serviceManager;
+};
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-notes/sfwnotes.qrc	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,13 @@
+<RCC>
+    <qresource prefix="/" >
+        <file>declarative-sfw-notes.qml</file>
+        <file>content/Button.qml</file>
+        <file>content/Dialog.qml</file> 
+        <file>content/InputDialog.qml</file>
+        <file>content/icons/addIcon.png</file>
+        <file>content/icons/deleteIcon.png</file>
+        <file>content/icons/searchIcon.png</file>
+        <file>content/icons/nextIcon.png</file>
+        <file>content/icons/prevIcon.png</file>
+    </qresource>
+</RCC>

--- a/qtmobility/examples/examples.pri	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/examples.pri	Fri May 14 16:41:33 2010 +0300
@@ -1,5 +1,7 @@
 include(../staticconfig.pri)
         
+#!contains(build_examples, yes):error(Please use the -examples configure switch to enable building of examples)
+
 win32:contains(CONFIG_WIN32,build_all):Win32DebugAndRelease=yes
 mac | contains(Win32DebugAndRelease,yes) {
     #due to different debug/release library names we have to comply with

--- a/qtmobility/examples/examples.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/examples.pro	Fri May 14 16:41:33 2010 +0300
@@ -9,10 +9,10 @@
                notesmanagerplugin \
                servicebrowser
 
-    !symbian:SUBDIRS+= servicenotesmanager/sfw-notes
+    !symbian:SUBDIRS+= sfw-notes
     
     contains(QT_CONFIG, declarative) {
-        SUBDIRS += servicenotesmanager/declarative-sfw-notes \
+        SUBDIRS += declarative-sfw-notes \
                    declarative-sfw-dialer
     }
 }

--- a/qtmobility/examples/fetchgooglemaps/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/fetchgooglemaps/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/fetchgooglemaps/mapwindow.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/fetchgooglemaps/mapwindow.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/fetchgooglemaps/mapwindow.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/fetchgooglemaps/mapwindow.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/filemanagerplugin/filemanagerplugin.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/filemanagerplugin/filemanagerplugin.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -47,17 +46,21 @@
 #include "filemanagerstorage.h"
 #include "filemanagertransfer.h"
 
+//! [createinstance-sig]
 QObject* FileManagerPlugin::createInstance(const QServiceInterfaceDescriptor& descriptor, QServiceContext* context, QAbstractSecuritySession* session)
+//! [createinstance-sig]
 {
     Q_UNUSED(context);
     Q_UNUSED(session);
 
+//! [createinstance]
     if (descriptor.interfaceName() == "com.nokia.qt.examples.FileStorage")
         return new FileManagerStorage(this);
     else if (descriptor.interfaceName() == "com.nokia.qt.examples.FileTransfer")
         return new FileManagerTransfer(this);
     else
         return 0;
+//! [createinstance]
 }
 
 Q_EXPORT_PLUGIN2(serviceframework_filemanagerplugin, FileManagerPlugin)

--- a/qtmobility/examples/filemanagerplugin/filemanagerplugin.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/filemanagerplugin/filemanagerplugin.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/filemanagerplugin/filemanagerstorage.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/filemanagerplugin/filemanagerstorage.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/filemanagerplugin/filemanagerstorage.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/filemanagerplugin/filemanagerstorage.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/filemanagerplugin/filemanagertransfer.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/filemanagerplugin/filemanagertransfer.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/filemanagerplugin/filemanagertransfer.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/filemanagerplugin/filemanagertransfer.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/flickrdemo/connectivityhelper.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/flickrdemo/connectivityhelper.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/flickrdemo/connectivityhelper.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/flickrdemo/connectivityhelper.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/flickrdemo/flickrdemo.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/flickrdemo/flickrdemo.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/flickrdemo/flickrdemo.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/flickrdemo/flickrdemo.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/flickrdemo/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/flickrdemo/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/flickrdemo/xqlistwidget.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/flickrdemo/xqlistwidget.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/flickrdemo/xqlistwidget.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/flickrdemo/xqlistwidget.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/keepintouch/addressfinder.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/keepintouch/addressfinder.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/keepintouch/addressfinder.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/keepintouch/addressfinder.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/keepintouch/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/keepintouch/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/lightmaps/lightmaps.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/lightmaps/lightmaps.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/logfilepositionsource/clientapplication.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/logfilepositionsource/clientapplication.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/logfilepositionsource/clientapplication.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/logfilepositionsource/clientapplication.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/logfilepositionsource/logfilepositionsource.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/logfilepositionsource/logfilepositionsource.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/logfilepositionsource/logfilepositionsource.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/logfilepositionsource/logfilepositionsource.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/logfilepositionsource/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/logfilepositionsource/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/notesmanagerplugin/note.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/notesmanagerplugin/note.h	Fri May 14 16:41:33 2010 +0300
@@ -6,33 +6,34 @@
 **
 ** This file is part of the Qt Mobility Components.
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/notesmanagerplugin/notesmanager.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/notesmanagerplugin/notesmanager.cpp	Fri May 14 16:41:33 2010 +0300
@@ -1,43 +1,43 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2009 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
 #include <QtCore>
 #include <QDebug>
 
@@ -140,7 +140,6 @@
     return m_notes;
 }
 
-
 #ifdef DECLARATIVE
 QDeclarativeListProperty<QObject> NotesManager::noteSet()
 {

--- a/qtmobility/examples/notesmanagerplugin/notesmanager.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/notesmanagerplugin/notesmanager.h	Fri May 14 16:41:33 2010 +0300
@@ -1,43 +1,43 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2009 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
 #ifndef NOTESMANAGER_H
 #define NOTESMANAGER_H

--- a/qtmobility/examples/notesmanagerplugin/notesmanagerplugin.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/notesmanagerplugin/notesmanagerplugin.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/notesmanagerplugin/notesmanagerplugin.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/notesmanagerplugin/notesmanagerplugin.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/notesmanagerplugin/notesmanagerplugin.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/notesmanagerplugin/notesmanagerplugin.pro	Fri May 14 16:41:33 2010 +0300
@@ -23,7 +23,7 @@
     DEPLOYMENT += pluginDep
 
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.CAPABILITY = LocalServices Location NetworkServices ReadUserData UserEnvironment WriteUserData
+    TARGET.CAPABILITY = ALL -TCB
 }
 
 xml.path = $$DESTDIR/xmldata

--- a/qtmobility/examples/notesmanagerplugin/notesmanagerservice.xml	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/notesmanagerplugin/notesmanagerservice.xml	Fri May 14 16:41:33 2010 +0300
@@ -9,22 +9,4 @@
         <description>Notes Management Interface</description>
         <capabilities></capabilities>
     </interface>
-    <interface>
-        <name>com.nokia.qt.examples.NotesManager</name>
-        <version>1.1</version>
-        <description>Notes Management Interface</description>
-        <capabilities></capabilities>
-    </interface>
-    <interface>
-        <name>com.nokia.qt.examples.NotesManager</name>
-        <version>1.2</version>
-        <description>Notes Management Interface</description>
-        <capabilities></capabilities>
-    </interface>
-    <interface>
-        <name>com.nokia.qt.examples.sfw.NotesManager</name>
-        <version>2.0</version>
-        <description>Notes Management Interface</description>
-        <capabilities></capabilities>
-    </interface>
 </service>

--- a/qtmobility/examples/player/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/player/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/player/mediakeysobserver.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/player/mediakeysobserver.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/player/mediakeysobserver.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/player/mediakeysobserver.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/player/player.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/player/player.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -47,6 +46,7 @@
 
 #include <qmediaservice.h>
 #include <qmediaplaylist.h>
+#include <qaudioendpointselector.h>
 
 #include <QtGui>
 
@@ -71,6 +71,7 @@
     , toggleAspectRatio(0)
     , showYoutubeDialog(0)
     , youtubeDialog(0)
+    , audioEndpointSelector(0)
 #else
     , colorDialog(0)
 #endif
@@ -105,6 +106,9 @@
     slider->setRange(0, player->duration() / 1000);
 
     connect(slider, SIGNAL(sliderMoved(int)), this, SLOT(seek(int)));
+    
+    audioEndpointSelector = qobject_cast<QAudioEndpointSelector*>(player->service()->control(QAudioEndpointSelector_iid));
+    connect(audioEndpointSelector, SIGNAL(activeEndpointChanged(const QString&)), this, SLOT(handleAudioOutputChangedSignal(const QString&)));
 
 #ifndef Q_OS_SYMBIAN
     QPushButton *openButton = new QPushButton(tr("Open"), this);
@@ -262,11 +266,11 @@
         setTrackInfo(QString("(%1/%2) %3 - %4")
                 .arg(playlist->currentIndex()+1)
                 .arg(playlist->mediaCount())
-                .arg(player->metaData(QtMedia::AlbumArtist).toString())
-                .arg(player->metaData(QtMedia::Title).toString()));
+                .arg(player->metaData(QtMediaServices::AlbumArtist).toString())
+                .arg(player->metaData(QtMediaServices::Title).toString()));
 
         if (!player->isVideoAvailable()) {
-            QUrl uri = player->metaData(QtMedia::CoverArtUrlLarge).value<QUrl>();
+            QUrl uri = player->metaData(QtMediaServices::CoverArtUrlLarge).value<QUrl>();
             QPixmap pixmap = NULL;
 
             if (uri.isEmpty()) {
@@ -302,14 +306,14 @@
     hideOrShowCoverArt();
     }
 #else
-    //qDebug() << "update metadata" << player->metaData(QtMedia::Title).toString();
+    //qDebug() << "update metadata" << player->metaData(QtMediaServices::Title).toString();
     if (player->isMetaDataAvailable()) {
         setTrackInfo(QString("%1 - %2")
-                .arg(player->metaData(QtMedia::AlbumArtist).toString())
-                .arg(player->metaData(QtMedia::Title).toString()));
+                .arg(player->metaData(QtMediaServices::AlbumArtist).toString())
+                .arg(player->metaData(QtMediaServices::Title).toString()));
 
         if (coverLabel) {
-            QUrl url = player->metaData(QtMedia::CoverArtUrlLarge).value<QUrl>();
+            QUrl url = player->metaData(QtMediaServices::CoverArtUrlLarge).value<QUrl>();
 
             coverLabel->setPixmap(!url.isEmpty()
                     ? QPixmap(url.toString())
@@ -494,6 +498,30 @@
     showYoutubeDialog = new QAction(tr("Youtube Search"), this);
     qobject_cast<QMainWindow *>(this->parent())->menuBar()->addAction(showYoutubeDialog);
     connect(showYoutubeDialog, SIGNAL(triggered()), this, SLOT(launchYoutubeDialog()));
+
+    setAudioOutputDefault = new QAction(tr("Default output"), this);
+    connect(setAudioOutputDefault, SIGNAL(triggered()), this, SLOT(handleAudioOutputDefault()));
+
+    setAudioOutputAll = new QAction(tr("All outputs"), this);
+    connect(setAudioOutputAll, SIGNAL(triggered()), this, SLOT(handleAudioOutputAll()));
+
+    setAudioOutputNone = new QAction(tr("No output"), this);
+    connect(setAudioOutputNone, SIGNAL(triggered()), this, SLOT(handleAudioOutputNone()));
+    
+    setAudioOutputEarphone = new QAction(tr("Earphone output"), this);
+    connect(setAudioOutputEarphone, SIGNAL(triggered()), this, SLOT(handleAudioOutputEarphone()));
+    
+    setAudioOutputSpeaker = new QAction(tr("Speaker output"), this);
+    connect(setAudioOutputSpeaker, SIGNAL(triggered()), this, SLOT(handleAudioOutputSpeaker()));
+
+    audioOutputMenu = new QMenu(tr("Set Audio Output"), this);
+    audioOutputMenu->addAction(setAudioOutputDefault);
+    audioOutputMenu->addAction(setAudioOutputAll);
+    audioOutputMenu->addAction(setAudioOutputNone);
+    audioOutputMenu->addAction(setAudioOutputEarphone);
+    audioOutputMenu->addAction(setAudioOutputSpeaker);
+
+    qobject_cast<QMainWindow *>(this->parent())->menuBar()->addMenu(audioOutputMenu);
 }
 
 void Player::handleFullScreen(bool isFullscreen)
@@ -522,6 +550,38 @@
     }
 }
 
+void Player::handleAudioOutputDefault()
+{
+    audioEndpointSelector->setActiveEndpoint("Default");
+}
+
+void Player::handleAudioOutputAll()
+{
+    audioEndpointSelector->setActiveEndpoint("All");
+}
+
+void Player::handleAudioOutputNone()
+{
+    audioEndpointSelector->setActiveEndpoint("None");
+}
+
+void Player::handleAudioOutputEarphone()
+{
+    audioEndpointSelector->setActiveEndpoint("Earphone");
+}
+
+void Player::handleAudioOutputSpeaker()
+{
+    audioEndpointSelector->setActiveEndpoint("Speaker");
+}
+
+void Player::handleAudioOutputChangedSignal(const QString&)
+{
+    QMessageBox msgBox;
+    msgBox.setText("Output changed: " + audioEndpointSelector->activeEndpoint());
+    msgBox.exec();
+}
+
 void Player::hideOrShowCoverArt()
 {
     if(player->isVideoAvailable()) {

--- a/qtmobility/examples/player/player.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/player/player.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -47,6 +46,7 @@
 #include <qmediaplayer.h>
 #include <qmediaplaylist.h>
 #include <qvideowidget.h>
+#include <qaudioendpointselector.h>
 
 #ifdef Q_OS_SYMBIAN
 #include <QtGui/QDialog>
@@ -61,14 +61,12 @@
 class QLabel;
 class QModelIndex;
 class QSlider;
+
+class QMediaPlayer;
+class QVideoWidget;
 QT_END_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
-class QMediaPlayer;
-class QVideoWidget;
-QTM_END_NAMESPACE
-
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class PlaylistModel;
 
@@ -111,6 +109,12 @@
     void youtubeReadResponseHeader(const QHttpResponseHeader& responseHeader);
     void searchYoutubeVideo();
     void addYoutubeVideo();
+    void handleAudioOutputDefault();
+    void handleAudioOutputAll();
+    void handleAudioOutputNone();
+    void handleAudioOutputEarphone();
+    void handleAudioOutputSpeaker();
+    void handleAudioOutputChangedSignal(const QString&);
 #else
     void showColorDialog();
 #endif
@@ -133,6 +137,7 @@
     QAbstractItemView *playlistView;
     QString trackInfo;
     QString statusInfo;
+    QAudioEndpointSelector *audioEndpointSelector;
 #ifdef Q_OS_SYMBIAN
     MediaKeysObserver *mediaKeysObserver;
     QDialog *playlistDialog;
@@ -141,6 +146,12 @@
     QDialog *youtubeDialog;
     QHttp http;
     int httpGetId;
+    QMenu *audioOutputMenu;
+    QAction *setAudioOutputDefault;
+    QAction *setAudioOutputAll;
+    QAction *setAudioOutputNone;
+    QAction *setAudioOutputEarphone;
+    QAction *setAudioOutputSpeaker;
 #else
     QDialog *colorDialog;
 #endif

--- a/qtmobility/examples/player/player.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/player/player.pro	Fri May 14 16:41:33 2010 +0300
@@ -21,7 +21,7 @@
     videowidget.cpp
 
 symbian {
-    TARGET.CAPABILITY = UserEnvironment WriteDeviceData ReadDeviceData NetworkServices
+    TARGET.CAPABILITY = UserEnvironment WriteDeviceData ReadDeviceData NetworkServices SwEvent
     HEADERS += mediakeysobserver.h
     SOURCES += mediakeysobserver.cpp
     LIBS += -lremconinterfacebase \

--- a/qtmobility/examples/player/playercontrols.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/player/playercontrols.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/player/playercontrols.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/player/playercontrols.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -52,7 +51,7 @@
 class QComboBox;
 QT_END_NAMESPACE
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class PlayerControls : public QWidget
 {

--- a/qtmobility/examples/player/playlistmodel.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/player/playlistmodel.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/player/playlistmodel.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/player/playlistmodel.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -45,11 +44,11 @@
 #include <qmobilityglobal.h>
 #include <QtCore/qabstractitemmodel.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 class QMediaPlaylist;
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class PlaylistModel : public QAbstractItemModel
 {

--- a/qtmobility/examples/player/videowidget.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/player/videowidget.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/player/videowidget.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/player/videowidget.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -43,7 +42,7 @@
 
 #include <qvideowidget.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class VideoWidget : public QVideoWidget
 {

--- a/qtmobility/examples/publish-subscribe/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/publish-subscribe/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/publish-subscribe/publisherdialog.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/publish-subscribe/publisherdialog.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/publish-subscribe/publisherdialog.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/publish-subscribe/publisherdialog.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/publish-subscribe/subscriberdialog.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/publish-subscribe/subscriberdialog.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/publish-subscribe/subscriberdialog.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/publish-subscribe/subscriberdialog.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/qmlcontacts/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/qmlcontacts/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/qmlcontacts/qmlcontact.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/qmlcontacts/qmlcontact.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -104,17 +103,6 @@
 }
 
 
-QStringList QmlContact::availableActions()
-{
-    QList<QContactActionDescriptor> actions =  m_contact.availableActions();
-    QStringList names;
-
-    foreach (const QContactActionDescriptor& action, actions) {
-        names << action.actionName();
-    }
-    return names;
-}
-
 QStringList QmlContact::details()
 {
     QStringList dets;

--- a/qtmobility/examples/qmlcontacts/qmlcontact.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/qmlcontacts/qmlcontact.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -55,7 +54,6 @@
 Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
 Q_PROPERTY(QString email READ email WRITE setEmail NOTIFY emailChanged)
 Q_PROPERTY(QString test READ test)
-Q_PROPERTY(QStringList availableActions READ availableActions)
 Q_PROPERTY(QStringList details READ details)
 Q_PROPERTY(QStringList contexts READ contexts)
 public:
@@ -72,7 +70,6 @@
     QString email();
     void setEmail(QString email);
 
-    QStringList availableActions();
     QStringList details();
 
     QStringList contexts();

--- a/qtmobility/examples/qmlcontacts/qmlcontacts.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/qmlcontacts/qmlcontacts.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -124,7 +123,7 @@
     QStringList list;
 
     for (int i = 0; i < contact.count(); i++) {
-        list += qc->synthesizedDisplayLabel(contact.at(i));
+        list += qc->synthesizedContactDisplayLabel(contact.at(i));
      }
 
     return list;
@@ -175,7 +174,7 @@
 QString QMLContactManagerAsync::idToName(QString name)
 {
     QContact c = qc->contact(name.toInt());
-    return qc->synthesizedDisplayLabel(c);
+    return qc->synthesizedContactDisplayLabel(c);
 }
 
 // ![0]

--- a/qtmobility/examples/qmlcontacts/qmlcontactsa.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/qmlcontacts/qmlcontactsa.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/querymessages/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/querymessages/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/quickstart/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/quickstart/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -48,7 +47,8 @@
 #else
 #include <QSystemInfo> //(1)
 #endif
-using namespace QtMobility; //(2)
+
+QTM_USE_NAMESPACE //(2)
 
 int main(int argc, char *argv[])
 {

--- a/qtmobility/examples/radio/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/radio/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -48,7 +47,11 @@
     QApplication app(argc, argv);
 
     Radio radio;
+#ifdef Q_OS_SYMBIAN
+    radio.showMaximized();
+#else
     radio.show();
+#endif
 
     return app.exec();
 };

--- a/qtmobility/examples/radio/radio.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/radio/radio.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/radio/radio.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/radio/radio.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -52,7 +51,7 @@
 class QSlider;
 QT_END_NAMESPACE
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class Radio : public QMainWindow
 {

--- a/qtmobility/examples/samplephonebook/contacteditor.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/samplephonebook/contacteditor.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -43,6 +42,8 @@
 
 #include <QtGui>
 
+const int MAX_AVATAR_DISPLAY_SIZE = 120;
+
 ContactEditor::ContactEditor(QWidget *parent)
         :QWidget(parent)
 {
@@ -53,17 +54,21 @@
     m_phoneEdit = new QLineEdit(this);
     m_emailEdit = new QLineEdit(this);
     m_addrEdit = new QLineEdit(this);
-    m_avatarBtn = new QPushButton(tr("Add image"), this);
-    m_avatarBtn->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    m_avatarBtn = new QPushButton(tr("Set picture"), this);
+    m_clearAvatarBtn = new QPushButton(tr("Clear"), this);
+    m_avatarView = new QLabel(this);
     connect(m_avatarBtn, SIGNAL(clicked()), this, SLOT(avatarClicked()));
-
+    connect(m_clearAvatarBtn, SIGNAL(clicked()), this, SLOT(clearAvatarClicked()));
 
     QFormLayout *detailsLayout = new QFormLayout;
     QLabel *nameLabel = new QLabel(tr("Name"), this);
     QLabel *phoneLabel = new QLabel(tr("Phone"), this);
     QLabel *emailLabel = new QLabel(tr("Email"), this);
     QLabel *addressLabel = new QLabel(tr("Address"), this);
-    QLabel *avatarLabel = new QLabel(tr("Avatar"), this);
+    QLabel *avatarLabel = new QLabel(tr("Picture"), this);
+    QHBoxLayout *avatarBtnLayout = new QHBoxLayout;
+    avatarBtnLayout->addWidget(m_avatarBtn);
+    avatarBtnLayout->addWidget(m_clearAvatarBtn);
     if (QApplication::desktop()->availableGeometry().width() < 360) {
         // Narrow screen: put label on separate line to textbox
         detailsLayout->addRow(nameLabel);
@@ -75,14 +80,16 @@
         detailsLayout->addRow(addressLabel);
         detailsLayout->addRow(m_addrEdit);
         detailsLayout->addRow(avatarLabel);
-        detailsLayout->addRow(m_avatarBtn);
+        detailsLayout->addRow(avatarBtnLayout);
+        detailsLayout->addRow(m_avatarView);
     } else {
         // Wide screen: put label on same line as textbox
         detailsLayout->addRow(nameLabel, m_nameEdit);
         detailsLayout->addRow(phoneLabel, m_phoneEdit);
         detailsLayout->addRow(emailLabel, m_emailEdit);
         detailsLayout->addRow(addressLabel, m_addrEdit);
-        detailsLayout->addRow(avatarLabel, m_avatarBtn);
+        detailsLayout->addRow(avatarLabel, avatarBtnLayout);
+        detailsLayout->addRow("", m_avatarView);
     }
     detailsLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
     detailsLayout->setSizeConstraint(QLayout::SetMinAndMaxSize);
@@ -136,8 +143,6 @@
     m_phoneEdit->clear();
     m_emailEdit->clear();
     m_addrEdit->clear();
-    m_avatarBtn->setText("Add image");
-    m_avatarBtn->setIcon(QIcon());
 
     if (manager == 0) {
         m_saveBtn->setEnabled(false);
@@ -158,7 +163,7 @@
     // name
     //QContactName nm = curr.detail(QContactName::DefinitionName);
     if (m_contactId != QContactLocalId(0))
-        m_nameEdit->setText(manager->synthesizedDisplayLabel(curr));
+        m_nameEdit->setText(manager->synthesizedContactDisplayLabel(curr));
 
     // phonenumber
     QContactPhoneNumber phn = curr.detail(QContactPhoneNumber::DefinitionName);
@@ -184,29 +189,29 @@
         m_addrEdit->setReadOnly(true);
     }
 
-    // avatar button
-    if (defs.contains(QContactAvatar::DefinitionName)) {
+    // avatar viewer
+    if (defs.contains(QContactAvatar::DefinitionName)
+        && defs.contains(QContactThumbnail::DefinitionName)) {
+        m_avatarBtn->setEnabled(true);
         QContactAvatar av = curr.detail(QContactAvatar::DefinitionName);
         QContactThumbnail thumb = curr.detail(QContactThumbnail::DefinitionName);
-        m_avatarBtn->setText(QString());
-        m_avatarBtn->setIcon(QIcon());
-        if (thumb.thumbnail().isNull()) {
-            if (av.imageUrl().isEmpty()) {
-                m_avatarBtn->setText("Add image");
+        m_avatarView->clear();
+        m_newAvatarPath = av.imageUrl().toLocalFile();
+        m_thumbnail = thumb.thumbnail();
+        if (m_thumbnail.isNull()) {
+            if (m_newAvatarPath.isEmpty()) {
+                m_avatarView->clear();
+                m_clearAvatarBtn->setDisabled(true);
             } else {
-                m_avatarBtn->setIcon(QIcon(QPixmap(av.imageUrl().toLocalFile())));
+                setAvatarPixmap(QPixmap(av.imageUrl().toLocalFile()));
                 m_thumbnail = QImage(av.imageUrl().toLocalFile());
             }
         } else {
-            m_newAvatarPath = av.imageUrl().toLocalFile();
-            m_thumbnail = thumb.thumbnail();
-            m_avatarBtn->setIcon(QIcon(QPixmap::fromImage(thumb.thumbnail())));
+            setAvatarPixmap(QPixmap::fromImage(m_thumbnail));
         }
-        m_avatarBtn->setDisabled(false);
     } else {
-        m_avatarBtn->setIcon(QIcon());
-        m_avatarBtn->setText("<not supported>");
         m_avatarBtn->setDisabled(true);
+        m_clearAvatarBtn->setDisabled(true);
     }
 }
 
@@ -227,17 +232,36 @@
     }
 }
 
+void ContactEditor::setAvatarPixmap(const QPixmap &pixmap)
+{
+    if (pixmap.isNull())
+        return;
+    QPixmap scaled = pixmap.scaled(QSize(MAX_AVATAR_DISPLAY_SIZE, MAX_AVATAR_DISPLAY_SIZE),
+                                   Qt::KeepAspectRatio,
+                                   Qt::SmoothTransformation);
+    m_avatarView->setPixmap(scaled);
+    m_avatarView->setMaximumSize(scaled.size());
+    m_clearAvatarBtn->setEnabled(true);
+}
+
+void ContactEditor::clearAvatarClicked()
+{
+    m_avatarView->clear();
+    m_thumbnail = QImage();
+    m_newAvatarPath.clear();
+    m_clearAvatarBtn->setDisabled(true);
+}
+
 void ContactEditor::avatarClicked()
 {
     // put up a file dialog, and update the new avatar path.
     QString fileName = QFileDialog::getOpenFileName(this,
-       tr("Select Avatar Image"), ".", tr("Image Files (*.png *.jpg *.bmp)"));
+       tr("Select Contact Picture"), ".", tr("Image Files (*.png *.jpg *.bmp)"));
 
     if (!fileName.isEmpty()) {
         m_newAvatarPath = fileName;
         m_thumbnail = QImage(m_newAvatarPath);
-        m_avatarBtn->setText(QString());
-        m_avatarBtn->setIcon(QIcon(m_newAvatarPath));
+        setAvatarPixmap(QPixmap::fromImage(m_thumbnail));
     }
 }
 
@@ -255,7 +279,7 @@
             return;
         }
 
-        if (m_nameEdit->text() != m_manager->synthesizedDisplayLabel(curr)) {
+        if (m_nameEdit->text() != m_manager->synthesizedContactDisplayLabel(curr)) {
             // if the name has changed (ie, is different to the synthed label) then save it as a custom label.
             QString saveNameField = nameField();
             if (!saveNameField.isEmpty()) {

--- a/qtmobility/examples/samplephonebook/contacteditor.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/samplephonebook/contacteditor.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -52,6 +51,7 @@
 class QScrollArea;
 class QPushButton;
 class QLineEdit;
+class QLabel;
 QT_END_NAMESPACE
 
 QTM_USE_NAMESPACE
@@ -74,9 +74,11 @@
     void saveClicked();
     void cancelClicked();
     void avatarClicked();
+    void clearAvatarClicked();
 
 private:
     QString nameField();
+    void setAvatarPixmap(const QPixmap& pixmap);
 
 #ifdef Q_OS_SYMBIAN
     QAction* m_saveBtn;
@@ -91,6 +93,8 @@
     QLineEdit *m_emailEdit;
     QLineEdit *m_addrEdit;
     QPushButton *m_avatarBtn;
+    QPushButton *m_clearAvatarBtn;
+    QLabel *m_avatarView;
 
     // data
     QContactManager *m_manager;

--- a/qtmobility/examples/samplephonebook/contactlistpage.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/samplephonebook/contactlistpage.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -124,22 +123,13 @@
 
     // Add items to the menu
     if (m_mainWindow) {
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_OS_WINCE)
+        // These platforms need their menu items added directly to the menu bar.
         QMenuBar *optionsMenu = m_mainWindow->menuBar();
 #else
         QMenu *optionsMenu = new QMenu(tr("&Contacts"), this);
         m_mainWindow->menuBar()->addMenu(optionsMenu);
 #endif
-        QAction* addAction = new QAction(tr("&Add Contact..."), this);
-        connect(addAction, SIGNAL(triggered()), this, SLOT(addClicked()));
-        optionsMenu->addAction(addAction);
-        QAction* editAction = new QAction(tr("&Edit Contact..."), this);
-        connect(editAction, SIGNAL(triggered()), this, SLOT(editClicked()));
-        optionsMenu->addAction(editAction);
-        QAction* deleteAction = new QAction(tr("&Delete Contact"), this);
-        connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteClicked()));
-        optionsMenu->addAction(deleteAction);
-        optionsMenu->addSeparator();
         QAction* filterAction = new QAction(tr("Apply &Filter..."), this);
         connect(filterAction, SIGNAL(triggered()), this, SLOT(filterClicked()));
         optionsMenu->addAction(filterAction);
@@ -157,9 +147,12 @@
         optionsMenu->addAction(exportAction);
         optionsMenu->addSeparator();
 #endif
+#if !(defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
+        // Maemo applications don't have an Exit button in the menu.
         QAction* exitAction = new QAction(tr("E&xit"), this);
         connect(exitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
         optionsMenu->addAction(exitAction);
+#endif
     }
 
     // force update to backend.
@@ -210,16 +203,14 @@
 
     m_filterActiveLabel->setVisible(m_currentFilter != QContactFilter());
 
-    QContact currContact;
     m_contactsList->clear();
     m_idToListIndex.clear();
-    QList<QContactLocalId> contactIds = m_manager->contactIds(m_currentFilter);
-    foreach (const QContactLocalId& id, contactIds) {
+    m_contacts = m_manager->contacts(m_currentFilter);
+    foreach (QContact contact, m_contacts) {
         QListWidgetItem *currItem = new QListWidgetItem;
-        currContact = m_manager->contact(id);
-        currItem->setData(Qt::DisplayRole, currContact.displayLabel());
-        currItem->setData(Qt::UserRole, currContact.localId()); // also store the id of the contact.
-        m_idToListIndex.insert(currContact.localId(), m_contactsList->count());
+        currItem->setData(Qt::DisplayRole, contact.displayLabel());
+        currItem->setData(Qt::UserRole, contact.localId()); // also store the id of the contact.
+        m_idToListIndex.insert(contact.localId(), m_contactsList->count());
         m_contactsList->addItem(currItem);
     }
 }
@@ -283,6 +274,11 @@
             if (importer.importDocuments(reader.results())) {
                 QList<QContact> contacts = importer.contacts();
                 QMap<int, QContactManager::Error> errorMap;
+                QList<QContact>::iterator it = contacts.begin();
+                while (it != contacts.end()) {
+                    *it = m_manager->compatibleContact(*it);
+                    it++;
+                }
                 m_manager->saveContacts(&contacts, &errorMap);
                 rebuildList(m_currentFilter);
             }
@@ -295,10 +291,9 @@
 {
 #ifdef BUILD_VERSIT
     if (!m_manager) {
-        qWarning() << "No manager selected; cannot import";
+        qWarning() << "No manager selected; cannot export";
         return;
     }
-    QList<QContact> contacts = m_manager->contacts(QList<QContactSortOrder>(), QContactFetchHint());
     QString fileName = QFileDialog::getSaveFileName(this, tr("Save vCard"),
                                                     "./contacts.vcf",
                                                     tr("vCards (*.vcf)"));
@@ -306,7 +301,7 @@
     file.open(QIODevice::WriteOnly);
     if (file.isWritable()) {
         QVersitContactExporter exporter;
-        if(exporter.exportContacts(contacts, QVersitDocument::VCard30Type)) {
+        if(exporter.exportContacts(m_contacts, QVersitDocument::VCard30Type)) {
             QList<QVersitDocument> documents = exporter.documents();
             QVersitWriter writer;
             writer.setDevice(&file);

--- a/qtmobility/examples/samplephonebook/contactlistpage.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/samplephonebook/contactlistpage.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -98,7 +97,7 @@
     QContactManager *m_manager;
     QMap<QContactLocalId, int> m_idToListIndex;
     QMap<QString, QContactManager*> m_initialisedManagers;
-
+    QList<QContact> m_contacts;
     QContactFilter m_currentFilter;
     QMap<QString, QString> m_availableManagers;
 };

--- a/qtmobility/examples/samplephonebook/filterpage.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/samplephonebook/filterpage.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/samplephonebook/filterpage.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/samplephonebook/filterpage.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/samplephonebook/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/samplephonebook/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/samplephonebook/phonebook.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/samplephonebook/phonebook.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -89,7 +88,7 @@
 
 void PhoneBook::activateList(const QContactFilter& filter)
 {
-#if !(defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
+#if !(defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5))
     menuBar()->setVisible(true);
 #endif
     m_currentFilter = filter;
@@ -98,7 +97,7 @@
 
 void PhoneBook::activateList()
 {
-#if !(defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
+#if !(defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5))
     menuBar()->setVisible(true);
 #endif
     m_listPage->rebuildList(m_currentFilter);

--- a/qtmobility/examples/samplephonebook/phonebook.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/samplephonebook/phonebook.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/satellitedialog/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/satellitedialog/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/satellitedialog/satellitedialog.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/satellitedialog/satellitedialog.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/satellitedialog/satellitedialog.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/satellitedialog/satellitedialog.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/accel/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/accel/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/cubehouse/camera.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/cubehouse/camera.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** This file is part of the Qt3D module 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/cubehouse/camera.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/cubehouse/camera.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** This file is part of the Qt3D module 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/cubehouse/cube.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/cubehouse/cube.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** This file is part of the Qt3D module 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/cubehouse/light.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/cubehouse/light.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** This file is part of the Qt3D module 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/cubehouse/light.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/cubehouse/light.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** This file is part of the Qt3D module 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/cubehouse/lightmodel.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/cubehouse/lightmodel.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** This file is part of the Qt3D module 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/cubehouse/lightmodel.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/cubehouse/lightmodel.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** This file is part of the Qt3D module 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/cubehouse/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/cubehouse/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** This file is part of the Qt3D module 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/cubehouse/material.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/cubehouse/material.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** This file is part of the Qt3D module 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/cubehouse/material.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/cubehouse/material.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** This file is part of the Qt3D module 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/cubehouse/painter.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/cubehouse/painter.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** This file is part of the Qt3D module 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/cubehouse/painter.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/cubehouse/painter.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** This file is part of the Qt3D module 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/cubehouse/painter_fixed.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/cubehouse/painter_fixed.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** This file is part of the Qt3D module 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/cubehouse/painter_shader.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/cubehouse/painter_shader.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** This file is part of the Qt3D module 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/cubehouse/teapot.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/cubehouse/teapot.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** This file is part of the Qt3D module 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -47,3494 +46,3494 @@
 #define teapotTriangleCount 4032
 
 static float const teapotVertexData[] = {
-    0.700000, 0.450000, -0.000000, -0.902860, -0.429934, 0.000000, 0.000000, 0.000000,
-    0.000000, 0.450000, 0.700000, -0.000000, -0.429934, -0.902860, 1.000000, 0.000000,
-    0.750000, 0.450000, -0.000000, 0.902860, 0.429934, -0.000000, 0.000000, 1.000000,
-    0.000000, 0.450000, 0.750000, 0.000000, 0.429934, 0.902860, 1.000000, 1.000000,
-    0.497000, 0.450000, 0.497000, -0.639602, -0.426402, -0.639602, 0.500000, 0.000000,
-    0.701563, 0.499219, -0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.500000,
-    0.498109, 0.499219, 0.498109, 0.000000, 1.000000, -0.000000, 0.500000, 0.500000,
-    0.000000, 0.499219, 0.701563, 0.000000, 1.000000, -0.000000, 1.000000, 0.500000,
-    0.532500, 0.450000, 0.532500, 0.639602, 0.426402, 0.639602, 0.500000, 1.000000,
-    0.645750, 0.450000, 0.274750, -0.833528, -0.429664, -0.347303, 0.250000, 0.000000,
-    0.690234, 0.486914, -0.000000, -0.995495, 0.094810, 0.000000, 0.000000, 0.250000,
-    0.636741, 0.486914, 0.270917, -0.918925, 0.094737, -0.382885, 0.250000, 0.250000,
-    0.490066, 0.486914, 0.490066, -0.703896, 0.095194, -0.703896, 0.500000, 0.250000,
-    0.647191, 0.499219, 0.275363, 0.000000, 1.000000, -0.000000, 0.250000, 0.500000,
-    0.686000, 0.450000, 0.142625, -0.885319, -0.429953, -0.177064, 0.125000, 0.000000,
-    0.691895, 0.471533, -0.000000, -0.969231, -0.246154, 0.000000, 0.000000, 0.125000,
-    0.678057, 0.471533, 0.140974, -0.950406, -0.246166, -0.190081, 0.125000, 0.125000,
-    0.638273, 0.471533, 0.271569, -0.894539, -0.246731, -0.372725, 0.250000, 0.125000,
-    0.676430, 0.486914, 0.140635, -0.976163, 0.094813, -0.195233, 0.125000, 0.250000,
-    0.581875, 0.450000, 0.393750, -0.749476, -0.430917, -0.502590, 0.375000, 0.000000,
-    0.638273, 0.471533, 0.271569, -0.894539, -0.246731, -0.372725, 0.250000, 0.125000,
-    0.575137, 0.471533, 0.389191, -0.804852, -0.246803, -0.539724, 0.375000, 0.125000,
-    0.491245, 0.471533, 0.491245, -0.685179, -0.247099, -0.685180, 0.500000, 0.125000,
-    0.573757, 0.486914, 0.388257, -0.826782, 0.095071, -0.554430, 0.375000, 0.250000,
-    0.676430, 0.486914, 0.140635, -0.976163, 0.094813, -0.195233, 0.125000, 0.250000,
-    0.693848, 0.496143, -0.000000, -0.724137, 0.689656, 0.000000, 0.000000, 0.375000,
-    0.679971, 0.496143, 0.141371, -0.710057, 0.689675, -0.142011, 0.125000, 0.375000,
-    0.640074, 0.496143, 0.272335, -0.667641, 0.690558, -0.278184, 0.250000, 0.375000,
-    0.687531, 0.499219, 0.142943, 0.000000, 1.000000, -0.000000, 0.125000, 0.500000,
-    0.573757, 0.486914, 0.388257, -0.826782, 0.095071, -0.554430, 0.375000, 0.250000,
-    0.640074, 0.496143, 0.272335, -0.667641, 0.690558, -0.278184, 0.250000, 0.375000,
-    0.576761, 0.496143, 0.390289, -0.600626, 0.690668, -0.402773, 0.375000, 0.375000,
-    0.492632, 0.496143, 0.492632, -0.511047, 0.691132, -0.511046, 0.500000, 0.375000,
-    0.583174, 0.499219, 0.394629, 0.000000, 1.000000, -0.000000, 0.375000, 0.500000,
-    0.274750, 0.450000, 0.645750, -0.347353, -0.429394, -0.833647, 0.750000, 0.000000,
-    0.490066, 0.486914, 0.490066, -0.703896, 0.095194, -0.703896, 0.500000, 0.250000,
-    0.270917, 0.486914, 0.636741, -0.382888, 0.094664, -0.918932, 0.750000, 0.250000,
-    0.000000, 0.486914, 0.690234, 0.000000, 0.094810, -0.995495, 1.000000, 0.250000,
-    0.275363, 0.499219, 0.647191, 0.000000, 1.000000, -0.000000, 0.750000, 0.500000,
-    0.393750, 0.450000, 0.581875, -0.502594, -0.430900, -0.749483, 0.625000, 0.000000,
-    0.491245, 0.471533, 0.491245, -0.685180, -0.247099, -0.685179, 0.500000, 0.125000,
-    0.389191, 0.471533, 0.575137, -0.539726, -0.246792, -0.804854, 0.625000, 0.125000,
-    0.271569, 0.471533, 0.638273, -0.372725, -0.246731, -0.894539, 0.750000, 0.125000,
-    0.388257, 0.486914, 0.573757, -0.554431, 0.095066, -0.826782, 0.625000, 0.250000,
-    0.142625, 0.450000, 0.686000, -0.177068, -0.429904, -0.885342, 0.875000, 0.000000,
-    0.271569, 0.471533, 0.638273, -0.372725, -0.246731, -0.894539, 0.750000, 0.125000,
-    0.140974, 0.471533, 0.678057, -0.190083, -0.246134, -0.950414, 0.875000, 0.125000,
-    0.000000, 0.471533, 0.691895, -0.000000, -0.246154, -0.969231, 1.000000, 0.125000,
-    0.140635, 0.486914, 0.676430, -0.195233, 0.094801, -0.976164, 0.875000, 0.250000,
-    0.388257, 0.486914, 0.573757, -0.554431, 0.095066, -0.826782, 0.625000, 0.250000,
-    0.492632, 0.496143, 0.492632, -0.511046, 0.691132, -0.511047, 0.500000, 0.375000,
-    0.390289, 0.496143, 0.576761, -0.402782, 0.690651, -0.600640, 0.625000, 0.375000,
-    0.272335, 0.496143, 0.640074, -0.278184, 0.690558, -0.667641, 0.750000, 0.375000,
-    0.394629, 0.499219, 0.583174, 0.000000, 1.000000, -0.000000, 0.625000, 0.500000,
-    0.140635, 0.486914, 0.676430, -0.195233, 0.094801, -0.976164, 0.875000, 0.250000,
-    0.272335, 0.496143, 0.640074, -0.278184, 0.690558, -0.667641, 0.750000, 0.375000,
-    0.141371, 0.496143, 0.679971, -0.142021, 0.689625, -0.710104, 0.875000, 0.375000,
-    0.000000, 0.496143, 0.693848, 0.000000, 0.689656, -0.724137, 1.000000, 0.375000,
-    0.142943, 0.499219, 0.687531, 0.000000, 1.000000, -0.000000, 0.875000, 0.500000,
-    0.647191, 0.499219, 0.275363, 0.000000, 1.000000, -0.000000, 0.250000, 0.500000,
-    0.724609, 0.486914, -0.000000, 0.690476, 0.723356, -0.000000, 0.000000, 0.750000,
-    0.668452, 0.486914, 0.284409, 0.637619, 0.723090, 0.265674, 0.250000, 0.750000,
-    0.514473, 0.486914, 0.514473, 0.487196, 0.724762, 0.487196, 0.500000, 0.750000,
-    0.691875, 0.450000, 0.294375, 0.833528, 0.429664, 0.347303, 0.250000, 1.000000,
-    0.687531, 0.499219, 0.142943, 0.000000, 1.000000, -0.000000, 0.125000, 0.500000,
-    0.712207, 0.496143, -0.000000, 0.464835, 0.885397, -0.000000, 0.000000, 0.625000,
-    0.697963, 0.496143, 0.145112, 0.455789, 0.885407, 0.091158, 0.125000, 0.625000,
-    0.657011, 0.496143, 0.279541, 0.428239, 0.885874, 0.178433, 0.250000, 0.625000,
-    0.710117, 0.486914, 0.147639, 0.677049, 0.723373, 0.135410, 0.125000, 0.750000,
-    0.583174, 0.499219, 0.394629, 0.000000, 1.000000, -0.000000, 0.375000, 0.500000,
-    0.657011, 0.496143, 0.279541, 0.428239, 0.885874, 0.178433, 0.250000, 0.625000,
-    0.592022, 0.496143, 0.400616, 0.385216, 0.885934, 0.258322, 0.375000, 0.625000,
-    0.505667, 0.496143, 0.505667, 0.327637, 0.886176, 0.327636, 0.500000, 0.625000,
-    0.602332, 0.486914, 0.407593, 0.572629, 0.724322, 0.383998, 0.375000, 0.750000,
-    0.710117, 0.486914, 0.147639, 0.677049, 0.723373, 0.135410, 0.125000, 0.750000,
-    0.737598, 0.471533, -0.000000, 0.819842, 0.572589, -0.000000, 0.000000, 0.875000,
-    0.722846, 0.471533, 0.150286, 0.803908, 0.572609, 0.160782, 0.125000, 0.875000,
-    0.680434, 0.471533, 0.289507, 0.756157, 0.573550, 0.315066, 0.250000, 0.875000,
-    0.735000, 0.450000, 0.152812, 0.885319, 0.429952, 0.177064, 0.125000, 1.000000,
-    0.602332, 0.486914, 0.407593, 0.572628, 0.724322, 0.383998, 0.375000, 0.750000,
-    0.680434, 0.471533, 0.289507, 0.756158, 0.573550, 0.315065, 0.250000, 0.875000,
-    0.613128, 0.471533, 0.414899, 0.680288, 0.573668, 0.456193, 0.375000, 0.875000,
-    0.523694, 0.471533, 0.523694, 0.578938, 0.574162, 0.578938, 0.500000, 0.875000,
-    0.623438, 0.450000, 0.421875, 0.749476, 0.430918, 0.502589, 0.375000, 1.000000,
-    0.275363, 0.499219, 0.647191, 0.000000, 1.000000, -0.000000, 0.750000, 0.500000,
-    0.514473, 0.486914, 0.514473, 0.487196, 0.724762, 0.487196, 0.500000, 0.750000,
-    0.284409, 0.486914, 0.668452, 0.265781, 0.722825, 0.637875, 0.750000, 0.750000,
-    0.000000, 0.486914, 0.724609, 0.000000, 0.723356, 0.690476, 1.000000, 0.750000,
-    0.294375, 0.450000, 0.691875, 0.347353, 0.429394, 0.833647, 0.750000, 1.000000,
-    0.394629, 0.499219, 0.583174, 0.000000, 1.000000, -0.000000, 0.625000, 0.500000,
-    0.505667, 0.496143, 0.505667, 0.327636, 0.886176, 0.327637, 0.500000, 0.625000,
-    0.400616, 0.496143, 0.592022, 0.258332, 0.885924, 0.385231, 0.625000, 0.625000,
-    0.279541, 0.496143, 0.657011, 0.178433, 0.885874, 0.428239, 0.750000, 0.625000,
-    0.407593, 0.486914, 0.602332, 0.384008, 0.724305, 0.572644, 0.625000, 0.750000,
-    0.142943, 0.499219, 0.687531, 0.000000, 1.000000, -0.000000, 0.875000, 0.500000,
-    0.279541, 0.496143, 0.657011, 0.178433, 0.885874, 0.428239, 0.750000, 0.625000,
-    0.145112, 0.496143, 0.697963, 0.091168, 0.885381, 0.455839, 0.875000, 0.625000,
-    0.000000, 0.496143, 0.712207, 0.000000, 0.885397, 0.464835, 1.000000, 0.625000,
-    0.147639, 0.486914, 0.710117, 0.135420, 0.723325, 0.677099, 0.875000, 0.750000,
-    0.407593, 0.486914, 0.602332, 0.384008, 0.724305, 0.572643, 0.625000, 0.750000,
-    0.523694, 0.471533, 0.523694, 0.578938, 0.574162, 0.578938, 0.500000, 0.875000,
-    0.414899, 0.471533, 0.613128, 0.456201, 0.573650, 0.680299, 0.625000, 0.875000,
-    0.289507, 0.471533, 0.680434, 0.315065, 0.573550, 0.756158, 0.750000, 0.875000,
-    0.421875, 0.450000, 0.623438, 0.502594, 0.430901, 0.749482, 0.625000, 1.000000,
-    0.147639, 0.486914, 0.710117, 0.135420, 0.723325, 0.677099, 0.875000, 0.750000,
-    0.289507, 0.471533, 0.680434, 0.315066, 0.573550, 0.756157, 0.750000, 0.875000,
-    0.150286, 0.471533, 0.722846, 0.160789, 0.572555, 0.803945, 0.875000, 0.875000,
-    0.000000, 0.471533, 0.737598, 0.000000, 0.572589, 0.819842, 1.000000, 0.875000,
-    0.152812, 0.450000, 0.735000, 0.177068, 0.429904, 0.885342, 0.875000, 1.000000,
-    0.000000, 0.450000, 0.700000, -0.000000, -0.429934, -0.902860, 0.000000, 0.000000,
-    -0.700000, 0.450000, -0.000000, 0.902860, -0.429934, 0.000000, 1.000000, 0.000000,
-    0.000000, 0.450000, 0.750000, 0.000000, 0.429934, 0.902860, 0.000000, 1.000000,
-    -0.750000, 0.450000, -0.000000, -0.902860, 0.429934, 0.000000, 1.000000, 1.000000,
-    -0.497000, 0.450000, 0.497000, 0.639602, -0.426402, -0.639602, 0.500000, 0.000000,
-    0.000000, 0.499219, 0.701563, 0.000000, 1.000000, -0.000000, 0.000000, 0.500000,
-    -0.498109, 0.499219, 0.498109, 0.000000, 1.000000, 0.000000, 0.500000, 0.500000,
-    -0.701563, 0.499219, -0.000000, 0.000000, 1.000000, 0.000000, 1.000000, 0.500000,
-    -0.532500, 0.450000, 0.532500, -0.639602, 0.426402, 0.639602, 0.500000, 1.000000,
-    -0.274750, 0.450000, 0.645750, 0.347303, -0.429664, -0.833528, 0.250000, 0.000000,
-    0.000000, 0.486914, 0.690234, 0.000000, 0.094810, -0.995495, 0.000000, 0.250000,
-    -0.270917, 0.486914, 0.636741, 0.382885, 0.094737, -0.918925, 0.250000, 0.250000,
-    -0.490066, 0.486914, 0.490066, 0.703896, 0.095194, -0.703896, 0.500000, 0.250000,
-    -0.275363, 0.499219, 0.647191, 0.000000, 1.000000, 0.000000, 0.250000, 0.500000,
-    -0.142625, 0.450000, 0.686000, 0.177064, -0.429953, -0.885319, 0.125000, 0.000000,
-    0.000000, 0.471533, 0.691895, -0.000000, -0.246154, -0.969231, 0.000000, 0.125000,
-    -0.140974, 0.471533, 0.678057, 0.190081, -0.246166, -0.950406, 0.125000, 0.125000,
-    -0.271569, 0.471533, 0.638273, 0.372725, -0.246731, -0.894539, 0.250000, 0.125000,
-    -0.140635, 0.486914, 0.676430, 0.195233, 0.094813, -0.976163, 0.125000, 0.250000,
-    -0.393750, 0.450000, 0.581875, 0.502590, -0.430917, -0.749476, 0.375000, 0.000000,
-    -0.271569, 0.471533, 0.638273, 0.372725, -0.246731, -0.894539, 0.250000, 0.125000,
-    -0.389191, 0.471533, 0.575137, 0.539724, -0.246803, -0.804852, 0.375000, 0.125000,
-    -0.491245, 0.471533, 0.491245, 0.685180, -0.247099, -0.685179, 0.500000, 0.125000,
-    -0.388257, 0.486914, 0.573757, 0.554430, 0.095071, -0.826782, 0.375000, 0.250000,
-    -0.140635, 0.486914, 0.676430, 0.195233, 0.094813, -0.976163, 0.125000, 0.250000,
-    0.000000, 0.496143, 0.693848, 0.000000, 0.689656, -0.724137, 0.000000, 0.375000,
-    -0.141371, 0.496143, 0.679971, 0.142011, 0.689675, -0.710057, 0.125000, 0.375000,
-    -0.272335, 0.496143, 0.640074, 0.278184, 0.690558, -0.667641, 0.250000, 0.375000,
-    -0.142943, 0.499219, 0.687531, 0.000000, 1.000000, 0.000000, 0.125000, 0.500000,
-    -0.388257, 0.486914, 0.573757, 0.554430, 0.095071, -0.826782, 0.375000, 0.250000,
-    -0.272335, 0.496143, 0.640074, 0.278184, 0.690558, -0.667641, 0.250000, 0.375000,
-    -0.390289, 0.496143, 0.576761, 0.402773, 0.690668, -0.600626, 0.375000, 0.375000,
-    -0.492632, 0.496143, 0.492632, 0.511046, 0.691132, -0.511047, 0.500000, 0.375000,
-    -0.394629, 0.499219, 0.583174, 0.000000, 1.000000, 0.000000, 0.375000, 0.500000,
-    -0.645750, 0.450000, 0.274750, 0.833647, -0.429394, -0.347353, 0.750000, 0.000000,
-    -0.490066, 0.486914, 0.490066, 0.703896, 0.095194, -0.703896, 0.500000, 0.250000,
-    -0.636741, 0.486914, 0.270917, 0.918932, 0.094664, -0.382888, 0.750000, 0.250000,
-    -0.690234, 0.486914, -0.000000, 0.995495, 0.094810, 0.000000, 1.000000, 0.250000,
-    -0.647191, 0.499219, 0.275363, 0.000000, 1.000000, 0.000000, 0.750000, 0.500000,
-    -0.581875, 0.450000, 0.393750, 0.749483, -0.430900, -0.502594, 0.625000, 0.000000,
-    -0.491245, 0.471533, 0.491245, 0.685179, -0.247099, -0.685180, 0.500000, 0.125000,
-    -0.575137, 0.471533, 0.389191, 0.804854, -0.246792, -0.539726, 0.625000, 0.125000,
-    -0.638273, 0.471533, 0.271569, 0.894539, -0.246731, -0.372725, 0.750000, 0.125000,
-    -0.573757, 0.486914, 0.388257, 0.826782, 0.095066, -0.554431, 0.625000, 0.250000,
-    -0.686000, 0.450000, 0.142625, 0.885342, -0.429904, -0.177068, 0.875000, 0.000000,
-    -0.638273, 0.471533, 0.271569, 0.894539, -0.246731, -0.372725, 0.750000, 0.125000,
-    -0.678057, 0.471533, 0.140974, 0.950414, -0.246134, -0.190083, 0.875000, 0.125000,
-    -0.691895, 0.471533, -0.000000, 0.969231, -0.246154, 0.000000, 1.000000, 0.125000,
-    -0.676430, 0.486914, 0.140635, 0.976164, 0.094801, -0.195233, 0.875000, 0.250000,
-    -0.573757, 0.486914, 0.388257, 0.826782, 0.095066, -0.554431, 0.625000, 0.250000,
-    -0.492632, 0.496143, 0.492632, 0.511047, 0.691132, -0.511046, 0.500000, 0.375000,
-    -0.576761, 0.496143, 0.390289, 0.600640, 0.690651, -0.402782, 0.625000, 0.375000,
-    -0.640074, 0.496143, 0.272335, 0.667641, 0.690558, -0.278184, 0.750000, 0.375000,
-    -0.583174, 0.499219, 0.394629, 0.000000, 1.000000, 0.000000, 0.625000, 0.500000,
-    -0.676430, 0.486914, 0.140635, 0.976164, 0.094801, -0.195233, 0.875000, 0.250000,
-    -0.640074, 0.496143, 0.272335, 0.667641, 0.690558, -0.278184, 0.750000, 0.375000,
-    -0.679971, 0.496143, 0.141371, 0.710104, 0.689625, -0.142021, 0.875000, 0.375000,
-    -0.693848, 0.496143, -0.000000, 0.724137, 0.689656, 0.000000, 1.000000, 0.375000,
-    -0.687531, 0.499219, 0.142943, 0.000000, 1.000000, 0.000000, 0.875000, 0.500000,
-    -0.275363, 0.499219, 0.647191, 0.000000, 1.000000, 0.000000, 0.250000, 0.500000,
-    0.000000, 0.486914, 0.724609, 0.000000, 0.723356, 0.690476, 0.000000, 0.750000,
-    -0.284409, 0.486914, 0.668452, -0.265674, 0.723090, 0.637619, 0.250000, 0.750000,
-    -0.514473, 0.486914, 0.514473, -0.487196, 0.724762, 0.487196, 0.500000, 0.750000,
-    -0.294375, 0.450000, 0.691875, -0.347303, 0.429664, 0.833528, 0.250000, 1.000000,
-    -0.142943, 0.499219, 0.687531, 0.000000, 1.000000, 0.000000, 0.125000, 0.500000,
-    0.000000, 0.496143, 0.712207, 0.000000, 0.885397, 0.464835, 0.000000, 0.625000,
-    -0.145112, 0.496143, 0.697963, -0.091158, 0.885407, 0.455789, 0.125000, 0.625000,
-    -0.279541, 0.496143, 0.657011, -0.178433, 0.885874, 0.428239, 0.250000, 0.625000,
-    -0.147639, 0.486914, 0.710117, -0.135410, 0.723373, 0.677049, 0.125000, 0.750000,
-    -0.394629, 0.499219, 0.583174, 0.000000, 1.000000, 0.000000, 0.375000, 0.500000,
-    -0.279541, 0.496143, 0.657011, -0.178433, 0.885874, 0.428239, 0.250000, 0.625000,
-    -0.400616, 0.496143, 0.592022, -0.258322, 0.885934, 0.385216, 0.375000, 0.625000,
-    -0.505667, 0.496143, 0.505667, -0.327636, 0.886176, 0.327637, 0.500000, 0.625000,
-    -0.407593, 0.486914, 0.602332, -0.383998, 0.724322, 0.572629, 0.375000, 0.750000,
-    -0.147639, 0.486914, 0.710117, -0.135410, 0.723373, 0.677049, 0.125000, 0.750000,
-    0.000000, 0.471533, 0.737598, 0.000000, 0.572589, 0.819842, 0.000000, 0.875000,
-    -0.150286, 0.471533, 0.722846, -0.160782, 0.572609, 0.803908, 0.125000, 0.875000,
-    -0.289507, 0.471533, 0.680434, -0.315066, 0.573550, 0.756157, 0.250000, 0.875000,
-    -0.152812, 0.450000, 0.735000, -0.177064, 0.429952, 0.885319, 0.125000, 1.000000,
-    -0.407593, 0.486914, 0.602332, -0.383998, 0.724322, 0.572628, 0.375000, 0.750000,
-    -0.289507, 0.471533, 0.680434, -0.315065, 0.573550, 0.756158, 0.250000, 0.875000,
-    -0.414899, 0.471533, 0.613128, -0.456193, 0.573668, 0.680288, 0.375000, 0.875000,
-    -0.523694, 0.471533, 0.523694, -0.578938, 0.574162, 0.578938, 0.500000, 0.875000,
-    -0.421875, 0.450000, 0.623438, -0.502589, 0.430918, 0.749476, 0.375000, 1.000000,
-    -0.647191, 0.499219, 0.275363, 0.000000, 1.000000, 0.000000, 0.750000, 0.500000,
-    -0.514473, 0.486914, 0.514473, -0.487196, 0.724762, 0.487196, 0.500000, 0.750000,
-    -0.668452, 0.486914, 0.284409, -0.637875, 0.722825, 0.265781, 0.750000, 0.750000,
-    -0.724609, 0.486914, -0.000000, -0.690476, 0.723356, 0.000000, 1.000000, 0.750000,
-    -0.691875, 0.450000, 0.294375, -0.833647, 0.429394, 0.347353, 0.750000, 1.000000,
-    -0.583174, 0.499219, 0.394629, 0.000000, 1.000000, 0.000000, 0.625000, 0.500000,
-    -0.505667, 0.496143, 0.505667, -0.327637, 0.886176, 0.327636, 0.500000, 0.625000,
-    -0.592022, 0.496143, 0.400616, -0.385231, 0.885924, 0.258332, 0.625000, 0.625000,
-    -0.657011, 0.496143, 0.279541, -0.428239, 0.885874, 0.178433, 0.750000, 0.625000,
-    -0.602332, 0.486914, 0.407593, -0.572644, 0.724305, 0.384008, 0.625000, 0.750000,
-    -0.687531, 0.499219, 0.142943, 0.000000, 1.000000, 0.000000, 0.875000, 0.500000,
-    -0.657011, 0.496143, 0.279541, -0.428239, 0.885874, 0.178433, 0.750000, 0.625000,
-    -0.697963, 0.496143, 0.145112, -0.455839, 0.885381, 0.091168, 0.875000, 0.625000,
-    -0.712207, 0.496143, -0.000000, -0.464835, 0.885397, 0.000000, 1.000000, 0.625000,
-    -0.710117, 0.486914, 0.147639, -0.677099, 0.723325, 0.135420, 0.875000, 0.750000,
-    -0.602332, 0.486914, 0.407593, -0.572643, 0.724305, 0.384008, 0.625000, 0.750000,
-    -0.523694, 0.471533, 0.523694, -0.578938, 0.574162, 0.578938, 0.500000, 0.875000,
-    -0.613128, 0.471533, 0.414899, -0.680299, 0.573650, 0.456201, 0.625000, 0.875000,
-    -0.680434, 0.471533, 0.289507, -0.756158, 0.573550, 0.315065, 0.750000, 0.875000,
-    -0.623438, 0.450000, 0.421875, -0.749482, 0.430901, 0.502594, 0.625000, 1.000000,
-    -0.710117, 0.486914, 0.147639, -0.677099, 0.723325, 0.135420, 0.875000, 0.750000,
-    -0.680434, 0.471533, 0.289507, -0.756157, 0.573550, 0.315066, 0.750000, 0.875000,
-    -0.722846, 0.471533, 0.150286, -0.803945, 0.572555, 0.160789, 0.875000, 0.875000,
-    -0.737598, 0.471533, -0.000000, -0.819842, 0.572589, 0.000000, 1.000000, 0.875000,
-    -0.735000, 0.450000, 0.152812, -0.885342, 0.429904, 0.177068, 0.875000, 1.000000,
-    -0.700000, 0.450000, -0.000000, 0.902860, -0.429934, 0.000000, 0.000000, 0.000000,
-    0.000000, 0.450000, -0.700000, 0.000000, -0.429934, 0.902860, 1.000000, 0.000000,
-    -0.750000, 0.450000, -0.000000, -0.902860, 0.429934, 0.000000, 0.000000, 1.000000,
-    0.000000, 0.450000, -0.750000, 0.000000, 0.429934, -0.902860, 1.000000, 1.000000,
-    -0.497000, 0.450000, -0.497000, 0.639602, -0.426402, 0.639602, 0.500000, 0.000000,
-    -0.701563, 0.499219, -0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.500000,
-    -0.498109, 0.499219, -0.498109, 0.000000, 1.000000, 0.000000, 0.500000, 0.500000,
-    0.000000, 0.499219, -0.701563, -0.000000, 1.000000, 0.000000, 1.000000, 0.500000,
-    -0.532500, 0.450000, -0.532500, -0.639602, 0.426402, -0.639602, 0.500000, 1.000000,
-    -0.645750, 0.450000, -0.274750, 0.833528, -0.429664, 0.347303, 0.250000, 0.000000,
-    -0.690234, 0.486914, -0.000000, 0.995495, 0.094810, 0.000000, 0.000000, 0.250000,
-    -0.636741, 0.486914, -0.270917, 0.918925, 0.094737, 0.382885, 0.250000, 0.250000,
-    -0.490066, 0.486914, -0.490066, 0.703896, 0.095194, 0.703896, 0.500000, 0.250000,
-    -0.647191, 0.499219, -0.275363, 0.000000, 1.000000, 0.000000, 0.250000, 0.500000,
-    -0.686000, 0.450000, -0.142625, 0.885319, -0.429953, 0.177064, 0.125000, 0.000000,
-    -0.691895, 0.471533, -0.000000, 0.969231, -0.246154, 0.000000, 0.000000, 0.125000,
-    -0.678057, 0.471533, -0.140974, 0.950406, -0.246166, 0.190081, 0.125000, 0.125000,
-    -0.638273, 0.471533, -0.271569, 0.894539, -0.246731, 0.372725, 0.250000, 0.125000,
-    -0.676430, 0.486914, -0.140635, 0.976163, 0.094813, 0.195233, 0.125000, 0.250000,
-    -0.581875, 0.450000, -0.393750, 0.749476, -0.430917, 0.502590, 0.375000, 0.000000,
-    -0.638273, 0.471533, -0.271569, 0.894539, -0.246731, 0.372725, 0.250000, 0.125000,
-    -0.575137, 0.471533, -0.389191, 0.804852, -0.246803, 0.539724, 0.375000, 0.125000,
-    -0.491245, 0.471533, -0.491245, 0.685179, -0.247099, 0.685180, 0.500000, 0.125000,
-    -0.573757, 0.486914, -0.388257, 0.826782, 0.095071, 0.554430, 0.375000, 0.250000,
-    -0.676430, 0.486914, -0.140635, 0.976163, 0.094813, 0.195233, 0.125000, 0.250000,
-    -0.693848, 0.496143, -0.000000, 0.724137, 0.689656, 0.000000, 0.000000, 0.375000,
-    -0.679971, 0.496143, -0.141371, 0.710057, 0.689675, 0.142011, 0.125000, 0.375000,
-    -0.640074, 0.496143, -0.272335, 0.667641, 0.690558, 0.278184, 0.250000, 0.375000,
-    -0.687531, 0.499219, -0.142943, 0.000000, 1.000000, 0.000000, 0.125000, 0.500000,
-    -0.573757, 0.486914, -0.388257, 0.826782, 0.095071, 0.554430, 0.375000, 0.250000,
-    -0.640074, 0.496143, -0.272335, 0.667641, 0.690558, 0.278184, 0.250000, 0.375000,
-    -0.576761, 0.496143, -0.390289, 0.600626, 0.690668, 0.402773, 0.375000, 0.375000,
-    -0.492632, 0.496143, -0.492632, 0.511047, 0.691132, 0.511046, 0.500000, 0.375000,
-    -0.583174, 0.499219, -0.394629, 0.000000, 1.000000, 0.000000, 0.375000, 0.500000,
-    -0.274750, 0.450000, -0.645750, 0.347353, -0.429394, 0.833647, 0.750000, 0.000000,
-    -0.490066, 0.486914, -0.490066, 0.703896, 0.095194, 0.703896, 0.500000, 0.250000,
-    -0.270917, 0.486914, -0.636741, 0.382888, 0.094664, 0.918932, 0.750000, 0.250000,
-    0.000000, 0.486914, -0.690234, -0.000000, 0.094810, 0.995495, 1.000000, 0.250000,
-    -0.275363, 0.499219, -0.647191, 0.000000, 1.000000, 0.000000, 0.750000, 0.500000,
-    -0.393750, 0.450000, -0.581875, 0.502594, -0.430900, 0.749483, 0.625000, 0.000000,
-    -0.491245, 0.471533, -0.491245, 0.685180, -0.247099, 0.685179, 0.500000, 0.125000,
-    -0.389191, 0.471533, -0.575137, 0.539726, -0.246792, 0.804854, 0.625000, 0.125000,
-    -0.271569, 0.471533, -0.638273, 0.372725, -0.246731, 0.894539, 0.750000, 0.125000,
-    -0.388257, 0.486914, -0.573757, 0.554431, 0.095066, 0.826782, 0.625000, 0.250000,
-    -0.142625, 0.450000, -0.686000, 0.177068, -0.429904, 0.885342, 0.875000, 0.000000,
-    -0.271569, 0.471533, -0.638273, 0.372725, -0.246731, 0.894539, 0.750000, 0.125000,
-    -0.140974, 0.471533, -0.678057, 0.190083, -0.246134, 0.950414, 0.875000, 0.125000,
-    0.000000, 0.471533, -0.691895, 0.000000, -0.246154, 0.969231, 1.000000, 0.125000,
-    -0.140635, 0.486914, -0.676430, 0.195233, 0.094801, 0.976164, 0.875000, 0.250000,
-    -0.388257, 0.486914, -0.573757, 0.554431, 0.095066, 0.826782, 0.625000, 0.250000,
-    -0.492632, 0.496143, -0.492632, 0.511046, 0.691132, 0.511047, 0.500000, 0.375000,
-    -0.390289, 0.496143, -0.576761, 0.402782, 0.690651, 0.600640, 0.625000, 0.375000,
-    -0.272335, 0.496143, -0.640074, 0.278184, 0.690558, 0.667641, 0.750000, 0.375000,
-    -0.394629, 0.499219, -0.583174, 0.000000, 1.000000, 0.000000, 0.625000, 0.500000,
-    -0.140635, 0.486914, -0.676430, 0.195233, 0.094801, 0.976164, 0.875000, 0.250000,
-    -0.272335, 0.496143, -0.640074, 0.278184, 0.690558, 0.667641, 0.750000, 0.375000,
-    -0.141371, 0.496143, -0.679971, 0.142021, 0.689625, 0.710104, 0.875000, 0.375000,
-    0.000000, 0.496143, -0.693848, -0.000000, 0.689656, 0.724137, 1.000000, 0.375000,
-    -0.142943, 0.499219, -0.687531, 0.000000, 1.000000, 0.000000, 0.875000, 0.500000,
-    -0.647191, 0.499219, -0.275363, 0.000000, 1.000000, 0.000000, 0.250000, 0.500000,
-    -0.724609, 0.486914, -0.000000, -0.690476, 0.723356, 0.000000, 0.000000, 0.750000,
-    -0.668452, 0.486914, -0.284409, -0.637619, 0.723090, -0.265674, 0.250000, 0.750000,
-    -0.514473, 0.486914, -0.514473, -0.487196, 0.724762, -0.487196, 0.500000, 0.750000,
-    -0.691875, 0.450000, -0.294375, -0.833528, 0.429664, -0.347303, 0.250000, 1.000000,
-    -0.687531, 0.499219, -0.142943, 0.000000, 1.000000, 0.000000, 0.125000, 0.500000,
-    -0.712207, 0.496143, -0.000000, -0.464835, 0.885397, 0.000000, 0.000000, 0.625000,
-    -0.697963, 0.496143, -0.145112, -0.455789, 0.885407, -0.091158, 0.125000, 0.625000,
-    -0.657011, 0.496143, -0.279541, -0.428239, 0.885874, -0.178433, 0.250000, 0.625000,
-    -0.710117, 0.486914, -0.147639, -0.677049, 0.723373, -0.135410, 0.125000, 0.750000,
-    -0.583174, 0.499219, -0.394629, 0.000000, 1.000000, 0.000000, 0.375000, 0.500000,
-    -0.657011, 0.496143, -0.279541, -0.428239, 0.885874, -0.178433, 0.250000, 0.625000,
-    -0.592022, 0.496143, -0.400616, -0.385216, 0.885934, -0.258322, 0.375000, 0.625000,
-    -0.505667, 0.496143, -0.505667, -0.327637, 0.886176, -0.327636, 0.500000, 0.625000,
-    -0.602332, 0.486914, -0.407593, -0.572629, 0.724322, -0.383998, 0.375000, 0.750000,
-    -0.710117, 0.486914, -0.147639, -0.677049, 0.723373, -0.135410, 0.125000, 0.750000,
-    -0.737598, 0.471533, -0.000000, -0.819842, 0.572589, 0.000000, 0.000000, 0.875000,
-    -0.722846, 0.471533, -0.150286, -0.803908, 0.572609, -0.160782, 0.125000, 0.875000,
-    -0.680434, 0.471533, -0.289507, -0.756157, 0.573550, -0.315066, 0.250000, 0.875000,
-    -0.735000, 0.450000, -0.152812, -0.885319, 0.429952, -0.177064, 0.125000, 1.000000,
-    -0.602332, 0.486914, -0.407593, -0.572628, 0.724322, -0.383998, 0.375000, 0.750000,
-    -0.680434, 0.471533, -0.289507, -0.756158, 0.573550, -0.315065, 0.250000, 0.875000,
-    -0.613128, 0.471533, -0.414899, -0.680288, 0.573668, -0.456193, 0.375000, 0.875000,
-    -0.523694, 0.471533, -0.523694, -0.578938, 0.574162, -0.578938, 0.500000, 0.875000,
-    -0.623438, 0.450000, -0.421875, -0.749476, 0.430918, -0.502589, 0.375000, 1.000000,
-    -0.275363, 0.499219, -0.647191, 0.000000, 1.000000, 0.000000, 0.750000, 0.500000,
-    -0.514473, 0.486914, -0.514473, -0.487196, 0.724762, -0.487196, 0.500000, 0.750000,
-    -0.284409, 0.486914, -0.668452, -0.265781, 0.722825, -0.637875, 0.750000, 0.750000,
-    0.000000, 0.486914, -0.724609, 0.000000, 0.723356, -0.690476, 1.000000, 0.750000,
-    -0.294375, 0.450000, -0.691875, -0.347353, 0.429394, -0.833647, 0.750000, 1.000000,
-    -0.394629, 0.499219, -0.583174, 0.000000, 1.000000, 0.000000, 0.625000, 0.500000,
-    -0.505667, 0.496143, -0.505667, -0.327636, 0.886176, -0.327637, 0.500000, 0.625000,
-    -0.400616, 0.496143, -0.592022, -0.258332, 0.885924, -0.385231, 0.625000, 0.625000,
-    -0.279541, 0.496143, -0.657011, -0.178433, 0.885874, -0.428239, 0.750000, 0.625000,
-    -0.407593, 0.486914, -0.602332, -0.384008, 0.724305, -0.572644, 0.625000, 0.750000,
-    -0.142943, 0.499219, -0.687531, 0.000000, 1.000000, 0.000000, 0.875000, 0.500000,
-    -0.279541, 0.496143, -0.657011, -0.178433, 0.885874, -0.428239, 0.750000, 0.625000,
-    -0.145112, 0.496143, -0.697963, -0.091168, 0.885381, -0.455839, 0.875000, 0.625000,
-    0.000000, 0.496143, -0.712207, 0.000000, 0.885397, -0.464835, 1.000000, 0.625000,
-    -0.147639, 0.486914, -0.710117, -0.135420, 0.723325, -0.677099, 0.875000, 0.750000,
-    -0.407593, 0.486914, -0.602332, -0.384008, 0.724305, -0.572643, 0.625000, 0.750000,
-    -0.523694, 0.471533, -0.523694, -0.578938, 0.574162, -0.578938, 0.500000, 0.875000,
-    -0.414899, 0.471533, -0.613128, -0.456201, 0.573650, -0.680299, 0.625000, 0.875000,
-    -0.289507, 0.471533, -0.680434, -0.315065, 0.573550, -0.756158, 0.750000, 0.875000,
-    -0.421875, 0.450000, -0.623438, -0.502594, 0.430901, -0.749482, 0.625000, 1.000000,
-    -0.147639, 0.486914, -0.710117, -0.135420, 0.723325, -0.677099, 0.875000, 0.750000,
-    -0.289507, 0.471533, -0.680434, -0.315066, 0.573550, -0.756157, 0.750000, 0.875000,
-    -0.150286, 0.471533, -0.722846, -0.160789, 0.572555, -0.803945, 0.875000, 0.875000,
-    0.000000, 0.471533, -0.737598, 0.000000, 0.572589, -0.819842, 1.000000, 0.875000,
-    -0.152812, 0.450000, -0.735000, -0.177068, 0.429904, -0.885342, 0.875000, 1.000000,
-    0.000000, 0.450000, -0.700000, 0.000000, -0.429934, 0.902860, 0.000000, 0.000000,
-    0.700000, 0.450000, -0.000000, -0.902860, -0.429934, 0.000000, 1.000000, 0.000000,
-    0.000000, 0.450000, -0.750000, 0.000000, 0.429934, -0.902860, 0.000000, 1.000000,
-    0.750000, 0.450000, -0.000000, 0.902860, 0.429934, -0.000000, 1.000000, 1.000000,
-    0.497000, 0.450000, -0.497000, -0.639602, -0.426402, 0.639602, 0.500000, 0.000000,
-    0.000000, 0.499219, -0.701563, -0.000000, 1.000000, 0.000000, 0.000000, 0.500000,
-    0.498109, 0.499219, -0.498109, -0.000000, 1.000000, 0.000000, 0.500000, 0.500000,
-    0.701563, 0.499219, -0.000000, 0.000000, 1.000000, 0.000000, 1.000000, 0.500000,
-    0.532500, 0.450000, -0.532500, 0.639602, 0.426402, -0.639602, 0.500000, 1.000000,
-    0.274750, 0.450000, -0.645750, -0.347303, -0.429664, 0.833528, 0.250000, 0.000000,
-    0.000000, 0.486914, -0.690234, -0.000000, 0.094810, 0.995495, 0.000000, 0.250000,
-    0.270917, 0.486914, -0.636741, -0.382885, 0.094737, 0.918925, 0.250000, 0.250000,
-    0.490066, 0.486914, -0.490066, -0.703896, 0.095194, 0.703896, 0.500000, 0.250000,
-    0.275363, 0.499219, -0.647191, -0.000000, 1.000000, 0.000000, 0.250000, 0.500000,
-    0.142625, 0.450000, -0.686000, -0.177064, -0.429953, 0.885319, 0.125000, 0.000000,
-    0.000000, 0.471533, -0.691895, 0.000000, -0.246154, 0.969231, 0.000000, 0.125000,
-    0.140974, 0.471533, -0.678057, -0.190081, -0.246166, 0.950406, 0.125000, 0.125000,
-    0.271569, 0.471533, -0.638273, -0.372725, -0.246731, 0.894539, 0.250000, 0.125000,
-    0.140635, 0.486914, -0.676430, -0.195233, 0.094813, 0.976163, 0.125000, 0.250000,
-    0.393750, 0.450000, -0.581875, -0.502590, -0.430917, 0.749476, 0.375000, 0.000000,
-    0.271569, 0.471533, -0.638273, -0.372725, -0.246731, 0.894539, 0.250000, 0.125000,
-    0.389191, 0.471533, -0.575137, -0.539724, -0.246803, 0.804852, 0.375000, 0.125000,
-    0.491245, 0.471533, -0.491245, -0.685180, -0.247099, 0.685179, 0.500000, 0.125000,
-    0.388257, 0.486914, -0.573757, -0.554430, 0.095071, 0.826782, 0.375000, 0.250000,
-    0.140635, 0.486914, -0.676430, -0.195233, 0.094813, 0.976163, 0.125000, 0.250000,
-    0.000000, 0.496143, -0.693848, -0.000000, 0.689656, 0.724137, 0.000000, 0.375000,
-    0.141371, 0.496143, -0.679971, -0.142011, 0.689675, 0.710057, 0.125000, 0.375000,
-    0.272335, 0.496143, -0.640074, -0.278184, 0.690558, 0.667641, 0.250000, 0.375000,
-    0.142943, 0.499219, -0.687531, -0.000000, 1.000000, 0.000000, 0.125000, 0.500000,
-    0.388257, 0.486914, -0.573757, -0.554430, 0.095071, 0.826782, 0.375000, 0.250000,
-    0.272335, 0.496143, -0.640074, -0.278184, 0.690558, 0.667641, 0.250000, 0.375000,
-    0.390289, 0.496143, -0.576761, -0.402773, 0.690668, 0.600626, 0.375000, 0.375000,
-    0.492632, 0.496143, -0.492632, -0.511046, 0.691132, 0.511047, 0.500000, 0.375000,
-    0.394629, 0.499219, -0.583174, -0.000000, 1.000000, 0.000000, 0.375000, 0.500000,
-    0.645750, 0.450000, -0.274750, -0.833647, -0.429394, 0.347353, 0.750000, 0.000000,
-    0.490066, 0.486914, -0.490066, -0.703896, 0.095194, 0.703896, 0.500000, 0.250000,
-    0.636741, 0.486914, -0.270917, -0.918932, 0.094664, 0.382888, 0.750000, 0.250000,
-    0.690234, 0.486914, -0.000000, -0.995495, 0.094810, 0.000000, 1.000000, 0.250000,
-    0.647191, 0.499219, -0.275363, -0.000000, 1.000000, 0.000000, 0.750000, 0.500000,
-    0.581875, 0.450000, -0.393750, -0.749483, -0.430900, 0.502594, 0.625000, 0.000000,
-    0.491245, 0.471533, -0.491245, -0.685179, -0.247099, 0.685180, 0.500000, 0.125000,
-    0.575137, 0.471533, -0.389191, -0.804854, -0.246792, 0.539726, 0.625000, 0.125000,
-    0.638273, 0.471533, -0.271569, -0.894539, -0.246731, 0.372725, 0.750000, 0.125000,
-    0.573757, 0.486914, -0.388257, -0.826782, 0.095066, 0.554431, 0.625000, 0.250000,
-    0.686000, 0.450000, -0.142625, -0.885342, -0.429904, 0.177068, 0.875000, 0.000000,
-    0.638273, 0.471533, -0.271569, -0.894539, -0.246731, 0.372725, 0.750000, 0.125000,
-    0.678057, 0.471533, -0.140974, -0.950414, -0.246134, 0.190083, 0.875000, 0.125000,
-    0.691895, 0.471533, -0.000000, -0.969231, -0.246154, 0.000000, 1.000000, 0.125000,
-    0.676430, 0.486914, -0.140635, -0.976164, 0.094801, 0.195233, 0.875000, 0.250000,
-    0.573757, 0.486914, -0.388257, -0.826782, 0.095066, 0.554431, 0.625000, 0.250000,
-    0.492632, 0.496143, -0.492632, -0.511047, 0.691132, 0.511046, 0.500000, 0.375000,
-    0.576761, 0.496143, -0.390289, -0.600640, 0.690651, 0.402782, 0.625000, 0.375000,
-    0.640074, 0.496143, -0.272335, -0.667641, 0.690558, 0.278184, 0.750000, 0.375000,
-    0.583174, 0.499219, -0.394629, -0.000000, 1.000000, 0.000000, 0.625000, 0.500000,
-    0.676430, 0.486914, -0.140635, -0.976164, 0.094801, 0.195233, 0.875000, 0.250000,
-    0.640074, 0.496143, -0.272335, -0.667641, 0.690558, 0.278184, 0.750000, 0.375000,
-    0.679971, 0.496143, -0.141371, -0.710104, 0.689625, 0.142021, 0.875000, 0.375000,
-    0.693848, 0.496143, -0.000000, -0.724137, 0.689656, 0.000000, 1.000000, 0.375000,
-    0.687531, 0.499219, -0.142943, -0.000000, 1.000000, 0.000000, 0.875000, 0.500000,
-    0.275363, 0.499219, -0.647191, -0.000000, 1.000000, 0.000000, 0.250000, 0.500000,
-    0.000000, 0.486914, -0.724609, 0.000000, 0.723356, -0.690476, 0.000000, 0.750000,
-    0.284409, 0.486914, -0.668452, 0.265674, 0.723090, -0.637619, 0.250000, 0.750000,
-    0.514473, 0.486914, -0.514473, 0.487196, 0.724762, -0.487196, 0.500000, 0.750000,
-    0.294375, 0.450000, -0.691875, 0.347303, 0.429664, -0.833528, 0.250000, 1.000000,
-    0.142943, 0.499219, -0.687531, -0.000000, 1.000000, 0.000000, 0.125000, 0.500000,
-    0.000000, 0.496143, -0.712207, 0.000000, 0.885397, -0.464835, 0.000000, 0.625000,
-    0.145112, 0.496143, -0.697963, 0.091158, 0.885407, -0.455789, 0.125000, 0.625000,
-    0.279541, 0.496143, -0.657011, 0.178433, 0.885874, -0.428239, 0.250000, 0.625000,
-    0.147639, 0.486914, -0.710117, 0.135410, 0.723373, -0.677049, 0.125000, 0.750000,
-    0.394629, 0.499219, -0.583174, -0.000000, 1.000000, 0.000000, 0.375000, 0.500000,
-    0.279541, 0.496143, -0.657011, 0.178433, 0.885874, -0.428239, 0.250000, 0.625000,
-    0.400616, 0.496143, -0.592022, 0.258322, 0.885934, -0.385216, 0.375000, 0.625000,
-    0.505667, 0.496143, -0.505667, 0.327636, 0.886176, -0.327637, 0.500000, 0.625000,
-    0.407593, 0.486914, -0.602332, 0.383998, 0.724322, -0.572629, 0.375000, 0.750000,
-    0.147639, 0.486914, -0.710117, 0.135410, 0.723373, -0.677049, 0.125000, 0.750000,
-    0.000000, 0.471533, -0.737598, 0.000000, 0.572589, -0.819842, 0.000000, 0.875000,
-    0.150286, 0.471533, -0.722846, 0.160782, 0.572609, -0.803908, 0.125000, 0.875000,
-    0.289507, 0.471533, -0.680434, 0.315066, 0.573550, -0.756157, 0.250000, 0.875000,
-    0.152812, 0.450000, -0.735000, 0.177064, 0.429952, -0.885319, 0.125000, 1.000000,
-    0.407593, 0.486914, -0.602332, 0.383998, 0.724322, -0.572628, 0.375000, 0.750000,
-    0.289507, 0.471533, -0.680434, 0.315065, 0.573550, -0.756158, 0.250000, 0.875000,
-    0.414899, 0.471533, -0.613128, 0.456193, 0.573668, -0.680288, 0.375000, 0.875000,
-    0.523694, 0.471533, -0.523694, 0.578938, 0.574162, -0.578938, 0.500000, 0.875000,
-    0.421875, 0.450000, -0.623438, 0.502589, 0.430918, -0.749476, 0.375000, 1.000000,
-    0.647191, 0.499219, -0.275363, -0.000000, 1.000000, 0.000000, 0.750000, 0.500000,
-    0.514473, 0.486914, -0.514473, 0.487196, 0.724762, -0.487196, 0.500000, 0.750000,
-    0.668452, 0.486914, -0.284409, 0.637875, 0.722825, -0.265781, 0.750000, 0.750000,
-    0.724609, 0.486914, -0.000000, 0.690476, 0.723356, -0.000000, 1.000000, 0.750000,
-    0.691875, 0.450000, -0.294375, 0.833647, 0.429394, -0.347353, 0.750000, 1.000000,
-    0.583174, 0.499219, -0.394629, -0.000000, 1.000000, 0.000000, 0.625000, 0.500000,
-    0.505667, 0.496143, -0.505667, 0.327637, 0.886176, -0.327636, 0.500000, 0.625000,
-    0.592022, 0.496143, -0.400616, 0.385231, 0.885924, -0.258332, 0.625000, 0.625000,
-    0.657011, 0.496143, -0.279541, 0.428239, 0.885874, -0.178433, 0.750000, 0.625000,
-    0.602332, 0.486914, -0.407593, 0.572644, 0.724305, -0.384008, 0.625000, 0.750000,
-    0.687531, 0.499219, -0.142943, -0.000000, 1.000000, 0.000000, 0.875000, 0.500000,
-    0.657011, 0.496143, -0.279541, 0.428239, 0.885874, -0.178433, 0.750000, 0.625000,
-    0.697963, 0.496143, -0.145112, 0.455839, 0.885381, -0.091168, 0.875000, 0.625000,
-    0.712207, 0.496143, -0.000000, 0.464835, 0.885397, -0.000000, 1.000000, 0.625000,
-    0.710117, 0.486914, -0.147639, 0.677099, 0.723325, -0.135420, 0.875000, 0.750000,
-    0.602332, 0.486914, -0.407593, 0.572643, 0.724305, -0.384008, 0.625000, 0.750000,
-    0.523694, 0.471533, -0.523694, 0.578938, 0.574162, -0.578938, 0.500000, 0.875000,
-    0.613128, 0.471533, -0.414899, 0.680299, 0.573650, -0.456201, 0.625000, 0.875000,
-    0.680434, 0.471533, -0.289507, 0.756158, 0.573550, -0.315065, 0.750000, 0.875000,
-    0.623438, 0.450000, -0.421875, 0.749482, 0.430901, -0.502594, 0.625000, 1.000000,
-    0.710117, 0.486914, -0.147639, 0.677099, 0.723325, -0.135420, 0.875000, 0.750000,
-    0.680434, 0.471533, -0.289507, 0.756157, 0.573550, -0.315066, 0.750000, 0.875000,
-    0.722846, 0.471533, -0.150286, 0.803945, 0.572555, -0.160789, 0.875000, 0.875000,
-    0.737598, 0.471533, -0.000000, 0.819842, 0.572589, -0.000000, 1.000000, 0.875000,
-    0.735000, 0.450000, -0.152812, 0.885342, 0.429904, -0.177068, 0.875000, 1.000000,
-    0.750000, 0.450000, -0.000000, 0.902861, 0.429934, -0.000000, 0.000000, 0.000000,
-    0.000000, 0.450000, 0.750000, 0.000000, 0.429934, 0.902861, 1.000000, 0.000000,
-    1.000000, -0.300000, -0.000000, 1.000000, 0.000000, -0.000000, 0.000000, 1.000000,
-    0.000000, -0.300000, 1.000000, 0.000000, 0.000000, 1.000000, 1.000000, 1.000000,
-    0.532500, 0.450000, 0.532500, 0.639602, 0.426401, 0.639602, 0.500000, 0.000000,
-    0.921875, 0.060938, -0.000000, 0.937749, 0.347314, -0.000000, 0.000000, 0.500000,
-    0.654531, 0.060938, 0.654531, 0.663890, 0.344239, 0.663890, 0.500000, 0.500000,
-    0.000000, 0.060938, 0.921875, 0.000000, 0.347314, 0.937749, 1.000000, 0.500000,
-    0.710000, -0.300000, 0.710000, 0.707107, 0.000000, 0.707107, 0.500000, 1.000000,
-    0.691875, 0.450000, 0.294375, 0.833528, 0.429664, 0.347303, 0.250000, 0.000000,
-    0.841797, 0.253711, -0.000000, 0.911768, 0.410706, -0.000000, 0.000000, 0.250000,
-    0.776558, 0.253711, 0.330405, 0.841741, 0.410444, 0.350725, 0.250000, 0.250000,
-    0.597676, 0.253711, 0.597676, 0.644272, 0.412102, 0.644272, 0.500000, 0.250000,
-    0.850430, 0.060938, 0.361836, 0.865695, 0.347079, 0.360706, 0.250000, 0.500000,
-    0.735000, 0.450000, 0.152812, 0.885319, 0.429952, 0.177064, 0.125000, 0.000000,
-    0.796631, 0.351636, -0.000000, 0.905094, 0.425212, -0.000000, 0.000000, 0.125000,
-    0.780698, 0.351636, 0.162314, 0.887509, 0.425230, 0.177502, 0.125000, 0.125000,
-    0.734892, 0.351636, 0.312678, 0.835093, 0.426082, 0.347956, 0.250000, 0.125000,
-    0.824961, 0.253711, 0.171516, 0.894054, 0.410724, 0.178811, 0.125000, 0.250000,
-    0.623438, 0.450000, 0.421875, 0.749476, 0.430917, 0.502590, 0.375000, 0.000000,
-    0.734892, 0.351636, 0.312678, 0.835093, 0.426082, 0.347956, 0.250000, 0.125000,
-    0.662199, 0.351636, 0.448105, 0.751338, 0.426189, 0.503839, 0.375000, 0.125000,
-    0.565608, 0.351636, 0.565608, 0.639524, 0.426636, 0.639524, 0.500000, 0.125000,
-    0.699744, 0.253711, 0.473511, 0.756904, 0.411664, 0.507571, 0.375000, 0.250000,
-    0.824961, 0.253711, 0.171516, 0.894054, 0.410724, 0.178811, 0.125000, 0.250000,
-    0.884033, 0.156665, -0.000000, 0.922766, 0.385361, -0.000000, 0.000000, 0.375000,
-    0.866353, 0.156665, 0.180122, 0.904839, 0.385379, 0.180968, 0.125000, 0.375000,
-    0.815521, 0.156665, 0.346983, 0.851467, 0.386182, 0.354778, 0.250000, 0.375000,
-    0.903437, 0.060938, 0.187832, 0.919533, 0.347330, 0.183906, 0.125000, 0.500000,
-    0.699744, 0.253711, 0.473511, 0.756904, 0.411665, 0.507571, 0.375000, 0.250000,
-    0.815521, 0.156665, 0.346983, 0.851467, 0.386182, 0.354778, 0.250000, 0.375000,
-    0.734853, 0.156665, 0.497269, 0.766078, 0.386283, 0.513723, 0.375000, 0.375000,
-    0.627664, 0.156665, 0.627664, 0.652097, 0.386703, 0.652097, 0.500000, 0.375000,
-    0.766309, 0.060938, 0.518555, 0.778577, 0.348172, 0.522105, 0.375000, 0.500000,
-    0.294375, 0.450000, 0.691875, 0.347353, 0.429394, 0.833647, 0.750000, 0.000000,
-    0.597676, 0.253711, 0.597676, 0.644272, 0.412102, 0.644272, 0.500000, 0.250000,
-    0.330405, 0.253711, 0.776558, 0.350771, 0.410181, 0.841850, 0.750000, 0.250000,
-    0.000000, 0.253711, 0.841797, 0.000000, 0.410706, 0.911768, 1.000000, 0.250000,
-    0.361836, 0.060938, 0.850430, 0.360739, 0.346844, 0.865775, 0.750000, 0.500000,
-    0.421875, 0.450000, 0.623438, 0.502594, 0.430900, 0.749483, 0.625000, 0.000000,
-    0.565608, 0.351636, 0.565608, 0.639524, 0.426636, 0.639524, 0.500000, 0.125000,
-    0.448105, 0.351636, 0.662199, 0.503843, 0.426172, 0.751345, 0.625000, 0.125000,
-    0.312678, 0.351636, 0.734892, 0.347956, 0.426082, 0.835093, 0.750000, 0.125000,
-    0.473511, 0.253711, 0.699744, 0.507575, 0.411648, 0.756911, 0.625000, 0.250000,
-    0.152812, 0.450000, 0.735000, 0.177068, 0.429903, 0.885342, 0.875000, 0.000000,
-    0.312678, 0.351636, 0.734892, 0.347956, 0.426082, 0.835093, 0.750000, 0.125000,
-    0.162314, 0.351636, 0.780698, 0.177506, 0.425181, 0.887532, 0.875000, 0.125000,
-    0.000000, 0.351636, 0.796631, 0.000000, 0.425212, 0.905094, 1.000000, 0.125000,
-    0.171516, 0.253711, 0.824961, 0.178815, 0.410676, 0.894075, 0.875000, 0.250000,
-    0.473511, 0.253711, 0.699744, 0.507575, 0.411648, 0.756910, 0.625000, 0.250000,
-    0.627664, 0.156665, 0.627664, 0.652097, 0.386703, 0.652097, 0.500000, 0.375000,
-    0.497269, 0.156665, 0.734853, 0.513726, 0.386267, 0.766083, 0.625000, 0.375000,
-    0.346983, 0.156665, 0.815521, 0.354778, 0.386182, 0.851467, 0.750000, 0.375000,
-    0.518555, 0.060938, 0.766309, 0.522108, 0.348157, 0.778582, 0.625000, 0.500000,
-    0.171516, 0.253711, 0.824961, 0.178815, 0.410676, 0.894075, 0.875000, 0.250000,
-    0.346983, 0.156665, 0.815521, 0.354778, 0.386182, 0.851467, 0.750000, 0.375000,
-    0.180122, 0.156665, 0.866353, 0.180972, 0.385333, 0.904858, 0.875000, 0.375000,
-    0.000000, 0.156665, 0.884033, 0.000000, 0.385361, 0.922766, 1.000000, 0.375000,
-    0.187832, 0.060938, 0.903437, 0.183909, 0.347288, 0.919548, 0.875000, 0.500000,
-    0.850430, 0.060938, 0.361836, 0.865695, 0.347079, 0.360706, 0.250000, 0.500000,
-    0.978516, -0.124805, -0.000000, 0.975288, 0.220939, -0.000000, 0.000000, 0.750000,
-    0.902681, -0.124805, 0.384067, 0.900299, 0.220777, 0.375125, 0.250000, 0.750000,
-    0.694746, -0.124805, 0.694746, 0.689494, 0.221799, 0.689495, 0.500000, 0.750000,
-    0.922500, -0.300000, 0.392500, 0.923077, 0.000000, 0.384615, 0.250000, 1.000000,
-    0.903437, 0.060938, 0.187832, 0.919533, 0.347330, 0.183906, 0.125000, 0.500000,
-    0.953857, -0.033032, -0.000000, 0.955877, 0.293768, -0.000000, 0.000000, 0.625000,
-    0.934780, -0.033032, 0.194348, 0.937310, 0.293782, 0.187462, 0.125000, 0.625000,
-    0.879933, -0.033032, 0.374389, 0.882157, 0.294439, 0.367565, 0.250000, 0.625000,
-    0.958945, -0.124805, 0.199373, 0.956346, 0.220950, 0.191269, 0.125000, 0.750000,
-    0.766309, 0.060938, 0.518555, 0.778578, 0.348172, 0.522105, 0.375000, 0.500000,
-    0.879933, -0.033032, 0.374389, 0.882157, 0.294439, 0.367565, 0.250000, 0.625000,
-    0.792894, -0.033032, 0.536545, 0.793705, 0.294522, 0.532249, 0.375000, 0.625000,
-    0.677239, -0.033032, 0.677239, 0.675668, 0.294866, 0.675668, 0.500000, 0.625000,
-    0.813391, -0.124805, 0.550415, 0.809908, 0.221529, 0.543115, 0.375000, 0.750000,
-    0.958945, -0.124805, 0.199373, 0.956346, 0.220950, 0.191269, 0.125000, 0.750000,
-    0.994385, -0.213940, -0.000000, 0.992240, 0.124341, -0.000000, 0.000000, 0.875000,
-    0.974497, -0.213940, 0.202606, 0.972970, 0.124347, 0.194594, 0.125000, 0.875000,
-    0.917320, -0.213940, 0.390296, 0.915878, 0.124647, 0.381616, 0.250000, 0.875000,
-    0.980000, -0.300000, 0.203750, 0.980581, 0.000000, 0.196116, 0.125000, 1.000000,
-    0.813391, -0.124805, 0.550415, 0.809908, 0.221529, 0.543115, 0.375000, 0.750000,
-    0.917320, -0.213940, 0.390296, 0.915878, 0.124647, 0.381616, 0.250000, 0.875000,
-    0.826582, -0.213940, 0.559341, 0.824063, 0.124685, 0.552607, 0.375000, 0.875000,
-    0.706013, -0.213940, 0.706013, 0.701575, 0.124842, 0.701575, 0.500000, 0.875000,
-    0.831250, -0.300000, 0.562500, 0.830544, 0.000000, 0.556953, 0.375000, 1.000000,
-    0.361836, 0.060938, 0.850430, 0.360740, 0.346844, 0.865775, 0.750000, 0.500000,
-    0.694746, -0.124805, 0.694746, 0.689495, 0.221799, 0.689494, 0.500000, 0.750000,
-    0.384067, -0.124805, 0.902681, 0.375139, 0.220616, 0.900333, 0.750000, 0.750000,
-    0.000000, -0.124805, 0.978516, 0.000000, 0.220939, 0.975288, 1.000000, 0.750000,
-    0.392500, -0.300000, 0.922500, 0.384615, 0.000000, 0.923077, 0.750000, 1.000000,
-    0.518555, 0.060938, 0.766309, 0.522108, 0.348157, 0.778582, 0.625000, 0.500000,
-    0.677239, -0.033032, 0.677239, 0.675668, 0.294866, 0.675668, 0.500000, 0.625000,
-    0.536545, -0.033032, 0.792894, 0.532252, 0.294509, 0.793708, 0.625000, 0.625000,
-    0.374389, -0.033032, 0.879933, 0.367565, 0.294439, 0.882157, 0.750000, 0.625000,
-    0.550415, -0.124805, 0.813391, 0.543116, 0.221518, 0.809910, 0.625000, 0.750000,
-    0.187832, 0.060938, 0.903437, 0.183910, 0.347287, 0.919548, 0.875000, 0.500000,
-    0.374389, -0.033032, 0.879933, 0.367565, 0.294439, 0.882157, 0.750000, 0.625000,
-    0.194348, -0.033032, 0.934780, 0.187464, 0.293744, 0.937321, 0.875000, 0.625000,
-    0.000000, -0.033032, 0.953857, 0.000000, 0.293768, 0.955877, 1.000000, 0.625000,
-    0.199373, -0.124805, 0.958945, 0.191271, 0.220920, 0.956352, 0.875000, 0.750000,
-    0.550415, -0.124805, 0.813391, 0.543116, 0.221518, 0.809910, 0.625000, 0.750000,
-    0.706013, -0.213940, 0.706013, 0.701575, 0.124842, 0.701575, 0.500000, 0.875000,
-    0.559341, -0.213940, 0.826582, 0.552607, 0.124679, 0.824063, 0.625000, 0.875000,
-    0.390296, -0.213940, 0.917320, 0.381616, 0.124647, 0.915878, 0.750000, 0.875000,
-    0.562500, -0.300000, 0.831250, 0.556953, 0.000000, 0.830544, 0.625000, 1.000000,
-    0.199373, -0.124805, 0.958945, 0.191271, 0.220920, 0.956352, 0.875000, 0.750000,
-    0.390296, -0.213940, 0.917320, 0.381616, 0.124647, 0.915878, 0.750000, 0.875000,
-    0.202606, -0.213940, 0.974497, 0.194595, 0.124330, 0.972972, 0.875000, 0.875000,
-    0.000000, -0.213940, 0.994385, 0.000000, 0.124341, 0.992240, 1.000000, 0.875000,
-    0.203750, -0.300000, 0.980000, 0.196116, 0.000000, 0.980581, 0.875000, 1.000000,
-    0.000000, 0.450000, 0.750000, 0.000000, 0.429934, 0.902861, 0.000000, 0.000000,
-    -0.750000, 0.450000, -0.000000, -0.902861, 0.429934, 0.000000, 1.000000, 0.000000,
-    0.000000, -0.300000, 1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 1.000000,
-    -1.000000, -0.300000, -0.000000, -1.000000, -0.000000, -0.000000, 1.000000, 1.000000,
-    -0.532500, 0.450000, 0.532500, -0.639602, 0.426401, 0.639602, 0.500000, 0.000000,
-    0.000000, 0.060938, 0.921875, 0.000000, 0.347314, 0.937749, 0.000000, 0.500000,
-    -0.654531, 0.060938, 0.654531, -0.663890, 0.344239, 0.663890, 0.500000, 0.500000,
-    -0.921875, 0.060938, -0.000000, -0.937749, 0.347314, 0.000000, 1.000000, 0.500000,
-    -0.710000, -0.300000, 0.710000, -0.707107, 0.000000, 0.707107, 0.500000, 1.000000,
-    -0.294375, 0.450000, 0.691875, -0.347303, 0.429664, 0.833528, 0.250000, 0.000000,
-    0.000000, 0.253711, 0.841797, 0.000000, 0.410706, 0.911768, 0.000000, 0.250000,
-    -0.330405, 0.253711, 0.776558, -0.350725, 0.410444, 0.841741, 0.250000, 0.250000,
-    -0.597676, 0.253711, 0.597676, -0.644272, 0.412102, 0.644272, 0.500000, 0.250000,
-    -0.361836, 0.060938, 0.850430, -0.360706, 0.347079, 0.865695, 0.250000, 0.500000,
-    -0.152812, 0.450000, 0.735000, -0.177064, 0.429952, 0.885319, 0.125000, 0.000000,
-    0.000000, 0.351636, 0.796631, 0.000000, 0.425212, 0.905094, 0.000000, 0.125000,
-    -0.162314, 0.351636, 0.780698, -0.177502, 0.425230, 0.887509, 0.125000, 0.125000,
-    -0.312678, 0.351636, 0.734892, -0.347956, 0.426082, 0.835093, 0.250000, 0.125000,
-    -0.171516, 0.253711, 0.824961, -0.178811, 0.410724, 0.894054, 0.125000, 0.250000,
-    -0.421875, 0.450000, 0.623438, -0.502590, 0.430917, 0.749476, 0.375000, 0.000000,
-    -0.312678, 0.351636, 0.734892, -0.347956, 0.426082, 0.835093, 0.250000, 0.125000,
-    -0.448105, 0.351636, 0.662199, -0.503839, 0.426189, 0.751338, 0.375000, 0.125000,
-    -0.565608, 0.351636, 0.565608, -0.639524, 0.426636, 0.639524, 0.500000, 0.125000,
-    -0.473511, 0.253711, 0.699744, -0.507571, 0.411664, 0.756904, 0.375000, 0.250000,
-    -0.171516, 0.253711, 0.824961, -0.178811, 0.410724, 0.894054, 0.125000, 0.250000,
-    0.000000, 0.156665, 0.884033, 0.000000, 0.385361, 0.922766, 0.000000, 0.375000,
-    -0.180122, 0.156665, 0.866353, -0.180968, 0.385379, 0.904839, 0.125000, 0.375000,
-    -0.346983, 0.156665, 0.815521, -0.354778, 0.386182, 0.851467, 0.250000, 0.375000,
-    -0.187832, 0.060938, 0.903437, -0.183906, 0.347330, 0.919533, 0.125000, 0.500000,
-    -0.473511, 0.253711, 0.699744, -0.507571, 0.411665, 0.756904, 0.375000, 0.250000,
-    -0.346983, 0.156665, 0.815521, -0.354778, 0.386182, 0.851467, 0.250000, 0.375000,
-    -0.497269, 0.156665, 0.734853, -0.513723, 0.386283, 0.766078, 0.375000, 0.375000,
-    -0.627664, 0.156665, 0.627664, -0.652097, 0.386703, 0.652097, 0.500000, 0.375000,
-    -0.518555, 0.060938, 0.766309, -0.522105, 0.348172, 0.778577, 0.375000, 0.500000,
-    -0.691875, 0.450000, 0.294375, -0.833647, 0.429394, 0.347353, 0.750000, 0.000000,
-    -0.597676, 0.253711, 0.597676, -0.644272, 0.412102, 0.644272, 0.500000, 0.250000,
-    -0.776558, 0.253711, 0.330405, -0.841850, 0.410181, 0.350771, 0.750000, 0.250000,
-    -0.841797, 0.253711, -0.000000, -0.911768, 0.410706, 0.000000, 1.000000, 0.250000,
-    -0.850430, 0.060938, 0.361836, -0.865775, 0.346844, 0.360739, 0.750000, 0.500000,
-    -0.623438, 0.450000, 0.421875, -0.749483, 0.430900, 0.502594, 0.625000, 0.000000,
-    -0.565608, 0.351636, 0.565608, -0.639524, 0.426636, 0.639524, 0.500000, 0.125000,
-    -0.662199, 0.351636, 0.448105, -0.751345, 0.426172, 0.503843, 0.625000, 0.125000,
-    -0.734892, 0.351636, 0.312678, -0.835093, 0.426082, 0.347956, 0.750000, 0.125000,
-    -0.699744, 0.253711, 0.473511, -0.756911, 0.411648, 0.507575, 0.625000, 0.250000,
-    -0.735000, 0.450000, 0.152812, -0.885342, 0.429903, 0.177068, 0.875000, 0.000000,
-    -0.734892, 0.351636, 0.312678, -0.835093, 0.426082, 0.347956, 0.750000, 0.125000,
-    -0.780698, 0.351636, 0.162314, -0.887532, 0.425181, 0.177506, 0.875000, 0.125000,
-    -0.796631, 0.351636, -0.000000, -0.905094, 0.425212, 0.000000, 1.000000, 0.125000,
-    -0.824961, 0.253711, 0.171516, -0.894075, 0.410676, 0.178815, 0.875000, 0.250000,
-    -0.699744, 0.253711, 0.473511, -0.756910, 0.411648, 0.507575, 0.625000, 0.250000,
-    -0.627664, 0.156665, 0.627664, -0.652097, 0.386703, 0.652097, 0.500000, 0.375000,
-    -0.734853, 0.156665, 0.497269, -0.766083, 0.386267, 0.513726, 0.625000, 0.375000,
-    -0.815521, 0.156665, 0.346983, -0.851467, 0.386182, 0.354778, 0.750000, 0.375000,
-    -0.766309, 0.060938, 0.518555, -0.778582, 0.348157, 0.522108, 0.625000, 0.500000,
-    -0.824961, 0.253711, 0.171516, -0.894075, 0.410676, 0.178815, 0.875000, 0.250000,
-    -0.815521, 0.156665, 0.346983, -0.851467, 0.386182, 0.354778, 0.750000, 0.375000,
-    -0.866353, 0.156665, 0.180122, -0.904858, 0.385333, 0.180972, 0.875000, 0.375000,
-    -0.884033, 0.156665, -0.000000, -0.922766, 0.385361, 0.000000, 1.000000, 0.375000,
-    -0.903437, 0.060938, 0.187832, -0.919548, 0.347288, 0.183909, 0.875000, 0.500000,
-    -0.361836, 0.060938, 0.850430, -0.360706, 0.347079, 0.865695, 0.250000, 0.500000,
-    0.000000, -0.124805, 0.978516, 0.000000, 0.220939, 0.975288, 0.000000, 0.750000,
-    -0.384067, -0.124805, 0.902681, -0.375125, 0.220777, 0.900299, 0.250000, 0.750000,
-    -0.694746, -0.124805, 0.694746, -0.689495, 0.221799, 0.689494, 0.500000, 0.750000,
-    -0.392500, -0.300000, 0.922500, -0.384615, 0.000000, 0.923077, 0.250000, 1.000000,
-    -0.187832, 0.060938, 0.903437, -0.183906, 0.347330, 0.919533, 0.125000, 0.500000,
-    0.000000, -0.033032, 0.953857, 0.000000, 0.293768, 0.955877, 0.000000, 0.625000,
-    -0.194348, -0.033032, 0.934780, -0.187462, 0.293782, 0.937310, 0.125000, 0.625000,
-    -0.374389, -0.033032, 0.879933, -0.367565, 0.294439, 0.882157, 0.250000, 0.625000,
-    -0.199373, -0.124805, 0.958945, -0.191269, 0.220950, 0.956346, 0.125000, 0.750000,
-    -0.518555, 0.060938, 0.766309, -0.522105, 0.348172, 0.778578, 0.375000, 0.500000,
-    -0.374389, -0.033032, 0.879933, -0.367565, 0.294439, 0.882157, 0.250000, 0.625000,
-    -0.536545, -0.033032, 0.792894, -0.532249, 0.294522, 0.793705, 0.375000, 0.625000,
-    -0.677239, -0.033032, 0.677239, -0.675668, 0.294866, 0.675668, 0.500000, 0.625000,
-    -0.550415, -0.124805, 0.813391, -0.543115, 0.221529, 0.809908, 0.375000, 0.750000,
-    -0.199373, -0.124805, 0.958945, -0.191269, 0.220950, 0.956346, 0.125000, 0.750000,
-    0.000000, -0.213940, 0.994385, 0.000000, 0.124341, 0.992240, 0.000000, 0.875000,
-    -0.202606, -0.213940, 0.974497, -0.194594, 0.124347, 0.972970, 0.125000, 0.875000,
-    -0.390296, -0.213940, 0.917320, -0.381616, 0.124647, 0.915878, 0.250000, 0.875000,
-    -0.203750, -0.300000, 0.980000, -0.196116, 0.000000, 0.980581, 0.125000, 1.000000,
-    -0.550415, -0.124805, 0.813391, -0.543115, 0.221529, 0.809908, 0.375000, 0.750000,
-    -0.390296, -0.213940, 0.917320, -0.381616, 0.124647, 0.915878, 0.250000, 0.875000,
-    -0.559341, -0.213940, 0.826582, -0.552607, 0.124685, 0.824063, 0.375000, 0.875000,
-    -0.706013, -0.213940, 0.706013, -0.701575, 0.124842, 0.701575, 0.500000, 0.875000,
-    -0.562500, -0.300000, 0.831250, -0.556953, 0.000000, 0.830544, 0.375000, 1.000000,
-    -0.850430, 0.060938, 0.361836, -0.865775, 0.346844, 0.360740, 0.750000, 0.500000,
-    -0.694746, -0.124805, 0.694746, -0.689494, 0.221799, 0.689495, 0.500000, 0.750000,
-    -0.902681, -0.124805, 0.384067, -0.900333, 0.220616, 0.375139, 0.750000, 0.750000,
-    -0.978516, -0.124805, -0.000000, -0.975288, 0.220939, 0.000000, 1.000000, 0.750000,
-    -0.922500, -0.300000, 0.392500, -0.923077, 0.000000, 0.384615, 0.750000, 1.000000,
-    -0.766309, 0.060938, 0.518555, -0.778582, 0.348157, 0.522108, 0.625000, 0.500000,
-    -0.677239, -0.033032, 0.677239, -0.675668, 0.294866, 0.675668, 0.500000, 0.625000,
-    -0.792894, -0.033032, 0.536545, -0.793708, 0.294509, 0.532252, 0.625000, 0.625000,
-    -0.879933, -0.033032, 0.374389, -0.882157, 0.294439, 0.367565, 0.750000, 0.625000,
-    -0.813391, -0.124805, 0.550415, -0.809910, 0.221518, 0.543116, 0.625000, 0.750000,
-    -0.903437, 0.060938, 0.187832, -0.919548, 0.347287, 0.183910, 0.875000, 0.500000,
-    -0.879933, -0.033032, 0.374389, -0.882157, 0.294439, 0.367565, 0.750000, 0.625000,
-    -0.934780, -0.033032, 0.194348, -0.937321, 0.293744, 0.187464, 0.875000, 0.625000,
-    -0.953857, -0.033032, -0.000000, -0.955877, 0.293768, 0.000000, 1.000000, 0.625000,
-    -0.958945, -0.124805, 0.199373, -0.956352, 0.220920, 0.191271, 0.875000, 0.750000,
-    -0.813391, -0.124805, 0.550415, -0.809910, 0.221518, 0.543116, 0.625000, 0.750000,
-    -0.706013, -0.213940, 0.706013, -0.701575, 0.124842, 0.701575, 0.500000, 0.875000,
-    -0.826582, -0.213940, 0.559341, -0.824063, 0.124679, 0.552607, 0.625000, 0.875000,
-    -0.917320, -0.213940, 0.390296, -0.915878, 0.124647, 0.381616, 0.750000, 0.875000,
-    -0.831250, -0.300000, 0.562500, -0.830544, 0.000000, 0.556953, 0.625000, 1.000000,
-    -0.958945, -0.124805, 0.199373, -0.956352, 0.220920, 0.191271, 0.875000, 0.750000,
-    -0.917320, -0.213940, 0.390296, -0.915878, 0.124647, 0.381616, 0.750000, 0.875000,
-    -0.974497, -0.213940, 0.202606, -0.972972, 0.124330, 0.194595, 0.875000, 0.875000,
-    -0.994385, -0.213940, -0.000000, -0.992240, 0.124341, 0.000000, 1.000000, 0.875000,
-    -0.980000, -0.300000, 0.203750, -0.980581, 0.000000, 0.196116, 0.875000, 1.000000,
-    -0.750000, 0.450000, -0.000000, -0.902861, 0.429934, 0.000000, 0.000000, 0.000000,
-    0.000000, 0.450000, -0.750000, 0.000000, 0.429934, -0.902861, 1.000000, 0.000000,
-    -1.000000, -0.300000, -0.000000, -1.000000, -0.000000, -0.000000, 0.000000, 1.000000,
-    0.000000, -0.300000, -1.000000, 0.000000, 0.000000, -1.000000, 1.000000, 1.000000,
-    -0.532500, 0.450000, -0.532500, -0.639602, 0.426401, -0.639602, 0.500000, 0.000000,
-    -0.921875, 0.060938, -0.000000, -0.937749, 0.347314, 0.000000, 0.000000, 0.500000,
-    -0.654531, 0.060938, -0.654531, -0.663890, 0.344239, -0.663890, 0.500000, 0.500000,
-    0.000000, 0.060938, -0.921875, 0.000000, 0.347314, -0.937749, 1.000000, 0.500000,
-    -0.710000, -0.300000, -0.710000, -0.707107, -0.000000, -0.707107, 0.500000, 1.000000,
-    -0.691875, 0.450000, -0.294375, -0.833528, 0.429664, -0.347303, 0.250000, 0.000000,
-    -0.841797, 0.253711, -0.000000, -0.911768, 0.410706, 0.000000, 0.000000, 0.250000,
-    -0.776558, 0.253711, -0.330405, -0.841741, 0.410444, -0.350725, 0.250000, 0.250000,
-    -0.597676, 0.253711, -0.597676, -0.644272, 0.412102, -0.644272, 0.500000, 0.250000,
-    -0.850430, 0.060938, -0.361836, -0.865695, 0.347079, -0.360706, 0.250000, 0.500000,
-    -0.735000, 0.450000, -0.152812, -0.885319, 0.429952, -0.177064, 0.125000, 0.000000,
-    -0.796631, 0.351636, -0.000000, -0.905094, 0.425212, 0.000000, 0.000000, 0.125000,
-    -0.780698, 0.351636, -0.162314, -0.887509, 0.425230, -0.177502, 0.125000, 0.125000,
-    -0.734892, 0.351636, -0.312678, -0.835093, 0.426082, -0.347956, 0.250000, 0.125000,
-    -0.824961, 0.253711, -0.171516, -0.894054, 0.410724, -0.178811, 0.125000, 0.250000,
-    -0.623438, 0.450000, -0.421875, -0.749476, 0.430917, -0.502590, 0.375000, 0.000000,
-    -0.734892, 0.351636, -0.312678, -0.835093, 0.426082, -0.347956, 0.250000, 0.125000,
-    -0.662199, 0.351636, -0.448105, -0.751338, 0.426189, -0.503839, 0.375000, 0.125000,
-    -0.565608, 0.351636, -0.565608, -0.639524, 0.426636, -0.639524, 0.500000, 0.125000,
-    -0.699744, 0.253711, -0.473511, -0.756904, 0.411664, -0.507571, 0.375000, 0.250000,
-    -0.824961, 0.253711, -0.171516, -0.894054, 0.410724, -0.178811, 0.125000, 0.250000,
-    -0.884033, 0.156665, -0.000000, -0.922766, 0.385361, 0.000000, 0.000000, 0.375000,
-    -0.866353, 0.156665, -0.180122, -0.904839, 0.385379, -0.180968, 0.125000, 0.375000,
-    -0.815521, 0.156665, -0.346983, -0.851467, 0.386182, -0.354778, 0.250000, 0.375000,
-    -0.903437, 0.060938, -0.187832, -0.919533, 0.347330, -0.183906, 0.125000, 0.500000,
-    -0.699744, 0.253711, -0.473511, -0.756904, 0.411665, -0.507571, 0.375000, 0.250000,
-    -0.815521, 0.156665, -0.346983, -0.851467, 0.386182, -0.354778, 0.250000, 0.375000,
-    -0.734853, 0.156665, -0.497269, -0.766078, 0.386283, -0.513723, 0.375000, 0.375000,
-    -0.627664, 0.156665, -0.627664, -0.652097, 0.386703, -0.652097, 0.500000, 0.375000,
-    -0.766309, 0.060938, -0.518555, -0.778577, 0.348172, -0.522105, 0.375000, 0.500000,
-    -0.294375, 0.450000, -0.691875, -0.347353, 0.429394, -0.833647, 0.750000, 0.000000,
-    -0.597676, 0.253711, -0.597676, -0.644272, 0.412102, -0.644272, 0.500000, 0.250000,
-    -0.330405, 0.253711, -0.776558, -0.350771, 0.410181, -0.841850, 0.750000, 0.250000,
-    0.000000, 0.253711, -0.841797, 0.000000, 0.410706, -0.911768, 1.000000, 0.250000,
-    -0.361836, 0.060938, -0.850430, -0.360739, 0.346844, -0.865775, 0.750000, 0.500000,
-    -0.421875, 0.450000, -0.623438, -0.502594, 0.430900, -0.749483, 0.625000, 0.000000,
-    -0.565608, 0.351636, -0.565608, -0.639524, 0.426636, -0.639524, 0.500000, 0.125000,
-    -0.448105, 0.351636, -0.662199, -0.503843, 0.426172, -0.751345, 0.625000, 0.125000,
-    -0.312678, 0.351636, -0.734892, -0.347956, 0.426082, -0.835093, 0.750000, 0.125000,
-    -0.473511, 0.253711, -0.699744, -0.507575, 0.411648, -0.756911, 0.625000, 0.250000,
-    -0.152812, 0.450000, -0.735000, -0.177068, 0.429903, -0.885342, 0.875000, 0.000000,
-    -0.312678, 0.351636, -0.734892, -0.347956, 0.426082, -0.835093, 0.750000, 0.125000,
-    -0.162314, 0.351636, -0.780698, -0.177506, 0.425181, -0.887532, 0.875000, 0.125000,
-    0.000000, 0.351636, -0.796631, 0.000000, 0.425212, -0.905094, 1.000000, 0.125000,
-    -0.171516, 0.253711, -0.824961, -0.178815, 0.410676, -0.894075, 0.875000, 0.250000,
-    -0.473511, 0.253711, -0.699744, -0.507575, 0.411648, -0.756910, 0.625000, 0.250000,
-    -0.627664, 0.156665, -0.627664, -0.652097, 0.386703, -0.652097, 0.500000, 0.375000,
-    -0.497269, 0.156665, -0.734853, -0.513726, 0.386267, -0.766083, 0.625000, 0.375000,
-    -0.346983, 0.156665, -0.815521, -0.354778, 0.386182, -0.851467, 0.750000, 0.375000,
-    -0.518555, 0.060938, -0.766309, -0.522108, 0.348157, -0.778582, 0.625000, 0.500000,
-    -0.171516, 0.253711, -0.824961, -0.178815, 0.410676, -0.894075, 0.875000, 0.250000,
-    -0.346983, 0.156665, -0.815521, -0.354778, 0.386182, -0.851467, 0.750000, 0.375000,
-    -0.180122, 0.156665, -0.866353, -0.180972, 0.385333, -0.904858, 0.875000, 0.375000,
-    0.000000, 0.156665, -0.884033, 0.000000, 0.385361, -0.922766, 1.000000, 0.375000,
-    -0.187832, 0.060938, -0.903437, -0.183909, 0.347288, -0.919548, 0.875000, 0.500000,
-    -0.850430, 0.060938, -0.361836, -0.865695, 0.347079, -0.360706, 0.250000, 0.500000,
-    -0.978516, -0.124805, -0.000000, -0.975288, 0.220939, 0.000000, 0.000000, 0.750000,
-    -0.902681, -0.124805, -0.384067, -0.900299, 0.220777, -0.375125, 0.250000, 0.750000,
-    -0.694746, -0.124805, -0.694746, -0.689494, 0.221799, -0.689495, 0.500000, 0.750000,
-    -0.922500, -0.300000, -0.392500, -0.923077, -0.000000, -0.384615, 0.250000, 1.000000,
-    -0.903437, 0.060938, -0.187832, -0.919533, 0.347330, -0.183906, 0.125000, 0.500000,
-    -0.953857, -0.033032, -0.000000, -0.955877, 0.293768, 0.000000, 0.000000, 0.625000,
-    -0.934780, -0.033032, -0.194348, -0.937310, 0.293782, -0.187462, 0.125000, 0.625000,
-    -0.879933, -0.033032, -0.374389, -0.882157, 0.294439, -0.367565, 0.250000, 0.625000,
-    -0.958945, -0.124805, -0.199373, -0.956346, 0.220950, -0.191269, 0.125000, 0.750000,
-    -0.766309, 0.060938, -0.518555, -0.778578, 0.348172, -0.522105, 0.375000, 0.500000,
-    -0.879933, -0.033032, -0.374389, -0.882157, 0.294439, -0.367565, 0.250000, 0.625000,
-    -0.792894, -0.033032, -0.536545, -0.793705, 0.294522, -0.532249, 0.375000, 0.625000,
-    -0.677239, -0.033032, -0.677239, -0.675668, 0.294866, -0.675668, 0.500000, 0.625000,
-    -0.813391, -0.124805, -0.550415, -0.809908, 0.221529, -0.543115, 0.375000, 0.750000,
-    -0.958945, -0.124805, -0.199373, -0.956346, 0.220950, -0.191269, 0.125000, 0.750000,
-    -0.994385, -0.213940, -0.000000, -0.992240, 0.124341, 0.000000, 0.000000, 0.875000,
-    -0.974497, -0.213940, -0.202606, -0.972970, 0.124347, -0.194594, 0.125000, 0.875000,
-    -0.917320, -0.213940, -0.390296, -0.915878, 0.124647, -0.381616, 0.250000, 0.875000,
-    -0.980000, -0.300000, -0.203750, -0.980581, -0.000000, -0.196116, 0.125000, 1.000000,
-    -0.813391, -0.124805, -0.550415, -0.809908, 0.221529, -0.543115, 0.375000, 0.750000,
-    -0.917320, -0.213940, -0.390296, -0.915878, 0.124647, -0.381616, 0.250000, 0.875000,
-    -0.826582, -0.213940, -0.559341, -0.824063, 0.124685, -0.552607, 0.375000, 0.875000,
-    -0.706013, -0.213940, -0.706013, -0.701575, 0.124842, -0.701575, 0.500000, 0.875000,
-    -0.831250, -0.300000, -0.562500, -0.830544, -0.000000, -0.556953, 0.375000, 1.000000,
-    -0.361836, 0.060938, -0.850430, -0.360740, 0.346844, -0.865775, 0.750000, 0.500000,
-    -0.694746, -0.124805, -0.694746, -0.689495, 0.221799, -0.689494, 0.500000, 0.750000,
-    -0.384067, -0.124805, -0.902681, -0.375139, 0.220616, -0.900333, 0.750000, 0.750000,
-    0.000000, -0.124805, -0.978516, 0.000000, 0.220939, -0.975288, 1.000000, 0.750000,
-    -0.392500, -0.300000, -0.922500, -0.384615, -0.000000, -0.923077, 0.750000, 1.000000,
-    -0.518555, 0.060938, -0.766309, -0.522108, 0.348157, -0.778582, 0.625000, 0.500000,
-    -0.677239, -0.033032, -0.677239, -0.675668, 0.294866, -0.675668, 0.500000, 0.625000,
-    -0.536545, -0.033032, -0.792894, -0.532252, 0.294509, -0.793708, 0.625000, 0.625000,
-    -0.374389, -0.033032, -0.879933, -0.367565, 0.294439, -0.882157, 0.750000, 0.625000,
-    -0.550415, -0.124805, -0.813391, -0.543116, 0.221518, -0.809910, 0.625000, 0.750000,
-    -0.187832, 0.060938, -0.903437, -0.183910, 0.347287, -0.919548, 0.875000, 0.500000,
-    -0.374389, -0.033032, -0.879933, -0.367565, 0.294439, -0.882157, 0.750000, 0.625000,
-    -0.194348, -0.033032, -0.934780, -0.187464, 0.293744, -0.937321, 0.875000, 0.625000,
-    0.000000, -0.033032, -0.953857, 0.000000, 0.293768, -0.955877, 1.000000, 0.625000,
-    -0.199373, -0.124805, -0.958945, -0.191271, 0.220920, -0.956352, 0.875000, 0.750000,
-    -0.550415, -0.124805, -0.813391, -0.543116, 0.221518, -0.809910, 0.625000, 0.750000,
-    -0.706013, -0.213940, -0.706013, -0.701575, 0.124842, -0.701575, 0.500000, 0.875000,
-    -0.559341, -0.213940, -0.826582, -0.552607, 0.124679, -0.824063, 0.625000, 0.875000,
-    -0.390296, -0.213940, -0.917320, -0.381616, 0.124647, -0.915878, 0.750000, 0.875000,
-    -0.562500, -0.300000, -0.831250, -0.556953, -0.000000, -0.830544, 0.625000, 1.000000,
-    -0.199373, -0.124805, -0.958945, -0.191271, 0.220920, -0.956352, 0.875000, 0.750000,
-    -0.390296, -0.213940, -0.917320, -0.381616, 0.124647, -0.915878, 0.750000, 0.875000,
-    -0.202606, -0.213940, -0.974497, -0.194595, 0.124330, -0.972972, 0.875000, 0.875000,
-    0.000000, -0.213940, -0.994385, 0.000000, 0.124341, -0.992240, 1.000000, 0.875000,
-    -0.203750, -0.300000, -0.980000, -0.196116, -0.000000, -0.980581, 0.875000, 1.000000,
-    0.000000, 0.450000, -0.750000, 0.000000, 0.429934, -0.902861, 0.000000, 0.000000,
-    0.750000, 0.450000, -0.000000, 0.902861, 0.429934, -0.000000, 1.000000, 0.000000,
-    0.000000, -0.300000, -1.000000, 0.000000, 0.000000, -1.000000, 0.000000, 1.000000,
-    1.000000, -0.300000, -0.000000, 1.000000, 0.000000, -0.000000, 1.000000, 1.000000,
-    0.532500, 0.450000, -0.532500, 0.639602, 0.426401, -0.639602, 0.500000, 0.000000,
-    0.000000, 0.060938, -0.921875, 0.000000, 0.347314, -0.937749, 0.000000, 0.500000,
-    0.654531, 0.060938, -0.654531, 0.663890, 0.344239, -0.663890, 0.500000, 0.500000,
-    0.921875, 0.060938, -0.000000, 0.937749, 0.347314, -0.000000, 1.000000, 0.500000,
-    0.710000, -0.300000, -0.710000, 0.707107, 0.000000, -0.707107, 0.500000, 1.000000,
-    0.294375, 0.450000, -0.691875, 0.347303, 0.429664, -0.833528, 0.250000, 0.000000,
-    0.000000, 0.253711, -0.841797, 0.000000, 0.410706, -0.911768, 0.000000, 0.250000,
-    0.330405, 0.253711, -0.776558, 0.350725, 0.410444, -0.841741, 0.250000, 0.250000,
-    0.597676, 0.253711, -0.597676, 0.644272, 0.412102, -0.644272, 0.500000, 0.250000,
-    0.361836, 0.060938, -0.850430, 0.360706, 0.347079, -0.865695, 0.250000, 0.500000,
-    0.152812, 0.450000, -0.735000, 0.177064, 0.429952, -0.885319, 0.125000, 0.000000,
-    0.000000, 0.351636, -0.796631, 0.000000, 0.425212, -0.905094, 0.000000, 0.125000,
-    0.162314, 0.351636, -0.780698, 0.177502, 0.425230, -0.887509, 0.125000, 0.125000,
-    0.312678, 0.351636, -0.734892, 0.347956, 0.426082, -0.835093, 0.250000, 0.125000,
-    0.171516, 0.253711, -0.824961, 0.178811, 0.410724, -0.894054, 0.125000, 0.250000,
-    0.421875, 0.450000, -0.623438, 0.502590, 0.430917, -0.749476, 0.375000, 0.000000,
-    0.312678, 0.351636, -0.734892, 0.347956, 0.426082, -0.835093, 0.250000, 0.125000,
-    0.448105, 0.351636, -0.662199, 0.503839, 0.426189, -0.751338, 0.375000, 0.125000,
-    0.565608, 0.351636, -0.565608, 0.639524, 0.426636, -0.639524, 0.500000, 0.125000,
-    0.473511, 0.253711, -0.699744, 0.507571, 0.411664, -0.756904, 0.375000, 0.250000,
-    0.171516, 0.253711, -0.824961, 0.178811, 0.410724, -0.894054, 0.125000, 0.250000,
-    0.000000, 0.156665, -0.884033, 0.000000, 0.385361, -0.922766, 0.000000, 0.375000,
-    0.180122, 0.156665, -0.866353, 0.180968, 0.385379, -0.904839, 0.125000, 0.375000,
-    0.346983, 0.156665, -0.815521, 0.354778, 0.386182, -0.851467, 0.250000, 0.375000,
-    0.187832, 0.060938, -0.903437, 0.183906, 0.347330, -0.919533, 0.125000, 0.500000,
-    0.473511, 0.253711, -0.699744, 0.507571, 0.411665, -0.756904, 0.375000, 0.250000,
-    0.346983, 0.156665, -0.815521, 0.354778, 0.386182, -0.851467, 0.250000, 0.375000,
-    0.497269, 0.156665, -0.734853, 0.513723, 0.386283, -0.766078, 0.375000, 0.375000,
-    0.627664, 0.156665, -0.627664, 0.652097, 0.386703, -0.652097, 0.500000, 0.375000,
-    0.518555, 0.060938, -0.766309, 0.522105, 0.348172, -0.778577, 0.375000, 0.500000,
-    0.691875, 0.450000, -0.294375, 0.833647, 0.429394, -0.347353, 0.750000, 0.000000,
-    0.597676, 0.253711, -0.597676, 0.644272, 0.412102, -0.644272, 0.500000, 0.250000,
-    0.776558, 0.253711, -0.330405, 0.841850, 0.410181, -0.350771, 0.750000, 0.250000,
-    0.841797, 0.253711, -0.000000, 0.911768, 0.410706, -0.000000, 1.000000, 0.250000,
-    0.850430, 0.060938, -0.361836, 0.865775, 0.346844, -0.360739, 0.750000, 0.500000,
-    0.623438, 0.450000, -0.421875, 0.749483, 0.430900, -0.502594, 0.625000, 0.000000,
-    0.565608, 0.351636, -0.565608, 0.639524, 0.426636, -0.639524, 0.500000, 0.125000,
-    0.662199, 0.351636, -0.448105, 0.751345, 0.426172, -0.503843, 0.625000, 0.125000,
-    0.734892, 0.351636, -0.312678, 0.835093, 0.426082, -0.347956, 0.750000, 0.125000,
-    0.699744, 0.253711, -0.473511, 0.756911, 0.411648, -0.507575, 0.625000, 0.250000,
-    0.735000, 0.450000, -0.152812, 0.885342, 0.429903, -0.177068, 0.875000, 0.000000,
-    0.734892, 0.351636, -0.312678, 0.835093, 0.426082, -0.347956, 0.750000, 0.125000,
-    0.780698, 0.351636, -0.162314, 0.887532, 0.425181, -0.177506, 0.875000, 0.125000,
-    0.796631, 0.351636, -0.000000, 0.905094, 0.425212, -0.000000, 1.000000, 0.125000,
-    0.824961, 0.253711, -0.171516, 0.894075, 0.410676, -0.178815, 0.875000, 0.250000,
-    0.699744, 0.253711, -0.473511, 0.756910, 0.411648, -0.507575, 0.625000, 0.250000,
-    0.627664, 0.156665, -0.627664, 0.652097, 0.386703, -0.652097, 0.500000, 0.375000,
-    0.734853, 0.156665, -0.497269, 0.766083, 0.386267, -0.513726, 0.625000, 0.375000,
-    0.815521, 0.156665, -0.346983, 0.851467, 0.386182, -0.354778, 0.750000, 0.375000,
-    0.766309, 0.060938, -0.518555, 0.778582, 0.348157, -0.522108, 0.625000, 0.500000,
-    0.824961, 0.253711, -0.171516, 0.894075, 0.410676, -0.178815, 0.875000, 0.250000,
-    0.815521, 0.156665, -0.346983, 0.851467, 0.386182, -0.354778, 0.750000, 0.375000,
-    0.866353, 0.156665, -0.180122, 0.904858, 0.385333, -0.180972, 0.875000, 0.375000,
-    0.884033, 0.156665, -0.000000, 0.922766, 0.385361, -0.000000, 1.000000, 0.375000,
-    0.903437, 0.060938, -0.187832, 0.919548, 0.347288, -0.183909, 0.875000, 0.500000,
-    0.361836, 0.060938, -0.850430, 0.360706, 0.347079, -0.865695, 0.250000, 0.500000,
-    0.000000, -0.124805, -0.978516, 0.000000, 0.220939, -0.975288, 0.000000, 0.750000,
-    0.384067, -0.124805, -0.902681, 0.375125, 0.220777, -0.900299, 0.250000, 0.750000,
-    0.694746, -0.124805, -0.694746, 0.689495, 0.221799, -0.689494, 0.500000, 0.750000,
-    0.392500, -0.300000, -0.922500, 0.384615, 0.000000, -0.923077, 0.250000, 1.000000,
-    0.187832, 0.060938, -0.903437, 0.183906, 0.347330, -0.919533, 0.125000, 0.500000,
-    0.000000, -0.033032, -0.953857, 0.000000, 0.293768, -0.955877, 0.000000, 0.625000,
-    0.194348, -0.033032, -0.934780, 0.187462, 0.293782, -0.937310, 0.125000, 0.625000,
-    0.374389, -0.033032, -0.879933, 0.367565, 0.294439, -0.882157, 0.250000, 0.625000,
-    0.199373, -0.124805, -0.958945, 0.191269, 0.220950, -0.956346, 0.125000, 0.750000,
-    0.518555, 0.060938, -0.766309, 0.522105, 0.348172, -0.778578, 0.375000, 0.500000,
-    0.374389, -0.033032, -0.879933, 0.367565, 0.294439, -0.882157, 0.250000, 0.625000,
-    0.536545, -0.033032, -0.792894, 0.532249, 0.294522, -0.793705, 0.375000, 0.625000,
-    0.677239, -0.033032, -0.677239, 0.675668, 0.294866, -0.675668, 0.500000, 0.625000,
-    0.550415, -0.124805, -0.813391, 0.543115, 0.221529, -0.809908, 0.375000, 0.750000,
-    0.199373, -0.124805, -0.958945, 0.191269, 0.220950, -0.956346, 0.125000, 0.750000,
-    0.000000, -0.213940, -0.994385, 0.000000, 0.124341, -0.992240, 0.000000, 0.875000,
-    0.202606, -0.213940, -0.974497, 0.194594, 0.124347, -0.972970, 0.125000, 0.875000,
-    0.390296, -0.213940, -0.917320, 0.381616, 0.124647, -0.915878, 0.250000, 0.875000,
-    0.203750, -0.300000, -0.980000, 0.196116, 0.000000, -0.980581, 0.125000, 1.000000,
-    0.550415, -0.124805, -0.813391, 0.543115, 0.221529, -0.809908, 0.375000, 0.750000,
-    0.390296, -0.213940, -0.917320, 0.381616, 0.124647, -0.915878, 0.250000, 0.875000,
-    0.559341, -0.213940, -0.826582, 0.552607, 0.124685, -0.824063, 0.375000, 0.875000,
-    0.706013, -0.213940, -0.706013, 0.701575, 0.124842, -0.701575, 0.500000, 0.875000,
-    0.562500, -0.300000, -0.831250, 0.556953, 0.000000, -0.830544, 0.375000, 1.000000,
-    0.850430, 0.060938, -0.361836, 0.865775, 0.346844, -0.360740, 0.750000, 0.500000,
-    0.694746, -0.124805, -0.694746, 0.689494, 0.221799, -0.689495, 0.500000, 0.750000,
-    0.902681, -0.124805, -0.384067, 0.900333, 0.220616, -0.375139, 0.750000, 0.750000,
-    0.978516, -0.124805, -0.000000, 0.975288, 0.220939, -0.000000, 1.000000, 0.750000,
-    0.922500, -0.300000, -0.392500, 0.923077, 0.000000, -0.384615, 0.750000, 1.000000,
-    0.766309, 0.060938, -0.518555, 0.778582, 0.348157, -0.522108, 0.625000, 0.500000,
-    0.677239, -0.033032, -0.677239, 0.675668, 0.294866, -0.675668, 0.500000, 0.625000,
-    0.792894, -0.033032, -0.536545, 0.793708, 0.294509, -0.532252, 0.625000, 0.625000,
-    0.879933, -0.033032, -0.374389, 0.882157, 0.294439, -0.367565, 0.750000, 0.625000,
-    0.813391, -0.124805, -0.550415, 0.809910, 0.221518, -0.543116, 0.625000, 0.750000,
-    0.903437, 0.060938, -0.187832, 0.919548, 0.347287, -0.183910, 0.875000, 0.500000,
-    0.879933, -0.033032, -0.374389, 0.882157, 0.294439, -0.367565, 0.750000, 0.625000,
-    0.934780, -0.033032, -0.194348, 0.937321, 0.293744, -0.187464, 0.875000, 0.625000,
-    0.953857, -0.033032, -0.000000, 0.955877, 0.293768, -0.000000, 1.000000, 0.625000,
-    0.958945, -0.124805, -0.199373, 0.956352, 0.220920, -0.191271, 0.875000, 0.750000,
-    0.813391, -0.124805, -0.550415, 0.809910, 0.221518, -0.543116, 0.625000, 0.750000,
-    0.706013, -0.213940, -0.706013, 0.701575, 0.124842, -0.701575, 0.500000, 0.875000,
-    0.826582, -0.213940, -0.559341, 0.824063, 0.124679, -0.552607, 0.625000, 0.875000,
-    0.917320, -0.213940, -0.390296, 0.915878, 0.124647, -0.381616, 0.750000, 0.875000,
-    0.831250, -0.300000, -0.562500, 0.830544, 0.000000, -0.556953, 0.625000, 1.000000,
-    0.958945, -0.124805, -0.199373, 0.956352, 0.220920, -0.191271, 0.875000, 0.750000,
-    0.917320, -0.213940, -0.390296, 0.915878, 0.124647, -0.381616, 0.750000, 0.875000,
-    0.974497, -0.213940, -0.202606, 0.972972, 0.124330, -0.194595, 0.875000, 0.875000,
-    0.994385, -0.213940, -0.000000, 0.992240, 0.124341, -0.000000, 1.000000, 0.875000,
-    0.980000, -0.300000, -0.203750, 0.980581, 0.000000, -0.196116, 0.875000, 1.000000,
-    1.000000, -0.300000, -0.000000, 1.000000, 0.000000, -0.000000, 0.000000, 0.000000,
-    0.000000, -0.300000, 1.000000, 0.000000, 0.000000, 1.000000, 1.000000, 0.000000,
-    0.750000, -0.675000, -0.000000, 1.000000, 0.000000, -0.000000, 0.000000, 1.000000,
-    0.000000, -0.675000, 0.750000, 0.000000, 0.000000, 1.000000, 1.000000, 1.000000,
-    0.710000, -0.300000, 0.710000, 0.707107, 0.000000, 0.707107, 0.500000, 0.000000,
-    0.875000, -0.557812, -0.000000, 0.698100, -0.716000, 0.000000, 0.000000, 0.500000,
-    0.621250, -0.557812, 0.621250, 0.496182, -0.712466, 0.496182, 0.500000, 0.500000,
-    0.000000, -0.557812, 0.875000, 0.000000, -0.716000, 0.698100, 1.000000, 0.500000,
-    0.532500, -0.675000, 0.532500, 0.707107, 0.000000, 0.707107, 0.500000, 1.000000,
-    0.922500, -0.300000, 0.392500, 0.923077, 0.000000, 0.384615, 0.250000, 0.000000,
-    0.960938, -0.448242, -0.000000, 0.876976, -0.480535, 0.000000, 0.000000, 0.250000,
-    0.886465, -0.448242, 0.377168, 0.809660, -0.480250, 0.337358, 0.250000, 0.250000,
-    0.682266, -0.448242, 0.682266, 0.619529, -0.482045, 0.619529, 0.500000, 0.250000,
-    0.807187, -0.557812, 0.343437, 0.644654, -0.715732, 0.268606, 0.250000, 0.500000,
-    0.980000, -0.300000, 0.203750, 0.980581, 0.000000, 0.196116, 0.125000, 0.000000,
-    0.989258, -0.379175, -0.000000, 0.963722, -0.266906, 0.000000, 0.000000, 0.125000,
-    0.969473, -0.379175, 0.201561, 0.945004, -0.266919, 0.189001, 0.125000, 0.125000,
-    0.912590, -0.379175, 0.388284, 0.889432, -0.267526, 0.370596, 0.250000, 0.125000,
-    0.941719, -0.448242, 0.195791, 0.859935, -0.480554, 0.171987, 0.125000, 0.250000,
-    0.831250, -0.300000, 0.562500, 0.830544, 0.000000, 0.556953, 0.375000, 0.000000,
-    0.912590, -0.379175, 0.388284, 0.889431, -0.267526, 0.370597, 0.250000, 0.125000,
-    0.822320, -0.379175, 0.556458, 0.800254, -0.267602, 0.536641, 0.375000, 0.125000,
-    0.702373, -0.379175, 0.702373, 0.681256, -0.267921, 0.681256, 0.500000, 0.125000,
-    0.798779, -0.448242, 0.540527, 0.727894, -0.481571, 0.488118, 0.375000, 0.250000,
-    0.941719, -0.448242, 0.195791, 0.859935, -0.480554, 0.171987, 0.125000, 0.250000,
-    0.920898, -0.507642, -0.000000, 0.779645, -0.626221, 0.000000, 0.000000, 0.375000,
-    0.902480, -0.507642, 0.187633, 0.764489, -0.626241, 0.152898, 0.125000, 0.375000,
-    0.849529, -0.507642, 0.361453, 0.718967, -0.627172, 0.299570, 0.250000, 0.375000,
-    0.857500, -0.557812, 0.178281, 0.684525, -0.716019, 0.136905, 0.125000, 0.500000,
-    0.798779, -0.448242, 0.540527, 0.727894, -0.481572, 0.488118, 0.375000, 0.250000,
-    0.849529, -0.507642, 0.361453, 0.718967, -0.627172, 0.299570, 0.250000, 0.375000,
-    0.765497, -0.507642, 0.518005, 0.646817, -0.627288, 0.433748, 0.375000, 0.375000,
-    0.653838, -0.507642, 0.653838, 0.550409, -0.627775, 0.550409, 0.500000, 0.375000,
-    0.727344, -0.557812, 0.492188, 0.578969, -0.716978, 0.388249, 0.375000, 0.500000,
-    0.392500, -0.300000, 0.922500, 0.384615, 0.000000, 0.923077, 0.750000, 0.000000,
-    0.682266, -0.448242, 0.682266, 0.619529, -0.482045, 0.619529, 0.500000, 0.250000,
-    0.377168, -0.448242, 0.886465, 0.337418, -0.479966, 0.809804, 0.750000, 0.250000,
-    0.000000, -0.448242, 0.960938, 0.000000, -0.480535, 0.876976, 1.000000, 0.250000,
-    0.343437, -0.557812, 0.807187, 0.268712, -0.715463, 0.644908, 0.750000, 0.500000,
-    0.562500, -0.300000, 0.831250, 0.556953, 0.000000, 0.830544, 0.625000, 0.000000,
-    0.702373, -0.379175, 0.702373, 0.681256, -0.267921, 0.681256, 0.500000, 0.125000,
-    0.556458, -0.379175, 0.822320, 0.536643, -0.267590, 0.800256, 0.625000, 0.125000,
-    0.388284, -0.379175, 0.912590, 0.370597, -0.267526, 0.889431, 0.750000, 0.125000,
-    0.540527, -0.448242, 0.798779, 0.488123, -0.481553, 0.727903, 0.625000, 0.250000,
-    0.203750, -0.300000, 0.980000, 0.196116, 0.000000, 0.980581, 0.875000, 0.000000,
-    0.388284, -0.379175, 0.912590, 0.370596, -0.267526, 0.889432, 0.750000, 0.125000,
-    0.201561, -0.379175, 0.969473, 0.189003, -0.266885, 0.945014, 0.875000, 0.125000,
-    0.000000, -0.379175, 0.989258, 0.000000, -0.266906, 0.963722, 1.000000, 0.125000,
-    0.195791, -0.448242, 0.941719, 0.171993, -0.480502, 0.859963, 0.875000, 0.250000,
-    0.540527, -0.448242, 0.798779, 0.488123, -0.481553, 0.727903, 0.625000, 0.250000,
-    0.653838, -0.507642, 0.653838, 0.550409, -0.627775, 0.550409, 0.500000, 0.375000,
-    0.518005, -0.507642, 0.765497, 0.433756, -0.627270, 0.646829, 0.625000, 0.375000,
-    0.361453, -0.507642, 0.849529, 0.299570, -0.627172, 0.718967, 0.750000, 0.375000,
-    0.492188, -0.557812, 0.727344, 0.388259, -0.716961, 0.578983, 0.625000, 0.500000,
-    0.195791, -0.448242, 0.941719, 0.171993, -0.480502, 0.859963, 0.875000, 0.250000,
-    0.361453, -0.507642, 0.849529, 0.299570, -0.627172, 0.718967, 0.750000, 0.375000,
-    0.187633, -0.507642, 0.902480, 0.152906, -0.626188, 0.764532, 0.875000, 0.375000,
-    0.000000, -0.507642, 0.920898, 0.000000, -0.626221, 0.779645, 1.000000, 0.375000,
-    0.178281, -0.557812, 0.857500, 0.136915, -0.715970, 0.684574, 0.875000, 0.500000,
-    0.807187, -0.557812, 0.343437, 0.644654, -0.715731, 0.268606, 0.250000, 0.500000,
-    0.789062, -0.632227, -0.000000, 0.636383, -0.771373, 0.000000, 0.000000, 0.750000,
-    0.727910, -0.632227, 0.309707, 0.587700, -0.771133, 0.244875, 0.250000, 0.750000,
-    0.560234, -0.632227, 0.560234, 0.448897, -0.772647, 0.448897, 0.500000, 0.750000,
-    0.691875, -0.675000, 0.294375, 0.923077, 0.000000, 0.384615, 0.250000, 1.000000,
-    0.857500, -0.557812, 0.178281, 0.684525, -0.716018, 0.136905, 0.125000, 0.500000,
-    0.829102, -0.599194, -0.000000, 0.645429, -0.763821, 0.000000, 0.000000, 0.625000,
-    0.812519, -0.599194, 0.168929, 0.632876, -0.763837, 0.126575, 0.125000, 0.625000,
-    0.764846, -0.599194, 0.325422, 0.594912, -0.764614, 0.247880, 0.250000, 0.625000,
-    0.773281, -0.632227, 0.160771, 0.624005, -0.771390, 0.124801, 0.125000, 0.750000,
-    0.727344, -0.557812, 0.492188, 0.578969, -0.716978, 0.388249, 0.375000, 0.500000,
-    0.764846, -0.599194, 0.325422, 0.594912, -0.764614, 0.247880, 0.250000, 0.625000,
-    0.689191, -0.599194, 0.466370, 0.535179, -0.764712, 0.358885, 0.375000, 0.625000,
-    0.588662, -0.599194, 0.588662, 0.455299, -0.765118, 0.455299, 0.500000, 0.625000,
-    0.655908, -0.632227, 0.443848, 0.527662, -0.772248, 0.353844, 0.375000, 0.750000,
-    0.773281, -0.632227, 0.160771, 0.624005, -0.771390, 0.124801, 0.125000, 0.750000,
-    0.760742, -0.657349, -0.000000, 0.720596, -0.693356, 0.000000, 0.000000, 0.875000,
-    0.745527, -0.657349, 0.155001, 0.706584, -0.693375, 0.141317, 0.125000, 0.875000,
-    0.701785, -0.657349, 0.298591, 0.664366, -0.694254, 0.276819, 0.250000, 0.875000,
-    0.735000, -0.675000, 0.152812, 0.980581, 0.000000, 0.196116, 0.125000, 1.000000,
-    0.655908, -0.632227, 0.443848, 0.527662, -0.772249, 0.353844, 0.375000, 0.750000,
-    0.701785, -0.657349, 0.298591, 0.664366, -0.694254, 0.276819, 0.250000, 0.875000,
-    0.632367, -0.657349, 0.427917, 0.597679, -0.694365, 0.400796, 0.375000, 0.875000,
-    0.540127, -0.657349, 0.540127, 0.508537, -0.694825, 0.508536, 0.500000, 0.875000,
-    0.623438, -0.675000, 0.421875, 0.830544, 0.000000, 0.556953, 0.375000, 1.000000,
-    0.343437, -0.557812, 0.807187, 0.268712, -0.715463, 0.644909, 0.750000, 0.500000,
-    0.560234, -0.632227, 0.560234, 0.448897, -0.772647, 0.448897, 0.500000, 0.750000,
-    0.309707, -0.632227, 0.727910, 0.244987, -0.770892, 0.587969, 0.750000, 0.750000,
-    0.000000, -0.632227, 0.789062, 0.000000, -0.771373, 0.636383, 1.000000, 0.750000,
-    0.294375, -0.675000, 0.691875, 0.384615, 0.000000, 0.923077, 0.750000, 1.000000,
-    0.492188, -0.557812, 0.727344, 0.388259, -0.716961, 0.578983, 0.625000, 0.500000,
-    0.588662, -0.599194, 0.588662, 0.455299, -0.765118, 0.455299, 0.500000, 0.625000,
-    0.466370, -0.599194, 0.689191, 0.358895, -0.764697, 0.535195, 0.625000, 0.625000,
-    0.325422, -0.599194, 0.764846, 0.247880, -0.764614, 0.594912, 0.750000, 0.625000,
-    0.443848, -0.632227, 0.655908, 0.353854, -0.772233, 0.527677, 0.625000, 0.750000,
-    0.178281, -0.557812, 0.857500, 0.136915, -0.715969, 0.684575, 0.875000, 0.500000,
-    0.325422, -0.599194, 0.764846, 0.247880, -0.764614, 0.594912, 0.750000, 0.625000,
-    0.168929, -0.599194, 0.812519, 0.126585, -0.763793, 0.632927, 0.875000, 0.625000,
-    0.000000, -0.599194, 0.829102, 0.000000, -0.763821, 0.645429, 1.000000, 0.625000,
-    0.160771, -0.632227, 0.773281, 0.124811, -0.771346, 0.624057, 0.875000, 0.750000,
-    0.443848, -0.632227, 0.655908, 0.353854, -0.772233, 0.527677, 0.625000, 0.750000,
-    0.540127, -0.657349, 0.540127, 0.508536, -0.694825, 0.508537, 0.500000, 0.875000,
-    0.427917, -0.657349, 0.632367, 0.400806, -0.694347, 0.597693, 0.625000, 0.875000,
-    0.298591, -0.657349, 0.701785, 0.276819, -0.694254, 0.664366, 0.750000, 0.875000,
-    0.421875, -0.675000, 0.623438, 0.556953, 0.000000, 0.830544, 0.625000, 1.000000,
-    0.160771, -0.632227, 0.773281, 0.124811, -0.771346, 0.624057, 0.875000, 0.750000,
-    0.298591, -0.657349, 0.701785, 0.276819, -0.694254, 0.664366, 0.750000, 0.875000,
-    0.155001, -0.657349, 0.745527, 0.141326, -0.693324, 0.706632, 0.875000, 0.875000,
-    0.000000, -0.657349, 0.760742, 0.000000, -0.693356, 0.720596, 1.000000, 0.875000,
-    0.152812, -0.675000, 0.735000, 0.196116, 0.000000, 0.980581, 0.875000, 1.000000,
-    0.000000, -0.300000, 1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000,
-    -1.000000, -0.300000, -0.000000, -1.000000, -0.000000, -0.000000, 1.000000, 0.000000,
-    0.000000, -0.675000, 0.750000, 0.000000, 0.000000, 1.000000, 0.000000, 1.000000,
-    -0.750000, -0.675000, -0.000000, -1.000000, -0.000000, -0.000000, 1.000000, 1.000000,
-    -0.710000, -0.300000, 0.710000, -0.707107, 0.000000, 0.707107, 0.500000, 0.000000,
-    0.000000, -0.557812, 0.875000, 0.000000, -0.716000, 0.698100, 0.000000, 0.500000,
-    -0.621250, -0.557812, 0.621250, -0.496182, -0.712466, 0.496182, 0.500000, 0.500000,
-    -0.875000, -0.557812, -0.000000, -0.698100, -0.716000, -0.000000, 1.000000, 0.500000,
-    -0.532500, -0.675000, 0.532500, -0.707107, 0.000000, 0.707107, 0.500000, 1.000000,
-    -0.392500, -0.300000, 0.922500, -0.384615, 0.000000, 0.923077, 0.250000, 0.000000,
-    0.000000, -0.448242, 0.960938, 0.000000, -0.480535, 0.876976, 0.000000, 0.250000,
-    -0.377168, -0.448242, 0.886465, -0.337358, -0.480250, 0.809660, 0.250000, 0.250000,
-    -0.682266, -0.448242, 0.682266, -0.619529, -0.482045, 0.619529, 0.500000, 0.250000,
-    -0.343437, -0.557812, 0.807187, -0.268606, -0.715732, 0.644654, 0.250000, 0.500000,
-    -0.203750, -0.300000, 0.980000, -0.196116, 0.000000, 0.980581, 0.125000, 0.000000,
-    0.000000, -0.379175, 0.989258, 0.000000, -0.266906, 0.963722, 0.000000, 0.125000,
-    -0.201561, -0.379175, 0.969473, -0.189001, -0.266919, 0.945004, 0.125000, 0.125000,
-    -0.388284, -0.379175, 0.912590, -0.370596, -0.267526, 0.889432, 0.250000, 0.125000,
-    -0.195791, -0.448242, 0.941719, -0.171987, -0.480554, 0.859935, 0.125000, 0.250000,
-    -0.562500, -0.300000, 0.831250, -0.556953, 0.000000, 0.830544, 0.375000, 0.000000,
-    -0.388284, -0.379175, 0.912590, -0.370597, -0.267526, 0.889431, 0.250000, 0.125000,
-    -0.556458, -0.379175, 0.822320, -0.536641, -0.267602, 0.800254, 0.375000, 0.125000,
-    -0.702373, -0.379175, 0.702373, -0.681256, -0.267921, 0.681256, 0.500000, 0.125000,
-    -0.540527, -0.448242, 0.798779, -0.488118, -0.481571, 0.727894, 0.375000, 0.250000,
-    -0.195791, -0.448242, 0.941719, -0.171987, -0.480554, 0.859935, 0.125000, 0.250000,
-    0.000000, -0.507642, 0.920898, 0.000000, -0.626221, 0.779645, 0.000000, 0.375000,
-    -0.187633, -0.507642, 0.902480, -0.152898, -0.626241, 0.764489, 0.125000, 0.375000,
-    -0.361453, -0.507642, 0.849529, -0.299570, -0.627172, 0.718967, 0.250000, 0.375000,
-    -0.178281, -0.557812, 0.857500, -0.136905, -0.716019, 0.684525, 0.125000, 0.500000,
-    -0.540527, -0.448242, 0.798779, -0.488118, -0.481572, 0.727894, 0.375000, 0.250000,
-    -0.361453, -0.507642, 0.849529, -0.299570, -0.627172, 0.718967, 0.250000, 0.375000,
-    -0.518005, -0.507642, 0.765497, -0.433748, -0.627288, 0.646817, 0.375000, 0.375000,
-    -0.653838, -0.507642, 0.653838, -0.550409, -0.627775, 0.550409, 0.500000, 0.375000,
-    -0.492188, -0.557812, 0.727344, -0.388249, -0.716978, 0.578969, 0.375000, 0.500000,
-    -0.922500, -0.300000, 0.392500, -0.923077, 0.000000, 0.384615, 0.750000, 0.000000,
-    -0.682266, -0.448242, 0.682266, -0.619529, -0.482045, 0.619529, 0.500000, 0.250000,
-    -0.886465, -0.448242, 0.377168, -0.809804, -0.479966, 0.337418, 0.750000, 0.250000,
-    -0.960938, -0.448242, -0.000000, -0.876976, -0.480535, -0.000000, 1.000000, 0.250000,
-    -0.807187, -0.557812, 0.343437, -0.644908, -0.715463, 0.268712, 0.750000, 0.500000,
-    -0.831250, -0.300000, 0.562500, -0.830544, 0.000000, 0.556953, 0.625000, 0.000000,
-    -0.702373, -0.379175, 0.702373, -0.681256, -0.267921, 0.681256, 0.500000, 0.125000,
-    -0.822320, -0.379175, 0.556458, -0.800256, -0.267590, 0.536643, 0.625000, 0.125000,
-    -0.912590, -0.379175, 0.388284, -0.889431, -0.267526, 0.370597, 0.750000, 0.125000,
-    -0.798779, -0.448242, 0.540527, -0.727903, -0.481553, 0.488123, 0.625000, 0.250000,
-    -0.980000, -0.300000, 0.203750, -0.980581, 0.000000, 0.196116, 0.875000, 0.000000,
-    -0.912590, -0.379175, 0.388284, -0.889432, -0.267526, 0.370596, 0.750000, 0.125000,
-    -0.969473, -0.379175, 0.201561, -0.945014, -0.266885, 0.189003, 0.875000, 0.125000,
-    -0.989258, -0.379175, -0.000000, -0.963722, -0.266906, -0.000000, 1.000000, 0.125000,
-    -0.941719, -0.448242, 0.195791, -0.859963, -0.480502, 0.171993, 0.875000, 0.250000,
-    -0.798779, -0.448242, 0.540527, -0.727903, -0.481553, 0.488123, 0.625000, 0.250000,
-    -0.653838, -0.507642, 0.653838, -0.550409, -0.627775, 0.550409, 0.500000, 0.375000,
-    -0.765497, -0.507642, 0.518005, -0.646829, -0.627270, 0.433756, 0.625000, 0.375000,
-    -0.849529, -0.507642, 0.361453, -0.718967, -0.627172, 0.299570, 0.750000, 0.375000,
-    -0.727344, -0.557812, 0.492188, -0.578983, -0.716961, 0.388259, 0.625000, 0.500000,
-    -0.941719, -0.448242, 0.195791, -0.859963, -0.480502, 0.171993, 0.875000, 0.250000,
-    -0.849529, -0.507642, 0.361453, -0.718967, -0.627172, 0.299570, 0.750000, 0.375000,
-    -0.902480, -0.507642, 0.187633, -0.764532, -0.626188, 0.152906, 0.875000, 0.375000,
-    -0.920898, -0.507642, -0.000000, -0.779645, -0.626221, -0.000000, 1.000000, 0.375000,
-    -0.857500, -0.557812, 0.178281, -0.684574, -0.715970, 0.136915, 0.875000, 0.500000,
-    -0.343437, -0.557812, 0.807187, -0.268606, -0.715731, 0.644654, 0.250000, 0.500000,
-    0.000000, -0.632227, 0.789062, 0.000000, -0.771373, 0.636383, 0.000000, 0.750000,
-    -0.309707, -0.632227, 0.727910, -0.244875, -0.771133, 0.587700, 0.250000, 0.750000,
-    -0.560234, -0.632227, 0.560234, -0.448897, -0.772647, 0.448897, 0.500000, 0.750000,
-    -0.294375, -0.675000, 0.691875, -0.384615, 0.000000, 0.923077, 0.250000, 1.000000,
-    -0.178281, -0.557812, 0.857500, -0.136905, -0.716018, 0.684525, 0.125000, 0.500000,
-    0.000000, -0.599194, 0.829102, 0.000000, -0.763821, 0.645429, 0.000000, 0.625000,
-    -0.168929, -0.599194, 0.812519, -0.126575, -0.763837, 0.632876, 0.125000, 0.625000,
-    -0.325422, -0.599194, 0.764846, -0.247880, -0.764614, 0.594912, 0.250000, 0.625000,
-    -0.160771, -0.632227, 0.773281, -0.124801, -0.771390, 0.624005, 0.125000, 0.750000,
-    -0.492188, -0.557812, 0.727344, -0.388249, -0.716978, 0.578969, 0.375000, 0.500000,
-    -0.325422, -0.599194, 0.764846, -0.247880, -0.764614, 0.594912, 0.250000, 0.625000,
-    -0.466370, -0.599194, 0.689191, -0.358885, -0.764712, 0.535179, 0.375000, 0.625000,
-    -0.588662, -0.599194, 0.588662, -0.455299, -0.765118, 0.455299, 0.500000, 0.625000,
-    -0.443848, -0.632227, 0.655908, -0.353844, -0.772248, 0.527662, 0.375000, 0.750000,
-    -0.160771, -0.632227, 0.773281, -0.124801, -0.771390, 0.624005, 0.125000, 0.750000,
-    0.000000, -0.657349, 0.760742, 0.000000, -0.693356, 0.720596, 0.000000, 0.875000,
-    -0.155001, -0.657349, 0.745527, -0.141317, -0.693375, 0.706584, 0.125000, 0.875000,
-    -0.298591, -0.657349, 0.701785, -0.276819, -0.694254, 0.664366, 0.250000, 0.875000,
-    -0.152812, -0.675000, 0.735000, -0.196116, 0.000000, 0.980581, 0.125000, 1.000000,
-    -0.443848, -0.632227, 0.655908, -0.353844, -0.772249, 0.527662, 0.375000, 0.750000,
-    -0.298591, -0.657349, 0.701785, -0.276819, -0.694254, 0.664366, 0.250000, 0.875000,
-    -0.427917, -0.657349, 0.632367, -0.400796, -0.694365, 0.597679, 0.375000, 0.875000,
-    -0.540127, -0.657349, 0.540127, -0.508536, -0.694825, 0.508537, 0.500000, 0.875000,
-    -0.421875, -0.675000, 0.623438, -0.556953, 0.000000, 0.830544, 0.375000, 1.000000,
-    -0.807187, -0.557812, 0.343437, -0.644909, -0.715463, 0.268712, 0.750000, 0.500000,
-    -0.560234, -0.632227, 0.560234, -0.448897, -0.772647, 0.448897, 0.500000, 0.750000,
-    -0.727910, -0.632227, 0.309707, -0.587969, -0.770892, 0.244987, 0.750000, 0.750000,
-    -0.789062, -0.632227, -0.000000, -0.636383, -0.771373, -0.000000, 1.000000, 0.750000,
-    -0.691875, -0.675000, 0.294375, -0.923077, 0.000000, 0.384615, 0.750000, 1.000000,
-    -0.727344, -0.557812, 0.492188, -0.578983, -0.716961, 0.388259, 0.625000, 0.500000,
-    -0.588662, -0.599194, 0.588662, -0.455299, -0.765118, 0.455299, 0.500000, 0.625000,
-    -0.689191, -0.599194, 0.466370, -0.535195, -0.764697, 0.358895, 0.625000, 0.625000,
-    -0.764846, -0.599194, 0.325422, -0.594912, -0.764614, 0.247880, 0.750000, 0.625000,
-    -0.655908, -0.632227, 0.443848, -0.527677, -0.772233, 0.353854, 0.625000, 0.750000,
-    -0.857500, -0.557812, 0.178281, -0.684575, -0.715969, 0.136915, 0.875000, 0.500000,
-    -0.764846, -0.599194, 0.325422, -0.594912, -0.764614, 0.247880, 0.750000, 0.625000,
-    -0.812519, -0.599194, 0.168929, -0.632927, -0.763793, 0.126585, 0.875000, 0.625000,
-    -0.829102, -0.599194, -0.000000, -0.645429, -0.763821, -0.000000, 1.000000, 0.625000,
-    -0.773281, -0.632227, 0.160771, -0.624057, -0.771346, 0.124811, 0.875000, 0.750000,
-    -0.655908, -0.632227, 0.443848, -0.527677, -0.772233, 0.353854, 0.625000, 0.750000,
-    -0.540127, -0.657349, 0.540127, -0.508537, -0.694825, 0.508536, 0.500000, 0.875000,
-    -0.632367, -0.657349, 0.427917, -0.597693, -0.694347, 0.400806, 0.625000, 0.875000,
-    -0.701785, -0.657349, 0.298591, -0.664366, -0.694254, 0.276819, 0.750000, 0.875000,
-    -0.623438, -0.675000, 0.421875, -0.830544, 0.000000, 0.556953, 0.625000, 1.000000,
-    -0.773281, -0.632227, 0.160771, -0.624057, -0.771346, 0.124811, 0.875000, 0.750000,
-    -0.701785, -0.657349, 0.298591, -0.664366, -0.694254, 0.276819, 0.750000, 0.875000,
-    -0.745527, -0.657349, 0.155001, -0.706632, -0.693324, 0.141326, 0.875000, 0.875000,
-    -0.760742, -0.657349, -0.000000, -0.720596, -0.693356, -0.000000, 1.000000, 0.875000,
-    -0.735000, -0.675000, 0.152812, -0.980581, 0.000000, 0.196116, 0.875000, 1.000000,
-    -1.000000, -0.300000, -0.000000, -1.000000, -0.000000, -0.000000, 0.000000, 0.000000,
-    0.000000, -0.300000, -1.000000, 0.000000, 0.000000, -1.000000, 1.000000, 0.000000,
-    -0.750000, -0.675000, -0.000000, -1.000000, -0.000000, -0.000000, 0.000000, 1.000000,
-    0.000000, -0.675000, -0.750000, 0.000000, 0.000000, -1.000000, 1.000000, 1.000000,
-    -0.710000, -0.300000, -0.710000, -0.707107, -0.000000, -0.707107, 0.500000, 0.000000,
-    -0.875000, -0.557812, -0.000000, -0.698100, -0.716000, -0.000000, 0.000000, 0.500000,
-    -0.621250, -0.557812, -0.621250, -0.496182, -0.712466, -0.496182, 0.500000, 0.500000,
-    0.000000, -0.557812, -0.875000, 0.000000, -0.716000, -0.698100, 1.000000, 0.500000,
-    -0.532500, -0.675000, -0.532500, -0.707107, -0.000000, -0.707107, 0.500000, 1.000000,
-    -0.922500, -0.300000, -0.392500, -0.923077, -0.000000, -0.384615, 0.250000, 0.000000,
-    -0.960938, -0.448242, -0.000000, -0.876976, -0.480535, -0.000000, 0.000000, 0.250000,
-    -0.886465, -0.448242, -0.377168, -0.809660, -0.480250, -0.337358, 0.250000, 0.250000,
-    -0.682266, -0.448242, -0.682266, -0.619529, -0.482045, -0.619529, 0.500000, 0.250000,
-    -0.807187, -0.557812, -0.343437, -0.644654, -0.715732, -0.268606, 0.250000, 0.500000,
-    -0.980000, -0.300000, -0.203750, -0.980581, -0.000000, -0.196116, 0.125000, 0.000000,
-    -0.989258, -0.379175, -0.000000, -0.963722, -0.266906, -0.000000, 0.000000, 0.125000,
-    -0.969473, -0.379175, -0.201561, -0.945004, -0.266919, -0.189001, 0.125000, 0.125000,
-    -0.912590, -0.379175, -0.388284, -0.889432, -0.267526, -0.370596, 0.250000, 0.125000,
-    -0.941719, -0.448242, -0.195791, -0.859935, -0.480554, -0.171987, 0.125000, 0.250000,
-    -0.831250, -0.300000, -0.562500, -0.830544, -0.000000, -0.556953, 0.375000, 0.000000,
-    -0.912590, -0.379175, -0.388284, -0.889431, -0.267526, -0.370597, 0.250000, 0.125000,
-    -0.822320, -0.379175, -0.556458, -0.800254, -0.267602, -0.536641, 0.375000, 0.125000,
-    -0.702373, -0.379175, -0.702373, -0.681256, -0.267921, -0.681256, 0.500000, 0.125000,
-    -0.798779, -0.448242, -0.540527, -0.727894, -0.481571, -0.488118, 0.375000, 0.250000,
-    -0.941719, -0.448242, -0.195791, -0.859935, -0.480554, -0.171987, 0.125000, 0.250000,
-    -0.920898, -0.507642, -0.000000, -0.779645, -0.626221, -0.000000, 0.000000, 0.375000,
-    -0.902480, -0.507642, -0.187633, -0.764489, -0.626241, -0.152898, 0.125000, 0.375000,
-    -0.849529, -0.507642, -0.361453, -0.718967, -0.627172, -0.299570, 0.250000, 0.375000,
-    -0.857500, -0.557812, -0.178281, -0.684525, -0.716019, -0.136905, 0.125000, 0.500000,
-    -0.798779, -0.448242, -0.540527, -0.727894, -0.481572, -0.488118, 0.375000, 0.250000,
-    -0.849529, -0.507642, -0.361453, -0.718967, -0.627172, -0.299570, 0.250000, 0.375000,
-    -0.765497, -0.507642, -0.518005, -0.646817, -0.627288, -0.433748, 0.375000, 0.375000,
-    -0.653838, -0.507642, -0.653838, -0.550409, -0.627775, -0.550409, 0.500000, 0.375000,
-    -0.727344, -0.557812, -0.492188, -0.578969, -0.716978, -0.388249, 0.375000, 0.500000,
-    -0.392500, -0.300000, -0.922500, -0.384615, -0.000000, -0.923077, 0.750000, 0.000000,
-    -0.682266, -0.448242, -0.682266, -0.619529, -0.482045, -0.619529, 0.500000, 0.250000,
-    -0.377168, -0.448242, -0.886465, -0.337418, -0.479966, -0.809804, 0.750000, 0.250000,
-    0.000000, -0.448242, -0.960938, 0.000000, -0.480535, -0.876976, 1.000000, 0.250000,
-    -0.343437, -0.557812, -0.807187, -0.268712, -0.715463, -0.644908, 0.750000, 0.500000,
-    -0.562500, -0.300000, -0.831250, -0.556953, -0.000000, -0.830544, 0.625000, 0.000000,
-    -0.702373, -0.379175, -0.702373, -0.681256, -0.267921, -0.681256, 0.500000, 0.125000,
-    -0.556458, -0.379175, -0.822320, -0.536643, -0.267590, -0.800256, 0.625000, 0.125000,
-    -0.388284, -0.379175, -0.912590, -0.370597, -0.267526, -0.889431, 0.750000, 0.125000,
-    -0.540527, -0.448242, -0.798779, -0.488123, -0.481553, -0.727903, 0.625000, 0.250000,
-    -0.203750, -0.300000, -0.980000, -0.196116, -0.000000, -0.980581, 0.875000, 0.000000,
-    -0.388284, -0.379175, -0.912590, -0.370596, -0.267526, -0.889432, 0.750000, 0.125000,
-    -0.201561, -0.379175, -0.969473, -0.189003, -0.266885, -0.945014, 0.875000, 0.125000,
-    0.000000, -0.379175, -0.989258, 0.000000, -0.266906, -0.963722, 1.000000, 0.125000,
-    -0.195791, -0.448242, -0.941719, -0.171993, -0.480502, -0.859963, 0.875000, 0.250000,
-    -0.540527, -0.448242, -0.798779, -0.488123, -0.481553, -0.727903, 0.625000, 0.250000,
-    -0.653838, -0.507642, -0.653838, -0.550409, -0.627775, -0.550409, 0.500000, 0.375000,
-    -0.518005, -0.507642, -0.765497, -0.433756, -0.627270, -0.646829, 0.625000, 0.375000,
-    -0.361453, -0.507642, -0.849529, -0.299570, -0.627172, -0.718967, 0.750000, 0.375000,
-    -0.492188, -0.557812, -0.727344, -0.388259, -0.716961, -0.578983, 0.625000, 0.500000,
-    -0.195791, -0.448242, -0.941719, -0.171993, -0.480502, -0.859963, 0.875000, 0.250000,
-    -0.361453, -0.507642, -0.849529, -0.299570, -0.627172, -0.718967, 0.750000, 0.375000,
-    -0.187633, -0.507642, -0.902480, -0.152906, -0.626188, -0.764532, 0.875000, 0.375000,
-    0.000000, -0.507642, -0.920898, 0.000000, -0.626221, -0.779645, 1.000000, 0.375000,
-    -0.178281, -0.557812, -0.857500, -0.136915, -0.715970, -0.684574, 0.875000, 0.500000,
-    -0.807187, -0.557812, -0.343437, -0.644654, -0.715731, -0.268606, 0.250000, 0.500000,
-    -0.789062, -0.632227, -0.000000, -0.636383, -0.771373, -0.000000, 0.000000, 0.750000,
-    -0.727910, -0.632227, -0.309707, -0.587700, -0.771133, -0.244875, 0.250000, 0.750000,
-    -0.560234, -0.632227, -0.560234, -0.448897, -0.772647, -0.448897, 0.500000, 0.750000,
-    -0.691875, -0.675000, -0.294375, -0.923077, -0.000000, -0.384615, 0.250000, 1.000000,
-    -0.857500, -0.557812, -0.178281, -0.684525, -0.716018, -0.136905, 0.125000, 0.500000,
-    -0.829102, -0.599194, -0.000000, -0.645429, -0.763821, -0.000000, 0.000000, 0.625000,
-    -0.812519, -0.599194, -0.168929, -0.632876, -0.763837, -0.126575, 0.125000, 0.625000,
-    -0.764846, -0.599194, -0.325422, -0.594912, -0.764614, -0.247880, 0.250000, 0.625000,
-    -0.773281, -0.632227, -0.160771, -0.624005, -0.771390, -0.124801, 0.125000, 0.750000,
-    -0.727344, -0.557812, -0.492188, -0.578969, -0.716978, -0.388249, 0.375000, 0.500000,
-    -0.764846, -0.599194, -0.325422, -0.594912, -0.764614, -0.247880, 0.250000, 0.625000,
-    -0.689191, -0.599194, -0.466370, -0.535179, -0.764712, -0.358885, 0.375000, 0.625000,
-    -0.588662, -0.599194, -0.588662, -0.455299, -0.765118, -0.455299, 0.500000, 0.625000,
-    -0.655908, -0.632227, -0.443848, -0.527662, -0.772248, -0.353844, 0.375000, 0.750000,
-    -0.773281, -0.632227, -0.160771, -0.624005, -0.771390, -0.124801, 0.125000, 0.750000,
-    -0.760742, -0.657349, -0.000000, -0.720596, -0.693356, -0.000000, 0.000000, 0.875000,
-    -0.745527, -0.657349, -0.155001, -0.706584, -0.693375, -0.141317, 0.125000, 0.875000,
-    -0.701785, -0.657349, -0.298591, -0.664366, -0.694254, -0.276819, 0.250000, 0.875000,
-    -0.735000, -0.675000, -0.152812, -0.980581, -0.000000, -0.196116, 0.125000, 1.000000,
-    -0.655908, -0.632227, -0.443848, -0.527662, -0.772249, -0.353844, 0.375000, 0.750000,
-    -0.701785, -0.657349, -0.298591, -0.664366, -0.694254, -0.276819, 0.250000, 0.875000,
-    -0.632367, -0.657349, -0.427917, -0.597679, -0.694365, -0.400796, 0.375000, 0.875000,
-    -0.540127, -0.657349, -0.540127, -0.508537, -0.694825, -0.508536, 0.500000, 0.875000,
-    -0.623438, -0.675000, -0.421875, -0.830544, -0.000000, -0.556953, 0.375000, 1.000000,
-    -0.343437, -0.557812, -0.807187, -0.268712, -0.715463, -0.644909, 0.750000, 0.500000,
-    -0.560234, -0.632227, -0.560234, -0.448897, -0.772647, -0.448897, 0.500000, 0.750000,
-    -0.309707, -0.632227, -0.727910, -0.244987, -0.770892, -0.587969, 0.750000, 0.750000,
-    0.000000, -0.632227, -0.789062, 0.000000, -0.771373, -0.636383, 1.000000, 0.750000,
-    -0.294375, -0.675000, -0.691875, -0.384615, -0.000000, -0.923077, 0.750000, 1.000000,
-    -0.492188, -0.557812, -0.727344, -0.388259, -0.716961, -0.578983, 0.625000, 0.500000,
-    -0.588662, -0.599194, -0.588662, -0.455299, -0.765118, -0.455299, 0.500000, 0.625000,
-    -0.466370, -0.599194, -0.689191, -0.358895, -0.764697, -0.535195, 0.625000, 0.625000,
-    -0.325422, -0.599194, -0.764846, -0.247880, -0.764614, -0.594912, 0.750000, 0.625000,
-    -0.443848, -0.632227, -0.655908, -0.353854, -0.772233, -0.527677, 0.625000, 0.750000,
-    -0.178281, -0.557812, -0.857500, -0.136915, -0.715969, -0.684575, 0.875000, 0.500000,
-    -0.325422, -0.599194, -0.764846, -0.247880, -0.764614, -0.594912, 0.750000, 0.625000,
-    -0.168929, -0.599194, -0.812519, -0.126585, -0.763793, -0.632927, 0.875000, 0.625000,
-    0.000000, -0.599194, -0.829102, 0.000000, -0.763821, -0.645429, 1.000000, 0.625000,
-    -0.160771, -0.632227, -0.773281, -0.124811, -0.771346, -0.624057, 0.875000, 0.750000,
-    -0.443848, -0.632227, -0.655908, -0.353854, -0.772233, -0.527677, 0.625000, 0.750000,
-    -0.540127, -0.657349, -0.540127, -0.508536, -0.694825, -0.508537, 0.500000, 0.875000,
-    -0.427917, -0.657349, -0.632367, -0.400806, -0.694347, -0.597693, 0.625000, 0.875000,
-    -0.298591, -0.657349, -0.701785, -0.276819, -0.694254, -0.664366, 0.750000, 0.875000,
-    -0.421875, -0.675000, -0.623438, -0.556953, -0.000000, -0.830544, 0.625000, 1.000000,
-    -0.160771, -0.632227, -0.773281, -0.124811, -0.771346, -0.624057, 0.875000, 0.750000,
-    -0.298591, -0.657349, -0.701785, -0.276819, -0.694254, -0.664366, 0.750000, 0.875000,
-    -0.155001, -0.657349, -0.745527, -0.141326, -0.693324, -0.706632, 0.875000, 0.875000,
-    0.000000, -0.657349, -0.760742, 0.000000, -0.693356, -0.720596, 1.000000, 0.875000,
-    -0.152812, -0.675000, -0.735000, -0.196116, -0.000000, -0.980581, 0.875000, 1.000000,
-    0.000000, -0.300000, -1.000000, 0.000000, 0.000000, -1.000000, 0.000000, 0.000000,
-    1.000000, -0.300000, -0.000000, 1.000000, 0.000000, -0.000000, 1.000000, 0.000000,
-    0.000000, -0.675000, -0.750000, 0.000000, 0.000000, -1.000000, 0.000000, 1.000000,
-    0.750000, -0.675000, -0.000000, 1.000000, 0.000000, -0.000000, 1.000000, 1.000000,
-    0.710000, -0.300000, -0.710000, 0.707107, 0.000000, -0.707107, 0.500000, 0.000000,
-    0.000000, -0.557812, -0.875000, 0.000000, -0.716000, -0.698100, 0.000000, 0.500000,
-    0.621250, -0.557812, -0.621250, 0.496182, -0.712466, -0.496182, 0.500000, 0.500000,
-    0.875000, -0.557812, -0.000000, 0.698100, -0.716000, 0.000000, 1.000000, 0.500000,
-    0.532500, -0.675000, -0.532500, 0.707107, 0.000000, -0.707107, 0.500000, 1.000000,
-    0.392500, -0.300000, -0.922500, 0.384615, 0.000000, -0.923077, 0.250000, 0.000000,
-    0.000000, -0.448242, -0.960938, 0.000000, -0.480535, -0.876976, 0.000000, 0.250000,
-    0.377168, -0.448242, -0.886465, 0.337358, -0.480250, -0.809660, 0.250000, 0.250000,
-    0.682266, -0.448242, -0.682266, 0.619529, -0.482045, -0.619529, 0.500000, 0.250000,
-    0.343437, -0.557812, -0.807187, 0.268606, -0.715732, -0.644654, 0.250000, 0.500000,
-    0.203750, -0.300000, -0.980000, 0.196116, 0.000000, -0.980581, 0.125000, 0.000000,
-    0.000000, -0.379175, -0.989258, 0.000000, -0.266906, -0.963722, 0.000000, 0.125000,
-    0.201561, -0.379175, -0.969473, 0.189001, -0.266919, -0.945004, 0.125000, 0.125000,
-    0.388284, -0.379175, -0.912590, 0.370596, -0.267526, -0.889432, 0.250000, 0.125000,
-    0.195791, -0.448242, -0.941719, 0.171987, -0.480554, -0.859935, 0.125000, 0.250000,
-    0.562500, -0.300000, -0.831250, 0.556953, 0.000000, -0.830544, 0.375000, 0.000000,
-    0.388284, -0.379175, -0.912590, 0.370597, -0.267526, -0.889431, 0.250000, 0.125000,
-    0.556458, -0.379175, -0.822320, 0.536641, -0.267602, -0.800254, 0.375000, 0.125000,
-    0.702373, -0.379175, -0.702373, 0.681256, -0.267921, -0.681256, 0.500000, 0.125000,
-    0.540527, -0.448242, -0.798779, 0.488118, -0.481571, -0.727894, 0.375000, 0.250000,
-    0.195791, -0.448242, -0.941719, 0.171987, -0.480554, -0.859935, 0.125000, 0.250000,
-    0.000000, -0.507642, -0.920898, 0.000000, -0.626221, -0.779645, 0.000000, 0.375000,
-    0.187633, -0.507642, -0.902480, 0.152898, -0.626241, -0.764489, 0.125000, 0.375000,
-    0.361453, -0.507642, -0.849529, 0.299570, -0.627172, -0.718967, 0.250000, 0.375000,
-    0.178281, -0.557812, -0.857500, 0.136905, -0.716019, -0.684525, 0.125000, 0.500000,
-    0.540527, -0.448242, -0.798779, 0.488118, -0.481572, -0.727894, 0.375000, 0.250000,
-    0.361453, -0.507642, -0.849529, 0.299570, -0.627172, -0.718967, 0.250000, 0.375000,
-    0.518005, -0.507642, -0.765497, 0.433748, -0.627288, -0.646817, 0.375000, 0.375000,
-    0.653838, -0.507642, -0.653838, 0.550409, -0.627775, -0.550409, 0.500000, 0.375000,
-    0.492188, -0.557812, -0.727344, 0.388249, -0.716978, -0.578969, 0.375000, 0.500000,
-    0.922500, -0.300000, -0.392500, 0.923077, 0.000000, -0.384615, 0.750000, 0.000000,
-    0.682266, -0.448242, -0.682266, 0.619529, -0.482045, -0.619529, 0.500000, 0.250000,
-    0.886465, -0.448242, -0.377168, 0.809804, -0.479966, -0.337418, 0.750000, 0.250000,
-    0.960938, -0.448242, -0.000000, 0.876976, -0.480535, 0.000000, 1.000000, 0.250000,
-    0.807187, -0.557812, -0.343437, 0.644908, -0.715463, -0.268712, 0.750000, 0.500000,
-    0.831250, -0.300000, -0.562500, 0.830544, 0.000000, -0.556953, 0.625000, 0.000000,
-    0.702373, -0.379175, -0.702373, 0.681256, -0.267921, -0.681256, 0.500000, 0.125000,
-    0.822320, -0.379175, -0.556458, 0.800256, -0.267590, -0.536643, 0.625000, 0.125000,
-    0.912590, -0.379175, -0.388284, 0.889431, -0.267526, -0.370597, 0.750000, 0.125000,
-    0.798779, -0.448242, -0.540527, 0.727903, -0.481553, -0.488123, 0.625000, 0.250000,
-    0.980000, -0.300000, -0.203750, 0.980581, 0.000000, -0.196116, 0.875000, 0.000000,
-    0.912590, -0.379175, -0.388284, 0.889432, -0.267526, -0.370596, 0.750000, 0.125000,
-    0.969473, -0.379175, -0.201561, 0.945014, -0.266885, -0.189003, 0.875000, 0.125000,
-    0.989258, -0.379175, -0.000000, 0.963722, -0.266906, 0.000000, 1.000000, 0.125000,
-    0.941719, -0.448242, -0.195791, 0.859963, -0.480502, -0.171993, 0.875000, 0.250000,
-    0.798779, -0.448242, -0.540527, 0.727903, -0.481553, -0.488123, 0.625000, 0.250000,
-    0.653838, -0.507642, -0.653838, 0.550409, -0.627775, -0.550409, 0.500000, 0.375000,
-    0.765497, -0.507642, -0.518005, 0.646829, -0.627270, -0.433756, 0.625000, 0.375000,
-    0.849529, -0.507642, -0.361453, 0.718967, -0.627172, -0.299570, 0.750000, 0.375000,
-    0.727344, -0.557812, -0.492188, 0.578983, -0.716961, -0.388259, 0.625000, 0.500000,
-    0.941719, -0.448242, -0.195791, 0.859963, -0.480502, -0.171993, 0.875000, 0.250000,
-    0.849529, -0.507642, -0.361453, 0.718967, -0.627172, -0.299570, 0.750000, 0.375000,
-    0.902480, -0.507642, -0.187633, 0.764532, -0.626188, -0.152906, 0.875000, 0.375000,
-    0.920898, -0.507642, -0.000000, 0.779645, -0.626221, 0.000000, 1.000000, 0.375000,
-    0.857500, -0.557812, -0.178281, 0.684574, -0.715970, -0.136915, 0.875000, 0.500000,
-    0.343437, -0.557812, -0.807187, 0.268606, -0.715731, -0.644654, 0.250000, 0.500000,
-    0.000000, -0.632227, -0.789062, 0.000000, -0.771373, -0.636383, 0.000000, 0.750000,
-    0.309707, -0.632227, -0.727910, 0.244875, -0.771133, -0.587700, 0.250000, 0.750000,
-    0.560234, -0.632227, -0.560234, 0.448897, -0.772647, -0.448897, 0.500000, 0.750000,
-    0.294375, -0.675000, -0.691875, 0.384615, 0.000000, -0.923077, 0.250000, 1.000000,
-    0.178281, -0.557812, -0.857500, 0.136905, -0.716018, -0.684525, 0.125000, 0.500000,
-    0.000000, -0.599194, -0.829102, 0.000000, -0.763821, -0.645429, 0.000000, 0.625000,
-    0.168929, -0.599194, -0.812519, 0.126575, -0.763837, -0.632876, 0.125000, 0.625000,
-    0.325422, -0.599194, -0.764846, 0.247880, -0.764614, -0.594912, 0.250000, 0.625000,
-    0.160771, -0.632227, -0.773281, 0.124801, -0.771390, -0.624005, 0.125000, 0.750000,
-    0.492188, -0.557812, -0.727344, 0.388249, -0.716978, -0.578969, 0.375000, 0.500000,
-    0.325422, -0.599194, -0.764846, 0.247880, -0.764614, -0.594912, 0.250000, 0.625000,
-    0.466370, -0.599194, -0.689191, 0.358885, -0.764712, -0.535179, 0.375000, 0.625000,
-    0.588662, -0.599194, -0.588662, 0.455299, -0.765118, -0.455299, 0.500000, 0.625000,
-    0.443848, -0.632227, -0.655908, 0.353844, -0.772248, -0.527662, 0.375000, 0.750000,
-    0.160771, -0.632227, -0.773281, 0.124801, -0.771390, -0.624005, 0.125000, 0.750000,
-    0.000000, -0.657349, -0.760742, 0.000000, -0.693356, -0.720596, 0.000000, 0.875000,
-    0.155001, -0.657349, -0.745527, 0.141317, -0.693375, -0.706584, 0.125000, 0.875000,
-    0.298591, -0.657349, -0.701785, 0.276819, -0.694254, -0.664366, 0.250000, 0.875000,
-    0.152812, -0.675000, -0.735000, 0.196116, 0.000000, -0.980581, 0.125000, 1.000000,
-    0.443848, -0.632227, -0.655908, 0.353844, -0.772249, -0.527662, 0.375000, 0.750000,
-    0.298591, -0.657349, -0.701785, 0.276819, -0.694254, -0.664366, 0.250000, 0.875000,
-    0.427917, -0.657349, -0.632367, 0.400796, -0.694365, -0.597679, 0.375000, 0.875000,
-    0.540127, -0.657349, -0.540127, 0.508536, -0.694825, -0.508537, 0.500000, 0.875000,
-    0.421875, -0.675000, -0.623438, 0.556953, 0.000000, -0.830544, 0.375000, 1.000000,
-    0.807187, -0.557812, -0.343437, 0.644909, -0.715463, -0.268712, 0.750000, 0.500000,
-    0.560234, -0.632227, -0.560234, 0.448897, -0.772647, -0.448897, 0.500000, 0.750000,
-    0.727910, -0.632227, -0.309707, 0.587969, -0.770892, -0.244987, 0.750000, 0.750000,
-    0.789062, -0.632227, -0.000000, 0.636383, -0.771373, 0.000000, 1.000000, 0.750000,
-    0.691875, -0.675000, -0.294375, 0.923077, 0.000000, -0.384615, 0.750000, 1.000000,
-    0.727344, -0.557812, -0.492188, 0.578983, -0.716961, -0.388259, 0.625000, 0.500000,
-    0.588662, -0.599194, -0.588662, 0.455299, -0.765118, -0.455299, 0.500000, 0.625000,
-    0.689191, -0.599194, -0.466370, 0.535195, -0.764697, -0.358895, 0.625000, 0.625000,
-    0.764846, -0.599194, -0.325422, 0.594912, -0.764614, -0.247880, 0.750000, 0.625000,
-    0.655908, -0.632227, -0.443848, 0.527677, -0.772233, -0.353854, 0.625000, 0.750000,
-    0.857500, -0.557812, -0.178281, 0.684575, -0.715969, -0.136915, 0.875000, 0.500000,
-    0.764846, -0.599194, -0.325422, 0.594912, -0.764614, -0.247880, 0.750000, 0.625000,
-    0.812519, -0.599194, -0.168929, 0.632927, -0.763793, -0.126585, 0.875000, 0.625000,
-    0.829102, -0.599194, -0.000000, 0.645429, -0.763821, 0.000000, 1.000000, 0.625000,
-    0.773281, -0.632227, -0.160771, 0.624057, -0.771346, -0.124811, 0.875000, 0.750000,
-    0.655908, -0.632227, -0.443848, 0.527677, -0.772233, -0.353854, 0.625000, 0.750000,
-    0.540127, -0.657349, -0.540127, 0.508537, -0.694825, -0.508536, 0.500000, 0.875000,
-    0.632367, -0.657349, -0.427917, 0.597693, -0.694347, -0.400806, 0.625000, 0.875000,
-    0.701785, -0.657349, -0.298591, 0.664366, -0.694254, -0.276819, 0.750000, 0.875000,
-    0.623438, -0.675000, -0.421875, 0.830544, 0.000000, -0.556953, 0.625000, 1.000000,
-    0.773281, -0.632227, -0.160771, 0.624057, -0.771346, -0.124811, 0.875000, 0.750000,
-    0.701785, -0.657349, -0.298591, 0.664366, -0.694254, -0.276819, 0.750000, 0.875000,
-    0.745527, -0.657349, -0.155001, 0.706632, -0.693324, -0.141326, 0.875000, 0.875000,
-    0.760742, -0.657349, -0.000000, 0.720596, -0.693356, 0.000000, 1.000000, 0.875000,
-    0.735000, -0.675000, -0.152812, 0.980581, 0.000000, -0.196116, 0.875000, 1.000000,
-    -0.800000, 0.262500, -0.000000, 0.000000, -1.000000, 0.000000, 0.000000, 0.000000,
-    -0.750000, 0.375000, -0.000000, 0.000000, 1.000000, 0.000000, 1.000000, 0.000000,
-    -1.350000, 0.150000, -0.000000, 1.000000, 0.000000, -0.000000, 0.000000, 1.000000,
-    -1.500000, 0.150000, -0.000000, -1.000000, -0.000000, -0.000000, 1.000000, 1.000000,
-    -0.775000, 0.318750, 0.112500, 0.000000, -0.000000, 1.000000, 0.500000, 0.000000,
-    -1.206250, 0.248438, -0.000000, 0.148341, -0.988936, 0.000000, 0.000000, 0.500000,
-    -1.259375, 0.297656, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.500000,
-    -1.312500, 0.346875, -0.000000, -0.219512, 0.975610, 0.000000, 1.000000, 0.500000,
-    -1.425000, 0.150000, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 1.000000,
-    -0.792188, 0.280078, 0.084375, 0.000000, -0.871576, 0.490261, 0.250000, 0.000000,
-    -1.033594, 0.260742, -0.000000, 0.025853, -0.999666, 0.000000, 0.000000, 0.250000,
-    -1.040552, 0.278046, 0.084375, 0.024475, -0.872955, 0.487186, 0.250000, 0.250000,
-    -1.055859, 0.316113, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.250000,
-    -1.222852, 0.263818, 0.084375, 0.140206, -0.856814, 0.496198, 0.250000, 0.500000,
-    -0.797852, 0.267334, 0.049219, 0.000000, -0.976900, 0.213697, 0.125000, 0.000000,
-    -0.924121, 0.262280, -0.000000, 0.005639, -0.999984, 0.000000, 0.000000, 0.125000,
-    -0.924192, 0.267105, 0.049219, 0.005639, -0.976986, 0.213230, 0.125000, 0.125000,
-    -0.924381, 0.279824, 0.084375, 0.005349, -0.872040, 0.489406, 0.250000, 0.125000,
-    -1.035507, 0.265501, 0.049219, 0.025883, -0.976801, 0.212578, 0.125000, 0.250000,
-    -0.784180, 0.298096, 0.105469, 0.000000, -0.579524, 0.814955, 0.375000, 0.000000,
-    -0.924381, 0.279824, 0.084375, 0.005349, -0.872040, 0.489406, 0.250000, 0.125000,
-    -0.924646, 0.297807, 0.105469, 0.003808, -0.580397, 0.814324, 0.375000, 0.125000,
-    -0.924951, 0.318420, 0.112500, 0.000000, -0.000000, 1.000000, 0.500000, 0.125000,
-    -1.047684, 0.295782, 0.105469, 0.017593, -0.580836, 0.813830, 0.375000, 0.250000,
-    -1.035507, 0.265501, 0.049219, 0.025883, -0.976801, 0.212578, 0.125000, 0.250000,
-    -1.127832, 0.256567, -0.000000, 0.068483, -0.997652, 0.000000, 0.000000, 0.375000,
-    -1.131235, 0.261146, 0.049219, 0.068616, -0.974722, 0.212623, 0.125000, 0.375000,
-    -1.140207, 0.273219, 0.084375, 0.065384, -0.869606, 0.489398, 0.250000, 0.375000,
-    -1.210815, 0.252667, 0.049219, 0.148598, -0.965146, 0.215435, 0.125000, 0.500000,
-    -1.047684, 0.295782, 0.105469, 0.017593, -0.580836, 0.813830, 0.375000, 0.250000,
-    -1.140207, 0.273219, 0.084375, 0.065384, -0.869606, 0.489398, 0.250000, 0.375000,
-    -1.152891, 0.290286, 0.105469, 0.046704, -0.577184, 0.815278, 0.375000, 0.375000,
-    -1.167432, 0.309851, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.375000,
-    -1.239868, 0.279584, 0.105469, 0.099732, -0.560496, 0.822130, 0.375000, 0.500000,
-    -0.757812, 0.357422, 0.084375, 0.000000, 0.871576, 0.490261, 0.750000, 0.000000,
-    -1.055859, 0.316113, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.250000,
-    -1.071167, 0.354181, 0.084375, -0.031326, 0.872200, 0.488145, 0.750000, 0.250000,
-    -1.078125, 0.371484, -0.000000, -0.037474, 0.999298, 0.000000, 1.000000, 0.250000,
-    -1.295898, 0.331494, 0.084375, -0.180412, 0.841138, 0.509842, 0.750000, 0.500000,
-    -0.765820, 0.339404, 0.105469, 0.000000, 0.579524, 0.814955, 0.625000, 0.000000,
-    -0.924951, 0.318420, 0.112500, 0.000000, -0.000000, 1.000000, 0.500000, 0.125000,
-    -0.925256, 0.339034, 0.105469, -0.004308, 0.580398, 0.814321, 0.625000, 0.125000,
-    -0.925522, 0.357017, 0.084375, -0.006764, 0.872035, 0.489397, 0.750000, 0.125000,
-    -1.064035, 0.336445, 0.105469, -0.020004, 0.580169, 0.814250, 0.625000, 0.250000,
-    -0.752148, 0.370166, 0.049219, 0.000000, 0.976900, 0.213697, 0.875000, 0.000000,
-    -0.925522, 0.357017, 0.084375, -0.006764, 0.872035, 0.489398, 0.750000, 0.125000,
-    -0.925710, 0.369736, 0.049219, -0.007768, 0.976972, 0.213224, 0.875000, 0.125000,
-    -0.925781, 0.374561, -0.000000, -0.008035, 0.999968, 0.000000, 1.000000, 0.125000,
-    -1.076211, 0.366726, 0.049219, -0.036201, 0.976302, 0.213364, 0.875000, 0.250000,
-    -1.064035, 0.336445, 0.105469, -0.020004, 0.580169, 0.814250, 0.625000, 0.250000,
-    -1.167432, 0.309851, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.375000,
-    -1.181972, 0.329416, 0.105469, -0.053190, 0.573905, 0.817192, 0.625000, 0.375000,
-    -1.194656, 0.346484, 0.084375, -0.084210, 0.865181, 0.494338, 0.750000, 0.375000,
-    -1.278882, 0.315729, 0.105469, -0.112865, 0.550447, 0.827206, 0.625000, 0.500000,
-    -1.076211, 0.366726, 0.049219, -0.036201, 0.976302, 0.213364, 0.875000, 0.250000,
-    -1.194656, 0.346484, 0.084375, -0.084210, 0.865181, 0.494339, 0.750000, 0.375000,
-    -1.203628, 0.358556, 0.049219, -0.097201, 0.971485, 0.216262, 0.875000, 0.375000,
-    -1.207031, 0.363135, -0.000000, -0.100735, 0.994913, 0.000000, 1.000000, 0.375000,
-    -1.307935, 0.342645, 0.049219, -0.211316, 0.951005, 0.225686, 0.875000, 0.500000,
-    -1.222852, 0.263818, 0.084375, 0.140206, -0.856814, 0.496198, 0.250000, 0.500000,
-    -1.313281, 0.215039, -0.000000, 0.546885, -0.837207, 0.000000, 0.000000, 0.750000,
-    -1.335132, 0.225201, 0.084375, 0.483435, -0.674422, 0.558073, 0.250000, 0.750000,
-    -1.383203, 0.247559, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.750000,
-    -1.373438, 0.150000, 0.084375, 0.800000, 0.000000, 0.600000, 0.250000, 1.000000,
-    -1.210815, 0.252667, 0.049219, 0.148598, -0.965146, 0.215435, 0.125000, 0.500000,
-    -1.268262, 0.235034, -0.000000, 0.293811, -0.955864, 0.000000, 0.000000, 0.625000,
-    -1.273687, 0.238688, 0.049219, 0.293318, -0.928882, 0.226146, 0.125000, 0.625000,
-    -1.287991, 0.248321, 0.084375, 0.274428, -0.809737, 0.518667, 0.250000, 0.625000,
-    -1.319290, 0.217834, 0.049219, 0.540058, -0.804093, 0.248541, 0.125000, 0.750000,
-    -1.239868, 0.279584, 0.105469, 0.099732, -0.560497, 0.822130, 0.375000, 0.500000,
-    -1.287991, 0.248321, 0.084375, 0.274428, -0.809736, 0.518669, 0.250000, 0.625000,
-    -1.308214, 0.261940, 0.105469, 0.187187, -0.510240, 0.839414, 0.375000, 0.625000,
-    -1.331396, 0.277551, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.625000,
-    -1.357529, 0.235618, 0.105469, 0.310389, -0.395752, 0.864314, 0.375000, 0.750000,
-    -1.319290, 0.217834, 0.049219, 0.540058, -0.804093, 0.248541, 0.125000, 0.750000,
-    -1.340723, 0.187134, -0.000000, 0.868244, -0.496138, 0.000000, 0.000000, 0.875000,
-    -1.347063, 0.188729, 0.049219, 0.840433, -0.466702, 0.275432, 0.125000, 0.875000,
-    -1.363779, 0.192936, 0.084375, 0.713833, -0.367656, 0.596046, 0.250000, 0.875000,
-    -1.356445, 0.150000, 0.049219, 0.960000, 0.000000, 0.280000, 0.125000, 1.000000,
-    -1.357529, 0.235618, 0.105469, 0.310389, -0.395752, 0.864314, 0.375000, 0.750000,
-    -1.363779, 0.192936, 0.084375, 0.713834, -0.367656, 0.596045, 0.250000, 0.875000,
-    -1.387411, 0.198883, 0.105469, 0.426484, -0.201800, 0.881696, 0.375000, 0.875000,
-    -1.414502, 0.205701, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.875000,
-    -1.397461, 0.150000, 0.105469, 0.470589, 0.000000, 0.882353, 0.375000, 1.000000,
-    -1.295898, 0.331494, 0.084375, -0.180412, 0.841138, 0.509842, 0.750000, 0.500000,
-    -1.383203, 0.247559, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.750000,
-    -1.431274, 0.269916, 0.084375, -0.562646, 0.585663, 0.583462, 0.750000, 0.750000,
-    -1.453125, 0.280078, -0.000000, -0.711485, 0.702701, 0.000000, 1.000000, 0.750000,
-    -1.476562, 0.150000, 0.084375, -0.800000, 0.000000, 0.600000, 0.750000, 1.000000,
-    -1.278882, 0.315729, 0.105469, -0.112865, 0.550447, 0.827206, 0.625000, 0.500000,
-    -1.331396, 0.277551, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.625000,
-    -1.354579, 0.293163, 0.105469, -0.207595, 0.488130, 0.847722, 0.625000, 0.625000,
-    -1.374802, 0.306782, 0.084375, -0.343732, 0.765920, 0.543338, 0.750000, 0.625000,
-    -1.408878, 0.259499, 0.105469, -0.330606, 0.361483, 0.871797, 0.625000, 0.750000,
-    -1.307935, 0.342645, 0.049219, -0.211317, 0.951005, 0.225686, 0.875000, 0.500000,
-    -1.374802, 0.306782, 0.084375, -0.343732, 0.765919, 0.543338, 0.750000, 0.625000,
-    -1.389106, 0.316415, 0.049219, -0.407011, 0.879764, 0.245675, 0.875000, 0.625000,
-    -1.394531, 0.320068, -0.000000, -0.424434, 0.905459, 0.000000, 1.000000, 0.625000,
-    -1.447116, 0.277283, 0.049219, -0.680178, 0.681081, 0.271085, 0.875000, 0.750000,
-    -1.408878, 0.259499, 0.105469, -0.330606, 0.361483, 0.871797, 0.625000, 0.750000,
-    -1.414502, 0.205701, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.875000,
-    -1.441593, 0.212518, 0.105469, -0.434397, 0.175246, 0.883509, 0.625000, 0.875000,
-    -1.465225, 0.218465, 0.084375, -0.745462, 0.283642, 0.603187, 0.750000, 0.875000,
-    -1.452539, 0.150000, 0.105469, -0.470588, 0.000000, 0.882353, 0.625000, 1.000000,
-    -1.447116, 0.277283, 0.049219, -0.680178, 0.681081, 0.271085, 0.875000, 0.750000,
-    -1.465225, 0.218465, 0.084375, -0.745462, 0.283642, 0.603187, 0.750000, 0.875000,
-    -1.481941, 0.222672, 0.049219, -0.900243, 0.331346, 0.282440, 0.875000, 0.875000,
-    -1.488281, 0.224268, -0.000000, -0.940042, 0.341058, 0.000000, 1.000000, 0.875000,
-    -1.493555, 0.150000, 0.049219, -0.960000, 0.000000, 0.280000, 0.875000, 1.000000,
-    -0.750000, 0.375000, -0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000,
-    -0.800000, 0.262500, -0.000000, 0.000000, -1.000000, 0.000000, 1.000000, 0.000000,
-    -1.500000, 0.150000, -0.000000, -1.000000, -0.000000, -0.000000, 0.000000, 1.000000,
-    -1.350000, 0.150000, -0.000000, 1.000000, 0.000000, -0.000000, 1.000000, 1.000000,
-    -0.775000, 0.318750, -0.112500, -0.000000, 0.000000, -1.000000, 0.500000, 0.000000,
-    -1.312500, 0.346875, -0.000000, -0.219512, 0.975610, 0.000000, 0.000000, 0.500000,
-    -1.259375, 0.297656, -0.112500, 0.000000, -0.000000, -1.000000, 0.500000, 0.500000,
-    -1.206250, 0.248438, -0.000000, 0.148341, -0.988936, 0.000000, 1.000000, 0.500000,
-    -1.425000, 0.150000, -0.112500, 0.000000, 0.000000, -1.000000, 0.500000, 1.000000,
-    -0.757812, 0.357422, -0.084375, 0.000000, 0.871576, -0.490261, 0.250000, 0.000000,
-    -1.078125, 0.371484, -0.000000, -0.037474, 0.999298, 0.000000, 0.000000, 0.250000,
-    -1.071167, 0.354181, -0.084375, -0.031612, 0.872168, -0.488184, 0.250000, 0.250000,
-    -1.055859, 0.316113, -0.112500, 0.000000, -0.000000, -1.000000, 0.500000, 0.250000,
-    -1.295898, 0.331494, -0.084375, -0.182095, 0.840441, -0.510393, 0.250000, 0.500000,
-    -0.752148, 0.370166, -0.049219, 0.000000, 0.976900, -0.213697, 0.125000, 0.000000,
-    -0.925781, 0.374561, -0.000000, -0.008035, 0.999968, 0.000000, 0.000000, 0.125000,
-    -0.925710, 0.369736, -0.049219, -0.007783, 0.976972, -0.213224, 0.125000, 0.125000,
-    -0.925522, 0.357017, -0.084375, -0.006764, 0.872035, -0.489398, 0.250000, 0.125000,
-    -1.076211, 0.366726, -0.049219, -0.036277, 0.976298, -0.213369, 0.125000, 0.250000,
-    -0.765820, 0.339404, -0.105469, 0.000000, 0.579524, -0.814955, 0.375000, 0.000000,
-    -0.925522, 0.357017, -0.084375, -0.006764, 0.872035, -0.489397, 0.250000, 0.125000,
-    -0.925256, 0.339034, -0.105469, -0.004329, 0.580399, -0.814321, 0.375000, 0.125000,
-    -0.924951, 0.318420, -0.112500, 0.000000, 0.000000, -1.000000, 0.500000, 0.125000,
-    -1.064035, 0.336445, -0.105469, -0.020108, 0.580140, -0.814268, 0.375000, 0.250000,
-    -1.076211, 0.366726, -0.049219, -0.036277, 0.976298, -0.213369, 0.125000, 0.250000,
-    -1.207031, 0.363135, -0.000000, -0.100735, 0.994913, 0.000000, 0.000000, 0.375000,
-    -1.203628, 0.358556, -0.049219, -0.097411, 0.971458, -0.216288, 0.125000, 0.375000,
-    -1.194656, 0.346484, -0.084375, -0.084210, 0.865181, -0.494339, 0.250000, 0.375000,
-    -1.307935, 0.342645, -0.049219, -0.211778, 0.950885, -0.225758, 0.125000, 0.500000,
-    -1.064035, 0.336445, -0.105469, -0.020108, 0.580141, -0.814268, 0.375000, 0.250000,
-    -1.194656, 0.346484, -0.084375, -0.084210, 0.865181, -0.494338, 0.250000, 0.375000,
-    -1.181972, 0.329416, -0.105469, -0.053470, 0.573763, -0.817274, 0.375000, 0.375000,
-    -1.167432, 0.309851, -0.112500, 0.000000, -0.000000, -1.000000, 0.500000, 0.375000,
-    -1.278882, 0.315729, -0.105469, -0.113428, 0.550012, -0.827418, 0.375000, 0.500000,
-    -0.792188, 0.280078, -0.084375, -0.000000, -0.871576, -0.490261, 0.750000, 0.000000,
-    -1.055859, 0.316113, -0.112500, 0.000000, -0.000000, -1.000000, 0.500000, 0.250000,
-    -1.040552, 0.278046, -0.084375, 0.024919, -0.872908, -0.487248, 0.750000, 0.250000,
-    -1.033594, 0.260742, -0.000000, 0.025853, -0.999666, 0.000000, 1.000000, 0.250000,
-    -1.222852, 0.263818, -0.084375, 0.142803, -0.855858, -0.497107, 0.750000, 0.500000,
-    -0.784180, 0.298096, -0.105469, -0.000000, -0.579524, -0.814955, 0.625000, 0.000000,
-    -0.924951, 0.318420, -0.112500, 0.000000, 0.000000, -1.000000, 0.500000, 0.125000,
-    -0.924646, 0.297807, -0.105469, 0.003835, -0.580398, -0.814324, 0.625000, 0.125000,
-    -0.924381, 0.279824, -0.084375, 0.005349, -0.872040, -0.489406, 0.750000, 0.125000,
-    -1.047684, 0.295782, -0.105469, 0.017725, -0.580800, -0.813853, 0.625000, 0.250000,
-    -0.797852, 0.267334, -0.049219, -0.000000, -0.976900, -0.213697, 0.875000, 0.000000,
-    -0.924381, 0.279824, -0.084375, 0.005349, -0.872040, -0.489406, 0.750000, 0.125000,
-    -0.924192, 0.267105, -0.049219, 0.005668, -0.976986, -0.213230, 0.875000, 0.125000,
-    -0.924121, 0.262280, -0.000000, 0.005639, -0.999984, 0.000000, 1.000000, 0.125000,
-    -1.035507, 0.265501, -0.049219, 0.026018, -0.976795, -0.212588, 0.875000, 0.250000,
-    -1.047684, 0.295782, -0.105469, 0.017725, -0.580800, -0.813853, 0.625000, 0.250000,
-    -1.167432, 0.309851, -0.112500, 0.000000, -0.000000, -1.000000, 0.500000, 0.375000,
-    -1.152891, 0.290286, -0.105469, 0.047058, -0.577006, -0.815383, 0.625000, 0.375000,
-    -1.140207, 0.273219, -0.084375, 0.065384, -0.869606, -0.489398, 0.750000, 0.375000,
-    -1.239868, 0.279584, -0.105469, 0.100453, -0.559950, -0.822414, 0.625000, 0.500000,
-    -1.035507, 0.265501, -0.049219, 0.026018, -0.976795, -0.212588, 0.875000, 0.250000,
-    -1.140207, 0.273219, -0.084375, 0.065384, -0.869606, -0.489398, 0.750000, 0.375000,
-    -1.131235, 0.261146, -0.049219, 0.068986, -0.974686, -0.212671, 0.875000, 0.375000,
-    -1.127832, 0.256567, -0.000000, 0.068483, -0.997652, 0.000000, 1.000000, 0.375000,
-    -1.210815, 0.252667, -0.049219, 0.149411, -0.964989, -0.215573, 0.875000, 0.500000,
-    -1.295898, 0.331494, -0.084375, -0.182096, 0.840441, -0.510393, 0.250000, 0.500000,
-    -1.453125, 0.280078, -0.000000, -0.711485, 0.702701, 0.000000, 0.000000, 0.750000,
-    -1.431274, 0.269916, -0.084375, -0.565483, 0.582130, -0.584255, 0.250000, 0.750000,
-    -1.383203, 0.247559, -0.112500, 0.000000, -0.000000, -1.000000, 0.500000, 0.750000,
-    -1.476562, 0.150000, -0.084375, -0.800000, -0.000000, -0.600000, 0.250000, 1.000000,
-    -1.307935, 0.342645, -0.049219, -0.211779, 0.950885, -0.225758, 0.125000, 0.500000,
-    -1.394531, 0.320068, -0.000000, -0.424434, 0.905459, 0.000000, 0.000000, 0.625000,
-    -1.389106, 0.316415, -0.049219, -0.407810, 0.879359, -0.245803, 0.125000, 0.625000,
-    -1.374802, 0.306782, -0.084375, -0.343732, 0.765919, -0.543338, 0.250000, 0.625000,
-    -1.447116, 0.277283, -0.049219, -0.681018, 0.680194, -0.271202, 0.125000, 0.750000,
-    -1.278882, 0.315729, -0.105469, -0.113428, 0.550012, -0.827418, 0.375000, 0.500000,
-    -1.374802, 0.306782, -0.084375, -0.343732, 0.765920, -0.543338, 0.250000, 0.625000,
-    -1.354579, 0.293163, -0.105469, -0.208448, 0.487192, -0.848053, 0.375000, 0.625000,
-    -1.331396, 0.277551, -0.112500, 0.000000, -0.000000, -1.000000, 0.500000, 0.625000,
-    -1.408878, 0.259499, -0.105469, -0.331408, 0.360091, -0.872068, 0.375000, 0.750000,
-    -1.447116, 0.277283, -0.049219, -0.681018, 0.680194, -0.271202, 0.125000, 0.750000,
-    -1.488281, 0.224268, -0.000000, -0.940042, 0.341058, 0.000000, 0.000000, 0.875000,
-    -1.481941, 0.222672, -0.049219, -0.900521, 0.330571, -0.282462, 0.125000, 0.875000,
-    -1.465225, 0.218465, -0.084375, -0.745462, 0.283642, -0.603187, 0.250000, 0.875000,
-    -1.493555, 0.150000, -0.049219, -0.960000, -0.000000, -0.280000, 0.125000, 1.000000,
-    -1.408878, 0.259499, -0.105469, -0.331408, 0.360091, -0.872068, 0.375000, 0.750000,
-    -1.465225, 0.218465, -0.084375, -0.745462, 0.283642, -0.603187, 0.250000, 0.875000,
-    -1.441593, 0.212518, -0.105469, -0.434695, 0.174222, -0.883565, 0.375000, 0.875000,
-    -1.414502, 0.205701, -0.112500, 0.000000, -0.000000, -1.000000, 0.500000, 0.875000,
-    -1.452539, 0.150000, -0.105469, -0.470588, -0.000000, -0.882353, 0.375000, 1.000000,
-    -1.222852, 0.263818, -0.084375, 0.142803, -0.855858, -0.497107, 0.750000, 0.500000,
-    -1.383203, 0.247559, -0.112500, 0.000000, -0.000000, -1.000000, 0.500000, 0.750000,
-    -1.335132, 0.225201, -0.084375, 0.489273, -0.668472, -0.560140, 0.750000, 0.750000,
-    -1.313281, 0.215039, -0.000000, 0.546885, -0.837207, 0.000000, 1.000000, 0.750000,
-    -1.373438, 0.150000, -0.084375, 0.800000, 0.000000, -0.600000, 0.750000, 1.000000,
-    -1.239868, 0.279584, -0.105469, 0.100453, -0.559950, -0.822414, 0.625000, 0.500000,
-    -1.331396, 0.277551, -0.112500, 0.000000, -0.000000, -1.000000, 0.500000, 0.625000,
-    -1.308214, 0.261940, -0.105469, 0.188332, -0.509017, -0.839900, 0.625000, 0.625000,
-    -1.287991, 0.248321, -0.084375, 0.274428, -0.809736, -0.518669, 0.750000, 0.625000,
-    -1.357529, 0.235618, -0.105469, 0.311577, -0.393781, -0.864787, 0.625000, 0.750000,
-    -1.210815, 0.252667, -0.049219, 0.149411, -0.964989, -0.215573, 0.875000, 0.500000,
-    -1.287991, 0.248321, -0.084375, 0.274428, -0.809737, -0.518667, 0.750000, 0.625000,
-    -1.273687, 0.238688, -0.049219, 0.294850, -0.928329, -0.226427, 0.875000, 0.625000,
-    -1.268262, 0.235034, -0.000000, 0.293811, -0.955864, 0.000000, 1.000000, 0.625000,
-    -1.319290, 0.217834, -0.049219, 0.542231, -0.802508, -0.248931, 0.875000, 0.750000,
-    -1.357529, 0.235618, -0.105469, 0.311577, -0.393780, -0.864787, 0.625000, 0.750000,
-    -1.414502, 0.205701, -0.112500, 0.000000, -0.000000, -1.000000, 0.500000, 0.875000,
-    -1.387411, 0.198883, -0.105469, 0.426972, -0.200197, -0.881825, 0.625000, 0.875000,
-    -1.363779, 0.192936, -0.084375, 0.713834, -0.367656, -0.596045, 0.750000, 0.875000,
-    -1.397461, 0.150000, -0.105469, 0.470589, 0.000000, -0.882353, 0.625000, 1.000000,
-    -1.319290, 0.217834, -0.049219, 0.542231, -0.802508, -0.248931, 0.875000, 0.750000,
-    -1.363779, 0.192936, -0.084375, 0.713833, -0.367656, -0.596046, 0.750000, 0.875000,
-    -1.347063, 0.188729, -0.049219, 0.841606, -0.464481, -0.275602, 0.875000, 0.875000,
-    -1.340723, 0.187134, -0.000000, 0.868244, -0.496138, 0.000000, 1.000000, 0.875000,
-    -1.356445, 0.150000, -0.049219, 0.960000, 0.000000, -0.280000, 0.875000, 1.000000,
-    -1.350000, 0.150000, -0.000000, 1.000000, 0.000000, -0.000000, 0.000000, 0.000000,
-    -1.500000, 0.150000, -0.000000, -1.000000, -0.000000, -0.000000, 1.000000, 0.000000,
-    -1.000000, -0.300000, -0.000000, 0.410365, 0.911922, -0.000000, 0.000000, 1.000000,
-    -0.950000, -0.450000, -0.000000, -0.410365, -0.911922, -0.000000, 1.000000, 1.000000,
-    -1.425000, 0.150000, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.000000,
-    -1.268750, -0.075000, -0.000000, 0.832050, 0.554700, -0.000000, 0.000000, 0.500000,
-    -1.317188, -0.123047, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.500000,
-    -1.365625, -0.171094, -0.000000, -0.743581, -0.668646, -0.000000, 1.000000, 0.500000,
-    -0.975000, -0.375000, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 1.000000,
-    -1.373438, 0.150000, 0.084375, 0.800000, 0.000000, 0.600000, 0.250000, 0.000000,
-    -1.330469, 0.048047, -0.000000, 0.945778, 0.324813, -0.000000, 0.000000, 0.250000,
-    -1.351770, 0.038205, 0.084375, 0.754441, 0.269277, 0.598589, 0.250000, 0.250000,
-    -1.398633, 0.016553, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.250000,
-    -1.283887, -0.090015, 0.084375, 0.678042, 0.478207, 0.558191, 0.250000, 0.500000,
-    -1.356445, 0.150000, 0.049219, 0.960000, 0.000000, 0.280000, 0.125000, 0.000000,
-    -1.345215, 0.102979, -0.000000, 0.982777, 0.184796, -0.000000, 0.000000, 0.125000,
-    -1.351511, 0.101413, 0.049219, 0.943027, 0.178069, 0.281055, 0.125000, 0.125000,
-    -1.368111, 0.097285, 0.084375, 0.784625, 0.149799, 0.601602, 0.250000, 0.125000,
-    -1.336327, 0.045340, 0.049219, 0.907104, 0.315107, 0.279051, 0.125000, 0.250000,
-    -1.397461, 0.150000, 0.105469, 0.470589, 0.000000, 0.882353, 0.375000, 0.000000,
-    -1.368111, 0.097285, 0.084375, 0.784624, 0.149799, 0.601603, 0.250000, 0.125000,
-    -1.391579, 0.091449, 0.105469, 0.460503, 0.089006, 0.883184, 0.375000, 0.125000,
-    -1.418481, 0.084760, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.125000,
-    -1.373604, 0.028117, 0.105469, 0.441858, 0.163868, 0.881991, 0.375000, 0.250000,
-    -1.336327, 0.045340, 0.049219, 0.907105, 0.315106, 0.279051, 0.125000, 0.250000,
-    -1.305176, -0.012158, -0.000000, 0.895694, 0.444671, -0.000000, 0.000000, 0.375000,
-    -1.310318, -0.015685, 0.049219, 0.859856, 0.433367, 0.269890, 0.125000, 0.375000,
-    -1.323875, -0.024981, 0.084375, 0.717810, 0.376810, 0.585460, 0.250000, 0.375000,
-    -1.272913, -0.079129, 0.049219, 0.801010, 0.542879, 0.252321, 0.125000, 0.500000,
-    -1.373604, 0.028117, 0.105469, 0.441858, 0.163868, 0.881991, 0.375000, 0.250000,
-    -1.323875, -0.024981, 0.084375, 0.717810, 0.376810, 0.585460, 0.250000, 0.375000,
-    -1.343043, -0.038125, 0.105469, 0.423804, 0.233330, 0.875184, 0.375000, 0.375000,
-    -1.365015, -0.053192, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.375000,
-    -1.299402, -0.105405, 0.105469, 0.408072, 0.304992, 0.860498, 0.375000, 0.500000,
-    -1.476562, 0.150000, 0.084375, -0.800000, 0.000000, 0.600000, 0.750000, 0.000000,
-    -1.398633, 0.016553, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.250000,
-    -1.445496, -0.005099, 0.084375, -0.741739, -0.300819, 0.599442, 0.750000, 0.250000,
-    -1.466797, -0.014941, -0.000000, -0.923524, -0.383540, -0.000000, 1.000000, 0.250000,
-    -1.350488, -0.156079, 0.084375, -0.625724, -0.540260, 0.562662, 0.750000, 0.500000,
-    -1.452539, 0.150000, 0.105469, -0.470588, 0.000000, 0.882353, 0.625000, 0.000000,
-    -1.418481, 0.084760, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.125000,
-    -1.445384, 0.078070, 0.105469, -0.460057, -0.090956, 0.883218, 0.625000, 0.125000,
-    -1.468852, 0.072234, 0.084375, -0.783295, -0.156125, 0.601726, 0.750000, 0.125000,
-    -1.423662, 0.004988, 0.105469, -0.437541, -0.173581, 0.882285, 0.625000, 0.250000,
-    -1.493555, 0.150000, 0.049219, -0.960000, 0.000000, 0.280000, 0.875000, 0.000000,
-    -1.468852, 0.072234, 0.084375, -0.783295, -0.156125, 0.601726, 0.750000, 0.125000,
-    -1.485452, 0.068106, 0.049219, -0.940981, -0.188412, 0.281170, 0.875000, 0.125000,
-    -1.491748, 0.066541, -0.000000, -0.980463, -0.196702, -0.000000, 1.000000, 0.125000,
-    -1.460939, -0.012235, 0.049219, -0.887370, -0.366235, 0.280082, 0.875000, 0.250000,
-    -1.423662, 0.004988, 0.105469, -0.437541, -0.173581, 0.882285, 0.625000, 0.250000,
-    -1.365015, -0.053192, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.375000,
-    -1.386987, -0.068259, 0.105469, -0.412980, -0.249957, 0.875768, 0.625000, 0.375000,
-    -1.406154, -0.081403, 0.084375, -0.685340, -0.430186, 0.587579, 0.750000, 0.375000,
-    -1.334973, -0.140689, 0.105469, -0.389863, -0.324451, 0.861822, 0.625000, 0.500000,
-    -1.460939, -0.012235, 0.049219, -0.887370, -0.366235, 0.280082, 0.875000, 0.250000,
-    -1.406154, -0.081403, 0.084375, -0.685340, -0.430186, 0.587580, 0.750000, 0.375000,
-    -1.419711, -0.090700, 0.049219, -0.810168, -0.519360, 0.271832, 0.875000, 0.375000,
-    -1.424854, -0.094226, -0.000000, -0.839602, -0.543202, -0.000000, 1.000000, 0.375000,
-    -1.361462, -0.166965, 0.049219, -0.722234, -0.642490, 0.256095, 0.875000, 0.500000,
-    -1.283887, -0.090015, 0.084375, 0.678042, 0.478207, 0.558191, 0.250000, 0.500000,
-    -1.160156, -0.198047, -0.000000, 0.655687, 0.755033, -0.000000, 0.000000, 0.750000,
-    -1.165466, -0.216586, 0.084375, 0.553444, 0.668090, 0.497350, 0.250000, 0.750000,
-    -1.177148, -0.257373, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.750000,
-    -0.992188, -0.323438, 0.084375, 0.354770, 0.788378, 0.502591, 0.250000, 1.000000,
-    -1.272913, -0.079129, 0.049219, 0.801011, 0.542878, 0.252321, 0.125000, 0.500000,
-    -1.220605, -0.137842, -0.000000, 0.752687, 0.658378, -0.000000, 0.000000, 0.625000,
-    -1.223536, -0.142460, 0.049219, 0.726886, 0.646097, 0.232800, 0.125000, 0.625000,
-    -1.231264, -0.154636, 0.084375, 0.623037, 0.578584, 0.526370, 0.250000, 0.625000,
-    -1.161617, -0.203145, 0.049219, 0.635572, 0.742022, 0.213194, 0.125000, 0.750000,
-    -1.299402, -0.105405, 0.105469, 0.408072, 0.304992, 0.860498, 0.375000, 0.500000,
-    -1.231264, -0.154636, 0.084375, 0.623037, 0.578584, 0.526370, 0.250000, 0.625000,
-    -1.242188, -0.171850, 0.105469, 0.386230, 0.377876, 0.841449, 0.375000, 0.625000,
-    -1.254712, -0.191583, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.625000,
-    -1.170909, -0.235589, 0.105469, 0.355340, 0.450452, 0.819040, 0.375000, 0.750000,
-    -1.161617, -0.203145, 0.049219, 0.635572, 0.742022, 0.213194, 0.125000, 0.750000,
-    -1.086816, -0.252979, -0.000000, 0.540758, 0.841178, -0.000000, 0.000000, 0.875000,
-    -1.086579, -0.258651, 0.049219, 0.525642, 0.825088, 0.207198, 0.125000, 0.875000,
-    -1.085954, -0.273607, 0.084375, 0.462854, 0.744576, 0.481012, 0.250000, 0.875000,
-    -0.997852, -0.306445, 0.049219, 0.400263, 0.889473, 0.220515, 0.125000, 1.000000,
-    -1.170909, -0.235589, 0.105469, 0.355340, 0.450452, 0.819040, 0.375000, 0.750000,
-    -1.085954, -0.273607, 0.084375, 0.462854, 0.744576, 0.481012, 0.250000, 0.875000,
-    -1.085071, -0.294750, 0.105469, 0.302868, 0.501527, 0.810396, 0.375000, 0.875000,
-    -1.084058, -0.318988, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.875000,
-    -0.984180, -0.347461, 0.105469, 0.232611, 0.516912, 0.823829, 0.375000, 1.000000,
-    -1.350488, -0.156079, 0.084375, -0.625724, -0.540260, 0.562662, 0.750000, 0.500000,
-    -1.177148, -0.257373, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.750000,
-    -1.188831, -0.298160, 0.084375, -0.492641, -0.706153, 0.508579, 0.750000, 0.750000,
-    -1.194141, -0.316699, -0.000000, -0.558748, -0.829337, -0.000000, 1.000000, 0.750000,
-    -0.957812, -0.426562, 0.084375, -0.354770, -0.788378, 0.502591, 0.750000, 1.000000,
-    -1.334973, -0.140689, 0.105469, -0.389864, -0.324451, 0.861822, 0.625000, 0.500000,
-    -1.254712, -0.191583, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.625000,
-    -1.267236, -0.211316, 0.105469, -0.362855, -0.394979, 0.843995, 0.625000, 0.625000,
-    -1.278160, -0.228531, 0.084375, -0.558837, -0.634504, 0.533952, 0.750000, 0.625000,
-    -1.183388, -0.279157, 0.105469, -0.331427, -0.460343, 0.823553, 0.625000, 0.750000,
-    -1.361462, -0.166965, 0.049219, -0.722234, -0.642490, 0.256095, 0.875000, 0.500000,
-    -1.278160, -0.228531, 0.084375, -0.558837, -0.634504, 0.533953, 0.750000, 0.625000,
-    -1.285887, -0.240706, 0.049219, -0.632854, -0.736497, 0.238887, 0.875000, 0.625000,
-    -1.288818, -0.245325, -0.000000, -0.647649, -0.761939, -0.000000, 1.000000, 0.625000,
-    -1.192680, -0.311601, 0.049219, -0.548245, -0.806248, 0.222240, 0.875000, 0.750000,
-    -1.183388, -0.279157, 0.105469, -0.331427, -0.460343, 0.823553, 0.625000, 0.750000,
-    -1.084058, -0.318988, 0.112500, 0.000000, 0.000000, 1.000000, 0.500000, 0.875000,
-    -1.083045, -0.343226, 0.105469, -0.286990, -0.503756, 0.814780, 0.625000, 0.875000,
-    -1.082161, -0.364370, 0.084375, -0.423555, -0.760495, 0.492187, 0.750000, 0.875000,
-    -0.965820, -0.402539, 0.105469, -0.232611, -0.516913, 0.823829, 0.625000, 1.000000,
-    -1.192680, -0.311601, 0.049219, -0.548245, -0.806248, 0.222240, 0.875000, 0.750000,
-    -1.082161, -0.364370, 0.084375, -0.423555, -0.760495, 0.492188, 0.750000, 0.875000,
-    -1.081536, -0.379325, 0.049219, -0.470388, -0.855760, 0.215428, 0.875000, 0.875000,
-    -1.081299, -0.384998, -0.000000, -0.479572, -0.877503, -0.000000, 1.000000, 0.875000,
-    -0.952148, -0.443555, 0.049219, -0.400263, -0.889473, 0.220515, 0.875000, 1.000000,
-    -1.500000, 0.150000, -0.000000, -1.000000, -0.000000, -0.000000, 0.000000, 0.000000,
-    -1.350000, 0.150000, -0.000000, 1.000000, 0.000000, -0.000000, 1.000000, 0.000000,
-    -0.950000, -0.450000, -0.000000, -0.410365, -0.911922, -0.000000, 0.000000, 1.000000,
-    -1.000000, -0.300000, -0.000000, 0.410365, 0.911922, -0.000000, 1.000000, 1.000000,
-    -1.425000, 0.150000, -0.112500, 0.000000, 0.000000, -1.000000, 0.500000, 0.000000,
-    -1.365625, -0.171094, -0.000000, -0.743581, -0.668646, -0.000000, 0.000000, 0.500000,
-    -1.317188, -0.123047, -0.112500, 0.000000, 0.000000, -1.000000, 0.500000, 0.500000,
-    -1.268750, -0.075000, -0.000000, 0.832050, 0.554700, -0.000000, 1.000000, 0.500000,
-    -0.975000, -0.375000, -0.112500, 0.000000, 0.000000, -1.000000, 0.500000, 1.000000,
-    -1.476562, 0.150000, -0.084375, -0.800000, -0.000000, -0.600000, 0.250000, 0.000000,
-    -1.466797, -0.014941, -0.000000, -0.923524, -0.383540, -0.000000, 0.000000, 0.250000,
-    -1.445496, -0.005099, -0.084375, -0.741200, -0.302104, -0.599462, 0.250000, 0.250000,
-    -1.398633, 0.016553, -0.112500, 0.000000, 0.000000, -1.000000, 0.500000, 0.250000,
-    -1.350488, -0.156079, -0.084375, -0.623402, -0.542826, -0.562770, 0.250000, 0.500000,
-    -1.493555, 0.150000, -0.049219, -0.960000, -0.000000, -0.280000, 0.125000, 0.000000,
-    -1.491748, 0.066541, -0.000000, -0.980463, -0.196702, -0.000000, 0.000000, 0.125000,
-    -1.485452, 0.068106, -0.049219, -0.940967, -0.188477, -0.281171, 0.125000, 0.125000,
-    -1.468852, 0.072234, -0.084375, -0.783295, -0.156125, -0.601726, 0.250000, 0.125000,
-    -1.460939, -0.012235, -0.049219, -0.887220, -0.366595, -0.280086, 0.125000, 0.250000,
-    -1.452539, 0.150000, -0.105469, -0.470588, -0.000000, -0.882353, 0.375000, 0.000000,
-    -1.468852, 0.072234, -0.084375, -0.783295, -0.156125, -0.601726, 0.250000, 0.125000,
-    -1.445384, 0.078070, -0.105469, -0.460039, -0.091036, -0.883219, 0.375000, 0.125000,
-    -1.418481, 0.084760, -0.112500, 0.000000, 0.000000, -1.000000, 0.500000, 0.125000,
-    -1.423662, 0.004988, -0.105469, -0.437356, -0.173995, -0.882296, 0.375000, 0.250000,
-    -1.460939, -0.012235, -0.049219, -0.887221, -0.366595, -0.280086, 0.125000, 0.250000,
-    -1.424854, -0.094226, -0.000000, -0.839602, -0.543202, -0.000000, 0.000000, 0.375000,
-    -1.419711, -0.090700, -0.049219, -0.809767, -0.519983, -0.271837, 0.125000, 0.375000,
-    -1.406154, -0.081403, -0.084375, -0.685340, -0.430186, -0.587580, 0.250000, 0.375000,
-    -1.361462, -0.166965, -0.049219, -0.721599, -0.643198, -0.256108, 0.125000, 0.500000,
-    -1.423662, 0.004988, -0.105469, -0.437356, -0.173994, -0.882296, 0.375000, 0.250000,
-    -1.406154, -0.081403, -0.084375, -0.685340, -0.430186, -0.587579, 0.250000, 0.375000,
-    -1.386987, -0.068259, -0.105469, -0.412506, -0.250677, -0.875785, 0.375000, 0.375000,
-    -1.365015, -0.053192, -0.112500, 0.000000, 0.000000, -1.000000, 0.500000, 0.375000,
-    -1.334973, -0.140689, -0.105469, -0.389066, -0.325292, -0.861866, 0.375000, 0.500000,
-    -1.373438, 0.150000, -0.084375, 0.800000, 0.000000, -0.600000, 0.750000, 0.000000,
-    -1.398633, 0.016553, -0.112500, 0.000000, 0.000000, -1.000000, 0.500000, 0.250000,
-    -1.351770, 0.038205, -0.084375, 0.753631, 0.271366, -0.598666, 0.750000, 0.250000,
-    -1.330469, 0.048047, -0.000000, 0.945778, 0.324813, -0.000000, 1.000000, 0.250000,
-    -1.283887, -0.090015, -0.084375, 0.674847, 0.482249, -0.558585, 0.750000, 0.500000,
-    -1.397461, 0.150000, -0.105469, 0.470589, 0.000000, -0.882353, 0.625000, 0.000000,
-    -1.418481, 0.084760, -0.112500, 0.000000, 0.000000, -1.000000, 0.500000, 0.125000,
-    -1.391579, 0.091449, -0.105469, 0.460478, 0.089118, -0.883187, 0.625000, 0.125000,
-    -1.368111, 0.097285, -0.084375, 0.784624, 0.149799, -0.601603, 0.750000, 0.125000,
-    -1.373604, 0.028117, -0.105469, 0.441621, 0.164404, -0.882010, 0.625000, 0.250000,
-    -1.356445, 0.150000, -0.049219, 0.960000, 0.000000, -0.280000, 0.875000, 0.000000,
-    -1.368111, 0.097285, -0.084375, 0.784625, 0.149799, -0.601602, 0.750000, 0.125000,
-    -1.351511, 0.101413, -0.049219, 0.942997, 0.178224, -0.281057, 0.875000, 0.125000,
-    -1.345215, 0.102979, -0.000000, 0.982777, 0.184796, -0.000000, 1.000000, 0.125000,
-    -1.336327, 0.045340, -0.049219, 0.906857, 0.315800, -0.279070, 0.875000, 0.250000,
-    -1.373604, 0.028117, -0.105469, 0.441621, 0.164404, -0.882010, 0.625000, 0.250000,
-    -1.365015, -0.053192, -0.112500, 0.000000, 0.000000, -1.000000, 0.500000, 0.375000,
-    -1.343043, -0.038125, -0.105469, 0.423222, 0.234233, -0.875224, 0.625000, 0.375000,
-    -1.323875, -0.024981, -0.084375, 0.717810, 0.376810, -0.585460, 0.750000, 0.375000,
-    -1.299402, -0.105405, -0.105469, 0.407093, 0.306052, -0.860586, 0.625000, 0.500000,
-    -1.336327, 0.045340, -0.049219, 0.906858, 0.315799, -0.279070, 0.875000, 0.250000,
-    -1.323875, -0.024981, -0.084375, 0.717810, 0.376810, -0.585460, 0.750000, 0.375000,
-    -1.310318, -0.015685, -0.049219, 0.859273, 0.434496, -0.269932, 0.875000, 0.375000,
-    -1.305176, -0.012158, -0.000000, 0.895694, 0.444671, -0.000000, 1.000000, 0.375000,
-    -1.272913, -0.079129, -0.049219, 0.800087, 0.544204, -0.252394, 0.875000, 0.500000,
-    -1.350488, -0.156079, -0.084375, -0.623402, -0.542826, -0.562770, 0.250000, 0.500000,
-    -1.194141, -0.316699, -0.000000, -0.558748, -0.829337, -0.000000, 0.000000, 0.750000,
-    -1.188831, -0.298160, -0.084375, -0.490104, -0.707628, -0.508980, 0.250000, 0.750000,
-    -1.177148, -0.257373, -0.112500, 0.000000, 0.000000, -1.000000, 0.500000, 0.750000,
-    -0.957812, -0.426562, -0.084375, -0.354770, -0.788378, -0.502591, 0.250000, 1.000000,
-    -1.361462, -0.166965, -0.049219, -0.721599, -0.643198, -0.256108, 0.125000, 0.500000,
-    -1.288818, -0.245325, -0.000000, -0.647649, -0.761939, -0.000000, 0.000000, 0.625000,
-    -1.285887, -0.240706, -0.049219, -0.632123, -0.737115, -0.238917, 0.125000, 0.625000,
-    -1.278160, -0.228531, -0.084375, -0.558837, -0.634504, -0.533953, 0.250000, 0.625000,
-    -1.192680, -0.311601, -0.049219, -0.547600, -0.806671, -0.222295, 0.125000, 0.750000,
-    -1.334973, -0.140689, -0.105469, -0.389066, -0.325292, -0.861866, 0.375000, 0.500000,
-    -1.278160, -0.228531, -0.084375, -0.558837, -0.634504, -0.533952, 0.250000, 0.625000,
-    -1.267236, -0.211316, -0.105469, -0.361844, -0.395706, -0.844088, 0.375000, 0.625000,
-    -1.254712, -0.191583, -0.112500, 0.000000, 0.000000, -1.000000, 0.500000, 0.625000,
-    -1.183388, -0.279157, -0.105469, -0.330412, -0.460754, -0.823731, 0.375000, 0.750000,
-    -1.192680, -0.311601, -0.049219, -0.547601, -0.806671, -0.222295, 0.125000, 0.750000,
-    -1.081299, -0.384998, -0.000000, -0.479572, -0.877503, -0.000000, 0.000000, 0.875000,
-    -1.081536, -0.379325, -0.049219, -0.470000, -0.855960, -0.215482, 0.125000, 0.875000,
-    -1.082161, -0.364370, -0.084375, -0.423555, -0.760495, -0.492188, 0.250000, 0.875000,
-    -0.952148, -0.443555, -0.049219, -0.400263, -0.889473, -0.220515, 0.125000, 1.000000,
-    -1.183388, -0.279157, -0.105469, -0.330412, -0.460754, -0.823731, 0.375000, 0.750000,
-    -1.082161, -0.364370, -0.084375, -0.423555, -0.760495, -0.492187, 0.250000, 0.875000,
-    -1.083045, -0.343226, -0.105469, -0.286325, -0.503846, -0.814958, 0.375000, 0.875000,
-    -1.084058, -0.318988, -0.112500, 0.000000, 0.000000, -1.000000, 0.500000, 0.875000,
-    -0.965820, -0.402539, -0.105469, -0.232611, -0.516913, -0.823829, 0.375000, 1.000000,
-    -1.283887, -0.090015, -0.084375, 0.674847, 0.482249, -0.558585, 0.750000, 0.500000,
-    -1.177148, -0.257373, -0.112500, 0.000000, 0.000000, -1.000000, 0.500000, 0.750000,
-    -1.165466, -0.216586, -0.084375, 0.549511, 0.670716, -0.498173, 0.750000, 0.750000,
-    -1.160156, -0.198047, -0.000000, 0.655687, 0.755033, -0.000000, 1.000000, 0.750000,
-    -0.992188, -0.323438, -0.084375, 0.354770, 0.788378, -0.502591, 0.750000, 1.000000,
-    -1.299402, -0.105405, -0.105469, 0.407093, 0.306051, -0.860586, 0.625000, 0.500000,
-    -1.254712, -0.191583, -0.112500, 0.000000, 0.000000, -1.000000, 0.500000, 0.625000,
-    -1.242188, -0.171850, -0.105469, 0.384959, 0.378821, -0.841606, 0.625000, 0.625000,
-    -1.231264, -0.154636, -0.084375, 0.623037, 0.578584, -0.526370, 0.750000, 0.625000,
-    -1.170909, -0.235589, -0.105469, 0.354017, 0.451010, -0.819306, 0.625000, 0.750000,
-    -1.272913, -0.079129, -0.049219, 0.800088, 0.544202, -0.252394, 0.875000, 0.500000,
-    -1.231264, -0.154636, -0.084375, 0.623037, 0.578584, -0.526370, 0.750000, 0.625000,
-    -1.223536, -0.142460, -0.049219, 0.725742, 0.647344, -0.232905, 0.875000, 0.625000,
-    -1.220605, -0.137842, -0.000000, 0.752687, 0.658378, -0.000000, 1.000000, 0.625000,
-    -1.161617, -0.203145, -0.049219, 0.634450, 0.742942, -0.213332, 0.875000, 0.750000,
-    -1.170909, -0.235589, -0.105469, 0.354017, 0.451010, -0.819306, 0.625000, 0.750000,
-    -1.084058, -0.318988, -0.112500, 0.000000, 0.000000, -1.000000, 0.500000, 0.875000,
-    -1.085071, -0.294750, -0.105469, 0.301978, 0.501655, -0.810649, 0.625000, 0.875000,
-    -1.085954, -0.273607, -0.084375, 0.462854, 0.744576, -0.481012, 0.750000, 0.875000,
-    -0.984180, -0.347461, -0.105469, 0.232611, 0.516912, -0.823829, 0.625000, 1.000000,
-    -1.161617, -0.203145, -0.049219, 0.634450, 0.742942, -0.213332, 0.875000, 0.750000,
-    -1.085954, -0.273607, -0.084375, 0.462854, 0.744576, -0.481012, 0.750000, 0.875000,
-    -1.086579, -0.258651, -0.049219, 0.524892, 0.825535, -0.207317, 0.875000, 0.875000,
-    -1.086816, -0.252979, -0.000000, 0.540758, 0.841178, -0.000000, 1.000000, 0.875000,
-    -0.997852, -0.306445, -0.049219, 0.400263, 0.889473, -0.220515, 0.875000, 1.000000,
-    0.850000, -0.037500, -0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000,
-    0.850000, -0.450000, -0.000000, 0.158678, -0.987330, 0.000000, 1.000000, 0.000000,
-    1.350000, 0.450000, -0.000000, -0.600000, 0.800000, 0.000000, 0.000000, 1.000000,
-    1.650000, 0.450000, -0.000000, 0.384615, -0.923077, 0.000000, 1.000000, 1.000000,
-    0.850000, -0.243750, 0.247500, -0.000000, 0.000000, 1.000000, 0.500000, 0.000000,
-    1.193750, 0.150000, -0.000000, -0.920582, 0.390550, 0.000000, 0.000000, 0.500000,
-    1.268750, 0.060938, 0.170625, 0.213724, 0.177140, 0.960699, 0.500000, 0.500000,
-    1.343750, -0.028125, -0.000000, 0.957826, -0.287348, 0.000000, 1.000000, 0.500000,
-    1.500000, 0.450000, 0.093750, 0.000000, 0.000000, 1.000000, 0.500000, 1.000000,
-    0.850000, -0.101953, 0.185625, -0.024132, 0.729325, 0.683742, 0.250000, 0.000000,
-    1.089844, 0.017578, -0.000000, -0.544548, 0.838729, 0.000000, 0.000000, 0.250000,
-    1.108154, -0.030212, 0.167607, -0.371220, 0.678515, 0.633887, 0.250000, 0.250000,
-    1.148438, -0.135352, 0.223477, 0.171854, 0.062939, 0.983110, 0.500000, 0.250000,
-    1.217188, 0.122168, 0.127969, -0.695041, 0.414771, 0.587267, 0.250000, 0.500000,
-    0.850000, -0.055225, 0.108281, -0.009231, 0.939467, 0.342514, 0.125000, 0.000000,
-    0.992480, -0.022705, -0.000000, -0.235151, 0.971959, 0.000000, 0.000000, 0.125000,
-    0.995678, -0.038346, 0.105391, -0.221262, 0.921126, 0.320265, 0.125000, 0.125000,
-    1.004108, -0.079582, 0.180670, -0.165703, 0.736103, 0.656273, 0.250000, 0.125000,
-    1.094879, 0.004436, 0.097771, -0.507507, 0.807721, 0.300039, 0.125000, 0.250000,
-    0.850000, -0.168018, 0.232031, -0.025797, 0.392308, 0.919472, 0.375000, 0.000000,
-    1.004108, -0.079582, 0.180670, -0.165703, 0.736103, 0.656273, 0.250000, 0.125000,
-    1.016026, -0.137881, 0.225838, -0.059540, 0.413822, 0.908409, 0.375000, 0.125000,
-    1.029688, -0.204712, 0.240894, 0.079921, 0.015529, 0.996680, 0.500000, 0.125000,
-    1.126923, -0.079198, 0.209509, -0.127458, 0.418405, 0.899273, 0.375000, 0.250000,
-    1.094879, 0.004436, 0.097771, -0.507507, 0.807721, 0.300039, 0.125000, 0.250000,
-    1.153223, 0.077197, -0.000000, -0.801883, 0.597481, 0.000000, 0.000000, 0.375000,
-    1.159190, 0.066780, 0.086998, -0.756895, 0.593502, 0.273617, 0.125000, 0.375000,
-    1.174921, 0.039317, 0.149139, -0.577629, 0.549531, 0.603623, 0.250000, 0.375000,
-    1.200195, 0.142346, 0.074648, -0.876990, 0.403565, 0.260813, 0.125000, 0.500000,
-    1.126923, -0.079198, 0.209509, -0.127458, 0.418405, 0.899273, 0.375000, 0.250000,
-    1.174921, 0.039317, 0.149139, -0.577629, 0.549531, 0.603623, 0.250000, 0.375000,
-    1.197161, 0.000490, 0.186424, -0.218772, 0.394191, 0.892610, 0.375000, 0.375000,
-    1.222656, -0.044019, 0.198853, 0.229848, 0.129312, 0.964597, 0.500000, 0.375000,
-    1.241211, 0.093640, 0.159961, -0.296452, 0.354445, 0.886840, 0.375000, 0.500000,
-    0.850000, -0.385547, 0.185625, 0.102331, -0.725708, 0.680351, 0.750000, 0.000000,
-    1.148438, -0.135352, 0.223477, 0.171854, 0.062939, 0.983110, 0.500000, 0.250000,
-    1.188721, -0.240491, 0.167607, 0.612561, -0.529591, 0.586772, 0.750000, 0.250000,
-    1.207031, -0.288281, -0.000000, 0.718240, -0.695795, 0.000000, 1.000000, 0.250000,
-    1.320312, -0.000293, 0.127969, 0.837979, -0.174710, 0.516979, 0.750000, 0.500000,
-    0.850000, -0.319482, 0.232031, 0.048061, -0.391985, 0.918715, 0.625000, 0.000000,
-    1.029688, -0.204712, 0.240894, 0.079921, 0.015529, 0.996680, 0.500000, 0.125000,
-    1.043350, -0.271543, 0.225838, 0.224876, -0.377046, 0.898480, 0.625000, 0.125000,
-    1.055267, -0.329842, 0.180670, 0.342821, -0.685430, 0.642386, 0.750000, 0.125000,
-    1.169952, -0.191505, 0.209509, 0.435323, -0.278094, 0.856247, 0.625000, 0.250000,
-    0.850000, -0.432275, 0.108281, 0.144604, -0.929633, 0.338929, 0.875000, 0.000000,
-    1.055267, -0.329842, 0.180670, 0.342821, -0.685430, 0.642386, 0.750000, 0.125000,
-    1.063697, -0.371078, 0.105391, 0.408872, -0.857837, 0.311351, 0.875000, 0.125000,
-    1.066895, -0.386719, -0.000000, 0.427109, -0.904200, 0.000000, 1.000000, 0.125000,
-    1.201996, -0.275139, 0.097771, 0.697781, -0.660281, 0.277723, 0.875000, 0.250000,
-    1.169952, -0.191505, 0.209509, 0.435322, -0.278094, 0.856247, 0.625000, 0.250000,
-    1.222656, -0.044019, 0.198853, 0.229848, 0.129312, 0.964597, 0.500000, 0.375000,
-    1.248151, -0.088527, 0.186424, 0.585763, -0.133695, 0.799380, 0.625000, 0.375000,
-    1.270392, -0.127354, 0.149139, 0.789294, -0.317418, 0.525605, 0.750000, 0.375000,
-    1.296289, 0.028235, 0.159961, 0.613165, -0.021542, 0.789661, 0.625000, 0.500000,
-    1.201996, -0.275139, 0.097771, 0.697781, -0.660281, 0.277723, 0.875000, 0.250000,
-    1.270392, -0.127354, 0.149139, 0.789294, -0.317418, 0.525605, 0.750000, 0.375000,
-    1.286123, -0.154817, 0.086998, 0.877362, -0.413464, 0.243482, 0.875000, 0.375000,
-    1.292090, -0.165234, -0.000000, 0.897596, -0.440819, 0.000000, 1.000000, 0.375000,
-    1.337305, -0.020471, 0.074648, 0.935156, -0.261048, 0.239452, 0.875000, 0.500000,
-    1.217188, 0.122168, 0.127969, -0.695041, 0.414772, 0.587267, 0.250000, 0.500000,
-    1.250781, 0.310547, -0.000000, -0.928477, 0.371391, 0.000000, 0.000000, 0.750000,
-    1.279346, 0.300476, 0.088330, -0.634799, 0.386374, 0.669138, 0.250000, 0.750000,
-    1.342187, 0.278320, 0.117773, 0.067770, 0.175606, 0.982125, 0.500000, 0.750000,
-    1.396875, 0.450000, 0.070312, -0.390971, 0.593197, 0.703747, 0.250000, 1.000000,
-    1.200195, 0.142346, 0.074648, -0.876990, 0.403566, 0.260813, 0.125000, 0.500000,
-    1.222558, 0.229834, -0.000000, -0.950213, 0.311602, 0.000000, 0.000000, 0.625000,
-    1.229482, 0.224792, 0.062299, -0.900661, 0.331376, 0.281068, 0.125000, 0.625000,
-    1.247736, 0.211501, 0.106798, -0.702257, 0.362674, 0.612620, 0.250000, 0.625000,
-    1.258636, 0.307777, 0.051526, -0.858527, 0.385856, 0.337708, 0.125000, 0.750000,
-    1.241211, 0.093640, 0.159961, -0.296452, 0.354445, 0.886840, 0.375000, 0.500000,
-    1.247736, 0.211501, 0.106798, -0.702256, 0.362674, 0.612621, 0.250000, 0.625000,
-    1.273542, 0.192709, 0.133498, -0.321036, 0.326352, 0.889062, 0.375000, 0.625000,
-    1.303125, 0.171167, 0.142397, 0.144754, 0.193543, 0.970354, 0.500000, 0.625000,
-    1.308624, 0.290154, 0.110413, -0.297769, 0.322801, 0.898406, 0.375000, 0.750000,
-    1.258636, 0.307777, 0.051526, -0.858527, 0.385856, 0.337708, 0.125000, 0.750000,
-    1.289551, 0.385986, -0.000000, -0.828868, 0.559444, 0.000000, 0.000000, 0.875000,
-    1.299244, 0.384960, 0.043906, -0.742962, 0.544199, 0.389686, 0.125000, 0.875000,
-    1.324799, 0.382256, 0.075267, -0.517529, 0.474866, 0.711805, 0.250000, 0.875000,
-    1.362891, 0.450000, 0.041016, -0.541369, 0.750540, 0.378959, 0.125000, 1.000000,
-    1.308624, 0.290154, 0.110413, -0.297769, 0.322801, 0.898406, 0.375000, 0.750000,
-    1.324799, 0.382256, 0.075267, -0.517529, 0.474866, 0.711805, 0.250000, 0.875000,
-    1.360928, 0.378432, 0.094084, -0.253078, 0.335498, 0.907410, 0.375000, 0.875000,
-    1.402344, 0.374048, 0.100356, 0.015086, 0.130164, 0.991378, 0.500000, 0.875000,
-    1.444922, 0.450000, 0.087891, -0.203320, 0.348629, 0.914942, 0.375000, 1.000000,
-    1.320312, -0.000293, 0.127969, 0.837979, -0.174710, 0.516979, 0.750000, 0.500000,
-    1.342187, 0.278320, 0.117773, 0.067770, 0.175606, 0.982125, 0.500000, 0.750000,
-    1.405029, 0.256165, 0.088330, 0.697661, -0.240664, 0.674796, 0.750000, 0.750000,
-    1.433594, 0.246094, -0.000000, 0.897727, -0.440551, 0.000000, 1.000000, 0.750000,
-    1.603125, 0.450000, 0.070312, 0.328506, -0.736502, 0.591311, 0.750000, 1.000000,
-    1.296289, 0.028235, 0.159961, 0.613165, -0.021543, 0.789661, 0.625000, 0.500000,
-    1.303125, 0.171167, 0.142397, 0.144754, 0.193543, 0.970354, 0.500000, 0.625000,
-    1.332708, 0.149625, 0.133498, 0.543037, 0.012500, 0.839616, 0.625000, 0.625000,
-    1.358514, 0.130833, 0.106798, 0.802971, -0.151273, 0.576501, 0.750000, 0.625000,
-    1.375751, 0.266487, 0.110413, 0.409019, -0.025151, 0.912179, 0.625000, 0.750000,
-    1.337305, -0.020471, 0.074648, 0.935156, -0.261048, 0.239452, 0.875000, 0.500000,
-    1.358514, 0.130833, 0.106798, 0.802972, -0.151273, 0.576501, 0.750000, 0.625000,
-    1.376768, 0.117542, 0.062299, 0.928216, -0.252378, 0.273351, 0.875000, 0.625000,
-    1.383691, 0.112500, -0.000000, 0.958492, -0.285121, 0.000000, 1.000000, 0.625000,
-    1.425738, 0.248863, 0.051526, 0.856186, -0.391161, 0.337548, 0.875000, 0.750000,
-    1.375751, 0.266487, 0.110413, 0.409019, -0.025151, 0.912179, 0.625000, 0.750000,
-    1.402344, 0.374048, 0.100356, 0.015086, 0.130164, 0.991378, 0.500000, 0.875000,
-    1.443760, 0.369664, 0.094084, 0.287699, -0.145568, 0.946593, 0.625000, 0.875000,
-    1.479889, 0.365840, 0.075267, 0.529482, -0.444837, 0.722336, 0.750000, 0.875000,
-    1.555078, 0.450000, 0.087891, 0.197370, -0.414974, 0.888167, 0.625000, 1.000000,
-    1.425738, 0.248863, 0.051526, 0.856187, -0.391160, 0.337548, 0.875000, 0.750000,
-    1.479889, 0.365840, 0.075267, 0.529481, -0.444836, 0.722337, 0.750000, 0.875000,
-    1.505444, 0.363135, 0.043906, 0.670506, -0.648431, 0.360497, 0.875000, 0.875000,
-    1.515137, 0.362109, -0.000000, 0.704117, -0.710084, 0.000000, 1.000000, 0.875000,
-    1.637109, 0.450000, 0.041016, 0.376658, -0.888038, 0.263661, 0.875000, 1.000000,
-    0.850000, -0.450000, -0.000000, 0.158678, -0.987330, 0.000000, 0.000000, 0.000000,
-    0.850000, -0.037500, -0.000000, 0.000000, 1.000000, 0.000000, 1.000000, 0.000000,
-    1.650000, 0.450000, -0.000000, 0.384615, -0.923077, 0.000000, 0.000000, 1.000000,
-    1.350000, 0.450000, -0.000000, -0.600000, 0.800000, 0.000000, 1.000000, 1.000000,
-    0.850000, -0.243750, -0.247500, 0.000000, 0.000000, -1.000000, 0.500000, 0.000000,
-    1.343750, -0.028125, -0.000000, 0.957826, -0.287348, 0.000000, 0.000000, 0.500000,
-    1.268750, 0.060938, -0.170625, 0.200450, 0.166138, -0.965514, 0.500000, 0.500000,
-    1.193750, 0.150000, -0.000000, -0.920582, 0.390550, 0.000000, 1.000000, 0.500000,
-    1.500000, 0.450000, -0.093750, 0.000000, 0.000000, -1.000000, 0.500000, 1.000000,
-    0.850000, -0.385547, -0.185625, 0.105312, -0.725480, -0.680138, 0.250000, 0.000000,
-    1.207031, -0.288281, -0.000000, 0.718240, -0.695795, 0.000000, 0.000000, 0.250000,
-    1.188721, -0.240491, -0.167607, 0.612003, -0.530032, -0.586957, 0.250000, 0.250000,
-    1.148438, -0.135352, -0.223477, 0.171854, 0.062939, -0.983110, 0.500000, 0.250000,
-    1.320312, -0.000293, -0.127969, 0.836313, -0.178498, -0.518380, 0.250000, 0.500000,
-    0.850000, -0.432275, -0.108281, 0.145471, -0.929513, -0.338885, 0.125000, 0.000000,
-    1.066895, -0.386719, -0.000000, 0.427109, -0.904200, 0.000000, 0.000000, 0.125000,
-    1.063697, -0.371078, -0.105391, 0.409189, -0.857696, -0.311324, 0.125000, 0.125000,
-    1.055267, -0.329842, -0.180670, 0.342821, -0.685430, -0.642386, 0.250000, 0.125000,
-    1.201996, -0.275139, -0.097771, 0.697590, -0.660469, -0.277758, 0.125000, 0.250000,
-    0.850000, -0.319482, -0.232031, 0.048978, -0.391968, -0.918674, 0.375000, 0.000000,
-    1.055267, -0.329842, -0.180670, 0.342821, -0.685430, -0.642386, 0.250000, 0.125000,
-    1.043350, -0.271543, -0.225838, 0.224881, -0.377045, -0.898480, 0.375000, 0.125000,
-    1.029688, -0.204712, -0.240894, 0.079921, 0.015529, -0.996680, 0.500000, 0.125000,
-    1.169952, -0.191505, -0.209509, 0.434362, -0.278625, -0.856562, 0.375000, 0.250000,
-    1.201996, -0.275139, -0.097771, 0.697590, -0.660469, -0.277758, 0.125000, 0.250000,
-    1.292090, -0.165234, -0.000000, 0.897596, -0.440819, 0.000000, 0.000000, 0.375000,
-    1.286123, -0.154817, -0.086998, 0.877008, -0.414138, -0.243610, 0.125000, 0.375000,
-    1.270392, -0.127354, -0.149139, 0.789294, -0.317418, -0.525605, 0.250000, 0.375000,
-    1.337305, -0.020471, -0.074648, 0.934784, -0.262203, -0.239644, 0.125000, 0.500000,
-    1.169952, -0.191505, -0.209509, 0.434362, -0.278625, -0.856562, 0.375000, 0.250000,
-    1.270392, -0.127354, -0.149139, 0.789294, -0.317418, -0.525605, 0.250000, 0.375000,
-    1.248151, -0.088527, -0.186424, 0.584302, -0.135007, -0.800227, 0.375000, 0.375000,
-    1.222656, -0.044019, -0.198853, 0.229848, 0.129312, -0.964597, 0.500000, 0.375000,
-    1.296289, 0.028235, -0.159961, 0.611590, -0.023659, -0.790821, 0.375000, 0.500000,
-    0.850000, -0.101953, -0.185625, -0.029616, 0.729217, -0.683641, 0.750000, 0.000000,
-    1.148438, -0.135352, -0.223477, 0.171854, 0.062939, -0.983110, 0.500000, 0.250000,
-    1.108154, -0.030212, -0.167607, -0.375101, 0.676680, -0.633564, 0.750000, 0.250000,
-    1.089844, 0.017578, -0.000000, -0.544548, 0.838729, 0.000000, 1.000000, 0.250000,
-    1.217188, 0.122168, -0.127969, -0.694334, 0.415688, -0.587455, 0.750000, 0.500000,
-    0.850000, -0.168018, -0.232031, -0.027062, 0.392295, -0.919441, 0.625000, 0.000000,
-    1.029688, -0.204712, -0.240894, 0.079921, 0.015529, -0.996680, 0.500000, 0.125000,
-    1.016026, -0.137881, -0.225838, -0.060933, 0.413563, -0.908434, 0.625000, 0.125000,
-    1.004108, -0.079582, -0.180670, -0.165703, 0.736103, -0.656273, 0.750000, 0.125000,
-    1.126923, -0.079198, -0.209509, -0.128837, 0.417897, -0.899313, 0.625000, 0.250000,
-    0.850000, -0.055225, -0.108281, -0.011227, 0.939448, -0.342507, 0.875000, 0.000000,
-    1.004108, -0.079582, -0.180670, -0.165703, 0.736103, -0.656273, 0.750000, 0.125000,
-    0.995678, -0.038346, -0.105391, -0.222729, 0.920780, -0.320245, 0.875000, 0.125000,
-    0.992480, -0.022705, -0.000000, -0.235151, 0.971959, 0.000000, 1.000000, 0.125000,
-    1.094879, 0.004436, -0.097771, -0.508167, 0.807322, -0.299996, 0.875000, 0.250000,
-    1.126923, -0.079198, -0.209509, -0.128837, 0.417897, -0.899313, 0.625000, 0.250000,
-    1.222656, -0.044019, -0.198853, 0.229848, 0.129312, -0.964597, 0.500000, 0.375000,
-    1.197161, 0.000490, -0.186424, -0.219827, 0.393598, -0.892612, 0.625000, 0.375000,
-    1.174921, 0.039317, -0.149139, -0.577629, 0.549531, -0.603623, 0.750000, 0.375000,
-    1.241211, 0.093640, -0.159961, -0.296846, 0.354114, -0.886840, 0.625000, 0.500000,
-    1.094879, 0.004436, -0.097771, -0.508167, 0.807322, -0.299996, 0.875000, 0.250000,
-    1.174921, 0.039317, -0.149139, -0.577629, 0.549531, -0.603623, 0.750000, 0.375000,
-    1.159190, 0.066780, -0.086998, -0.756738, 0.593689, -0.273644, 0.875000, 0.375000,
-    1.153223, 0.077197, -0.000000, -0.801883, 0.597481, 0.000000, 1.000000, 0.375000,
-    1.200195, 0.142346, -0.074648, -0.876392, 0.404760, -0.260971, 0.875000, 0.500000,
-    1.320312, -0.000293, -0.127969, 0.836313, -0.178498, -0.518380, 0.250000, 0.500000,
-    1.433594, 0.246094, -0.000000, 0.897727, -0.440551, 0.000000, 0.000000, 0.750000,
-    1.405029, 0.256165, -0.088330, 0.694944, -0.248071, -0.674918, 0.250000, 0.750000,
-    1.342187, 0.278320, -0.117773, 0.067770, 0.175606, -0.982125, 0.500000, 0.750000,
-    1.603125, 0.450000, -0.070312, 0.325932, -0.741335, -0.586677, 0.250000, 1.000000,
-    1.337305, -0.020471, -0.074648, 0.934784, -0.262203, -0.239644, 0.125000, 0.500000,
-    1.383691, 0.112500, -0.000000, 0.958492, -0.285121, 0.000000, 0.000000, 0.625000,
-    1.376768, 0.117542, -0.062299, 0.927697, -0.254079, -0.273535, 0.125000, 0.625000,
-    1.358514, 0.130833, -0.106798, 0.802972, -0.151273, -0.576501, 0.250000, 0.625000,
-    1.425738, 0.248863, -0.051526, 0.855222, -0.393324, -0.337479, 0.125000, 0.750000,
-    1.296289, 0.028235, -0.159961, 0.611590, -0.023659, -0.790821, 0.375000, 0.500000,
-    1.358514, 0.130833, -0.106798, 0.802971, -0.151273, -0.576501, 0.250000, 0.625000,
-    1.332708, 0.149625, -0.133498, 0.541544, 0.009652, -0.840617, 0.375000, 0.625000,
-    1.303125, 0.171167, -0.142397, 0.144754, 0.193543, -0.970354, 0.500000, 0.625000,
-    1.375751, 0.266487, -0.110413, 0.408001, -0.028503, -0.912536, 0.375000, 0.750000,
-    1.425738, 0.248863, -0.051526, 0.855222, -0.393323, -0.337479, 0.125000, 0.750000,
-    1.515137, 0.362109, -0.000000, 0.704117, -0.710084, 0.000000, 0.000000, 0.875000,
-    1.505444, 0.363135, -0.043906, 0.669146, -0.650146, -0.359936, 0.125000, 0.875000,
-    1.479889, 0.365840, -0.075267, 0.529481, -0.444836, -0.722337, 0.250000, 0.875000,
-    1.637109, 0.450000, -0.041016, 0.375683, -0.888654, -0.262978, 0.125000, 1.000000,
-    1.375751, 0.266487, -0.110413, 0.408001, -0.028503, -0.912536, 0.375000, 0.750000,
-    1.479889, 0.365840, -0.075267, 0.529482, -0.444837, -0.722336, 0.250000, 0.875000,
-    1.443760, 0.369664, -0.094084, 0.287200, -0.148873, -0.946231, 0.375000, 0.875000,
-    1.402344, 0.374048, -0.100356, 0.015086, 0.130164, -0.991378, 0.500000, 0.875000,
-    1.555078, 0.450000, -0.087891, 0.197089, -0.417806, -0.886901, 0.375000, 1.000000,
-    1.217188, 0.122168, -0.127969, -0.694334, 0.415688, -0.587455, 0.750000, 0.500000,
-    1.342187, 0.278320, -0.117773, 0.067770, 0.175606, -0.982125, 0.500000, 0.750000,
-    1.279346, 0.300476, -0.088330, -0.631401, 0.393081, -0.668446, 0.750000, 0.750000,
-    1.250781, 0.310547, -0.000000, -0.928477, 0.371391, 0.000000, 1.000000, 0.750000,
-    1.396875, 0.450000, -0.070312, -0.386984, 0.604180, -0.696571, 0.750000, 1.000000,
-    1.241211, 0.093640, -0.159961, -0.296846, 0.354114, -0.886840, 0.625000, 0.500000,
-    1.303125, 0.171167, -0.142397, 0.144754, 0.193543, -0.970354, 0.500000, 0.625000,
-    1.273542, 0.192709, -0.133498, -0.320819, 0.326623, -0.889040, 0.625000, 0.625000,
-    1.247736, 0.211501, -0.106798, -0.702256, 0.362674, -0.612621, 0.750000, 0.625000,
-    1.308624, 0.290154, -0.110413, -0.297312, 0.323820, -0.898191, 0.625000, 0.750000,
-    1.200195, 0.142346, -0.074648, -0.876392, 0.404761, -0.260971, 0.875000, 0.500000,
-    1.247736, 0.211501, -0.106798, -0.702257, 0.362674, -0.612620, 0.750000, 0.625000,
-    1.229482, 0.224792, -0.062299, -0.899738, 0.333705, -0.281268, 0.875000, 0.625000,
-    1.222558, 0.229834, -0.000000, -0.950213, 0.311602, 0.000000, 1.000000, 0.625000,
-    1.258636, 0.307777, -0.051526, -0.857015, 0.389291, -0.337605, 0.875000, 0.750000,
-    1.308624, 0.290154, -0.110413, -0.297312, 0.323820, -0.898191, 0.625000, 0.750000,
-    1.402344, 0.374048, -0.100356, 0.015086, 0.130164, -0.991378, 0.500000, 0.875000,
-    1.360928, 0.378432, -0.094084, -0.252654, 0.337465, -0.906799, 0.625000, 0.875000,
-    1.324799, 0.382256, -0.075267, -0.517529, 0.474866, -0.711805, 0.750000, 0.875000,
-    1.444922, 0.450000, -0.087891, -0.203025, 0.352273, -0.913611, 0.625000, 1.000000,
-    1.258636, 0.307777, -0.051526, -0.857015, 0.389291, -0.337606, 0.875000, 0.750000,
-    1.324799, 0.382256, -0.075267, -0.517529, 0.474866, -0.711805, 0.750000, 0.875000,
-    1.299244, 0.384960, -0.043906, -0.740671, 0.547951, -0.388789, 0.875000, 0.875000,
-    1.289551, 0.385986, -0.000000, -0.828868, 0.559444, 0.000000, 1.000000, 0.875000,
-    1.362891, 0.450000, -0.041016, -0.538815, 0.753273, -0.377171, 0.875000, 1.000000,
-    1.350000, 0.450000, -0.000000, -0.599999, 0.800000, 0.000000, 0.000000, 0.000000,
-    1.650000, 0.450000, -0.000000, 0.384615, -0.923077, 0.000000, 1.000000, 0.000000,
-    1.400000, 0.450000, -0.000000, 0.599998, -0.800001, 0.000000, 0.000000, 1.000000,
-    1.600000, 0.450000, -0.000000, -0.410365, 0.911922, 0.000000, 1.000000, 1.000000,
-    1.500000, 0.450000, 0.093750, 0.000000, 0.000000, 1.000000, 0.500000, 0.000000,
-    1.412500, 0.478125, -0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.500000,
-    1.563281, 0.483398, 0.075000, -0.030653, 0.998390, 0.047730, 0.500000, 0.500000,
-    1.714062, 0.488672, -0.000000, 0.106533, 0.994309, 0.000000, 1.000000, 0.500000,
-    1.500000, 0.450000, 0.056250, 0.000000, -0.000000, -1.000000, 0.500000, 1.000000,
-    1.396875, 0.450000, 0.070312, -0.390970, 0.593197, 0.703746, 0.250000, 0.000000,
-    1.385937, 0.471094, -0.000000, -0.393919, 0.919145, 0.000000, 0.000000, 0.250000,
-    1.436139, 0.472124, 0.065918, -0.261242, 0.825249, 0.500716, 0.250000, 0.250000,
-    1.546582, 0.474390, 0.087891, -0.010489, 0.543162, 0.839563, 0.500000, 0.250000,
-    1.459619, 0.479773, 0.056250, -0.028676, 0.999488, -0.014204, 0.250000, 0.500000,
-    1.362891, 0.450000, 0.041016, -0.541370, 0.750538, 0.378960, 0.125000, 0.000000,
-    1.368555, 0.462305, -0.000000, -0.502135, 0.864789, 0.000000, 0.000000, 0.125000,
-    1.382164, 0.462453, 0.040311, -0.452660, 0.827269, 0.332754, 0.125000, 0.125000,
-    1.418043, 0.462845, 0.069104, -0.328007, 0.714730, 0.617715, 0.250000, 0.125000,
-    1.399743, 0.471377, 0.038452, -0.354757, 0.895428, 0.268992, 0.125000, 0.250000,
-    1.444922, 0.450000, 0.087891, -0.203320, 0.348630, 0.914942, 0.375000, 0.000000,
-    1.418043, 0.462845, 0.069104, -0.328007, 0.714730, 0.617715, 0.250000, 0.125000,
-    1.468768, 0.463400, 0.086380, -0.177466, 0.531475, 0.828275, 0.375000, 0.125000,
-    1.526917, 0.464035, 0.092139, -0.002586, 0.248712, 0.968574, 0.500000, 0.125000,
-    1.487595, 0.473179, 0.082397, -0.146800, 0.719542, 0.678756, 0.375000, 0.250000,
-    1.399743, 0.471377, 0.038452, -0.354755, 0.895429, 0.268990, 0.125000, 0.250000,
-    1.400977, 0.476367, -0.000000, -0.252422, 0.967617, 0.000000, 0.000000, 0.375000,
-    1.414538, 0.476757, 0.035825, -0.228367, 0.958759, 0.169205, 0.125000, 0.375000,
-    1.450289, 0.477783, 0.061414, -0.171147, 0.934241, 0.312892, 0.250000, 0.375000,
-    1.425458, 0.478578, 0.032812, -0.011150, 0.999718, -0.020946, 0.125000, 0.500000,
-    1.487595, 0.473179, 0.082397, -0.146800, 0.719545, 0.678753, 0.375000, 0.250000,
-    1.450289, 0.477783, 0.061414, -0.171148, 0.934242, 0.312891, 0.250000, 0.375000,
-    1.500835, 0.479235, 0.076767, -0.104867, 0.896864, 0.429695, 0.375000, 0.375000,
-    1.558777, 0.480899, 0.081885, -0.023691, 0.837628, 0.545728, 0.500000, 0.375000,
-    1.507916, 0.481462, 0.070312, -0.038175, 0.999104, 0.018273, 0.375000, 0.500000,
-    1.603125, 0.450000, 0.070312, 0.328506, -0.736502, 0.591311, 0.750000, 0.000000,
-    1.546582, 0.474390, 0.087891, -0.010489, 0.543162, 0.839563, 0.500000, 0.250000,
-    1.657025, 0.476656, 0.065918, 0.419012, -0.340104, 0.841878, 0.750000, 0.250000,
-    1.707227, 0.477686, -0.000000, 0.537133, -0.843498, 0.000000, 1.000000, 0.250000,
-    1.666943, 0.487024, 0.056250, 0.017233, 0.992921, 0.117519, 0.750000, 0.500000,
-    1.555078, 0.450000, 0.087891, 0.197370, -0.414975, 0.888167, 0.625000, 0.000000,
-    1.526917, 0.464035, 0.092139, -0.002586, 0.248712, 0.968574, 0.500000, 0.125000,
-    1.585065, 0.464670, 0.086380, 0.201774, -0.178320, 0.963062, 0.625000, 0.125000,
-    1.635790, 0.465225, 0.069104, 0.367189, -0.618011, 0.695150, 0.750000, 0.125000,
-    1.605569, 0.475600, 0.082397, 0.182564, 0.209574, 0.960598, 0.625000, 0.250000,
-    1.637109, 0.450000, 0.041016, 0.376658, -0.888038, 0.263661, 0.875000, 0.000000,
-    1.635790, 0.465225, 0.069104, 0.367189, -0.618009, 0.695153, 0.750000, 0.125000,
-    1.671669, 0.465617, 0.040311, 0.430592, -0.845391, 0.316077, 0.875000, 0.125000,
-    1.685278, 0.465765, -0.000000, 0.438412, -0.898774, 0.000000, 1.000000, 0.125000,
-    1.693421, 0.477402, 0.038452, 0.528248, -0.743422, 0.410218, 0.875000, 0.250000,
-    1.605569, 0.475600, 0.082397, 0.182565, 0.209570, 0.960599, 0.625000, 0.250000,
-    1.558777, 0.480899, 0.081885, -0.023691, 0.837628, 0.545728, 0.500000, 0.375000,
-    1.616719, 0.482563, 0.076767, 0.105864, 0.722978, 0.682712, 0.625000, 0.375000,
-    1.667265, 0.484015, 0.061414, 0.368189, 0.433463, 0.822524, 0.750000, 0.375000,
-    1.618646, 0.485335, 0.070312, -0.017857, 0.995236, 0.095847, 0.625000, 0.500000,
-    1.693421, 0.477402, 0.038452, 0.528244, -0.743425, 0.410215, 0.875000, 0.250000,
-    1.667265, 0.484015, 0.061414, 0.368191, 0.433462, 0.822524, 0.750000, 0.375000,
-    1.703016, 0.485041, 0.035825, 0.754900, -0.180907, 0.630395, 0.875000, 0.375000,
-    1.716577, 0.485431, -0.000000, 0.859737, -0.510736, 0.000000, 1.000000, 0.375000,
-    1.701105, 0.488219, 0.032812, 0.072271, 0.992935, 0.094111, 0.875000, 0.500000,
-    1.459619, 0.479773, 0.056250, -0.028676, 0.999488, -0.014203, 0.250000, 0.500000,
-    1.420312, 0.471094, -0.000000, 0.948684, -0.316227, 0.000000, 0.000000, 0.750000,
-    1.460321, 0.472536, 0.046582, 0.388841, 0.140631, -0.910508, 0.250000, 0.750000,
-    1.548340, 0.475708, 0.062109, -0.020139, 0.565841, -0.824268, 0.500000, 0.750000,
-    1.431250, 0.450000, 0.042188, 0.370536, -0.559922, -0.741073, 0.250000, 1.000000,
-    1.425458, 0.478578, 0.032812, -0.011151, 0.999718, -0.020945, 0.125000, 0.500000,
-    1.419336, 0.476367, -0.000000, 0.650788, 0.759260, -0.000000, 0.000000, 0.625000,
-    1.431414, 0.476827, 0.029800, 0.466018, 0.764069, -0.446123, 0.125000, 0.625000,
-    1.463255, 0.478041, 0.051086, 0.212314, 0.799230, -0.562276, 0.250000, 0.625000,
-    1.431315, 0.471490, 0.027173, 0.736672, -0.149641, -0.659487, 0.125000, 0.750000,
-    1.507916, 0.481462, 0.070312, -0.038175, 0.999104, 0.018273, 0.375000, 0.500000,
-    1.463255, 0.478041, 0.051086, 0.212315, 0.799230, -0.562276, 0.250000, 0.625000,
-    1.508271, 0.479756, 0.063858, 0.061046, 0.840539, -0.538301, 0.375000, 0.625000,
-    1.559876, 0.481723, 0.068115, -0.033383, 0.880730, -0.472440, 0.500000, 0.625000,
-    1.501330, 0.474014, 0.058228, 0.143907, 0.380043, -0.913706, 0.375000, 0.750000,
-    1.431315, 0.471490, 0.027173, 0.736673, -0.149623, -0.659489, 0.125000, 0.750000,
-    1.414258, 0.462305, -0.000000, 0.727013, -0.686624, 0.000000, 0.000000, 0.875000,
-    1.424072, 0.462553, 0.025314, 0.622016, -0.580709, -0.525236, 0.125000, 0.875000,
-    1.449944, 0.463206, 0.043396, 0.394296, -0.328022, -0.858448, 0.250000, 0.875000,
-    1.408594, 0.450000, 0.024609, 0.532585, -0.738082, -0.414232, 0.125000, 1.000000,
-    1.501330, 0.474014, 0.058228, 0.143907, 0.380043, -0.913706, 0.375000, 0.750000,
-    1.449944, 0.463206, 0.043396, 0.394294, -0.328020, -0.858449, 0.250000, 0.875000,
-    1.486523, 0.464130, 0.054245, 0.177862, -0.043211, -0.983106, 0.375000, 0.875000,
-    1.528455, 0.465189, 0.057861, -0.006299, 0.244403, -0.969653, 0.500000, 0.875000,
-    1.463281, 0.450000, 0.052734, 0.186166, -0.314478, -0.930831, 0.375000, 1.000000,
-    1.666943, 0.487024, 0.056250, 0.017234, 0.992921, 0.117521, 0.750000, 0.500000,
-    1.548340, 0.475708, 0.062109, -0.020139, 0.565841, -0.824268, 0.500000, 0.750000,
-    1.636358, 0.478880, 0.046582, -0.236122, 0.847054, -0.476179, 0.750000, 0.750000,
-    1.676367, 0.480322, -0.000000, -0.309738, 0.950822, 0.000000, 1.000000, 0.750000,
-    1.568750, 0.450000, 0.042188, -0.325285, 0.686256, -0.650571, 0.750000, 1.000000,
-    1.618646, 0.485335, 0.070312, -0.017856, 0.995235, 0.095852, 0.625000, 0.500000,
-    1.559876, 0.481723, 0.068115, -0.033384, 0.880731, -0.472439, 0.500000, 0.625000,
-    1.611480, 0.483690, 0.063858, -0.102068, 0.914951, -0.390443, 0.625000, 0.625000,
-    1.656496, 0.485405, 0.051086, -0.157379, 0.946540, -0.281590, 0.750000, 0.625000,
-    1.595350, 0.477402, 0.058228, -0.142748, 0.722340, -0.676645, 0.625000, 0.750000,
-    1.701105, 0.488219, 0.032812, 0.072275, 0.992935, 0.094114, 0.875000, 0.500000,
-    1.656496, 0.485405, 0.051086, -0.157378, 0.946540, -0.281592, 0.750000, 0.625000,
-    1.688337, 0.486619, 0.029800, -0.197992, 0.969370, -0.145333, 0.875000, 0.625000,
-    1.700415, 0.487079, -0.000000, -0.212233, 0.977219, 0.000000, 1.000000, 0.625000,
-    1.665365, 0.479926, 0.027173, -0.292302, 0.927391, -0.233464, 0.875000, 0.750000,
-    1.595350, 0.477402, 0.058228, -0.142748, 0.722338, -0.676646, 0.625000, 0.750000,
-    1.528455, 0.465189, 0.057861, -0.006299, 0.244403, -0.969653, 0.500000, 0.875000,
-    1.570386, 0.466248, 0.054245, -0.163578, 0.526337, -0.834393, 0.625000, 0.875000,
-    1.606965, 0.467171, 0.043396, -0.282838, 0.759561, -0.585721, 0.750000, 0.875000,
-    1.536719, 0.450000, 0.052734, -0.182506, 0.366028, -0.912532, 0.625000, 1.000000,
-    1.665365, 0.479926, 0.027173, -0.292302, 0.927391, -0.233463, 0.875000, 0.750000,
-    1.606965, 0.467171, 0.043396, -0.282837, 0.759559, -0.585724, 0.750000, 0.875000,
-    1.632838, 0.467825, 0.025314, -0.349511, 0.893333, -0.282485, 0.875000, 0.875000,
-    1.642651, 0.468073, -0.000000, -0.366863, 0.930275, 0.000000, 1.000000, 0.875000,
-    1.591406, 0.450000, 0.024609, -0.394896, 0.865864, -0.307141, 0.875000, 1.000000,
-    1.650000, 0.450000, -0.000000, 0.384615, -0.923077, 0.000000, 0.000000, 0.000000,
-    1.350000, 0.450000, -0.000000, -0.599999, 0.800000, 0.000000, 1.000000, 0.000000,
-    1.600000, 0.450000, -0.000000, -0.410365, 0.911922, 0.000000, 0.000000, 1.000000,
-    1.400000, 0.450000, -0.000000, 0.599998, -0.800001, 0.000000, 1.000000, 1.000000,
-    1.500000, 0.450000, -0.093750, 0.000000, 0.000000, -1.000000, 0.500000, 0.000000,
-    1.714062, 0.488672, -0.000000, 0.106533, 0.994309, 0.000000, 0.000000, 0.500000,
-    1.563281, 0.483398, -0.075000, -0.030594, 0.996500, -0.077797, 0.500000, 0.500000,
-    1.412500, 0.478125, -0.000000, 0.000000, 1.000000, 0.000000, 1.000000, 0.500000,
-    1.500000, 0.450000, -0.056250, 0.000000, 0.000000, 1.000000, 0.500000, 1.000000,
-    1.603125, 0.450000, -0.070312, 0.325932, -0.741335, -0.586677, 0.250000, 0.000000,
-    1.707227, 0.477686, -0.000000, 0.537133, -0.843498, 0.000000, 0.000000, 0.250000,
-    1.657025, 0.476656, -0.065918, 0.416712, -0.355669, -0.836570, 0.250000, 0.250000,
-    1.546582, 0.474390, -0.087891, -0.010489, 0.543162, -0.839563, 0.500000, 0.250000,
-    1.666943, 0.487024, -0.056250, 0.020713, 0.991902, -0.125308, 0.250000, 0.500000,
-    1.637109, 0.450000, -0.041016, 0.375683, -0.888653, -0.262978, 0.125000, 0.000000,
-    1.685278, 0.465765, -0.000000, 0.438412, -0.898774, 0.000000, 0.000000, 0.125000,
-    1.671669, 0.465617, -0.040311, 0.429299, -0.846413, -0.315099, 0.125000, 0.125000,
-    1.635790, 0.465225, -0.069104, 0.367189, -0.618009, -0.695153, 0.250000, 0.125000,
-    1.693421, 0.477402, -0.038452, 0.526088, -0.745922, -0.408450, 0.125000, 0.250000,
-    1.555078, 0.450000, -0.087891, 0.197089, -0.417807, -0.886901, 0.375000, 0.000000,
-    1.635790, 0.465225, -0.069104, 0.367189, -0.618011, -0.695150, 0.250000, 0.125000,
-    1.585065, 0.464670, -0.086380, 0.201644, -0.183060, -0.962200, 0.375000, 0.125000,
-    1.526917, 0.464035, -0.092139, -0.002586, 0.248712, -0.968574, 0.500000, 0.125000,
-    1.605569, 0.475600, -0.082397, 0.183016, 0.202049, -0.962123, 0.375000, 0.250000,
-    1.693421, 0.477402, -0.038452, 0.526085, -0.745926, -0.408447, 0.125000, 0.250000,
-    1.716577, 0.485431, -0.000000, 0.859737, -0.510736, 0.000000, 0.000000, 0.375000,
-    1.703016, 0.485041, -0.035825, 0.753057, -0.194596, -0.628520, 0.125000, 0.375000,
-    1.667265, 0.484015, -0.061414, 0.368191, 0.433462, -0.822524, 0.250000, 0.375000,
-    1.701105, 0.488219, -0.032812, 0.074241, 0.992625, -0.095834, 0.125000, 0.500000,
-    1.605569, 0.475600, -0.082397, 0.183016, 0.202045, -0.962124, 0.375000, 0.250000,
-    1.667265, 0.484015, -0.061414, 0.368189, 0.433463, -0.822524, 0.250000, 0.375000,
-    1.616719, 0.482563, -0.076767, 0.107208, 0.716766, -0.689024, 0.375000, 0.375000,
-    1.558777, 0.480899, -0.081885, -0.023691, 0.837628, -0.545728, 0.500000, 0.375000,
-    1.618646, 0.485335, -0.070312, -0.017113, 0.994843, -0.099972, 0.375000, 0.500000,
-    1.396875, 0.450000, -0.070312, -0.386984, 0.604180, -0.696570, 0.750000, 0.000000,
-    1.546582, 0.474390, -0.087891, -0.010489, 0.543162, -0.839563, 0.500000, 0.250000,
-    1.436139, 0.472124, -0.065918, -0.260333, 0.826693, -0.498803, 0.750000, 0.250000,
-    1.385937, 0.471094, -0.000000, -0.393919, 0.919145, 0.000000, 1.000000, 0.250000,
-    1.459619, 0.479773, -0.056250, -0.031625, 0.999471, 0.007533, 0.750000, 0.500000,
-    1.444922, 0.450000, -0.087891, -0.203025, 0.352273, -0.913611, 0.625000, 0.000000,
-    1.526917, 0.464035, -0.092139, -0.002586, 0.248712, -0.968574, 0.500000, 0.125000,
-    1.468768, 0.463400, -0.086380, -0.177235, 0.533433, -0.827065, 0.625000, 0.125000,
-    1.418043, 0.462845, -0.069104, -0.328007, 0.714730, -0.617715, 0.750000, 0.125000,
-    1.487595, 0.473179, -0.082397, -0.146760, 0.719769, -0.678524, 0.625000, 0.250000,
-    1.362891, 0.450000, -0.041016, -0.538816, 0.753272, -0.377172, 0.875000, 0.000000,
-    1.418043, 0.462845, -0.069104, -0.328007, 0.714730, -0.617715, 0.750000, 0.125000,
-    1.382164, 0.462453, -0.040311, -0.450802, 0.828846, -0.331350, 0.875000, 0.125000,
-    1.368555, 0.462305, -0.000000, -0.502135, 0.864789, 0.000000, 1.000000, 0.125000,
-    1.399743, 0.471377, -0.038452, -0.353662, 0.896127, -0.268105, 0.875000, 0.250000,
-    1.487595, 0.473179, -0.082397, -0.146759, 0.719772, -0.678521, 0.625000, 0.250000,
-    1.558777, 0.480899, -0.081885, -0.023691, 0.837628, -0.545728, 0.500000, 0.375000,
-    1.500835, 0.479235, -0.076767, -0.105172, 0.895971, -0.431480, 0.625000, 0.375000,
-    1.450289, 0.477783, -0.061414, -0.171148, 0.934242, -0.312891, 0.750000, 0.375000,
-    1.507916, 0.481462, -0.070312, -0.038808, 0.999007, -0.021872, 0.625000, 0.500000,
-    1.399743, 0.471377, -0.038452, -0.353660, 0.896128, -0.268103, 0.875000, 0.250000,
-    1.450289, 0.477783, -0.061414, -0.171147, 0.934241, -0.312892, 0.750000, 0.375000,
-    1.414538, 0.476757, -0.035825, -0.228267, 0.958797, -0.169120, 0.875000, 0.375000,
-    1.400977, 0.476367, -0.000000, -0.252422, 0.967617, 0.000000, 1.000000, 0.375000,
-    1.425458, 0.478578, -0.032812, -0.012463, 0.999726, 0.019791, 0.875000, 0.500000,
-    1.666943, 0.487024, -0.056250, 0.020714, 0.991901, -0.125310, 0.250000, 0.500000,
-    1.676367, 0.480322, -0.000000, -0.309738, 0.950822, 0.000000, 0.000000, 0.750000,
-    1.636358, 0.478880, -0.046582, -0.235472, 0.848126, 0.474589, 0.250000, 0.750000,
-    1.548340, 0.475708, -0.062109, -0.020139, 0.565841, 0.824268, 0.500000, 0.750000,
-    1.568750, 0.450000, -0.042188, -0.323573, 0.690291, 0.647147, 0.250000, 1.000000,
-    1.701105, 0.488219, -0.032812, 0.074245, 0.992624, -0.095838, 0.125000, 0.500000,
-    1.700415, 0.487079, -0.000000, -0.212233, 0.977219, 0.000000, 0.000000, 0.625000,
-    1.688337, 0.486619, -0.029800, -0.197930, 0.969391, 0.145277, 0.125000, 0.625000,
-    1.656496, 0.485405, -0.051086, -0.157378, 0.946540, 0.281592, 0.250000, 0.625000,
-    1.665365, 0.479926, -0.027173, -0.292143, 0.927478, 0.233317, 0.125000, 0.750000,
-    1.618646, 0.485335, -0.070312, -0.017112, 0.994843, -0.099978, 0.375000, 0.500000,
-    1.656496, 0.485405, -0.051086, -0.157379, 0.946540, 0.281590, 0.250000, 0.625000,
-    1.611480, 0.483690, -0.063858, -0.102043, 0.915022, 0.390285, 0.375000, 0.625000,
-    1.559876, 0.481723, -0.068115, -0.033384, 0.880731, 0.472439, 0.500000, 0.625000,
-    1.595350, 0.477402, -0.058228, -0.142797, 0.721999, 0.676998, 0.375000, 0.750000,
-    1.665365, 0.479926, -0.027173, -0.292143, 0.927478, 0.233317, 0.125000, 0.750000,
-    1.642651, 0.468073, -0.000000, -0.366863, 0.930275, 0.000000, 0.000000, 0.875000,
-    1.632838, 0.467825, -0.025314, -0.349075, 0.893625, 0.282102, 0.125000, 0.875000,
-    1.606965, 0.467171, -0.043396, -0.282837, 0.759559, 0.585724, 0.250000, 0.875000,
-    1.591406, 0.450000, -0.024609, -0.394161, 0.866402, 0.306569, 0.125000, 1.000000,
-    1.595350, 0.477402, -0.058228, -0.142797, 0.721999, 0.676998, 0.375000, 0.750000,
-    1.606965, 0.467171, -0.043396, -0.282838, 0.759561, 0.585721, 0.250000, 0.875000,
-    1.570386, 0.466248, -0.054245, -0.163533, 0.526860, 0.834072, 0.375000, 0.875000,
-    1.528455, 0.465189, -0.057861, -0.006299, 0.244403, 0.969653, 0.500000, 0.875000,
-    1.536719, 0.450000, -0.052734, -0.182345, 0.368116, 0.911724, 0.375000, 1.000000,
-    1.459619, 0.479773, -0.056250, -0.031626, 0.999471, 0.007532, 0.750000, 0.500000,
-    1.548340, 0.475708, -0.062109, -0.020139, 0.565841, 0.824268, 0.500000, 0.750000,
-    1.460321, 0.472536, -0.046582, 0.390568, 0.119605, 0.912771, 0.750000, 0.750000,
-    1.420312, 0.471094, -0.000000, 0.948684, -0.316227, 0.000000, 1.000000, 0.750000,
-    1.431250, 0.450000, -0.042188, 0.367398, -0.570170, 0.734796, 0.750000, 1.000000,
-    1.507916, 0.481462, -0.070312, -0.038808, 0.999007, -0.021872, 0.625000, 0.500000,
-    1.559876, 0.481723, -0.068115, -0.033383, 0.880730, 0.472440, 0.500000, 0.625000,
-    1.508271, 0.479756, -0.063858, 0.060846, 0.841199, 0.537292, 0.625000, 0.625000,
-    1.463255, 0.478041, -0.051086, 0.212315, 0.799230, 0.562276, 0.750000, 0.625000,
-    1.501330, 0.474014, -0.058228, 0.144240, 0.376853, 0.914974, 0.625000, 0.750000,
-    1.425458, 0.478578, -0.032812, -0.012465, 0.999726, 0.019790, 0.875000, 0.500000,
-    1.463255, 0.478041, -0.051086, 0.212314, 0.799230, 0.562276, 0.750000, 0.625000,
-    1.431414, 0.476827, -0.029800, 0.465501, 0.764644, 0.445677, 0.875000, 0.625000,
-    1.419336, 0.476367, -0.000000, 0.650788, 0.759260, -0.000000, 1.000000, 0.625000,
-    1.431315, 0.471490, -0.027173, 0.736016, -0.156276, 0.658680, 0.875000, 0.750000,
-    1.501330, 0.474014, -0.058228, 0.144240, 0.376852, 0.914974, 0.625000, 0.750000,
-    1.528455, 0.465189, -0.057861, -0.006299, 0.244403, 0.969653, 0.500000, 0.875000,
-    1.486523, 0.464130, -0.054245, 0.177936, -0.047578, 0.982891, 0.625000, 0.875000,
-    1.449944, 0.463206, -0.043396, 0.394294, -0.328020, 0.858449, 0.750000, 0.875000,
-    1.463281, 0.450000, -0.052734, 0.185972, -0.317450, 0.929860, 0.625000, 1.000000,
-    1.431315, 0.471490, -0.027173, 0.736017, -0.156259, 0.658682, 0.875000, 0.750000,
-    1.449944, 0.463206, -0.043396, 0.394296, -0.328022, 0.858448, 0.750000, 0.875000,
-    1.424072, 0.462553, -0.025314, 0.619509, -0.585423, 0.522962, 0.875000, 0.875000,
-    1.414258, 0.462305, -0.000000, 0.727013, -0.686624, 0.000000, 1.000000, 0.875000,
-    1.408594, 0.450000, -0.024609, 0.530206, -0.740826, 0.412382, 0.875000, 1.000000,
-    0.000000, 0.825000, -0.000000, 0.674579, 0.299813, 0.674579, 0.000000, 0.000000,
-    0.000000, 0.825000, -0.000000, 0.674579, 0.299813, 0.674579, 1.000000, 0.000000,
-    0.100000, 0.600000, -0.000000, 0.600000, 0.800000, -0.000000, 0.000000, 1.000000,
-    0.000000, 0.600000, 0.100000, 0.000000, 0.800000, 0.600000, 1.000000, 1.000000,
-    0.000000, 0.825000, -0.000000, 0.674579, 0.299813, 0.674579, 0.500000, 0.000000,
-    0.162500, 0.740625, -0.000000, 0.780869, -0.624695, 0.000000, 0.000000, 0.500000,
-    0.115516, 0.740625, 0.115516, 0.553962, -0.621492, 0.553962, 0.500000, 0.500000,
-    0.000000, 0.740625, 0.162500, 0.000000, -0.624695, 0.780869, 1.000000, 0.500000,
-    0.071000, 0.600000, 0.071000, 0.427005, 0.797078, 0.427005, 0.500000, 1.000000,
-    0.000000, 0.825000, -0.000000, 0.452928, 0.872306, 0.184222, 0.250000, 0.000000,
-    0.170313, 0.800391, -0.000000, 0.600000, 0.800000, -0.000000, 0.000000, 0.250000,
-    0.157173, 0.800391, 0.067026, 0.554284, 0.799965, 0.229837, 0.250000, 0.250000,
-    0.121080, 0.800391, 0.121080, 0.422824, 0.801523, 0.422824, 0.500000, 0.250000,
-    0.149959, 0.740625, 0.063939, 0.721237, -0.624756, 0.299162, 0.250000, 0.500000,
-    0.000000, 0.825000, -0.000000, 0.142954, 0.989332, 0.028025, 0.125000, 0.000000,
-    0.115039, 0.818408, -0.000000, 0.152452, 0.988311, -0.000000, 0.000000, 0.125000,
-    0.112750, 0.818408, 0.023522, 0.149493, 0.988317, 0.029677, 0.125000, 0.125000,
-    0.106164, 0.818408, 0.045274, 0.140386, 0.988384, 0.058210, 0.250000, 0.125000,
-    0.166924, 0.800391, 0.034822, 0.588416, 0.800075, 0.116818, 0.125000, 0.250000,
-    0.000000, 0.825000, -0.000000, 0.120585, 0.989432, 0.080516, 0.375000, 0.000000,
-    0.106164, 0.818408, 0.045274, 0.140386, 0.988384, 0.058209, 0.250000, 0.125000,
-    0.095702, 0.818408, 0.064836, 0.126226, 0.988401, 0.084441, 0.375000, 0.125000,
-    0.081785, 0.818408, 0.081785, 0.107233, 0.988434, 0.107233, 0.500000, 0.125000,
-    0.141684, 0.800391, 0.095986, 0.497465, 0.801110, 0.332794, 0.375000, 0.250000,
-    0.166924, 0.800391, 0.034822, 0.588416, 0.800075, 0.116818, 0.125000, 0.250000,
-    0.181055, 0.773584, -0.000000, 0.978147, -0.207916, 0.000000, 0.000000, 0.375000,
-    0.177452, 0.773584, 0.037016, 0.959398, -0.208008, 0.190496, 0.125000, 0.375000,
-    0.167085, 0.773584, 0.071249, 0.903388, -0.208673, 0.374628, 0.250000, 0.375000,
-    0.159265, 0.740625, 0.033217, 0.765799, -0.624831, 0.152111, 0.125000, 0.500000,
-    0.141684, 0.800391, 0.095986, 0.497465, 0.801110, 0.332794, 0.375000, 0.250000,
-    0.167085, 0.773584, 0.071249, 0.903388, -0.208673, 0.374627, 0.250000, 0.375000,
-    0.150618, 0.773584, 0.102036, 0.812814, -0.208889, 0.543782, 0.375000, 0.375000,
-    0.128714, 0.773584, 0.128714, 0.691459, -0.209208, 0.691459, 0.500000, 0.375000,
-    0.135177, 0.740625, 0.091571, 0.647897, -0.626344, 0.433501, 0.375000, 0.500000,
-    0.000000, 0.825000, -0.000000, 0.184222, 0.872306, 0.452928, 0.750000, 0.000000,
-    0.121080, 0.800391, 0.121080, 0.422824, 0.801523, 0.422824, 0.500000, 0.250000,
-    0.067026, 0.800391, 0.157173, 0.229949, 0.799746, 0.554553, 0.750000, 0.250000,
-    0.000000, 0.800391, 0.170313, 0.000000, 0.800000, 0.600000, 1.000000, 0.250000,
-    0.063939, 0.740625, 0.149959, 0.299246, -0.624481, 0.721440, 0.750000, 0.500000,
-    0.000000, 0.825000, -0.000000, 0.080516, 0.989432, 0.120585, 0.625000, 0.000000,
-    0.081785, 0.818408, 0.081785, 0.107233, 0.988434, 0.107233, 0.500000, 0.125000,
-    0.064836, 0.818408, 0.095702, 0.084445, 0.988400, 0.126232, 0.625000, 0.125000,
-    0.045274, 0.818408, 0.106164, 0.058209, 0.988384, 0.140386, 0.750000, 0.125000,
-    0.095986, 0.800391, 0.141684, 0.332805, 0.801096, 0.497480, 0.625000, 0.250000,
-    0.000000, 0.825000, -0.000000, 0.028025, 0.989332, 0.142954, 0.875000, 0.000000,
-    0.045274, 0.818408, 0.106164, 0.058210, 0.988384, 0.140386, 0.750000, 0.125000,
-    0.023522, 0.818408, 0.112750, 0.029681, 0.988314, 0.149513, 0.875000, 0.125000,
-    0.000000, 0.818408, 0.115039, 0.000000, 0.988311, 0.152452, 1.000000, 0.125000,
-    0.034822, 0.800391, 0.166924, 0.116828, 0.800035, 0.588468, 0.875000, 0.250000,
-    0.095986, 0.800391, 0.141684, 0.332805, 0.801096, 0.497480, 0.625000, 0.250000,
-    0.128714, 0.773584, 0.128714, 0.691459, -0.209208, 0.691459, 0.500000, 0.375000,
-    0.102036, 0.773584, 0.150618, 0.543783, -0.208883, 0.812815, 0.625000, 0.375000,
-    0.071249, 0.773584, 0.167085, 0.374627, -0.208673, 0.903388, 0.750000, 0.375000,
-    0.091571, 0.740625, 0.135177, 0.433508, -0.626329, 0.647907, 0.625000, 0.500000,
-    0.034822, 0.800391, 0.166924, 0.116828, 0.800035, 0.588468, 0.875000, 0.250000,
-    0.071249, 0.773584, 0.167085, 0.374628, -0.208673, 0.903388, 0.750000, 0.375000,
-    0.037016, 0.773584, 0.177452, 0.190497, -0.207986, 0.959402, 0.875000, 0.375000,
-    0.000000, 0.773584, 0.181055, 0.000000, -0.207916, 0.978147, 1.000000, 0.375000,
-    0.033217, 0.740625, 0.159265, 0.152118, -0.624784, 0.765837, 0.875000, 0.500000,
-    0.149959, 0.740625, 0.063939, 0.721237, -0.624756, 0.299162, 0.250000, 0.500000,
-    0.098437, 0.666797, -0.000000, 0.819843, -0.572589, 0.000000, 0.000000, 0.750000,
-    0.090828, 0.666797, 0.038696, 0.756991, -0.572775, 0.314474, 0.250000, 0.750000,
-    0.069943, 0.666797, 0.069943, 0.578481, -0.575083, 0.578480, 0.500000, 0.750000,
-    0.092250, 0.600000, 0.039250, 0.554119, 0.799779, 0.230883, 0.250000, 1.000000,
-    0.159265, 0.740625, 0.033217, 0.765799, -0.624831, 0.152111, 0.125000, 0.500000,
-    0.129883, 0.704150, -0.000000, 0.733920, -0.679236, 0.000000, 0.000000, 0.625000,
-    0.127296, 0.704150, 0.026539, 0.719711, -0.679374, 0.143067, 0.125000, 0.625000,
-    0.119854, 0.704150, 0.051090, 0.676763, -0.680523, 0.280858, 0.250000, 0.625000,
-    0.096475, 0.666797, 0.020097, 0.803930, -0.572768, 0.160103, 0.125000, 0.750000,
-    0.135177, 0.740625, 0.091571, 0.647897, -0.626344, 0.433501, 0.375000, 0.500000,
-    0.119854, 0.704150, 0.051090, 0.676763, -0.680523, 0.280858, 0.250000, 0.625000,
-    0.108035, 0.704150, 0.073175, 0.608679, -0.680856, 0.407364, 0.375000, 0.625000,
-    0.092316, 0.704150, 0.092316, 0.517530, -0.681414, 0.517530, 0.500000, 0.625000,
-    0.081863, 0.666797, 0.055433, 0.680115, -0.574467, 0.455446, 0.375000, 0.750000,
-    0.096475, 0.666797, 0.020097, 0.803930, -0.572768, 0.160103, 0.125000, 0.750000,
-    0.083398, 0.631201, -0.000000, 0.998653, -0.051878, 0.000000, 0.000000, 0.875000,
-    0.081732, 0.631201, 0.017004, 0.979312, -0.052085, 0.195539, 0.125000, 0.875000,
-    0.076941, 0.631201, 0.032751, 0.921944, -0.052662, 0.383727, 0.250000, 0.875000,
-    0.098000, 0.600000, 0.020375, 0.588328, 0.800016, 0.117666, 0.125000, 1.000000,
-    0.081863, 0.666797, 0.055433, 0.680115, -0.574467, 0.455446, 0.375000, 0.750000,
-    0.076941, 0.631201, 0.032751, 0.921944, -0.052662, 0.383728, 0.250000, 0.875000,
-    0.069336, 0.631201, 0.046930, 0.829512, -0.053050, 0.555963, 0.375000, 0.875000,
-    0.059228, 0.631201, 0.059228, 0.706103, -0.053279, 0.706102, 0.500000, 0.875000,
-    0.083125, 0.600000, 0.056250, 0.497431, 0.800807, 0.333571, 0.375000, 1.000000,
-    0.063939, 0.740625, 0.149959, 0.299246, -0.624480, 0.721440, 0.750000, 0.500000,
-    0.069943, 0.666797, 0.069943, 0.578480, -0.575083, 0.578481, 0.500000, 0.750000,
-    0.038696, 0.666797, 0.090828, 0.314542, -0.572521, 0.757155, 0.750000, 0.750000,
-    0.000000, 0.666797, 0.098437, 0.000000, -0.572589, 0.819843, 1.000000, 0.750000,
-    0.039250, 0.600000, 0.092250, 0.230996, 0.799557, 0.554392, 0.750000, 1.000000,
-    0.091571, 0.740625, 0.135177, 0.433508, -0.626329, 0.647907, 0.625000, 0.500000,
-    0.092316, 0.704150, 0.092316, 0.517530, -0.681414, 0.517530, 0.500000, 0.625000,
-    0.073175, 0.704150, 0.108035, 0.407370, -0.680843, 0.608689, 0.625000, 0.625000,
-    0.051090, 0.704150, 0.119854, 0.280858, -0.680523, 0.676763, 0.750000, 0.625000,
-    0.055433, 0.666797, 0.081863, 0.455449, -0.574459, 0.680120, 0.625000, 0.750000,
-    0.033217, 0.740625, 0.159265, 0.152118, -0.624783, 0.765837, 0.875000, 0.500000,
-    0.051090, 0.704150, 0.119854, 0.280858, -0.680523, 0.676763, 0.750000, 0.625000,
-    0.026539, 0.704150, 0.127296, 0.143075, -0.679330, 0.719750, 0.875000, 0.625000,
-    0.000000, 0.704150, 0.129883, 0.000000, -0.679236, 0.733920, 1.000000, 0.625000,
-    0.020097, 0.666797, 0.096475, 0.160109, -0.572729, 0.803957, 0.875000, 0.750000,
-    0.055433, 0.666797, 0.081863, 0.455449, -0.574459, 0.680120, 0.625000, 0.750000,
-    0.059228, 0.631201, 0.059228, 0.706102, -0.053279, 0.706103, 0.500000, 0.875000,
-    0.046930, 0.631201, 0.069336, 0.555963, -0.053067, 0.829512, 0.625000, 0.875000,
-    0.032751, 0.631201, 0.076941, 0.383728, -0.052662, 0.921944, 0.750000, 0.875000,
-    0.056250, 0.600000, 0.083125, 0.333582, 0.800793, 0.497447, 0.625000, 1.000000,
-    0.020097, 0.666797, 0.096475, 0.160109, -0.572729, 0.803957, 0.875000, 0.750000,
-    0.032751, 0.631201, 0.076941, 0.383727, -0.052662, 0.921944, 0.750000, 0.875000,
-    0.017004, 0.631201, 0.081732, 0.195539, -0.052105, 0.979311, 0.875000, 0.875000,
-    0.000000, 0.631201, 0.083398, 0.000000, -0.051878, 0.998653, 1.000000, 0.875000,
-    0.020375, 0.600000, 0.098000, 0.117676, 0.799975, 0.588381, 0.875000, 1.000000,
-    0.000000, 0.825000, -0.000000, -0.674579, 0.299813, 0.674579, 0.000000, 0.000000,
-    0.000000, 0.825000, -0.000000, -0.674579, 0.299813, 0.674579, 1.000000, 0.000000,
-    0.000000, 0.600000, 0.100000, 0.000000, 0.800000, 0.600000, 0.000000, 1.000000,
-    -0.100000, 0.600000, -0.000000, -0.600000, 0.800000, 0.000000, 1.000000, 1.000000,
-    0.000000, 0.825000, -0.000000, -0.674579, 0.299813, 0.674579, 0.500000, 0.000000,
-    0.000000, 0.740625, 0.162500, 0.000000, -0.624695, 0.780869, 0.000000, 0.500000,
-    -0.115516, 0.740625, 0.115516, -0.553962, -0.621492, 0.553962, 0.500000, 0.500000,
-    -0.162500, 0.740625, -0.000000, -0.780869, -0.624695, -0.000000, 1.000000, 0.500000,
-    -0.071000, 0.600000, 0.071000, -0.427005, 0.797078, 0.427005, 0.500000, 1.000000,
-    0.000000, 0.825000, -0.000000, -0.184222, 0.872306, 0.452928, 0.250000, 0.000000,
-    0.000000, 0.800391, 0.170313, 0.000000, 0.800000, 0.600000, 0.000000, 0.250000,
-    -0.067026, 0.800391, 0.157173, -0.229837, 0.799965, 0.554284, 0.250000, 0.250000,
-    -0.121080, 0.800391, 0.121080, -0.422824, 0.801523, 0.422824, 0.500000, 0.250000,
-    -0.063939, 0.740625, 0.149959, -0.299162, -0.624756, 0.721237, 0.250000, 0.500000,
-    0.000000, 0.825000, -0.000000, -0.028025, 0.989332, 0.142954, 0.125000, 0.000000,
-    0.000000, 0.818408, 0.115039, 0.000000, 0.988311, 0.152452, 0.000000, 0.125000,
-    -0.023522, 0.818408, 0.112750, -0.029677, 0.988317, 0.149493, 0.125000, 0.125000,
-    -0.045274, 0.818408, 0.106164, -0.058210, 0.988384, 0.140386, 0.250000, 0.125000,
-    -0.034822, 0.800391, 0.166924, -0.116818, 0.800075, 0.588416, 0.125000, 0.250000,
-    0.000000, 0.825000, -0.000000, -0.080516, 0.989432, 0.120585, 0.375000, 0.000000,
-    -0.045274, 0.818408, 0.106164, -0.058209, 0.988384, 0.140386, 0.250000, 0.125000,
-    -0.064836, 0.818408, 0.095702, -0.084441, 0.988401, 0.126226, 0.375000, 0.125000,
-    -0.081785, 0.818408, 0.081785, -0.107233, 0.988434, 0.107233, 0.500000, 0.125000,
-    -0.095986, 0.800391, 0.141684, -0.332794, 0.801110, 0.497465, 0.375000, 0.250000,
-    -0.034822, 0.800391, 0.166924, -0.116818, 0.800075, 0.588416, 0.125000, 0.250000,
-    0.000000, 0.773584, 0.181055, 0.000000, -0.207916, 0.978147, 0.000000, 0.375000,
-    -0.037016, 0.773584, 0.177452, -0.190496, -0.208008, 0.959398, 0.125000, 0.375000,
-    -0.071249, 0.773584, 0.167085, -0.374628, -0.208673, 0.903388, 0.250000, 0.375000,
-    -0.033217, 0.740625, 0.159265, -0.152111, -0.624831, 0.765799, 0.125000, 0.500000,
-    -0.095986, 0.800391, 0.141684, -0.332794, 0.801110, 0.497465, 0.375000, 0.250000,
-    -0.071249, 0.773584, 0.167085, -0.374627, -0.208673, 0.903388, 0.250000, 0.375000,
-    -0.102036, 0.773584, 0.150618, -0.543782, -0.208889, 0.812814, 0.375000, 0.375000,
-    -0.128714, 0.773584, 0.128714, -0.691459, -0.209208, 0.691459, 0.500000, 0.375000,
-    -0.091571, 0.740625, 0.135177, -0.433501, -0.626344, 0.647897, 0.375000, 0.500000,
-    0.000000, 0.825000, -0.000000, -0.452928, 0.872306, 0.184222, 0.750000, 0.000000,
-    -0.121080, 0.800391, 0.121080, -0.422824, 0.801523, 0.422824, 0.500000, 0.250000,
-    -0.157173, 0.800391, 0.067026, -0.554553, 0.799746, 0.229949, 0.750000, 0.250000,
-    -0.170313, 0.800391, -0.000000, -0.600000, 0.800000, 0.000000, 1.000000, 0.250000,
-    -0.149959, 0.740625, 0.063939, -0.721440, -0.624481, 0.299246, 0.750000, 0.500000,
-    0.000000, 0.825000, -0.000000, -0.120585, 0.989432, 0.080516, 0.625000, 0.000000,
-    -0.081785, 0.818408, 0.081785, -0.107233, 0.988434, 0.107233, 0.500000, 0.125000,
-    -0.095702, 0.818408, 0.064836, -0.126232, 0.988400, 0.084445, 0.625000, 0.125000,
-    -0.106164, 0.818408, 0.045274, -0.140386, 0.988384, 0.058209, 0.750000, 0.125000,
-    -0.141684, 0.800391, 0.095986, -0.497480, 0.801096, 0.332805, 0.625000, 0.250000,
-    0.000000, 0.825000, -0.000000, -0.142954, 0.989332, 0.028025, 0.875000, 0.000000,
-    -0.106164, 0.818408, 0.045274, -0.140386, 0.988384, 0.058210, 0.750000, 0.125000,
-    -0.112750, 0.818408, 0.023522, -0.149513, 0.988314, 0.029681, 0.875000, 0.125000,
-    -0.115039, 0.818408, -0.000000, -0.152452, 0.988311, 0.000000, 1.000000, 0.125000,
-    -0.166924, 0.800391, 0.034822, -0.588468, 0.800035, 0.116828, 0.875000, 0.250000,
-    -0.141684, 0.800391, 0.095986, -0.497480, 0.801096, 0.332805, 0.625000, 0.250000,
-    -0.128714, 0.773584, 0.128714, -0.691459, -0.209208, 0.691459, 0.500000, 0.375000,
-    -0.150618, 0.773584, 0.102036, -0.812815, -0.208883, 0.543783, 0.625000, 0.375000,
-    -0.167085, 0.773584, 0.071249, -0.903388, -0.208673, 0.374627, 0.750000, 0.375000,
-    -0.135177, 0.740625, 0.091571, -0.647907, -0.626329, 0.433508, 0.625000, 0.500000,
-    -0.166924, 0.800391, 0.034822, -0.588468, 0.800035, 0.116828, 0.875000, 0.250000,
-    -0.167085, 0.773584, 0.071249, -0.903388, -0.208673, 0.374628, 0.750000, 0.375000,
-    -0.177452, 0.773584, 0.037016, -0.959402, -0.207986, 0.190497, 0.875000, 0.375000,
-    -0.181055, 0.773584, -0.000000, -0.978147, -0.207916, -0.000000, 1.000000, 0.375000,
-    -0.159265, 0.740625, 0.033217, -0.765837, -0.624784, 0.152118, 0.875000, 0.500000,
-    -0.063939, 0.740625, 0.149959, -0.299162, -0.624756, 0.721237, 0.250000, 0.500000,
-    0.000000, 0.666797, 0.098437, 0.000000, -0.572589, 0.819843, 0.000000, 0.750000,
-    -0.038696, 0.666797, 0.090828, -0.314474, -0.572775, 0.756991, 0.250000, 0.750000,
-    -0.069943, 0.666797, 0.069943, -0.578480, -0.575083, 0.578481, 0.500000, 0.750000,
-    -0.039250, 0.600000, 0.092250, -0.230883, 0.799779, 0.554119, 0.250000, 1.000000,
-    -0.033217, 0.740625, 0.159265, -0.152111, -0.624831, 0.765799, 0.125000, 0.500000,
-    0.000000, 0.704150, 0.129883, 0.000000, -0.679236, 0.733920, 0.000000, 0.625000,
-    -0.026539, 0.704150, 0.127296, -0.143067, -0.679374, 0.719711, 0.125000, 0.625000,
-    -0.051090, 0.704150, 0.119854, -0.280858, -0.680523, 0.676763, 0.250000, 0.625000,
-    -0.020097, 0.666797, 0.096475, -0.160103, -0.572768, 0.803930, 0.125000, 0.750000,
-    -0.091571, 0.740625, 0.135177, -0.433501, -0.626344, 0.647897, 0.375000, 0.500000,
-    -0.051090, 0.704150, 0.119854, -0.280858, -0.680523, 0.676763, 0.250000, 0.625000,
-    -0.073175, 0.704150, 0.108035, -0.407364, -0.680856, 0.608679, 0.375000, 0.625000,
-    -0.092316, 0.704150, 0.092316, -0.517530, -0.681414, 0.517530, 0.500000, 0.625000,
-    -0.055433, 0.666797, 0.081863, -0.455446, -0.574467, 0.680115, 0.375000, 0.750000,
-    -0.020097, 0.666797, 0.096475, -0.160103, -0.572768, 0.803930, 0.125000, 0.750000,
-    0.000000, 0.631201, 0.083398, 0.000000, -0.051878, 0.998653, 0.000000, 0.875000,
-    -0.017004, 0.631201, 0.081732, -0.195539, -0.052085, 0.979312, 0.125000, 0.875000,
-    -0.032751, 0.631201, 0.076941, -0.383727, -0.052662, 0.921944, 0.250000, 0.875000,
-    -0.020375, 0.600000, 0.098000, -0.117666, 0.800016, 0.588328, 0.125000, 1.000000,
-    -0.055433, 0.666797, 0.081863, -0.455446, -0.574467, 0.680115, 0.375000, 0.750000,
-    -0.032751, 0.631201, 0.076941, -0.383728, -0.052662, 0.921944, 0.250000, 0.875000,
-    -0.046930, 0.631201, 0.069336, -0.555963, -0.053050, 0.829512, 0.375000, 0.875000,
-    -0.059228, 0.631201, 0.059228, -0.706102, -0.053279, 0.706103, 0.500000, 0.875000,
-    -0.056250, 0.600000, 0.083125, -0.333571, 0.800807, 0.497431, 0.375000, 1.000000,
-    -0.149959, 0.740625, 0.063939, -0.721440, -0.624480, 0.299246, 0.750000, 0.500000,
-    -0.069943, 0.666797, 0.069943, -0.578481, -0.575083, 0.578480, 0.500000, 0.750000,
-    -0.090828, 0.666797, 0.038696, -0.757155, -0.572521, 0.314542, 0.750000, 0.750000,
-    -0.098437, 0.666797, -0.000000, -0.819843, -0.572589, -0.000000, 1.000000, 0.750000,
-    -0.092250, 0.600000, 0.039250, -0.554392, 0.799557, 0.230996, 0.750000, 1.000000,
-    -0.135177, 0.740625, 0.091571, -0.647907, -0.626329, 0.433508, 0.625000, 0.500000,
-    -0.092316, 0.704150, 0.092316, -0.517530, -0.681414, 0.517530, 0.500000, 0.625000,
-    -0.108035, 0.704150, 0.073175, -0.608689, -0.680843, 0.407370, 0.625000, 0.625000,
-    -0.119854, 0.704150, 0.051090, -0.676763, -0.680523, 0.280858, 0.750000, 0.625000,
-    -0.081863, 0.666797, 0.055433, -0.680120, -0.574459, 0.455449, 0.625000, 0.750000,
-    -0.159265, 0.740625, 0.033217, -0.765837, -0.624783, 0.152118, 0.875000, 0.500000,
-    -0.119854, 0.704150, 0.051090, -0.676763, -0.680523, 0.280858, 0.750000, 0.625000,
-    -0.127296, 0.704150, 0.026539, -0.719750, -0.679330, 0.143075, 0.875000, 0.625000,
-    -0.129883, 0.704150, -0.000000, -0.733920, -0.679236, -0.000000, 1.000000, 0.625000,
-    -0.096475, 0.666797, 0.020097, -0.803957, -0.572729, 0.160109, 0.875000, 0.750000,
-    -0.081863, 0.666797, 0.055433, -0.680120, -0.574459, 0.455449, 0.625000, 0.750000,
-    -0.059228, 0.631201, 0.059228, -0.706103, -0.053279, 0.706102, 0.500000, 0.875000,
-    -0.069336, 0.631201, 0.046930, -0.829512, -0.053067, 0.555963, 0.625000, 0.875000,
-    -0.076941, 0.631201, 0.032751, -0.921944, -0.052662, 0.383728, 0.750000, 0.875000,
-    -0.083125, 0.600000, 0.056250, -0.497447, 0.800793, 0.333582, 0.625000, 1.000000,
-    -0.096475, 0.666797, 0.020097, -0.803957, -0.572729, 0.160109, 0.875000, 0.750000,
-    -0.076941, 0.631201, 0.032751, -0.921944, -0.052662, 0.383727, 0.750000, 0.875000,
-    -0.081732, 0.631201, 0.017004, -0.979311, -0.052105, 0.195539, 0.875000, 0.875000,
-    -0.083398, 0.631201, -0.000000, -0.998653, -0.051878, -0.000000, 1.000000, 0.875000,
-    -0.098000, 0.600000, 0.020375, -0.588381, 0.799975, 0.117676, 0.875000, 1.000000,
-    0.000000, 0.825000, -0.000000, -0.674579, 0.299813, -0.674579, 0.000000, 0.000000,
-    0.000000, 0.825000, -0.000000, -0.674579, 0.299813, -0.674579, 1.000000, 0.000000,
-    -0.100000, 0.600000, -0.000000, -0.600000, 0.800000, 0.000000, 0.000000, 1.000000,
-    0.000000, 0.600000, -0.100000, 0.000000, 0.800000, -0.600000, 1.000000, 1.000000,
-    0.000000, 0.825000, -0.000000, -0.674579, 0.299813, -0.674579, 0.500000, 0.000000,
-    -0.162500, 0.740625, -0.000000, -0.780869, -0.624695, -0.000000, 0.000000, 0.500000,
-    -0.115516, 0.740625, -0.115516, -0.553962, -0.621492, -0.553962, 0.500000, 0.500000,
-    0.000000, 0.740625, -0.162500, 0.000000, -0.624695, -0.780869, 1.000000, 0.500000,
-    -0.071000, 0.600000, -0.071000, -0.427005, 0.797078, -0.427005, 0.500000, 1.000000,
-    0.000000, 0.825000, -0.000000, -0.452928, 0.872306, -0.184222, 0.250000, 0.000000,
-    -0.170313, 0.800391, -0.000000, -0.600000, 0.800000, 0.000000, 0.000000, 0.250000,
-    -0.157173, 0.800391, -0.067026, -0.554284, 0.799965, -0.229837, 0.250000, 0.250000,
-    -0.121080, 0.800391, -0.121080, -0.422824, 0.801523, -0.422824, 0.500000, 0.250000,
-    -0.149959, 0.740625, -0.063939, -0.721237, -0.624756, -0.299162, 0.250000, 0.500000,
-    0.000000, 0.825000, -0.000000, -0.142954, 0.989332, -0.028025, 0.125000, 0.000000,
-    -0.115039, 0.818408, -0.000000, -0.152452, 0.988311, 0.000000, 0.000000, 0.125000,
-    -0.112750, 0.818408, -0.023522, -0.149493, 0.988317, -0.029677, 0.125000, 0.125000,
-    -0.106164, 0.818408, -0.045274, -0.140386, 0.988384, -0.058210, 0.250000, 0.125000,
-    -0.166924, 0.800391, -0.034822, -0.588416, 0.800075, -0.116818, 0.125000, 0.250000,
-    0.000000, 0.825000, -0.000000, -0.120585, 0.989432, -0.080516, 0.375000, 0.000000,
-    -0.106164, 0.818408, -0.045274, -0.140386, 0.988384, -0.058209, 0.250000, 0.125000,
-    -0.095702, 0.818408, -0.064836, -0.126226, 0.988401, -0.084441, 0.375000, 0.125000,
-    -0.081785, 0.818408, -0.081785, -0.107233, 0.988434, -0.107233, 0.500000, 0.125000,
-    -0.141684, 0.800391, -0.095986, -0.497465, 0.801110, -0.332794, 0.375000, 0.250000,
-    -0.166924, 0.800391, -0.034822, -0.588416, 0.800075, -0.116818, 0.125000, 0.250000,
-    -0.181055, 0.773584, -0.000000, -0.978147, -0.207916, -0.000000, 0.000000, 0.375000,
-    -0.177452, 0.773584, -0.037016, -0.959398, -0.208008, -0.190496, 0.125000, 0.375000,
-    -0.167085, 0.773584, -0.071249, -0.903388, -0.208673, -0.374628, 0.250000, 0.375000,
-    -0.159265, 0.740625, -0.033217, -0.765799, -0.624831, -0.152111, 0.125000, 0.500000,
-    -0.141684, 0.800391, -0.095986, -0.497465, 0.801110, -0.332794, 0.375000, 0.250000,
-    -0.167085, 0.773584, -0.071249, -0.903388, -0.208673, -0.374627, 0.250000, 0.375000,
-    -0.150618, 0.773584, -0.102036, -0.812814, -0.208889, -0.543782, 0.375000, 0.375000,
-    -0.128714, 0.773584, -0.128714, -0.691459, -0.209208, -0.691459, 0.500000, 0.375000,
-    -0.135177, 0.740625, -0.091571, -0.647897, -0.626344, -0.433501, 0.375000, 0.500000,
-    0.000000, 0.825000, -0.000000, -0.184222, 0.872306, -0.452928, 0.750000, 0.000000,
-    -0.121080, 0.800391, -0.121080, -0.422824, 0.801523, -0.422824, 0.500000, 0.250000,
-    -0.067026, 0.800391, -0.157173, -0.229949, 0.799746, -0.554553, 0.750000, 0.250000,
-    0.000000, 0.800391, -0.170313, 0.000000, 0.800000, -0.600000, 1.000000, 0.250000,
-    -0.063939, 0.740625, -0.149959, -0.299246, -0.624481, -0.721440, 0.750000, 0.500000,
-    0.000000, 0.825000, -0.000000, -0.080516, 0.989432, -0.120585, 0.625000, 0.000000,
-    -0.081785, 0.818408, -0.081785, -0.107233, 0.988434, -0.107233, 0.500000, 0.125000,
-    -0.064836, 0.818408, -0.095702, -0.084445, 0.988400, -0.126232, 0.625000, 0.125000,
-    -0.045274, 0.818408, -0.106164, -0.058209, 0.988384, -0.140386, 0.750000, 0.125000,
-    -0.095986, 0.800391, -0.141684, -0.332805, 0.801096, -0.497480, 0.625000, 0.250000,
-    0.000000, 0.825000, -0.000000, -0.028025, 0.989332, -0.142954, 0.875000, 0.000000,
-    -0.045274, 0.818408, -0.106164, -0.058210, 0.988384, -0.140386, 0.750000, 0.125000,
-    -0.023522, 0.818408, -0.112750, -0.029681, 0.988314, -0.149513, 0.875000, 0.125000,
-    0.000000, 0.818408, -0.115039, 0.000000, 0.988311, -0.152452, 1.000000, 0.125000,
-    -0.034822, 0.800391, -0.166924, -0.116828, 0.800035, -0.588468, 0.875000, 0.250000,
-    -0.095986, 0.800391, -0.141684, -0.332805, 0.801096, -0.497480, 0.625000, 0.250000,
-    -0.128714, 0.773584, -0.128714, -0.691459, -0.209208, -0.691459, 0.500000, 0.375000,
-    -0.102036, 0.773584, -0.150618, -0.543783, -0.208883, -0.812815, 0.625000, 0.375000,
-    -0.071249, 0.773584, -0.167085, -0.374627, -0.208673, -0.903388, 0.750000, 0.375000,
-    -0.091571, 0.740625, -0.135177, -0.433508, -0.626329, -0.647907, 0.625000, 0.500000,
-    -0.034822, 0.800391, -0.166924, -0.116828, 0.800035, -0.588468, 0.875000, 0.250000,
-    -0.071249, 0.773584, -0.167085, -0.374628, -0.208673, -0.903388, 0.750000, 0.375000,
-    -0.037016, 0.773584, -0.177452, -0.190497, -0.207986, -0.959402, 0.875000, 0.375000,
-    0.000000, 0.773584, -0.181055, 0.000000, -0.207916, -0.978147, 1.000000, 0.375000,
-    -0.033217, 0.740625, -0.159265, -0.152118, -0.624784, -0.765837, 0.875000, 0.500000,
-    -0.149959, 0.740625, -0.063939, -0.721237, -0.624756, -0.299162, 0.250000, 0.500000,
-    -0.098437, 0.666797, -0.000000, -0.819843, -0.572589, -0.000000, 0.000000, 0.750000,
-    -0.090828, 0.666797, -0.038696, -0.756991, -0.572775, -0.314474, 0.250000, 0.750000,
-    -0.069943, 0.666797, -0.069943, -0.578481, -0.575083, -0.578480, 0.500000, 0.750000,
-    -0.092250, 0.600000, -0.039250, -0.554119, 0.799779, -0.230883, 0.250000, 1.000000,
-    -0.159265, 0.740625, -0.033217, -0.765799, -0.624831, -0.152111, 0.125000, 0.500000,
-    -0.129883, 0.704150, -0.000000, -0.733920, -0.679236, -0.000000, 0.000000, 0.625000,
-    -0.127296, 0.704150, -0.026539, -0.719711, -0.679374, -0.143067, 0.125000, 0.625000,
-    -0.119854, 0.704150, -0.051090, -0.676763, -0.680523, -0.280858, 0.250000, 0.625000,
-    -0.096475, 0.666797, -0.020097, -0.803930, -0.572768, -0.160103, 0.125000, 0.750000,
-    -0.135177, 0.740625, -0.091571, -0.647897, -0.626344, -0.433501, 0.375000, 0.500000,
-    -0.119854, 0.704150, -0.051090, -0.676763, -0.680523, -0.280858, 0.250000, 0.625000,
-    -0.108035, 0.704150, -0.073175, -0.608679, -0.680856, -0.407364, 0.375000, 0.625000,
-    -0.092316, 0.704150, -0.092316, -0.517530, -0.681414, -0.517530, 0.500000, 0.625000,
-    -0.081863, 0.666797, -0.055433, -0.680115, -0.574467, -0.455446, 0.375000, 0.750000,
-    -0.096475, 0.666797, -0.020097, -0.803930, -0.572768, -0.160103, 0.125000, 0.750000,
-    -0.083398, 0.631201, -0.000000, -0.998653, -0.051878, -0.000000, 0.000000, 0.875000,
-    -0.081732, 0.631201, -0.017004, -0.979312, -0.052085, -0.195539, 0.125000, 0.875000,
-    -0.076941, 0.631201, -0.032751, -0.921944, -0.052662, -0.383727, 0.250000, 0.875000,
-    -0.098000, 0.600000, -0.020375, -0.588328, 0.800016, -0.117666, 0.125000, 1.000000,
-    -0.081863, 0.666797, -0.055433, -0.680115, -0.574467, -0.455446, 0.375000, 0.750000,
-    -0.076941, 0.631201, -0.032751, -0.921944, -0.052662, -0.383728, 0.250000, 0.875000,
-    -0.069336, 0.631201, -0.046930, -0.829512, -0.053050, -0.555963, 0.375000, 0.875000,
-    -0.059228, 0.631201, -0.059228, -0.706103, -0.053279, -0.706102, 0.500000, 0.875000,
-    -0.083125, 0.600000, -0.056250, -0.497431, 0.800807, -0.333571, 0.375000, 1.000000,
-    -0.063939, 0.740625, -0.149959, -0.299246, -0.624480, -0.721440, 0.750000, 0.500000,
-    -0.069943, 0.666797, -0.069943, -0.578480, -0.575083, -0.578481, 0.500000, 0.750000,
-    -0.038696, 0.666797, -0.090828, -0.314542, -0.572521, -0.757155, 0.750000, 0.750000,
-    0.000000, 0.666797, -0.098437, 0.000000, -0.572589, -0.819843, 1.000000, 0.750000,
-    -0.039250, 0.600000, -0.092250, -0.230996, 0.799557, -0.554392, 0.750000, 1.000000,
-    -0.091571, 0.740625, -0.135177, -0.433508, -0.626329, -0.647907, 0.625000, 0.500000,
-    -0.092316, 0.704150, -0.092316, -0.517530, -0.681414, -0.517530, 0.500000, 0.625000,
-    -0.073175, 0.704150, -0.108035, -0.407370, -0.680843, -0.608689, 0.625000, 0.625000,
-    -0.051090, 0.704150, -0.119854, -0.280858, -0.680523, -0.676763, 0.750000, 0.625000,
-    -0.055433, 0.666797, -0.081863, -0.455449, -0.574459, -0.680120, 0.625000, 0.750000,
-    -0.033217, 0.740625, -0.159265, -0.152118, -0.624783, -0.765837, 0.875000, 0.500000,
-    -0.051090, 0.704150, -0.119854, -0.280858, -0.680523, -0.676763, 0.750000, 0.625000,
-    -0.026539, 0.704150, -0.127296, -0.143075, -0.679330, -0.719750, 0.875000, 0.625000,
-    0.000000, 0.704150, -0.129883, 0.000000, -0.679236, -0.733920, 1.000000, 0.625000,
-    -0.020097, 0.666797, -0.096475, -0.160109, -0.572729, -0.803957, 0.875000, 0.750000,
-    -0.055433, 0.666797, -0.081863, -0.455449, -0.574459, -0.680120, 0.625000, 0.750000,
-    -0.059228, 0.631201, -0.059228, -0.706102, -0.053279, -0.706103, 0.500000, 0.875000,
-    -0.046930, 0.631201, -0.069336, -0.555963, -0.053067, -0.829512, 0.625000, 0.875000,
-    -0.032751, 0.631201, -0.076941, -0.383728, -0.052662, -0.921944, 0.750000, 0.875000,
-    -0.056250, 0.600000, -0.083125, -0.333582, 0.800793, -0.497447, 0.625000, 1.000000,
-    -0.020097, 0.666797, -0.096475, -0.160109, -0.572729, -0.803957, 0.875000, 0.750000,
-    -0.032751, 0.631201, -0.076941, -0.383727, -0.052662, -0.921944, 0.750000, 0.875000,
-    -0.017004, 0.631201, -0.081732, -0.195539, -0.052105, -0.979311, 0.875000, 0.875000,
-    0.000000, 0.631201, -0.083398, 0.000000, -0.051878, -0.998653, 1.000000, 0.875000,
-    -0.020375, 0.600000, -0.098000, -0.117676, 0.799975, -0.588381, 0.875000, 1.000000,
-    0.000000, 0.825000, -0.000000, 0.674579, 0.299813, -0.674579, 0.000000, 0.000000,
-    0.000000, 0.825000, -0.000000, 0.674579, 0.299813, -0.674579, 1.000000, 0.000000,
-    0.000000, 0.600000, -0.100000, 0.000000, 0.800000, -0.600000, 0.000000, 1.000000,
-    0.100000, 0.600000, -0.000000, 0.600000, 0.800000, -0.000000, 1.000000, 1.000000,
-    0.000000, 0.825000, -0.000000, 0.674579, 0.299813, -0.674579, 0.500000, 0.000000,
-    0.000000, 0.740625, -0.162500, 0.000000, -0.624695, -0.780869, 0.000000, 0.500000,
-    0.115516, 0.740625, -0.115516, 0.553962, -0.621492, -0.553962, 0.500000, 0.500000,
-    0.162500, 0.740625, -0.000000, 0.780869, -0.624695, 0.000000, 1.000000, 0.500000,
-    0.071000, 0.600000, -0.071000, 0.427005, 0.797078, -0.427005, 0.500000, 1.000000,
-    0.000000, 0.825000, -0.000000, 0.184222, 0.872306, -0.452928, 0.250000, 0.000000,
-    0.000000, 0.800391, -0.170313, 0.000000, 0.800000, -0.600000, 0.000000, 0.250000,
-    0.067026, 0.800391, -0.157173, 0.229837, 0.799965, -0.554284, 0.250000, 0.250000,
-    0.121080, 0.800391, -0.121080, 0.422824, 0.801523, -0.422824, 0.500000, 0.250000,
-    0.063939, 0.740625, -0.149959, 0.299162, -0.624756, -0.721237, 0.250000, 0.500000,
-    0.000000, 0.825000, -0.000000, 0.028025, 0.989332, -0.142954, 0.125000, 0.000000,
-    0.000000, 0.818408, -0.115039, 0.000000, 0.988311, -0.152452, 0.000000, 0.125000,
-    0.023522, 0.818408, -0.112750, 0.029677, 0.988317, -0.149493, 0.125000, 0.125000,
-    0.045274, 0.818408, -0.106164, 0.058210, 0.988384, -0.140386, 0.250000, 0.125000,
-    0.034822, 0.800391, -0.166924, 0.116818, 0.800075, -0.588416, 0.125000, 0.250000,
-    0.000000, 0.825000, -0.000000, 0.080516, 0.989432, -0.120585, 0.375000, 0.000000,
-    0.045274, 0.818408, -0.106164, 0.058209, 0.988384, -0.140386, 0.250000, 0.125000,
-    0.064836, 0.818408, -0.095702, 0.084441, 0.988401, -0.126226, 0.375000, 0.125000,
-    0.081785, 0.818408, -0.081785, 0.107233, 0.988434, -0.107233, 0.500000, 0.125000,
-    0.095986, 0.800391, -0.141684, 0.332794, 0.801110, -0.497465, 0.375000, 0.250000,
-    0.034822, 0.800391, -0.166924, 0.116818, 0.800075, -0.588416, 0.125000, 0.250000,
-    0.000000, 0.773584, -0.181055, 0.000000, -0.207916, -0.978147, 0.000000, 0.375000,
-    0.037016, 0.773584, -0.177452, 0.190496, -0.208008, -0.959398, 0.125000, 0.375000,
-    0.071249, 0.773584, -0.167085, 0.374628, -0.208673, -0.903388, 0.250000, 0.375000,
-    0.033217, 0.740625, -0.159265, 0.152111, -0.624831, -0.765799, 0.125000, 0.500000,
-    0.095986, 0.800391, -0.141684, 0.332794, 0.801110, -0.497465, 0.375000, 0.250000,
-    0.071249, 0.773584, -0.167085, 0.374627, -0.208673, -0.903388, 0.250000, 0.375000,
-    0.102036, 0.773584, -0.150618, 0.543782, -0.208889, -0.812814, 0.375000, 0.375000,
-    0.128714, 0.773584, -0.128714, 0.691459, -0.209208, -0.691459, 0.500000, 0.375000,
-    0.091571, 0.740625, -0.135177, 0.433501, -0.626344, -0.647897, 0.375000, 0.500000,
-    0.000000, 0.825000, -0.000000, 0.452928, 0.872306, -0.184222, 0.750000, 0.000000,
-    0.121080, 0.800391, -0.121080, 0.422824, 0.801523, -0.422824, 0.500000, 0.250000,
-    0.157173, 0.800391, -0.067026, 0.554553, 0.799746, -0.229949, 0.750000, 0.250000,
-    0.170313, 0.800391, -0.000000, 0.600000, 0.800000, -0.000000, 1.000000, 0.250000,
-    0.149959, 0.740625, -0.063939, 0.721440, -0.624481, -0.299246, 0.750000, 0.500000,
-    0.000000, 0.825000, -0.000000, 0.120585, 0.989432, -0.080516, 0.625000, 0.000000,
-    0.081785, 0.818408, -0.081785, 0.107233, 0.988434, -0.107233, 0.500000, 0.125000,
-    0.095702, 0.818408, -0.064836, 0.126232, 0.988400, -0.084445, 0.625000, 0.125000,
-    0.106164, 0.818408, -0.045274, 0.140386, 0.988384, -0.058209, 0.750000, 0.125000,
-    0.141684, 0.800391, -0.095986, 0.497480, 0.801096, -0.332805, 0.625000, 0.250000,
-    0.000000, 0.825000, -0.000000, 0.142954, 0.989332, -0.028025, 0.875000, 0.000000,
-    0.106164, 0.818408, -0.045274, 0.140386, 0.988384, -0.058210, 0.750000, 0.125000,
-    0.112750, 0.818408, -0.023522, 0.149513, 0.988314, -0.029681, 0.875000, 0.125000,
-    0.115039, 0.818408, -0.000000, 0.152452, 0.988311, -0.000000, 1.000000, 0.125000,
-    0.166924, 0.800391, -0.034822, 0.588468, 0.800035, -0.116828, 0.875000, 0.250000,
-    0.141684, 0.800391, -0.095986, 0.497480, 0.801096, -0.332805, 0.625000, 0.250000,
-    0.128714, 0.773584, -0.128714, 0.691459, -0.209208, -0.691459, 0.500000, 0.375000,
-    0.150618, 0.773584, -0.102036, 0.812815, -0.208883, -0.543783, 0.625000, 0.375000,
-    0.167085, 0.773584, -0.071249, 0.903388, -0.208673, -0.374627, 0.750000, 0.375000,
-    0.135177, 0.740625, -0.091571, 0.647907, -0.626329, -0.433508, 0.625000, 0.500000,
-    0.166924, 0.800391, -0.034822, 0.588468, 0.800035, -0.116828, 0.875000, 0.250000,
-    0.167085, 0.773584, -0.071249, 0.903388, -0.208673, -0.374628, 0.750000, 0.375000,
-    0.177452, 0.773584, -0.037016, 0.959402, -0.207986, -0.190497, 0.875000, 0.375000,
-    0.181055, 0.773584, -0.000000, 0.978147, -0.207916, 0.000000, 1.000000, 0.375000,
-    0.159265, 0.740625, -0.033217, 0.765837, -0.624784, -0.152118, 0.875000, 0.500000,
-    0.063939, 0.740625, -0.149959, 0.299162, -0.624756, -0.721237, 0.250000, 0.500000,
-    0.000000, 0.666797, -0.098437, 0.000000, -0.572589, -0.819843, 0.000000, 0.750000,
-    0.038696, 0.666797, -0.090828, 0.314474, -0.572775, -0.756991, 0.250000, 0.750000,
-    0.069943, 0.666797, -0.069943, 0.578480, -0.575083, -0.578481, 0.500000, 0.750000,
-    0.039250, 0.600000, -0.092250, 0.230883, 0.799779, -0.554119, 0.250000, 1.000000,
-    0.033217, 0.740625, -0.159265, 0.152111, -0.624831, -0.765799, 0.125000, 0.500000,
-    0.000000, 0.704150, -0.129883, 0.000000, -0.679236, -0.733920, 0.000000, 0.625000,
-    0.026539, 0.704150, -0.127296, 0.143067, -0.679374, -0.719711, 0.125000, 0.625000,
-    0.051090, 0.704150, -0.119854, 0.280858, -0.680523, -0.676763, 0.250000, 0.625000,
-    0.020097, 0.666797, -0.096475, 0.160103, -0.572768, -0.803930, 0.125000, 0.750000,
-    0.091571, 0.740625, -0.135177, 0.433501, -0.626344, -0.647897, 0.375000, 0.500000,
-    0.051090, 0.704150, -0.119854, 0.280858, -0.680523, -0.676763, 0.250000, 0.625000,
-    0.073175, 0.704150, -0.108035, 0.407364, -0.680856, -0.608679, 0.375000, 0.625000,
-    0.092316, 0.704150, -0.092316, 0.517530, -0.681414, -0.517530, 0.500000, 0.625000,
-    0.055433, 0.666797, -0.081863, 0.455446, -0.574467, -0.680115, 0.375000, 0.750000,
-    0.020097, 0.666797, -0.096475, 0.160103, -0.572768, -0.803930, 0.125000, 0.750000,
-    0.000000, 0.631201, -0.083398, 0.000000, -0.051878, -0.998653, 0.000000, 0.875000,
-    0.017004, 0.631201, -0.081732, 0.195539, -0.052085, -0.979312, 0.125000, 0.875000,
-    0.032751, 0.631201, -0.076941, 0.383727, -0.052662, -0.921944, 0.250000, 0.875000,
-    0.020375, 0.600000, -0.098000, 0.117666, 0.800016, -0.588328, 0.125000, 1.000000,
-    0.055433, 0.666797, -0.081863, 0.455446, -0.574467, -0.680115, 0.375000, 0.750000,
-    0.032751, 0.631201, -0.076941, 0.383728, -0.052662, -0.921944, 0.250000, 0.875000,
-    0.046930, 0.631201, -0.069336, 0.555963, -0.053050, -0.829512, 0.375000, 0.875000,
-    0.059228, 0.631201, -0.059228, 0.706102, -0.053279, -0.706103, 0.500000, 0.875000,
-    0.056250, 0.600000, -0.083125, 0.333571, 0.800807, -0.497431, 0.375000, 1.000000,
-    0.149959, 0.740625, -0.063939, 0.721440, -0.624480, -0.299246, 0.750000, 0.500000,
-    0.069943, 0.666797, -0.069943, 0.578481, -0.575083, -0.578480, 0.500000, 0.750000,
-    0.090828, 0.666797, -0.038696, 0.757155, -0.572521, -0.314542, 0.750000, 0.750000,
-    0.098437, 0.666797, -0.000000, 0.819843, -0.572589, 0.000000, 1.000000, 0.750000,
-    0.092250, 0.600000, -0.039250, 0.554392, 0.799557, -0.230996, 0.750000, 1.000000,
-    0.135177, 0.740625, -0.091571, 0.647907, -0.626329, -0.433508, 0.625000, 0.500000,
-    0.092316, 0.704150, -0.092316, 0.517530, -0.681414, -0.517530, 0.500000, 0.625000,
-    0.108035, 0.704150, -0.073175, 0.608689, -0.680843, -0.407370, 0.625000, 0.625000,
-    0.119854, 0.704150, -0.051090, 0.676763, -0.680523, -0.280858, 0.750000, 0.625000,
-    0.081863, 0.666797, -0.055433, 0.680120, -0.574459, -0.455449, 0.625000, 0.750000,
-    0.159265, 0.740625, -0.033217, 0.765837, -0.624783, -0.152118, 0.875000, 0.500000,
-    0.119854, 0.704150, -0.051090, 0.676763, -0.680523, -0.280858, 0.750000, 0.625000,
-    0.127296, 0.704150, -0.026539, 0.719750, -0.679330, -0.143075, 0.875000, 0.625000,
-    0.129883, 0.704150, -0.000000, 0.733920, -0.679236, 0.000000, 1.000000, 0.625000,
-    0.096475, 0.666797, -0.020097, 0.803957, -0.572729, -0.160109, 0.875000, 0.750000,
-    0.081863, 0.666797, -0.055433, 0.680120, -0.574459, -0.455449, 0.625000, 0.750000,
-    0.059228, 0.631201, -0.059228, 0.706103, -0.053279, -0.706102, 0.500000, 0.875000,
-    0.069336, 0.631201, -0.046930, 0.829512, -0.053067, -0.555963, 0.625000, 0.875000,
-    0.076941, 0.631201, -0.032751, 0.921944, -0.052662, -0.383728, 0.750000, 0.875000,
-    0.083125, 0.600000, -0.056250, 0.497447, 0.800793, -0.333582, 0.625000, 1.000000,
-    0.096475, 0.666797, -0.020097, 0.803957, -0.572729, -0.160109, 0.875000, 0.750000,
-    0.076941, 0.631201, -0.032751, 0.921944, -0.052662, -0.383727, 0.750000, 0.875000,
-    0.081732, 0.631201, -0.017004, 0.979311, -0.052105, -0.195539, 0.875000, 0.875000,
-    0.083398, 0.631201, -0.000000, 0.998653, -0.051878, 0.000000, 1.000000, 0.875000,
-    0.098000, 0.600000, -0.020375, 0.588381, 0.799975, -0.117676, 0.875000, 1.000000,
-    0.100000, 0.600000, -0.000000, 0.600000, 0.800000, -0.000000, 0.000000, 0.000000,
-    0.000000, 0.600000, 0.100000, 0.000000, 0.800000, 0.600000, 1.000000, 0.000000,
-    0.650000, 0.450000, -0.000000, 1.000000, 0.000000, -0.000000, 0.000000, 1.000000,
-    0.000000, 0.450000, 0.650000, 0.000000, 0.000000, 1.000000, 1.000000, 1.000000,
-    0.071000, 0.600000, 0.071000, 0.427006, 0.797077, 0.427006, 0.500000, 0.000000,
-    0.412500, 0.525000, -0.000000, 0.148340, 0.988936, -0.000000, 0.000000, 0.500000,
-    0.292875, 0.525000, 0.292875, 0.105934, 0.988714, 0.105934, 0.500000, 0.500000,
-    0.000000, 0.525000, 0.412500, 0.000000, 0.988936, 0.148340, 1.000000, 0.500000,
-    0.461500, 0.450000, 0.461500, 0.707107, 0.000000, 0.707107, 0.500000, 1.000000,
-    0.092250, 0.600000, 0.039250, 0.554119, 0.799778, 0.230883, 0.250000, 0.000000,
-    0.228125, 0.555469, -0.000000, 0.203954, 0.978980, -0.000000, 0.000000, 0.250000,
-    0.210445, 0.555469, 0.089539, 0.188404, 0.978949, 0.078502, 0.250000, 0.250000,
-    0.161969, 0.555469, 0.161969, 0.143654, 0.979146, 0.143654, 0.500000, 0.250000,
-    0.380531, 0.525000, 0.161906, 0.137033, 0.988920, 0.057097, 0.250000, 0.500000,
-    0.098000, 0.600000, 0.020375, 0.588329, 0.800015, 0.117666, 0.125000, 0.000000,
-    0.152344, 0.575098, -0.000000, 0.317497, 0.948259, -0.000000, 0.000000, 0.125000,
-    0.149297, 0.575098, 0.031040, 0.311317, 0.948264, 0.062263, 0.125000, 0.125000,
-    0.140537, 0.575098, 0.059795, 0.292417, 0.948497, 0.121840, 0.250000, 0.125000,
-    0.223562, 0.555469, 0.046480, 0.199984, 0.978983, 0.039997, 0.125000, 0.250000,
-    0.083125, 0.600000, 0.056250, 0.497432, 0.800807, 0.333572, 0.375000, 0.000000,
-    0.140537, 0.575098, 0.059795, 0.292417, 0.948497, 0.121840, 0.250000, 0.125000,
-    0.126636, 0.575098, 0.085693, 0.263031, 0.948527, 0.176386, 0.375000, 0.125000,
-    0.108164, 0.575098, 0.108164, 0.223681, 0.948648, 0.223681, 0.500000, 0.125000,
-    0.189629, 0.555469, 0.128320, 0.168938, 0.979094, 0.113288, 0.375000, 0.250000,
-    0.223562, 0.555469, 0.046480, 0.199985, 0.978982, 0.039997, 0.125000, 0.250000,
-    0.317969, 0.539355, -0.000000, 0.157389, 0.987537, -0.000000, 0.000000, 0.375000,
-    0.311609, 0.539355, 0.064786, 0.154325, 0.987538, 0.030865, 0.125000, 0.375000,
-    0.293326, 0.539355, 0.124803, 0.144929, 0.987598, 0.060387, 0.250000, 0.375000,
-    0.404250, 0.525000, 0.084047, 0.145452, 0.988938, 0.029090, 0.125000, 0.500000,
-    0.189629, 0.555469, 0.128320, 0.168939, 0.979094, 0.113289, 0.375000, 0.250000,
-    0.293326, 0.539355, 0.124803, 0.144929, 0.987598, 0.060387, 0.250000, 0.375000,
-    0.264312, 0.539355, 0.178857, 0.130361, 0.987605, 0.087419, 0.375000, 0.375000,
-    0.225758, 0.539355, 0.225758, 0.110849, 0.987636, 0.110849, 0.500000, 0.375000,
-    0.342891, 0.525000, 0.232031, 0.122865, 0.988997, 0.082392, 0.375000, 0.500000,
-    0.039250, 0.600000, 0.092250, 0.230997, 0.799556, 0.554392, 0.750000, 0.000000,
-    0.161969, 0.555469, 0.161969, 0.143654, 0.979146, 0.143654, 0.500000, 0.250000,
-    0.089539, 0.555469, 0.210445, 0.078560, 0.978918, 0.188544, 0.750000, 0.250000,
-    0.000000, 0.555469, 0.228125, 0.000000, 0.978980, 0.203954, 1.000000, 0.250000,
-    0.161906, 0.525000, 0.380531, 0.057140, 0.988903, 0.137136, 0.750000, 0.500000,
-    0.056250, 0.600000, 0.083125, 0.333583, 0.800793, 0.497447, 0.625000, 0.000000,
-    0.108164, 0.575098, 0.108164, 0.223681, 0.948648, 0.223681, 0.500000, 0.125000,
-    0.085693, 0.575098, 0.126636, 0.176393, 0.948522, 0.263043, 0.625000, 0.125000,
-    0.059795, 0.575098, 0.140537, 0.121840, 0.948497, 0.292417, 0.750000, 0.125000,
-    0.128320, 0.555469, 0.189629, 0.113293, 0.979092, 0.168946, 0.625000, 0.250000,
-    0.020375, 0.600000, 0.098000, 0.117676, 0.799975, 0.588382, 0.875000, 0.000000,
-    0.059795, 0.575098, 0.140537, 0.121840, 0.948497, 0.292417, 0.750000, 0.125000,
-    0.031040, 0.575098, 0.149297, 0.062271, 0.948251, 0.311356, 0.875000, 0.125000,
-    0.000000, 0.575098, 0.152344, 0.000000, 0.948259, 0.317497, 1.000000, 0.125000,
-    0.046480, 0.555469, 0.223562, 0.040002, 0.978977, 0.200010, 0.875000, 0.250000,
-    0.128320, 0.555469, 0.189629, 0.113294, 0.979092, 0.168947, 0.625000, 0.250000,
-    0.225758, 0.539355, 0.225758, 0.110849, 0.987636, 0.110849, 0.500000, 0.375000,
-    0.178857, 0.539355, 0.264312, 0.087423, 0.987604, 0.130368, 0.625000, 0.375000,
-    0.124803, 0.539355, 0.293326, 0.060387, 0.987598, 0.144929, 0.750000, 0.375000,
-    0.232031, 0.525000, 0.342891, 0.082396, 0.988996, 0.122871, 0.625000, 0.500000,
-    0.046480, 0.555469, 0.223562, 0.040002, 0.978977, 0.200011, 0.875000, 0.250000,
-    0.124803, 0.539355, 0.293326, 0.060387, 0.987598, 0.144929, 0.750000, 0.375000,
-    0.064786, 0.539355, 0.311609, 0.030869, 0.987535, 0.154346, 0.875000, 0.375000,
-    0.000000, 0.539355, 0.317969, 0.000000, 0.987537, 0.157389, 1.000000, 0.375000,
-    0.084047, 0.525000, 0.404250, 0.029094, 0.988935, 0.145472, 0.875000, 0.500000,
-    0.380531, 0.525000, 0.161906, 0.137032, 0.988920, 0.057097, 0.250000, 0.500000,
-    0.578125, 0.494531, -0.000000, 0.258736, 0.965948, -0.000000, 0.000000, 0.750000,
-    0.533320, 0.494531, 0.226914, 0.239005, 0.965898, 0.099585, 0.250000, 0.750000,
-    0.410469, 0.494531, 0.410469, 0.182258, 0.966211, 0.182258, 0.500000, 0.750000,
-    0.599625, 0.450000, 0.255125, 0.923077, 0.000000, 0.384615, 0.250000, 1.000000,
-    0.404250, 0.525000, 0.084047, 0.145452, 0.988938, 0.029090, 0.125000, 0.500000,
-    0.502344, 0.510645, -0.000000, 0.174370, 0.984680, -0.000000, 0.000000, 0.625000,
-    0.492297, 0.510645, 0.102353, 0.170975, 0.984682, 0.034195, 0.125000, 0.625000,
-    0.463412, 0.510645, 0.197170, 0.160568, 0.984755, 0.066903, 0.250000, 0.625000,
-    0.566563, 0.494531, 0.117793, 0.253699, 0.965951, 0.050740, 0.125000, 0.750000,
-    0.342891, 0.525000, 0.232031, 0.122865, 0.988997, 0.082392, 0.375000, 0.500000,
-    0.463412, 0.510645, 0.197170, 0.160568, 0.984755, 0.066903, 0.250000, 0.625000,
-    0.417573, 0.510645, 0.282568, 0.144429, 0.984764, 0.096852, 0.375000, 0.625000,
-    0.356664, 0.510645, 0.356664, 0.122811, 0.984802, 0.122811, 0.500000, 0.625000,
-    0.480566, 0.494531, 0.325195, 0.214330, 0.966129, 0.143727, 0.375000, 0.750000,
-    0.566563, 0.494531, 0.117793, 0.253699, 0.965951, 0.050740, 0.125000, 0.750000,
-    0.630469, 0.474902, -0.000000, 0.505546, 0.862799, -0.000000, 0.000000, 0.875000,
-    0.617859, 0.474902, 0.128458, 0.495710, 0.862811, 0.099142, 0.125000, 0.875000,
-    0.581607, 0.474902, 0.247459, 0.465791, 0.863349, 0.194079, 0.250000, 0.875000,
-    0.637000, 0.450000, 0.132437, 0.980581, 0.000000, 0.196116, 0.125000, 1.000000,
-    0.480566, 0.494531, 0.325195, 0.214330, 0.966129, 0.143727, 0.375000, 0.750000,
-    0.581607, 0.474902, 0.247459, 0.465791, 0.863349, 0.194080, 0.250000, 0.875000,
-    0.524077, 0.474902, 0.354639, 0.419002, 0.863417, 0.280978, 0.375000, 0.875000,
-    0.447633, 0.474902, 0.447633, 0.356389, 0.863698, 0.356389, 0.500000, 0.875000,
-    0.540312, 0.450000, 0.365625, 0.830544, 0.000000, 0.556953, 0.375000, 1.000000,
-    0.161906, 0.525000, 0.380531, 0.057140, 0.988903, 0.137136, 0.750000, 0.500000,
-    0.410469, 0.494531, 0.410469, 0.182258, 0.966211, 0.182258, 0.500000, 0.750000,
-    0.226914, 0.494531, 0.533320, 0.099657, 0.965848, 0.239176, 0.750000, 0.750000,
-    0.000000, 0.494531, 0.578125, 0.000000, 0.965948, 0.258736, 1.000000, 0.750000,
-    0.255125, 0.450000, 0.599625, 0.384615, 0.000000, 0.923077, 0.750000, 1.000000,
-    0.232031, 0.525000, 0.342891, 0.082396, 0.988996, 0.122871, 0.625000, 0.500000,
-    0.356664, 0.510645, 0.356664, 0.122811, 0.984802, 0.122811, 0.500000, 0.625000,
-    0.282568, 0.510645, 0.417573, 0.096857, 0.984762, 0.144436, 0.625000, 0.625000,
-    0.197170, 0.510645, 0.463412, 0.066903, 0.984755, 0.160568, 0.750000, 0.625000,
-    0.325195, 0.494531, 0.480566, 0.143734, 0.966126, 0.214340, 0.625000, 0.750000,
-    0.084047, 0.525000, 0.404250, 0.029094, 0.988935, 0.145472, 0.875000, 0.500000,
-    0.197170, 0.510645, 0.463412, 0.066903, 0.984755, 0.160568, 0.750000, 0.625000,
-    0.102353, 0.510645, 0.492297, 0.034200, 0.984678, 0.170999, 0.875000, 0.625000,
-    0.000000, 0.510645, 0.502344, 0.000000, 0.984680, 0.174370, 1.000000, 0.625000,
-    0.117793, 0.494531, 0.566563, 0.050746, 0.965942, 0.253732, 0.875000, 0.750000,
-    0.325195, 0.494531, 0.480566, 0.143734, 0.966126, 0.214340, 0.625000, 0.750000,
-    0.447633, 0.474902, 0.447633, 0.356389, 0.863698, 0.356389, 0.500000, 0.875000,
-    0.354639, 0.474902, 0.524077, 0.280988, 0.863406, 0.419017, 0.625000, 0.875000,
-    0.247459, 0.474902, 0.581607, 0.194080, 0.863349, 0.465791, 0.750000, 0.875000,
-    0.365625, 0.450000, 0.540312, 0.556953, 0.000000, 0.830544, 0.625000, 1.000000,
-    0.117793, 0.494531, 0.566563, 0.050747, 0.965942, 0.253732, 0.875000, 0.750000,
-    0.247459, 0.474902, 0.581607, 0.194079, 0.863349, 0.465791, 0.750000, 0.875000,
-    0.128458, 0.474902, 0.617859, 0.099152, 0.862780, 0.495761, 0.875000, 0.875000,
-    0.000000, 0.474902, 0.630469, 0.000000, 0.862799, 0.505546, 1.000000, 0.875000,
-    0.132437, 0.450000, 0.637000, 0.196116, 0.000000, 0.980581, 0.875000, 1.000000,
-    0.000000, 0.600000, 0.100000, 0.000000, 0.800000, 0.600000, 0.000000, 0.000000,
-    -0.100000, 0.600000, -0.000000, -0.600000, 0.800000, 0.000000, 1.000000, 0.000000,
-    0.000000, 0.450000, 0.650000, 0.000000, 0.000000, 1.000000, 0.000000, 1.000000,
-    -0.650000, 0.450000, -0.000000, -1.000000, -0.000000, -0.000000, 1.000000, 1.000000,
-    -0.071000, 0.600000, 0.071000, -0.427006, 0.797077, 0.427006, 0.500000, 0.000000,
-    0.000000, 0.525000, 0.412500, 0.000000, 0.988936, 0.148340, 0.000000, 0.500000,
-    -0.292875, 0.525000, 0.292875, -0.105934, 0.988714, 0.105934, 0.500000, 0.500000,
-    -0.412500, 0.525000, -0.000000, -0.148340, 0.988936, 0.000000, 1.000000, 0.500000,
-    -0.461500, 0.450000, 0.461500, -0.707107, 0.000000, 0.707107, 0.500000, 1.000000,
-    -0.039250, 0.600000, 0.092250, -0.230883, 0.799778, 0.554119, 0.250000, 0.000000,
-    0.000000, 0.555469, 0.228125, 0.000000, 0.978980, 0.203954, 0.000000, 0.250000,
-    -0.089539, 0.555469, 0.210445, -0.078502, 0.978949, 0.188404, 0.250000, 0.250000,
-    -0.161969, 0.555469, 0.161969, -0.143654, 0.979146, 0.143654, 0.500000, 0.250000,
-    -0.161906, 0.525000, 0.380531, -0.057097, 0.988920, 0.137033, 0.250000, 0.500000,
-    -0.020375, 0.600000, 0.098000, -0.117666, 0.800015, 0.588329, 0.125000, 0.000000,
-    0.000000, 0.575098, 0.152344, 0.000000, 0.948259, 0.317497, 0.000000, 0.125000,
-    -0.031040, 0.575098, 0.149297, -0.062263, 0.948264, 0.311317, 0.125000, 0.125000,
-    -0.059795, 0.575098, 0.140537, -0.121840, 0.948497, 0.292417, 0.250000, 0.125000,
-    -0.046480, 0.555469, 0.223562, -0.039997, 0.978983, 0.199984, 0.125000, 0.250000,
-    -0.056250, 0.600000, 0.083125, -0.333572, 0.800807, 0.497432, 0.375000, 0.000000,
-    -0.059795, 0.575098, 0.140537, -0.121840, 0.948497, 0.292417, 0.250000, 0.125000,
-    -0.085693, 0.575098, 0.126636, -0.176386, 0.948527, 0.263031, 0.375000, 0.125000,
-    -0.108164, 0.575098, 0.108164, -0.223681, 0.948648, 0.223681, 0.500000, 0.125000,
-    -0.128320, 0.555469, 0.189629, -0.113288, 0.979094, 0.168938, 0.375000, 0.250000,
-    -0.046480, 0.555469, 0.223562, -0.039997, 0.978982, 0.199985, 0.125000, 0.250000,
-    0.000000, 0.539355, 0.317969, 0.000000, 0.987537, 0.157389, 0.000000, 0.375000,
-    -0.064786, 0.539355, 0.311609, -0.030865, 0.987538, 0.154325, 0.125000, 0.375000,
-    -0.124803, 0.539355, 0.293326, -0.060387, 0.987598, 0.144929, 0.250000, 0.375000,
-    -0.084047, 0.525000, 0.404250, -0.029090, 0.988938, 0.145452, 0.125000, 0.500000,
-    -0.128320, 0.555469, 0.189629, -0.113289, 0.979094, 0.168939, 0.375000, 0.250000,
-    -0.124803, 0.539355, 0.293326, -0.060387, 0.987598, 0.144929, 0.250000, 0.375000,
-    -0.178857, 0.539355, 0.264312, -0.087419, 0.987605, 0.130361, 0.375000, 0.375000,
-    -0.225758, 0.539355, 0.225758, -0.110849, 0.987636, 0.110849, 0.500000, 0.375000,
-    -0.232031, 0.525000, 0.342891, -0.082392, 0.988997, 0.122865, 0.375000, 0.500000,
-    -0.092250, 0.600000, 0.039250, -0.554392, 0.799556, 0.230997, 0.750000, 0.000000,
-    -0.161969, 0.555469, 0.161969, -0.143654, 0.979146, 0.143654, 0.500000, 0.250000,
-    -0.210445, 0.555469, 0.089539, -0.188544, 0.978918, 0.078560, 0.750000, 0.250000,
-    -0.228125, 0.555469, -0.000000, -0.203954, 0.978980, 0.000000, 1.000000, 0.250000,
-    -0.380531, 0.525000, 0.161906, -0.137136, 0.988903, 0.057140, 0.750000, 0.500000,
-    -0.083125, 0.600000, 0.056250, -0.497447, 0.800793, 0.333583, 0.625000, 0.000000,
-    -0.108164, 0.575098, 0.108164, -0.223681, 0.948648, 0.223681, 0.500000, 0.125000,
-    -0.126636, 0.575098, 0.085693, -0.263043, 0.948522, 0.176393, 0.625000, 0.125000,
-    -0.140537, 0.575098, 0.059795, -0.292417, 0.948497, 0.121840, 0.750000, 0.125000,
-    -0.189629, 0.555469, 0.128320, -0.168946, 0.979092, 0.113293, 0.625000, 0.250000,
-    -0.098000, 0.600000, 0.020375, -0.588382, 0.799975, 0.117676, 0.875000, 0.000000,
-    -0.140537, 0.575098, 0.059795, -0.292417, 0.948497, 0.121840, 0.750000, 0.125000,
-    -0.149297, 0.575098, 0.031040, -0.311356, 0.948251, 0.062271, 0.875000, 0.125000,
-    -0.152344, 0.575098, -0.000000, -0.317497, 0.948259, 0.000000, 1.000000, 0.125000,
-    -0.223562, 0.555469, 0.046480, -0.200010, 0.978977, 0.040002, 0.875000, 0.250000,
-    -0.189629, 0.555469, 0.128320, -0.168947, 0.979092, 0.113294, 0.625000, 0.250000,
-    -0.225758, 0.539355, 0.225758, -0.110849, 0.987636, 0.110849, 0.500000, 0.375000,
-    -0.264312, 0.539355, 0.178857, -0.130368, 0.987604, 0.087423, 0.625000, 0.375000,
-    -0.293326, 0.539355, 0.124803, -0.144929, 0.987598, 0.060387, 0.750000, 0.375000,
-    -0.342891, 0.525000, 0.232031, -0.122871, 0.988996, 0.082396, 0.625000, 0.500000,
-    -0.223562, 0.555469, 0.046480, -0.200011, 0.978977, 0.040002, 0.875000, 0.250000,
-    -0.293326, 0.539355, 0.124803, -0.144929, 0.987598, 0.060387, 0.750000, 0.375000,
-    -0.311609, 0.539355, 0.064786, -0.154346, 0.987535, 0.030869, 0.875000, 0.375000,
-    -0.317969, 0.539355, -0.000000, -0.157389, 0.987537, 0.000000, 1.000000, 0.375000,
-    -0.404250, 0.525000, 0.084047, -0.145472, 0.988935, 0.029094, 0.875000, 0.500000,
-    -0.161906, 0.525000, 0.380531, -0.057097, 0.988920, 0.137032, 0.250000, 0.500000,
-    0.000000, 0.494531, 0.578125, 0.000000, 0.965948, 0.258736, 0.000000, 0.750000,
-    -0.226914, 0.494531, 0.533320, -0.099585, 0.965898, 0.239005, 0.250000, 0.750000,
-    -0.410469, 0.494531, 0.410469, -0.182258, 0.966211, 0.182258, 0.500000, 0.750000,
-    -0.255125, 0.450000, 0.599625, -0.384615, 0.000000, 0.923077, 0.250000, 1.000000,
-    -0.084047, 0.525000, 0.404250, -0.029090, 0.988938, 0.145452, 0.125000, 0.500000,
-    0.000000, 0.510645, 0.502344, 0.000000, 0.984680, 0.174370, 0.000000, 0.625000,
-    -0.102353, 0.510645, 0.492297, -0.034195, 0.984682, 0.170975, 0.125000, 0.625000,
-    -0.197170, 0.510645, 0.463412, -0.066903, 0.984755, 0.160568, 0.250000, 0.625000,
-    -0.117793, 0.494531, 0.566563, -0.050740, 0.965951, 0.253699, 0.125000, 0.750000,
-    -0.232031, 0.525000, 0.342891, -0.082392, 0.988997, 0.122865, 0.375000, 0.500000,
-    -0.197170, 0.510645, 0.463412, -0.066903, 0.984755, 0.160568, 0.250000, 0.625000,
-    -0.282568, 0.510645, 0.417573, -0.096852, 0.984764, 0.144429, 0.375000, 0.625000,
-    -0.356664, 0.510645, 0.356664, -0.122811, 0.984802, 0.122811, 0.500000, 0.625000,
-    -0.325195, 0.494531, 0.480566, -0.143727, 0.966129, 0.214330, 0.375000, 0.750000,
-    -0.117793, 0.494531, 0.566563, -0.050740, 0.965951, 0.253699, 0.125000, 0.750000,
-    0.000000, 0.474902, 0.630469, 0.000000, 0.862799, 0.505546, 0.000000, 0.875000,
-    -0.128458, 0.474902, 0.617859, -0.099142, 0.862811, 0.495710, 0.125000, 0.875000,
-    -0.247459, 0.474902, 0.581607, -0.194079, 0.863349, 0.465791, 0.250000, 0.875000,
-    -0.132437, 0.450000, 0.637000, -0.196116, 0.000000, 0.980581, 0.125000, 1.000000,
-    -0.325195, 0.494531, 0.480566, -0.143727, 0.966129, 0.214330, 0.375000, 0.750000,
-    -0.247459, 0.474902, 0.581607, -0.194080, 0.863349, 0.465791, 0.250000, 0.875000,
-    -0.354639, 0.474902, 0.524077, -0.280978, 0.863417, 0.419002, 0.375000, 0.875000,
-    -0.447633, 0.474902, 0.447633, -0.356389, 0.863698, 0.356389, 0.500000, 0.875000,
-    -0.365625, 0.450000, 0.540312, -0.556953, 0.000000, 0.830544, 0.375000, 1.000000,
-    -0.380531, 0.525000, 0.161906, -0.137136, 0.988903, 0.057140, 0.750000, 0.500000,
-    -0.410469, 0.494531, 0.410469, -0.182258, 0.966211, 0.182258, 0.500000, 0.750000,
-    -0.533320, 0.494531, 0.226914, -0.239176, 0.965848, 0.099657, 0.750000, 0.750000,
-    -0.578125, 0.494531, -0.000000, -0.258736, 0.965948, 0.000000, 1.000000, 0.750000,
-    -0.599625, 0.450000, 0.255125, -0.923077, 0.000000, 0.384615, 0.750000, 1.000000,
-    -0.342891, 0.525000, 0.232031, -0.122871, 0.988996, 0.082396, 0.625000, 0.500000,
-    -0.356664, 0.510645, 0.356664, -0.122811, 0.984802, 0.122811, 0.500000, 0.625000,
-    -0.417573, 0.510645, 0.282568, -0.144436, 0.984762, 0.096857, 0.625000, 0.625000,
-    -0.463412, 0.510645, 0.197170, -0.160568, 0.984755, 0.066903, 0.750000, 0.625000,
-    -0.480566, 0.494531, 0.325195, -0.214340, 0.966126, 0.143734, 0.625000, 0.750000,
-    -0.404250, 0.525000, 0.084047, -0.145472, 0.988935, 0.029094, 0.875000, 0.500000,
-    -0.463412, 0.510645, 0.197170, -0.160568, 0.984755, 0.066903, 0.750000, 0.625000,
-    -0.492297, 0.510645, 0.102353, -0.170999, 0.984678, 0.034200, 0.875000, 0.625000,
-    -0.502344, 0.510645, -0.000000, -0.174370, 0.984680, 0.000000, 1.000000, 0.625000,
-    -0.566563, 0.494531, 0.117793, -0.253732, 0.965942, 0.050746, 0.875000, 0.750000,
-    -0.480566, 0.494531, 0.325195, -0.214340, 0.966126, 0.143734, 0.625000, 0.750000,
-    -0.447633, 0.474902, 0.447633, -0.356389, 0.863698, 0.356389, 0.500000, 0.875000,
-    -0.524077, 0.474902, 0.354639, -0.419017, 0.863406, 0.280988, 0.625000, 0.875000,
-    -0.581607, 0.474902, 0.247459, -0.465791, 0.863349, 0.194080, 0.750000, 0.875000,
-    -0.540312, 0.450000, 0.365625, -0.830544, 0.000000, 0.556953, 0.625000, 1.000000,
-    -0.566563, 0.494531, 0.117793, -0.253732, 0.965942, 0.050747, 0.875000, 0.750000,
-    -0.581607, 0.474902, 0.247459, -0.465791, 0.863349, 0.194079, 0.750000, 0.875000,
-    -0.617859, 0.474902, 0.128458, -0.495761, 0.862780, 0.099152, 0.875000, 0.875000,
-    -0.630469, 0.474902, -0.000000, -0.505546, 0.862799, 0.000000, 1.000000, 0.875000,
-    -0.637000, 0.450000, 0.132437, -0.980581, 0.000000, 0.196116, 0.875000, 1.000000,
-    -0.100000, 0.600000, -0.000000, -0.600000, 0.800000, 0.000000, 0.000000, 0.000000,
-    0.000000, 0.600000, -0.100000, 0.000000, 0.800000, -0.600000, 1.000000, 0.000000,
-    -0.650000, 0.450000, -0.000000, -1.000000, -0.000000, -0.000000, 0.000000, 1.000000,
-    0.000000, 0.450000, -0.650000, 0.000000, 0.000000, -1.000000, 1.000000, 1.000000,
-    -0.071000, 0.600000, -0.071000, -0.427006, 0.797077, -0.427006, 0.500000, 0.000000,
-    -0.412500, 0.525000, -0.000000, -0.148340, 0.988936, 0.000000, 0.000000, 0.500000,
-    -0.292875, 0.525000, -0.292875, -0.105934, 0.988714, -0.105934, 0.500000, 0.500000,
-    0.000000, 0.525000, -0.412500, 0.000000, 0.988936, -0.148340, 1.000000, 0.500000,
-    -0.461500, 0.450000, -0.461500, -0.707107, -0.000000, -0.707107, 0.500000, 1.000000,
-    -0.092250, 0.600000, -0.039250, -0.554119, 0.799778, -0.230883, 0.250000, 0.000000,
-    -0.228125, 0.555469, -0.000000, -0.203954, 0.978980, 0.000000, 0.000000, 0.250000,
-    -0.210445, 0.555469, -0.089539, -0.188404, 0.978949, -0.078502, 0.250000, 0.250000,
-    -0.161969, 0.555469, -0.161969, -0.143654, 0.979146, -0.143654, 0.500000, 0.250000,
-    -0.380531, 0.525000, -0.161906, -0.137033, 0.988920, -0.057097, 0.250000, 0.500000,
-    -0.098000, 0.600000, -0.020375, -0.588329, 0.800015, -0.117666, 0.125000, 0.000000,
-    -0.152344, 0.575098, -0.000000, -0.317497, 0.948259, 0.000000, 0.000000, 0.125000,
-    -0.149297, 0.575098, -0.031040, -0.311317, 0.948264, -0.062263, 0.125000, 0.125000,
-    -0.140537, 0.575098, -0.059795, -0.292417, 0.948497, -0.121840, 0.250000, 0.125000,
-    -0.223562, 0.555469, -0.046480, -0.199984, 0.978983, -0.039997, 0.125000, 0.250000,
-    -0.083125, 0.600000, -0.056250, -0.497432, 0.800807, -0.333572, 0.375000, 0.000000,
-    -0.140537, 0.575098, -0.059795, -0.292417, 0.948497, -0.121840, 0.250000, 0.125000,
-    -0.126636, 0.575098, -0.085693, -0.263031, 0.948527, -0.176386, 0.375000, 0.125000,
-    -0.108164, 0.575098, -0.108164, -0.223681, 0.948648, -0.223681, 0.500000, 0.125000,
-    -0.189629, 0.555469, -0.128320, -0.168938, 0.979094, -0.113288, 0.375000, 0.250000,
-    -0.223562, 0.555469, -0.046480, -0.199985, 0.978982, -0.039997, 0.125000, 0.250000,
-    -0.317969, 0.539355, -0.000000, -0.157389, 0.987537, 0.000000, 0.000000, 0.375000,
-    -0.311609, 0.539355, -0.064786, -0.154325, 0.987538, -0.030865, 0.125000, 0.375000,
-    -0.293326, 0.539355, -0.124803, -0.144929, 0.987598, -0.060387, 0.250000, 0.375000,
-    -0.404250, 0.525000, -0.084047, -0.145452, 0.988938, -0.029090, 0.125000, 0.500000,
-    -0.189629, 0.555469, -0.128320, -0.168939, 0.979094, -0.113289, 0.375000, 0.250000,
-    -0.293326, 0.539355, -0.124803, -0.144929, 0.987598, -0.060387, 0.250000, 0.375000,
-    -0.264312, 0.539355, -0.178857, -0.130361, 0.987605, -0.087419, 0.375000, 0.375000,
-    -0.225758, 0.539355, -0.225758, -0.110849, 0.987636, -0.110849, 0.500000, 0.375000,
-    -0.342891, 0.525000, -0.232031, -0.122865, 0.988997, -0.082392, 0.375000, 0.500000,
-    -0.039250, 0.600000, -0.092250, -0.230997, 0.799556, -0.554392, 0.750000, 0.000000,
-    -0.161969, 0.555469, -0.161969, -0.143654, 0.979146, -0.143654, 0.500000, 0.250000,
-    -0.089539, 0.555469, -0.210445, -0.078560, 0.978918, -0.188544, 0.750000, 0.250000,
-    0.000000, 0.555469, -0.228125, 0.000000, 0.978980, -0.203954, 1.000000, 0.250000,
-    -0.161906, 0.525000, -0.380531, -0.057140, 0.988903, -0.137136, 0.750000, 0.500000,
-    -0.056250, 0.600000, -0.083125, -0.333583, 0.800793, -0.497447, 0.625000, 0.000000,
-    -0.108164, 0.575098, -0.108164, -0.223681, 0.948648, -0.223681, 0.500000, 0.125000,
-    -0.085693, 0.575098, -0.126636, -0.176393, 0.948522, -0.263043, 0.625000, 0.125000,
-    -0.059795, 0.575098, -0.140537, -0.121840, 0.948497, -0.292417, 0.750000, 0.125000,
-    -0.128320, 0.555469, -0.189629, -0.113293, 0.979092, -0.168946, 0.625000, 0.250000,
-    -0.020375, 0.600000, -0.098000, -0.117676, 0.799975, -0.588382, 0.875000, 0.000000,
-    -0.059795, 0.575098, -0.140537, -0.121840, 0.948497, -0.292417, 0.750000, 0.125000,
-    -0.031040, 0.575098, -0.149297, -0.062271, 0.948251, -0.311356, 0.875000, 0.125000,
-    0.000000, 0.575098, -0.152344, 0.000000, 0.948259, -0.317497, 1.000000, 0.125000,
-    -0.046480, 0.555469, -0.223562, -0.040002, 0.978977, -0.200010, 0.875000, 0.250000,
-    -0.128320, 0.555469, -0.189629, -0.113294, 0.979092, -0.168947, 0.625000, 0.250000,
-    -0.225758, 0.539355, -0.225758, -0.110849, 0.987636, -0.110849, 0.500000, 0.375000,
-    -0.178857, 0.539355, -0.264312, -0.087423, 0.987604, -0.130368, 0.625000, 0.375000,
-    -0.124803, 0.539355, -0.293326, -0.060387, 0.987598, -0.144929, 0.750000, 0.375000,
-    -0.232031, 0.525000, -0.342891, -0.082396, 0.988996, -0.122871, 0.625000, 0.500000,
-    -0.046480, 0.555469, -0.223562, -0.040002, 0.978977, -0.200011, 0.875000, 0.250000,
-    -0.124803, 0.539355, -0.293326, -0.060387, 0.987598, -0.144929, 0.750000, 0.375000,
-    -0.064786, 0.539355, -0.311609, -0.030869, 0.987535, -0.154346, 0.875000, 0.375000,
-    0.000000, 0.539355, -0.317969, 0.000000, 0.987537, -0.157389, 1.000000, 0.375000,
-    -0.084047, 0.525000, -0.404250, -0.029094, 0.988935, -0.145472, 0.875000, 0.500000,
-    -0.380531, 0.525000, -0.161906, -0.137032, 0.988920, -0.057097, 0.250000, 0.500000,
-    -0.578125, 0.494531, -0.000000, -0.258736, 0.965948, 0.000000, 0.000000, 0.750000,
-    -0.533320, 0.494531, -0.226914, -0.239005, 0.965898, -0.099585, 0.250000, 0.750000,
-    -0.410469, 0.494531, -0.410469, -0.182258, 0.966211, -0.182258, 0.500000, 0.750000,
-    -0.599625, 0.450000, -0.255125, -0.923077, -0.000000, -0.384615, 0.250000, 1.000000,
-    -0.404250, 0.525000, -0.084047, -0.145452, 0.988938, -0.029090, 0.125000, 0.500000,
-    -0.502344, 0.510645, -0.000000, -0.174370, 0.984680, 0.000000, 0.000000, 0.625000,
-    -0.492297, 0.510645, -0.102353, -0.170975, 0.984682, -0.034195, 0.125000, 0.625000,
-    -0.463412, 0.510645, -0.197170, -0.160568, 0.984755, -0.066903, 0.250000, 0.625000,
-    -0.566563, 0.494531, -0.117793, -0.253699, 0.965951, -0.050740, 0.125000, 0.750000,
-    -0.342891, 0.525000, -0.232031, -0.122865, 0.988997, -0.082392, 0.375000, 0.500000,
-    -0.463412, 0.510645, -0.197170, -0.160568, 0.984755, -0.066903, 0.250000, 0.625000,
-    -0.417573, 0.510645, -0.282568, -0.144429, 0.984764, -0.096852, 0.375000, 0.625000,
-    -0.356664, 0.510645, -0.356664, -0.122811, 0.984802, -0.122811, 0.500000, 0.625000,
-    -0.480566, 0.494531, -0.325195, -0.214330, 0.966129, -0.143727, 0.375000, 0.750000,
-    -0.566563, 0.494531, -0.117793, -0.253699, 0.965951, -0.050740, 0.125000, 0.750000,
-    -0.630469, 0.474902, -0.000000, -0.505546, 0.862799, 0.000000, 0.000000, 0.875000,
-    -0.617859, 0.474902, -0.128458, -0.495710, 0.862811, -0.099142, 0.125000, 0.875000,
-    -0.581607, 0.474902, -0.247459, -0.465791, 0.863349, -0.194079, 0.250000, 0.875000,
-    -0.637000, 0.450000, -0.132437, -0.980581, -0.000000, -0.196116, 0.125000, 1.000000,
-    -0.480566, 0.494531, -0.325195, -0.214330, 0.966129, -0.143727, 0.375000, 0.750000,
-    -0.581607, 0.474902, -0.247459, -0.465791, 0.863349, -0.194080, 0.250000, 0.875000,
-    -0.524077, 0.474902, -0.354639, -0.419002, 0.863417, -0.280978, 0.375000, 0.875000,
-    -0.447633, 0.474902, -0.447633, -0.356389, 0.863698, -0.356389, 0.500000, 0.875000,
-    -0.540312, 0.450000, -0.365625, -0.830544, -0.000000, -0.556953, 0.375000, 1.000000,
-    -0.161906, 0.525000, -0.380531, -0.057140, 0.988903, -0.137136, 0.750000, 0.500000,
-    -0.410469, 0.494531, -0.410469, -0.182258, 0.966211, -0.182258, 0.500000, 0.750000,
-    -0.226914, 0.494531, -0.533320, -0.099657, 0.965848, -0.239176, 0.750000, 0.750000,
-    0.000000, 0.494531, -0.578125, 0.000000, 0.965948, -0.258736, 1.000000, 0.750000,
-    -0.255125, 0.450000, -0.599625, -0.384615, -0.000000, -0.923077, 0.750000, 1.000000,
-    -0.232031, 0.525000, -0.342891, -0.082396, 0.988996, -0.122871, 0.625000, 0.500000,
-    -0.356664, 0.510645, -0.356664, -0.122811, 0.984802, -0.122811, 0.500000, 0.625000,
-    -0.282568, 0.510645, -0.417573, -0.096857, 0.984762, -0.144436, 0.625000, 0.625000,
-    -0.197170, 0.510645, -0.463412, -0.066903, 0.984755, -0.160568, 0.750000, 0.625000,
-    -0.325195, 0.494531, -0.480566, -0.143734, 0.966126, -0.214340, 0.625000, 0.750000,
-    -0.084047, 0.525000, -0.404250, -0.029094, 0.988935, -0.145472, 0.875000, 0.500000,
-    -0.197170, 0.510645, -0.463412, -0.066903, 0.984755, -0.160568, 0.750000, 0.625000,
-    -0.102353, 0.510645, -0.492297, -0.034200, 0.984678, -0.170999, 0.875000, 0.625000,
-    0.000000, 0.510645, -0.502344, 0.000000, 0.984680, -0.174370, 1.000000, 0.625000,
-    -0.117793, 0.494531, -0.566563, -0.050746, 0.965942, -0.253732, 0.875000, 0.750000,
-    -0.325195, 0.494531, -0.480566, -0.143734, 0.966126, -0.214340, 0.625000, 0.750000,
-    -0.447633, 0.474902, -0.447633, -0.356389, 0.863698, -0.356389, 0.500000, 0.875000,
-    -0.354639, 0.474902, -0.524077, -0.280988, 0.863406, -0.419017, 0.625000, 0.875000,
-    -0.247459, 0.474902, -0.581607, -0.194080, 0.863349, -0.465791, 0.750000, 0.875000,
-    -0.365625, 0.450000, -0.540312, -0.556953, -0.000000, -0.830544, 0.625000, 1.000000,
-    -0.117793, 0.494531, -0.566563, -0.050747, 0.965942, -0.253732, 0.875000, 0.750000,
-    -0.247459, 0.474902, -0.581607, -0.194079, 0.863349, -0.465791, 0.750000, 0.875000,
-    -0.128458, 0.474902, -0.617859, -0.099152, 0.862780, -0.495761, 0.875000, 0.875000,
-    0.000000, 0.474902, -0.630469, 0.000000, 0.862799, -0.505546, 1.000000, 0.875000,
-    -0.132437, 0.450000, -0.637000, -0.196116, -0.000000, -0.980581, 0.875000, 1.000000,
-    0.000000, 0.600000, -0.100000, 0.000000, 0.800000, -0.600000, 0.000000, 0.000000,
-    0.100000, 0.600000, -0.000000, 0.600000, 0.800000, -0.000000, 1.000000, 0.000000,
-    0.000000, 0.450000, -0.650000, 0.000000, 0.000000, -1.000000, 0.000000, 1.000000,
-    0.650000, 0.450000, -0.000000, 1.000000, 0.000000, -0.000000, 1.000000, 1.000000,
-    0.071000, 0.600000, -0.071000, 0.427006, 0.797077, -0.427006, 0.500000, 0.000000,
-    0.000000, 0.525000, -0.412500, 0.000000, 0.988936, -0.148340, 0.000000, 0.500000,
-    0.292875, 0.525000, -0.292875, 0.105934, 0.988714, -0.105934, 0.500000, 0.500000,
-    0.412500, 0.525000, -0.000000, 0.148340, 0.988936, -0.000000, 1.000000, 0.500000,
-    0.461500, 0.450000, -0.461500, 0.707107, 0.000000, -0.707107, 0.500000, 1.000000,
-    0.039250, 0.600000, -0.092250, 0.230883, 0.799778, -0.554119, 0.250000, 0.000000,
-    0.000000, 0.555469, -0.228125, 0.000000, 0.978980, -0.203954, 0.000000, 0.250000,
-    0.089539, 0.555469, -0.210445, 0.078502, 0.978949, -0.188404, 0.250000, 0.250000,
-    0.161969, 0.555469, -0.161969, 0.143654, 0.979146, -0.143654, 0.500000, 0.250000,
-    0.161906, 0.525000, -0.380531, 0.057097, 0.988920, -0.137033, 0.250000, 0.500000,
-    0.020375, 0.600000, -0.098000, 0.117666, 0.800015, -0.588329, 0.125000, 0.000000,
-    0.000000, 0.575098, -0.152344, 0.000000, 0.948259, -0.317497, 0.000000, 0.125000,
-    0.031040, 0.575098, -0.149297, 0.062263, 0.948264, -0.311317, 0.125000, 0.125000,
-    0.059795, 0.575098, -0.140537, 0.121840, 0.948497, -0.292417, 0.250000, 0.125000,
-    0.046480, 0.555469, -0.223562, 0.039997, 0.978983, -0.199984, 0.125000, 0.250000,
-    0.056250, 0.600000, -0.083125, 0.333572, 0.800807, -0.497432, 0.375000, 0.000000,
-    0.059795, 0.575098, -0.140537, 0.121840, 0.948497, -0.292417, 0.250000, 0.125000,
-    0.085693, 0.575098, -0.126636, 0.176386, 0.948527, -0.263031, 0.375000, 0.125000,
-    0.108164, 0.575098, -0.108164, 0.223681, 0.948648, -0.223681, 0.500000, 0.125000,
-    0.128320, 0.555469, -0.189629, 0.113288, 0.979094, -0.168938, 0.375000, 0.250000,
-    0.046480, 0.555469, -0.223562, 0.039997, 0.978982, -0.199985, 0.125000, 0.250000,
-    0.000000, 0.539355, -0.317969, 0.000000, 0.987537, -0.157389, 0.000000, 0.375000,
-    0.064786, 0.539355, -0.311609, 0.030865, 0.987538, -0.154325, 0.125000, 0.375000,
-    0.124803, 0.539355, -0.293326, 0.060387, 0.987598, -0.144929, 0.250000, 0.375000,
-    0.084047, 0.525000, -0.404250, 0.029090, 0.988938, -0.145452, 0.125000, 0.500000,
-    0.128320, 0.555469, -0.189629, 0.113289, 0.979094, -0.168939, 0.375000, 0.250000,
-    0.124803, 0.539355, -0.293326, 0.060387, 0.987598, -0.144929, 0.250000, 0.375000,
-    0.178857, 0.539355, -0.264312, 0.087419, 0.987605, -0.130361, 0.375000, 0.375000,
-    0.225758, 0.539355, -0.225758, 0.110849, 0.987636, -0.110849, 0.500000, 0.375000,
-    0.232031, 0.525000, -0.342891, 0.082392, 0.988997, -0.122865, 0.375000, 0.500000,
-    0.092250, 0.600000, -0.039250, 0.554392, 0.799556, -0.230997, 0.750000, 0.000000,
-    0.161969, 0.555469, -0.161969, 0.143654, 0.979146, -0.143654, 0.500000, 0.250000,
-    0.210445, 0.555469, -0.089539, 0.188544, 0.978918, -0.078560, 0.750000, 0.250000,
-    0.228125, 0.555469, -0.000000, 0.203954, 0.978980, -0.000000, 1.000000, 0.250000,
-    0.380531, 0.525000, -0.161906, 0.137136, 0.988903, -0.057140, 0.750000, 0.500000,
-    0.083125, 0.600000, -0.056250, 0.497447, 0.800793, -0.333583, 0.625000, 0.000000,
-    0.108164, 0.575098, -0.108164, 0.223681, 0.948648, -0.223681, 0.500000, 0.125000,
-    0.126636, 0.575098, -0.085693, 0.263043, 0.948522, -0.176393, 0.625000, 0.125000,
-    0.140537, 0.575098, -0.059795, 0.292417, 0.948497, -0.121840, 0.750000, 0.125000,
-    0.189629, 0.555469, -0.128320, 0.168946, 0.979092, -0.113293, 0.625000, 0.250000,
-    0.098000, 0.600000, -0.020375, 0.588382, 0.799975, -0.117676, 0.875000, 0.000000,
-    0.140537, 0.575098, -0.059795, 0.292417, 0.948497, -0.121840, 0.750000, 0.125000,
-    0.149297, 0.575098, -0.031040, 0.311356, 0.948251, -0.062271, 0.875000, 0.125000,
-    0.152344, 0.575098, -0.000000, 0.317497, 0.948259, -0.000000, 1.000000, 0.125000,
-    0.223562, 0.555469, -0.046480, 0.200010, 0.978977, -0.040002, 0.875000, 0.250000,
-    0.189629, 0.555469, -0.128320, 0.168947, 0.979092, -0.113294, 0.625000, 0.250000,
-    0.225758, 0.539355, -0.225758, 0.110849, 0.987636, -0.110849, 0.500000, 0.375000,
-    0.264312, 0.539355, -0.178857, 0.130368, 0.987604, -0.087423, 0.625000, 0.375000,
-    0.293326, 0.539355, -0.124803, 0.144929, 0.987598, -0.060387, 0.750000, 0.375000,
-    0.342891, 0.525000, -0.232031, 0.122871, 0.988996, -0.082396, 0.625000, 0.500000,
-    0.223562, 0.555469, -0.046480, 0.200011, 0.978977, -0.040002, 0.875000, 0.250000,
-    0.293326, 0.539355, -0.124803, 0.144929, 0.987598, -0.060387, 0.750000, 0.375000,
-    0.311609, 0.539355, -0.064786, 0.154346, 0.987535, -0.030869, 0.875000, 0.375000,
-    0.317969, 0.539355, -0.000000, 0.157389, 0.987537, -0.000000, 1.000000, 0.375000,
-    0.404250, 0.525000, -0.084047, 0.145472, 0.988935, -0.029094, 0.875000, 0.500000,
-    0.161906, 0.525000, -0.380531, 0.057097, 0.988920, -0.137032, 0.250000, 0.500000,
-    0.000000, 0.494531, -0.578125, 0.000000, 0.965948, -0.258736, 0.000000, 0.750000,
-    0.226914, 0.494531, -0.533320, 0.099585, 0.965898, -0.239005, 0.250000, 0.750000,
-    0.410469, 0.494531, -0.410469, 0.182258, 0.966211, -0.182258, 0.500000, 0.750000,
-    0.255125, 0.450000, -0.599625, 0.384615, 0.000000, -0.923077, 0.250000, 1.000000,
-    0.084047, 0.525000, -0.404250, 0.029090, 0.988938, -0.145452, 0.125000, 0.500000,
-    0.000000, 0.510645, -0.502344, 0.000000, 0.984680, -0.174370, 0.000000, 0.625000,
-    0.102353, 0.510645, -0.492297, 0.034195, 0.984682, -0.170975, 0.125000, 0.625000,
-    0.197170, 0.510645, -0.463412, 0.066903, 0.984755, -0.160568, 0.250000, 0.625000,
-    0.117793, 0.494531, -0.566563, 0.050740, 0.965951, -0.253699, 0.125000, 0.750000,
-    0.232031, 0.525000, -0.342891, 0.082392, 0.988997, -0.122865, 0.375000, 0.500000,
-    0.197170, 0.510645, -0.463412, 0.066903, 0.984755, -0.160568, 0.250000, 0.625000,
-    0.282568, 0.510645, -0.417573, 0.096852, 0.984764, -0.144429, 0.375000, 0.625000,
-    0.356664, 0.510645, -0.356664, 0.122811, 0.984802, -0.122811, 0.500000, 0.625000,
-    0.325195, 0.494531, -0.480566, 0.143727, 0.966129, -0.214330, 0.375000, 0.750000,
-    0.117793, 0.494531, -0.566563, 0.050740, 0.965951, -0.253699, 0.125000, 0.750000,
-    0.000000, 0.474902, -0.630469, 0.000000, 0.862799, -0.505546, 0.000000, 0.875000,
-    0.128458, 0.474902, -0.617859, 0.099142, 0.862811, -0.495710, 0.125000, 0.875000,
-    0.247459, 0.474902, -0.581607, 0.194079, 0.863349, -0.465791, 0.250000, 0.875000,
-    0.132437, 0.450000, -0.637000, 0.196116, 0.000000, -0.980581, 0.125000, 1.000000,
-    0.325195, 0.494531, -0.480566, 0.143727, 0.966129, -0.214330, 0.375000, 0.750000,
-    0.247459, 0.474902, -0.581607, 0.194080, 0.863349, -0.465791, 0.250000, 0.875000,
-    0.354639, 0.474902, -0.524077, 0.280978, 0.863417, -0.419002, 0.375000, 0.875000,
-    0.447633, 0.474902, -0.447633, 0.356389, 0.863698, -0.356389, 0.500000, 0.875000,
-    0.365625, 0.450000, -0.540312, 0.556953, 0.000000, -0.830544, 0.375000, 1.000000,
-    0.380531, 0.525000, -0.161906, 0.137136, 0.988903, -0.057140, 0.750000, 0.500000,
-    0.410469, 0.494531, -0.410469, 0.182258, 0.966211, -0.182258, 0.500000, 0.750000,
-    0.533320, 0.494531, -0.226914, 0.239176, 0.965848, -0.099657, 0.750000, 0.750000,
-    0.578125, 0.494531, -0.000000, 0.258736, 0.965948, -0.000000, 1.000000, 0.750000,
-    0.599625, 0.450000, -0.255125, 0.923077, 0.000000, -0.384615, 0.750000, 1.000000,
-    0.342891, 0.525000, -0.232031, 0.122871, 0.988996, -0.082396, 0.625000, 0.500000,
-    0.356664, 0.510645, -0.356664, 0.122811, 0.984802, -0.122811, 0.500000, 0.625000,
-    0.417573, 0.510645, -0.282568, 0.144436, 0.984762, -0.096857, 0.625000, 0.625000,
-    0.463412, 0.510645, -0.197170, 0.160568, 0.984755, -0.066903, 0.750000, 0.625000,
-    0.480566, 0.494531, -0.325195, 0.214340, 0.966126, -0.143734, 0.625000, 0.750000,
-    0.404250, 0.525000, -0.084047, 0.145472, 0.988935, -0.029094, 0.875000, 0.500000,
-    0.463412, 0.510645, -0.197170, 0.160568, 0.984755, -0.066903, 0.750000, 0.625000,
-    0.492297, 0.510645, -0.102353, 0.170999, 0.984678, -0.034200, 0.875000, 0.625000,
-    0.502344, 0.510645, -0.000000, 0.174370, 0.984680, -0.000000, 1.000000, 0.625000,
-    0.566563, 0.494531, -0.117793, 0.253732, 0.965942, -0.050746, 0.875000, 0.750000,
-    0.480566, 0.494531, -0.325195, 0.214340, 0.966126, -0.143734, 0.625000, 0.750000,
-    0.447633, 0.474902, -0.447633, 0.356389, 0.863698, -0.356389, 0.500000, 0.875000,
-    0.524077, 0.474902, -0.354639, 0.419017, 0.863406, -0.280988, 0.625000, 0.875000,
-    0.581607, 0.474902, -0.247459, 0.465791, 0.863349, -0.194080, 0.750000, 0.875000,
-    0.540312, 0.450000, -0.365625, 0.830544, 0.000000, -0.556953, 0.625000, 1.000000,
-    0.566563, 0.494531, -0.117793, 0.253732, 0.965942, -0.050747, 0.875000, 0.750000,
-    0.581607, 0.474902, -0.247459, 0.465791, 0.863349, -0.194079, 0.750000, 0.875000,
-    0.617859, 0.474902, -0.128458, 0.495761, 0.862780, -0.099152, 0.875000, 0.875000,
-    0.630469, 0.474902, -0.000000, 0.505546, 0.862799, -0.000000, 1.000000, 0.875000,
-    0.637000, 0.450000, -0.132437, 0.980581, 0.000000, -0.196116, 0.875000, 1.000000,
-    0.000000, -0.750000, -0.000000, 0.099015, -0.990148, -0.099015, 0.000000, 0.000000,
-    0.000000, -0.750000, -0.000000, 0.099015, -0.990148, -0.099015, 1.000000, 0.000000,
-    0.750000, -0.675000, -0.000000, 1.000000, -0.000000, 0.000000, 0.000000, 1.000000,
-    0.000000, -0.675000, -0.750000, 0.000000, 0.000000, -1.000000, 1.000000, 1.000000,
-    0.000000, -0.750000, -0.000000, 0.099015, -0.990148, -0.099015, 0.500000, 0.000000,
-    0.642187, -0.726562, -0.000000, 0.141421, -0.989949, 0.000000, 0.000000, 0.500000,
-    0.455953, -0.726562, -0.455953, 0.100995, -0.989748, -0.100995, 0.500000, 0.500000,
-    0.000000, -0.726562, -0.642187, -0.000000, -0.989949, -0.141421, 1.000000, 0.500000,
-    0.532500, -0.675000, -0.532500, 0.707107, 0.000000, -0.707107, 0.500000, 1.000000,
-    0.000000, -0.750000, -0.000000, 0.036468, -0.999224, -0.014895, 0.250000, 0.000000,
-    0.417773, -0.743555, -0.000000, 0.039517, -0.999219, 0.000000, 0.000000, 0.250000,
-    0.385396, -0.743555, -0.163976, 0.036505, -0.999218, -0.015211, 0.250000, 0.250000,
-    0.296619, -0.743555, -0.296619, 0.027829, -0.999225, -0.027829, 0.500000, 0.250000,
-    0.592418, -0.726562, -0.252059, 0.130641, -0.989934, -0.054434, 0.250000, 0.500000,
-    0.000000, -0.750000, -0.000000, 0.015426, -0.999876, -0.003046, 0.125000, 0.000000,
-    0.236792, -0.748315, -0.000000, 0.015871, -0.999874, 0.000000, 0.000000, 0.125000,
-    0.232056, -0.748315, -0.048246, 0.015562, -0.999874, -0.003112, 0.125000, 0.125000,
-    0.218441, -0.748315, -0.092941, 0.014614, -0.999875, -0.006089, 0.250000, 0.125000,
-    0.409418, -0.743555, -0.085121, 0.038747, -0.999219, -0.007749, 0.125000, 0.250000,
-    0.000000, -0.750000, -0.000000, 0.013015, -0.999877, -0.008711, 0.375000, 0.000000,
-    0.218441, -0.748315, -0.092941, 0.014614, -0.999875, -0.006089, 0.250000, 0.125000,
-    0.196833, -0.748315, -0.133195, 0.013145, -0.999875, -0.008815, 0.375000, 0.125000,
-    0.168122, -0.748315, -0.168122, 0.011177, -0.999875, -0.011177, 0.500000, 0.125000,
-    0.347274, -0.743555, -0.234998, 0.032729, -0.999223, -0.021947, 0.375000, 0.250000,
-    0.409418, -0.743555, -0.085121, 0.038748, -0.999219, -0.007750, 0.125000, 0.250000,
-    0.550415, -0.736157, -0.000000, 0.076999, -0.997031, 0.000000, 0.000000, 0.375000,
-    0.539407, -0.736157, -0.112147, 0.075499, -0.997032, -0.015100, 0.125000, 0.375000,
-    0.507758, -0.736157, -0.216038, 0.070899, -0.997046, -0.029541, 0.250000, 0.375000,
-    0.629344, -0.726562, -0.130846, 0.138668, -0.989950, -0.027734, 0.125000, 0.500000,
-    0.347274, -0.743555, -0.234998, 0.032729, -0.999223, -0.021948, 0.375000, 0.250000,
-    0.507758, -0.736157, -0.216038, 0.070899, -0.997046, -0.029541, 0.250000, 0.375000,
-    0.457533, -0.736157, -0.309608, 0.063773, -0.997048, -0.042765, 0.375000, 0.375000,
-    0.390795, -0.736157, -0.390795, 0.054226, -0.997055, -0.054226, 0.500000, 0.375000,
-    0.533818, -0.726562, -0.361230, 0.117134, -0.990005, -0.078549, 0.375000, 0.500000,
-    0.000000, -0.750000, -0.000000, 0.014895, -0.999224, -0.036468, 0.750000, 0.000000,
-    0.296619, -0.743555, -0.296619, 0.027829, -0.999225, -0.027829, 0.500000, 0.250000,
-    0.163976, -0.743555, -0.385396, 0.015222, -0.999216, -0.036533, 0.750000, 0.250000,
-    0.000000, -0.743555, -0.417773, -0.000000, -0.999219, -0.039517, 1.000000, 0.250000,
-    0.252059, -0.726562, -0.592418, 0.054475, -0.989919, -0.130740, 0.750000, 0.500000,
-    0.000000, -0.750000, -0.000000, 0.008711, -0.999877, -0.013015, 0.625000, 0.000000,
-    0.168122, -0.748315, -0.168122, 0.011177, -0.999875, -0.011177, 0.500000, 0.125000,
-    0.133195, -0.748315, -0.196833, 0.008815, -0.999875, -0.013145, 0.625000, 0.125000,
-    0.092941, -0.748315, -0.218441, 0.006089, -0.999875, -0.014614, 0.750000, 0.125000,
-    0.234998, -0.743555, -0.347274, 0.021948, -0.999223, -0.032730, 0.625000, 0.250000,
-    0.000000, -0.750000, -0.000000, 0.003046, -0.999876, -0.015426, 0.875000, 0.000000,
-    0.092941, -0.748315, -0.218441, 0.006089, -0.999875, -0.014614, 0.750000, 0.125000,
-    0.048246, -0.748315, -0.232056, 0.003113, -0.999874, -0.015564, 0.875000, 0.125000,
-    0.000000, -0.748315, -0.236792, -0.000000, -0.999874, -0.015871, 1.000000, 0.125000,
-    0.085121, -0.743555, -0.409418, 0.007751, -0.999219, -0.038753, 0.875000, 0.250000,
-    0.234998, -0.743555, -0.347274, 0.021949, -0.999223, -0.032731, 0.625000, 0.250000,
-    0.390795, -0.736157, -0.390795, 0.054226, -0.997055, -0.054226, 0.500000, 0.375000,
-    0.309608, -0.736157, -0.457533, 0.042767, -0.997047, -0.063776, 0.625000, 0.375000,
-    0.216038, -0.736157, -0.507758, 0.029541, -0.997046, -0.070899, 0.750000, 0.375000,
-    0.361230, -0.726562, -0.533818, 0.078553, -0.990004, -0.117140, 0.625000, 0.500000,
-    0.085121, -0.743555, -0.409418, 0.007751, -0.999219, -0.038753, 0.875000, 0.250000,
-    0.216038, -0.736157, -0.507758, 0.029541, -0.997046, -0.070899, 0.750000, 0.375000,
-    0.112147, -0.736157, -0.539407, 0.015102, -0.997031, -0.075510, 0.875000, 0.375000,
-    0.000000, -0.736157, -0.550415, -0.000000, -0.997031, -0.076999, 1.000000, 0.375000,
-    0.130846, -0.726562, -0.629344, 0.027737, -0.989948, -0.138687, 0.875000, 0.500000,
-    0.592418, -0.726562, -0.252059, 0.130641, -0.989934, -0.054434, 0.250000, 0.500000,
-    0.733008, -0.702539, -0.000000, 0.514495, -0.857493, 0.000000, 0.000000, 0.750000,
-    0.676200, -0.702539, -0.287706, 0.475188, -0.857318, -0.197995, 0.250000, 0.750000,
-    0.520436, -0.702539, -0.520436, 0.362711, -0.858418, -0.362711, 0.500000, 0.750000,
-    0.691875, -0.675000, -0.294375, 0.923077, 0.000000, -0.384615, 0.250000, 1.000000,
-    0.629344, -0.726562, -0.130846, 0.138668, -0.989950, -0.027734, 0.125000, 0.500000,
-    0.700562, -0.715210, -0.000000, 0.263929, -0.964542, 0.000000, 0.000000, 0.625000,
-    0.686550, -0.715210, -0.142739, 0.258791, -0.964546, -0.051758, 0.125000, 0.625000,
-    0.646268, -0.715210, -0.274970, 0.243061, -0.964709, -0.101276, 0.250000, 0.625000,
-    0.718348, -0.702539, -0.149350, 0.504486, -0.857505, -0.100897, 0.125000, 0.750000,
-    0.533818, -0.726562, -0.361230, 0.117134, -0.990005, -0.078549, 0.375000, 0.500000,
-    0.646268, -0.715210, -0.274970, 0.243061, -0.964709, -0.101276, 0.250000, 0.625000,
-    0.582342, -0.715210, -0.394066, 0.218633, -0.964730, -0.146613, 0.375000, 0.625000,
-    0.497399, -0.715210, -0.497399, 0.185918, -0.964815, -0.185918, 0.500000, 0.625000,
-    0.609313, -0.702539, -0.412317, 0.426431, -0.858128, -0.285959, 0.375000, 0.750000,
-    0.718348, -0.702539, -0.149350, 0.504485, -0.857505, -0.100897, 0.125000, 0.750000,
-    0.746997, -0.688989, -0.000000, 0.885831, -0.464008, 0.000000, 0.000000, 0.875000,
-    0.732057, -0.688989, -0.152201, 0.868619, -0.464027, -0.173724, 0.125000, 0.875000,
-    0.689105, -0.688989, -0.293196, 0.817250, -0.464917, -0.340521, 0.250000, 0.875000,
-    0.735000, -0.675000, -0.152812, 0.980581, 0.000000, -0.196116, 0.125000, 1.000000,
-    0.609313, -0.702539, -0.412317, 0.426430, -0.858129, -0.285959, 0.375000, 0.750000,
-    0.689105, -0.688989, -0.293196, 0.817250, -0.464917, -0.340521, 0.250000, 0.875000,
-    0.620941, -0.688989, -0.420186, 0.735277, -0.465030, -0.493068, 0.375000, 0.875000,
-    0.530368, -0.688989, -0.530368, 0.625826, -0.465494, -0.625825, 0.500000, 0.875000,
-    0.623438, -0.675000, -0.421875, 0.830544, 0.000000, -0.556953, 0.375000, 1.000000,
-    0.252059, -0.726562, -0.592418, 0.054475, -0.989919, -0.130740, 0.750000, 0.500000,
-    0.520436, -0.702539, -0.520436, 0.362711, -0.858418, -0.362711, 0.500000, 0.750000,
-    0.287706, -0.702539, -0.676200, 0.198107, -0.857143, -0.475457, 0.750000, 0.750000,
-    0.000000, -0.702539, -0.733008, -0.000000, -0.857493, -0.514495, 1.000000, 0.750000,
-    0.294375, -0.675000, -0.691875, 0.384615, 0.000000, -0.923077, 0.750000, 1.000000,
-    0.361230, -0.726562, -0.533818, 0.078553, -0.990004, -0.117140, 0.625000, 0.500000,
-    0.497399, -0.715210, -0.497399, 0.185918, -0.964815, -0.185918, 0.500000, 0.625000,
-    0.394066, -0.715210, -0.582342, 0.146620, -0.964727, -0.218643, 0.625000, 0.625000,
-    0.274970, -0.715210, -0.646268, 0.101276, -0.964709, -0.243061, 0.750000, 0.625000,
-    0.412317, -0.702539, -0.609313, 0.285969, -0.858117, -0.426446, 0.625000, 0.750000,
-    0.130846, -0.726562, -0.629344, 0.027737, -0.989948, -0.138687, 0.875000, 0.500000,
-    0.274970, -0.715210, -0.646268, 0.101276, -0.964709, -0.243061, 0.750000, 0.625000,
-    0.142739, -0.715210, -0.686550, 0.051765, -0.964536, -0.258825, 0.875000, 0.625000,
-    0.000000, -0.715210, -0.700562, -0.000000, -0.964542, -0.263929, 1.000000, 0.625000,
-    0.149350, -0.702539, -0.718348, 0.100908, -0.857473, -0.504538, 0.875000, 0.750000,
-    0.412317, -0.702539, -0.609313, 0.285969, -0.858118, -0.426445, 0.625000, 0.750000,
-    0.530368, -0.688989, -0.530368, 0.625825, -0.465494, -0.625826, 0.500000, 0.875000,
-    0.420186, -0.688989, -0.620941, 0.493073, -0.465012, -0.735284, 0.625000, 0.875000,
-    0.293196, -0.688989, -0.689105, 0.340521, -0.464917, -0.817250, 0.750000, 0.875000,
-    0.421875, -0.675000, -0.623438, 0.556953, 0.000000, -0.830544, 0.625000, 1.000000,
-    0.149350, -0.702539, -0.718348, 0.100907, -0.857473, -0.504537, 0.875000, 0.750000,
-    0.293196, -0.688989, -0.689105, 0.340521, -0.464917, -0.817250, 0.750000, 0.875000,
-    0.152201, -0.688989, -0.732057, 0.173729, -0.463975, -0.868645, 0.875000, 0.875000,
-    0.000000, -0.688989, -0.746997, -0.000000, -0.464008, -0.885831, 1.000000, 0.875000,
-    0.152812, -0.675000, -0.735000, 0.196116, 0.000000, -0.980581, 0.875000, 1.000000,
-    0.000000, -0.750000, -0.000000, -0.099015, -0.990148, -0.099015, 0.000000, 0.000000,
-    0.000000, -0.750000, -0.000000, -0.099015, -0.990148, -0.099015, 1.000000, 0.000000,
-    0.000000, -0.675000, -0.750000, 0.000000, 0.000000, -1.000000, 0.000000, 1.000000,
-    -0.750000, -0.675000, -0.000000, -1.000000, 0.000000, 0.000000, 1.000000, 1.000000,
-    0.000000, -0.750000, -0.000000, -0.099015, -0.990148, -0.099015, 0.500000, 0.000000,
-    0.000000, -0.726562, -0.642187, -0.000000, -0.989949, -0.141421, 0.000000, 0.500000,
-    -0.455953, -0.726562, -0.455953, -0.100995, -0.989748, -0.100995, 0.500000, 0.500000,
-    -0.642187, -0.726562, -0.000000, -0.141421, -0.989949, 0.000000, 1.000000, 0.500000,
-    -0.532500, -0.675000, -0.532500, -0.707107, 0.000000, -0.707107, 0.500000, 1.000000,
-    0.000000, -0.750000, -0.000000, -0.014895, -0.999224, -0.036468, 0.250000, 0.000000,
-    0.000000, -0.743555, -0.417773, -0.000000, -0.999219, -0.039517, 0.000000, 0.250000,
-    -0.163976, -0.743555, -0.385396, -0.015211, -0.999218, -0.036505, 0.250000, 0.250000,
-    -0.296619, -0.743555, -0.296619, -0.027829, -0.999225, -0.027829, 0.500000, 0.250000,
-    -0.252059, -0.726562, -0.592418, -0.054434, -0.989934, -0.130641, 0.250000, 0.500000,
-    0.000000, -0.750000, -0.000000, -0.003046, -0.999876, -0.015426, 0.125000, 0.000000,
-    0.000000, -0.748315, -0.236792, -0.000000, -0.999874, -0.015871, 0.000000, 0.125000,
-    -0.048246, -0.748315, -0.232056, -0.003112, -0.999874, -0.015562, 0.125000, 0.125000,
-    -0.092941, -0.748315, -0.218441, -0.006089, -0.999875, -0.014614, 0.250000, 0.125000,
-    -0.085121, -0.743555, -0.409418, -0.007749, -0.999219, -0.038747, 0.125000, 0.250000,
-    0.000000, -0.750000, -0.000000, -0.008711, -0.999877, -0.013015, 0.375000, 0.000000,
-    -0.092941, -0.748315, -0.218441, -0.006089, -0.999875, -0.014614, 0.250000, 0.125000,
-    -0.133195, -0.748315, -0.196833, -0.008815, -0.999875, -0.013145, 0.375000, 0.125000,
-    -0.168122, -0.748315, -0.168122, -0.011177, -0.999875, -0.011177, 0.500000, 0.125000,
-    -0.234998, -0.743555, -0.347274, -0.021947, -0.999223, -0.032729, 0.375000, 0.250000,
-    -0.085121, -0.743555, -0.409418, -0.007750, -0.999219, -0.038748, 0.125000, 0.250000,
-    0.000000, -0.736157, -0.550415, -0.000000, -0.997031, -0.076999, 0.000000, 0.375000,
-    -0.112147, -0.736157, -0.539407, -0.015100, -0.997032, -0.075499, 0.125000, 0.375000,
-    -0.216038, -0.736157, -0.507758, -0.029541, -0.997046, -0.070899, 0.250000, 0.375000,
-    -0.130846, -0.726562, -0.629344, -0.027734, -0.989950, -0.138668, 0.125000, 0.500000,
-    -0.234998, -0.743555, -0.347274, -0.021948, -0.999223, -0.032729, 0.375000, 0.250000,
-    -0.216038, -0.736157, -0.507758, -0.029541, -0.997046, -0.070899, 0.250000, 0.375000,
-    -0.309608, -0.736157, -0.457533, -0.042765, -0.997048, -0.063773, 0.375000, 0.375000,
-    -0.390795, -0.736157, -0.390795, -0.054226, -0.997055, -0.054226, 0.500000, 0.375000,
-    -0.361230, -0.726562, -0.533818, -0.078549, -0.990005, -0.117134, 0.375000, 0.500000,
-    0.000000, -0.750000, -0.000000, -0.036468, -0.999224, -0.014895, 0.750000, 0.000000,
-    -0.296619, -0.743555, -0.296619, -0.027829, -0.999225, -0.027829, 0.500000, 0.250000,
-    -0.385396, -0.743555, -0.163976, -0.036533, -0.999216, -0.015222, 0.750000, 0.250000,
-    -0.417773, -0.743555, -0.000000, -0.039517, -0.999219, 0.000000, 1.000000, 0.250000,
-    -0.592418, -0.726562, -0.252059, -0.130740, -0.989919, -0.054475, 0.750000, 0.500000,
-    0.000000, -0.750000, -0.000000, -0.013015, -0.999877, -0.008711, 0.625000, 0.000000,
-    -0.168122, -0.748315, -0.168122, -0.011177, -0.999875, -0.011177, 0.500000, 0.125000,
-    -0.196833, -0.748315, -0.133195, -0.013145, -0.999875, -0.008815, 0.625000, 0.125000,
-    -0.218441, -0.748315, -0.092941, -0.014614, -0.999875, -0.006089, 0.750000, 0.125000,
-    -0.347274, -0.743555, -0.234998, -0.032730, -0.999223, -0.021948, 0.625000, 0.250000,
-    0.000000, -0.750000, -0.000000, -0.015426, -0.999876, -0.003046, 0.875000, 0.000000,
-    -0.218441, -0.748315, -0.092941, -0.014614, -0.999875, -0.006089, 0.750000, 0.125000,
-    -0.232056, -0.748315, -0.048246, -0.015564, -0.999874, -0.003113, 0.875000, 0.125000,
-    -0.236792, -0.748315, -0.000000, -0.015871, -0.999874, 0.000000, 1.000000, 0.125000,
-    -0.409418, -0.743555, -0.085121, -0.038753, -0.999219, -0.007751, 0.875000, 0.250000,
-    -0.347274, -0.743555, -0.234998, -0.032731, -0.999223, -0.021949, 0.625000, 0.250000,
-    -0.390795, -0.736157, -0.390795, -0.054226, -0.997055, -0.054226, 0.500000, 0.375000,
-    -0.457533, -0.736157, -0.309608, -0.063776, -0.997047, -0.042767, 0.625000, 0.375000,
-    -0.507758, -0.736157, -0.216038, -0.070899, -0.997046, -0.029541, 0.750000, 0.375000,
-    -0.533818, -0.726562, -0.361230, -0.117140, -0.990004, -0.078553, 0.625000, 0.500000,
-    -0.409418, -0.743555, -0.085121, -0.038753, -0.999219, -0.007751, 0.875000, 0.250000,
-    -0.507758, -0.736157, -0.216038, -0.070899, -0.997046, -0.029541, 0.750000, 0.375000,
-    -0.539407, -0.736157, -0.112147, -0.075510, -0.997031, -0.015102, 0.875000, 0.375000,
-    -0.550415, -0.736157, -0.000000, -0.076999, -0.997031, 0.000000, 1.000000, 0.375000,
-    -0.629344, -0.726562, -0.130846, -0.138687, -0.989948, -0.027737, 0.875000, 0.500000,
-    -0.252059, -0.726562, -0.592418, -0.054434, -0.989934, -0.130641, 0.250000, 0.500000,
-    0.000000, -0.702539, -0.733008, -0.000000, -0.857493, -0.514495, 0.000000, 0.750000,
-    -0.287706, -0.702539, -0.676200, -0.197995, -0.857318, -0.475188, 0.250000, 0.750000,
-    -0.520436, -0.702539, -0.520436, -0.362711, -0.858418, -0.362711, 0.500000, 0.750000,
-    -0.294375, -0.675000, -0.691875, -0.384615, 0.000000, -0.923077, 0.250000, 1.000000,
-    -0.130846, -0.726562, -0.629344, -0.027734, -0.989950, -0.138668, 0.125000, 0.500000,
-    0.000000, -0.715210, -0.700562, -0.000000, -0.964542, -0.263929, 0.000000, 0.625000,
-    -0.142739, -0.715210, -0.686550, -0.051758, -0.964546, -0.258791, 0.125000, 0.625000,
-    -0.274970, -0.715210, -0.646268, -0.101276, -0.964709, -0.243061, 0.250000, 0.625000,
-    -0.149350, -0.702539, -0.718348, -0.100897, -0.857505, -0.504486, 0.125000, 0.750000,
-    -0.361230, -0.726562, -0.533818, -0.078549, -0.990005, -0.117134, 0.375000, 0.500000,
-    -0.274970, -0.715210, -0.646268, -0.101276, -0.964709, -0.243061, 0.250000, 0.625000,
-    -0.394066, -0.715210, -0.582342, -0.146613, -0.964730, -0.218633, 0.375000, 0.625000,
-    -0.497399, -0.715210, -0.497399, -0.185918, -0.964815, -0.185918, 0.500000, 0.625000,
-    -0.412317, -0.702539, -0.609313, -0.285959, -0.858128, -0.426431, 0.375000, 0.750000,
-    -0.149350, -0.702539, -0.718348, -0.100897, -0.857505, -0.504485, 0.125000, 0.750000,
-    0.000000, -0.688989, -0.746997, -0.000000, -0.464008, -0.885831, 0.000000, 0.875000,
-    -0.152201, -0.688989, -0.732057, -0.173724, -0.464027, -0.868619, 0.125000, 0.875000,
-    -0.293196, -0.688989, -0.689105, -0.340521, -0.464917, -0.817250, 0.250000, 0.875000,
-    -0.152812, -0.675000, -0.735000, -0.196116, 0.000000, -0.980581, 0.125000, 1.000000,
-    -0.412317, -0.702539, -0.609313, -0.285959, -0.858129, -0.426430, 0.375000, 0.750000,
-    -0.293196, -0.688989, -0.689105, -0.340521, -0.464917, -0.817250, 0.250000, 0.875000,
-    -0.420186, -0.688989, -0.620941, -0.493068, -0.465030, -0.735277, 0.375000, 0.875000,
-    -0.530368, -0.688989, -0.530368, -0.625825, -0.465494, -0.625826, 0.500000, 0.875000,
-    -0.421875, -0.675000, -0.623438, -0.556953, 0.000000, -0.830544, 0.375000, 1.000000,
-    -0.592418, -0.726562, -0.252059, -0.130740, -0.989919, -0.054475, 0.750000, 0.500000,
-    -0.520436, -0.702539, -0.520436, -0.362711, -0.858418, -0.362711, 0.500000, 0.750000,
-    -0.676200, -0.702539, -0.287706, -0.475457, -0.857143, -0.198107, 0.750000, 0.750000,
-    -0.733008, -0.702539, -0.000000, -0.514495, -0.857493, 0.000000, 1.000000, 0.750000,
-    -0.691875, -0.675000, -0.294375, -0.923077, 0.000000, -0.384615, 0.750000, 1.000000,
-    -0.533818, -0.726562, -0.361230, -0.117140, -0.990004, -0.078553, 0.625000, 0.500000,
-    -0.497399, -0.715210, -0.497399, -0.185918, -0.964815, -0.185918, 0.500000, 0.625000,
-    -0.582342, -0.715210, -0.394066, -0.218643, -0.964727, -0.146620, 0.625000, 0.625000,
-    -0.646268, -0.715210, -0.274970, -0.243061, -0.964709, -0.101276, 0.750000, 0.625000,
-    -0.609313, -0.702539, -0.412317, -0.426446, -0.858117, -0.285969, 0.625000, 0.750000,
-    -0.629344, -0.726562, -0.130846, -0.138687, -0.989948, -0.027737, 0.875000, 0.500000,
-    -0.646268, -0.715210, -0.274970, -0.243061, -0.964709, -0.101276, 0.750000, 0.625000,
-    -0.686550, -0.715210, -0.142739, -0.258825, -0.964536, -0.051765, 0.875000, 0.625000,
-    -0.700562, -0.715210, -0.000000, -0.263929, -0.964542, 0.000000, 1.000000, 0.625000,
-    -0.718348, -0.702539, -0.149350, -0.504538, -0.857473, -0.100908, 0.875000, 0.750000,
-    -0.609313, -0.702539, -0.412317, -0.426445, -0.858118, -0.285969, 0.625000, 0.750000,
-    -0.530368, -0.688989, -0.530368, -0.625826, -0.465494, -0.625825, 0.500000, 0.875000,
-    -0.620941, -0.688989, -0.420186, -0.735284, -0.465012, -0.493073, 0.625000, 0.875000,
-    -0.689105, -0.688989, -0.293196, -0.817250, -0.464917, -0.340521, 0.750000, 0.875000,
-    -0.623438, -0.675000, -0.421875, -0.830544, 0.000000, -0.556953, 0.625000, 1.000000,
-    -0.718348, -0.702539, -0.149350, -0.504537, -0.857473, -0.100907, 0.875000, 0.750000,
-    -0.689105, -0.688989, -0.293196, -0.817250, -0.464917, -0.340521, 0.750000, 0.875000,
-    -0.732057, -0.688989, -0.152201, -0.868645, -0.463975, -0.173729, 0.875000, 0.875000,
-    -0.746997, -0.688989, -0.000000, -0.885831, -0.464008, 0.000000, 1.000000, 0.875000,
-    -0.735000, -0.675000, -0.152812, -0.980581, 0.000000, -0.196116, 0.875000, 1.000000,
-    0.000000, -0.750000, -0.000000, -0.099015, -0.990148, 0.099015, 0.000000, 0.000000,
-    0.000000, -0.750000, -0.000000, -0.099015, -0.990148, 0.099015, 1.000000, 0.000000,
-    -0.750000, -0.675000, -0.000000, -1.000000, 0.000000, 0.000000, 0.000000, 1.000000,
-    0.000000, -0.675000, 0.750000, 0.000000, 0.000000, 1.000000, 1.000000, 1.000000,
-    0.000000, -0.750000, -0.000000, -0.099015, -0.990148, 0.099015, 0.500000, 0.000000,
-    -0.642187, -0.726562, -0.000000, -0.141421, -0.989949, 0.000000, 0.000000, 0.500000,
-    -0.455953, -0.726562, 0.455953, -0.100995, -0.989748, 0.100995, 0.500000, 0.500000,
-    0.000000, -0.726562, 0.642187, 0.000000, -0.989949, 0.141421, 1.000000, 0.500000,
-    -0.532500, -0.675000, 0.532500, -0.707107, 0.000000, 0.707107, 0.500000, 1.000000,
-    0.000000, -0.750000, -0.000000, -0.036468, -0.999224, 0.014895, 0.250000, 0.000000,
-    -0.417773, -0.743555, -0.000000, -0.039517, -0.999219, 0.000000, 0.000000, 0.250000,
-    -0.385396, -0.743555, 0.163976, -0.036505, -0.999218, 0.015211, 0.250000, 0.250000,
-    -0.296619, -0.743555, 0.296619, -0.027829, -0.999225, 0.027829, 0.500000, 0.250000,
-    -0.592418, -0.726562, 0.252059, -0.130641, -0.989934, 0.054434, 0.250000, 0.500000,
-    0.000000, -0.750000, -0.000000, -0.015426, -0.999876, 0.003046, 0.125000, 0.000000,
-    -0.236792, -0.748315, -0.000000, -0.015871, -0.999874, 0.000000, 0.000000, 0.125000,
-    -0.232056, -0.748315, 0.048246, -0.015562, -0.999874, 0.003112, 0.125000, 0.125000,
-    -0.218441, -0.748315, 0.092941, -0.014614, -0.999875, 0.006089, 0.250000, 0.125000,
-    -0.409418, -0.743555, 0.085121, -0.038747, -0.999219, 0.007749, 0.125000, 0.250000,
-    0.000000, -0.750000, -0.000000, -0.013015, -0.999877, 0.008711, 0.375000, 0.000000,
-    -0.218441, -0.748315, 0.092941, -0.014614, -0.999875, 0.006089, 0.250000, 0.125000,
-    -0.196833, -0.748315, 0.133195, -0.013145, -0.999875, 0.008815, 0.375000, 0.125000,
-    -0.168122, -0.748315, 0.168122, -0.011177, -0.999875, 0.011177, 0.500000, 0.125000,
-    -0.347274, -0.743555, 0.234998, -0.032729, -0.999223, 0.021947, 0.375000, 0.250000,
-    -0.409418, -0.743555, 0.085121, -0.038748, -0.999219, 0.007750, 0.125000, 0.250000,
-    -0.550415, -0.736157, -0.000000, -0.076999, -0.997031, 0.000000, 0.000000, 0.375000,
-    -0.539407, -0.736157, 0.112147, -0.075499, -0.997032, 0.015100, 0.125000, 0.375000,
-    -0.507758, -0.736157, 0.216038, -0.070899, -0.997046, 0.029541, 0.250000, 0.375000,
-    -0.629344, -0.726562, 0.130846, -0.138668, -0.989950, 0.027734, 0.125000, 0.500000,
-    -0.347274, -0.743555, 0.234998, -0.032729, -0.999223, 0.021948, 0.375000, 0.250000,
-    -0.507758, -0.736157, 0.216038, -0.070899, -0.997046, 0.029541, 0.250000, 0.375000,
-    -0.457533, -0.736157, 0.309608, -0.063773, -0.997048, 0.042765, 0.375000, 0.375000,
-    -0.390795, -0.736157, 0.390795, -0.054226, -0.997055, 0.054226, 0.500000, 0.375000,
-    -0.533818, -0.726562, 0.361230, -0.117134, -0.990005, 0.078549, 0.375000, 0.500000,
-    0.000000, -0.750000, -0.000000, -0.014895, -0.999224, 0.036468, 0.750000, 0.000000,
-    -0.296619, -0.743555, 0.296619, -0.027829, -0.999225, 0.027829, 0.500000, 0.250000,
-    -0.163976, -0.743555, 0.385396, -0.015222, -0.999216, 0.036533, 0.750000, 0.250000,
-    0.000000, -0.743555, 0.417773, 0.000000, -0.999219, 0.039517, 1.000000, 0.250000,
-    -0.252059, -0.726562, 0.592418, -0.054475, -0.989919, 0.130740, 0.750000, 0.500000,
-    0.000000, -0.750000, -0.000000, -0.008711, -0.999877, 0.013015, 0.625000, 0.000000,
-    -0.168122, -0.748315, 0.168122, -0.011177, -0.999875, 0.011177, 0.500000, 0.125000,
-    -0.133195, -0.748315, 0.196833, -0.008815, -0.999875, 0.013145, 0.625000, 0.125000,
-    -0.092941, -0.748315, 0.218441, -0.006089, -0.999875, 0.014614, 0.750000, 0.125000,
-    -0.234998, -0.743555, 0.347274, -0.021948, -0.999223, 0.032730, 0.625000, 0.250000,
-    0.000000, -0.750000, -0.000000, -0.003046, -0.999876, 0.015426, 0.875000, 0.000000,
-    -0.092941, -0.748315, 0.218441, -0.006089, -0.999875, 0.014614, 0.750000, 0.125000,
-    -0.048246, -0.748315, 0.232056, -0.003113, -0.999874, 0.015564, 0.875000, 0.125000,
-    0.000000, -0.748315, 0.236792, 0.000000, -0.999874, 0.015871, 1.000000, 0.125000,
-    -0.085121, -0.743555, 0.409418, -0.007751, -0.999219, 0.038753, 0.875000, 0.250000,
-    -0.234998, -0.743555, 0.347274, -0.021949, -0.999223, 0.032731, 0.625000, 0.250000,
-    -0.390795, -0.736157, 0.390795, -0.054226, -0.997055, 0.054226, 0.500000, 0.375000,
-    -0.309608, -0.736157, 0.457533, -0.042767, -0.997047, 0.063776, 0.625000, 0.375000,
-    -0.216038, -0.736157, 0.507758, -0.029541, -0.997046, 0.070899, 0.750000, 0.375000,
-    -0.361230, -0.726562, 0.533818, -0.078553, -0.990004, 0.117140, 0.625000, 0.500000,
-    -0.085121, -0.743555, 0.409418, -0.007751, -0.999219, 0.038753, 0.875000, 0.250000,
-    -0.216038, -0.736157, 0.507758, -0.029541, -0.997046, 0.070899, 0.750000, 0.375000,
-    -0.112147, -0.736157, 0.539407, -0.015102, -0.997031, 0.075510, 0.875000, 0.375000,
-    0.000000, -0.736157, 0.550415, 0.000000, -0.997031, 0.076999, 1.000000, 0.375000,
-    -0.130846, -0.726562, 0.629344, -0.027737, -0.989948, 0.138687, 0.875000, 0.500000,
-    -0.592418, -0.726562, 0.252059, -0.130641, -0.989934, 0.054434, 0.250000, 0.500000,
-    -0.733008, -0.702539, -0.000000, -0.514495, -0.857493, 0.000000, 0.000000, 0.750000,
-    -0.676200, -0.702539, 0.287706, -0.475188, -0.857318, 0.197995, 0.250000, 0.750000,
-    -0.520436, -0.702539, 0.520436, -0.362711, -0.858418, 0.362711, 0.500000, 0.750000,
-    -0.691875, -0.675000, 0.294375, -0.923077, 0.000000, 0.384615, 0.250000, 1.000000,
-    -0.629344, -0.726562, 0.130846, -0.138668, -0.989950, 0.027734, 0.125000, 0.500000,
-    -0.700562, -0.715210, -0.000000, -0.263929, -0.964542, 0.000000, 0.000000, 0.625000,
-    -0.686550, -0.715210, 0.142739, -0.258791, -0.964546, 0.051758, 0.125000, 0.625000,
-    -0.646268, -0.715210, 0.274970, -0.243061, -0.964709, 0.101276, 0.250000, 0.625000,
-    -0.718348, -0.702539, 0.149350, -0.504486, -0.857505, 0.100897, 0.125000, 0.750000,
-    -0.533818, -0.726562, 0.361230, -0.117134, -0.990005, 0.078549, 0.375000, 0.500000,
-    -0.646268, -0.715210, 0.274970, -0.243061, -0.964709, 0.101276, 0.250000, 0.625000,
-    -0.582342, -0.715210, 0.394066, -0.218633, -0.964730, 0.146613, 0.375000, 0.625000,
-    -0.497399, -0.715210, 0.497399, -0.185918, -0.964815, 0.185918, 0.500000, 0.625000,
-    -0.609313, -0.702539, 0.412317, -0.426431, -0.858128, 0.285959, 0.375000, 0.750000,
-    -0.718348, -0.702539, 0.149350, -0.504485, -0.857505, 0.100897, 0.125000, 0.750000,
-    -0.746997, -0.688989, -0.000000, -0.885831, -0.464008, 0.000000, 0.000000, 0.875000,
-    -0.732057, -0.688989, 0.152201, -0.868619, -0.464027, 0.173724, 0.125000, 0.875000,
-    -0.689105, -0.688989, 0.293196, -0.817250, -0.464917, 0.340521, 0.250000, 0.875000,
-    -0.735000, -0.675000, 0.152812, -0.980581, 0.000000, 0.196116, 0.125000, 1.000000,
-    -0.609313, -0.702539, 0.412317, -0.426430, -0.858129, 0.285959, 0.375000, 0.750000,
-    -0.689105, -0.688989, 0.293196, -0.817250, -0.464917, 0.340521, 0.250000, 0.875000,
-    -0.620941, -0.688989, 0.420186, -0.735277, -0.465030, 0.493068, 0.375000, 0.875000,
-    -0.530368, -0.688989, 0.530368, -0.625826, -0.465494, 0.625825, 0.500000, 0.875000,
-    -0.623438, -0.675000, 0.421875, -0.830544, 0.000000, 0.556953, 0.375000, 1.000000,
-    -0.252059, -0.726562, 0.592418, -0.054475, -0.989919, 0.130740, 0.750000, 0.500000,
-    -0.520436, -0.702539, 0.520436, -0.362711, -0.858418, 0.362711, 0.500000, 0.750000,
-    -0.287706, -0.702539, 0.676200, -0.198107, -0.857143, 0.475457, 0.750000, 0.750000,
-    0.000000, -0.702539, 0.733008, 0.000000, -0.857493, 0.514495, 1.000000, 0.750000,
-    -0.294375, -0.675000, 0.691875, -0.384615, 0.000000, 0.923077, 0.750000, 1.000000,
-    -0.361230, -0.726562, 0.533818, -0.078553, -0.990004, 0.117140, 0.625000, 0.500000,
-    -0.497399, -0.715210, 0.497399, -0.185918, -0.964815, 0.185918, 0.500000, 0.625000,
-    -0.394066, -0.715210, 0.582342, -0.146620, -0.964727, 0.218643, 0.625000, 0.625000,
-    -0.274970, -0.715210, 0.646268, -0.101276, -0.964709, 0.243061, 0.750000, 0.625000,
-    -0.412317, -0.702539, 0.609313, -0.285969, -0.858117, 0.426446, 0.625000, 0.750000,
-    -0.130846, -0.726562, 0.629344, -0.027737, -0.989948, 0.138687, 0.875000, 0.500000,
-    -0.274970, -0.715210, 0.646268, -0.101276, -0.964709, 0.243061, 0.750000, 0.625000,
-    -0.142739, -0.715210, 0.686550, -0.051765, -0.964536, 0.258825, 0.875000, 0.625000,
-    0.000000, -0.715210, 0.700562, 0.000000, -0.964542, 0.263929, 1.000000, 0.625000,
-    -0.149350, -0.702539, 0.718348, -0.100908, -0.857473, 0.504538, 0.875000, 0.750000,
-    -0.412317, -0.702539, 0.609313, -0.285969, -0.858118, 0.426445, 0.625000, 0.750000,
-    -0.530368, -0.688989, 0.530368, -0.625825, -0.465494, 0.625826, 0.500000, 0.875000,
-    -0.420186, -0.688989, 0.620941, -0.493073, -0.465012, 0.735284, 0.625000, 0.875000,
-    -0.293196, -0.688989, 0.689105, -0.340521, -0.464917, 0.817250, 0.750000, 0.875000,
-    -0.421875, -0.675000, 0.623438, -0.556953, 0.000000, 0.830544, 0.625000, 1.000000,
-    -0.149350, -0.702539, 0.718348, -0.100907, -0.857473, 0.504537, 0.875000, 0.750000,
-    -0.293196, -0.688989, 0.689105, -0.340521, -0.464917, 0.817250, 0.750000, 0.875000,
-    -0.152201, -0.688989, 0.732057, -0.173729, -0.463975, 0.868645, 0.875000, 0.875000,
-    0.000000, -0.688989, 0.746997, 0.000000, -0.464008, 0.885831, 1.000000, 0.875000,
-    -0.152812, -0.675000, 0.735000, -0.196116, 0.000000, 0.980581, 0.875000, 1.000000,
-    0.000000, -0.750000, -0.000000, 0.099015, -0.990148, 0.099015, 0.000000, 0.000000,
-    0.000000, -0.750000, -0.000000, 0.099015, -0.990148, 0.099015, 1.000000, 0.000000,
-    0.000000, -0.675000, 0.750000, 0.000000, 0.000000, 1.000000, 0.000000, 1.000000,
-    0.750000, -0.675000, -0.000000, 1.000000, -0.000000, 0.000000, 1.000000, 1.000000,
-    0.000000, -0.750000, -0.000000, 0.099015, -0.990148, 0.099015, 0.500000, 0.000000,
-    0.000000, -0.726562, 0.642187, 0.000000, -0.989949, 0.141421, 0.000000, 0.500000,
-    0.455953, -0.726562, 0.455953, 0.100995, -0.989748, 0.100995, 0.500000, 0.500000,
-    0.642187, -0.726562, -0.000000, 0.141421, -0.989949, 0.000000, 1.000000, 0.500000,
-    0.532500, -0.675000, 0.532500, 0.707107, -0.000000, 0.707107, 0.500000, 1.000000,
-    0.000000, -0.750000, -0.000000, 0.014895, -0.999224, 0.036468, 0.250000, 0.000000,
-    0.000000, -0.743555, 0.417773, 0.000000, -0.999219, 0.039517, 0.000000, 0.250000,
-    0.163976, -0.743555, 0.385396, 0.015211, -0.999218, 0.036505, 0.250000, 0.250000,
-    0.296619, -0.743555, 0.296619, 0.027829, -0.999225, 0.027829, 0.500000, 0.250000,
-    0.252059, -0.726562, 0.592418, 0.054434, -0.989934, 0.130641, 0.250000, 0.500000,
-    0.000000, -0.750000, -0.000000, 0.003046, -0.999876, 0.015426, 0.125000, 0.000000,
-    0.000000, -0.748315, 0.236792, 0.000000, -0.999874, 0.015871, 0.000000, 0.125000,
-    0.048246, -0.748315, 0.232056, 0.003112, -0.999874, 0.015562, 0.125000, 0.125000,
-    0.092941, -0.748315, 0.218441, 0.006089, -0.999875, 0.014614, 0.250000, 0.125000,
-    0.085121, -0.743555, 0.409418, 0.007749, -0.999219, 0.038747, 0.125000, 0.250000,
-    0.000000, -0.750000, -0.000000, 0.008711, -0.999877, 0.013015, 0.375000, 0.000000,
-    0.092941, -0.748315, 0.218441, 0.006089, -0.999875, 0.014614, 0.250000, 0.125000,
-    0.133195, -0.748315, 0.196833, 0.008815, -0.999875, 0.013145, 0.375000, 0.125000,
-    0.168122, -0.748315, 0.168122, 0.011177, -0.999875, 0.011177, 0.500000, 0.125000,
-    0.234998, -0.743555, 0.347274, 0.021947, -0.999223, 0.032729, 0.375000, 0.250000,
-    0.085121, -0.743555, 0.409418, 0.007750, -0.999219, 0.038748, 0.125000, 0.250000,
-    0.000000, -0.736157, 0.550415, 0.000000, -0.997031, 0.076999, 0.000000, 0.375000,
-    0.112147, -0.736157, 0.539407, 0.015100, -0.997032, 0.075499, 0.125000, 0.375000,
-    0.216038, -0.736157, 0.507758, 0.029541, -0.997046, 0.070899, 0.250000, 0.375000,
-    0.130846, -0.726562, 0.629344, 0.027734, -0.989950, 0.138668, 0.125000, 0.500000,
-    0.234998, -0.743555, 0.347274, 0.021948, -0.999223, 0.032729, 0.375000, 0.250000,
-    0.216038, -0.736157, 0.507758, 0.029541, -0.997046, 0.070899, 0.250000, 0.375000,
-    0.309608, -0.736157, 0.457533, 0.042765, -0.997048, 0.063773, 0.375000, 0.375000,
-    0.390795, -0.736157, 0.390795, 0.054226, -0.997055, 0.054226, 0.500000, 0.375000,
-    0.361230, -0.726562, 0.533818, 0.078549, -0.990005, 0.117134, 0.375000, 0.500000,
-    0.000000, -0.750000, -0.000000, 0.036468, -0.999224, 0.014895, 0.750000, 0.000000,
-    0.296619, -0.743555, 0.296619, 0.027829, -0.999225, 0.027829, 0.500000, 0.250000,
-    0.385396, -0.743555, 0.163976, 0.036533, -0.999216, 0.015222, 0.750000, 0.250000,
-    0.417773, -0.743555, -0.000000, 0.039517, -0.999219, 0.000000, 1.000000, 0.250000,
-    0.592418, -0.726562, 0.252059, 0.130740, -0.989919, 0.054475, 0.750000, 0.500000,
-    0.000000, -0.750000, -0.000000, 0.013015, -0.999877, 0.008711, 0.625000, 0.000000,
-    0.168122, -0.748315, 0.168122, 0.011177, -0.999875, 0.011177, 0.500000, 0.125000,
-    0.196833, -0.748315, 0.133195, 0.013145, -0.999875, 0.008815, 0.625000, 0.125000,
-    0.218441, -0.748315, 0.092941, 0.014614, -0.999875, 0.006089, 0.750000, 0.125000,
-    0.347274, -0.743555, 0.234998, 0.032730, -0.999223, 0.021948, 0.625000, 0.250000,
-    0.000000, -0.750000, -0.000000, 0.015426, -0.999876, 0.003046, 0.875000, 0.000000,
-    0.218441, -0.748315, 0.092941, 0.014614, -0.999875, 0.006089, 0.750000, 0.125000,
-    0.232056, -0.748315, 0.048246, 0.015564, -0.999874, 0.003113, 0.875000, 0.125000,
-    0.236792, -0.748315, -0.000000, 0.015871, -0.999874, 0.000000, 1.000000, 0.125000,
-    0.409418, -0.743555, 0.085121, 0.038753, -0.999219, 0.007751, 0.875000, 0.250000,
-    0.347274, -0.743555, 0.234998, 0.032731, -0.999223, 0.021949, 0.625000, 0.250000,
-    0.390795, -0.736157, 0.390795, 0.054226, -0.997055, 0.054226, 0.500000, 0.375000,
-    0.457533, -0.736157, 0.309608, 0.063776, -0.997047, 0.042767, 0.625000, 0.375000,
-    0.507758, -0.736157, 0.216038, 0.070899, -0.997046, 0.029541, 0.750000, 0.375000,
-    0.533818, -0.726562, 0.361230, 0.117140, -0.990004, 0.078553, 0.625000, 0.500000,
-    0.409418, -0.743555, 0.085121, 0.038753, -0.999219, 0.007751, 0.875000, 0.250000,
-    0.507758, -0.736157, 0.216038, 0.070899, -0.997046, 0.029541, 0.750000, 0.375000,
-    0.539407, -0.736157, 0.112147, 0.075510, -0.997031, 0.015102, 0.875000, 0.375000,
-    0.550415, -0.736157, -0.000000, 0.076999, -0.997031, 0.000000, 1.000000, 0.375000,
-    0.629344, -0.726562, 0.130846, 0.138687, -0.989948, 0.027737, 0.875000, 0.500000,
-    0.252059, -0.726562, 0.592418, 0.054434, -0.989934, 0.130641, 0.250000, 0.500000,
-    0.000000, -0.702539, 0.733008, 0.000000, -0.857493, 0.514495, 0.000000, 0.750000,
-    0.287706, -0.702539, 0.676200, 0.197995, -0.857318, 0.475188, 0.250000, 0.750000,
-    0.520436, -0.702539, 0.520436, 0.362711, -0.858418, 0.362711, 0.500000, 0.750000,
-    0.294375, -0.675000, 0.691875, 0.384615, -0.000000, 0.923077, 0.250000, 1.000000,
-    0.130846, -0.726562, 0.629344, 0.027734, -0.989950, 0.138668, 0.125000, 0.500000,
-    0.000000, -0.715210, 0.700562, 0.000000, -0.964542, 0.263929, 0.000000, 0.625000,
-    0.142739, -0.715210, 0.686550, 0.051758, -0.964546, 0.258791, 0.125000, 0.625000,
-    0.274970, -0.715210, 0.646268, 0.101276, -0.964709, 0.243061, 0.250000, 0.625000,
-    0.149350, -0.702539, 0.718348, 0.100897, -0.857505, 0.504486, 0.125000, 0.750000,
-    0.361230, -0.726562, 0.533818, 0.078549, -0.990005, 0.117134, 0.375000, 0.500000,
-    0.274970, -0.715210, 0.646268, 0.101276, -0.964709, 0.243061, 0.250000, 0.625000,
-    0.394066, -0.715210, 0.582342, 0.146613, -0.964730, 0.218633, 0.375000, 0.625000,
-    0.497399, -0.715210, 0.497399, 0.185918, -0.964815, 0.185918, 0.500000, 0.625000,
-    0.412317, -0.702539, 0.609313, 0.285959, -0.858128, 0.426431, 0.375000, 0.750000,
-    0.149350, -0.702539, 0.718348, 0.100897, -0.857505, 0.504485, 0.125000, 0.750000,
-    0.000000, -0.688989, 0.746997, 0.000000, -0.464008, 0.885831, 0.000000, 0.875000,
-    0.152201, -0.688989, 0.732057, 0.173724, -0.464027, 0.868619, 0.125000, 0.875000,
-    0.293196, -0.688989, 0.689105, 0.340521, -0.464917, 0.817250, 0.250000, 0.875000,
-    0.152812, -0.675000, 0.735000, 0.196116, -0.000000, 0.980581, 0.125000, 1.000000,
-    0.412317, -0.702539, 0.609313, 0.285959, -0.858129, 0.426430, 0.375000, 0.750000,
-    0.293196, -0.688989, 0.689105, 0.340521, -0.464917, 0.817250, 0.250000, 0.875000,
-    0.420186, -0.688989, 0.620941, 0.493068, -0.465030, 0.735277, 0.375000, 0.875000,
-    0.530368, -0.688989, 0.530368, 0.625825, -0.465494, 0.625826, 0.500000, 0.875000,
-    0.421875, -0.675000, 0.623438, 0.556953, -0.000000, 0.830544, 0.375000, 1.000000,
-    0.592418, -0.726562, 0.252059, 0.130740, -0.989919, 0.054475, 0.750000, 0.500000,
-    0.520436, -0.702539, 0.520436, 0.362711, -0.858418, 0.362711, 0.500000, 0.750000,
-    0.676200, -0.702539, 0.287706, 0.475457, -0.857143, 0.198107, 0.750000, 0.750000,
-    0.733008, -0.702539, -0.000000, 0.514495, -0.857493, 0.000000, 1.000000, 0.750000,
-    0.691875, -0.675000, 0.294375, 0.923077, -0.000000, 0.384615, 0.750000, 1.000000,
-    0.533818, -0.726562, 0.361230, 0.117140, -0.990004, 0.078553, 0.625000, 0.500000,
-    0.497399, -0.715210, 0.497399, 0.185918, -0.964815, 0.185918, 0.500000, 0.625000,
-    0.582342, -0.715210, 0.394066, 0.218643, -0.964727, 0.146620, 0.625000, 0.625000,
-    0.646268, -0.715210, 0.274970, 0.243061, -0.964709, 0.101276, 0.750000, 0.625000,
-    0.609313, -0.702539, 0.412317, 0.426446, -0.858117, 0.285969, 0.625000, 0.750000,
-    0.629344, -0.726562, 0.130846, 0.138687, -0.989948, 0.027737, 0.875000, 0.500000,
-    0.646268, -0.715210, 0.274970, 0.243061, -0.964709, 0.101276, 0.750000, 0.625000,
-    0.686550, -0.715210, 0.142739, 0.258825, -0.964536, 0.051765, 0.875000, 0.625000,
-    0.700562, -0.715210, -0.000000, 0.263929, -0.964542, 0.000000, 1.000000, 0.625000,
-    0.718348, -0.702539, 0.149350, 0.504538, -0.857473, 0.100908, 0.875000, 0.750000,
-    0.609313, -0.702539, 0.412317, 0.426445, -0.858118, 0.285969, 0.625000, 0.750000,
-    0.530368, -0.688989, 0.530368, 0.625826, -0.465494, 0.625825, 0.500000, 0.875000,
-    0.620941, -0.688989, 0.420186, 0.735284, -0.465012, 0.493073, 0.625000, 0.875000,
-    0.689105, -0.688989, 0.293196, 0.817250, -0.464917, 0.340521, 0.750000, 0.875000,
-    0.623438, -0.675000, 0.421875, 0.830544, -0.000000, 0.556953, 0.625000, 1.000000,
-    0.718348, -0.702539, 0.149350, 0.504537, -0.857473, 0.100907, 0.875000, 0.750000,
-    0.689105, -0.688989, 0.293196, 0.817250, -0.464917, 0.340521, 0.750000, 0.875000,
-    0.732057, -0.688989, 0.152201, 0.868645, -0.463975, 0.173729, 0.875000, 0.875000,
-    0.746997, -0.688989, -0.000000, 0.885831, -0.464008, 0.000000, 1.000000, 0.875000,
-    0.735000, -0.675000, 0.152812, 0.980581, -0.000000, 0.196116, 0.875000, 1.000000
+    0.700000f, 0.450000f, -0.000000f, -0.902860f, -0.429934f, 0.000000f, 0.000000f, 0.000000f,
+    0.000000f, 0.450000f, 0.700000f, -0.000000f, -0.429934f, -0.902860f, 1.000000f, 0.000000f,
+    0.750000f, 0.450000f, -0.000000f, 0.902860f, 0.429934f, -0.000000f, 0.000000f, 1.000000f,
+    0.000000f, 0.450000f, 0.750000f, 0.000000f, 0.429934f, 0.902860f, 1.000000f, 1.000000f,
+    0.497000f, 0.450000f, 0.497000f, -0.639602f, -0.426402f, -0.639602f, 0.500000f, 0.000000f,
+    0.701563f, 0.499219f, -0.000000f, 0.000000f, 1.000000f, 0.000000f, 0.000000f, 0.500000f,
+    0.498109f, 0.499219f, 0.498109f, 0.000000f, 1.000000f, -0.000000f, 0.500000f, 0.500000f,
+    0.000000f, 0.499219f, 0.701563f, 0.000000f, 1.000000f, -0.000000f, 1.000000f, 0.500000f,
+    0.532500f, 0.450000f, 0.532500f, 0.639602f, 0.426402f, 0.639602f, 0.500000f, 1.000000f,
+    0.645750f, 0.450000f, 0.274750f, -0.833528f, -0.429664f, -0.347303f, 0.250000f, 0.000000f,
+    0.690234f, 0.486914f, -0.000000f, -0.995495f, 0.094810f, 0.000000f, 0.000000f, 0.250000f,
+    0.636741f, 0.486914f, 0.270917f, -0.918925f, 0.094737f, -0.382885f, 0.250000f, 0.250000f,
+    0.490066f, 0.486914f, 0.490066f, -0.703896f, 0.095194f, -0.703896f, 0.500000f, 0.250000f,
+    0.647191f, 0.499219f, 0.275363f, 0.000000f, 1.000000f, -0.000000f, 0.250000f, 0.500000f,
+    0.686000f, 0.450000f, 0.142625f, -0.885319f, -0.429953f, -0.177064f, 0.125000f, 0.000000f,
+    0.691895f, 0.471533f, -0.000000f, -0.969231f, -0.246154f, 0.000000f, 0.000000f, 0.125000f,
+    0.678057f, 0.471533f, 0.140974f, -0.950406f, -0.246166f, -0.190081f, 0.125000f, 0.125000f,
+    0.638273f, 0.471533f, 0.271569f, -0.894539f, -0.246731f, -0.372725f, 0.250000f, 0.125000f,
+    0.676430f, 0.486914f, 0.140635f, -0.976163f, 0.094813f, -0.195233f, 0.125000f, 0.250000f,
+    0.581875f, 0.450000f, 0.393750f, -0.749476f, -0.430917f, -0.502590f, 0.375000f, 0.000000f,
+    0.638273f, 0.471533f, 0.271569f, -0.894539f, -0.246731f, -0.372725f, 0.250000f, 0.125000f,
+    0.575137f, 0.471533f, 0.389191f, -0.804852f, -0.246803f, -0.539724f, 0.375000f, 0.125000f,
+    0.491245f, 0.471533f, 0.491245f, -0.685179f, -0.247099f, -0.685180f, 0.500000f, 0.125000f,
+    0.573757f, 0.486914f, 0.388257f, -0.826782f, 0.095071f, -0.554430f, 0.375000f, 0.250000f,
+    0.676430f, 0.486914f, 0.140635f, -0.976163f, 0.094813f, -0.195233f, 0.125000f, 0.250000f,
+    0.693848f, 0.496143f, -0.000000f, -0.724137f, 0.689656f, 0.000000f, 0.000000f, 0.375000f,
+    0.679971f, 0.496143f, 0.141371f, -0.710057f, 0.689675f, -0.142011f, 0.125000f, 0.375000f,
+    0.640074f, 0.496143f, 0.272335f, -0.667641f, 0.690558f, -0.278184f, 0.250000f, 0.375000f,
+    0.687531f, 0.499219f, 0.142943f, 0.000000f, 1.000000f, -0.000000f, 0.125000f, 0.500000f,
+    0.573757f, 0.486914f, 0.388257f, -0.826782f, 0.095071f, -0.554430f, 0.375000f, 0.250000f,
+    0.640074f, 0.496143f, 0.272335f, -0.667641f, 0.690558f, -0.278184f, 0.250000f, 0.375000f,
+    0.576761f, 0.496143f, 0.390289f, -0.600626f, 0.690668f, -0.402773f, 0.375000f, 0.375000f,
+    0.492632f, 0.496143f, 0.492632f, -0.511047f, 0.691132f, -0.511046f, 0.500000f, 0.375000f,
+    0.583174f, 0.499219f, 0.394629f, 0.000000f, 1.000000f, -0.000000f, 0.375000f, 0.500000f,
+    0.274750f, 0.450000f, 0.645750f, -0.347353f, -0.429394f, -0.833647f, 0.750000f, 0.000000f,
+    0.490066f, 0.486914f, 0.490066f, -0.703896f, 0.095194f, -0.703896f, 0.500000f, 0.250000f,
+    0.270917f, 0.486914f, 0.636741f, -0.382888f, 0.094664f, -0.918932f, 0.750000f, 0.250000f,
+    0.000000f, 0.486914f, 0.690234f, 0.000000f, 0.094810f, -0.995495f, 1.000000f, 0.250000f,
+    0.275363f, 0.499219f, 0.647191f, 0.000000f, 1.000000f, -0.000000f, 0.750000f, 0.500000f,
+    0.393750f, 0.450000f, 0.581875f, -0.502594f, -0.430900f, -0.749483f, 0.625000f, 0.000000f,
+    0.491245f, 0.471533f, 0.491245f, -0.685180f, -0.247099f, -0.685179f, 0.500000f, 0.125000f,
+    0.389191f, 0.471533f, 0.575137f, -0.539726f, -0.246792f, -0.804854f, 0.625000f, 0.125000f,
+    0.271569f, 0.471533f, 0.638273f, -0.372725f, -0.246731f, -0.894539f, 0.750000f, 0.125000f,
+    0.388257f, 0.486914f, 0.573757f, -0.554431f, 0.095066f, -0.826782f, 0.625000f, 0.250000f,
+    0.142625f, 0.450000f, 0.686000f, -0.177068f, -0.429904f, -0.885342f, 0.875000f, 0.000000f,
+    0.271569f, 0.471533f, 0.638273f, -0.372725f, -0.246731f, -0.894539f, 0.750000f, 0.125000f,
+    0.140974f, 0.471533f, 0.678057f, -0.190083f, -0.246134f, -0.950414f, 0.875000f, 0.125000f,
+    0.000000f, 0.471533f, 0.691895f, -0.000000f, -0.246154f, -0.969231f, 1.000000f, 0.125000f,
+    0.140635f, 0.486914f, 0.676430f, -0.195233f, 0.094801f, -0.976164f, 0.875000f, 0.250000f,
+    0.388257f, 0.486914f, 0.573757f, -0.554431f, 0.095066f, -0.826782f, 0.625000f, 0.250000f,
+    0.492632f, 0.496143f, 0.492632f, -0.511046f, 0.691132f, -0.511047f, 0.500000f, 0.375000f,
+    0.390289f, 0.496143f, 0.576761f, -0.402782f, 0.690651f, -0.600640f, 0.625000f, 0.375000f,
+    0.272335f, 0.496143f, 0.640074f, -0.278184f, 0.690558f, -0.667641f, 0.750000f, 0.375000f,
+    0.394629f, 0.499219f, 0.583174f, 0.000000f, 1.000000f, -0.000000f, 0.625000f, 0.500000f,
+    0.140635f, 0.486914f, 0.676430f, -0.195233f, 0.094801f, -0.976164f, 0.875000f, 0.250000f,
+    0.272335f, 0.496143f, 0.640074f, -0.278184f, 0.690558f, -0.667641f, 0.750000f, 0.375000f,
+    0.141371f, 0.496143f, 0.679971f, -0.142021f, 0.689625f, -0.710104f, 0.875000f, 0.375000f,
+    0.000000f, 0.496143f, 0.693848f, 0.000000f, 0.689656f, -0.724137f, 1.000000f, 0.375000f,
+    0.142943f, 0.499219f, 0.687531f, 0.000000f, 1.000000f, -0.000000f, 0.875000f, 0.500000f,
+    0.647191f, 0.499219f, 0.275363f, 0.000000f, 1.000000f, -0.000000f, 0.250000f, 0.500000f,
+    0.724609f, 0.486914f, -0.000000f, 0.690476f, 0.723356f, -0.000000f, 0.000000f, 0.750000f,
+    0.668452f, 0.486914f, 0.284409f, 0.637619f, 0.723090f, 0.265674f, 0.250000f, 0.750000f,
+    0.514473f, 0.486914f, 0.514473f, 0.487196f, 0.724762f, 0.487196f, 0.500000f, 0.750000f,
+    0.691875f, 0.450000f, 0.294375f, 0.833528f, 0.429664f, 0.347303f, 0.250000f, 1.000000f,
+    0.687531f, 0.499219f, 0.142943f, 0.000000f, 1.000000f, -0.000000f, 0.125000f, 0.500000f,
+    0.712207f, 0.496143f, -0.000000f, 0.464835f, 0.885397f, -0.000000f, 0.000000f, 0.625000f,
+    0.697963f, 0.496143f, 0.145112f, 0.455789f, 0.885407f, 0.091158f, 0.125000f, 0.625000f,
+    0.657011f, 0.496143f, 0.279541f, 0.428239f, 0.885874f, 0.178433f, 0.250000f, 0.625000f,
+    0.710117f, 0.486914f, 0.147639f, 0.677049f, 0.723373f, 0.135410f, 0.125000f, 0.750000f,
+    0.583174f, 0.499219f, 0.394629f, 0.000000f, 1.000000f, -0.000000f, 0.375000f, 0.500000f,
+    0.657011f, 0.496143f, 0.279541f, 0.428239f, 0.885874f, 0.178433f, 0.250000f, 0.625000f,
+    0.592022f, 0.496143f, 0.400616f, 0.385216f, 0.885934f, 0.258322f, 0.375000f, 0.625000f,
+    0.505667f, 0.496143f, 0.505667f, 0.327637f, 0.886176f, 0.327636f, 0.500000f, 0.625000f,
+    0.602332f, 0.486914f, 0.407593f, 0.572629f, 0.724322f, 0.383998f, 0.375000f, 0.750000f,
+    0.710117f, 0.486914f, 0.147639f, 0.677049f, 0.723373f, 0.135410f, 0.125000f, 0.750000f,
+    0.737598f, 0.471533f, -0.000000f, 0.819842f, 0.572589f, -0.000000f, 0.000000f, 0.875000f,
+    0.722846f, 0.471533f, 0.150286f, 0.803908f, 0.572609f, 0.160782f, 0.125000f, 0.875000f,
+    0.680434f, 0.471533f, 0.289507f, 0.756157f, 0.573550f, 0.315066f, 0.250000f, 0.875000f,
+    0.735000f, 0.450000f, 0.152812f, 0.885319f, 0.429952f, 0.177064f, 0.125000f, 1.000000f,
+    0.602332f, 0.486914f, 0.407593f, 0.572628f, 0.724322f, 0.383998f, 0.375000f, 0.750000f,
+    0.680434f, 0.471533f, 0.289507f, 0.756158f, 0.573550f, 0.315065f, 0.250000f, 0.875000f,
+    0.613128f, 0.471533f, 0.414899f, 0.680288f, 0.573668f, 0.456193f, 0.375000f, 0.875000f,
+    0.523694f, 0.471533f, 0.523694f, 0.578938f, 0.574162f, 0.578938f, 0.500000f, 0.875000f,
+    0.623438f, 0.450000f, 0.421875f, 0.749476f, 0.430918f, 0.502589f, 0.375000f, 1.000000f,
+    0.275363f, 0.499219f, 0.647191f, 0.000000f, 1.000000f, -0.000000f, 0.750000f, 0.500000f,
+    0.514473f, 0.486914f, 0.514473f, 0.487196f, 0.724762f, 0.487196f, 0.500000f, 0.750000f,
+    0.284409f, 0.486914f, 0.668452f, 0.265781f, 0.722825f, 0.637875f, 0.750000f, 0.750000f,
+    0.000000f, 0.486914f, 0.724609f, 0.000000f, 0.723356f, 0.690476f, 1.000000f, 0.750000f,
+    0.294375f, 0.450000f, 0.691875f, 0.347353f, 0.429394f, 0.833647f, 0.750000f, 1.000000f,
+    0.394629f, 0.499219f, 0.583174f, 0.000000f, 1.000000f, -0.000000f, 0.625000f, 0.500000f,
+    0.505667f, 0.496143f, 0.505667f, 0.327636f, 0.886176f, 0.327637f, 0.500000f, 0.625000f,
+    0.400616f, 0.496143f, 0.592022f, 0.258332f, 0.885924f, 0.385231f, 0.625000f, 0.625000f,
+    0.279541f, 0.496143f, 0.657011f, 0.178433f, 0.885874f, 0.428239f, 0.750000f, 0.625000f,
+    0.407593f, 0.486914f, 0.602332f, 0.384008f, 0.724305f, 0.572644f, 0.625000f, 0.750000f,
+    0.142943f, 0.499219f, 0.687531f, 0.000000f, 1.000000f, -0.000000f, 0.875000f, 0.500000f,
+    0.279541f, 0.496143f, 0.657011f, 0.178433f, 0.885874f, 0.428239f, 0.750000f, 0.625000f,
+    0.145112f, 0.496143f, 0.697963f, 0.091168f, 0.885381f, 0.455839f, 0.875000f, 0.625000f,
+    0.000000f, 0.496143f, 0.712207f, 0.000000f, 0.885397f, 0.464835f, 1.000000f, 0.625000f,
+    0.147639f, 0.486914f, 0.710117f, 0.135420f, 0.723325f, 0.677099f, 0.875000f, 0.750000f,
+    0.407593f, 0.486914f, 0.602332f, 0.384008f, 0.724305f, 0.572643f, 0.625000f, 0.750000f,
+    0.523694f, 0.471533f, 0.523694f, 0.578938f, 0.574162f, 0.578938f, 0.500000f, 0.875000f,
+    0.414899f, 0.471533f, 0.613128f, 0.456201f, 0.573650f, 0.680299f, 0.625000f, 0.875000f,
+    0.289507f, 0.471533f, 0.680434f, 0.315065f, 0.573550f, 0.756158f, 0.750000f, 0.875000f,
+    0.421875f, 0.450000f, 0.623438f, 0.502594f, 0.430901f, 0.749482f, 0.625000f, 1.000000f,
+    0.147639f, 0.486914f, 0.710117f, 0.135420f, 0.723325f, 0.677099f, 0.875000f, 0.750000f,
+    0.289507f, 0.471533f, 0.680434f, 0.315066f, 0.573550f, 0.756157f, 0.750000f, 0.875000f,
+    0.150286f, 0.471533f, 0.722846f, 0.160789f, 0.572555f, 0.803945f, 0.875000f, 0.875000f,
+    0.000000f, 0.471533f, 0.737598f, 0.000000f, 0.572589f, 0.819842f, 1.000000f, 0.875000f,
+    0.152812f, 0.450000f, 0.735000f, 0.177068f, 0.429904f, 0.885342f, 0.875000f, 1.000000f,
+    0.000000f, 0.450000f, 0.700000f, -0.000000f, -0.429934f, -0.902860f, 0.000000f, 0.000000f,
+    -0.700000f, 0.450000f, -0.000000f, 0.902860f, -0.429934f, 0.000000f, 1.000000f, 0.000000f,
+    0.000000f, 0.450000f, 0.750000f, 0.000000f, 0.429934f, 0.902860f, 0.000000f, 1.000000f,
+    -0.750000f, 0.450000f, -0.000000f, -0.902860f, 0.429934f, 0.000000f, 1.000000f, 1.000000f,
+    -0.497000f, 0.450000f, 0.497000f, 0.639602f, -0.426402f, -0.639602f, 0.500000f, 0.000000f,
+    0.000000f, 0.499219f, 0.701563f, 0.000000f, 1.000000f, -0.000000f, 0.000000f, 0.500000f,
+    -0.498109f, 0.499219f, 0.498109f, 0.000000f, 1.000000f, 0.000000f, 0.500000f, 0.500000f,
+    -0.701563f, 0.499219f, -0.000000f, 0.000000f, 1.000000f, 0.000000f, 1.000000f, 0.500000f,
+    -0.532500f, 0.450000f, 0.532500f, -0.639602f, 0.426402f, 0.639602f, 0.500000f, 1.000000f,
+    -0.274750f, 0.450000f, 0.645750f, 0.347303f, -0.429664f, -0.833528f, 0.250000f, 0.000000f,
+    0.000000f, 0.486914f, 0.690234f, 0.000000f, 0.094810f, -0.995495f, 0.000000f, 0.250000f,
+    -0.270917f, 0.486914f, 0.636741f, 0.382885f, 0.094737f, -0.918925f, 0.250000f, 0.250000f,
+    -0.490066f, 0.486914f, 0.490066f, 0.703896f, 0.095194f, -0.703896f, 0.500000f, 0.250000f,
+    -0.275363f, 0.499219f, 0.647191f, 0.000000f, 1.000000f, 0.000000f, 0.250000f, 0.500000f,
+    -0.142625f, 0.450000f, 0.686000f, 0.177064f, -0.429953f, -0.885319f, 0.125000f, 0.000000f,
+    0.000000f, 0.471533f, 0.691895f, -0.000000f, -0.246154f, -0.969231f, 0.000000f, 0.125000f,
+    -0.140974f, 0.471533f, 0.678057f, 0.190081f, -0.246166f, -0.950406f, 0.125000f, 0.125000f,
+    -0.271569f, 0.471533f, 0.638273f, 0.372725f, -0.246731f, -0.894539f, 0.250000f, 0.125000f,
+    -0.140635f, 0.486914f, 0.676430f, 0.195233f, 0.094813f, -0.976163f, 0.125000f, 0.250000f,
+    -0.393750f, 0.450000f, 0.581875f, 0.502590f, -0.430917f, -0.749476f, 0.375000f, 0.000000f,
+    -0.271569f, 0.471533f, 0.638273f, 0.372725f, -0.246731f, -0.894539f, 0.250000f, 0.125000f,
+    -0.389191f, 0.471533f, 0.575137f, 0.539724f, -0.246803f, -0.804852f, 0.375000f, 0.125000f,
+    -0.491245f, 0.471533f, 0.491245f, 0.685180f, -0.247099f, -0.685179f, 0.500000f, 0.125000f,
+    -0.388257f, 0.486914f, 0.573757f, 0.554430f, 0.095071f, -0.826782f, 0.375000f, 0.250000f,
+    -0.140635f, 0.486914f, 0.676430f, 0.195233f, 0.094813f, -0.976163f, 0.125000f, 0.250000f,
+    0.000000f, 0.496143f, 0.693848f, 0.000000f, 0.689656f, -0.724137f, 0.000000f, 0.375000f,
+    -0.141371f, 0.496143f, 0.679971f, 0.142011f, 0.689675f, -0.710057f, 0.125000f, 0.375000f,
+    -0.272335f, 0.496143f, 0.640074f, 0.278184f, 0.690558f, -0.667641f, 0.250000f, 0.375000f,
+    -0.142943f, 0.499219f, 0.687531f, 0.000000f, 1.000000f, 0.000000f, 0.125000f, 0.500000f,
+    -0.388257f, 0.486914f, 0.573757f, 0.554430f, 0.095071f, -0.826782f, 0.375000f, 0.250000f,
+    -0.272335f, 0.496143f, 0.640074f, 0.278184f, 0.690558f, -0.667641f, 0.250000f, 0.375000f,
+    -0.390289f, 0.496143f, 0.576761f, 0.402773f, 0.690668f, -0.600626f, 0.375000f, 0.375000f,
+    -0.492632f, 0.496143f, 0.492632f, 0.511046f, 0.691132f, -0.511047f, 0.500000f, 0.375000f,
+    -0.394629f, 0.499219f, 0.583174f, 0.000000f, 1.000000f, 0.000000f, 0.375000f, 0.500000f,
+    -0.645750f, 0.450000f, 0.274750f, 0.833647f, -0.429394f, -0.347353f, 0.750000f, 0.000000f,
+    -0.490066f, 0.486914f, 0.490066f, 0.703896f, 0.095194f, -0.703896f, 0.500000f, 0.250000f,
+    -0.636741f, 0.486914f, 0.270917f, 0.918932f, 0.094664f, -0.382888f, 0.750000f, 0.250000f,
+    -0.690234f, 0.486914f, -0.000000f, 0.995495f, 0.094810f, 0.000000f, 1.000000f, 0.250000f,
+    -0.647191f, 0.499219f, 0.275363f, 0.000000f, 1.000000f, 0.000000f, 0.750000f, 0.500000f,
+    -0.581875f, 0.450000f, 0.393750f, 0.749483f, -0.430900f, -0.502594f, 0.625000f, 0.000000f,
+    -0.491245f, 0.471533f, 0.491245f, 0.685179f, -0.247099f, -0.685180f, 0.500000f, 0.125000f,
+    -0.575137f, 0.471533f, 0.389191f, 0.804854f, -0.246792f, -0.539726f, 0.625000f, 0.125000f,
+    -0.638273f, 0.471533f, 0.271569f, 0.894539f, -0.246731f, -0.372725f, 0.750000f, 0.125000f,
+    -0.573757f, 0.486914f, 0.388257f, 0.826782f, 0.095066f, -0.554431f, 0.625000f, 0.250000f,
+    -0.686000f, 0.450000f, 0.142625f, 0.885342f, -0.429904f, -0.177068f, 0.875000f, 0.000000f,
+    -0.638273f, 0.471533f, 0.271569f, 0.894539f, -0.246731f, -0.372725f, 0.750000f, 0.125000f,
+    -0.678057f, 0.471533f, 0.140974f, 0.950414f, -0.246134f, -0.190083f, 0.875000f, 0.125000f,
+    -0.691895f, 0.471533f, -0.000000f, 0.969231f, -0.246154f, 0.000000f, 1.000000f, 0.125000f,
+    -0.676430f, 0.486914f, 0.140635f, 0.976164f, 0.094801f, -0.195233f, 0.875000f, 0.250000f,
+    -0.573757f, 0.486914f, 0.388257f, 0.826782f, 0.095066f, -0.554431f, 0.625000f, 0.250000f,
+    -0.492632f, 0.496143f, 0.492632f, 0.511047f, 0.691132f, -0.511046f, 0.500000f, 0.375000f,
+    -0.576761f, 0.496143f, 0.390289f, 0.600640f, 0.690651f, -0.402782f, 0.625000f, 0.375000f,
+    -0.640074f, 0.496143f, 0.272335f, 0.667641f, 0.690558f, -0.278184f, 0.750000f, 0.375000f,
+    -0.583174f, 0.499219f, 0.394629f, 0.000000f, 1.000000f, 0.000000f, 0.625000f, 0.500000f,
+    -0.676430f, 0.486914f, 0.140635f, 0.976164f, 0.094801f, -0.195233f, 0.875000f, 0.250000f,
+    -0.640074f, 0.496143f, 0.272335f, 0.667641f, 0.690558f, -0.278184f, 0.750000f, 0.375000f,
+    -0.679971f, 0.496143f, 0.141371f, 0.710104f, 0.689625f, -0.142021f, 0.875000f, 0.375000f,
+    -0.693848f, 0.496143f, -0.000000f, 0.724137f, 0.689656f, 0.000000f, 1.000000f, 0.375000f,
+    -0.687531f, 0.499219f, 0.142943f, 0.000000f, 1.000000f, 0.000000f, 0.875000f, 0.500000f,
+    -0.275363f, 0.499219f, 0.647191f, 0.000000f, 1.000000f, 0.000000f, 0.250000f, 0.500000f,
+    0.000000f, 0.486914f, 0.724609f, 0.000000f, 0.723356f, 0.690476f, 0.000000f, 0.750000f,
+    -0.284409f, 0.486914f, 0.668452f, -0.265674f, 0.723090f, 0.637619f, 0.250000f, 0.750000f,
+    -0.514473f, 0.486914f, 0.514473f, -0.487196f, 0.724762f, 0.487196f, 0.500000f, 0.750000f,
+    -0.294375f, 0.450000f, 0.691875f, -0.347303f, 0.429664f, 0.833528f, 0.250000f, 1.000000f,
+    -0.142943f, 0.499219f, 0.687531f, 0.000000f, 1.000000f, 0.000000f, 0.125000f, 0.500000f,
+    0.000000f, 0.496143f, 0.712207f, 0.000000f, 0.885397f, 0.464835f, 0.000000f, 0.625000f,
+    -0.145112f, 0.496143f, 0.697963f, -0.091158f, 0.885407f, 0.455789f, 0.125000f, 0.625000f,
+    -0.279541f, 0.496143f, 0.657011f, -0.178433f, 0.885874f, 0.428239f, 0.250000f, 0.625000f,
+    -0.147639f, 0.486914f, 0.710117f, -0.135410f, 0.723373f, 0.677049f, 0.125000f, 0.750000f,
+    -0.394629f, 0.499219f, 0.583174f, 0.000000f, 1.000000f, 0.000000f, 0.375000f, 0.500000f,
+    -0.279541f, 0.496143f, 0.657011f, -0.178433f, 0.885874f, 0.428239f, 0.250000f, 0.625000f,
+    -0.400616f, 0.496143f, 0.592022f, -0.258322f, 0.885934f, 0.385216f, 0.375000f, 0.625000f,
+    -0.505667f, 0.496143f, 0.505667f, -0.327636f, 0.886176f, 0.327637f, 0.500000f, 0.625000f,
+    -0.407593f, 0.486914f, 0.602332f, -0.383998f, 0.724322f, 0.572629f, 0.375000f, 0.750000f,
+    -0.147639f, 0.486914f, 0.710117f, -0.135410f, 0.723373f, 0.677049f, 0.125000f, 0.750000f,
+    0.000000f, 0.471533f, 0.737598f, 0.000000f, 0.572589f, 0.819842f, 0.000000f, 0.875000f,
+    -0.150286f, 0.471533f, 0.722846f, -0.160782f, 0.572609f, 0.803908f, 0.125000f, 0.875000f,
+    -0.289507f, 0.471533f, 0.680434f, -0.315066f, 0.573550f, 0.756157f, 0.250000f, 0.875000f,
+    -0.152812f, 0.450000f, 0.735000f, -0.177064f, 0.429952f, 0.885319f, 0.125000f, 1.000000f,
+    -0.407593f, 0.486914f, 0.602332f, -0.383998f, 0.724322f, 0.572628f, 0.375000f, 0.750000f,
+    -0.289507f, 0.471533f, 0.680434f, -0.315065f, 0.573550f, 0.756158f, 0.250000f, 0.875000f,
+    -0.414899f, 0.471533f, 0.613128f, -0.456193f, 0.573668f, 0.680288f, 0.375000f, 0.875000f,
+    -0.523694f, 0.471533f, 0.523694f, -0.578938f, 0.574162f, 0.578938f, 0.500000f, 0.875000f,
+    -0.421875f, 0.450000f, 0.623438f, -0.502589f, 0.430918f, 0.749476f, 0.375000f, 1.000000f,
+    -0.647191f, 0.499219f, 0.275363f, 0.000000f, 1.000000f, 0.000000f, 0.750000f, 0.500000f,
+    -0.514473f, 0.486914f, 0.514473f, -0.487196f, 0.724762f, 0.487196f, 0.500000f, 0.750000f,
+    -0.668452f, 0.486914f, 0.284409f, -0.637875f, 0.722825f, 0.265781f, 0.750000f, 0.750000f,
+    -0.724609f, 0.486914f, -0.000000f, -0.690476f, 0.723356f, 0.000000f, 1.000000f, 0.750000f,
+    -0.691875f, 0.450000f, 0.294375f, -0.833647f, 0.429394f, 0.347353f, 0.750000f, 1.000000f,
+    -0.583174f, 0.499219f, 0.394629f, 0.000000f, 1.000000f, 0.000000f, 0.625000f, 0.500000f,
+    -0.505667f, 0.496143f, 0.505667f, -0.327637f, 0.886176f, 0.327636f, 0.500000f, 0.625000f,
+    -0.592022f, 0.496143f, 0.400616f, -0.385231f, 0.885924f, 0.258332f, 0.625000f, 0.625000f,
+    -0.657011f, 0.496143f, 0.279541f, -0.428239f, 0.885874f, 0.178433f, 0.750000f, 0.625000f,
+    -0.602332f, 0.486914f, 0.407593f, -0.572644f, 0.724305f, 0.384008f, 0.625000f, 0.750000f,
+    -0.687531f, 0.499219f, 0.142943f, 0.000000f, 1.000000f, 0.000000f, 0.875000f, 0.500000f,
+    -0.657011f, 0.496143f, 0.279541f, -0.428239f, 0.885874f, 0.178433f, 0.750000f, 0.625000f,
+    -0.697963f, 0.496143f, 0.145112f, -0.455839f, 0.885381f, 0.091168f, 0.875000f, 0.625000f,
+    -0.712207f, 0.496143f, -0.000000f, -0.464835f, 0.885397f, 0.000000f, 1.000000f, 0.625000f,
+    -0.710117f, 0.486914f, 0.147639f, -0.677099f, 0.723325f, 0.135420f, 0.875000f, 0.750000f,
+    -0.602332f, 0.486914f, 0.407593f, -0.572643f, 0.724305f, 0.384008f, 0.625000f, 0.750000f,
+    -0.523694f, 0.471533f, 0.523694f, -0.578938f, 0.574162f, 0.578938f, 0.500000f, 0.875000f,
+    -0.613128f, 0.471533f, 0.414899f, -0.680299f, 0.573650f, 0.456201f, 0.625000f, 0.875000f,
+    -0.680434f, 0.471533f, 0.289507f, -0.756158f, 0.573550f, 0.315065f, 0.750000f, 0.875000f,
+    -0.623438f, 0.450000f, 0.421875f, -0.749482f, 0.430901f, 0.502594f, 0.625000f, 1.000000f,
+    -0.710117f, 0.486914f, 0.147639f, -0.677099f, 0.723325f, 0.135420f, 0.875000f, 0.750000f,
+    -0.680434f, 0.471533f, 0.289507f, -0.756157f, 0.573550f, 0.315066f, 0.750000f, 0.875000f,
+    -0.722846f, 0.471533f, 0.150286f, -0.803945f, 0.572555f, 0.160789f, 0.875000f, 0.875000f,
+    -0.737598f, 0.471533f, -0.000000f, -0.819842f, 0.572589f, 0.000000f, 1.000000f, 0.875000f,
+    -0.735000f, 0.450000f, 0.152812f, -0.885342f, 0.429904f, 0.177068f, 0.875000f, 1.000000f,
+    -0.700000f, 0.450000f, -0.000000f, 0.902860f, -0.429934f, 0.000000f, 0.000000f, 0.000000f,
+    0.000000f, 0.450000f, -0.700000f, 0.000000f, -0.429934f, 0.902860f, 1.000000f, 0.000000f,
+    -0.750000f, 0.450000f, -0.000000f, -0.902860f, 0.429934f, 0.000000f, 0.000000f, 1.000000f,
+    0.000000f, 0.450000f, -0.750000f, 0.000000f, 0.429934f, -0.902860f, 1.000000f, 1.000000f,
+    -0.497000f, 0.450000f, -0.497000f, 0.639602f, -0.426402f, 0.639602f, 0.500000f, 0.000000f,
+    -0.701563f, 0.499219f, -0.000000f, 0.000000f, 1.000000f, 0.000000f, 0.000000f, 0.500000f,
+    -0.498109f, 0.499219f, -0.498109f, 0.000000f, 1.000000f, 0.000000f, 0.500000f, 0.500000f,
+    0.000000f, 0.499219f, -0.701563f, -0.000000f, 1.000000f, 0.000000f, 1.000000f, 0.500000f,
+    -0.532500f, 0.450000f, -0.532500f, -0.639602f, 0.426402f, -0.639602f, 0.500000f, 1.000000f,
+    -0.645750f, 0.450000f, -0.274750f, 0.833528f, -0.429664f, 0.347303f, 0.250000f, 0.000000f,
+    -0.690234f, 0.486914f, -0.000000f, 0.995495f, 0.094810f, 0.000000f, 0.000000f, 0.250000f,
+    -0.636741f, 0.486914f, -0.270917f, 0.918925f, 0.094737f, 0.382885f, 0.250000f, 0.250000f,
+    -0.490066f, 0.486914f, -0.490066f, 0.703896f, 0.095194f, 0.703896f, 0.500000f, 0.250000f,
+    -0.647191f, 0.499219f, -0.275363f, 0.000000f, 1.000000f, 0.000000f, 0.250000f, 0.500000f,
+    -0.686000f, 0.450000f, -0.142625f, 0.885319f, -0.429953f, 0.177064f, 0.125000f, 0.000000f,
+    -0.691895f, 0.471533f, -0.000000f, 0.969231f, -0.246154f, 0.000000f, 0.000000f, 0.125000f,
+    -0.678057f, 0.471533f, -0.140974f, 0.950406f, -0.246166f, 0.190081f, 0.125000f, 0.125000f,
+    -0.638273f, 0.471533f, -0.271569f, 0.894539f, -0.246731f, 0.372725f, 0.250000f, 0.125000f,
+    -0.676430f, 0.486914f, -0.140635f, 0.976163f, 0.094813f, 0.195233f, 0.125000f, 0.250000f,
+    -0.581875f, 0.450000f, -0.393750f, 0.749476f, -0.430917f, 0.502590f, 0.375000f, 0.000000f,
+    -0.638273f, 0.471533f, -0.271569f, 0.894539f, -0.246731f, 0.372725f, 0.250000f, 0.125000f,
+    -0.575137f, 0.471533f, -0.389191f, 0.804852f, -0.246803f, 0.539724f, 0.375000f, 0.125000f,
+    -0.491245f, 0.471533f, -0.491245f, 0.685179f, -0.247099f, 0.685180f, 0.500000f, 0.125000f,
+    -0.573757f, 0.486914f, -0.388257f, 0.826782f, 0.095071f, 0.554430f, 0.375000f, 0.250000f,
+    -0.676430f, 0.486914f, -0.140635f, 0.976163f, 0.094813f, 0.195233f, 0.125000f, 0.250000f,
+    -0.693848f, 0.496143f, -0.000000f, 0.724137f, 0.689656f, 0.000000f, 0.000000f, 0.375000f,
+    -0.679971f, 0.496143f, -0.141371f, 0.710057f, 0.689675f, 0.142011f, 0.125000f, 0.375000f,
+    -0.640074f, 0.496143f, -0.272335f, 0.667641f, 0.690558f, 0.278184f, 0.250000f, 0.375000f,
+    -0.687531f, 0.499219f, -0.142943f, 0.000000f, 1.000000f, 0.000000f, 0.125000f, 0.500000f,
+    -0.573757f, 0.486914f, -0.388257f, 0.826782f, 0.095071f, 0.554430f, 0.375000f, 0.250000f,
+    -0.640074f, 0.496143f, -0.272335f, 0.667641f, 0.690558f, 0.278184f, 0.250000f, 0.375000f,
+    -0.576761f, 0.496143f, -0.390289f, 0.600626f, 0.690668f, 0.402773f, 0.375000f, 0.375000f,
+    -0.492632f, 0.496143f, -0.492632f, 0.511047f, 0.691132f, 0.511046f, 0.500000f, 0.375000f,
+    -0.583174f, 0.499219f, -0.394629f, 0.000000f, 1.000000f, 0.000000f, 0.375000f, 0.500000f,
+    -0.274750f, 0.450000f, -0.645750f, 0.347353f, -0.429394f, 0.833647f, 0.750000f, 0.000000f,
+    -0.490066f, 0.486914f, -0.490066f, 0.703896f, 0.095194f, 0.703896f, 0.500000f, 0.250000f,
+    -0.270917f, 0.486914f, -0.636741f, 0.382888f, 0.094664f, 0.918932f, 0.750000f, 0.250000f,
+    0.000000f, 0.486914f, -0.690234f, -0.000000f, 0.094810f, 0.995495f, 1.000000f, 0.250000f,
+    -0.275363f, 0.499219f, -0.647191f, 0.000000f, 1.000000f, 0.000000f, 0.750000f, 0.500000f,
+    -0.393750f, 0.450000f, -0.581875f, 0.502594f, -0.430900f, 0.749483f, 0.625000f, 0.000000f,
+    -0.491245f, 0.471533f, -0.491245f, 0.685180f, -0.247099f, 0.685179f, 0.500000f, 0.125000f,
+    -0.389191f, 0.471533f, -0.575137f, 0.539726f, -0.246792f, 0.804854f, 0.625000f, 0.125000f,
+    -0.271569f, 0.471533f, -0.638273f, 0.372725f, -0.246731f, 0.894539f, 0.750000f, 0.125000f,
+    -0.388257f, 0.486914f, -0.573757f, 0.554431f, 0.095066f, 0.826782f, 0.625000f, 0.250000f,
+    -0.142625f, 0.450000f, -0.686000f, 0.177068f, -0.429904f, 0.885342f, 0.875000f, 0.000000f,
+    -0.271569f, 0.471533f, -0.638273f, 0.372725f, -0.246731f, 0.894539f, 0.750000f, 0.125000f,
+    -0.140974f, 0.471533f, -0.678057f, 0.190083f, -0.246134f, 0.950414f, 0.875000f, 0.125000f,
+    0.000000f, 0.471533f, -0.691895f, 0.000000f, -0.246154f, 0.969231f, 1.000000f, 0.125000f,
+    -0.140635f, 0.486914f, -0.676430f, 0.195233f, 0.094801f, 0.976164f, 0.875000f, 0.250000f,
+    -0.388257f, 0.486914f, -0.573757f, 0.554431f, 0.095066f, 0.826782f, 0.625000f, 0.250000f,
+    -0.492632f, 0.496143f, -0.492632f, 0.511046f, 0.691132f, 0.511047f, 0.500000f, 0.375000f,
+    -0.390289f, 0.496143f, -0.576761f, 0.402782f, 0.690651f, 0.600640f, 0.625000f, 0.375000f,
+    -0.272335f, 0.496143f, -0.640074f, 0.278184f, 0.690558f, 0.667641f, 0.750000f, 0.375000f,
+    -0.394629f, 0.499219f, -0.583174f, 0.000000f, 1.000000f, 0.000000f, 0.625000f, 0.500000f,
+    -0.140635f, 0.486914f, -0.676430f, 0.195233f, 0.094801f, 0.976164f, 0.875000f, 0.250000f,
+    -0.272335f, 0.496143f, -0.640074f, 0.278184f, 0.690558f, 0.667641f, 0.750000f, 0.375000f,
+    -0.141371f, 0.496143f, -0.679971f, 0.142021f, 0.689625f, 0.710104f, 0.875000f, 0.375000f,
+    0.000000f, 0.496143f, -0.693848f, -0.000000f, 0.689656f, 0.724137f, 1.000000f, 0.375000f,
+    -0.142943f, 0.499219f, -0.687531f, 0.000000f, 1.000000f, 0.000000f, 0.875000f, 0.500000f,
+    -0.647191f, 0.499219f, -0.275363f, 0.000000f, 1.000000f, 0.000000f, 0.250000f, 0.500000f,
+    -0.724609f, 0.486914f, -0.000000f, -0.690476f, 0.723356f, 0.000000f, 0.000000f, 0.750000f,
+    -0.668452f, 0.486914f, -0.284409f, -0.637619f, 0.723090f, -0.265674f, 0.250000f, 0.750000f,
+    -0.514473f, 0.486914f, -0.514473f, -0.487196f, 0.724762f, -0.487196f, 0.500000f, 0.750000f,
+    -0.691875f, 0.450000f, -0.294375f, -0.833528f, 0.429664f, -0.347303f, 0.250000f, 1.000000f,
+    -0.687531f, 0.499219f, -0.142943f, 0.000000f, 1.000000f, 0.000000f, 0.125000f, 0.500000f,
+    -0.712207f, 0.496143f, -0.000000f, -0.464835f, 0.885397f, 0.000000f, 0.000000f, 0.625000f,
+    -0.697963f, 0.496143f, -0.145112f, -0.455789f, 0.885407f, -0.091158f, 0.125000f, 0.625000f,
+    -0.657011f, 0.496143f, -0.279541f, -0.428239f, 0.885874f, -0.178433f, 0.250000f, 0.625000f,
+    -0.710117f, 0.486914f, -0.147639f, -0.677049f, 0.723373f, -0.135410f, 0.125000f, 0.750000f,
+    -0.583174f, 0.499219f, -0.394629f, 0.000000f, 1.000000f, 0.000000f, 0.375000f, 0.500000f,
+    -0.657011f, 0.496143f, -0.279541f, -0.428239f, 0.885874f, -0.178433f, 0.250000f, 0.625000f,
+    -0.592022f, 0.496143f, -0.400616f, -0.385216f, 0.885934f, -0.258322f, 0.375000f, 0.625000f,
+    -0.505667f, 0.496143f, -0.505667f, -0.327637f, 0.886176f, -0.327636f, 0.500000f, 0.625000f,
+    -0.602332f, 0.486914f, -0.407593f, -0.572629f, 0.724322f, -0.383998f, 0.375000f, 0.750000f,
+    -0.710117f, 0.486914f, -0.147639f, -0.677049f, 0.723373f, -0.135410f, 0.125000f, 0.750000f,
+    -0.737598f, 0.471533f, -0.000000f, -0.819842f, 0.572589f, 0.000000f, 0.000000f, 0.875000f,
+    -0.722846f, 0.471533f, -0.150286f, -0.803908f, 0.572609f, -0.160782f, 0.125000f, 0.875000f,
+    -0.680434f, 0.471533f, -0.289507f, -0.756157f, 0.573550f, -0.315066f, 0.250000f, 0.875000f,
+    -0.735000f, 0.450000f, -0.152812f, -0.885319f, 0.429952f, -0.177064f, 0.125000f, 1.000000f,
+    -0.602332f, 0.486914f, -0.407593f, -0.572628f, 0.724322f, -0.383998f, 0.375000f, 0.750000f,
+    -0.680434f, 0.471533f, -0.289507f, -0.756158f, 0.573550f, -0.315065f, 0.250000f, 0.875000f,
+    -0.613128f, 0.471533f, -0.414899f, -0.680288f, 0.573668f, -0.456193f, 0.375000f, 0.875000f,
+    -0.523694f, 0.471533f, -0.523694f, -0.578938f, 0.574162f, -0.578938f, 0.500000f, 0.875000f,
+    -0.623438f, 0.450000f, -0.421875f, -0.749476f, 0.430918f, -0.502589f, 0.375000f, 1.000000f,
+    -0.275363f, 0.499219f, -0.647191f, 0.000000f, 1.000000f, 0.000000f, 0.750000f, 0.500000f,
+    -0.514473f, 0.486914f, -0.514473f, -0.487196f, 0.724762f, -0.487196f, 0.500000f, 0.750000f,
+    -0.284409f, 0.486914f, -0.668452f, -0.265781f, 0.722825f, -0.637875f, 0.750000f, 0.750000f,
+    0.000000f, 0.486914f, -0.724609f, 0.000000f, 0.723356f, -0.690476f, 1.000000f, 0.750000f,
+    -0.294375f, 0.450000f, -0.691875f, -0.347353f, 0.429394f, -0.833647f, 0.750000f, 1.000000f,
+    -0.394629f, 0.499219f, -0.583174f, 0.000000f, 1.000000f, 0.000000f, 0.625000f, 0.500000f,
+    -0.505667f, 0.496143f, -0.505667f, -0.327636f, 0.886176f, -0.327637f, 0.500000f, 0.625000f,
+    -0.400616f, 0.496143f, -0.592022f, -0.258332f, 0.885924f, -0.385231f, 0.625000f, 0.625000f,
+    -0.279541f, 0.496143f, -0.657011f, -0.178433f, 0.885874f, -0.428239f, 0.750000f, 0.625000f,
+    -0.407593f, 0.486914f, -0.602332f, -0.384008f, 0.724305f, -0.572644f, 0.625000f, 0.750000f,
+    -0.142943f, 0.499219f, -0.687531f, 0.000000f, 1.000000f, 0.000000f, 0.875000f, 0.500000f,
+    -0.279541f, 0.496143f, -0.657011f, -0.178433f, 0.885874f, -0.428239f, 0.750000f, 0.625000f,
+    -0.145112f, 0.496143f, -0.697963f, -0.091168f, 0.885381f, -0.455839f, 0.875000f, 0.625000f,
+    0.000000f, 0.496143f, -0.712207f, 0.000000f, 0.885397f, -0.464835f, 1.000000f, 0.625000f,
+    -0.147639f, 0.486914f, -0.710117f, -0.135420f, 0.723325f, -0.677099f, 0.875000f, 0.750000f,
+    -0.407593f, 0.486914f, -0.602332f, -0.384008f, 0.724305f, -0.572643f, 0.625000f, 0.750000f,
+    -0.523694f, 0.471533f, -0.523694f, -0.578938f, 0.574162f, -0.578938f, 0.500000f, 0.875000f,
+    -0.414899f, 0.471533f, -0.613128f, -0.456201f, 0.573650f, -0.680299f, 0.625000f, 0.875000f,
+    -0.289507f, 0.471533f, -0.680434f, -0.315065f, 0.573550f, -0.756158f, 0.750000f, 0.875000f,
+    -0.421875f, 0.450000f, -0.623438f, -0.502594f, 0.430901f, -0.749482f, 0.625000f, 1.000000f,
+    -0.147639f, 0.486914f, -0.710117f, -0.135420f, 0.723325f, -0.677099f, 0.875000f, 0.750000f,
+    -0.289507f, 0.471533f, -0.680434f, -0.315066f, 0.573550f, -0.756157f, 0.750000f, 0.875000f,
+    -0.150286f, 0.471533f, -0.722846f, -0.160789f, 0.572555f, -0.803945f, 0.875000f, 0.875000f,
+    0.000000f, 0.471533f, -0.737598f, 0.000000f, 0.572589f, -0.819842f, 1.000000f, 0.875000f,
+    -0.152812f, 0.450000f, -0.735000f, -0.177068f, 0.429904f, -0.885342f, 0.875000f, 1.000000f,
+    0.000000f, 0.450000f, -0.700000f, 0.000000f, -0.429934f, 0.902860f, 0.000000f, 0.000000f,
+    0.700000f, 0.450000f, -0.000000f, -0.902860f, -0.429934f, 0.000000f, 1.000000f, 0.000000f,
+    0.000000f, 0.450000f, -0.750000f, 0.000000f, 0.429934f, -0.902860f, 0.000000f, 1.000000f,
+    0.750000f, 0.450000f, -0.000000f, 0.902860f, 0.429934f, -0.000000f, 1.000000f, 1.000000f,
+    0.497000f, 0.450000f, -0.497000f, -0.639602f, -0.426402f, 0.639602f, 0.500000f, 0.000000f,
+    0.000000f, 0.499219f, -0.701563f, -0.000000f, 1.000000f, 0.000000f, 0.000000f, 0.500000f,
+    0.498109f, 0.499219f, -0.498109f, -0.000000f, 1.000000f, 0.000000f, 0.500000f, 0.500000f,
+    0.701563f, 0.499219f, -0.000000f, 0.000000f, 1.000000f, 0.000000f, 1.000000f, 0.500000f,
+    0.532500f, 0.450000f, -0.532500f, 0.639602f, 0.426402f, -0.639602f, 0.500000f, 1.000000f,
+    0.274750f, 0.450000f, -0.645750f, -0.347303f, -0.429664f, 0.833528f, 0.250000f, 0.000000f,
+    0.000000f, 0.486914f, -0.690234f, -0.000000f, 0.094810f, 0.995495f, 0.000000f, 0.250000f,
+    0.270917f, 0.486914f, -0.636741f, -0.382885f, 0.094737f, 0.918925f, 0.250000f, 0.250000f,
+    0.490066f, 0.486914f, -0.490066f, -0.703896f, 0.095194f, 0.703896f, 0.500000f, 0.250000f,
+    0.275363f, 0.499219f, -0.647191f, -0.000000f, 1.000000f, 0.000000f, 0.250000f, 0.500000f,
+    0.142625f, 0.450000f, -0.686000f, -0.177064f, -0.429953f, 0.885319f, 0.125000f, 0.000000f,
+    0.000000f, 0.471533f, -0.691895f, 0.000000f, -0.246154f, 0.969231f, 0.000000f, 0.125000f,
+    0.140974f, 0.471533f, -0.678057f, -0.190081f, -0.246166f, 0.950406f, 0.125000f, 0.125000f,
+    0.271569f, 0.471533f, -0.638273f, -0.372725f, -0.246731f, 0.894539f, 0.250000f, 0.125000f,
+    0.140635f, 0.486914f, -0.676430f, -0.195233f, 0.094813f, 0.976163f, 0.125000f, 0.250000f,
+    0.393750f, 0.450000f, -0.581875f, -0.502590f, -0.430917f, 0.749476f, 0.375000f, 0.000000f,
+    0.271569f, 0.471533f, -0.638273f, -0.372725f, -0.246731f, 0.894539f, 0.250000f, 0.125000f,
+    0.389191f, 0.471533f, -0.575137f, -0.539724f, -0.246803f, 0.804852f, 0.375000f, 0.125000f,
+    0.491245f, 0.471533f, -0.491245f, -0.685180f, -0.247099f, 0.685179f, 0.500000f, 0.125000f,
+    0.388257f, 0.486914f, -0.573757f, -0.554430f, 0.095071f, 0.826782f, 0.375000f, 0.250000f,
+    0.140635f, 0.486914f, -0.676430f, -0.195233f, 0.094813f, 0.976163f, 0.125000f, 0.250000f,
+    0.000000f, 0.496143f, -0.693848f, -0.000000f, 0.689656f, 0.724137f, 0.000000f, 0.375000f,
+    0.141371f, 0.496143f, -0.679971f, -0.142011f, 0.689675f, 0.710057f, 0.125000f, 0.375000f,
+    0.272335f, 0.496143f, -0.640074f, -0.278184f, 0.690558f, 0.667641f, 0.250000f, 0.375000f,
+    0.142943f, 0.499219f, -0.687531f, -0.000000f, 1.000000f, 0.000000f, 0.125000f, 0.500000f,
+    0.388257f, 0.486914f, -0.573757f, -0.554430f, 0.095071f, 0.826782f, 0.375000f, 0.250000f,
+    0.272335f, 0.496143f, -0.640074f, -0.278184f, 0.690558f, 0.667641f, 0.250000f, 0.375000f,
+    0.390289f, 0.496143f, -0.576761f, -0.402773f, 0.690668f, 0.600626f, 0.375000f, 0.375000f,
+    0.492632f, 0.496143f, -0.492632f, -0.511046f, 0.691132f, 0.511047f, 0.500000f, 0.375000f,
+    0.394629f, 0.499219f, -0.583174f, -0.000000f, 1.000000f, 0.000000f, 0.375000f, 0.500000f,
+    0.645750f, 0.450000f, -0.274750f, -0.833647f, -0.429394f, 0.347353f, 0.750000f, 0.000000f,
+    0.490066f, 0.486914f, -0.490066f, -0.703896f, 0.095194f, 0.703896f, 0.500000f, 0.250000f,
+    0.636741f, 0.486914f, -0.270917f, -0.918932f, 0.094664f, 0.382888f, 0.750000f, 0.250000f,
+    0.690234f, 0.486914f, -0.000000f, -0.995495f, 0.094810f, 0.000000f, 1.000000f, 0.250000f,
+    0.647191f, 0.499219f, -0.275363f, -0.000000f, 1.000000f, 0.000000f, 0.750000f, 0.500000f,
+    0.581875f, 0.450000f, -0.393750f, -0.749483f, -0.430900f, 0.502594f, 0.625000f, 0.000000f,
+    0.491245f, 0.471533f, -0.491245f, -0.685179f, -0.247099f, 0.685180f, 0.500000f, 0.125000f,
+    0.575137f, 0.471533f, -0.389191f, -0.804854f, -0.246792f, 0.539726f, 0.625000f, 0.125000f,
+    0.638273f, 0.471533f, -0.271569f, -0.894539f, -0.246731f, 0.372725f, 0.750000f, 0.125000f,
+    0.573757f, 0.486914f, -0.388257f, -0.826782f, 0.095066f, 0.554431f, 0.625000f, 0.250000f,
+    0.686000f, 0.450000f, -0.142625f, -0.885342f, -0.429904f, 0.177068f, 0.875000f, 0.000000f,
+    0.638273f, 0.471533f, -0.271569f, -0.894539f, -0.246731f, 0.372725f, 0.750000f, 0.125000f,
+    0.678057f, 0.471533f, -0.140974f, -0.950414f, -0.246134f, 0.190083f, 0.875000f, 0.125000f,
+    0.691895f, 0.471533f, -0.000000f, -0.969231f, -0.246154f, 0.000000f, 1.000000f, 0.125000f,
+    0.676430f, 0.486914f, -0.140635f, -0.976164f, 0.094801f, 0.195233f, 0.875000f, 0.250000f,
+    0.573757f, 0.486914f, -0.388257f, -0.826782f, 0.095066f, 0.554431f, 0.625000f, 0.250000f,
+    0.492632f, 0.496143f, -0.492632f, -0.511047f, 0.691132f, 0.511046f, 0.500000f, 0.375000f,
+    0.576761f, 0.496143f, -0.390289f, -0.600640f, 0.690651f, 0.402782f, 0.625000f, 0.375000f,
+    0.640074f, 0.496143f, -0.272335f, -0.667641f, 0.690558f, 0.278184f, 0.750000f, 0.375000f,
+    0.583174f, 0.499219f, -0.394629f, -0.000000f, 1.000000f, 0.000000f, 0.625000f, 0.500000f,
+    0.676430f, 0.486914f, -0.140635f, -0.976164f, 0.094801f, 0.195233f, 0.875000f, 0.250000f,
+    0.640074f, 0.496143f, -0.272335f, -0.667641f, 0.690558f, 0.278184f, 0.750000f, 0.375000f,
+    0.679971f, 0.496143f, -0.141371f, -0.710104f, 0.689625f, 0.142021f, 0.875000f, 0.375000f,
+    0.693848f, 0.496143f, -0.000000f, -0.724137f, 0.689656f, 0.000000f, 1.000000f, 0.375000f,
+    0.687531f, 0.499219f, -0.142943f, -0.000000f, 1.000000f, 0.000000f, 0.875000f, 0.500000f,
+    0.275363f, 0.499219f, -0.647191f, -0.000000f, 1.000000f, 0.000000f, 0.250000f, 0.500000f,
+    0.000000f, 0.486914f, -0.724609f, 0.000000f, 0.723356f, -0.690476f, 0.000000f, 0.750000f,
+    0.284409f, 0.486914f, -0.668452f, 0.265674f, 0.723090f, -0.637619f, 0.250000f, 0.750000f,
+    0.514473f, 0.486914f, -0.514473f, 0.487196f, 0.724762f, -0.487196f, 0.500000f, 0.750000f,
+    0.294375f, 0.450000f, -0.691875f, 0.347303f, 0.429664f, -0.833528f, 0.250000f, 1.000000f,
+    0.142943f, 0.499219f, -0.687531f, -0.000000f, 1.000000f, 0.000000f, 0.125000f, 0.500000f,
+    0.000000f, 0.496143f, -0.712207f, 0.000000f, 0.885397f, -0.464835f, 0.000000f, 0.625000f,
+    0.145112f, 0.496143f, -0.697963f, 0.091158f, 0.885407f, -0.455789f, 0.125000f, 0.625000f,
+    0.279541f, 0.496143f, -0.657011f, 0.178433f, 0.885874f, -0.428239f, 0.250000f, 0.625000f,
+    0.147639f, 0.486914f, -0.710117f, 0.135410f, 0.723373f, -0.677049f, 0.125000f, 0.750000f,
+    0.394629f, 0.499219f, -0.583174f, -0.000000f, 1.000000f, 0.000000f, 0.375000f, 0.500000f,
+    0.279541f, 0.496143f, -0.657011f, 0.178433f, 0.885874f, -0.428239f, 0.250000f, 0.625000f,
+    0.400616f, 0.496143f, -0.592022f, 0.258322f, 0.885934f, -0.385216f, 0.375000f, 0.625000f,
+    0.505667f, 0.496143f, -0.505667f, 0.327636f, 0.886176f, -0.327637f, 0.500000f, 0.625000f,
+    0.407593f, 0.486914f, -0.602332f, 0.383998f, 0.724322f, -0.572629f, 0.375000f, 0.750000f,
+    0.147639f, 0.486914f, -0.710117f, 0.135410f, 0.723373f, -0.677049f, 0.125000f, 0.750000f,
+    0.000000f, 0.471533f, -0.737598f, 0.000000f, 0.572589f, -0.819842f, 0.000000f, 0.875000f,
+    0.150286f, 0.471533f, -0.722846f, 0.160782f, 0.572609f, -0.803908f, 0.125000f, 0.875000f,
+    0.289507f, 0.471533f, -0.680434f, 0.315066f, 0.573550f, -0.756157f, 0.250000f, 0.875000f,
+    0.152812f, 0.450000f, -0.735000f, 0.177064f, 0.429952f, -0.885319f, 0.125000f, 1.000000f,
+    0.407593f, 0.486914f, -0.602332f, 0.383998f, 0.724322f, -0.572628f, 0.375000f, 0.750000f,
+    0.289507f, 0.471533f, -0.680434f, 0.315065f, 0.573550f, -0.756158f, 0.250000f, 0.875000f,
+    0.414899f, 0.471533f, -0.613128f, 0.456193f, 0.573668f, -0.680288f, 0.375000f, 0.875000f,
+    0.523694f, 0.471533f, -0.523694f, 0.578938f, 0.574162f, -0.578938f, 0.500000f, 0.875000f,
+    0.421875f, 0.450000f, -0.623438f, 0.502589f, 0.430918f, -0.749476f, 0.375000f, 1.000000f,
+    0.647191f, 0.499219f, -0.275363f, -0.000000f, 1.000000f, 0.000000f, 0.750000f, 0.500000f,
+    0.514473f, 0.486914f, -0.514473f, 0.487196f, 0.724762f, -0.487196f, 0.500000f, 0.750000f,
+    0.668452f, 0.486914f, -0.284409f, 0.637875f, 0.722825f, -0.265781f, 0.750000f, 0.750000f,
+    0.724609f, 0.486914f, -0.000000f, 0.690476f, 0.723356f, -0.000000f, 1.000000f, 0.750000f,
+    0.691875f, 0.450000f, -0.294375f, 0.833647f, 0.429394f, -0.347353f, 0.750000f, 1.000000f,
+    0.583174f, 0.499219f, -0.394629f, -0.000000f, 1.000000f, 0.000000f, 0.625000f, 0.500000f,
+    0.505667f, 0.496143f, -0.505667f, 0.327637f, 0.886176f, -0.327636f, 0.500000f, 0.625000f,
+    0.592022f, 0.496143f, -0.400616f, 0.385231f, 0.885924f, -0.258332f, 0.625000f, 0.625000f,
+    0.657011f, 0.496143f, -0.279541f, 0.428239f, 0.885874f, -0.178433f, 0.750000f, 0.625000f,
+    0.602332f, 0.486914f, -0.407593f, 0.572644f, 0.724305f, -0.384008f, 0.625000f, 0.750000f,
+    0.687531f, 0.499219f, -0.142943f, -0.000000f, 1.000000f, 0.000000f, 0.875000f, 0.500000f,
+    0.657011f, 0.496143f, -0.279541f, 0.428239f, 0.885874f, -0.178433f, 0.750000f, 0.625000f,
+    0.697963f, 0.496143f, -0.145112f, 0.455839f, 0.885381f, -0.091168f, 0.875000f, 0.625000f,
+    0.712207f, 0.496143f, -0.000000f, 0.464835f, 0.885397f, -0.000000f, 1.000000f, 0.625000f,
+    0.710117f, 0.486914f, -0.147639f, 0.677099f, 0.723325f, -0.135420f, 0.875000f, 0.750000f,
+    0.602332f, 0.486914f, -0.407593f, 0.572643f, 0.724305f, -0.384008f, 0.625000f, 0.750000f,
+    0.523694f, 0.471533f, -0.523694f, 0.578938f, 0.574162f, -0.578938f, 0.500000f, 0.875000f,
+    0.613128f, 0.471533f, -0.414899f, 0.680299f, 0.573650f, -0.456201f, 0.625000f, 0.875000f,
+    0.680434f, 0.471533f, -0.289507f, 0.756158f, 0.573550f, -0.315065f, 0.750000f, 0.875000f,
+    0.623438f, 0.450000f, -0.421875f, 0.749482f, 0.430901f, -0.502594f, 0.625000f, 1.000000f,
+    0.710117f, 0.486914f, -0.147639f, 0.677099f, 0.723325f, -0.135420f, 0.875000f, 0.750000f,
+    0.680434f, 0.471533f, -0.289507f, 0.756157f, 0.573550f, -0.315066f, 0.750000f, 0.875000f,
+    0.722846f, 0.471533f, -0.150286f, 0.803945f, 0.572555f, -0.160789f, 0.875000f, 0.875000f,
+    0.737598f, 0.471533f, -0.000000f, 0.819842f, 0.572589f, -0.000000f, 1.000000f, 0.875000f,
+    0.735000f, 0.450000f, -0.152812f, 0.885342f, 0.429904f, -0.177068f, 0.875000f, 1.000000f,
+    0.750000f, 0.450000f, -0.000000f, 0.902861f, 0.429934f, -0.000000f, 0.000000f, 0.000000f,
+    0.000000f, 0.450000f, 0.750000f, 0.000000f, 0.429934f, 0.902861f, 1.000000f, 0.000000f,
+    1.000000f, -0.300000f, -0.000000f, 1.000000f, 0.000000f, -0.000000f, 0.000000f, 1.000000f,
+    0.000000f, -0.300000f, 1.000000f, 0.000000f, 0.000000f, 1.000000f, 1.000000f, 1.000000f,
+    0.532500f, 0.450000f, 0.532500f, 0.639602f, 0.426401f, 0.639602f, 0.500000f, 0.000000f,
+    0.921875f, 0.060938f, -0.000000f, 0.937749f, 0.347314f, -0.000000f, 0.000000f, 0.500000f,
+    0.654531f, 0.060938f, 0.654531f, 0.663890f, 0.344239f, 0.663890f, 0.500000f, 0.500000f,
+    0.000000f, 0.060938f, 0.921875f, 0.000000f, 0.347314f, 0.937749f, 1.000000f, 0.500000f,
+    0.710000f, -0.300000f, 0.710000f, 0.707107f, 0.000000f, 0.707107f, 0.500000f, 1.000000f,
+    0.691875f, 0.450000f, 0.294375f, 0.833528f, 0.429664f, 0.347303f, 0.250000f, 0.000000f,
+    0.841797f, 0.253711f, -0.000000f, 0.911768f, 0.410706f, -0.000000f, 0.000000f, 0.250000f,
+    0.776558f, 0.253711f, 0.330405f, 0.841741f, 0.410444f, 0.350725f, 0.250000f, 0.250000f,
+    0.597676f, 0.253711f, 0.597676f, 0.644272f, 0.412102f, 0.644272f, 0.500000f, 0.250000f,
+    0.850430f, 0.060938f, 0.361836f, 0.865695f, 0.347079f, 0.360706f, 0.250000f, 0.500000f,
+    0.735000f, 0.450000f, 0.152812f, 0.885319f, 0.429952f, 0.177064f, 0.125000f, 0.000000f,
+    0.796631f, 0.351636f, -0.000000f, 0.905094f, 0.425212f, -0.000000f, 0.000000f, 0.125000f,
+    0.780698f, 0.351636f, 0.162314f, 0.887509f, 0.425230f, 0.177502f, 0.125000f, 0.125000f,
+    0.734892f, 0.351636f, 0.312678f, 0.835093f, 0.426082f, 0.347956f, 0.250000f, 0.125000f,
+    0.824961f, 0.253711f, 0.171516f, 0.894054f, 0.410724f, 0.178811f, 0.125000f, 0.250000f,
+    0.623438f, 0.450000f, 0.421875f, 0.749476f, 0.430917f, 0.502590f, 0.375000f, 0.000000f,
+    0.734892f, 0.351636f, 0.312678f, 0.835093f, 0.426082f, 0.347956f, 0.250000f, 0.125000f,
+    0.662199f, 0.351636f, 0.448105f, 0.751338f, 0.426189f, 0.503839f, 0.375000f, 0.125000f,
+    0.565608f, 0.351636f, 0.565608f, 0.639524f, 0.426636f, 0.639524f, 0.500000f, 0.125000f,
+    0.699744f, 0.253711f, 0.473511f, 0.756904f, 0.411664f, 0.507571f, 0.375000f, 0.250000f,
+    0.824961f, 0.253711f, 0.171516f, 0.894054f, 0.410724f, 0.178811f, 0.125000f, 0.250000f,
+    0.884033f, 0.156665f, -0.000000f, 0.922766f, 0.385361f, -0.000000f, 0.000000f, 0.375000f,
+    0.866353f, 0.156665f, 0.180122f, 0.904839f, 0.385379f, 0.180968f, 0.125000f, 0.375000f,
+    0.815521f, 0.156665f, 0.346983f, 0.851467f, 0.386182f, 0.354778f, 0.250000f, 0.375000f,
+    0.903437f, 0.060938f, 0.187832f, 0.919533f, 0.347330f, 0.183906f, 0.125000f, 0.500000f,
+    0.699744f, 0.253711f, 0.473511f, 0.756904f, 0.411665f, 0.507571f, 0.375000f, 0.250000f,
+    0.815521f, 0.156665f, 0.346983f, 0.851467f, 0.386182f, 0.354778f, 0.250000f, 0.375000f,
+    0.734853f, 0.156665f, 0.497269f, 0.766078f, 0.386283f, 0.513723f, 0.375000f, 0.375000f,
+    0.627664f, 0.156665f, 0.627664f, 0.652097f, 0.386703f, 0.652097f, 0.500000f, 0.375000f,
+    0.766309f, 0.060938f, 0.518555f, 0.778577f, 0.348172f, 0.522105f, 0.375000f, 0.500000f,
+    0.294375f, 0.450000f, 0.691875f, 0.347353f, 0.429394f, 0.833647f, 0.750000f, 0.000000f,
+    0.597676f, 0.253711f, 0.597676f, 0.644272f, 0.412102f, 0.644272f, 0.500000f, 0.250000f,
+    0.330405f, 0.253711f, 0.776558f, 0.350771f, 0.410181f, 0.841850f, 0.750000f, 0.250000f,
+    0.000000f, 0.253711f, 0.841797f, 0.000000f, 0.410706f, 0.911768f, 1.000000f, 0.250000f,
+    0.361836f, 0.060938f, 0.850430f, 0.360739f, 0.346844f, 0.865775f, 0.750000f, 0.500000f,
+    0.421875f, 0.450000f, 0.623438f, 0.502594f, 0.430900f, 0.749483f, 0.625000f, 0.000000f,
+    0.565608f, 0.351636f, 0.565608f, 0.639524f, 0.426636f, 0.639524f, 0.500000f, 0.125000f,
+    0.448105f, 0.351636f, 0.662199f, 0.503843f, 0.426172f, 0.751345f, 0.625000f, 0.125000f,
+    0.312678f, 0.351636f, 0.734892f, 0.347956f, 0.426082f, 0.835093f, 0.750000f, 0.125000f,
+    0.473511f, 0.253711f, 0.699744f, 0.507575f, 0.411648f, 0.756911f, 0.625000f, 0.250000f,
+    0.152812f, 0.450000f, 0.735000f, 0.177068f, 0.429903f, 0.885342f, 0.875000f, 0.000000f,
+    0.312678f, 0.351636f, 0.734892f, 0.347956f, 0.426082f, 0.835093f, 0.750000f, 0.125000f,
+    0.162314f, 0.351636f, 0.780698f, 0.177506f, 0.425181f, 0.887532f, 0.875000f, 0.125000f,
+    0.000000f, 0.351636f, 0.796631f, 0.000000f, 0.425212f, 0.905094f, 1.000000f, 0.125000f,
+    0.171516f, 0.253711f, 0.824961f, 0.178815f, 0.410676f, 0.894075f, 0.875000f, 0.250000f,
+    0.473511f, 0.253711f, 0.699744f, 0.507575f, 0.411648f, 0.756910f, 0.625000f, 0.250000f,
+    0.627664f, 0.156665f, 0.627664f, 0.652097f, 0.386703f, 0.652097f, 0.500000f, 0.375000f,
+    0.497269f, 0.156665f, 0.734853f, 0.513726f, 0.386267f, 0.766083f, 0.625000f, 0.375000f,
+    0.346983f, 0.156665f, 0.815521f, 0.354778f, 0.386182f, 0.851467f, 0.750000f, 0.375000f,
+    0.518555f, 0.060938f, 0.766309f, 0.522108f, 0.348157f, 0.778582f, 0.625000f, 0.500000f,
+    0.171516f, 0.253711f, 0.824961f, 0.178815f, 0.410676f, 0.894075f, 0.875000f, 0.250000f,
+    0.346983f, 0.156665f, 0.815521f, 0.354778f, 0.386182f, 0.851467f, 0.750000f, 0.375000f,
+    0.180122f, 0.156665f, 0.866353f, 0.180972f, 0.385333f, 0.904858f, 0.875000f, 0.375000f,
+    0.000000f, 0.156665f, 0.884033f, 0.000000f, 0.385361f, 0.922766f, 1.000000f, 0.375000f,
+    0.187832f, 0.060938f, 0.903437f, 0.183909f, 0.347288f, 0.919548f, 0.875000f, 0.500000f,
+    0.850430f, 0.060938f, 0.361836f, 0.865695f, 0.347079f, 0.360706f, 0.250000f, 0.500000f,
+    0.978516f, -0.124805f, -0.000000f, 0.975288f, 0.220939f, -0.000000f, 0.000000f, 0.750000f,
+    0.902681f, -0.124805f, 0.384067f, 0.900299f, 0.220777f, 0.375125f, 0.250000f, 0.750000f,
+    0.694746f, -0.124805f, 0.694746f, 0.689494f, 0.221799f, 0.689495f, 0.500000f, 0.750000f,
+    0.922500f, -0.300000f, 0.392500f, 0.923077f, 0.000000f, 0.384615f, 0.250000f, 1.000000f,
+    0.903437f, 0.060938f, 0.187832f, 0.919533f, 0.347330f, 0.183906f, 0.125000f, 0.500000f,
+    0.953857f, -0.033032f, -0.000000f, 0.955877f, 0.293768f, -0.000000f, 0.000000f, 0.625000f,
+    0.934780f, -0.033032f, 0.194348f, 0.937310f, 0.293782f, 0.187462f, 0.125000f, 0.625000f,
+    0.879933f, -0.033032f, 0.374389f, 0.882157f, 0.294439f, 0.367565f, 0.250000f, 0.625000f,
+    0.958945f, -0.124805f, 0.199373f, 0.956346f, 0.220950f, 0.191269f, 0.125000f, 0.750000f,
+    0.766309f, 0.060938f, 0.518555f, 0.778578f, 0.348172f, 0.522105f, 0.375000f, 0.500000f,
+    0.879933f, -0.033032f, 0.374389f, 0.882157f, 0.294439f, 0.367565f, 0.250000f, 0.625000f,
+    0.792894f, -0.033032f, 0.536545f, 0.793705f, 0.294522f, 0.532249f, 0.375000f, 0.625000f,
+    0.677239f, -0.033032f, 0.677239f, 0.675668f, 0.294866f, 0.675668f, 0.500000f, 0.625000f,
+    0.813391f, -0.124805f, 0.550415f, 0.809908f, 0.221529f, 0.543115f, 0.375000f, 0.750000f,
+    0.958945f, -0.124805f, 0.199373f, 0.956346f, 0.220950f, 0.191269f, 0.125000f, 0.750000f,
+    0.994385f, -0.213940f, -0.000000f, 0.992240f, 0.124341f, -0.000000f, 0.000000f, 0.875000f,
+    0.974497f, -0.213940f, 0.202606f, 0.972970f, 0.124347f, 0.194594f, 0.125000f, 0.875000f,
+    0.917320f, -0.213940f, 0.390296f, 0.915878f, 0.124647f, 0.381616f, 0.250000f, 0.875000f,
+    0.980000f, -0.300000f, 0.203750f, 0.980581f, 0.000000f, 0.196116f, 0.125000f, 1.000000f,
+    0.813391f, -0.124805f, 0.550415f, 0.809908f, 0.221529f, 0.543115f, 0.375000f, 0.750000f,
+    0.917320f, -0.213940f, 0.390296f, 0.915878f, 0.124647f, 0.381616f, 0.250000f, 0.875000f,
+    0.826582f, -0.213940f, 0.559341f, 0.824063f, 0.124685f, 0.552607f, 0.375000f, 0.875000f,
+    0.706013f, -0.213940f, 0.706013f, 0.701575f, 0.124842f, 0.701575f, 0.500000f, 0.875000f,
+    0.831250f, -0.300000f, 0.562500f, 0.830544f, 0.000000f, 0.556953f, 0.375000f, 1.000000f,
+    0.361836f, 0.060938f, 0.850430f, 0.360740f, 0.346844f, 0.865775f, 0.750000f, 0.500000f,
+    0.694746f, -0.124805f, 0.694746f, 0.689495f, 0.221799f, 0.689494f, 0.500000f, 0.750000f,
+    0.384067f, -0.124805f, 0.902681f, 0.375139f, 0.220616f, 0.900333f, 0.750000f, 0.750000f,
+    0.000000f, -0.124805f, 0.978516f, 0.000000f, 0.220939f, 0.975288f, 1.000000f, 0.750000f,
+    0.392500f, -0.300000f, 0.922500f, 0.384615f, 0.000000f, 0.923077f, 0.750000f, 1.000000f,
+    0.518555f, 0.060938f, 0.766309f, 0.522108f, 0.348157f, 0.778582f, 0.625000f, 0.500000f,
+    0.677239f, -0.033032f, 0.677239f, 0.675668f, 0.294866f, 0.675668f, 0.500000f, 0.625000f,
+    0.536545f, -0.033032f, 0.792894f, 0.532252f, 0.294509f, 0.793708f, 0.625000f, 0.625000f,
+    0.374389f, -0.033032f, 0.879933f, 0.367565f, 0.294439f, 0.882157f, 0.750000f, 0.625000f,
+    0.550415f, -0.124805f, 0.813391f, 0.543116f, 0.221518f, 0.809910f, 0.625000f, 0.750000f,
+    0.187832f, 0.060938f, 0.903437f, 0.183910f, 0.347287f, 0.919548f, 0.875000f, 0.500000f,
+    0.374389f, -0.033032f, 0.879933f, 0.367565f, 0.294439f, 0.882157f, 0.750000f, 0.625000f,
+    0.194348f, -0.033032f, 0.934780f, 0.187464f, 0.293744f, 0.937321f, 0.875000f, 0.625000f,
+    0.000000f, -0.033032f, 0.953857f, 0.000000f, 0.293768f, 0.955877f, 1.000000f, 0.625000f,
+    0.199373f, -0.124805f, 0.958945f, 0.191271f, 0.220920f, 0.956352f, 0.875000f, 0.750000f,
+    0.550415f, -0.124805f, 0.813391f, 0.543116f, 0.221518f, 0.809910f, 0.625000f, 0.750000f,
+    0.706013f, -0.213940f, 0.706013f, 0.701575f, 0.124842f, 0.701575f, 0.500000f, 0.875000f,
+    0.559341f, -0.213940f, 0.826582f, 0.552607f, 0.124679f, 0.824063f, 0.625000f, 0.875000f,
+    0.390296f, -0.213940f, 0.917320f, 0.381616f, 0.124647f, 0.915878f, 0.750000f, 0.875000f,
+    0.562500f, -0.300000f, 0.831250f, 0.556953f, 0.000000f, 0.830544f, 0.625000f, 1.000000f,
+    0.199373f, -0.124805f, 0.958945f, 0.191271f, 0.220920f, 0.956352f, 0.875000f, 0.750000f,
+    0.390296f, -0.213940f, 0.917320f, 0.381616f, 0.124647f, 0.915878f, 0.750000f, 0.875000f,
+    0.202606f, -0.213940f, 0.974497f, 0.194595f, 0.124330f, 0.972972f, 0.875000f, 0.875000f,
+    0.000000f, -0.213940f, 0.994385f, 0.000000f, 0.124341f, 0.992240f, 1.000000f, 0.875000f,
+    0.203750f, -0.300000f, 0.980000f, 0.196116f, 0.000000f, 0.980581f, 0.875000f, 1.000000f,
+    0.000000f, 0.450000f, 0.750000f, 0.000000f, 0.429934f, 0.902861f, 0.000000f, 0.000000f,
+    -0.750000f, 0.450000f, -0.000000f, -0.902861f, 0.429934f, 0.000000f, 1.000000f, 0.000000f,
+    0.000000f, -0.300000f, 1.000000f, 0.000000f, 0.000000f, 1.000000f, 0.000000f, 1.000000f,
+    -1.000000f, -0.300000f, -0.000000f, -1.000000f, -0.000000f, -0.000000f, 1.000000f, 1.000000f,
+    -0.532500f, 0.450000f, 0.532500f, -0.639602f, 0.426401f, 0.639602f, 0.500000f, 0.000000f,
+    0.000000f, 0.060938f, 0.921875f, 0.000000f, 0.347314f, 0.937749f, 0.000000f, 0.500000f,
+    -0.654531f, 0.060938f, 0.654531f, -0.663890f, 0.344239f, 0.663890f, 0.500000f, 0.500000f,
+    -0.921875f, 0.060938f, -0.000000f, -0.937749f, 0.347314f, 0.000000f, 1.000000f, 0.500000f,
+    -0.710000f, -0.300000f, 0.710000f, -0.707107f, 0.000000f, 0.707107f, 0.500000f, 1.000000f,
+    -0.294375f, 0.450000f, 0.691875f, -0.347303f, 0.429664f, 0.833528f, 0.250000f, 0.000000f,
+    0.000000f, 0.253711f, 0.841797f, 0.000000f, 0.410706f, 0.911768f, 0.000000f, 0.250000f,
+    -0.330405f, 0.253711f, 0.776558f, -0.350725f, 0.410444f, 0.841741f, 0.250000f, 0.250000f,
+    -0.597676f, 0.253711f, 0.597676f, -0.644272f, 0.412102f, 0.644272f, 0.500000f, 0.250000f,
+    -0.361836f, 0.060938f, 0.850430f, -0.360706f, 0.347079f, 0.865695f, 0.250000f, 0.500000f,
+    -0.152812f, 0.450000f, 0.735000f, -0.177064f, 0.429952f, 0.885319f, 0.125000f, 0.000000f,
+    0.000000f, 0.351636f, 0.796631f, 0.000000f, 0.425212f, 0.905094f, 0.000000f, 0.125000f,
+    -0.162314f, 0.351636f, 0.780698f, -0.177502f, 0.425230f, 0.887509f, 0.125000f, 0.125000f,
+    -0.312678f, 0.351636f, 0.734892f, -0.347956f, 0.426082f, 0.835093f, 0.250000f, 0.125000f,
+    -0.171516f, 0.253711f, 0.824961f, -0.178811f, 0.410724f, 0.894054f, 0.125000f, 0.250000f,
+    -0.421875f, 0.450000f, 0.623438f, -0.502590f, 0.430917f, 0.749476f, 0.375000f, 0.000000f,
+    -0.312678f, 0.351636f, 0.734892f, -0.347956f, 0.426082f, 0.835093f, 0.250000f, 0.125000f,
+    -0.448105f, 0.351636f, 0.662199f, -0.503839f, 0.426189f, 0.751338f, 0.375000f, 0.125000f,
+    -0.565608f, 0.351636f, 0.565608f, -0.639524f, 0.426636f, 0.639524f, 0.500000f, 0.125000f,
+    -0.473511f, 0.253711f, 0.699744f, -0.507571f, 0.411664f, 0.756904f, 0.375000f, 0.250000f,
+    -0.171516f, 0.253711f, 0.824961f, -0.178811f, 0.410724f, 0.894054f, 0.125000f, 0.250000f,
+    0.000000f, 0.156665f, 0.884033f, 0.000000f, 0.385361f, 0.922766f, 0.000000f, 0.375000f,
+    -0.180122f, 0.156665f, 0.866353f, -0.180968f, 0.385379f, 0.904839f, 0.125000f, 0.375000f,
+    -0.346983f, 0.156665f, 0.815521f, -0.354778f, 0.386182f, 0.851467f, 0.250000f, 0.375000f,
+    -0.187832f, 0.060938f, 0.903437f, -0.183906f, 0.347330f, 0.919533f, 0.125000f, 0.500000f,
+    -0.473511f, 0.253711f, 0.699744f, -0.507571f, 0.411665f, 0.756904f, 0.375000f, 0.250000f,
+    -0.346983f, 0.156665f, 0.815521f, -0.354778f, 0.386182f, 0.851467f, 0.250000f, 0.375000f,
+    -0.497269f, 0.156665f, 0.734853f, -0.513723f, 0.386283f, 0.766078f, 0.375000f, 0.375000f,
+    -0.627664f, 0.156665f, 0.627664f, -0.652097f, 0.386703f, 0.652097f, 0.500000f, 0.375000f,
+    -0.518555f, 0.060938f, 0.766309f, -0.522105f, 0.348172f, 0.778577f, 0.375000f, 0.500000f,
+    -0.691875f, 0.450000f, 0.294375f, -0.833647f, 0.429394f, 0.347353f, 0.750000f, 0.000000f,
+    -0.597676f, 0.253711f, 0.597676f, -0.644272f, 0.412102f, 0.644272f, 0.500000f, 0.250000f,
+    -0.776558f, 0.253711f, 0.330405f, -0.841850f, 0.410181f, 0.350771f, 0.750000f, 0.250000f,
+    -0.841797f, 0.253711f, -0.000000f, -0.911768f, 0.410706f, 0.000000f, 1.000000f, 0.250000f,
+    -0.850430f, 0.060938f, 0.361836f, -0.865775f, 0.346844f, 0.360739f, 0.750000f, 0.500000f,
+    -0.623438f, 0.450000f, 0.421875f, -0.749483f, 0.430900f, 0.502594f, 0.625000f, 0.000000f,
+    -0.565608f, 0.351636f, 0.565608f, -0.639524f, 0.426636f, 0.639524f, 0.500000f, 0.125000f,
+    -0.662199f, 0.351636f, 0.448105f, -0.751345f, 0.426172f, 0.503843f, 0.625000f, 0.125000f,
+    -0.734892f, 0.351636f, 0.312678f, -0.835093f, 0.426082f, 0.347956f, 0.750000f, 0.125000f,
+    -0.699744f, 0.253711f, 0.473511f, -0.756911f, 0.411648f, 0.507575f, 0.625000f, 0.250000f,
+    -0.735000f, 0.450000f, 0.152812f, -0.885342f, 0.429903f, 0.177068f, 0.875000f, 0.000000f,
+    -0.734892f, 0.351636f, 0.312678f, -0.835093f, 0.426082f, 0.347956f, 0.750000f, 0.125000f,
+    -0.780698f, 0.351636f, 0.162314f, -0.887532f, 0.425181f, 0.177506f, 0.875000f, 0.125000f,
+    -0.796631f, 0.351636f, -0.000000f, -0.905094f, 0.425212f, 0.000000f, 1.000000f, 0.125000f,
+    -0.824961f, 0.253711f, 0.171516f, -0.894075f, 0.410676f, 0.178815f, 0.875000f, 0.250000f,
+    -0.699744f, 0.253711f, 0.473511f, -0.756910f, 0.411648f, 0.507575f, 0.625000f, 0.250000f,
+    -0.627664f, 0.156665f, 0.627664f, -0.652097f, 0.386703f, 0.652097f, 0.500000f, 0.375000f,
+    -0.734853f, 0.156665f, 0.497269f, -0.766083f, 0.386267f, 0.513726f, 0.625000f, 0.375000f,
+    -0.815521f, 0.156665f, 0.346983f, -0.851467f, 0.386182f, 0.354778f, 0.750000f, 0.375000f,
+    -0.766309f, 0.060938f, 0.518555f, -0.778582f, 0.348157f, 0.522108f, 0.625000f, 0.500000f,
+    -0.824961f, 0.253711f, 0.171516f, -0.894075f, 0.410676f, 0.178815f, 0.875000f, 0.250000f,
+    -0.815521f, 0.156665f, 0.346983f, -0.851467f, 0.386182f, 0.354778f, 0.750000f, 0.375000f,
+    -0.866353f, 0.156665f, 0.180122f, -0.904858f, 0.385333f, 0.180972f, 0.875000f, 0.375000f,
+    -0.884033f, 0.156665f, -0.000000f, -0.922766f, 0.385361f, 0.000000f, 1.000000f, 0.375000f,
+    -0.903437f, 0.060938f, 0.187832f, -0.919548f, 0.347288f, 0.183909f, 0.875000f, 0.500000f,
+    -0.361836f, 0.060938f, 0.850430f, -0.360706f, 0.347079f, 0.865695f, 0.250000f, 0.500000f,
+    0.000000f, -0.124805f, 0.978516f, 0.000000f, 0.220939f, 0.975288f, 0.000000f, 0.750000f,
+    -0.384067f, -0.124805f, 0.902681f, -0.375125f, 0.220777f, 0.900299f, 0.250000f, 0.750000f,
+    -0.694746f, -0.124805f, 0.694746f, -0.689495f, 0.221799f, 0.689494f, 0.500000f, 0.750000f,
+    -0.392500f, -0.300000f, 0.922500f, -0.384615f, 0.000000f, 0.923077f, 0.250000f, 1.000000f,
+    -0.187832f, 0.060938f, 0.903437f, -0.183906f, 0.347330f, 0.919533f, 0.125000f, 0.500000f,
+    0.000000f, -0.033032f, 0.953857f, 0.000000f, 0.293768f, 0.955877f, 0.000000f, 0.625000f,
+    -0.194348f, -0.033032f, 0.934780f, -0.187462f, 0.293782f, 0.937310f, 0.125000f, 0.625000f,
+    -0.374389f, -0.033032f, 0.879933f, -0.367565f, 0.294439f, 0.882157f, 0.250000f, 0.625000f,
+    -0.199373f, -0.124805f, 0.958945f, -0.191269f, 0.220950f, 0.956346f, 0.125000f, 0.750000f,
+    -0.518555f, 0.060938f, 0.766309f, -0.522105f, 0.348172f, 0.778578f, 0.375000f, 0.500000f,
+    -0.374389f, -0.033032f, 0.879933f, -0.367565f, 0.294439f, 0.882157f, 0.250000f, 0.625000f,
+    -0.536545f, -0.033032f, 0.792894f, -0.532249f, 0.294522f, 0.793705f, 0.375000f, 0.625000f,
+    -0.677239f, -0.033032f, 0.677239f, -0.675668f, 0.294866f, 0.675668f, 0.500000f, 0.625000f,
+    -0.550415f, -0.124805f, 0.813391f, -0.543115f, 0.221529f, 0.809908f, 0.375000f, 0.750000f,
+    -0.199373f, -0.124805f, 0.958945f, -0.191269f, 0.220950f, 0.956346f, 0.125000f, 0.750000f,
+    0.000000f, -0.213940f, 0.994385f, 0.000000f, 0.124341f, 0.992240f, 0.000000f, 0.875000f,
+    -0.202606f, -0.213940f, 0.974497f, -0.194594f, 0.124347f, 0.972970f, 0.125000f, 0.875000f,
+    -0.390296f, -0.213940f, 0.917320f, -0.381616f, 0.124647f, 0.915878f, 0.250000f, 0.875000f,
+    -0.203750f, -0.300000f, 0.980000f, -0.196116f, 0.000000f, 0.980581f, 0.125000f, 1.000000f,
+    -0.550415f, -0.124805f, 0.813391f, -0.543115f, 0.221529f, 0.809908f, 0.375000f, 0.750000f,
+    -0.390296f, -0.213940f, 0.917320f, -0.381616f, 0.124647f, 0.915878f, 0.250000f, 0.875000f,
+    -0.559341f, -0.213940f, 0.826582f, -0.552607f, 0.124685f, 0.824063f, 0.375000f, 0.875000f,
+    -0.706013f, -0.213940f, 0.706013f, -0.701575f, 0.124842f, 0.701575f, 0.500000f, 0.875000f,
+    -0.562500f, -0.300000f, 0.831250f, -0.556953f, 0.000000f, 0.830544f, 0.375000f, 1.000000f,
+    -0.850430f, 0.060938f, 0.361836f, -0.865775f, 0.346844f, 0.360740f, 0.750000f, 0.500000f,
+    -0.694746f, -0.124805f, 0.694746f, -0.689494f, 0.221799f, 0.689495f, 0.500000f, 0.750000f,
+    -0.902681f, -0.124805f, 0.384067f, -0.900333f, 0.220616f, 0.375139f, 0.750000f, 0.750000f,
+    -0.978516f, -0.124805f, -0.000000f, -0.975288f, 0.220939f, 0.000000f, 1.000000f, 0.750000f,
+    -0.922500f, -0.300000f, 0.392500f, -0.923077f, 0.000000f, 0.384615f, 0.750000f, 1.000000f,
+    -0.766309f, 0.060938f, 0.518555f, -0.778582f, 0.348157f, 0.522108f, 0.625000f, 0.500000f,
+    -0.677239f, -0.033032f, 0.677239f, -0.675668f, 0.294866f, 0.675668f, 0.500000f, 0.625000f,
+    -0.792894f, -0.033032f, 0.536545f, -0.793708f, 0.294509f, 0.532252f, 0.625000f, 0.625000f,
+    -0.879933f, -0.033032f, 0.374389f, -0.882157f, 0.294439f, 0.367565f, 0.750000f, 0.625000f,
+    -0.813391f, -0.124805f, 0.550415f, -0.809910f, 0.221518f, 0.543116f, 0.625000f, 0.750000f,
+    -0.903437f, 0.060938f, 0.187832f, -0.919548f, 0.347287f, 0.183910f, 0.875000f, 0.500000f,
+    -0.879933f, -0.033032f, 0.374389f, -0.882157f, 0.294439f, 0.367565f, 0.750000f, 0.625000f,
+    -0.934780f, -0.033032f, 0.194348f, -0.937321f, 0.293744f, 0.187464f, 0.875000f, 0.625000f,
+    -0.953857f, -0.033032f, -0.000000f, -0.955877f, 0.293768f, 0.000000f, 1.000000f, 0.625000f,
+    -0.958945f, -0.124805f, 0.199373f, -0.956352f, 0.220920f, 0.191271f, 0.875000f, 0.750000f,
+    -0.813391f, -0.124805f, 0.550415f, -0.809910f, 0.221518f, 0.543116f, 0.625000f, 0.750000f,
+    -0.706013f, -0.213940f, 0.706013f, -0.701575f, 0.124842f, 0.701575f, 0.500000f, 0.875000f,
+    -0.826582f, -0.213940f, 0.559341f, -0.824063f, 0.124679f, 0.552607f, 0.625000f, 0.875000f,
+    -0.917320f, -0.213940f, 0.390296f, -0.915878f, 0.124647f, 0.381616f, 0.750000f, 0.875000f,
+    -0.831250f, -0.300000f, 0.562500f, -0.830544f, 0.000000f, 0.556953f, 0.625000f, 1.000000f,
+    -0.958945f, -0.124805f, 0.199373f, -0.956352f, 0.220920f, 0.191271f, 0.875000f, 0.750000f,
+    -0.917320f, -0.213940f, 0.390296f, -0.915878f, 0.124647f, 0.381616f, 0.750000f, 0.875000f,
+    -0.974497f, -0.213940f, 0.202606f, -0.972972f, 0.124330f, 0.194595f, 0.875000f, 0.875000f,
+    -0.994385f, -0.213940f, -0.000000f, -0.992240f, 0.124341f, 0.000000f, 1.000000f, 0.875000f,
+    -0.980000f, -0.300000f, 0.203750f, -0.980581f, 0.000000f, 0.196116f, 0.875000f, 1.000000f,
+    -0.750000f, 0.450000f, -0.000000f, -0.902861f, 0.429934f, 0.000000f, 0.000000f, 0.000000f,
+    0.000000f, 0.450000f, -0.750000f, 0.000000f, 0.429934f, -0.902861f, 1.000000f, 0.000000f,
+    -1.000000f, -0.300000f, -0.000000f, -1.000000f, -0.000000f, -0.000000f, 0.000000f, 1.000000f,
+    0.000000f, -0.300000f, -1.000000f, 0.000000f, 0.000000f, -1.000000f, 1.000000f, 1.000000f,
+    -0.532500f, 0.450000f, -0.532500f, -0.639602f, 0.426401f, -0.639602f, 0.500000f, 0.000000f,
+    -0.921875f, 0.060938f, -0.000000f, -0.937749f, 0.347314f, 0.000000f, 0.000000f, 0.500000f,
+    -0.654531f, 0.060938f, -0.654531f, -0.663890f, 0.344239f, -0.663890f, 0.500000f, 0.500000f,
+    0.000000f, 0.060938f, -0.921875f, 0.000000f, 0.347314f, -0.937749f, 1.000000f, 0.500000f,
+    -0.710000f, -0.300000f, -0.710000f, -0.707107f, -0.000000f, -0.707107f, 0.500000f, 1.000000f,
+    -0.691875f, 0.450000f, -0.294375f, -0.833528f, 0.429664f, -0.347303f, 0.250000f, 0.000000f,
+    -0.841797f, 0.253711f, -0.000000f, -0.911768f, 0.410706f, 0.000000f, 0.000000f, 0.250000f,
+    -0.776558f, 0.253711f, -0.330405f, -0.841741f, 0.410444f, -0.350725f, 0.250000f, 0.250000f,
+    -0.597676f, 0.253711f, -0.597676f, -0.644272f, 0.412102f, -0.644272f, 0.500000f, 0.250000f,
+    -0.850430f, 0.060938f, -0.361836f, -0.865695f, 0.347079f, -0.360706f, 0.250000f, 0.500000f,
+    -0.735000f, 0.450000f, -0.152812f, -0.885319f, 0.429952f, -0.177064f, 0.125000f, 0.000000f,
+    -0.796631f, 0.351636f, -0.000000f, -0.905094f, 0.425212f, 0.000000f, 0.000000f, 0.125000f,
+    -0.780698f, 0.351636f, -0.162314f, -0.887509f, 0.425230f, -0.177502f, 0.125000f, 0.125000f,
+    -0.734892f, 0.351636f, -0.312678f, -0.835093f, 0.426082f, -0.347956f, 0.250000f, 0.125000f,
+    -0.824961f, 0.253711f, -0.171516f, -0.894054f, 0.410724f, -0.178811f, 0.125000f, 0.250000f,
+    -0.623438f, 0.450000f, -0.421875f, -0.749476f, 0.430917f, -0.502590f, 0.375000f, 0.000000f,
+    -0.734892f, 0.351636f, -0.312678f, -0.835093f, 0.426082f, -0.347956f, 0.250000f, 0.125000f,
+    -0.662199f, 0.351636f, -0.448105f, -0.751338f, 0.426189f, -0.503839f, 0.375000f, 0.125000f,
+    -0.565608f, 0.351636f, -0.565608f, -0.639524f, 0.426636f, -0.639524f, 0.500000f, 0.125000f,
+    -0.699744f, 0.253711f, -0.473511f, -0.756904f, 0.411664f, -0.507571f, 0.375000f, 0.250000f,
+    -0.824961f, 0.253711f, -0.171516f, -0.894054f, 0.410724f, -0.178811f, 0.125000f, 0.250000f,
+    -0.884033f, 0.156665f, -0.000000f, -0.922766f, 0.385361f, 0.000000f, 0.000000f, 0.375000f,
+    -0.866353f, 0.156665f, -0.180122f, -0.904839f, 0.385379f, -0.180968f, 0.125000f, 0.375000f,
+    -0.815521f, 0.156665f, -0.346983f, -0.851467f, 0.386182f, -0.354778f, 0.250000f, 0.375000f,
+    -0.903437f, 0.060938f, -0.187832f, -0.919533f, 0.347330f, -0.183906f, 0.125000f, 0.500000f,
+    -0.699744f, 0.253711f, -0.473511f, -0.756904f, 0.411665f, -0.507571f, 0.375000f, 0.250000f,
+    -0.815521f, 0.156665f, -0.346983f, -0.851467f, 0.386182f, -0.354778f, 0.250000f, 0.375000f,
+    -0.734853f, 0.156665f, -0.497269f, -0.766078f, 0.386283f, -0.513723f, 0.375000f, 0.375000f,
+    -0.627664f, 0.156665f, -0.627664f, -0.652097f, 0.386703f, -0.652097f, 0.500000f, 0.375000f,
+    -0.766309f, 0.060938f, -0.518555f, -0.778577f, 0.348172f, -0.522105f, 0.375000f, 0.500000f,
+    -0.294375f, 0.450000f, -0.691875f, -0.347353f, 0.429394f, -0.833647f, 0.750000f, 0.000000f,
+    -0.597676f, 0.253711f, -0.597676f, -0.644272f, 0.412102f, -0.644272f, 0.500000f, 0.250000f,
+    -0.330405f, 0.253711f, -0.776558f, -0.350771f, 0.410181f, -0.841850f, 0.750000f, 0.250000f,
+    0.000000f, 0.253711f, -0.841797f, 0.000000f, 0.410706f, -0.911768f, 1.000000f, 0.250000f,
+    -0.361836f, 0.060938f, -0.850430f, -0.360739f, 0.346844f, -0.865775f, 0.750000f, 0.500000f,
+    -0.421875f, 0.450000f, -0.623438f, -0.502594f, 0.430900f, -0.749483f, 0.625000f, 0.000000f,
+    -0.565608f, 0.351636f, -0.565608f, -0.639524f, 0.426636f, -0.639524f, 0.500000f, 0.125000f,
+    -0.448105f, 0.351636f, -0.662199f, -0.503843f, 0.426172f, -0.751345f, 0.625000f, 0.125000f,
+    -0.312678f, 0.351636f, -0.734892f, -0.347956f, 0.426082f, -0.835093f, 0.750000f, 0.125000f,
+    -0.473511f, 0.253711f, -0.699744f, -0.507575f, 0.411648f, -0.756911f, 0.625000f, 0.250000f,
+    -0.152812f, 0.450000f, -0.735000f, -0.177068f, 0.429903f, -0.885342f, 0.875000f, 0.000000f,
+    -0.312678f, 0.351636f, -0.734892f, -0.347956f, 0.426082f, -0.835093f, 0.750000f, 0.125000f,
+    -0.162314f, 0.351636f, -0.780698f, -0.177506f, 0.425181f, -0.887532f, 0.875000f, 0.125000f,
+    0.000000f, 0.351636f, -0.796631f, 0.000000f, 0.425212f, -0.905094f, 1.000000f, 0.125000f,
+    -0.171516f, 0.253711f, -0.824961f, -0.178815f, 0.410676f, -0.894075f, 0.875000f, 0.250000f,
+    -0.473511f, 0.253711f, -0.699744f, -0.507575f, 0.411648f, -0.756910f, 0.625000f, 0.250000f,
+    -0.627664f, 0.156665f, -0.627664f, -0.652097f, 0.386703f, -0.652097f, 0.500000f, 0.375000f,
+    -0.497269f, 0.156665f, -0.734853f, -0.513726f, 0.386267f, -0.766083f, 0.625000f, 0.375000f,
+    -0.346983f, 0.156665f, -0.815521f, -0.354778f, 0.386182f, -0.851467f, 0.750000f, 0.375000f,
+    -0.518555f, 0.060938f, -0.766309f, -0.522108f, 0.348157f, -0.778582f, 0.625000f, 0.500000f,
+    -0.171516f, 0.253711f, -0.824961f, -0.178815f, 0.410676f, -0.894075f, 0.875000f, 0.250000f,
+    -0.346983f, 0.156665f, -0.815521f, -0.354778f, 0.386182f, -0.851467f, 0.750000f, 0.375000f,
+    -0.180122f, 0.156665f, -0.866353f, -0.180972f, 0.385333f, -0.904858f, 0.875000f, 0.375000f,
+    0.000000f, 0.156665f, -0.884033f, 0.000000f, 0.385361f, -0.922766f, 1.000000f, 0.375000f,
+    -0.187832f, 0.060938f, -0.903437f, -0.183909f, 0.347288f, -0.919548f, 0.875000f, 0.500000f,
+    -0.850430f, 0.060938f, -0.361836f, -0.865695f, 0.347079f, -0.360706f, 0.250000f, 0.500000f,
+    -0.978516f, -0.124805f, -0.000000f, -0.975288f, 0.220939f, 0.000000f, 0.000000f, 0.750000f,
+    -0.902681f, -0.124805f, -0.384067f, -0.900299f, 0.220777f, -0.375125f, 0.250000f, 0.750000f,
+    -0.694746f, -0.124805f, -0.694746f, -0.689494f, 0.221799f, -0.689495f, 0.500000f, 0.750000f,
+    -0.922500f, -0.300000f, -0.392500f, -0.923077f, -0.000000f, -0.384615f, 0.250000f, 1.000000f,
+    -0.903437f, 0.060938f, -0.187832f, -0.919533f, 0.347330f, -0.183906f, 0.125000f, 0.500000f,
+    -0.953857f, -0.033032f, -0.000000f, -0.955877f, 0.293768f, 0.000000f, 0.000000f, 0.625000f,
+    -0.934780f, -0.033032f, -0.194348f, -0.937310f, 0.293782f, -0.187462f, 0.125000f, 0.625000f,
+    -0.879933f, -0.033032f, -0.374389f, -0.882157f, 0.294439f, -0.367565f, 0.250000f, 0.625000f,
+    -0.958945f, -0.124805f, -0.199373f, -0.956346f, 0.220950f, -0.191269f, 0.125000f, 0.750000f,
+    -0.766309f, 0.060938f, -0.518555f, -0.778578f, 0.348172f, -0.522105f, 0.375000f, 0.500000f,
+    -0.879933f, -0.033032f, -0.374389f, -0.882157f, 0.294439f, -0.367565f, 0.250000f, 0.625000f,
+    -0.792894f, -0.033032f, -0.536545f, -0.793705f, 0.294522f, -0.532249f, 0.375000f, 0.625000f,
+    -0.677239f, -0.033032f, -0.677239f, -0.675668f, 0.294866f, -0.675668f, 0.500000f, 0.625000f,
+    -0.813391f, -0.124805f, -0.550415f, -0.809908f, 0.221529f, -0.543115f, 0.375000f, 0.750000f,
+    -0.958945f, -0.124805f, -0.199373f, -0.956346f, 0.220950f, -0.191269f, 0.125000f, 0.750000f,
+    -0.994385f, -0.213940f, -0.000000f, -0.992240f, 0.124341f, 0.000000f, 0.000000f, 0.875000f,
+    -0.974497f, -0.213940f, -0.202606f, -0.972970f, 0.124347f, -0.194594f, 0.125000f, 0.875000f,
+    -0.917320f, -0.213940f, -0.390296f, -0.915878f, 0.124647f, -0.381616f, 0.250000f, 0.875000f,
+    -0.980000f, -0.300000f, -0.203750f, -0.980581f, -0.000000f, -0.196116f, 0.125000f, 1.000000f,
+    -0.813391f, -0.124805f, -0.550415f, -0.809908f, 0.221529f, -0.543115f, 0.375000f, 0.750000f,
+    -0.917320f, -0.213940f, -0.390296f, -0.915878f, 0.124647f, -0.381616f, 0.250000f, 0.875000f,
+    -0.826582f, -0.213940f, -0.559341f, -0.824063f, 0.124685f, -0.552607f, 0.375000f, 0.875000f,
+    -0.706013f, -0.213940f, -0.706013f, -0.701575f, 0.124842f, -0.701575f, 0.500000f, 0.875000f,
+    -0.831250f, -0.300000f, -0.562500f, -0.830544f, -0.000000f, -0.556953f, 0.375000f, 1.000000f,
+    -0.361836f, 0.060938f, -0.850430f, -0.360740f, 0.346844f, -0.865775f, 0.750000f, 0.500000f,
+    -0.694746f, -0.124805f, -0.694746f, -0.689495f, 0.221799f, -0.689494f, 0.500000f, 0.750000f,
+    -0.384067f, -0.124805f, -0.902681f, -0.375139f, 0.220616f, -0.900333f, 0.750000f, 0.750000f,
+    0.000000f, -0.124805f, -0.978516f, 0.000000f, 0.220939f, -0.975288f, 1.000000f, 0.750000f,
+    -0.392500f, -0.300000f, -0.922500f, -0.384615f, -0.000000f, -0.923077f, 0.750000f, 1.000000f,
+    -0.518555f, 0.060938f, -0.766309f, -0.522108f, 0.348157f, -0.778582f, 0.625000f, 0.500000f,
+    -0.677239f, -0.033032f, -0.677239f, -0.675668f, 0.294866f, -0.675668f, 0.500000f, 0.625000f,
+    -0.536545f, -0.033032f, -0.792894f, -0.532252f, 0.294509f, -0.793708f, 0.625000f, 0.625000f,
+    -0.374389f, -0.033032f, -0.879933f, -0.367565f, 0.294439f, -0.882157f, 0.750000f, 0.625000f,
+    -0.550415f, -0.124805f, -0.813391f, -0.543116f, 0.221518f, -0.809910f, 0.625000f, 0.750000f,
+    -0.187832f, 0.060938f, -0.903437f, -0.183910f, 0.347287f, -0.919548f, 0.875000f, 0.500000f,
+    -0.374389f, -0.033032f, -0.879933f, -0.367565f, 0.294439f, -0.882157f, 0.750000f, 0.625000f,
+    -0.194348f, -0.033032f, -0.934780f, -0.187464f, 0.293744f, -0.937321f, 0.875000f, 0.625000f,
+    0.000000f, -0.033032f, -0.953857f, 0.000000f, 0.293768f, -0.955877f, 1.000000f, 0.625000f,
+    -0.199373f, -0.124805f, -0.958945f, -0.191271f, 0.220920f, -0.956352f, 0.875000f, 0.750000f,
+    -0.550415f, -0.124805f, -0.813391f, -0.543116f, 0.221518f, -0.809910f, 0.625000f, 0.750000f,
+    -0.706013f, -0.213940f, -0.706013f, -0.701575f, 0.124842f, -0.701575f, 0.500000f, 0.875000f,
+    -0.559341f, -0.213940f, -0.826582f, -0.552607f, 0.124679f, -0.824063f, 0.625000f, 0.875000f,
+    -0.390296f, -0.213940f, -0.917320f, -0.381616f, 0.124647f, -0.915878f, 0.750000f, 0.875000f,
+    -0.562500f, -0.300000f, -0.831250f, -0.556953f, -0.000000f, -0.830544f, 0.625000f, 1.000000f,
+    -0.199373f, -0.124805f, -0.958945f, -0.191271f, 0.220920f, -0.956352f, 0.875000f, 0.750000f,
+    -0.390296f, -0.213940f, -0.917320f, -0.381616f, 0.124647f, -0.915878f, 0.750000f, 0.875000f,
+    -0.202606f, -0.213940f, -0.974497f, -0.194595f, 0.124330f, -0.972972f, 0.875000f, 0.875000f,
+    0.000000f, -0.213940f, -0.994385f, 0.000000f, 0.124341f, -0.992240f, 1.000000f, 0.875000f,
+    -0.203750f, -0.300000f, -0.980000f, -0.196116f, -0.000000f, -0.980581f, 0.875000f, 1.000000f,
+    0.000000f, 0.450000f, -0.750000f, 0.000000f, 0.429934f, -0.902861f, 0.000000f, 0.000000f,
+    0.750000f, 0.450000f, -0.000000f, 0.902861f, 0.429934f, -0.000000f, 1.000000f, 0.000000f,
+    0.000000f, -0.300000f, -1.000000f, 0.000000f, 0.000000f, -1.000000f, 0.000000f, 1.000000f,
+    1.000000f, -0.300000f, -0.000000f, 1.000000f, 0.000000f, -0.000000f, 1.000000f, 1.000000f,
+    0.532500f, 0.450000f, -0.532500f, 0.639602f, 0.426401f, -0.639602f, 0.500000f, 0.000000f,
+    0.000000f, 0.060938f, -0.921875f, 0.000000f, 0.347314f, -0.937749f, 0.000000f, 0.500000f,
+    0.654531f, 0.060938f, -0.654531f, 0.663890f, 0.344239f, -0.663890f, 0.500000f, 0.500000f,
+    0.921875f, 0.060938f, -0.000000f, 0.937749f, 0.347314f, -0.000000f, 1.000000f, 0.500000f,
+    0.710000f, -0.300000f, -0.710000f, 0.707107f, 0.000000f, -0.707107f, 0.500000f, 1.000000f,
+    0.294375f, 0.450000f, -0.691875f, 0.347303f, 0.429664f, -0.833528f, 0.250000f, 0.000000f,
+    0.000000f, 0.253711f, -0.841797f, 0.000000f, 0.410706f, -0.911768f, 0.000000f, 0.250000f,
+    0.330405f, 0.253711f, -0.776558f, 0.350725f, 0.410444f, -0.841741f, 0.250000f, 0.250000f,
+    0.597676f, 0.253711f, -0.597676f, 0.644272f, 0.412102f, -0.644272f, 0.500000f, 0.250000f,
+    0.361836f, 0.060938f, -0.850430f, 0.360706f, 0.347079f, -0.865695f, 0.250000f, 0.500000f,
+    0.152812f, 0.450000f, -0.735000f, 0.177064f, 0.429952f, -0.885319f, 0.125000f, 0.000000f,
+    0.000000f, 0.351636f, -0.796631f, 0.000000f, 0.425212f, -0.905094f, 0.000000f, 0.125000f,
+    0.162314f, 0.351636f, -0.780698f, 0.177502f, 0.425230f, -0.887509f, 0.125000f, 0.125000f,
+    0.312678f, 0.351636f, -0.734892f, 0.347956f, 0.426082f, -0.835093f, 0.250000f, 0.125000f,
+    0.171516f, 0.253711f, -0.824961f, 0.178811f, 0.410724f, -0.894054f, 0.125000f, 0.250000f,
+    0.421875f, 0.450000f, -0.623438f, 0.502590f, 0.430917f, -0.749476f, 0.375000f, 0.000000f,
+    0.312678f, 0.351636f, -0.734892f, 0.347956f, 0.426082f, -0.835093f, 0.250000f, 0.125000f,
+    0.448105f, 0.351636f, -0.662199f, 0.503839f, 0.426189f, -0.751338f, 0.375000f, 0.125000f,
+    0.565608f, 0.351636f, -0.565608f, 0.639524f, 0.426636f, -0.639524f, 0.500000f, 0.125000f,
+    0.473511f, 0.253711f, -0.699744f, 0.507571f, 0.411664f, -0.756904f, 0.375000f, 0.250000f,
+    0.171516f, 0.253711f, -0.824961f, 0.178811f, 0.410724f, -0.894054f, 0.125000f, 0.250000f,
+    0.000000f, 0.156665f, -0.884033f, 0.000000f, 0.385361f, -0.922766f, 0.000000f, 0.375000f,
+    0.180122f, 0.156665f, -0.866353f, 0.180968f, 0.385379f, -0.904839f, 0.125000f, 0.375000f,
+    0.346983f, 0.156665f, -0.815521f, 0.354778f, 0.386182f, -0.851467f, 0.250000f, 0.375000f,
+    0.187832f, 0.060938f, -0.903437f, 0.183906f, 0.347330f, -0.919533f, 0.125000f, 0.500000f,
+    0.473511f, 0.253711f, -0.699744f, 0.507571f, 0.411665f, -0.756904f, 0.375000f, 0.250000f,
+    0.346983f, 0.156665f, -0.815521f, 0.354778f, 0.386182f, -0.851467f, 0.250000f, 0.375000f,
+    0.497269f, 0.156665f, -0.734853f, 0.513723f, 0.386283f, -0.766078f, 0.375000f, 0.375000f,
+    0.627664f, 0.156665f, -0.627664f, 0.652097f, 0.386703f, -0.652097f, 0.500000f, 0.375000f,
+    0.518555f, 0.060938f, -0.766309f, 0.522105f, 0.348172f, -0.778577f, 0.375000f, 0.500000f,
+    0.691875f, 0.450000f, -0.294375f, 0.833647f, 0.429394f, -0.347353f, 0.750000f, 0.000000f,
+    0.597676f, 0.253711f, -0.597676f, 0.644272f, 0.412102f, -0.644272f, 0.500000f, 0.250000f,
+    0.776558f, 0.253711f, -0.330405f, 0.841850f, 0.410181f, -0.350771f, 0.750000f, 0.250000f,
+    0.841797f, 0.253711f, -0.000000f, 0.911768f, 0.410706f, -0.000000f, 1.000000f, 0.250000f,
+    0.850430f, 0.060938f, -0.361836f, 0.865775f, 0.346844f, -0.360739f, 0.750000f, 0.500000f,
+    0.623438f, 0.450000f, -0.421875f, 0.749483f, 0.430900f, -0.502594f, 0.625000f, 0.000000f,
+    0.565608f, 0.351636f, -0.565608f, 0.639524f, 0.426636f, -0.639524f, 0.500000f, 0.125000f,
+    0.662199f, 0.351636f, -0.448105f, 0.751345f, 0.426172f, -0.503843f, 0.625000f, 0.125000f,
+    0.734892f, 0.351636f, -0.312678f, 0.835093f, 0.426082f, -0.347956f, 0.750000f, 0.125000f,
+    0.699744f, 0.253711f, -0.473511f, 0.756911f, 0.411648f, -0.507575f, 0.625000f, 0.250000f,
+    0.735000f, 0.450000f, -0.152812f, 0.885342f, 0.429903f, -0.177068f, 0.875000f, 0.000000f,
+    0.734892f, 0.351636f, -0.312678f, 0.835093f, 0.426082f, -0.347956f, 0.750000f, 0.125000f,
+    0.780698f, 0.351636f, -0.162314f, 0.887532f, 0.425181f, -0.177506f, 0.875000f, 0.125000f,
+    0.796631f, 0.351636f, -0.000000f, 0.905094f, 0.425212f, -0.000000f, 1.000000f, 0.125000f,
+    0.824961f, 0.253711f, -0.171516f, 0.894075f, 0.410676f, -0.178815f, 0.875000f, 0.250000f,
+    0.699744f, 0.253711f, -0.473511f, 0.756910f, 0.411648f, -0.507575f, 0.625000f, 0.250000f,
+    0.627664f, 0.156665f, -0.627664f, 0.652097f, 0.386703f, -0.652097f, 0.500000f, 0.375000f,
+    0.734853f, 0.156665f, -0.497269f, 0.766083f, 0.386267f, -0.513726f, 0.625000f, 0.375000f,
+    0.815521f, 0.156665f, -0.346983f, 0.851467f, 0.386182f, -0.354778f, 0.750000f, 0.375000f,
+    0.766309f, 0.060938f, -0.518555f, 0.778582f, 0.348157f, -0.522108f, 0.625000f, 0.500000f,
+    0.824961f, 0.253711f, -0.171516f, 0.894075f, 0.410676f, -0.178815f, 0.875000f, 0.250000f,
+    0.815521f, 0.156665f, -0.346983f, 0.851467f, 0.386182f, -0.354778f, 0.750000f, 0.375000f,
+    0.866353f, 0.156665f, -0.180122f, 0.904858f, 0.385333f, -0.180972f, 0.875000f, 0.375000f,
+    0.884033f, 0.156665f, -0.000000f, 0.922766f, 0.385361f, -0.000000f, 1.000000f, 0.375000f,
+    0.903437f, 0.060938f, -0.187832f, 0.919548f, 0.347288f, -0.183909f, 0.875000f, 0.500000f,
+    0.361836f, 0.060938f, -0.850430f, 0.360706f, 0.347079f, -0.865695f, 0.250000f, 0.500000f,
+    0.000000f, -0.124805f, -0.978516f, 0.000000f, 0.220939f, -0.975288f, 0.000000f, 0.750000f,
+    0.384067f, -0.124805f, -0.902681f, 0.375125f, 0.220777f, -0.900299f, 0.250000f, 0.750000f,
+    0.694746f, -0.124805f, -0.694746f, 0.689495f, 0.221799f, -0.689494f, 0.500000f, 0.750000f,
+    0.392500f, -0.300000f, -0.922500f, 0.384615f, 0.000000f, -0.923077f, 0.250000f, 1.000000f,
+    0.187832f, 0.060938f, -0.903437f, 0.183906f, 0.347330f, -0.919533f, 0.125000f, 0.500000f,
+    0.000000f, -0.033032f, -0.953857f, 0.000000f, 0.293768f, -0.955877f, 0.000000f, 0.625000f,
+    0.194348f, -0.033032f, -0.934780f, 0.187462f, 0.293782f, -0.937310f, 0.125000f, 0.625000f,
+    0.374389f, -0.033032f, -0.879933f, 0.367565f, 0.294439f, -0.882157f, 0.250000f, 0.625000f,
+    0.199373f, -0.124805f, -0.958945f, 0.191269f, 0.220950f, -0.956346f, 0.125000f, 0.750000f,
+    0.518555f, 0.060938f, -0.766309f, 0.522105f, 0.348172f, -0.778578f, 0.375000f, 0.500000f,
+    0.374389f, -0.033032f, -0.879933f, 0.367565f, 0.294439f, -0.882157f, 0.250000f, 0.625000f,
+    0.536545f, -0.033032f, -0.792894f, 0.532249f, 0.294522f, -0.793705f, 0.375000f, 0.625000f,
+    0.677239f, -0.033032f, -0.677239f, 0.675668f, 0.294866f, -0.675668f, 0.500000f, 0.625000f,
+    0.550415f, -0.124805f, -0.813391f, 0.543115f, 0.221529f, -0.809908f, 0.375000f, 0.750000f,
+    0.199373f, -0.124805f, -0.958945f, 0.191269f, 0.220950f, -0.956346f, 0.125000f, 0.750000f,
+    0.000000f, -0.213940f, -0.994385f, 0.000000f, 0.124341f, -0.992240f, 0.000000f, 0.875000f,
+    0.202606f, -0.213940f, -0.974497f, 0.194594f, 0.124347f, -0.972970f, 0.125000f, 0.875000f,
+    0.390296f, -0.213940f, -0.917320f, 0.381616f, 0.124647f, -0.915878f, 0.250000f, 0.875000f,
+    0.203750f, -0.300000f, -0.980000f, 0.196116f, 0.000000f, -0.980581f, 0.125000f, 1.000000f,
+    0.550415f, -0.124805f, -0.813391f, 0.543115f, 0.221529f, -0.809908f, 0.375000f, 0.750000f,
+    0.390296f, -0.213940f, -0.917320f, 0.381616f, 0.124647f, -0.915878f, 0.250000f, 0.875000f,
+    0.559341f, -0.213940f, -0.826582f, 0.552607f, 0.124685f, -0.824063f, 0.375000f, 0.875000f,
+    0.706013f, -0.213940f, -0.706013f, 0.701575f, 0.124842f, -0.701575f, 0.500000f, 0.875000f,
+    0.562500f, -0.300000f, -0.831250f, 0.556953f, 0.000000f, -0.830544f, 0.375000f, 1.000000f,
+    0.850430f, 0.060938f, -0.361836f, 0.865775f, 0.346844f, -0.360740f, 0.750000f, 0.500000f,
+    0.694746f, -0.124805f, -0.694746f, 0.689494f, 0.221799f, -0.689495f, 0.500000f, 0.750000f,
+    0.902681f, -0.124805f, -0.384067f, 0.900333f, 0.220616f, -0.375139f, 0.750000f, 0.750000f,
+    0.978516f, -0.124805f, -0.000000f, 0.975288f, 0.220939f, -0.000000f, 1.000000f, 0.750000f,
+    0.922500f, -0.300000f, -0.392500f, 0.923077f, 0.000000f, -0.384615f, 0.750000f, 1.000000f,
+    0.766309f, 0.060938f, -0.518555f, 0.778582f, 0.348157f, -0.522108f, 0.625000f, 0.500000f,
+    0.677239f, -0.033032f, -0.677239f, 0.675668f, 0.294866f, -0.675668f, 0.500000f, 0.625000f,
+    0.792894f, -0.033032f, -0.536545f, 0.793708f, 0.294509f, -0.532252f, 0.625000f, 0.625000f,
+    0.879933f, -0.033032f, -0.374389f, 0.882157f, 0.294439f, -0.367565f, 0.750000f, 0.625000f,
+    0.813391f, -0.124805f, -0.550415f, 0.809910f, 0.221518f, -0.543116f, 0.625000f, 0.750000f,
+    0.903437f, 0.060938f, -0.187832f, 0.919548f, 0.347287f, -0.183910f, 0.875000f, 0.500000f,
+    0.879933f, -0.033032f, -0.374389f, 0.882157f, 0.294439f, -0.367565f, 0.750000f, 0.625000f,
+    0.934780f, -0.033032f, -0.194348f, 0.937321f, 0.293744f, -0.187464f, 0.875000f, 0.625000f,
+    0.953857f, -0.033032f, -0.000000f, 0.955877f, 0.293768f, -0.000000f, 1.000000f, 0.625000f,
+    0.958945f, -0.124805f, -0.199373f, 0.956352f, 0.220920f, -0.191271f, 0.875000f, 0.750000f,
+    0.813391f, -0.124805f, -0.550415f, 0.809910f, 0.221518f, -0.543116f, 0.625000f, 0.750000f,
+    0.706013f, -0.213940f, -0.706013f, 0.701575f, 0.124842f, -0.701575f, 0.500000f, 0.875000f,
+    0.826582f, -0.213940f, -0.559341f, 0.824063f, 0.124679f, -0.552607f, 0.625000f, 0.875000f,
+    0.917320f, -0.213940f, -0.390296f, 0.915878f, 0.124647f, -0.381616f, 0.750000f, 0.875000f,
+    0.831250f, -0.300000f, -0.562500f, 0.830544f, 0.000000f, -0.556953f, 0.625000f, 1.000000f,
+    0.958945f, -0.124805f, -0.199373f, 0.956352f, 0.220920f, -0.191271f, 0.875000f, 0.750000f,
+    0.917320f, -0.213940f, -0.390296f, 0.915878f, 0.124647f, -0.381616f, 0.750000f, 0.875000f,
+    0.974497f, -0.213940f, -0.202606f, 0.972972f, 0.124330f, -0.194595f, 0.875000f, 0.875000f,
+    0.994385f, -0.213940f, -0.000000f, 0.992240f, 0.124341f, -0.000000f, 1.000000f, 0.875000f,
+    0.980000f, -0.300000f, -0.203750f, 0.980581f, 0.000000f, -0.196116f, 0.875000f, 1.000000f,
+    1.000000f, -0.300000f, -0.000000f, 1.000000f, 0.000000f, -0.000000f, 0.000000f, 0.000000f,
+    0.000000f, -0.300000f, 1.000000f, 0.000000f, 0.000000f, 1.000000f, 1.000000f, 0.000000f,
+    0.750000f, -0.675000f, -0.000000f, 1.000000f, 0.000000f, -0.000000f, 0.000000f, 1.000000f,
+    0.000000f, -0.675000f, 0.750000f, 0.000000f, 0.000000f, 1.000000f, 1.000000f, 1.000000f,
+    0.710000f, -0.300000f, 0.710000f, 0.707107f, 0.000000f, 0.707107f, 0.500000f, 0.000000f,
+    0.875000f, -0.557812f, -0.000000f, 0.698100f, -0.716000f, 0.000000f, 0.000000f, 0.500000f,
+    0.621250f, -0.557812f, 0.621250f, 0.496182f, -0.712466f, 0.496182f, 0.500000f, 0.500000f,
+    0.000000f, -0.557812f, 0.875000f, 0.000000f, -0.716000f, 0.698100f, 1.000000f, 0.500000f,
+    0.532500f, -0.675000f, 0.532500f, 0.707107f, 0.000000f, 0.707107f, 0.500000f, 1.000000f,
+    0.922500f, -0.300000f, 0.392500f, 0.923077f, 0.000000f, 0.384615f, 0.250000f, 0.000000f,
+    0.960938f, -0.448242f, -0.000000f, 0.876976f, -0.480535f, 0.000000f, 0.000000f, 0.250000f,
+    0.886465f, -0.448242f, 0.377168f, 0.809660f, -0.480250f, 0.337358f, 0.250000f, 0.250000f,
+    0.682266f, -0.448242f, 0.682266f, 0.619529f, -0.482045f, 0.619529f, 0.500000f, 0.250000f,
+    0.807187f, -0.557812f, 0.343437f, 0.644654f, -0.715732f, 0.268606f, 0.250000f, 0.500000f,
+    0.980000f, -0.300000f, 0.203750f, 0.980581f, 0.000000f, 0.196116f, 0.125000f, 0.000000f,
+    0.989258f, -0.379175f, -0.000000f, 0.963722f, -0.266906f, 0.000000f, 0.000000f, 0.125000f,
+    0.969473f, -0.379175f, 0.201561f, 0.945004f, -0.266919f, 0.189001f, 0.125000f, 0.125000f,
+    0.912590f, -0.379175f, 0.388284f, 0.889432f, -0.267526f, 0.370596f, 0.250000f, 0.125000f,
+    0.941719f, -0.448242f, 0.195791f, 0.859935f, -0.480554f, 0.171987f, 0.125000f, 0.250000f,
+    0.831250f, -0.300000f, 0.562500f, 0.830544f, 0.000000f, 0.556953f, 0.375000f, 0.000000f,
+    0.912590f, -0.379175f, 0.388284f, 0.889431f, -0.267526f, 0.370597f, 0.250000f, 0.125000f,
+    0.822320f, -0.379175f, 0.556458f, 0.800254f, -0.267602f, 0.536641f, 0.375000f, 0.125000f,
+    0.702373f, -0.379175f, 0.702373f, 0.681256f, -0.267921f, 0.681256f, 0.500000f, 0.125000f,
+    0.798779f, -0.448242f, 0.540527f, 0.727894f, -0.481571f, 0.488118f, 0.375000f, 0.250000f,
+    0.941719f, -0.448242f, 0.195791f, 0.859935f, -0.480554f, 0.171987f, 0.125000f, 0.250000f,
+    0.920898f, -0.507642f, -0.000000f, 0.779645f, -0.626221f, 0.000000f, 0.000000f, 0.375000f,
+    0.902480f, -0.507642f, 0.187633f, 0.764489f, -0.626241f, 0.152898f, 0.125000f, 0.375000f,
+    0.849529f, -0.507642f, 0.361453f, 0.718967f, -0.627172f, 0.299570f, 0.250000f, 0.375000f,
+    0.857500f, -0.557812f, 0.178281f, 0.684525f, -0.716019f, 0.136905f, 0.125000f, 0.500000f,
+    0.798779f, -0.448242f, 0.540527f, 0.727894f, -0.481572f, 0.488118f, 0.375000f, 0.250000f,
+    0.849529f, -0.507642f, 0.361453f, 0.718967f, -0.627172f, 0.299570f, 0.250000f, 0.375000f,
+    0.765497f, -0.507642f, 0.518005f, 0.646817f, -0.627288f, 0.433748f, 0.375000f, 0.375000f,
+    0.653838f, -0.507642f, 0.653838f, 0.550409f, -0.627775f, 0.550409f, 0.500000f, 0.375000f,
+    0.727344f, -0.557812f, 0.492188f, 0.578969f, -0.716978f, 0.388249f, 0.375000f, 0.500000f,
+    0.392500f, -0.300000f, 0.922500f, 0.384615f, 0.000000f, 0.923077f, 0.750000f, 0.000000f,
+    0.682266f, -0.448242f, 0.682266f, 0.619529f, -0.482045f, 0.619529f, 0.500000f, 0.250000f,
+    0.377168f, -0.448242f, 0.886465f, 0.337418f, -0.479966f, 0.809804f, 0.750000f, 0.250000f,
+    0.000000f, -0.448242f, 0.960938f, 0.000000f, -0.480535f, 0.876976f, 1.000000f, 0.250000f,
+    0.343437f, -0.557812f, 0.807187f, 0.268712f, -0.715463f, 0.644908f, 0.750000f, 0.500000f,
+    0.562500f, -0.300000f, 0.831250f, 0.556953f, 0.000000f, 0.830544f, 0.625000f, 0.000000f,
+    0.702373f, -0.379175f, 0.702373f, 0.681256f, -0.267921f, 0.681256f, 0.500000f, 0.125000f,
+    0.556458f, -0.379175f, 0.822320f, 0.536643f, -0.267590f, 0.800256f, 0.625000f, 0.125000f,
+    0.388284f, -0.379175f, 0.912590f, 0.370597f, -0.267526f, 0.889431f, 0.750000f, 0.125000f,
+    0.540527f, -0.448242f, 0.798779f, 0.488123f, -0.481553f, 0.727903f, 0.625000f, 0.250000f,
+    0.203750f, -0.300000f, 0.980000f, 0.196116f, 0.000000f, 0.980581f, 0.875000f, 0.000000f,
+    0.388284f, -0.379175f, 0.912590f, 0.370596f, -0.267526f, 0.889432f, 0.750000f, 0.125000f,
+    0.201561f, -0.379175f, 0.969473f, 0.189003f, -0.266885f, 0.945014f, 0.875000f, 0.125000f,
+    0.000000f, -0.379175f, 0.989258f, 0.000000f, -0.266906f, 0.963722f, 1.000000f, 0.125000f,
+    0.195791f, -0.448242f, 0.941719f, 0.171993f, -0.480502f, 0.859963f, 0.875000f, 0.250000f,
+    0.540527f, -0.448242f, 0.798779f, 0.488123f, -0.481553f, 0.727903f, 0.625000f, 0.250000f,
+    0.653838f, -0.507642f, 0.653838f, 0.550409f, -0.627775f, 0.550409f, 0.500000f, 0.375000f,
+    0.518005f, -0.507642f, 0.765497f, 0.433756f, -0.627270f, 0.646829f, 0.625000f, 0.375000f,
+    0.361453f, -0.507642f, 0.849529f, 0.299570f, -0.627172f, 0.718967f, 0.750000f, 0.375000f,
+    0.492188f, -0.557812f, 0.727344f, 0.388259f, -0.716961f, 0.578983f, 0.625000f, 0.500000f,
+    0.195791f, -0.448242f, 0.941719f, 0.171993f, -0.480502f, 0.859963f, 0.875000f, 0.250000f,
+    0.361453f, -0.507642f, 0.849529f, 0.299570f, -0.627172f, 0.718967f, 0.750000f, 0.375000f,
+    0.187633f, -0.507642f, 0.902480f, 0.152906f, -0.626188f, 0.764532f, 0.875000f, 0.375000f,
+    0.000000f, -0.507642f, 0.920898f, 0.000000f, -0.626221f, 0.779645f, 1.000000f, 0.375000f,
+    0.178281f, -0.557812f, 0.857500f, 0.136915f, -0.715970f, 0.684574f, 0.875000f, 0.500000f,
+    0.807187f, -0.557812f, 0.343437f, 0.644654f, -0.715731f, 0.268606f, 0.250000f, 0.500000f,
+    0.789062f, -0.632227f, -0.000000f, 0.636383f, -0.771373f, 0.000000f, 0.000000f, 0.750000f,
+    0.727910f, -0.632227f, 0.309707f, 0.587700f, -0.771133f, 0.244875f, 0.250000f, 0.750000f,
+    0.560234f, -0.632227f, 0.560234f, 0.448897f, -0.772647f, 0.448897f, 0.500000f, 0.750000f,
+    0.691875f, -0.675000f, 0.294375f, 0.923077f, 0.000000f, 0.384615f, 0.250000f, 1.000000f,
+    0.857500f, -0.557812f, 0.178281f, 0.684525f, -0.716018f, 0.136905f, 0.125000f, 0.500000f,
+    0.829102f, -0.599194f, -0.000000f, 0.645429f, -0.763821f, 0.000000f, 0.000000f, 0.625000f,
+    0.812519f, -0.599194f, 0.168929f, 0.632876f, -0.763837f, 0.126575f, 0.125000f, 0.625000f,
+    0.764846f, -0.599194f, 0.325422f, 0.594912f, -0.764614f, 0.247880f, 0.250000f, 0.625000f,
+    0.773281f, -0.632227f, 0.160771f, 0.624005f, -0.771390f, 0.124801f, 0.125000f, 0.750000f,
+    0.727344f, -0.557812f, 0.492188f, 0.578969f, -0.716978f, 0.388249f, 0.375000f, 0.500000f,
+    0.764846f, -0.599194f, 0.325422f, 0.594912f, -0.764614f, 0.247880f, 0.250000f, 0.625000f,
+    0.689191f, -0.599194f, 0.466370f, 0.535179f, -0.764712f, 0.358885f, 0.375000f, 0.625000f,
+    0.588662f, -0.599194f, 0.588662f, 0.455299f, -0.765118f, 0.455299f, 0.500000f, 0.625000f,
+    0.655908f, -0.632227f, 0.443848f, 0.527662f, -0.772248f, 0.353844f, 0.375000f, 0.750000f,
+    0.773281f, -0.632227f, 0.160771f, 0.624005f, -0.771390f, 0.124801f, 0.125000f, 0.750000f,
+    0.760742f, -0.657349f, -0.000000f, 0.720596f, -0.693356f, 0.000000f, 0.000000f, 0.875000f,
+    0.745527f, -0.657349f, 0.155001f, 0.706584f, -0.693375f, 0.141317f, 0.125000f, 0.875000f,
+    0.701785f, -0.657349f, 0.298591f, 0.664366f, -0.694254f, 0.276819f, 0.250000f, 0.875000f,
+    0.735000f, -0.675000f, 0.152812f, 0.980581f, 0.000000f, 0.196116f, 0.125000f, 1.000000f,
+    0.655908f, -0.632227f, 0.443848f, 0.527662f, -0.772249f, 0.353844f, 0.375000f, 0.750000f,
+    0.701785f, -0.657349f, 0.298591f, 0.664366f, -0.694254f, 0.276819f, 0.250000f, 0.875000f,
+    0.632367f, -0.657349f, 0.427917f, 0.597679f, -0.694365f, 0.400796f, 0.375000f, 0.875000f,
+    0.540127f, -0.657349f, 0.540127f, 0.508537f, -0.694825f, 0.508536f, 0.500000f, 0.875000f,
+    0.623438f, -0.675000f, 0.421875f, 0.830544f, 0.000000f, 0.556953f, 0.375000f, 1.000000f,
+    0.343437f, -0.557812f, 0.807187f, 0.268712f, -0.715463f, 0.644909f, 0.750000f, 0.500000f,
+    0.560234f, -0.632227f, 0.560234f, 0.448897f, -0.772647f, 0.448897f, 0.500000f, 0.750000f,
+    0.309707f, -0.632227f, 0.727910f, 0.244987f, -0.770892f, 0.587969f, 0.750000f, 0.750000f,
+    0.000000f, -0.632227f, 0.789062f, 0.000000f, -0.771373f, 0.636383f, 1.000000f, 0.750000f,
+    0.294375f, -0.675000f, 0.691875f, 0.384615f, 0.000000f, 0.923077f, 0.750000f, 1.000000f,
+    0.492188f, -0.557812f, 0.727344f, 0.388259f, -0.716961f, 0.578983f, 0.625000f, 0.500000f,
+    0.588662f, -0.599194f, 0.588662f, 0.455299f, -0.765118f, 0.455299f, 0.500000f, 0.625000f,
+    0.466370f, -0.599194f, 0.689191f, 0.358895f, -0.764697f, 0.535195f, 0.625000f, 0.625000f,
+    0.325422f, -0.599194f, 0.764846f, 0.247880f, -0.764614f, 0.594912f, 0.750000f, 0.625000f,
+    0.443848f, -0.632227f, 0.655908f, 0.353854f, -0.772233f, 0.527677f, 0.625000f, 0.750000f,
+    0.178281f, -0.557812f, 0.857500f, 0.136915f, -0.715969f, 0.684575f, 0.875000f, 0.500000f,
+    0.325422f, -0.599194f, 0.764846f, 0.247880f, -0.764614f, 0.594912f, 0.750000f, 0.625000f,
+    0.168929f, -0.599194f, 0.812519f, 0.126585f, -0.763793f, 0.632927f, 0.875000f, 0.625000f,
+    0.000000f, -0.599194f, 0.829102f, 0.000000f, -0.763821f, 0.645429f, 1.000000f, 0.625000f,
+    0.160771f, -0.632227f, 0.773281f, 0.124811f, -0.771346f, 0.624057f, 0.875000f, 0.750000f,
+    0.443848f, -0.632227f, 0.655908f, 0.353854f, -0.772233f, 0.527677f, 0.625000f, 0.750000f,
+    0.540127f, -0.657349f, 0.540127f, 0.508536f, -0.694825f, 0.508537f, 0.500000f, 0.875000f,
+    0.427917f, -0.657349f, 0.632367f, 0.400806f, -0.694347f, 0.597693f, 0.625000f, 0.875000f,
+    0.298591f, -0.657349f, 0.701785f, 0.276819f, -0.694254f, 0.664366f, 0.750000f, 0.875000f,
+    0.421875f, -0.675000f, 0.623438f, 0.556953f, 0.000000f, 0.830544f, 0.625000f, 1.000000f,
+    0.160771f, -0.632227f, 0.773281f, 0.124811f, -0.771346f, 0.624057f, 0.875000f, 0.750000f,
+    0.298591f, -0.657349f, 0.701785f, 0.276819f, -0.694254f, 0.664366f, 0.750000f, 0.875000f,
+    0.155001f, -0.657349f, 0.745527f, 0.141326f, -0.693324f, 0.706632f, 0.875000f, 0.875000f,
+    0.000000f, -0.657349f, 0.760742f, 0.000000f, -0.693356f, 0.720596f, 1.000000f, 0.875000f,
+    0.152812f, -0.675000f, 0.735000f, 0.196116f, 0.000000f, 0.980581f, 0.875000f, 1.000000f,
+    0.000000f, -0.300000f, 1.000000f, 0.000000f, 0.000000f, 1.000000f, 0.000000f, 0.000000f,
+    -1.000000f, -0.300000f, -0.000000f, -1.000000f, -0.000000f, -0.000000f, 1.000000f, 0.000000f,
+    0.000000f, -0.675000f, 0.750000f, 0.000000f, 0.000000f, 1.000000f, 0.000000f, 1.000000f,
+    -0.750000f, -0.675000f, -0.000000f, -1.000000f, -0.000000f, -0.000000f, 1.000000f, 1.000000f,
+    -0.710000f, -0.300000f, 0.710000f, -0.707107f, 0.000000f, 0.707107f, 0.500000f, 0.000000f,
+    0.000000f, -0.557812f, 0.875000f, 0.000000f, -0.716000f, 0.698100f, 0.000000f, 0.500000f,
+    -0.621250f, -0.557812f, 0.621250f, -0.496182f, -0.712466f, 0.496182f, 0.500000f, 0.500000f,
+    -0.875000f, -0.557812f, -0.000000f, -0.698100f, -0.716000f, -0.000000f, 1.000000f, 0.500000f,
+    -0.532500f, -0.675000f, 0.532500f, -0.707107f, 0.000000f, 0.707107f, 0.500000f, 1.000000f,
+    -0.392500f, -0.300000f, 0.922500f, -0.384615f, 0.000000f, 0.923077f, 0.250000f, 0.000000f,
+    0.000000f, -0.448242f, 0.960938f, 0.000000f, -0.480535f, 0.876976f, 0.000000f, 0.250000f,
+    -0.377168f, -0.448242f, 0.886465f, -0.337358f, -0.480250f, 0.809660f, 0.250000f, 0.250000f,
+    -0.682266f, -0.448242f, 0.682266f, -0.619529f, -0.482045f, 0.619529f, 0.500000f, 0.250000f,
+    -0.343437f, -0.557812f, 0.807187f, -0.268606f, -0.715732f, 0.644654f, 0.250000f, 0.500000f,
+    -0.203750f, -0.300000f, 0.980000f, -0.196116f, 0.000000f, 0.980581f, 0.125000f, 0.000000f,
+    0.000000f, -0.379175f, 0.989258f, 0.000000f, -0.266906f, 0.963722f, 0.000000f, 0.125000f,
+    -0.201561f, -0.379175f, 0.969473f, -0.189001f, -0.266919f, 0.945004f, 0.125000f, 0.125000f,
+    -0.388284f, -0.379175f, 0.912590f, -0.370596f, -0.267526f, 0.889432f, 0.250000f, 0.125000f,
+    -0.195791f, -0.448242f, 0.941719f, -0.171987f, -0.480554f, 0.859935f, 0.125000f, 0.250000f,
+    -0.562500f, -0.300000f, 0.831250f, -0.556953f, 0.000000f, 0.830544f, 0.375000f, 0.000000f,
+    -0.388284f, -0.379175f, 0.912590f, -0.370597f, -0.267526f, 0.889431f, 0.250000f, 0.125000f,
+    -0.556458f, -0.379175f, 0.822320f, -0.536641f, -0.267602f, 0.800254f, 0.375000f, 0.125000f,
+    -0.702373f, -0.379175f, 0.702373f, -0.681256f, -0.267921f, 0.681256f, 0.500000f, 0.125000f,
+    -0.540527f, -0.448242f, 0.798779f, -0.488118f, -0.481571f, 0.727894f, 0.375000f, 0.250000f,
+    -0.195791f, -0.448242f, 0.941719f, -0.171987f, -0.480554f, 0.859935f, 0.125000f, 0.250000f,
+    0.000000f, -0.507642f, 0.920898f, 0.000000f, -0.626221f, 0.779645f, 0.000000f, 0.375000f,
+    -0.187633f, -0.507642f, 0.902480f, -0.152898f, -0.626241f, 0.764489f, 0.125000f, 0.375000f,
+    -0.361453f, -0.507642f, 0.849529f, -0.299570f, -0.627172f, 0.718967f, 0.250000f, 0.375000f,
+    -0.178281f, -0.557812f, 0.857500f, -0.136905f, -0.716019f, 0.684525f, 0.125000f, 0.500000f,
+    -0.540527f, -0.448242f, 0.798779f, -0.488118f, -0.481572f, 0.727894f, 0.375000f, 0.250000f,
+    -0.361453f, -0.507642f, 0.849529f, -0.299570f, -0.627172f, 0.718967f, 0.250000f, 0.375000f,
+    -0.518005f, -0.507642f, 0.765497f, -0.433748f, -0.627288f, 0.646817f, 0.375000f, 0.375000f,
+    -0.653838f, -0.507642f, 0.653838f, -0.550409f, -0.627775f, 0.550409f, 0.500000f, 0.375000f,
+    -0.492188f, -0.557812f, 0.727344f, -0.388249f, -0.716978f, 0.578969f, 0.375000f, 0.500000f,
+    -0.922500f, -0.300000f, 0.392500f, -0.923077f, 0.000000f, 0.384615f, 0.750000f, 0.000000f,
+    -0.682266f, -0.448242f, 0.682266f, -0.619529f, -0.482045f, 0.619529f, 0.500000f, 0.250000f,
+    -0.886465f, -0.448242f, 0.377168f, -0.809804f, -0.479966f, 0.337418f, 0.750000f, 0.250000f,
+    -0.960938f, -0.448242f, -0.000000f, -0.876976f, -0.480535f, -0.000000f, 1.000000f, 0.250000f,
+    -0.807187f, -0.557812f, 0.343437f, -0.644908f, -0.715463f, 0.268712f, 0.750000f, 0.500000f,
+    -0.831250f, -0.300000f, 0.562500f, -0.830544f, 0.000000f, 0.556953f, 0.625000f, 0.000000f,
+    -0.702373f, -0.379175f, 0.702373f, -0.681256f, -0.267921f, 0.681256f, 0.500000f, 0.125000f,
+    -0.822320f, -0.379175f, 0.556458f, -0.800256f, -0.267590f, 0.536643f, 0.625000f, 0.125000f,
+    -0.912590f, -0.379175f, 0.388284f, -0.889431f, -0.267526f, 0.370597f, 0.750000f, 0.125000f,
+    -0.798779f, -0.448242f, 0.540527f, -0.727903f, -0.481553f, 0.488123f, 0.625000f, 0.250000f,
+    -0.980000f, -0.300000f, 0.203750f, -0.980581f, 0.000000f, 0.196116f, 0.875000f, 0.000000f,
+    -0.912590f, -0.379175f, 0.388284f, -0.889432f, -0.267526f, 0.370596f, 0.750000f, 0.125000f,
+    -0.969473f, -0.379175f, 0.201561f, -0.945014f, -0.266885f, 0.189003f, 0.875000f, 0.125000f,
+    -0.989258f, -0.379175f, -0.000000f, -0.963722f, -0.266906f, -0.000000f, 1.000000f, 0.125000f,
+    -0.941719f, -0.448242f, 0.195791f, -0.859963f, -0.480502f, 0.171993f, 0.875000f, 0.250000f,
+    -0.798779f, -0.448242f, 0.540527f, -0.727903f, -0.481553f, 0.488123f, 0.625000f, 0.250000f,
+    -0.653838f, -0.507642f, 0.653838f, -0.550409f, -0.627775f, 0.550409f, 0.500000f, 0.375000f,
+    -0.765497f, -0.507642f, 0.518005f, -0.646829f, -0.627270f, 0.433756f, 0.625000f, 0.375000f,
+    -0.849529f, -0.507642f, 0.361453f, -0.718967f, -0.627172f, 0.299570f, 0.750000f, 0.375000f,
+    -0.727344f, -0.557812f, 0.492188f, -0.578983f, -0.716961f, 0.388259f, 0.625000f, 0.500000f,
+    -0.941719f, -0.448242f, 0.195791f, -0.859963f, -0.480502f, 0.171993f, 0.875000f, 0.250000f,
+    -0.849529f, -0.507642f, 0.361453f, -0.718967f, -0.627172f, 0.299570f, 0.750000f, 0.375000f,
+    -0.902480f, -0.507642f, 0.187633f, -0.764532f, -0.626188f, 0.152906f, 0.875000f, 0.375000f,
+    -0.920898f, -0.507642f, -0.000000f, -0.779645f, -0.626221f, -0.000000f, 1.000000f, 0.375000f,
+    -0.857500f, -0.557812f, 0.178281f, -0.684574f, -0.715970f, 0.136915f, 0.875000f, 0.500000f,
+    -0.343437f, -0.557812f, 0.807187f, -0.268606f, -0.715731f, 0.644654f, 0.250000f, 0.500000f,
+    0.000000f, -0.632227f, 0.789062f, 0.000000f, -0.771373f, 0.636383f, 0.000000f, 0.750000f,
+    -0.309707f, -0.632227f, 0.727910f, -0.244875f, -0.771133f, 0.587700f, 0.250000f, 0.750000f,
+    -0.560234f, -0.632227f, 0.560234f, -0.448897f, -0.772647f, 0.448897f, 0.500000f, 0.750000f,
+    -0.294375f, -0.675000f, 0.691875f, -0.384615f, 0.000000f, 0.923077f, 0.250000f, 1.000000f,
+    -0.178281f, -0.557812f, 0.857500f, -0.136905f, -0.716018f, 0.684525f, 0.125000f, 0.500000f,
+    0.000000f, -0.599194f, 0.829102f, 0.000000f, -0.763821f, 0.645429f, 0.000000f, 0.625000f,
+    -0.168929f, -0.599194f, 0.812519f, -0.126575f, -0.763837f, 0.632876f, 0.125000f, 0.625000f,
+    -0.325422f, -0.599194f, 0.764846f, -0.247880f, -0.764614f, 0.594912f, 0.250000f, 0.625000f,
+    -0.160771f, -0.632227f, 0.773281f, -0.124801f, -0.771390f, 0.624005f, 0.125000f, 0.750000f,
+    -0.492188f, -0.557812f, 0.727344f, -0.388249f, -0.716978f, 0.578969f, 0.375000f, 0.500000f,
+    -0.325422f, -0.599194f, 0.764846f, -0.247880f, -0.764614f, 0.594912f, 0.250000f, 0.625000f,
+    -0.466370f, -0.599194f, 0.689191f, -0.358885f, -0.764712f, 0.535179f, 0.375000f, 0.625000f,
+    -0.588662f, -0.599194f, 0.588662f, -0.455299f, -0.765118f, 0.455299f, 0.500000f, 0.625000f,
+    -0.443848f, -0.632227f, 0.655908f, -0.353844f, -0.772248f, 0.527662f, 0.375000f, 0.750000f,
+    -0.160771f, -0.632227f, 0.773281f, -0.124801f, -0.771390f, 0.624005f, 0.125000f, 0.750000f,
+    0.000000f, -0.657349f, 0.760742f, 0.000000f, -0.693356f, 0.720596f, 0.000000f, 0.875000f,
+    -0.155001f, -0.657349f, 0.745527f, -0.141317f, -0.693375f, 0.706584f, 0.125000f, 0.875000f,
+    -0.298591f, -0.657349f, 0.701785f, -0.276819f, -0.694254f, 0.664366f, 0.250000f, 0.875000f,
+    -0.152812f, -0.675000f, 0.735000f, -0.196116f, 0.000000f, 0.980581f, 0.125000f, 1.000000f,
+    -0.443848f, -0.632227f, 0.655908f, -0.353844f, -0.772249f, 0.527662f, 0.375000f, 0.750000f,
+    -0.298591f, -0.657349f, 0.701785f, -0.276819f, -0.694254f, 0.664366f, 0.250000f, 0.875000f,
+    -0.427917f, -0.657349f, 0.632367f, -0.400796f, -0.694365f, 0.597679f, 0.375000f, 0.875000f,
+    -0.540127f, -0.657349f, 0.540127f, -0.508536f, -0.694825f, 0.508537f, 0.500000f, 0.875000f,
+    -0.421875f, -0.675000f, 0.623438f, -0.556953f, 0.000000f, 0.830544f, 0.375000f, 1.000000f,
+    -0.807187f, -0.557812f, 0.343437f, -0.644909f, -0.715463f, 0.268712f, 0.750000f, 0.500000f,
+    -0.560234f, -0.632227f, 0.560234f, -0.448897f, -0.772647f, 0.448897f, 0.500000f, 0.750000f,
+    -0.727910f, -0.632227f, 0.309707f, -0.587969f, -0.770892f, 0.244987f, 0.750000f, 0.750000f,
+    -0.789062f, -0.632227f, -0.000000f, -0.636383f, -0.771373f, -0.000000f, 1.000000f, 0.750000f,
+    -0.691875f, -0.675000f, 0.294375f, -0.923077f, 0.000000f, 0.384615f, 0.750000f, 1.000000f,
+    -0.727344f, -0.557812f, 0.492188f, -0.578983f, -0.716961f, 0.388259f, 0.625000f, 0.500000f,
+    -0.588662f, -0.599194f, 0.588662f, -0.455299f, -0.765118f, 0.455299f, 0.500000f, 0.625000f,
+    -0.689191f, -0.599194f, 0.466370f, -0.535195f, -0.764697f, 0.358895f, 0.625000f, 0.625000f,
+    -0.764846f, -0.599194f, 0.325422f, -0.594912f, -0.764614f, 0.247880f, 0.750000f, 0.625000f,
+    -0.655908f, -0.632227f, 0.443848f, -0.527677f, -0.772233f, 0.353854f, 0.625000f, 0.750000f,
+    -0.857500f, -0.557812f, 0.178281f, -0.684575f, -0.715969f, 0.136915f, 0.875000f, 0.500000f,
+    -0.764846f, -0.599194f, 0.325422f, -0.594912f, -0.764614f, 0.247880f, 0.750000f, 0.625000f,
+    -0.812519f, -0.599194f, 0.168929f, -0.632927f, -0.763793f, 0.126585f, 0.875000f, 0.625000f,
+    -0.829102f, -0.599194f, -0.000000f, -0.645429f, -0.763821f, -0.000000f, 1.000000f, 0.625000f,
+    -0.773281f, -0.632227f, 0.160771f, -0.624057f, -0.771346f, 0.124811f, 0.875000f, 0.750000f,
+    -0.655908f, -0.632227f, 0.443848f, -0.527677f, -0.772233f, 0.353854f, 0.625000f, 0.750000f,
+    -0.540127f, -0.657349f, 0.540127f, -0.508537f, -0.694825f, 0.508536f, 0.500000f, 0.875000f,
+    -0.632367f, -0.657349f, 0.427917f, -0.597693f, -0.694347f, 0.400806f, 0.625000f, 0.875000f,
+    -0.701785f, -0.657349f, 0.298591f, -0.664366f, -0.694254f, 0.276819f, 0.750000f, 0.875000f,
+    -0.623438f, -0.675000f, 0.421875f, -0.830544f, 0.000000f, 0.556953f, 0.625000f, 1.000000f,
+    -0.773281f, -0.632227f, 0.160771f, -0.624057f, -0.771346f, 0.124811f, 0.875000f, 0.750000f,
+    -0.701785f, -0.657349f, 0.298591f, -0.664366f, -0.694254f, 0.276819f, 0.750000f, 0.875000f,
+    -0.745527f, -0.657349f, 0.155001f, -0.706632f, -0.693324f, 0.141326f, 0.875000f, 0.875000f,
+    -0.760742f, -0.657349f, -0.000000f, -0.720596f, -0.693356f, -0.000000f, 1.000000f, 0.875000f,
+    -0.735000f, -0.675000f, 0.152812f, -0.980581f, 0.000000f, 0.196116f, 0.875000f, 1.000000f,
+    -1.000000f, -0.300000f, -0.000000f, -1.000000f, -0.000000f, -0.000000f, 0.000000f, 0.000000f,
+    0.000000f, -0.300000f, -1.000000f, 0.000000f, 0.000000f, -1.000000f, 1.000000f, 0.000000f,
+    -0.750000f, -0.675000f, -0.000000f, -1.000000f, -0.000000f, -0.000000f, 0.000000f, 1.000000f,
+    0.000000f, -0.675000f, -0.750000f, 0.000000f, 0.000000f, -1.000000f, 1.000000f, 1.000000f,
+    -0.710000f, -0.300000f, -0.710000f, -0.707107f, -0.000000f, -0.707107f, 0.500000f, 0.000000f,
+    -0.875000f, -0.557812f, -0.000000f, -0.698100f, -0.716000f, -0.000000f, 0.000000f, 0.500000f,
+    -0.621250f, -0.557812f, -0.621250f, -0.496182f, -0.712466f, -0.496182f, 0.500000f, 0.500000f,
+    0.000000f, -0.557812f, -0.875000f, 0.000000f, -0.716000f, -0.698100f, 1.000000f, 0.500000f,
+    -0.532500f, -0.675000f, -0.532500f, -0.707107f, -0.000000f, -0.707107f, 0.500000f, 1.000000f,
+    -0.922500f, -0.300000f, -0.392500f, -0.923077f, -0.000000f, -0.384615f, 0.250000f, 0.000000f,
+    -0.960938f, -0.448242f, -0.000000f, -0.876976f, -0.480535f, -0.000000f, 0.000000f, 0.250000f,
+    -0.886465f, -0.448242f, -0.377168f, -0.809660f, -0.480250f, -0.337358f, 0.250000f, 0.250000f,
+    -0.682266f, -0.448242f, -0.682266f, -0.619529f, -0.482045f, -0.619529f, 0.500000f, 0.250000f,
+    -0.807187f, -0.557812f, -0.343437f, -0.644654f, -0.715732f, -0.268606f, 0.250000f, 0.500000f,
+    -0.980000f, -0.300000f, -0.203750f, -0.980581f, -0.000000f, -0.196116f, 0.125000f, 0.000000f,
+    -0.989258f, -0.379175f, -0.000000f, -0.963722f, -0.266906f, -0.000000f, 0.000000f, 0.125000f,
+    -0.969473f, -0.379175f, -0.201561f, -0.945004f, -0.266919f, -0.189001f, 0.125000f, 0.125000f,
+    -0.912590f, -0.379175f, -0.388284f, -0.889432f, -0.267526f, -0.370596f, 0.250000f, 0.125000f,
+    -0.941719f, -0.448242f, -0.195791f, -0.859935f, -0.480554f, -0.171987f, 0.125000f, 0.250000f,
+    -0.831250f, -0.300000f, -0.562500f, -0.830544f, -0.000000f, -0.556953f, 0.375000f, 0.000000f,
+    -0.912590f, -0.379175f, -0.388284f, -0.889431f, -0.267526f, -0.370597f, 0.250000f, 0.125000f,
+    -0.822320f, -0.379175f, -0.556458f, -0.800254f, -0.267602f, -0.536641f, 0.375000f, 0.125000f,
+    -0.702373f, -0.379175f, -0.702373f, -0.681256f, -0.267921f, -0.681256f, 0.500000f, 0.125000f,
+    -0.798779f, -0.448242f, -0.540527f, -0.727894f, -0.481571f, -0.488118f, 0.375000f, 0.250000f,
+    -0.941719f, -0.448242f, -0.195791f, -0.859935f, -0.480554f, -0.171987f, 0.125000f, 0.250000f,
+    -0.920898f, -0.507642f, -0.000000f, -0.779645f, -0.626221f, -0.000000f, 0.000000f, 0.375000f,
+    -0.902480f, -0.507642f, -0.187633f, -0.764489f, -0.626241f, -0.152898f, 0.125000f, 0.375000f,
+    -0.849529f, -0.507642f, -0.361453f, -0.718967f, -0.627172f, -0.299570f, 0.250000f, 0.375000f,
+    -0.857500f, -0.557812f, -0.178281f, -0.684525f, -0.716019f, -0.136905f, 0.125000f, 0.500000f,
+    -0.798779f, -0.448242f, -0.540527f, -0.727894f, -0.481572f, -0.488118f, 0.375000f, 0.250000f,
+    -0.849529f, -0.507642f, -0.361453f, -0.718967f, -0.627172f, -0.299570f, 0.250000f, 0.375000f,
+    -0.765497f, -0.507642f, -0.518005f, -0.646817f, -0.627288f, -0.433748f, 0.375000f, 0.375000f,
+    -0.653838f, -0.507642f, -0.653838f, -0.550409f, -0.627775f, -0.550409f, 0.500000f, 0.375000f,
+    -0.727344f, -0.557812f, -0.492188f, -0.578969f, -0.716978f, -0.388249f, 0.375000f, 0.500000f,
+    -0.392500f, -0.300000f, -0.922500f, -0.384615f, -0.000000f, -0.923077f, 0.750000f, 0.000000f,
+    -0.682266f, -0.448242f, -0.682266f, -0.619529f, -0.482045f, -0.619529f, 0.500000f, 0.250000f,
+    -0.377168f, -0.448242f, -0.886465f, -0.337418f, -0.479966f, -0.809804f, 0.750000f, 0.250000f,
+    0.000000f, -0.448242f, -0.960938f, 0.000000f, -0.480535f, -0.876976f, 1.000000f, 0.250000f,
+    -0.343437f, -0.557812f, -0.807187f, -0.268712f, -0.715463f, -0.644908f, 0.750000f, 0.500000f,
+    -0.562500f, -0.300000f, -0.831250f, -0.556953f, -0.000000f, -0.830544f, 0.625000f, 0.000000f,
+    -0.702373f, -0.379175f, -0.702373f, -0.681256f, -0.267921f, -0.681256f, 0.500000f, 0.125000f,
+    -0.556458f, -0.379175f, -0.822320f, -0.536643f, -0.267590f, -0.800256f, 0.625000f, 0.125000f,
+    -0.388284f, -0.379175f, -0.912590f, -0.370597f, -0.267526f, -0.889431f, 0.750000f, 0.125000f,
+    -0.540527f, -0.448242f, -0.798779f, -0.488123f, -0.481553f, -0.727903f, 0.625000f, 0.250000f,
+    -0.203750f, -0.300000f, -0.980000f, -0.196116f, -0.000000f, -0.980581f, 0.875000f, 0.000000f,
+    -0.388284f, -0.379175f, -0.912590f, -0.370596f, -0.267526f, -0.889432f, 0.750000f, 0.125000f,
+    -0.201561f, -0.379175f, -0.969473f, -0.189003f, -0.266885f, -0.945014f, 0.875000f, 0.125000f,
+    0.000000f, -0.379175f, -0.989258f, 0.000000f, -0.266906f, -0.963722f, 1.000000f, 0.125000f,
+    -0.195791f, -0.448242f, -0.941719f, -0.171993f, -0.480502f, -0.859963f, 0.875000f, 0.250000f,
+    -0.540527f, -0.448242f, -0.798779f, -0.488123f, -0.481553f, -0.727903f, 0.625000f, 0.250000f,
+    -0.653838f, -0.507642f, -0.653838f, -0.550409f, -0.627775f, -0.550409f, 0.500000f, 0.375000f,
+    -0.518005f, -0.507642f, -0.765497f, -0.433756f, -0.627270f, -0.646829f, 0.625000f, 0.375000f,
+    -0.361453f, -0.507642f, -0.849529f, -0.299570f, -0.627172f, -0.718967f, 0.750000f, 0.375000f,
+    -0.492188f, -0.557812f, -0.727344f, -0.388259f, -0.716961f, -0.578983f, 0.625000f, 0.500000f,
+    -0.195791f, -0.448242f, -0.941719f, -0.171993f, -0.480502f, -0.859963f, 0.875000f, 0.250000f,
+    -0.361453f, -0.507642f, -0.849529f, -0.299570f, -0.627172f, -0.718967f, 0.750000f, 0.375000f,
+    -0.187633f, -0.507642f, -0.902480f, -0.152906f, -0.626188f, -0.764532f, 0.875000f, 0.375000f,
+    0.000000f, -0.507642f, -0.920898f, 0.000000f, -0.626221f, -0.779645f, 1.000000f, 0.375000f,
+    -0.178281f, -0.557812f, -0.857500f, -0.136915f, -0.715970f, -0.684574f, 0.875000f, 0.500000f,
+    -0.807187f, -0.557812f, -0.343437f, -0.644654f, -0.715731f, -0.268606f, 0.250000f, 0.500000f,
+    -0.789062f, -0.632227f, -0.000000f, -0.636383f, -0.771373f, -0.000000f, 0.000000f, 0.750000f,
+    -0.727910f, -0.632227f, -0.309707f, -0.587700f, -0.771133f, -0.244875f, 0.250000f, 0.750000f,
+    -0.560234f, -0.632227f, -0.560234f, -0.448897f, -0.772647f, -0.448897f, 0.500000f, 0.750000f,
+    -0.691875f, -0.675000f, -0.294375f, -0.923077f, -0.000000f, -0.384615f, 0.250000f, 1.000000f,
+    -0.857500f, -0.557812f, -0.178281f, -0.684525f, -0.716018f, -0.136905f, 0.125000f, 0.500000f,
+    -0.829102f, -0.599194f, -0.000000f, -0.645429f, -0.763821f, -0.000000f, 0.000000f, 0.625000f,
+    -0.812519f, -0.599194f, -0.168929f, -0.632876f, -0.763837f, -0.126575f, 0.125000f, 0.625000f,
+    -0.764846f, -0.599194f, -0.325422f, -0.594912f, -0.764614f, -0.247880f, 0.250000f, 0.625000f,
+    -0.773281f, -0.632227f, -0.160771f, -0.624005f, -0.771390f, -0.124801f, 0.125000f, 0.750000f,
+    -0.727344f, -0.557812f, -0.492188f, -0.578969f, -0.716978f, -0.388249f, 0.375000f, 0.500000f,
+    -0.764846f, -0.599194f, -0.325422f, -0.594912f, -0.764614f, -0.247880f, 0.250000f, 0.625000f,
+    -0.689191f, -0.599194f, -0.466370f, -0.535179f, -0.764712f, -0.358885f, 0.375000f, 0.625000f,
+    -0.588662f, -0.599194f, -0.588662f, -0.455299f, -0.765118f, -0.455299f, 0.500000f, 0.625000f,
+    -0.655908f, -0.632227f, -0.443848f, -0.527662f, -0.772248f, -0.353844f, 0.375000f, 0.750000f,
+    -0.773281f, -0.632227f, -0.160771f, -0.624005f, -0.771390f, -0.124801f, 0.125000f, 0.750000f,
+    -0.760742f, -0.657349f, -0.000000f, -0.720596f, -0.693356f, -0.000000f, 0.000000f, 0.875000f,
+    -0.745527f, -0.657349f, -0.155001f, -0.706584f, -0.693375f, -0.141317f, 0.125000f, 0.875000f,
+    -0.701785f, -0.657349f, -0.298591f, -0.664366f, -0.694254f, -0.276819f, 0.250000f, 0.875000f,
+    -0.735000f, -0.675000f, -0.152812f, -0.980581f, -0.000000f, -0.196116f, 0.125000f, 1.000000f,
+    -0.655908f, -0.632227f, -0.443848f, -0.527662f, -0.772249f, -0.353844f, 0.375000f, 0.750000f,
+    -0.701785f, -0.657349f, -0.298591f, -0.664366f, -0.694254f, -0.276819f, 0.250000f, 0.875000f,
+    -0.632367f, -0.657349f, -0.427917f, -0.597679f, -0.694365f, -0.400796f, 0.375000f, 0.875000f,
+    -0.540127f, -0.657349f, -0.540127f, -0.508537f, -0.694825f, -0.508536f, 0.500000f, 0.875000f,
+    -0.623438f, -0.675000f, -0.421875f, -0.830544f, -0.000000f, -0.556953f, 0.375000f, 1.000000f,
+    -0.343437f, -0.557812f, -0.807187f, -0.268712f, -0.715463f, -0.644909f, 0.750000f, 0.500000f,
+    -0.560234f, -0.632227f, -0.560234f, -0.448897f, -0.772647f, -0.448897f, 0.500000f, 0.750000f,
+    -0.309707f, -0.632227f, -0.727910f, -0.244987f, -0.770892f, -0.587969f, 0.750000f, 0.750000f,
+    0.000000f, -0.632227f, -0.789062f, 0.000000f, -0.771373f, -0.636383f, 1.000000f, 0.750000f,
+    -0.294375f, -0.675000f, -0.691875f, -0.384615f, -0.000000f, -0.923077f, 0.750000f, 1.000000f,
+    -0.492188f, -0.557812f, -0.727344f, -0.388259f, -0.716961f, -0.578983f, 0.625000f, 0.500000f,
+    -0.588662f, -0.599194f, -0.588662f, -0.455299f, -0.765118f, -0.455299f, 0.500000f, 0.625000f,
+    -0.466370f, -0.599194f, -0.689191f, -0.358895f, -0.764697f, -0.535195f, 0.625000f, 0.625000f,
+    -0.325422f, -0.599194f, -0.764846f, -0.247880f, -0.764614f, -0.594912f, 0.750000f, 0.625000f,
+    -0.443848f, -0.632227f, -0.655908f, -0.353854f, -0.772233f, -0.527677f, 0.625000f, 0.750000f,
+    -0.178281f, -0.557812f, -0.857500f, -0.136915f, -0.715969f, -0.684575f, 0.875000f, 0.500000f,
+    -0.325422f, -0.599194f, -0.764846f, -0.247880f, -0.764614f, -0.594912f, 0.750000f, 0.625000f,
+    -0.168929f, -0.599194f, -0.812519f, -0.126585f, -0.763793f, -0.632927f, 0.875000f, 0.625000f,
+    0.000000f, -0.599194f, -0.829102f, 0.000000f, -0.763821f, -0.645429f, 1.000000f, 0.625000f,
+    -0.160771f, -0.632227f, -0.773281f, -0.124811f, -0.771346f, -0.624057f, 0.875000f, 0.750000f,
+    -0.443848f, -0.632227f, -0.655908f, -0.353854f, -0.772233f, -0.527677f, 0.625000f, 0.750000f,
+    -0.540127f, -0.657349f, -0.540127f, -0.508536f, -0.694825f, -0.508537f, 0.500000f, 0.875000f,
+    -0.427917f, -0.657349f, -0.632367f, -0.400806f, -0.694347f, -0.597693f, 0.625000f, 0.875000f,
+    -0.298591f, -0.657349f, -0.701785f, -0.276819f, -0.694254f, -0.664366f, 0.750000f, 0.875000f,
+    -0.421875f, -0.675000f, -0.623438f, -0.556953f, -0.000000f, -0.830544f, 0.625000f, 1.000000f,
+    -0.160771f, -0.632227f, -0.773281f, -0.124811f, -0.771346f, -0.624057f, 0.875000f, 0.750000f,
+    -0.298591f, -0.657349f, -0.701785f, -0.276819f, -0.694254f, -0.664366f, 0.750000f, 0.875000f,
+    -0.155001f, -0.657349f, -0.745527f, -0.141326f, -0.693324f, -0.706632f, 0.875000f, 0.875000f,
+    0.000000f, -0.657349f, -0.760742f, 0.000000f, -0.693356f, -0.720596f, 1.000000f, 0.875000f,
+    -0.152812f, -0.675000f, -0.735000f, -0.196116f, -0.000000f, -0.980581f, 0.875000f, 1.000000f,
+    0.000000f, -0.300000f, -1.000000f, 0.000000f, 0.000000f, -1.000000f, 0.000000f, 0.000000f,
+    1.000000f, -0.300000f, -0.000000f, 1.000000f, 0.000000f, -0.000000f, 1.000000f, 0.000000f,
+    0.000000f, -0.675000f, -0.750000f, 0.000000f, 0.000000f, -1.000000f, 0.000000f, 1.000000f,
+    0.750000f, -0.675000f, -0.000000f, 1.000000f, 0.000000f, -0.000000f, 1.000000f, 1.000000f,
+    0.710000f, -0.300000f, -0.710000f, 0.707107f, 0.000000f, -0.707107f, 0.500000f, 0.000000f,
+    0.000000f, -0.557812f, -0.875000f, 0.000000f, -0.716000f, -0.698100f, 0.000000f, 0.500000f,
+    0.621250f, -0.557812f, -0.621250f, 0.496182f, -0.712466f, -0.496182f, 0.500000f, 0.500000f,
+    0.875000f, -0.557812f, -0.000000f, 0.698100f, -0.716000f, 0.000000f, 1.000000f, 0.500000f,
+    0.532500f, -0.675000f, -0.532500f, 0.707107f, 0.000000f, -0.707107f, 0.500000f, 1.000000f,
+    0.392500f, -0.300000f, -0.922500f, 0.384615f, 0.000000f, -0.923077f, 0.250000f, 0.000000f,
+    0.000000f, -0.448242f, -0.960938f, 0.000000f, -0.480535f, -0.876976f, 0.000000f, 0.250000f,
+    0.377168f, -0.448242f, -0.886465f, 0.337358f, -0.480250f, -0.809660f, 0.250000f, 0.250000f,
+    0.682266f, -0.448242f, -0.682266f, 0.619529f, -0.482045f, -0.619529f, 0.500000f, 0.250000f,
+    0.343437f, -0.557812f, -0.807187f, 0.268606f, -0.715732f, -0.644654f, 0.250000f, 0.500000f,
+    0.203750f, -0.300000f, -0.980000f, 0.196116f, 0.000000f, -0.980581f, 0.125000f, 0.000000f,
+    0.000000f, -0.379175f, -0.989258f, 0.000000f, -0.266906f, -0.963722f, 0.000000f, 0.125000f,
+    0.201561f, -0.379175f, -0.969473f, 0.189001f, -0.266919f, -0.945004f, 0.125000f, 0.125000f,
+    0.388284f, -0.379175f, -0.912590f, 0.370596f, -0.267526f, -0.889432f, 0.250000f, 0.125000f,
+    0.195791f, -0.448242f, -0.941719f, 0.171987f, -0.480554f, -0.859935f, 0.125000f, 0.250000f,
+    0.562500f, -0.300000f, -0.831250f, 0.556953f, 0.000000f, -0.830544f, 0.375000f, 0.000000f,
+    0.388284f, -0.379175f, -0.912590f, 0.370597f, -0.267526f, -0.889431f, 0.250000f, 0.125000f,
+    0.556458f, -0.379175f, -0.822320f, 0.536641f, -0.267602f, -0.800254f, 0.375000f, 0.125000f,
+    0.702373f, -0.379175f, -0.702373f, 0.681256f, -0.267921f, -0.681256f, 0.500000f, 0.125000f,
+    0.540527f, -0.448242f, -0.798779f, 0.488118f, -0.481571f, -0.727894f, 0.375000f, 0.250000f,
+    0.195791f, -0.448242f, -0.941719f, 0.171987f, -0.480554f, -0.859935f, 0.125000f, 0.250000f,
+    0.000000f, -0.507642f, -0.920898f, 0.000000f, -0.626221f, -0.779645f, 0.000000f, 0.375000f,
+    0.187633f, -0.507642f, -0.902480f, 0.152898f, -0.626241f, -0.764489f, 0.125000f, 0.375000f,
+    0.361453f, -0.507642f, -0.849529f, 0.299570f, -0.627172f, -0.718967f, 0.250000f, 0.375000f,
+    0.178281f, -0.557812f, -0.857500f, 0.136905f, -0.716019f, -0.684525f, 0.125000f, 0.500000f,
+    0.540527f, -0.448242f, -0.798779f, 0.488118f, -0.481572f, -0.727894f, 0.375000f, 0.250000f,
+    0.361453f, -0.507642f, -0.849529f, 0.299570f, -0.627172f, -0.718967f, 0.250000f, 0.375000f,
+    0.518005f, -0.507642f, -0.765497f, 0.433748f, -0.627288f, -0.646817f, 0.375000f, 0.375000f,
+    0.653838f, -0.507642f, -0.653838f, 0.550409f, -0.627775f, -0.550409f, 0.500000f, 0.375000f,
+    0.492188f, -0.557812f, -0.727344f, 0.388249f, -0.716978f, -0.578969f, 0.375000f, 0.500000f,
+    0.922500f, -0.300000f, -0.392500f, 0.923077f, 0.000000f, -0.384615f, 0.750000f, 0.000000f,
+    0.682266f, -0.448242f, -0.682266f, 0.619529f, -0.482045f, -0.619529f, 0.500000f, 0.250000f,
+    0.886465f, -0.448242f, -0.377168f, 0.809804f, -0.479966f, -0.337418f, 0.750000f, 0.250000f,
+    0.960938f, -0.448242f, -0.000000f, 0.876976f, -0.480535f, 0.000000f, 1.000000f, 0.250000f,
+    0.807187f, -0.557812f, -0.343437f, 0.644908f, -0.715463f, -0.268712f, 0.750000f, 0.500000f,
+    0.831250f, -0.300000f, -0.562500f, 0.830544f, 0.000000f, -0.556953f, 0.625000f, 0.000000f,
+    0.702373f, -0.379175f, -0.702373f, 0.681256f, -0.267921f, -0.681256f, 0.500000f, 0.125000f,
+    0.822320f, -0.379175f, -0.556458f, 0.800256f, -0.267590f, -0.536643f, 0.625000f, 0.125000f,
+    0.912590f, -0.379175f, -0.388284f, 0.889431f, -0.267526f, -0.370597f, 0.750000f, 0.125000f,
+    0.798779f, -0.448242f, -0.540527f, 0.727903f, -0.481553f, -0.488123f, 0.625000f, 0.250000f,
+    0.980000f, -0.300000f, -0.203750f, 0.980581f, 0.000000f, -0.196116f, 0.875000f, 0.000000f,
+    0.912590f, -0.379175f, -0.388284f, 0.889432f, -0.267526f, -0.370596f, 0.750000f, 0.125000f,
+    0.969473f, -0.379175f, -0.201561f, 0.945014f, -0.266885f, -0.189003f, 0.875000f, 0.125000f,
+    0.989258f, -0.379175f, -0.000000f, 0.963722f, -0.266906f, 0.000000f, 1.000000f, 0.125000f,
+    0.941719f, -0.448242f, -0.195791f, 0.859963f, -0.480502f, -0.171993f, 0.875000f, 0.250000f,
+    0.798779f, -0.448242f, -0.540527f, 0.727903f, -0.481553f, -0.488123f, 0.625000f, 0.250000f,
+    0.653838f, -0.507642f, -0.653838f, 0.550409f, -0.627775f, -0.550409f, 0.500000f, 0.375000f,
+    0.765497f, -0.507642f, -0.518005f, 0.646829f, -0.627270f, -0.433756f, 0.625000f, 0.375000f,
+    0.849529f, -0.507642f, -0.361453f, 0.718967f, -0.627172f, -0.299570f, 0.750000f, 0.375000f,
+    0.727344f, -0.557812f, -0.492188f, 0.578983f, -0.716961f, -0.388259f, 0.625000f, 0.500000f,
+    0.941719f, -0.448242f, -0.195791f, 0.859963f, -0.480502f, -0.171993f, 0.875000f, 0.250000f,
+    0.849529f, -0.507642f, -0.361453f, 0.718967f, -0.627172f, -0.299570f, 0.750000f, 0.375000f,
+    0.902480f, -0.507642f, -0.187633f, 0.764532f, -0.626188f, -0.152906f, 0.875000f, 0.375000f,
+    0.920898f, -0.507642f, -0.000000f, 0.779645f, -0.626221f, 0.000000f, 1.000000f, 0.375000f,
+    0.857500f, -0.557812f, -0.178281f, 0.684574f, -0.715970f, -0.136915f, 0.875000f, 0.500000f,
+    0.343437f, -0.557812f, -0.807187f, 0.268606f, -0.715731f, -0.644654f, 0.250000f, 0.500000f,
+    0.000000f, -0.632227f, -0.789062f, 0.000000f, -0.771373f, -0.636383f, 0.000000f, 0.750000f,
+    0.309707f, -0.632227f, -0.727910f, 0.244875f, -0.771133f, -0.587700f, 0.250000f, 0.750000f,
+    0.560234f, -0.632227f, -0.560234f, 0.448897f, -0.772647f, -0.448897f, 0.500000f, 0.750000f,
+    0.294375f, -0.675000f, -0.691875f, 0.384615f, 0.000000f, -0.923077f, 0.250000f, 1.000000f,
+    0.178281f, -0.557812f, -0.857500f, 0.136905f, -0.716018f, -0.684525f, 0.125000f, 0.500000f,
+    0.000000f, -0.599194f, -0.829102f, 0.000000f, -0.763821f, -0.645429f, 0.000000f, 0.625000f,
+    0.168929f, -0.599194f, -0.812519f, 0.126575f, -0.763837f, -0.632876f, 0.125000f, 0.625000f,
+    0.325422f, -0.599194f, -0.764846f, 0.247880f, -0.764614f, -0.594912f, 0.250000f, 0.625000f,
+    0.160771f, -0.632227f, -0.773281f, 0.124801f, -0.771390f, -0.624005f, 0.125000f, 0.750000f,
+    0.492188f, -0.557812f, -0.727344f, 0.388249f, -0.716978f, -0.578969f, 0.375000f, 0.500000f,
+    0.325422f, -0.599194f, -0.764846f, 0.247880f, -0.764614f, -0.594912f, 0.250000f, 0.625000f,
+    0.466370f, -0.599194f, -0.689191f, 0.358885f, -0.764712f, -0.535179f, 0.375000f, 0.625000f,
+    0.588662f, -0.599194f, -0.588662f, 0.455299f, -0.765118f, -0.455299f, 0.500000f, 0.625000f,
+    0.443848f, -0.632227f, -0.655908f, 0.353844f, -0.772248f, -0.527662f, 0.375000f, 0.750000f,
+    0.160771f, -0.632227f, -0.773281f, 0.124801f, -0.771390f, -0.624005f, 0.125000f, 0.750000f,
+    0.000000f, -0.657349f, -0.760742f, 0.000000f, -0.693356f, -0.720596f, 0.000000f, 0.875000f,
+    0.155001f, -0.657349f, -0.745527f, 0.141317f, -0.693375f, -0.706584f, 0.125000f, 0.875000f,
+    0.298591f, -0.657349f, -0.701785f, 0.276819f, -0.694254f, -0.664366f, 0.250000f, 0.875000f,
+    0.152812f, -0.675000f, -0.735000f, 0.196116f, 0.000000f, -0.980581f, 0.125000f, 1.000000f,
+    0.443848f, -0.632227f, -0.655908f, 0.353844f, -0.772249f, -0.527662f, 0.375000f, 0.750000f,
+    0.298591f, -0.657349f, -0.701785f, 0.276819f, -0.694254f, -0.664366f, 0.250000f, 0.875000f,
+    0.427917f, -0.657349f, -0.632367f, 0.400796f, -0.694365f, -0.597679f, 0.375000f, 0.875000f,
+    0.540127f, -0.657349f, -0.540127f, 0.508536f, -0.694825f, -0.508537f, 0.500000f, 0.875000f,
+    0.421875f, -0.675000f, -0.623438f, 0.556953f, 0.000000f, -0.830544f, 0.375000f, 1.000000f,
+    0.807187f, -0.557812f, -0.343437f, 0.644909f, -0.715463f, -0.268712f, 0.750000f, 0.500000f,
+    0.560234f, -0.632227f, -0.560234f, 0.448897f, -0.772647f, -0.448897f, 0.500000f, 0.750000f,
+    0.727910f, -0.632227f, -0.309707f, 0.587969f, -0.770892f, -0.244987f, 0.750000f, 0.750000f,
+    0.789062f, -0.632227f, -0.000000f, 0.636383f, -0.771373f, 0.000000f, 1.000000f, 0.750000f,
+    0.691875f, -0.675000f, -0.294375f, 0.923077f, 0.000000f, -0.384615f, 0.750000f, 1.000000f,
+    0.727344f, -0.557812f, -0.492188f, 0.578983f, -0.716961f, -0.388259f, 0.625000f, 0.500000f,
+    0.588662f, -0.599194f, -0.588662f, 0.455299f, -0.765118f, -0.455299f, 0.500000f, 0.625000f,
+    0.689191f, -0.599194f, -0.466370f, 0.535195f, -0.764697f, -0.358895f, 0.625000f, 0.625000f,
+    0.764846f, -0.599194f, -0.325422f, 0.594912f, -0.764614f, -0.247880f, 0.750000f, 0.625000f,
+    0.655908f, -0.632227f, -0.443848f, 0.527677f, -0.772233f, -0.353854f, 0.625000f, 0.750000f,
+    0.857500f, -0.557812f, -0.178281f, 0.684575f, -0.715969f, -0.136915f, 0.875000f, 0.500000f,
+    0.764846f, -0.599194f, -0.325422f, 0.594912f, -0.764614f, -0.247880f, 0.750000f, 0.625000f,
+    0.812519f, -0.599194f, -0.168929f, 0.632927f, -0.763793f, -0.126585f, 0.875000f, 0.625000f,
+    0.829102f, -0.599194f, -0.000000f, 0.645429f, -0.763821f, 0.000000f, 1.000000f, 0.625000f,
+    0.773281f, -0.632227f, -0.160771f, 0.624057f, -0.771346f, -0.124811f, 0.875000f, 0.750000f,
+    0.655908f, -0.632227f, -0.443848f, 0.527677f, -0.772233f, -0.353854f, 0.625000f, 0.750000f,
+    0.540127f, -0.657349f, -0.540127f, 0.508537f, -0.694825f, -0.508536f, 0.500000f, 0.875000f,
+    0.632367f, -0.657349f, -0.427917f, 0.597693f, -0.694347f, -0.400806f, 0.625000f, 0.875000f,
+    0.701785f, -0.657349f, -0.298591f, 0.664366f, -0.694254f, -0.276819f, 0.750000f, 0.875000f,
+    0.623438f, -0.675000f, -0.421875f, 0.830544f, 0.000000f, -0.556953f, 0.625000f, 1.000000f,
+    0.773281f, -0.632227f, -0.160771f, 0.624057f, -0.771346f, -0.124811f, 0.875000f, 0.750000f,
+    0.701785f, -0.657349f, -0.298591f, 0.664366f, -0.694254f, -0.276819f, 0.750000f, 0.875000f,
+    0.745527f, -0.657349f, -0.155001f, 0.706632f, -0.693324f, -0.141326f, 0.875000f, 0.875000f,
+    0.760742f, -0.657349f, -0.000000f, 0.720596f, -0.693356f, 0.000000f, 1.000000f, 0.875000f,
+    0.735000f, -0.675000f, -0.152812f, 0.980581f, 0.000000f, -0.196116f, 0.875000f, 1.000000f,
+    -0.800000f, 0.262500f, -0.000000f, 0.000000f, -1.000000f, 0.000000f, 0.000000f, 0.000000f,
+    -0.750000f, 0.375000f, -0.000000f, 0.000000f, 1.000000f, 0.000000f, 1.000000f, 0.000000f,
+    -1.350000f, 0.150000f, -0.000000f, 1.000000f, 0.000000f, -0.000000f, 0.000000f, 1.000000f,
+    -1.500000f, 0.150000f, -0.000000f, -1.000000f, -0.000000f, -0.000000f, 1.000000f, 1.000000f,
+    -0.775000f, 0.318750f, 0.112500f, 0.000000f, -0.000000f, 1.000000f, 0.500000f, 0.000000f,
+    -1.206250f, 0.248438f, -0.000000f, 0.148341f, -0.988936f, 0.000000f, 0.000000f, 0.500000f,
+    -1.259375f, 0.297656f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.500000f,
+    -1.312500f, 0.346875f, -0.000000f, -0.219512f, 0.975610f, 0.000000f, 1.000000f, 0.500000f,
+    -1.425000f, 0.150000f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 1.000000f,
+    -0.792188f, 0.280078f, 0.084375f, 0.000000f, -0.871576f, 0.490261f, 0.250000f, 0.000000f,
+    -1.033594f, 0.260742f, -0.000000f, 0.025853f, -0.999666f, 0.000000f, 0.000000f, 0.250000f,
+    -1.040552f, 0.278046f, 0.084375f, 0.024475f, -0.872955f, 0.487186f, 0.250000f, 0.250000f,
+    -1.055859f, 0.316113f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.250000f,
+    -1.222852f, 0.263818f, 0.084375f, 0.140206f, -0.856814f, 0.496198f, 0.250000f, 0.500000f,
+    -0.797852f, 0.267334f, 0.049219f, 0.000000f, -0.976900f, 0.213697f, 0.125000f, 0.000000f,
+    -0.924121f, 0.262280f, -0.000000f, 0.005639f, -0.999984f, 0.000000f, 0.000000f, 0.125000f,
+    -0.924192f, 0.267105f, 0.049219f, 0.005639f, -0.976986f, 0.213230f, 0.125000f, 0.125000f,
+    -0.924381f, 0.279824f, 0.084375f, 0.005349f, -0.872040f, 0.489406f, 0.250000f, 0.125000f,
+    -1.035507f, 0.265501f, 0.049219f, 0.025883f, -0.976801f, 0.212578f, 0.125000f, 0.250000f,
+    -0.784180f, 0.298096f, 0.105469f, 0.000000f, -0.579524f, 0.814955f, 0.375000f, 0.000000f,
+    -0.924381f, 0.279824f, 0.084375f, 0.005349f, -0.872040f, 0.489406f, 0.250000f, 0.125000f,
+    -0.924646f, 0.297807f, 0.105469f, 0.003808f, -0.580397f, 0.814324f, 0.375000f, 0.125000f,
+    -0.924951f, 0.318420f, 0.112500f, 0.000000f, -0.000000f, 1.000000f, 0.500000f, 0.125000f,
+    -1.047684f, 0.295782f, 0.105469f, 0.017593f, -0.580836f, 0.813830f, 0.375000f, 0.250000f,
+    -1.035507f, 0.265501f, 0.049219f, 0.025883f, -0.976801f, 0.212578f, 0.125000f, 0.250000f,
+    -1.127832f, 0.256567f, -0.000000f, 0.068483f, -0.997652f, 0.000000f, 0.000000f, 0.375000f,
+    -1.131235f, 0.261146f, 0.049219f, 0.068616f, -0.974722f, 0.212623f, 0.125000f, 0.375000f,
+    -1.140207f, 0.273219f, 0.084375f, 0.065384f, -0.869606f, 0.489398f, 0.250000f, 0.375000f,
+    -1.210815f, 0.252667f, 0.049219f, 0.148598f, -0.965146f, 0.215435f, 0.125000f, 0.500000f,
+    -1.047684f, 0.295782f, 0.105469f, 0.017593f, -0.580836f, 0.813830f, 0.375000f, 0.250000f,
+    -1.140207f, 0.273219f, 0.084375f, 0.065384f, -0.869606f, 0.489398f, 0.250000f, 0.375000f,
+    -1.152891f, 0.290286f, 0.105469f, 0.046704f, -0.577184f, 0.815278f, 0.375000f, 0.375000f,
+    -1.167432f, 0.309851f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.375000f,
+    -1.239868f, 0.279584f, 0.105469f, 0.099732f, -0.560496f, 0.822130f, 0.375000f, 0.500000f,
+    -0.757812f, 0.357422f, 0.084375f, 0.000000f, 0.871576f, 0.490261f, 0.750000f, 0.000000f,
+    -1.055859f, 0.316113f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.250000f,
+    -1.071167f, 0.354181f, 0.084375f, -0.031326f, 0.872200f, 0.488145f, 0.750000f, 0.250000f,
+    -1.078125f, 0.371484f, -0.000000f, -0.037474f, 0.999298f, 0.000000f, 1.000000f, 0.250000f,
+    -1.295898f, 0.331494f, 0.084375f, -0.180412f, 0.841138f, 0.509842f, 0.750000f, 0.500000f,
+    -0.765820f, 0.339404f, 0.105469f, 0.000000f, 0.579524f, 0.814955f, 0.625000f, 0.000000f,
+    -0.924951f, 0.318420f, 0.112500f, 0.000000f, -0.000000f, 1.000000f, 0.500000f, 0.125000f,
+    -0.925256f, 0.339034f, 0.105469f, -0.004308f, 0.580398f, 0.814321f, 0.625000f, 0.125000f,
+    -0.925522f, 0.357017f, 0.084375f, -0.006764f, 0.872035f, 0.489397f, 0.750000f, 0.125000f,
+    -1.064035f, 0.336445f, 0.105469f, -0.020004f, 0.580169f, 0.814250f, 0.625000f, 0.250000f,
+    -0.752148f, 0.370166f, 0.049219f, 0.000000f, 0.976900f, 0.213697f, 0.875000f, 0.000000f,
+    -0.925522f, 0.357017f, 0.084375f, -0.006764f, 0.872035f, 0.489398f, 0.750000f, 0.125000f,
+    -0.925710f, 0.369736f, 0.049219f, -0.007768f, 0.976972f, 0.213224f, 0.875000f, 0.125000f,
+    -0.925781f, 0.374561f, -0.000000f, -0.008035f, 0.999968f, 0.000000f, 1.000000f, 0.125000f,
+    -1.076211f, 0.366726f, 0.049219f, -0.036201f, 0.976302f, 0.213364f, 0.875000f, 0.250000f,
+    -1.064035f, 0.336445f, 0.105469f, -0.020004f, 0.580169f, 0.814250f, 0.625000f, 0.250000f,
+    -1.167432f, 0.309851f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.375000f,
+    -1.181972f, 0.329416f, 0.105469f, -0.053190f, 0.573905f, 0.817192f, 0.625000f, 0.375000f,
+    -1.194656f, 0.346484f, 0.084375f, -0.084210f, 0.865181f, 0.494338f, 0.750000f, 0.375000f,
+    -1.278882f, 0.315729f, 0.105469f, -0.112865f, 0.550447f, 0.827206f, 0.625000f, 0.500000f,
+    -1.076211f, 0.366726f, 0.049219f, -0.036201f, 0.976302f, 0.213364f, 0.875000f, 0.250000f,
+    -1.194656f, 0.346484f, 0.084375f, -0.084210f, 0.865181f, 0.494339f, 0.750000f, 0.375000f,
+    -1.203628f, 0.358556f, 0.049219f, -0.097201f, 0.971485f, 0.216262f, 0.875000f, 0.375000f,
+    -1.207031f, 0.363135f, -0.000000f, -0.100735f, 0.994913f, 0.000000f, 1.000000f, 0.375000f,
+    -1.307935f, 0.342645f, 0.049219f, -0.211316f, 0.951005f, 0.225686f, 0.875000f, 0.500000f,
+    -1.222852f, 0.263818f, 0.084375f, 0.140206f, -0.856814f, 0.496198f, 0.250000f, 0.500000f,
+    -1.313281f, 0.215039f, -0.000000f, 0.546885f, -0.837207f, 0.000000f, 0.000000f, 0.750000f,
+    -1.335132f, 0.225201f, 0.084375f, 0.483435f, -0.674422f, 0.558073f, 0.250000f, 0.750000f,
+    -1.383203f, 0.247559f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.750000f,
+    -1.373438f, 0.150000f, 0.084375f, 0.800000f, 0.000000f, 0.600000f, 0.250000f, 1.000000f,
+    -1.210815f, 0.252667f, 0.049219f, 0.148598f, -0.965146f, 0.215435f, 0.125000f, 0.500000f,
+    -1.268262f, 0.235034f, -0.000000f, 0.293811f, -0.955864f, 0.000000f, 0.000000f, 0.625000f,
+    -1.273687f, 0.238688f, 0.049219f, 0.293318f, -0.928882f, 0.226146f, 0.125000f, 0.625000f,
+    -1.287991f, 0.248321f, 0.084375f, 0.274428f, -0.809737f, 0.518667f, 0.250000f, 0.625000f,
+    -1.319290f, 0.217834f, 0.049219f, 0.540058f, -0.804093f, 0.248541f, 0.125000f, 0.750000f,
+    -1.239868f, 0.279584f, 0.105469f, 0.099732f, -0.560497f, 0.822130f, 0.375000f, 0.500000f,
+    -1.287991f, 0.248321f, 0.084375f, 0.274428f, -0.809736f, 0.518669f, 0.250000f, 0.625000f,
+    -1.308214f, 0.261940f, 0.105469f, 0.187187f, -0.510240f, 0.839414f, 0.375000f, 0.625000f,
+    -1.331396f, 0.277551f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.625000f,
+    -1.357529f, 0.235618f, 0.105469f, 0.310389f, -0.395752f, 0.864314f, 0.375000f, 0.750000f,
+    -1.319290f, 0.217834f, 0.049219f, 0.540058f, -0.804093f, 0.248541f, 0.125000f, 0.750000f,
+    -1.340723f, 0.187134f, -0.000000f, 0.868244f, -0.496138f, 0.000000f, 0.000000f, 0.875000f,
+    -1.347063f, 0.188729f, 0.049219f, 0.840433f, -0.466702f, 0.275432f, 0.125000f, 0.875000f,
+    -1.363779f, 0.192936f, 0.084375f, 0.713833f, -0.367656f, 0.596046f, 0.250000f, 0.875000f,
+    -1.356445f, 0.150000f, 0.049219f, 0.960000f, 0.000000f, 0.280000f, 0.125000f, 1.000000f,
+    -1.357529f, 0.235618f, 0.105469f, 0.310389f, -0.395752f, 0.864314f, 0.375000f, 0.750000f,
+    -1.363779f, 0.192936f, 0.084375f, 0.713834f, -0.367656f, 0.596045f, 0.250000f, 0.875000f,
+    -1.387411f, 0.198883f, 0.105469f, 0.426484f, -0.201800f, 0.881696f, 0.375000f, 0.875000f,
+    -1.414502f, 0.205701f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.875000f,
+    -1.397461f, 0.150000f, 0.105469f, 0.470589f, 0.000000f, 0.882353f, 0.375000f, 1.000000f,
+    -1.295898f, 0.331494f, 0.084375f, -0.180412f, 0.841138f, 0.509842f, 0.750000f, 0.500000f,
+    -1.383203f, 0.247559f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.750000f,
+    -1.431274f, 0.269916f, 0.084375f, -0.562646f, 0.585663f, 0.583462f, 0.750000f, 0.750000f,
+    -1.453125f, 0.280078f, -0.000000f, -0.711485f, 0.702701f, 0.000000f, 1.000000f, 0.750000f,
+    -1.476562f, 0.150000f, 0.084375f, -0.800000f, 0.000000f, 0.600000f, 0.750000f, 1.000000f,
+    -1.278882f, 0.315729f, 0.105469f, -0.112865f, 0.550447f, 0.827206f, 0.625000f, 0.500000f,
+    -1.331396f, 0.277551f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.625000f,
+    -1.354579f, 0.293163f, 0.105469f, -0.207595f, 0.488130f, 0.847722f, 0.625000f, 0.625000f,
+    -1.374802f, 0.306782f, 0.084375f, -0.343732f, 0.765920f, 0.543338f, 0.750000f, 0.625000f,
+    -1.408878f, 0.259499f, 0.105469f, -0.330606f, 0.361483f, 0.871797f, 0.625000f, 0.750000f,
+    -1.307935f, 0.342645f, 0.049219f, -0.211317f, 0.951005f, 0.225686f, 0.875000f, 0.500000f,
+    -1.374802f, 0.306782f, 0.084375f, -0.343732f, 0.765919f, 0.543338f, 0.750000f, 0.625000f,
+    -1.389106f, 0.316415f, 0.049219f, -0.407011f, 0.879764f, 0.245675f, 0.875000f, 0.625000f,
+    -1.394531f, 0.320068f, -0.000000f, -0.424434f, 0.905459f, 0.000000f, 1.000000f, 0.625000f,
+    -1.447116f, 0.277283f, 0.049219f, -0.680178f, 0.681081f, 0.271085f, 0.875000f, 0.750000f,
+    -1.408878f, 0.259499f, 0.105469f, -0.330606f, 0.361483f, 0.871797f, 0.625000f, 0.750000f,
+    -1.414502f, 0.205701f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.875000f,
+    -1.441593f, 0.212518f, 0.105469f, -0.434397f, 0.175246f, 0.883509f, 0.625000f, 0.875000f,
+    -1.465225f, 0.218465f, 0.084375f, -0.745462f, 0.283642f, 0.603187f, 0.750000f, 0.875000f,
+    -1.452539f, 0.150000f, 0.105469f, -0.470588f, 0.000000f, 0.882353f, 0.625000f, 1.000000f,
+    -1.447116f, 0.277283f, 0.049219f, -0.680178f, 0.681081f, 0.271085f, 0.875000f, 0.750000f,
+    -1.465225f, 0.218465f, 0.084375f, -0.745462f, 0.283642f, 0.603187f, 0.750000f, 0.875000f,
+    -1.481941f, 0.222672f, 0.049219f, -0.900243f, 0.331346f, 0.282440f, 0.875000f, 0.875000f,
+    -1.488281f, 0.224268f, -0.000000f, -0.940042f, 0.341058f, 0.000000f, 1.000000f, 0.875000f,
+    -1.493555f, 0.150000f, 0.049219f, -0.960000f, 0.000000f, 0.280000f, 0.875000f, 1.000000f,
+    -0.750000f, 0.375000f, -0.000000f, 0.000000f, 1.000000f, 0.000000f, 0.000000f, 0.000000f,
+    -0.800000f, 0.262500f, -0.000000f, 0.000000f, -1.000000f, 0.000000f, 1.000000f, 0.000000f,
+    -1.500000f, 0.150000f, -0.000000f, -1.000000f, -0.000000f, -0.000000f, 0.000000f, 1.000000f,
+    -1.350000f, 0.150000f, -0.000000f, 1.000000f, 0.000000f, -0.000000f, 1.000000f, 1.000000f,
+    -0.775000f, 0.318750f, -0.112500f, -0.000000f, 0.000000f, -1.000000f, 0.500000f, 0.000000f,
+    -1.312500f, 0.346875f, -0.000000f, -0.219512f, 0.975610f, 0.000000f, 0.000000f, 0.500000f,
+    -1.259375f, 0.297656f, -0.112500f, 0.000000f, -0.000000f, -1.000000f, 0.500000f, 0.500000f,
+    -1.206250f, 0.248438f, -0.000000f, 0.148341f, -0.988936f, 0.000000f, 1.000000f, 0.500000f,
+    -1.425000f, 0.150000f, -0.112500f, 0.000000f, 0.000000f, -1.000000f, 0.500000f, 1.000000f,
+    -0.757812f, 0.357422f, -0.084375f, 0.000000f, 0.871576f, -0.490261f, 0.250000f, 0.000000f,
+    -1.078125f, 0.371484f, -0.000000f, -0.037474f, 0.999298f, 0.000000f, 0.000000f, 0.250000f,
+    -1.071167f, 0.354181f, -0.084375f, -0.031612f, 0.872168f, -0.488184f, 0.250000f, 0.250000f,
+    -1.055859f, 0.316113f, -0.112500f, 0.000000f, -0.000000f, -1.000000f, 0.500000f, 0.250000f,
+    -1.295898f, 0.331494f, -0.084375f, -0.182095f, 0.840441f, -0.510393f, 0.250000f, 0.500000f,
+    -0.752148f, 0.370166f, -0.049219f, 0.000000f, 0.976900f, -0.213697f, 0.125000f, 0.000000f,
+    -0.925781f, 0.374561f, -0.000000f, -0.008035f, 0.999968f, 0.000000f, 0.000000f, 0.125000f,
+    -0.925710f, 0.369736f, -0.049219f, -0.007783f, 0.976972f, -0.213224f, 0.125000f, 0.125000f,
+    -0.925522f, 0.357017f, -0.084375f, -0.006764f, 0.872035f, -0.489398f, 0.250000f, 0.125000f,
+    -1.076211f, 0.366726f, -0.049219f, -0.036277f, 0.976298f, -0.213369f, 0.125000f, 0.250000f,
+    -0.765820f, 0.339404f, -0.105469f, 0.000000f, 0.579524f, -0.814955f, 0.375000f, 0.000000f,
+    -0.925522f, 0.357017f, -0.084375f, -0.006764f, 0.872035f, -0.489397f, 0.250000f, 0.125000f,
+    -0.925256f, 0.339034f, -0.105469f, -0.004329f, 0.580399f, -0.814321f, 0.375000f, 0.125000f,
+    -0.924951f, 0.318420f, -0.112500f, 0.000000f, 0.000000f, -1.000000f, 0.500000f, 0.125000f,
+    -1.064035f, 0.336445f, -0.105469f, -0.020108f, 0.580140f, -0.814268f, 0.375000f, 0.250000f,
+    -1.076211f, 0.366726f, -0.049219f, -0.036277f, 0.976298f, -0.213369f, 0.125000f, 0.250000f,
+    -1.207031f, 0.363135f, -0.000000f, -0.100735f, 0.994913f, 0.000000f, 0.000000f, 0.375000f,
+    -1.203628f, 0.358556f, -0.049219f, -0.097411f, 0.971458f, -0.216288f, 0.125000f, 0.375000f,
+    -1.194656f, 0.346484f, -0.084375f, -0.084210f, 0.865181f, -0.494339f, 0.250000f, 0.375000f,
+    -1.307935f, 0.342645f, -0.049219f, -0.211778f, 0.950885f, -0.225758f, 0.125000f, 0.500000f,
+    -1.064035f, 0.336445f, -0.105469f, -0.020108f, 0.580141f, -0.814268f, 0.375000f, 0.250000f,
+    -1.194656f, 0.346484f, -0.084375f, -0.084210f, 0.865181f, -0.494338f, 0.250000f, 0.375000f,
+    -1.181972f, 0.329416f, -0.105469f, -0.053470f, 0.573763f, -0.817274f, 0.375000f, 0.375000f,
+    -1.167432f, 0.309851f, -0.112500f, 0.000000f, -0.000000f, -1.000000f, 0.500000f, 0.375000f,
+    -1.278882f, 0.315729f, -0.105469f, -0.113428f, 0.550012f, -0.827418f, 0.375000f, 0.500000f,
+    -0.792188f, 0.280078f, -0.084375f, -0.000000f, -0.871576f, -0.490261f, 0.750000f, 0.000000f,
+    -1.055859f, 0.316113f, -0.112500f, 0.000000f, -0.000000f, -1.000000f, 0.500000f, 0.250000f,
+    -1.040552f, 0.278046f, -0.084375f, 0.024919f, -0.872908f, -0.487248f, 0.750000f, 0.250000f,
+    -1.033594f, 0.260742f, -0.000000f, 0.025853f, -0.999666f, 0.000000f, 1.000000f, 0.250000f,
+    -1.222852f, 0.263818f, -0.084375f, 0.142803f, -0.855858f, -0.497107f, 0.750000f, 0.500000f,
+    -0.784180f, 0.298096f, -0.105469f, -0.000000f, -0.579524f, -0.814955f, 0.625000f, 0.000000f,
+    -0.924951f, 0.318420f, -0.112500f, 0.000000f, 0.000000f, -1.000000f, 0.500000f, 0.125000f,
+    -0.924646f, 0.297807f, -0.105469f, 0.003835f, -0.580398f, -0.814324f, 0.625000f, 0.125000f,
+    -0.924381f, 0.279824f, -0.084375f, 0.005349f, -0.872040f, -0.489406f, 0.750000f, 0.125000f,
+    -1.047684f, 0.295782f, -0.105469f, 0.017725f, -0.580800f, -0.813853f, 0.625000f, 0.250000f,
+    -0.797852f, 0.267334f, -0.049219f, -0.000000f, -0.976900f, -0.213697f, 0.875000f, 0.000000f,
+    -0.924381f, 0.279824f, -0.084375f, 0.005349f, -0.872040f, -0.489406f, 0.750000f, 0.125000f,
+    -0.924192f, 0.267105f, -0.049219f, 0.005668f, -0.976986f, -0.213230f, 0.875000f, 0.125000f,
+    -0.924121f, 0.262280f, -0.000000f, 0.005639f, -0.999984f, 0.000000f, 1.000000f, 0.125000f,
+    -1.035507f, 0.265501f, -0.049219f, 0.026018f, -0.976795f, -0.212588f, 0.875000f, 0.250000f,
+    -1.047684f, 0.295782f, -0.105469f, 0.017725f, -0.580800f, -0.813853f, 0.625000f, 0.250000f,
+    -1.167432f, 0.309851f, -0.112500f, 0.000000f, -0.000000f, -1.000000f, 0.500000f, 0.375000f,
+    -1.152891f, 0.290286f, -0.105469f, 0.047058f, -0.577006f, -0.815383f, 0.625000f, 0.375000f,
+    -1.140207f, 0.273219f, -0.084375f, 0.065384f, -0.869606f, -0.489398f, 0.750000f, 0.375000f,
+    -1.239868f, 0.279584f, -0.105469f, 0.100453f, -0.559950f, -0.822414f, 0.625000f, 0.500000f,
+    -1.035507f, 0.265501f, -0.049219f, 0.026018f, -0.976795f, -0.212588f, 0.875000f, 0.250000f,
+    -1.140207f, 0.273219f, -0.084375f, 0.065384f, -0.869606f, -0.489398f, 0.750000f, 0.375000f,
+    -1.131235f, 0.261146f, -0.049219f, 0.068986f, -0.974686f, -0.212671f, 0.875000f, 0.375000f,
+    -1.127832f, 0.256567f, -0.000000f, 0.068483f, -0.997652f, 0.000000f, 1.000000f, 0.375000f,
+    -1.210815f, 0.252667f, -0.049219f, 0.149411f, -0.964989f, -0.215573f, 0.875000f, 0.500000f,
+    -1.295898f, 0.331494f, -0.084375f, -0.182096f, 0.840441f, -0.510393f, 0.250000f, 0.500000f,
+    -1.453125f, 0.280078f, -0.000000f, -0.711485f, 0.702701f, 0.000000f, 0.000000f, 0.750000f,
+    -1.431274f, 0.269916f, -0.084375f, -0.565483f, 0.582130f, -0.584255f, 0.250000f, 0.750000f,
+    -1.383203f, 0.247559f, -0.112500f, 0.000000f, -0.000000f, -1.000000f, 0.500000f, 0.750000f,
+    -1.476562f, 0.150000f, -0.084375f, -0.800000f, -0.000000f, -0.600000f, 0.250000f, 1.000000f,
+    -1.307935f, 0.342645f, -0.049219f, -0.211779f, 0.950885f, -0.225758f, 0.125000f, 0.500000f,
+    -1.394531f, 0.320068f, -0.000000f, -0.424434f, 0.905459f, 0.000000f, 0.000000f, 0.625000f,
+    -1.389106f, 0.316415f, -0.049219f, -0.407810f, 0.879359f, -0.245803f, 0.125000f, 0.625000f,
+    -1.374802f, 0.306782f, -0.084375f, -0.343732f, 0.765919f, -0.543338f, 0.250000f, 0.625000f,
+    -1.447116f, 0.277283f, -0.049219f, -0.681018f, 0.680194f, -0.271202f, 0.125000f, 0.750000f,
+    -1.278882f, 0.315729f, -0.105469f, -0.113428f, 0.550012f, -0.827418f, 0.375000f, 0.500000f,
+    -1.374802f, 0.306782f, -0.084375f, -0.343732f, 0.765920f, -0.543338f, 0.250000f, 0.625000f,
+    -1.354579f, 0.293163f, -0.105469f, -0.208448f, 0.487192f, -0.848053f, 0.375000f, 0.625000f,
+    -1.331396f, 0.277551f, -0.112500f, 0.000000f, -0.000000f, -1.000000f, 0.500000f, 0.625000f,
+    -1.408878f, 0.259499f, -0.105469f, -0.331408f, 0.360091f, -0.872068f, 0.375000f, 0.750000f,
+    -1.447116f, 0.277283f, -0.049219f, -0.681018f, 0.680194f, -0.271202f, 0.125000f, 0.750000f,
+    -1.488281f, 0.224268f, -0.000000f, -0.940042f, 0.341058f, 0.000000f, 0.000000f, 0.875000f,
+    -1.481941f, 0.222672f, -0.049219f, -0.900521f, 0.330571f, -0.282462f, 0.125000f, 0.875000f,
+    -1.465225f, 0.218465f, -0.084375f, -0.745462f, 0.283642f, -0.603187f, 0.250000f, 0.875000f,
+    -1.493555f, 0.150000f, -0.049219f, -0.960000f, -0.000000f, -0.280000f, 0.125000f, 1.000000f,
+    -1.408878f, 0.259499f, -0.105469f, -0.331408f, 0.360091f, -0.872068f, 0.375000f, 0.750000f,
+    -1.465225f, 0.218465f, -0.084375f, -0.745462f, 0.283642f, -0.603187f, 0.250000f, 0.875000f,
+    -1.441593f, 0.212518f, -0.105469f, -0.434695f, 0.174222f, -0.883565f, 0.375000f, 0.875000f,
+    -1.414502f, 0.205701f, -0.112500f, 0.000000f, -0.000000f, -1.000000f, 0.500000f, 0.875000f,
+    -1.452539f, 0.150000f, -0.105469f, -0.470588f, -0.000000f, -0.882353f, 0.375000f, 1.000000f,
+    -1.222852f, 0.263818f, -0.084375f, 0.142803f, -0.855858f, -0.497107f, 0.750000f, 0.500000f,
+    -1.383203f, 0.247559f, -0.112500f, 0.000000f, -0.000000f, -1.000000f, 0.500000f, 0.750000f,
+    -1.335132f, 0.225201f, -0.084375f, 0.489273f, -0.668472f, -0.560140f, 0.750000f, 0.750000f,
+    -1.313281f, 0.215039f, -0.000000f, 0.546885f, -0.837207f, 0.000000f, 1.000000f, 0.750000f,
+    -1.373438f, 0.150000f, -0.084375f, 0.800000f, 0.000000f, -0.600000f, 0.750000f, 1.000000f,
+    -1.239868f, 0.279584f, -0.105469f, 0.100453f, -0.559950f, -0.822414f, 0.625000f, 0.500000f,
+    -1.331396f, 0.277551f, -0.112500f, 0.000000f, -0.000000f, -1.000000f, 0.500000f, 0.625000f,
+    -1.308214f, 0.261940f, -0.105469f, 0.188332f, -0.509017f, -0.839900f, 0.625000f, 0.625000f,
+    -1.287991f, 0.248321f, -0.084375f, 0.274428f, -0.809736f, -0.518669f, 0.750000f, 0.625000f,
+    -1.357529f, 0.235618f, -0.105469f, 0.311577f, -0.393781f, -0.864787f, 0.625000f, 0.750000f,
+    -1.210815f, 0.252667f, -0.049219f, 0.149411f, -0.964989f, -0.215573f, 0.875000f, 0.500000f,
+    -1.287991f, 0.248321f, -0.084375f, 0.274428f, -0.809737f, -0.518667f, 0.750000f, 0.625000f,
+    -1.273687f, 0.238688f, -0.049219f, 0.294850f, -0.928329f, -0.226427f, 0.875000f, 0.625000f,
+    -1.268262f, 0.235034f, -0.000000f, 0.293811f, -0.955864f, 0.000000f, 1.000000f, 0.625000f,
+    -1.319290f, 0.217834f, -0.049219f, 0.542231f, -0.802508f, -0.248931f, 0.875000f, 0.750000f,
+    -1.357529f, 0.235618f, -0.105469f, 0.311577f, -0.393780f, -0.864787f, 0.625000f, 0.750000f,
+    -1.414502f, 0.205701f, -0.112500f, 0.000000f, -0.000000f, -1.000000f, 0.500000f, 0.875000f,
+    -1.387411f, 0.198883f, -0.105469f, 0.426972f, -0.200197f, -0.881825f, 0.625000f, 0.875000f,
+    -1.363779f, 0.192936f, -0.084375f, 0.713834f, -0.367656f, -0.596045f, 0.750000f, 0.875000f,
+    -1.397461f, 0.150000f, -0.105469f, 0.470589f, 0.000000f, -0.882353f, 0.625000f, 1.000000f,
+    -1.319290f, 0.217834f, -0.049219f, 0.542231f, -0.802508f, -0.248931f, 0.875000f, 0.750000f,
+    -1.363779f, 0.192936f, -0.084375f, 0.713833f, -0.367656f, -0.596046f, 0.750000f, 0.875000f,
+    -1.347063f, 0.188729f, -0.049219f, 0.841606f, -0.464481f, -0.275602f, 0.875000f, 0.875000f,
+    -1.340723f, 0.187134f, -0.000000f, 0.868244f, -0.496138f, 0.000000f, 1.000000f, 0.875000f,
+    -1.356445f, 0.150000f, -0.049219f, 0.960000f, 0.000000f, -0.280000f, 0.875000f, 1.000000f,
+    -1.350000f, 0.150000f, -0.000000f, 1.000000f, 0.000000f, -0.000000f, 0.000000f, 0.000000f,
+    -1.500000f, 0.150000f, -0.000000f, -1.000000f, -0.000000f, -0.000000f, 1.000000f, 0.000000f,
+    -1.000000f, -0.300000f, -0.000000f, 0.410365f, 0.911922f, -0.000000f, 0.000000f, 1.000000f,
+    -0.950000f, -0.450000f, -0.000000f, -0.410365f, -0.911922f, -0.000000f, 1.000000f, 1.000000f,
+    -1.425000f, 0.150000f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.000000f,
+    -1.268750f, -0.075000f, -0.000000f, 0.832050f, 0.554700f, -0.000000f, 0.000000f, 0.500000f,
+    -1.317188f, -0.123047f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.500000f,
+    -1.365625f, -0.171094f, -0.000000f, -0.743581f, -0.668646f, -0.000000f, 1.000000f, 0.500000f,
+    -0.975000f, -0.375000f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 1.000000f,
+    -1.373438f, 0.150000f, 0.084375f, 0.800000f, 0.000000f, 0.600000f, 0.250000f, 0.000000f,
+    -1.330469f, 0.048047f, -0.000000f, 0.945778f, 0.324813f, -0.000000f, 0.000000f, 0.250000f,
+    -1.351770f, 0.038205f, 0.084375f, 0.754441f, 0.269277f, 0.598589f, 0.250000f, 0.250000f,
+    -1.398633f, 0.016553f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.250000f,
+    -1.283887f, -0.090015f, 0.084375f, 0.678042f, 0.478207f, 0.558191f, 0.250000f, 0.500000f,
+    -1.356445f, 0.150000f, 0.049219f, 0.960000f, 0.000000f, 0.280000f, 0.125000f, 0.000000f,
+    -1.345215f, 0.102979f, -0.000000f, 0.982777f, 0.184796f, -0.000000f, 0.000000f, 0.125000f,
+    -1.351511f, 0.101413f, 0.049219f, 0.943027f, 0.178069f, 0.281055f, 0.125000f, 0.125000f,
+    -1.368111f, 0.097285f, 0.084375f, 0.784625f, 0.149799f, 0.601602f, 0.250000f, 0.125000f,
+    -1.336327f, 0.045340f, 0.049219f, 0.907104f, 0.315107f, 0.279051f, 0.125000f, 0.250000f,
+    -1.397461f, 0.150000f, 0.105469f, 0.470589f, 0.000000f, 0.882353f, 0.375000f, 0.000000f,
+    -1.368111f, 0.097285f, 0.084375f, 0.784624f, 0.149799f, 0.601603f, 0.250000f, 0.125000f,
+    -1.391579f, 0.091449f, 0.105469f, 0.460503f, 0.089006f, 0.883184f, 0.375000f, 0.125000f,
+    -1.418481f, 0.084760f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.125000f,
+    -1.373604f, 0.028117f, 0.105469f, 0.441858f, 0.163868f, 0.881991f, 0.375000f, 0.250000f,
+    -1.336327f, 0.045340f, 0.049219f, 0.907105f, 0.315106f, 0.279051f, 0.125000f, 0.250000f,
+    -1.305176f, -0.012158f, -0.000000f, 0.895694f, 0.444671f, -0.000000f, 0.000000f, 0.375000f,
+    -1.310318f, -0.015685f, 0.049219f, 0.859856f, 0.433367f, 0.269890f, 0.125000f, 0.375000f,
+    -1.323875f, -0.024981f, 0.084375f, 0.717810f, 0.376810f, 0.585460f, 0.250000f, 0.375000f,
+    -1.272913f, -0.079129f, 0.049219f, 0.801010f, 0.542879f, 0.252321f, 0.125000f, 0.500000f,
+    -1.373604f, 0.028117f, 0.105469f, 0.441858f, 0.163868f, 0.881991f, 0.375000f, 0.250000f,
+    -1.323875f, -0.024981f, 0.084375f, 0.717810f, 0.376810f, 0.585460f, 0.250000f, 0.375000f,
+    -1.343043f, -0.038125f, 0.105469f, 0.423804f, 0.233330f, 0.875184f, 0.375000f, 0.375000f,
+    -1.365015f, -0.053192f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.375000f,
+    -1.299402f, -0.105405f, 0.105469f, 0.408072f, 0.304992f, 0.860498f, 0.375000f, 0.500000f,
+    -1.476562f, 0.150000f, 0.084375f, -0.800000f, 0.000000f, 0.600000f, 0.750000f, 0.000000f,
+    -1.398633f, 0.016553f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.250000f,
+    -1.445496f, -0.005099f, 0.084375f, -0.741739f, -0.300819f, 0.599442f, 0.750000f, 0.250000f,
+    -1.466797f, -0.014941f, -0.000000f, -0.923524f, -0.383540f, -0.000000f, 1.000000f, 0.250000f,
+    -1.350488f, -0.156079f, 0.084375f, -0.625724f, -0.540260f, 0.562662f, 0.750000f, 0.500000f,
+    -1.452539f, 0.150000f, 0.105469f, -0.470588f, 0.000000f, 0.882353f, 0.625000f, 0.000000f,
+    -1.418481f, 0.084760f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.125000f,
+    -1.445384f, 0.078070f, 0.105469f, -0.460057f, -0.090956f, 0.883218f, 0.625000f, 0.125000f,
+    -1.468852f, 0.072234f, 0.084375f, -0.783295f, -0.156125f, 0.601726f, 0.750000f, 0.125000f,
+    -1.423662f, 0.004988f, 0.105469f, -0.437541f, -0.173581f, 0.882285f, 0.625000f, 0.250000f,
+    -1.493555f, 0.150000f, 0.049219f, -0.960000f, 0.000000f, 0.280000f, 0.875000f, 0.000000f,
+    -1.468852f, 0.072234f, 0.084375f, -0.783295f, -0.156125f, 0.601726f, 0.750000f, 0.125000f,
+    -1.485452f, 0.068106f, 0.049219f, -0.940981f, -0.188412f, 0.281170f, 0.875000f, 0.125000f,
+    -1.491748f, 0.066541f, -0.000000f, -0.980463f, -0.196702f, -0.000000f, 1.000000f, 0.125000f,
+    -1.460939f, -0.012235f, 0.049219f, -0.887370f, -0.366235f, 0.280082f, 0.875000f, 0.250000f,
+    -1.423662f, 0.004988f, 0.105469f, -0.437541f, -0.173581f, 0.882285f, 0.625000f, 0.250000f,
+    -1.365015f, -0.053192f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.375000f,
+    -1.386987f, -0.068259f, 0.105469f, -0.412980f, -0.249957f, 0.875768f, 0.625000f, 0.375000f,
+    -1.406154f, -0.081403f, 0.084375f, -0.685340f, -0.430186f, 0.587579f, 0.750000f, 0.375000f,
+    -1.334973f, -0.140689f, 0.105469f, -0.389863f, -0.324451f, 0.861822f, 0.625000f, 0.500000f,
+    -1.460939f, -0.012235f, 0.049219f, -0.887370f, -0.366235f, 0.280082f, 0.875000f, 0.250000f,
+    -1.406154f, -0.081403f, 0.084375f, -0.685340f, -0.430186f, 0.587580f, 0.750000f, 0.375000f,
+    -1.419711f, -0.090700f, 0.049219f, -0.810168f, -0.519360f, 0.271832f, 0.875000f, 0.375000f,
+    -1.424854f, -0.094226f, -0.000000f, -0.839602f, -0.543202f, -0.000000f, 1.000000f, 0.375000f,
+    -1.361462f, -0.166965f, 0.049219f, -0.722234f, -0.642490f, 0.256095f, 0.875000f, 0.500000f,
+    -1.283887f, -0.090015f, 0.084375f, 0.678042f, 0.478207f, 0.558191f, 0.250000f, 0.500000f,
+    -1.160156f, -0.198047f, -0.000000f, 0.655687f, 0.755033f, -0.000000f, 0.000000f, 0.750000f,
+    -1.165466f, -0.216586f, 0.084375f, 0.553444f, 0.668090f, 0.497350f, 0.250000f, 0.750000f,
+    -1.177148f, -0.257373f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.750000f,
+    -0.992188f, -0.323438f, 0.084375f, 0.354770f, 0.788378f, 0.502591f, 0.250000f, 1.000000f,
+    -1.272913f, -0.079129f, 0.049219f, 0.801011f, 0.542878f, 0.252321f, 0.125000f, 0.500000f,
+    -1.220605f, -0.137842f, -0.000000f, 0.752687f, 0.658378f, -0.000000f, 0.000000f, 0.625000f,
+    -1.223536f, -0.142460f, 0.049219f, 0.726886f, 0.646097f, 0.232800f, 0.125000f, 0.625000f,
+    -1.231264f, -0.154636f, 0.084375f, 0.623037f, 0.578584f, 0.526370f, 0.250000f, 0.625000f,
+    -1.161617f, -0.203145f, 0.049219f, 0.635572f, 0.742022f, 0.213194f, 0.125000f, 0.750000f,
+    -1.299402f, -0.105405f, 0.105469f, 0.408072f, 0.304992f, 0.860498f, 0.375000f, 0.500000f,
+    -1.231264f, -0.154636f, 0.084375f, 0.623037f, 0.578584f, 0.526370f, 0.250000f, 0.625000f,
+    -1.242188f, -0.171850f, 0.105469f, 0.386230f, 0.377876f, 0.841449f, 0.375000f, 0.625000f,
+    -1.254712f, -0.191583f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.625000f,
+    -1.170909f, -0.235589f, 0.105469f, 0.355340f, 0.450452f, 0.819040f, 0.375000f, 0.750000f,
+    -1.161617f, -0.203145f, 0.049219f, 0.635572f, 0.742022f, 0.213194f, 0.125000f, 0.750000f,
+    -1.086816f, -0.252979f, -0.000000f, 0.540758f, 0.841178f, -0.000000f, 0.000000f, 0.875000f,
+    -1.086579f, -0.258651f, 0.049219f, 0.525642f, 0.825088f, 0.207198f, 0.125000f, 0.875000f,
+    -1.085954f, -0.273607f, 0.084375f, 0.462854f, 0.744576f, 0.481012f, 0.250000f, 0.875000f,
+    -0.997852f, -0.306445f, 0.049219f, 0.400263f, 0.889473f, 0.220515f, 0.125000f, 1.000000f,
+    -1.170909f, -0.235589f, 0.105469f, 0.355340f, 0.450452f, 0.819040f, 0.375000f, 0.750000f,
+    -1.085954f, -0.273607f, 0.084375f, 0.462854f, 0.744576f, 0.481012f, 0.250000f, 0.875000f,
+    -1.085071f, -0.294750f, 0.105469f, 0.302868f, 0.501527f, 0.810396f, 0.375000f, 0.875000f,
+    -1.084058f, -0.318988f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.875000f,
+    -0.984180f, -0.347461f, 0.105469f, 0.232611f, 0.516912f, 0.823829f, 0.375000f, 1.000000f,
+    -1.350488f, -0.156079f, 0.084375f, -0.625724f, -0.540260f, 0.562662f, 0.750000f, 0.500000f,
+    -1.177148f, -0.257373f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.750000f,
+    -1.188831f, -0.298160f, 0.084375f, -0.492641f, -0.706153f, 0.508579f, 0.750000f, 0.750000f,
+    -1.194141f, -0.316699f, -0.000000f, -0.558748f, -0.829337f, -0.000000f, 1.000000f, 0.750000f,
+    -0.957812f, -0.426562f, 0.084375f, -0.354770f, -0.788378f, 0.502591f, 0.750000f, 1.000000f,
+    -1.334973f, -0.140689f, 0.105469f, -0.389864f, -0.324451f, 0.861822f, 0.625000f, 0.500000f,
+    -1.254712f, -0.191583f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.625000f,
+    -1.267236f, -0.211316f, 0.105469f, -0.362855f, -0.394979f, 0.843995f, 0.625000f, 0.625000f,
+    -1.278160f, -0.228531f, 0.084375f, -0.558837f, -0.634504f, 0.533952f, 0.750000f, 0.625000f,
+    -1.183388f, -0.279157f, 0.105469f, -0.331427f, -0.460343f, 0.823553f, 0.625000f, 0.750000f,
+    -1.361462f, -0.166965f, 0.049219f, -0.722234f, -0.642490f, 0.256095f, 0.875000f, 0.500000f,
+    -1.278160f, -0.228531f, 0.084375f, -0.558837f, -0.634504f, 0.533953f, 0.750000f, 0.625000f,
+    -1.285887f, -0.240706f, 0.049219f, -0.632854f, -0.736497f, 0.238887f, 0.875000f, 0.625000f,
+    -1.288818f, -0.245325f, -0.000000f, -0.647649f, -0.761939f, -0.000000f, 1.000000f, 0.625000f,
+    -1.192680f, -0.311601f, 0.049219f, -0.548245f, -0.806248f, 0.222240f, 0.875000f, 0.750000f,
+    -1.183388f, -0.279157f, 0.105469f, -0.331427f, -0.460343f, 0.823553f, 0.625000f, 0.750000f,
+    -1.084058f, -0.318988f, 0.112500f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.875000f,
+    -1.083045f, -0.343226f, 0.105469f, -0.286990f, -0.503756f, 0.814780f, 0.625000f, 0.875000f,
+    -1.082161f, -0.364370f, 0.084375f, -0.423555f, -0.760495f, 0.492187f, 0.750000f, 0.875000f,
+    -0.965820f, -0.402539f, 0.105469f, -0.232611f, -0.516913f, 0.823829f, 0.625000f, 1.000000f,
+    -1.192680f, -0.311601f, 0.049219f, -0.548245f, -0.806248f, 0.222240f, 0.875000f, 0.750000f,
+    -1.082161f, -0.364370f, 0.084375f, -0.423555f, -0.760495f, 0.492188f, 0.750000f, 0.875000f,
+    -1.081536f, -0.379325f, 0.049219f, -0.470388f, -0.855760f, 0.215428f, 0.875000f, 0.875000f,
+    -1.081299f, -0.384998f, -0.000000f, -0.479572f, -0.877503f, -0.000000f, 1.000000f, 0.875000f,
+    -0.952148f, -0.443555f, 0.049219f, -0.400263f, -0.889473f, 0.220515f, 0.875000f, 1.000000f,
+    -1.500000f, 0.150000f, -0.000000f, -1.000000f, -0.000000f, -0.000000f, 0.000000f, 0.000000f,
+    -1.350000f, 0.150000f, -0.000000f, 1.000000f, 0.000000f, -0.000000f, 1.000000f, 0.000000f,
+    -0.950000f, -0.450000f, -0.000000f, -0.410365f, -0.911922f, -0.000000f, 0.000000f, 1.000000f,
+    -1.000000f, -0.300000f, -0.000000f, 0.410365f, 0.911922f, -0.000000f, 1.000000f, 1.000000f,
+    -1.425000f, 0.150000f, -0.112500f, 0.000000f, 0.000000f, -1.000000f, 0.500000f, 0.000000f,
+    -1.365625f, -0.171094f, -0.000000f, -0.743581f, -0.668646f, -0.000000f, 0.000000f, 0.500000f,
+    -1.317188f, -0.123047f, -0.112500f, 0.000000f, 0.000000f, -1.000000f, 0.500000f, 0.500000f,
+    -1.268750f, -0.075000f, -0.000000f, 0.832050f, 0.554700f, -0.000000f, 1.000000f, 0.500000f,
+    -0.975000f, -0.375000f, -0.112500f, 0.000000f, 0.000000f, -1.000000f, 0.500000f, 1.000000f,
+    -1.476562f, 0.150000f, -0.084375f, -0.800000f, -0.000000f, -0.600000f, 0.250000f, 0.000000f,
+    -1.466797f, -0.014941f, -0.000000f, -0.923524f, -0.383540f, -0.000000f, 0.000000f, 0.250000f,
+    -1.445496f, -0.005099f, -0.084375f, -0.741200f, -0.302104f, -0.599462f, 0.250000f, 0.250000f,
+    -1.398633f, 0.016553f, -0.112500f, 0.000000f, 0.000000f, -1.000000f, 0.500000f, 0.250000f,
+    -1.350488f, -0.156079f, -0.084375f, -0.623402f, -0.542826f, -0.562770f, 0.250000f, 0.500000f,
+    -1.493555f, 0.150000f, -0.049219f, -0.960000f, -0.000000f, -0.280000f, 0.125000f, 0.000000f,
+    -1.491748f, 0.066541f, -0.000000f, -0.980463f, -0.196702f, -0.000000f, 0.000000f, 0.125000f,
+    -1.485452f, 0.068106f, -0.049219f, -0.940967f, -0.188477f, -0.281171f, 0.125000f, 0.125000f,
+    -1.468852f, 0.072234f, -0.084375f, -0.783295f, -0.156125f, -0.601726f, 0.250000f, 0.125000f,
+    -1.460939f, -0.012235f, -0.049219f, -0.887220f, -0.366595f, -0.280086f, 0.125000f, 0.250000f,
+    -1.452539f, 0.150000f, -0.105469f, -0.470588f, -0.000000f, -0.882353f, 0.375000f, 0.000000f,
+    -1.468852f, 0.072234f, -0.084375f, -0.783295f, -0.156125f, -0.601726f, 0.250000f, 0.125000f,
+    -1.445384f, 0.078070f, -0.105469f, -0.460039f, -0.091036f, -0.883219f, 0.375000f, 0.125000f,
+    -1.418481f, 0.084760f, -0.112500f, 0.000000f, 0.000000f, -1.000000f, 0.500000f, 0.125000f,
+    -1.423662f, 0.004988f, -0.105469f, -0.437356f, -0.173995f, -0.882296f, 0.375000f, 0.250000f,
+    -1.460939f, -0.012235f, -0.049219f, -0.887221f, -0.366595f, -0.280086f, 0.125000f, 0.250000f,
+    -1.424854f, -0.094226f, -0.000000f, -0.839602f, -0.543202f, -0.000000f, 0.000000f, 0.375000f,
+    -1.419711f, -0.090700f, -0.049219f, -0.809767f, -0.519983f, -0.271837f, 0.125000f, 0.375000f,
+    -1.406154f, -0.081403f, -0.084375f, -0.685340f, -0.430186f, -0.587580f, 0.250000f, 0.375000f,
+    -1.361462f, -0.166965f, -0.049219f, -0.721599f, -0.643198f, -0.256108f, 0.125000f, 0.500000f,
+    -1.423662f, 0.004988f, -0.105469f, -0.437356f, -0.173994f, -0.882296f, 0.375000f, 0.250000f,
+    -1.406154f, -0.081403f, -0.084375f, -0.685340f, -0.430186f, -0.587579f, 0.250000f, 0.375000f,
+    -1.386987f, -0.068259f, -0.105469f, -0.412506f, -0.250677f, -0.875785f, 0.375000f, 0.375000f,
+    -1.365015f, -0.053192f, -0.112500f, 0.000000f, 0.000000f, -1.000000f, 0.500000f, 0.375000f,
+    -1.334973f, -0.140689f, -0.105469f, -0.389066f, -0.325292f, -0.861866f, 0.375000f, 0.500000f,
+    -1.373438f, 0.150000f, -0.084375f, 0.800000f, 0.000000f, -0.600000f, 0.750000f, 0.000000f,
+    -1.398633f, 0.016553f, -0.112500f, 0.000000f, 0.000000f, -1.000000f, 0.500000f, 0.250000f,
+    -1.351770f, 0.038205f, -0.084375f, 0.753631f, 0.271366f, -0.598666f, 0.750000f, 0.250000f,
+    -1.330469f, 0.048047f, -0.000000f, 0.945778f, 0.324813f, -0.000000f, 1.000000f, 0.250000f,
+    -1.283887f, -0.090015f, -0.084375f, 0.674847f, 0.482249f, -0.558585f, 0.750000f, 0.500000f,
+    -1.397461f, 0.150000f, -0.105469f, 0.470589f, 0.000000f, -0.882353f, 0.625000f, 0.000000f,
+    -1.418481f, 0.084760f, -0.112500f, 0.000000f, 0.000000f, -1.000000f, 0.500000f, 0.125000f,
+    -1.391579f, 0.091449f, -0.105469f, 0.460478f, 0.089118f, -0.883187f, 0.625000f, 0.125000f,
+    -1.368111f, 0.097285f, -0.084375f, 0.784624f, 0.149799f, -0.601603f, 0.750000f, 0.125000f,
+    -1.373604f, 0.028117f, -0.105469f, 0.441621f, 0.164404f, -0.882010f, 0.625000f, 0.250000f,
+    -1.356445f, 0.150000f, -0.049219f, 0.960000f, 0.000000f, -0.280000f, 0.875000f, 0.000000f,
+    -1.368111f, 0.097285f, -0.084375f, 0.784625f, 0.149799f, -0.601602f, 0.750000f, 0.125000f,
+    -1.351511f, 0.101413f, -0.049219f, 0.942997f, 0.178224f, -0.281057f, 0.875000f, 0.125000f,
+    -1.345215f, 0.102979f, -0.000000f, 0.982777f, 0.184796f, -0.000000f, 1.000000f, 0.125000f,
+    -1.336327f, 0.045340f, -0.049219f, 0.906857f, 0.315800f, -0.279070f, 0.875000f, 0.250000f,
+    -1.373604f, 0.028117f, -0.105469f, 0.441621f, 0.164404f, -0.882010f, 0.625000f, 0.250000f,
+    -1.365015f, -0.053192f, -0.112500f, 0.000000f, 0.000000f, -1.000000f, 0.500000f, 0.375000f,
+    -1.343043f, -0.038125f, -0.105469f, 0.423222f, 0.234233f, -0.875224f, 0.625000f, 0.375000f,
+    -1.323875f, -0.024981f, -0.084375f, 0.717810f, 0.376810f, -0.585460f, 0.750000f, 0.375000f,
+    -1.299402f, -0.105405f, -0.105469f, 0.407093f, 0.306052f, -0.860586f, 0.625000f, 0.500000f,
+    -1.336327f, 0.045340f, -0.049219f, 0.906858f, 0.315799f, -0.279070f, 0.875000f, 0.250000f,
+    -1.323875f, -0.024981f, -0.084375f, 0.717810f, 0.376810f, -0.585460f, 0.750000f, 0.375000f,
+    -1.310318f, -0.015685f, -0.049219f, 0.859273f, 0.434496f, -0.269932f, 0.875000f, 0.375000f,
+    -1.305176f, -0.012158f, -0.000000f, 0.895694f, 0.444671f, -0.000000f, 1.000000f, 0.375000f,
+    -1.272913f, -0.079129f, -0.049219f, 0.800087f, 0.544204f, -0.252394f, 0.875000f, 0.500000f,
+    -1.350488f, -0.156079f, -0.084375f, -0.623402f, -0.542826f, -0.562770f, 0.250000f, 0.500000f,
+    -1.194141f, -0.316699f, -0.000000f, -0.558748f, -0.829337f, -0.000000f, 0.000000f, 0.750000f,
+    -1.188831f, -0.298160f, -0.084375f, -0.490104f, -0.707628f, -0.508980f, 0.250000f, 0.750000f,
+    -1.177148f, -0.257373f, -0.112500f, 0.000000f, 0.000000f, -1.000000f, 0.500000f, 0.750000f,
+    -0.957812f, -0.426562f, -0.084375f, -0.354770f, -0.788378f, -0.502591f, 0.250000f, 1.000000f,
+    -1.361462f, -0.166965f, -0.049219f, -0.721599f, -0.643198f, -0.256108f, 0.125000f, 0.500000f,
+    -1.288818f, -0.245325f, -0.000000f, -0.647649f, -0.761939f, -0.000000f, 0.000000f, 0.625000f,
+    -1.285887f, -0.240706f, -0.049219f, -0.632123f, -0.737115f, -0.238917f, 0.125000f, 0.625000f,
+    -1.278160f, -0.228531f, -0.084375f, -0.558837f, -0.634504f, -0.533953f, 0.250000f, 0.625000f,
+    -1.192680f, -0.311601f, -0.049219f, -0.547600f, -0.806671f, -0.222295f, 0.125000f, 0.750000f,
+    -1.334973f, -0.140689f, -0.105469f, -0.389066f, -0.325292f, -0.861866f, 0.375000f, 0.500000f,
+    -1.278160f, -0.228531f, -0.084375f, -0.558837f, -0.634504f, -0.533952f, 0.250000f, 0.625000f,
+    -1.267236f, -0.211316f, -0.105469f, -0.361844f, -0.395706f, -0.844088f, 0.375000f, 0.625000f,
+    -1.254712f, -0.191583f, -0.112500f, 0.000000f, 0.000000f, -1.000000f, 0.500000f, 0.625000f,
+    -1.183388f, -0.279157f, -0.105469f, -0.330412f, -0.460754f, -0.823731f, 0.375000f, 0.750000f,
+    -1.192680f, -0.311601f, -0.049219f, -0.547601f, -0.806671f, -0.222295f, 0.125000f, 0.750000f,
+    -1.081299f, -0.384998f, -0.000000f, -0.479572f, -0.877503f, -0.000000f, 0.000000f, 0.875000f,
+    -1.081536f, -0.379325f, -0.049219f, -0.470000f, -0.855960f, -0.215482f, 0.125000f, 0.875000f,
+    -1.082161f, -0.364370f, -0.084375f, -0.423555f, -0.760495f, -0.492188f, 0.250000f, 0.875000f,
+    -0.952148f, -0.443555f, -0.049219f, -0.400263f, -0.889473f, -0.220515f, 0.125000f, 1.000000f,
+    -1.183388f, -0.279157f, -0.105469f, -0.330412f, -0.460754f, -0.823731f, 0.375000f, 0.750000f,
+    -1.082161f, -0.364370f, -0.084375f, -0.423555f, -0.760495f, -0.492187f, 0.250000f, 0.875000f,
+    -1.083045f, -0.343226f, -0.105469f, -0.286325f, -0.503846f, -0.814958f, 0.375000f, 0.875000f,
+    -1.084058f, -0.318988f, -0.112500f, 0.000000f, 0.000000f, -1.000000f, 0.500000f, 0.875000f,
+    -0.965820f, -0.402539f, -0.105469f, -0.232611f, -0.516913f, -0.823829f, 0.375000f, 1.000000f,
+    -1.283887f, -0.090015f, -0.084375f, 0.674847f, 0.482249f, -0.558585f, 0.750000f, 0.500000f,
+    -1.177148f, -0.257373f, -0.112500f, 0.000000f, 0.000000f, -1.000000f, 0.500000f, 0.750000f,
+    -1.165466f, -0.216586f, -0.084375f, 0.549511f, 0.670716f, -0.498173f, 0.750000f, 0.750000f,
+    -1.160156f, -0.198047f, -0.000000f, 0.655687f, 0.755033f, -0.000000f, 1.000000f, 0.750000f,
+    -0.992188f, -0.323438f, -0.084375f, 0.354770f, 0.788378f, -0.502591f, 0.750000f, 1.000000f,
+    -1.299402f, -0.105405f, -0.105469f, 0.407093f, 0.306051f, -0.860586f, 0.625000f, 0.500000f,
+    -1.254712f, -0.191583f, -0.112500f, 0.000000f, 0.000000f, -1.000000f, 0.500000f, 0.625000f,
+    -1.242188f, -0.171850f, -0.105469f, 0.384959f, 0.378821f, -0.841606f, 0.625000f, 0.625000f,
+    -1.231264f, -0.154636f, -0.084375f, 0.623037f, 0.578584f, -0.526370f, 0.750000f, 0.625000f,
+    -1.170909f, -0.235589f, -0.105469f, 0.354017f, 0.451010f, -0.819306f, 0.625000f, 0.750000f,
+    -1.272913f, -0.079129f, -0.049219f, 0.800088f, 0.544202f, -0.252394f, 0.875000f, 0.500000f,
+    -1.231264f, -0.154636f, -0.084375f, 0.623037f, 0.578584f, -0.526370f, 0.750000f, 0.625000f,
+    -1.223536f, -0.142460f, -0.049219f, 0.725742f, 0.647344f, -0.232905f, 0.875000f, 0.625000f,
+    -1.220605f, -0.137842f, -0.000000f, 0.752687f, 0.658378f, -0.000000f, 1.000000f, 0.625000f,
+    -1.161617f, -0.203145f, -0.049219f, 0.634450f, 0.742942f, -0.213332f, 0.875000f, 0.750000f,
+    -1.170909f, -0.235589f, -0.105469f, 0.354017f, 0.451010f, -0.819306f, 0.625000f, 0.750000f,
+    -1.084058f, -0.318988f, -0.112500f, 0.000000f, 0.000000f, -1.000000f, 0.500000f, 0.875000f,
+    -1.085071f, -0.294750f, -0.105469f, 0.301978f, 0.501655f, -0.810649f, 0.625000f, 0.875000f,
+    -1.085954f, -0.273607f, -0.084375f, 0.462854f, 0.744576f, -0.481012f, 0.750000f, 0.875000f,
+    -0.984180f, -0.347461f, -0.105469f, 0.232611f, 0.516912f, -0.823829f, 0.625000f, 1.000000f,
+    -1.161617f, -0.203145f, -0.049219f, 0.634450f, 0.742942f, -0.213332f, 0.875000f, 0.750000f,
+    -1.085954f, -0.273607f, -0.084375f, 0.462854f, 0.744576f, -0.481012f, 0.750000f, 0.875000f,
+    -1.086579f, -0.258651f, -0.049219f, 0.524892f, 0.825535f, -0.207317f, 0.875000f, 0.875000f,
+    -1.086816f, -0.252979f, -0.000000f, 0.540758f, 0.841178f, -0.000000f, 1.000000f, 0.875000f,
+    -0.997852f, -0.306445f, -0.049219f, 0.400263f, 0.889473f, -0.220515f, 0.875000f, 1.000000f,
+    0.850000f, -0.037500f, -0.000000f, 0.000000f, 1.000000f, 0.000000f, 0.000000f, 0.000000f,
+    0.850000f, -0.450000f, -0.000000f, 0.158678f, -0.987330f, 0.000000f, 1.000000f, 0.000000f,
+    1.350000f, 0.450000f, -0.000000f, -0.600000f, 0.800000f, 0.000000f, 0.000000f, 1.000000f,
+    1.650000f, 0.450000f, -0.000000f, 0.384615f, -0.923077f, 0.000000f, 1.000000f, 1.000000f,
+    0.850000f, -0.243750f, 0.247500f, -0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.000000f,
+    1.193750f, 0.150000f, -0.000000f, -0.920582f, 0.390550f, 0.000000f, 0.000000f, 0.500000f,
+    1.268750f, 0.060938f, 0.170625f, 0.213724f, 0.177140f, 0.960699f, 0.500000f, 0.500000f,
+    1.343750f, -0.028125f, -0.000000f, 0.957826f, -0.287348f, 0.000000f, 1.000000f, 0.500000f,
+    1.500000f, 0.450000f, 0.093750f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 1.000000f,
+    0.850000f, -0.101953f, 0.185625f, -0.024132f, 0.729325f, 0.683742f, 0.250000f, 0.000000f,
+    1.089844f, 0.017578f, -0.000000f, -0.544548f, 0.838729f, 0.000000f, 0.000000f, 0.250000f,
+    1.108154f, -0.030212f, 0.167607f, -0.371220f, 0.678515f, 0.633887f, 0.250000f, 0.250000f,
+    1.148438f, -0.135352f, 0.223477f, 0.171854f, 0.062939f, 0.983110f, 0.500000f, 0.250000f,
+    1.217188f, 0.122168f, 0.127969f, -0.695041f, 0.414771f, 0.587267f, 0.250000f, 0.500000f,
+    0.850000f, -0.055225f, 0.108281f, -0.009231f, 0.939467f, 0.342514f, 0.125000f, 0.000000f,
+    0.992480f, -0.022705f, -0.000000f, -0.235151f, 0.971959f, 0.000000f, 0.000000f, 0.125000f,
+    0.995678f, -0.038346f, 0.105391f, -0.221262f, 0.921126f, 0.320265f, 0.125000f, 0.125000f,
+    1.004108f, -0.079582f, 0.180670f, -0.165703f, 0.736103f, 0.656273f, 0.250000f, 0.125000f,
+    1.094879f, 0.004436f, 0.097771f, -0.507507f, 0.807721f, 0.300039f, 0.125000f, 0.250000f,
+    0.850000f, -0.168018f, 0.232031f, -0.025797f, 0.392308f, 0.919472f, 0.375000f, 0.000000f,
+    1.004108f, -0.079582f, 0.180670f, -0.165703f, 0.736103f, 0.656273f, 0.250000f, 0.125000f,
+    1.016026f, -0.137881f, 0.225838f, -0.059540f, 0.413822f, 0.908409f, 0.375000f, 0.125000f,
+    1.029688f, -0.204712f, 0.240894f, 0.079921f, 0.015529f, 0.996680f, 0.500000f, 0.125000f,
+    1.126923f, -0.079198f, 0.209509f, -0.127458f, 0.418405f, 0.899273f, 0.375000f, 0.250000f,
+    1.094879f, 0.004436f, 0.097771f, -0.507507f, 0.807721f, 0.300039f, 0.125000f, 0.250000f,
+    1.153223f, 0.077197f, -0.000000f, -0.801883f, 0.597481f, 0.000000f, 0.000000f, 0.375000f,
+    1.159190f, 0.066780f, 0.086998f, -0.756895f, 0.593502f, 0.273617f, 0.125000f, 0.375000f,
+    1.174921f, 0.039317f, 0.149139f, -0.577629f, 0.549531f, 0.603623f, 0.250000f, 0.375000f,
+    1.200195f, 0.142346f, 0.074648f, -0.876990f, 0.403565f, 0.260813f, 0.125000f, 0.500000f,
+    1.126923f, -0.079198f, 0.209509f, -0.127458f, 0.418405f, 0.899273f, 0.375000f, 0.250000f,
+    1.174921f, 0.039317f, 0.149139f, -0.577629f, 0.549531f, 0.603623f, 0.250000f, 0.375000f,
+    1.197161f, 0.000490f, 0.186424f, -0.218772f, 0.394191f, 0.892610f, 0.375000f, 0.375000f,
+    1.222656f, -0.044019f, 0.198853f, 0.229848f, 0.129312f, 0.964597f, 0.500000f, 0.375000f,
+    1.241211f, 0.093640f, 0.159961f, -0.296452f, 0.354445f, 0.886840f, 0.375000f, 0.500000f,
+    0.850000f, -0.385547f, 0.185625f, 0.102331f, -0.725708f, 0.680351f, 0.750000f, 0.000000f,
+    1.148438f, -0.135352f, 0.223477f, 0.171854f, 0.062939f, 0.983110f, 0.500000f, 0.250000f,
+    1.188721f, -0.240491f, 0.167607f, 0.612561f, -0.529591f, 0.586772f, 0.750000f, 0.250000f,
+    1.207031f, -0.288281f, -0.000000f, 0.718240f, -0.695795f, 0.000000f, 1.000000f, 0.250000f,
+    1.320312f, -0.000293f, 0.127969f, 0.837979f, -0.174710f, 0.516979f, 0.750000f, 0.500000f,
+    0.850000f, -0.319482f, 0.232031f, 0.048061f, -0.391985f, 0.918715f, 0.625000f, 0.000000f,
+    1.029688f, -0.204712f, 0.240894f, 0.079921f, 0.015529f, 0.996680f, 0.500000f, 0.125000f,
+    1.043350f, -0.271543f, 0.225838f, 0.224876f, -0.377046f, 0.898480f, 0.625000f, 0.125000f,
+    1.055267f, -0.329842f, 0.180670f, 0.342821f, -0.685430f, 0.642386f, 0.750000f, 0.125000f,
+    1.169952f, -0.191505f, 0.209509f, 0.435323f, -0.278094f, 0.856247f, 0.625000f, 0.250000f,
+    0.850000f, -0.432275f, 0.108281f, 0.144604f, -0.929633f, 0.338929f, 0.875000f, 0.000000f,
+    1.055267f, -0.329842f, 0.180670f, 0.342821f, -0.685430f, 0.642386f, 0.750000f, 0.125000f,
+    1.063697f, -0.371078f, 0.105391f, 0.408872f, -0.857837f, 0.311351f, 0.875000f, 0.125000f,
+    1.066895f, -0.386719f, -0.000000f, 0.427109f, -0.904200f, 0.000000f, 1.000000f, 0.125000f,
+    1.201996f, -0.275139f, 0.097771f, 0.697781f, -0.660281f, 0.277723f, 0.875000f, 0.250000f,
+    1.169952f, -0.191505f, 0.209509f, 0.435322f, -0.278094f, 0.856247f, 0.625000f, 0.250000f,
+    1.222656f, -0.044019f, 0.198853f, 0.229848f, 0.129312f, 0.964597f, 0.500000f, 0.375000f,
+    1.248151f, -0.088527f, 0.186424f, 0.585763f, -0.133695f, 0.799380f, 0.625000f, 0.375000f,
+    1.270392f, -0.127354f, 0.149139f, 0.789294f, -0.317418f, 0.525605f, 0.750000f, 0.375000f,
+    1.296289f, 0.028235f, 0.159961f, 0.613165f, -0.021542f, 0.789661f, 0.625000f, 0.500000f,
+    1.201996f, -0.275139f, 0.097771f, 0.697781f, -0.660281f, 0.277723f, 0.875000f, 0.250000f,
+    1.270392f, -0.127354f, 0.149139f, 0.789294f, -0.317418f, 0.525605f, 0.750000f, 0.375000f,
+    1.286123f, -0.154817f, 0.086998f, 0.877362f, -0.413464f, 0.243482f, 0.875000f, 0.375000f,
+    1.292090f, -0.165234f, -0.000000f, 0.897596f, -0.440819f, 0.000000f, 1.000000f, 0.375000f,
+    1.337305f, -0.020471f, 0.074648f, 0.935156f, -0.261048f, 0.239452f, 0.875000f, 0.500000f,
+    1.217188f, 0.122168f, 0.127969f, -0.695041f, 0.414772f, 0.587267f, 0.250000f, 0.500000f,
+    1.250781f, 0.310547f, -0.000000f, -0.928477f, 0.371391f, 0.000000f, 0.000000f, 0.750000f,
+    1.279346f, 0.300476f, 0.088330f, -0.634799f, 0.386374f, 0.669138f, 0.250000f, 0.750000f,
+    1.342187f, 0.278320f, 0.117773f, 0.067770f, 0.175606f, 0.982125f, 0.500000f, 0.750000f,
+    1.396875f, 0.450000f, 0.070312f, -0.390971f, 0.593197f, 0.703747f, 0.250000f, 1.000000f,
+    1.200195f, 0.142346f, 0.074648f, -0.876990f, 0.403566f, 0.260813f, 0.125000f, 0.500000f,
+    1.222558f, 0.229834f, -0.000000f, -0.950213f, 0.311602f, 0.000000f, 0.000000f, 0.625000f,
+    1.229482f, 0.224792f, 0.062299f, -0.900661f, 0.331376f, 0.281068f, 0.125000f, 0.625000f,
+    1.247736f, 0.211501f, 0.106798f, -0.702257f, 0.362674f, 0.612620f, 0.250000f, 0.625000f,
+    1.258636f, 0.307777f, 0.051526f, -0.858527f, 0.385856f, 0.337708f, 0.125000f, 0.750000f,
+    1.241211f, 0.093640f, 0.159961f, -0.296452f, 0.354445f, 0.886840f, 0.375000f, 0.500000f,
+    1.247736f, 0.211501f, 0.106798f, -0.702256f, 0.362674f, 0.612621f, 0.250000f, 0.625000f,
+    1.273542f, 0.192709f, 0.133498f, -0.321036f, 0.326352f, 0.889062f, 0.375000f, 0.625000f,
+    1.303125f, 0.171167f, 0.142397f, 0.144754f, 0.193543f, 0.970354f, 0.500000f, 0.625000f,
+    1.308624f, 0.290154f, 0.110413f, -0.297769f, 0.322801f, 0.898406f, 0.375000f, 0.750000f,
+    1.258636f, 0.307777f, 0.051526f, -0.858527f, 0.385856f, 0.337708f, 0.125000f, 0.750000f,
+    1.289551f, 0.385986f, -0.000000f, -0.828868f, 0.559444f, 0.000000f, 0.000000f, 0.875000f,
+    1.299244f, 0.384960f, 0.043906f, -0.742962f, 0.544199f, 0.389686f, 0.125000f, 0.875000f,
+    1.324799f, 0.382256f, 0.075267f, -0.517529f, 0.474866f, 0.711805f, 0.250000f, 0.875000f,
+    1.362891f, 0.450000f, 0.041016f, -0.541369f, 0.750540f, 0.378959f, 0.125000f, 1.000000f,
+    1.308624f, 0.290154f, 0.110413f, -0.297769f, 0.322801f, 0.898406f, 0.375000f, 0.750000f,
+    1.324799f, 0.382256f, 0.075267f, -0.517529f, 0.474866f, 0.711805f, 0.250000f, 0.875000f,
+    1.360928f, 0.378432f, 0.094084f, -0.253078f, 0.335498f, 0.907410f, 0.375000f, 0.875000f,
+    1.402344f, 0.374048f, 0.100356f, 0.015086f, 0.130164f, 0.991378f, 0.500000f, 0.875000f,
+    1.444922f, 0.450000f, 0.087891f, -0.203320f, 0.348629f, 0.914942f, 0.375000f, 1.000000f,
+    1.320312f, -0.000293f, 0.127969f, 0.837979f, -0.174710f, 0.516979f, 0.750000f, 0.500000f,
+    1.342187f, 0.278320f, 0.117773f, 0.067770f, 0.175606f, 0.982125f, 0.500000f, 0.750000f,
+    1.405029f, 0.256165f, 0.088330f, 0.697661f, -0.240664f, 0.674796f, 0.750000f, 0.750000f,
+    1.433594f, 0.246094f, -0.000000f, 0.897727f, -0.440551f, 0.000000f, 1.000000f, 0.750000f,
+    1.603125f, 0.450000f, 0.070312f, 0.328506f, -0.736502f, 0.591311f, 0.750000f, 1.000000f,
+    1.296289f, 0.028235f, 0.159961f, 0.613165f, -0.021543f, 0.789661f, 0.625000f, 0.500000f,
+    1.303125f, 0.171167f, 0.142397f, 0.144754f, 0.193543f, 0.970354f, 0.500000f, 0.625000f,
+    1.332708f, 0.149625f, 0.133498f, 0.543037f, 0.012500f, 0.839616f, 0.625000f, 0.625000f,
+    1.358514f, 0.130833f, 0.106798f, 0.802971f, -0.151273f, 0.576501f, 0.750000f, 0.625000f,
+    1.375751f, 0.266487f, 0.110413f, 0.409019f, -0.025151f, 0.912179f, 0.625000f, 0.750000f,
+    1.337305f, -0.020471f, 0.074648f, 0.935156f, -0.261048f, 0.239452f, 0.875000f, 0.500000f,
+    1.358514f, 0.130833f, 0.106798f, 0.802972f, -0.151273f, 0.576501f, 0.750000f, 0.625000f,
+    1.376768f, 0.117542f, 0.062299f, 0.928216f, -0.252378f, 0.273351f, 0.875000f, 0.625000f,
+    1.383691f, 0.112500f, -0.000000f, 0.958492f, -0.285121f, 0.000000f, 1.000000f, 0.625000f,
+    1.425738f, 0.248863f, 0.051526f, 0.856186f, -0.391161f, 0.337548f, 0.875000f, 0.750000f,
+    1.375751f, 0.266487f, 0.110413f, 0.409019f, -0.025151f, 0.912179f, 0.625000f, 0.750000f,
+    1.402344f, 0.374048f, 0.100356f, 0.015086f, 0.130164f, 0.991378f, 0.500000f, 0.875000f,
+    1.443760f, 0.369664f, 0.094084f, 0.287699f, -0.145568f, 0.946593f, 0.625000f, 0.875000f,
+    1.479889f, 0.365840f, 0.075267f, 0.529482f, -0.444837f, 0.722336f, 0.750000f, 0.875000f,
+    1.555078f, 0.450000f, 0.087891f, 0.197370f, -0.414974f, 0.888167f, 0.625000f, 1.000000f,
+    1.425738f, 0.248863f, 0.051526f, 0.856187f, -0.391160f, 0.337548f, 0.875000f, 0.750000f,
+    1.479889f, 0.365840f, 0.075267f, 0.529481f, -0.444836f, 0.722337f, 0.750000f, 0.875000f,
+    1.505444f, 0.363135f, 0.043906f, 0.670506f, -0.648431f, 0.360497f, 0.875000f, 0.875000f,
+    1.515137f, 0.362109f, -0.000000f, 0.704117f, -0.710084f, 0.000000f, 1.000000f, 0.875000f,
+    1.637109f, 0.450000f, 0.041016f, 0.376658f, -0.888038f, 0.263661f, 0.875000f, 1.000000f,
+    0.850000f, -0.450000f, -0.000000f, 0.158678f, -0.987330f, 0.000000f, 0.000000f, 0.000000f,
+    0.850000f, -0.037500f, -0.000000f, 0.000000f, 1.000000f, 0.000000f, 1.000000f, 0.000000f,
+    1.650000f, 0.450000f, -0.000000f, 0.384615f, -0.923077f, 0.000000f, 0.000000f, 1.000000f,
+    1.350000f, 0.450000f, -0.000000f, -0.600000f, 0.800000f, 0.000000f, 1.000000f, 1.000000f,
+    0.850000f, -0.243750f, -0.247500f, 0.000000f, 0.000000f, -1.000000f, 0.500000f, 0.000000f,
+    1.343750f, -0.028125f, -0.000000f, 0.957826f, -0.287348f, 0.000000f, 0.000000f, 0.500000f,
+    1.268750f, 0.060938f, -0.170625f, 0.200450f, 0.166138f, -0.965514f, 0.500000f, 0.500000f,
+    1.193750f, 0.150000f, -0.000000f, -0.920582f, 0.390550f, 0.000000f, 1.000000f, 0.500000f,
+    1.500000f, 0.450000f, -0.093750f, 0.000000f, 0.000000f, -1.000000f, 0.500000f, 1.000000f,
+    0.850000f, -0.385547f, -0.185625f, 0.105312f, -0.725480f, -0.680138f, 0.250000f, 0.000000f,
+    1.207031f, -0.288281f, -0.000000f, 0.718240f, -0.695795f, 0.000000f, 0.000000f, 0.250000f,
+    1.188721f, -0.240491f, -0.167607f, 0.612003f, -0.530032f, -0.586957f, 0.250000f, 0.250000f,
+    1.148438f, -0.135352f, -0.223477f, 0.171854f, 0.062939f, -0.983110f, 0.500000f, 0.250000f,
+    1.320312f, -0.000293f, -0.127969f, 0.836313f, -0.178498f, -0.518380f, 0.250000f, 0.500000f,
+    0.850000f, -0.432275f, -0.108281f, 0.145471f, -0.929513f, -0.338885f, 0.125000f, 0.000000f,
+    1.066895f, -0.386719f, -0.000000f, 0.427109f, -0.904200f, 0.000000f, 0.000000f, 0.125000f,
+    1.063697f, -0.371078f, -0.105391f, 0.409189f, -0.857696f, -0.311324f, 0.125000f, 0.125000f,
+    1.055267f, -0.329842f, -0.180670f, 0.342821f, -0.685430f, -0.642386f, 0.250000f, 0.125000f,
+    1.201996f, -0.275139f, -0.097771f, 0.697590f, -0.660469f, -0.277758f, 0.125000f, 0.250000f,
+    0.850000f, -0.319482f, -0.232031f, 0.048978f, -0.391968f, -0.918674f, 0.375000f, 0.000000f,
+    1.055267f, -0.329842f, -0.180670f, 0.342821f, -0.685430f, -0.642386f, 0.250000f, 0.125000f,
+    1.043350f, -0.271543f, -0.225838f, 0.224881f, -0.377045f, -0.898480f, 0.375000f, 0.125000f,
+    1.029688f, -0.204712f, -0.240894f, 0.079921f, 0.015529f, -0.996680f, 0.500000f, 0.125000f,
+    1.169952f, -0.191505f, -0.209509f, 0.434362f, -0.278625f, -0.856562f, 0.375000f, 0.250000f,
+    1.201996f, -0.275139f, -0.097771f, 0.697590f, -0.660469f, -0.277758f, 0.125000f, 0.250000f,
+    1.292090f, -0.165234f, -0.000000f, 0.897596f, -0.440819f, 0.000000f, 0.000000f, 0.375000f,
+    1.286123f, -0.154817f, -0.086998f, 0.877008f, -0.414138f, -0.243610f, 0.125000f, 0.375000f,
+    1.270392f, -0.127354f, -0.149139f, 0.789294f, -0.317418f, -0.525605f, 0.250000f, 0.375000f,
+    1.337305f, -0.020471f, -0.074648f, 0.934784f, -0.262203f, -0.239644f, 0.125000f, 0.500000f,
+    1.169952f, -0.191505f, -0.209509f, 0.434362f, -0.278625f, -0.856562f, 0.375000f, 0.250000f,
+    1.270392f, -0.127354f, -0.149139f, 0.789294f, -0.317418f, -0.525605f, 0.250000f, 0.375000f,
+    1.248151f, -0.088527f, -0.186424f, 0.584302f, -0.135007f, -0.800227f, 0.375000f, 0.375000f,
+    1.222656f, -0.044019f, -0.198853f, 0.229848f, 0.129312f, -0.964597f, 0.500000f, 0.375000f,
+    1.296289f, 0.028235f, -0.159961f, 0.611590f, -0.023659f, -0.790821f, 0.375000f, 0.500000f,
+    0.850000f, -0.101953f, -0.185625f, -0.029616f, 0.729217f, -0.683641f, 0.750000f, 0.000000f,
+    1.148438f, -0.135352f, -0.223477f, 0.171854f, 0.062939f, -0.983110f, 0.500000f, 0.250000f,
+    1.108154f, -0.030212f, -0.167607f, -0.375101f, 0.676680f, -0.633564f, 0.750000f, 0.250000f,
+    1.089844f, 0.017578f, -0.000000f, -0.544548f, 0.838729f, 0.000000f, 1.000000f, 0.250000f,
+    1.217188f, 0.122168f, -0.127969f, -0.694334f, 0.415688f, -0.587455f, 0.750000f, 0.500000f,
+    0.850000f, -0.168018f, -0.232031f, -0.027062f, 0.392295f, -0.919441f, 0.625000f, 0.000000f,
+    1.029688f, -0.204712f, -0.240894f, 0.079921f, 0.015529f, -0.996680f, 0.500000f, 0.125000f,
+    1.016026f, -0.137881f, -0.225838f, -0.060933f, 0.413563f, -0.908434f, 0.625000f, 0.125000f,
+    1.004108f, -0.079582f, -0.180670f, -0.165703f, 0.736103f, -0.656273f, 0.750000f, 0.125000f,
+    1.126923f, -0.079198f, -0.209509f, -0.128837f, 0.417897f, -0.899313f, 0.625000f, 0.250000f,
+    0.850000f, -0.055225f, -0.108281f, -0.011227f, 0.939448f, -0.342507f, 0.875000f, 0.000000f,
+    1.004108f, -0.079582f, -0.180670f, -0.165703f, 0.736103f, -0.656273f, 0.750000f, 0.125000f,
+    0.995678f, -0.038346f, -0.105391f, -0.222729f, 0.920780f, -0.320245f, 0.875000f, 0.125000f,
+    0.992480f, -0.022705f, -0.000000f, -0.235151f, 0.971959f, 0.000000f, 1.000000f, 0.125000f,
+    1.094879f, 0.004436f, -0.097771f, -0.508167f, 0.807322f, -0.299996f, 0.875000f, 0.250000f,
+    1.126923f, -0.079198f, -0.209509f, -0.128837f, 0.417897f, -0.899313f, 0.625000f, 0.250000f,
+    1.222656f, -0.044019f, -0.198853f, 0.229848f, 0.129312f, -0.964597f, 0.500000f, 0.375000f,
+    1.197161f, 0.000490f, -0.186424f, -0.219827f, 0.393598f, -0.892612f, 0.625000f, 0.375000f,
+    1.174921f, 0.039317f, -0.149139f, -0.577629f, 0.549531f, -0.603623f, 0.750000f, 0.375000f,
+    1.241211f, 0.093640f, -0.159961f, -0.296846f, 0.354114f, -0.886840f, 0.625000f, 0.500000f,
+    1.094879f, 0.004436f, -0.097771f, -0.508167f, 0.807322f, -0.299996f, 0.875000f, 0.250000f,
+    1.174921f, 0.039317f, -0.149139f, -0.577629f, 0.549531f, -0.603623f, 0.750000f, 0.375000f,
+    1.159190f, 0.066780f, -0.086998f, -0.756738f, 0.593689f, -0.273644f, 0.875000f, 0.375000f,
+    1.153223f, 0.077197f, -0.000000f, -0.801883f, 0.597481f, 0.000000f, 1.000000f, 0.375000f,
+    1.200195f, 0.142346f, -0.074648f, -0.876392f, 0.404760f, -0.260971f, 0.875000f, 0.500000f,
+    1.320312f, -0.000293f, -0.127969f, 0.836313f, -0.178498f, -0.518380f, 0.250000f, 0.500000f,
+    1.433594f, 0.246094f, -0.000000f, 0.897727f, -0.440551f, 0.000000f, 0.000000f, 0.750000f,
+    1.405029f, 0.256165f, -0.088330f, 0.694944f, -0.248071f, -0.674918f, 0.250000f, 0.750000f,
+    1.342187f, 0.278320f, -0.117773f, 0.067770f, 0.175606f, -0.982125f, 0.500000f, 0.750000f,
+    1.603125f, 0.450000f, -0.070312f, 0.325932f, -0.741335f, -0.586677f, 0.250000f, 1.000000f,
+    1.337305f, -0.020471f, -0.074648f, 0.934784f, -0.262203f, -0.239644f, 0.125000f, 0.500000f,
+    1.383691f, 0.112500f, -0.000000f, 0.958492f, -0.285121f, 0.000000f, 0.000000f, 0.625000f,
+    1.376768f, 0.117542f, -0.062299f, 0.927697f, -0.254079f, -0.273535f, 0.125000f, 0.625000f,
+    1.358514f, 0.130833f, -0.106798f, 0.802972f, -0.151273f, -0.576501f, 0.250000f, 0.625000f,
+    1.425738f, 0.248863f, -0.051526f, 0.855222f, -0.393324f, -0.337479f, 0.125000f, 0.750000f,
+    1.296289f, 0.028235f, -0.159961f, 0.611590f, -0.023659f, -0.790821f, 0.375000f, 0.500000f,
+    1.358514f, 0.130833f, -0.106798f, 0.802971f, -0.151273f, -0.576501f, 0.250000f, 0.625000f,
+    1.332708f, 0.149625f, -0.133498f, 0.541544f, 0.009652f, -0.840617f, 0.375000f, 0.625000f,
+    1.303125f, 0.171167f, -0.142397f, 0.144754f, 0.193543f, -0.970354f, 0.500000f, 0.625000f,
+    1.375751f, 0.266487f, -0.110413f, 0.408001f, -0.028503f, -0.912536f, 0.375000f, 0.750000f,
+    1.425738f, 0.248863f, -0.051526f, 0.855222f, -0.393323f, -0.337479f, 0.125000f, 0.750000f,
+    1.515137f, 0.362109f, -0.000000f, 0.704117f, -0.710084f, 0.000000f, 0.000000f, 0.875000f,
+    1.505444f, 0.363135f, -0.043906f, 0.669146f, -0.650146f, -0.359936f, 0.125000f, 0.875000f,
+    1.479889f, 0.365840f, -0.075267f, 0.529481f, -0.444836f, -0.722337f, 0.250000f, 0.875000f,
+    1.637109f, 0.450000f, -0.041016f, 0.375683f, -0.888654f, -0.262978f, 0.125000f, 1.000000f,
+    1.375751f, 0.266487f, -0.110413f, 0.408001f, -0.028503f, -0.912536f, 0.375000f, 0.750000f,
+    1.479889f, 0.365840f, -0.075267f, 0.529482f, -0.444837f, -0.722336f, 0.250000f, 0.875000f,
+    1.443760f, 0.369664f, -0.094084f, 0.287200f, -0.148873f, -0.946231f, 0.375000f, 0.875000f,
+    1.402344f, 0.374048f, -0.100356f, 0.015086f, 0.130164f, -0.991378f, 0.500000f, 0.875000f,
+    1.555078f, 0.450000f, -0.087891f, 0.197089f, -0.417806f, -0.886901f, 0.375000f, 1.000000f,
+    1.217188f, 0.122168f, -0.127969f, -0.694334f, 0.415688f, -0.587455f, 0.750000f, 0.500000f,
+    1.342187f, 0.278320f, -0.117773f, 0.067770f, 0.175606f, -0.982125f, 0.500000f, 0.750000f,
+    1.279346f, 0.300476f, -0.088330f, -0.631401f, 0.393081f, -0.668446f, 0.750000f, 0.750000f,
+    1.250781f, 0.310547f, -0.000000f, -0.928477f, 0.371391f, 0.000000f, 1.000000f, 0.750000f,
+    1.396875f, 0.450000f, -0.070312f, -0.386984f, 0.604180f, -0.696571f, 0.750000f, 1.000000f,
+    1.241211f, 0.093640f, -0.159961f, -0.296846f, 0.354114f, -0.886840f, 0.625000f, 0.500000f,
+    1.303125f, 0.171167f, -0.142397f, 0.144754f, 0.193543f, -0.970354f, 0.500000f, 0.625000f,
+    1.273542f, 0.192709f, -0.133498f, -0.320819f, 0.326623f, -0.889040f, 0.625000f, 0.625000f,
+    1.247736f, 0.211501f, -0.106798f, -0.702256f, 0.362674f, -0.612621f, 0.750000f, 0.625000f,
+    1.308624f, 0.290154f, -0.110413f, -0.297312f, 0.323820f, -0.898191f, 0.625000f, 0.750000f,
+    1.200195f, 0.142346f, -0.074648f, -0.876392f, 0.404761f, -0.260971f, 0.875000f, 0.500000f,
+    1.247736f, 0.211501f, -0.106798f, -0.702257f, 0.362674f, -0.612620f, 0.750000f, 0.625000f,
+    1.229482f, 0.224792f, -0.062299f, -0.899738f, 0.333705f, -0.281268f, 0.875000f, 0.625000f,
+    1.222558f, 0.229834f, -0.000000f, -0.950213f, 0.311602f, 0.000000f, 1.000000f, 0.625000f,
+    1.258636f, 0.307777f, -0.051526f, -0.857015f, 0.389291f, -0.337605f, 0.875000f, 0.750000f,
+    1.308624f, 0.290154f, -0.110413f, -0.297312f, 0.323820f, -0.898191f, 0.625000f, 0.750000f,
+    1.402344f, 0.374048f, -0.100356f, 0.015086f, 0.130164f, -0.991378f, 0.500000f, 0.875000f,
+    1.360928f, 0.378432f, -0.094084f, -0.252654f, 0.337465f, -0.906799f, 0.625000f, 0.875000f,
+    1.324799f, 0.382256f, -0.075267f, -0.517529f, 0.474866f, -0.711805f, 0.750000f, 0.875000f,
+    1.444922f, 0.450000f, -0.087891f, -0.203025f, 0.352273f, -0.913611f, 0.625000f, 1.000000f,
+    1.258636f, 0.307777f, -0.051526f, -0.857015f, 0.389291f, -0.337606f, 0.875000f, 0.750000f,
+    1.324799f, 0.382256f, -0.075267f, -0.517529f, 0.474866f, -0.711805f, 0.750000f, 0.875000f,
+    1.299244f, 0.384960f, -0.043906f, -0.740671f, 0.547951f, -0.388789f, 0.875000f, 0.875000f,
+    1.289551f, 0.385986f, -0.000000f, -0.828868f, 0.559444f, 0.000000f, 1.000000f, 0.875000f,
+    1.362891f, 0.450000f, -0.041016f, -0.538815f, 0.753273f, -0.377171f, 0.875000f, 1.000000f,
+    1.350000f, 0.450000f, -0.000000f, -0.599999f, 0.800000f, 0.000000f, 0.000000f, 0.000000f,
+    1.650000f, 0.450000f, -0.000000f, 0.384615f, -0.923077f, 0.000000f, 1.000000f, 0.000000f,
+    1.400000f, 0.450000f, -0.000000f, 0.599998f, -0.800001f, 0.000000f, 0.000000f, 1.000000f,
+    1.600000f, 0.450000f, -0.000000f, -0.410365f, 0.911922f, 0.000000f, 1.000000f, 1.000000f,
+    1.500000f, 0.450000f, 0.093750f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 0.000000f,
+    1.412500f, 0.478125f, -0.000000f, 0.000000f, 1.000000f, 0.000000f, 0.000000f, 0.500000f,
+    1.563281f, 0.483398f, 0.075000f, -0.030653f, 0.998390f, 0.047730f, 0.500000f, 0.500000f,
+    1.714062f, 0.488672f, -0.000000f, 0.106533f, 0.994309f, 0.000000f, 1.000000f, 0.500000f,
+    1.500000f, 0.450000f, 0.056250f, 0.000000f, -0.000000f, -1.000000f, 0.500000f, 1.000000f,
+    1.396875f, 0.450000f, 0.070312f, -0.390970f, 0.593197f, 0.703746f, 0.250000f, 0.000000f,
+    1.385937f, 0.471094f, -0.000000f, -0.393919f, 0.919145f, 0.000000f, 0.000000f, 0.250000f,
+    1.436139f, 0.472124f, 0.065918f, -0.261242f, 0.825249f, 0.500716f, 0.250000f, 0.250000f,
+    1.546582f, 0.474390f, 0.087891f, -0.010489f, 0.543162f, 0.839563f, 0.500000f, 0.250000f,
+    1.459619f, 0.479773f, 0.056250f, -0.028676f, 0.999488f, -0.014204f, 0.250000f, 0.500000f,
+    1.362891f, 0.450000f, 0.041016f, -0.541370f, 0.750538f, 0.378960f, 0.125000f, 0.000000f,
+    1.368555f, 0.462305f, -0.000000f, -0.502135f, 0.864789f, 0.000000f, 0.000000f, 0.125000f,
+    1.382164f, 0.462453f, 0.040311f, -0.452660f, 0.827269f, 0.332754f, 0.125000f, 0.125000f,
+    1.418043f, 0.462845f, 0.069104f, -0.328007f, 0.714730f, 0.617715f, 0.250000f, 0.125000f,
+    1.399743f, 0.471377f, 0.038452f, -0.354757f, 0.895428f, 0.268992f, 0.125000f, 0.250000f,
+    1.444922f, 0.450000f, 0.087891f, -0.203320f, 0.348630f, 0.914942f, 0.375000f, 0.000000f,
+    1.418043f, 0.462845f, 0.069104f, -0.328007f, 0.714730f, 0.617715f, 0.250000f, 0.125000f,
+    1.468768f, 0.463400f, 0.086380f, -0.177466f, 0.531475f, 0.828275f, 0.375000f, 0.125000f,
+    1.526917f, 0.464035f, 0.092139f, -0.002586f, 0.248712f, 0.968574f, 0.500000f, 0.125000f,
+    1.487595f, 0.473179f, 0.082397f, -0.146800f, 0.719542f, 0.678756f, 0.375000f, 0.250000f,
+    1.399743f, 0.471377f, 0.038452f, -0.354755f, 0.895429f, 0.268990f, 0.125000f, 0.250000f,
+    1.400977f, 0.476367f, -0.000000f, -0.252422f, 0.967617f, 0.000000f, 0.000000f, 0.375000f,
+    1.414538f, 0.476757f, 0.035825f, -0.228367f, 0.958759f, 0.169205f, 0.125000f, 0.375000f,
+    1.450289f, 0.477783f, 0.061414f, -0.171147f, 0.934241f, 0.312892f, 0.250000f, 0.375000f,
+    1.425458f, 0.478578f, 0.032812f, -0.011150f, 0.999718f, -0.020946f, 0.125000f, 0.500000f,
+    1.487595f, 0.473179f, 0.082397f, -0.146800f, 0.719545f, 0.678753f, 0.375000f, 0.250000f,
+    1.450289f, 0.477783f, 0.061414f, -0.171148f, 0.934242f, 0.312891f, 0.250000f, 0.375000f,
+    1.500835f, 0.479235f, 0.076767f, -0.104867f, 0.896864f, 0.429695f, 0.375000f, 0.375000f,
+    1.558777f, 0.480899f, 0.081885f, -0.023691f, 0.837628f, 0.545728f, 0.500000f, 0.375000f,
+    1.507916f, 0.481462f, 0.070312f, -0.038175f, 0.999104f, 0.018273f, 0.375000f, 0.500000f,
+    1.603125f, 0.450000f, 0.070312f, 0.328506f, -0.736502f, 0.591311f, 0.750000f, 0.000000f,
+    1.546582f, 0.474390f, 0.087891f, -0.010489f, 0.543162f, 0.839563f, 0.500000f, 0.250000f,
+    1.657025f, 0.476656f, 0.065918f, 0.419012f, -0.340104f, 0.841878f, 0.750000f, 0.250000f,
+    1.707227f, 0.477686f, -0.000000f, 0.537133f, -0.843498f, 0.000000f, 1.000000f, 0.250000f,
+    1.666943f, 0.487024f, 0.056250f, 0.017233f, 0.992921f, 0.117519f, 0.750000f, 0.500000f,
+    1.555078f, 0.450000f, 0.087891f, 0.197370f, -0.414975f, 0.888167f, 0.625000f, 0.000000f,
+    1.526917f, 0.464035f, 0.092139f, -0.002586f, 0.248712f, 0.968574f, 0.500000f, 0.125000f,
+    1.585065f, 0.464670f, 0.086380f, 0.201774f, -0.178320f, 0.963062f, 0.625000f, 0.125000f,
+    1.635790f, 0.465225f, 0.069104f, 0.367189f, -0.618011f, 0.695150f, 0.750000f, 0.125000f,
+    1.605569f, 0.475600f, 0.082397f, 0.182564f, 0.209574f, 0.960598f, 0.625000f, 0.250000f,
+    1.637109f, 0.450000f, 0.041016f, 0.376658f, -0.888038f, 0.263661f, 0.875000f, 0.000000f,
+    1.635790f, 0.465225f, 0.069104f, 0.367189f, -0.618009f, 0.695153f, 0.750000f, 0.125000f,
+    1.671669f, 0.465617f, 0.040311f, 0.430592f, -0.845391f, 0.316077f, 0.875000f, 0.125000f,
+    1.685278f, 0.465765f, -0.000000f, 0.438412f, -0.898774f, 0.000000f, 1.000000f, 0.125000f,
+    1.693421f, 0.477402f, 0.038452f, 0.528248f, -0.743422f, 0.410218f, 0.875000f, 0.250000f,
+    1.605569f, 0.475600f, 0.082397f, 0.182565f, 0.209570f, 0.960599f, 0.625000f, 0.250000f,
+    1.558777f, 0.480899f, 0.081885f, -0.023691f, 0.837628f, 0.545728f, 0.500000f, 0.375000f,
+    1.616719f, 0.482563f, 0.076767f, 0.105864f, 0.722978f, 0.682712f, 0.625000f, 0.375000f,
+    1.667265f, 0.484015f, 0.061414f, 0.368189f, 0.433463f, 0.822524f, 0.750000f, 0.375000f,
+    1.618646f, 0.485335f, 0.070312f, -0.017857f, 0.995236f, 0.095847f, 0.625000f, 0.500000f,
+    1.693421f, 0.477402f, 0.038452f, 0.528244f, -0.743425f, 0.410215f, 0.875000f, 0.250000f,
+    1.667265f, 0.484015f, 0.061414f, 0.368191f, 0.433462f, 0.822524f, 0.750000f, 0.375000f,
+    1.703016f, 0.485041f, 0.035825f, 0.754900f, -0.180907f, 0.630395f, 0.875000f, 0.375000f,
+    1.716577f, 0.485431f, -0.000000f, 0.859737f, -0.510736f, 0.000000f, 1.000000f, 0.375000f,
+    1.701105f, 0.488219f, 0.032812f, 0.072271f, 0.992935f, 0.094111f, 0.875000f, 0.500000f,
+    1.459619f, 0.479773f, 0.056250f, -0.028676f, 0.999488f, -0.014203f, 0.250000f, 0.500000f,
+    1.420312f, 0.471094f, -0.000000f, 0.948684f, -0.316227f, 0.000000f, 0.000000f, 0.750000f,
+    1.460321f, 0.472536f, 0.046582f, 0.388841f, 0.140631f, -0.910508f, 0.250000f, 0.750000f,
+    1.548340f, 0.475708f, 0.062109f, -0.020139f, 0.565841f, -0.824268f, 0.500000f, 0.750000f,
+    1.431250f, 0.450000f, 0.042188f, 0.370536f, -0.559922f, -0.741073f, 0.250000f, 1.000000f,
+    1.425458f, 0.478578f, 0.032812f, -0.011151f, 0.999718f, -0.020945f, 0.125000f, 0.500000f,
+    1.419336f, 0.476367f, -0.000000f, 0.650788f, 0.759260f, -0.000000f, 0.000000f, 0.625000f,
+    1.431414f, 0.476827f, 0.029800f, 0.466018f, 0.764069f, -0.446123f, 0.125000f, 0.625000f,
+    1.463255f, 0.478041f, 0.051086f, 0.212314f, 0.799230f, -0.562276f, 0.250000f, 0.625000f,
+    1.431315f, 0.471490f, 0.027173f, 0.736672f, -0.149641f, -0.659487f, 0.125000f, 0.750000f,
+    1.507916f, 0.481462f, 0.070312f, -0.038175f, 0.999104f, 0.018273f, 0.375000f, 0.500000f,
+    1.463255f, 0.478041f, 0.051086f, 0.212315f, 0.799230f, -0.562276f, 0.250000f, 0.625000f,
+    1.508271f, 0.479756f, 0.063858f, 0.061046f, 0.840539f, -0.538301f, 0.375000f, 0.625000f,
+    1.559876f, 0.481723f, 0.068115f, -0.033383f, 0.880730f, -0.472440f, 0.500000f, 0.625000f,
+    1.501330f, 0.474014f, 0.058228f, 0.143907f, 0.380043f, -0.913706f, 0.375000f, 0.750000f,
+    1.431315f, 0.471490f, 0.027173f, 0.736673f, -0.149623f, -0.659489f, 0.125000f, 0.750000f,
+    1.414258f, 0.462305f, -0.000000f, 0.727013f, -0.686624f, 0.000000f, 0.000000f, 0.875000f,
+    1.424072f, 0.462553f, 0.025314f, 0.622016f, -0.580709f, -0.525236f, 0.125000f, 0.875000f,
+    1.449944f, 0.463206f, 0.043396f, 0.394296f, -0.328022f, -0.858448f, 0.250000f, 0.875000f,
+    1.408594f, 0.450000f, 0.024609f, 0.532585f, -0.738082f, -0.414232f, 0.125000f, 1.000000f,
+    1.501330f, 0.474014f, 0.058228f, 0.143907f, 0.380043f, -0.913706f, 0.375000f, 0.750000f,
+    1.449944f, 0.463206f, 0.043396f, 0.394294f, -0.328020f, -0.858449f, 0.250000f, 0.875000f,
+    1.486523f, 0.464130f, 0.054245f, 0.177862f, -0.043211f, -0.983106f, 0.375000f, 0.875000f,
+    1.528455f, 0.465189f, 0.057861f, -0.006299f, 0.244403f, -0.969653f, 0.500000f, 0.875000f,
+    1.463281f, 0.450000f, 0.052734f, 0.186166f, -0.314478f, -0.930831f, 0.375000f, 1.000000f,
+    1.666943f, 0.487024f, 0.056250f, 0.017234f, 0.992921f, 0.117521f, 0.750000f, 0.500000f,
+    1.548340f, 0.475708f, 0.062109f, -0.020139f, 0.565841f, -0.824268f, 0.500000f, 0.750000f,
+    1.636358f, 0.478880f, 0.046582f, -0.236122f, 0.847054f, -0.476179f, 0.750000f, 0.750000f,
+    1.676367f, 0.480322f, -0.000000f, -0.309738f, 0.950822f, 0.000000f, 1.000000f, 0.750000f,
+    1.568750f, 0.450000f, 0.042188f, -0.325285f, 0.686256f, -0.650571f, 0.750000f, 1.000000f,
+    1.618646f, 0.485335f, 0.070312f, -0.017856f, 0.995235f, 0.095852f, 0.625000f, 0.500000f,
+    1.559876f, 0.481723f, 0.068115f, -0.033384f, 0.880731f, -0.472439f, 0.500000f, 0.625000f,
+    1.611480f, 0.483690f, 0.063858f, -0.102068f, 0.914951f, -0.390443f, 0.625000f, 0.625000f,
+    1.656496f, 0.485405f, 0.051086f, -0.157379f, 0.946540f, -0.281590f, 0.750000f, 0.625000f,
+    1.595350f, 0.477402f, 0.058228f, -0.142748f, 0.722340f, -0.676645f, 0.625000f, 0.750000f,
+    1.701105f, 0.488219f, 0.032812f, 0.072275f, 0.992935f, 0.094114f, 0.875000f, 0.500000f,
+    1.656496f, 0.485405f, 0.051086f, -0.157378f, 0.946540f, -0.281592f, 0.750000f, 0.625000f,
+    1.688337f, 0.486619f, 0.029800f, -0.197992f, 0.969370f, -0.145333f, 0.875000f, 0.625000f,
+    1.700415f, 0.487079f, -0.000000f, -0.212233f, 0.977219f, 0.000000f, 1.000000f, 0.625000f,
+    1.665365f, 0.479926f, 0.027173f, -0.292302f, 0.927391f, -0.233464f, 0.875000f, 0.750000f,
+    1.595350f, 0.477402f, 0.058228f, -0.142748f, 0.722338f, -0.676646f, 0.625000f, 0.750000f,
+    1.528455f, 0.465189f, 0.057861f, -0.006299f, 0.244403f, -0.969653f, 0.500000f, 0.875000f,
+    1.570386f, 0.466248f, 0.054245f, -0.163578f, 0.526337f, -0.834393f, 0.625000f, 0.875000f,
+    1.606965f, 0.467171f, 0.043396f, -0.282838f, 0.759561f, -0.585721f, 0.750000f, 0.875000f,
+    1.536719f, 0.450000f, 0.052734f, -0.182506f, 0.366028f, -0.912532f, 0.625000f, 1.000000f,
+    1.665365f, 0.479926f, 0.027173f, -0.292302f, 0.927391f, -0.233463f, 0.875000f, 0.750000f,
+    1.606965f, 0.467171f, 0.043396f, -0.282837f, 0.759559f, -0.585724f, 0.750000f, 0.875000f,
+    1.632838f, 0.467825f, 0.025314f, -0.349511f, 0.893333f, -0.282485f, 0.875000f, 0.875000f,
+    1.642651f, 0.468073f, -0.000000f, -0.366863f, 0.930275f, 0.000000f, 1.000000f, 0.875000f,
+    1.591406f, 0.450000f, 0.024609f, -0.394896f, 0.865864f, -0.307141f, 0.875000f, 1.000000f,
+    1.650000f, 0.450000f, -0.000000f, 0.384615f, -0.923077f, 0.000000f, 0.000000f, 0.000000f,
+    1.350000f, 0.450000f, -0.000000f, -0.599999f, 0.800000f, 0.000000f, 1.000000f, 0.000000f,
+    1.600000f, 0.450000f, -0.000000f, -0.410365f, 0.911922f, 0.000000f, 0.000000f, 1.000000f,
+    1.400000f, 0.450000f, -0.000000f, 0.599998f, -0.800001f, 0.000000f, 1.000000f, 1.000000f,
+    1.500000f, 0.450000f, -0.093750f, 0.000000f, 0.000000f, -1.000000f, 0.500000f, 0.000000f,
+    1.714062f, 0.488672f, -0.000000f, 0.106533f, 0.994309f, 0.000000f, 0.000000f, 0.500000f,
+    1.563281f, 0.483398f, -0.075000f, -0.030594f, 0.996500f, -0.077797f, 0.500000f, 0.500000f,
+    1.412500f, 0.478125f, -0.000000f, 0.000000f, 1.000000f, 0.000000f, 1.000000f, 0.500000f,
+    1.500000f, 0.450000f, -0.056250f, 0.000000f, 0.000000f, 1.000000f, 0.500000f, 1.000000f,
+    1.603125f, 0.450000f, -0.070312f, 0.325932f, -0.741335f, -0.586677f, 0.250000f, 0.000000f,
+    1.707227f, 0.477686f, -0.000000f, 0.537133f, -0.843498f, 0.000000f, 0.000000f, 0.250000f,
+    1.657025f, 0.476656f, -0.065918f, 0.416712f, -0.355669f, -0.836570f, 0.250000f, 0.250000f,
+    1.546582f, 0.474390f, -0.087891f, -0.010489f, 0.543162f, -0.839563f, 0.500000f, 0.250000f,
+    1.666943f, 0.487024f, -0.056250f, 0.020713f, 0.991902f, -0.125308f, 0.250000f, 0.500000f,
+    1.637109f, 0.450000f, -0.041016f, 0.375683f, -0.888653f, -0.262978f, 0.125000f, 0.000000f,
+    1.685278f, 0.465765f, -0.000000f, 0.438412f, -0.898774f, 0.000000f, 0.000000f, 0.125000f,
+    1.671669f, 0.465617f, -0.040311f, 0.429299f, -0.846413f, -0.315099f, 0.125000f, 0.125000f,
+    1.635790f, 0.465225f, -0.069104f, 0.367189f, -0.618009f, -0.695153f, 0.250000f, 0.125000f,
+    1.693421f, 0.477402f, -0.038452f, 0.526088f, -0.745922f, -0.408450f, 0.125000f, 0.250000f,
+    1.555078f, 0.450000f, -0.087891f, 0.197089f, -0.417807f, -0.886901f, 0.375000f, 0.000000f,
+    1.635790f, 0.465225f, -0.069104f, 0.367189f, -0.618011f, -0.695150f, 0.250000f, 0.125000f,
+    1.585065f, 0.464670f, -0.086380f, 0.201644f, -0.183060f, -0.962200f, 0.375000f, 0.125000f,
+    1.526917f, 0.464035f, -0.092139f, -0.002586f, 0.248712f, -0.968574f, 0.500000f, 0.125000f,
+    1.605569f, 0.475600f, -0.082397f, 0.183016f, 0.202049f, -0.962123f, 0.375000f, 0.250000f,
+    1.693421f, 0.477402f, -0.038452f, 0.526085f, -0.745926f, -0.408447f, 0.125000f, 0.250000f,
+    1.716577f, 0.485431f, -0.000000f, 0.859737f, -0.510736f, 0.000000f, 0.000000f, 0.375000f,
+    1.703016f, 0.485041f, -0.035825f, 0.753057f, -0.194596f, -0.628520f, 0.125000f, 0.375000f,
+    1.667265f, 0.484015f, -0.061414f, 0.368191f, 0.433462f, -0.822524f, 0.250000f, 0.375000f,
+    1.701105f, 0.488219f, -0.032812f, 0.074241f, 0.992625f, -0.095834f, 0.125000f, 0.500000f,
+    1.605569f, 0.475600f, -0.082397f, 0.183016f, 0.202045f, -0.962124f, 0.375000f, 0.250000f,
+    1.667265f, 0.484015f, -0.061414f, 0.368189f, 0.433463f, -0.822524f, 0.250000f, 0.375000f,
+    1.616719f, 0.482563f, -0.076767f, 0.107208f, 0.716766f, -0.689024f, 0.375000f, 0.375000f,
+    1.558777f, 0.480899f, -0.081885f, -0.023691f, 0.837628f, -0.545728f, 0.500000f, 0.375000f,
+    1.618646f, 0.485335f, -0.070312f, -0.017113f, 0.994843f, -0.099972f, 0.375000f, 0.500000f,
+    1.396875f, 0.450000f, -0.070312f, -0.386984f, 0.604180f, -0.696570f, 0.750000f, 0.000000f,
+    1.546582f, 0.474390f, -0.087891f, -0.010489f, 0.543162f, -0.839563f, 0.500000f, 0.250000f,
+    1.436139f, 0.472124f, -0.065918f, -0.260333f, 0.826693f, -0.498803f, 0.750000f, 0.250000f,
+    1.385937f, 0.471094f, -0.000000f, -0.393919f, 0.919145f, 0.000000f, 1.000000f, 0.250000f,
+    1.459619f, 0.479773f, -0.056250f, -0.031625f, 0.999471f, 0.007533f, 0.750000f, 0.500000f,
+    1.444922f, 0.450000f, -0.087891f, -0.203025f, 0.352273f, -0.913611f, 0.625000f, 0.000000f,
+    1.526917f, 0.464035f, -0.092139f, -0.002586f, 0.248712f, -0.968574f, 0.500000f, 0.125000f,
+    1.468768f, 0.463400f, -0.086380f, -0.177235f, 0.533433f, -0.827065f, 0.625000f, 0.125000f,
+    1.418043f, 0.462845f, -0.069104f, -0.328007f, 0.714730f, -0.617715f, 0.750000f, 0.125000f,
+    1.487595f, 0.473179f, -0.082397f, -0.146760f, 0.719769f, -0.678524f, 0.625000f, 0.250000f,
+    1.362891f, 0.450000f, -0.041016f, -0.538816f, 0.753272f, -0.377172f, 0.875000f, 0.000000f,
+    1.418043f, 0.462845f, -0.069104f, -0.328007f, 0.714730f, -0.617715f, 0.750000f, 0.125000f,
+    1.382164f, 0.462453f, -0.040311f, -0.450802f, 0.828846f, -0.331350f, 0.875000f, 0.125000f,
+    1.368555f, 0.462305f, -0.000000f, -0.502135f, 0.864789f, 0.000000f, 1.000000f, 0.125000f,
+    1.399743f, 0.471377f, -0.038452f, -0.353662f, 0.896127f, -0.268105f, 0.875000f, 0.250000f,
+    1.487595f, 0.473179f, -0.082397f, -0.146759f, 0.719772f, -0.678521f, 0.625000f, 0.250000f,
+    1.558777f, 0.480899f, -0.081885f, -0.023691f, 0.837628f, -0.545728f, 0.500000f, 0.375000f,
+    1.500835f, 0.479235f, -0.076767f, -0.105172f, 0.895971f, -0.431480f, 0.625000f, 0.375000f,
+    1.450289f, 0.477783f, -0.061414f, -0.171148f, 0.934242f, -0.312891f, 0.750000f, 0.375000f,
+    1.507916f, 0.481462f, -0.070312f, -0.038808f, 0.999007f, -0.021872f, 0.625000f, 0.500000f,
+    1.399743f, 0.471377f, -0.038452f, -0.353660f, 0.896128f, -0.268103f, 0.875000f, 0.250000f,
+    1.450289f, 0.477783f, -0.061414f, -0.171147f, 0.934241f, -0.312892f, 0.750000f, 0.375000f,
+    1.414538f, 0.476757f, -0.035825f, -0.228267f, 0.958797f, -0.169120f, 0.875000f, 0.375000f,
+    1.400977f, 0.476367f, -0.000000f, -0.252422f, 0.967617f, 0.000000f, 1.000000f, 0.375000f,
+    1.425458f, 0.478578f, -0.032812f, -0.012463f, 0.999726f, 0.019791f, 0.875000f, 0.500000f,
+    1.666943f, 0.487024f, -0.056250f, 0.020714f, 0.991901f, -0.125310f, 0.250000f, 0.500000f,
+    1.676367f, 0.480322f, -0.000000f, -0.309738f, 0.950822f, 0.000000f, 0.000000f, 0.750000f,
+    1.636358f, 0.478880f, -0.046582f, -0.235472f, 0.848126f, 0.474589f, 0.250000f, 0.750000f,
+    1.548340f, 0.475708f, -0.062109f, -0.020139f, 0.565841f, 0.824268f, 0.500000f, 0.750000f,
+    1.568750f, 0.450000f, -0.042188f, -0.323573f, 0.690291f, 0.647147f, 0.250000f, 1.000000f,
+    1.701105f, 0.488219f, -0.032812f, 0.074245f, 0.992624f, -0.095838f, 0.125000f, 0.500000f,
+    1.700415f, 0.487079f, -0.000000f, -0.212233f, 0.977219f, 0.000000f, 0.000000f, 0.625000f,
+    1.688337f, 0.486619f, -0.029800f, -0.197930f, 0.969391f, 0.145277f, 0.125000f, 0.625000f,
+    1.656496f, 0.485405f, -0.051086f, -0.157378f, 0.946540f, 0.281592f, 0.250000f, 0.625000f,
+    1.665365f, 0.479926f, -0.027173f, -0.292143f, 0.927478f, 0.233317f, 0.125000f, 0.750000f,
+    1.618646f, 0.485335f, -0.070312f, -0.017112f, 0.994843f, -0.099978f, 0.375000f, 0.500000f,
+    1.656496f, 0.485405f, -0.051086f, -0.157379f, 0.946540f, 0.281590f, 0.250000f, 0.625000f,
+    1.611480f, 0.483690f, -0.063858f, -0.102043f, 0.915022f, 0.390285f, 0.375000f, 0.625000f,
+    1.559876f, 0.481723f, -0.068115f, -0.033384f, 0.880731f, 0.472439f, 0.500000f, 0.625000f,
+    1.595350f, 0.477402f, -0.058228f, -0.142797f, 0.721999f, 0.676998f, 0.375000f, 0.750000f,
+    1.665365f, 0.479926f, -0.027173f, -0.292143f, 0.927478f, 0.233317f, 0.125000f, 0.750000f,
+    1.642651f, 0.468073f, -0.000000f, -0.366863f, 0.930275f, 0.000000f, 0.000000f, 0.875000f,
+    1.632838f, 0.467825f, -0.025314f, -0.349075f, 0.893625f, 0.282102f, 0.125000f, 0.875000f,
+    1.606965f, 0.467171f, -0.043396f, -0.282837f, 0.759559f, 0.585724f, 0.250000f, 0.875000f,
+    1.591406f, 0.450000f, -0.024609f, -0.394161f, 0.866402f, 0.306569f, 0.125000f, 1.000000f,
+    1.595350f, 0.477402f, -0.058228f, -0.142797f, 0.721999f, 0.676998f, 0.375000f, 0.750000f,
+    1.606965f, 0.467171f, -0.043396f, -0.282838f, 0.759561f, 0.585721f, 0.250000f, 0.875000f,
+    1.570386f, 0.466248f, -0.054245f, -0.163533f, 0.526860f, 0.834072f, 0.375000f, 0.875000f,
+    1.528455f, 0.465189f, -0.057861f, -0.006299f, 0.244403f, 0.969653f, 0.500000f, 0.875000f,
+    1.536719f, 0.450000f, -0.052734f, -0.182345f, 0.368116f, 0.911724f, 0.375000f, 1.000000f,
+    1.459619f, 0.479773f, -0.056250f, -0.031626f, 0.999471f, 0.007532f, 0.750000f, 0.500000f,
+    1.548340f, 0.475708f, -0.062109f, -0.020139f, 0.565841f, 0.824268f, 0.500000f, 0.750000f,
+    1.460321f, 0.472536f, -0.046582f, 0.390568f, 0.119605f, 0.912771f, 0.750000f, 0.750000f,
+    1.420312f, 0.471094f, -0.000000f, 0.948684f, -0.316227f, 0.000000f, 1.000000f, 0.750000f,
+    1.431250f, 0.450000f, -0.042188f, 0.367398f, -0.570170f, 0.734796f, 0.750000f, 1.000000f,
+    1.507916f, 0.481462f, -0.070312f, -0.038808f, 0.999007f, -0.021872f, 0.625000f, 0.500000f,
+    1.559876f, 0.481723f, -0.068115f, -0.033383f, 0.880730f, 0.472440f, 0.500000f, 0.625000f,
+    1.508271f, 0.479756f, -0.063858f, 0.060846f, 0.841199f, 0.537292f, 0.625000f, 0.625000f,
+    1.463255f, 0.478041f, -0.051086f, 0.212315f, 0.799230f, 0.562276f, 0.750000f, 0.625000f,
+    1.501330f, 0.474014f, -0.058228f, 0.144240f, 0.376853f, 0.914974f, 0.625000f, 0.750000f,
+    1.425458f, 0.478578f, -0.032812f, -0.012465f, 0.999726f, 0.019790f, 0.875000f, 0.500000f,
+    1.463255f, 0.478041f, -0.051086f, 0.212314f, 0.799230f, 0.562276f, 0.750000f, 0.625000f,
+    1.431414f, 0.476827f, -0.029800f, 0.465501f, 0.764644f, 0.445677f, 0.875000f, 0.625000f,
+    1.419336f, 0.476367f, -0.000000f, 0.650788f, 0.759260f, -0.000000f, 1.000000f, 0.625000f,
+    1.431315f, 0.471490f, -0.027173f, 0.736016f, -0.156276f, 0.658680f, 0.875000f, 0.750000f,
+    1.501330f, 0.474014f, -0.058228f, 0.144240f, 0.376852f, 0.914974f, 0.625000f, 0.750000f,
+    1.528455f, 0.465189f, -0.057861f, -0.006299f, 0.244403f, 0.969653f, 0.500000f, 0.875000f,
+    1.486523f, 0.464130f, -0.054245f, 0.177936f, -0.047578f, 0.982891f, 0.625000f, 0.875000f,
+    1.449944f, 0.463206f, -0.043396f, 0.394294f, -0.328020f, 0.858449f, 0.750000f, 0.875000f,
+    1.463281f, 0.450000f, -0.052734f, 0.185972f, -0.317450f, 0.929860f, 0.625000f, 1.000000f,
+    1.431315f, 0.471490f, -0.027173f, 0.736017f, -0.156259f, 0.658682f, 0.875000f, 0.750000f,
+    1.449944f, 0.463206f, -0.043396f, 0.394296f, -0.328022f, 0.858448f, 0.750000f, 0.875000f,
+    1.424072f, 0.462553f, -0.025314f, 0.619509f, -0.585423f, 0.522962f, 0.875000f, 0.875000f,
+    1.414258f, 0.462305f, -0.000000f, 0.727013f, -0.686624f, 0.000000f, 1.000000f, 0.875000f,
+    1.408594f, 0.450000f, -0.024609f, 0.530206f, -0.740826f, 0.412382f, 0.875000f, 1.000000f,
+    0.000000f, 0.825000f, -0.000000f, 0.674579f, 0.299813f, 0.674579f, 0.000000f, 0.000000f,
+    0.000000f, 0.825000f, -0.000000f, 0.674579f, 0.299813f, 0.674579f, 1.000000f, 0.000000f,
+    0.100000f, 0.600000f, -0.000000f, 0.600000f, 0.800000f, -0.000000f, 0.000000f, 1.000000f,
+    0.000000f, 0.600000f, 0.100000f, 0.000000f, 0.800000f, 0.600000f, 1.000000f, 1.000000f,
+    0.000000f, 0.825000f, -0.000000f, 0.674579f, 0.299813f, 0.674579f, 0.500000f, 0.000000f,
+    0.162500f, 0.740625f, -0.000000f, 0.780869f, -0.624695f, 0.000000f, 0.000000f, 0.500000f,
+    0.115516f, 0.740625f, 0.115516f, 0.553962f, -0.621492f, 0.553962f, 0.500000f, 0.500000f,
+    0.000000f, 0.740625f, 0.162500f, 0.000000f, -0.624695f, 0.780869f, 1.000000f, 0.500000f,
+    0.071000f, 0.600000f, 0.071000f, 0.427005f, 0.797078f, 0.427005f, 0.500000f, 1.000000f,
+    0.000000f, 0.825000f, -0.000000f, 0.452928f, 0.872306f, 0.184222f, 0.250000f, 0.000000f,
+    0.170313f, 0.800391f, -0.000000f, 0.600000f, 0.800000f, -0.000000f, 0.000000f, 0.250000f,
+    0.157173f, 0.800391f, 0.067026f, 0.554284f, 0.799965f, 0.229837f, 0.250000f, 0.250000f,
+    0.121080f, 0.800391f, 0.121080f, 0.422824f, 0.801523f, 0.422824f, 0.500000f, 0.250000f,
+    0.149959f, 0.740625f, 0.063939f, 0.721237f, -0.624756f, 0.299162f, 0.250000f, 0.500000f,
+    0.000000f, 0.825000f, -0.000000f, 0.142954f, 0.989332f, 0.028025f, 0.125000f, 0.000000f,
+    0.115039f, 0.818408f, -0.000000f, 0.152452f, 0.988311f, -0.000000f, 0.000000f, 0.125000f,
+    0.112750f, 0.818408f, 0.023522f, 0.149493f, 0.988317f, 0.029677f, 0.125000f, 0.125000f,
+    0.106164f, 0.818408f, 0.045274f, 0.140386f, 0.988384f, 0.058210f, 0.250000f, 0.125000f,
+    0.166924f, 0.800391f, 0.034822f, 0.588416f, 0.800075f, 0.116818f, 0.125000f, 0.250000f,
+    0.000000f, 0.825000f, -0.000000f, 0.120585f, 0.989432f, 0.080516f, 0.375000f, 0.000000f,
+    0.106164f, 0.818408f, 0.045274f, 0.140386f, 0.988384f, 0.058209f, 0.250000f, 0.125000f,
+    0.095702f, 0.818408f, 0.064836f, 0.126226f, 0.988401f, 0.084441f, 0.375000f, 0.125000f,
+    0.081785f, 0.818408f, 0.081785f, 0.107233f, 0.988434f, 0.107233f, 0.500000f, 0.125000f,
+    0.141684f, 0.800391f, 0.095986f, 0.497465f, 0.801110f, 0.332794f, 0.375000f, 0.250000f,
+    0.166924f, 0.800391f, 0.034822f, 0.588416f, 0.800075f, 0.116818f, 0.125000f, 0.250000f,
+    0.181055f, 0.773584f, -0.000000f, 0.978147f, -0.207916f, 0.000000f, 0.000000f, 0.375000f,
+    0.177452f, 0.773584f, 0.037016f, 0.959398f, -0.208008f, 0.190496f, 0.125000f, 0.375000f,
+    0.167085f, 0.773584f, 0.071249f, 0.903388f, -0.208673f, 0.374628f, 0.250000f, 0.375000f,
+    0.159265f, 0.740625f, 0.033217f, 0.765799f, -0.624831f, 0.152111f, 0.125000f, 0.500000f,
+    0.141684f, 0.800391f, 0.095986f, 0.497465f, 0.801110f, 0.332794f, 0.375000f, 0.250000f,
+    0.167085f, 0.773584f, 0.071249f, 0.903388f, -0.208673f, 0.374627f, 0.250000f, 0.375000f,
+    0.150618f, 0.773584f, 0.102036f, 0.812814f, -0.208889f, 0.543782f, 0.375000f, 0.375000f,
+    0.128714f, 0.773584f, 0.128714f, 0.691459f, -0.209208f, 0.691459f, 0.500000f, 0.375000f,
+    0.135177f, 0.740625f, 0.091571f, 0.647897f, -0.626344f, 0.433501f, 0.375000f, 0.500000f,
+    0.000000f, 0.825000f, -0.000000f, 0.184222f, 0.872306f, 0.452928f, 0.750000f, 0.000000f,
+    0.121080f, 0.800391f, 0.121080f, 0.422824f, 0.801523f, 0.422824f, 0.500000f, 0.250000f,
+    0.067026f, 0.800391f, 0.157173f, 0.229949f, 0.799746f, 0.554553f, 0.750000f, 0.250000f,
+    0.000000f, 0.800391f, 0.170313f, 0.000000f, 0.800000f, 0.600000f, 1.000000f, 0.250000f,
+    0.063939f, 0.740625f, 0.149959f, 0.299246f, -0.624481f, 0.721440f, 0.750000f, 0.500000f,
+    0.000000f, 0.825000f, -0.000000f, 0.080516f, 0.989432f, 0.120585f, 0.625000f, 0.000000f,
+    0.081785f, 0.818408f, 0.081785f, 0.107233f, 0.988434f, 0.107233f, 0.500000f, 0.125000f,
+    0.064836f, 0.818408f, 0.095702f, 0.084445f, 0.988400f, 0.126232f, 0.625000f, 0.125000f,
+    0.045274f, 0.818408f, 0.106164f, 0.058209f, 0.988384f, 0.140386f, 0.750000f, 0.125000f,
+    0.095986f, 0.800391f, 0.141684f, 0.332805f, 0.801096f, 0.497480f, 0.625000f, 0.250000f,
+    0.000000f, 0.825000f, -0.000000f, 0.028025f, 0.989332f, 0.142954f, 0.875000f, 0.000000f,
+    0.045274f, 0.818408f, 0.106164f, 0.058210f, 0.988384f, 0.140386f, 0.750000f, 0.125000f,
+    0.023522f, 0.818408f, 0.112750f, 0.029681f, 0.988314f, 0.149513f, 0.875000f, 0.125000f,
+    0.000000f, 0.818408f, 0.115039f, 0.000000f, 0.988311f, 0.152452f, 1.000000f, 0.125000f,
+    0.034822f, 0.800391f, 0.166924f, 0.116828f, 0.800035f, 0.588468f, 0.875000f, 0.250000f,
+    0.095986f, 0.800391f, 0.141684f, 0.332805f, 0.801096f, 0.497480f, 0.625000f, 0.250000f,
+    0.128714f, 0.773584f, 0.128714f, 0.691459f, -0.209208f, 0.691459f, 0.500000f, 0.375000f,
+    0.102036f, 0.773584f, 0.150618f, 0.543783f, -0.208883f, 0.812815f, 0.625000f, 0.375000f,
+    0.071249f, 0.773584f, 0.167085f, 0.374627f, -0.208673f, 0.903388f, 0.750000f, 0.375000f,
+    0.091571f, 0.740625f, 0.135177f, 0.433508f, -0.626329f, 0.647907f, 0.625000f, 0.500000f,
+    0.034822f, 0.800391f, 0.166924f, 0.116828f, 0.800035f, 0.588468f, 0.875000f, 0.250000f,
+    0.071249f, 0.773584f, 0.167085f, 0.374628f, -0.208673f, 0.903388f, 0.750000f, 0.375000f,
+    0.037016f, 0.773584f, 0.177452f, 0.190497f, -0.207986f, 0.959402f, 0.875000f, 0.375000f,
+    0.000000f, 0.773584f, 0.181055f, 0.000000f, -0.207916f, 0.978147f, 1.000000f, 0.375000f,
+    0.033217f, 0.740625f, 0.159265f, 0.152118f, -0.624784f, 0.765837f, 0.875000f, 0.500000f,
+    0.149959f, 0.740625f, 0.063939f, 0.721237f, -0.624756f, 0.299162f, 0.250000f, 0.500000f,
+    0.098437f, 0.666797f, -0.000000f, 0.819843f, -0.572589f, 0.000000f, 0.000000f, 0.750000f,
+    0.090828f, 0.666797f, 0.038696f, 0.756991f, -0.572775f, 0.314474f, 0.250000f, 0.750000f,
+    0.069943f, 0.666797f, 0.069943f, 0.578481f, -0.575083f, 0.578480f, 0.500000f, 0.750000f,
+    0.092250f, 0.600000f, 0.039250f, 0.554119f, 0.799779f, 0.230883f, 0.250000f, 1.000000f,
+    0.159265f, 0.740625f, 0.033217f, 0.765799f, -0.624831f, 0.152111f, 0.125000f, 0.500000f,
+    0.129883f, 0.704150f, -0.000000f, 0.733920f, -0.679236f, 0.000000f, 0.000000f, 0.625000f,
+    0.127296f, 0.704150f, 0.026539f, 0.719711f, -0.679374f, 0.143067f, 0.125000f, 0.625000f,
+    0.119854f, 0.704150f, 0.051090f, 0.676763f, -0.680523f, 0.280858f, 0.250000f, 0.625000f,
+    0.096475f, 0.666797f, 0.020097f, 0.803930f, -0.572768f, 0.160103f, 0.125000f, 0.750000f,
+    0.135177f, 0.740625f, 0.091571f, 0.647897f, -0.626344f, 0.433501f, 0.375000f, 0.500000f,
+    0.119854f, 0.704150f, 0.051090f, 0.676763f, -0.680523f, 0.280858f, 0.250000f, 0.625000f,
+    0.108035f, 0.704150f, 0.073175f, 0.608679f, -0.680856f, 0.407364f, 0.375000f, 0.625000f,
+    0.092316f, 0.704150f, 0.092316f, 0.517530f, -0.681414f, 0.517530f, 0.500000f, 0.625000f,
+    0.081863f, 0.666797f, 0.055433f, 0.680115f, -0.574467f, 0.455446f, 0.375000f, 0.750000f,
+    0.096475f, 0.666797f, 0.020097f, 0.803930f, -0.572768f, 0.160103f, 0.125000f, 0.750000f,
+    0.083398f, 0.631201f, -0.000000f, 0.998653f, -0.051878f, 0.000000f, 0.000000f, 0.875000f,
+    0.081732f, 0.631201f, 0.017004f, 0.979312f, -0.052085f, 0.195539f, 0.125000f, 0.875000f,
+    0.076941f, 0.631201f, 0.032751f, 0.921944f, -0.052662f, 0.383727f, 0.250000f, 0.875000f,
+    0.098000f, 0.600000f, 0.020375f, 0.588328f, 0.800016f, 0.117666f, 0.125000f, 1.000000f,
+    0.081863f, 0.666797f, 0.055433f, 0.680115f, -0.574467f, 0.455446f, 0.375000f, 0.750000f,
+    0.076941f, 0.631201f, 0.032751f, 0.921944f, -0.052662f, 0.383728f, 0.250000f, 0.875000f,
+    0.069336f, 0.631201f, 0.046930f, 0.829512f, -0.053050f, 0.555963f, 0.375000f, 0.875000f,
+    0.059228f, 0.631201f, 0.059228f, 0.706103f, -0.053279f, 0.706102f, 0.500000f, 0.875000f,
+    0.083125f, 0.600000f, 0.056250f, 0.497431f, 0.800807f, 0.333571f, 0.375000f, 1.000000f,
+    0.063939f, 0.740625f, 0.149959f, 0.299246f, -0.624480f, 0.721440f, 0.750000f, 0.500000f,
+    0.069943f, 0.666797f, 0.069943f, 0.578480f, -0.575083f, 0.578481f, 0.500000f, 0.750000f,
+    0.038696f, 0.666797f, 0.090828f, 0.314542f, -0.572521f, 0.757155f, 0.750000f, 0.750000f,
+    0.000000f, 0.666797f, 0.098437f, 0.000000f, -0.572589f, 0.819843f, 1.000000f, 0.750000f,
+    0.039250f, 0.600000f, 0.092250f, 0.230996f, 0.799557f, 0.554392f, 0.750000f, 1.000000f,
+    0.091571f, 0.740625f, 0.135177f, 0.433508f, -0.626329f, 0.647907f, 0.625000f, 0.500000f,
+    0.092316f, 0.704150f, 0.092316f, 0.517530f, -0.681414f, 0.517530f, 0.500000f, 0.625000f,
+    0.073175f, 0.704150f, 0.108035f, 0.407370f, -0.680843f, 0.608689f, 0.625000f, 0.625000f,
+    0.051090f, 0.704150f, 0.119854f, 0.280858f, -0.680523f, 0.676763f, 0.750000f, 0.625000f,
+    0.055433f, 0.666797f, 0.081863f, 0.455449f, -0.574459f, 0.680120f, 0.625000f, 0.750000f,
+    0.033217f, 0.740625f, 0.159265f, 0.152118f, -0.624783f, 0.765837f, 0.875000f, 0.500000f,
+    0.051090f, 0.704150f, 0.119854f, 0.280858f, -0.680523f, 0.676763f, 0.750000f, 0.625000f,
+    0.026539f, 0.704150f, 0.127296f, 0.143075f, -0.679330f, 0.719750f, 0.875000f, 0.625000f,
+    0.000000f, 0.704150f, 0.129883f, 0.000000f, -0.679236f, 0.733920f, 1.000000f, 0.625000f,
+    0.020097f, 0.666797f, 0.096475f, 0.160109f, -0.572729f, 0.803957f, 0.875000f, 0.750000f,
+    0.055433f, 0.666797f, 0.081863f, 0.455449f, -0.574459f, 0.680120f, 0.625000f, 0.750000f,
+    0.059228f, 0.631201f, 0.059228f, 0.706102f, -0.053279f, 0.706103f, 0.500000f, 0.875000f,
+    0.046930f, 0.631201f, 0.069336f, 0.555963f, -0.053067f, 0.829512f, 0.625000f, 0.875000f,
+    0.032751f, 0.631201f, 0.076941f, 0.383728f, -0.052662f, 0.921944f, 0.750000f, 0.875000f,
+    0.056250f, 0.600000f, 0.083125f, 0.333582f, 0.800793f, 0.497447f, 0.625000f, 1.000000f,
+    0.020097f, 0.666797f, 0.096475f, 0.160109f, -0.572729f, 0.803957f, 0.875000f, 0.750000f,
+    0.032751f, 0.631201f, 0.076941f, 0.383727f, -0.052662f, 0.921944f, 0.750000f, 0.875000f,
+    0.017004f, 0.631201f, 0.081732f, 0.195539f, -0.052105f, 0.979311f, 0.875000f, 0.875000f,
+    0.000000f, 0.631201f, 0.083398f, 0.000000f, -0.051878f, 0.998653f, 1.000000f, 0.875000f,
+    0.020375f, 0.600000f, 0.098000f, 0.117676f, 0.799975f, 0.588381f, 0.875000f, 1.000000f,
+    0.000000f, 0.825000f, -0.000000f, -0.674579f, 0.299813f, 0.674579f, 0.000000f, 0.000000f,
+    0.000000f, 0.825000f, -0.000000f, -0.674579f, 0.299813f, 0.674579f, 1.000000f, 0.000000f,
+    0.000000f, 0.600000f, 0.100000f, 0.000000f, 0.800000f, 0.600000f, 0.000000f, 1.000000f,
+    -0.100000f, 0.600000f, -0.000000f, -0.600000f, 0.800000f, 0.000000f, 1.000000f, 1.000000f,
+    0.000000f, 0.825000f, -0.000000f, -0.674579f, 0.299813f, 0.674579f, 0.500000f, 0.000000f,
+    0.000000f, 0.740625f, 0.162500f, 0.000000f, -0.624695f, 0.780869f, 0.000000f, 0.500000f,
+    -0.115516f, 0.740625f, 0.115516f, -0.553962f, -0.621492f, 0.553962f, 0.500000f, 0.500000f,
+    -0.162500f, 0.740625f, -0.000000f, -0.780869f, -0.624695f, -0.000000f, 1.000000f, 0.500000f,
+    -0.071000f, 0.600000f, 0.071000f, -0.427005f, 0.797078f, 0.427005f, 0.500000f, 1.000000f,
+    0.000000f, 0.825000f, -0.000000f, -0.184222f, 0.872306f, 0.452928f, 0.250000f, 0.000000f,
+    0.000000f, 0.800391f, 0.170313f, 0.000000f, 0.800000f, 0.600000f, 0.000000f, 0.250000f,
+    -0.067026f, 0.800391f, 0.157173f, -0.229837f, 0.799965f, 0.554284f, 0.250000f, 0.250000f,
+    -0.121080f, 0.800391f, 0.121080f, -0.422824f, 0.801523f, 0.422824f, 0.500000f, 0.250000f,
+    -0.063939f, 0.740625f, 0.149959f, -0.299162f, -0.624756f, 0.721237f, 0.250000f, 0.500000f,
+    0.000000f, 0.825000f, -0.000000f, -0.028025f, 0.989332f, 0.142954f, 0.125000f, 0.000000f,
+    0.000000f, 0.818408f, 0.115039f, 0.000000f, 0.988311f, 0.152452f, 0.000000f, 0.125000f,
+    -0.023522f, 0.818408f, 0.112750f, -0.029677f, 0.988317f, 0.149493f, 0.125000f, 0.125000f,
+    -0.045274f, 0.818408f, 0.106164f, -0.058210f, 0.988384f, 0.140386f, 0.250000f, 0.125000f,
+    -0.034822f, 0.800391f, 0.166924f, -0.116818f, 0.800075f, 0.588416f, 0.125000f, 0.250000f,
+    0.000000f, 0.825000f, -0.000000f, -0.080516f, 0.989432f, 0.120585f, 0.375000f, 0.000000f,
+    -0.045274f, 0.818408f, 0.106164f, -0.058209f, 0.988384f, 0.140386f, 0.250000f, 0.125000f,
+    -0.064836f, 0.818408f, 0.095702f, -0.084441f, 0.988401f, 0.126226f, 0.375000f, 0.125000f,
+    -0.081785f, 0.818408f, 0.081785f, -0.107233f, 0.988434f, 0.107233f, 0.500000f, 0.125000f,
+    -0.095986f, 0.800391f, 0.141684f, -0.332794f, 0.801110f, 0.497465f, 0.375000f, 0.250000f,
+    -0.034822f, 0.800391f, 0.166924f, -0.116818f, 0.800075f, 0.588416f, 0.125000f, 0.250000f,
+    0.000000f, 0.773584f, 0.181055f, 0.000000f, -0.207916f, 0.978147f, 0.000000f, 0.375000f,
+    -0.037016f, 0.773584f, 0.177452f, -0.190496f, -0.208008f, 0.959398f, 0.125000f, 0.375000f,
+    -0.071249f, 0.773584f, 0.167085f, -0.374628f, -0.208673f, 0.903388f, 0.250000f, 0.375000f,
+    -0.033217f, 0.740625f, 0.159265f, -0.152111f, -0.624831f, 0.765799f, 0.125000f, 0.500000f,
+    -0.095986f, 0.800391f, 0.141684f, -0.332794f, 0.801110f, 0.497465f, 0.375000f, 0.250000f,
+    -0.071249f, 0.773584f, 0.167085f, -0.374627f, -0.208673f, 0.903388f, 0.250000f, 0.375000f,
+    -0.102036f, 0.773584f, 0.150618f, -0.543782f, -0.208889f, 0.812814f, 0.375000f, 0.375000f,
+    -0.128714f, 0.773584f, 0.128714f, -0.691459f, -0.209208f, 0.691459f, 0.500000f, 0.375000f,
+    -0.091571f, 0.740625f, 0.135177f, -0.433501f, -0.626344f, 0.647897f, 0.375000f, 0.500000f,
+    0.000000f, 0.825000f, -0.000000f, -0.452928f, 0.872306f, 0.184222f, 0.750000f, 0.000000f,
+    -0.121080f, 0.800391f, 0.121080f, -0.422824f, 0.801523f, 0.422824f, 0.500000f, 0.250000f,
+    -0.157173f, 0.800391f, 0.067026f, -0.554553f, 0.799746f, 0.229949f, 0.750000f, 0.250000f,
+    -0.170313f, 0.800391f, -0.000000f, -0.600000f, 0.800000f, 0.000000f, 1.000000f, 0.250000f,
+    -0.149959f, 0.740625f, 0.063939f, -0.721440f, -0.624481f, 0.299246f, 0.750000f, 0.500000f,
+    0.000000f, 0.825000f, -0.000000f, -0.120585f, 0.989432f, 0.080516f, 0.625000f, 0.000000f,
+    -0.081785f, 0.818408f, 0.081785f, -0.107233f, 0.988434f, 0.107233f, 0.500000f, 0.125000f,
+    -0.095702f, 0.818408f, 0.064836f, -0.126232f, 0.988400f, 0.084445f, 0.625000f, 0.125000f,
+    -0.106164f, 0.818408f, 0.045274f, -0.140386f, 0.988384f, 0.058209f, 0.750000f, 0.125000f,
+    -0.141684f, 0.800391f, 0.095986f, -0.497480f, 0.801096f, 0.332805f, 0.625000f, 0.250000f,
+    0.000000f, 0.825000f, -0.000000f, -0.142954f, 0.989332f, 0.028025f, 0.875000f, 0.000000f,
+    -0.106164f, 0.818408f, 0.045274f, -0.140386f, 0.988384f, 0.058210f, 0.750000f, 0.125000f,
+    -0.112750f, 0.818408f, 0.023522f, -0.149513f, 0.988314f, 0.029681f, 0.875000f, 0.125000f,
+    -0.115039f, 0.818408f, -0.000000f, -0.152452f, 0.988311f, 0.000000f, 1.000000f, 0.125000f,
+    -0.166924f, 0.800391f, 0.034822f, -0.588468f, 0.800035f, 0.116828f, 0.875000f, 0.250000f,
+    -0.141684f, 0.800391f, 0.095986f, -0.497480f, 0.801096f, 0.332805f, 0.625000f, 0.250000f,
+    -0.128714f, 0.773584f, 0.128714f, -0.691459f, -0.209208f, 0.691459f, 0.500000f, 0.375000f,
+    -0.150618f, 0.773584f, 0.102036f, -0.812815f, -0.208883f, 0.543783f, 0.625000f, 0.375000f,
+    -0.167085f, 0.773584f, 0.071249f, -0.903388f, -0.208673f, 0.374627f, 0.750000f, 0.375000f,
+    -0.135177f, 0.740625f, 0.091571f, -0.647907f, -0.626329f, 0.433508f, 0.625000f, 0.500000f,
+    -0.166924f, 0.800391f, 0.034822f, -0.588468f, 0.800035f, 0.116828f, 0.875000f, 0.250000f,
+    -0.167085f, 0.773584f, 0.071249f, -0.903388f, -0.208673f, 0.374628f, 0.750000f, 0.375000f,
+    -0.177452f, 0.773584f, 0.037016f, -0.959402f, -0.207986f, 0.190497f, 0.875000f, 0.375000f,
+    -0.181055f, 0.773584f, -0.000000f, -0.978147f, -0.207916f, -0.000000f, 1.000000f, 0.375000f,
+    -0.159265f, 0.740625f, 0.033217f, -0.765837f, -0.624784f, 0.152118f, 0.875000f, 0.500000f,
+    -0.063939f, 0.740625f, 0.149959f, -0.299162f, -0.624756f, 0.721237f, 0.250000f, 0.500000f,
+    0.000000f, 0.666797f, 0.098437f, 0.000000f, -0.572589f, 0.819843f, 0.000000f, 0.750000f,
+    -0.038696f, 0.666797f, 0.090828f, -0.314474f, -0.572775f, 0.756991f, 0.250000f, 0.750000f,
+    -0.069943f, 0.666797f, 0.069943f, -0.578480f, -0.575083f, 0.578481f, 0.500000f, 0.750000f,
+    -0.039250f, 0.600000f, 0.092250f, -0.230883f, 0.799779f, 0.554119f, 0.250000f, 1.000000f,
+    -0.033217f, 0.740625f, 0.159265f, -0.152111f, -0.624831f, 0.765799f, 0.125000f, 0.500000f,
+    0.000000f, 0.704150f, 0.129883f, 0.000000f, -0.679236f, 0.733920f, 0.000000f, 0.625000f,
+    -0.026539f, 0.704150f, 0.127296f, -0.143067f, -0.679374f, 0.719711f, 0.125000f, 0.625000f,
+    -0.051090f, 0.704150f, 0.119854f, -0.280858f, -0.680523f, 0.676763f, 0.250000f, 0.625000f,
+    -0.020097f, 0.666797f, 0.096475f, -0.160103f, -0.572768f, 0.803930f, 0.125000f, 0.750000f,
+    -0.091571f, 0.740625f, 0.135177f, -0.433501f, -0.626344f, 0.647897f, 0.375000f, 0.500000f,
+    -0.051090f, 0.704150f, 0.119854f, -0.280858f, -0.680523f, 0.676763f, 0.250000f, 0.625000f,
+    -0.073175f, 0.704150f, 0.108035f, -0.407364f, -0.680856f, 0.608679f, 0.375000f, 0.625000f,
+    -0.092316f, 0.704150f, 0.092316f, -0.517530f, -0.681414f, 0.517530f, 0.500000f, 0.625000f,
+    -0.055433f, 0.666797f, 0.081863f, -0.455446f, -0.574467f, 0.680115f, 0.375000f, 0.750000f,
+    -0.020097f, 0.666797f, 0.096475f, -0.160103f, -0.572768f, 0.803930f, 0.125000f, 0.750000f,
+    0.000000f, 0.631201f, 0.083398f, 0.000000f, -0.051878f, 0.998653f, 0.000000f, 0.875000f,
+    -0.017004f, 0.631201f, 0.081732f, -0.195539f, -0.052085f, 0.979312f, 0.125000f, 0.875000f,
+    -0.032751f, 0.631201f, 0.076941f, -0.383727f, -0.052662f, 0.921944f, 0.250000f, 0.875000f,
+    -0.020375f, 0.600000f, 0.098000f, -0.117666f, 0.800016f, 0.588328f, 0.125000f, 1.000000f,
+    -0.055433f, 0.666797f, 0.081863f, -0.455446f, -0.574467f, 0.680115f, 0.375000f, 0.750000f,
+    -0.032751f, 0.631201f, 0.076941f, -0.383728f, -0.052662f, 0.921944f, 0.250000f, 0.875000f,
+    -0.046930f, 0.631201f, 0.069336f, -0.555963f, -0.053050f, 0.829512f, 0.375000f, 0.875000f,
+    -0.059228f, 0.631201f, 0.059228f, -0.706102f, -0.053279f, 0.706103f, 0.500000f, 0.875000f,
+    -0.056250f, 0.600000f, 0.083125f, -0.333571f, 0.800807f, 0.497431f, 0.375000f, 1.000000f,
+    -0.149959f, 0.740625f, 0.063939f, -0.721440f, -0.624480f, 0.299246f, 0.750000f, 0.500000f,
+    -0.069943f, 0.666797f, 0.069943f, -0.578481f, -0.575083f, 0.578480f, 0.500000f, 0.750000f,
+    -0.090828f, 0.666797f, 0.038696f, -0.757155f, -0.572521f, 0.314542f, 0.750000f, 0.750000f,
+    -0.098437f, 0.666797f, -0.000000f, -0.819843f, -0.572589f, -0.000000f, 1.000000f, 0.750000f,
+    -0.092250f, 0.600000f, 0.039250f, -0.554392f, 0.799557f, 0.230996f, 0.750000f, 1.000000f,
+    -0.135177f, 0.740625f, 0.091571f, -0.647907f, -0.626329f, 0.433508f, 0.625000f, 0.500000f,
+    -0.092316f, 0.704150f, 0.092316f, -0.517530f, -0.681414f, 0.517530f, 0.500000f, 0.625000f,
+    -0.108035f, 0.704150f, 0.073175f, -0.608689f, -0.680843f, 0.407370f, 0.625000f, 0.625000f,
+    -0.119854f, 0.704150f, 0.051090f, -0.676763f, -0.680523f, 0.280858f, 0.750000f, 0.625000f,
+    -0.081863f, 0.666797f, 0.055433f, -0.680120f, -0.574459f, 0.455449f, 0.625000f, 0.750000f,
+    -0.159265f, 0.740625f, 0.033217f, -0.765837f, -0.624783f, 0.152118f, 0.875000f, 0.500000f,
+    -0.119854f, 0.704150f, 0.051090f, -0.676763f, -0.680523f, 0.280858f, 0.750000f, 0.625000f,
+    -0.127296f, 0.704150f, 0.026539f, -0.719750f, -0.679330f, 0.143075f, 0.875000f, 0.625000f,
+    -0.129883f, 0.704150f, -0.000000f, -0.733920f, -0.679236f, -0.000000f, 1.000000f, 0.625000f,
+    -0.096475f, 0.666797f, 0.020097f, -0.803957f, -0.572729f, 0.160109f, 0.875000f, 0.750000f,
+    -0.081863f, 0.666797f, 0.055433f, -0.680120f, -0.574459f, 0.455449f, 0.625000f, 0.750000f,
+    -0.059228f, 0.631201f, 0.059228f, -0.706103f, -0.053279f, 0.706102f, 0.500000f, 0.875000f,
+    -0.069336f, 0.631201f, 0.046930f, -0.829512f, -0.053067f, 0.555963f, 0.625000f, 0.875000f,
+    -0.076941f, 0.631201f, 0.032751f, -0.921944f, -0.052662f, 0.383728f, 0.750000f, 0.875000f,
+    -0.083125f, 0.600000f, 0.056250f, -0.497447f, 0.800793f, 0.333582f, 0.625000f, 1.000000f,
+    -0.096475f, 0.666797f, 0.020097f, -0.803957f, -0.572729f, 0.160109f, 0.875000f, 0.750000f,
+    -0.076941f, 0.631201f, 0.032751f, -0.921944f, -0.052662f, 0.383727f, 0.750000f, 0.875000f,
+    -0.081732f, 0.631201f, 0.017004f, -0.979311f, -0.052105f, 0.195539f, 0.875000f, 0.875000f,
+    -0.083398f, 0.631201f, -0.000000f, -0.998653f, -0.051878f, -0.000000f, 1.000000f, 0.875000f,
+    -0.098000f, 0.600000f, 0.020375f, -0.588381f, 0.799975f, 0.117676f, 0.875000f, 1.000000f,
+    0.000000f, 0.825000f, -0.000000f, -0.674579f, 0.299813f, -0.674579f, 0.000000f, 0.000000f,
+    0.000000f, 0.825000f, -0.000000f, -0.674579f, 0.299813f, -0.674579f, 1.000000f, 0.000000f,
+    -0.100000f, 0.600000f, -0.000000f, -0.600000f, 0.800000f, 0.000000f, 0.000000f, 1.000000f,
+    0.000000f, 0.600000f, -0.100000f, 0.000000f, 0.800000f, -0.600000f, 1.000000f, 1.000000f,
+    0.000000f, 0.825000f, -0.000000f, -0.674579f, 0.299813f, -0.674579f, 0.500000f, 0.000000f,
+    -0.162500f, 0.740625f, -0.000000f, -0.780869f, -0.624695f, -0.000000f, 0.000000f, 0.500000f,
+    -0.115516f, 0.740625f, -0.115516f, -0.553962f, -0.621492f, -0.553962f, 0.500000f, 0.500000f,
+    0.000000f, 0.740625f, -0.162500f, 0.000000f, -0.624695f, -0.780869f, 1.000000f, 0.500000f,
+    -0.071000f, 0.600000f, -0.071000f, -0.427005f, 0.797078f, -0.427005f, 0.500000f, 1.000000f,
+    0.000000f, 0.825000f, -0.000000f, -0.452928f, 0.872306f, -0.184222f, 0.250000f, 0.000000f,
+    -0.170313f, 0.800391f, -0.000000f, -0.600000f, 0.800000f, 0.000000f, 0.000000f, 0.250000f,
+    -0.157173f, 0.800391f, -0.067026f, -0.554284f, 0.799965f, -0.229837f, 0.250000f, 0.250000f,
+    -0.121080f, 0.800391f, -0.121080f, -0.422824f, 0.801523f, -0.422824f, 0.500000f, 0.250000f,
+    -0.149959f, 0.740625f, -0.063939f, -0.721237f, -0.624756f, -0.299162f, 0.250000f, 0.500000f,
+    0.000000f, 0.825000f, -0.000000f, -0.142954f, 0.989332f, -0.028025f, 0.125000f, 0.000000f,
+    -0.115039f, 0.818408f, -0.000000f, -0.152452f, 0.988311f, 0.000000f, 0.000000f, 0.125000f,
+    -0.112750f, 0.818408f, -0.023522f, -0.149493f, 0.988317f, -0.029677f, 0.125000f, 0.125000f,
+    -0.106164f, 0.818408f, -0.045274f, -0.140386f, 0.988384f, -0.058210f, 0.250000f, 0.125000f,
+    -0.166924f, 0.800391f, -0.034822f, -0.588416f, 0.800075f, -0.116818f, 0.125000f, 0.250000f,
+    0.000000f, 0.825000f, -0.000000f, -0.120585f, 0.989432f, -0.080516f, 0.375000f, 0.000000f,
+    -0.106164f, 0.818408f, -0.045274f, -0.140386f, 0.988384f, -0.058209f, 0.250000f, 0.125000f,
+    -0.095702f, 0.818408f, -0.064836f, -0.126226f, 0.988401f, -0.084441f, 0.375000f, 0.125000f,
+    -0.081785f, 0.818408f, -0.081785f, -0.107233f, 0.988434f, -0.107233f, 0.500000f, 0.125000f,
+    -0.141684f, 0.800391f, -0.095986f, -0.497465f, 0.801110f, -0.332794f, 0.375000f, 0.250000f,
+    -0.166924f, 0.800391f, -0.034822f, -0.588416f, 0.800075f, -0.116818f, 0.125000f, 0.250000f,
+    -0.181055f, 0.773584f, -0.000000f, -0.978147f, -0.207916f, -0.000000f, 0.000000f, 0.375000f,
+    -0.177452f, 0.773584f, -0.037016f, -0.959398f, -0.208008f, -0.190496f, 0.125000f, 0.375000f,
+    -0.167085f, 0.773584f, -0.071249f, -0.903388f, -0.208673f, -0.374628f, 0.250000f, 0.375000f,
+    -0.159265f, 0.740625f, -0.033217f, -0.765799f, -0.624831f, -0.152111f, 0.125000f, 0.500000f,
+    -0.141684f, 0.800391f, -0.095986f, -0.497465f, 0.801110f, -0.332794f, 0.375000f, 0.250000f,
+    -0.167085f, 0.773584f, -0.071249f, -0.903388f, -0.208673f, -0.374627f, 0.250000f, 0.375000f,
+    -0.150618f, 0.773584f, -0.102036f, -0.812814f, -0.208889f, -0.543782f, 0.375000f, 0.375000f,
+    -0.128714f, 0.773584f, -0.128714f, -0.691459f, -0.209208f, -0.691459f, 0.500000f, 0.375000f,
+    -0.135177f, 0.740625f, -0.091571f, -0.647897f, -0.626344f, -0.433501f, 0.375000f, 0.500000f,
+    0.000000f, 0.825000f, -0.000000f, -0.184222f, 0.872306f, -0.452928f, 0.750000f, 0.000000f,
+    -0.121080f, 0.800391f, -0.121080f, -0.422824f, 0.801523f, -0.422824f, 0.500000f, 0.250000f,
+    -0.067026f, 0.800391f, -0.157173f, -0.229949f, 0.799746f, -0.554553f, 0.750000f, 0.250000f,
+    0.000000f, 0.800391f, -0.170313f, 0.000000f, 0.800000f, -0.600000f, 1.000000f, 0.250000f,
+    -0.063939f, 0.740625f, -0.149959f, -0.299246f, -0.624481f, -0.721440f, 0.750000f, 0.500000f,
+    0.000000f, 0.825000f, -0.000000f, -0.080516f, 0.989432f, -0.120585f, 0.625000f, 0.000000f,
+    -0.081785f, 0.818408f, -0.081785f, -0.107233f, 0.988434f, -0.107233f, 0.500000f, 0.125000f,
+    -0.064836f, 0.818408f, -0.095702f, -0.084445f, 0.988400f, -0.126232f, 0.625000f, 0.125000f,
+    -0.045274f, 0.818408f, -0.106164f, -0.058209f, 0.988384f, -0.140386f, 0.750000f, 0.125000f,
+    -0.095986f, 0.800391f, -0.141684f, -0.332805f, 0.801096f, -0.497480f, 0.625000f, 0.250000f,
+    0.000000f, 0.825000f, -0.000000f, -0.028025f, 0.989332f, -0.142954f, 0.875000f, 0.000000f,
+    -0.045274f, 0.818408f, -0.106164f, -0.058210f, 0.988384f, -0.140386f, 0.750000f, 0.125000f,
+    -0.023522f, 0.818408f, -0.112750f, -0.029681f, 0.988314f, -0.149513f, 0.875000f, 0.125000f,
+    0.000000f, 0.818408f, -0.115039f, 0.000000f, 0.988311f, -0.152452f, 1.000000f, 0.125000f,
+    -0.034822f, 0.800391f, -0.166924f, -0.116828f, 0.800035f, -0.588468f, 0.875000f, 0.250000f,
+    -0.095986f, 0.800391f, -0.141684f, -0.332805f, 0.801096f, -0.497480f, 0.625000f, 0.250000f,
+    -0.128714f, 0.773584f, -0.128714f, -0.691459f, -0.209208f, -0.691459f, 0.500000f, 0.375000f,
+    -0.102036f, 0.773584f, -0.150618f, -0.543783f, -0.208883f, -0.812815f, 0.625000f, 0.375000f,
+    -0.071249f, 0.773584f, -0.167085f, -0.374627f, -0.208673f, -0.903388f, 0.750000f, 0.375000f,
+    -0.091571f, 0.740625f, -0.135177f, -0.433508f, -0.626329f, -0.647907f, 0.625000f, 0.500000f,
+    -0.034822f, 0.800391f, -0.166924f, -0.116828f, 0.800035f, -0.588468f, 0.875000f, 0.250000f,
+    -0.071249f, 0.773584f, -0.167085f, -0.374628f, -0.208673f, -0.903388f, 0.750000f, 0.375000f,
+    -0.037016f, 0.773584f, -0.177452f, -0.190497f, -0.207986f, -0.959402f, 0.875000f, 0.375000f,
+    0.000000f, 0.773584f, -0.181055f, 0.000000f, -0.207916f, -0.978147f, 1.000000f, 0.375000f,
+    -0.033217f, 0.740625f, -0.159265f, -0.152118f, -0.624784f, -0.765837f, 0.875000f, 0.500000f,
+    -0.149959f, 0.740625f, -0.063939f, -0.721237f, -0.624756f, -0.299162f, 0.250000f, 0.500000f,
+    -0.098437f, 0.666797f, -0.000000f, -0.819843f, -0.572589f, -0.000000f, 0.000000f, 0.750000f,
+    -0.090828f, 0.666797f, -0.038696f, -0.756991f, -0.572775f, -0.314474f, 0.250000f, 0.750000f,
+    -0.069943f, 0.666797f, -0.069943f, -0.578481f, -0.575083f, -0.578480f, 0.500000f, 0.750000f,
+    -0.092250f, 0.600000f, -0.039250f, -0.554119f, 0.799779f, -0.230883f, 0.250000f, 1.000000f,
+    -0.159265f, 0.740625f, -0.033217f, -0.765799f, -0.624831f, -0.152111f, 0.125000f, 0.500000f,
+    -0.129883f, 0.704150f, -0.000000f, -0.733920f, -0.679236f, -0.000000f, 0.000000f, 0.625000f,
+    -0.127296f, 0.704150f, -0.026539f, -0.719711f, -0.679374f, -0.143067f, 0.125000f, 0.625000f,
+    -0.119854f, 0.704150f, -0.051090f, -0.676763f, -0.680523f, -0.280858f, 0.250000f, 0.625000f,
+    -0.096475f, 0.666797f, -0.020097f, -0.803930f, -0.572768f, -0.160103f, 0.125000f, 0.750000f,
+    -0.135177f, 0.740625f, -0.091571f, -0.647897f, -0.626344f, -0.433501f, 0.375000f, 0.500000f,
+    -0.119854f, 0.704150f, -0.051090f, -0.676763f, -0.680523f, -0.280858f, 0.250000f, 0.625000f,
+    -0.108035f, 0.704150f, -0.073175f, -0.608679f, -0.680856f, -0.407364f, 0.375000f, 0.625000f,
+    -0.092316f, 0.704150f, -0.092316f, -0.517530f, -0.681414f, -0.517530f, 0.500000f, 0.625000f,
+    -0.081863f, 0.666797f, -0.055433f, -0.680115f, -0.574467f, -0.455446f, 0.375000f, 0.750000f,
+    -0.096475f, 0.666797f, -0.020097f, -0.803930f, -0.572768f, -0.160103f, 0.125000f, 0.750000f,
+    -0.083398f, 0.631201f, -0.000000f, -0.998653f, -0.051878f, -0.000000f, 0.000000f, 0.875000f,
+    -0.081732f, 0.631201f, -0.017004f, -0.979312f, -0.052085f, -0.195539f, 0.125000f, 0.875000f,
+    -0.076941f, 0.631201f, -0.032751f, -0.921944f, -0.052662f, -0.383727f, 0.250000f, 0.875000f,
+    -0.098000f, 0.600000f, -0.020375f, -0.588328f, 0.800016f, -0.117666f, 0.125000f, 1.000000f,
+    -0.081863f, 0.666797f, -0.055433f, -0.680115f, -0.574467f, -0.455446f, 0.375000f, 0.750000f,
+    -0.076941f, 0.631201f, -0.032751f, -0.921944f, -0.052662f, -0.383728f, 0.250000f, 0.875000f,
+    -0.069336f, 0.631201f, -0.046930f, -0.829512f, -0.053050f, -0.555963f, 0.375000f, 0.875000f,
+    -0.059228f, 0.631201f, -0.059228f, -0.706103f, -0.053279f, -0.706102f, 0.500000f, 0.875000f,
+    -0.083125f, 0.600000f, -0.056250f, -0.497431f, 0.800807f, -0.333571f, 0.375000f, 1.000000f,
+    -0.063939f, 0.740625f, -0.149959f, -0.299246f, -0.624480f, -0.721440f, 0.750000f, 0.500000f,
+    -0.069943f, 0.666797f, -0.069943f, -0.578480f, -0.575083f, -0.578481f, 0.500000f, 0.750000f,
+    -0.038696f, 0.666797f, -0.090828f, -0.314542f, -0.572521f, -0.757155f, 0.750000f, 0.750000f,
+    0.000000f, 0.666797f, -0.098437f, 0.000000f, -0.572589f, -0.819843f, 1.000000f, 0.750000f,
+    -0.039250f, 0.600000f, -0.092250f, -0.230996f, 0.799557f, -0.554392f, 0.750000f, 1.000000f,
+    -0.091571f, 0.740625f, -0.135177f, -0.433508f, -0.626329f, -0.647907f, 0.625000f, 0.500000f,
+    -0.092316f, 0.704150f, -0.092316f, -0.517530f, -0.681414f, -0.517530f, 0.500000f, 0.625000f,
+    -0.073175f, 0.704150f, -0.108035f, -0.407370f, -0.680843f, -0.608689f, 0.625000f, 0.625000f,
+    -0.051090f, 0.704150f, -0.119854f, -0.280858f, -0.680523f, -0.676763f, 0.750000f, 0.625000f,
+    -0.055433f, 0.666797f, -0.081863f, -0.455449f, -0.574459f, -0.680120f, 0.625000f, 0.750000f,
+    -0.033217f, 0.740625f, -0.159265f, -0.152118f, -0.624783f, -0.765837f, 0.875000f, 0.500000f,
+    -0.051090f, 0.704150f, -0.119854f, -0.280858f, -0.680523f, -0.676763f, 0.750000f, 0.625000f,
+    -0.026539f, 0.704150f, -0.127296f, -0.143075f, -0.679330f, -0.719750f, 0.875000f, 0.625000f,
+    0.000000f, 0.704150f, -0.129883f, 0.000000f, -0.679236f, -0.733920f, 1.000000f, 0.625000f,
+    -0.020097f, 0.666797f, -0.096475f, -0.160109f, -0.572729f, -0.803957f, 0.875000f, 0.750000f,
+    -0.055433f, 0.666797f, -0.081863f, -0.455449f, -0.574459f, -0.680120f, 0.625000f, 0.750000f,
+    -0.059228f, 0.631201f, -0.059228f, -0.706102f, -0.053279f, -0.706103f, 0.500000f, 0.875000f,
+    -0.046930f, 0.631201f, -0.069336f, -0.555963f, -0.053067f, -0.829512f, 0.625000f, 0.875000f,
+    -0.032751f, 0.631201f, -0.076941f, -0.383728f, -0.052662f, -0.921944f, 0.750000f, 0.875000f,
+    -0.056250f, 0.600000f, -0.083125f, -0.333582f, 0.800793f, -0.497447f, 0.625000f, 1.000000f,
+    -0.020097f, 0.666797f, -0.096475f, -0.160109f, -0.572729f, -0.803957f, 0.875000f, 0.750000f,
+    -0.032751f, 0.631201f, -0.076941f, -0.383727f, -0.052662f, -0.921944f, 0.750000f, 0.875000f,
+    -0.017004f, 0.631201f, -0.081732f, -0.195539f, -0.052105f, -0.979311f, 0.875000f, 0.875000f,
+    0.000000f, 0.631201f, -0.083398f, 0.000000f, -0.051878f, -0.998653f, 1.000000f, 0.875000f,
+    -0.020375f, 0.600000f, -0.098000f, -0.117676f, 0.799975f, -0.588381f, 0.875000f, 1.000000f,
+    0.000000f, 0.825000f, -0.000000f, 0.674579f, 0.299813f, -0.674579f, 0.000000f, 0.000000f,
+    0.000000f, 0.825000f, -0.000000f, 0.674579f, 0.299813f, -0.674579f, 1.000000f, 0.000000f,
+    0.000000f, 0.600000f, -0.100000f, 0.000000f, 0.800000f, -0.600000f, 0.000000f, 1.000000f,
+    0.100000f, 0.600000f, -0.000000f, 0.600000f, 0.800000f, -0.000000f, 1.000000f, 1.000000f,
+    0.000000f, 0.825000f, -0.000000f, 0.674579f, 0.299813f, -0.674579f, 0.500000f, 0.000000f,
+    0.000000f, 0.740625f, -0.162500f, 0.000000f, -0.624695f, -0.780869f, 0.000000f, 0.500000f,
+    0.115516f, 0.740625f, -0.115516f, 0.553962f, -0.621492f, -0.553962f, 0.500000f, 0.500000f,
+    0.162500f, 0.740625f, -0.000000f, 0.780869f, -0.624695f, 0.000000f, 1.000000f, 0.500000f,
+    0.071000f, 0.600000f, -0.071000f, 0.427005f, 0.797078f, -0.427005f, 0.500000f, 1.000000f,
+    0.000000f, 0.825000f, -0.000000f, 0.184222f, 0.872306f, -0.452928f, 0.250000f, 0.000000f,
+    0.000000f, 0.800391f, -0.170313f, 0.000000f, 0.800000f, -0.600000f, 0.000000f, 0.250000f,
+    0.067026f, 0.800391f, -0.157173f, 0.229837f, 0.799965f, -0.554284f, 0.250000f, 0.250000f,
+    0.121080f, 0.800391f, -0.121080f, 0.422824f, 0.801523f, -0.422824f, 0.500000f, 0.250000f,
+    0.063939f, 0.740625f, -0.149959f, 0.299162f, -0.624756f, -0.721237f, 0.250000f, 0.500000f,
+    0.000000f, 0.825000f, -0.000000f, 0.028025f, 0.989332f, -0.142954f, 0.125000f, 0.000000f,
+    0.000000f, 0.818408f, -0.115039f, 0.000000f, 0.988311f, -0.152452f, 0.000000f, 0.125000f,
+    0.023522f, 0.818408f, -0.112750f, 0.029677f, 0.988317f, -0.149493f, 0.125000f, 0.125000f,
+    0.045274f, 0.818408f, -0.106164f, 0.058210f, 0.988384f, -0.140386f, 0.250000f, 0.125000f,
+    0.034822f, 0.800391f, -0.166924f, 0.116818f, 0.800075f, -0.588416f, 0.125000f, 0.250000f,
+    0.000000f, 0.825000f, -0.000000f, 0.080516f, 0.989432f, -0.120585f, 0.375000f, 0.000000f,
+    0.045274f, 0.818408f, -0.106164f, 0.058209f, 0.988384f, -0.140386f, 0.250000f, 0.125000f,
+    0.064836f, 0.818408f, -0.095702f, 0.084441f, 0.988401f, -0.126226f, 0.375000f, 0.125000f,
+    0.081785f, 0.818408f, -0.081785f, 0.107233f, 0.988434f, -0.107233f, 0.500000f, 0.125000f,
+    0.095986f, 0.800391f, -0.141684f, 0.332794f, 0.801110f, -0.497465f, 0.375000f, 0.250000f,
+    0.034822f, 0.800391f, -0.166924f, 0.116818f, 0.800075f, -0.588416f, 0.125000f, 0.250000f,
+    0.000000f, 0.773584f, -0.181055f, 0.000000f, -0.207916f, -0.978147f, 0.000000f, 0.375000f,
+    0.037016f, 0.773584f, -0.177452f, 0.190496f, -0.208008f, -0.959398f, 0.125000f, 0.375000f,
+    0.071249f, 0.773584f, -0.167085f, 0.374628f, -0.208673f, -0.903388f, 0.250000f, 0.375000f,
+    0.033217f, 0.740625f, -0.159265f, 0.152111f, -0.624831f, -0.765799f, 0.125000f, 0.500000f,
+    0.095986f, 0.800391f, -0.141684f, 0.332794f, 0.801110f, -0.497465f, 0.375000f, 0.250000f,
+    0.071249f, 0.773584f, -0.167085f, 0.374627f, -0.208673f, -0.903388f, 0.250000f, 0.375000f,
+    0.102036f, 0.773584f, -0.150618f, 0.543782f, -0.208889f, -0.812814f, 0.375000f, 0.375000f,
+    0.128714f, 0.773584f, -0.128714f, 0.691459f, -0.209208f, -0.691459f, 0.500000f, 0.375000f,
+    0.091571f, 0.740625f, -0.135177f, 0.433501f, -0.626344f, -0.647897f, 0.375000f, 0.500000f,
+    0.000000f, 0.825000f, -0.000000f, 0.452928f, 0.872306f, -0.184222f, 0.750000f, 0.000000f,
+    0.121080f, 0.800391f, -0.121080f, 0.422824f, 0.801523f, -0.422824f, 0.500000f, 0.250000f,
+    0.157173f, 0.800391f, -0.067026f, 0.554553f, 0.799746f, -0.229949f, 0.750000f, 0.250000f,
+    0.170313f, 0.800391f, -0.000000f, 0.600000f, 0.800000f, -0.000000f, 1.000000f, 0.250000f,
+    0.149959f, 0.740625f, -0.063939f, 0.721440f, -0.624481f, -0.299246f, 0.750000f, 0.500000f,
+    0.000000f, 0.825000f, -0.000000f, 0.120585f, 0.989432f, -0.080516f, 0.625000f, 0.000000f,
+    0.081785f, 0.818408f, -0.081785f, 0.107233f, 0.988434f, -0.107233f, 0.500000f, 0.125000f,
+    0.095702f, 0.818408f, -0.064836f, 0.126232f, 0.988400f, -0.084445f, 0.625000f, 0.125000f,
+    0.106164f, 0.818408f, -0.045274f, 0.140386f, 0.988384f, -0.058209f, 0.750000f, 0.125000f,
+    0.141684f, 0.800391f, -0.095986f, 0.497480f, 0.801096f, -0.332805f, 0.625000f, 0.250000f,
+    0.000000f, 0.825000f, -0.000000f, 0.142954f, 0.989332f, -0.028025f, 0.875000f, 0.000000f,
+    0.106164f, 0.818408f, -0.045274f, 0.140386f, 0.988384f, -0.058210f, 0.750000f, 0.125000f,
+    0.112750f, 0.818408f, -0.023522f, 0.149513f, 0.988314f, -0.029681f, 0.875000f, 0.125000f,
+    0.115039f, 0.818408f, -0.000000f, 0.152452f, 0.988311f, -0.000000f, 1.000000f, 0.125000f,
+    0.166924f, 0.800391f, -0.034822f, 0.588468f, 0.800035f, -0.116828f, 0.875000f, 0.250000f,
+    0.141684f, 0.800391f, -0.095986f, 0.497480f, 0.801096f, -0.332805f, 0.625000f, 0.250000f,
+    0.128714f, 0.773584f, -0.128714f, 0.691459f, -0.209208f, -0.691459f, 0.500000f, 0.375000f,
+    0.150618f, 0.773584f, -0.102036f, 0.812815f, -0.208883f, -0.543783f, 0.625000f, 0.375000f,
+    0.167085f, 0.773584f, -0.071249f, 0.903388f, -0.208673f, -0.374627f, 0.750000f, 0.375000f,
+    0.135177f, 0.740625f, -0.091571f, 0.647907f, -0.626329f, -0.433508f, 0.625000f, 0.500000f,
+    0.166924f, 0.800391f, -0.034822f, 0.588468f, 0.800035f, -0.116828f, 0.875000f, 0.250000f,
+    0.167085f, 0.773584f, -0.071249f, 0.903388f, -0.208673f, -0.374628f, 0.750000f, 0.375000f,
+    0.177452f, 0.773584f, -0.037016f, 0.959402f, -0.207986f, -0.190497f, 0.875000f, 0.375000f,
+    0.181055f, 0.773584f, -0.000000f, 0.978147f, -0.207916f, 0.000000f, 1.000000f, 0.375000f,
+    0.159265f, 0.740625f, -0.033217f, 0.765837f, -0.624784f, -0.152118f, 0.875000f, 0.500000f,
+    0.063939f, 0.740625f, -0.149959f, 0.299162f, -0.624756f, -0.721237f, 0.250000f, 0.500000f,
+    0.000000f, 0.666797f, -0.098437f, 0.000000f, -0.572589f, -0.819843f, 0.000000f, 0.750000f,
+    0.038696f, 0.666797f, -0.090828f, 0.314474f, -0.572775f, -0.756991f, 0.250000f, 0.750000f,
+    0.069943f, 0.666797f, -0.069943f, 0.578480f, -0.575083f, -0.578481f, 0.500000f, 0.750000f,
+    0.039250f, 0.600000f, -0.092250f, 0.230883f, 0.799779f, -0.554119f, 0.250000f, 1.000000f,
+    0.033217f, 0.740625f, -0.159265f, 0.152111f, -0.624831f, -0.765799f, 0.125000f, 0.500000f,
+    0.000000f, 0.704150f, -0.129883f, 0.000000f, -0.679236f, -0.733920f, 0.000000f, 0.625000f,
+    0.026539f, 0.704150f, -0.127296f, 0.143067f, -0.679374f, -0.719711f, 0.125000f, 0.625000f,
+    0.051090f, 0.704150f, -0.119854f, 0.280858f, -0.680523f, -0.676763f, 0.250000f, 0.625000f,
+    0.020097f, 0.666797f, -0.096475f, 0.160103f, -0.572768f, -0.803930f, 0.125000f, 0.750000f,
+    0.091571f, 0.740625f, -0.135177f, 0.433501f, -0.626344f, -0.647897f, 0.375000f, 0.500000f,
+    0.051090f, 0.704150f, -0.119854f, 0.280858f, -0.680523f, -0.676763f, 0.250000f, 0.625000f,
+    0.073175f, 0.704150f, -0.108035f, 0.407364f, -0.680856f, -0.608679f, 0.375000f, 0.625000f,
+    0.092316f, 0.704150f, -0.092316f, 0.517530f, -0.681414f, -0.517530f, 0.500000f, 0.625000f,
+    0.055433f, 0.666797f, -0.081863f, 0.455446f, -0.574467f, -0.680115f, 0.375000f, 0.750000f,
+    0.020097f, 0.666797f, -0.096475f, 0.160103f, -0.572768f, -0.803930f, 0.125000f, 0.750000f,
+    0.000000f, 0.631201f, -0.083398f, 0.000000f, -0.051878f, -0.998653f, 0.000000f, 0.875000f,
+    0.017004f, 0.631201f, -0.081732f, 0.195539f, -0.052085f, -0.979312f, 0.125000f, 0.875000f,
+    0.032751f, 0.631201f, -0.076941f, 0.383727f, -0.052662f, -0.921944f, 0.250000f, 0.875000f,
+    0.020375f, 0.600000f, -0.098000f, 0.117666f, 0.800016f, -0.588328f, 0.125000f, 1.000000f,
+    0.055433f, 0.666797f, -0.081863f, 0.455446f, -0.574467f, -0.680115f, 0.375000f, 0.750000f,
+    0.032751f, 0.631201f, -0.076941f, 0.383728f, -0.052662f, -0.921944f, 0.250000f, 0.875000f,
+    0.046930f, 0.631201f, -0.069336f, 0.555963f, -0.053050f, -0.829512f, 0.375000f, 0.875000f,
+    0.059228f, 0.631201f, -0.059228f, 0.706102f, -0.053279f, -0.706103f, 0.500000f, 0.875000f,
+    0.056250f, 0.600000f, -0.083125f, 0.333571f, 0.800807f, -0.497431f, 0.375000f, 1.000000f,
+    0.149959f, 0.740625f, -0.063939f, 0.721440f, -0.624480f, -0.299246f, 0.750000f, 0.500000f,
+    0.069943f, 0.666797f, -0.069943f, 0.578481f, -0.575083f, -0.578480f, 0.500000f, 0.750000f,
+    0.090828f, 0.666797f, -0.038696f, 0.757155f, -0.572521f, -0.314542f, 0.750000f, 0.750000f,
+    0.098437f, 0.666797f, -0.000000f, 0.819843f, -0.572589f, 0.000000f, 1.000000f, 0.750000f,
+    0.092250f, 0.600000f, -0.039250f, 0.554392f, 0.799557f, -0.230996f, 0.750000f, 1.000000f,
+    0.135177f, 0.740625f, -0.091571f, 0.647907f, -0.626329f, -0.433508f, 0.625000f, 0.500000f,
+    0.092316f, 0.704150f, -0.092316f, 0.517530f, -0.681414f, -0.517530f, 0.500000f, 0.625000f,
+    0.108035f, 0.704150f, -0.073175f, 0.608689f, -0.680843f, -0.407370f, 0.625000f, 0.625000f,
+    0.119854f, 0.704150f, -0.051090f, 0.676763f, -0.680523f, -0.280858f, 0.750000f, 0.625000f,
+    0.081863f, 0.666797f, -0.055433f, 0.680120f, -0.574459f, -0.455449f, 0.625000f, 0.750000f,
+    0.159265f, 0.740625f, -0.033217f, 0.765837f, -0.624783f, -0.152118f, 0.875000f, 0.500000f,
+    0.119854f, 0.704150f, -0.051090f, 0.676763f, -0.680523f, -0.280858f, 0.750000f, 0.625000f,
+    0.127296f, 0.704150f, -0.026539f, 0.719750f, -0.679330f, -0.143075f, 0.875000f, 0.625000f,
+    0.129883f, 0.704150f, -0.000000f, 0.733920f, -0.679236f, 0.000000f, 1.000000f, 0.625000f,
+    0.096475f, 0.666797f, -0.020097f, 0.803957f, -0.572729f, -0.160109f, 0.875000f, 0.750000f,
+    0.081863f, 0.666797f, -0.055433f, 0.680120f, -0.574459f, -0.455449f, 0.625000f, 0.750000f,
+    0.059228f, 0.631201f, -0.059228f, 0.706103f, -0.053279f, -0.706102f, 0.500000f, 0.875000f,
+    0.069336f, 0.631201f, -0.046930f, 0.829512f, -0.053067f, -0.555963f, 0.625000f, 0.875000f,
+    0.076941f, 0.631201f, -0.032751f, 0.921944f, -0.052662f, -0.383728f, 0.750000f, 0.875000f,
+    0.083125f, 0.600000f, -0.056250f, 0.497447f, 0.800793f, -0.333582f, 0.625000f, 1.000000f,
+    0.096475f, 0.666797f, -0.020097f, 0.803957f, -0.572729f, -0.160109f, 0.875000f, 0.750000f,
+    0.076941f, 0.631201f, -0.032751f, 0.921944f, -0.052662f, -0.383727f, 0.750000f, 0.875000f,
+    0.081732f, 0.631201f, -0.017004f, 0.979311f, -0.052105f, -0.195539f, 0.875000f, 0.875000f,
+    0.083398f, 0.631201f, -0.000000f, 0.998653f, -0.051878f, 0.000000f, 1.000000f, 0.875000f,
+    0.098000f, 0.600000f, -0.020375f, 0.588381f, 0.799975f, -0.117676f, 0.875000f, 1.000000f,
+    0.100000f, 0.600000f, -0.000000f, 0.600000f, 0.800000f, -0.000000f, 0.000000f, 0.000000f,
+    0.000000f, 0.600000f, 0.100000f, 0.000000f, 0.800000f, 0.600000f, 1.000000f, 0.000000f,
+    0.650000f, 0.450000f, -0.000000f, 1.000000f, 0.000000f, -0.000000f, 0.000000f, 1.000000f,
+    0.000000f, 0.450000f, 0.650000f, 0.000000f, 0.000000f, 1.000000f, 1.000000f, 1.000000f,
+    0.071000f, 0.600000f, 0.071000f, 0.427006f, 0.797077f, 0.427006f, 0.500000f, 0.000000f,
+    0.412500f, 0.525000f, -0.000000f, 0.148340f, 0.988936f, -0.000000f, 0.000000f, 0.500000f,
+    0.292875f, 0.525000f, 0.292875f, 0.105934f, 0.988714f, 0.105934f, 0.500000f, 0.500000f,
+    0.000000f, 0.525000f, 0.412500f, 0.000000f, 0.988936f, 0.148340f, 1.000000f, 0.500000f,
+    0.461500f, 0.450000f, 0.461500f, 0.707107f, 0.000000f, 0.707107f, 0.500000f, 1.000000f,
+    0.092250f, 0.600000f, 0.039250f, 0.554119f, 0.799778f, 0.230883f, 0.250000f, 0.000000f,
+    0.228125f, 0.555469f, -0.000000f, 0.203954f, 0.978980f, -0.000000f, 0.000000f, 0.250000f,
+    0.210445f, 0.555469f, 0.089539f, 0.188404f, 0.978949f, 0.078502f, 0.250000f, 0.250000f,
+    0.161969f, 0.555469f, 0.161969f, 0.143654f, 0.979146f, 0.143654f, 0.500000f, 0.250000f,
+    0.380531f, 0.525000f, 0.161906f, 0.137033f, 0.988920f, 0.057097f, 0.250000f, 0.500000f,
+    0.098000f, 0.600000f, 0.020375f, 0.588329f, 0.800015f, 0.117666f, 0.125000f, 0.000000f,
+    0.152344f, 0.575098f, -0.000000f, 0.317497f, 0.948259f, -0.000000f, 0.000000f, 0.125000f,
+    0.149297f, 0.575098f, 0.031040f, 0.311317f, 0.948264f, 0.062263f, 0.125000f, 0.125000f,
+    0.140537f, 0.575098f, 0.059795f, 0.292417f, 0.948497f, 0.121840f, 0.250000f, 0.125000f,
+    0.223562f, 0.555469f, 0.046480f, 0.199984f, 0.978983f, 0.039997f, 0.125000f, 0.250000f,
+    0.083125f, 0.600000f, 0.056250f, 0.497432f, 0.800807f, 0.333572f, 0.375000f, 0.000000f,
+    0.140537f, 0.575098f, 0.059795f, 0.292417f, 0.948497f, 0.121840f, 0.250000f, 0.125000f,
+    0.126636f, 0.575098f, 0.085693f, 0.263031f, 0.948527f, 0.176386f, 0.375000f, 0.125000f,
+    0.108164f, 0.575098f, 0.108164f, 0.223681f, 0.948648f, 0.223681f, 0.500000f, 0.125000f,
+    0.189629f, 0.555469f, 0.128320f, 0.168938f, 0.979094f, 0.113288f, 0.375000f, 0.250000f,
+    0.223562f, 0.555469f, 0.046480f, 0.199985f, 0.978982f, 0.039997f, 0.125000f, 0.250000f,
+    0.317969f, 0.539355f, -0.000000f, 0.157389f, 0.987537f, -0.000000f, 0.000000f, 0.375000f,
+    0.311609f, 0.539355f, 0.064786f, 0.154325f, 0.987538f, 0.030865f, 0.125000f, 0.375000f,
+    0.293326f, 0.539355f, 0.124803f, 0.144929f, 0.987598f, 0.060387f, 0.250000f, 0.375000f,
+    0.404250f, 0.525000f, 0.084047f, 0.145452f, 0.988938f, 0.029090f, 0.125000f, 0.500000f,
+    0.189629f, 0.555469f, 0.128320f, 0.168939f, 0.979094f, 0.113289f, 0.375000f, 0.250000f,
+    0.293326f, 0.539355f, 0.124803f, 0.144929f, 0.987598f, 0.060387f, 0.250000f, 0.375000f,
+    0.264312f, 0.539355f, 0.178857f, 0.130361f, 0.987605f, 0.087419f, 0.375000f, 0.375000f,
+    0.225758f, 0.539355f, 0.225758f, 0.110849f, 0.987636f, 0.110849f, 0.500000f, 0.375000f,
+    0.342891f, 0.525000f, 0.232031f, 0.122865f, 0.988997f, 0.082392f, 0.375000f, 0.500000f,
+    0.039250f, 0.600000f, 0.092250f, 0.230997f, 0.799556f, 0.554392f, 0.750000f, 0.000000f,
+    0.161969f, 0.555469f, 0.161969f, 0.143654f, 0.979146f, 0.143654f, 0.500000f, 0.250000f,
+    0.089539f, 0.555469f, 0.210445f, 0.078560f, 0.978918f, 0.188544f, 0.750000f, 0.250000f,
+    0.000000f, 0.555469f, 0.228125f, 0.000000f, 0.978980f, 0.203954f, 1.000000f, 0.250000f,
+    0.161906f, 0.525000f, 0.380531f, 0.057140f, 0.988903f, 0.137136f, 0.750000f, 0.500000f,
+    0.056250f, 0.600000f, 0.083125f, 0.333583f, 0.800793f, 0.497447f, 0.625000f, 0.000000f,
+    0.108164f, 0.575098f, 0.108164f, 0.223681f, 0.948648f, 0.223681f, 0.500000f, 0.125000f,
+    0.085693f, 0.575098f, 0.126636f, 0.176393f, 0.948522f, 0.263043f, 0.625000f, 0.125000f,
+    0.059795f, 0.575098f, 0.140537f, 0.121840f, 0.948497f, 0.292417f, 0.750000f, 0.125000f,
+    0.128320f, 0.555469f, 0.189629f, 0.113293f, 0.979092f, 0.168946f, 0.625000f, 0.250000f,
+    0.020375f, 0.600000f, 0.098000f, 0.117676f, 0.799975f, 0.588382f, 0.875000f, 0.000000f,
+    0.059795f, 0.575098f, 0.140537f, 0.121840f, 0.948497f, 0.292417f, 0.750000f, 0.125000f,
+    0.031040f, 0.575098f, 0.149297f, 0.062271f, 0.948251f, 0.311356f, 0.875000f, 0.125000f,
+    0.000000f, 0.575098f, 0.152344f, 0.000000f, 0.948259f, 0.317497f, 1.000000f, 0.125000f,
+    0.046480f, 0.555469f, 0.223562f, 0.040002f, 0.978977f, 0.200010f, 0.875000f, 0.250000f,
+    0.128320f, 0.555469f, 0.189629f, 0.113294f, 0.979092f, 0.168947f, 0.625000f, 0.250000f,
+    0.225758f, 0.539355f, 0.225758f, 0.110849f, 0.987636f, 0.110849f, 0.500000f, 0.375000f,
+    0.178857f, 0.539355f, 0.264312f, 0.087423f, 0.987604f, 0.130368f, 0.625000f, 0.375000f,
+    0.124803f, 0.539355f, 0.293326f, 0.060387f, 0.987598f, 0.144929f, 0.750000f, 0.375000f,
+    0.232031f, 0.525000f, 0.342891f, 0.082396f, 0.988996f, 0.122871f, 0.625000f, 0.500000f,
+    0.046480f, 0.555469f, 0.223562f, 0.040002f, 0.978977f, 0.200011f, 0.875000f, 0.250000f,
+    0.124803f, 0.539355f, 0.293326f, 0.060387f, 0.987598f, 0.144929f, 0.750000f, 0.375000f,
+    0.064786f, 0.539355f, 0.311609f, 0.030869f, 0.987535f, 0.154346f, 0.875000f, 0.375000f,
+    0.000000f, 0.539355f, 0.317969f, 0.000000f, 0.987537f, 0.157389f, 1.000000f, 0.375000f,
+    0.084047f, 0.525000f, 0.404250f, 0.029094f, 0.988935f, 0.145472f, 0.875000f, 0.500000f,
+    0.380531f, 0.525000f, 0.161906f, 0.137032f, 0.988920f, 0.057097f, 0.250000f, 0.500000f,
+    0.578125f, 0.494531f, -0.000000f, 0.258736f, 0.965948f, -0.000000f, 0.000000f, 0.750000f,
+    0.533320f, 0.494531f, 0.226914f, 0.239005f, 0.965898f, 0.099585f, 0.250000f, 0.750000f,
+    0.410469f, 0.494531f, 0.410469f, 0.182258f, 0.966211f, 0.182258f, 0.500000f, 0.750000f,
+    0.599625f, 0.450000f, 0.255125f, 0.923077f, 0.000000f, 0.384615f, 0.250000f, 1.000000f,
+    0.404250f, 0.525000f, 0.084047f, 0.145452f, 0.988938f, 0.029090f, 0.125000f, 0.500000f,
+    0.502344f, 0.510645f, -0.000000f, 0.174370f, 0.984680f, -0.000000f, 0.000000f, 0.625000f,
+    0.492297f, 0.510645f, 0.102353f, 0.170975f, 0.984682f, 0.034195f, 0.125000f, 0.625000f,
+    0.463412f, 0.510645f, 0.197170f, 0.160568f, 0.984755f, 0.066903f, 0.250000f, 0.625000f,
+    0.566563f, 0.494531f, 0.117793f, 0.253699f, 0.965951f, 0.050740f, 0.125000f, 0.750000f,
+    0.342891f, 0.525000f, 0.232031f, 0.122865f, 0.988997f, 0.082392f, 0.375000f, 0.500000f,
+    0.463412f, 0.510645f, 0.197170f, 0.160568f, 0.984755f, 0.066903f, 0.250000f, 0.625000f,
+    0.417573f, 0.510645f, 0.282568f, 0.144429f, 0.984764f, 0.096852f, 0.375000f, 0.625000f,
+    0.356664f, 0.510645f, 0.356664f, 0.122811f, 0.984802f, 0.122811f, 0.500000f, 0.625000f,
+    0.480566f, 0.494531f, 0.325195f, 0.214330f, 0.966129f, 0.143727f, 0.375000f, 0.750000f,
+    0.566563f, 0.494531f, 0.117793f, 0.253699f, 0.965951f, 0.050740f, 0.125000f, 0.750000f,
+    0.630469f, 0.474902f, -0.000000f, 0.505546f, 0.862799f, -0.000000f, 0.000000f, 0.875000f,
+    0.617859f, 0.474902f, 0.128458f, 0.495710f, 0.862811f, 0.099142f, 0.125000f, 0.875000f,
+    0.581607f, 0.474902f, 0.247459f, 0.465791f, 0.863349f, 0.194079f, 0.250000f, 0.875000f,
+    0.637000f, 0.450000f, 0.132437f, 0.980581f, 0.000000f, 0.196116f, 0.125000f, 1.000000f,
+    0.480566f, 0.494531f, 0.325195f, 0.214330f, 0.966129f, 0.143727f, 0.375000f, 0.750000f,
+    0.581607f, 0.474902f, 0.247459f, 0.465791f, 0.863349f, 0.194080f, 0.250000f, 0.875000f,
+    0.524077f, 0.474902f, 0.354639f, 0.419002f, 0.863417f, 0.280978f, 0.375000f, 0.875000f,
+    0.447633f, 0.474902f, 0.447633f, 0.356389f, 0.863698f, 0.356389f, 0.500000f, 0.875000f,
+    0.540312f, 0.450000f, 0.365625f, 0.830544f, 0.000000f, 0.556953f, 0.375000f, 1.000000f,
+    0.161906f, 0.525000f, 0.380531f, 0.057140f, 0.988903f, 0.137136f, 0.750000f, 0.500000f,
+    0.410469f, 0.494531f, 0.410469f, 0.182258f, 0.966211f, 0.182258f, 0.500000f, 0.750000f,
+    0.226914f, 0.494531f, 0.533320f, 0.099657f, 0.965848f, 0.239176f, 0.750000f, 0.750000f,
+    0.000000f, 0.494531f, 0.578125f, 0.000000f, 0.965948f, 0.258736f, 1.000000f, 0.750000f,
+    0.255125f, 0.450000f, 0.599625f, 0.384615f, 0.000000f, 0.923077f, 0.750000f, 1.000000f,
+    0.232031f, 0.525000f, 0.342891f, 0.082396f, 0.988996f, 0.122871f, 0.625000f, 0.500000f,
+    0.356664f, 0.510645f, 0.356664f, 0.122811f, 0.984802f, 0.122811f, 0.500000f, 0.625000f,
+    0.282568f, 0.510645f, 0.417573f, 0.096857f, 0.984762f, 0.144436f, 0.625000f, 0.625000f,
+    0.197170f, 0.510645f, 0.463412f, 0.066903f, 0.984755f, 0.160568f, 0.750000f, 0.625000f,
+    0.325195f, 0.494531f, 0.480566f, 0.143734f, 0.966126f, 0.214340f, 0.625000f, 0.750000f,
+    0.084047f, 0.525000f, 0.404250f, 0.029094f, 0.988935f, 0.145472f, 0.875000f, 0.500000f,
+    0.197170f, 0.510645f, 0.463412f, 0.066903f, 0.984755f, 0.160568f, 0.750000f, 0.625000f,
+    0.102353f, 0.510645f, 0.492297f, 0.034200f, 0.984678f, 0.170999f, 0.875000f, 0.625000f,
+    0.000000f, 0.510645f, 0.502344f, 0.000000f, 0.984680f, 0.174370f, 1.000000f, 0.625000f,
+    0.117793f, 0.494531f, 0.566563f, 0.050746f, 0.965942f, 0.253732f, 0.875000f, 0.750000f,
+    0.325195f, 0.494531f, 0.480566f, 0.143734f, 0.966126f, 0.214340f, 0.625000f, 0.750000f,
+    0.447633f, 0.474902f, 0.447633f, 0.356389f, 0.863698f, 0.356389f, 0.500000f, 0.875000f,
+    0.354639f, 0.474902f, 0.524077f, 0.280988f, 0.863406f, 0.419017f, 0.625000f, 0.875000f,
+    0.247459f, 0.474902f, 0.581607f, 0.194080f, 0.863349f, 0.465791f, 0.750000f, 0.875000f,
+    0.365625f, 0.450000f, 0.540312f, 0.556953f, 0.000000f, 0.830544f, 0.625000f, 1.000000f,
+    0.117793f, 0.494531f, 0.566563f, 0.050747f, 0.965942f, 0.253732f, 0.875000f, 0.750000f,
+    0.247459f, 0.474902f, 0.581607f, 0.194079f, 0.863349f, 0.465791f, 0.750000f, 0.875000f,
+    0.128458f, 0.474902f, 0.617859f, 0.099152f, 0.862780f, 0.495761f, 0.875000f, 0.875000f,
+    0.000000f, 0.474902f, 0.630469f, 0.000000f, 0.862799f, 0.505546f, 1.000000f, 0.875000f,
+    0.132437f, 0.450000f, 0.637000f, 0.196116f, 0.000000f, 0.980581f, 0.875000f, 1.000000f,
+    0.000000f, 0.600000f, 0.100000f, 0.000000f, 0.800000f, 0.600000f, 0.000000f, 0.000000f,
+    -0.100000f, 0.600000f, -0.000000f, -0.600000f, 0.800000f, 0.000000f, 1.000000f, 0.000000f,
+    0.000000f, 0.450000f, 0.650000f, 0.000000f, 0.000000f, 1.000000f, 0.000000f, 1.000000f,
+    -0.650000f, 0.450000f, -0.000000f, -1.000000f, -0.000000f, -0.000000f, 1.000000f, 1.000000f,
+    -0.071000f, 0.600000f, 0.071000f, -0.427006f, 0.797077f, 0.427006f, 0.500000f, 0.000000f,
+    0.000000f, 0.525000f, 0.412500f, 0.000000f, 0.988936f, 0.148340f, 0.000000f, 0.500000f,
+    -0.292875f, 0.525000f, 0.292875f, -0.105934f, 0.988714f, 0.105934f, 0.500000f, 0.500000f,
+    -0.412500f, 0.525000f, -0.000000f, -0.148340f, 0.988936f, 0.000000f, 1.000000f, 0.500000f,
+    -0.461500f, 0.450000f, 0.461500f, -0.707107f, 0.000000f, 0.707107f, 0.500000f, 1.000000f,
+    -0.039250f, 0.600000f, 0.092250f, -0.230883f, 0.799778f, 0.554119f, 0.250000f, 0.000000f,
+    0.000000f, 0.555469f, 0.228125f, 0.000000f, 0.978980f, 0.203954f, 0.000000f, 0.250000f,
+    -0.089539f, 0.555469f, 0.210445f, -0.078502f, 0.978949f, 0.188404f, 0.250000f, 0.250000f,
+    -0.161969f, 0.555469f, 0.161969f, -0.143654f, 0.979146f, 0.143654f, 0.500000f, 0.250000f,
+    -0.161906f, 0.525000f, 0.380531f, -0.057097f, 0.988920f, 0.137033f, 0.250000f, 0.500000f,
+    -0.020375f, 0.600000f, 0.098000f, -0.117666f, 0.800015f, 0.588329f, 0.125000f, 0.000000f,
+    0.000000f, 0.575098f, 0.152344f, 0.000000f, 0.948259f, 0.317497f, 0.000000f, 0.125000f,
+    -0.031040f, 0.575098f, 0.149297f, -0.062263f, 0.948264f, 0.311317f, 0.125000f, 0.125000f,
+    -0.059795f, 0.575098f, 0.140537f, -0.121840f, 0.948497f, 0.292417f, 0.250000f, 0.125000f,
+    -0.046480f, 0.555469f, 0.223562f, -0.039997f, 0.978983f, 0.199984f, 0.125000f, 0.250000f,
+    -0.056250f, 0.600000f, 0.083125f, -0.333572f, 0.800807f, 0.497432f, 0.375000f, 0.000000f,
+    -0.059795f, 0.575098f, 0.140537f, -0.121840f, 0.948497f, 0.292417f, 0.250000f, 0.125000f,
+    -0.085693f, 0.575098f, 0.126636f, -0.176386f, 0.948527f, 0.263031f, 0.375000f, 0.125000f,
+    -0.108164f, 0.575098f, 0.108164f, -0.223681f, 0.948648f, 0.223681f, 0.500000f, 0.125000f,
+    -0.128320f, 0.555469f, 0.189629f, -0.113288f, 0.979094f, 0.168938f, 0.375000f, 0.250000f,
+    -0.046480f, 0.555469f, 0.223562f, -0.039997f, 0.978982f, 0.199985f, 0.125000f, 0.250000f,
+    0.000000f, 0.539355f, 0.317969f, 0.000000f, 0.987537f, 0.157389f, 0.000000f, 0.375000f,
+    -0.064786f, 0.539355f, 0.311609f, -0.030865f, 0.987538f, 0.154325f, 0.125000f, 0.375000f,
+    -0.124803f, 0.539355f, 0.293326f, -0.060387f, 0.987598f, 0.144929f, 0.250000f, 0.375000f,
+    -0.084047f, 0.525000f, 0.404250f, -0.029090f, 0.988938f, 0.145452f, 0.125000f, 0.500000f,
+    -0.128320f, 0.555469f, 0.189629f, -0.113289f, 0.979094f, 0.168939f, 0.375000f, 0.250000f,
+    -0.124803f, 0.539355f, 0.293326f, -0.060387f, 0.987598f, 0.144929f, 0.250000f, 0.375000f,
+    -0.178857f, 0.539355f, 0.264312f, -0.087419f, 0.987605f, 0.130361f, 0.375000f, 0.375000f,
+    -0.225758f, 0.539355f, 0.225758f, -0.110849f, 0.987636f, 0.110849f, 0.500000f, 0.375000f,
+    -0.232031f, 0.525000f, 0.342891f, -0.082392f, 0.988997f, 0.122865f, 0.375000f, 0.500000f,
+    -0.092250f, 0.600000f, 0.039250f, -0.554392f, 0.799556f, 0.230997f, 0.750000f, 0.000000f,
+    -0.161969f, 0.555469f, 0.161969f, -0.143654f, 0.979146f, 0.143654f, 0.500000f, 0.250000f,
+    -0.210445f, 0.555469f, 0.089539f, -0.188544f, 0.978918f, 0.078560f, 0.750000f, 0.250000f,
+    -0.228125f, 0.555469f, -0.000000f, -0.203954f, 0.978980f, 0.000000f, 1.000000f, 0.250000f,
+    -0.380531f, 0.525000f, 0.161906f, -0.137136f, 0.988903f, 0.057140f, 0.750000f, 0.500000f,
+    -0.083125f, 0.600000f, 0.056250f, -0.497447f, 0.800793f, 0.333583f, 0.625000f, 0.000000f,
+    -0.108164f, 0.575098f, 0.108164f, -0.223681f, 0.948648f, 0.223681f, 0.500000f, 0.125000f,
+    -0.126636f, 0.575098f, 0.085693f, -0.263043f, 0.948522f, 0.176393f, 0.625000f, 0.125000f,
+    -0.140537f, 0.575098f, 0.059795f, -0.292417f, 0.948497f, 0.121840f, 0.750000f, 0.125000f,
+    -0.189629f, 0.555469f, 0.128320f, -0.168946f, 0.979092f, 0.113293f, 0.625000f, 0.250000f,
+    -0.098000f, 0.600000f, 0.020375f, -0.588382f, 0.799975f, 0.117676f, 0.875000f, 0.000000f,
+    -0.140537f, 0.575098f, 0.059795f, -0.292417f, 0.948497f, 0.121840f, 0.750000f, 0.125000f,
+    -0.149297f, 0.575098f, 0.031040f, -0.311356f, 0.948251f, 0.062271f, 0.875000f, 0.125000f,
+    -0.152344f, 0.575098f, -0.000000f, -0.317497f, 0.948259f, 0.000000f, 1.000000f, 0.125000f,
+    -0.223562f, 0.555469f, 0.046480f, -0.200010f, 0.978977f, 0.040002f, 0.875000f, 0.250000f,
+    -0.189629f, 0.555469f, 0.128320f, -0.168947f, 0.979092f, 0.113294f, 0.625000f, 0.250000f,
+    -0.225758f, 0.539355f, 0.225758f, -0.110849f, 0.987636f, 0.110849f, 0.500000f, 0.375000f,
+    -0.264312f, 0.539355f, 0.178857f, -0.130368f, 0.987604f, 0.087423f, 0.625000f, 0.375000f,
+    -0.293326f, 0.539355f, 0.124803f, -0.144929f, 0.987598f, 0.060387f, 0.750000f, 0.375000f,
+    -0.342891f, 0.525000f, 0.232031f, -0.122871f, 0.988996f, 0.082396f, 0.625000f, 0.500000f,
+    -0.223562f, 0.555469f, 0.046480f, -0.200011f, 0.978977f, 0.040002f, 0.875000f, 0.250000f,
+    -0.293326f, 0.539355f, 0.124803f, -0.144929f, 0.987598f, 0.060387f, 0.750000f, 0.375000f,
+    -0.311609f, 0.539355f, 0.064786f, -0.154346f, 0.987535f, 0.030869f, 0.875000f, 0.375000f,
+    -0.317969f, 0.539355f, -0.000000f, -0.157389f, 0.987537f, 0.000000f, 1.000000f, 0.375000f,
+    -0.404250f, 0.525000f, 0.084047f, -0.145472f, 0.988935f, 0.029094f, 0.875000f, 0.500000f,
+    -0.161906f, 0.525000f, 0.380531f, -0.057097f, 0.988920f, 0.137032f, 0.250000f, 0.500000f,
+    0.000000f, 0.494531f, 0.578125f, 0.000000f, 0.965948f, 0.258736f, 0.000000f, 0.750000f,
+    -0.226914f, 0.494531f, 0.533320f, -0.099585f, 0.965898f, 0.239005f, 0.250000f, 0.750000f,
+    -0.410469f, 0.494531f, 0.410469f, -0.182258f, 0.966211f, 0.182258f, 0.500000f, 0.750000f,
+    -0.255125f, 0.450000f, 0.599625f, -0.384615f, 0.000000f, 0.923077f, 0.250000f, 1.000000f,
+    -0.084047f, 0.525000f, 0.404250f, -0.029090f, 0.988938f, 0.145452f, 0.125000f, 0.500000f,
+    0.000000f, 0.510645f, 0.502344f, 0.000000f, 0.984680f, 0.174370f, 0.000000f, 0.625000f,
+    -0.102353f, 0.510645f, 0.492297f, -0.034195f, 0.984682f, 0.170975f, 0.125000f, 0.625000f,
+    -0.197170f, 0.510645f, 0.463412f, -0.066903f, 0.984755f, 0.160568f, 0.250000f, 0.625000f,
+    -0.117793f, 0.494531f, 0.566563f, -0.050740f, 0.965951f, 0.253699f, 0.125000f, 0.750000f,
+    -0.232031f, 0.525000f, 0.342891f, -0.082392f, 0.988997f, 0.122865f, 0.375000f, 0.500000f,
+    -0.197170f, 0.510645f, 0.463412f, -0.066903f, 0.984755f, 0.160568f, 0.250000f, 0.625000f,
+    -0.282568f, 0.510645f, 0.417573f, -0.096852f, 0.984764f, 0.144429f, 0.375000f, 0.625000f,
+    -0.356664f, 0.510645f, 0.356664f, -0.122811f, 0.984802f, 0.122811f, 0.500000f, 0.625000f,
+    -0.325195f, 0.494531f, 0.480566f, -0.143727f, 0.966129f, 0.214330f, 0.375000f, 0.750000f,
+    -0.117793f, 0.494531f, 0.566563f, -0.050740f, 0.965951f, 0.253699f, 0.125000f, 0.750000f,
+    0.000000f, 0.474902f, 0.630469f, 0.000000f, 0.862799f, 0.505546f, 0.000000f, 0.875000f,
+    -0.128458f, 0.474902f, 0.617859f, -0.099142f, 0.862811f, 0.495710f, 0.125000f, 0.875000f,
+    -0.247459f, 0.474902f, 0.581607f, -0.194079f, 0.863349f, 0.465791f, 0.250000f, 0.875000f,
+    -0.132437f, 0.450000f, 0.637000f, -0.196116f, 0.000000f, 0.980581f, 0.125000f, 1.000000f,
+    -0.325195f, 0.494531f, 0.480566f, -0.143727f, 0.966129f, 0.214330f, 0.375000f, 0.750000f,
+    -0.247459f, 0.474902f, 0.581607f, -0.194080f, 0.863349f, 0.465791f, 0.250000f, 0.875000f,
+    -0.354639f, 0.474902f, 0.524077f, -0.280978f, 0.863417f, 0.419002f, 0.375000f, 0.875000f,
+    -0.447633f, 0.474902f, 0.447633f, -0.356389f, 0.863698f, 0.356389f, 0.500000f, 0.875000f,
+    -0.365625f, 0.450000f, 0.540312f, -0.556953f, 0.000000f, 0.830544f, 0.375000f, 1.000000f,
+    -0.380531f, 0.525000f, 0.161906f, -0.137136f, 0.988903f, 0.057140f, 0.750000f, 0.500000f,
+    -0.410469f, 0.494531f, 0.410469f, -0.182258f, 0.966211f, 0.182258f, 0.500000f, 0.750000f,
+    -0.533320f, 0.494531f, 0.226914f, -0.239176f, 0.965848f, 0.099657f, 0.750000f, 0.750000f,
+    -0.578125f, 0.494531f, -0.000000f, -0.258736f, 0.965948f, 0.000000f, 1.000000f, 0.750000f,
+    -0.599625f, 0.450000f, 0.255125f, -0.923077f, 0.000000f, 0.384615f, 0.750000f, 1.000000f,
+    -0.342891f, 0.525000f, 0.232031f, -0.122871f, 0.988996f, 0.082396f, 0.625000f, 0.500000f,
+    -0.356664f, 0.510645f, 0.356664f, -0.122811f, 0.984802f, 0.122811f, 0.500000f, 0.625000f,
+    -0.417573f, 0.510645f, 0.282568f, -0.144436f, 0.984762f, 0.096857f, 0.625000f, 0.625000f,
+    -0.463412f, 0.510645f, 0.197170f, -0.160568f, 0.984755f, 0.066903f, 0.750000f, 0.625000f,
+    -0.480566f, 0.494531f, 0.325195f, -0.214340f, 0.966126f, 0.143734f, 0.625000f, 0.750000f,
+    -0.404250f, 0.525000f, 0.084047f, -0.145472f, 0.988935f, 0.029094f, 0.875000f, 0.500000f,
+    -0.463412f, 0.510645f, 0.197170f, -0.160568f, 0.984755f, 0.066903f, 0.750000f, 0.625000f,
+    -0.492297f, 0.510645f, 0.102353f, -0.170999f, 0.984678f, 0.034200f, 0.875000f, 0.625000f,
+    -0.502344f, 0.510645f, -0.000000f, -0.174370f, 0.984680f, 0.000000f, 1.000000f, 0.625000f,
+    -0.566563f, 0.494531f, 0.117793f, -0.253732f, 0.965942f, 0.050746f, 0.875000f, 0.750000f,
+    -0.480566f, 0.494531f, 0.325195f, -0.214340f, 0.966126f, 0.143734f, 0.625000f, 0.750000f,
+    -0.447633f, 0.474902f, 0.447633f, -0.356389f, 0.863698f, 0.356389f, 0.500000f, 0.875000f,
+    -0.524077f, 0.474902f, 0.354639f, -0.419017f, 0.863406f, 0.280988f, 0.625000f, 0.875000f,
+    -0.581607f, 0.474902f, 0.247459f, -0.465791f, 0.863349f, 0.194080f, 0.750000f, 0.875000f,
+    -0.540312f, 0.450000f, 0.365625f, -0.830544f, 0.000000f, 0.556953f, 0.625000f, 1.000000f,
+    -0.566563f, 0.494531f, 0.117793f, -0.253732f, 0.965942f, 0.050747f, 0.875000f, 0.750000f,
+    -0.581607f, 0.474902f, 0.247459f, -0.465791f, 0.863349f, 0.194079f, 0.750000f, 0.875000f,
+    -0.617859f, 0.474902f, 0.128458f, -0.495761f, 0.862780f, 0.099152f, 0.875000f, 0.875000f,
+    -0.630469f, 0.474902f, -0.000000f, -0.505546f, 0.862799f, 0.000000f, 1.000000f, 0.875000f,
+    -0.637000f, 0.450000f, 0.132437f, -0.980581f, 0.000000f, 0.196116f, 0.875000f, 1.000000f,
+    -0.100000f, 0.600000f, -0.000000f, -0.600000f, 0.800000f, 0.000000f, 0.000000f, 0.000000f,
+    0.000000f, 0.600000f, -0.100000f, 0.000000f, 0.800000f, -0.600000f, 1.000000f, 0.000000f,
+    -0.650000f, 0.450000f, -0.000000f, -1.000000f, -0.000000f, -0.000000f, 0.000000f, 1.000000f,
+    0.000000f, 0.450000f, -0.650000f, 0.000000f, 0.000000f, -1.000000f, 1.000000f, 1.000000f,
+    -0.071000f, 0.600000f, -0.071000f, -0.427006f, 0.797077f, -0.427006f, 0.500000f, 0.000000f,
+    -0.412500f, 0.525000f, -0.000000f, -0.148340f, 0.988936f, 0.000000f, 0.000000f, 0.500000f,
+    -0.292875f, 0.525000f, -0.292875f, -0.105934f, 0.988714f, -0.105934f, 0.500000f, 0.500000f,
+    0.000000f, 0.525000f, -0.412500f, 0.000000f, 0.988936f, -0.148340f, 1.000000f, 0.500000f,
+    -0.461500f, 0.450000f, -0.461500f, -0.707107f, -0.000000f, -0.707107f, 0.500000f, 1.000000f,
+    -0.092250f, 0.600000f, -0.039250f, -0.554119f, 0.799778f, -0.230883f, 0.250000f, 0.000000f,
+    -0.228125f, 0.555469f, -0.000000f, -0.203954f, 0.978980f, 0.000000f, 0.000000f, 0.250000f,
+    -0.210445f, 0.555469f, -0.089539f, -0.188404f, 0.978949f, -0.078502f, 0.250000f, 0.250000f,
+    -0.161969f, 0.555469f, -0.161969f, -0.143654f, 0.979146f, -0.143654f, 0.500000f, 0.250000f,
+    -0.380531f, 0.525000f, -0.161906f, -0.137033f, 0.988920f, -0.057097f, 0.250000f, 0.500000f,
+    -0.098000f, 0.600000f, -0.020375f, -0.588329f, 0.800015f, -0.117666f, 0.125000f, 0.000000f,
+    -0.152344f, 0.575098f, -0.000000f, -0.317497f, 0.948259f, 0.000000f, 0.000000f, 0.125000f,
+    -0.149297f, 0.575098f, -0.031040f, -0.311317f, 0.948264f, -0.062263f, 0.125000f, 0.125000f,
+    -0.140537f, 0.575098f, -0.059795f, -0.292417f, 0.948497f, -0.121840f, 0.250000f, 0.125000f,
+    -0.223562f, 0.555469f, -0.046480f, -0.199984f, 0.978983f, -0.039997f, 0.125000f, 0.250000f,
+    -0.083125f, 0.600000f, -0.056250f, -0.497432f, 0.800807f, -0.333572f, 0.375000f, 0.000000f,
+    -0.140537f, 0.575098f, -0.059795f, -0.292417f, 0.948497f, -0.121840f, 0.250000f, 0.125000f,
+    -0.126636f, 0.575098f, -0.085693f, -0.263031f, 0.948527f, -0.176386f, 0.375000f, 0.125000f,
+    -0.108164f, 0.575098f, -0.108164f, -0.223681f, 0.948648f, -0.223681f, 0.500000f, 0.125000f,
+    -0.189629f, 0.555469f, -0.128320f, -0.168938f, 0.979094f, -0.113288f, 0.375000f, 0.250000f,
+    -0.223562f, 0.555469f, -0.046480f, -0.199985f, 0.978982f, -0.039997f, 0.125000f, 0.250000f,
+    -0.317969f, 0.539355f, -0.000000f, -0.157389f, 0.987537f, 0.000000f, 0.000000f, 0.375000f,
+    -0.311609f, 0.539355f, -0.064786f, -0.154325f, 0.987538f, -0.030865f, 0.125000f, 0.375000f,
+    -0.293326f, 0.539355f, -0.124803f, -0.144929f, 0.987598f, -0.060387f, 0.250000f, 0.375000f,
+    -0.404250f, 0.525000f, -0.084047f, -0.145452f, 0.988938f, -0.029090f, 0.125000f, 0.500000f,
+    -0.189629f, 0.555469f, -0.128320f, -0.168939f, 0.979094f, -0.113289f, 0.375000f, 0.250000f,
+    -0.293326f, 0.539355f, -0.124803f, -0.144929f, 0.987598f, -0.060387f, 0.250000f, 0.375000f,
+    -0.264312f, 0.539355f, -0.178857f, -0.130361f, 0.987605f, -0.087419f, 0.375000f, 0.375000f,
+    -0.225758f, 0.539355f, -0.225758f, -0.110849f, 0.987636f, -0.110849f, 0.500000f, 0.375000f,
+    -0.342891f, 0.525000f, -0.232031f, -0.122865f, 0.988997f, -0.082392f, 0.375000f, 0.500000f,
+    -0.039250f, 0.600000f, -0.092250f, -0.230997f, 0.799556f, -0.554392f, 0.750000f, 0.000000f,
+    -0.161969f, 0.555469f, -0.161969f, -0.143654f, 0.979146f, -0.143654f, 0.500000f, 0.250000f,
+    -0.089539f, 0.555469f, -0.210445f, -0.078560f, 0.978918f, -0.188544f, 0.750000f, 0.250000f,
+    0.000000f, 0.555469f, -0.228125f, 0.000000f, 0.978980f, -0.203954f, 1.000000f, 0.250000f,
+    -0.161906f, 0.525000f, -0.380531f, -0.057140f, 0.988903f, -0.137136f, 0.750000f, 0.500000f,
+    -0.056250f, 0.600000f, -0.083125f, -0.333583f, 0.800793f, -0.497447f, 0.625000f, 0.000000f,
+    -0.108164f, 0.575098f, -0.108164f, -0.223681f, 0.948648f, -0.223681f, 0.500000f, 0.125000f,
+    -0.085693f, 0.575098f, -0.126636f, -0.176393f, 0.948522f, -0.263043f, 0.625000f, 0.125000f,
+    -0.059795f, 0.575098f, -0.140537f, -0.121840f, 0.948497f, -0.292417f, 0.750000f, 0.125000f,
+    -0.128320f, 0.555469f, -0.189629f, -0.113293f, 0.979092f, -0.168946f, 0.625000f, 0.250000f,
+    -0.020375f, 0.600000f, -0.098000f, -0.117676f, 0.799975f, -0.588382f, 0.875000f, 0.000000f,
+    -0.059795f, 0.575098f, -0.140537f, -0.121840f, 0.948497f, -0.292417f, 0.750000f, 0.125000f,
+    -0.031040f, 0.575098f, -0.149297f, -0.062271f, 0.948251f, -0.311356f, 0.875000f, 0.125000f,
+    0.000000f, 0.575098f, -0.152344f, 0.000000f, 0.948259f, -0.317497f, 1.000000f, 0.125000f,
+    -0.046480f, 0.555469f, -0.223562f, -0.040002f, 0.978977f, -0.200010f, 0.875000f, 0.250000f,
+    -0.128320f, 0.555469f, -0.189629f, -0.113294f, 0.979092f, -0.168947f, 0.625000f, 0.250000f,
+    -0.225758f, 0.539355f, -0.225758f, -0.110849f, 0.987636f, -0.110849f, 0.500000f, 0.375000f,
+    -0.178857f, 0.539355f, -0.264312f, -0.087423f, 0.987604f, -0.130368f, 0.625000f, 0.375000f,
+    -0.124803f, 0.539355f, -0.293326f, -0.060387f, 0.987598f, -0.144929f, 0.750000f, 0.375000f,
+    -0.232031f, 0.525000f, -0.342891f, -0.082396f, 0.988996f, -0.122871f, 0.625000f, 0.500000f,
+    -0.046480f, 0.555469f, -0.223562f, -0.040002f, 0.978977f, -0.200011f, 0.875000f, 0.250000f,
+    -0.124803f, 0.539355f, -0.293326f, -0.060387f, 0.987598f, -0.144929f, 0.750000f, 0.375000f,
+    -0.064786f, 0.539355f, -0.311609f, -0.030869f, 0.987535f, -0.154346f, 0.875000f, 0.375000f,
+    0.000000f, 0.539355f, -0.317969f, 0.000000f, 0.987537f, -0.157389f, 1.000000f, 0.375000f,
+    -0.084047f, 0.525000f, -0.404250f, -0.029094f, 0.988935f, -0.145472f, 0.875000f, 0.500000f,
+    -0.380531f, 0.525000f, -0.161906f, -0.137032f, 0.988920f, -0.057097f, 0.250000f, 0.500000f,
+    -0.578125f, 0.494531f, -0.000000f, -0.258736f, 0.965948f, 0.000000f, 0.000000f, 0.750000f,
+    -0.533320f, 0.494531f, -0.226914f, -0.239005f, 0.965898f, -0.099585f, 0.250000f, 0.750000f,
+    -0.410469f, 0.494531f, -0.410469f, -0.182258f, 0.966211f, -0.182258f, 0.500000f, 0.750000f,
+    -0.599625f, 0.450000f, -0.255125f, -0.923077f, -0.000000f, -0.384615f, 0.250000f, 1.000000f,
+    -0.404250f, 0.525000f, -0.084047f, -0.145452f, 0.988938f, -0.029090f, 0.125000f, 0.500000f,
+    -0.502344f, 0.510645f, -0.000000f, -0.174370f, 0.984680f, 0.000000f, 0.000000f, 0.625000f,
+    -0.492297f, 0.510645f, -0.102353f, -0.170975f, 0.984682f, -0.034195f, 0.125000f, 0.625000f,
+    -0.463412f, 0.510645f, -0.197170f, -0.160568f, 0.984755f, -0.066903f, 0.250000f, 0.625000f,
+    -0.566563f, 0.494531f, -0.117793f, -0.253699f, 0.965951f, -0.050740f, 0.125000f, 0.750000f,
+    -0.342891f, 0.525000f, -0.232031f, -0.122865f, 0.988997f, -0.082392f, 0.375000f, 0.500000f,
+    -0.463412f, 0.510645f, -0.197170f, -0.160568f, 0.984755f, -0.066903f, 0.250000f, 0.625000f,
+    -0.417573f, 0.510645f, -0.282568f, -0.144429f, 0.984764f, -0.096852f, 0.375000f, 0.625000f,
+    -0.356664f, 0.510645f, -0.356664f, -0.122811f, 0.984802f, -0.122811f, 0.500000f, 0.625000f,
+    -0.480566f, 0.494531f, -0.325195f, -0.214330f, 0.966129f, -0.143727f, 0.375000f, 0.750000f,
+    -0.566563f, 0.494531f, -0.117793f, -0.253699f, 0.965951f, -0.050740f, 0.125000f, 0.750000f,
+    -0.630469f, 0.474902f, -0.000000f, -0.505546f, 0.862799f, 0.000000f, 0.000000f, 0.875000f,
+    -0.617859f, 0.474902f, -0.128458f, -0.495710f, 0.862811f, -0.099142f, 0.125000f, 0.875000f,
+    -0.581607f, 0.474902f, -0.247459f, -0.465791f, 0.863349f, -0.194079f, 0.250000f, 0.875000f,
+    -0.637000f, 0.450000f, -0.132437f, -0.980581f, -0.000000f, -0.196116f, 0.125000f, 1.000000f,
+    -0.480566f, 0.494531f, -0.325195f, -0.214330f, 0.966129f, -0.143727f, 0.375000f, 0.750000f,
+    -0.581607f, 0.474902f, -0.247459f, -0.465791f, 0.863349f, -0.194080f, 0.250000f, 0.875000f,
+    -0.524077f, 0.474902f, -0.354639f, -0.419002f, 0.863417f, -0.280978f, 0.375000f, 0.875000f,
+    -0.447633f, 0.474902f, -0.447633f, -0.356389f, 0.863698f, -0.356389f, 0.500000f, 0.875000f,
+    -0.540312f, 0.450000f, -0.365625f, -0.830544f, -0.000000f, -0.556953f, 0.375000f, 1.000000f,
+    -0.161906f, 0.525000f, -0.380531f, -0.057140f, 0.988903f, -0.137136f, 0.750000f, 0.500000f,
+    -0.410469f, 0.494531f, -0.410469f, -0.182258f, 0.966211f, -0.182258f, 0.500000f, 0.750000f,
+    -0.226914f, 0.494531f, -0.533320f, -0.099657f, 0.965848f, -0.239176f, 0.750000f, 0.750000f,
+    0.000000f, 0.494531f, -0.578125f, 0.000000f, 0.965948f, -0.258736f, 1.000000f, 0.750000f,
+    -0.255125f, 0.450000f, -0.599625f, -0.384615f, -0.000000f, -0.923077f, 0.750000f, 1.000000f,
+    -0.232031f, 0.525000f, -0.342891f, -0.082396f, 0.988996f, -0.122871f, 0.625000f, 0.500000f,
+    -0.356664f, 0.510645f, -0.356664f, -0.122811f, 0.984802f, -0.122811f, 0.500000f, 0.625000f,
+    -0.282568f, 0.510645f, -0.417573f, -0.096857f, 0.984762f, -0.144436f, 0.625000f, 0.625000f,
+    -0.197170f, 0.510645f, -0.463412f, -0.066903f, 0.984755f, -0.160568f, 0.750000f, 0.625000f,
+    -0.325195f, 0.494531f, -0.480566f, -0.143734f, 0.966126f, -0.214340f, 0.625000f, 0.750000f,
+    -0.084047f, 0.525000f, -0.404250f, -0.029094f, 0.988935f, -0.145472f, 0.875000f, 0.500000f,
+    -0.197170f, 0.510645f, -0.463412f, -0.066903f, 0.984755f, -0.160568f, 0.750000f, 0.625000f,
+    -0.102353f, 0.510645f, -0.492297f, -0.034200f, 0.984678f, -0.170999f, 0.875000f, 0.625000f,
+    0.000000f, 0.510645f, -0.502344f, 0.000000f, 0.984680f, -0.174370f, 1.000000f, 0.625000f,
+    -0.117793f, 0.494531f, -0.566563f, -0.050746f, 0.965942f, -0.253732f, 0.875000f, 0.750000f,
+    -0.325195f, 0.494531f, -0.480566f, -0.143734f, 0.966126f, -0.214340f, 0.625000f, 0.750000f,
+    -0.447633f, 0.474902f, -0.447633f, -0.356389f, 0.863698f, -0.356389f, 0.500000f, 0.875000f,
+    -0.354639f, 0.474902f, -0.524077f, -0.280988f, 0.863406f, -0.419017f, 0.625000f, 0.875000f,
+    -0.247459f, 0.474902f, -0.581607f, -0.194080f, 0.863349f, -0.465791f, 0.750000f, 0.875000f,
+    -0.365625f, 0.450000f, -0.540312f, -0.556953f, -0.000000f, -0.830544f, 0.625000f, 1.000000f,
+    -0.117793f, 0.494531f, -0.566563f, -0.050747f, 0.965942f, -0.253732f, 0.875000f, 0.750000f,
+    -0.247459f, 0.474902f, -0.581607f, -0.194079f, 0.863349f, -0.465791f, 0.750000f, 0.875000f,
+    -0.128458f, 0.474902f, -0.617859f, -0.099152f, 0.862780f, -0.495761f, 0.875000f, 0.875000f,
+    0.000000f, 0.474902f, -0.630469f, 0.000000f, 0.862799f, -0.505546f, 1.000000f, 0.875000f,
+    -0.132437f, 0.450000f, -0.637000f, -0.196116f, -0.000000f, -0.980581f, 0.875000f, 1.000000f,
+    0.000000f, 0.600000f, -0.100000f, 0.000000f, 0.800000f, -0.600000f, 0.000000f, 0.000000f,
+    0.100000f, 0.600000f, -0.000000f, 0.600000f, 0.800000f, -0.000000f, 1.000000f, 0.000000f,
+    0.000000f, 0.450000f, -0.650000f, 0.000000f, 0.000000f, -1.000000f, 0.000000f, 1.000000f,
+    0.650000f, 0.450000f, -0.000000f, 1.000000f, 0.000000f, -0.000000f, 1.000000f, 1.000000f,
+    0.071000f, 0.600000f, -0.071000f, 0.427006f, 0.797077f, -0.427006f, 0.500000f, 0.000000f,
+    0.000000f, 0.525000f, -0.412500f, 0.000000f, 0.988936f, -0.148340f, 0.000000f, 0.500000f,
+    0.292875f, 0.525000f, -0.292875f, 0.105934f, 0.988714f, -0.105934f, 0.500000f, 0.500000f,
+    0.412500f, 0.525000f, -0.000000f, 0.148340f, 0.988936f, -0.000000f, 1.000000f, 0.500000f,
+    0.461500f, 0.450000f, -0.461500f, 0.707107f, 0.000000f, -0.707107f, 0.500000f, 1.000000f,
+    0.039250f, 0.600000f, -0.092250f, 0.230883f, 0.799778f, -0.554119f, 0.250000f, 0.000000f,
+    0.000000f, 0.555469f, -0.228125f, 0.000000f, 0.978980f, -0.203954f, 0.000000f, 0.250000f,
+    0.089539f, 0.555469f, -0.210445f, 0.078502f, 0.978949f, -0.188404f, 0.250000f, 0.250000f,
+    0.161969f, 0.555469f, -0.161969f, 0.143654f, 0.979146f, -0.143654f, 0.500000f, 0.250000f,
+    0.161906f, 0.525000f, -0.380531f, 0.057097f, 0.988920f, -0.137033f, 0.250000f, 0.500000f,
+    0.020375f, 0.600000f, -0.098000f, 0.117666f, 0.800015f, -0.588329f, 0.125000f, 0.000000f,
+    0.000000f, 0.575098f, -0.152344f, 0.000000f, 0.948259f, -0.317497f, 0.000000f, 0.125000f,
+    0.031040f, 0.575098f, -0.149297f, 0.062263f, 0.948264f, -0.311317f, 0.125000f, 0.125000f,
+    0.059795f, 0.575098f, -0.140537f, 0.121840f, 0.948497f, -0.292417f, 0.250000f, 0.125000f,
+    0.046480f, 0.555469f, -0.223562f, 0.039997f, 0.978983f, -0.199984f, 0.125000f, 0.250000f,
+    0.056250f, 0.600000f, -0.083125f, 0.333572f, 0.800807f, -0.497432f, 0.375000f, 0.000000f,
+    0.059795f, 0.575098f, -0.140537f, 0.121840f, 0.948497f, -0.292417f, 0.250000f, 0.125000f,
+    0.085693f, 0.575098f, -0.126636f, 0.176386f, 0.948527f, -0.263031f, 0.375000f, 0.125000f,
+    0.108164f, 0.575098f, -0.108164f, 0.223681f, 0.948648f, -0.223681f, 0.500000f, 0.125000f,
+    0.128320f, 0.555469f, -0.189629f, 0.113288f, 0.979094f, -0.168938f, 0.375000f, 0.250000f,
+    0.046480f, 0.555469f, -0.223562f, 0.039997f, 0.978982f, -0.199985f, 0.125000f, 0.250000f,
+    0.000000f, 0.539355f, -0.317969f, 0.000000f, 0.987537f, -0.157389f, 0.000000f, 0.375000f,
+    0.064786f, 0.539355f, -0.311609f, 0.030865f, 0.987538f, -0.154325f, 0.125000f, 0.375000f,
+    0.124803f, 0.539355f, -0.293326f, 0.060387f, 0.987598f, -0.144929f, 0.250000f, 0.375000f,
+    0.084047f, 0.525000f, -0.404250f, 0.029090f, 0.988938f, -0.145452f, 0.125000f, 0.500000f,
+    0.128320f, 0.555469f, -0.189629f, 0.113289f, 0.979094f, -0.168939f, 0.375000f, 0.250000f,
+    0.124803f, 0.539355f, -0.293326f, 0.060387f, 0.987598f, -0.144929f, 0.250000f, 0.375000f,
+    0.178857f, 0.539355f, -0.264312f, 0.087419f, 0.987605f, -0.130361f, 0.375000f, 0.375000f,
+    0.225758f, 0.539355f, -0.225758f, 0.110849f, 0.987636f, -0.110849f, 0.500000f, 0.375000f,
+    0.232031f, 0.525000f, -0.342891f, 0.082392f, 0.988997f, -0.122865f, 0.375000f, 0.500000f,
+    0.092250f, 0.600000f, -0.039250f, 0.554392f, 0.799556f, -0.230997f, 0.750000f, 0.000000f,
+    0.161969f, 0.555469f, -0.161969f, 0.143654f, 0.979146f, -0.143654f, 0.500000f, 0.250000f,
+    0.210445f, 0.555469f, -0.089539f, 0.188544f, 0.978918f, -0.078560f, 0.750000f, 0.250000f,
+    0.228125f, 0.555469f, -0.000000f, 0.203954f, 0.978980f, -0.000000f, 1.000000f, 0.250000f,
+    0.380531f, 0.525000f, -0.161906f, 0.137136f, 0.988903f, -0.057140f, 0.750000f, 0.500000f,
+    0.083125f, 0.600000f, -0.056250f, 0.497447f, 0.800793f, -0.333583f, 0.625000f, 0.000000f,
+    0.108164f, 0.575098f, -0.108164f, 0.223681f, 0.948648f, -0.223681f, 0.500000f, 0.125000f,
+    0.126636f, 0.575098f, -0.085693f, 0.263043f, 0.948522f, -0.176393f, 0.625000f, 0.125000f,
+    0.140537f, 0.575098f, -0.059795f, 0.292417f, 0.948497f, -0.121840f, 0.750000f, 0.125000f,
+    0.189629f, 0.555469f, -0.128320f, 0.168946f, 0.979092f, -0.113293f, 0.625000f, 0.250000f,
+    0.098000f, 0.600000f, -0.020375f, 0.588382f, 0.799975f, -0.117676f, 0.875000f, 0.000000f,
+    0.140537f, 0.575098f, -0.059795f, 0.292417f, 0.948497f, -0.121840f, 0.750000f, 0.125000f,
+    0.149297f, 0.575098f, -0.031040f, 0.311356f, 0.948251f, -0.062271f, 0.875000f, 0.125000f,
+    0.152344f, 0.575098f, -0.000000f, 0.317497f, 0.948259f, -0.000000f, 1.000000f, 0.125000f,
+    0.223562f, 0.555469f, -0.046480f, 0.200010f, 0.978977f, -0.040002f, 0.875000f, 0.250000f,
+    0.189629f, 0.555469f, -0.128320f, 0.168947f, 0.979092f, -0.113294f, 0.625000f, 0.250000f,
+    0.225758f, 0.539355f, -0.225758f, 0.110849f, 0.987636f, -0.110849f, 0.500000f, 0.375000f,
+    0.264312f, 0.539355f, -0.178857f, 0.130368f, 0.987604f, -0.087423f, 0.625000f, 0.375000f,
+    0.293326f, 0.539355f, -0.124803f, 0.144929f, 0.987598f, -0.060387f, 0.750000f, 0.375000f,
+    0.342891f, 0.525000f, -0.232031f, 0.122871f, 0.988996f, -0.082396f, 0.625000f, 0.500000f,
+    0.223562f, 0.555469f, -0.046480f, 0.200011f, 0.978977f, -0.040002f, 0.875000f, 0.250000f,
+    0.293326f, 0.539355f, -0.124803f, 0.144929f, 0.987598f, -0.060387f, 0.750000f, 0.375000f,
+    0.311609f, 0.539355f, -0.064786f, 0.154346f, 0.987535f, -0.030869f, 0.875000f, 0.375000f,
+    0.317969f, 0.539355f, -0.000000f, 0.157389f, 0.987537f, -0.000000f, 1.000000f, 0.375000f,
+    0.404250f, 0.525000f, -0.084047f, 0.145472f, 0.988935f, -0.029094f, 0.875000f, 0.500000f,
+    0.161906f, 0.525000f, -0.380531f, 0.057097f, 0.988920f, -0.137032f, 0.250000f, 0.500000f,
+    0.000000f, 0.494531f, -0.578125f, 0.000000f, 0.965948f, -0.258736f, 0.000000f, 0.750000f,
+    0.226914f, 0.494531f, -0.533320f, 0.099585f, 0.965898f, -0.239005f, 0.250000f, 0.750000f,
+    0.410469f, 0.494531f, -0.410469f, 0.182258f, 0.966211f, -0.182258f, 0.500000f, 0.750000f,
+    0.255125f, 0.450000f, -0.599625f, 0.384615f, 0.000000f, -0.923077f, 0.250000f, 1.000000f,
+    0.084047f, 0.525000f, -0.404250f, 0.029090f, 0.988938f, -0.145452f, 0.125000f, 0.500000f,
+    0.000000f, 0.510645f, -0.502344f, 0.000000f, 0.984680f, -0.174370f, 0.000000f, 0.625000f,
+    0.102353f, 0.510645f, -0.492297f, 0.034195f, 0.984682f, -0.170975f, 0.125000f, 0.625000f,
+    0.197170f, 0.510645f, -0.463412f, 0.066903f, 0.984755f, -0.160568f, 0.250000f, 0.625000f,
+    0.117793f, 0.494531f, -0.566563f, 0.050740f, 0.965951f, -0.253699f, 0.125000f, 0.750000f,
+    0.232031f, 0.525000f, -0.342891f, 0.082392f, 0.988997f, -0.122865f, 0.375000f, 0.500000f,
+    0.197170f, 0.510645f, -0.463412f, 0.066903f, 0.984755f, -0.160568f, 0.250000f, 0.625000f,
+    0.282568f, 0.510645f, -0.417573f, 0.096852f, 0.984764f, -0.144429f, 0.375000f, 0.625000f,
+    0.356664f, 0.510645f, -0.356664f, 0.122811f, 0.984802f, -0.122811f, 0.500000f, 0.625000f,
+    0.325195f, 0.494531f, -0.480566f, 0.143727f, 0.966129f, -0.214330f, 0.375000f, 0.750000f,
+    0.117793f, 0.494531f, -0.566563f, 0.050740f, 0.965951f, -0.253699f, 0.125000f, 0.750000f,
+    0.000000f, 0.474902f, -0.630469f, 0.000000f, 0.862799f, -0.505546f, 0.000000f, 0.875000f,
+    0.128458f, 0.474902f, -0.617859f, 0.099142f, 0.862811f, -0.495710f, 0.125000f, 0.875000f,
+    0.247459f, 0.474902f, -0.581607f, 0.194079f, 0.863349f, -0.465791f, 0.250000f, 0.875000f,
+    0.132437f, 0.450000f, -0.637000f, 0.196116f, 0.000000f, -0.980581f, 0.125000f, 1.000000f,
+    0.325195f, 0.494531f, -0.480566f, 0.143727f, 0.966129f, -0.214330f, 0.375000f, 0.750000f,
+    0.247459f, 0.474902f, -0.581607f, 0.194080f, 0.863349f, -0.465791f, 0.250000f, 0.875000f,
+    0.354639f, 0.474902f, -0.524077f, 0.280978f, 0.863417f, -0.419002f, 0.375000f, 0.875000f,
+    0.447633f, 0.474902f, -0.447633f, 0.356389f, 0.863698f, -0.356389f, 0.500000f, 0.875000f,
+    0.365625f, 0.450000f, -0.540312f, 0.556953f, 0.000000f, -0.830544f, 0.375000f, 1.000000f,
+    0.380531f, 0.525000f, -0.161906f, 0.137136f, 0.988903f, -0.057140f, 0.750000f, 0.500000f,
+    0.410469f, 0.494531f, -0.410469f, 0.182258f, 0.966211f, -0.182258f, 0.500000f, 0.750000f,
+    0.533320f, 0.494531f, -0.226914f, 0.239176f, 0.965848f, -0.099657f, 0.750000f, 0.750000f,
+    0.578125f, 0.494531f, -0.000000f, 0.258736f, 0.965948f, -0.000000f, 1.000000f, 0.750000f,
+    0.599625f, 0.450000f, -0.255125f, 0.923077f, 0.000000f, -0.384615f, 0.750000f, 1.000000f,
+    0.342891f, 0.525000f, -0.232031f, 0.122871f, 0.988996f, -0.082396f, 0.625000f, 0.500000f,
+    0.356664f, 0.510645f, -0.356664f, 0.122811f, 0.984802f, -0.122811f, 0.500000f, 0.625000f,
+    0.417573f, 0.510645f, -0.282568f, 0.144436f, 0.984762f, -0.096857f, 0.625000f, 0.625000f,
+    0.463412f, 0.510645f, -0.197170f, 0.160568f, 0.984755f, -0.066903f, 0.750000f, 0.625000f,
+    0.480566f, 0.494531f, -0.325195f, 0.214340f, 0.966126f, -0.143734f, 0.625000f, 0.750000f,
+    0.404250f, 0.525000f, -0.084047f, 0.145472f, 0.988935f, -0.029094f, 0.875000f, 0.500000f,
+    0.463412f, 0.510645f, -0.197170f, 0.160568f, 0.984755f, -0.066903f, 0.750000f, 0.625000f,
+    0.492297f, 0.510645f, -0.102353f, 0.170999f, 0.984678f, -0.034200f, 0.875000f, 0.625000f,
+    0.502344f, 0.510645f, -0.000000f, 0.174370f, 0.984680f, -0.000000f, 1.000000f, 0.625000f,
+    0.566563f, 0.494531f, -0.117793f, 0.253732f, 0.965942f, -0.050746f, 0.875000f, 0.750000f,
+    0.480566f, 0.494531f, -0.325195f, 0.214340f, 0.966126f, -0.143734f, 0.625000f, 0.750000f,
+    0.447633f, 0.474902f, -0.447633f, 0.356389f, 0.863698f, -0.356389f, 0.500000f, 0.875000f,
+    0.524077f, 0.474902f, -0.354639f, 0.419017f, 0.863406f, -0.280988f, 0.625000f, 0.875000f,
+    0.581607f, 0.474902f, -0.247459f, 0.465791f, 0.863349f, -0.194080f, 0.750000f, 0.875000f,
+    0.540312f, 0.450000f, -0.365625f, 0.830544f, 0.000000f, -0.556953f, 0.625000f, 1.000000f,
+    0.566563f, 0.494531f, -0.117793f, 0.253732f, 0.965942f, -0.050747f, 0.875000f, 0.750000f,
+    0.581607f, 0.474902f, -0.247459f, 0.465791f, 0.863349f, -0.194079f, 0.750000f, 0.875000f,
+    0.617859f, 0.474902f, -0.128458f, 0.495761f, 0.862780f, -0.099152f, 0.875000f, 0.875000f,
+    0.630469f, 0.474902f, -0.000000f, 0.505546f, 0.862799f, -0.000000f, 1.000000f, 0.875000f,
+    0.637000f, 0.450000f, -0.132437f, 0.980581f, 0.000000f, -0.196116f, 0.875000f, 1.000000f,
+    0.000000f, -0.750000f, -0.000000f, 0.099015f, -0.990148f, -0.099015f, 0.000000f, 0.000000f,
+    0.000000f, -0.750000f, -0.000000f, 0.099015f, -0.990148f, -0.099015f, 1.000000f, 0.000000f,
+    0.750000f, -0.675000f, -0.000000f, 1.000000f, -0.000000f, 0.000000f, 0.000000f, 1.000000f,
+    0.000000f, -0.675000f, -0.750000f, 0.000000f, 0.000000f, -1.000000f, 1.000000f, 1.000000f,
+    0.000000f, -0.750000f, -0.000000f, 0.099015f, -0.990148f, -0.099015f, 0.500000f, 0.000000f,
+    0.642187f, -0.726562f, -0.000000f, 0.141421f, -0.989949f, 0.000000f, 0.000000f, 0.500000f,
+    0.455953f, -0.726562f, -0.455953f, 0.100995f, -0.989748f, -0.100995f, 0.500000f, 0.500000f,
+    0.000000f, -0.726562f, -0.642187f, -0.000000f, -0.989949f, -0.141421f, 1.000000f, 0.500000f,
+    0.532500f, -0.675000f, -0.532500f, 0.707107f, 0.000000f, -0.707107f, 0.500000f, 1.000000f,
+    0.000000f, -0.750000f, -0.000000f, 0.036468f, -0.999224f, -0.014895f, 0.250000f, 0.000000f,
+    0.417773f, -0.743555f, -0.000000f, 0.039517f, -0.999219f, 0.000000f, 0.000000f, 0.250000f,
+    0.385396f, -0.743555f, -0.163976f, 0.036505f, -0.999218f, -0.015211f, 0.250000f, 0.250000f,
+    0.296619f, -0.743555f, -0.296619f, 0.027829f, -0.999225f, -0.027829f, 0.500000f, 0.250000f,
+    0.592418f, -0.726562f, -0.252059f, 0.130641f, -0.989934f, -0.054434f, 0.250000f, 0.500000f,
+    0.000000f, -0.750000f, -0.000000f, 0.015426f, -0.999876f, -0.003046f, 0.125000f, 0.000000f,
+    0.236792f, -0.748315f, -0.000000f, 0.015871f, -0.999874f, 0.000000f, 0.000000f, 0.125000f,
+    0.232056f, -0.748315f, -0.048246f, 0.015562f, -0.999874f, -0.003112f, 0.125000f, 0.125000f,
+    0.218441f, -0.748315f, -0.092941f, 0.014614f, -0.999875f, -0.006089f, 0.250000f, 0.125000f,
+    0.409418f, -0.743555f, -0.085121f, 0.038747f, -0.999219f, -0.007749f, 0.125000f, 0.250000f,
+    0.000000f, -0.750000f, -0.000000f, 0.013015f, -0.999877f, -0.008711f, 0.375000f, 0.000000f,
+    0.218441f, -0.748315f, -0.092941f, 0.014614f, -0.999875f, -0.006089f, 0.250000f, 0.125000f,
+    0.196833f, -0.748315f, -0.133195f, 0.013145f, -0.999875f, -0.008815f, 0.375000f, 0.125000f,
+    0.168122f, -0.748315f, -0.168122f, 0.011177f, -0.999875f, -0.011177f, 0.500000f, 0.125000f,
+    0.347274f, -0.743555f, -0.234998f, 0.032729f, -0.999223f, -0.021947f, 0.375000f, 0.250000f,
+    0.409418f, -0.743555f, -0.085121f, 0.038748f, -0.999219f, -0.007750f, 0.125000f, 0.250000f,
+    0.550415f, -0.736157f, -0.000000f, 0.076999f, -0.997031f, 0.000000f, 0.000000f, 0.375000f,
+    0.539407f, -0.736157f, -0.112147f, 0.075499f, -0.997032f, -0.015100f, 0.125000f, 0.375000f,
+    0.507758f, -0.736157f, -0.216038f, 0.070899f, -0.997046f, -0.029541f, 0.250000f, 0.375000f,
+    0.629344f, -0.726562f, -0.130846f, 0.138668f, -0.989950f, -0.027734f, 0.125000f, 0.500000f,
+    0.347274f, -0.743555f, -0.234998f, 0.032729f, -0.999223f, -0.021948f, 0.375000f, 0.250000f,
+    0.507758f, -0.736157f, -0.216038f, 0.070899f, -0.997046f, -0.029541f, 0.250000f, 0.375000f,
+    0.457533f, -0.736157f, -0.309608f, 0.063773f, -0.997048f, -0.042765f, 0.375000f, 0.375000f,
+    0.390795f, -0.736157f, -0.390795f, 0.054226f, -0.997055f, -0.054226f, 0.500000f, 0.375000f,
+    0.533818f, -0.726562f, -0.361230f, 0.117134f, -0.990005f, -0.078549f, 0.375000f, 0.500000f,
+    0.000000f, -0.750000f, -0.000000f, 0.014895f, -0.999224f, -0.036468f, 0.750000f, 0.000000f,
+    0.296619f, -0.743555f, -0.296619f, 0.027829f, -0.999225f, -0.027829f, 0.500000f, 0.250000f,
+    0.163976f, -0.743555f, -0.385396f, 0.015222f, -0.999216f, -0.036533f, 0.750000f, 0.250000f,
+    0.000000f, -0.743555f, -0.417773f, -0.000000f, -0.999219f, -0.039517f, 1.000000f, 0.250000f,
+    0.252059f, -0.726562f, -0.592418f, 0.054475f, -0.989919f, -0.130740f, 0.750000f, 0.500000f,
+    0.000000f, -0.750000f, -0.000000f, 0.008711f, -0.999877f, -0.013015f, 0.625000f, 0.000000f,
+    0.168122f, -0.748315f, -0.168122f, 0.011177f, -0.999875f, -0.011177f, 0.500000f, 0.125000f,
+    0.133195f, -0.748315f, -0.196833f, 0.008815f, -0.999875f, -0.013145f, 0.625000f, 0.125000f,
+    0.092941f, -0.748315f, -0.218441f, 0.006089f, -0.999875f, -0.014614f, 0.750000f, 0.125000f,
+    0.234998f, -0.743555f, -0.347274f, 0.021948f, -0.999223f, -0.032730f, 0.625000f, 0.250000f,
+    0.000000f, -0.750000f, -0.000000f, 0.003046f, -0.999876f, -0.015426f, 0.875000f, 0.000000f,
+    0.092941f, -0.748315f, -0.218441f, 0.006089f, -0.999875f, -0.014614f, 0.750000f, 0.125000f,
+    0.048246f, -0.748315f, -0.232056f, 0.003113f, -0.999874f, -0.015564f, 0.875000f, 0.125000f,
+    0.000000f, -0.748315f, -0.236792f, -0.000000f, -0.999874f, -0.015871f, 1.000000f, 0.125000f,
+    0.085121f, -0.743555f, -0.409418f, 0.007751f, -0.999219f, -0.038753f, 0.875000f, 0.250000f,
+    0.234998f, -0.743555f, -0.347274f, 0.021949f, -0.999223f, -0.032731f, 0.625000f, 0.250000f,
+    0.390795f, -0.736157f, -0.390795f, 0.054226f, -0.997055f, -0.054226f, 0.500000f, 0.375000f,
+    0.309608f, -0.736157f, -0.457533f, 0.042767f, -0.997047f, -0.063776f, 0.625000f, 0.375000f,
+    0.216038f, -0.736157f, -0.507758f, 0.029541f, -0.997046f, -0.070899f, 0.750000f, 0.375000f,
+    0.361230f, -0.726562f, -0.533818f, 0.078553f, -0.990004f, -0.117140f, 0.625000f, 0.500000f,
+    0.085121f, -0.743555f, -0.409418f, 0.007751f, -0.999219f, -0.038753f, 0.875000f, 0.250000f,
+    0.216038f, -0.736157f, -0.507758f, 0.029541f, -0.997046f, -0.070899f, 0.750000f, 0.375000f,
+    0.112147f, -0.736157f, -0.539407f, 0.015102f, -0.997031f, -0.075510f, 0.875000f, 0.375000f,
+    0.000000f, -0.736157f, -0.550415f, -0.000000f, -0.997031f, -0.076999f, 1.000000f, 0.375000f,
+    0.130846f, -0.726562f, -0.629344f, 0.027737f, -0.989948f, -0.138687f, 0.875000f, 0.500000f,
+    0.592418f, -0.726562f, -0.252059f, 0.130641f, -0.989934f, -0.054434f, 0.250000f, 0.500000f,
+    0.733008f, -0.702539f, -0.000000f, 0.514495f, -0.857493f, 0.000000f, 0.000000f, 0.750000f,
+    0.676200f, -0.702539f, -0.287706f, 0.475188f, -0.857318f, -0.197995f, 0.250000f, 0.750000f,
+    0.520436f, -0.702539f, -0.520436f, 0.362711f, -0.858418f, -0.362711f, 0.500000f, 0.750000f,
+    0.691875f, -0.675000f, -0.294375f, 0.923077f, 0.000000f, -0.384615f, 0.250000f, 1.000000f,
+    0.629344f, -0.726562f, -0.130846f, 0.138668f, -0.989950f, -0.027734f, 0.125000f, 0.500000f,
+    0.700562f, -0.715210f, -0.000000f, 0.263929f, -0.964542f, 0.000000f, 0.000000f, 0.625000f,
+    0.686550f, -0.715210f, -0.142739f, 0.258791f, -0.964546f, -0.051758f, 0.125000f, 0.625000f,
+    0.646268f, -0.715210f, -0.274970f, 0.243061f, -0.964709f, -0.101276f, 0.250000f, 0.625000f,
+    0.718348f, -0.702539f, -0.149350f, 0.504486f, -0.857505f, -0.100897f, 0.125000f, 0.750000f,
+    0.533818f, -0.726562f, -0.361230f, 0.117134f, -0.990005f, -0.078549f, 0.375000f, 0.500000f,
+    0.646268f, -0.715210f, -0.274970f, 0.243061f, -0.964709f, -0.101276f, 0.250000f, 0.625000f,
+    0.582342f, -0.715210f, -0.394066f, 0.218633f, -0.964730f, -0.146613f, 0.375000f, 0.625000f,
+    0.497399f, -0.715210f, -0.497399f, 0.185918f, -0.964815f, -0.185918f, 0.500000f, 0.625000f,
+    0.609313f, -0.702539f, -0.412317f, 0.426431f, -0.858128f, -0.285959f, 0.375000f, 0.750000f,
+    0.718348f, -0.702539f, -0.149350f, 0.504485f, -0.857505f, -0.100897f, 0.125000f, 0.750000f,
+    0.746997f, -0.688989f, -0.000000f, 0.885831f, -0.464008f, 0.000000f, 0.000000f, 0.875000f,
+    0.732057f, -0.688989f, -0.152201f, 0.868619f, -0.464027f, -0.173724f, 0.125000f, 0.875000f,
+    0.689105f, -0.688989f, -0.293196f, 0.817250f, -0.464917f, -0.340521f, 0.250000f, 0.875000f,
+    0.735000f, -0.675000f, -0.152812f, 0.980581f, 0.000000f, -0.196116f, 0.125000f, 1.000000f,
+    0.609313f, -0.702539f, -0.412317f, 0.426430f, -0.858129f, -0.285959f, 0.375000f, 0.750000f,
+    0.689105f, -0.688989f, -0.293196f, 0.817250f, -0.464917f, -0.340521f, 0.250000f, 0.875000f,
+    0.620941f, -0.688989f, -0.420186f, 0.735277f, -0.465030f, -0.493068f, 0.375000f, 0.875000f,
+    0.530368f, -0.688989f, -0.530368f, 0.625826f, -0.465494f, -0.625825f, 0.500000f, 0.875000f,
+    0.623438f, -0.675000f, -0.421875f, 0.830544f, 0.000000f, -0.556953f, 0.375000f, 1.000000f,
+    0.252059f, -0.726562f, -0.592418f, 0.054475f, -0.989919f, -0.130740f, 0.750000f, 0.500000f,
+    0.520436f, -0.702539f, -0.520436f, 0.362711f, -0.858418f, -0.362711f, 0.500000f, 0.750000f,
+    0.287706f, -0.702539f, -0.676200f, 0.198107f, -0.857143f, -0.475457f, 0.750000f, 0.750000f,
+    0.000000f, -0.702539f, -0.733008f, -0.000000f, -0.857493f, -0.514495f, 1.000000f, 0.750000f,
+    0.294375f, -0.675000f, -0.691875f, 0.384615f, 0.000000f, -0.923077f, 0.750000f, 1.000000f,
+    0.361230f, -0.726562f, -0.533818f, 0.078553f, -0.990004f, -0.117140f, 0.625000f, 0.500000f,
+    0.497399f, -0.715210f, -0.497399f, 0.185918f, -0.964815f, -0.185918f, 0.500000f, 0.625000f,
+    0.394066f, -0.715210f, -0.582342f, 0.146620f, -0.964727f, -0.218643f, 0.625000f, 0.625000f,
+    0.274970f, -0.715210f, -0.646268f, 0.101276f, -0.964709f, -0.243061f, 0.750000f, 0.625000f,
+    0.412317f, -0.702539f, -0.609313f, 0.285969f, -0.858117f, -0.426446f, 0.625000f, 0.750000f,
+    0.130846f, -0.726562f, -0.629344f, 0.027737f, -0.989948f, -0.138687f, 0.875000f, 0.500000f,
+    0.274970f, -0.715210f, -0.646268f, 0.101276f, -0.964709f, -0.243061f, 0.750000f, 0.625000f,
+    0.142739f, -0.715210f, -0.686550f, 0.051765f, -0.964536f, -0.258825f, 0.875000f, 0.625000f,
+    0.000000f, -0.715210f, -0.700562f, -0.000000f, -0.964542f, -0.263929f, 1.000000f, 0.625000f,
+    0.149350f, -0.702539f, -0.718348f, 0.100908f, -0.857473f, -0.504538f, 0.875000f, 0.750000f,
+    0.412317f, -0.702539f, -0.609313f, 0.285969f, -0.858118f, -0.426445f, 0.625000f, 0.750000f,
+    0.530368f, -0.688989f, -0.530368f, 0.625825f, -0.465494f, -0.625826f, 0.500000f, 0.875000f,
+    0.420186f, -0.688989f, -0.620941f, 0.493073f, -0.465012f, -0.735284f, 0.625000f, 0.875000f,
+    0.293196f, -0.688989f, -0.689105f, 0.340521f, -0.464917f, -0.817250f, 0.750000f, 0.875000f,
+    0.421875f, -0.675000f, -0.623438f, 0.556953f, 0.000000f, -0.830544f, 0.625000f, 1.000000f,
+    0.149350f, -0.702539f, -0.718348f, 0.100907f, -0.857473f, -0.504537f, 0.875000f, 0.750000f,
+    0.293196f, -0.688989f, -0.689105f, 0.340521f, -0.464917f, -0.817250f, 0.750000f, 0.875000f,
+    0.152201f, -0.688989f, -0.732057f, 0.173729f, -0.463975f, -0.868645f, 0.875000f, 0.875000f,
+    0.000000f, -0.688989f, -0.746997f, -0.000000f, -0.464008f, -0.885831f, 1.000000f, 0.875000f,
+    0.152812f, -0.675000f, -0.735000f, 0.196116f, 0.000000f, -0.980581f, 0.875000f, 1.000000f,
+    0.000000f, -0.750000f, -0.000000f, -0.099015f, -0.990148f, -0.099015f, 0.000000f, 0.000000f,
+    0.000000f, -0.750000f, -0.000000f, -0.099015f, -0.990148f, -0.099015f, 1.000000f, 0.000000f,
+    0.000000f, -0.675000f, -0.750000f, 0.000000f, 0.000000f, -1.000000f, 0.000000f, 1.000000f,
+    -0.750000f, -0.675000f, -0.000000f, -1.000000f, 0.000000f, 0.000000f, 1.000000f, 1.000000f,
+    0.000000f, -0.750000f, -0.000000f, -0.099015f, -0.990148f, -0.099015f, 0.500000f, 0.000000f,
+    0.000000f, -0.726562f, -0.642187f, -0.000000f, -0.989949f, -0.141421f, 0.000000f, 0.500000f,
+    -0.455953f, -0.726562f, -0.455953f, -0.100995f, -0.989748f, -0.100995f, 0.500000f, 0.500000f,
+    -0.642187f, -0.726562f, -0.000000f, -0.141421f, -0.989949f, 0.000000f, 1.000000f, 0.500000f,
+    -0.532500f, -0.675000f, -0.532500f, -0.707107f, 0.000000f, -0.707107f, 0.500000f, 1.000000f,
+    0.000000f, -0.750000f, -0.000000f, -0.014895f, -0.999224f, -0.036468f, 0.250000f, 0.000000f,
+    0.000000f, -0.743555f, -0.417773f, -0.000000f, -0.999219f, -0.039517f, 0.000000f, 0.250000f,
+    -0.163976f, -0.743555f, -0.385396f, -0.015211f, -0.999218f, -0.036505f, 0.250000f, 0.250000f,
+    -0.296619f, -0.743555f, -0.296619f, -0.027829f, -0.999225f, -0.027829f, 0.500000f, 0.250000f,
+    -0.252059f, -0.726562f, -0.592418f, -0.054434f, -0.989934f, -0.130641f, 0.250000f, 0.500000f,
+    0.000000f, -0.750000f, -0.000000f, -0.003046f, -0.999876f, -0.015426f, 0.125000f, 0.000000f,
+    0.000000f, -0.748315f, -0.236792f, -0.000000f, -0.999874f, -0.015871f, 0.000000f, 0.125000f,
+    -0.048246f, -0.748315f, -0.232056f, -0.003112f, -0.999874f, -0.015562f, 0.125000f, 0.125000f,
+    -0.092941f, -0.748315f, -0.218441f, -0.006089f, -0.999875f, -0.014614f, 0.250000f, 0.125000f,
+    -0.085121f, -0.743555f, -0.409418f, -0.007749f, -0.999219f, -0.038747f, 0.125000f, 0.250000f,
+    0.000000f, -0.750000f, -0.000000f, -0.008711f, -0.999877f, -0.013015f, 0.375000f, 0.000000f,
+    -0.092941f, -0.748315f, -0.218441f, -0.006089f, -0.999875f, -0.014614f, 0.250000f, 0.125000f,
+    -0.133195f, -0.748315f, -0.196833f, -0.008815f, -0.999875f, -0.013145f, 0.375000f, 0.125000f,
+    -0.168122f, -0.748315f, -0.168122f, -0.011177f, -0.999875f, -0.011177f, 0.500000f, 0.125000f,
+    -0.234998f, -0.743555f, -0.347274f, -0.021947f, -0.999223f, -0.032729f, 0.375000f, 0.250000f,
+    -0.085121f, -0.743555f, -0.409418f, -0.007750f, -0.999219f, -0.038748f, 0.125000f, 0.250000f,
+    0.000000f, -0.736157f, -0.550415f, -0.000000f, -0.997031f, -0.076999f, 0.000000f, 0.375000f,
+    -0.112147f, -0.736157f, -0.539407f, -0.015100f, -0.997032f, -0.075499f, 0.125000f, 0.375000f,
+    -0.216038f, -0.736157f, -0.507758f, -0.029541f, -0.997046f, -0.070899f, 0.250000f, 0.375000f,
+    -0.130846f, -0.726562f, -0.629344f, -0.027734f, -0.989950f, -0.138668f, 0.125000f, 0.500000f,
+    -0.234998f, -0.743555f, -0.347274f, -0.021948f, -0.999223f, -0.032729f, 0.375000f, 0.250000f,
+    -0.216038f, -0.736157f, -0.507758f, -0.029541f, -0.997046f, -0.070899f, 0.250000f, 0.375000f,
+    -0.309608f, -0.736157f, -0.457533f, -0.042765f, -0.997048f, -0.063773f, 0.375000f, 0.375000f,
+    -0.390795f, -0.736157f, -0.390795f, -0.054226f, -0.997055f, -0.054226f, 0.500000f, 0.375000f,
+    -0.361230f, -0.726562f, -0.533818f, -0.078549f, -0.990005f, -0.117134f, 0.375000f, 0.500000f,
+    0.000000f, -0.750000f, -0.000000f, -0.036468f, -0.999224f, -0.014895f, 0.750000f, 0.000000f,
+    -0.296619f, -0.743555f, -0.296619f, -0.027829f, -0.999225f, -0.027829f, 0.500000f, 0.250000f,
+    -0.385396f, -0.743555f, -0.163976f, -0.036533f, -0.999216f, -0.015222f, 0.750000f, 0.250000f,
+    -0.417773f, -0.743555f, -0.000000f, -0.039517f, -0.999219f, 0.000000f, 1.000000f, 0.250000f,
+    -0.592418f, -0.726562f, -0.252059f, -0.130740f, -0.989919f, -0.054475f, 0.750000f, 0.500000f,
+    0.000000f, -0.750000f, -0.000000f, -0.013015f, -0.999877f, -0.008711f, 0.625000f, 0.000000f,
+    -0.168122f, -0.748315f, -0.168122f, -0.011177f, -0.999875f, -0.011177f, 0.500000f, 0.125000f,
+    -0.196833f, -0.748315f, -0.133195f, -0.013145f, -0.999875f, -0.008815f, 0.625000f, 0.125000f,
+    -0.218441f, -0.748315f, -0.092941f, -0.014614f, -0.999875f, -0.006089f, 0.750000f, 0.125000f,
+    -0.347274f, -0.743555f, -0.234998f, -0.032730f, -0.999223f, -0.021948f, 0.625000f, 0.250000f,
+    0.000000f, -0.750000f, -0.000000f, -0.015426f, -0.999876f, -0.003046f, 0.875000f, 0.000000f,
+    -0.218441f, -0.748315f, -0.092941f, -0.014614f, -0.999875f, -0.006089f, 0.750000f, 0.125000f,
+    -0.232056f, -0.748315f, -0.048246f, -0.015564f, -0.999874f, -0.003113f, 0.875000f, 0.125000f,
+    -0.236792f, -0.748315f, -0.000000f, -0.015871f, -0.999874f, 0.000000f, 1.000000f, 0.125000f,
+    -0.409418f, -0.743555f, -0.085121f, -0.038753f, -0.999219f, -0.007751f, 0.875000f, 0.250000f,
+    -0.347274f, -0.743555f, -0.234998f, -0.032731f, -0.999223f, -0.021949f, 0.625000f, 0.250000f,
+    -0.390795f, -0.736157f, -0.390795f, -0.054226f, -0.997055f, -0.054226f, 0.500000f, 0.375000f,
+    -0.457533f, -0.736157f, -0.309608f, -0.063776f, -0.997047f, -0.042767f, 0.625000f, 0.375000f,
+    -0.507758f, -0.736157f, -0.216038f, -0.070899f, -0.997046f, -0.029541f, 0.750000f, 0.375000f,
+    -0.533818f, -0.726562f, -0.361230f, -0.117140f, -0.990004f, -0.078553f, 0.625000f, 0.500000f,
+    -0.409418f, -0.743555f, -0.085121f, -0.038753f, -0.999219f, -0.007751f, 0.875000f, 0.250000f,
+    -0.507758f, -0.736157f, -0.216038f, -0.070899f, -0.997046f, -0.029541f, 0.750000f, 0.375000f,
+    -0.539407f, -0.736157f, -0.112147f, -0.075510f, -0.997031f, -0.015102f, 0.875000f, 0.375000f,
+    -0.550415f, -0.736157f, -0.000000f, -0.076999f, -0.997031f, 0.000000f, 1.000000f, 0.375000f,
+    -0.629344f, -0.726562f, -0.130846f, -0.138687f, -0.989948f, -0.027737f, 0.875000f, 0.500000f,
+    -0.252059f, -0.726562f, -0.592418f, -0.054434f, -0.989934f, -0.130641f, 0.250000f, 0.500000f,
+    0.000000f, -0.702539f, -0.733008f, -0.000000f, -0.857493f, -0.514495f, 0.000000f, 0.750000f,
+    -0.287706f, -0.702539f, -0.676200f, -0.197995f, -0.857318f, -0.475188f, 0.250000f, 0.750000f,
+    -0.520436f, -0.702539f, -0.520436f, -0.362711f, -0.858418f, -0.362711f, 0.500000f, 0.750000f,
+    -0.294375f, -0.675000f, -0.691875f, -0.384615f, 0.000000f, -0.923077f, 0.250000f, 1.000000f,
+    -0.130846f, -0.726562f, -0.629344f, -0.027734f, -0.989950f, -0.138668f, 0.125000f, 0.500000f,
+    0.000000f, -0.715210f, -0.700562f, -0.000000f, -0.964542f, -0.263929f, 0.000000f, 0.625000f,
+    -0.142739f, -0.715210f, -0.686550f, -0.051758f, -0.964546f, -0.258791f, 0.125000f, 0.625000f,
+    -0.274970f, -0.715210f, -0.646268f, -0.101276f, -0.964709f, -0.243061f, 0.250000f, 0.625000f,
+    -0.149350f, -0.702539f, -0.718348f, -0.100897f, -0.857505f, -0.504486f, 0.125000f, 0.750000f,
+    -0.361230f, -0.726562f, -0.533818f, -0.078549f, -0.990005f, -0.117134f, 0.375000f, 0.500000f,
+    -0.274970f, -0.715210f, -0.646268f, -0.101276f, -0.964709f, -0.243061f, 0.250000f, 0.625000f,
+    -0.394066f, -0.715210f, -0.582342f, -0.146613f, -0.964730f, -0.218633f, 0.375000f, 0.625000f,
+    -0.497399f, -0.715210f, -0.497399f, -0.185918f, -0.964815f, -0.185918f, 0.500000f, 0.625000f,
+    -0.412317f, -0.702539f, -0.609313f, -0.285959f, -0.858128f, -0.426431f, 0.375000f, 0.750000f,
+    -0.149350f, -0.702539f, -0.718348f, -0.100897f, -0.857505f, -0.504485f, 0.125000f, 0.750000f,
+    0.000000f, -0.688989f, -0.746997f, -0.000000f, -0.464008f, -0.885831f, 0.000000f, 0.875000f,
+    -0.152201f, -0.688989f, -0.732057f, -0.173724f, -0.464027f, -0.868619f, 0.125000f, 0.875000f,
+    -0.293196f, -0.688989f, -0.689105f, -0.340521f, -0.464917f, -0.817250f, 0.250000f, 0.875000f,
+    -0.152812f, -0.675000f, -0.735000f, -0.196116f, 0.000000f, -0.980581f, 0.125000f, 1.000000f,
+    -0.412317f, -0.702539f, -0.609313f, -0.285959f, -0.858129f, -0.426430f, 0.375000f, 0.750000f,
+    -0.293196f, -0.688989f, -0.689105f, -0.340521f, -0.464917f, -0.817250f, 0.250000f, 0.875000f,
+    -0.420186f, -0.688989f, -0.620941f, -0.493068f, -0.465030f, -0.735277f, 0.375000f, 0.875000f,
+    -0.530368f, -0.688989f, -0.530368f, -0.625825f, -0.465494f, -0.625826f, 0.500000f, 0.875000f,
+    -0.421875f, -0.675000f, -0.623438f, -0.556953f, 0.000000f, -0.830544f, 0.375000f, 1.000000f,
+    -0.592418f, -0.726562f, -0.252059f, -0.130740f, -0.989919f, -0.054475f, 0.750000f, 0.500000f,
+    -0.520436f, -0.702539f, -0.520436f, -0.362711f, -0.858418f, -0.362711f, 0.500000f, 0.750000f,
+    -0.676200f, -0.702539f, -0.287706f, -0.475457f, -0.857143f, -0.198107f, 0.750000f, 0.750000f,
+    -0.733008f, -0.702539f, -0.000000f, -0.514495f, -0.857493f, 0.000000f, 1.000000f, 0.750000f,
+    -0.691875f, -0.675000f, -0.294375f, -0.923077f, 0.000000f, -0.384615f, 0.750000f, 1.000000f,
+    -0.533818f, -0.726562f, -0.361230f, -0.117140f, -0.990004f, -0.078553f, 0.625000f, 0.500000f,
+    -0.497399f, -0.715210f, -0.497399f, -0.185918f, -0.964815f, -0.185918f, 0.500000f, 0.625000f,
+    -0.582342f, -0.715210f, -0.394066f, -0.218643f, -0.964727f, -0.146620f, 0.625000f, 0.625000f,
+    -0.646268f, -0.715210f, -0.274970f, -0.243061f, -0.964709f, -0.101276f, 0.750000f, 0.625000f,
+    -0.609313f, -0.702539f, -0.412317f, -0.426446f, -0.858117f, -0.285969f, 0.625000f, 0.750000f,
+    -0.629344f, -0.726562f, -0.130846f, -0.138687f, -0.989948f, -0.027737f, 0.875000f, 0.500000f,
+    -0.646268f, -0.715210f, -0.274970f, -0.243061f, -0.964709f, -0.101276f, 0.750000f, 0.625000f,
+    -0.686550f, -0.715210f, -0.142739f, -0.258825f, -0.964536f, -0.051765f, 0.875000f, 0.625000f,
+    -0.700562f, -0.715210f, -0.000000f, -0.263929f, -0.964542f, 0.000000f, 1.000000f, 0.625000f,
+    -0.718348f, -0.702539f, -0.149350f, -0.504538f, -0.857473f, -0.100908f, 0.875000f, 0.750000f,
+    -0.609313f, -0.702539f, -0.412317f, -0.426445f, -0.858118f, -0.285969f, 0.625000f, 0.750000f,
+    -0.530368f, -0.688989f, -0.530368f, -0.625826f, -0.465494f, -0.625825f, 0.500000f, 0.875000f,
+    -0.620941f, -0.688989f, -0.420186f, -0.735284f, -0.465012f, -0.493073f, 0.625000f, 0.875000f,
+    -0.689105f, -0.688989f, -0.293196f, -0.817250f, -0.464917f, -0.340521f, 0.750000f, 0.875000f,
+    -0.623438f, -0.675000f, -0.421875f, -0.830544f, 0.000000f, -0.556953f, 0.625000f, 1.000000f,
+    -0.718348f, -0.702539f, -0.149350f, -0.504537f, -0.857473f, -0.100907f, 0.875000f, 0.750000f,
+    -0.689105f, -0.688989f, -0.293196f, -0.817250f, -0.464917f, -0.340521f, 0.750000f, 0.875000f,
+    -0.732057f, -0.688989f, -0.152201f, -0.868645f, -0.463975f, -0.173729f, 0.875000f, 0.875000f,
+    -0.746997f, -0.688989f, -0.000000f, -0.885831f, -0.464008f, 0.000000f, 1.000000f, 0.875000f,
+    -0.735000f, -0.675000f, -0.152812f, -0.980581f, 0.000000f, -0.196116f, 0.875000f, 1.000000f,
+    0.000000f, -0.750000f, -0.000000f, -0.099015f, -0.990148f, 0.099015f, 0.000000f, 0.000000f,
+    0.000000f, -0.750000f, -0.000000f, -0.099015f, -0.990148f, 0.099015f, 1.000000f, 0.000000f,
+    -0.750000f, -0.675000f, -0.000000f, -1.000000f, 0.000000f, 0.000000f, 0.000000f, 1.000000f,
+    0.000000f, -0.675000f, 0.750000f, 0.000000f, 0.000000f, 1.000000f, 1.000000f, 1.000000f,
+    0.000000f, -0.750000f, -0.000000f, -0.099015f, -0.990148f, 0.099015f, 0.500000f, 0.000000f,
+    -0.642187f, -0.726562f, -0.000000f, -0.141421f, -0.989949f, 0.000000f, 0.000000f, 0.500000f,
+    -0.455953f, -0.726562f, 0.455953f, -0.100995f, -0.989748f, 0.100995f, 0.500000f, 0.500000f,
+    0.000000f, -0.726562f, 0.642187f, 0.000000f, -0.989949f, 0.141421f, 1.000000f, 0.500000f,
+    -0.532500f, -0.675000f, 0.532500f, -0.707107f, 0.000000f, 0.707107f, 0.500000f, 1.000000f,
+    0.000000f, -0.750000f, -0.000000f, -0.036468f, -0.999224f, 0.014895f, 0.250000f, 0.000000f,
+    -0.417773f, -0.743555f, -0.000000f, -0.039517f, -0.999219f, 0.000000f, 0.000000f, 0.250000f,
+    -0.385396f, -0.743555f, 0.163976f, -0.036505f, -0.999218f, 0.015211f, 0.250000f, 0.250000f,
+    -0.296619f, -0.743555f, 0.296619f, -0.027829f, -0.999225f, 0.027829f, 0.500000f, 0.250000f,
+    -0.592418f, -0.726562f, 0.252059f, -0.130641f, -0.989934f, 0.054434f, 0.250000f, 0.500000f,
+    0.000000f, -0.750000f, -0.000000f, -0.015426f, -0.999876f, 0.003046f, 0.125000f, 0.000000f,
+    -0.236792f, -0.748315f, -0.000000f, -0.015871f, -0.999874f, 0.000000f, 0.000000f, 0.125000f,
+    -0.232056f, -0.748315f, 0.048246f, -0.015562f, -0.999874f, 0.003112f, 0.125000f, 0.125000f,
+    -0.218441f, -0.748315f, 0.092941f, -0.014614f, -0.999875f, 0.006089f, 0.250000f, 0.125000f,
+    -0.409418f, -0.743555f, 0.085121f, -0.038747f, -0.999219f, 0.007749f, 0.125000f, 0.250000f,
+    0.000000f, -0.750000f, -0.000000f, -0.013015f, -0.999877f, 0.008711f, 0.375000f, 0.000000f,
+    -0.218441f, -0.748315f, 0.092941f, -0.014614f, -0.999875f, 0.006089f, 0.250000f, 0.125000f,
+    -0.196833f, -0.748315f, 0.133195f, -0.013145f, -0.999875f, 0.008815f, 0.375000f, 0.125000f,
+    -0.168122f, -0.748315f, 0.168122f, -0.011177f, -0.999875f, 0.011177f, 0.500000f, 0.125000f,
+    -0.347274f, -0.743555f, 0.234998f, -0.032729f, -0.999223f, 0.021947f, 0.375000f, 0.250000f,
+    -0.409418f, -0.743555f, 0.085121f, -0.038748f, -0.999219f, 0.007750f, 0.125000f, 0.250000f,
+    -0.550415f, -0.736157f, -0.000000f, -0.076999f, -0.997031f, 0.000000f, 0.000000f, 0.375000f,
+    -0.539407f, -0.736157f, 0.112147f, -0.075499f, -0.997032f, 0.015100f, 0.125000f, 0.375000f,
+    -0.507758f, -0.736157f, 0.216038f, -0.070899f, -0.997046f, 0.029541f, 0.250000f, 0.375000f,
+    -0.629344f, -0.726562f, 0.130846f, -0.138668f, -0.989950f, 0.027734f, 0.125000f, 0.500000f,
+    -0.347274f, -0.743555f, 0.234998f, -0.032729f, -0.999223f, 0.021948f, 0.375000f, 0.250000f,
+    -0.507758f, -0.736157f, 0.216038f, -0.070899f, -0.997046f, 0.029541f, 0.250000f, 0.375000f,
+    -0.457533f, -0.736157f, 0.309608f, -0.063773f, -0.997048f, 0.042765f, 0.375000f, 0.375000f,
+    -0.390795f, -0.736157f, 0.390795f, -0.054226f, -0.997055f, 0.054226f, 0.500000f, 0.375000f,
+    -0.533818f, -0.726562f, 0.361230f, -0.117134f, -0.990005f, 0.078549f, 0.375000f, 0.500000f,
+    0.000000f, -0.750000f, -0.000000f, -0.014895f, -0.999224f, 0.036468f, 0.750000f, 0.000000f,
+    -0.296619f, -0.743555f, 0.296619f, -0.027829f, -0.999225f, 0.027829f, 0.500000f, 0.250000f,
+    -0.163976f, -0.743555f, 0.385396f, -0.015222f, -0.999216f, 0.036533f, 0.750000f, 0.250000f,
+    0.000000f, -0.743555f, 0.417773f, 0.000000f, -0.999219f, 0.039517f, 1.000000f, 0.250000f,
+    -0.252059f, -0.726562f, 0.592418f, -0.054475f, -0.989919f, 0.130740f, 0.750000f, 0.500000f,
+    0.000000f, -0.750000f, -0.000000f, -0.008711f, -0.999877f, 0.013015f, 0.625000f, 0.000000f,
+    -0.168122f, -0.748315f, 0.168122f, -0.011177f, -0.999875f, 0.011177f, 0.500000f, 0.125000f,
+    -0.133195f, -0.748315f, 0.196833f, -0.008815f, -0.999875f, 0.013145f, 0.625000f, 0.125000f,
+    -0.092941f, -0.748315f, 0.218441f, -0.006089f, -0.999875f, 0.014614f, 0.750000f, 0.125000f,
+    -0.234998f, -0.743555f, 0.347274f, -0.021948f, -0.999223f, 0.032730f, 0.625000f, 0.250000f,
+    0.000000f, -0.750000f, -0.000000f, -0.003046f, -0.999876f, 0.015426f, 0.875000f, 0.000000f,
+    -0.092941f, -0.748315f, 0.218441f, -0.006089f, -0.999875f, 0.014614f, 0.750000f, 0.125000f,
+    -0.048246f, -0.748315f, 0.232056f, -0.003113f, -0.999874f, 0.015564f, 0.875000f, 0.125000f,
+    0.000000f, -0.748315f, 0.236792f, 0.000000f, -0.999874f, 0.015871f, 1.000000f, 0.125000f,
+    -0.085121f, -0.743555f, 0.409418f, -0.007751f, -0.999219f, 0.038753f, 0.875000f, 0.250000f,
+    -0.234998f, -0.743555f, 0.347274f, -0.021949f, -0.999223f, 0.032731f, 0.625000f, 0.250000f,
+    -0.390795f, -0.736157f, 0.390795f, -0.054226f, -0.997055f, 0.054226f, 0.500000f, 0.375000f,
+    -0.309608f, -0.736157f, 0.457533f, -0.042767f, -0.997047f, 0.063776f, 0.625000f, 0.375000f,
+    -0.216038f, -0.736157f, 0.507758f, -0.029541f, -0.997046f, 0.070899f, 0.750000f, 0.375000f,
+    -0.361230f, -0.726562f, 0.533818f, -0.078553f, -0.990004f, 0.117140f, 0.625000f, 0.500000f,
+    -0.085121f, -0.743555f, 0.409418f, -0.007751f, -0.999219f, 0.038753f, 0.875000f, 0.250000f,
+    -0.216038f, -0.736157f, 0.507758f, -0.029541f, -0.997046f, 0.070899f, 0.750000f, 0.375000f,
+    -0.112147f, -0.736157f, 0.539407f, -0.015102f, -0.997031f, 0.075510f, 0.875000f, 0.375000f,
+    0.000000f, -0.736157f, 0.550415f, 0.000000f, -0.997031f, 0.076999f, 1.000000f, 0.375000f,
+    -0.130846f, -0.726562f, 0.629344f, -0.027737f, -0.989948f, 0.138687f, 0.875000f, 0.500000f,
+    -0.592418f, -0.726562f, 0.252059f, -0.130641f, -0.989934f, 0.054434f, 0.250000f, 0.500000f,
+    -0.733008f, -0.702539f, -0.000000f, -0.514495f, -0.857493f, 0.000000f, 0.000000f, 0.750000f,
+    -0.676200f, -0.702539f, 0.287706f, -0.475188f, -0.857318f, 0.197995f, 0.250000f, 0.750000f,
+    -0.520436f, -0.702539f, 0.520436f, -0.362711f, -0.858418f, 0.362711f, 0.500000f, 0.750000f,
+    -0.691875f, -0.675000f, 0.294375f, -0.923077f, 0.000000f, 0.384615f, 0.250000f, 1.000000f,
+    -0.629344f, -0.726562f, 0.130846f, -0.138668f, -0.989950f, 0.027734f, 0.125000f, 0.500000f,
+    -0.700562f, -0.715210f, -0.000000f, -0.263929f, -0.964542f, 0.000000f, 0.000000f, 0.625000f,
+    -0.686550f, -0.715210f, 0.142739f, -0.258791f, -0.964546f, 0.051758f, 0.125000f, 0.625000f,
+    -0.646268f, -0.715210f, 0.274970f, -0.243061f, -0.964709f, 0.101276f, 0.250000f, 0.625000f,
+    -0.718348f, -0.702539f, 0.149350f, -0.504486f, -0.857505f, 0.100897f, 0.125000f, 0.750000f,
+    -0.533818f, -0.726562f, 0.361230f, -0.117134f, -0.990005f, 0.078549f, 0.375000f, 0.500000f,
+    -0.646268f, -0.715210f, 0.274970f, -0.243061f, -0.964709f, 0.101276f, 0.250000f, 0.625000f,
+    -0.582342f, -0.715210f, 0.394066f, -0.218633f, -0.964730f, 0.146613f, 0.375000f, 0.625000f,
+    -0.497399f, -0.715210f, 0.497399f, -0.185918f, -0.964815f, 0.185918f, 0.500000f, 0.625000f,
+    -0.609313f, -0.702539f, 0.412317f, -0.426431f, -0.858128f, 0.285959f, 0.375000f, 0.750000f,
+    -0.718348f, -0.702539f, 0.149350f, -0.504485f, -0.857505f, 0.100897f, 0.125000f, 0.750000f,
+    -0.746997f, -0.688989f, -0.000000f, -0.885831f, -0.464008f, 0.000000f, 0.000000f, 0.875000f,
+    -0.732057f, -0.688989f, 0.152201f, -0.868619f, -0.464027f, 0.173724f, 0.125000f, 0.875000f,
+    -0.689105f, -0.688989f, 0.293196f, -0.817250f, -0.464917f, 0.340521f, 0.250000f, 0.875000f,
+    -0.735000f, -0.675000f, 0.152812f, -0.980581f, 0.000000f, 0.196116f, 0.125000f, 1.000000f,
+    -0.609313f, -0.702539f, 0.412317f, -0.426430f, -0.858129f, 0.285959f, 0.375000f, 0.750000f,
+    -0.689105f, -0.688989f, 0.293196f, -0.817250f, -0.464917f, 0.340521f, 0.250000f, 0.875000f,
+    -0.620941f, -0.688989f, 0.420186f, -0.735277f, -0.465030f, 0.493068f, 0.375000f, 0.875000f,
+    -0.530368f, -0.688989f, 0.530368f, -0.625826f, -0.465494f, 0.625825f, 0.500000f, 0.875000f,
+    -0.623438f, -0.675000f, 0.421875f, -0.830544f, 0.000000f, 0.556953f, 0.375000f, 1.000000f,
+    -0.252059f, -0.726562f, 0.592418f, -0.054475f, -0.989919f, 0.130740f, 0.750000f, 0.500000f,
+    -0.520436f, -0.702539f, 0.520436f, -0.362711f, -0.858418f, 0.362711f, 0.500000f, 0.750000f,
+    -0.287706f, -0.702539f, 0.676200f, -0.198107f, -0.857143f, 0.475457f, 0.750000f, 0.750000f,
+    0.000000f, -0.702539f, 0.733008f, 0.000000f, -0.857493f, 0.514495f, 1.000000f, 0.750000f,
+    -0.294375f, -0.675000f, 0.691875f, -0.384615f, 0.000000f, 0.923077f, 0.750000f, 1.000000f,
+    -0.361230f, -0.726562f, 0.533818f, -0.078553f, -0.990004f, 0.117140f, 0.625000f, 0.500000f,
+    -0.497399f, -0.715210f, 0.497399f, -0.185918f, -0.964815f, 0.185918f, 0.500000f, 0.625000f,
+    -0.394066f, -0.715210f, 0.582342f, -0.146620f, -0.964727f, 0.218643f, 0.625000f, 0.625000f,
+    -0.274970f, -0.715210f, 0.646268f, -0.101276f, -0.964709f, 0.243061f, 0.750000f, 0.625000f,
+    -0.412317f, -0.702539f, 0.609313f, -0.285969f, -0.858117f, 0.426446f, 0.625000f, 0.750000f,
+    -0.130846f, -0.726562f, 0.629344f, -0.027737f, -0.989948f, 0.138687f, 0.875000f, 0.500000f,
+    -0.274970f, -0.715210f, 0.646268f, -0.101276f, -0.964709f, 0.243061f, 0.750000f, 0.625000f,
+    -0.142739f, -0.715210f, 0.686550f, -0.051765f, -0.964536f, 0.258825f, 0.875000f, 0.625000f,
+    0.000000f, -0.715210f, 0.700562f, 0.000000f, -0.964542f, 0.263929f, 1.000000f, 0.625000f,
+    -0.149350f, -0.702539f, 0.718348f, -0.100908f, -0.857473f, 0.504538f, 0.875000f, 0.750000f,
+    -0.412317f, -0.702539f, 0.609313f, -0.285969f, -0.858118f, 0.426445f, 0.625000f, 0.750000f,
+    -0.530368f, -0.688989f, 0.530368f, -0.625825f, -0.465494f, 0.625826f, 0.500000f, 0.875000f,
+    -0.420186f, -0.688989f, 0.620941f, -0.493073f, -0.465012f, 0.735284f, 0.625000f, 0.875000f,
+    -0.293196f, -0.688989f, 0.689105f, -0.340521f, -0.464917f, 0.817250f, 0.750000f, 0.875000f,
+    -0.421875f, -0.675000f, 0.623438f, -0.556953f, 0.000000f, 0.830544f, 0.625000f, 1.000000f,
+    -0.149350f, -0.702539f, 0.718348f, -0.100907f, -0.857473f, 0.504537f, 0.875000f, 0.750000f,
+    -0.293196f, -0.688989f, 0.689105f, -0.340521f, -0.464917f, 0.817250f, 0.750000f, 0.875000f,
+    -0.152201f, -0.688989f, 0.732057f, -0.173729f, -0.463975f, 0.868645f, 0.875000f, 0.875000f,
+    0.000000f, -0.688989f, 0.746997f, 0.000000f, -0.464008f, 0.885831f, 1.000000f, 0.875000f,
+    -0.152812f, -0.675000f, 0.735000f, -0.196116f, 0.000000f, 0.980581f, 0.875000f, 1.000000f,
+    0.000000f, -0.750000f, -0.000000f, 0.099015f, -0.990148f, 0.099015f, 0.000000f, 0.000000f,
+    0.000000f, -0.750000f, -0.000000f, 0.099015f, -0.990148f, 0.099015f, 1.000000f, 0.000000f,
+    0.000000f, -0.675000f, 0.750000f, 0.000000f, 0.000000f, 1.000000f, 0.000000f, 1.000000f,
+    0.750000f, -0.675000f, -0.000000f, 1.000000f, -0.000000f, 0.000000f, 1.000000f, 1.000000f,
+    0.000000f, -0.750000f, -0.000000f, 0.099015f, -0.990148f, 0.099015f, 0.500000f, 0.000000f,
+    0.000000f, -0.726562f, 0.642187f, 0.000000f, -0.989949f, 0.141421f, 0.000000f, 0.500000f,
+    0.455953f, -0.726562f, 0.455953f, 0.100995f, -0.989748f, 0.100995f, 0.500000f, 0.500000f,
+    0.642187f, -0.726562f, -0.000000f, 0.141421f, -0.989949f, 0.000000f, 1.000000f, 0.500000f,
+    0.532500f, -0.675000f, 0.532500f, 0.707107f, -0.000000f, 0.707107f, 0.500000f, 1.000000f,
+    0.000000f, -0.750000f, -0.000000f, 0.014895f, -0.999224f, 0.036468f, 0.250000f, 0.000000f,
+    0.000000f, -0.743555f, 0.417773f, 0.000000f, -0.999219f, 0.039517f, 0.000000f, 0.250000f,
+    0.163976f, -0.743555f, 0.385396f, 0.015211f, -0.999218f, 0.036505f, 0.250000f, 0.250000f,
+    0.296619f, -0.743555f, 0.296619f, 0.027829f, -0.999225f, 0.027829f, 0.500000f, 0.250000f,
+    0.252059f, -0.726562f, 0.592418f, 0.054434f, -0.989934f, 0.130641f, 0.250000f, 0.500000f,
+    0.000000f, -0.750000f, -0.000000f, 0.003046f, -0.999876f, 0.015426f, 0.125000f, 0.000000f,
+    0.000000f, -0.748315f, 0.236792f, 0.000000f, -0.999874f, 0.015871f, 0.000000f, 0.125000f,
+    0.048246f, -0.748315f, 0.232056f, 0.003112f, -0.999874f, 0.015562f, 0.125000f, 0.125000f,
+    0.092941f, -0.748315f, 0.218441f, 0.006089f, -0.999875f, 0.014614f, 0.250000f, 0.125000f,
+    0.085121f, -0.743555f, 0.409418f, 0.007749f, -0.999219f, 0.038747f, 0.125000f, 0.250000f,
+    0.000000f, -0.750000f, -0.000000f, 0.008711f, -0.999877f, 0.013015f, 0.375000f, 0.000000f,
+    0.092941f, -0.748315f, 0.218441f, 0.006089f, -0.999875f, 0.014614f, 0.250000f, 0.125000f,
+    0.133195f, -0.748315f, 0.196833f, 0.008815f, -0.999875f, 0.013145f, 0.375000f, 0.125000f,
+    0.168122f, -0.748315f, 0.168122f, 0.011177f, -0.999875f, 0.011177f, 0.500000f, 0.125000f,
+    0.234998f, -0.743555f, 0.347274f, 0.021947f, -0.999223f, 0.032729f, 0.375000f, 0.250000f,
+    0.085121f, -0.743555f, 0.409418f, 0.007750f, -0.999219f, 0.038748f, 0.125000f, 0.250000f,
+    0.000000f, -0.736157f, 0.550415f, 0.000000f, -0.997031f, 0.076999f, 0.000000f, 0.375000f,
+    0.112147f, -0.736157f, 0.539407f, 0.015100f, -0.997032f, 0.075499f, 0.125000f, 0.375000f,
+    0.216038f, -0.736157f, 0.507758f, 0.029541f, -0.997046f, 0.070899f, 0.250000f, 0.375000f,
+    0.130846f, -0.726562f, 0.629344f, 0.027734f, -0.989950f, 0.138668f, 0.125000f, 0.500000f,
+    0.234998f, -0.743555f, 0.347274f, 0.021948f, -0.999223f, 0.032729f, 0.375000f, 0.250000f,
+    0.216038f, -0.736157f, 0.507758f, 0.029541f, -0.997046f, 0.070899f, 0.250000f, 0.375000f,
+    0.309608f, -0.736157f, 0.457533f, 0.042765f, -0.997048f, 0.063773f, 0.375000f, 0.375000f,
+    0.390795f, -0.736157f, 0.390795f, 0.054226f, -0.997055f, 0.054226f, 0.500000f, 0.375000f,
+    0.361230f, -0.726562f, 0.533818f, 0.078549f, -0.990005f, 0.117134f, 0.375000f, 0.500000f,
+    0.000000f, -0.750000f, -0.000000f, 0.036468f, -0.999224f, 0.014895f, 0.750000f, 0.000000f,
+    0.296619f, -0.743555f, 0.296619f, 0.027829f, -0.999225f, 0.027829f, 0.500000f, 0.250000f,
+    0.385396f, -0.743555f, 0.163976f, 0.036533f, -0.999216f, 0.015222f, 0.750000f, 0.250000f,
+    0.417773f, -0.743555f, -0.000000f, 0.039517f, -0.999219f, 0.000000f, 1.000000f, 0.250000f,
+    0.592418f, -0.726562f, 0.252059f, 0.130740f, -0.989919f, 0.054475f, 0.750000f, 0.500000f,
+    0.000000f, -0.750000f, -0.000000f, 0.013015f, -0.999877f, 0.008711f, 0.625000f, 0.000000f,
+    0.168122f, -0.748315f, 0.168122f, 0.011177f, -0.999875f, 0.011177f, 0.500000f, 0.125000f,
+    0.196833f, -0.748315f, 0.133195f, 0.013145f, -0.999875f, 0.008815f, 0.625000f, 0.125000f,
+    0.218441f, -0.748315f, 0.092941f, 0.014614f, -0.999875f, 0.006089f, 0.750000f, 0.125000f,
+    0.347274f, -0.743555f, 0.234998f, 0.032730f, -0.999223f, 0.021948f, 0.625000f, 0.250000f,
+    0.000000f, -0.750000f, -0.000000f, 0.015426f, -0.999876f, 0.003046f, 0.875000f, 0.000000f,
+    0.218441f, -0.748315f, 0.092941f, 0.014614f, -0.999875f, 0.006089f, 0.750000f, 0.125000f,
+    0.232056f, -0.748315f, 0.048246f, 0.015564f, -0.999874f, 0.003113f, 0.875000f, 0.125000f,
+    0.236792f, -0.748315f, -0.000000f, 0.015871f, -0.999874f, 0.000000f, 1.000000f, 0.125000f,
+    0.409418f, -0.743555f, 0.085121f, 0.038753f, -0.999219f, 0.007751f, 0.875000f, 0.250000f,
+    0.347274f, -0.743555f, 0.234998f, 0.032731f, -0.999223f, 0.021949f, 0.625000f, 0.250000f,
+    0.390795f, -0.736157f, 0.390795f, 0.054226f, -0.997055f, 0.054226f, 0.500000f, 0.375000f,
+    0.457533f, -0.736157f, 0.309608f, 0.063776f, -0.997047f, 0.042767f, 0.625000f, 0.375000f,
+    0.507758f, -0.736157f, 0.216038f, 0.070899f, -0.997046f, 0.029541f, 0.750000f, 0.375000f,
+    0.533818f, -0.726562f, 0.361230f, 0.117140f, -0.990004f, 0.078553f, 0.625000f, 0.500000f,
+    0.409418f, -0.743555f, 0.085121f, 0.038753f, -0.999219f, 0.007751f, 0.875000f, 0.250000f,
+    0.507758f, -0.736157f, 0.216038f, 0.070899f, -0.997046f, 0.029541f, 0.750000f, 0.375000f,
+    0.539407f, -0.736157f, 0.112147f, 0.075510f, -0.997031f, 0.015102f, 0.875000f, 0.375000f,
+    0.550415f, -0.736157f, -0.000000f, 0.076999f, -0.997031f, 0.000000f, 1.000000f, 0.375000f,
+    0.629344f, -0.726562f, 0.130846f, 0.138687f, -0.989948f, 0.027737f, 0.875000f, 0.500000f,
+    0.252059f, -0.726562f, 0.592418f, 0.054434f, -0.989934f, 0.130641f, 0.250000f, 0.500000f,
+    0.000000f, -0.702539f, 0.733008f, 0.000000f, -0.857493f, 0.514495f, 0.000000f, 0.750000f,
+    0.287706f, -0.702539f, 0.676200f, 0.197995f, -0.857318f, 0.475188f, 0.250000f, 0.750000f,
+    0.520436f, -0.702539f, 0.520436f, 0.362711f, -0.858418f, 0.362711f, 0.500000f, 0.750000f,
+    0.294375f, -0.675000f, 0.691875f, 0.384615f, -0.000000f, 0.923077f, 0.250000f, 1.000000f,
+    0.130846f, -0.726562f, 0.629344f, 0.027734f, -0.989950f, 0.138668f, 0.125000f, 0.500000f,
+    0.000000f, -0.715210f, 0.700562f, 0.000000f, -0.964542f, 0.263929f, 0.000000f, 0.625000f,
+    0.142739f, -0.715210f, 0.686550f, 0.051758f, -0.964546f, 0.258791f, 0.125000f, 0.625000f,
+    0.274970f, -0.715210f, 0.646268f, 0.101276f, -0.964709f, 0.243061f, 0.250000f, 0.625000f,
+    0.149350f, -0.702539f, 0.718348f, 0.100897f, -0.857505f, 0.504486f, 0.125000f, 0.750000f,
+    0.361230f, -0.726562f, 0.533818f, 0.078549f, -0.990005f, 0.117134f, 0.375000f, 0.500000f,
+    0.274970f, -0.715210f, 0.646268f, 0.101276f, -0.964709f, 0.243061f, 0.250000f, 0.625000f,
+    0.394066f, -0.715210f, 0.582342f, 0.146613f, -0.964730f, 0.218633f, 0.375000f, 0.625000f,
+    0.497399f, -0.715210f, 0.497399f, 0.185918f, -0.964815f, 0.185918f, 0.500000f, 0.625000f,
+    0.412317f, -0.702539f, 0.609313f, 0.285959f, -0.858128f, 0.426431f, 0.375000f, 0.750000f,
+    0.149350f, -0.702539f, 0.718348f, 0.100897f, -0.857505f, 0.504485f, 0.125000f, 0.750000f,
+    0.000000f, -0.688989f, 0.746997f, 0.000000f, -0.464008f, 0.885831f, 0.000000f, 0.875000f,
+    0.152201f, -0.688989f, 0.732057f, 0.173724f, -0.464027f, 0.868619f, 0.125000f, 0.875000f,
+    0.293196f, -0.688989f, 0.689105f, 0.340521f, -0.464917f, 0.817250f, 0.250000f, 0.875000f,
+    0.152812f, -0.675000f, 0.735000f, 0.196116f, -0.000000f, 0.980581f, 0.125000f, 1.000000f,
+    0.412317f, -0.702539f, 0.609313f, 0.285959f, -0.858129f, 0.426430f, 0.375000f, 0.750000f,
+    0.293196f, -0.688989f, 0.689105f, 0.340521f, -0.464917f, 0.817250f, 0.250000f, 0.875000f,
+    0.420186f, -0.688989f, 0.620941f, 0.493068f, -0.465030f, 0.735277f, 0.375000f, 0.875000f,
+    0.530368f, -0.688989f, 0.530368f, 0.625825f, -0.465494f, 0.625826f, 0.500000f, 0.875000f,
+    0.421875f, -0.675000f, 0.623438f, 0.556953f, -0.000000f, 0.830544f, 0.375000f, 1.000000f,
+    0.592418f, -0.726562f, 0.252059f, 0.130740f, -0.989919f, 0.054475f, 0.750000f, 0.500000f,
+    0.520436f, -0.702539f, 0.520436f, 0.362711f, -0.858418f, 0.362711f, 0.500000f, 0.750000f,
+    0.676200f, -0.702539f, 0.287706f, 0.475457f, -0.857143f, 0.198107f, 0.750000f, 0.750000f,
+    0.733008f, -0.702539f, -0.000000f, 0.514495f, -0.857493f, 0.000000f, 1.000000f, 0.750000f,
+    0.691875f, -0.675000f, 0.294375f, 0.923077f, -0.000000f, 0.384615f, 0.750000f, 1.000000f,
+    0.533818f, -0.726562f, 0.361230f, 0.117140f, -0.990004f, 0.078553f, 0.625000f, 0.500000f,
+    0.497399f, -0.715210f, 0.497399f, 0.185918f, -0.964815f, 0.185918f, 0.500000f, 0.625000f,
+    0.582342f, -0.715210f, 0.394066f, 0.218643f, -0.964727f, 0.146620f, 0.625000f, 0.625000f,
+    0.646268f, -0.715210f, 0.274970f, 0.243061f, -0.964709f, 0.101276f, 0.750000f, 0.625000f,
+    0.609313f, -0.702539f, 0.412317f, 0.426446f, -0.858117f, 0.285969f, 0.625000f, 0.750000f,
+    0.629344f, -0.726562f, 0.130846f, 0.138687f, -0.989948f, 0.027737f, 0.875000f, 0.500000f,
+    0.646268f, -0.715210f, 0.274970f, 0.243061f, -0.964709f, 0.101276f, 0.750000f, 0.625000f,
+    0.686550f, -0.715210f, 0.142739f, 0.258825f, -0.964536f, 0.051765f, 0.875000f, 0.625000f,
+    0.700562f, -0.715210f, -0.000000f, 0.263929f, -0.964542f, 0.000000f, 1.000000f, 0.625000f,
+    0.718348f, -0.702539f, 0.149350f, 0.504538f, -0.857473f, 0.100908f, 0.875000f, 0.750000f,
+    0.609313f, -0.702539f, 0.412317f, 0.426445f, -0.858118f, 0.285969f, 0.625000f, 0.750000f,
+    0.530368f, -0.688989f, 0.530368f, 0.625826f, -0.465494f, 0.625825f, 0.500000f, 0.875000f,
+    0.620941f, -0.688989f, 0.420186f, 0.735284f, -0.465012f, 0.493073f, 0.625000f, 0.875000f,
+    0.689105f, -0.688989f, 0.293196f, 0.817250f, -0.464917f, 0.340521f, 0.750000f, 0.875000f,
+    0.623438f, -0.675000f, 0.421875f, 0.830544f, -0.000000f, 0.556953f, 0.625000f, 1.000000f,
+    0.718348f, -0.702539f, 0.149350f, 0.504537f, -0.857473f, 0.100907f, 0.875000f, 0.750000f,
+    0.689105f, -0.688989f, 0.293196f, 0.817250f, -0.464917f, 0.340521f, 0.750000f, 0.875000f,
+    0.732057f, -0.688989f, 0.152201f, 0.868645f, -0.463975f, 0.173729f, 0.875000f, 0.875000f,
+    0.746997f, -0.688989f, -0.000000f, 0.885831f, -0.464008f, 0.000000f, 1.000000f, 0.875000f,
+    0.735000f, -0.675000f, 0.152812f, 0.980581f, -0.000000f, 0.196116f, 0.875000f, 1.000000f
 };
 
 static ushort const teapotTriangleData[] = {

--- a/qtmobility/examples/sensors/cubehouse/view.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/cubehouse/view.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** This file is part of the Qt3D module 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/cubehouse/view.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/cubehouse/view.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** This file is part of the Qt3D module 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/grueapp/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/grueapp/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/grueplugin/gruesensor.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/grueplugin/gruesensor.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/grueplugin/gruesensor.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/grueplugin/gruesensor.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/grueplugin/gruesensor_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/grueplugin/gruesensor_p.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/grueplugin/gruesensorimpl.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/grueplugin/gruesensorimpl.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/grueplugin/gruesensorimpl.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/grueplugin/gruesensorimpl.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/grueplugin/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/grueplugin/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/orientation/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/orientation/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/orientation/orientation.qml	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/orientation/orientation.qml	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/reading_perf/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/reading_perf/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/sensor_explorer/explorer.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/sensor_explorer/explorer.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/sensor_explorer/explorer.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/sensor_explorer/explorer.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/sensor_explorer/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/sensor_explorer/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/small_screen_sensors/accelerationform.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/small_screen_sensors/accelerationform.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/small_screen_sensors/accelerationform.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/small_screen_sensors/accelerationform.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/small_screen_sensors/freefallform.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/small_screen_sensors/freefallform.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/small_screen_sensors/freefallform.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/small_screen_sensors/freefallform.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/small_screen_sensors/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/small_screen_sensors/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/small_screen_sensors/orientationform.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/small_screen_sensors/orientationform.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/small_screen_sensors/orientationform.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/small_screen_sensors/orientationform.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/small_screen_sensors/sensorswindow.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/small_screen_sensors/sensorswindow.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sensors/small_screen_sensors/sensorswindow.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sensors/small_screen_sensors/sensorswindow.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/serviceactions/attachmentlistwidget.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/serviceactions/attachmentlistwidget.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** This file is part of the Qt Messaging Framework.
 **
-** $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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/serviceactions/attachmentlistwidget.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/serviceactions/attachmentlistwidget.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** This file is part of the Qt Messaging Framework.
 **
-** $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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/serviceactions/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/serviceactions/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/serviceactions/mainwindow.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/serviceactions/mainwindow.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -382,7 +381,7 @@
 
 void RecentMessagesWidget::stateChanged(QMessageService::State newState)
 {
-  qDebug() << "stateChanged state=" << m_state << " newState=" << newState << "error=" << m_service->error();
+    //  qDebug() << "stateChanged state=" << m_state << " newState=" << newState << "error=" << m_service->error();
     if (newState == QMessageService::FinishedState) {
         if ((m_state != LoadFailed) && (m_service->error() == QMessageManager::NoError)) {
             m_state = LoadFinished;
@@ -505,7 +504,7 @@
     bool b;
 
     b=m_service->queryMessages(QMessageFilter(),QMessageSortOrder::byReceptionTimeStamp(Qt::DescendingOrder),m_maxRecent);
-    qDebug() << "RecentMessagesWidget::load" << b << m_state;
+    //    qDebug() << "RecentMessagesWidget::load" << b << m_state;
 //! [load-message]
 };
 
@@ -891,7 +890,7 @@
 
 void MessageViewWidget::stateChanged(QMessageService::State newState)
 {
-  qDebug() << "stateChanged state=" << m_state << " newState=" << newState << "error=" << m_service->error();
+    //  qDebug() << "stateChanged state=" << m_state << " newState=" << newState << "error=" << m_service->error();
     if (m_state == LoadFailed)
         return;
 
@@ -1338,7 +1337,7 @@
 
 void MainWindow::serviceStateChanged(QMessageService::State newState)
 {
-  qDebug() << "MainWindow::serviceStateChanged";
+    //  qDebug() << "MainWindow::serviceStateChanged";
     if ((newState == QMessageService::FinishedState) && (m_service->error() != QMessageManager::NoError))
         QMessageBox::critical(this,"Error","One or more service actions failed");
 }

--- a/qtmobility/examples/serviceactions/mainwindow.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/serviceactions/mainwindow.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/servicebrowser/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/servicebrowser/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/servicebrowser/servicebrowser.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/servicebrowser/servicebrowser.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/servicebrowser/servicebrowser.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/servicebrowser/servicebrowser.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/serviceinstaller_sfw_symbian/exampleinstaller/exampleinstaller.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/serviceinstaller_sfw_symbian/exampleinstaller/exampleinstaller.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/servicenotesmanager/declarative-sfw-notes/Button.qml	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    id: container
-
-    signal clicked
-    property string image: ""
-    property string text: ""
-
-    color: activePalette.button; smooth: true
-    border.width: 1; border.color: Qt.darker(activePalette.button); radius: 8;
-
-    gradient: Gradient {
-        GradientStop {
-            id: topGrad; position: 0.0
-            color :if (mr.pressed) { activePalette.dark } else { activePalette.light } }
-        GradientStop { position: 1.0; color: activePalette.button }
-    }
-
-    Image {
-        id: imgItem;
-        smooth: true
-        width: 16; height: 16;
-        source: container.image; anchors.centerIn: container
-    }
-
-    MouseArea { id: mr; anchors.fill: parent; onClicked: container.clicked() }
-
-    Text {
-        id: txtItem; text: container.text; anchors.centerIn: container; color: activePalette.buttonText
-    }
-}

--- a/qtmobility/examples/servicenotesmanager/declarative-sfw-notes/Dialog.qml	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    property string text: ""
-    property bool alert: false
-    signal confirmed();
-
-    id: page
-    opacity: 0
-    border.width: 1; color: "lightgray"; radius: 5
-
-    width: 200; height: dialogText.height + okButton.height + 35
-    anchors.verticalCenter: mainWindow.verticalCenter
-    anchors.horizontalCenter: mainWindow.horizontalCenter
-
-    Text {
-        id: dialogText
-        text: page.text
-        wrap: true
-        x: 15; y: 15
-        color: activePalette.buttonText
-        anchors.horizontalCenter: page.horizontalCenter
-    }
-
-    Button {
-        id: okButton
-        text: "Ok"
-        width: 75; height: 25
-        anchors.top: dialogText.bottom; anchors.topMargin: 7
-
-        onClicked: {
-            page.confirmed();
-            page.opacity = 0;
-        }
-    }
-
-    Button {
-        id: noButton
-        text: "Cancel"
-        width: 75; height: 25
-        anchors.left: page.horizontalCenter; anchors.leftMargin: 5
-        anchors.top: dialogText.bottom; anchors.topMargin: 7
-    
-        onClicked: {
-            page.opacity = 0;
-        }
-    }
-
-    Component.onCompleted: {
-        if (alert == true)
-        {
-            noButton.opacity = 0;
-            okButton.anchors.horizontalCenter = page.horizontalCenter;
-        }
-        else {
-            okButton.anchors.right = page.horizontalCenter; 
-            okButton.anchors.rightMargin = 5;
-        }
-    }
-}

--- a/qtmobility/examples/servicenotesmanager/declarative-sfw-notes/InputDialog.qml	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-import Qt 4.6
-
-Rectangle {
-    property string text: ""
-    property int size: 0
-    signal confirmed(string input);
-    
-    id: page
-    opacity: 0
-
-    width: dialogText.width + 30 + size; height: dialogText.height + okButton.height + inputText.height + 44
-    anchors.verticalCenter: mainWindow.verticalCenter
-    anchors.horizontalCenter: mainWindow.horizontalCenter
-
-    border.width: 1; color: "lightgray"; radius: 5
-
-    Text {
-        id: dialogText
-        text: page.text
-        x: 15; y: 15
-        color: activePalette.buttonText
-    }
-
-    Rectangle {
-        id: inputArea
-        width: page.width - 30 
-        height: inputText.height + 4
-        border.width: 1; color: "white"; radius: 1
-        anchors.left: dialogText.left
-        anchors.top: dialogText.bottom; anchors.topMargin: 7
-    }
-
-    TextInput {
-        id: inputText
-        width: inputArea.width - 10
-        anchors.verticalCenter: inputArea.verticalCenter
-        anchors.horizontalCenter: inputArea.horizontalCenter
-    }
-
-    Button {
-        id: okButton
-        text: "Ok"
-        width: 75; height: 25
-        anchors.right: page.horizontalCenter; anchors.rightMargin: 5
-        anchors.top: inputArea.bottom; anchors.topMargin: 10
-
-        onClicked: {
-            page.confirmed(inputText.text);
-            forceClose(); 
-        }
-    }
-
-    Button {
-        id: noButton
-        text: "Cancel"
-        width: 75; height: 25
-        anchors.left: page.horizontalCenter; anchors.leftMargin: 5
-        anchors.top: inputArea.bottom; anchors.topMargin: 10
-    
-        onClicked: {
-            forceClose();
-        }
-    }
-
-    function forceClose()
-    {
-        page.opacity = 0;
-        inputText.text = "";
-    }
-}

--- a/qtmobility/examples/servicenotesmanager/declarative-sfw-notes/declarative-sfw-notes.pro	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-TEMPLATE = app
-TARGET = declarative-sfw-notes
-INCLUDEPATH += ../../../src/serviceframework
-
-include(../../examples.pri)
-
-QT += declarative
-
-HEADERS += note.h \
-           sfwnotes.h
-SOURCES += sfwnotes.cpp \
-           main.cpp
-
-CONFIG += mobility
-MOBILITY = serviceframework
-
-RESOURCES += sfwnotes.qrc
-
-OTHER_FILES = declarative-sfw-notes.qml

--- a/qtmobility/examples/servicenotesmanager/declarative-sfw-notes/declarative-sfw-notes.qml	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,258 +0,0 @@
-import Qt 4.6
-import QtSFW 1.0
-
-Rectangle {
-    property int size: 0
-    property int curr: 0
-    property string search: ""
-    property variant notesObject: notesService.serviceObject()
-
-    id: mainWindow
-    color: "lightgray"
-    width: 220; height: 265
-
-    SystemPalette { id: activePalette }
-
-    Rectangle {
-        id: datetimeArea
-        width: 160; height: 20
-        x: 30; y: 120
-        color: "#FFFF7F"
-    }
-
-    Rectangle {
-        id: noteArea
-        width: 160; height: 110
-        x: 30; y: 140
-        color: "#FFFF7F"
-    }
-
-
-    Text {
-        id: title
-        text: "ToDoTool"
-        font.pointSize: 24; font.family: "Nimbus Roman No9 L"; font.bold: true; font.italic:true 
-        color: "blue"
-        y: 5; anchors.horizontalCenter: mainWindow.horizontalCenter
-    }
-
-    Text {
-        id: countLabel
-        text: curr + "/" + size
-        font.pointSize:10
-        y: 90
-        anchors.horizontalCenter: mainWindow.horizontalCenter
-    }
-
-    Text {
-        id: datetimeLabel
-        text: ""
-        font.pointSize:10
-        x: 30; y: 120
-        anchors.right: datetimeArea.right
-    }
-
-    Text {
-        id: noteLabel
-        text: "Click + to add a new note"
-        font.pointSize: 18; font.family: "Comic Sans MS"; font.italic:true
-        horizontalAlignment: Text.AlignHCenter
-        wrap: true
-        width: noteArea.width
-        anchors.verticalCenter: noteArea.verticalCenter
-        anchors.horizontalCenter: title.horizontalCenter
-    }
-
-    Button {
-        id: addButton
-        image: "../icons/addIcon.png"
-        width: 60; height: 30
-        x: 20; y: 40
-
-        onClicked: {
-            addDialog.opacity = 1;
-        }
-    }
-
-    Button {
-        id: deleteButton
-        image: "../icons/deleteIcon.png"
-        width: 60; height: 30
-        x: 80; y: 40
-
-        onClicked: {
-            deleteDialog.opacity = 1;
-        }
-    }
-
-    Button {
-        id: searchButton
-        image: "../icons/searchIcon.png"
-        width: 60; height: 30
-        x: 140; y: 40
-
-        onClicked: {
-            searchDialog.opacity = 1;
-        }
-    }
-
-    Button {
-        id: nextButton
-        image: "../icons/nextIcon.png"
-        width: 40; height: 30
-        x: 130; y: 80
-
-        onClicked: { 
-            if (curr < size) { 
-                curr++;
-                refreshNotes();
-            }
-        }
-    }
-
-    Button {
-        id: prevButton
-        image: "../icons/prevIcon.png"
-        width: 40; height: 30
-        x: 50; y: 80
-
-        onClicked: {
-            if (curr > 1) {
-                curr--;
-                refreshNotes();
-            }
-        }
-    }
-
-    DateTimeFormatter {
-        id: myDateTime
-        dateTime: "2000-01-01 00:00:00"
-        dateTimeFormat: "yyyy-MM-dd hh:mm"
-    }
-
-    InputDialog {
-        id: addDialog
-        text: "Add a new note + alarm of format:\nnote#yyyy-mm-dd#hh:mm"
-
-        onConfirmed: {
-            var note = input.split("#");
-
-            if (note.length == 3) {
-                var date = note[1].split("-");
-                var time = note[2].split(":");
-
-                if (date.length == 3 && time.length ==2) {
-                    myDateTime.dateTime = note[1] + " " + note[2] + ":00";
-                    notesObject.addNote(note[0], myDateTime.dateTime);
-                }
-            } else {
-                    myDateTime.dateTime = currentDateTime() + ":00";
-                    notesObject.addNote(note[0], myDateTime.dateTime);
-            }
-
-            refreshNotes();
-        }
-    }
-
-    InputDialog {
-        id: searchDialog
-        text: "Find a note:"
-        size: 100
-
-        onConfirmed: {
-            search = input;
-            curr = 1; 
-            refreshNotes()
-        }
-    }
-
-    Connections {
-        target: notesObject
-        
-        onSoundAlarm: {
-            alarmDialog.text = "ALERT SOUNDED!!!" + "\n\n" + 
-                               formatDateTime(alarm) + "\n\n" + notesObject.alarmMessage;
-            alarmDialog.opacity = 1;
-        }
-    }
-
-    Dialog {
-        id: deleteDialog
-        text: "Confirm removing this note item?"
-
-        onConfirmed: {
-            var list = notesObject.noteSet;
-            notesObject.removeNote(list[curr-1].index);
-
-            if (curr > 1) { curr--; }
-
-            refreshNotes();
-        }
-    }
-
-    Dialog {
-        id: alarmDialog
-        text: "ALERT SOUNDED!!!"
-        alert: true
-    }
-
-    Script {
-        function refreshNotes()
-        {
-            notesObject.setSearch(search);
-            var list = notesObject.noteSet;
-            size = list.length;
-           
-            if (size < 1) curr = 0;
-            else if (size > 0 && curr == 0) curr = 1;
-          
-            if (size > 0) {
-                noteLabel.text = list[curr-1].message;
-                datetimeLabel.text = formatDateTime(list[curr-1].alarm);
-            } else {
-                noteLabel.text = "Click + to add a new note";
-                datetimeLabel.text = "";
-            }
-        }
-
-        function formatDateTime(datetime)
-        {
-            var dt = new Date(datetime);
-
-            var month = (dt.getMonth() + 1) + ""; 
-            if (month.length == 1)  month = "0" + month;
-
-            var date = dt.getDate() + ""; 
-            if (date.length == 1)  date= "0" + date;
-            
-            var hour = dt.getHours() + ""; 
-            if (hour.length == 1)  hour = "0" + hour;
-            
-            var mins = dt.getMinutes() + ""; 
-            if (mins.length == 1)  mins = "0" + mins;
-
-            return (dt.getFullYear() + "-" + month + "-" + date + " " + hour + ":" + mins);
-        }
-
-        function currentDateTime()
-        {
-            var dt = new Date();
-
-            return formatDateTime(dt);
-        }
-    }
-
-    Service {
-        id: notesService
-        interfaceName: "com.nokia.qt.examples.NotesManager"
-        serviceName: "NotesManagerService"
-        version: "1.2"
-    }
-
-    Component.onCompleted: {
-        var list = notesObject.noteSet;
-        if (list.length > 0) {curr = 1;}
-        
-        refreshNotes();
-    }
-}

--- a/qtmobility/examples/servicenotesmanager/declarative-sfw-notes/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 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 <QApplication>
-#include <QUrl>
-#include <QtCore>
-#include <QtDeclarative/QDeclarativeView>
-#include <qserviceinterfacedescriptor.h>
-#include <qservicemanager.h>
-#include <qdeclarative.h>
-
-#include "sfwnotes.h"
-#include "note.h"
-
-int main(int argc, char* argv[])
-{
-    qmlRegisterType<ServiceWrapper>("QtSFW", 1, 0, "Service");
-    //QML_REGISTER_TYPE(QtSFW,1,0,Service, ServiceWrapper);
-    //QML_REGISTER_NOCREATE_TYPE(Note);
-
-    QApplication app(argc, argv);
-
-    QDeclarativeView canvas;
-    canvas.setSource(QUrl("qrc:/declarative-sfw-notes.qml"));
-    canvas.show();
-
-    return app.exec();
-}

--- a/qtmobility/examples/servicenotesmanager/declarative-sfw-notes/note.h	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 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$
-** 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$
-**
-****************************************************************************/
-
-#ifndef NOTE_H
-#define NOTE_H
-
-#include <QObject>
-#include <QDateTime>
-#include <QtDeclarative/qdeclarative.h>
-
-class Note : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(int index READ index WRITE setIndex)
-    Q_PROPERTY(QString message READ message WRITE setMessage)
-    Q_PROPERTY(QDateTime alarm READ alarm WRITE setAlarm)
-
-public:
-    Note(QObject *parent =0) : QObject(parent) {}
-    ~Note() {}
-
-public slots:
-    int index() const { return m_index; }
-    void setIndex(int index) { m_index = index; }
-
-    QString message() const { return m_message; }
-    void setMessage(const QString &message) { m_message = message; }
-
-    QDateTime alarm() const { return m_alarm; }
-    void setAlarm(const QDateTime &alarm) { m_alarm = alarm; }
-
-private:
-    int m_index;
-    QString m_message;
-    QDateTime m_alarm;
-};
-
-//QML_DECLARE_TYPE(Note)
-
-class NoteSet : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QList<Note*>* noteset READ noteset WRITE setnoteset)
-
-public:
-    NoteSet(QObject *parent =0) : QObject(parent) {};
-    ~NoteSet() {};
-
-    QList<Note*> *noteset() { return &m_noteset; }
-    void setnoteset(QList<Note*>* set) { m_noteset = *set; }
-
-private:
-    QList<Note*> m_noteset;
-};
-
-//QML_DECLARE_TYPE(NoteSet)
-
-#endif
-

--- a/qtmobility/examples/servicenotesmanager/declarative-sfw-notes/sfwnotes.cpp	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 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 "sfwnotes.h"
-
-ServiceWrapper::ServiceWrapper()
-: serviceInstance(0)
-{
-    serviceManager = new QServiceManager(this);
-
-    registerExampleServices();
-}
-
-ServiceWrapper::~ServiceWrapper()
-{
-    delete serviceInstance;
-    unregisterExampleServices();
-}
-
-QString ServiceWrapper::interfaceName() const
-{
-    return m_interface;
-}
-
-void ServiceWrapper::setInterfaceName(const QString &interface)
-{
-    m_interface = interface;
-}
-
-QString ServiceWrapper::serviceName() const
-{
-    return m_service;
-}
-
-void ServiceWrapper::setServiceName(const QString &service)
-{
-    m_service = service;
-}
-
-QString ServiceWrapper::version() const
-{
-    return m_version;
-}
-
-void ServiceWrapper::setVersion(const QString &version)
-{
-    m_version = version;
-}
-
-bool ServiceWrapper::existsInterface()
-{
-    return (m_interface != "");
-}
-
-bool ServiceWrapper::existsService()
-{
-    return (m_service != "");
-}
-
-bool ServiceWrapper::existsVersion()
-{
-    return (m_version != "");
-}
-
-void ServiceWrapper::findServiceInterface()
-{
-    QServiceFilter filter;
-    filter.setServiceName(m_service);
-    
-    if (existsInterface())
-        filter.setInterface(m_interface, m_version, QServiceFilter::ExactVersionMatch);
-
-    QList<QServiceInterfaceDescriptor> list = serviceManager->findInterfaces(filter);
-
-    if (list.size() == 0) return;
-
-    if (existsInterface()) {
-        if (existsVersion()) {
-            m_descriptor = list[0];
-        } else {
-            m_descriptor = serviceManager->interfaceDefault(m_interface);
-        }
-
-    } else if (existsService()) {
-        if (existsVersion()) {
-            for (int i=0; i<list.count(); i++) {
-                QString currVersion = QString::number(list[i].majorVersion()) + "." + 
-                                      QString::number(list[i].minorVersion());
-
-                if ( currVersion == m_version) {
-                    m_descriptor = list[i];
-                    return;
-                }
-            }
-        } else {
-            int major = -1;
-            int minor = -1;
-
-            for (int i=0; i<list.count(); i++) {
-                int currMajor = list[i].majorVersion();
-                int currMinor = list[i].minorVersion();
-                
-                if (currMajor > major) {
-                    major = currMajor;
-                    minor = -1;
-                }
-                    
-                if (currMinor > minor) {
-                    minor = currMinor;
-                    m_descriptor = list[i];
-                }
-            }
-        }
-    }
-}
-
-QObject* ServiceWrapper::serviceObject()
-{
-    findServiceInterface();
-
-    if (serviceInstance) {
-        return serviceInstance;
-    }
-
-    if (m_descriptor.isValid()) {
-        QServiceManager manager;
-        serviceInstance = manager.loadInterface(m_descriptor);
-        return serviceInstance;
-    } else {
-        return 0;
-    }
-}
-
-void ServiceWrapper::registerExampleServices()
-{
-    QStringList exampleXmlFiles;
-    exampleXmlFiles << "notesmanagerservice.xml";
-    foreach (const QString &fileName, exampleXmlFiles) {
-        QString path = QCoreApplication::applicationDirPath() + "/xmldata/" + fileName;
-        serviceManager->addService(path);
-    }
-}
-
-void ServiceWrapper::unregisterExampleServices()
-{
-    serviceManager->removeService("NotesManagerService");
-}

--- a/qtmobility/examples/servicenotesmanager/declarative-sfw-notes/sfwnotes.h	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 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$
-**
-***************************************************************************/
-
-#ifndef SFWNOTES_H
-#define SFWNOTES_H
-
-#include <QtCore>
-#include <qserviceinterfacedescriptor.h>
-#include <qservicemanager.h>
-#include <qdeclarative.h>
-
-QTM_USE_NAMESPACE
-
-Q_DECLARE_METATYPE(QServiceInterfaceDescriptor)
-
-class ServiceWrapper : public QObject {
-    Q_OBJECT
-    Q_PROPERTY(QString interfaceName READ interfaceName WRITE setInterfaceName);
-    Q_PROPERTY(QString serviceName READ serviceName WRITE setServiceName);
-    Q_PROPERTY(QString version READ version WRITE setVersion);
-
-public:
-    ServiceWrapper();
-    ~ServiceWrapper();
-
-    QString interfaceName() const;
-    void setInterfaceName(const QString& interface);
-    
-    QString serviceName() const;
-    void setServiceName(const QString& service);
-
-    QString version() const;
-    void setVersion(const QString& version);
-
-    Q_INVOKABLE QObject* serviceObject();
-
-private:
-    void registerExampleServices();
-    void unregisterExampleServices();
-    void findServiceInterface();
-
-    bool existsInterface();
-    bool existsService();
-    bool existsVersion();
-
-    QString m_interface;
-    QString m_service;
-    QString m_version;
-
-    QServiceInterfaceDescriptor m_descriptor;
-    QObject* serviceInstance;
-    
-    QServiceManager* serviceManager;
-};
-
-QML_DECLARE_TYPE(ServiceWrapper)
-
-#endif
-

--- a/qtmobility/examples/servicenotesmanager/declarative-sfw-notes/sfwnotes.qrc	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<RCC>
-    <qresource prefix="/" >
-        <file>declarative-sfw-notes.qml</file>
-        <file>Button.qml</file>
-        <file>Dialog.qml</file>
-        <file>InputDialog.qml</file>
-        <file>../icons/addIcon.png</file>
-        <file>../icons/deleteIcon.png</file>
-        <file>../icons/searchIcon.png</file>
-        <file>../icons/nextIcon.png</file>
-        <file>../icons/prevIcon.png</file>
-    </qresource>
-</RCC>

Binary file qtmobility/examples/servicenotesmanager/icons/addIcon.png has changed

Binary file qtmobility/examples/servicenotesmanager/icons/deleteIcon.png has changed

--- a/qtmobility/examples/servicenotesmanager/icons/drawing.svg	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="744.09448819"
-   height="1052.3622047"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="drawing.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="343.87988"
-     inkscape:cy="546.43804"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="640"
-     inkscape:window-height="774"
-     inkscape:window-x="233"
-     inkscape:window-y="116">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2383" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 230,412.36218 L 230,432.36218 L 210,432.36218 L 210,452.36218 L 230,452.36218 L 230,472.36218 L 250,472.36218 L 250,452.36218 L 270,452.36218 L 270,432.36218 L 250,432.36218 L 250,412.36218 L 230,412.36218 z"
-       id="path2389" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ff0000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path2395"
-       sodipodi:cx="250"
-       sodipodi:cy="442.36218"
-       sodipodi:rx="30"
-       sodipodi:ry="30"
-       d="M 280,442.36218 A 30,30 0 1 1 220,442.36218 A 30,30 0 1 1 280,442.36218 z"
-       transform="translate(70,0)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path2447"
-       sodipodi:cx="320"
-       sodipodi:cy="442.36218"
-       sodipodi:rx="20"
-       sodipodi:ry="20"
-       d="M 309.45297,425.36924 A 20,20 0 0 1 336.95545,452.96939"
-       sodipodi:start="4.1569088"
-       sodipodi:end="6.8422107"
-       sodipodi:open="true" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 303,432.36218 L 330,459.36218"
-       id="path2511" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 310,425.36218 L 337,452.36218"
-       id="path2513"
-       sodipodi:nodetypes="cc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path2639"
-       sodipodi:cx="320"
-       sodipodi:cy="442.36218"
-       sodipodi:rx="20"
-       sodipodi:ry="20"
-       d="M 330.59976,459.32228 A 20,20 0 0 1 303.03497,431.77031"
-       sodipodi:start="1.0122098"
-       sodipodi:end="3.6997139"
-       sodipodi:open="true" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.96428567px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 330.01786,459.38004 L 303.01786,432.38004"
-       id="path2643"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:#008000;stroke:#008000;stroke-width:0.12500000000000000"
-       d="M 230.51461,461.76936 L 230.51461,451.76936 L 220.51461,451.76936 L 210.51461,451.76936 L 210.51461,442.33186 L 210.51461,432.89436 L 220.51461,432.89436 L 230.51461,432.89436 L 230.51461,422.89436 L 230.51461,412.89436 L 239.95211,412.89436 L 249.38961,412.89436 L 249.38961,422.89436 L 249.38961,432.89436 L 259.38961,432.89436 L 269.38961,432.89436 L 269.38961,442.33111 L 269.38961,451.76787 L 259.42086,451.79986 L 249.45211,451.83186 L 249.42011,461.80061 L 249.38811,471.76936 L 239.95136,471.76936 L 230.51461,471.76936 L 230.51461,461.76936 z"
-       id="path2663" />
-    <path
-       style="fill:#008000;stroke:#008000;stroke-width:0.125"
-       d="M 230.51461,461.75686 L 230.51461,451.75686 L 220.51461,451.75686 L 210.51461,451.75686 L 210.51461,442.31936 L 210.51461,432.88186 L 220.51461,432.88186 L 230.51461,432.88186 L 230.51461,422.88186 L 230.51461,412.88186 L 239.95211,412.88186 L 249.38961,412.88186 L 249.38961,422.88186 L 249.38961,432.88186 L 259.38961,432.88186 L 269.38961,432.88186 L 269.38961,442.29922 L 269.38961,451.71657 L 259.48837,451.80462 C 254.04269,451.85304 249.56059,451.91921 249.52814,451.95166 C 249.4957,451.9841 249.4438,456.45355 249.41281,461.88375 L 249.35647,471.75686 L 239.93553,471.75686 L 230.51461,471.75686 L 230.51461,461.75686 z"
-       id="path2665" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 290,492.36218 L 290,552.36218 L 350,522.36218 L 290,492.36218"
-       id="path2671" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 270,492.36218 L 270,552.36218 L 210,522.36218 L 270,492.36218 z"
-       id="path2693" />
-    <path
-       style="fill:#000080;stroke:#000080;stroke-width:0.25"
-       d="M 240.20457,536.83815 L 211.33001,522.3832 L 240.39207,507.85173 L 269.45414,493.32027 L 269.45414,522.32048 C 269.45414,538.2706 269.36977,551.31449 269.26664,551.3069 C 269.16352,551.29932 256.08559,544.78838 240.20457,536.83815 L 240.20457,536.83815 z"
-       id="path2695" />
-    <path
-       style="fill:#000080;stroke:#000080;stroke-width:0.17677669"
-       d="M 290.63836,522.35468 L 290.63836,493.36345 L 319.54135,507.81462 C 335.438,515.76276 348.44434,522.30579 348.44434,522.35468 C 348.44434,522.40357 335.438,528.9466 319.54135,536.89474 L 290.63836,551.34592 L 290.63836,522.35468 z"
-       id="path2699" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#333333;stroke:#333333"
-       id="path2701"
-       sodipodi:cx="395"
-       sodipodi:cy="437.36218"
-       sodipodi:rx="25"
-       sodipodi:ry="25"
-       d="M 420,437.36218 A 25,25 0 1 1 370,437.36218 A 25,25 0 1 1 420,437.36218 z" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ff0000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path2719"
-       sodipodi:cx="395"
-       sodipodi:cy="437.36218"
-       sodipodi:rx="20"
-       sodipodi:ry="20"
-       d="M 415,437.36218 A 20,20 0 1 1 375,437.36218 A 20,20 0 1 1 415,437.36218 z" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ff0000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path2721"
-       sodipodi:cx="397.5"
-       sodipodi:cy="427.36218"
-       sodipodi:rx="7.5"
-       sodipodi:ry="5"
-       d="M 405,427.36218 A 7.5,5 0 1 1 390,427.36218 A 7.5,5 0 1 1 405,427.36218 z" />
-    <path
-       style="fill:#ffffff;stroke:#ffffff;stroke-width:0.0625"
-       d="M 396.40505,431.78003 C 393.90342,431.51926 391.71813,430.33043 390.91373,428.79266 C 390.63166,428.25345 390.55121,427.93328 390.55245,427.35502 C 390.55664,425.41012 392.48824,423.72192 395.42639,423.09525 C 396.3054,422.90777 398.04503,422.86095 398.9841,422.99949 C 401.94894,423.4369 404.16765,425.04505 404.42416,426.94252 C 404.63476,428.50042 403.6196,429.9743 401.6863,430.91754 C 400.1573,431.66351 398.25994,431.97338 396.40505,431.78003 L 396.40505,431.78003 z"
-       id="path2795" />
-    <path
-       style="fill:#ffffff;stroke:#ffffff;stroke-width:0.125"
-       d="M 392.24549,456.60881 C 386.70401,455.70262 382.29466,452.99009 379.09875,448.52127 C 377.89989,446.84491 376.70959,444.28958 376.18554,442.26721 C 375.37972,439.15744 375.40801,435.24586 376.25824,432.21582 C 378.01501,425.95507 382.67594,421.03153 388.82789,418.93798 C 392.63538,417.64226 397.2271,417.61758 401.00444,418.87254 C 407.43261,421.0082 412.26728,426.21771 413.86422,432.72939 C 414.62698,435.83962 414.58184,439.43445 413.74155,442.49733 C 412.03775,448.70775 407.27525,453.74587 401.18786,455.77755 C 399.19674,456.44209 397.77246,456.67918 395.44194,456.73402 C 393.98969,456.76819 392.97773,456.72855 392.24549,456.60881 L 392.24549,456.60881 z M 399.94194,432.61467 C 401.72083,432.22993 402.97481,431.58395 404.07443,430.48584 C 405.16512,429.39664 405.44256,428.76018 405.43945,427.35439 C 405.43632,425.93575 405.15498,425.29973 404.04444,424.20074 C 402.48773,422.6602 400.28133,421.87586 397.50444,421.87586 C 394.69181,421.87586 392.53733,422.64516 390.94562,424.21782 C 389.93874,425.21266 389.58401,425.94993 389.5267,427.16689 C 389.46195,428.54207 389.79909,429.36072 390.868,430.42388 C 392.24357,431.79204 393.818,432.49117 396.31694,432.84351 C 396.98888,432.93825 399.04637,432.80837 399.94194,432.61467 L 399.94194,432.61467 z"
-       id="path2803" />
-    <path
-       style="fill:#ffffff;stroke:#ffffff;stroke-width:0.125"
-       d="M 393.25444,456.74543 C 393.22006,456.70962 392.88256,456.64898 392.50444,456.61066 C 391.59836,456.51885 390.20542,456.21857 389.50444,455.96393 C 389.19506,455.85155 388.81585,455.73491 388.66174,455.70474 C 388.50764,455.67457 387.88631,455.43508 387.28101,455.17255 C 382.75258,453.20846 379.20668,449.65924 377.20381,445.0859 C 376.61644,443.74471 376.05402,441.99953 375.9413,441.16836 C 375.90763,440.92005 375.83835,440.43564 375.78734,440.09189 C 375.66339,439.25644 375.67126,435.42195 375.79902,434.40793 C 376.43391,429.36881 379.67726,424.28337 384.18604,421.25747 C 385.84314,420.14537 388.28197,418.99085 389.53704,418.72435 C 389.69098,418.69166 390.12631,418.58028 390.50444,418.47683 C 392.60819,417.90126 396.63247,417.80968 398.72391,418.28978 C 399.05007,418.36466 399.45362,418.45213 399.62068,418.48417 C 399.78773,418.51622 399.97034,418.57081 400.02646,418.6055 C 400.08258,418.64018 400.22714,418.69079 400.34772,418.71795 C 400.46829,418.74512 400.68039,418.79243 400.81906,418.82308 C 401.39482,418.95035 403.13989,419.69463 404.16113,420.24847 C 408.15716,422.41564 411.3683,425.9738 412.98814,430.02939 C 413.43266,431.14233 413.9427,432.8687 414.05912,433.65439 C 414.10496,433.96376 414.18096,434.47001 414.22801,434.77939 C 414.34037,435.51818 414.33825,439.30986 414.22508,440.02939 C 414.17642,440.33876 414.10959,440.77432 414.07657,440.9973 C 413.76382,443.10889 412.58742,445.98714 411.17188,448.10402 C 408.70302,451.7961 404.93637,454.62602 400.81501,455.88521 C 399.49737,456.28779 399.07594,456.37888 397.56694,456.5873 C 396.80919,456.69195 393.32572,456.81968 393.25444,456.74543 z M 399.44194,432.70776 C 399.79065,432.64463 400.4488,432.49793 400.87368,432.38864 C 400.97364,432.36292 401.54164,432.10302 402.13591,431.81108 C 403.39703,431.19153 404.58623,430.10302 405.09167,429.10558 C 405.34962,428.59653 405.41556,428.28185 405.42169,427.53065 C 405.4259,427.01433 405.393,426.4332 405.34856,426.23924 C 405.10011,425.15482 403.61615,423.61143 402.10312,422.86382 C 401.58093,422.60581 401.03124,422.37112 400.88158,422.3423 C 400.73192,422.31348 400.50595,422.25704 400.37944,422.21689 C 399.22167,421.84943 396.47054,421.7729 395.25444,422.07433 C 395.08256,422.11693 394.80131,422.17495 394.62944,422.20327 C 392.94157,422.48135 390.49769,424.2901 389.85903,425.73391 C 389.3489,426.88715 389.4493,428.42093 390.10293,429.45978 C 390.84082,430.63255 392.47474,431.81322 394.06694,432.32417 C 395.61812,432.82197 397.90831,432.98541 399.44194,432.70776 L 399.44194,432.70776 z"
-       id="path2805" />
-    <path
-       style="fill:#00ffff;stroke:#00ffff"
-       d="M 392.59113,456.69202 C 385.67882,455.69398 380.19025,451.65725 377.32129,445.46138 C 376.06651,442.75154 375.58919,440.49094 375.60124,437.31531 C 375.614,433.95444 376.13429,431.62149 377.47926,428.89448 C 380.38398,423.00494 385.94469,418.95478 392.30988,418.09257 C 393.35533,417.95096 395.83692,417.90198 396.93488,418.00128 C 401.35175,418.40077 405.52354,420.39186 408.78099,423.65513 C 411.19618,426.07463 412.81325,428.83702 413.7408,432.12781 C 414.73642,435.66013 414.65616,439.90987 413.52915,443.33474 C 412.81235,445.51303 411.60182,447.76157 410.20849,449.50281 C 409.64155,450.21131 408.23338,451.647 407.49738,452.26689 C 405.46957,453.97481 403.13749,455.23518 400.59333,455.99818 C 398.94001,456.49401 397.84781,456.66291 395.71613,456.75239 C 393.86449,456.83011 393.49861,456.82304 392.59113,456.69202 L 392.59113,456.69202 z M 398.62238,432.7492 C 400.55539,432.57255 402.16692,431.94872 403.54632,430.84313 C 404.48919,430.08742 405.15432,429.14129 405.31245,428.33084 C 405.43015,427.72755 405.36201,426.37641 405.19147,425.93198 C 405.00054,425.43445 404.53484,424.80038 403.95255,424.24515 C 402.73251,423.0818 401.38729,422.41995 399.55988,422.08392 C 399.09805,421.999 398.6259,421.97487 397.43488,421.97533 C 396.00926,421.97587 395.84908,421.98756 395.11296,422.14472 C 393.76408,422.4327 392.88327,422.81851 391.89177,423.55568 C 390.51325,424.58059 389.85323,425.48661 389.64443,426.64062 C 389.42852,427.83388 389.73823,429.00479 390.51921,429.94794 C 391.16168,430.72379 392.36693,431.59041 393.41754,432.03191 C 394.12523,432.32931 395.17182,432.59338 395.99892,432.68324 C 396.35901,432.72236 396.738,432.76386 396.84113,432.77547 C 397.25221,432.82175 397.93936,432.81162 398.62238,432.7492 L 398.62238,432.7492 z"
-       id="path2807" />
-    <path
-       style="fill:#ffffff;stroke:#ffffff;stroke-width:0.0625"
-       d="M 396.12238,431.74456 C 395.96769,431.71373 395.75513,431.67682 395.65002,431.66255 C 395.36998,431.62453 394.43353,431.38055 394.21613,431.28896 C 394.113,431.24552 393.8758,431.14953 393.68901,431.07566 C 392.96909,430.79095 392.30587,430.35659 391.71689,429.78406 C 391.22691,429.30777 391.0963,429.13607 390.86468,428.66377 C 390.59135,428.10644 390.59113,428.10542 390.59205,427.41377 C 390.59316,426.57933 390.68865,426.25703 391.13053,425.59638 C 391.70633,424.73547 392.59288,424.08508 393.93624,423.53803 C 394.30402,423.38826 395.1543,423.14082 395.46613,423.09281 C 396.12472,422.99141 396.4417,422.97294 397.52863,422.97262 C 398.72399,422.97227 399.00703,422.99341 399.7144,423.13588 C 400.57979,423.31017 401.85425,423.83808 402.56636,424.31721 C 403.32687,424.82891 404.15936,425.82298 404.27875,426.36196 C 404.2921,426.42224 404.33182,426.56677 404.36701,426.68313 C 404.47063,427.02576 404.40778,427.98309 404.25554,428.38086 C 403.87353,429.37899 402.98502,430.25838 401.71613,430.89421 C 401.23374,431.13593 400.31416,431.47493 400.01142,431.52264 C 399.90479,431.53945 399.7938,431.56787 399.76479,431.5858 C 399.73577,431.60373 399.57233,431.63719 399.40158,431.66015 C 399.23083,431.68312 399.00675,431.71541 398.90363,431.73192 C 398.53983,431.79017 396.39997,431.79989 396.12238,431.74456 z"
-       id="path2809" />
-    <path
-       style="fill:#ffffff;stroke:#ffffff;stroke-width:0.0625"
-       d="M 396.21613,431.77674 C 394.84895,431.57823 393.53721,431.12261 392.59113,430.51762 C 391.91553,430.0856 391.13823,429.2614 390.84604,428.66723 C 390.63176,428.23149 390.60073,428.10944 390.57392,427.59692 C 390.53746,426.89977 390.61978,426.50146 390.91992,425.92294 C 391.67088,424.47545 393.74693,423.28681 396.02491,423.00008 C 396.90844,422.88887 399.00337,422.95516 399.68488,423.1159 C 400.72988,423.36237 401.91889,423.8528 402.58869,424.31363 C 403.40225,424.87337 404.10146,425.74002 404.32,426.45952 C 404.49012,427.01958 404.45942,427.91955 404.25267,428.43369 C 403.65254,429.92607 401.89277,431.13698 399.59113,431.64135 C 399.15495,431.73693 398.73388,431.76903 397.71613,431.78429 C 396.99425,431.79511 396.31925,431.79172 396.21613,431.77674 L 396.21613,431.77674 z"
-       id="path2811" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 413,455.36218 L 425,467.36218 L 420,472.36218 L 407,459.36218"
-       id="path2851" />
-    <path
-       style="fill:#333333;stroke:#333333"
-       d="M 413.31301,466.35544 L 406.66136,459.70335 L 406.9926,459.37211 L 407.32383,459.04088 L 413.66655,465.38314 L 420.00926,471.7254 L 422.19674,469.53793 L 424.38421,467.35045 L 418.59522,461.56204 C 415.41128,458.37842 412.79561,455.74177 412.78263,455.70281 C 412.76964,455.66385 412.88981,455.50521 413.04967,455.35027 L 413.34032,455.06856 L 419.48091,461.20962 L 425.62151,467.35069 L 422.79309,470.17911 L 419.96468,473.00753 L 413.31301,466.35544 z M 413.86627,465.49448 C 410.5122,462.14014 407.81129,459.39568 407.86427,459.39568 C 407.91724,459.39568 408.47243,459.05386 409.09802,458.63608 C 410.07338,457.98471 410.85175,457.37832 412.37282,456.08482 L 412.68027,455.82336 L 418.44383,461.58692 L 424.20739,467.35048 L 422.086,469.47188 L 419.96459,471.59328 L 413.86627,465.49448 z"
-       id="path2889" />
-  </g>
-</svg>

Binary file qtmobility/examples/servicenotesmanager/icons/nextIcon.png has changed

Binary file qtmobility/examples/servicenotesmanager/icons/prevIcon.png has changed

Binary file qtmobility/examples/servicenotesmanager/icons/searchIcon.png has changed

--- a/qtmobility/examples/servicenotesmanager/icons/todotool.ui	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,305 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ToDoToolDiaog</class>
- <widget class="QDialog" name="ToDoToolDiaog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>222</width>
-    <height>264</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>ToDoTool</string>
-  </property>
-  <widget class="QPushButton" name="addButton">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>40</y>
-     <width>61</width>
-     <height>31</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="icon">
-    <iconset>
-     <normaloff>addIcon.png</normaloff>addIcon.png</iconset>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="deleteButton">
-   <property name="geometry">
-    <rect>
-     <x>80</x>
-     <y>40</y>
-     <width>61</width>
-     <height>31</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="icon">
-    <iconset>
-     <normaloff>deleteIcon.png</normaloff>deleteIcon.png</iconset>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="searchButton">
-   <property name="geometry">
-    <rect>
-     <x>140</x>
-     <y>40</y>
-     <width>61</width>
-     <height>31</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="icon">
-    <iconset>
-     <normaloff>searchIcon.png</normaloff>searchIcon.png</iconset>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="prevButton">
-   <property name="geometry">
-    <rect>
-     <x>50</x>
-     <y>80</y>
-     <width>41</width>
-     <height>31</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="icon">
-    <iconset>
-     <normaloff>prevIcon.png</normaloff>prevIcon.png</iconset>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="nextButton">
-   <property name="geometry">
-    <rect>
-     <x>130</x>
-     <y>80</y>
-     <width>41</width>
-     <height>31</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="icon">
-    <iconset>
-     <normaloff>nextIcon.png</normaloff>nextIcon.png</iconset>
-   </property>
-  </widget>
-  <widget class="QLabel" name="noteLabel">
-   <property name="geometry">
-    <rect>
-     <x>90</x>
-     <y>80</y>
-     <width>41</width>
-     <height>31</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>6/10</string>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignCenter</set>
-   </property>
-  </widget>
-  <widget class="QLabel" name="titleLabel">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>10</y>
-     <width>181</width>
-     <height>21</height>
-    </rect>
-   </property>
-   <property name="palette">
-    <palette>
-     <active>
-      <colorrole role="WindowText">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>0</red>
-         <green>0</green>
-         <blue>255</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Text">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>0</red>
-         <green>0</green>
-         <blue>0</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </active>
-     <inactive>
-      <colorrole role="WindowText">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>0</red>
-         <green>0</green>
-         <blue>255</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Text">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>0</red>
-         <green>0</green>
-         <blue>0</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </inactive>
-     <disabled>
-      <colorrole role="WindowText">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>126</red>
-         <green>125</green>
-         <blue>124</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Text">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>126</red>
-         <green>125</green>
-         <blue>124</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </disabled>
-    </palette>
-   </property>
-   <property name="font">
-    <font>
-     <family>Nimbus Roman No9 L</family>
-     <pointsize>24</pointsize>
-     <weight>75</weight>
-     <italic>true</italic>
-     <bold>true</bold>
-    </font>
-   </property>
-   <property name="text">
-    <string>ToDoTool</string>
-   </property>
-   <property name="textFormat">
-    <enum>Qt::AutoText</enum>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignCenter</set>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>120</y>
-     <width>161</width>
-     <height>131</height>
-    </rect>
-   </property>
-   <property name="palette">
-    <palette>
-     <active>
-      <colorrole role="Base">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>255</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Window">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </active>
-     <inactive>
-      <colorrole role="Base">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>255</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Window">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </inactive>
-     <disabled>
-      <colorrole role="Base">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Window">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </disabled>
-    </palette>
-   </property>
-   <property name="font">
-    <font>
-     <family>Comic Sans MS</family>
-     <pointsize>18</pointsize>
-     <italic>true</italic>
-    </font>
-   </property>
-   <property name="autoFillBackground">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Service the car nand buy tyres</string>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignCenter</set>
-   </property>
-   <property name="wordWrap">
-    <bool>true</bool>
-   </property>
-  </widget>
- </widget>
- <resources/>
- <connections/>
-</ui>

--- a/qtmobility/examples/servicenotesmanager/servicenotesmanager.pro	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = declarative-sfw-notes sfw-notes

--- a/qtmobility/examples/servicenotesmanager/sfw-notes/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 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 <QApplication>
-#include "sfwnotes.h"
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-    ToDoTool dialog;
-    
-#ifdef Q_OS_SYMBIAN
-    dialog.showMaximused();
-#else
-    dialog.show();
-#endif
-
-    return app.exec();
-}
-

--- a/qtmobility/examples/servicenotesmanager/sfw-notes/sfw-notes.pro	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-TEMPLATE = app
-TARGET = sfw-notes
-INCLUDEPATH += ../../../src/serviceframework
-
-include(../../examples.pri)
-
-QT += gui
-
-# Input 
-HEADERS += sfwnotes.h
-SOURCES += sfwnotes.cpp \
-           main.cpp
-
-CONFIG += mobility
-MOBILITY = serviceframework
-
-RESOURCES += sfwnotes.qrc
-
-win32 {
-    FORMS += sfwnotes.ui
-}
-
-unix: {
-    linux-*: {
-        FORMS += sfwnotes.ui
-    }
-
-    mac: {
-        FORMS += sfwnotes.ui
-    }
-}
-
-symbian {
-    #addFiles.sources = ../../notesmanagerplugin/notesmanagerservice.xml
-    #addFiles.path = xmldata
-    #DEPLOYMENT += addFiles
-
-    #TARGET.CAPABILITY = ReadUserData WriteUserData
-    #FORMS += sfwnotes.ui #change to sfwnotes_small.ui
-}

--- a/qtmobility/examples/servicenotesmanager/sfw-notes/sfwnotes.cpp	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,235 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 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 <QtGui>
-
-#include <qservicemanager.h>
-#include <qserviceinterfacedescriptor.h>
-
-#include "sfwnotes.h"
-
-Q_DECLARE_METATYPE(QServiceInterfaceDescriptor)
-
-ToDoTool::ToDoTool(QWidget *parent, Qt::WindowFlags flags)
-    : QWidget(parent, flags)
-{
-    setupUi(this);
-
-    serviceManager = new QServiceManager(this);
-
-    registerExampleServices();
-
-    setWindowTitle(tr("ToDoTool"));
-
-    init();
-}
-
-ToDoTool::~ToDoTool()
-{
-    unregisterExampleServices();
-}
-
-void ToDoTool::soundAlarm(const QDateTime& alarm)
-{
-    QString message = notesManager->property("alarmMessage").toString();
-
-    QMessageBox msgBox;
-    msgBox.setWindowTitle("Alert");
-    msgBox.setText("ALARM SOUNDED!!!\n\n" +alarm.toString("yyyy-MM-dd HH:mm") + "\n\n" + message);
-    msgBox.resize(200, msgBox.height());
-    msgBox.exec();
-}
-
-void ToDoTool::init()
-{
-    QServiceManager mgr;
-    QServiceFilter filter;
-    filter.setServiceName("NotesManagerService");
-    QList<QServiceInterfaceDescriptor> list = serviceManager->findInterfaces(filter);
-
-    notesManager = mgr.loadInterface(list[0]);
-
-    if (notesManager)
-        notesManager->setParent(this);
-
-    {
-        currentNote = 1;
-        searchWord = "";    
-        refreshList();
-
-        QObject::connect(notesManager, SIGNAL(soundAlarm(QDateTime)), 
-                         this, SLOT(soundAlarm(QDateTime)));
-    }
-}
-
-void ToDoTool::registerExampleServices()
-{
-    QStringList exampleXmlFiles;
-    exampleXmlFiles << "notesmanagerservice.xml";
-    foreach (const QString &fileName, exampleXmlFiles) {
-        QString path = QCoreApplication::applicationDirPath() + "/xmldata/" + fileName;
-        serviceManager->addService(path);
-    }
-}
-
-void ToDoTool::unregisterExampleServices()
-{
-    serviceManager->removeService("NotesManagerService");
-}
-
-void ToDoTool::refreshList()
-{
-        QMetaObject::invokeMethod(notesManager, "getNotes", 
-                                  Q_RETURN_ARG(QList<QObject*>, ret),
-                                  Q_ARG(QString, searchWord)); 
-
-        totalNotes = ret.size();
-    
-        if (totalNotes < 1) { currentNote = 0; }
-        else if (totalNotes > 0 && currentNote == 0) { currentNote = 1; }
-        
-        refreshNotes();
-}
-
-void ToDoTool::refreshNotes()
-{
-    countLabel->setText(QString::number(currentNote) + "/" + QString::number(totalNotes));
-    
-    if (currentNote == 0) {
-        dateLabel->setText("");
-        noteLabel->setText("Click + to add a note");
-    }
-    else {
-        QDateTime alarm;
-        QMetaObject::invokeMethod(ret[currentNote-1], "alarm", Q_RETURN_ARG(QDateTime, alarm));
-        dateLabel->setText(alarm.toString("yyyy-MM-dd HH:mm"));
-
-        QString note;
-        QMetaObject::invokeMethod(ret[currentNote-1], "message", Q_RETURN_ARG(QString, note));
-        noteLabel->setText(note);
-    }
-}
-
-void ToDoTool::on_nextButton_clicked()
-{
-    if (currentNote < totalNotes) {
-        currentNote++;
-        refreshNotes();
-    }
-}
-
-void ToDoTool::on_prevButton_clicked()
-{
-    if (currentNote > 1) {
-        currentNote--;
-        refreshNotes();
-    }
-}
-
-void ToDoTool::on_addButton_clicked()
-{
-    // re-implement date-time input method
-
-    bool ok;
-    QString newNote = QInputDialog::getText(this, tr("ToDoTool"), 
-                                            tr("Add a new note + alarm of format:\nnote#yyyy-mm-dd#hh:mm"), 
-                                            QLineEdit::Normal, "", &ok);
-
-    if (ok && !newNote.isEmpty()) {
-        QStringList note = newNote.split(QRegExp("#"));
-      
-        if (note.size() == 3) {
-
-            QStringList date = note.at(1).split("-");
-            QStringList time = note.at(2).split(":");
-
-            if (date.size() == 3 && time.size() == 2) {
-                QDateTime alarm = QDateTime::fromString(note.at(1)+" "+note.at(2),"yyyy-MM-dd HH:mm");
-                QMetaObject::invokeMethod(notesManager, "addNote",
-                                          Q_ARG(QString, note.at(0)),
-                                          Q_ARG(QDateTime, alarm));
-            }
-        } else {
-                QMetaObject::invokeMethod(notesManager, "addNote",
-                                          Q_ARG(QString, note.at(0)),
-                                          Q_ARG(QDateTime, QDateTime::currentDateTime()));
-        }
-
-        refreshList();
-    }
-}
-
-void ToDoTool::on_deleteButton_clicked()
-{
-    if (currentNote != 0) {
-        QMessageBox msgBox;
-        msgBox.setText("Confirm removing this note?");
-        msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
-        
-        if (msgBox.exec() == QMessageBox::Ok) {
-            int index;
-            QMetaObject::invokeMethod(ret[currentNote-1], "index", Q_RETURN_ARG(int, index));
-
-            QMetaObject::invokeMethod(notesManager, "removeNote", Q_ARG(int, index));
-            if (currentNote > 1)
-                currentNote--;
-
-            refreshList();
-        }
-    }
-}
-
-void ToDoTool::on_searchButton_clicked()
-{
-    bool ok;
-    QString searchNote = QInputDialog::getText(this, tr("ToDoTool"), tr("Find a note:"),
-                                               QLineEdit::Normal, "", &ok);
-    if (ok) {
-        if (searchNote.isEmpty())
-            searchWord = "";
-        else
-            searchWord = searchNote;
-        
-        currentNote = 1;
-        refreshList();
-    }
-}
-

--- a/qtmobility/examples/servicenotesmanager/sfw-notes/sfwnotes.h	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 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$
-**
-****************************************************************************/
-
-#ifndef SFWNOTES_H
-#define SFWNOTES_H
-
-#include <QWidget>
-#include <QObject>
-#include <QDateTime>
-#include <qmobilityglobal.h>
-
-//#ifdef Q_OS_SYMBIAN
-//#include "ui_sfwnotes.h"
-//#else
-#include "ui_sfwnotes.h"
-//#endif
-
-QTM_BEGIN_NAMESPACE
-class QServiceManager;
-QTM_END_NAMESPACE
-
-QTM_USE_NAMESPACE
-
-class ToDoTool : public QWidget, public Ui_ToDoTool
-{
-    Q_OBJECT
-public:
-    ToDoTool(QWidget *parent = 0, Qt::WindowFlags flags = 0);
-    ~ToDoTool();
-
-private slots:
-    void on_nextButton_clicked();
-    void on_prevButton_clicked();
-    void on_addButton_clicked();
-    void on_deleteButton_clicked();
-    void on_searchButton_clicked();
-    void soundAlarm(const QDateTime &alarm);
-
-private:
-    void init();
-    void refreshList();
-    void refreshNotes();
-    void registerExampleServices();
-    void unregisterExampleServices();
-
-    QServiceManager *serviceManager;
-    QObject *notesManager;
-
-    QList<QObject*> ret;
-
-    QString searchWord;
-    int currentNote;
-    int totalNotes;
-
-};
-
-#endif
-

--- a/qtmobility/examples/servicenotesmanager/sfw-notes/sfwnotes.qrc	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-<RCC>
-  <qresource prefix="/" >
-    <file>../icons/searchIcon.png</file>
-    <file>../icons/nextIcon.png</file>
-    <file>../icons/prevIcon.png</file>
-    <file>../icons/deleteIcon.png</file>
-    <file>../icons/addIcon.png</file>
-  </qresource>
-</RCC>

--- a/qtmobility/examples/servicenotesmanager/sfw-notes/sfwnotes.ui	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,398 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ToDoTool</class>
- <widget class="QWidget" name="ToDoTool">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>220</width>
-    <height>265</height>
-   </rect>
-  </property>
-  <property name="contextMenuPolicy">
-   <enum>Qt::DefaultContextMenu</enum>
-  </property>
-  <property name="windowTitle">
-   <string>ToDoTool</string>
-  </property>
-  <widget class="QPushButton" name="addButton">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>40</y>
-     <width>60</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="icon">
-    <iconset resource="todotool-designer.qrc">
-     <normaloff>:/icons/addIcon.png</normaloff>:/icons/addIcon.png</iconset>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="deleteButton">
-   <property name="geometry">
-    <rect>
-     <x>80</x>
-     <y>40</y>
-     <width>60</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="icon">
-    <iconset resource="todotool-designer.qrc">
-     <normaloff>:/icons/deleteIcon.png</normaloff>:/icons/deleteIcon.png</iconset>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="searchButton">
-   <property name="geometry">
-    <rect>
-     <x>140</x>
-     <y>40</y>
-     <width>60</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="icon">
-    <iconset resource="todotool-designer.qrc">
-     <normaloff>:/icons/searchIcon.png</normaloff>:/icons/searchIcon.png</iconset>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="prevButton">
-   <property name="geometry">
-    <rect>
-     <x>50</x>
-     <y>80</y>
-     <width>40</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="icon">
-    <iconset resource="todotool-designer.qrc">
-     <normaloff>:/icons/prevIcon.png</normaloff>:/icons/prevIcon.png</iconset>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="nextButton">
-   <property name="geometry">
-    <rect>
-     <x>130</x>
-     <y>80</y>
-     <width>40</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="icon">
-    <iconset resource="todotool-designer.qrc">
-     <normaloff>:/icons/nextIcon.png</normaloff>:/icons/nextIcon.png</iconset>
-   </property>
-  </widget>
-  <widget class="QLabel" name="countLabel">
-   <property name="geometry">
-    <rect>
-     <x>90</x>
-     <y>80</y>
-     <width>40</width>
-     <height>30</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>0/0</string>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignCenter</set>
-   </property>
-  </widget>
-  <widget class="QLabel" name="titleLabel">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>10</y>
-     <width>180</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="palette">
-    <palette>
-     <active>
-      <colorrole role="WindowText">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>0</red>
-         <green>0</green>
-         <blue>255</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Text">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>0</red>
-         <green>0</green>
-         <blue>0</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </active>
-     <inactive>
-      <colorrole role="WindowText">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>0</red>
-         <green>0</green>
-         <blue>255</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Text">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>0</red>
-         <green>0</green>
-         <blue>0</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </inactive>
-     <disabled>
-      <colorrole role="WindowText">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>126</red>
-         <green>125</green>
-         <blue>124</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Text">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>126</red>
-         <green>125</green>
-         <blue>124</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </disabled>
-    </palette>
-   </property>
-   <property name="font">
-    <font>
-     <family>Nimbus Roman No9 L</family>
-     <pointsize>24</pointsize>
-     <weight>75</weight>
-     <italic>true</italic>
-     <bold>true</bold>
-    </font>
-   </property>
-   <property name="text">
-    <string>ToDoTool</string>
-   </property>
-   <property name="textFormat">
-    <enum>Qt::AutoText</enum>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignCenter</set>
-   </property>
-  </widget>
-  <widget class="QLabel" name="noteLabel">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>140</y>
-     <width>160</width>
-     <height>110</height>
-    </rect>
-   </property>
-   <property name="palette">
-    <palette>
-     <active>
-      <colorrole role="Base">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>255</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Window">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </active>
-     <inactive>
-      <colorrole role="Base">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>255</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Window">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </inactive>
-     <disabled>
-      <colorrole role="Base">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Window">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </disabled>
-    </palette>
-   </property>
-   <property name="font">
-    <font>
-     <family>Comic Sans MS</family>
-     <pointsize>18</pointsize>
-     <italic>true</italic>
-    </font>
-   </property>
-   <property name="autoFillBackground">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Service the car and buy tyres</string>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignCenter</set>
-   </property>
-   <property name="wordWrap">
-    <bool>true</bool>
-   </property>
-  </widget>
-  <widget class="QLabel" name="dateLabel">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>120</y>
-     <width>160</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <property name="palette">
-    <palette>
-     <active>
-      <colorrole role="Base">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Window">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </active>
-     <inactive>
-      <colorrole role="Base">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Window">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </inactive>
-     <disabled>
-      <colorrole role="Base">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Window">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </disabled>
-    </palette>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="autoFillBackground">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Jan 1, 2010 - 8:00PM </string>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-   </property>
-  </widget>
- </widget>
- <resources>
-  <include location="todotool-designer.qrc"/>
- </resources>
- <connections/>
-</ui>

--- a/qtmobility/examples/servicenotesmanager/sfw-notes/sfwnotes_small.ui	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,398 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ToDoTool</class>
- <widget class="QWidget" name="ToDoTool">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>221</width>
-    <height>264</height>
-   </rect>
-  </property>
-  <property name="contextMenuPolicy">
-   <enum>Qt::DefaultContextMenu</enum>
-  </property>
-  <property name="windowTitle">
-   <string>ToDoTool</string>
-  </property>
-  <widget class="QPushButton" name="addButton">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>40</y>
-     <width>61</width>
-     <height>31</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="icon">
-    <iconset resource="resource.qrc">
-     <normaloff>:/icons/icons/addIcon.png</normaloff>:/icons/icons/addIcon.png</iconset>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="deleteButton">
-   <property name="geometry">
-    <rect>
-     <x>80</x>
-     <y>40</y>
-     <width>61</width>
-     <height>31</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="icon">
-    <iconset resource="resource.qrc">
-     <normaloff>:/icons/icons/deleteIcon.png</normaloff>:/icons/icons/deleteIcon.png</iconset>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="searchButton">
-   <property name="geometry">
-    <rect>
-     <x>140</x>
-     <y>40</y>
-     <width>61</width>
-     <height>31</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="icon">
-    <iconset resource="resource.qrc">
-     <normaloff>:/icons/icons/searchIcon.png</normaloff>:/icons/icons/searchIcon.png</iconset>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="prevButton">
-   <property name="geometry">
-    <rect>
-     <x>50</x>
-     <y>80</y>
-     <width>41</width>
-     <height>31</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="icon">
-    <iconset resource="resource.qrc">
-     <normaloff>:/icons/icons/prevIcon.png</normaloff>:/icons/icons/prevIcon.png</iconset>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="nextButton">
-   <property name="geometry">
-    <rect>
-     <x>130</x>
-     <y>80</y>
-     <width>41</width>
-     <height>31</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="icon">
-    <iconset resource="resource.qrc">
-     <normaloff>:/icons/icons/nextIcon.png</normaloff>:/icons/icons/nextIcon.png</iconset>
-   </property>
-  </widget>
-  <widget class="QLabel" name="countLabel">
-   <property name="geometry">
-    <rect>
-     <x>90</x>
-     <y>80</y>
-     <width>41</width>
-     <height>31</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>0/0</string>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignCenter</set>
-   </property>
-  </widget>
-  <widget class="QLabel" name="titleLabel">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>10</y>
-     <width>181</width>
-     <height>21</height>
-    </rect>
-   </property>
-   <property name="palette">
-    <palette>
-     <active>
-      <colorrole role="WindowText">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>0</red>
-         <green>0</green>
-         <blue>255</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Text">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>0</red>
-         <green>0</green>
-         <blue>0</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </active>
-     <inactive>
-      <colorrole role="WindowText">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>0</red>
-         <green>0</green>
-         <blue>255</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Text">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>0</red>
-         <green>0</green>
-         <blue>0</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </inactive>
-     <disabled>
-      <colorrole role="WindowText">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>126</red>
-         <green>125</green>
-         <blue>124</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Text">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>126</red>
-         <green>125</green>
-         <blue>124</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </disabled>
-    </palette>
-   </property>
-   <property name="font">
-    <font>
-     <family>Nimbus Roman No9 L</family>
-     <pointsize>24</pointsize>
-     <weight>75</weight>
-     <italic>true</italic>
-     <bold>true</bold>
-    </font>
-   </property>
-   <property name="text">
-    <string>ToDoTool</string>
-   </property>
-   <property name="textFormat">
-    <enum>Qt::AutoText</enum>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignCenter</set>
-   </property>
-  </widget>
-  <widget class="QLabel" name="noteLabel">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>140</y>
-     <width>161</width>
-     <height>111</height>
-    </rect>
-   </property>
-   <property name="palette">
-    <palette>
-     <active>
-      <colorrole role="Base">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>255</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Window">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </active>
-     <inactive>
-      <colorrole role="Base">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>255</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Window">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </inactive>
-     <disabled>
-      <colorrole role="Base">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Window">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </disabled>
-    </palette>
-   </property>
-   <property name="font">
-    <font>
-     <family>Comic Sans MS</family>
-     <pointsize>18</pointsize>
-     <italic>true</italic>
-    </font>
-   </property>
-   <property name="autoFillBackground">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Service the car nand buy tyres</string>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignCenter</set>
-   </property>
-   <property name="wordWrap">
-    <bool>true</bool>
-   </property>
-  </widget>
-  <widget class="QLabel" name="dateLabel">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>120</y>
-     <width>161</width>
-     <height>21</height>
-    </rect>
-   </property>
-   <property name="palette">
-    <palette>
-     <active>
-      <colorrole role="Base">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Window">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </active>
-     <inactive>
-      <colorrole role="Base">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Window">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </inactive>
-     <disabled>
-      <colorrole role="Base">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-      <colorrole role="Window">
-       <brush brushstyle="SolidPattern">
-        <color alpha="255">
-         <red>255</red>
-         <green>255</green>
-         <blue>127</blue>
-        </color>
-       </brush>
-      </colorrole>
-     </disabled>
-    </palette>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>10</pointsize>
-    </font>
-   </property>
-   <property name="autoFillBackground">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Jan 1, 2010 - 8:00PM </string>
-   </property>
-   <property name="alignment">
-    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-   </property>
-  </widget>
- </widget>
- <resources>
-  <include location="resource.qrc"/>
- </resources>
- <connections/>
-</ui>

Binary file qtmobility/examples/sfw-notes/icons/addIcon.png has changed

Binary file qtmobility/examples/sfw-notes/icons/deleteIcon.png has changed

Binary file qtmobility/examples/sfw-notes/icons/nextIcon.png has changed

Binary file qtmobility/examples/sfw-notes/icons/prevIcon.png has changed

Binary file qtmobility/examples/sfw-notes/icons/searchIcon.png has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sfw-notes/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include "sfwnotes.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    ToDoTool dialog;
+    
+#ifdef Q_OS_SYMBIAN
+    dialog.showMaximused();
+#else
+    dialog.show();
+#endif
+
+    return app.exec();
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sfw-notes/sfw-notes.pro	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,40 @@
+TEMPLATE = app
+TARGET = sfw-notes
+INCLUDEPATH += ../../src/serviceframework
+
+include(../examples.pri)
+
+QT += gui
+
+# Input 
+HEADERS += sfwnotes.h
+SOURCES += sfwnotes.cpp \
+           main.cpp
+
+CONFIG += mobility
+MOBILITY = serviceframework
+
+RESOURCES += sfwnotes.qrc
+
+win32 {
+    FORMS += sfwnotes.ui
+}
+
+unix: {
+    linux-*: {
+        FORMS += sfwnotes.ui
+    }
+
+    mac: {
+        FORMS += sfwnotes.ui
+    }
+}
+
+symbian {
+    #addFiles.sources = ../../notesmanagerplugin/notesmanagerservice.xml
+    #addFiles.path = xmldata
+    #DEPLOYMENT += addFiles
+
+    #TARGET.CAPABILITY = ALL -TCB
+    #FORMS += sfwnotes.ui #change to sfwnotes_small.ui
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sfw-notes/sfwnotes.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,246 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include <qservicemanager.h>
+#include <qserviceinterfacedescriptor.h>
+
+#include "sfwnotes.h"
+
+ToDoTool::ToDoTool(QWidget *parent, Qt::WindowFlags flags)
+    : QWidget(parent, flags)
+{
+    setupUi(this);
+
+    serviceManager = new QServiceManager(this);
+
+    registerExampleServices();
+
+    setWindowTitle(tr("ToDoTool"));
+
+    init();
+}
+
+ToDoTool::~ToDoTool()
+{
+    unregisterExampleServices();
+}
+
+void ToDoTool::soundAlarm(const QDateTime& alarm)
+{
+    QString message = notesManager->property("alarmMessage").toString();
+
+    QMessageBox msgBox;
+    msgBox.setWindowTitle("Alert");
+    msgBox.setText("ALARM SOUNDED!!!\n\n" +alarm.toString("yyyy-MM-dd HH:mm") + "\n\n" + message);
+    msgBox.resize(200, msgBox.height());
+    msgBox.exec();
+}
+
+void ToDoTool::init()
+{
+    bool ok;
+    QString interfaceName = QInputDialog::getText(this, tr("ToDoTool"), tr("Specify Notes Manager interface:"),
+                                                  QLineEdit::Normal, "com.nokia.qt.examples.NotesManager", &ok);
+    if (ok) {
+        QServiceInterfaceDescriptor desc = serviceManager->interfaceDefault(interfaceName);
+        
+        if (desc.isValid()) {
+            QServiceManager mgr;
+            notesManager = mgr.loadInterface(desc);
+
+            if (notesManager)
+                notesManager->setParent(this);
+
+            currentNote = 1;
+            searchWord = "";    
+            refreshList();
+
+            addButton->setEnabled(true);
+            deleteButton->setEnabled(true);
+            searchButton->setEnabled(true);
+            nextButton->setEnabled(true);
+            prevButton->setEnabled(true);
+
+            QObject::connect(notesManager, SIGNAL(soundAlarm(QDateTime)), 
+                            this, SLOT(soundAlarm(QDateTime)));
+        } else {
+            QMessageBox msgBox;
+            msgBox.setWindowTitle(tr("ToDoTool"));
+            msgBox.setText("No valid default interface for:\n\n\"" + interfaceName + "\"");
+            msgBox.exec();
+        }
+    }
+}
+
+void ToDoTool::registerExampleServices()
+{
+    QStringList exampleXmlFiles;
+    exampleXmlFiles << "notesmanagerservice.xml";
+    foreach (const QString &fileName, exampleXmlFiles) {
+        QString path = QCoreApplication::applicationDirPath() + "/xmldata/" + fileName;
+        serviceManager->addService(path);
+    }
+}
+
+void ToDoTool::unregisterExampleServices()
+{
+    serviceManager->removeService("NotesManagerService");
+}
+
+void ToDoTool::refreshList()
+{
+        QMetaObject::invokeMethod(notesManager, "getNotes", 
+                                  Q_RETURN_ARG(QList<QObject*>, ret),
+                                  Q_ARG(QString, searchWord)); 
+
+        totalNotes = ret.size();
+    
+        if (totalNotes < 1) { currentNote = 0; }
+        else if (totalNotes > 0 && currentNote == 0) { currentNote = 1; }
+        
+        refreshNotes();
+}
+
+void ToDoTool::refreshNotes()
+{
+    countLabel->setText(QString::number(currentNote) + "/" + QString::number(totalNotes));
+    
+    if (currentNote == 0) {
+        dateLabel->setText("");
+        noteLabel->setText("Click + to add a note");
+    }
+    else {
+        QDateTime alarm;
+        QMetaObject::invokeMethod(ret[currentNote-1], "alarm", Q_RETURN_ARG(QDateTime, alarm));
+        dateLabel->setText(alarm.toString("yyyy-MM-dd HH:mm"));
+
+        QString note;
+        QMetaObject::invokeMethod(ret[currentNote-1], "message", Q_RETURN_ARG(QString, note));
+        noteLabel->setText(note);
+    }
+}
+
+void ToDoTool::on_nextButton_clicked()
+{
+    if (currentNote < totalNotes) {
+        currentNote++;
+        refreshNotes();
+    }
+}
+
+void ToDoTool::on_prevButton_clicked()
+{
+    if (currentNote > 1) {
+        currentNote--;
+        refreshNotes();
+    }
+}
+
+void ToDoTool::on_addButton_clicked()
+{
+    // re-implement date-time input method
+
+    bool ok;
+    QString newNote = QInputDialog::getText(this, tr("ToDoTool"), 
+                                            tr("Add a new note + alarm of format:\nnote#yyyy-mm-dd#hh:mm"), 
+                                            QLineEdit::Normal, "", &ok);
+
+    if (ok && !newNote.isEmpty()) {
+        QStringList note = newNote.split(QRegExp("#"));
+      
+        if (note.size() == 3) {
+
+            QStringList date = note.at(1).split("-");
+            QStringList time = note.at(2).split(":");
+
+            if (date.size() == 3 && time.size() == 2) {
+                QDateTime alarm = QDateTime::fromString(note.at(1)+" "+note.at(2),"yyyy-MM-dd HH:mm");
+                QMetaObject::invokeMethod(notesManager, "addNote",
+                                          Q_ARG(QString, note.at(0)),
+                                          Q_ARG(QDateTime, alarm));
+            }
+        } else {
+                QMetaObject::invokeMethod(notesManager, "addNote",
+                                          Q_ARG(QString, note.at(0)),
+                                          Q_ARG(QDateTime, QDateTime::currentDateTime()));
+        }
+
+        refreshList();
+    }
+}
+
+void ToDoTool::on_deleteButton_clicked()
+{
+    if (currentNote != 0) {
+        QMessageBox msgBox;
+        msgBox.setText("Confirm removing this note?");
+        msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
+        
+        if (msgBox.exec() == QMessageBox::Ok) {
+            int index;
+            QMetaObject::invokeMethod(ret[currentNote-1], "index", Q_RETURN_ARG(int, index));
+
+            QMetaObject::invokeMethod(notesManager, "removeNote", Q_ARG(int, index));
+            if (currentNote > 1)
+                currentNote--;
+
+            refreshList();
+        }
+    }
+}
+
+void ToDoTool::on_searchButton_clicked()
+{
+    bool ok;
+    QString searchNote = QInputDialog::getText(this, tr("ToDoTool"), tr("Find a note:"),
+                                               QLineEdit::Normal, "", &ok);
+    if (ok) {
+        if (searchNote.isEmpty())
+            searchWord = "";
+        else
+            searchWord = searchNote;
+        
+        currentNote = 1;
+        refreshList();
+    }
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sfw-notes/sfwnotes.h	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SFWNOTES_H
+#define SFWNOTES_H
+
+#include <QWidget>
+#include <QObject>
+#include <QDateTime>
+#include <qmobilityglobal.h>
+
+#include "ui_sfwnotes.h"
+
+QTM_BEGIN_NAMESPACE
+class QServiceManager;
+QTM_END_NAMESPACE
+
+QTM_USE_NAMESPACE
+
+class ToDoTool : public QWidget, public Ui_ToDoTool
+{
+    Q_OBJECT
+public:
+    ToDoTool(QWidget *parent = 0, Qt::WindowFlags flags = 0);
+    ~ToDoTool();
+
+private slots:
+    void on_nextButton_clicked();
+    void on_prevButton_clicked();
+    void on_addButton_clicked();
+    void on_deleteButton_clicked();
+    void on_searchButton_clicked();
+    void soundAlarm(const QDateTime &alarm);
+
+private:
+    void init();
+    void refreshList();
+    void refreshNotes();
+    void registerExampleServices();
+    void unregisterExampleServices();
+
+    QServiceManager *serviceManager;
+    QObject *notesManager;
+
+    QList<QObject*> ret;
+
+    QString searchWord;
+    int currentNote;
+    int totalNotes;
+
+};
+
+#endif
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sfw-notes/sfwnotes.qrc	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,9 @@
+<RCC>
+  <qresource prefix="/" >
+    <file>icons/searchIcon.png</file>
+    <file>icons/nextIcon.png</file>
+    <file>icons/prevIcon.png</file>
+    <file>icons/deleteIcon.png</file>
+    <file>icons/addIcon.png</file>
+  </qresource>
+</RCC>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sfw-notes/sfwnotes.ui	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,413 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ToDoTool</class>
+ <widget class="QWidget" name="ToDoTool">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>220</width>
+    <height>265</height>
+   </rect>
+  </property>
+  <property name="contextMenuPolicy">
+   <enum>Qt::DefaultContextMenu</enum>
+  </property>
+  <property name="windowTitle">
+   <string>ToDoTool</string>
+  </property>
+  <widget class="QPushButton" name="addButton">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>40</y>
+     <width>60</width>
+     <height>30</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="icon">
+    <iconset resource="sfwnotes.qrc">
+     <normaloff>:/icons/addIcon.png</normaloff>:/icons/addIcon.png</iconset>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="deleteButton">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="geometry">
+    <rect>
+     <x>80</x>
+     <y>40</y>
+     <width>60</width>
+     <height>30</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="icon">
+    <iconset resource="sfwnotes.qrc">
+     <normaloff>:/icons/deleteIcon.png</normaloff>:/icons/deleteIcon.png</iconset>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="searchButton">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="geometry">
+    <rect>
+     <x>140</x>
+     <y>40</y>
+     <width>60</width>
+     <height>30</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="icon">
+    <iconset resource="sfwnotes.qrc">
+     <normaloff>:/icons/searchIcon.png</normaloff>:/icons/searchIcon.png</iconset>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="prevButton">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="geometry">
+    <rect>
+     <x>50</x>
+     <y>80</y>
+     <width>40</width>
+     <height>30</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="icon">
+    <iconset resource="sfwnotes.qrc">
+     <normaloff>:/icons/prevIcon.png</normaloff>:/icons/prevIcon.png</iconset>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="nextButton">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="geometry">
+    <rect>
+     <x>130</x>
+     <y>80</y>
+     <width>40</width>
+     <height>30</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="icon">
+    <iconset resource="sfwnotes.qrc">
+     <normaloff>:/icons/nextIcon.png</normaloff>:/icons/nextIcon.png</iconset>
+   </property>
+  </widget>
+  <widget class="QLabel" name="countLabel">
+   <property name="geometry">
+    <rect>
+     <x>90</x>
+     <y>80</y>
+     <width>40</width>
+     <height>30</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>0/0</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="titleLabel">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>10</y>
+     <width>180</width>
+     <height>20</height>
+    </rect>
+   </property>
+   <property name="palette">
+    <palette>
+     <active>
+      <colorrole role="WindowText">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>0</red>
+         <green>0</green>
+         <blue>255</blue>
+        </color>
+       </brush>
+      </colorrole>
+      <colorrole role="Text">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>0</red>
+         <green>0</green>
+         <blue>0</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </active>
+     <inactive>
+      <colorrole role="WindowText">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>0</red>
+         <green>0</green>
+         <blue>255</blue>
+        </color>
+       </brush>
+      </colorrole>
+      <colorrole role="Text">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>0</red>
+         <green>0</green>
+         <blue>0</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </inactive>
+     <disabled>
+      <colorrole role="WindowText">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>126</red>
+         <green>125</green>
+         <blue>124</blue>
+        </color>
+       </brush>
+      </colorrole>
+      <colorrole role="Text">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>126</red>
+         <green>125</green>
+         <blue>124</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font">
+    <font>
+     <family>Nimbus Roman No9 L</family>
+     <pointsize>24</pointsize>
+     <weight>75</weight>
+     <italic>true</italic>
+     <bold>true</bold>
+    </font>
+   </property>
+   <property name="text">
+    <string>ToDoTool</string>
+   </property>
+   <property name="textFormat">
+    <enum>Qt::AutoText</enum>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="noteLabel">
+   <property name="geometry">
+    <rect>
+     <x>30</x>
+     <y>140</y>
+     <width>160</width>
+     <height>110</height>
+    </rect>
+   </property>
+   <property name="palette">
+    <palette>
+     <active>
+      <colorrole role="Base">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>255</blue>
+        </color>
+       </brush>
+      </colorrole>
+      <colorrole role="Window">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>127</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </active>
+     <inactive>
+      <colorrole role="Base">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>255</blue>
+        </color>
+       </brush>
+      </colorrole>
+      <colorrole role="Window">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>127</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </inactive>
+     <disabled>
+      <colorrole role="Base">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>127</blue>
+        </color>
+       </brush>
+      </colorrole>
+      <colorrole role="Window">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>127</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font">
+    <font>
+     <family>Comic Sans MS</family>
+     <pointsize>18</pointsize>
+     <italic>true</italic>
+    </font>
+   </property>
+   <property name="autoFillBackground">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Notes Manager service not found</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
+   <property name="wordWrap">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QLabel" name="dateLabel">
+   <property name="geometry">
+    <rect>
+     <x>30</x>
+     <y>120</y>
+     <width>160</width>
+     <height>20</height>
+    </rect>
+   </property>
+   <property name="palette">
+    <palette>
+     <active>
+      <colorrole role="Base">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>127</blue>
+        </color>
+       </brush>
+      </colorrole>
+      <colorrole role="Window">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>127</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </active>
+     <inactive>
+      <colorrole role="Base">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>127</blue>
+        </color>
+       </brush>
+      </colorrole>
+      <colorrole role="Window">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>127</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </inactive>
+     <disabled>
+      <colorrole role="Base">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>127</blue>
+        </color>
+       </brush>
+      </colorrole>
+      <colorrole role="Window">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>127</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font">
+    <font>
+     <pointsize>10</pointsize>
+    </font>
+   </property>
+   <property name="autoFillBackground">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+   </property>
+  </widget>
+ </widget>
+ <resources>
+  <include location="sfwnotes.qrc"/>
+ </resources>
+ <connections/>
+</ui>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sfw-notes/sfwnotes_small.ui	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,398 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ToDoTool</class>
+ <widget class="QWidget" name="ToDoTool">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>221</width>
+    <height>264</height>
+   </rect>
+  </property>
+  <property name="contextMenuPolicy">
+   <enum>Qt::DefaultContextMenu</enum>
+  </property>
+  <property name="windowTitle">
+   <string>ToDoTool</string>
+  </property>
+  <widget class="QPushButton" name="addButton">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>40</y>
+     <width>61</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="icon">
+    <iconset resource="resource.qrc">
+     <normaloff>:/icons/icons/addIcon.png</normaloff>:/icons/icons/addIcon.png</iconset>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="deleteButton">
+   <property name="geometry">
+    <rect>
+     <x>80</x>
+     <y>40</y>
+     <width>61</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="icon">
+    <iconset resource="resource.qrc">
+     <normaloff>:/icons/icons/deleteIcon.png</normaloff>:/icons/icons/deleteIcon.png</iconset>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="searchButton">
+   <property name="geometry">
+    <rect>
+     <x>140</x>
+     <y>40</y>
+     <width>61</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="icon">
+    <iconset resource="resource.qrc">
+     <normaloff>:/icons/icons/searchIcon.png</normaloff>:/icons/icons/searchIcon.png</iconset>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="prevButton">
+   <property name="geometry">
+    <rect>
+     <x>50</x>
+     <y>80</y>
+     <width>41</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="icon">
+    <iconset resource="resource.qrc">
+     <normaloff>:/icons/icons/prevIcon.png</normaloff>:/icons/icons/prevIcon.png</iconset>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="nextButton">
+   <property name="geometry">
+    <rect>
+     <x>130</x>
+     <y>80</y>
+     <width>41</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="icon">
+    <iconset resource="resource.qrc">
+     <normaloff>:/icons/icons/nextIcon.png</normaloff>:/icons/icons/nextIcon.png</iconset>
+   </property>
+  </widget>
+  <widget class="QLabel" name="countLabel">
+   <property name="geometry">
+    <rect>
+     <x>90</x>
+     <y>80</y>
+     <width>41</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>0/0</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="titleLabel">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>10</y>
+     <width>181</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="palette">
+    <palette>
+     <active>
+      <colorrole role="WindowText">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>0</red>
+         <green>0</green>
+         <blue>255</blue>
+        </color>
+       </brush>
+      </colorrole>
+      <colorrole role="Text">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>0</red>
+         <green>0</green>
+         <blue>0</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </active>
+     <inactive>
+      <colorrole role="WindowText">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>0</red>
+         <green>0</green>
+         <blue>255</blue>
+        </color>
+       </brush>
+      </colorrole>
+      <colorrole role="Text">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>0</red>
+         <green>0</green>
+         <blue>0</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </inactive>
+     <disabled>
+      <colorrole role="WindowText">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>126</red>
+         <green>125</green>
+         <blue>124</blue>
+        </color>
+       </brush>
+      </colorrole>
+      <colorrole role="Text">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>126</red>
+         <green>125</green>
+         <blue>124</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font">
+    <font>
+     <family>Nimbus Roman No9 L</family>
+     <pointsize>24</pointsize>
+     <weight>75</weight>
+     <italic>true</italic>
+     <bold>true</bold>
+    </font>
+   </property>
+   <property name="text">
+    <string>ToDoTool</string>
+   </property>
+   <property name="textFormat">
+    <enum>Qt::AutoText</enum>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QLabel" name="noteLabel">
+   <property name="geometry">
+    <rect>
+     <x>30</x>
+     <y>140</y>
+     <width>161</width>
+     <height>111</height>
+    </rect>
+   </property>
+   <property name="palette">
+    <palette>
+     <active>
+      <colorrole role="Base">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>255</blue>
+        </color>
+       </brush>
+      </colorrole>
+      <colorrole role="Window">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>127</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </active>
+     <inactive>
+      <colorrole role="Base">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>255</blue>
+        </color>
+       </brush>
+      </colorrole>
+      <colorrole role="Window">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>127</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </inactive>
+     <disabled>
+      <colorrole role="Base">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>127</blue>
+        </color>
+       </brush>
+      </colorrole>
+      <colorrole role="Window">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>127</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font">
+    <font>
+     <family>Comic Sans MS</family>
+     <pointsize>18</pointsize>
+     <italic>true</italic>
+    </font>
+   </property>
+   <property name="autoFillBackground">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Service the car nand buy tyres</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
+   <property name="wordWrap">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QLabel" name="dateLabel">
+   <property name="geometry">
+    <rect>
+     <x>30</x>
+     <y>120</y>
+     <width>161</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="palette">
+    <palette>
+     <active>
+      <colorrole role="Base">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>127</blue>
+        </color>
+       </brush>
+      </colorrole>
+      <colorrole role="Window">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>127</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </active>
+     <inactive>
+      <colorrole role="Base">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>127</blue>
+        </color>
+       </brush>
+      </colorrole>
+      <colorrole role="Window">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>127</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </inactive>
+     <disabled>
+      <colorrole role="Base">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>127</blue>
+        </color>
+       </brush>
+      </colorrole>
+      <colorrole role="Window">
+       <brush brushstyle="SolidPattern">
+        <color alpha="255">
+         <red>255</red>
+         <green>255</green>
+         <blue>127</blue>
+        </color>
+       </brush>
+      </colorrole>
+     </disabled>
+    </palette>
+   </property>
+   <property name="font">
+    <font>
+     <pointsize>10</pointsize>
+    </font>
+   </property>
+   <property name="autoFillBackground">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Jan 1, 2010 - 8:00PM </string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+   </property>
+  </widget>
+ </widget>
+ <resources>
+  <include location="resource.qrc"/>
+ </resources>
+ <connections/>
+</ui>

--- a/qtmobility/examples/slideshow/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/slideshow/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/slideshow/slideshow.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/slideshow/slideshow.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/slideshow/slideshow.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/slideshow/slideshow.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -49,13 +48,11 @@
 class QAbstractButton;
 class QLabel;
 class QStackedLayout;
+
+class QMediaPlaylist;
 QT_END_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
-class QMediaPlaylist;
-QTM_END_NAMESPACE
-
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class SlideShow : public QWidget
 {

--- a/qtmobility/examples/sysinfo/dialog.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sysinfo/dialog.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -143,8 +142,10 @@
 void Dialog::setupGeneral()
 {
     delete systemInfo;
+//! [lang]
     systemInfo = new QSystemInfo(this);
     curLanguageLineEdit->setText( systemInfo->currentLanguage());
+//! [lang]
     languagesComboBox->clear();
     languagesComboBox->insertItems(0,systemInfo->availableLanguages());
     countryCodeLabel->setText(systemInfo->currentCountryCode());
@@ -153,11 +154,17 @@
 void Dialog::setupDevice()
 {
     delete di;
+//! [createdi]
     di = new QSystemDeviceInfo(this);
+//! [createdi]
+//! [batteryLevel]
     batteryLevelBar->setValue(di->batteryLevel());
+//! [batteryLevel]
 
+//! [sig batteryLevelChanged]
     connect(di,SIGNAL(batteryLevelChanged(int)),
             this,SLOT(updateBatteryStatus(int)));
+//! [sig batteryLevelChanged]
 
     connect(di,SIGNAL(batteryStatusChanged(QSystemDeviceInfo::BatteryStatus)),
             this,SLOT(displayBatteryStatus(QSystemDeviceInfo::BatteryStatus)));
@@ -167,9 +174,13 @@
 
     ImeiLabel->setText(di->imei());
     imsiLabel->setText(di->imsi());
+//! [manuf-id]
     manufacturerLabel->setText(di->manufacturer());
+//! [manuf-id]
     modelLabel->setText(di->model());
+//! [productName]
     productLabel->setText(di->productName());
+//! [productName]
 
     deviceLockPushButton->setChecked(di->isDeviceLocked());
 
@@ -189,6 +200,7 @@
         radioButton->setChecked(true);
     }
 
+//! [inputMethod flags]
     QSystemDeviceInfo::InputMethodFlags methods = di->inputMethodType();
     QStringList inputs;
     if((methods & QSystemDeviceInfo::Keys)){
@@ -197,6 +209,7 @@
     if((methods & QSystemDeviceInfo::Keypad)) {
         inputs << "Keypad";
     }
+//! [inputMethod flags]
     if((methods & QSystemDeviceInfo::Keyboard)) {
         inputs << "Keyboard";
     }
@@ -270,13 +283,17 @@
 void Dialog::setupNetwork()
 {
     delete ni;
+//! [networkInfo]
     ni = new QSystemNetworkInfo(this);
+//! [networkInfo]
 
     connect(netStatusComboBox,SIGNAL(activated(int)),
             this, SLOT(netStatusComboActivated(int)));
 
+//! [sig strength]
     connect(ni,SIGNAL(networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode, int)),
             this,SLOT(networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode,int)));
+//! [sig strength]
 
     connect(ni,SIGNAL(networkNameChanged(QSystemNetworkInfo::NetworkMode,QString)),
             this,SLOT(networkNameChanged(QSystemNetworkInfo::NetworkMode,QString)));
@@ -325,13 +342,19 @@
         versionLineEdit->setText("");
         break;
     case 1:
+//! [OS ver]
         version = QSystemInfo::Os;
+//! [OS ver]
         break;
     case 2:
+//! [Qt ver]
         version = QSystemInfo::QtCore;
+//! [Qt ver]
         break;
     case 3:
+//! [Firm ver]
         version = QSystemInfo::Firmware;
+//! [Firm ver]
         break;
     };
 
@@ -341,13 +364,17 @@
 
 void Dialog::getFeature(int index)
 {
+//! [feature]
     QSystemInfo::Feature feature;
     switch(index) {
+//! [feature]
     case 0:
         return;
         break;
+//! [feature-bluetooth]
     case 1:
         feature = QSystemInfo::BluetoothFeature;
+//! [feature-bluetooth]
         break;
     case 2:
         feature = QSystemInfo::CameraFeature;
@@ -386,8 +413,10 @@
         feature = QSystemInfo::HapticsFeature;
         break;
     };
+//! [feature test]
     QSystemInfo si;
     featuresLineEdit->setText((si.hasFeatureSupported(feature) ? "true":"false" ));
+//! [feature test]
 }
 
 void Dialog::setupSaver()

--- a/qtmobility/examples/sysinfo/dialog.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sysinfo/dialog.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/sysinfo/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/sysinfo/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/weatherinfo/weatherinfo.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/weatherinfo/weatherinfo.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/writemessage/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/writemessage/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/writemessage/messagesender.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/writemessage/messagesender.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/examples/writemessage/messagesender.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/writemessage/messagesender.h	Fri May 14 16:41:33 2010 +0300
@@ -6,35 +6,34 @@
 **
 ** 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.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** 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.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/

--- a/qtmobility/features/mobility.prf	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/features/mobility.prf	Fri May 14 16:41:33 2010 +0300
@@ -13,6 +13,7 @@
 }
 mac: LIBS += -F$${MOBILITY_LIB}
 LIBS+= -L$${MOBILITY_LIB}
+QMAKE_RPATHDIR+=$${MOBILITY_LIB}
 
 contains(MOBILITY, bearer) {
     DEFINES += QT_MOBILITY_BEARER

--- a/qtmobility/features/mobility.prf.template	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/features/mobility.prf.template	Fri May 14 16:41:33 2010 +0300
@@ -13,6 +13,7 @@
 }
 mac: LIBS += -F$${MOBILITY_LIB}
 LIBS+= -L$${MOBILITY_LIB}
+QMAKE_RPATHDIR+=$${MOBILITY_LIB}
 
 contains(MOBILITY, bearer) {
     DEFINES += QT_MOBILITY_BEARER

--- a/qtmobility/plugins/contacts/maemo5/maemo5.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/maemo5/maemo5.pro	Fri May 14 16:41:33 2010 +0300
@@ -6,6 +6,7 @@
 include(../../../common.pri)
 
 HEADERS += \
+        qcontactidshash.h \
         qcontactabook_p.h \
         qcontactmaemo5backend_p.h \
         qcontactmaemo5debug_p.h

--- a/qtmobility/plugins/contacts/maemo5/osso-abook-workaround.h	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-/* This file is a workaround for Maemo5 PR 1.1
- * This file should be deleted in PR 1.2 and
- * replaced by <libosso-abook/osso-abook.h>
- */
-#ifndef OSSO_ABOOK_WORKAROUND_H
-#define OSSO_ABOOK_WORKAROUND_H
-
-#include <libmcclient/mc-profile.h>
-#include <libmcclient/mc-account.h>
-
-#include <libosso-abook/osso-abook-init.h>
-#include <libosso-abook/osso-abook-types.h>
-#include <libosso-abook/osso-abook-waitable.h>
-#include <libosso-abook/osso-abook-presence.h>
-#include <libosso-abook/osso-abook-avatar.h>
-
-//### Remove in PR 1.2
-extern "C" {
-        typedef void GtkWindow;
-        struct _OssoABookContact {
-          EContact parent;
-        };
-
-        OssoABookRoster*    osso_abook_roster_new               (const char *name,
-                                                                 EBookView *book_view,
-                                                                 const char *vcard_field);
-        gboolean            osso_abook_roster_is_running        (OssoABookRoster *roster);
-        void                osso_abook_roster_start             (OssoABookRoster *roster);
-
-        gboolean            osso_abook_contact_has_valid_name   (OssoABookContact *contact);
-        gboolean            osso_abook_contact_is_roster_contact(OssoABookContact *contact);
-
-        OssoABookRoster*    osso_abook_aggregator_get_default   (GError **error);
-        GList*              osso_abook_aggregator_list_master_contacts
-                                                                (OssoABookAggregator *aggregator);
-        unsigned            osso_abook_aggregator_get_master_contact_count
-                                                                (OssoABookAggregator *aggregator);
-        GList*              osso_abook_aggregator_lookup        (OssoABookAggregator *aggregator,
-                                                                 const char *uid);
-        const char*         osso_abook_contact_get_uid          (OssoABookContact *contact); 
-        EBook*              osso_abook_roster_get_book          (OssoABookRoster *roster);
-        char*               osso_abook_contact_to_string        (OssoABookContact *contact,
-                                                                 EVCardFormat format,
-                                                                 gboolean inline_avatar);
-        char*               osso_abook_contact_get_value        (EContact *contact,
-                                                                 const char *attr_name);
-        GList*              osso_abook_aggregator_find_contacts (OssoABookAggregator *aggregator,
-                                                                 EBookQuery *query);
-        GList*              osso_abook_contact_get_values       (EContact *contact,
-                                                                 const char *attr_name);
-        GList*              osso_abook_contact_get_attributes   (EContact *contact,
-                                                                 const char *attr_name);
-        GList*              osso_abook_contact_get_roster_contacts
-                                                                (OssoABookContact *master_contact);
-        McProfile*          osso_abook_contact_get_profile      (OssoABookContact *contact);
-        McAccount*          osso_abook_contact_get_account      (OssoABookContact *contact);
-        gboolean            osso_abook_contact_delete           (OssoABookContact *contact,
-                                                                 EBook *book,
-                                                                 GtkWindow *window);
-        GList*              osso_abook_aggregator_find_contacts (OssoABookAggregator *aggregator,
-                                                                 EBookQuery *query);
-        const char*         osso_abook_contact_get_display_name (OssoABookContact *contact);
-        GdkPixbuf*          osso_abook_avatar_get_image_rounded (OssoABookAvatar *avatar,
-                                                                 int width,
-                                                                 int height,
-                                                                 gboolean crop,
-                                                                 int radius,
-                                                                 const guint8 border_color[4]);
-        OssoABookContact*   osso_abook_contact_new              (void);
-        guint               osso_abook_contact_async_add        (OssoABookContact *contact,
-                                                                 EBook *book,
-                                                                 EBookIdCallback callback,
-                                                                 gpointer user_data);
-        guint               osso_abook_contact_async_commit     (OssoABookContact *contact,
-                                                                 EBook *book,
-                                                                 EBookCallback callback,
-                                                                 gpointer user_data);
-        gboolean            osso_abook_contact_add_value        (EContact *contact,
-                                                                 const char *attr_name,
-                                                                 GCompareFunc value_check,
-                                                                 const char *value);
-        void                osso_abook_contact_set_pixbuf       (OssoABookContact *contact,
-                                                                 GdkPixbuf *pixbuf,
-                                                                 EBook *book,
-                                                                 GtkWindow *window);
-
-        OssoABookSelfContact* osso_abook_self_contact_get_default
-                                                                (void);
-
-                                                                 // osso-abook-account-manager.h
-        const GList*        osso_abook_account_manager_get_primary_vcard_fields
-                                                                 (OssoABookAccountManager *manager);
-        OssoABookAccountManager* osso_abook_account_manager_get_default(void);
-        const char*         osso_abook_account_manager_get_vcard_field
-                                                                (OssoABookAccountManager *manager,
-                                                                 const char *account_name);
-        // osso-abook-caps.h
-        typedef enum {
-          OSSO_ABOOK_CAPS_NONE             = (0),
-          OSSO_ABOOK_CAPS_EMAIL            = (1 << 0),
-          OSSO_ABOOK_CAPS_CHAT             = (1 << 1),
-          OSSO_ABOOK_CAPS_CHAT_ADDITIONAL  = (1 << 2),
-          OSSO_ABOOK_CAPS_VOICE            = (1 << 3),
-          OSSO_ABOOK_CAPS_VOICE_ADDITIONAL = (1 << 4),
-          OSSO_ABOOK_CAPS_VIDEO            = (1 << 5),
-          OSSO_ABOOK_CAPS_PHONE            = (1 << 6),
-          OSSO_ABOOK_CAPS_ADDRESSBOOK      = (1 << 7),
-          OSSO_ABOOK_CAPS_IMMUTABLE_STREAMS= (1 << 8),
-          OSSO_ABOOK_CAPS_SMS              = (1 << 9),
-
-          OSSO_ABOOK_CAPS_ALL = (OSSO_ABOOK_CAPS_EMAIL | OSSO_ABOOK_CAPS_CHAT |
-                                 OSSO_ABOOK_CAPS_VOICE | OSSO_ABOOK_CAPS_VIDEO |
-                                 OSSO_ABOOK_CAPS_PHONE | OSSO_ABOOK_CAPS_SMS)
-        } OssoABookCapsFlags;
-        GType osso_abook_caps_get_type (void) G_GNUC_CONST;
-
-        typedef struct _OssoABookCaps OssoABookCaps; 
-        #define OSSO_ABOOK_TYPE_CAPS \
-                (osso_abook_caps_get_type ())
-
-        #define OSSO_ABOOK_CAPS(obj) \
-                (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-                 OSSO_ABOOK_TYPE_CAPS, \
-                 OssoABookCaps))
-
-        OssoABookCapsFlags  osso_abook_caps_get_capabilities    (OssoABookCaps *caps);
-        void                osso_abook_contact_reject_for_uid   (OssoABookContact *contact,
-                                                                 const char *master_uid,
-                                                                 GtkWindow *parent);
-        GType  osso_abook_contact_get_type(void) G_GNUC_CONST;
-        #define OSSO_ABOOK_TYPE_CONTACT \
-                (osso_abook_contact_get_type ())
-        #define OSSO_ABOOK_IS_CONTACT(obj) \
-                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-                 OSSO_ABOOK_TYPE_CONTACT))
-}
-
-#endif

--- a/qtmobility/plugins/contacts/maemo5/qcontactabook.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/maemo5/qcontactabook.cpp	Fri May 14 16:41:33 2010 +0300
@@ -73,6 +73,7 @@
    QContactABook* that;
    bool *result;
    char *uid;
+   QContactManager::Error *error;
 };
 
 /* QContactABook */
@@ -109,7 +110,7 @@
   
   cbSharedData* d = static_cast<cbSharedData*>(data);
   if (!d){
-    qWarning() << "d has been deleted";
+    //qWarning() << "d has been deleted";
     return;
   }
   
@@ -127,7 +128,9 @@
     if (id)
       contactIds << id;
   }
-  d->that->_contactsAdded(contactIds);
+
+  if (!contactIds.isEmpty())
+    d->that->_contactsAdded(contactIds);
 }
 
 static void contactsChangedCB(OssoABookRoster *roster, OssoABookContact **contacts, gpointer data)
@@ -137,7 +140,7 @@
   
   cbSharedData* d = static_cast<cbSharedData*>(data);
   if (!d){
-    qWarning() << "d has been deleted";
+    //qWarning() << "d has been deleted";
     return;
   }
   
@@ -154,7 +157,9 @@
     if (id)
       contactIds << id;
   }
-  d->that->_contactsChanged(contactIds);
+
+  if (!contactIds.isEmpty())
+    d->that->_contactsChanged(contactIds);
 }
 
 static void contactsRemovedCB(OssoABookRoster *roster, const char **ids, gpointer data)
@@ -164,7 +169,7 @@
   
   cbSharedData* d = static_cast<cbSharedData*>(data);
   if (!d){
-    qWarning() << "d has been deleted";
+    //qWarning() << "d has been deleted";
     return;
   }
   
@@ -172,13 +177,15 @@
   QList<QContactLocalId> contactIds;
   
   for (p = ids; *p; ++p) {
-    QContactLocalId id = d->hash->take(*p);
-    QCM5_DEBUG << "Contact" << id << "has been removed";
-    if (id)
-      contactIds << id;
+      QContactLocalId id = d->hash->take(*p);
+      if (id) {
+        QCM5_DEBUG << "Contact" << id << "has been removed";
+        contactIds << id;
+      }
   }
   
-  d->that->_contactsRemoved(contactIds);
+  if (!contactIds.isEmpty())
+    d->that->_contactsRemoved(contactIds);
 }
 
 void QContactABook::initAddressBook(){
@@ -239,7 +246,7 @@
    contactList = osso_abook_aggregator_list_master_contacts(m_abookAgregator);
 
    if (!contactList) {
-     qWarning() << "There are no Master contacts. LocalId hash is empty.";
+     //qWarning() << "There are no Master contacts. LocalId hash is empty.";
      return;
    }
    
@@ -261,8 +268,30 @@
 QList<QContactLocalId> QContactABook::contactIds(const QContactFilter& filter, const QList<QContactSortOrder>& sortOrders, QContactManager::Error* error) const
 {
   QList<QContactLocalId> rtn;
-  
-  /* Sorting */
+
+  // do this naively for now...
+  *error = QContactManager::NoError;
+  QContactManager::Error tempError = QContactManager::NoError;
+  QList<QContactLocalId> allIds = m_localIds.keys();
+  QList<QContact> sortedAndFiltered;
+  QContact *curr = 0;
+  foreach (const QContactLocalId& currId, allIds) {
+    curr = getQContact(currId, &tempError);
+    if (tempError != QContactManager::NoError)
+      *error = tempError;
+    if (QContactManagerEngine::testFilter(filter, *curr)) {
+      QContactManagerEngine::addSorted(&sortedAndFiltered, *curr, sortOrders);
+    }
+    delete curr;
+  }
+
+  foreach (const QContact& contact, sortedAndFiltered) {
+    rtn.append(contact.localId());
+  }
+  return rtn;
+
+  /*
+  // Sorting
   //NOTE Native sorting is possible thanks to g_list_sort.
   //     It's limited just to one filter.
   //     Multi filters support need non native sorting.
@@ -296,40 +325,6 @@
     return QContactManagerEngine::sortContacts(contacts, sortOrders);
   }
   
-  /* Matching action filter */
-  //NOTE The code was not really tested */
-  if(filter.type() == QContactFilter::ActionFilter){
-    QContactActionFilter af(filter);
-    /* This looks a bit strange for me */
-    QList<QContactActionDescriptor> descriptors = QContactAction::actionDescriptors(af.actionName(), af.vendorName(), af.implementationVersion());
-
-    GList *masterContacts = osso_abook_aggregator_list_master_contacts(m_abookAgregator);
-    for(; masterContacts; ){
-      OssoABookContact *masterContact = A_CONTACT(masterContacts->data);
-      bool match = contactActionsMatch(masterContact, descriptors);
-      if(!match) {
-        GList *rosterContacts = osso_abook_contact_get_roster_contacts(masterContact);
-        for(; rosterContacts && !match; ){
-          OssoABookContact *rosterContact = A_CONTACT(rosterContacts->data);
-          match = contactActionsMatch(rosterContact, descriptors);
-          rosterContacts = g_list_delete_link(rosterContacts, rosterContacts);
-        }
-        g_list_free(rosterContacts);
-      }
-      if(match){
-        EContact *contact = E_CONTACT(masterContact);
-        const char* data = CONST_CHAR(e_contact_get_const(contact, E_CONTACT_UID));
-        QByteArray localId(data);
-        m_localIds << localId;
-        rtn.append(m_localIds[localId]);
-        QCM5_DEBUG << "eContactID " << localId << "has been stored in m_localIDs with key" << m_localIds[localId];
-      }
-      masterContacts = g_list_delete_link(masterContacts, masterContacts);
-    }
-    *error = QContactManager::NoError;
-    return  rtn;
-  }
-  
   EBookQuery* query = convert(filter);
   
   GList* l = osso_abook_aggregator_find_contacts(m_abookAgregator, query);
@@ -348,23 +343,66 @@
   
   *error = QContactManager::NoError;
   return rtn;
+  */
 }
 
 QContact* QContactABook::getQContact(const QContactLocalId& contactId, QContactManager::Error* error) const
 {
   QContact *rtn;
-  OssoABookContact* aContact = getAContact(contactId);
+  OssoABookContact* aContact = getAContact(contactId, error);
   if (!aContact) {
-    qWarning() << "Unable to get a valid AContact";
-    *error = QContactManager::DoesNotExistError;
+    //qWarning() << "Unable to get a valid AContact";
     return new QContact;
   }
   
   //Convert aContact => qContact
   rtn = convert(E_CONTACT(aContact));
+  QContactId cId;
+  cId.setLocalId(contactId);
+  rtn->setId(cId);
   return rtn;
 }
 
+static QContactManager::Error getErrorFromStatus(const EBookStatus status){
+  switch (status) {
+    case E_BOOK_ERROR_OK:
+      return QContactManager::NoError;
+    case E_BOOK_ERROR_INVALID_ARG:
+      return QContactManager::BadArgumentError;
+    case E_BOOK_ERROR_BUSY:
+      return QContactManager::LockedError;        
+    case E_BOOK_ERROR_PERMISSION_DENIED:
+    case E_BOOK_ERROR_AUTHENTICATION_FAILED:
+    case E_BOOK_ERROR_AUTHENTICATION_REQUIRED:
+    //case E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD: //Missing in current Maemo5 Ebook lib version
+      return QContactManager::PermissionsError;
+    case E_BOOK_ERROR_CONTACT_NOT_FOUND:
+      return QContactManager::DoesNotExistError;
+    case E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS:
+      return QContactManager::AlreadyExistsError;
+    case E_BOOK_ERROR_NO_SPACE:
+      return QContactManager::OutOfMemoryError;
+#if 0
+    case E_BOOK_ERROR_REPOSITORY_OFFLINE:
+    case E_BOOK_ERROR_NO_SUCH_BOOK:
+    case E_BOOK_ERROR_NO_SELF_CONTACT:
+    case E_BOOK_ERROR_SOURCE_NOT_LOADED:
+    case E_BOOK_ERROR_SOURCE_ALREADY_LOADED:
+    case E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED:
+    case E_BOOK_ERROR_CANCELLED:
+    case E_BOOK_ERROR_COULD_NOT_CANCEL:
+    case E_BOOK_ERROR_TLS_NOT_AVAILABLE:
+    case E_BOOK_ERROR_CORBA_EXCEPTION:
+    case E_BOOK_ERROR_NO_SUCH_SOURCE:
+    case E_BOOK_ERROR_OFFLINE_UNAVAILABLE:
+    case E_BOOK_ERROR_OTHER_ERROR:
+    case E_BOOK_ERROR_INVALID_SERVER_VERSION:
+#endif
+    default:
+      return QContactManager::UnspecifiedError;
+  }
+}
+
 static void delContactCB(EBook *book, EBookStatus status, gpointer closure)
 {
   Q_UNUSED(book);
@@ -375,11 +413,12 @@
     return;
   
   *sd->result = (status != E_BOOK_ERROR_OK &&
-                 status != E_BOOK_ERROR_CONTACT_NOT_FOUND) ? false : true;  
+                 status != E_BOOK_ERROR_CONTACT_NOT_FOUND) ? false : true;
+  *sd->error = getErrorFromStatus(status);
+  
   sd->that->_jobRemovingCompleted();
 }
 
-//### FIXME error is not managed
 bool QContactABook::removeContact(const QContactLocalId& contactId, QContactManager::Error* error)
 {
   Q_UNUSED(error);
@@ -389,9 +428,9 @@
   
   OssoABookRoster *roster = A_ROSTER(m_abookAgregator);
   EBook *book = osso_abook_roster_get_book(roster);
-  OssoABookContact *aContact = getAContact(contactId);
+  OssoABookContact *aContact = getAContact(contactId, error);
   if (!OSSO_ABOOK_IS_CONTACT(aContact)){
-    qWarning() << "aCtontact is not a valid ABook contact"; 
+    //qWarning() << "Specified contact is not a valid ABook contact";
     return false;
   }
   
@@ -407,6 +446,7 @@
   m_deleteJobSD = new jobSharedData;
   m_deleteJobSD->that = this;
   m_deleteJobSD->result = &ok;
+  m_deleteJobSD->error = error;
   
   //Remove photos
   EContactPhoto *photo = NULL;
@@ -425,6 +465,7 @@
   GList* rosterContacts = NULL;
   rosterContacts = osso_abook_contact_get_roster_contacts(aContact);
   const char *masterUid = CONST_CHAR(e_contact_get_const(E_CONTACT(aContact), E_CONTACT_UID));
+  char *contactUidCopy = strdup(masterUid);
   while(rosterContacts){
     OssoABookContact *rosterContact = A_CONTACT(rosterContacts->data);
     osso_abook_contact_reject_for_uid(rosterContact, masterUid, NULL);
@@ -436,6 +477,15 @@
                               delContactCB, m_deleteJobSD);
   
   loop.exec(QEventLoop::AllEvents|QEventLoop::WaitForMoreEvents);
+
+  // update our list of ids...
+  QContactLocalId id = m_localIds[contactUidCopy];
+  m_localIds.remove(contactUidCopy);
+  if (contactUidCopy)
+    free(contactUidCopy);
+  
+  if (id)
+    _contactsRemoved(QList<QContactLocalId>() << id);
   
   return ok;
 }
@@ -444,18 +494,25 @@
 {
   Q_UNUSED(book)
   jobSharedData *sd = static_cast<jobSharedData*>(user_data);
+  if (!sd)
+    return;
   
-  *sd->result = (status == E_BOOK_ERROR_OK) ? true : false;  
+  *sd->result = (status == E_BOOK_ERROR_OK) ? true : false;
+  *sd->error = getErrorFromStatus(status);
   sd->that->_jobSavingCompleted();
 }
 
 static void addContactCB(EBook* book, EBookStatus  status, const char  *uid, gpointer user_data)
 {
   jobSharedData *sd = static_cast<jobSharedData*>(user_data);
+  if (!sd)
+    return;
+  
   if (uid)
     sd->uid = strdup(uid);
-  
-  //osso_abook_contact_set_roster(OssoABookContact *contact, OssoABookRoster *roster)
+
+  //### FIXME IS THIS LINE REALLY NEEDED: osso_abook_contact_set_roster(OssoABookContact *contact, OssoABookRoster *roster)
+  *sd->result = (status == E_BOOK_ERROR_OK) ? true : false;
   commitContactCB(book, status, user_data);
 }
 
@@ -478,10 +535,9 @@
     book = osso_abook_roster_get_book(roster);
   }
   
-  // Conver QContact to AContact
-  aContact = convert(contact);
+  // Convert QContact to AContact
+  aContact = convert(contact, error);
   if (!aContact){
-    *error = QContactManager::UnspecifiedError;
     return false;
   }  
 
@@ -497,10 +553,13 @@
   m_saveJobSD = new jobSharedData;
   m_saveJobSD->that = this;
   m_saveJobSD->result = &ok;
+  m_saveJobSD->error = error;
+  m_saveJobSD->uid = 0;
   
   // Add/Commit the contact
   uid = CONST_CHAR(e_contact_get_const(E_CONTACT (aContact), E_CONTACT_UID)); 
   if (uid) {
+    m_saveJobSD->uid = strdup(uid);
     osso_abook_contact_async_commit(aContact, book, commitContactCB, m_saveJobSD);
   } else {
     osso_abook_contact_async_add(aContact, book, addContactCB, m_saveJobSD);
@@ -508,11 +567,15 @@
   
   loop.exec(QEventLoop::AllEvents|QEventLoop::WaitForMoreEvents);
 
+  // save the newly saved contact's id in the hash.
+  m_localIds << m_saveJobSD->uid;
+
   // set the id of the contact.
   QContactId cId;
   cId.setLocalId(m_localIds[m_saveJobSD->uid]);
   contact->setId(cId);
-  //free(m_saveJobSD->uid);
+  if (m_saveJobSD->uid)
+      free(m_saveJobSD->uid);
   
   return ok;
 }
@@ -534,7 +597,7 @@
       QCM5_DEBUG << "eContactID " << eContactUID << "has been stored in m_localIDs with key" << id;
     }
   } else {
-    qWarning() << "Cannot find self contact";
+    //qWarning() << "Cannot find self contact";
     *errors = QContactManager::DoesNotExistError;
     id = 0;
   }
@@ -542,38 +605,6 @@
   return id;
 }
 
-bool QContactABook::contactActionsMatch(OssoABookContact *contact, QList<QContactActionDescriptor> descriptors) const
-{
-  OssoABookCapsFlags capsFlags = osso_abook_caps_get_capabilities(OSSO_ABOOK_CAPS(contact));
-
-  if(capsFlags & OSSO_ABOOK_CAPS_NONE)
-    return false;
-
-  /* ActionNames could be incorrect */
-  OssoABookCapsFlags actionFlags = OSSO_ABOOK_CAPS_NONE;
-  for(int i = 0; i < descriptors.size(); i++){
-    QString actionName = descriptors.at(i).actionName();
-    QCM5_DEBUG << actionName;
-    if(!actionName.compare("Phone"))
-      actionFlags = (OssoABookCapsFlags)(actionFlags | OSSO_ABOOK_CAPS_PHONE);
-    else if(!actionName.compare("Voice"))
-      actionFlags = (OssoABookCapsFlags)(actionFlags | OSSO_ABOOK_CAPS_VOICE);
-    else if(!actionName.compare("SendEmail"))
-      actionFlags = (OssoABookCapsFlags)(actionFlags | OSSO_ABOOK_CAPS_EMAIL);
-    else if(!actionName.compare("Chat"))
-      actionFlags = (OssoABookCapsFlags)(actionFlags | OSSO_ABOOK_CAPS_CHAT);
-    else if(!actionName.compare("ChatAdditional"))
-      actionFlags = (OssoABookCapsFlags)(actionFlags | OSSO_ABOOK_CAPS_CHAT_ADDITIONAL);
-    else if(!actionName.compare("VoiceAdditional"))
-      actionFlags = (OssoABookCapsFlags)(actionFlags | OSSO_ABOOK_CAPS_VOICE_ADDITIONAL);
-    else if(!actionName.compare("Video"))
-      actionFlags = (OssoABookCapsFlags)(actionFlags | OSSO_ABOOK_CAPS_VIDEO);
-    else if(!actionName.compare("Addressbook"))
-      actionFlags = (OssoABookCapsFlags)(actionFlags | OSSO_ABOOK_CAPS_ADDRESSBOOK);
-  }
-  return ((actionFlags & capsFlags) == actionFlags);
-}
-
 EBookQuery* QContactABook::convert(const QContactFilter& filter) const
 {
   EBookQuery* query = NULL;
@@ -626,7 +657,7 @@
         case QContactFilter::MatchEndsWith: queryStr = "endswith"; break;
         default:
           queryStr = "contains";
-          qWarning() << "Match flag not supported";
+          //qWarning() << "Match flag not supported";
       }
       static QHash<QString,QString> hash;
       if (hash.isEmpty()){
@@ -644,14 +675,13 @@
   
       QString eDetail = hash[f.detailDefinitionName()];
       if (eDetail.isEmpty()){
-        qWarning() << "Unable to found an ebook detail for " << f.detailDefinitionName();
+        //qWarning() << "Unable to found an ebook detail for " << f.detailDefinitionName();
         return NULL;
       }
       queryStr = queryStr + " \"" + eDetail + "\" \"" + f.value().toString() + "\"";
       query = e_book_query_from_string(qPrintable(queryStr));
     } break;
     case QContactFilter::ActionFilter:
-      QCM5_DEBUG << "ActionFilter"; //eQuery doesn't support ActionFilter
       break;
     case QContactFilter::IntersectionFilter:
     {
@@ -662,7 +692,7 @@
       foreach(i, fs){
         EBookQuery* q = convert(i);
         if (!q){
-          qWarning() << "Query is null";
+          //qWarning() << "Query is null";
           continue;
         }
         if (query)
@@ -680,7 +710,7 @@
       foreach(i, fs){
         EBookQuery* q = convert(i);
         if (!q){
-          qWarning() << "Query is null";
+          //qWarning() << "Query is null";
           continue;
         }
         if (query)
@@ -696,6 +726,7 @@
     } break;
     default:
       QCM5_DEBUG << "Filter not supported";
+      query = convert(QContactInvalidFilter());
   }
  
   //Debugging
@@ -778,7 +809,7 @@
 
     ok = contact->saveDetail(detail);
     if (!ok){
-      qWarning() << "Detail can't be saved into QContact";
+      //qWarning() << "Detail can't be saved to QContact";
       delete detail;
       continue;
     }
@@ -812,13 +843,14 @@
   return true;
 }
 
-OssoABookContact* QContactABook::getAContact(const QContactLocalId& contactId) const
+OssoABookContact* QContactABook::getAContact(const QContactLocalId& contactId, QContactManager::Error* error) const
 {
   OssoABookContact* rtn = NULL;
 
   QCM5_DEBUG << "Getting aContact with id " << m_localIds[contactId] << "local contactId is" << contactId;
 
   if(QString(m_localIds[contactId]).compare("osso-abook-self") == 0) {
+    *error = QContactManager::NoError;
     rtn = A_CONTACT(osso_abook_self_contact_get_default());
   } else {
     EBookQuery* query;
@@ -830,9 +862,13 @@
         e_book_query_unref(query);
 
     if (g_list_length(contacts) == 1) {
+      *error = QContactManager::NoError;
       rtn = A_CONTACT(contacts->data);
+    } else if (g_list_length(contacts) == 0) {
+      *error = QContactManager::DoesNotExistError;
     } else {
-      qWarning("List is empty or several contacts have the same UID or contactId belongs to a roster contact.");
+      //qWarning("Several contacts have the same UID or contactId belongs to a roster contact.");
+      *error = QContactManager::UnspecifiedError;
     }
     if (contacts)
       g_list_free(contacts);
@@ -850,7 +886,7 @@
     const QByteArray eContactUID(data);
     QContactLocalId localId = m_localIds[eContactUID];
     if (!localId)
-      qWarning("Unable to get valid localId for the specified eContaact UID");
+      //qWarning("Unable to get valid localId for the specified eContaact UID");
     rtn.setLocalId(localId);
   }
   return rtn;
@@ -863,7 +899,7 @@
   //Ordered list of Fields
   QStringList addressFields;
   addressFields << QContactAddress::FieldPostOfficeBox
-                << "Estension" //FIXME I'm not sure we have to use a new field 
+                << AddressFieldExtension //XXX FIXME I'm not sure we have to use a new field
                 << QContactAddress::FieldStreet
                 << QContactAddress::FieldLocality
                 << QContactAddress::FieldRegion 
@@ -933,7 +969,6 @@
     map[QContactName::FieldCustomLabel] = eContactName->additional;
     map[QContactName::FieldFirstName] = eContactName->given;
     map[QContactName::FieldLastName] = eContactName->family;
-    //map[QContactName::FieldMiddleName] = eContactName->
     map[QContactName::FieldPrefix] = eContactName->prefixes;
     map[QContactName::FieldSuffix] = eContactName->suffixes;
     e_contact_name_free (eContactName);
@@ -1194,7 +1229,7 @@
           attrIsOssoValid = paramName.contains("X-OSSO-VALID");
         
         if (!attrIsType && !attrIsOssoValid) {
-          qWarning () << "Skipping attribute parameter checking for" << paramName;
+          //qWarning () << "Skipping attribute parameter checking for" << paramName;
           continue;
         }
         
@@ -1205,7 +1240,7 @@
           if (attrIsOssoValid) {
             ossoValidIsOk = (attributeParameterValue == "yes")? true : false;
             if (!ossoValidIsOk) {
-              qWarning() << "X-OSSO-VALID is false.";
+              //qWarning() << "X-OSSO-VALID is false.";
               break;
             }
           } else if (type.isEmpty()) {
@@ -1233,7 +1268,7 @@
 {
   QContactOrganization* rtn = new QContactOrganization;
   QVariantMap map;
-  const char* title = CONST_CHAR(e_contact_get(eContact, E_CONTACT_TITLE));
+  const char* title = CONST_CHAR(e_contact_get(eContact, E_CONTACT_ORG));
   map[QContactOrganization::FieldTitle] = title;
   FREE(title);
   setDetailValues(map, rtn);
@@ -1379,7 +1414,7 @@
           attrIsOssoValid = paramName.contains("X-OSSO-VALID");
 
         if (!attrIsType && !attrIsOssoValid) {
-          qWarning () << "Skipping attribute parameter checking for" << paramName;
+          //qWarning () << "Skipping attribute parameter checking for" << paramName;
           continue;
         }
 
@@ -1390,7 +1425,7 @@
           if (attrIsOssoValid) {
             ossoValidIsOk = (attributeParameterValue == "yes")? true : false;
             if (!ossoValidIsOk) {
-              qWarning() << "X-OSSO-VALID is false.";
+              //qWarning() << "X-OSSO-VALID is false.";
               break;
             }
           } else if (type.isEmpty()) {
@@ -1491,7 +1526,7 @@
       int pos =  g_list_position(attributeList, node);
       
       if (index > pos){
-        qWarning() << "Attribute doesn't found at position" << index;
+        //qWarning() << "Attribute doesn't found at position" << index;
         return;
       }
       
@@ -1568,26 +1603,17 @@
   }
 }
 
-OssoABookContact* QContactABook::convert(const QContact *contact) const
+OssoABookContact* QContactABook::convert(const QContact *contact, QContactManager::Error* error) const
 {
   Q_CHECK_PTR(contact);
-  
+
   OssoABookContact* rtn;
   
   // Get aContact if it exists or create a new one if it doesn't
   QContactLocalId id = contact->localId();
   QCM5_DEBUG << "Converting QContact id:" << id << " to aContact";
-  if (id){
-    rtn = getAContact(id);
-    // It's not safe to commit changes to a contact that has been modified.
-    // This problem affects attributes with the same name and parameters such as
-    // EMail, Address...
-    QContactTimestamp* ts = getTimestampDetail(E_CONTACT(rtn));
-    if (*ts != contact->detail<QContactTimestamp>()){
-      delete ts;
-      return NULL;
-    }
-    delete ts;
+  if (id) {
+    rtn = getAContact(id, error);
   } else {
     rtn = osso_abook_contact_new();
   }
@@ -1671,7 +1697,7 @@
     QString key = i.key();
       
     if (key == QContactAddress::FieldPostOfficeBox) index = 0;
-    else if (key == "Estension") index = 1;
+    else if (key == AddressFieldExtension) index = 1;
     else if (key == QContactAddress::FieldStreet) index = 2;
     else if (key == QContactAddress::FieldLocality) index = 3;
     else if (key == QContactAddress::FieldRegion) index = 4;
@@ -1680,7 +1706,7 @@
     else if (key == QContactDetail::FieldContext) continue;
     else if (key == QContactDetail::FieldDetailUri) detailUri = i.value().toInt();
     else {
-      qWarning() << "Address contains an invalid field:" << key;
+      //qWarning() << "Address contains an invalid field:" << key;
       return;
     }
     
@@ -1823,16 +1849,16 @@
   // Save First and Last name in the N vcard attribute
   {  
     QStringList supportedDetailValues;
-    supportedDetailValues << QContactName::FieldFirstName << QContactName::FieldLastName;
+    supportedDetailValues << QContactName::FieldLastName << QContactName::FieldFirstName;
   
     foreach(QString key, supportedDetailValues){
       attrValues << detail.value(key);
     }
   
     //REMOVE ME - We don't want to support custom label
-    if (attrValues[0].isEmpty()){
-      qWarning() << "QContactName::FieldFirstName is empty";
-      attrValues[0] = detail.customLabel();
+    if (attrValues[1].isEmpty()){
+      //qWarning() << "QContactName::FieldFirstName is empty";
+      attrValues[1] = detail.customLabel();
     }
   
     addAttributeToAContact(aContact, EVC_N, attrValues);
@@ -1907,6 +1933,8 @@
       QString value = i.value().toString();
       if (value == QContactPhoneNumber::SubTypeMobile)
         value = "CELL";
+      else if (value == QContactPhoneNumber::SubTypeVoice)
+        value = "VOICE";
       paramValues << value.toUpper();
     } else
       attrValues << i.value().toString();
@@ -1916,7 +1944,7 @@
   if (paramValues.isEmpty())
     paramValues << "VOICE";
   
-  addAttributeToAContact(aContact, EVC_TEL, attrValues, EVC_TYPE, paramValues, true, detail.detailUri().toInt());
+  addAttributeToAContact(aContact, EVC_TEL, attrValues, EVC_TYPE, paramValues, false, detail.detailUri().toInt());
 }
 
 void QContactABook::setUrlDetail(const OssoABookContact* aContact, const QContactUrl& detail) const

--- a/qtmobility/plugins/contacts/maemo5/qcontactabook_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/maemo5/qcontactabook_p.h	Fri May 14 16:41:33 2010 +0300
@@ -48,9 +48,10 @@
 #include "qtcontacts.h"
 #include "qcontactmaemo5debug_p.h"
 
+#undef signals
+#include <libosso-abook/osso-abook.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include "osso-abook-workaround.h"
 #include "qcontactidshash.h"
 
 QTM_USE_NAMESPACE
@@ -97,10 +98,9 @@
   
   bool setDetailValues(const QVariantMap& data, QContactDetail* detail) const;
   
-  OssoABookContact* getAContact(const QContactLocalId& contactId) const;
+  OssoABookContact* getAContact(const QContactLocalId& contactId, QContactManager::Error* error) const;
   
   /* Filtering */
-  bool contactActionsMatch(OssoABookContact *contact, QList<QContactActionDescriptor> descriptors) const;
   EBookQuery* convert(const QContactFilter& filter) const;
   
   /* Reading - eContact/abookContact to QContact methods */
@@ -125,7 +125,7 @@
   QContactUrl* getUrlDetail(EContact *eContact) const;
   
   /* Saving - QContact to abookContact */
-  OssoABookContact* convert(const QContact *contact) const;
+  OssoABookContact* convert(const QContact *contact, QContactManager::Error* error) const;
   
   /* Save QDetails in OssoABookContact attributes */
   void setAddressDetail(const OssoABookContact* aContact, const QContactAddress& detail) const;

--- a/qtmobility/plugins/contacts/maemo5/qcontactidshash.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/maemo5/qcontactidshash.h	Fri May 14 16:41:33 2010 +0300
@@ -96,6 +96,9 @@
     remove(hashKey);
     return hashKey;
   };
+
+  /* Keys */
+  const QList<QContactLocalId> keys() {return m_localIds.keys();}
   
 private:
   QHash<QContactLocalId, QByteArray> m_localIds; //[int/QContactLocalId Maemo5LocalId, QByteArray eContactID]

--- a/qtmobility/plugins/contacts/maemo5/qcontactmaemo5backend.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/maemo5/qcontactmaemo5backend.cpp	Fri May 14 16:41:33 2010 +0300
@@ -42,6 +42,7 @@
 #include "qcontactmaemo5backend_p.h"
 
 #include <QSharedData>
+#include <QTimer>
 
 #include "qcontactmaemo5debug_p.h"
 
@@ -127,6 +128,11 @@
     return false;
 }
 
+QContact QContactMaemo5Engine::compatibleContact(const QContact& contact, QContactManager::Error* error) const
+{
+    return QContactManagerEngine::compatibleContact(contact, error);
+}
+
 QContactLocalId QContactMaemo5Engine::selfContactId(QContactManager::Error* error) const
 {
   Q_CHECK_PTR(d->m_abook);
@@ -181,7 +187,8 @@
     for (int i = 0; i < contacts->size(); i++) {
         curr = contacts->at(i);
         if (!saveContact(&curr, &tempError)) {
-            errorMap->insert(i, tempError);
+            if (errorMap)
+                errorMap->insert(i, tempError);
             *error = tempError;
         } else {
             contacts->replace(i, curr);
@@ -198,7 +205,8 @@
     QContact curr;
     for (int i = 0; i < ids.size(); i++) {
         if (!removeContact(ids.at(i), &tempError)) {
-            errorMap->insert(i, tempError);
+            if (errorMap)
+                errorMap->insert(i, tempError);
             *error = tempError;
         }
     }
@@ -249,18 +257,26 @@
     
     // QContactAddress
     fields = defns[contactType][QContactAddress::DefinitionName].fields();
-    //fields.remove(QContactAddress::FieldSubTypes);
-    fields.insert("Estension", gsfd);
+    fields.remove(QContactAddress::FieldSubTypes);
+    fields.insert(AddressFieldExtension, gsfd);
     fields.insert(QContactDetail::FieldDetailUri, gsfd);
     defns[contactType][QContactAddress::DefinitionName].setFields(fields);
     
-    // QContactAnniversary
+    // No QContactAnniversary
     defns[contactType].remove(QContactAnniversary::DefinitionName);
     
-    // QContactAvatar
+    // No QContactAvatar
+    defns[contactType].remove(QContactAvatar::DefinitionName);
+
     // TODO setUnique(true);
     // QContactBirthday
+    fields = defns[contactType][QContactBirthday::DefinitionName].fields();
+    fields.remove(QContactDetail::FieldContext);
+    defns[contactType][QContactBirthday::DefinitionName].setFields(fields);
+
     // QContactDisplayLabel
+    fields = defns[contactType][QContactDisplayLabel::DefinitionName].fields();
+    defns[contactType][QContactDisplayLabel::DefinitionName].setFields(fields);
     
     // QContactEmailAddress
     fields = defns[contactType][QContactEmailAddress::DefinitionName].fields();
@@ -268,22 +284,48 @@
     defns[contactType][QContactEmailAddress::DefinitionName].setFields(fields);
     
     // QContactFamily
+    fields = defns[contactType][QContactFamily::DefinitionName].fields();
+    fields.remove(QContactDetail::FieldContext);
+    defns[contactType][QContactFamily::DefinitionName].setFields(fields);
+
     // QContactGender
-    // QContactGeoLocation
+    fields = defns[contactType][QContactGender::DefinitionName].fields();
+    fields.remove(QContactDetail::FieldContext);
+    defns[contactType][QContactGender::DefinitionName].setFields(fields);
+
+    // No QContactGeoLocation
     defns[contactType].remove(QContactGeoLocation::DefinitionName);
     
     // QContactGuid
+    fields = defns[contactType][QContactGuid::DefinitionName].fields();
+    fields.remove(QContactDetail::FieldContext);
+    defns[contactType][QContactGuid::DefinitionName].setFields(fields);
+  
+    // No QContactGlobalPresence
+    defns[contactType].remove(QContactGlobalPresence::DefinitionName);
+
     // QContactName
     fields = defns[contactType][QContactName::DefinitionName].fields();
+    fields.remove(QContactDetail::FieldContext);
     fields.remove(QContactName::FieldCustomLabel);
+    fields.remove(QContactName::FieldMiddleName);
     fields.remove(QContactName::FieldPrefix);
     fields.remove(QContactName::FieldSuffix);
     defns[contactType][QContactName::DefinitionName].setFields(fields);
     
     // QContactNickname
+    fields = defns[contactType][QContactNickname::DefinitionName].fields();
+    fields.remove(QContactDetail::FieldContext);
+    defns[contactType][QContactNickname::DefinitionName].setFields(fields);
+
     // QContactNote
+    fields = defns[contactType][QContactNote::DefinitionName].fields();
+    fields.remove(QContactDetail::FieldContext);
+    defns[contactType][QContactNote::DefinitionName].setFields(fields);
+
     // QContactOnlineAccount
     fields = defns[contactType][QContactOnlineAccount::DefinitionName].fields();
+    fields.remove(QContactDetail::FieldContext);
     fields.remove(QContactOnlineAccount::FieldAccountUri);
     fields.remove(QContactOnlineAccount::FieldSubTypes);
     fields.insert("AccountPath", gsfd);
@@ -291,6 +333,7 @@
     
     // QContactOrganization
     fields = defns[contactType][QContactOrganization::DefinitionName].fields();
+    fields.remove(QContactDetail::FieldContext);
     fields.remove(QContactOrganization::FieldAssistantName);
     fields.remove(QContactOrganization::FieldDepartment);
     fields.remove(QContactOrganization::FieldLocation);
@@ -302,19 +345,41 @@
     // QContactPhoneNumber
     fields = defns[contactType][QContactPhoneNumber::DefinitionName].fields();
     fields.insert(QContactDetail::FieldDetailUri, gsfd);
+    QContactDetailFieldDefinition phoneSubtype = fields.value(QContactPhoneNumber::FieldSubTypes);
+    QVariantList allowableValues;
+    allowableValues << QContactPhoneNumber::SubTypeMobile;
+    allowableValues << QContactPhoneNumber::SubTypeVoice;
+    phoneSubtype.setAllowableValues(allowableValues);
+    fields.insert(QContactPhoneNumber::FieldSubTypes, phoneSubtype);
     defns[contactType][QContactPhoneNumber::DefinitionName].setFields(fields);
+
+    // No QContactPresence
+    defns[contactType].remove(QContactPresence::DefinitionName);
+
+    // No QContactRingtone
+    defns[contactType].remove(QContactRingtone::DefinitionName);
     
-    // QContactSyncTarget
+    // No QContactSyncTarget
     defns[contactType].remove(QContactSyncTarget::DefinitionName);
+
+    // No QContactTag
+    defns[contactType].remove(QContactTag::DefinitionName);
     
     // QContactTimestamp
+    fields = defns[contactType][QContactTimestamp::DefinitionName].fields();
+    fields.remove(QContactDetail::FieldContext);
+    defns[contactType][QContactTimestamp::DefinitionName].setFields(fields);
+
     // QContactType
+    fields = defns[contactType][QContactType::DefinitionName].fields();
+    fields.remove(QContactDetail::FieldContext);
+    defns[contactType][QContactType::DefinitionName].setFields(fields);
+
     // QContactUrl
     fields = defns[contactType][QContactUrl::DefinitionName].fields();
+    fields.remove(QContactDetail::FieldContext);
     fields.remove(QContactUrl::FieldSubType);
     defns[contactType][QContactUrl::DefinitionName].setFields(fields);
-  
-    //Still unmanaged: GlobalPresence, Presence, Ringtone, Tag
     
     QCM5_DEBUG << "Contact type" << contactType << "Keys" <<  defns.keys();
     
@@ -361,3 +426,148 @@
 
   return st;   
 }
+
+void QContactMaemo5Engine::requestDestroyed(QContactAbstractRequest* req){
+  m_asynchronousOperations.removeOne(req);
+}
+
+bool QContactMaemo5Engine::startRequest(QContactAbstractRequest* req){
+  if (!m_asynchronousOperations.contains(req))
+    m_asynchronousOperations.enqueue(req);
+  updateRequestState(req, QContactAbstractRequest::ActiveState);
+  QTimer::singleShot(0, this, SLOT(performAsynchronousOperation()));
+  return true;
+}
+
+bool QContactMaemo5Engine::cancelRequest(QContactAbstractRequest* req){
+  updateRequestState(req, QContactAbstractRequest::CanceledState);
+  return true;
+}
+
+bool QContactMaemo5Engine::waitForRequestProgress(QContactAbstractRequest* req, int msecs){
+  Q_UNUSED(msecs);
+  
+  if (!m_asynchronousOperations.removeOne(req))
+    return false; // didn't exist.
+
+  // replace at head of queue
+  m_asynchronousOperations.insert(0, req);
+
+  // and perform the operation.
+  performAsynchronousOperation();
+
+  return true;
+}
+
+bool QContactMaemo5Engine::waitForRequestFinished(QContactAbstractRequest* req, int msecs){
+  // in our implementation, we always complete any operation we start.
+  // so, waitForRequestFinished is equivalent to waitForRequestProgress.
+  return waitForRequestProgress(req, msecs);
+}
+
+void QContactMaemo5Engine::performAsynchronousOperation(){
+  QContactAbstractRequest *currentRequest;
+
+  // take the first pending request and finish it
+  if (m_asynchronousOperations.isEmpty())
+    return;
+  currentRequest = m_asynchronousOperations.dequeue();
+
+  // check to see if it is cancelling; if so, remove it from the queue and return.
+  if (currentRequest->state() == QContactAbstractRequest::CanceledState)
+    return;
+
+  // Now perform the active request and emit required signals.
+  Q_ASSERT(currentRequest->state() == QContactAbstractRequest::ActiveState);
+  switch (currentRequest->type()) {
+    case QContactAbstractRequest::ContactFetchRequest:
+    {
+      QContactFetchRequest* r = static_cast<QContactFetchRequest*>(currentRequest);
+      QContactFilter filter = r->filter();
+      QList<QContactSortOrder> sorting = r->sorting();
+      QContactFetchHint fh = r->fetchHint();
+
+      QContactManager::Error operationError;
+      QList<QContact> requestedContacts = contacts(filter, sorting, fh, &operationError);
+
+      // update the request with the results.
+      updateContactFetchRequest(r, requestedContacts, operationError, QContactAbstractRequest::FinishedState); // emit resultsAvailable()
+    } break;
+    case QContactAbstractRequest::ContactLocalIdFetchRequest:
+    {
+      QContactLocalIdFetchRequest* r = static_cast<QContactLocalIdFetchRequest*>(currentRequest);
+      QContactFilter filter = r->filter();
+      QList<QContactSortOrder> sorting = r->sorting();
+
+      QContactManager::Error operationError = QContactManager::NoError;
+      QList<QContactLocalId> requestedContactIds = contactIds(filter, sorting, &operationError);
+
+      updateContactLocalIdFetchRequest(r, requestedContactIds, operationError, QContactAbstractRequest::FinishedState);
+    } break;
+    case QContactAbstractRequest::ContactSaveRequest:
+    {
+      QContactSaveRequest* r = static_cast<QContactSaveRequest*>(currentRequest);
+      QList<QContact> contacts = r->contacts();
+
+      QContactManager::Error operationError = QContactManager::NoError;
+      QMap<int, QContactManager::Error> errorMap;
+      saveContacts(&contacts, &errorMap, &operationError);
+
+      updateContactSaveRequest(r, contacts, operationError, errorMap, QContactAbstractRequest::FinishedState); // there will always be results of some form.  emit resultsAvailable().
+     } break;
+     case QContactAbstractRequest::ContactRemoveRequest:
+     {
+       // this implementation provides scant information to the user
+       // the operation either succeeds (all contacts matching the filter were removed)
+       // or it fails (one or more contacts matching the filter could not be removed)
+       // if a failure occurred, the request error will be set to the most recent
+       // error that occurred during the remove operation.
+       QContactRemoveRequest* r = static_cast<QContactRemoveRequest*>(currentRequest);
+       QContactManager::Error operationError = QContactManager::NoError;
+       QList<QContactLocalId> contactsToRemove = r->contactIds();
+       QMap<int, QContactManager::Error> errorMap;
+
+       for (int i = 0; i < contactsToRemove.size(); i++) {
+         QContactManager::Error tempError;
+         removeContact(contactsToRemove.at(i), /*changeSet,*/ &tempError);
+
+         errorMap.insert(i, tempError);                
+         if (tempError != QContactManager::NoError) {
+           operationError = tempError;
+         }
+       }
+
+       updateContactRemoveRequest(r, operationError, errorMap, QContactAbstractRequest::FinishedState);
+     } break;
+     case QContactAbstractRequest::DetailDefinitionFetchRequest:
+     {
+       QContactDetailDefinitionFetchRequest* r = static_cast<QContactDetailDefinitionFetchRequest*>(currentRequest);
+       QContactManager::Error operationError = QContactManager::NoError;
+       QMap<int, QContactManager::Error> errorMap;
+       QMap<QString, QContactDetailDefinition> requestedDefinitions;
+       QStringList names = r->definitionNames();
+       if (names.isEmpty())
+         names = detailDefinitions(r->contactType(), &operationError).keys(); // all definitions.
+
+       QContactManager::Error tempError;
+       for (int i = 0; i < names.size(); i++) {
+         QContactDetailDefinition current = detailDefinition(names.at(i), r->contactType(), &tempError);
+         requestedDefinitions.insert(names.at(i), current);
+
+         errorMap.insert(i, tempError);              
+         if (tempError != QContactManager::NoError) {
+           operationError = tempError;
+         }
+       }
+
+       updateDefinitionFetchRequest(r, requestedDefinitions, operationError, errorMap, QContactAbstractRequest::FinishedState);
+     } break;
+     default:
+     {
+       // symbian engine currently does not support mutable definitions.
+     } break;
+
+    
+  } 
+}
+

--- a/qtmobility/plugins/contacts/maemo5/qcontactmaemo5backend_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/maemo5/qcontactmaemo5backend_p.h	Fri May 14 16:41:33 2010 +0300
@@ -48,7 +48,7 @@
 #include <QMap>
 #include <QString>
 #include <QList>
-
+#include <QQueue>
 #include <QDebug>
 
 #include "qtcontacts.h"
@@ -59,6 +59,8 @@
 
 QTM_USE_NAMESPACE
 
+Q_DEFINE_LATIN1_CONSTANT(AddressFieldExtension, "X-Maemo5-Extension");
+
 class Q_DECL_EXPORT ContactMaemo5Factory : public QObject, public QContactManagerEngineFactory
 {
   Q_OBJECT
@@ -105,6 +107,7 @@
     QString synthesizedDisplayLabel(const QContact& contact, QContactManager::Error* error) const;
     bool validateContact(const QContact&, QContactManager::Error* error) const;
     bool validateDefinition(const QContactDetailDefinition&, QContactManager::Error* error) const;
+    QContact compatibleContact(const QContact& contact, QContactManager::Error* error) const;
 
     /* "Self" contact id (MyCard) */
     QContactLocalId selfContactId(QContactManager::Error* errors) const;
@@ -134,26 +137,18 @@
     QList<QVariant::Type> supportedDataTypes() const;
     QStringList supportedContactTypes() const {return (QStringList() << QContactType::TypeContact);}
     
-    // XXX TODO: FIXME - these are pure virtual and so MUST be implemented by the backend.  Stubs here.
-    QMap<QString, QString> managerParameters() const {return QMap<QString,QString>();}
-
-    QContact compatibleContact(const QContact&, QContactManager::Error* error) const {*error =  QContactManager::NotSupportedError;return QContact();}
-
-    bool setSelfContactId(const QContactLocalId&, QContactManager::Error* error) {*error = QContactManager::NotSupportedError; return false;}
-    bool saveDetailDefinition(const QContactDetailDefinition&, const QString&, QContactManager::Error* error) {*error = QContactManager::NotSupportedError; return false;}
-    bool removeDetailDefinition(const QString&, const QString&, QContactManager::Error* error) {*error = QContactManager::NotSupportedError; return false;}
-
-    void requestDestroyed(QContactAbstractRequest*) {}
-    bool startRequest(QContactAbstractRequest*) {return false;}
-    bool cancelRequest(QContactAbstractRequest*) {return false;}
-    bool waitForRequestFinished(QContactAbstractRequest*, int) {return false;}
+    /* Asynchronous Request Support - synchronous versions until thread worker is stable */
+    void requestDestroyed(QContactAbstractRequest *req);
+    bool startRequest(QContactAbstractRequest *req);
+    bool cancelRequest(QContactAbstractRequest *req);
+    bool waitForRequestProgress(QContactAbstractRequest* req, int msecs);
+    bool waitForRequestFinished(QContactAbstractRequest* req, int msecs);
     
-    bool saveRelationships(QList<QContactRelationship>*, QMap<int, QContactManager::Error>*, QContactManager::Error* error) {*error = QContactManager::NotSupportedError; return false;}
-    bool removeRelationships(const QList<QContactRelationship>&, QMap<int, QContactManager::Error>*, QContactManager::Error* error) {*error = QContactManager::NotSupportedError; return false;}
-    bool isRelationshipTypeSupported(const QString&, const QString&) const {return false;}
-    QList<QContactRelationship> relationships(const QString&, const QContactId&, QContactRelationship::Role, QContactManager::Error* error) const {*error = QContactManager::NotSupportedError; return QList<QContactRelationship>();}
-
-  private:
+  private slots:
+    void performAsynchronousOperation();
+    
+  private:  
+    QQueue<QContactAbstractRequest*> m_asynchronousOperations; // async requests to be performed.
     QSharedDataPointer<QContactMaemo5EngineData> d;
 };

--- a/qtmobility/plugins/contacts/symbian/inc/cntsymbiandatabase.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/cntsymbiandatabase.h	Fri May 14 16:41:33 2010 +0300
@@ -89,11 +89,11 @@
     QSet<QContactLocalId> groupMembersL(QContactLocalId groupId);
 
 private:
+    QContactManagerEngine *m_engine;
     CContactDatabase* m_contactDatabase;
 #ifndef SYMBIAN_BACKEND_USE_SQLITE
     CContactChangeNotifier* m_contactChangeNotifier;
 #endif
-    QContactManagerEngine *m_engine;
     QList<QContactLocalId> m_contactsEmitted;
     QContactLocalId m_currentOwnCardId;
     QMap<QContactLocalId, QSet<QContactLocalId> > m_groupContents;

--- a/qtmobility/plugins/contacts/symbian/inc/cntsymbianengine.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/cntsymbianengine.h	Fri May 14 16:41:33 2010 +0300
@@ -94,15 +94,7 @@
     QString managerName() const;
 
     /* XXX TODO - implement these correctly */
-    QMap<QString, QString> managerParameters() const {return QMap<QString, QString>();}
     int managerVersion() const { return 1;}
-    QContact compatibleContact(const QContact&, QContactManager::Error* error) const {*error =  QContactManager::NotSupportedError;return QContact();}
-    bool validateContact(const QContact& contact, QContactManager::Error* error) const {return QContactManagerEngine::validateContact(contact, error);}
-    bool validateDefinition(const QContactDetailDefinition& def, QContactManager::Error* error) const {return QContactManagerEngine::validateDefinition(def, error);}
-    QContactDetailDefinition detailDefinition(const QString& definitionId, const QString& contactType, QContactManager::Error* error) const  {return QContactManagerEngine::detailDefinition(definitionId, contactType, error);}
-    bool saveDetailDefinition(const QContactDetailDefinition& def, const QString& contactType, QContactManager::Error* error) {return QContactManagerEngine::saveDetailDefinition(def, contactType, error);}
-    bool removeDetailDefinition(const QString& definitionId, const QString& contactType, QContactManager::Error* error)  {return QContactManagerEngine::removeDetailDefinition(definitionId, contactType, error);}
-    QStringList supportedContactTypes() const {return QContactManagerEngine::supportedContactTypes();}
 
     /* Functions that are optional in the base API */
     bool saveRelationship(QContactRelationship* relationship, QContactManager::Error* error);

--- a/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilteraction.h	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module 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$
-**
-****************************************************************************/
-
-#ifndef CNTFILTERACTION_H_
-#define CNTFILTERACTION_H_
-
-#include "cntabstractcontactfilter.h"
-#include "cntsymbiansrvconnection.h"
-#include "cntdbinfo.h"
-
-class CntFilterAction : public CntAbstractContactFilter
-{
-public:
-    CntFilterAction(CContactDatabase& contactDatabase,CntSymbianSrvConnection &cntServer,CntDbInfo& dbInfo);
-    ~CntFilterAction();
-    QList<QContactLocalId> contacts(
-            const QContactFilter &filter,
-            const QList<QContactSortOrder> &sortOrders,
-            bool &filterSupported,
-            QContactManager::Error* error);
-    bool filterSupported(const QContactFilter& filter);
-
-    void createSelectQuery(const QContactFilter& filter,
-                                 QString& sqlQuery,
-                                 QContactManager::Error* error);
-private:
-
-protected:
-    CContactDatabase& m_contactdatabase;
-    CntSymbianSrvConnection &m_srvConnection;
-    CntDbInfo& m_dbInfo;
-};
-
-#endif /* CNTFILTERACTION_H_ */

--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformcontact.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformcontact.h	Fri May 14 16:41:33 2010 +0300
@@ -105,8 +105,6 @@
 	void initializeCntTransformContactData();
 	QList<CContactItemField *> transformDetailL(const QContactDetail &detail) const;
 	QContactDetail *transformItemField(const CContactItemField& field, const QContact &contact) const;
-	void transformPreferredDetailL(const QContact& contact, const QContactDetail& detail, QList<CContactItemField*> &fieldList) const;
-	void transformPreferredDetail(const CContactItemField& field, const QContactDetail& detail, QContact& contact) const;
 
 private:
 	QMap<ContactData, CntTransformContactData*> m_transformContactData;

--- a/qtmobility/plugins/contacts/symbian/plugin_commonU.def	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-; ==============================================================================
-; Generated by qmake (2.01a) (Qt 4.6.1) on: 2010-03-19T12:47:52
-; This file is generated by qmake and should not be modified by the
-; user.
-;  Name        : plugin_commonU.def
-;  Part of     : mobapicontactspluginsymbian
-;  Description : Fixes common plugin symbols to known ordinals
-;  Version     : 
-;
-; ==============================================================================
-
-
-EXPORTS
-	qt_plugin_query_verification_data @ 1 NONAME
-	qt_plugin_instance @ 2 NONAME
-

--- a/qtmobility/plugins/contacts/symbian/src/cntsymbianengine.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/cntsymbianengine.cpp	Fri May 14 16:41:33 2010 +0300
@@ -1159,6 +1159,6 @@
     return CNT_SYMBIAN_MANAGER_NAME;
 }
 
-Q_EXPORT_PLUGIN2(mobapicontactspluginsymbian, CntSymbianFactory);
+Q_EXPORT_PLUGIN2(qtcontacts_symbian, CntSymbianFactory);
 
 #endif  //PBK_UNIT_TEST

--- a/qtmobility/plugins/contacts/symbian/src/filtering/cntfilteraction.cpp	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module 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$
-**
-****************************************************************************/
-
-#include "cntfilteraction.h"
-#include "cnttransformcontact.h"
-#include "cntfilterdetaildisplaylabel.h" //todo rename class to follow naming pattern CntFilterDetailDisplayLabel
-
-CntFilterAction::CntFilterAction(CContactDatabase& contactDatabase,CntSymbianSrvConnection &cntServer,CntDbInfo& dbInfo) 
-                                        :m_contactdatabase(contactDatabase),
-                                         m_srvConnection(cntServer),
-                                         m_dbInfo(dbInfo)
-{
-    // m_detailFilters.append(new CntFilterDetailDisplayLabel(m_srvConnection));
-}
-
-CntFilterAction::~CntFilterAction()
-{
-    
-}
-
-QList<QContactLocalId> CntFilterAction::contacts(
-        const QContactFilter &filter,
-        const QList<QContactSortOrder> &sortOrders,
-        bool &filterSupportedflag,
-        QContactManager::Error* error)
-{
-    Q_UNUSED(sortOrders);
-    Q_UNUSED(filterSupportedflag);
-    //Check if any invalid filter is passed 
-    if(!filterSupported(filter))
-            {
-            *error =  QContactManager::NotSupportedError;
-            return QList<QContactLocalId>();
-            }
-    QList<QContactLocalId> idList;
-    
-    //Create the query
-    QString sqlQuery;
-    createSelectQuery( filter,sqlQuery,error);
-    
-    //fetch the contacts
-    if(*error != QContactManager::NotSupportedError)
-    {
-        idList =  m_srvConnection.searchContacts(sqlQuery, error);
-    }
-    
-    return idList;
-    
-}
-
-
-bool CntFilterAction::filterSupported(const QContactFilter& /*filter*/) 
-{
-    bool result = false;
-    //Not yet supported  
-      /*if(QContactFilter::ActionFilter == filter.type())
-             {
-             result = true;
-             }
-      */
-    
-       return result;
-}
-
-
-void CntFilterAction::createSelectQuery(const QContactFilter& filter,
-                              QString& sqlQuery,
-                              QContactManager::Error* error)
-
-{
-    //Check if any invalid filter is passed 
-    if(!filterSupported(filter))
-            {
-            *error =  QContactManager::NotSupportedError;
-            }
-   //For default filter, just return the below query
-    sqlQuery = "";
-
-    
-}

--- a/qtmobility/plugins/contacts/symbian/src/filtering/cntsymbianfiltersql.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/filtering/cntsymbianfiltersql.cpp	Fri May 14 16:41:33 2010 +0300
@@ -54,7 +54,6 @@
 #include "cntfilterinvalid.h"
 #include "cntfilterdetailrange.h"
 #include "cntfilterchangelog.h"
-#include "cntfilteraction.h"
 #include "cntfilterlocalid.h"
 #include <QLatin1String>
 #include <e32cmn.h>
@@ -81,7 +80,6 @@
     m_filterMap.insert(QContactFilter::InvalidFilter, new CntFilterInvalid(m_contactDatabase,*m_srvConnection,*m_dbInfo));
     m_filterMap.insert(QContactFilter::ContactDetailRangeFilter, new CntFilterdetailrange(m_contactDatabase,*m_srvConnection,*m_dbInfo));
     m_filterMap.insert(QContactFilter::ChangeLogFilter, new CntFilterChangeLog(m_contactDatabase,*m_srvConnection,*m_dbInfo));
-    m_filterMap.insert(QContactFilter::ActionFilter, new CntFilterAction(m_contactDatabase,*m_srvConnection,*m_dbInfo));
     m_filterMap.insert(QContactFilter::LocalIdFilter, new CntFilterLocalId(m_contactDatabase,*m_srvConnection,*m_dbInfo));
     
     }

--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformcontact.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformcontact.cpp	Fri May 14 16:41:33 2010 +0300
@@ -72,12 +72,6 @@
 
 #include <QDebug>
 
-//UIDs for preferred (default) fields
-const int KDefaultFieldForCall = 0x10003E70;
-const int KDefaultFieldForVideoCall = 0x101F85A6;
-const int KDefaultFieldForEmail = 0x101F85A7;
-const int KDefaultFieldForMessage = 0x101f4cf1;
-
 CntTransformContact::CntTransformContact()
 {
 	initializeCntTransformContactData();
@@ -176,7 +170,6 @@
             if(definitionRestrictions.isEmpty() || definitionRestrictions.contains(detail->definitionName())) 
             {
                 newQtContact.saveDetail(detail);
-                transformPreferredDetail(fields[i], *detail, newQtContact);
             }
             delete detail;
             detail = 0;
@@ -260,9 +253,6 @@
             QList<CContactItemField *> fieldList = transformDetailL(*detail);
             int fieldCount = fieldList.count();
             
-            // save preferred detail
-            transformPreferredDetailL(contact, detailList.at(i), fieldList);            
-            
             for (int j = 0; j < fieldCount; j++)
             {
                 //Add field to fieldSet
@@ -443,41 +433,3 @@
     return 0;
 #endif
 }
-
-void CntTransformContact::transformPreferredDetailL(const QContact& contact,
-        const QContactDetail& detail, QList<CContactItemField*> &fieldList) const
-{
-    if (fieldList.count() == 0) {
-        return;
-    }
-
-    if (contact.isPreferredDetail("call", detail)) {
-        fieldList.at(0)->AddFieldTypeL(TFieldType::Uid(KDefaultFieldForCall));
-    }
-    if (contact.isPreferredDetail("email", detail)) {
-        fieldList.at(0)->AddFieldTypeL(TFieldType::Uid(KDefaultFieldForEmail));
-    }
-    if (contact.isPreferredDetail("videocall", detail)) {
-        fieldList.at(0)->AddFieldTypeL(TFieldType::Uid(KDefaultFieldForVideoCall));
-    }
-    if (contact.isPreferredDetail("message", detail)) {
-        fieldList.at(0)->AddFieldTypeL(TFieldType::Uid(KDefaultFieldForMessage));
-    }
-}
-
-void CntTransformContact::transformPreferredDetail(const CContactItemField& field,
-        const QContactDetail& detail, QContact& contact) const
-{
-    if (field.ContentType().ContainsFieldType(TFieldType::Uid(KDefaultFieldForCall))) {
-        contact.setPreferredDetail("call", detail);
-    }
-    if (field.ContentType().ContainsFieldType(TFieldType::Uid(KDefaultFieldForEmail))) {
-        contact.setPreferredDetail("email", detail);
-    }
-    if (field.ContentType().ContainsFieldType(TFieldType::Uid(KDefaultFieldForVideoCall))) {
-        contact.setPreferredDetail("videocall", detail);
-    }
-    if (field.ContentType().ContainsFieldType(TFieldType::Uid(KDefaultFieldForMessage))) {
-        contact.setPreferredDetail("message", detail);
-    }
-}

--- a/qtmobility/plugins/contacts/symbian/symbian.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/symbian.pro	Fri May 14 16:41:33 2010 +0300
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(mobapicontactspluginsymbian)
+TARGET = $$qtLibraryTarget(qtcontacts_symbian)
 PLUGIN_TYPE=contacts
 
 include(../../../common.pri)
@@ -61,7 +61,6 @@
         inc/filtering/cntfilterintersection.h \
         inc/filtering/cntfilterunion.h \
         inc/filtering/cntfilterinvalid.h \
-        inc/filtering/cntfilteraction.h \
         inc/filtering/cntfilterlocalid.h \
 				inc/filtering/cntfilterchangelog.h \
 				inc/filtering/cntfilterdetailrange.h \
@@ -106,7 +105,6 @@
         src/filtering/cntfilterintersection.cpp \
         src/filtering/cntfilterunion.cpp \
         src/filtering/cntfilterinvalid.cpp \
-        src/filtering/cntfilteraction.cpp \
         src/filtering/cntfilterlocalid.cpp \
 				src/filtering/cntfilterchangelog.cpp \
 				src/filtering/cntfilterdetailrange.cpp \

--- a/qtmobility/plugins/contacts/symbian/tsrc/performance/performance.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/performance/performance.cpp	Fri May 14 16:41:33 2010 +0300
@@ -119,7 +119,6 @@
         number.setSubTypes("Mobile");
         number.setNumber("12345678");
         alice.saveDetail(&number);
-        alice.setPreferredDetail("DialAction", number);
 
         QContactPhoneNumber number2;
         number2.setContexts("Work");
@@ -417,7 +416,6 @@
         number.setSubTypes("Mobile");
         number.setNumber("12345678");
         alice.saveDetail(&number);
-        alice.setPreferredDetail("DialAction", number);
         QContactPhoneNumber number2;
         number2.setContexts("Work");
         number2.setSubTypes("Landline");

--- a/qtmobility/plugins/contacts/symbian/tsrc/tsrc.pri	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/tsrc.pri	Fri May 14 16:41:33 2010 +0300
@@ -58,7 +58,6 @@
         ../../inc/filtering/cntfilterinvalid.h \
         ../../inc/filtering/cntfilterdetailrange.h \
         ../../inc/filtering/cntfilterchangelog.h \
-        ../../inc/filtering/cntfilteraction.h \
         ../../inc/filtering/cntfilterlocalid.h \
         ../../inc/filtering/cntfilterdetaildisplaylabel.h \
         
@@ -109,7 +108,6 @@
         ../../src/filtering/cntfilterinvalid.cpp \
         ../../src/filtering/cntfilterdetailrange.cpp \
         ../../src/filtering/cntfilterchangelog.cpp \
-        ../../src/filtering/cntfilteraction.cpp \
         ../../src/filtering/cntfilterlocalid.cpp \
         ../../src/filtering/cntfilterdetaildisplaylabel.cpp \

--- a/qtmobility/plugins/contacts/symbian/tsrc/tst_cntfilteringdbms/tst_cntfilteringdbms.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/tst_cntfilteringdbms/tst_cntfilteringdbms.cpp	Fri May 14 16:41:33 2010 +0300
@@ -171,16 +171,16 @@
     allContacts << abc << bcd << cde << Abc << Bcd << Cde;
     
     addNewRow(QContactPhoneNumber::DefinitionName, QString(), QContactFilter::MatchExactly, CntAbstractContactFilter::NotSupported, "foobar", allContacts);
-    addNewRow(QContactPhoneNumber::DefinitionName, QContactPhoneNumber::FieldNumber, QContactFilter::MatchExactly, CntAbstractContactFilter::SupportedPreFilterOnly, "123", QContactIds() << abc);
+    addNewRow(QContactPhoneNumber::DefinitionName, QContactPhoneNumber::FieldNumber, QContactFilter::MatchExactly, CntAbstractContactFilter::NotSupported, "123", QContactIds() << abc);
     addNewRow(QContactPhoneNumber::DefinitionName, QContactPhoneNumber::FieldNumber, QContactFilter::MatchExactly, CntAbstractContactFilter::SupportedPreFilterOnly, "1234567", QContactIds() << bcd);
     addNewRow(QContactPhoneNumber::DefinitionName, QContactPhoneNumber::FieldNumber, QContactFilter::MatchExactly, CntAbstractContactFilter::SupportedPreFilterOnly, "1234567890", QContactIds() << cde);
     addNewRow(QContactPhoneNumber::DefinitionName, QContactPhoneNumber::FieldNumber, QContactFilter::MatchContains, CntAbstractContactFilter::NotSupported, "123", QContactIds() << abc << bcd << cde << Abc);
     addNewRow(QContactPhoneNumber::DefinitionName, QContactPhoneNumber::FieldNumber, QContactFilter::MatchStartsWith, CntAbstractContactFilter::NotSupported, "123", QContactIds() << abc << bcd << cde);
-    addNewRow(QContactPhoneNumber::DefinitionName, QContactPhoneNumber::FieldNumber, QContactFilter::MatchEndsWith, CntAbstractContactFilter::SupportedPreFilterOnly, "567", QContactIds() << bcd );
+    addNewRow(QContactPhoneNumber::DefinitionName, QContactPhoneNumber::FieldNumber, QContactFilter::MatchEndsWith, CntAbstractContactFilter::NotSupported, "567", QContactIds() << bcd );
     addNewRow(QContactPhoneNumber::DefinitionName, QContactPhoneNumber::FieldNumber, QContactFilter::MatchEndsWith, CntAbstractContactFilter::SupportedPreFilterOnly, "4567890", QContactIds() << cde << Abc );
-    addNewRow(QContactPhoneNumber::DefinitionName, QContactPhoneNumber::FieldNumber, QContactFilter::MatchFixedString, CntAbstractContactFilter::SupportedPreFilterOnly, "123", QContactIds() << abc);
+    addNewRow(QContactPhoneNumber::DefinitionName, QContactPhoneNumber::FieldNumber, QContactFilter::MatchFixedString, CntAbstractContactFilter::NotSupported, "123", QContactIds() << abc);
     addNewRow(QContactPhoneNumber::DefinitionName, QContactPhoneNumber::FieldNumber, QContactFilter::MatchPhoneNumber, CntAbstractContactFilter::Supported, "1234567890", QContactIds() << cde << Abc);
-    addNewRow(QContactPhoneNumber::DefinitionName, QContactPhoneNumber::FieldNumber, QContactFilter::MatchKeypadCollation, CntAbstractContactFilter::NotSupported, "123", QContactIds() << abc << bcd << cde << Abc);
+    addNewRow(QContactPhoneNumber::DefinitionName, QContactPhoneNumber::FieldNumber, QContactFilter::MatchKeypadCollation, CntAbstractContactFilter::NotSupported, "123", QContactIds() << abc);
     
     addNewRow(QContactName::DefinitionName, QString(), QContactFilter::MatchExactly, CntAbstractContactFilter::NotSupported, "foobar", allContacts);
     addNewRow(QContactName::DefinitionName, QContactName::FieldFirstName, QContactFilter::MatchExactly, CntAbstractContactFilter::SupportedPreFilterOnly, "Abc", QContactIds() << abc << Abc);
@@ -193,8 +193,7 @@
     addNewRow(QContactName::DefinitionName, QContactName::FieldFirstName, QContactFilter::MatchEndsWith | QContactFilter::MatchCaseSensitive, CntAbstractContactFilter::SupportedPreFilterOnly, "Cde", QContactIds() << Cde);
     addNewRow(QContactName::DefinitionName, QContactName::FieldFirstName, QContactFilter::MatchFixedString, CntAbstractContactFilter::SupportedPreFilterOnly, "abc", QContactIds() << abc << Abc);
     addNewRow(QContactName::DefinitionName, QContactName::FieldFirstName, QContactFilter::MatchFixedString | QContactFilter::MatchCaseSensitive, CntAbstractContactFilter::SupportedPreFilterOnly, "abc", QContactIds() << abc);
-    addNewRow(QContactName::DefinitionName, QContactName::FieldFirstName, QContactFilter::MatchPhoneNumber, CntAbstractContactFilter::NotSupported, "abc", QContactIds() << abc << Abc); // not sure if this valid
-    addNewRow(QContactName::DefinitionName, QContactName::FieldFirstName, QContactFilter::MatchKeypadCollation, CntAbstractContactFilter::NotSupported, "abc", QContactIds() << abc << Abc);
+    addNewRow(QContactName::DefinitionName, QContactName::FieldFirstName, QContactFilter::MatchKeypadCollation, CntAbstractContactFilter::NotSupported, "223", QContactIds() << bcd << Bcd);
     
     addNewRow(QContactDisplayLabel::DefinitionName, QString(), QContactFilter::MatchExactly, CntAbstractContactFilter::NotSupported, "foobar", allContacts);
     addNewRow(QContactDisplayLabel::DefinitionName, QContactDisplayLabel::FieldLabel, QContactFilter::MatchExactly, CntAbstractContactFilter::NotSupported, "abc def", QContactIds() << abc << Abc);
@@ -207,8 +206,7 @@
     addNewRow(QContactDisplayLabel::DefinitionName, QContactDisplayLabel::FieldLabel, QContactFilter::MatchEndsWith | QContactFilter::MatchCaseSensitive, CntAbstractContactFilter::NotSupported, "d Efg", QContactIds() << Bcd);
     addNewRow(QContactDisplayLabel::DefinitionName, QContactDisplayLabel::FieldLabel, QContactFilter::MatchFixedString, CntAbstractContactFilter::NotSupported, "abc def", QContactIds() << abc << Abc);
     addNewRow(QContactDisplayLabel::DefinitionName, QContactDisplayLabel::FieldLabel, QContactFilter::MatchFixedString | QContactFilter::MatchCaseSensitive, CntAbstractContactFilter::NotSupported, "abc def", QContactIds() << abc);
-    addNewRow(QContactDisplayLabel::DefinitionName, QContactDisplayLabel::FieldLabel, QContactFilter::MatchPhoneNumber, CntAbstractContactFilter::NotSupported, "abc def", QContactIds() << abc << Abc); // not sure if this is valid
-    addNewRow(QContactDisplayLabel::DefinitionName, QContactDisplayLabel::FieldLabel, QContactFilter::MatchKeypadCollation, CntAbstractContactFilter::NotSupported, "abc def", QContactIds() << abc << Abc);
+    addNewRow(QContactDisplayLabel::DefinitionName, QContactDisplayLabel::FieldLabel, QContactFilter::MatchKeypadCollation, CntAbstractContactFilter::NotSupported, "223 334", QContactIds() << bcd << Bcd);
 }

--- a/qtmobility/plugins/contacts/symbian/tsrc/tst_qcontactmanagersymbian/tst_qcontactmanagersymbian.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/tst_qcontactmanagersymbian/tst_qcontactmanagersymbian.cpp	Fri May 14 16:41:33 2010 +0300
@@ -339,11 +339,7 @@
 
     QContact testContact = m_cm->contact(m_contactId.localId());
 
-    // Verify the image exists
-    QImage image(fileName);
-    QVERIFY(!image.isNull());
-    
-    // Set image
+    // Set image, the image file may or may not actually exist
     QContactAvatar avatar;
     QUrl url(fileName);
     QVERIFY(url.isValid());
@@ -355,10 +351,7 @@
     testContact = m_cm->contact(m_contactId.localId());
     avatar = testContact.detail(QContactAvatar::DefinitionName);
     QVERIFY(!avatar.isEmpty());
-    url = avatar.imageUrl();
-    QVERIFY(url.isValid());
-    image = QImage(url.toString());
-    QVERIFY(!image.isNull());
+    QCOMPARE(url, avatar.imageUrl());
 }
 
 void tst_QContactManagerSymbian::thumbnail_data()

--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -51,11 +51,11 @@
 
 int main(int argc, char *argv[]) 
 {
-    bool promptOnExit(true);
+    /*bool promptOnExit(true);
     for (int i=0; i<argc; i++) {
         if (QString(argv[i]) == "-noprompt")
             promptOnExit = false;
-    }
+    }*/
     printf("Running tests...\n");
             
     QApplication app(argc, argv);

--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntfiltering.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntfiltering.cpp	Fri May 14 16:41:33 2010 +0300
@@ -51,7 +51,6 @@
 #include "cntfilterdefault.h"
 #include "cntfilterunion.h"
 #include "cntfilterintersection.h"
-#include "cntfilteraction.h"
 #include "cntfilterlocalid.h"
 #include "cntfilterinvalid.h"
 #include "cntfilterchangelog.h"
@@ -561,19 +560,6 @@
     QVERIFY(error == QContactManager::NotSupportedError);
 }
 
-void TestFiltering::testActionFilter()
-{
-    QList<QContactLocalId> cnt_ids;
-    QContactActionFilter filter;
-    QContactManager::Error error;
-    QList<QContactSortOrder> sortOrder;
-    
-    cnt_ids = mCntMng->contactIds(filter, sortOrder);
-    error = mCntMng->error();
-
-    QVERIFY(error == QContactManager::NotSupportedError);
-}
-
 void TestFiltering::testRelationshipFilter()
 {
     // create a group contact
@@ -596,18 +582,14 @@
     mCntMng->saveRelationship(&relationship);
     
     
-    QList<QContactLocalId> cnt_ids;
-    QContactManager::Error error;
-    QList<QContactSortOrder> sortOrder;
-    
     QContactRelationshipFilter groupFilter;                   
     groupFilter.setRelationshipType(QContactRelationship::HasMember);
     groupFilter.setRelatedContactId(groupContact.id());                
     groupFilter.setRelatedContactRole(QContactRelationship::First);
 
-    
-    cnt_ids = mCntMng->contactIds(groupFilter, sortOrder);
-    error = mCntMng->error();
+    QList<QContactSortOrder> sortOrder = QList<QContactSortOrder>();
+    QList<QContactLocalId> cnt_ids = mCntMng->contactIds(groupFilter, sortOrder);
+    QContactManager::Error error = mCntMng->error();
     
     // check counts 
     int seachedcontactcount = cnt_ids.count();
@@ -881,17 +863,15 @@
 {
     QList<QContactLocalId> cnt_ids;
     QContactDetailFilter df;
-    QContactManager::Error error;
     QList<QContactSortOrder> sortOrder;
 
-    bool isPredSearch = false;
     QString pattern = "60";
        
     df.setDetailDefinitionName(QContactName::DefinitionName);
     df.setMatchFlags( QContactFilter::MatchKeypadCollation );
     df.setValue( pattern );
     cnt_ids = mCntMng->contactIds(df, sortOrder);
-    error = mCntMng->error();
+    QContactManager::Error error = mCntMng->error();
 
     for( int i=0;i<cnt_ids.count();i++ ) {
             QString firstName("Micheal");
@@ -935,10 +915,6 @@
     flag = filterInvalid.filterSupported(f1);
     QVERIFY(flag ==false);   
             
-    CntFilterAction filterAction(*m_database,srvConnection,dbInfo);
-    flag = filterAction.filterSupported(f1);
-    QVERIFY(flag ==false);   
-               
     CntFilterUnion filterUnion(*m_database,srvConnection,dbInfo);
     flag = filterUnion.filterSupported(f1);
     QVERIFY(flag ==false);   
@@ -988,12 +964,7 @@
     error = QContactManager::NoError;
     filterInvalid.createSelectQuery(f1,sqlquery,&error);
     QVERIFY(error == QContactManager::NotSupportedError);
-            
-    CntFilterAction filterAction(*m_database,srvConnection,dbInfo);
-    error = QContactManager::NoError;
-    filterAction.createSelectQuery(f1,sqlquery,&error);
-    QVERIFY(error == QContactManager::NotSupportedError);
-               
+                        
     CntFilterUnion filterUnion(*m_database,srvConnection,dbInfo);
     error = QContactManager::NoError;
     filterUnion.createSelectQuery(f1,sqlquery,&error);

--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntfiltering.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntfiltering.h	Fri May 14 16:41:33 2010 +0300
@@ -80,7 +80,6 @@
     void testContactDetailFilter();
     void testContactDetailRangeFilter();
     void testChangeLogFilter();
-    void testActionFilter();
     void testRelationshipFilter();
     void testIntersectionFilter();
     void testUnionFilter();

--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbiandatabase.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbiandatabase.cpp	Fri May 14 16:41:33 2010 +0300
@@ -127,9 +127,10 @@
 #if 0
     TRAPD(err, db->m_contactDatabase->sendEventsL());
     QVERIFY(err == KErrNone);
+    delete db;
 #else
+    delete db;
     QFAIL("Mock database not currently compiled in, test meaningless?");
 #endif
-    delete db;
 }

--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbianengine.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbianengine.cpp	Fri May 14 16:41:33 2010 +0300
@@ -202,96 +202,6 @@
     QVERIFY(g.id().managerUri().contains(uri, Qt::CaseInsensitive));
 }
 
-void TestSymbianEngine::saveContactWithPreferredDetails()
-{
-    QContactManager::Error err;
-
-    //save a contact with preferred details
-    QContact c;
-    c.setType(QContactType::TypeContact);
-
-    QContactPhoneNumber number1;
-    number1.setNumber("123");
-    number1.setSubTypes(QContactPhoneNumber::SubTypeMobile);
-    c.saveDetail(&number1);
-    c.setPreferredDetail("call", number1);
-
-    QContactPhoneNumber number2;
-    number2.setNumber("456");
-    number2.setSubTypes(QContactPhoneNumber::SubTypeMobile);
-    c.saveDetail(&number2);
-    c.setPreferredDetail("videocall", number2);
-
-    QContactPhoneNumber number3;
-    number3.setNumber("789");
-    number3.setSubTypes(QContactPhoneNumber::SubTypeMobile);
-    c.saveDetail(&number3);
-    c.setPreferredDetail("message", number3);
-
-    QContactEmailAddress email;
-    email.setEmailAddress("dummyemail");
-    c.saveDetail(&email);
-    c.setPreferredDetail("email", email);
-
-    QVERIFY(m_engine->saveContact(&c, &err));
-    QVERIFY(err == QContactManager::NoError);
-
-    //fetch the saved contact and check preferred details
-    QContactFetchHint hint = QContactFetchHint();
-    QContact fetched = m_engine->contact(c.localId(), hint, &err);
-    QVERIFY(err == QContactManager::NoError);
-
-    QContactDetail callDetail1 = fetched.preferredDetail("call");
-    QVERIFY(callDetail1.definitionName() == QContactPhoneNumber::DefinitionName);
-    QContactPhoneNumber fetchedNumber1 = static_cast<QContactPhoneNumber>(callDetail1);
-    QVERIFY(fetchedNumber1.number() == "123");
-
-    QContactDetail callDetail2 = fetched.preferredDetail("videocall");
-    QVERIFY(callDetail2.definitionName() == QContactPhoneNumber::DefinitionName);
-    QContactPhoneNumber fetchedNumber2 = static_cast<QContactPhoneNumber>(callDetail2);
-    QVERIFY(fetchedNumber2.number() == "456");
-
-    QContactDetail callDetail3 = fetched.preferredDetail("message");
-    QVERIFY(callDetail3.definitionName() == QContactPhoneNumber::DefinitionName);
-    QContactPhoneNumber fetchedNumber3 = static_cast<QContactPhoneNumber>(callDetail3);
-    QVERIFY(fetchedNumber3.number() == "789");
-
-    QContactDetail emailDetail = fetched.preferredDetail("email");
-    QVERIFY(emailDetail.definitionName() == QContactEmailAddress::DefinitionName);
-    QContactEmailAddress fetchedEmail = static_cast<QContactEmailAddress>(emailDetail);
-    QVERIFY(fetchedEmail.emailAddress() == "dummyemail");
-
-    //save a contact with one preferred details for several actions
-    QContact c2;
-    c2.setType(QContactType::TypeContact);
-    c2.saveDetail(&number1);
-    c2.setPreferredDetail("call", number1);
-    c2.setPreferredDetail("videocall", number1);
-    c2.setPreferredDetail("message", number1);
-
-    QVERIFY(m_engine->saveContact(&c2, &err));
-    QVERIFY(err == QContactManager::NoError);
-
-    //fetch the saved contact and check preferred details
-    QContact fetched2 = m_engine->contact(c2.localId(), hint, &err);
-    QVERIFY(err == QContactManager::NoError);
-
-    QContactDetail callDetail4 = fetched2.preferredDetail("call");
-    QVERIFY(callDetail4.definitionName() == QContactPhoneNumber::DefinitionName);
-    QContactPhoneNumber fetchedNumber4 = static_cast<QContactPhoneNumber>(callDetail4);
-    QVERIFY(fetchedNumber4.number() == "123");
-
-    QContactDetail callDetail5 = fetched2.preferredDetail("videocall");
-    QVERIFY(callDetail5.definitionName() == QContactPhoneNumber::DefinitionName);
-    QContactPhoneNumber fetchedNumber5 = static_cast<QContactPhoneNumber>(callDetail5);
-    QVERIFY(fetchedNumber5.number() == "123");
-
-    QContactDetail callDetail6 = fetched2.preferredDetail("message");
-    QVERIFY(callDetail6.definitionName() == QContactPhoneNumber::DefinitionName);
-    QContactPhoneNumber fetchedNumber6 = static_cast<QContactPhoneNumber>(callDetail6);
-    QVERIFY(fetchedNumber6.number() == "123");
-}
-
 void TestSymbianEngine::saveContacts()
 {
     QContactManager::Error err;

--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbianengine.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbianengine.h	Fri May 14 16:41:33 2010 +0300
@@ -55,7 +55,6 @@
     
     void ctors();
     void saveContact();
-    void saveContactWithPreferredDetails();
     void saveContacts();
     void retrieveContact();
     void retrieveContacts();

--- a/qtmobility/plugins/contacts/symbiansim/inc/cntsymbiansimengine.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbiansim/inc/cntsymbiansimengine.h	Fri May 14 16:41:33 2010 +0300
@@ -111,33 +111,13 @@
 
     QString managerName() const;
 
-    QMap<QString, QString> managerParameters() const {return QMap<QString, QString>();}
     int managerVersion() const { return 1;}
 
     /* Defaulted functions - XXX check*/
-    QContact compatibleContact(const QContact&, QContactManager::Error* error) const {*error =  QContactManager::NotSupportedError;return QContact();}
-    bool validateContact(const QContact& contact, QContactManager::Error* error) const {return QContactManagerEngine::validateContact(contact, error);}
-    bool validateDefinition(const QContactDetailDefinition& def, QContactManager::Error* error) const {return QContactManagerEngine::validateDefinition(def, error);}
-    QContactDetailDefinition detailDefinition(const QString& definitionId, const QString& contactType, QContactManager::Error* error) const  {return QContactManagerEngine::detailDefinition(definitionId, contactType, error);}
-    bool saveDetailDefinition(const QContactDetailDefinition& def, const QString& contactType, QContactManager::Error* error) {return QContactManagerEngine::saveDetailDefinition(def, contactType, error);}
-    bool removeDetailDefinition(const QString& definitionId, const QString& contactType, QContactManager::Error* error)  {return QContactManagerEngine::removeDetailDefinition(definitionId, contactType, error);}
-    QList<QContactRelationship> relationships(const QString& relationshipType, const QContactId& participantId, QContactRelationship::Role role, QContactManager::Error* error) const
-    {
-        return QContactManagerEngine::relationships(relationshipType, participantId, role, error);
-    }
-    bool saveRelationships(QList<QContactRelationship>* relationships, QMap<int, QContactManager::Error>* errorMap, QContactManager::Error* error)
+    QList<QVariant::Type> supportedDataTypes() const
     {
-        return QContactManagerEngine::saveRelationships(relationships, errorMap, error);
-    }
-    bool removeRelationships(const QList<QContactRelationship>& relationships, QMap<int, QContactManager::Error>* errorMap, QContactManager::Error* error)
-    {
-        return QContactManagerEngine::removeRelationships(relationships, errorMap, error);
+        return QContactManagerEngine::supportedDataTypes();
     }
-    bool isRelationshipTypeSupported(const QString&, const QString&) const  {return false;}
-    bool isFilterSupported(const QContactFilter&) const {return false;}
-    QList<QVariant::Type> supportedDataTypes() const {return QContactManagerEngine::supportedDataTypes();}
-    bool setSelfContactId(const QContactLocalId& contactId, QContactManager::Error* error) {return QContactManagerEngine::setSelfContactId(contactId, error);}
-    QContactLocalId selfContactId(QContactManager::Error* error) const {return QContactManagerEngine::selfContactId(error);}
 
     /* Contacts - Accessors and Mutators */
     QList<QContactLocalId> contactIds(const QContactFilter& filter, const QList<QContactSortOrder>& sortOrders, QContactManager::Error* error) const;

--- a/qtmobility/plugins/contacts/symbiansim/src/cntsimstoreprivate.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbiansim/src/cntsimstoreprivate.cpp	Fri May 14 16:41:33 2010 +0300
@@ -271,12 +271,16 @@
         {
             QList<QContact> contacts = decodeSimContactsL(m_buffer);
 
-            // set sync target
+            // set sync target and set type as read only
             QList<QContact>::iterator i;
             for (i = contacts.begin(); i != contacts.end(); ++i) {
                 QContactSyncTarget syncTarget;
                 syncTarget.setSyncTarget(KSimSyncTarget);
+                m_engine.setReadOnlyAccessConstraint(&syncTarget);
                 i->saveDetail(&syncTarget);
+                QContactType contactType = i->detail(QContactType::DefinitionName);
+                m_engine.setReadOnlyAccessConstraint(&contactType);
+                i->saveDetail(&contactType);
             }
             
             emit m_simStore.readComplete(contacts, QContactManager::NoError);
@@ -295,9 +299,15 @@
             if(m_convertedContact.detail(QContactSyncTarget::DefinitionName).isEmpty()) {
                 QContactSyncTarget syncTarget = m_convertedContact.detail(QContactSyncTarget::DefinitionName);
                 syncTarget.setSyncTarget(KSimSyncTarget);
+                m_engine.setReadOnlyAccessConstraint(&syncTarget);
                 m_convertedContact.saveDetail(&syncTarget);
             }
 
+            // set type as read only
+            QContactType contactType = m_convertedContact.detail(QContactType::DefinitionName);
+            m_engine.setReadOnlyAccessConstraint(&contactType);
+            m_convertedContact.saveDetail(&contactType);
+
             emit m_simStore.writeComplete(m_convertedContact, QContactManager::NoError);
         }
         break;
@@ -432,7 +442,7 @@
                         QString nameString = QString::fromUtf16(bufPtr.Ptr(), bufPtr.Length());
                         name.setCustomLabel(nameString);
                         if (m_readOnlyAccess)
-                            m_engine.setReadOnlyAccessConstraint(&name);                        
+                            m_engine.setReadOnlyAccessConstraint(&name);
                         currentContact.saveDetail(&name);
                         QContactManager::Error error(QContactManager::NoError);
                         m_engine.setContactDisplayLabel(&currentContact, m_engine.synthesizedDisplayLabel(currentContact, &error));
@@ -447,7 +457,7 @@
                     QString name = QString::fromUtf16(bufPtr.Ptr(), bufPtr.Length());
                     nickName.setNickname(name);
                     if (m_readOnlyAccess)
-                        m_engine.setReadOnlyAccessConstraint(&nickName);                    
+                        m_engine.setReadOnlyAccessConstraint(&nickName);
                     currentContact.saveDetail(&nickName);
                 }
                 break;
@@ -459,7 +469,7 @@
                     QString number = QString::fromUtf16(bufPtr.Ptr(), bufPtr.Length());
                     phoneNumber.setNumber(number);
                     if (m_readOnlyAccess)
-                        m_engine.setReadOnlyAccessConstraint(&phoneNumber);                    
+                        m_engine.setReadOnlyAccessConstraint(&phoneNumber);
                     currentContact.saveDetail(&phoneNumber);
                 }
                 break;
@@ -477,7 +487,7 @@
                     QString emailAddress = QString::fromUtf16(bufPtr.Ptr(), bufPtr.Length());
                     email.setEmailAddress(emailAddress);
                     if (m_readOnlyAccess)
-                        m_engine.setReadOnlyAccessConstraint(&email);                    
+                        m_engine.setReadOnlyAccessConstraint(&email);
                     currentContact.saveDetail(&email);
                 }
                 break;
@@ -499,9 +509,6 @@
         // save contact to the array of contact to be returned if the whole entry was extracted
         if ((tagValue == RMobilePhoneBookStore::ETagPBNewEntry && currentContact.localId() > 0) ||
             (pbBuffer->RemainingReadLength() == 0 && currentContact.localId() > 0)) {
-            //QContactSyncTarget syncTarget;
-            //syncTarget.setSyncTarget(KSimSyncTarget);
-            //currentContact.saveDetail(&syncTarget);
             fetchedContacts.append(currentContact);
             //clear current contact
             currentContact.clearDetails();

--- a/qtmobility/plugins/contacts/symbiansim/src/cntsymbiansimengine.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbiansim/src/cntsymbiansimengine.cpp	Fri May 14 16:41:33 2010 +0300
@@ -543,4 +543,4 @@
     return CNT_SYMBIANSIM_MANAGER_NAME;
 }
 
-Q_EXPORT_PLUGIN2(mobapicontactspluginsymbiansim, CntSymbianSimFactory);
+Q_EXPORT_PLUGIN2(qtcontacts_symbiansim, CntSymbianSimFactory);

--- a/qtmobility/plugins/contacts/symbiansim/symbiansim.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbiansim/symbiansim.pro	Fri May 14 16:41:33 2010 +0300
@@ -6,7 +6,7 @@
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(mobapicontactspluginsymbiansim)
+TARGET = $$qtLibraryTarget(qtcontacts_symbiansim)
 
 include(../../../common.pri)
 include(symbiansim_defines.pri)

--- a/qtmobility/plugins/contacts/symbiansim/symbiansim_defines.pri	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbiansim/symbiansim_defines.pri	Fri May 14 16:41:33 2010 +0300
@@ -21,14 +21,17 @@
         !contains(DEFINES, SYMBIANSIM_BACKEND_USE_ETEL_TESTSERVER) {
             	DEFINES += SYMBIANSIM_BACKEND_PHONEBOOKINFOV1
         }
-        
-        # S60 3.1 device will reboot when removing several nonexisting contacts in
-        # sequence. The first remove operation will succeed but right after the second
-        # remove operation has completed the device reboots. To prevent rebooting
-        # we read the reserved slots before and really remove those contacts that
-        # really exist.
-        DEFINES += SYMBIANSIM_BACKEND_CHECK_BEFORE_REMOVE
     }
+
+    # Enable checking the existence of a contact before trying to remove it.
+    # This is needed because a contact backend is supposed to give an error
+    # when trying to remove a nonexistent contact, but SIM store does not
+    # give an error in such situations.
+    # In S60 3.1 devices the consequences are even worse; the device will
+    # reboot when trying to remove several nonexistent contacts in a row.
+    # The first remove operation will succeed but right after the second
+    # remove operation has completed the device reboots.
+    DEFINES += SYMBIANSIM_BACKEND_CHECK_BEFORE_REMOVE
     
     # In pre 10.1 platforms we need a small delay between requests to prevent
     # S60 3.2 devices from rebooting and S60 5.0 devices from reporting a

--- a/qtmobility/plugins/contacts/symbiansim/tsrc/tst_simcm/tst_simcm.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/symbiansim/tsrc/tst_simcm/tst_simcm.cpp	Fri May 14 16:41:33 2010 +0300
@@ -1033,7 +1033,17 @@
     QList<QContact> contacts = cm->contacts();
     QVERIFY(contacts.count());
     foreach(const QContact& c, contacts) {
+        // Assume a valid SDN contact always has a display label and a phone number
+        QVERIFY(!c.displayLabel().isEmpty());
+        QVERIFY(!c.displayLabel().contains("unnamed", Qt::CaseInsensitive));
+        QVERIFY(!c.detail(QContactPhoneNumber::DefinitionName).isEmpty());
         foreach(const QContactDetail& d, c.details()) {
+            qDebug() << "Detail: " << d.definitionName();
+            foreach (QVariant varianttt, d.variantValues()) {
+                qDebug() << "Variant value: " << varianttt.toString();
+            }
+            qDebug() << "access constraints: " << d.accessConstraints();
+            // Verify that read only details have the read only constraint set
             QVERIFY(d.accessConstraints().testFlag(QContactDetail::ReadOnly));
         }
     }
@@ -1143,7 +1153,7 @@
         // Use existing detail if available and would not cause an overwrite of
         // a field value
         QContactDetail contactDetail = QContactDetail(detailParts[0]);
-        if (contact.details().contains(detailParts[0])
+        if (contact.details().contains(QContactDetail(detailParts[0]))
             && contact.detail(detailParts[0]).variantValues().key(detailParts[1]).isNull()) {
             contactDetail = contact.detail(detailParts[0]);
         }

--- 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;
 }

--- a/qtmobility/plugins/contacts/wince/qcontactwincebackend.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/wince/qcontactwincebackend.cpp	Fri May 14 16:41:33 2010 +0300
@@ -87,14 +87,14 @@
                 if(SUCCEEDED(d->m_app->GetDefaultFolder(olFolderContacts, &d->m_folder))) {
                     if(SUCCEEDED(d->m_folder->get_Items(&d->m_collection))) {
                         // Register/retrieve our custom ids
-                        LPCWSTR customIds[4] = { L"QTCONTACTS_PHONE_META", L"QTCONTACTS_EMAIL_META", L"QTCONTACTS_AVATAR_META",  L"QTCONTACTS_AVATAR_TYPE_META" };
+                        LPCWSTR customIds[4] = { L"QTCONTACTS_PHONE_META", L"QTCONTACTS_EMAIL_META", L"QTCONTACTS_AVATAR_IMAGE_META",  L"QTCONTACTS_AVATAR_VIDEO_META" };
                         CEPROPID outIds[4];
 
                         if (SUCCEEDED(d->m_app->GetIDsFromNames(4, customIds, PIM_CREATE | CEVT_LPWSTR, outIds))) {
                             d->m_phonemeta = outIds[0];
                             d->m_emailmeta = outIds[1];
-                            d->m_avatarmeta = outIds[2];
-                            d->m_avatartypemeta = outIds[3];
+                            d->m_avatarImageMeta = outIds[2];
+                            d->m_avatarVideoMeta = outIds[3];
                         }
 
                         // get an IPOLItems2 pointer for the collection, too
@@ -335,12 +335,6 @@
     // No contexts for these details
     fields =  defns[contactType][QContactAvatar::DefinitionName].fields();
     fields.remove(QContactDetail::FieldContext);
-    fields.remove(QContactDetail::FieldContext);
-    fields.remove(QContactDetail::FieldContext);
-    fields.remove(QContactDetail::FieldContext);
-    fields.remove(QContactDetail::FieldContext);
-    fields.remove(QContactDetail::FieldContext);
-    fields.remove(QContactDetail::FieldContext);
     defns[contactType][QContactAvatar::DefinitionName].setFields(fields);
 
     // Simple phone number types (non multiple)
@@ -433,14 +427,14 @@
 
 
 
-PROPID QContactWinCEEngine::metaAvatar() const
+PROPID QContactWinCEEngine::metaAvatarImage() const
 {
-    return d->m_avatarmeta;
+    return d->m_avatarImageMeta;
 }
 
-PROPID QContactWinCEEngine::metaAvatarType() const
+PROPID QContactWinCEEngine::metaAvatarVideo() const
 {
-    return d->m_avatartypemeta;
+    return d->m_avatarVideoMeta;
 }
 
 PROPID QContactWinCEEngine::metaEmail() const
@@ -471,12 +465,6 @@
 }
 
 /*! \reimp */
-QMap<QString, QString> QContactWinCEEngine::managerParameters() const
-{
-    return QMap<QString, QString>();
-}
-
-/*! \reimp */
 int QContactWinCEEngine::managerVersion() const
 {
     return QTCONTACTS_VERSION;
@@ -496,22 +484,6 @@
 }
 
 /*! \reimp */
-bool QContactWinCEEngine::saveRelationship(QContactRelationship* relationship, QContactManager::Error* error)
-{
-    Q_UNUSED(relationship);
-    *error = QContactManager::NotSupportedError;
-    return false;
-}
-
-/*! \reimp */
-bool QContactWinCEEngine::removeRelationship(const QContactRelationship& relationship, QContactManager::Error* error)
-{
-    Q_UNUSED(relationship);
-    *error = QContactManager::NotSupportedError;
-    return false;
-}
-
-/*! \reimp */
 bool QContactWinCEEngine::saveContacts(QList<QContact>* contacts, QMap<int, QContactManager::Error>* errorMap, QContactManager::Error* error)
 {
     bool ret = true;
@@ -544,67 +516,6 @@
     return ret;
 }
 
-/*! \reimp */
-bool QContactWinCEEngine::setSelfContactId(const QContactLocalId& contactId, QContactManager::Error* error)
-{
-    Q_UNUSED(contactId);
-    *error = QContactManager::NotSupportedError;
-    return false;
-}
-
-/*! \reimp */
-QContactLocalId QContactWinCEEngine::selfContactId(QContactManager::Error* error) const
-{
-    *error = QContactManager::NotSupportedError;
-    return QContactLocalId();
-}
-
-/*! \reimp */
-QList<QContactRelationship> QContactWinCEEngine::relationships(const QString& relationshipType, const QContactId& participantId, QContactRelationship::Role role, QContactManager::Error* error) const
-{
-    Q_UNUSED(relationshipType);
-    Q_UNUSED(participantId);
-    Q_UNUSED(role);
-    *error = QContactManager::NotSupportedError;
-    return QList<QContactRelationship>();
-}
-
-/*! \reimp */
-bool QContactWinCEEngine::saveRelationships(QList<QContactRelationship>* relationships, QMap<int, QContactManager::Error>* errorMap, QContactManager::Error* error)
-{
-    Q_UNUSED(relationships);
-    Q_UNUSED(errorMap);
-    *error = QContactManager::NotSupportedError;
-    return false;
-}
-
-/*! \reimp */
-bool QContactWinCEEngine::removeRelationships(const QList<QContactRelationship>& relationships, QMap<int, QContactManager::Error>* errorMap, QContactManager::Error* error)
-{
-    Q_UNUSED(relationships);
-    Q_UNUSED(errorMap);
-    *error = QContactManager::NotSupportedError;
-    return false;
-}
-
-/*! \reimp */
-bool QContactWinCEEngine::saveDetailDefinition(const QContactDetailDefinition& def, const QString& contactType, QContactManager::Error* error)
-{
-    Q_UNUSED(def);
-    Q_UNUSED(contactType);
-    *error = QContactManager::NotSupportedError;
-    return false;
-}
-
-/*! \reimp */
-bool QContactWinCEEngine::removeDetailDefinition(const QString& definitionId, const QString& contactType, QContactManager::Error* error)
-{
-    Q_UNUSED(definitionId);
-    Q_UNUSED(contactType);
-    *error = QContactManager::NotSupportedError;
-    return false;
-}
-
 /*!
  * Returns the list of data types supported by the WinCE engine
  */
@@ -647,4 +558,4 @@
      QMutexLocker locker(&m_mutex);
      m_engine = 0;
  }
-Q_EXPORT_PLUGIN2(contacts_wince, ContactWinceFactory);
+Q_EXPORT_PLUGIN2(qtcontacts_wince, ContactWinceFactory);

--- a/qtmobility/plugins/contacts/wince/qcontactwincebackend_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/wince/qcontactwincebackend_p.h	Fri May 14 16:41:33 2010 +0300
@@ -167,8 +167,8 @@
         m_phonemeta(PIMPR_INVALID_ID),
         m_emailmeta(PIMPR_INVALID_ID),
         m_factory(0),
-        m_avatarmeta(PIMPR_INVALID_ID),
-        m_avatartypemeta(PIMPR_INVALID_ID)
+        m_avatarImageMeta(PIMPR_INVALID_ID),
+        m_avatarVideoMeta(PIMPR_INVALID_ID)
     {
     }
 
@@ -187,8 +187,8 @@
     // The ID of our sekrit extra phone number and email metadata id
     PROPID m_phonemeta;
     PROPID m_emailmeta;
-    PROPID m_avatarmeta;
-    PROPID m_avatartypemeta;
+    PROPID m_avatarImageMeta;
+    PROPID m_avatarVideoMeta;
 
     // List of ids (OIDs are equiv to unique ids, yay)
     QList<QContactLocalId> m_ids;
@@ -209,7 +209,6 @@
 
     /* URI reporting */
     virtual QString managerName() const;
-    QMap<QString, QString> managerParameters() const;
     virtual int managerVersion() const;
 
     /* Filtering */
@@ -220,50 +219,15 @@
 
     virtual bool saveContact(QContact* contact, QContactManager::Error* error);
     virtual bool removeContact(const QContactLocalId& contactId, QContactManager::Error* error);
-    virtual bool saveRelationship(QContactRelationship* relationship, QContactManager::Error* error);
-    virtual bool removeRelationship(const QContactRelationship& relationship, QContactManager::Error* error);
 
     virtual bool saveContacts(QList<QContact>* contacts, QMap<int, QContactManager::Error>* errorMap, QContactManager::Error* error);
     virtual bool removeContacts(const QList<QContactLocalId>& contactIds, QMap<int, QContactManager::Error>* errorMap, QContactManager::Error* error);
 
-    /* Return a pruned or modified contact which is valid and can be saved in the backend */
-    virtual QContact compatibleContact(const QContact& original, QContactManager::Error* error)
-    {
-        return QContactManagerEngine::compatibleContact(original, error);
-    }
-
     /* Synthesize the display label of a contact */
     virtual QString synthesizedDisplayLabel(const QContact& contact, QContactManager::Error* error) const;
 
-
-    /* "Self" contact id (MyCard) */
-    virtual bool setSelfContactId(const QContactLocalId& contactId, QContactManager::Error* error);
-    virtual QContactLocalId selfContactId(QContactManager::Error* error) const;
-
-    /* Relationships between contacts */
-    virtual QList<QContactRelationship> relationships(const QString& relationshipType, const QContactId& participantId, QContactRelationship::Role role, QContactManager::Error* error) const;
-    virtual bool saveRelationships(QList<QContactRelationship>* relationships, QMap<int, QContactManager::Error>* errorMap, QContactManager::Error* error);
-    virtual bool removeRelationships(const QList<QContactRelationship>& relationships, QMap<int, QContactManager::Error>* errorMap, QContactManager::Error* error);
-
-    /* Validation for saving */
-    virtual QContact compatibleContact(const QContact&, QContactManager::Error* error) const {*error =  QContactManager::NotSupportedError;return QContact();}
-    virtual bool validateContact(const QContact& contact, QContactManager::Error* error) const
-    {
-        return QContactManagerEngine::validateContact(contact, error);
-    }
-    virtual bool validateDefinition(const QContactDetailDefinition& def, QContactManager::Error* error) const
-    {
-        return QContactManagerEngine::validateDefinition(def, error);
-    }
-
     /* Definitions - Accessors and Mutators */
     virtual QMap<QString, QContactDetailDefinition> detailDefinitions(const QString& contactType, QContactManager::Error* error) const;
-    virtual QContactDetailDefinition detailDefinition(const QString& definitionId, const QString& contactType, QContactManager::Error* error) const
-    {
-        return QContactManagerEngine::detailDefinition(definitionId, contactType, error);
-    }
-    virtual bool saveDetailDefinition(const QContactDetailDefinition& def, const QString& contactType, QContactManager::Error* error);
-    virtual bool removeDetailDefinition(const QString& definitionId, const QString& contactType, QContactManager::Error* error);
 
     /* Asynchronous Request Support */
     virtual void requestDestroyed(QContactAbstractRequest* req);
@@ -288,8 +252,8 @@
     }
 
     /*helper functions*/
-    PROPID metaAvatar() const;
-    PROPID metaAvatarType() const;
+    PROPID metaAvatarImage() const;
+    PROPID metaAvatarVideo() const;
     PROPID metaEmail() const;
     PROPID metaPhone() const;

--- a/qtmobility/plugins/multimedia/audiocapture/audiocapture.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audiocapture.pro	Fri May 14 16:41:33 2010 +0300
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(audioengine)
+TARGET = $$qtLibraryTarget(qtmedia_audioengine)
 PLUGIN_TYPE=mediaservice
 
 QT += multimedia

--- a/qtmobility/plugins/multimedia/audiocapture/audiocaptureservice.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audiocaptureservice.h	Fri May 14 16:41:33 2010 +0300
@@ -52,7 +52,7 @@
 class AudioMediaRecorderControl;
 class AudioEndpointSelector;
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class AudioCaptureService : public QMediaService
 {

--- a/qtmobility/plugins/multimedia/audiocapture/audiocaptureserviceplugin.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audiocaptureserviceplugin.cpp	Fri May 14 16:41:33 2010 +0300
@@ -65,5 +65,5 @@
     delete service;
 }
 
-Q_EXPORT_PLUGIN2(audioengine, AudioCaptureServicePlugin);
+Q_EXPORT_PLUGIN2(qtmedia_audioengine, AudioCaptureServicePlugin);

--- a/qtmobility/plugins/multimedia/audiocapture/audiocaptureserviceplugin.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audiocaptureserviceplugin.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 
 #include "../../../src/multimedia/qmediaserviceproviderplugin.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class AudioCaptureServicePlugin : public QMediaServiceProviderPlugin
 {

--- a/qtmobility/plugins/multimedia/audiocapture/audiocapturesession.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audiocapturesession.h	Fri May 14 16:41:33 2010 +0300
@@ -53,7 +53,7 @@
 #include <QtMultimedia/qaudioinput.h>
 #include <QtMultimedia/qaudiodeviceinfo.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class AudioCaptureSession : public QObject
 {

--- a/qtmobility/plugins/multimedia/audiocapture/audiocontainercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audiocontainercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,7 @@
 
 class AudioCaptureSession;
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class AudioContainerControl : public QMediaContainerControl
 {

--- a/qtmobility/plugins/multimedia/audiocapture/audioencodercontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audioencodercontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -60,12 +60,12 @@
     fmt.setByteOrder(QAudioFormat::LittleEndian);
     m_session->setFormat(fmt);
 
-    m_settings.setEncodingMode(QtMedia::ConstantQualityEncoding);
+    m_settings.setEncodingMode(QtMediaServices::ConstantQualityEncoding);
     m_settings.setCodec("audio/pcm");
     m_settings.setBitRate(8000);
     m_settings.setChannelCount(1);
     m_settings.setSampleRate(8000);
-    m_settings.setQuality(QtMedia::LowQuality);
+    m_settings.setQuality(QtMediaServices::LowQuality);
 }
 
 AudioEncoderControl::~AudioEncoderControl()
@@ -130,14 +130,14 @@
 {
     QAudioFormat fmt = m_session->format();
 
-    if (settings.encodingMode() == QtMedia::ConstantQualityEncoding) {
-        if (settings.quality() == QtMedia::LowQuality) {
+    if (settings.encodingMode() == QtMediaServices::ConstantQualityEncoding) {
+        if (settings.quality() == QtMediaServices::LowQuality) {
             fmt.setSampleSize(8);
             fmt.setChannels(1);
             fmt.setFrequency(8000);
             fmt.setSampleType(QAudioFormat::UnSignedInt);
 
-        } else if (settings.quality() == QtMedia::NormalQuality) {
+        } else if (settings.quality() == QtMediaServices::NormalQuality) {
             fmt.setSampleSize(16);
             fmt.setChannels(1);
             fmt.setFrequency(22050);

--- a/qtmobility/plugins/multimedia/audiocapture/audioencodercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audioencodercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -51,7 +51,7 @@
 
 class AudioCaptureSession;
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class AudioEncoderControl : public QAudioEncoderControl
 {

--- a/qtmobility/plugins/multimedia/audiocapture/audioendpointselector.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audioendpointselector.h	Fri May 14 16:41:33 2010 +0300
@@ -48,7 +48,7 @@
 
 class AudioCaptureSession;
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class AudioEndpointSelector : public QAudioEndpointSelector
 {

--- a/qtmobility/plugins/multimedia/audiocapture/audiomediarecordercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audiomediarecordercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,7 @@
 
 class AudioCaptureSession;
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class AudioMediaRecorderControl : public QMediaRecorderControl
 {

--- a/qtmobility/plugins/multimedia/directshow/directshow.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/directshow.pro	Fri May 14 16:41:33 2010 +0300
@@ -2,7 +2,7 @@
 QT+=multimedia
 CONFIG += plugin
 QT+=multimedia
-TARGET = $$qtLibraryTarget(dsengine)
+TARGET = $$qtLibraryTarget(qtmedia_dsengine)
 
 PLUGIN_TYPE = mediaservice

--- a/qtmobility/plugins/multimedia/directshow/dsserviceplugin.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/dsserviceplugin.cpp	Fri May 14 16:41:33 2010 +0300
@@ -179,5 +179,5 @@
 }
 #endif
 
-Q_EXPORT_PLUGIN2(dsengine, DSServicePlugin);
+Q_EXPORT_PLUGIN2(qtmedia_dsengine, DSServicePlugin);

--- a/qtmobility/plugins/multimedia/directshow/dsserviceplugin.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/dsserviceplugin.h	Fri May 14 16:41:33 2010 +0300
@@ -44,12 +44,12 @@
 
 #include "../../../src/multimedia/qmediaserviceproviderplugin.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class DSServicePlugin : public QMediaServiceProviderPlugin, public QMediaServiceSupportedDevicesInterface
 {
     Q_OBJECT
-    Q_INTERFACES(QtMobility::QMediaServiceSupportedDevicesInterface)
+    Q_INTERFACES(QMediaServiceSupportedDevicesInterface)
 public:
     QStringList keys() const;
     QMediaService* create(QString const& key);

--- a/qtmobility/plugins/multimedia/directshow/player/directshowaudioendpointcontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowaudioendpointcontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -48,7 +48,7 @@
 
 class DirectShowPlayerService;
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class DirectShowAudioEndpointControl : public QAudioEndpointSelector
 {

--- a/qtmobility/plugins/multimedia/directshow/player/directshowmetadatacontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowmetadatacontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -54,76 +54,76 @@
 {
     struct QWMMetaDataKeyLookup
     {
-        QtMedia::MetaData key;
+        QtMediaServices::MetaData key;
         const wchar_t *token;
     };
 }
 
 static const QWMMetaDataKeyLookup qt_wmMetaDataKeys[] =
 {
-    { QtMedia::Title, L"Title" },
-    { QtMedia::SubTitle, L"WM/SubTitle" },
-    { QtMedia::Author, L"Author" },
-    { QtMedia::Comment, L"Comment" },
-    { QtMedia::Description, L"Description" },
-    { QtMedia::Category, L"WM/Category" },
-    { QtMedia::Genre, L"WM/Genre" },
-    //{ QtMedia::Date, 0 },
-    { QtMedia::Year, L"WM/Year" },
-    { QtMedia::UserRating, L"UserRating" },
-    //{ QtMedia::MetaDatawords, 0 },
-    { QtMedia::Language, L"Language" },
-    { QtMedia::Publisher, L"WM/Publisher" },
-    { QtMedia::Copyright, L"Copyright" },
-    { QtMedia::ParentalRating, L"ParentalRating" },
-    { QtMedia::RatingOrganisation, L"RatingOrganisation" },
+    { QtMediaServices::Title, L"Title" },
+    { QtMediaServices::SubTitle, L"WM/SubTitle" },
+    { QtMediaServices::Author, L"Author" },
+    { QtMediaServices::Comment, L"Comment" },
+    { QtMediaServices::Description, L"Description" },
+    { QtMediaServices::Category, L"WM/Category" },
+    { QtMediaServices::Genre, L"WM/Genre" },
+    //{ QtMediaServices::Date, 0 },
+    { QtMediaServices::Year, L"WM/Year" },
+    { QtMediaServices::UserRating, L"UserRating" },
+    //{ QtMediaServices::MetaDatawords, 0 },
+    { QtMediaServices::Language, L"Language" },
+    { QtMediaServices::Publisher, L"WM/Publisher" },
+    { QtMediaServices::Copyright, L"Copyright" },
+    { QtMediaServices::ParentalRating, L"ParentalRating" },
+    { QtMediaServices::RatingOrganisation, L"RatingOrganisation" },
 
     // Media
-    { QtMedia::Size, L"FileSize" },
-    { QtMedia::MediaType, L"MediaType" },
-    { QtMedia::Duration, L"Duration" },
+    { QtMediaServices::Size, L"FileSize" },
+    { QtMediaServices::MediaType, L"MediaType" },
+    { QtMediaServices::Duration, L"Duration" },
 
     // Audio
-    { QtMedia::AudioBitRate, L"AudioBitRate" },
-    { QtMedia::AudioCodec, L"AudioCodec" },
-    { QtMedia::ChannelCount, L"ChannelCount" },
-    { QtMedia::SampleRate, L"Frequency" },
+    { QtMediaServices::AudioBitRate, L"AudioBitRate" },
+    { QtMediaServices::AudioCodec, L"AudioCodec" },
+    { QtMediaServices::ChannelCount, L"ChannelCount" },
+    { QtMediaServices::SampleRate, L"Frequency" },
 
     // Music
-    { QtMedia::AlbumTitle, L"WM/AlbumTitle" },
-    { QtMedia::AlbumArtist, L"WM/AlbumArtist" },
-    { QtMedia::ContributingArtist, L"Author" },
-    { QtMedia::Composer, L"WM/Composer" },
-    { QtMedia::Conductor, L"WM/Conductor" },
-    { QtMedia::Lyrics, L"WM/Lyrics" },
-    { QtMedia::Mood, L"WM/Mood" },
-    { QtMedia::TrackNumber, L"WM/TrackNumber" },
-    //{ QtMedia::TrackCount, 0 },
-    //{ QtMedia::CoverArtUriSmall, 0 },
-    //{ QtMedia::CoverArtUriLarge, 0 },
+    { QtMediaServices::AlbumTitle, L"WM/AlbumTitle" },
+    { QtMediaServices::AlbumArtist, L"WM/AlbumArtist" },
+    { QtMediaServices::ContributingArtist, L"Author" },
+    { QtMediaServices::Composer, L"WM/Composer" },
+    { QtMediaServices::Conductor, L"WM/Conductor" },
+    { QtMediaServices::Lyrics, L"WM/Lyrics" },
+    { QtMediaServices::Mood, L"WM/Mood" },
+    { QtMediaServices::TrackNumber, L"WM/TrackNumber" },
+    //{ QtMediaServices::TrackCount, 0 },
+    //{ QtMediaServices::CoverArtUriSmall, 0 },
+    //{ QtMediaServices::CoverArtUriLarge, 0 },
 
     // Image/Video
-    //{ QtMedia::Resolution, 0 },
-    //{ QtMedia::PixelAspectRatio, 0 },
+    //{ QtMediaServices::Resolution, 0 },
+    //{ QtMediaServices::PixelAspectRatio, 0 },
 
     // Video
-    //{ QtMedia::FrameRate, 0 },
-    { QtMedia::VideoBitRate, L"VideoBitRate" },
-    { QtMedia::VideoCodec, L"VideoCodec" },
+    //{ QtMediaServices::FrameRate, 0 },
+    { QtMediaServices::VideoBitRate, L"VideoBitRate" },
+    { QtMediaServices::VideoCodec, L"VideoCodec" },
 
-    //{ QtMedia::PosterUri, 0 },
+    //{ QtMediaServices::PosterUri, 0 },
 
     // Movie
-    { QtMedia::ChapterNumber, L"ChapterNumber" },
-    { QtMedia::Director, L"WM/Director" },
-    { QtMedia::LeadPerformer, L"LeadPerformer" },
-    { QtMedia::Writer, L"WM/Writer" },
+    { QtMediaServices::ChapterNumber, L"ChapterNumber" },
+    { QtMediaServices::Director, L"WM/Director" },
+    { QtMediaServices::LeadPerformer, L"LeadPerformer" },
+    { QtMediaServices::Writer, L"WM/Writer" },
 
     // Photos
-    { QtMedia::CameraManufacturer, L"CameraManufacturer" },
-    { QtMedia::CameraModel, L"CameraModel" },
-    { QtMedia::Event, L"Event" },
-    { QtMedia::Subject, L"Subject" }
+    { QtMediaServices::CameraManufacturer, L"CameraManufacturer" },
+    { QtMediaServices::CameraModel, L"CameraModel" },
+    { QtMediaServices::Event, L"Event" },
+    { QtMediaServices::Subject, L"Subject" }
 };
 
 static QVariant getValue(IWMHeaderInfo *header, const wchar_t *key)
@@ -254,7 +254,7 @@
 #endif
 }
 
-QVariant DirectShowMetaDataControl::metaData(QtMedia::MetaData key) const
+QVariant DirectShowMetaDataControl::metaData(QtMediaServices::MetaData key) const
 {
     QVariant value;
 
@@ -274,19 +274,19 @@
         BSTR string = 0;
 
         switch (key) {
-        case QtMedia::Author:
+        case QtMediaServices::Author:
             m_content->get_AuthorName(&string);
             break;
-        case QtMedia::Title:
+        case QtMediaServices::Title:
             m_content->get_Title(&string);
             break;
-        case QtMedia::ParentalRating:
+        case QtMediaServices::ParentalRating:
             m_content->get_Rating(&string);
             break;
-        case QtMedia::Description:
+        case QtMediaServices::Description:
             m_content->get_Description(&string);
             break;
-        case QtMedia::Copyright:
+        case QtMediaServices::Copyright:
             m_content->get_Copyright(&string);
             break;
         default:
@@ -302,13 +302,13 @@
     return value;
 }
 
-void DirectShowMetaDataControl::setMetaData(QtMedia::MetaData, const QVariant &)
+void DirectShowMetaDataControl::setMetaData(QtMediaServices::MetaData, const QVariant &)
 {
 }
 
-QList<QtMedia::MetaData> DirectShowMetaDataControl::availableMetaData() const
+QList<QtMediaServices::MetaData> DirectShowMetaDataControl::availableMetaData() const
 {
-    return QList<QtMedia::MetaData>();
+    return QList<QtMediaServices::MetaData>();
 }
 
 QVariant DirectShowMetaDataControl::extendedMetaData(const QString &) const

--- a/qtmobility/plugins/multimedia/directshow/player/directshowmetadatacontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowmetadatacontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -56,7 +56,7 @@
 
 class DirectShowPlayerService;
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class DirectShowMetaDataControl : public QMetaDataControl
 {
@@ -68,9 +68,9 @@
     bool isWritable() const;
     bool isMetaDataAvailable() const;
 
-    QVariant metaData(QtMedia::MetaData key) const;
-    void setMetaData(QtMedia::MetaData key, const QVariant &value);
-    QList<QtMedia::MetaData> availableMetaData() const;
+    QVariant metaData(QtMediaServices::MetaData key) const;
+    void setMetaData(QtMediaServices::MetaData key, const QVariant &value);
+    QList<QtMediaServices::MetaData> availableMetaData() const;
 
     QVariant extendedMetaData(const QString &key) const;
     void setExtendedMetaData(const QString &key, const QVariant &value);

--- a/qtmobility/plugins/multimedia/directshow/player/directshowplayercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowplayercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,7 @@
 
 #include "directshowplayerservice.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class DirectShowPlayerControl : public QMediaPlayerControl
 {

--- a/qtmobility/plugins/multimedia/directshow/player/directshowplayerservice.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowplayerservice.h	Fri May 14 16:41:33 2010 +0300
@@ -62,11 +62,11 @@
 class DirectShowVideoRendererControl;
 class Vmr9VideoWindowControl;
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 class QMediaContent;
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class DirectShowPlayerService : public QMediaService
 {

--- a/qtmobility/plugins/multimedia/directshow/player/directshowvideooutputcontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowvideooutputcontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -44,7 +44,7 @@
 
 #include "../../src/multimedia/qvideooutputcontrol.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class DirectShowVideoOutputControl : public QVideoOutputControl
 {

--- a/qtmobility/plugins/multimedia/directshow/player/directshowvideorenderercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowvideorenderercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,7 @@
 class DirectShowEventLoop;
 class VideoSurfaceFilter;
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class DirectShowVideoRendererControl : public QVideoRendererControl
 {

--- a/qtmobility/plugins/multimedia/directshow/player/vmr9videowindowcontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/vmr9videowindowcontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -48,7 +48,7 @@
 #include <d3d9.h>
 #include <vmr9.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class Vmr9VideoWindowControl : public QVideoWindowControl
 {

--- a/qtmobility/plugins/multimedia/gstreamer/gstreamer.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/gstreamer.pro	Fri May 14 16:41:33 2010 +0300
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(gstengine)
+TARGET = $$qtLibraryTarget(qtmedia_gstengine)
 PLUGIN_TYPE=mediaservice
 
 include(../../../common.pri)

--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.cpp	Fri May 14 16:41:33 2010 +0300
@@ -169,8 +169,8 @@
     }
 
     if (encoderElement) {
-        if (m_audioSettings.encodingMode() == QtMedia::ConstantQualityEncoding) {
-            QtMedia::EncodingQuality qualityValue = m_audioSettings.quality();
+        if (m_audioSettings.encodingMode() == QtMediaServices::ConstantQualityEncoding) {
+            QtMediaServices::EncodingQuality qualityValue = m_audioSettings.quality();
 
             if (codec == QLatin1String("audio/mpeg")) {
                 g_object_set(G_OBJECT(encoderElement), "target", 0, NULL); //constant quality mode

--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.h	Fri May 14 16:41:33 2010 +0300
@@ -53,7 +53,7 @@
 
 #include <QtMultimedia/qaudioformat.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QGstreamerAudioEncode : public QAudioEncoderControl
 {

--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.cpp	Fri May 14 16:41:33 2010 +0300
@@ -46,77 +46,77 @@
 
 struct QGstreamerMetaDataKeyLookup
 {
-    QtMedia::MetaData key;
+    QtMediaServices::MetaData key;
     const char *token;
 };
 
 static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] =
 {
-    { QtMedia::Title, GST_TAG_TITLE },
-    //{ QtMedia::SubTitle, 0 },
-    //{ QtMedia::Author, 0 },
-    { QtMedia::Comment, GST_TAG_COMMENT },
-    { QtMedia::Description, GST_TAG_DESCRIPTION },
-    //{ QtMedia::Category, 0 },
-    { QtMedia::Genre, GST_TAG_GENRE },
-    //{ QtMedia::Year, 0 },
-    //{ QtMedia::UserRating, 0 },
+    { QtMediaServices::Title, GST_TAG_TITLE },
+    //{ QtMediaServices::SubTitle, 0 },
+    //{ QtMediaServices::Author, 0 },
+    { QtMediaServices::Comment, GST_TAG_COMMENT },
+    { QtMediaServices::Description, GST_TAG_DESCRIPTION },
+    //{ QtMediaServices::Category, 0 },
+    { QtMediaServices::Genre, GST_TAG_GENRE },
+    //{ QtMediaServices::Year, 0 },
+    //{ QtMediaServices::UserRating, 0 },
 
-    { QtMedia::Language, GST_TAG_LANGUAGE_CODE },
+    { QtMediaServices::Language, GST_TAG_LANGUAGE_CODE },
 
-    { QtMedia::Publisher, GST_TAG_ORGANIZATION },
-    { QtMedia::Copyright, GST_TAG_COPYRIGHT },
-    //{ QtMedia::ParentalRating, 0 },
-    //{ QtMedia::RatingOrganisation, 0 },
+    { QtMediaServices::Publisher, GST_TAG_ORGANIZATION },
+    { QtMediaServices::Copyright, GST_TAG_COPYRIGHT },
+    //{ QtMediaServices::ParentalRating, 0 },
+    //{ QtMediaServices::RatingOrganisation, 0 },
 
     // Media
-    //{ QtMedia::Size, 0 },
-    //{ QtMedia::MediaType, 0 },
-    { QtMedia::Duration, GST_TAG_DURATION },
+    //{ QtMediaServices::Size, 0 },
+    //{ QtMediaServices::MediaType, 0 },
+    { QtMediaServices::Duration, GST_TAG_DURATION },
 
     // Audio
-    { QtMedia::AudioBitRate, GST_TAG_BITRATE },
-    { QtMedia::AudioCodec, GST_TAG_AUDIO_CODEC },
-    //{ QtMedia::ChannelCount, 0 },
-    //{ QtMedia::SampleRate, 0 },
+    { QtMediaServices::AudioBitRate, GST_TAG_BITRATE },
+    { QtMediaServices::AudioCodec, GST_TAG_AUDIO_CODEC },
+    //{ QtMediaServices::ChannelCount, 0 },
+    //{ QtMediaServices::SampleRate, 0 },
 
     // Music
-    { QtMedia::AlbumTitle, GST_TAG_ALBUM },
-    { QtMedia::AlbumArtist,  GST_TAG_ARTIST},
-    { QtMedia::ContributingArtist, GST_TAG_PERFORMER },
+    { QtMediaServices::AlbumTitle, GST_TAG_ALBUM },
+    { QtMediaServices::AlbumArtist,  GST_TAG_ARTIST},
+    { QtMediaServices::ContributingArtist, GST_TAG_PERFORMER },
 #if (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19)
-    { QtMedia::Composer, GST_TAG_COMPOSER },
+    { QtMediaServices::Composer, GST_TAG_COMPOSER },
 #endif
-    //{ QtMedia::Conductor, 0 },
-    //{ QtMedia::Lyrics, 0 },
-    //{ QtMedia::Mood, 0 },
-    { QtMedia::TrackNumber, GST_TAG_TRACK_NUMBER },
+    //{ QtMediaServices::Conductor, 0 },
+    //{ QtMediaServices::Lyrics, 0 },
+    //{ QtMediaServices::Mood, 0 },
+    { QtMediaServices::TrackNumber, GST_TAG_TRACK_NUMBER },
 
-    //{ QtMedia::CoverArtUrlSmall, 0 },
-    //{ QtMedia::CoverArtUrlLarge, 0 },
+    //{ QtMediaServices::CoverArtUrlSmall, 0 },
+    //{ QtMediaServices::CoverArtUrlLarge, 0 },
 
     // Image/Video
-    //{ QtMedia::Resolution, 0 },
-    //{ QtMedia::PixelAspectRatio, 0 },
+    //{ QtMediaServices::Resolution, 0 },
+    //{ QtMediaServices::PixelAspectRatio, 0 },
 
     // Video
-    //{ QtMedia::VideoFrameRate, 0 },
-    //{ QtMedia::VideoBitRate, 0 },
-    { QtMedia::VideoCodec, GST_TAG_VIDEO_CODEC },
+    //{ QtMediaServices::VideoFrameRate, 0 },
+    //{ QtMediaServices::VideoBitRate, 0 },
+    { QtMediaServices::VideoCodec, GST_TAG_VIDEO_CODEC },
 
-    //{ QtMedia::PosterUrl, 0 },
+    //{ QtMediaServices::PosterUrl, 0 },
 
     // Movie
-    //{ QtMedia::ChapterNumber, 0 },
-    //{ QtMedia::Director, 0 },
-    { QtMedia::LeadPerformer, GST_TAG_PERFORMER },
-    //{ QtMedia::Writer, 0 },
+    //{ QtMediaServices::ChapterNumber, 0 },
+    //{ QtMediaServices::Director, 0 },
+    { QtMediaServices::LeadPerformer, GST_TAG_PERFORMER },
+    //{ QtMediaServices::Writer, 0 },
 
     // Photos
-    //{ QtMedia::CameraManufacturer, 0 },
-    //{ QtMedia::CameraModel, 0 },
-    //{ QtMedia::Event, 0 },
-    //{ QtMedia::Subject, 0 }
+    //{ QtMediaServices::CameraManufacturer, 0 },
+    //{ QtMediaServices::CameraModel, 0 },
+    //{ QtMediaServices::Event, 0 },
+    //{ QtMediaServices::Subject, 0 }
 };
 
 QGstreamerCaptureMetaDataControl::QGstreamerCaptureMetaDataControl(QObject *parent)
@@ -124,7 +124,7 @@
 {
 }
 
-QVariant QGstreamerCaptureMetaDataControl::metaData(QtMedia::MetaData key) const
+QVariant QGstreamerCaptureMetaDataControl::metaData(QtMediaServices::MetaData key) const
 {
     static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
 
@@ -138,7 +138,7 @@
     return QVariant();
 }
 
-void QGstreamerCaptureMetaDataControl::setMetaData(QtMedia::MetaData key, const QVariant &value)
+void QGstreamerCaptureMetaDataControl::setMetaData(QtMediaServices::MetaData key, const QVariant &value)
 {
     static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
 
@@ -156,9 +156,9 @@
     }
 }
 
-QList<QtMedia::MetaData> QGstreamerCaptureMetaDataControl::availableMetaData() const
+QList<QtMediaServices::MetaData> QGstreamerCaptureMetaDataControl::availableMetaData() const
 {
-    static QMap<QByteArray, QtMedia::MetaData> keysMap;
+    static QMap<QByteArray, QtMediaServices::MetaData> keysMap;
     if (keysMap.isEmpty()) {
         const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
         for (int i = 0; i < count; ++i) {
@@ -166,9 +166,9 @@
         }
     }
 
-    QList<QtMedia::MetaData> res;
+    QList<QtMediaServices::MetaData> res;
     foreach (const QByteArray &key, m_values.keys()) {
-        QtMedia::MetaData tag = keysMap.value(key, QtMedia::MetaData(-1));
+        QtMediaServices::MetaData tag = keysMap.value(key, QtMediaServices::MetaData(-1));
         if (tag != -1)
             res.append(tag);
     }

--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.h	Fri May 14 16:41:33 2010 +0300
@@ -44,7 +44,7 @@
 
 #include <qmetadatacontrol.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QGstreamerCaptureMetaDataControl : public QMetaDataControl
 {
@@ -57,9 +57,9 @@
     bool isMetaDataAvailable() const { return true; }
     bool isWritable() const { return true; }
 
-    QVariant metaData(QtMedia::MetaData key) const;
-    void setMetaData(QtMedia::MetaData key, const QVariant &value);
-    QList<QtMedia::MetaData> availableMetaData() const;
+    QVariant metaData(QtMediaServices::MetaData key) const;
+    void setMetaData(QtMediaServices::MetaData key, const QVariant &value);
+    QList<QtMediaServices::MetaData> availableMetaData() const;
 
     QVariant extendedMetaData(QString const &name) const;
     void setExtendedMetaData(QString const &name, QVariant const &value);

--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercaptureservice_maemo.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercaptureservice_maemo.h	Fri May 14 16:41:33 2010 +0300
@@ -47,10 +47,10 @@
 #include "qgstreamervideooutputcontrol.h"
 
 #include <gst/gst.h>
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 class QAudioEndpointSelector;
 class QVideoDeviceControl;
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 class QGstreamerCaptureSession;
 class QGstreamerCameraControl;

--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturesession_maemo.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturesession_maemo.h	Fri May 14 16:41:33 2010 +0300
@@ -50,7 +50,7 @@
 
 #include "qgstreamerbushelper.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QGstreamerMessage;
 class QGstreamerBusHelper;

--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamermediacontainercontrol_maemo.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamermediacontainercontrol_maemo.h	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,7 @@
 
 #include <gst/gst.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QGstreamerMediaContainerControl : public QMediaContainerControl
 {

--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamerrecordercontrol_maemo.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamerrecordercontrol_maemo.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 
 #include <qmediarecordercontrol.h>
 #include "qgstreamercapturesession_maemo.h"
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QGstreamerRecorderControl : public QMediaRecorderControl
 {

--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamervideoencode_maemo.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamervideoencode_maemo.h	Fri May 14 16:41:33 2010 +0300
@@ -51,7 +51,7 @@
 
 #include <gst/gst.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QGstreamerVideoEncode : public QVideoEncoderControl
 {

--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.cpp	Fri May 14 16:41:33 2010 +0300
@@ -188,8 +188,8 @@
     }
 
     if (encoderElement) {
-        if (m_audioSettings.encodingMode() == QtMedia::ConstantQualityEncoding) {
-            QtMedia::EncodingQuality qualityValue = m_audioSettings.quality();
+        if (m_audioSettings.encodingMode() == QtMediaServices::ConstantQualityEncoding) {
+            QtMediaServices::EncodingQuality qualityValue = m_audioSettings.quality();
 
             if (codec == QLatin1String("audio/vorbis")) {
                 double qualityTable[] = {

--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.h	Fri May 14 16:41:33 2010 +0300
@@ -53,7 +53,7 @@
 
 #include <QtMultimedia/qaudioformat.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QGstreamerAudioEncode : public QAudioEncoderControl
 {

--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -46,77 +46,77 @@
 
 struct QGstreamerMetaDataKeyLookup
 {
-    QtMedia::MetaData key;
+    QtMediaServices::MetaData key;
     const char *token;
 };
 
 static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] =
 {
-    { QtMedia::Title, GST_TAG_TITLE },
-    //{ QtMedia::SubTitle, 0 },
-    //{ QtMedia::Author, 0 },
-    { QtMedia::Comment, GST_TAG_COMMENT },
-    { QtMedia::Description, GST_TAG_DESCRIPTION },
-    //{ QtMedia::Category, 0 },
-    { QtMedia::Genre, GST_TAG_GENRE },
-    //{ QtMedia::Year, 0 },
-    //{ QtMedia::UserRating, 0 },
+    { QtMediaServices::Title, GST_TAG_TITLE },
+    //{ QtMediaServices::SubTitle, 0 },
+    //{ QtMediaServices::Author, 0 },
+    { QtMediaServices::Comment, GST_TAG_COMMENT },
+    { QtMediaServices::Description, GST_TAG_DESCRIPTION },
+    //{ QtMediaServices::Category, 0 },
+    { QtMediaServices::Genre, GST_TAG_GENRE },
+    //{ QtMediaServices::Year, 0 },
+    //{ QtMediaServices::UserRating, 0 },
 
-    { QtMedia::Language, GST_TAG_LANGUAGE_CODE },
+    { QtMediaServices::Language, GST_TAG_LANGUAGE_CODE },
 
-    { QtMedia::Publisher, GST_TAG_ORGANIZATION },
-    { QtMedia::Copyright, GST_TAG_COPYRIGHT },
-    //{ QtMedia::ParentalRating, 0 },
-    //{ QtMedia::RatingOrganisation, 0 },
+    { QtMediaServices::Publisher, GST_TAG_ORGANIZATION },
+    { QtMediaServices::Copyright, GST_TAG_COPYRIGHT },
+    //{ QtMediaServices::ParentalRating, 0 },
+    //{ QtMediaServices::RatingOrganisation, 0 },
 
     // Media
-    //{ QtMedia::Size, 0 },
-    //{ QtMedia::MediaType, 0 },
-    { QtMedia::Duration, GST_TAG_DURATION },
+    //{ QtMediaServices::Size, 0 },
+    //{ QtMediaServices::MediaType, 0 },
+    { QtMediaServices::Duration, GST_TAG_DURATION },
 
     // Audio
-    { QtMedia::AudioBitRate, GST_TAG_BITRATE },
-    { QtMedia::AudioCodec, GST_TAG_AUDIO_CODEC },
-    //{ QtMedia::ChannelCount, 0 },
-    //{ QtMedia::SampleRate, 0 },
+    { QtMediaServices::AudioBitRate, GST_TAG_BITRATE },
+    { QtMediaServices::AudioCodec, GST_TAG_AUDIO_CODEC },
+    //{ QtMediaServices::ChannelCount, 0 },
+    //{ QtMediaServices::SampleRate, 0 },
 
     // Music
-    { QtMedia::AlbumTitle, GST_TAG_ALBUM },
-    { QtMedia::AlbumArtist,  GST_TAG_ARTIST},
-    { QtMedia::ContributingArtist, GST_TAG_PERFORMER },
+    { QtMediaServices::AlbumTitle, GST_TAG_ALBUM },
+    { QtMediaServices::AlbumArtist,  GST_TAG_ARTIST},
+    { QtMediaServices::ContributingArtist, GST_TAG_PERFORMER },
 #if (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19)
-    { QtMedia::Composer, GST_TAG_COMPOSER },
+    { QtMediaServices::Composer, GST_TAG_COMPOSER },
 #endif
-    //{ QtMedia::Conductor, 0 },
-    //{ QtMedia::Lyrics, 0 },
-    //{ QtMedia::Mood, 0 },
-    { QtMedia::TrackNumber, GST_TAG_TRACK_NUMBER },
+    //{ QtMediaServices::Conductor, 0 },
+    //{ QtMediaServices::Lyrics, 0 },
+    //{ QtMediaServices::Mood, 0 },
+    { QtMediaServices::TrackNumber, GST_TAG_TRACK_NUMBER },
 
-    //{ QtMedia::CoverArtUrlSmall, 0 },
-    //{ QtMedia::CoverArtUrlLarge, 0 },
+    //{ QtMediaServices::CoverArtUrlSmall, 0 },
+    //{ QtMediaServices::CoverArtUrlLarge, 0 },
 
     // Image/Video
-    //{ QtMedia::Resolution, 0 },
-    //{ QtMedia::PixelAspectRatio, 0 },
+    //{ QtMediaServices::Resolution, 0 },
+    //{ QtMediaServices::PixelAspectRatio, 0 },
 
     // Video
-    //{ QtMedia::VideoFrameRate, 0 },
-    //{ QtMedia::VideoBitRate, 0 },
-    { QtMedia::VideoCodec, GST_TAG_VIDEO_CODEC },
+    //{ QtMediaServices::VideoFrameRate, 0 },
+    //{ QtMediaServices::VideoBitRate, 0 },
+    { QtMediaServices::VideoCodec, GST_TAG_VIDEO_CODEC },
 
-    //{ QtMedia::PosterUrl, 0 },
+    //{ QtMediaServices::PosterUrl, 0 },
 
     // Movie
-    //{ QtMedia::ChapterNumber, 0 },
-    //{ QtMedia::Director, 0 },
-    { QtMedia::LeadPerformer, GST_TAG_PERFORMER },
-    //{ QtMedia::Writer, 0 },
+    //{ QtMediaServices::ChapterNumber, 0 },
+    //{ QtMediaServices::Director, 0 },
+    { QtMediaServices::LeadPerformer, GST_TAG_PERFORMER },
+    //{ QtMediaServices::Writer, 0 },
 
     // Photos
-    //{ QtMedia::CameraManufacturer, 0 },
-    //{ QtMedia::CameraModel, 0 },
-    //{ QtMedia::Event, 0 },
-    //{ QtMedia::Subject, 0 }
+    //{ QtMediaServices::CameraManufacturer, 0 },
+    //{ QtMediaServices::CameraModel, 0 },
+    //{ QtMediaServices::Event, 0 },
+    //{ QtMediaServices::Subject, 0 }
 };
 
 QGstreamerCaptureMetaDataControl::QGstreamerCaptureMetaDataControl(QObject *parent)
@@ -124,7 +124,7 @@
 {
 }
 
-QVariant QGstreamerCaptureMetaDataControl::metaData(QtMedia::MetaData key) const
+QVariant QGstreamerCaptureMetaDataControl::metaData(QtMediaServices::MetaData key) const
 {
     static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
 
@@ -138,7 +138,7 @@
     return QVariant();
 }
 
-void QGstreamerCaptureMetaDataControl::setMetaData(QtMedia::MetaData key, const QVariant &value)
+void QGstreamerCaptureMetaDataControl::setMetaData(QtMediaServices::MetaData key, const QVariant &value)
 {
     static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
 
@@ -156,9 +156,9 @@
     }
 }
 
-QList<QtMedia::MetaData> QGstreamerCaptureMetaDataControl::availableMetaData() const
+QList<QtMediaServices::MetaData> QGstreamerCaptureMetaDataControl::availableMetaData() const
 {
-    static QMap<QByteArray, QtMedia::MetaData> keysMap;
+    static QMap<QByteArray, QtMediaServices::MetaData> keysMap;
     if (keysMap.isEmpty()) {
         const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
         for (int i = 0; i < count; ++i) {
@@ -166,9 +166,9 @@
         }
     }
 
-    QList<QtMedia::MetaData> res;
+    QList<QtMediaServices::MetaData> res;
     foreach (const QByteArray &key, m_values.keys()) {
-        QtMedia::MetaData tag = keysMap.value(key, QtMedia::MetaData(-1));
+        QtMediaServices::MetaData tag = keysMap.value(key, QtMediaServices::MetaData(-1));
         if (tag != -1)
             res.append(tag);
     }

--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -44,7 +44,7 @@
 
 #include <qmetadatacontrol.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QGstreamerCaptureMetaDataControl : public QMetaDataControl
 {
@@ -57,9 +57,9 @@
     bool isMetaDataAvailable() const { return true; }
     bool isWritable() const { return true; }
 
-    QVariant metaData(QtMedia::MetaData key) const;
-    void setMetaData(QtMedia::MetaData key, const QVariant &value);
-    QList<QtMedia::MetaData> availableMetaData() const;
+    QVariant metaData(QtMediaServices::MetaData key) const;
+    void setMetaData(QtMediaServices::MetaData key, const QVariant &value);
+    QList<QtMediaServices::MetaData> availableMetaData() const;
 
     QVariant extendedMetaData(QString const &name) const;
     void setExtendedMetaData(QString const &name, QVariant const &value);

--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercaptureservice.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercaptureservice.h	Fri May 14 16:41:33 2010 +0300
@@ -47,10 +47,10 @@
 #include "qgstreamervideooutputcontrol.h"
 
 #include <gst/gst.h>
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 class QAudioEndpointSelector;
 class QVideoDeviceControl;
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 class QGstreamerCaptureSession;
 class QGstreamerCameraControl;

--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.h	Fri May 14 16:41:33 2010 +0300
@@ -51,7 +51,7 @@
 
 #include "qgstreamerbushelper.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QGstreamerMessage;
 class QGstreamerBusHelper;

--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacontainercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacontainercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,7 @@
 
 #include <gst/gst.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QGstreamerMediaContainerControl : public QMediaContainerControl
 {

--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamerrecordercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamerrecordercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 
 #include <qmediarecordercontrol.h>
 #include "qgstreamercapturesession.h"
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QGstreamerRecorderControl : public QMediaRecorderControl
 {

--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamerv4l2input.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamerv4l2input.h	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,6 @@
 #include <QtCore/qsize.h>
 #include "qgstreamercapturesession.h"
 
-QTM_USE_NAMESPACE
 QT_USE_NAMESPACE
 
 class QGstreamerV4L2Input : public QObject, public QGstreamerVideoInput

--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.cpp	Fri May 14 16:41:33 2010 +0300
@@ -171,8 +171,8 @@
     gst_object_unref(GST_OBJECT(pad));
 
     if (encoderElement) {
-        if (m_videoSettings.encodingMode() == QtMedia::ConstantQualityEncoding) {
-            QtMedia::EncodingQuality qualityValue = m_videoSettings.quality();
+        if (m_videoSettings.encodingMode() == QtMediaServices::ConstantQualityEncoding) {
+            QtMediaServices::EncodingQuality qualityValue = m_videoSettings.quality();
 
             if (codec == QLatin1String("video/h264")) {
                 //constant quantizer mode

--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.h	Fri May 14 16:41:33 2010 +0300
@@ -51,7 +51,7 @@
 
 #include <gst/gst.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QGstreamerVideoEncode : public QVideoEncoderControl
 {

--- a/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp	Fri May 14 16:41:33 2010 +0300
@@ -47,77 +47,77 @@
 
 struct QGstreamerMetaDataKeyLookup
 {
-    QtMedia::MetaData key;
+    QtMediaServices::MetaData key;
     const char *token;
 };
 
 static const QGstreamerMetaDataKeyLookup qt_gstreamerMetaDataKeys[] =
 {
-    { QtMedia::Title, GST_TAG_TITLE },
-    //{ QtMedia::SubTitle, 0 },
-    //{ QtMedia::Author, 0 },
-    { QtMedia::Comment, GST_TAG_COMMENT },
-    { QtMedia::Description, GST_TAG_DESCRIPTION },
-    //{ QtMedia::Category, 0 },
-    { QtMedia::Genre, GST_TAG_GENRE },
-    { QtMedia::Year, "year" },
-    //{ QtMedia::UserRating, 0 },
+    { QtMediaServices::Title, GST_TAG_TITLE },
+    //{ QtMediaServices::SubTitle, 0 },
+    //{ QtMediaServices::Author, 0 },
+    { QtMediaServices::Comment, GST_TAG_COMMENT },
+    { QtMediaServices::Description, GST_TAG_DESCRIPTION },
+    //{ QtMediaServices::Category, 0 },
+    { QtMediaServices::Genre, GST_TAG_GENRE },
+    { QtMediaServices::Year, "year" },
+    //{ QtMediaServices::UserRating, 0 },
 
-    { QtMedia::Language, GST_TAG_LANGUAGE_CODE },
+    { QtMediaServices::Language, GST_TAG_LANGUAGE_CODE },
 
-    { QtMedia::Publisher, GST_TAG_ORGANIZATION },
-    { QtMedia::Copyright, GST_TAG_COPYRIGHT },
-    //{ QtMedia::ParentalRating, 0 },
-    //{ QtMedia::RatingOrganisation, 0 },
+    { QtMediaServices::Publisher, GST_TAG_ORGANIZATION },
+    { QtMediaServices::Copyright, GST_TAG_COPYRIGHT },
+    //{ QtMediaServices::ParentalRating, 0 },
+    //{ QtMediaServices::RatingOrganisation, 0 },
 
     // Media
-    //{ QtMedia::Size, 0 },
-    //{ QtMedia::MediaType, 0 },
-    { QtMedia::Duration, GST_TAG_DURATION },
+    //{ QtMediaServices::Size, 0 },
+    //{ QtMediaServices::MediaType, 0 },
+    { QtMediaServices::Duration, GST_TAG_DURATION },
 
     // Audio
-    { QtMedia::AudioBitRate, GST_TAG_BITRATE },
-    { QtMedia::AudioCodec, GST_TAG_AUDIO_CODEC },
-    //{ QtMedia::ChannelCount, 0 },
-    //{ QtMedia::SampleRate, 0 },
+    { QtMediaServices::AudioBitRate, GST_TAG_BITRATE },
+    { QtMediaServices::AudioCodec, GST_TAG_AUDIO_CODEC },
+    //{ QtMediaServices::ChannelCount, 0 },
+    //{ QtMediaServices::SampleRate, 0 },
 
     // Music
-    { QtMedia::AlbumTitle, GST_TAG_ALBUM },
-    { QtMedia::AlbumArtist,  GST_TAG_ARTIST},
-    { QtMedia::ContributingArtist, GST_TAG_PERFORMER },
+    { QtMediaServices::AlbumTitle, GST_TAG_ALBUM },
+    { QtMediaServices::AlbumArtist,  GST_TAG_ARTIST},
+    { QtMediaServices::ContributingArtist, GST_TAG_PERFORMER },
 #if (GST_VERSION_MAJOR >= 0) && (GST_VERSION_MINOR >= 10) && (GST_VERSION_MICRO >= 19)
-    { QtMedia::Composer, GST_TAG_COMPOSER },
+    { QtMediaServices::Composer, GST_TAG_COMPOSER },
 #endif
-    //{ QtMedia::Conductor, 0 },
-    //{ QtMedia::Lyrics, 0 },
-    //{ QtMedia::Mood, 0 },
-    { QtMedia::TrackNumber, GST_TAG_TRACK_NUMBER },
+    //{ QtMediaServices::Conductor, 0 },
+    //{ QtMediaServices::Lyrics, 0 },
+    //{ QtMediaServices::Mood, 0 },
+    { QtMediaServices::TrackNumber, GST_TAG_TRACK_NUMBER },
 
-    //{ QtMedia::CoverArtUrlSmall, 0 },
-    //{ QtMedia::CoverArtUrlLarge, 0 },
+    //{ QtMediaServices::CoverArtUrlSmall, 0 },
+    //{ QtMediaServices::CoverArtUrlLarge, 0 },
 
     // Image/Video
-    //{ QtMedia::Resolution, 0 },
-    //{ QtMedia::PixelAspectRatio, 0 },
+    //{ QtMediaServices::Resolution, 0 },
+    //{ QtMediaServices::PixelAspectRatio, 0 },
 
     // Video
-    //{ QtMedia::VideoFrameRate, 0 },
-    //{ QtMedia::VideoBitRate, 0 },
-    { QtMedia::VideoCodec, GST_TAG_VIDEO_CODEC },
+    //{ QtMediaServices::VideoFrameRate, 0 },
+    //{ QtMediaServices::VideoBitRate, 0 },
+    { QtMediaServices::VideoCodec, GST_TAG_VIDEO_CODEC },
 
-    //{ QtMedia::PosterUrl, 0 },
+    //{ QtMediaServices::PosterUrl, 0 },
 
     // Movie
-    //{ QtMedia::ChapterNumber, 0 },
-    //{ QtMedia::Director, 0 },
-    { QtMedia::LeadPerformer, GST_TAG_PERFORMER },
-    //{ QtMedia::Writer, 0 },
+    //{ QtMediaServices::ChapterNumber, 0 },
+    //{ QtMediaServices::Director, 0 },
+    { QtMediaServices::LeadPerformer, GST_TAG_PERFORMER },
+    //{ QtMediaServices::Writer, 0 },
 
     // Photos
-    //{ QtMedia::CameraManufacturer, 0 },
-    //{ QtMedia::CameraModel, 0 },
-    //{ QtMedia::Event, 0 },
-    //{ QtMedia::Subject, 0 }
+    //{ QtMediaServices::CameraManufacturer, 0 },
+    //{ QtMediaServices::CameraModel, 0 },
+    //{ QtMediaServices::Event, 0 },
+    //{ QtMediaServices::Subject, 0 }
 };
 
 QGstreamerMetaDataProvider::QGstreamerMetaDataProvider(QGstreamerPlayerSession *session, QObject *parent)
@@ -140,7 +140,7 @@
     return false;
 }
 
-QVariant QGstreamerMetaDataProvider::metaData(QtMedia::MetaData key) const
+QVariant QGstreamerMetaDataProvider::metaData(QtMediaServices::MetaData key) const
 {
     static const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
 
@@ -152,15 +152,15 @@
     return QVariant();
 }
 
-void QGstreamerMetaDataProvider::setMetaData(QtMedia::MetaData key, QVariant const &value)
+void QGstreamerMetaDataProvider::setMetaData(QtMediaServices::MetaData key, QVariant const &value)
 {
     Q_UNUSED(key);
     Q_UNUSED(value);
 }
 
-QList<QtMedia::MetaData> QGstreamerMetaDataProvider::availableMetaData() const
+QList<QtMediaServices::MetaData> QGstreamerMetaDataProvider::availableMetaData() const
 {
-    static QMap<QByteArray, QtMedia::MetaData> keysMap;
+    static QMap<QByteArray, QtMediaServices::MetaData> keysMap;
     if (keysMap.isEmpty()) {
         const int count = sizeof(qt_gstreamerMetaDataKeys) / sizeof(QGstreamerMetaDataKeyLookup);
         for (int i = 0; i < count; ++i) {
@@ -168,9 +168,9 @@
         }
     }
 
-    QList<QtMedia::MetaData> res;
+    QList<QtMediaServices::MetaData> res;
     foreach (const QByteArray &key, m_session->tags().keys()) {
-        QtMedia::MetaData tag = keysMap.value(key, QtMedia::MetaData(-1));
+        QtMediaServices::MetaData tag = keysMap.value(key, QtMediaServices::MetaData(-1));
         if (tag != -1)
             res.append(tag);
     }

--- a/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.h	Fri May 14 16:41:33 2010 +0300
@@ -44,7 +44,7 @@
 
 #include <qmetadatacontrol.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QGstreamerPlayerSession;
 
@@ -58,9 +58,9 @@
     bool isMetaDataAvailable() const;
     bool isWritable() const;
 
-    QVariant metaData(QtMedia::MetaData key) const;
-    void setMetaData(QtMedia::MetaData key, const QVariant &value);
-    QList<QtMedia::MetaData> availableMetaData() const;
+    QVariant metaData(QtMediaServices::MetaData key) const;
+    void setMetaData(QtMediaServices::MetaData key, const QVariant &value);
+    QList<QtMediaServices::MetaData> availableMetaData() const;
 
     QVariant extendedMetaData(const QString &key) const ;
     void setExtendedMetaData(const QString &key, const QVariant &value);

--- a/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -49,17 +49,16 @@
 
 #include <limits.h>
 
-QTM_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
+class QMediaPlaylist;
+class QMediaPlaylistNavigator;
+class QSocketNotifier;
+QT_END_NAMESPACE
 
-class QMediaPlaylist;
+QT_USE_NAMESPACE
 
 class QGstreamerPlayerSession;
 class QGstreamerPlayerService;
-class QMediaPlaylistNavigator;
-
-QT_BEGIN_NAMESPACE
-class QSocketNotifier;
-QT_END_NAMESPACE
 
 class QGstreamerPlayerControl : public QMediaPlayerControl
 {

--- a/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.h	Fri May 14 16:41:33 2010 +0300
@@ -49,12 +49,12 @@
 
 #include "qgstreamervideooutputcontrol.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 class QMediaMetaData;
 class QMediaPlayerControl;
 class QMediaPlaylist;
 class QMediaPlaylistNavigator;
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 class QGstreamerMetaData;
 class QGstreamerPlayerControl;
@@ -65,7 +65,7 @@
 class QGstreamerVideoOverlay;
 class QGstreamerVideoWidgetControl;
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QGstreamerPlayerService : public QMediaService
 {

--- a/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,7 @@
 #include <QtCore/qdatetime.h>
 #include <QtCore/qdebug.h>
 
-#ifdef Q_WS_MAEMO_5
+#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
 #define USE_PLAYBIN2
 #endif
 
@@ -658,7 +658,7 @@
 
     for (int i=0; i<m_streamTypes.count(); i++) {
         QMediaStreamsControl::StreamType streamType = m_streamTypes[i];
-        QMap<QtMedia::MetaData, QVariant> streamProperties;
+        QMap<QtMediaServices::MetaData, QVariant> streamProperties;
 
         int streamIndex = i - m_playbin2StreamOffset[streamType];
 
@@ -680,7 +680,7 @@
         if (tags && gst_is_tag_list(tags)) {
             gchar *languageCode = 0;
             if (gst_tag_list_get_string(tags, GST_TAG_LANGUAGE_CODE, &languageCode))
-                streamProperties[QtMedia::Language] = QString::fromUtf8(languageCode);
+                streamProperties[QtMediaServices::Language] = QString::fromUtf8(languageCode);
 
             //qDebug() << "language for setream" << i << QString::fromUtf8(languageCode);
             g_free (languageCode);
@@ -733,8 +733,8 @@
             break;
         }
 
-        QMap<QtMedia::MetaData, QVariant> streamProperties;
-        streamProperties[QtMedia::Language] = QString::fromUtf8(languageCode);
+        QMap<QtMediaServices::MetaData, QVariant> streamProperties;
+        streamProperties[QtMediaServices::Language] = QString::fromUtf8(languageCode);
 
         m_streamProperties.append(streamProperties);
         m_streamTypes.append(streamType);

--- a/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.h	Fri May 14 16:41:33 2010 +0300
@@ -56,7 +56,7 @@
 
 class QGstreamerVideoRendererInterface;
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QGstreamerPlayerSession : public QObject, public QGstreamerSyncEventFilter
 {
@@ -91,7 +91,7 @@
     void setPlaybackRate(qreal rate);
 
     QMap<QByteArray ,QVariant> tags() const { return m_tags; }
-    QMap<QtMedia::MetaData,QVariant> streamProperties(int streamNumber) const { return m_streamProperties[streamNumber]; }
+    QMap<QtMediaServices::MetaData,QVariant> streamProperties(int streamNumber) const { return m_streamProperties[streamNumber]; }
     int streamCount() const { return m_streamProperties.count(); }
     QMediaStreamsControl::StreamType streamType(int streamNumber) { return m_streamTypes.value(streamNumber, QMediaStreamsControl::UnknownStream); }
 
@@ -143,7 +143,7 @@
     QGstreamerVideoRendererInterface *m_renderer;
 
     QMap<QByteArray, QVariant> m_tags;
-    QList< QMap<QtMedia::MetaData,QVariant> > m_streamProperties;
+    QList< QMap<QtMediaServices::MetaData,QVariant> > m_streamProperties;
     QList<QMediaStreamsControl::StreamType> m_streamTypes;
     QMap<QMediaStreamsControl::StreamType, int> m_playbin2StreamOffset;

--- a/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -62,7 +62,7 @@
     return m_session->streamType(streamNumber);
 }
 
-QVariant QGstreamerStreamsControl::metaData(int streamNumber, QtMedia::MetaData key)
+QVariant QGstreamerStreamsControl::metaData(int streamNumber, QtMediaServices::MetaData key)
 {
     return m_session->streamProperties(streamNumber).value(key);
 }

--- a/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -44,7 +44,7 @@
 
 #include <qmediastreamscontrol.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QGstreamerPlayerSession;
 
@@ -58,7 +58,7 @@
     virtual int streamCount();
     virtual StreamType streamType(int streamNumber);
 
-    virtual QVariant metaData(int streamNumber, QtMedia::MetaData key);
+    virtual QVariant metaData(int streamNumber, QtMediaServices::MetaData key);
 
     virtual bool isActive(int streamNumber);
     virtual void setActive(int streamNumber, bool state);

--- a/qtmobility/plugins/multimedia/gstreamer/qgstreameraudioinputendpointselector.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreameraudioinputendpointselector.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 #include <qaudioendpointselector.h>
 #include <QtCore/qstringlist.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QGstreamerAudioInputEndpointSelector : public QAudioEndpointSelector
 {

--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamerserviceplugin.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamerserviceplugin.cpp	Fri May 14 16:41:33 2010 +0300
@@ -103,4 +103,4 @@
     delete service;
 }
 
-Q_EXPORT_PLUGIN2(gstengine, QGstreamerServicePlugin);
+Q_EXPORT_PLUGIN2(qtmedia_gstengine, QGstreamerServicePlugin);

--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamerserviceplugin.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamerserviceplugin.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 
 #include <qmediaserviceproviderplugin.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 
 class QGstreamerServicePlugin : public QMediaServiceProviderPlugin

--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamervideoinputdevicecontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamervideoinputdevicecontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 #include <qvideodevicecontrol.h>
 #include <QtCore/qstringlist.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QGstreamerVideoInputDeviceControl : public QVideoDeviceControl
 {

--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamervideooutputcontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamervideooutputcontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -46,7 +46,7 @@
 
 #include <gst/gst.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QGstreamerVideoRendererInterface
 {

--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamervideooverlay.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamervideooverlay.h	Fri May 14 16:41:33 2010 +0300
@@ -46,13 +46,13 @@
 
 #include "qgstreamervideorendererinterface.h"
 
-QTM_USE_NAMESPACE
-
 QT_BEGIN_NAMESPACE
 class QAbstractVideoSurface;
 QT_END_NAMESPACE
 class QX11VideoSurface;
 
+QT_USE_NAMESPACE
+
 class QGstreamerVideoOverlay : public QVideoWindowControl, public QGstreamerVideoRendererInterface
 {
     Q_OBJECT

--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamervideorenderer.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamervideorenderer.h	Fri May 14 16:41:33 2010 +0300
@@ -47,7 +47,7 @@
 
 #include "qgstreamervideorendererinterface.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QGstreamerVideoRenderer : public QVideoRendererControl, public QGstreamerVideoRendererInterface
 {

--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamervideowidget.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamervideowidget.h	Fri May 14 16:41:33 2010 +0300
@@ -46,7 +46,7 @@
 
 #include "qgstreamervideorendererinterface.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QGstreamerVideoWidget;

--- a/qtmobility/plugins/multimedia/m3u/m3u.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/m3u/m3u.pro	Fri May 14 16:41:33 2010 +0300
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(m3u)
+TARGET = $$qtLibraryTarget(qtmedia_m3u)
 
 PLUGIN_TYPE = playlistformats
 
@@ -17,6 +17,7 @@
 SOURCES += main.cpp \
            qm3uhandler.cpp
 symbian {
+    TARGET.UID3 = 0x2002BFC7
     TARGET.CAPABILITY = ALL -TCB
     TARGET.EPOCALLOWDLLDATA = 1

--- a/qtmobility/plugins/multimedia/m3u/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/m3u/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -44,4 +44,4 @@
 
 
 Q_EXPORT_STATIC_PLUGIN(QM3uPlaylistPlugin)
-Q_EXPORT_PLUGIN2(qm3u, QM3uPlaylistPlugin)
+Q_EXPORT_PLUGIN2(qtmedia_m3u, QM3uPlaylistPlugin)

--- a/qtmobility/plugins/multimedia/m3u/qm3uhandler.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/m3u/qm3uhandler.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 #include <qmediaplaylistioplugin.h>
 #include <QObject>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QM3uPlaylistPlugin : public QMediaPlaylistIOPlugin
 {

--- a/qtmobility/plugins/multimedia/qt7/qcvdisplaylink.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qcvdisplaylink.h	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,7 @@
 
 #include <CoreVideo/CVDisplayLink.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QCvDisplayLink : public QObject
 {
@@ -82,7 +82,7 @@
     CVTimeStamp m_frameTimeStamp;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/plugins/multimedia/qt7/qcvdisplaylink.mm	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qcvdisplaylink.mm	Fri May 14 16:41:33 2010 +0300
@@ -44,7 +44,7 @@
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qdebug.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 static CVReturn CVDisplayLinkCallback(CVDisplayLinkRef displayLink,
                                  const CVTimeStamp *inNow,

--- a/qtmobility/plugins/multimedia/qt7/qt7.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7.pro	Fri May 14 16:41:33 2010 +0300
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qt7engine)
+TARGET = $$qtLibraryTarget(qtmedia_qt7engine)
 QT += opengl multimedia
 
 PLUGIN_TYPE = mediaservice

--- a/qtmobility/plugins/multimedia/qt7/qt7backend.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7backend.h	Fri May 14 16:41:33 2010 +0300
@@ -50,7 +50,7 @@
 #define QUICKTIME_C_API_AVAILABLE
 #endif
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class AutoReleasePool
 {
@@ -61,6 +61,6 @@
     ~AutoReleasePool();
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/plugins/multimedia/qt7/qt7backend.mm	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7backend.mm	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 #include <CoreFoundation/CFBase.h>
 
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 AutoReleasePool::AutoReleasePool()
 {
@@ -57,4 +57,4 @@
     [(NSAutoreleasePool*)pool release];
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/plugins/multimedia/qt7/qt7movierenderer.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7movierenderer.h	Fri May 14 16:41:33 2010 +0300
@@ -56,9 +56,9 @@
 #include <CoreVideo/CVOpenGLTexture.h>
 #include <QuickTime/QuickTime.h>
 
-class QGLContext;
+QT_BEGIN_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
+class QGLContext;
 
 class QCvDisplayLink;
 class QT7PlayerSession;
@@ -102,6 +102,6 @@
     QSize m_nativeSize;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/plugins/multimedia/qt7/qt7movierenderer.mm	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7movierenderer.mm	Fri May 14 16:41:33 2010 +0300
@@ -56,7 +56,7 @@
 #include <QtMultimedia/qabstractvideosurface.h>
 #include <QtMultimedia/qvideosurfaceformat.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class CVGLTextureVideoBuffer : public QAbstractVideoBuffer
 {

--- a/qtmobility/plugins/multimedia/qt7/qt7movievideowidget.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7movievideowidget.h	Fri May 14 16:41:33 2010 +0300
@@ -56,7 +56,7 @@
 
 class GLVideoWidget;
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QCvDisplayLink;
 class QT7PlayerSession;
@@ -121,6 +121,6 @@
     int m_saturation;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/plugins/multimedia/qt7/qt7movievideowidget.mm	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7movievideowidget.mm	Fri May 14 16:41:33 2010 +0300
@@ -63,7 +63,7 @@
 
 #include "math.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class GLVideoWidget : public QGLWidget
 {

--- a/qtmobility/plugins/multimedia/qt7/qt7movieviewoutput.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7movieviewoutput.h	Fri May 14 16:41:33 2010 +0300
@@ -51,7 +51,7 @@
 #include "qt7videooutputcontrol.h"
 
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QT7PlayerSession;
 class QT7PlayerService;
@@ -110,6 +110,6 @@
     int m_saturation;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/plugins/multimedia/qt7/qt7movieviewoutput.mm	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7movieviewoutput.mm	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,7 @@
 #include <QtCore/qdebug.h>
 
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 #define VIDEO_TRANSPARENT(m) -(void)m:(NSEvent *)e{[[self superview] m:e];}

--- a/qtmobility/plugins/multimedia/qt7/qt7movieviewrenderer.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7movieviewrenderer.h	Fri May 14 16:41:33 2010 +0300
@@ -52,9 +52,9 @@
 #include "qt7videooutputcontrol.h"
 #include <QtMultimedia/qvideoframe.h>
 
-class QVideoFrame;
+QT_BEGIN_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
+class QVideoFrame;
 
 class QT7PlayerSession;
 class QT7PlayerService;
@@ -87,6 +87,6 @@
     QMutex m_mutex;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/plugins/multimedia/qt7/qt7movieviewrenderer.mm	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7movieviewrenderer.mm	Fri May 14 16:41:33 2010 +0300
@@ -55,7 +55,7 @@
 #include <QtMultimedia/qvideosurfaceformat.h>
 
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class NSBitmapVideoBuffer : public QAbstractVideoBuffer
 {

--- a/qtmobility/plugins/multimedia/qt7/qt7playercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7playercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -50,7 +50,7 @@
 #include <QtGui/qmacdefines_mac.h>
 
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QT7PlayerSession;
 class QT7PlayerService;
@@ -119,6 +119,6 @@
     QT7PlayerSession *m_session;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/plugins/multimedia/qt7/qt7playercontrol.mm	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7playercontrol.mm	Fri May 14 16:41:33 2010 +0300
@@ -47,7 +47,7 @@
 #include <QtCore/qurl.h>
 #include <QtCore/qdebug.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QT7PlayerControl::QT7PlayerControl(QObject *parent)
    : QMediaPlayerControl(parent)

--- a/qtmobility/plugins/multimedia/qt7/qt7playermetadata.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7playermetadata.h	Fri May 14 16:41:33 2010 +0300
@@ -44,7 +44,7 @@
 
 #include <qmetadatacontrol.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QT7PlayerSession;
 
@@ -58,9 +58,9 @@
     bool isMetaDataAvailable() const;
     bool isWritable() const;
 
-    QVariant metaData(QtMedia::MetaData key) const;
-    void setMetaData(QtMedia::MetaData key, const QVariant &value);
-    QList<QtMedia::MetaData> availableMetaData() const;
+    QVariant metaData(QtMediaServices::MetaData key) const;
+    void setMetaData(QtMediaServices::MetaData key, const QVariant &value);
+    QList<QtMediaServices::MetaData> availableMetaData() const;
 
     QVariant extendedMetaData(const QString &key) const ;
     void setExtendedMetaData(const QString &key, const QVariant &value);
@@ -71,9 +71,9 @@
 
 private:
     QT7PlayerSession *m_session;
-    QMap<QtMedia::MetaData, QVariant> m_tags;
+    QMap<QtMediaServices::MetaData, QVariant> m_tags;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/plugins/multimedia/qt7/qt7playermetadata.mm	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7playermetadata.mm	Fri May 14 16:41:33 2010 +0300
@@ -51,7 +51,7 @@
     #undef check // avoid name clash;
 #endif
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QT7PlayerMetaDataControl::QT7PlayerMetaDataControl(QT7PlayerSession *session, QObject *parent)
     :QMetaDataControl(parent), m_session(session)
@@ -72,18 +72,18 @@
     return false;
 }
 
-QVariant QT7PlayerMetaDataControl::metaData(QtMedia::MetaData key) const
+QVariant QT7PlayerMetaDataControl::metaData(QtMediaServices::MetaData key) const
 {
     return m_tags.value(key);
 }
 
-void QT7PlayerMetaDataControl::setMetaData(QtMedia::MetaData key, QVariant const &value)
+void QT7PlayerMetaDataControl::setMetaData(QtMediaServices::MetaData key, QVariant const &value)
 {
     Q_UNUSED(key);
     Q_UNUSED(value);
 }
 
-QList<QtMedia::MetaData> QT7PlayerMetaDataControl::availableMetaData() const
+QList<QtMediaServices::MetaData> QT7PlayerMetaDataControl::availableMetaData() const
 {
     return m_tags.keys();
 }
@@ -243,13 +243,13 @@
         metaMap.insert(QLatin1String("nam"), QString::fromUtf8([name UTF8String]));
 #endif // QUICKTIME_C_API_AVAILABLE
 
-        m_tags.insert(QtMedia::AlbumArtist, metaMap.value(QLatin1String("ART")));
-        m_tags.insert(QtMedia::AlbumTitle, metaMap.value(QLatin1String("alb")));
-        m_tags.insert(QtMedia::Title, metaMap.value(QLatin1String("nam")));
-        m_tags.insert(QtMedia::Date, metaMap.value(QLatin1String("day")));
-        m_tags.insert(QtMedia::Genre, metaMap.value(QLatin1String("gnre")));
-        m_tags.insert(QtMedia::TrackNumber, metaMap.value(QLatin1String("trk")));
-        m_tags.insert(QtMedia::Description, metaMap.value(QLatin1String("des")));
+        m_tags.insert(QtMediaServices::AlbumArtist, metaMap.value(QLatin1String("ART")));
+        m_tags.insert(QtMediaServices::AlbumTitle, metaMap.value(QLatin1String("alb")));
+        m_tags.insert(QtMediaServices::Title, metaMap.value(QLatin1String("nam")));
+        m_tags.insert(QtMediaServices::Date, metaMap.value(QLatin1String("day")));
+        m_tags.insert(QtMediaServices::Genre, metaMap.value(QLatin1String("gnre")));
+        m_tags.insert(QtMediaServices::TrackNumber, metaMap.value(QLatin1String("trk")));
+        m_tags.insert(QtMediaServices::Description, metaMap.value(QLatin1String("des")));
     }
 
     if (!wasEmpty || !m_tags.isEmpty())

--- a/qtmobility/plugins/multimedia/qt7/qt7playerservice.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7playerservice.h	Fri May 14 16:41:33 2010 +0300
@@ -46,7 +46,7 @@
 #include <qmediaservice.h>
 
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 class QMediaMetaData;
 class QMediaPlayerControl;
 class QMediaPlaylist;
@@ -82,6 +82,6 @@
     QT7PlayerMetaDataControl *m_playerMetaDataControl;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/plugins/multimedia/qt7/qt7playerservice.mm	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7playerservice.mm	Fri May 14 16:41:33 2010 +0300
@@ -57,7 +57,7 @@
 #include <qmediaplaylistnavigator.h>
 #include <qmediaplaylist.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QT7PlayerService::QT7PlayerService(QObject *parent):
     QMediaService(parent)

--- a/qtmobility/plugins/multimedia/qt7/qt7playersession.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7playersession.h	Fri May 14 16:41:33 2010 +0300
@@ -49,16 +49,14 @@
 
 #include <QtGui/qmacdefines_mac.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 class QT7PlayerControl;
 class QMediaPlaylist;
 class QMediaPlaylistNavigator;
 class QT7VideoOutput;
 class QT7PlayerSession;
 class QT7PlayerService;
-QTM_END_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
 
 class QT7PlayerSession : public QObject
 {
@@ -139,6 +137,6 @@
     qreal m_rate;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/plugins/multimedia/qt7/qt7playersession.mm	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7playersession.mm	Fri May 14 16:41:33 2010 +0300
@@ -55,7 +55,7 @@
 #include <QtCore/qurl.h>
 #include <QtCore/qdebug.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 @interface QTMovieObserver : NSObject
 {

--- a/qtmobility/plugins/multimedia/qt7/qt7serviceplugin.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7serviceplugin.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 
 #include <qmediaserviceproviderplugin.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QT7ServicePlugin : public QMediaServiceProviderPlugin
 {
@@ -55,6 +55,6 @@
     void release(QMediaService *service);
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QGSTREAMERSERVICEPLUGIN_H

--- a/qtmobility/plugins/multimedia/qt7/qt7serviceplugin.mm	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7serviceplugin.mm	Fri May 14 16:41:33 2010 +0300
@@ -47,7 +47,7 @@
 
 #include <qmediaserviceprovider.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QStringList QT7ServicePlugin::keys() const
 {
@@ -69,6 +69,6 @@
     delete service;
 }
 
-Q_EXPORT_PLUGIN2(qt7_serviceplugin, QT7ServicePlugin);
+Q_EXPORT_PLUGIN2(qtmedia_qt7engine, QT7ServicePlugin);
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/plugins/multimedia/qt7/qt7videooutputcontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7videooutputcontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -53,7 +53,7 @@
 #include <QtGui/qmacdefines_mac.h>
 
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaPlaylist;
 class QMediaPlaylistNavigator;
@@ -125,6 +125,6 @@
     QList<Output> m_outputs;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/plugins/multimedia/qt7/qt7videooutputcontrol.mm	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7videooutputcontrol.mm	Fri May 14 16:41:33 2010 +0300
@@ -44,7 +44,7 @@
 #include "qt7playersession.h"
 #include <QtCore/qdebug.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 QT7VideoOutputControl::QT7VideoOutputControl(QObject *parent)
    :QVideoOutputControl(parent),

--- a/qtmobility/plugins/multimedia/symbian/common/s60videooutputcontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/common/s60videooutputcontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 #include <QObject>
 #include <QVideoOutputControl>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class S60VideoOutputControl : public QVideoOutputControl
 {

--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.h	Fri May 14 16:41:33 2010 +0300
@@ -46,7 +46,7 @@
 
 #include <QMediaService>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class S60AudioCaptureSession;
 class S60AudioEncoderControl;

--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp	Fri May 14 16:41:33 2010 +0300
@@ -62,9 +62,10 @@
     , m_captureState(ENotInitialized)    
     , m_controllerIdMap(QHash<QString, ControllerData>())    
     , m_audioCodeclist(QHash<QString, CodecData>())    
+    , m_error(QMediaRecorder::NoError) 
 {
     TRAPD(err, initializeSessionL());
-    qWarning()<<err;
+    setError(err);
 }
 
 void S60AudioCaptureSession::initializeSessionL()
@@ -75,6 +76,49 @@
     setDefaultSettings();
 }
 
+void S60AudioCaptureSession::setError(TInt aError)
+{
+    if (aError == KErrNone)
+        return;
+        
+    m_error = aError;
+    QMediaRecorder::Error recorderError = fromSymbianErrorToMultimediaError(m_error);
+    
+    // TODO: fix to user friendly string at some point
+    // These error string are only dev usable
+    QString symbianError; 
+    symbianError.append("Symbian:");
+    symbianError.append(QString::number(m_error));
+    emit error(recorderError, symbianError);
+}
+
+QMediaRecorder::Error S60AudioCaptureSession::fromSymbianErrorToMultimediaError(int error)
+{
+    switch(error) {
+    case KErrNoMemory:
+    case KErrNotFound:
+    case KErrBadHandle:
+    case KErrAbort:    
+    case KErrCorrupt:
+    case KErrGeneral:    
+    case KErrPathNotFound:        
+    case KErrUnknown:
+    case KErrNotReady:
+    case KErrInUse:
+    case KErrAccessDenied:
+    case KErrLocked:
+    case KErrPermissionDenied:
+    case KErrAlreadyExists:        
+        return QMediaRecorder::ResourceError;    
+    case KErrNotSupported:   
+    case KErrArgument:        
+        return QMediaRecorder::FormatError;   
+    case KErrNone:
+    default:
+        return QMediaRecorder::NoError;
+    }
+}
+
 S60AudioCaptureSession::~S60AudioCaptureSession()
 {       
     delete m_recorderUtility;    
@@ -92,8 +136,8 @@
 }
 
 QStringList S60AudioCaptureSession::supportedAudioCodecs() const
-{    
-	return m_audioCodeclist.keys();
+{   
+    return m_audioCodeclist.keys();    
 }
 
 QStringList S60AudioCaptureSession::supportedAudioContainers() const
@@ -104,7 +148,7 @@
 QString S60AudioCaptureSession::codecDescription(const QString &codecName)
 {
     if (m_audioCodeclist.keys().contains(codecName))
-        return m_audioCodeclist[codecName].codecDescription;
+        return m_audioCodeclist.value(codecName).codecDescription;
     else
         return QString();
 }
@@ -112,7 +156,7 @@
 QString S60AudioCaptureSession::audioContainerDescription(const QString &containerName)
 {   
     if (m_controllerIdMap.keys().contains(containerName))
-        return m_controllerIdMap[containerName].destinationFormatDescription;
+        return m_controllerIdMap.value(containerName).destinationFormatDescription;
     else
         return QString();
 }
@@ -159,9 +203,12 @@
     TRAPD(err, BaflUtils::EnsurePathExistsL(CCoeEnv::Static()->FsSession(),path));
     if (err==KErrNone) {
         m_sink = sink;
+        setError(err);
         return true;
-    }else 
-        return false;    
+    }else {
+        setError(err);
+        return false;
+    }
 }
 
 qint64 S60AudioCaptureSession::position() const
@@ -172,28 +219,38 @@
     return m_recorderUtility->Duration().Int64() / 1000;        
 }
 
+QString S60AudioCaptureSession::initializeSinkL()
+{    
+    QString sink = QDir::toNativeSeparators(m_sink.toString());    
+    int index = sink.lastIndexOf('.');
+    if (index != -1)
+        sink.chop(sink.length()-index);
+    
+    sink.append(m_controllerIdMap.value(m_container).fileExtension);    
+    return sink;    
+}
+
 void S60AudioCaptureSession::record()
 {   
     if (!m_recorderUtility)
         return;
     
     if (m_captureState == EInitialized || m_captureState == ERecordComplete) {
-        QString filename = QDir::toNativeSeparators(m_sink.toString());        
-        TPtrC16 sink(reinterpret_cast<const TUint16*>(filename.utf16()));         
-        TUid controllerUid(TUid::Uid(m_controllerIdMap[m_container].controllerUid));
-        TUid formatUid(TUid::Uid(m_controllerIdMap[m_container].destinationFormatUid));
-                
+        QString filename = initializeSinkL();
+        TPtrC16 sink(reinterpret_cast<const TUint16*>(filename.utf16()));        
+        TUid controllerUid(TUid::Uid(m_controllerIdMap.value(m_container).controllerUid));
+        TUid formatUid(TUid::Uid(m_controllerIdMap.value(m_container).destinationFormatUid));        
         TRAPD(err, 
         if (m_container != "audio/amr")   
             m_recorderUtility->OpenFileL(sink, controllerUid, KNullUid, formatUid);
         else   
             m_recorderUtility->OpenFileL(sink);
         );       
-        qWarning() << err;
+        setError(err);
     }else if (m_captureState == EPaused) {        
         m_recorderUtility->SetPosition(m_pausedPosition);
         TRAPD(error, m_recorderUtility->RecordL());
-        qWarning() << error;
+        setError(error);
         m_captureState = ERecording;
         emit stateChanged(m_captureState);
     }        
@@ -209,9 +266,13 @@
             m_container = m_controllerIdMap.keys()[0];
     }
     if (m_audioCodeclist.keys().count() > 0) {
-        if (m_audioCodeclist.keys().contains("AMR"))
+        if (m_audioCodeclist.keys().contains("AMR")) {            
+            m_format.setSampleSize(8);
+            m_format.setChannels(1);
+            m_format.setFrequency(8000);
+            m_format.setSampleType(QAudioFormat::SignedInt);            
             m_format.setCodec("AMR");
-        else
+        }else
             m_format.setCodec(m_audioCodeclist.keys()[0]);
     }
 }
@@ -228,14 +289,14 @@
 }
 
 void S60AudioCaptureSession::stop()
-{
+{    
     if (!m_recorderUtility)
         return;
     
     m_recorderUtility->Stop();
     m_recorderUtility->Close();        
     m_captureState = ERecordComplete;
-    emit stateChanged(m_captureState);
+    emit stateChanged(m_captureState);   
 }
 
 void S60AudioCaptureSession::setCaptureDevice(const QString &deviceName)
@@ -245,9 +306,12 @@
 
 void S60AudioCaptureSession::MoscoStateChangeEvent(CBase* aObject,
         TInt aPreviousState, TInt aCurrentState, TInt aErrorCode)
-{    
-	TRAPD(err, MoscoStateChangeEventL(aObject, aPreviousState, aCurrentState, NULL));    
-	qWarning() << err;
+{ 	    
+    if (aErrorCode==KErrNone) {
+	    TRAPD(err, MoscoStateChangeEventL(aObject, aPreviousState, aCurrentState, NULL));
+	    setError(err);
+	}
+	setError(aErrorCode);
 }
 
 void S60AudioCaptureSession::MoscoStateChangeEventL(CBase* aObject,
@@ -265,11 +329,8 @@
                     m_captureState = EInitialized;
                     emit stateChanged(m_captureState);
                 }else {         
-                    applyAudioSettingsL();                            
-                    m_recorderUtility->SetAudioDeviceMode(CMdaAudioRecorderUtility::ELocal);
-                    m_recorderUtility->SetGain(m_recorderUtility->MaxGain());                    
-                    m_recorderUtility->SetPosition(TTimeIntervalMicroSeconds(0));
-                    m_recorderUtility->CropL();
+                    applyAudioSettingsL();                    
+                    m_recorderUtility->SetGain(m_recorderUtility->MaxGain());                 
                     m_recorderUtility->RecordL();
                     m_captureState = EOpenCompelete;                    
                     emit stateChanged(m_captureState);
@@ -320,17 +381,23 @@
 			controllers[index]->RecordFormats();
 		for (TInt j=0; j<recordFormats.Count(); j++) {
 			const CDesC8Array& mimeTypes = recordFormats[j]->SupportedMimeTypes();
-			TInt count = mimeTypes.Count();
-			if (count > 0) {
-				TPtrC8 mimeType = mimeTypes[0];
-				QString type = QString::fromUtf8((char *)mimeType.Ptr(), mimeType.Length());
-				if (type != "audio/mp4") {
+			const CDesC8Array& fileExtensions = recordFormats[j]->SupportedFileExtensions();
+			TInt mimeCount = mimeTypes.Count();
+			TInt fileExtCount = fileExtensions.Count();
+									                                      
+			if (mimeCount > 0 && fileExtCount > 0) {
+                TPtrC8 extension = fileExtensions[0];
+                TPtrC8 mimeType = mimeTypes[0];             
+                QString type = QString::fromUtf8((char *)mimeType.Ptr(), mimeType.Length());          
+                
+				if (type != "audio/mp4" && type != "audio/basic") {
                     ControllerData data;
                     data.controllerUid = controllers[index]->Uid().iUid;
                     data.destinationFormatUid = recordFormats[j]->Uid().iUid;
                     data.destinationFormatDescription = QString::fromUtf16(
                             recordFormats[j]->DisplayName().Ptr(),
-                            recordFormats[j]->DisplayName().Length());                
+                            recordFormats[j]->DisplayName().Length());  
+                    data.fileExtension = QString::fromUtf8((char *)extension.Ptr(), extension.Length());  
                     m_controllerIdMap[type] = data;
 				}
 			}
@@ -344,24 +411,34 @@
     if (!m_recorderUtility || m_captureState != EInitializing) 
         return;
     
+    m_supportedSampleRates.clear();
+    
     RArray<TUint> supportedSampleRates;
     CleanupClosePushL(supportedSampleRates);
     m_recorderUtility->GetSupportedSampleRatesL(supportedSampleRates);        
-    for (TInt j = 0; j < supportedSampleRates.Count(); j++ ) {            
-        m_supportedSampleRates.append(supportedSampleRates[j]);
-        //qDebug()<<"S60AudioCaptureSession::doPopulateAudioCodecsDataL, samplerate: "<<m_supportedSampleRates[j];                        
-    }            
+    for (TInt j = 0; j < supportedSampleRates.Count(); j++ )             
+        m_supportedSampleRates.append(supportedSampleRates[j]);                                
+
     CleanupStack::PopAndDestroy(&supportedSampleRates);    
 }
 
-QList<int> S60AudioCaptureSession::supportedAudioSampleRates() const
+QList<int> S60AudioCaptureSession::supportedAudioSampleRates(const QAudioEncoderSettings &settings) const
 {
-    return m_supportedSampleRates;
+    QList<int> supportedSampleRates;
+
+    if (!settings.codec().isEmpty()) {
+        if (settings.codec() == "AMR")             
+            supportedSampleRates.append(8000);
+        else
+            supportedSampleRates = m_supportedSampleRates; 
+    }else 
+        supportedSampleRates = m_supportedSampleRates;           
+    
+    return supportedSampleRates;
 }
 
 void S60AudioCaptureSession::populateAudioCodecsDataL()
-{
-    //qDebug() << "S60AudioCaptureSession::doInitializeAudioRecorderL START";    
+{        
     if (!m_recorderUtility)  
         return;
         
@@ -389,38 +466,37 @@
         m_audioCodeclist[QString("AAC")]=data;
     }        
     
-    if (m_controllerIdMap.contains("audio/wav")) {            
+    // default samplerates
+    m_supportedSampleRates << 96000 << 88200 << 64000 << 48000 << 44100 << 32000 << 24000 << 22050 << 16000 << 12000 << 11025 << 8000;
+    m_captureState = EInitialized;
+    if (m_controllerIdMap.contains("audio/wav") && m_captureState != EInitialized) {            
         TMdaFileClipLocation location;   
         location.iName = KAudioDummyFile();
         TMdaWavClipFormat format;
         m_captureState = EInitializing;
         m_recorderUtility->OpenL(&location, &format);             
-    }    
+    }      
 }
 
 void S60AudioCaptureSession::applyAudioSettingsL()
-{
-    //qDebug() << "S60AudioCaptureSession::applyAudioSettings START";  
+{      
     if (!m_recorderUtility)
         return;
     
-    TFourCC fourCC = m_audioCodeclist[m_format.codec()].fourCC;    
+    TFourCC fourCC = m_audioCodeclist.value(m_format.codec()).fourCC;    
     
     //set destination datatype
     RArray<TFourCC> supportedDataTypes;
     CleanupClosePushL(supportedDataTypes);
-    m_recorderUtility->GetSupportedDestinationDataTypesL(supportedDataTypes);
-    //qDebug() << "S60AudioCaptureSession::applyAudioSettingsL, datatype count"<<supportedDataTypes.Count();
+    m_recorderUtility->GetSupportedDestinationDataTypesL(supportedDataTypes);    
 
-    for (TInt k = 0; k < supportedDataTypes.Count(); k++ ) {
-        qDebug() << "S60AudioCaptureSession::applyAudioSettingsL, codec"<<m_format.codec()<<"datatype"<<supportedDataTypes[k].FourCC();
-        if (supportedDataTypes[k].FourCC() == fourCC.FourCC()) {
-            //qDebug() << "S60AudioCaptureSession::applyAudioSettingsL, codec"<<m_format.codec()<<"matched datatype"<<supportedDataTypes[k].FourCC();
+    for (TInt k = 0; k < supportedDataTypes.Count(); k++ ) {        
+        if (supportedDataTypes[k].FourCC() == fourCC.FourCC()) {            
             m_recorderUtility->SetDestinationDataTypeL(supportedDataTypes[k]);
             break;
         }
     }
-    CleanupStack::PopAndDestroy(&supportedDataTypes);
+    CleanupStack::PopAndDestroy(&supportedDataTypes);    
     
     RArray<TUint> supportedSampleRates;
     CleanupClosePushL(supportedSampleRates);
@@ -433,23 +509,21 @@
         }        
     }
     CleanupStack::PopAndDestroy(&supportedSampleRates);
- 
+    
     RArray<TUint> supportedChannels;
     CleanupClosePushL(supportedChannels);
-    m_recorderUtility->GetSupportedNumberOfChannelsL(supportedChannels);
-    for (TInt l = 0; l < supportedChannels.Count(); l++ ) {
+    m_recorderUtility->GetSupportedNumberOfChannelsL(supportedChannels);    
+    for (TInt l = 0; l < supportedChannels.Count(); l++ ) {        
         if (supportedChannels[l] == m_format.channels()) {
             m_recorderUtility->SetDestinationNumberOfChannelsL(m_format.channels());
             break;
         }
     }
-    CleanupStack::PopAndDestroy(&supportedChannels);
-    //qDebug() << "S60AudioCaptureSession::applyAudioSettings END";        
+    CleanupStack::PopAndDestroy(&supportedChannels);        
 }
 
 TFourCC S60AudioCaptureSession::determinePCMFormat()
-{
-    //qDebug() << "S60AudioCaptureSession::determinePCMSampleSize START";    
+{        
     TFourCC fourCC;    
     
     if (m_format.sampleSize() == 8) {
@@ -488,7 +562,6 @@
             break;
         }
         }    
-    }    
-    //qDebug() << "S60AudioCaptureSession::determinePCMSampleSize END";
+    }
     return fourCC;
 }

--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.h	Fri May 14 16:41:33 2010 +0300
@@ -49,6 +49,7 @@
 #include <QList>
 #include <QHash>
 #include <QAudioFormat>
+#include <QMediaRecorder>
 
 #include <Mda\Common\Audio.h>
 #include <Mda\Common\Resource.h>
@@ -56,12 +57,13 @@
 #include <MdaAudioSampleEditor.h>
 #include <mmf\common\mmfutilities.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 struct ControllerData
 {
 	int controllerUid;
 	int destinationFormatUid;
 	QString destinationFormatDescription;
+	QString fileExtension;
 };
 
 struct CodecData
@@ -69,16 +71,16 @@
     TFourCC fourCC;
     QString codecDescription;
 };
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class S60AudioCaptureSession : public QObject, public MMdaObjectStateChangeObserver
 {
     Q_OBJECT
     Q_PROPERTY(qint64 position READ position NOTIFY positionChanged)
     Q_ENUMS(TAudioCaptureState)
-public:
+public:    
     
     enum TAudioCaptureState
     {
@@ -104,7 +106,7 @@
     QStringList supportedAudioContainers() const;
     bool setAudioContainer(const QString &containerMimeType); 
     QString audioContainerDescription(const QString &containerName);
-    QList<int> supportedAudioSampleRates() const;
+    QList<int> supportedAudioSampleRates(const QAudioEncoderSettings &settings) const;
     QUrl outputLocation() const;
     bool setOutputLocation(const QUrl& sink);
     qint64 position() const;    
@@ -114,6 +116,9 @@
     
 private:    
     void initializeSessionL();
+    void setError(TInt aError);
+    QMediaRecorder::Error fromSymbianErrorToMultimediaError(int error);    
+    QString initializeSinkL();
     void updateAudioContainersL();    
     void populateAudioCodecsDataL();
     void retrieveSupportedAudioSampleRatesL();
@@ -133,6 +138,7 @@
 Q_SIGNALS:
     void stateChanged(S60AudioCaptureSession::TAudioCaptureState);
     void positionChanged(qint64 position);
+    void error(int error, const QString &errorString);
 
 private:
     QString m_container;    
@@ -145,6 +151,7 @@
     QHash<QString, ControllerData> m_controllerIdMap;
     QHash<QString, CodecData>  m_audioCodeclist;
     QList<int> m_supportedSampleRates;    
+    int m_error; 
 };
 
 #endif // S60AUDIOCAPTURESESSION_H

--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -46,7 +46,7 @@
 #include <QtCore/qstringlist.h>
 
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class S60AudioCaptureSession;

--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -47,17 +47,16 @@
 #include <QtCore/qdebug.h>
 
 S60AudioEncoderControl::S60AudioEncoderControl(QObject *session, QObject *parent)
-    :QAudioEncoderControl(parent)
-{
-    qDebug()<<"S60AudioEncoderControl::S60AudioEncoderControl";
-    QAudioFormat fmt;
-    fmt.setSampleSize(8);
+    :QAudioEncoderControl(parent), m_quality(QtMediaServices::NormalQuality)
+{   
+    m_session = qobject_cast<S60AudioCaptureSession*>(session);
+    QAudioFormat fmt = m_session->format();
+    // medium, 22050Hz mono S16
+    fmt.setSampleType(QAudioFormat::SignedInt);
+    fmt.setSampleSize(16);
+    fmt.setFrequency(22050);
     fmt.setChannels(1);
-    fmt.setFrequency(8000);
-    fmt.setSampleType(QAudioFormat::SignedInt);
-    //fmt.setCodec("audio/pcm");
-
-    m_session = qobject_cast<S60AudioCaptureSession*>(session);
+    m_session->setFormat(fmt);
 }
 
 S60AudioEncoderControl::~S60AudioEncoderControl()
@@ -94,86 +93,93 @@
 void S60AudioEncoderControl::setBitRate(int value)
 {
     Q_UNUSED(value)
+    //Note: None of the default codecs provided in the MMF support the setting of bit rates.                
 }
 
-QtMedia::EncodingQuality S60AudioEncoderControl::quality() const
+QtMediaServices::EncodingQuality S60AudioEncoderControl::quality() const
 {
-    return QtMedia::NormalQuality;
+    return m_quality;
 }
 
-void S60AudioEncoderControl::setQuality(QtMedia::EncodingQuality value)
+void S60AudioEncoderControl::setQuality(QtMediaServices::EncodingQuality value)
 {
     QAudioFormat fmt = m_session->format();
 
     switch (value) {
-        case QtMedia::VeryLowQuality:
-        case QtMedia::LowQuality:
-            // low, 8000Hz mono U8
-            fmt.setSampleType(QAudioFormat::UnSignedInt);
-            fmt.setSampleSize(8);
-            fmt.setFrequency(8000);
-            fmt.setChannels(1);
-            break;
-        case QtMedia::NormalQuality:
-            // medium, 22050Hz mono S16
-            fmt.setSampleType(QAudioFormat::SignedInt);
-            fmt.setSampleSize(16);
-            fmt.setFrequency(22050);
-            fmt.setChannels(1);
-            break;
-        case QtMedia::HighQuality:
-        case QtMedia::VeryHighQuality:    
-            // high, 44100Hz mono S16
-            fmt.setSampleType(QAudioFormat::SignedInt);
-            fmt.setSampleSize(16);
-            fmt.setFrequency(44100);
-            fmt.setChannels(1);
-            break;
-        default:
-            break;
+    case QtMediaServices::VeryLowQuality:
+    case QtMediaServices::LowQuality:
+        // low, 8000Hz mono U8
+        fmt.setSampleType(QAudioFormat::UnSignedInt);
+        fmt.setSampleSize(8);
+        fmt.setFrequency(8000);
+        fmt.setChannels(1);
+        break;
+    case QtMediaServices::NormalQuality:
+        // medium, 22050Hz mono S16
+        fmt.setSampleType(QAudioFormat::SignedInt);
+        fmt.setSampleSize(16);
+        fmt.setFrequency(22050);
+        fmt.setChannels(1);
+        break;
+    case QtMediaServices::HighQuality:
+    case QtMediaServices::VeryHighQuality:    
+        // high, 44100Hz mono S16
+        fmt.setSampleType(QAudioFormat::SignedInt);
+        fmt.setSampleSize(16);
+        fmt.setFrequency(44100);
+        fmt.setChannels(1);
+        break;
+    default:
+        break;
     }
     m_session->setFormat(fmt);
+    m_quality = value;  
 }
 
 QStringList S60AudioEncoderControl::supportedEncodingOptions(const QString &codec) const
 {
     Q_UNUSED(codec)
-
     QStringList list;
-    return list;
+    if (codec == "PCM") 
+        list << "quality" << "channels" << "samplerate";        
+     return list;
 }
 
 QVariant S60AudioEncoderControl::encodingOption(const QString &codec, const QString &name) const
 {
-    Q_UNUSED(codec)
-	QAudioFormat fmt = m_session->format();
-    
-    if(qstrcmp(name.toLocal8Bit().constData(), "bitrate") == 0) {
-        return QVariant(fmt.frequency());
+    if (codec == "PCM") {
+        QAudioFormat fmt = m_session->format();
+        
+        if(qstrcmp(name.toLocal8Bit().constData(), "bitrate") == 0) {
+            return QVariant(bitRate());
+        }
+        else if(qstrcmp(name.toLocal8Bit().constData(), "quality") == 0) {
+            return QVariant(quality());
+        }        
+        else if(qstrcmp(name.toLocal8Bit().constData(), "channels") == 0) {
+            return QVariant(fmt.channels());
+        }                
+        else if(qstrcmp(name.toLocal8Bit().constData(), "samplerate") == 0) {
+            return QVariant(fmt.frequency());
+        }       
     }
-
     return QVariant();
 }
 
 void S60AudioEncoderControl::setEncodingOption(
         const QString &codec, const QString &name, const QVariant &value)
 {
-    Q_UNUSED(value)
-    Q_UNUSED(codec)
-
-    //QAudioFormat fmt = m_session->format();
-
-    if(qstrcmp(name.toLocal8Bit().constData(), "bitrate") == 0) {
-        if (value.toString() == "vbr")
-            setBitRate(-1);
-        else
+    if (codec == "PCM") {        
+        if(qstrcmp(name.toLocal8Bit().constData(), "bitrate") == 0) {
             setBitRate(value.toInt());
-
-    } else if(qstrcmp(name.toLocal8Bit().constData(), "quality") == 0) {
-        setQuality((QtMedia::EncodingQuality)value.toInt());
-
-    } else
-        qWarning() << "option: " << name << " is an unknown option!";
+        } else if(qstrcmp(name.toLocal8Bit().constData(), "quality") == 0) {
+            setQuality((QtMediaServices::EncodingQuality)value.toInt());
+        } else if(qstrcmp(name.toLocal8Bit().constData(), "channels") == 0) {
+            setChannelCount(value.toInt());
+        } else if(qstrcmp(name.toLocal8Bit().constData(), "samplerate") == 0) {
+            setSampleRate(value.toInt());       
+        }        
+    }
 }
 
 int S60AudioEncoderControl::sampleRate() const
@@ -183,11 +189,9 @@
 
 void S60AudioEncoderControl::setSampleRate(int sampleRate)
 {
-    if (sampleRate > 0) {
-        QAudioFormat fmt = m_session->format();
-        fmt.setFrequency(sampleRate);
-        m_session->setFormat(fmt);
-    }
+    QAudioFormat fmt = m_session->format();
+    fmt.setFrequency(sampleRate);
+    m_session->setFormat(fmt);
 }
 
 QList<int> S60AudioEncoderControl::supportedSampleRates(const QAudioEncoderSettings &settings, bool *continuous) const
@@ -195,7 +199,7 @@
     if (continuous)
         *continuous = false;
     
-    return m_session->supportedAudioSampleRates();       
+    return m_session->supportedAudioSampleRates(settings);       
 }
 
 int S60AudioEncoderControl::channelCount() const
@@ -205,16 +209,9 @@
 
 void S60AudioEncoderControl::setChannelCount(int channels)
 {
-    if (channels > 0) {
-        QAudioFormat fmt = m_session->format();
-        fmt.setChannels(channels);
-        m_session->setFormat(fmt);
-    }
-}
-
-QList<int> S60AudioEncoderControl::supportedChannelCounts() const
-{
-    return QList<int>() << 1 << 2;
+    QAudioFormat fmt = m_session->format();
+    fmt.setChannels(channels);
+    m_session->setFormat(fmt);
 }
 
 int S60AudioEncoderControl::sampleSize() const
@@ -229,12 +226,6 @@
     m_session->setFormat(fmt);
 }
 
-QList<int> S60AudioEncoderControl::supportedSampleSizes() const
-{
-    //QList<int> sizes = m_session->deviceInfo()->supportedSampleSizes();
-    return QList<int>(); //sizes;
-}
-
 QAudioEncoderSettings S60AudioEncoderControl::audioSettings() const
 {
     QAudioEncoderSettings settings;
@@ -248,10 +239,16 @@
 
 void S60AudioEncoderControl::setAudioSettings(const QAudioEncoderSettings &settings)
 {
-    setAudioCodec(settings.codec());
-    setBitRate(settings.bitRate());
-    setSampleRate(settings.sampleRate());
-    setChannelCount(settings.channelCount());
-    // Setting quality will override other settings except codec
-    setQuality(settings.quality());
+    if (settings.encodingMode() == QtMediaServices::ConstantQualityEncoding) {             
+        setAudioCodec(settings.codec());
+        setQuality(settings.quality());
+        if (settings.sampleRate() > 0)
+            setSampleRate(settings.sampleRate());   
+        if (settings.channelCount() > 0)
+            setChannelCount(settings.channelCount());
+    }else {        
+        setAudioCodec(settings.codec());        
+        setSampleRate(settings.sampleRate());
+        setChannelCount(settings.channelCount());
+    }    
 }

--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -44,8 +44,9 @@
 
 #include <QAudioEncoderControl>
 #include <QtCore/qstringlist.h>
+#include <QAudioFormat>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class S60AudioCaptureSession;
 
@@ -57,38 +58,35 @@
     virtual ~S60AudioEncoderControl();
 
     QStringList supportedAudioCodecs() const;
+    QString codecDescription(const QString &codecName) const;
+    
+    QList<int> supportedSampleRates(const QAudioEncoderSettings &settings, bool *continuous = 0) const;
+    
+    QAudioEncoderSettings audioSettings() const;
+    void setAudioSettings(const QAudioEncoderSettings&);
+    
+    QStringList supportedEncodingOptions(const QString &codec) const;
+    QVariant encodingOption(const QString &codec, const QString &name) const;
+    void setEncodingOption(const QString &codec, const QString &name, const QVariant &value);    
+    
+private:    
     QString audioCodec() const;
     bool setAudioCodec(const QString &codecName);
-
-    QString codecDescription(const QString &codecName) const;
-
     int bitRate() const;
     void setBitRate(int);
 
-    QtMedia::EncodingQuality quality() const;
-    void setQuality(QtMedia::EncodingQuality);
-
-    QStringList supportedEncodingOptions(const QString &codec) const;
-    QVariant encodingOption(const QString &codec, const QString &name) const;
-    void setEncodingOption(const QString &codec, const QString &name, const QVariant &value);
+    QtMediaServices::EncodingQuality quality() const;
+    void setQuality(QtMediaServices::EncodingQuality);
 
     int sampleRate() const;
     void setSampleRate(int sampleRate);
-    QList<int> supportedSampleRates(const QAudioEncoderSettings &settings, bool *continuous = 0) const;
-
     int channelCount() const;
-    void setChannelCount(int channels);
-    QList<int> supportedChannelCounts() const;
-
+    void setChannelCount(int channels);    
     int sampleSize() const;
-    void setSampleSize(int sampleSize);
-    QList<int> supportedSampleSizes() const;
-
-    QAudioEncoderSettings audioSettings() const;
-    void setAudioSettings(const QAudioEncoderSettings&);
-
+    void setSampleSize(int sampleSize);    
 private:
     S60AudioCaptureSession* m_session;
+    QtMediaServices::EncodingQuality m_quality;
 };
 
 #endif

--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.cpp	Fri May 14 16:41:33 2010 +0300
@@ -42,9 +42,7 @@
 #include "s60audiocapturesession.h"
 #include "s60audioendpointselector.h"
 
-#include <QtGui/QIcon>
-#include <QtCore/QDebug>
-
+#include <QtMultimedia/qaudiodeviceinfo.h>
 
 S60AudioEndpointSelector::S60AudioEndpointSelector(QObject *session, QObject *parent)
     :QAudioEndpointSelector(parent)
@@ -66,7 +64,6 @@
 QString S60AudioEndpointSelector::endpointDescription(const QString& name) const
 {
     QString desc;
-
     for(int i = 0; i < m_names.count(); i++) {
         if (m_names.at(i).compare(name) == 0) {
             desc = m_descriptions.at(i);
@@ -78,9 +75,7 @@
 
 QString S60AudioEndpointSelector::defaultEndpoint() const
 {
-    if (m_names.size() > 0)
-        return m_names.at(0);
-    return QString();
+    return QAudioDeviceInfo(QAudioDeviceInfo::defaultInputDevice()).deviceName();
 }
 
 QString S60AudioEndpointSelector::activeEndpoint() const
@@ -100,8 +95,13 @@
 void S60AudioEndpointSelector::update()
 {
     m_names.clear();
-    m_descriptions.clear();
-
-    m_names.append(QString("MMF"));
-    m_descriptions.append(QString("MMF"));
+    m_descriptions.clear();    
+    QList<QAudioDeviceInfo> devices;
+    devices = QAudioDeviceInfo::availableDevices(QAudio::AudioInput);
+    for(int i = 0; i < devices.size(); ++i) {
+        m_names.append(devices.at(i).deviceName());
+        m_descriptions.append(devices.at(i).deviceName());
+    }
+    if (m_names.isEmpty())
+        m_names.append("MMF");
 }

--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.h	Fri May 14 16:41:33 2010 +0300
@@ -46,7 +46,7 @@
 
 #include <QAudioEndpointSelector>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class S60AudioCaptureSession;

--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -50,6 +50,7 @@
     m_session = qobject_cast<S60AudioCaptureSession*>(session);
     connect(m_session, SIGNAL(positionChanged(qint64)), this, SIGNAL(durationChanged(qint64)));
     connect(m_session, SIGNAL(stateChanged(S60AudioCaptureSession::TAudioCaptureState)), this, SLOT(updateState(S60AudioCaptureSession::TAudioCaptureState)));
+    connect(m_session,SIGNAL(error(int,const QString &)),this,SIGNAL(error(int,const QString &)));
 }
 
 S60AudioMediaRecorderControl::~S60AudioMediaRecorderControl()

--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -50,7 +50,7 @@
 
 #include "s60audiocapturesession.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 //class S60AudioCaptureSession;

--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/mediaplayer_s60.pri	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/mediaplayer_s60.pri	Fri May 14 16:41:33 2010 +0300
@@ -46,20 +46,22 @@
     $$PWD/s60mediaplayeraudioendpointselector.cpp
 
 contains(S60_VERSION, 3.1) {
+
+    #3.1 doesn't provide audio routing in videoplayer
+    DEFINES += HAS_NO_AUDIOROUTING_IN_VIDEOPLAYER
+
     MMP_RULES += "$${LITERAL_HASH}ifndef WINSCW" \
     "LIBRARY    MPEngine.lib" \
     "MACRO    HAS_MEDIA_PLAYER" \
     "$${LITERAL_HASH}endif"
-   
+
     !exists($${EPOCROOT}epoc32\release\winscw\udeb\audiooutputrouting.lib) {
         MMP_RULES += "$${LITERAL_HASH}ifdef WINSCW" \
                      "MACRO HAS_NO_AUDIOROUTING" \
                      "$${LITERAL_HASH}else" \
                      "LIBRARY audiooutputrouting.lib" \
                      "$${LITERAL_HASH}endif"
-        message("Note: AudioOutput Routing API not supported for 3.1 winscw target")
-    } else {
-        MMP_RULES +="LIBRARY audiooutputrouting.lib"
+        message("Note: AudioOutput Routing API not supported for 3.1 winscw target and in videoplayer")
     }
 
 } else {

--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.cpp	Fri May 14 16:41:33 2010 +0300
@@ -50,17 +50,15 @@
     : S60MediaPlayerSession(parent)
     , m_player(0)
     , m_audioOutput(0)
+    , m_audioEndpoint("Default")
 {
     QT_TRAP_THROWING(m_player = CAudioPlayer::NewL(*this, 0, EMdaPriorityPreferenceNone));
-    //QT_TRAP_THROWING(m_audioOutput = CAudioOutput::NewL(*m_player));
-    //QT_TRAP_THROWING(m_audioOutput->RegisterObserverL(*this));
-
     m_player->RegisterForAudioLoadingNotification(*this);
 }
 
 S60AudioPlayerSession::~S60AudioPlayerSession()
 {
-#ifndef HAS_NO_AUDIOROUTING
+#if !defined(HAS_NO_AUDIOROUTING)
     if (m_audioOutput)
         m_audioOutput->UnregisterObserver(*this);
     delete m_audioOutput;
@@ -71,6 +69,12 @@
 
 void S60AudioPlayerSession::doLoadL(const TDesC &path)
 {
+    // m_audioOutput needs to be reinitialized after MapcInitComplete
+    if (m_audioOutput)
+        m_audioOutput->UnregisterObserver(*this);
+    delete m_audioOutput;
+    m_audioOutput = NULL;
+
     m_player->OpenFileL(path);
 }
 
@@ -169,6 +173,12 @@
 {
     Q_UNUSED(aDuration);
     setError(aError);
+    TRAPD(err, 
+        m_audioOutput = CAudioOutput::NewL(*m_player);
+        m_audioOutput->RegisterObserverL(*this);
+    );
+    setActiveEndpoint(m_audioEndpoint);
+    setError(err);
     loaded();
 }
 
@@ -182,30 +192,33 @@
     endOfMedia();
 }
 
+void S60AudioPlayerSession::doSetAudioEndpoint(const QString& audioEndpoint)
+{
+    m_audioEndpoint = audioEndpoint;
+}
+
 QString S60AudioPlayerSession::activeEndpoint() const
 {
-#ifndef HAS_NO_AUDIOROUTING
-    QString outputName;
+    QString outputName = QString("Default");
+#if !defined(HAS_NO_AUDIOROUTING)
     if (m_audioOutput) {
         CAudioOutput::TAudioOutputPreference output = m_audioOutput->AudioOutput();
         outputName = qStringFromTAudioOutputPreference(output);
     }
+#endif
     return outputName;
-#endif
-    return QString("Default");
 }
 
 QString S60AudioPlayerSession::defaultEndpoint() const
 {
-#ifndef HAS_NO_AUDIOROUTING
-    QString outputName;
+    QString outputName = QString("Default");
+#if !defined(HAS_NO_AUDIOROUTING)
     if (m_audioOutput) {
         CAudioOutput::TAudioOutputPreference output = m_audioOutput->DefaultAudioOutput();
         outputName = qStringFromTAudioOutputPreference(output);
     }
+#endif
     return outputName;
-#endif
-    return QString("Default");
 }
 
 void S60AudioPlayerSession::setActiveEndpoint(const QString& name)
@@ -222,39 +235,25 @@
         output = CAudioOutput::EPrivate;
     else if (name == QString("Speaker"))
         output = CAudioOutput::EPublic;
-#ifndef HAS_NO_AUDIOROUTING
+#if !defined(HAS_NO_AUDIOROUTING)
     if (m_audioOutput) {
         TRAPD(err, m_audioOutput->SetAudioOutputL(output));
         setError(err);
+
+        if (m_audioEndpoint != name) {
+            m_audioEndpoint = name;
+            emit activeEndpointChanged(name);
+        }
     }
 #endif
-
 }
 
 void S60AudioPlayerSession::DefaultAudioOutputChanged(CAudioOutput& aAudioOutput,
                                         CAudioOutput::TAudioOutputPreference aNewDefault)
 {
-#ifndef HAS_NO_AUDIOROUTING
-    if (m_audioOutput) {
-        CAudioOutput::TAudioOutputPreference output = m_audioOutput->AudioOutput();
-        if (output == CAudioOutput::ENoPreference) {
-            QString name;
-            if (output == CAudioOutput::EAll)
-                name = QString("All");
-            else if (output == CAudioOutput::ENoOutput)
-                name = QString("None");
-            else if (output == CAudioOutput::EPrivate)
-                name = QString("Earphone");
-            else if (output == CAudioOutput::EPublic)
-                name = QString("Speaker");
-            if (!name.isEmpty())
-                emit activeEndpointChanged(name);
-        }
-    }
-#else
+    // Emit already implemented in setActiveEndpoint function
     Q_UNUSED(aAudioOutput)
     Q_UNUSED(aNewDefault)
-#endif
 }
 
 QString S60AudioPlayerSession::qStringFromTAudioOutputPreference(CAudioOutput::TAudioOutputPreference output) const
@@ -264,10 +263,10 @@
     else if (output == CAudioOutput::EAll)
         return QString("All");
     else if (output == CAudioOutput::ENoOutput)
-            return QString("None");
+        return QString("None");
     else if (output == CAudioOutput::EPrivate)
-            return QString("Earphone");
+        return QString("Earphone");
     else if (output == CAudioOutput::EPublic)
-            return QString("Speaker");
-    return QString();
+        return QString("Speaker");
+    return QString("Default");
 }

--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.h	Fri May 14 16:41:33 2010 +0300
@@ -102,6 +102,7 @@
     void updateMetaDataEntriesL();
     int doGetBufferStatusL() const;
     qint64 doGetDurationL() const;
+    void doSetAudioEndpoint(const QString& audioEndpoint);
     
 private:
 #ifdef S60_DRM_SUPPORTED    
@@ -118,6 +119,7 @@
 private:
     CAudioPlayer *m_player;
     CAudioOutput *m_audioOutput;
+    QString m_audioEndpoint;
 };
 
 #endif

--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp	Fri May 14 16:41:33 2010 +0300
@@ -67,7 +67,7 @@
     return false;
 }
 
-QVariant S60MediaMetaDataProvider::metaData(QtMedia::MetaData key) const
+QVariant S60MediaMetaDataProvider::metaData(QtMediaServices::MetaData key) const
 {
     m_session = m_mediaPlayerResolver.PlayerSession();
     if (m_session && m_session->isMetadataAvailable())
@@ -75,21 +75,21 @@
     return QVariant();
 }
 
-void S60MediaMetaDataProvider::setMetaData(QtMedia::MetaData key, QVariant const &value)
+void S60MediaMetaDataProvider::setMetaData(QtMediaServices::MetaData key, QVariant const &value)
 {
     Q_UNUSED(key);
     Q_UNUSED(value);
 }
-QList<QtMedia::MetaData> S60MediaMetaDataProvider::availableMetaData() const
+QList<QtMediaServices::MetaData> S60MediaMetaDataProvider::availableMetaData() const
 {
     m_session = m_mediaPlayerResolver.PlayerSession();
-    QList<QtMedia::MetaData> metaDataTags;
+    QList<QtMediaServices::MetaData> metaDataTags;
     if (m_session && m_session->isMetadataAvailable()) {
-        for (int i = QtMedia::Title; i <= QtMedia::DeviceSettingDescription; i++) {
-            QString metaData = metaDataKeyAsString((QtMedia::MetaData)i);
+        for (int i = QtMediaServices::Title; i <= QtMediaServices::DeviceSettingDescription; i++) {
+            QString metaData = metaDataKeyAsString((QtMediaServices::MetaData)i);
             if (!metaData.isEmpty()) {
                 if (!m_session->metaData(metaData).toString().isEmpty()) {
-                    metaDataTags.append((QtMedia::MetaData)i);               
+                    metaDataTags.append((QtMediaServices::MetaData)i);               
                 }
             }
         }
@@ -119,59 +119,59 @@
     return QStringList();
 }
 
-QString S60MediaMetaDataProvider::metaDataKeyAsString(QtMedia::MetaData key) const
+QString S60MediaMetaDataProvider::metaDataKeyAsString(QtMediaServices::MetaData key) const
 {
     switch(key) {
-        case QtMedia::Title: return "title";
-        case QtMedia::AlbumArtist: return "artist";
-        case QtMedia::Comment: return "comment";
-        case QtMedia::Genre: return "genre";
-        case QtMedia::Year: return "year";
-        case QtMedia::Copyright: return "copyright";
-        case QtMedia::AlbumTitle: return "album";
-        case QtMedia::Composer: return "composer";
-        case QtMedia::TrackNumber: return "albumtrack";
-        case QtMedia::AudioBitRate: return "audiobitrate";
-        case QtMedia::VideoBitRate: return "videobitrate";
-        case QtMedia::Duration: return "duration";
-        case QtMedia::MediaType: return "contenttype";
-        case QtMedia::SubTitle: // TODO: Find the matching metadata keys
-        case QtMedia::Description:
-        case QtMedia::Category:
-        case QtMedia::Date:
-        case QtMedia::UserRating:
-        case QtMedia::Keywords:
-        case QtMedia::Language:
-        case QtMedia::Publisher:
-        case QtMedia::ParentalRating:
-        case QtMedia::RatingOrganisation:
-        case QtMedia::Size:
-        case QtMedia::AudioCodec:
-        case QtMedia::AverageLevel:
-        case QtMedia::ChannelCount:
-        case QtMedia::PeakValue:
-        case QtMedia::SampleRate:
-        case QtMedia::Author:
-        case QtMedia::ContributingArtist:
-        case QtMedia::Conductor:
-        case QtMedia::Lyrics:
-        case QtMedia::Mood:
-        case QtMedia::TrackCount:
-        case QtMedia::CoverArtUrlSmall:
-        case QtMedia::CoverArtUrlLarge:
-        case QtMedia::Resolution:
-        case QtMedia::PixelAspectRatio:
-        case QtMedia::VideoFrameRate:
-        case QtMedia::VideoCodec:
-        case QtMedia::PosterUrl:
-        case QtMedia::ChapterNumber:
-        case QtMedia::Director:
-        case QtMedia::LeadPerformer:
-        case QtMedia::Writer:
-        case QtMedia::CameraManufacturer:
-        case QtMedia::CameraModel:
-        case QtMedia::Event:
-        case QtMedia::Subject:
+        case QtMediaServices::Title: return "title";
+        case QtMediaServices::AlbumArtist: return "artist";
+        case QtMediaServices::Comment: return "comment";
+        case QtMediaServices::Genre: return "genre";
+        case QtMediaServices::Year: return "year";
+        case QtMediaServices::Copyright: return "copyright";
+        case QtMediaServices::AlbumTitle: return "album";
+        case QtMediaServices::Composer: return "composer";
+        case QtMediaServices::TrackNumber: return "albumtrack";
+        case QtMediaServices::AudioBitRate: return "audiobitrate";
+        case QtMediaServices::VideoBitRate: return "videobitrate";
+        case QtMediaServices::Duration: return "duration";
+        case QtMediaServices::MediaType: return "contenttype";
+        case QtMediaServices::SubTitle: // TODO: Find the matching metadata keys
+        case QtMediaServices::Description:
+        case QtMediaServices::Category:
+        case QtMediaServices::Date:
+        case QtMediaServices::UserRating:
+        case QtMediaServices::Keywords:
+        case QtMediaServices::Language:
+        case QtMediaServices::Publisher:
+        case QtMediaServices::ParentalRating:
+        case QtMediaServices::RatingOrganisation:
+        case QtMediaServices::Size:
+        case QtMediaServices::AudioCodec:
+        case QtMediaServices::AverageLevel:
+        case QtMediaServices::ChannelCount:
+        case QtMediaServices::PeakValue:
+        case QtMediaServices::SampleRate:
+        case QtMediaServices::Author:
+        case QtMediaServices::ContributingArtist:
+        case QtMediaServices::Conductor:
+        case QtMediaServices::Lyrics:
+        case QtMediaServices::Mood:
+        case QtMediaServices::TrackCount:
+        case QtMediaServices::CoverArtUrlSmall:
+        case QtMediaServices::CoverArtUrlLarge:
+        case QtMediaServices::Resolution:
+        case QtMediaServices::PixelAspectRatio:
+        case QtMediaServices::VideoFrameRate:
+        case QtMediaServices::VideoCodec:
+        case QtMediaServices::PosterUrl:
+        case QtMediaServices::ChapterNumber:
+        case QtMediaServices::Director:
+        case QtMediaServices::LeadPerformer:
+        case QtMediaServices::Writer:
+        case QtMediaServices::CameraManufacturer:
+        case QtMediaServices::CameraModel:
+        case QtMediaServices::Event:
+        case QtMediaServices::Subject:
         default:
             break;
     }

--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 #include <QMetaDataControl>
 #include "ms60mediaplayerresolver.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class S60MediaPlayerSession;
 
@@ -60,16 +60,16 @@
     bool isMetaDataAvailable() const;
     bool isWritable() const;
 
-    QVariant metaData(QtMedia::MetaData key) const;
-    void setMetaData(QtMedia::MetaData key, const QVariant &value);
-    QList<QtMedia::MetaData> availableMetaData() const;
+    QVariant metaData(QtMediaServices::MetaData key) const;
+    void setMetaData(QtMediaServices::MetaData key, const QVariant &value);
+    QList<QtMediaServices::MetaData> availableMetaData() const;
     
     QVariant extendedMetaData(const QString &key) const ;
     void setExtendedMetaData(const QString &key, const QVariant &value);
     QStringList availableExtendedMetaData() const;
     
 private:
-    QString metaDataKeyAsString(QtMedia::MetaData key) const;
+    QString metaDataKeyAsString(QtMediaServices::MetaData key) const;
 
 private:
     MS60MediaPlayerResolver& m_mediaPlayerResolver;

--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.cpp	Fri May 14 16:41:33 2010 +0300
@@ -49,6 +49,7 @@
 S60MediaPlayerAudioEndpointSelector::S60MediaPlayerAudioEndpointSelector(QObject *control, QObject *parent)
    :QAudioEndpointSelector(parent)
     , m_control(0)
+    , m_audioEndpointNames(0)
 {
     m_control = qobject_cast<S60MediaPlayerControl*>(control);
 }
@@ -56,7 +57,6 @@
 S60MediaPlayerAudioEndpointSelector::~S60MediaPlayerAudioEndpointSelector()
 {
     delete m_audioEndpointNames;
-    delete m_control;
 }
 
 QList<QString> S60MediaPlayerAudioEndpointSelector::availableEndpoints() const
@@ -96,21 +96,28 @@
 {
     if (m_control->session())
         return m_control->session()->activeEndpoint();
-
-    return QString();
+    else
+        return m_control->mediaControlSettings().audioEndpoint();
 }
 
 QString S60MediaPlayerAudioEndpointSelector::defaultEndpoint() const
 {
     if (m_control->session())
         return m_control->session()->defaultEndpoint();
-
-    return QString();
+    else
+        return m_control->mediaControlSettings().audioEndpoint();
 }
 
 void S60MediaPlayerAudioEndpointSelector::setActiveEndpoint(const QString& name)
 {
-    if (m_control->session())
-        m_control->session()->setActiveEndpoint(name);
+    QString oldEndpoint = m_control->mediaControlSettings().audioEndpoint();
+
+    if (name != oldEndpoint && (name == QString("Default") || name == QString("All") ||
+        name == QString("None") || name == QString("Earphone") || name == QString("Speaker"))) {
+
+        if (m_control->session()) {
+            m_control->session()->setActiveEndpoint(name);
+        }
+        m_control->setAudioEndpoint(name);
+    }
 }
-

--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.h	Fri May 14 16:41:33 2010 +0300
@@ -46,7 +46,7 @@
 
 #include <QAudioEndpointSelector>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class S60MediaPlayerControl;
 class S60MediaPlayerSession;
@@ -72,7 +72,6 @@
     S60MediaPlayerControl* m_control;
     QString m_audioInput;
     QList<QString> *m_audioEndpointNames;
-    QList<QString> *m_audioEndpointDescriptions;
 };
 
 #endif // S60MEDIAPLAYERAUDIOENDPOINTSELECTOR_H

--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -262,3 +262,8 @@
 {
     return m_mediaSettings;
 }
+
+void S60MediaPlayerControl::setAudioEndpoint(const QString& name)
+{
+    m_mediaSettings.setAudioEndpoint(name);
+}

--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -49,13 +49,13 @@
 #include "ms60mediaplayerresolver.h"
 #include <QtCore/qdebug.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 class QMediaPlayer;
 class QMediaTimeRange;
 class QMediaContent;
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class S60MediaPlayerSession;
 class S60MediaPlayerService;
@@ -69,6 +69,7 @@
         , m_muted(false)
         , m_playbackRate(0)
         , m_mediaStatus(QMediaPlayer::UnknownMediaStatus)
+        , m_audioEndpoint(QString("Default"))
     {
     }
     
@@ -76,17 +77,20 @@
     void setMuted(bool muted) { m_muted = muted; }
     void setPlaybackRate(int rate) { m_playbackRate = rate; }
     void setMediaStatus(QMediaPlayer::MediaStatus status) {m_mediaStatus=status;}
+    void setAudioEndpoint(const QString& audioEndpoint) { m_audioEndpoint = audioEndpoint; }
     
     int volume() const { return m_volume; }
     bool isMuted() const { return m_muted; }
     qreal playbackRate() const { return m_playbackRate; }
     QMediaPlayer::MediaStatus mediaStatus() const {return m_mediaStatus;}
+    QString audioEndpoint() const { return m_audioEndpoint; }
     
 private:
     int m_volume;
     bool m_muted;
     qreal m_playbackRate;
     QMediaPlayer::MediaStatus m_mediaStatus;
+    QString m_audioEndpoint;
 };
 
 class S60MediaPlayerControl : public QMediaPlayerControl
@@ -121,6 +125,7 @@
     virtual void pause();
     virtual void stop();  
     S60MediaPlayerSession* session();
+    void setAudioEndpoint(const QString& name);
 
     // Own methods
     void setVideoOutput(QObject *output);

--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp	Fri May 14 16:41:33 2010 +0300
@@ -74,6 +74,7 @@
     m_control = new S60MediaPlayerControl(*this, this);
     m_mediaRecognizer = new S60MediaRecognizer(this);  
     m_metaData = new S60MediaMetaDataProvider(*this);
+    m_audioEndpointSelector = new S60MediaPlayerAudioEndpointSelector(m_control, this);
 }
 
 S60MediaPlayerService::~S60MediaPlayerService()
@@ -82,7 +83,6 @@
     delete m_videoRenderer;
     delete m_videoWindow;
     delete m_videoOutput;
-    delete m_metaData;
 }
 
 QMediaControl *S60MediaPlayerService::control(const char *name) const
@@ -127,8 +127,6 @@
     }
 
     if (qstrcmp(name, QAudioEndpointSelector_iid) == 0) {
-        if (!m_audioEndpointSelector)
-            m_audioEndpointSelector = new S60MediaPlayerAudioEndpointSelector(m_control);
         return m_audioEndpointSelector;
     }
 
@@ -209,10 +207,13 @@
                 m_control, SIGNAL(error(int, const QString &)));
         connect(m_videoPlayerSession, SIGNAL(metaDataChanged()), 
                 m_metaData, SIGNAL(metaDataChanged()));
+        connect(m_videoPlayerSession, SIGNAL(activeEndpointChanged(const QString&)), 
+                m_audioEndpointSelector, SIGNAL(activeEndpointChanged(const QString&)));
     }
     
     m_videoPlayerSession->setVolume(m_control->mediaControlSettings().volume());
     m_videoPlayerSession->setMuted(m_control->mediaControlSettings().isMuted());
+    m_videoPlayerSession->setAudioEndpoint(m_control->mediaControlSettings().audioEndpoint());
     return m_videoPlayerSession;
 }
 
@@ -243,9 +244,12 @@
                 m_control, SIGNAL(error(int, const QString &)));
         connect(m_audioPlayerSession, SIGNAL(metaDataChanged()), 
                 m_metaData, SIGNAL(metaDataChanged()));
+        connect(m_audioPlayerSession, SIGNAL(activeEndpointChanged(const QString&)), 
+                m_audioEndpointSelector, SIGNAL(activeEndpointChanged(const QString&)));
     }
     
     m_audioPlayerSession->setVolume(m_control->mediaControlSettings().volume());
     m_audioPlayerSession->setMuted(m_control->mediaControlSettings().isMuted());
+    m_audioPlayerSession->setAudioEndpoint(m_control->mediaControlSettings().audioEndpoint());
     return m_audioPlayerSession;
 }

--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.h	Fri May 14 16:41:33 2010 +0300
@@ -52,13 +52,13 @@
 
 #include "s60mediaplayeraudioendpointselector.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 class QMediaMetaData;
 class QMediaPlayerControl;
 class QMediaPlaylist;
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class S60VideoPlayerSession;
 class S60AudioPlayerSession;
@@ -99,7 +99,7 @@
     mutable S60VideoWidgetControl *m_videoWidget;
     mutable S60VideoOverlay *m_videoWindow;
     mutable S60VideoRenderer *m_videoRenderer;
-    mutable S60MediaPlayerAudioEndpointSelector *m_audioEndpointSelector;
+    S60MediaPlayerAudioEndpointSelector *m_audioEndpointSelector;
 };
 
 #endif

--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.cpp	Fri May 14 16:41:33 2010 +0300
@@ -300,6 +300,11 @@
     emit positionChanged(position());
 }
 
+void S60MediaPlayerSession::setAudioEndpoint(const QString& audioEndpoint)
+{
+    doSetAudioEndpoint(audioEndpoint);
+}
+
 void S60MediaPlayerSession::loaded()
 {
     stopStalledTimer();
@@ -483,4 +488,4 @@
 TRect S60MediaPlayerSession::QRect2TRect(const QRect& qr)
 {
     return TRect(TPoint(qr.left(), qr.top()), TSize(qr.width(), qr.height()));
-}
\ No newline at end of file
+}

--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.h	Fri May 14 16:41:33 2010 +0300
@@ -50,9 +50,9 @@
 #include <QRect>
 #include "s60mediaplayerservice.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 class QMediaTimeRange;
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 class QTimer;
 
@@ -89,6 +89,7 @@
     virtual void setVideoRenderer(QObject *renderer);
     void setMediaStatus(QMediaPlayer::MediaStatus);
     void setState(QMediaPlayer::State state);
+    void setAudioEndpoint(const QString& audioEndpoint);
     
 protected:    
     virtual void doLoadL(const TDesC &path) = 0;
@@ -102,6 +103,7 @@
     virtual void updateMetaDataEntriesL() = 0;
     virtual int doGetBufferStatusL() const = 0;
     virtual qint64 doGetDurationL() const = 0;
+    virtual void doSetAudioEndpoint(const QString& audioEndpoint) = 0;
 
 public:
     // From S60MediaPlayerAudioEndpointSelector
@@ -109,8 +111,6 @@
     virtual QString defaultEndpoint() const = 0;
 public Q_SLOTS:
     virtual void setActiveEndpoint(const QString& name) = 0;
-Q_SIGNALS:
-    virtual void activeEndpointChanged(const QString &name) = 0;
 
 protected:
     void setError(int error,  const QString &errorString = QString(), bool forceReset = false);
@@ -146,6 +146,7 @@
     void availablePlaybackRangesChanged(const QMediaTimeRange&);
     void metaDataChanged();
     void error(int error, const QString &errorString);
+    void activeEndpointChanged(const QString &name);
     
 private:
     qreal m_playbackRate;

--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videooverlay.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videooverlay.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 #include <QtCore/qobject.h>
 #include <QVideoWindowControl>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QAbstractVideoSurface;
 class S60VideoSurface;

--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp	Fri May 14 16:41:33 2010 +0300
@@ -44,7 +44,6 @@
 #include "s60mediaplayerservice.h"
 #include "s60videooverlay.h"
 
-#include <QtCore/private/qcore_symbian_p.h> // For qt_TRect2QRect 
 #include <QtCore/qdebug.h>
 #include <QtGui/qwidget.h>
 #include <QtCore/qtimer.h>
@@ -55,6 +54,8 @@
 #include <w32std.h>
 #include <mmf/common/mmfcontrollerframeworkbase.h>
 
+#include <AudioOutput.h>
+#include <MAudioOutputObserver.h>
 
 S60VideoPlayerSession::S60VideoPlayerSession(QMediaService *service)
     : S60MediaPlayerSession(service)
@@ -71,6 +72,7 @@
     , m_aspectRatioMode(Qt::KeepAspectRatio)
     , m_originalSize(1, 1)
     , m_audioOutput(0)
+    , m_audioEndpoint("Default")
 {  
     resetNativeHandles();
     QT_TRAP_THROWING(m_player = CVideoPlayerUtility::NewL(
@@ -84,15 +86,11 @@
         m_rect));
     m_dsaActive = true;
     m_player->RegisterForVideoLoadingNotification(*this);
-#if !defined(HAS_NO_AUDIOROUTING)
-    //QT_TRAP_THROWING(m_audioOutput = CAudioOutput::NewL(*m_player));
-    //QT_TRAP_THROWING(m_audioOutput->RegisterObserverL(*this));
-#endif
 }
 
 S60VideoPlayerSession::~S60VideoPlayerSession()
 {
-#if !defined(HAS_NO_AUDIOROUTING)
+#if !defined(HAS_NO_AUDIOROUTING_IN_VIDEOPLAYER)
     if (m_audioOutput)
         m_audioOutput->UnregisterObserver(*this);
     delete m_audioOutput;
@@ -103,17 +101,29 @@
 
 void S60VideoPlayerSession::doLoadL(const TDesC &path)
 {
+    // m_audioOutput needs to be reinitialized after MapcInitComplete
+    if (m_audioOutput)
+        m_audioOutput->UnregisterObserver(*this);
+    delete m_audioOutput;
+    m_audioOutput = NULL;
+
     m_player->OpenFileL(path);
 }
 
 void S60VideoPlayerSession::doLoadUrlL(const TDesC &path)
 {
+    // m_audioOutput needs to be reinitialized after MapcInitComplete
+    if (m_audioOutput)
+        m_audioOutput->UnregisterObserver(*this);
+    delete m_audioOutput;
+    m_audioOutput = NULL;
+
     m_player->OpenUrlL(path);
 }
 
 int S60VideoPlayerSession::doGetBufferStatusL() const
 {
-	int progress = 0;
+    int progress = 0;
     m_player->GetVideoLoadingProgressL(progress);
     return progress;
 }
@@ -246,9 +256,9 @@
 {
     QSize scaled = m_originalSize;
     if (m_aspectRatioMode == Qt::IgnoreAspectRatio)
-        scaled.scale(qt_TRect2QRect(m_rect).size(), Qt::IgnoreAspectRatio);    
+        scaled.scale(TRect2QRect(m_rect).size(), Qt::IgnoreAspectRatio);    
     else if(m_aspectRatioMode == Qt::KeepAspectRatio)
-        scaled.scale(qt_TRect2QRect(m_rect).size(), Qt::KeepAspectRatio);    
+        scaled.scale(TRect2QRect(m_rect).size(), Qt::KeepAspectRatio);    
     
     qreal width = qreal(scaled.width()) / qreal(m_originalSize.width()) * qreal(100);
     qreal height = qreal(scaled.height()) / qreal(m_originalSize.height()) * qreal(100);
@@ -302,6 +312,14 @@
 
     setError(err);
     m_dsaActive = true;
+#if !defined(HAS_NO_AUDIOROUTING_IN_VIDEOPLAYER)
+    TRAP(err, 
+        m_audioOutput = CAudioOutput::NewL(*m_player);
+        m_audioOutput->RegisterObserverL(*this);
+    );
+    setActiveEndpoint(m_audioEndpoint);
+    setError(err);
+#endif
     loaded();
 }
 
@@ -383,10 +401,15 @@
     buffered();
 }
 
+void S60VideoPlayerSession::doSetAudioEndpoint(const QString& audioEndpoint)
+{
+    m_audioEndpoint = audioEndpoint;
+}
+
 QString S60VideoPlayerSession::activeEndpoint() const
 {
-    QString outputName;
-#if !defined(HAS_NO_AUDIOROUTING)
+    QString outputName = QString("Default");
+#if !defined(HAS_NO_AUDIOROUTING_IN_VIDEOPLAYER)
     if (m_audioOutput) {
         CAudioOutput::TAudioOutputPreference output = m_audioOutput->AudioOutput();
         outputName = qStringFromTAudioOutputPreference(output);
@@ -397,15 +420,14 @@
 
 QString S60VideoPlayerSession::defaultEndpoint() const
 {
-    QString outputName;
-#if !defined(HAS_NO_AUDIOROUTING)
+    QString outputName = QString("Default");
+#if !defined(HAS_NO_AUDIOROUTING_IN_VIDEOPLAYER)
     if (m_audioOutput) {
         CAudioOutput::TAudioOutputPreference output = m_audioOutput->DefaultAudioOutput();
         outputName = qStringFromTAudioOutputPreference(output);
     }
+#endif
     return outputName;
-#endif
-    return QString("Default");
 }
 
 void S60VideoPlayerSession::setActiveEndpoint(const QString& name)
@@ -422,10 +444,15 @@
         output = CAudioOutput::EPrivate;
     else if (name == QString("Speaker"))
         output = CAudioOutput::EPublic;
-#if !defined(HAS_NO_AUDIOROUTING)
+#if !defined(HAS_NO_AUDIOROUTING_IN_VIDEOPLAYER)
     if (m_audioOutput) {
         TRAPD(err, m_audioOutput->SetAudioOutputL(output));
         setError(err);
+        
+        if (m_audioEndpoint != name) {
+            m_audioEndpoint = name;
+            emit activeEndpointChanged(name);
+        }
     }
 #endif
 }
@@ -433,24 +460,9 @@
 void S60VideoPlayerSession::DefaultAudioOutputChanged( CAudioOutput& aAudioOutput,
                                         CAudioOutput::TAudioOutputPreference aNewDefault )
 {
-#if !defined(HAS_NO_AUDIOROUTING)
-    if (m_audioOutput) {
-        CAudioOutput::TAudioOutputPreference output = m_audioOutput->AudioOutput();
-        if (output == CAudioOutput::ENoPreference) {
-            QString name;
-            if (output == CAudioOutput::EAll)
-                name = QString("All");
-            else if (output == CAudioOutput::ENoOutput)
-                name = QString("None");
-            else if (output == CAudioOutput::EPrivate)
-                name = QString("Earphone");
-            else if (output == CAudioOutput::EPublic)
-                name = QString("Speaker");
-            if (!name.isEmpty())
-                emit activeEndpointChanged(name);
-        }
-    }
-#endif
+    // Emit already implemented in setActiveEndpoint function
+    Q_UNUSED(aAudioOutput)
+    Q_UNUSED(aNewDefault)
 }
 
 QString S60VideoPlayerSession::qStringFromTAudioOutputPreference(CAudioOutput::TAudioOutputPreference output) const
@@ -460,10 +472,10 @@
     else if (output == CAudioOutput::EAll)
         return QString("All");
     else if (output == CAudioOutput::ENoOutput)
-            return QString("None");
+        return QString("None");
     else if (output == CAudioOutput::EPrivate)
-            return QString("Earphone");
+        return QString("Earphone");
     else if (output == CAudioOutput::EPublic)
-            return QString("Speaker");
-    return QString();
+        return QString("Speaker");
+    return QString("Default");
 }

--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.h	Fri May 14 16:41:33 2010 +0300
@@ -99,6 +99,7 @@
     void updateMetaDataEntriesL();
     int doGetBufferStatusL() const;
     qint64 doGetDurationL() const;
+    void doSetAudioEndpoint(const QString& audioEndpoint);
 
 private slots: 
     void resetVideoDisplay();
@@ -137,6 +138,7 @@
     Qt::AspectRatioMode m_aspectRatioMode;
     QSize m_originalSize;
     CAudioOutput *m_audioOutput;
+    QString m_audioEndpoint;
 };
 
 #endif

--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videorenderer.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videorenderer.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 #include <QtCore/qobject.h>
 #include <QVideoRendererControl>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class S60VideoRenderer : public QVideoRendererControl
 {

--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 #include <QVideoWidgetControl>
 #include <qmediaplayer.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QBlackWidget : public QWidget
 {

--- a/qtmobility/plugins/multimedia/symbian/mmf/mmf.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mmf.pro	Fri May 14 16:41:33 2010 +0300
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 QT += multimedia
 CONFIG += plugin
-TARGET = QtMobilityMmfEngine
+TARGET = qtmedia_mmfengine
 PLUGIN_SUBDIR = mediaservice
 include (../../../../common.pri)
 qtAddLibrary(QtMedia)

--- a/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.cpp	Fri May 14 16:41:33 2010 +0300
@@ -345,12 +345,12 @@
     return m_available;
 }
 
-QtMedia::AvailabilityError S60RadioTunerControl::availabilityError() const
+QtMediaServices::AvailabilityError S60RadioTunerControl::availabilityError() const
 {
     if (m_available)
-        return QtMedia::NoError;
+        return QtMediaServices::NoError;
     else
-        return QtMedia::ResourceError;
+        return QtMediaServices::ResourceError;
 }
 
 QRadioTuner::Error S60RadioTunerControl::error() const

--- a/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.h	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,7 @@
 
 class S60RadioTunerService;
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class S60RadioTunerControl 
     : public QRadioTunerControl
@@ -95,7 +95,7 @@
     bool isValid() const;
 
     bool isAvailable() const;
-    QtMedia::AvailabilityError availabilityError() const;
+    QtMediaServices::AvailabilityError availabilityError() const;
     
     void start();
     void stop();

--- a/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.cpp	Fri May 14 16:41:33 2010 +0300
@@ -288,12 +288,12 @@
 	return m_available;
 }
 
-QtMedia::AvailabilityError S60RadioTunerControl::availabilityError() const
+QtMediaServices::AvailabilityError S60RadioTunerControl::availabilityError() const
 {
 	if (m_available)
-		return QtMedia::NoError;
+		return QtMediaServices::NoError;
 	else
-		return QtMedia::ResourceError;
+		return QtMediaServices::ResourceError;
 }
 
 void S60RadioTunerControl::start()

--- a/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.h	Fri May 14 16:41:33 2010 +0300
@@ -53,7 +53,7 @@
 class S60RadioTunerService;
 class CFMRadioEngineCallObserver;
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class S60RadioTunerControl 
     : public QRadioTunerControl
@@ -96,7 +96,7 @@
     bool isValid() const;
 
     bool isAvailable() const;
-    QtMedia::AvailabilityError availabilityError() const;
+    QtMediaServices::AvailabilityError availabilityError() const;
     
     void start();
     void stop();

--- a/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.h	Fri May 14 16:41:33 2010 +0300
@@ -52,7 +52,7 @@
 #include "s60radiotunercontrol_since32.h"
 #endif
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class S60RadioTunerService : public QMediaService
 {

--- a/qtmobility/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.cpp	Fri May 14 16:41:33 2010 +0300
@@ -92,4 +92,4 @@
     delete service;
 }
 
-Q_EXPORT_PLUGIN2(QtMobilityMmfEngine, S60MediaServicePlugin);
+Q_EXPORT_PLUGIN2(qtmedia_mmfengine, S60MediaServicePlugin);

--- a/qtmobility/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.h	Fri May 14 16:41:33 2010 +0300
@@ -47,7 +47,7 @@
 #include <QMediaService>
 #include <QMediaServiceProviderPlugin>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class S60MediaServicePlugin : public QMediaServiceProviderPlugin
 {

--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/mediarecorder.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/mediarecorder.pro	Fri May 14 16:41:33 2010 +0300
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = xarecordservice
+TARGET = qtmedia_xarecordservice
 
 PLUGIN_SUBDIR = mediaservice
 
@@ -12,7 +12,7 @@
 
 # Input parameters for qmake to make the dll a qt plugin
 # ------------------------------------------------------
-pluginstub.sources = qmakepluginstubs/xarecordservice.dll
+pluginstub.sources = qmakepluginstubs/qtmedia_xarecordservice.dll
 pluginstub.path = /resource/qt/plugins/mediaservice
 DEPLOYMENT += pluginstub

--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioencodercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioencodercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -44,7 +44,7 @@
 
 #include <qaudioencodercontrol.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 /*
  * This class implements QAudioEncoderControl interface.

--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioendpointselector.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioendpointselector.h	Fri May 14 16:41:33 2010 +0300
@@ -44,7 +44,7 @@
 
 #include <qaudioendpointselector.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 /*
  * This class implements QAudioEncoderControl interface.

--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediacontainercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediacontainercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -44,7 +44,7 @@
 
 #include <qmediacontainercontrol.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 /*
  * This class implements QMediaContainerControl interface.

--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediarecordercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediarecordercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 #include <qmediarecorder.h>
 #include <qmediarecordercontrol.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 /*
  * This class implements QMediaRecorderControl interface.

--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaservice.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaservice.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 #include <QtCore/qobject.h>
 #include <qmediaservice.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 /*
  * This class implements QMediaService interface.

--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.cpp	Fri May 14 16:41:33 2010 +0300
@@ -66,4 +66,4 @@
     QT_TRACE_FUNCTION_EXIT;
 }
 
-Q_EXPORT_PLUGIN2(xarecordservice, QXARecordMediaServiceProviderPlugin);
+Q_EXPORT_PLUGIN2(qtmedia_xarecordservice, QXARecordMediaServiceProviderPlugin);

--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 #include <qmediaservice.h>
 #include <qmediaserviceproviderplugin.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 /*
  * This class implements QMediaServiceProviderPlugin interface.

--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordsession.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordsession.cpp	Fri May 14 16:41:33 2010 +0300
@@ -87,8 +87,8 @@
             m_containerMimeType = QString();
             m_audioencodersettings.setBitRate(0);
             m_audioencodersettings.setChannelCount(-1);
-            m_audioencodersettings.setEncodingMode(QtMedia::ConstantQualityEncoding);
-            m_audioencodersettings.setQuality(QtMedia::NormalQuality);
+            m_audioencodersettings.setEncodingMode(QtMediaServices::ConstantQualityEncoding);
+            m_audioencodersettings.setQuality(QtMediaServices::NormalQuality);
             m_audioencodersettings.setSampleRate(-1);
             QT_TRACE1("Initialized implementation");
         }
@@ -533,7 +533,7 @@
     m_impl->setContainerType(tempPtr);
 
     /* Validate and set bitrate only if encoding mode is other than quality encoding */
-    if (m_audioencodersettings.encodingMode() != QtMedia::ConstantQualityEncoding) {
+    if (m_audioencodersettings.encodingMode() != QtMediaServices::ConstantQualityEncoding) {
         if (m_audioencodersettings.bitRate() < 0 ) {
             emit error(QMediaRecorder::FormatError, tr("Invalid bitrate"));
             SIGNAL_EMIT_TRACE1("emit error(QMediaRecorder::FormatError, tr(\"Invalid bitrate\"))");
@@ -569,21 +569,21 @@
     }
 
     switch (m_audioencodersettings.encodingMode()) {
-    case QtMedia::ConstantQualityEncoding: {
+    case QtMediaServices::ConstantQualityEncoding: {
             switch (m_audioencodersettings.quality()) {
-            case QtMedia::VeryLowQuality:
+            case QtMediaServices::VeryLowQuality:
                 m_impl->setVeryLowQuality();
                 break;
-            case QtMedia::LowQuality:
+            case QtMediaServices::LowQuality:
                 m_impl->setLowQuality();
                 break;
-            case QtMedia::NormalQuality:
+            case QtMediaServices::NormalQuality:
                 m_impl->setNormalQuality();
                 break;
-            case QtMedia::HighQuality:
+            case QtMediaServices::HighQuality:
                 m_impl->setHighQuality();
                 break;
-            case QtMedia::VeryHighQuality:
+            case QtMediaServices::VeryHighQuality:
                 m_impl->setVeryHighQuality();
                 break;
             default:
@@ -593,7 +593,7 @@
             }; /* end of switch (m_audioencodersettings.quality())*/
         }
         break;
-    case QtMedia::ConstantBitRateEncoding: {
+    case QtMediaServices::ConstantBitRateEncoding: {
             TInt32 status = m_impl->setCBRMode();
             if (status == KErrNotSupported) {
                 emit error(QMediaRecorder::FormatError, tr("Invalid encoding mode setting"));
@@ -607,7 +607,7 @@
             }
         }
         break;
-    case QtMedia::AverageBitRateEncoding: {
+    case QtMediaServices::AverageBitRateEncoding: {
             TInt32 status = m_impl->setVBRMode();
             if (status == KErrNotSupported) {
                 emit error(QMediaRecorder::FormatError, tr("Invalid encoding mode setting"));
@@ -621,7 +621,7 @@
             }
         }
         break;
-    case QtMedia::TwoPassEncoding:
+    case QtMediaServices::TwoPassEncoding:
         // fall through
     default: {
             emit error(QMediaRecorder::FormatError, tr("Invalid encoding mode setting"));

--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordsession.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordsession.h	Fri May 14 16:41:33 2010 +0300
@@ -47,7 +47,7 @@
 #include "qmediarecorder.h"
 #include "xarecordsessioncommon.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class XARecordSessionImpl;

--- a/qtmobility/plugins/multimedia/v4l/radio/v4lradiocontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/v4l/radio/v4lradiocontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -88,12 +88,12 @@
     return available;
 }
 
-QtMedia::AvailabilityError V4LRadioControl::availabilityError() const
+QtMediaServices::AvailabilityError V4LRadioControl::availabilityError() const
 {
     if (fd > 0)
-        return QtMedia::NoError;
+        return QtMediaServices::NoError;
     else
-        return QtMedia::ResourceError;
+        return QtMediaServices::ResourceError;
 }
 
 QRadioTuner::State V4LRadioControl::state() const

--- a/qtmobility/plugins/multimedia/v4l/radio/v4lradiocontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/v4l/radio/v4lradiocontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -53,7 +53,7 @@
 #include <sys/ioctl.h>
 #include <linux/videodev2.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class V4LRadioService;
 
@@ -65,7 +65,7 @@
     ~V4LRadioControl();
 
     bool isAvailable() const;
-    QtMedia::AvailabilityError availabilityError() const;
+    QtMediaServices::AvailabilityError availabilityError() const;
 
     QRadioTuner::State state() const;

--- a/qtmobility/plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.cpp	Fri May 14 16:41:33 2010 +0300
@@ -135,12 +135,12 @@
     return available;
 }
 
-QtMedia::AvailabilityError V4LRadioControl::availabilityError() const
+QtMediaServices::AvailabilityError V4LRadioControl::availabilityError() const
 {
     if (fd > 0)
-        return QtMedia::NoError;
+        return QtMediaServices::NoError;
     else
-        return QtMedia::ResourceError;
+        return QtMediaServices::ResourceError;
 }
 
 QRadioTuner::State V4LRadioControl::state() const

--- a/qtmobility/plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.h	Fri May 14 16:41:33 2010 +0300
@@ -52,7 +52,7 @@
 
 #include <alsa/asoundlib.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class V4LRadioService;
 
@@ -64,7 +64,7 @@
     ~V4LRadioControl();
 
     bool isAvailable() const;
-    QtMedia::AvailabilityError availabilityError() const;
+    QtMediaServices::AvailabilityError availabilityError() const;
 
     QRadioTuner::State state() const;

--- a/qtmobility/plugins/multimedia/v4l/radio/v4lradioservice.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/v4l/radio/v4lradioservice.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 #include <QtCore/qobject.h>
 
 #include <qmediaservice.h>
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class V4LRadioControl;

--- a/qtmobility/plugins/multimedia/v4l/v4l.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/v4l/v4l.pro	Fri May 14 16:41:33 2010 +0300
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(v4lengine)
+TARGET = $$qtLibraryTarget(qtmedia_v4lengine)
 
 PLUGIN_TYPE = mediaservice

--- a/qtmobility/plugins/multimedia/v4l/v4lserviceplugin.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/v4l/v4lserviceplugin.cpp	Fri May 14 16:41:33 2010 +0300
@@ -80,5 +80,5 @@
 }
 
 
-Q_EXPORT_PLUGIN2(v4lengine, V4LServicePlugin);
+Q_EXPORT_PLUGIN2(qtmedia_v4lengine, V4LServicePlugin);

--- a/qtmobility/plugins/multimedia/v4l/v4lserviceplugin.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/v4l/v4lserviceplugin.h	Fri May 14 16:41:33 2010 +0300
@@ -45,12 +45,12 @@
 
 #include <qmediaserviceproviderplugin.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class V4LServicePlugin : public QMediaServiceProviderPlugin, public QMediaServiceSupportedDevicesInterface
 {
     Q_OBJECT
-    Q_INTERFACES(QtMobility::QMediaServiceSupportedDevicesInterface)
+    Q_INTERFACES(QMediaServiceSupportedDevicesInterface)
 public:
     QStringList keys() const;
     QMediaService* create(QString const& key);

--- a/qtmobility/plugins/multimedia/wmp/qevrvideooverlay.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qevrvideooverlay.h	Fri May 14 16:41:33 2010 +0300
@@ -48,7 +48,7 @@
 
 #include <evr.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QEvrVideoOverlay : public QVideoWindowControl, public QMFActivate
 {

--- a/qtmobility/plugins/multimedia/wmp/qwmpmetadata.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpmetadata.cpp	Fri May 14 16:41:33 2010 +0300
@@ -57,75 +57,75 @@
 
 struct QWmpMetaDataKeyLookup
 {
-    QtMedia::MetaData key;
+    QtMediaServices::MetaData key;
     const wchar_t *token;
 };
 
 static const QWmpMetaDataKeyLookup qt_wmpMetaDataKeys[] =
 {
-    { QtMedia::Title, L"Title" },
-    { QtMedia::SubTitle, L"WM/SubTitle" },
-    { QtMedia::Author, L"Author" },
-    { QtMedia::Comment, L"Comment" },
-    { QtMedia::Description, L"Description" },
-    { QtMedia::Category, L"WM/Category" },
-    { QtMedia::Genre, L"WM/Genre" },
-    //{ QtMedia::Date, 0 },
-    { QtMedia::Year, L"WM/Year" },
-    { QtMedia::UserRating, L"UserRating" },
-    //{ QtMedia::MetaDatawords, 0 },
-    { QtMedia::Language, L"Language" },
-    { QtMedia::Publisher, L"WM/Publisher" },
-    { QtMedia::Copyright, L"Copyright" },
-    { QtMedia::ParentalRating, L"ParentalRating" },
-    { QtMedia::RatingOrganisation, L"RatingOrganisation" },
+    { QtMediaServices::Title, L"Title" },
+    { QtMediaServices::SubTitle, L"WM/SubTitle" },
+    { QtMediaServices::Author, L"Author" },
+    { QtMediaServices::Comment, L"Comment" },
+    { QtMediaServices::Description, L"Description" },
+    { QtMediaServices::Category, L"WM/Category" },
+    { QtMediaServices::Genre, L"WM/Genre" },
+    //{ QtMediaServices::Date, 0 },
+    { QtMediaServices::Year, L"WM/Year" },
+    { QtMediaServices::UserRating, L"UserRating" },
+    //{ QtMediaServices::MetaDatawords, 0 },
+    { QtMediaServices::Language, L"Language" },
+    { QtMediaServices::Publisher, L"WM/Publisher" },
+    { QtMediaServices::Copyright, L"Copyright" },
+    { QtMediaServices::ParentalRating, L"ParentalRating" },
+    { QtMediaServices::RatingOrganisation, L"RatingOrganisation" },
 
     // Media
-    { QtMedia::Size, L"FileSize" },
-    { QtMedia::MediaType, L"MediaType" },
-    { QtMedia::Duration, L"Duration" },
+    { QtMediaServices::Size, L"FileSize" },
+    { QtMediaServices::MediaType, L"MediaType" },
+    { QtMediaServices::Duration, L"Duration" },
 
     // Audio
-    { QtMedia::AudioBitRate, L"AudioBitrate" },
-    { QtMedia::AudioCodec, L"AudioCodec" },
-    { QtMedia::ChannelCount, L"Channels" },
-    { QtMedia::SampleRate, L"Frequency" },
+    { QtMediaServices::AudioBitRate, L"AudioBitrate" },
+    { QtMediaServices::AudioCodec, L"AudioCodec" },
+    { QtMediaServices::ChannelCount, L"Channels" },
+    { QtMediaServices::SampleRate, L"Frequency" },
 
     // Music
-    { QtMedia::AlbumTitle, L"WM/AlbumTitle" },
-    { QtMedia::AlbumArtist, L"WM/AlbumArtist" },
-    { QtMedia::ContributingArtist, L"Author" },
-    { QtMedia::Composer, L"WM/Composer" },
-    { QtMedia::Conductor, L"WM/Conductor" },
-    { QtMedia::Lyrics, L"WM/Lyrics" },
-    { QtMedia::Mood, L"WM/Mood" },
-    { QtMedia::TrackNumber, L"WM/TrackNumber" },
-    //{ QtMedia::TrackCount, 0 },
-    //{ QtMedia::CoverArtUrlSmall, 0 },
-    //{ QtMedia::CoverArtUrlLarge, 0 },
+    { QtMediaServices::AlbumTitle, L"WM/AlbumTitle" },
+    { QtMediaServices::AlbumArtist, L"WM/AlbumArtist" },
+    { QtMediaServices::ContributingArtist, L"Author" },
+    { QtMediaServices::Composer, L"WM/Composer" },
+    { QtMediaServices::Conductor, L"WM/Conductor" },
+    { QtMediaServices::Lyrics, L"WM/Lyrics" },
+    { QtMediaServices::Mood, L"WM/Mood" },
+    { QtMediaServices::TrackNumber, L"WM/TrackNumber" },
+    //{ QtMediaServices::TrackCount, 0 },
+    //{ QtMediaServices::CoverArtUrlSmall, 0 },
+    //{ QtMediaServices::CoverArtUrlLarge, 0 },
 
     // Image/Video
-    //{ QtMedia::Resolution, 0 },
-    //{ QtMedia::PixelAspectRatio, 0 },
+    //{ QtMediaServices::Resolution, 0 },
+    //{ QtMediaServices::PixelAspectRatio, 0 },
 
     // Video
-    //{ QtMedia::FrameRate, 0 },
-    { QtMedia::VideoBitRate, L"VideoBitRate" },
-    { QtMedia::VideoCodec, L"VideoCodec" },
+    //{ QtMediaServices::FrameRate, 0 },
+    { QtMediaServices::VideoBitRate, L"VideoBitRate" },
+    { QtMediaServices::VideoCodec, L"VideoCodec" },
 
-    //{ QtMedia::PosterUrl, 0 },
+    //{ QtMediaServices::PosterUrl, 0 },
 
     // Movie
-    { QtMedia::ChapterNumber, L"ChapterNumber" },
-    { QtMedia::Director, L"WM/Director" },
-    { QtMedia::LeadPerformer, L"LeadPerformer" },
-    { QtMedia::Writer, L"WM/Writer" },
+    { QtMediaServices::ChapterNumber, L"ChapterNumber" },
+    { QtMediaServices::Director, L"WM/Director" },
+    { QtMediaServices::LeadPerformer, L"LeadPerformer" },
+    { QtMediaServices::Writer, L"WM/Writer" },
 
     // Photos
-    { QtMedia::CameraManufacturer, L"CameraManufacturer" },
-    { QtMedia::CameraModel, L"CameraModel" },
-    { QtMedia::Event, L"Event" },
-    { QtMedia::Subject, L"Subject" }
+    { QtMediaServices::CameraManufacturer, L"CameraManufacturer" },
+    { QtMediaServices::CameraModel, L"CameraModel" },
+    { QtMediaServices::Event, L"Event" },
+    { QtMediaServices::Subject, L"Subject" }
 };
 
 QWmpMetaData::QWmpMetaData(IWMPCore3 *player, QWmpEvents *events, QObject *parent)
@@ -155,12 +155,12 @@
     return m_media != 0;
 }
 
-QVariant QWmpMetaData::metaData(QtMedia::MetaData key) const
+QVariant QWmpMetaData::metaData(QtMediaServices::MetaData key) const
 {
     static const int  count = sizeof(qt_wmpMetaDataKeys) / sizeof(QWmpMetaDataKeyLookup);
 
     switch (key) {
-    case QtMedia::Date:
+    case QtMediaServices::Date:
         {
             QVariant day = value(m_media, QAutoBStr(L"ReleaseDateDay"));
             QVariant month = value(m_media, QAutoBStr(L"ReleaseDateMonth"));
@@ -170,11 +170,11 @@
                 return QDate(year.toInt(), month.toInt(), day.toInt());
         }
         break;
-    case QtMedia::CoverArtUrlSmall:
+    case QtMediaServices::CoverArtUrlSmall:
         return albumArtUrl(m_media, "_Small.jpg");
-    case QtMedia::CoverArtUrlLarge:
+    case QtMediaServices::CoverArtUrlLarge:
         return albumArtUrl(m_media, "_Large.jpg");
-    case QtMedia::Resolution:
+    case QtMediaServices::Resolution:
         {
             QVariant width = value(m_media, QAutoBStr(L"WM/VideoWidth"));
             QVariant height = value(m_media, QAutoBStr(L"WM/VideoHeight"));
@@ -183,7 +183,7 @@
                 return QSize(width.toInt(), height.toInt());
         }
         break;
-    case QtMedia::PixelAspectRatio:
+    case QtMediaServices::PixelAspectRatio:
         {
             QVariant x = value(m_media, QAutoBStr(L"PixelAspectRatioX"));
             QVariant y = value(m_media, QAutoBStr(L"PixelAspectRatioY"));
@@ -192,7 +192,7 @@
                 return QSize(x.toInt(), y.toInt());
         }
         break;
-    case QtMedia::VideoFrameRate:
+    case QtMediaServices::VideoFrameRate:
         break;
     default:
         for (int i = 0; i < count; ++i) {
@@ -204,7 +204,7 @@
     return QVariant();
 }
 
-void QWmpMetaData::setMetaData(QtMedia::MetaData key, const QVariant &value)
+void QWmpMetaData::setMetaData(QtMediaServices::MetaData key, const QVariant &value)
 {
     static const int  count = sizeof(qt_wmpMetaDataKeys) / sizeof(QWmpMetaDataKeyLookup);
 
@@ -216,9 +216,9 @@
     }
 }
 
-QList<QtMedia::MetaData> QWmpMetaData::availableMetaData() const
+QList<QtMediaServices::MetaData> QWmpMetaData::availableMetaData() const
 {
-    QList<QtMedia::MetaData> keys;
+    QList<QtMediaServices::MetaData> keys;
 
     if (m_media) {
         // WMP will return a list of all possible keys so there's no point in filtering the keys
@@ -242,9 +242,9 @@
                 QDir dir = QFileInfo(url).absoluteDir();
 
                 if (dir.exists(albumArtLarge))
-                    keys.append(QtMedia::CoverArtUrlLarge);
+                    keys.append(QtMediaServices::CoverArtUrlLarge);
                 if (dir.exists(albumArtSmall))
-                    keys.append(QtMedia::CoverArtUrlSmall);
+                    keys.append(QtMediaServices::CoverArtUrlSmall);
             }
         }
     }

--- a/qtmobility/plugins/multimedia/wmp/qwmpmetadata.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpmetadata.h	Fri May 14 16:41:33 2010 +0300
@@ -47,13 +47,13 @@
 
 #include <wmp.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 class QMediaContent;
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 class QWmpEvents;
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class QWmpMetaData : public QMetaDataControl
 {
@@ -65,9 +65,9 @@
     bool isMetaDataAvailable() const;
     bool isWritable() const;
 
-    QVariant metaData(QtMedia::MetaData key) const;
-    void setMetaData(QtMedia::MetaData key, const QVariant &value);
-    QList<QtMedia::MetaData> availableMetaData() const;
+    QVariant metaData(QtMediaServices::MetaData key) const;
+    void setMetaData(QtMediaServices::MetaData key, const QVariant &value);
+    QList<QtMediaServices::MetaData> availableMetaData() const;
 
     QVariant extendedMetaData(const QString &key) const ;
     void setExtendedMetaData(const QString &key, const QVariant &value);

--- a/qtmobility/plugins/multimedia/wmp/qwmpplayercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpplayercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,7 @@
 class QWmpEvents;
 class QWmpPlaylist;
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class QWmpPlayerControl : public QMediaPlayerControl
 {
     Q_OBJECT

--- a/qtmobility/plugins/multimedia/wmp/qwmpplayerservice.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpplayerservice.h	Fri May 14 16:41:33 2010 +0300
@@ -47,11 +47,11 @@
 
 #include <qmediaservice.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 class QMediaMetaData;
 class QMediaPlayerControl;
 class QMediaPlaylist;
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 class QEvrVideoOverlay;
 class QWmpMetaData;
@@ -60,7 +60,7 @@
 class QWmpPlaylistControl;
 class QWmpVideoOverlay;
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class QWmpPlayerService
     : public QMediaService
     , public IOleClientSite

--- a/qtmobility/plugins/multimedia/wmp/qwmpplaylist.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpplaylist.h	Fri May 14 16:41:33 2010 +0300
@@ -50,7 +50,7 @@
 
 class QWmpEvents;
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class QWmpPlaylist : public QMediaPlaylistProvider
 {
     Q_OBJECT

--- a/qtmobility/plugins/multimedia/wmp/qwmpplaylistcontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpplaylistcontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,7 @@
 class QWmpEvents;
 class QWmpPlaylist;
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class QWmpPlaylistControl : public QMediaPlaylistControl
 {
     Q_OBJECT

--- a/qtmobility/plugins/multimedia/wmp/qwmpserviceprovider.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpserviceprovider.cpp	Fri May 14 16:41:33 2010 +0300
@@ -71,4 +71,4 @@
 }
 
 
-Q_EXPORT_PLUGIN2(qwmp, QWmpServiceProviderPlugin);
+Q_EXPORT_PLUGIN2(qtmedia_wmp, QWmpServiceProviderPlugin);

--- a/qtmobility/plugins/multimedia/wmp/qwmpserviceprovider.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpserviceprovider.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 #include <qmediaserviceprovider.h>
 #include <qmediaserviceproviderplugin.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class QWmpServiceProviderPlugin : public QMediaServiceProviderPlugin
 {
     Q_OBJECT

--- a/qtmobility/plugins/multimedia/wmp/qwmpvideooutputcontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpvideooutputcontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -44,7 +44,7 @@
 
 #include <qvideooutputcontrol.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class QWmpVideoOutputControl : public QVideoOutputControl
 {
     Q_OBJECT

--- a/qtmobility/plugins/multimedia/wmp/qwmpvideooverlay.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpvideooverlay.h	Fri May 14 16:41:33 2010 +0300
@@ -48,7 +48,7 @@
 
 #include <wmp.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class QWmpVideoOverlay
     : public QVideoWindowControl
     , public IOleInPlaceSite

--- a/qtmobility/plugins/multimedia/wmp/wmp.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/wmp.pro	Fri May 14 16:41:33 2010 +0300
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qwmp)
+TARGET = $$qtLibraryTarget(qtmedia_wmp)
 
 PLUGIN_TYPE = mediaservice

--- a/qtmobility/plugins/sensors/dummy/dummy.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/sensors/dummy/dummy.pro	Fri May 14 16:41:33 2010 +0300
@@ -6,7 +6,7 @@
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(sensors_dummy)
+TARGET = $$qtLibraryTarget(qtsensors_dummy)
 symbian:TARGET.EPOCALLOWDLLDATA = 1
 
 QT=core

--- a/qtmobility/plugins/sensors/dummy/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/sensors/dummy/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -73,7 +73,7 @@
     }
 };
 
-Q_EXPORT_PLUGIN2(libsensors_dummy, dummySensorPlugin)
+Q_EXPORT_PLUGIN2(qtsensors_dummy, dummySensorPlugin)
 
 #include "main.moc"

--- a/qtmobility/plugins/sensors/generic/generic.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/sensors/generic/generic.pro	Fri May 14 16:41:33 2010 +0300
@@ -6,7 +6,7 @@
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(sensors_generic)
+TARGET = $$qtLibraryTarget(qtsensors_generic)
 
 symbian {
    TARGET.EPOCALLOWDLLDATA = 1

--- a/qtmobility/plugins/sensors/generic/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/sensors/generic/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -79,7 +79,7 @@
     }
 };
 
-Q_EXPORT_PLUGIN2(libsensors_generic, genericSensorPlugin)
+Q_EXPORT_PLUGIN2(qtsensors_generic, genericSensorPlugin)
 
 #include "main.moc"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/maemo6/maemo6.pro	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,31 @@
+TEMPLATE = lib
+TARGET = maemo6sensorplugin
+DEPENDPATH += .
+INCLUDEPATH += .
+QT += dbus
+QT += network
+CONFIG += plugin
+CONFIG += sensord
+CONFIG += link_pkgconfig
+CONFIG += mobility
+HEADERS += maemo6sensorbase.h \
+    maemo6accelerometer.h \
+    maemo6als.h \
+    maemo6compass.h \
+    maemo6magnetometer.h \
+    maemo6orientationsensor.h \
+    maemo6proximitysensor.h \
+    maemo6rotationsensor.h \
+    maemo6tapsensor.h
+SOURCES += maemo6sensorbase.cpp \
+    maemo6accelerometer.cpp \
+    maemo6als.cpp \
+    maemo6compass.cpp \
+    maemo6magnetometer.cpp \
+    maemo6orientationsensor.cpp \
+    maemo6proximitysensor.cpp \
+    maemo6rotationsensor.cpp \
+    maemo6tapsensor.cpp \
+    main.cpp
+target.path = /usr/lib/qt4/plugins/sensors
+INSTALLS += target

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/maemo6/maemo6accelerometer.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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 "maemo6accelerometer.h"
+
+const char *maemo6accelerometer::id("maemo6.accelerometer");
+bool maemo6accelerometer::m_initDone = false;
+
+maemo6accelerometer::maemo6accelerometer(QSensor *sensor)
+    : maemo6sensorbase(sensor)
+{
+    setReading<QAccelerometerReading>(&m_reading);
+
+    if (!m_initDone) {
+        qDBusRegisterMetaType<XYZ>();
+
+        initSensor<AccelerometerSensorChannelInterface>("accelerometersensor");
+
+        if (m_sensorInterface)
+            QObject::connect(static_cast<AccelerometerSensorChannelInterface*>(m_sensorInterface), SIGNAL(dataAvailable(const XYZ&)), this, SLOT(slotDataAvailable(const XYZ&)));
+        else
+            qWarning() << "Unable to initialize accelerometer sensor.";
+
+        // adding metadata
+        addDataRate(100, 100); // 100Hz
+        //addDataRate(400, 400); // 400Hz
+
+        // accuracy - or resolution???
+        // 2^8 = 256    256/2 - 1 = 127
+        addOutputRange(-2*GRAVITY_EARTH, 2*GRAVITY_EARTH, 2*GRAVITY_EARTH/127); // 2G
+        addOutputRange(-8*GRAVITY_EARTH, 8*GRAVITY_EARTH, 8*GRAVITY_EARTH/127); // 8G
+        setDescription(QLatin1String("Measures x, y, and z axes accelerations in m/s^2"));
+
+        m_initDone = true;
+    }
+}
+
+void maemo6accelerometer::slotDataAvailable(const XYZ& data)
+{
+    // Convert from milli-Gs to meters per second per second
+    // Using 1 G = 9.80665 m/s^2
+    qreal ax = - data.x() * GRAVITY_EARTH_THOUSANDTH;
+    qreal ay = - data.y() * GRAVITY_EARTH_THOUSANDTH;
+    qreal az = - data.z() * GRAVITY_EARTH_THOUSANDTH;
+
+    m_reading.setX(ax);
+    m_reading.setY(ay);
+    m_reading.setZ(az);
+    //m_reading.setTimestamp(data.timestamp());
+    m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp
+    newReadingAvailable();
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/maemo6/maemo6accelerometer.h	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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$
+**
+****************************************************************************/
+
+#ifndef MAEMO6ACCELEROMETER_H
+#define MAEMO6ACCELEROMETER_H
+
+#include "maemo6sensorbase.h"
+#include <qaccelerometer.h>
+#include <qsensorbackend.h>
+
+#include <sensord/accelerometersensor_i.h>
+#include <sensord/datatypes/xyz.h>
+
+QTM_USE_NAMESPACE
+
+class maemo6accelerometer : public maemo6sensorbase
+{
+    Q_OBJECT
+
+public:
+    static const char *id;
+
+    maemo6accelerometer(QSensor *sensor);
+
+private:
+    QAccelerometerReading m_reading;
+    static bool m_initDone;
+
+private slots:
+    void slotDataAvailable(const XYZ& data);
+};
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/maemo6/maemo6als.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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 "maemo6als.h"
+
+const char *maemo6als::id("maemo6.als");
+bool maemo6als::m_initDone = false;
+
+maemo6als::maemo6als(QSensor *sensor)
+    : maemo6sensorbase(sensor)
+{
+    setReading<QAmbientLightReading>(&m_reading);
+    if (!m_initDone) {
+        initSensor<ALSSensorChannelInterface>("alssensor");
+
+        if (m_sensorInterface)
+            QObject::connect(static_cast<const ALSSensorChannelInterface*>(m_sensorInterface), SIGNAL(ALSChanged(const int&)), this, SLOT(slotDataAvailable(const int&)));
+        else
+            qWarning() << "Unable to initialize ambient light sensor.";
+
+        // metadata
+        addOutputRange(0, 5, 1);
+        setDescription(QLatin1String("Ambient light intensity given as 5 pre-defined levels"));
+
+        m_initDone = true;
+    }
+}
+
+void maemo6als::slotDataAvailable(const int& data)
+{
+    // Convert from integer to fixed levels
+    // TODO: verify levels
+    QAmbientLightReading::LightLevel level;
+    if (data < 0) {
+        level = QAmbientLightReading::Undefined;
+    } else if (data < 10) {
+        level = QAmbientLightReading::Dark;
+    } else if (data < 50) {
+        level = QAmbientLightReading::Twilight;
+    } else if (data < 100) {
+        level = QAmbientLightReading::Light;
+    } else if (data < 150) {
+        level = QAmbientLightReading::Bright;
+    } else {
+        level = QAmbientLightReading::Sunny;
+    }
+
+    if (level != m_reading.lightLevel()) {
+        m_reading.setLightLevel(level);
+        //m_reading.setTimestamp(data.timestamp());
+        m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp
+        newReadingAvailable();
+    }
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/maemo6/maemo6als.h	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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$
+**
+****************************************************************************/
+
+#ifndef MAEMO6ALS_H
+#define MAEMO6ALS_H
+
+#include "maemo6sensorbase.h"
+#include <qambientlightsensor.h>
+
+#include <sensord/alssensor_i.h>
+
+QTM_USE_NAMESPACE
+
+class maemo6als : public maemo6sensorbase
+{
+    Q_OBJECT
+
+public:
+    static const char *id;
+
+    maemo6als(QSensor *sensor);
+
+private:
+    QAmbientLightReading m_reading;
+    static bool m_initDone;
+
+private slots:
+    void slotDataAvailable(const int& data);
+};
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/maemo6/maemo6compass.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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 "maemo6compass.h"
+
+const char *maemo6compass::id("maemo6.compass");
+bool maemo6compass::m_initDone = false;
+
+maemo6compass::maemo6compass(QSensor *sensor)
+    : maemo6sensorbase(sensor)
+{
+    setReading<QCompassReading>(&m_reading);
+
+    if (!m_initDone) {
+        initSensor<CompassSensorChannelInterface>("compasssensor");
+
+        if (m_sensorInterface) {
+            QObject::connect(static_cast<CompassSensorChannelInterface*>(m_sensorInterface), SIGNAL(levelChanged(const int&)), this, SLOT(slotLevelChanged(const int&)));
+            QObject::connect(static_cast<CompassSensorChannelInterface*>(m_sensorInterface), SIGNAL(degreesChanged(const int&)), this, SLOT(slotDegreesChanged(const int&)));
+        } else {
+            qWarning() << "Unable to initialize compass sensor.";            
+        }
+
+        // metadata TODO accuracy
+        addDataRate(10, 10); // 10Hz
+        addOutputRange(0, 359, 2);
+        setDescription(QLatin1String("Measures compass north in degrees"));
+ 
+        m_initDone = true;
+    }
+}
+
+void maemo6compass::slotLevelChanged(const int& level)
+{
+    // The scale for level is [0,3], where 3 is the best
+    // Qt: Measured as a value from 0 to 1 with higher values being better.
+    float l = ((float) level) / 3.0;
+
+    qreal calibrationLevel = l;
+    m_reading.setCalibrationLevel(calibrationLevel);
+    //m_reading.setTimestamp(level.timestamp());
+    m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp
+    newReadingAvailable();
+}
+
+void maemo6compass::slotDegreesChanged(const int& degrees)
+{
+    // The scale for degrees from sensord is [0,359]
+    // Value can be directly used as azimuth
+    qreal azimuth = degrees;
+    m_reading.setAzimuth(azimuth);
+    //m_reading.setTimestamp(degrees.timestamp());
+    m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp
+    newReadingAvailable();
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/maemo6/maemo6compass.h	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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$
+**
+****************************************************************************/
+
+#ifndef MAEMO6COMPASS_H
+#define MAEMO6COMPASS_H
+
+#include "maemo6sensorbase.h"
+#include <qcompass.h>
+#include <qsensorbackend.h>
+
+#include <sensord/compasssensor_i.h>
+
+QTM_USE_NAMESPACE
+
+class maemo6compass : public maemo6sensorbase
+{
+    Q_OBJECT
+
+public:
+    static const char *id;
+    maemo6compass(QSensor *sensor);
+
+private:
+    QCompassReading m_reading;
+    static bool m_initDone;
+
+private slots:
+    void slotLevelChanged(const int& level);
+    void slotDegreesChanged(const int& degrees);
+};
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/maemo6/maemo6magnetometer.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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 "maemo6magnetometer.h"
+
+const char *maemo6magnetometer::id("maemo6.magnetometer");
+bool maemo6magnetometer::m_initDone = false;
+
+maemo6magnetometer::maemo6magnetometer(QSensor *sensor)
+    : maemo6sensorbase(sensor), m_sensor(sensor)
+{
+    setReading<QMagnetometerReading>(&m_reading);
+
+    if (!m_initDone) {
+        qDBusRegisterMetaType<MagneticField>();
+        initSensor<MagnetometerSensorChannelInterface>("magnetometersensor");
+
+        if (m_sensorInterface)
+            QObject::connect(static_cast<const MagnetometerSensorChannelInterface*>(m_sensorInterface), SIGNAL(dataAvailable(const MagneticField&)), this, SLOT(slotDataAvailable(const MagneticField&)));
+        else
+            qWarning() << "Unable to initialize magnetometer sensor.";
+
+        // metadata
+        setDescription(QLatin1String("Magnetic flux density measured in teslas"));
+
+        m_initDone = true;
+    }
+}
+
+void maemo6magnetometer::slotDataAvailable(const MagneticField& data)
+{
+    QVariant v = m_sensor->property("returnGeoValues");
+    if (v.isValid() && v.toBool()) {
+        m_reading.setX(data.x());
+        m_reading.setY(data.y());
+        m_reading.setZ(data.z());
+        m_reading.setCalibrationLevel(data.level());
+    } else {
+        m_reading.setX(data.rx());
+        m_reading.setY(data.ry());
+        m_reading.setZ(data.rz());
+        m_reading.setCalibrationLevel(1);
+    }
+    //m_reading.setTimestamp(data.timestamp());
+    m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp
+    newReadingAvailable();
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/maemo6/maemo6magnetometer.h	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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$
+**
+****************************************************************************/
+
+#ifndef MAEMO6MAGNETOMETER_H
+#define MAEMO6MAGNETOMETER_H
+
+#include "maemo6sensorbase.h"
+#include <qmagnetometer.h>
+
+#include <sensord/magnetometersensor_i.h>
+#include <sensord/datatypes/magneticfield.h>
+
+QTM_USE_NAMESPACE
+
+class maemo6magnetometer : public maemo6sensorbase
+{
+    Q_OBJECT
+
+public:
+    static const char *id;
+
+    maemo6magnetometer(QSensor *sensor);
+
+private:
+    QMagnetometerReading m_reading;
+    static bool m_initDone;
+    QSensor *m_sensor;
+
+private slots:
+    void slotDataAvailable(const MagneticField& data);
+};
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/maemo6/maemo6orientationsensor.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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 "maemo6orientationsensor.h"
+
+#include "sensord/filters/posedata.h"
+
+const char *maemo6orientationsensor::id("maemo6.orientationsensor");
+bool maemo6orientationsensor::m_initDone = false;
+
+maemo6orientationsensor::maemo6orientationsensor(QSensor *sensor)
+    : maemo6sensorbase(sensor)
+{
+    setReading<QOrientationReading>(&m_reading);
+
+    if (!m_initDone) {
+        initSensor<OrientationSensorChannelInterface>("orientationsensor");
+
+        if (m_sensorInterface)
+            QObject::connect(static_cast<OrientationSensorChannelInterface*>(m_sensorInterface), SIGNAL(orientationChanged(const int&)), this, SLOT(slotOrientationChanged(const int&)));
+        else
+            qWarning() << "Unable to initialize orientation sensor.";
+
+        // metadata
+        addOutputRange(0, 6, 1);
+        setDescription(QLatin1String("Orientation of the device screen"));
+
+        m_initDone = true;
+    }
+}
+
+void maemo6orientationsensor::slotOrientationChanged(const int& data)
+{
+    QOrientationReading::Orientation o;
+    switch (data) {
+        case PoseData::BottomDown: o = QOrientationReading::TopUp;     break;
+        case PoseData::BottomUp:   o = QOrientationReading::TopDown;   break;
+        case PoseData::LeftUp:     o = QOrientationReading::LeftUp;    break;
+        case PoseData::RightUp:    o = QOrientationReading::RightUp;   break;
+        case PoseData::FaceUp:     o = QOrientationReading::FaceUp;    break;
+        case PoseData::FaceDown:   o = QOrientationReading::FaceDown;  break;
+        default:                   o = QOrientationReading::Undefined;
+    }
+    m_reading.setOrientation(o);
+    //m_reading.setTimestamp(data.timestamp());
+    m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp
+    newReadingAvailable();
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/maemo6/maemo6orientationsensor.h	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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$
+**
+****************************************************************************/
+
+#ifndef MAEMO6ORIENTATIONSENSOR_H
+#define MAEMO6ORIENTATIONSENSOR_H
+
+#include "maemo6sensorbase.h"
+#include <qorientationsensor.h>
+#include <qsensorbackend.h>
+
+#include <sensord/orientationsensor_i.h>
+
+QTM_USE_NAMESPACE
+
+class maemo6orientationsensor : public maemo6sensorbase
+{
+    Q_OBJECT
+
+public:
+    static const char *id;
+
+    maemo6orientationsensor(QSensor *sensor);
+
+private:
+    QOrientationReading m_reading;
+    static bool m_initDone;
+
+private slots:
+    void slotOrientationChanged(const int& orientation); 
+};
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/maemo6/maemo6proximitysensor.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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 "maemo6proximitysensor.h"
+
+const char *maemo6proximitysensor::id("maemo6.proximity");
+bool maemo6proximitysensor::m_initDone = false;
+
+maemo6proximitysensor::maemo6proximitysensor(QSensor *sensor)
+    : maemo6sensorbase(sensor)
+{
+    setReading<QProximityReading>(&m_reading);
+
+    if (!m_initDone) {
+        initSensor<ProximitySensorChannelInterface>("proximitysensor");
+
+        if (m_sensorInterface)
+            QObject::connect(static_cast<ProximitySensorChannelInterface*>(m_sensorInterface), SIGNAL(dataAvailable(const int&)), this, SLOT(slotDataAvailable(const int&)));
+        else
+            qWarning() << "Unable to initialize proximity sensor.";
+
+        // close definition in meters - may be used as metadata even the sensor gives true/false values 
+        addOutputRange(0, 1, 1);
+        setDescription(QLatin1String("Measures if a living object is in proximity or not"));
+
+        m_initDone = true;
+    }
+}
+
+void maemo6proximitysensor::slotDataAvailable(const int& data)
+{
+    bool close;
+    if (data)
+        close = true;
+    else
+        close = false;
+
+    m_reading.setClose(close);
+    //m_reading.setTimestamp(data.timestamp());
+    m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp
+    newReadingAvailable();
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/maemo6/maemo6proximitysensor.h	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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$
+**
+****************************************************************************/
+
+#ifndef MAEMO6PROXIMITYSENSOR_H
+#define MAEMO6PROXIMITYSENSOR_H
+
+#include "maemo6sensorbase.h"
+#include <qproximitysensor.h>
+
+#include <sensord/proximitysensor_i.h>
+
+QTM_USE_NAMESPACE
+
+class maemo6proximitysensor : public maemo6sensorbase
+{
+    Q_OBJECT
+
+public:
+    static const char *id;
+
+    maemo6proximitysensor(QSensor *sensor);
+
+private:
+    QProximityReading m_reading;
+    static bool m_initDone;
+   
+private slots:
+    void slotDataAvailable(const int& data);
+};
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/maemo6/maemo6rotationsensor.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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 "maemo6rotationsensor.h"
+
+const char *maemo6rotationsensor::id("maemo6.rotationsensor");
+bool maemo6rotationsensor::m_initDone = false;
+
+maemo6rotationsensor::maemo6rotationsensor(QSensor *sensor)
+    : maemo6sensorbase(sensor)
+{
+    setReading<QRotationReading>(&m_reading);
+
+    if (!m_initDone) {
+        qDBusRegisterMetaType<XYZ>();
+
+        initSensor<RotationSensorChannelInterface>("rotationsensor");
+
+        if (m_sensorInterface)
+            QObject::connect(static_cast<RotationSensorChannelInterface*>(m_sensorInterface), SIGNAL(dataAvailable(const XYZ&)), this, SLOT(slotDataAvailable(const XYZ&)));
+        else
+            qWarning() << "Unable to initialize rotation sensor.";
+
+        setDescription(QLatin1String("Measures x, y, and z axes rotation"));
+
+        m_initDone = true;
+    }
+    sensor->setProperty("hasZ", true);
+}
+
+void maemo6rotationsensor::slotDataAvailable(const XYZ& data)
+{
+    m_reading.setX(data.x());
+    m_reading.setY(data.y());
+    m_reading.setZ(data.z());
+    //m_reading.setTimestamp(data.timestamp());
+    m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp
+    newReadingAvailable();
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/maemo6/maemo6rotationsensor.h	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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$
+**
+****************************************************************************/
+
+#ifndef MAEMO6ROTATION_H
+#define MAEMO6ROTATION_H
+
+#include "maemo6sensorbase.h"
+#include <qrotationsensor.h>
+#include <qsensorbackend.h>
+
+#include <sensord/rotationsensor_i.h>
+#include <sensord/datatypes/xyz.h>
+
+QTM_USE_NAMESPACE
+
+class maemo6rotationsensor : public maemo6sensorbase
+{
+    Q_OBJECT
+
+public:
+    static const char *id;
+
+    maemo6rotationsensor(QSensor *sensor);
+
+private:
+    QRotationReading m_reading;
+    static bool m_initDone;
+
+private slots:
+    void slotDataAvailable(const XYZ& data);
+};
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/maemo6/maemo6sensorbase.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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 "maemo6sensorbase.h"
+#include <ctime>
+
+SensorManagerInterface* maemo6sensorbase::m_remoteSensorManager = 0;
+const float maemo6sensorbase::GRAVITY_EARTH = 9.80665;
+const float maemo6sensorbase::GRAVITY_EARTH_THOUSANDTH = 0.00980665;
+
+maemo6sensorbase::maemo6sensorbase(QSensor *sensor)
+    : QSensorBackend(sensor), m_sensorRunning(false)
+{
+    if (!m_remoteSensorManager)
+        m_remoteSensorManager = &SensorManagerInterface::instance();
+}
+
+maemo6sensorbase::~maemo6sensorbase()
+{
+   if (m_sensorInterface) {
+        stop();
+        QObject::disconnect(m_sensorInterface);
+        delete m_sensorInterface, m_sensorInterface = 0;
+    }
+}
+
+void maemo6sensorbase::start()
+{
+    if (m_sensorRunning)
+        return;
+    if (m_sensorInterface) {
+        int dataRate = sensor()->dataRate();
+        qDebug() << "Sensor data rate " << dataRate;
+
+        if (dataRate > 0) {
+            qDebug() << "Setting data rate " << dataRate << " for " << m_sensorInterface->id();
+            m_sensorInterface->setInterval(dataRate);
+        }
+        m_sensorInterface->start();
+    }
+    m_sensorRunning = true;
+}
+
+void maemo6sensorbase::stop()
+{
+    if (!m_sensorRunning)
+        return;
+    if (m_sensorInterface)
+        m_sensorInterface->stop();
+    m_sensorRunning = false;
+}
+
+qtimestamp maemo6sensorbase::createTimestamp()
+{
+    timespec stamp;
+    clock_gettime(CLOCK_MONOTONIC, &stamp);
+    qtimestamp data = stamp.tv_sec;
+    data = data * 1000000;
+    data = stamp.tv_nsec / 1000 + data;
+    return data;
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/maemo6/maemo6sensorbase.h	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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$
+**
+****************************************************************************/
+
+#ifndef MAEMO6SENSORBASE_H
+#define MAEMO6SENSORBASE_H
+
+#include <qsensorbackend.h>
+#include "sensord/sensormanagerinterface.h"
+#include "sensord/abstractsensor_i.h"
+
+QTM_USE_NAMESPACE
+
+class maemo6sensorbase : public QSensorBackend
+{
+public:
+    maemo6sensorbase(QSensor *sensor);
+    virtual ~maemo6sensorbase();
+
+    virtual void start();
+    virtual void stop();
+
+protected:
+    static SensorManagerInterface* m_remoteSensorManager;
+    AbstractSensorChannelInterface* m_sensorInterface;
+    bool m_sensorRunning;
+
+    static const float GRAVITY_EARTH;
+    static const float GRAVITY_EARTH_THOUSANDTH;    //for speed
+
+    template<typename T>
+    void initSensor(QString sensorName)
+    {
+        m_remoteSensorManager->loadPlugin(sensorName);
+        m_remoteSensorManager->registerSensorInterface<T>(sensorName);
+        m_sensorInterface = T::controlInterface(sensorName);
+        if (!m_sensorInterface) {
+            m_sensorInterface = const_cast<T*>(T::listenInterface(sensorName));
+        }
+    }
+
+    qtimestamp createTimestamp();
+};
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/maemo6/maemo6tapsensor.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,105 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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 "maemo6tapsensor.h"
+
+#include "sensord/filters/tapdata.h"
+
+const char *maemo6tapsensor::id("maemo6.tapsensor");
+bool maemo6tapsensor::m_initDone = false;
+
+maemo6tapsensor::maemo6tapsensor(QSensor *sensor)
+    : maemo6sensorbase(sensor), m_sensor(sensor)
+{
+    setReading<QTapReading>(&m_reading);
+
+    if (!m_initDone) {
+        qDBusRegisterMetaType<Tap>();
+        initSensor<TapSensorChannelInterface>("tapsensor");
+
+        if (m_sensorInterface)
+            QObject::connect(static_cast<TapSensorChannelInterface*>(m_sensorInterface), SIGNAL(dataAvailable(const Tap&)), this, SLOT(slotDataAvailable(const Tap&)));
+        else
+            qWarning() << "Unable to initialize tap sensor.";
+
+        // metadata
+        addOutputRange(0, 9, 1);
+        setDescription(QLatin1String("Measures single and double taps and gives tap direction"));
+
+        m_initDone = true;
+    }
+}
+
+void maemo6tapsensor::slotDataAvailable(const Tap& data)
+{
+    // Set tap type (single/double)
+    bool doubleTap;
+    switch (data.type()) {
+        case TapData::DoubleTap: doubleTap = true; break;
+        case TapData::SingleTap: doubleTap = false; break;
+        default:                 doubleTap = false;
+    }
+    QVariant v = m_sensor->property("returnDoubleTapEvents");
+    if (v.isValid() && v.toBool() == false)
+        m_reading.setDoubleTap(false);
+    else
+        m_reading.setDoubleTap(doubleTap);
+
+    // Set tap direction
+    QTapReading::TapDirection o;
+    switch (data.direction()) {
+        case TapData::X:         o = QTapReading::X;         break;
+        case TapData::Y:         o = QTapReading::Y;         break;
+        case TapData::Z:         o = QTapReading::Z;         break;
+        case TapData::LeftRight: o = QTapReading::X_Pos;     break;
+        case TapData::RightLeft: o = QTapReading::X_Neg;     break;
+        case TapData::TopBottom: o = QTapReading::Z_Neg;     break;
+        case TapData::BottomTop: o = QTapReading::Z_Pos;     break;
+        case TapData::FaceBack:  o = QTapReading::Y_Pos;     break;
+        case TapData::BackFace:  o = QTapReading::Y_Neg;     break;
+        default:                 o = QTapReading::Undefined;
+    }
+    m_reading.setTapDirection(o);
+
+    //m_reading.setTimestamp(data.timestamp());
+    m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp
+    newReadingAvailable();
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/maemo6/maemo6tapsensor.h	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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$
+**
+****************************************************************************/
+
+#ifndef MAEMO6TAPSENSOR_H
+#define MAEMO6TAPSENSOR_H
+
+#include "maemo6sensorbase.h"
+#include <qtapsensor.h>
+#include <qsensorbackend.h>
+
+#include <sensord/tapsensor_i.h>
+#include <sensord/datatypes/tap.h>
+
+QTM_USE_NAMESPACE
+
+class maemo6tapsensor : public maemo6sensorbase
+{
+    Q_OBJECT
+
+public:
+    static const char *id;
+
+    maemo6tapsensor(QSensor *sensor);
+
+private:
+    QTapReading m_reading;
+    static bool m_initDone;
+    QSensor *m_sensor;
+
+private slots:
+    void slotDataAvailable(const Tap&);
+};
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/maemo6/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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 "maemo6accelerometer.h"
+#include "maemo6als.h"
+#include "maemo6compass.h"
+#include "maemo6magnetometer.h"
+#include "maemo6orientationsensor.h"
+#include "maemo6proximitysensor.h"
+#include "maemo6rotationsensor.h"
+#include "maemo6tapsensor.h"
+#include <qsensorplugin.h>
+#include <qsensorbackend.h>
+#include <qsensormanager.h>
+#include <QDebug>
+
+class maemo6SensorPlugin : public QObject, public QSensorPluginInterface, public QSensorBackendFactory
+{
+    Q_OBJECT
+    Q_INTERFACES(QtMobility::QSensorPluginInterface)
+public:
+    void registerSensors()
+    {
+        QSensorManager::registerBackend(QAccelerometer::type, maemo6accelerometer::id, this);
+        QSensorManager::registerBackend(QAmbientLightSensor::type, maemo6als::id, this);
+        QSensorManager::registerBackend(QCompass::type, maemo6compass::id, this);
+        QSensorManager::registerBackend(QMagnetometer::type, maemo6magnetometer::id, this);
+        QSensorManager::registerBackend(QOrientationSensor::type, maemo6orientationsensor::id, this);
+        QSensorManager::registerBackend(QProximitySensor::type, maemo6proximitysensor::id, this);
+        QSensorManager::registerBackend(QRotationSensor::type, maemo6rotationsensor::id, this);
+        QSensorManager::registerBackend(QTapSensor::type, maemo6tapsensor::id, this);
+        qDebug() << "loaded the Maemo 6 plugin";
+    }
+
+    QSensorBackend *createBackend(QSensor *sensor)
+    {
+        if (sensor->identifier() == maemo6accelerometer::id)
+            return new maemo6accelerometer(sensor);
+        else if (sensor->identifier() == maemo6als::id)
+            return new maemo6als(sensor);
+        else if (sensor->identifier() == maemo6compass::id)
+            return new maemo6compass(sensor);
+        else if (sensor->identifier() == maemo6magnetometer::id)
+            return new maemo6magnetometer(sensor);
+        else if (sensor->identifier() == maemo6orientationsensor::id)
+            return new maemo6orientationsensor(sensor);
+        else if (sensor->identifier() == maemo6proximitysensor::id)
+            return new maemo6proximitysensor(sensor);
+        else if (sensor->identifier() == maemo6rotationsensor::id)
+            return new maemo6rotationsensor(sensor);
+        else if (sensor->identifier() == maemo6tapsensor::id)
+            return new maemo6tapsensor(sensor);
+
+        return 0;
+    }
+};
+
+Q_EXPORT_PLUGIN2(libsensors_maemo6, maemo6SensorPlugin)
+
+#include "main.moc"

--- a/qtmobility/plugins/sensors/n900/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/sensors/n900/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -75,7 +75,7 @@
     }
 };
 
-Q_EXPORT_PLUGIN2(libsensors_n900, n900SensorPlugin)
+Q_EXPORT_PLUGIN2(qtsensors_n900, n900SensorPlugin)
 
 #include "main.moc"

--- a/qtmobility/plugins/sensors/n900/n900.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/sensors/n900/n900.pro	Fri May 14 16:41:33 2010 +0300
@@ -6,7 +6,7 @@
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(sensors_n900)
+TARGET = $$qtLibraryTarget(qtsensors_n900)
 
 QT=core
 CONFIG+=mobility

--- a/qtmobility/plugins/sensors/s60_sensor_api/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/sensors/s60_sensor_api/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -67,6 +67,6 @@
     }
 };
 
-Q_EXPORT_PLUGIN2(libsensors_s60SensorApi, s60SensorApiSensorPlugin)
+Q_EXPORT_PLUGIN2(qtsensors_s60sensorapi, s60SensorApiSensorPlugin)
 
 #include "main.moc"

--- a/qtmobility/plugins/sensors/s60_sensor_api/s60_sensor_api.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/sensors/s60_sensor_api/s60_sensor_api.pro	Fri May 14 16:41:33 2010 +0300
@@ -7,7 +7,7 @@
 TEMPLATE = lib
 CONFIG += plugin
 
-TARGET = $$qtLibraryTarget(sensor_s60sensorapi)
+TARGET = $$qtLibraryTarget(qtsensors_s60sensorapi)
 TARGET.EPOCALLOWDLLDATA = 1
 TARGET.UID3 = 0x2002BFC1
 TARGET.CAPABILITY = ALL -TCB

--- a/qtmobility/plugins/sensors/sensors.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/sensors/sensors.pro	Fri May 14 16:41:33 2010 +0300
@@ -2,35 +2,23 @@
 
 include(../../common.pri)
 
-device_plugin=0
 maemo5 {
-    device_plugin=1
     SUBDIRS += n900
 }
 
 symbian {
-    exists($${EPOCROOT}epoc32/release/armv5/lib/SensrvClient.lib) {
-        message("Sensor framework found")
-        device_plugin=1                                                    
+    equals(sensors_symbian_enabled,yes) {
+        SUBDIRS += symbian
+    } else:equals(sensors_s60_31_enabled,yes) {
+        SUBDIRS += s60_sensor_api
     } else {
-        exists($${EPOCROOT}epoc32/release/armv5/lib/RRSensorApi.lib) {
-            message("Sensor API found")
-            device_plugin=1
-            SUBDIRS += s60_sensor_api
-        } else {
-            message("No native sensor interface found")
-            device_plugin=0
-        }
+        message("No native sensor interface found")
     }
 }
 
 SUBDIRS += generic
 
-!equals(device_plugin,1) {
-    # Create some dummy sensors to help out with testing
-    SUBDIRS += dummy
-}
-
+# Allow forcing extra plugins to build even if they won't run
 BUILD_ALL_PLUGINS=$$(BUILD_ALL_PLUGINS)
 equals(BUILD_ALL_PLUGINS,1) {
     SUBDIRS *= n900 dummy

--- a/qtmobility/plugins/sensors/symbian/accelerometersym.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/accelerometersym.cpp	Fri May 14 16:41:33 2010 +0300
@@ -41,6 +41,9 @@
 
 // Internal Headers
 #include "accelerometersym.h"
+#include <sensrvgeneralproperties.h>
+
+#define GRAVITATION_CONSTANT 9.812865328        //According to wikipedia link http://en.wikipedia.org/wiki/Standard_gravity
 
 /**
  * set the id of the accelerometer sensor
@@ -73,7 +76,9 @@
 /**
  * Default constructor
  */
-CAccelerometerSensorSym::CAccelerometerSensorSym(QSensor *sensor):CSensorBackendSym(sensor)
+CAccelerometerSensorSym::CAccelerometerSensorSym(QSensor *sensor):CSensorBackendSym(sensor),
+        iScale(0),
+        iUnit(0)
         {
         setReading<QAccelerometerReading>(&iReading);
         iBackendData.iSensorType = KSensrvChannelTypeIdAccelerometerXYZAxisData;    
@@ -95,12 +100,28 @@
         // If there is no reading available, return without setting
         return;
         }
+    TReal x = iData.iAxisX;
+    TReal y = iData.iAxisY;
+    TReal z = iData.iAxisZ;
+    //Converting unit to m/s^2
+    qoutputrangelist rangeList = sensor()->outputRanges();
+    TReal maxValue = rangeList[sensor()->outputRange()].maximum;
+    if(iScale && iUnit == ESensevChannelUnitAcceleration)
+        {
+        x = (x/iScale) * maxValue;
+        y = (y/iScale) * maxValue;
+        z = (z/iScale) * maxValue;
+        }
+    else if(iUnit == ESensrvChannelUnitGravityConstant)
+        {
+        //conversion is yet to done
+        }
     // Get a lock on the reading data
     iBackendData.iReadingLock.Wait();
     // Set qt mobility accelerometer reading with data from sensor server
-    iReading.setX(iData.iAxisX);
-    iReading.setY(iData.iAxisY);
-    iReading.setZ(iData.iAxisZ);
+    iReading.setX(x);
+    iReading.setY(y);
+    iReading.setZ(z);
     // Set the timestamp
     iReading.setTimestamp(iData.iTimeStamp.Int64());
     // Release the lock
@@ -114,6 +135,24 @@
 void CAccelerometerSensorSym::ConstructL()
     {
     //Initialize the backend resources
-    InitializeL();
+    InitializeL(); 
+    
+    TSensrvProperty unitProperty;
+    TRAPD(err, iBackendData.iSensorChannel->GetPropertyL(KSensrvPropIdChannelUnit, ESensrvSingleProperty, unitProperty));
+    if(err == KErrNone)
+        {
+        unitProperty.GetValue(iUnit);
+        }
+    
+    TSensrvProperty dataFormatProperty;
+    iBackendData.iSensorChannel->GetPropertyL(KSensrvPropIdChannelDataFormat, ESensrvSingleProperty, dataFormatProperty);
+    TInt dataFormat;
+    dataFormatProperty.GetValue(dataFormat);
+    if(dataFormat == ESensrvChannelDataFormatScaled)
+        {
+        TSensrvProperty scaleRangeProperty;
+        TRAPD(err, iBackendData.iSensorChannel->GetPropertyL(KSensrvPropIdScaledRange, ESensrvSingleProperty, scaleRangeProperty));         //Slight confusion
+        scaleRangeProperty.GetMaxValue(iScale);
+        }
     }

--- a/qtmobility/plugins/sensors/symbian/accelerometersym.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/accelerometersym.h	Fri May 14 16:41:33 2010 +0300
@@ -98,6 +98,7 @@
 private:
     QAccelerometerReading iReading;
     TSensrvAccelerometerAxisData iData;
+    TInt iScale, iUnit;
     };
 
 #endif //ACCELEROMETERSYM_H

--- a/qtmobility/plugins/sensors/symbian/main.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/main.cpp	Fri May 14 16:41:33 2010 +0300
@@ -50,6 +50,8 @@
 #include "compasssym.h"
 #include "orientationsym.h"
 #include "accelerometersym.h"
+#include "rotationsensorsym.h"
+#include "tapsensorsym.h"
 
 // QT Utility headers
 #include <QDebug>
@@ -68,6 +70,8 @@
         QSensorManager::registerBackend(QCompass::type, CCompassSym::id, this);
         QSensorManager::registerBackend(QOrientationSensor::type, COrientationSensorSym::id, this);
         QSensorManager::registerBackend(QAccelerometer::type, CAccelerometerSensorSym::id, this);
+        QSensorManager::registerBackend(QRotationSensor::type, CRotationSensorSym::id, this);
+        QSensorManager::registerBackend(QTapSensor::type, CTapSensorSym::id, this);
         }
 
     QSensorBackend *createBackend(QSensor *sensor)
@@ -108,11 +112,23 @@
             TRAPD(err,self = CAccelerometerSensorSym::NewL(sensor));
             return self;
             }
+        if (sensor->identifier() == CRotationSensorSym::id)
+            {
+            CRotationSensorSym *self = NULL;
+            TRAPD(err,self = CRotationSensorSym::NewL(sensor));
+            return self;
+            }
+        if (sensor->identifier() == CTapSensorSym::id)
+            {
+            CTapSensorSym *self = NULL;
+            TRAPD(err,self = CTapSensorSym::NewL(sensor));
+            return self;
+            }
         return 0;
         }
     };
 
-Q_EXPORT_PLUGIN2(libsensors_sym, SensorPluginSym);
+Q_EXPORT_PLUGIN2(qtsensors_sym, SensorPluginSym);
 
 #include "main.moc"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/symbian/rotationsensorsym.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,126 @@
+/****************************************************************************
+ **
+ ** Copyright (C) 2009 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$
+ **
+ ****************************************************************************/
+
+// Internal Headers
+#include "rotationsensorsym.h"
+
+/**
+ * set the id of the proximity sensor
+ */
+const char *CRotationSensorSym::id("sym.rotation");
+
+/**
+ * Factory function, this is used to create the rotation sensor object
+ * @return CRotationSensorSym if successful, leaves on failure
+ */
+CRotationSensorSym* CRotationSensorSym::NewL(QSensor *sensor)
+    {
+    CRotationSensorSym* self = new (ELeave) CRotationSensorSym(sensor);
+    CleanupStack::PushL(self);
+    self->ConstructL();
+    CleanupStack::Pop();
+    return self;
+    }
+
+/**
+ * Destructor
+ * Closes the backend resources
+ */
+CRotationSensorSym::~CRotationSensorSym()
+    {
+    // Release the backend resources
+    Close();
+    }
+
+/**
+ * Default constructor
+ */
+CRotationSensorSym::CRotationSensorSym(QSensor *sensor):CSensorBackendSym(sensor)
+        {
+        setReading<QRotationReading>(&iReading);    
+        iBackendData.iSensorType = KSensrvChannelTypeIdRotationData;
+        }
+
+/*
+ * RecvData is used to retrieve the sensor reading from sensor server
+ * It is implemented here to handle rotation sensor specific
+ * reading data and provides conversion and utility code
+ */ 
+void CRotationSensorSym::RecvData(CSensrvChannel &aChannel)
+    {
+    TPckg<TSensrvRotationData> rotationpkg( iData );
+    TInt ret = aChannel.GetData( rotationpkg );
+    if(KErrNone != ret)
+        {
+        // If there is no reading available, return without setting
+        return;
+        }
+    // Get a lock on the reading data
+    iBackendData.iReadingLock.Wait();
+    // To Do verify with ds and ramsay
+    iReading.setX(iData.iDeviceRotationAboutXAxis);
+    iReading.setY(iData.iDeviceRotationAboutYAxis-180);
+    if(iData.iDeviceRotationAboutZAxis == TSensrvRotationData::KSensrvRotationUndefined)
+        {
+        sensor()->setProperty("hasZ", QVariant(FALSE));
+        }
+    else
+        {
+        sensor()->setProperty("hasZ", QVariant(TRUE));
+        iReading.setZ(iData.iDeviceRotationAboutZAxis-180);
+        }
+    // Set the timestamp
+    iReading.setTimestamp(iData.iTimeStamp.Int64());
+    // Release the lock
+    iBackendData.iReadingLock.Signal();
+    }
+
+
+/**
+ * Second phase constructor
+ * Initialize the backend resources
+ */
+void CRotationSensorSym::ConstructL()
+    {
+    //Initialize the backend resources
+    InitializeL();    
+    }
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/symbian/rotationsensorsym.h	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,103 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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$
+**
+****************************************************************************/
+
+#ifndef ROTATIONSENSORSYM_H
+#define ROTATIONSENSORSYM_H
+
+// QT Mobility Sensor API headers
+#include <qsensorbackend.h>
+#include <qrotationsensor.h>
+
+// Internal Headers
+#include "sensorbackendsym.h"
+
+// Sensor client headers
+// Rotation Sensor specific header
+#include <sensrvorientationsensor.h>
+
+QTM_USE_NAMESPACE
+
+class CRotationSensorSym: public CSensorBackendSym
+    {
+public:
+    /**
+     * Factory function, this is used to create the rotation sensor object
+     * @return CRotationSensorSym if successful, leaves on failure
+     */
+    static CRotationSensorSym* NewL(QSensor *sensor);
+    
+    /**
+     * Destructor
+     * Closes the backend resources
+     */
+    ~CRotationSensorSym();
+    
+private:
+    /**
+     * Default constructor
+     */
+    CRotationSensorSym(QSensor *sensor);
+    
+    /*
+     * RecvData is used to retrieve the sensor reading from sensor server
+     * It is implemented here to handle rotation sensor specific
+     * reading data and provides conversion and utility code
+     */ 
+    void RecvData(CSensrvChannel &aChannel);
+
+    /**
+     * Second phase constructor
+     * Initialize the backend resources
+     */
+    void ConstructL();
+    
+public:
+    /**
+     * Holds the id of the proximity sensor
+     */
+    static const char *id;
+    
+private:     
+    QRotationReading iReading;
+    TSensrvRotationData iData;
+    };
+
+#endif //ROTATIONSENSORSYM_H

--- a/qtmobility/plugins/sensors/symbian/sensorbackenddatasym.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/sensorbackenddatasym.h	Fri May 14 16:41:33 2010 +0300
@@ -57,6 +57,7 @@
     TInt iTimerId;
     TBool iPropertyListening;
     TBool iDataListening;
+    TBool iTimerRequired;
     };
 
 #endif //SENSORBACKENDDATASYM_H

--- a/qtmobility/plugins/sensors/symbian/sensorbackendsym.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/sensorbackendsym.cpp	Fri May 14 16:41:33 2010 +0300
@@ -41,10 +41,14 @@
 // Internal Includes
 #include "sensorbackendsym.h"
 
+#include <sensrvgeneralproperties.h>
+
 // Constants
 const TInt KDesiredReadingCount = 1;
 const TInt KMaximumReadingCount = 1;
 const TInt KDefaultBufferingPeriod = 0;
+const TInt KInvalidDataRate = 123456;
+const TInt KAccuracyInvalid = -1;
 
 ///// Internal Functions
 
@@ -126,6 +130,104 @@
     User::Leave( KErrNotFound );
     }
 
+TInt CSensorBackendSym::SetProperty(TSensrvPropertyId aPropertyId, TSensrvPropertyType aPropertyType, TSensrvArrayIndex aArrayIndex, TReal aValue)
+    {
+    //Creating property object
+    TSensrvProperty prop;   
+    //Set property Id
+    prop.SetPropertyId(aPropertyId);
+    //Set Index of property
+    prop.SetItemIndex(-1);
+    //Set value depending on type of property
+    if(aPropertyType == ESensrvRealProperty)
+        {
+        prop.SetValue(aValue);
+        }
+    else if(aPropertyType == ESensrvIntProperty)
+        {
+        prop.SetValue((TInt)aValue);
+        }
+    //Set array Index
+    prop.SetArrayIndex(aArrayIndex);
+    //Setting the property
+    return iBackendData.iSensorChannel->SetProperty(prop);
+    }
+
+TInt CSensorBackendSym::SetMeasurementRange()
+    {
+    //Setting measurement range
+    //Check if more than one output ranges are available
+    if(sensor()->outputRanges().length() <= 1)
+        {
+        return KErrNone;
+        }
+    TSensrvProperty propertyType;
+    //Getting the property to check the type
+    TRAPD(err, iBackendData.iSensorChannel->GetPropertyL(KSensrvPropIdMeasureRange, ESensrvSingleProperty, propertyType));
+    if(err != KErrNone)
+        {
+        return err;
+        }
+    //Find the type of property
+    TSensrvPropertyType type = propertyType.PropertyType();
+    //If type is integer
+    if(type == ESensrvRealProperty)
+        {    
+        return SetProperty(KSensrvPropIdMeasureRange, ESensrvRealProperty, ESensrvArrayPropertyInfo, sensor()->outputRange());
+        }
+    //If type is real
+    if(type == ESensrvIntProperty)
+        {
+        return SetProperty(KSensrvPropIdMeasureRange, ESensrvIntProperty, ESensrvArrayPropertyInfo, sensor()->outputRange());
+        }       
+    }
+
+TInt CSensorBackendSym::SetDataRate()
+    {
+    //Get available datarates
+    qrangelist availableDataRates = sensor()->availableDataRates();
+    if ( availableDataRates.count() != 0 )
+        {
+        //Check if discret values or range value is used
+        if( availableDataRates[0].first == availableDataRates[0].second )
+            {
+            //In descrete ranges if only one available, no need to set that range
+            if(availableDataRates.length() <= 1)
+                {
+                return KErrNone;
+                }
+            return SetProperty(KSensrvPropIdDataRate, ESensrvIntProperty,ESensrvArrayPropertyInfo,
+                    availableDataRates.indexOf(qrange(sensor()->dataRate(),sensor()->dataRate())));
+            }
+        else
+            {
+            // Uses range value
+            return SetProperty(KSensrvPropIdDataRate, ESensrvIntProperty, ESensrvSingleProperty, sensor()->dataRate());
+            }
+        }
+    // No data rates available
+    return KErrNone;
+    }
+
+void CSensorBackendSym::SetProperties()
+    {
+    if(sensor())
+        {
+        //Set measurement range
+        TInt err = SetMeasurementRange();
+        if(err != KErrNone)
+            {
+            sensorError(err);
+            }
+        //Set data rate
+        err = SetDataRate();
+        if(err != KErrNone)
+            {
+            sensorError(err);
+            }
+        }
+    }
+
 /*
  * Used to start listening to the sensor
  */
@@ -134,12 +236,7 @@
     // Check if data listening is enabled
     if(iBackendData.iDataListening)
         {
-        // Start timer if required i.e. if update interval is more than zero   
-        TInt interval = sensor()->updateInterval();
-        if( interval > 0 )
-            {
-            iBackendData.iTimerId = startTimer(interval);
-            }
+        SetProperties();
         // Start listening to the sensor 
         // Before calling this api the channel should be found and opened
         iBackendData.iSensorChannel->StartDataListeningL( this,
@@ -147,7 +244,7 @@
                 KMaximumReadingCount,
                 KDefaultBufferingPeriod );
         }
-    // start property listening if required
+    // start property listening if required         //put it above
     if ( iBackendData.iPropertyListening )
         {
         iBackendData.iSensorChannel->SetPropertyListenerL(this);
@@ -155,19 +252,6 @@
     }
 
 /*
- * timerEvent is called when timer expires, this is used for supporting time based
- * sensor update policies
- */
-void CSensorBackendSym::timerEvent(QTimerEvent* /*aTimerEvent*/)
-    {
-    // Called upon timer expiry
-    //Use synchronization mechanism and emit the reading value
-    iBackendData.iReadingLock.Wait();
-    newReadingAvailable();
-    iBackendData.iReadingLock.Signal();
-    }
-
-/*
  * Used to stop listening to the sensor
  */
 void CSensorBackendSym::StopListeningL()
@@ -179,12 +263,6 @@
         }
     if(iBackendData.iDataListening)
         {
-        // If timer is being used, stop the timer
-        if (iBackendData.iTimerId)
-            {
-            killTimer(iBackendData.iTimerId);
-            iBackendData.iTimerId = 0;
-            }
         // Stop listening to the sensor channel
         User::LeaveIfError(iBackendData.iSensorChannel->StopDataListening());
         }
@@ -209,6 +287,169 @@
     // No Implementation
     }
 
+void CSensorBackendSym::GetDescription()
+    {
+    RSensrvPropertyList list;
+    TRAPD(err, iBackendData.iSensorChannel->GetAllPropertiesL(KSensrvSensorDescription, list));
+    if(err == KErrNone)
+        {
+        QString str;
+        TBuf8<KSensrvPropertyTextBufferSize> desc;
+        for(int i=0; i<list.Count(); i++)
+            {            
+            if(list[i].GetArrayIndex() == ESensrvArrayPropertyInfo)
+                {                
+                continue;
+                }
+            list[i].GetValue(desc);
+            str.append((const char*)desc.PtrZ());
+            }
+        setDescription(str);
+        }
+    }
+
+void CSensorBackendSym::GetDataRate()
+    {
+    RSensrvPropertyList list;
+    TRAPD(err, iBackendData.iSensorChannel->GetAllPropertiesL(KSensrvPropIdDataRate, list));
+    if(err == KErrNone)
+        {    
+        //if list has only one item then it is range of values and not descrete values, agreed with DS team
+        if(list.Count() == 1)               
+            {
+            TInt min, max, value;
+            list[0].GetMinValue(min);
+            list[0].GetMaxValue(max);
+            //Set datarate as range
+            addDataRate(min, max);
+            list[0].GetValue(value);
+            //Set current datarate as default
+            sensor()->setDataRate(value);
+            }
+        //if list has more than one item, data rate will be having descrete values, agreed with DS team
+        else                                
+            {
+            TInt datarate, index;
+            for(int i=0; i<list.Count(); i++)
+                {  
+                if(list[i].GetArrayIndex() == ESensrvArrayPropertyInfo)
+                    {
+                    //If array index is ESensrvArrayPropertyInfo, getting the value to get current datarate
+                    list[i].GetValue(index);
+                    list[index].GetValue(datarate);
+                    //Setting current datarate as default
+                    sensor()->setDataRate(datarate);
+                    continue;
+                    }     
+                list[i].GetValue(datarate);
+                addDataRate(datarate, datarate);
+                }
+            }
+        }
+    }
+
+void CSensorBackendSym::GetMeasurementrangeAndAccuracy()
+    {
+    /*
+    In QT Mobility measurement range and accuracy are coupled together to form the output range
+    where as, in Symbian accuracy and measurement range are independent properties.
+    To solve the QT requirement, the mapping used is as follows
+    1. If symbian provides only one accuracy, use this with all the measurement ranges
+    2. If there are n accuracies and n measurement ranges, map linearly (n:n)
+    3. If there are n accuracies and n+x measurement ranges, then the mapping will be 
+         n:n for each n measurement ranges and accuracies
+         KAccuracyInvalid : for each n+x measurement ranges
+    */
+    TReal accuracy = 0;
+    RSensrvPropertyList accuracyList;
+    RSensrvPropertyList list;
+    TInt err;
+    TRAP(err, iBackendData.iSensorChannel->GetAllPropertiesL(KSensrvPropIdChannelAccuracy, accuracyList));
+    if(err == KErrNone)
+        {            
+        if(accuracyList.Count() == 1)
+            {
+            accuracyList[0].GetValue(accuracy);          
+            }
+        else
+            {
+            accuracy = KAccuracyInvalid; 
+            }
+        }
+        
+    //measurement minimum & maximum
+    list.Reset();
+    TRAP(err, iBackendData.iSensorChannel->GetAllPropertiesL(KSensrvPropIdMeasureRange, list));
+    if(err == KErrNone)
+        {            
+        for(int i=0; i<list.Count(); i++)
+            {
+            if(list[i].GetArrayIndex() == ESensrvArrayPropertyInfo)
+                {
+                continue;
+                }
+            if(list[i].PropertyType() == ESensrvIntProperty )
+                {
+                TInt min, max;
+                list[i].GetMinValue(min);
+                list[i].GetMaxValue(max);
+                if(accuracy != KAccuracyInvalid)
+                    {
+                    addOutputRange(min, max, accuracy);
+                    }
+                else
+                    {
+                    if(accuracyList.Count() > i)
+                        {
+                        accuracyList[i].GetValue(accuracy);
+                        addOutputRange(min, max, accuracy);
+                        }
+                    else
+                        {
+                        addOutputRange(min, max, KAccuracyInvalid);
+                        }
+                    }
+                }
+            else if(list[i].PropertyType() == ESensrvRealProperty  )
+                {
+                TReal min, max;
+                list[i].GetMinValue(min);
+                list[i].GetMaxValue(max);
+                if(accuracy != KAccuracyInvalid)
+                    {
+                    addOutputRange(min, max, accuracy);
+                    }
+                else
+                    {
+                    if(accuracyList.Count() > i)
+                        {
+                        accuracyList[i].GetValue(accuracy);
+                        addOutputRange(min, max, accuracy);
+                        }
+                    else
+                        {
+                        addOutputRange(min, max, KAccuracyInvalid);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+void CSensorBackendSym::GetPropertiesL()
+    {
+    //description
+    GetDescription();
+    
+    //data rate
+    GetDataRate();
+    
+    //accuracy and measurement ranges
+    GetMeasurementrangeAndAccuracy();
+    }
+
+
+
 /*
  * InitializeL is used to create and init the sensor server objects
  */ 
@@ -216,6 +457,10 @@
     {
     // Initialize Symbian Sensor Framework Objects
     OpenSensorChannelL();
+    if(sensor())
+        {
+        GetPropertiesL();        
+        }
     }
 
 /*
@@ -270,11 +515,8 @@
     {
     // Retrieve the data from sensor buffer
     RecvData(aChannel);
-    // Notify only if no timer present
-    if( !iBackendData.iTimerId )
-        {
-        newReadingAvailable();
-        }
+    // Notify that a reading is available
+    newReadingAvailable();
     }
 
 /**

--- a/qtmobility/plugins/sensors/symbian/sensorbackendsym.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/sensorbackendsym.h	Fri May 14 16:41:33 2010 +0300
@@ -154,6 +154,49 @@
         void InitializeL();
         
         /*
+         * SetProperty is used to set property to the channel
+         */         
+        TInt SetProperty(TSensrvPropertyId aPropertyId, TSensrvPropertyType aPropertyType, TSensrvArrayIndex aArrayIndex, TReal aValue);
+        
+        /*
+         * SetMeasurementRange is used to check measurement range type and set the measurement range
+         */
+        TInt SetMeasurementRange();
+        
+        /*
+         * SetDataRate is used to calculate appropriate data rate for given interval and set that interval to the channel
+         */
+        TInt SetDataRate();
+        
+        /*
+         * SetProperties is used to set properties on the channel before start data listening 
+         */
+        void SetProperties();
+        
+        /*
+         * GetPropertiesL used to get the properties from sensor server and sets as metadata for Qt.
+         */
+        void GetPropertiesL();
+       
+        /*
+         * GetDescription used to get description of sensor from symbian and set
+         * as description in Qt
+         */
+        void GetDescription();
+        
+        /*
+         * GetDataRate used to get available datarates from symbian and set
+         * as availableDataRates in Qt
+         */
+        void GetDataRate();
+        
+        /*
+         * GetMeasurementrangeAndAccuracy used to get measurement ranges and accuracy from
+         * symbian and set as outputRanges in Qt
+         */
+        void GetMeasurementrangeAndAccuracy();
+        
+        /*
          * Close is used to release all the sensor server objects
          * May change when error handling is supported by mobility apis
          */
@@ -186,12 +229,6 @@
          * Used to stop listening to the sensor
          */
         void StopListeningL();
-        
-        /*
-         * timerEvent is called when timer expires, this is used for supporting time based
-         * sensor update policies
-         */
-        void timerEvent(QTimerEvent *aTimerEvent);
 
     protected:
         TSensorBackendDataSym iBackendData;

--- a/qtmobility/plugins/sensors/symbian/symbian.pri	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/symbian.pri	Fri May 14 16:41:33 2010 +0300
@@ -1,8 +1,2 @@
-HEADERS += proximitysensorsym.h\
-		   ambientlightsensorsym.h \
-		   sensorbackendsym.h \
-           sensorbackenddatasym.h \
-SOURCES += sensorbackendsym.cpp \
-		   proximitysensorsym.cpp \
-		   ambientlightsensorsym.cpp \
-		   main.cpp \
+HEADERS += \
+SOURCES += \

--- a/qtmobility/plugins/sensors/symbian/symbian.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/symbian.pro	Fri May 14 16:41:33 2010 +0300
@@ -2,14 +2,14 @@
 INCLUDEPATH+=../../sensors \epoc32\include\osextensions
 
 include(version.pri)
-include(symbian.pri)
+#include(symbian.pri)
 include(../../../common.pri)
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(sensors_sym)
+TARGET = $$qtLibraryTarget(qtsensors_sym)
 
-SOURCES +=  \
+SOURCES +=  \			
 			sensorbackendsym.cpp \
 			proximitysensorsym.cpp \
 			ambientlightsensorsym.cpp \
@@ -17,7 +17,10 @@
 			compasssym.cpp \
 			accelerometersym.cpp \
 			orientationsym.cpp \
-			main.cpp
+			rotationsensorsym.cpp \
+			tapsensorsym.cpp \			
+			main.cpp \
+			
 PRIVATE_HEADERS += \
 			sensorbackendsym.h \
 			sensorbackenddatasym.h \
@@ -26,7 +29,9 @@
 			magnetometersensorsym.h \
 			compasssym.h \
 			accelerometersym.h \
-			orientationsym.h
+			orientationsym.h \
+			rotationsensorsym.h \
+			tapsensorsym.h \
            
 HEADERS = $$PRIVATE_HEADERS
 
@@ -56,7 +61,7 @@
 load(data_caging_paths)
  
 # Defines plugin files into Symbian .pkg package
-pluginDep.sources = sensors_sym.dll
+pluginDep.sources = qtsensors_sym.dll
 pluginDep.path = $$QT_PLUGINS_BASE_DIR/sensors
 DEPLOYMENT += pluginDep
 }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/symbian/tapsensorsym.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,171 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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 "tapsensorsym.h"
+/**
+ * set the id of the Tap sensor
+ */
+const char *CTapSensorSym::id("sym.tap");
+
+/**
+ * Factory function, this is used to create the tap sensor object
+ * @return CTapSensorSym if successful, leaves on failure
+ */
+CTapSensorSym* CTapSensorSym::NewL(QSensor *sensor)
+    {
+    CTapSensorSym* self = new (ELeave) CTapSensorSym(sensor);
+    CleanupStack::PushL(self);
+    self->ConstructL();
+    CleanupStack::Pop();
+    return self;    
+    }
+
+/**
+ * Destructor
+ * Closes the backend resources
+ */
+CTapSensorSym::~CTapSensorSym()
+    {
+    Close();
+    }
+
+/**
+ * Default constructor
+ */
+CTapSensorSym::CTapSensorSym(QSensor *sensor):CSensorBackendSym(sensor)
+    {
+    setReading<QTapReading>(&iReading);    
+    iBackendData.iSensorType = KSensrvChannelTypeIdAccelerometerDoubleTappingData;
+    }
+/*
+ * RecvData is used to retrieve the sensor reading from sensor server
+ * It is implemented here to handle tap sensor specific
+ * reading data and provides conversion and utility code
+ */ 
+void CTapSensorSym::RecvData(CSensrvChannel &aChannel)
+    {
+    TPckg<TSensrvTappingData> tappkg( iData );
+    TInt ret = aChannel.GetData( tappkg );
+    if(KErrNone != ret)
+        {
+		// If there is no reading available, return without setting
+        return;
+        }
+	// Get a lock on the reading data
+    iBackendData.iReadingLock.Wait();
+	//Mapping device tap sensor enum values to Qt tap sensor enum values
+    switch (iData.iDirection)
+        {
+			// Indicates a tap on positive X axis
+        case KSensrvAccelerometerDirectionXplus:
+            {
+            iReading.setTapDirection(QTapReading::X_Pos);
+            }
+            break;
+			// Indicates a tap on negative X axis
+        case KSensrvAccelerometerDirectionXminus:
+            {
+            iReading.setTapDirection(QTapReading::X_Neg);
+            }
+            break;
+			// Indicates a tap on positive Y axis
+        case KSensrvAccelerometerDirectionYplus:
+            {
+            iReading.setTapDirection(QTapReading::Y_Pos);
+            }
+            break;
+			// Indicates a tap on negative Y axis
+        case KSensrvAccelerometerDirectionYminus:
+            {
+            iReading.setTapDirection(QTapReading::Y_Neg);
+            }
+            break;    
+			// Indicates a tap on positive Z axis
+        case KSensrvAccelerometerDirectionZplus:
+            {
+            iReading.setTapDirection(QTapReading::Z_Pos);
+            }
+            break;
+			// Indicates a tap on negative Z axis
+        case KSensrvAccelerometerDirectionZminus:
+            {
+            iReading.setTapDirection(QTapReading::Z_Neg);
+            }
+            break;    
+        default:
+            {
+				// Indicates a tap on X axis
+            if(iData.iDirection==KSensrvAccelerometerDirectionXplus|KSensrvAccelerometerDirectionXminus)
+                {
+                iReading.setTapDirection(QTapReading::X);
+                }
+				// Indicates a tap on Y axis
+            else if(iData.iDirection==KSensrvAccelerometerDirectionYplus|KSensrvAccelerometerDirectionYminus)
+                {
+                iReading.setTapDirection(QTapReading::Y);
+                }
+				// Indicates a tap on Z axis
+            else if(iData.iDirection==KSensrvAccelerometerDirectionZplus|KSensrvAccelerometerDirectionZminus)
+                {
+                iReading.setTapDirection(QTapReading::Z);
+                }
+				 // Undefined value
+            else
+                {
+                iReading.setTapDirection(QTapReading::Undefined);
+                }
+            }            
+        }
+	//Set the type of tap to be double tap
+    iReading.setDoubleTap(true);
+    iReading.setTimestamp(iData.iTimeStamp.Int64());  
+	    // Release the lock
+    iBackendData.iReadingLock.Signal();
+    }
+/**
+ * Second phase constructor
+ * Initialize the backend resources
+ */
+void CTapSensorSym::ConstructL()
+    {
+    InitializeL();
+    }
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/sensors/symbian/tapsensorsym.h	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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$
+**
+****************************************************************************/
+
+#ifndef TAPSENSORSYM_H
+#define TAPSENSORSYM_H
+
+// QT Mobility Sensor API headers
+#include <qsensorbackend.h>
+#include <qtapsensor.h>
+
+// Internal Headers
+#include "sensorbackendsym.h"
+
+// Sensor client headers
+// Double Tap Sensor specific header
+#include <sensrvtappingsensor.h>
+
+QTM_USE_NAMESPACE
+
+class CTapSensorSym: public CSensorBackendSym
+    {
+public:
+    /**
+     * Factory function, this is used to create the tap sensor object
+     * @return CTapSensorSym if successful, leaves on failure
+     */
+    static CTapSensorSym* NewL(QSensor *sensor);
+    /**
+     * Destructor
+     * Closes the backend resources
+     */
+    ~CTapSensorSym();
+    
+private:
+	  /**
+     * Default constructor
+     */
+    CTapSensorSym(QSensor *sensor);
+    /**
+     * RecvData is used to retrieve the sensor reading from sensor server
+     * It is implemented here to handle tap sensor specific
+     * reading data and provides conversion and utility code
+     */ 
+    void RecvData(CSensrvChannel &aChannel);
+   /**
+     * Second phase constructor
+     * Initialize the backend resources
+     */
+    void ConstructL();
+    
+public:
+    /**
+     * Holds the id of the magnetometer
+     */	
+    static const char *id;
+    
+private:
+    QTapReading iReading;
+    TSensrvTappingData iData;
+    };
+
+#endif //TAPSENSORSYM_H
+

--- a/qtmobility/plugins/sensors/symbian/version.pri	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/version.pri	Fri May 14 16:41:33 2010 +0300
@@ -1,1 +1,1 @@
-VERSION = 0.0.2
+VERSION = 1.0.0
\ No newline at end of file

--- a/qtmobility/qtmobility.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/qtmobility.pro	Fri May 14 16:41:33 2010 +0300
@@ -19,6 +19,27 @@
     #happen if we are trying to shadow build w/o running configure
 }
 
+#creating qbuildcfg header
+!exists($$QT_MOBILITY_BUILD_TREE/src/global){
+	message("creating qbuildcfg header")
+	symbian|win32|wince*{
+		system($$QMAKE_MKDIR $$QT_MOBILITY_BUILD_TREE\src\global)
+	}
+	else{
+		system($$QMAKE_MKDIR $$QT_MOBILITY_BUILD_TREE/src/global)
+	}
+}
+	
+QCFGH_OUTPUT=$$QT_MOBILITY_BUILD_TREE/src/global/qbuildcfg.h
+mobilityprefixpath = $$QT_MOBILITY_PREFIX
+symbian|win32|wince*{
+	mobilityprefixpath = $$replace(mobilityprefixpath, \\\, \\\\)
+	system(echo static const char qt_mobility_configure_prefix_path_str [512 + 12] = \"$$mobilityprefixpath\\0\"; > $$QCFGH_OUTPUT)
+}
+else{
+	system(echo static const char qt_mobility_configure_prefix_path_str [512 + 12] = '\\\"$$mobilityprefixpath\\\0\\\"\;' > $$QCFGH_OUTPUT)
+}
+
 
 #don't build QtMobility if chosen config mismatches Qt's config
 win32:!contains(CONFIG_WIN32,build_all) {

--- a/qtmobility/src/bearer/qnativewifiengine_win.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/bearer/qnativewifiengine_win.cpp	Fri May 14 16:41:33 2010 +0300
@@ -43,7 +43,6 @@
 #include "qnetworkconfiguration_p.h"
 
 #include <QtCore/qmutex.h>
-#include <QtCore/private/qmutexpool_p.h>
 #include <QtCore/qlibrary.h>
 #include <QtCore/qstringlist.h>
 
@@ -330,13 +329,15 @@
 static WlanFreeMemoryProto local_WlanFreeMemory = 0;
 static WlanCloseHandleProto local_WlanCloseHandle = 0;
 
+Q_GLOBAL_STATIC_WITH_ARGS(QMutex, dynamicLoadMutex, (QMutex::Recursive));
+
 static void resolveLibrary()
 {
     static volatile bool triedResolve = false;
 
     if (!triedResolve) {
 #ifndef QT_NO_THREAD
-        QMutexLocker locker(QMutexPool::globalInstanceGet(&local_WlanOpenHandle));
+        QMutexLocker locker(dynamicLoadMutex());
 #endif
 
         if (!triedResolve) {

--- a/qtmobility/src/bearer/qnetworksession_s60_p.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/bearer/qnetworksession_s60_p.cpp	Fri May 14 16:41:33 2010 +0300
@@ -57,7 +57,10 @@
       iALREnabled(0), iConnectInBackground(false)
 {
     CActiveScheduler::Add(this);
-    
+
+#ifdef SNAP_FUNCTIONALITY_AVAILABLE
+    iMobility = NULL;
+#endif
     TRAP_IGNORE(iConnectionMonitor.ConnectL());
 }
 
@@ -507,22 +510,26 @@
 void QNetworkSessionPrivate::migrate()
 {
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE
-    // Close global 'Open C' RConnection
-    setdefaultif(0);
-    
-    // Start migrating to new IAP
-    iMobility->MigrateToPreferredCarrier();
+    if (iMobility) {
+        // Close global 'Open C' RConnection
+        setdefaultif(0);
+        // Start migrating to new IAP
+        iMobility->MigrateToPreferredCarrier();
+    }
 #endif
 }
 
 void QNetworkSessionPrivate::ignore()
 {
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE
-    iMobility->IgnorePreferredCarrier();
-    if (!iALRUpgradingConnection) {
-        newState(QNetworkSession::Disconnected);
-    } else {
-        newState(QNetworkSession::Connected,iOldRoamingIap);
+    if (iMobility) {
+        iMobility->IgnorePreferredCarrier();
+
+        if (!iALRUpgradingConnection) {
+            newState(QNetworkSession::Disconnected);
+        } else {
+            newState(QNetworkSession::Connected,iOldRoamingIap);
+        }
     }
 #endif
 }
@@ -530,39 +537,43 @@
 void QNetworkSessionPrivate::accept()
 {
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE
-    iMobility->NewCarrierAccepted();
-    
-    QNetworkConfiguration newActiveConfig = activeConfiguration(iNewRoamingIap);
+    if (iMobility) {
+        iMobility->NewCarrierAccepted();
+
+        QNetworkConfiguration newActiveConfig = activeConfiguration(iNewRoamingIap);
 
-    // Use name of the new IAP to open global 'Open C' RConnection
-    QByteArray nameAsByteArray = newActiveConfig.name().toUtf8();
-    ifreq ifr;
-    memset(&ifr, 0, sizeof(struct ifreq));
-    strcpy(ifr.ifr_name, nameAsByteArray.constData());
-    setdefaultif(&ifr);
-    
-    newState(QNetworkSession::Connected, iNewRoamingIap);
+        // Use name of the new IAP to open global 'Open C' RConnection
+        QByteArray nameAsByteArray = newActiveConfig.name().toUtf8();
+        ifreq ifr;
+        memset(&ifr, 0, sizeof(struct ifreq));
+        strcpy(ifr.ifr_name, nameAsByteArray.constData());
+        setdefaultif(&ifr);
+
+        newState(QNetworkSession::Connected, iNewRoamingIap);
+    }
 #endif
 }
 
 void QNetworkSessionPrivate::reject()
 {
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE
-    iMobility->NewCarrierRejected();
+    if (iMobility) {
+        iMobility->NewCarrierRejected();
 
-    if (!iALRUpgradingConnection) {
-        newState(QNetworkSession::Disconnected);
-    } else {
-        QNetworkConfiguration newActiveConfig = activeConfiguration(iOldRoamingIap);
+        if (!iALRUpgradingConnection) {
+            newState(QNetworkSession::Disconnected);
+        } else {
+            QNetworkConfiguration newActiveConfig = activeConfiguration(iOldRoamingIap);
 
-        // Use name of the old IAP to open global 'Open C' RConnection
-        QByteArray nameAsByteArray = newActiveConfig.name().toUtf8();
-        ifreq ifr;
-        memset(&ifr, 0, sizeof(struct ifreq));
-        strcpy(ifr.ifr_name, nameAsByteArray.constData());
-        setdefaultif(&ifr);
+            // Use name of the old IAP to open global 'Open C' RConnection
+            QByteArray nameAsByteArray = newActiveConfig.name().toUtf8();
+            ifreq ifr;
+            memset(&ifr, 0, sizeof(struct ifreq));
+            strcpy(ifr.ifr_name, nameAsByteArray.constData());
+            setdefaultif(&ifr);
 
-        newState(QNetworkSession::Connected, iOldRoamingIap);
+            newState(QNetworkSession::Connected, iOldRoamingIap);
+        }
     }
 #endif
 }

--- a/qtmobility/src/contacts/contacts.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/contacts.pro	Fri May 14 16:41:33 2010 +0300
@@ -19,9 +19,6 @@
 PUBLIC_HEADERS += \
     qcontact.h \
     qcontactabstractrequest.h \
-    qcontactaction.h \
-    qcontactactiondescriptor.h \
-    qcontactactionfactory.h \
     qcontactchangeset.h \
     qcontactdetail.h \
     qcontactdetaildefinition.h \
@@ -41,7 +38,6 @@
 PRIVATE_HEADERS += \
     qcontact_p.h \
     qcontactabstractrequest_p.h \
-    qcontactactiondescriptor_p.h \
     qcontactchangeset_p.h \
     qcontactdetail_p.h \
     qcontactdetaildefinition_p.h \
@@ -56,9 +52,6 @@
 SOURCES += \
     qcontact.cpp \
     qcontactabstractrequest.cpp \
-    qcontactaction.cpp \
-    qcontactactiondescriptor.cpp \
-    qcontactactionfactory.cpp \
     qcontactchangeset.cpp \
     qcontactdetail.cpp \
     qcontactdetaildefinition.cpp \

--- a/qtmobility/src/contacts/details/qcontactdetails.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactdetails.cpp	Fri May 14 16:41:33 2010 +0300
@@ -50,132 +50,28 @@
 
 QTM_BEGIN_NAMESPACE
 
-/*!
-   \class QContactAddress
-   \brief The QContactAddress class contains an address of a contact.
-   \ingroup contacts-details
- */
-
-/*!
-   \class QContactAnniversary
-   \brief The QContactAnniversary class contains the anniversary of a contact.
-   \ingroup contacts-details
- */
-
-/*!
-   \class QContactAvatar
-   \brief The QContactAvatar class contains the avatar of a contact.
-   \ingroup contacts-details
- */
-
-/*!
-   \class QContactBirthday
-   \brief The QContactBirthday class contains the birthday of a contact.
-   \ingroup contacts-details
- */
-
-/*!
-   \class QContactDisplayLabel
-   \brief The QContactDisplayLabel class is the (possibly synthesized)
-   display label of a contact.
-   \ingroup contacts-details
- */
-
-/*!
-   \class QContactEmailAddress
-
-   \brief The QContactEmailAddress class contains the email address of
-   a contact.
-   \ingroup contacts-details
- */
-
-/*!
-   \class QContactFamily
-   \brief The QContactFamily class contains the names of the
-   family members of a contact.
-   \ingroup contacts-details
- */
-
-/*!
-   \class QContactGender
-   \brief The QContactGender class contains the gender of a contact.
-   \ingroup contacts-details
+
+/* template docs:
+
+   XXXX::FieldYYYY:
+       The field key constant for the YYYY value.
+       \sa yyyy(), setYyyy()
+
+   XXXX::DefinitionName:
+        The string constant for the definition name of QContactXXXX details.
+
+   XXXX::FieldSubType
+        The field key constant for the field that stores the sub type of a XXXX.
+        \sa subType(), setSubType()
+
+   XXXX::SubTypeYYYY
+        The predefined string constant for a sub type value,
+        indicating blah blah blah.
+        \sa subTypes(), setSubTypes()
  */
 
-/*!
-   \class QContactGeoLocation
-   \brief The QContactGeoLocation class contains the global location
-   coordinate associated with a contact.
-   \ingroup contacts-details
-*/
-
-/*!
-   \class QContactGlobalPresence
-   \brief The QContactGlobalPresence class provides aggregated presence information
-   for a contact, synthesized or supplied by the backend.
-   \ingroup contacts-details
- */
-
-/*!
-   \class QContactGuid
-   \brief The QContactGuid class contains the globally unique
-   Id of a contact.
-   \ingroup contacts-details
- */
-
-/*!
-   \class QContactName
-   \brief The QContactName class contains the name of a contact.
-   \ingroup contacts-details
- */
-
-/*!
-   \class QContactNickname
-   \brief The QContactNickname class contains a nickname of a contact.
-   \ingroup contacts-details
- */
-
-/*!
-   \class QContactNote
-   \brief The QContactNote class contains a note associated
-   with a contact.
-   \ingroup contacts-details
- */
-
-/*!
-   \class QContactOnlineAccount
-   \brief The QContactOnlineAccount class provides the online account,
-   which the contact uses to communicate with friends and family.
-   \ingroup contacts-details
- */
-
-/*!
-   \class QContactOrganization
-   \brief The QContactOrganization class provides details about an
-   organization that the contact is either a part of, or stands for.
-   \ingroup contacts-details
- */
-
-/*!
-   \class QContactPhoneNumber
-   \brief The QContactPhoneNumber class provides a phone number
-   of a contact.
-   \ingroup contacts-details
- */
-
-/*!
-   \class QContactPresence
-   \brief The QContactPresence class provides presence information
-   for an online account of a contact.
-   \ingroup contacts-details
- */
-
-/*!
-   \class QContactRingtone
-   \brief The QContactRingtone class provides a ringtone associated
-   with a contact
-   \ingroup contacts-details
- */
+
+/* ==================== QContactSyncTarget ======================= */
 
 /*!
    \class QContactSyncTarget
@@ -185,1044 +81,20 @@
  */
 
 /*!
-   \class QContactTag
-   \brief The QContactTag class contains a tag associated with a
-   contact.
-   \ingroup contacts-details
- */
-
-/*!
-   \class QContactThumbnail
-   \brief The QContactThumbnail class contains a thumbnail used
-   in display lists to represent the contact.
-   \ingroup contacts-details
- */
-
-/*!
-   \class QContactTimestamp
-   \brief The QContactTimestamp class contains the creation and
-   last-modified timestamp associated with the contact.
-   \ingroup contacts-details
- */
-
-/*!
-   \class QContactType
-   \brief The QContactType class describes the type of the contact.
-   \ingroup contacts-details
- */
-
-/*!
-   \class QContactUrl
-   \brief The QContactUrl class contains a url associated with
-   a contact.
-   \ingroup contacts-details
- */
-
-/*!
-   \variable QContactName::DefinitionName
-   The constant string which identifies the definition of details which are names.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactName::DefinitionName, "Name");
-
-/*!
-   \variable QContactNickname::DefinitionName
-   The constant string which identifies the definition of details which are nicknames.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactNickname::DefinitionName, "Nickname");
-
-/*!
-   \variable QContactNote::DefinitionName
-   The constant string which identifies the definition of details which are notes.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactNote::DefinitionName, "Note");
-
-/*!
-   \variable QContactAvatar::DefinitionName
-   The constant string which identifies the definition of details which are avatars.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAvatar::DefinitionName, "Avatar");
-
-/*!
-   \variable QContactAddress::DefinitionName
-   The constant string which identifies the definition of details which are street addresses.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAddress::DefinitionName, "Address");
-
-/*!
-   \variable QContactPhoneNumber::DefinitionName
-   The constant string which identifies the definition of details which are phone numbers.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::DefinitionName, "PhoneNumber");
-
-/*!
-   \variable QContactPresence::DefinitionName
-   The constant string which identifies the definition of details which contain presence information.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactPresence::DefinitionName, "Presence");
-
-/*!
-   \variable QContactPresence::FieldTimestamp
-
-   The constant key for which the last update timestamp value is stored in details
-   of the QContactPresence type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactPresence::FieldTimestamp, "Timestamp");
-
-/*!
-   \variable QContactPresence::FieldNickname
-
-   The constant key for which the nickname value is stored in details
-   of the QContactPresence type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactPresence::FieldNickname, "Nickname");
-
-/*!
-   \variable QContactPresence::FieldPresenceState
-
-   The constant key for which the presence state value is stored in details
-   of the QContactPresence typel.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactPresence::FieldPresenceState, "PresenceState");
-
-/*!
-   \variable QContactPresence::FieldPresenceStateText
-
-   The constant key for which the presence provider provided text representation
-   of the presence state is stored in details of the QContactPresence type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactPresence::FieldPresenceStateText, "PresenceStateText");
-
-/*!
-   \variable QContactPresence::FieldPresenceStateImageUrl
-
-   The constant key for which the image url value for the current presence state
-   is stored in details of the QContactPresence type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactPresence::FieldPresenceStateImageUrl, "PresenceStateImageUrl");
-
-/*!
-   \variable QContactPresence::FieldCustomMessage
-
-   The constant key for which the user-entered custom message for their state
-   is stored in details of the QContactPresence type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactPresence::FieldCustomMessage, "CustomMessage");
-
-/*!
-   \variable QContactRingtone::DefinitionName
-   The constant string which identifies the definition of details which are ringtones.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactRingtone::DefinitionName, "Ringtone");
-
-/*!
-   \variable QContactSyncTarget::DefinitionName
-   The constant string which identifies the definition of details which are synchronization target stores.
- */
+    \variable QContactSyncTarget::DefinitionName
+    The string constant for the definition name of QContactSyncTarget details.
+*/
 Q_DEFINE_LATIN1_CONSTANT(QContactSyncTarget::DefinitionName, "SyncTarget");
 
 /*!
-   \variable QContactTimestamp::DefinitionName
-   The constant string which identifies the definition of details which are contact synchronization timestamps.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactTimestamp::DefinitionName, "Timestamp");
-
-/*!
-   \variable QContactType::DefinitionName
-   The constant string which identifies the definition of details which identify the type of the contact.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactType::DefinitionName, "Type");
-
-/*!
-   \variable QContactGuid::DefinitionName
-   The constant string which identifies the definition of details which are globally unique identifiers.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGuid::DefinitionName, "Guid");
-
-/*!
-   \variable QContactEmailAddress::DefinitionName
-   The constant string which identifies the definition of details which are email addresses.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactEmailAddress::DefinitionName, "EmailAddress");
-
-/*!
-   \variable QContactFamily::DefinitionName
-   The constant string which identifies the definition of details which contain the names of the contact's family.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactFamily::DefinitionName, "Family");
-
-/*!
-   \variable QContactUrl::DefinitionName
-   The constant string which identifies the definition of details which are universal resource location paths.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactUrl::DefinitionName, "Url");
-
-/*!
-   \variable QContactBirthday::DefinitionName
-   The constant string which identifies the definition of details which are the dates of birthdays.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactBirthday::DefinitionName, "Birthday");
-
-/*!
-   \variable QContactAnniversary::DefinitionName
-   The constant string which identifies the definition of details which are anniversary dates.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::DefinitionName, "Anniversary");
-
-/*!
-   \variable QContactGender::DefinitionName
-
-   The constant string which identifies the definition of details
-   which identify the gender of a contact in a given context.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGender::DefinitionName, "Gender");
-
-/*!
-   \variable QContactGeoLocation::DefinitionName
-
-   The constant string which identifies the definition of details
-   which describe a location associated with a contact.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::DefinitionName, "GeoLocation");
-
-/*!
-   \variable QContactGlobalPresence::DefinitionName
-   The constant string which identifies the definition of details which contain presence information.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGlobalPresence::DefinitionName, "GlobalPresence");
-
-/*!
-   \variable QContactGlobalPresence::FieldTimestamp
-
-   The constant key for which the last update timestamp value is stored in details
-   of the QContactGlobalPresence type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGlobalPresence::FieldTimestamp, "Timestamp");
-
-/*!
-   \variable QContactGlobalPresence::FieldNickname
-
-   The constant key for which the nickname value is stored in details
-   of the QContactGlobalPresence type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGlobalPresence::FieldNickname, "Nickname");
-
-/*!
-   \variable QContactGlobalPresence::FieldPresenceState
-
-   The constant key for which the presence state value is stored in details
-   of the QContactGlobalPresence typel.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGlobalPresence::FieldPresenceState, "PresenceState");
-
-/*!
-   \variable QContactGlobalPresence::FieldPresenceStateText
-
-   The constant key for which the presence provider provided text representation
-   of the presence state is stored in details of the QContactGlobalPresence type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGlobalPresence::FieldPresenceStateText, "PresenceStateText");
-
-/*!
-   \variable QContactGlobalPresence::FieldPresenceStateImageUrl
-
-   The constant key for which the image url value for the current presence state
-   is stored in details of the QContactGlobalPresence type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGlobalPresence::FieldPresenceStateImageUrl, "PresenceStateImageUrl");
-
-/*!
-   \variable QContactGlobalPresence::FieldCustomMessage
-
-   The constant key for which the user-entered custom message for their state
-   is stored in details of the QContactGlobalPresence type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGlobalPresence::FieldCustomMessage, "CustomMessage");
-
-/*!
-   \variable QContactOnlineAccount::DefinitionName
-
-   The constant string which identifies the definition of details
-   which identify the organization to which a contact belongs in a
-   given context.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::DefinitionName, "OnlineAccount");
-
-/*!
-   \variable QContactTag::DefinitionName
-   The constant string which identifies the definition of details which are tags.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactTag::DefinitionName, "Tag");
-
-/*!
-   \variable QContactThumbnail::DefinitionName
-   The constant string which identifies the definition of details which are thumbnails.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactThumbnail::DefinitionName, "Thumbnail");
-
-/*!
-   \variable QContactOnlineAccount::FieldCapabilities
-
-   The constant key for which the account capabilities value is stored in
-   details of the QContactOnlineAccount type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::FieldCapabilities, "Capabilities");
-
-/*!
-   \variable QContactOnlineAccount::FieldAccountUri
-
-   The constant key for which the remote account uri value is stored
-   in details of the QContactOnlineAccount type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::FieldAccountUri, "AccountUri");
-
-/*!
-   \variable QContactOnlineAccount::FieldServiceProvider
-
-   The constant key for which the service provider value is stored in
-   details of the QContactOnlineAccount type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::FieldServiceProvider, "ServiceProvider");
-
-/*!
-   \variable QContactOnlineAccount::FieldSubTypes
-
-   The constant key for which the subtypes value is stored in details
-   of the QContactOnlineAccount type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::FieldSubTypes, "SubTypes");
-
-/*!
-   \variable QContactOnlineAccount::SubTypeSip
-
-   The constant attribute value which describes the online account as
-   supporting SIP.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::SubTypeSip, "Sip");
-
-/*!
-   \variable QContactOnlineAccount::SubTypeSipVoip
-
-   The constant attribute value which describes the online account as
-   supporting SIP-based VoIP.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::SubTypeSipVoip, "SipVoip");
-
-/*!
-   \variable QContactOnlineAccount::SubTypeImpp
-
-   The constant attribute value which describes the online account as
-   supporting IMPP.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::SubTypeImpp, "Impp");
-
-/*!
-   \variable QContactOnlineAccount::SubTypeVideoShare
-
-   The constant attribute value which describes the online account as
-   supporting VideoShare.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::SubTypeVideoShare, "VideoShare");
-
-/*!
-   \variable QContactOrganization::DefinitionName
-
-   The constant string which identifies the definition of details
-   which identify the organization to which a contact belongs in a
-   given context.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::DefinitionName, "Organization");
-
-/*!
-   \variable QContactDisplayLabel::DefinitionName
-
-   The constant string which identifies the definition of details
-   which contain a display label of a contact.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactDisplayLabel::DefinitionName, "DisplayLabel");
-
-
-/*!
-   \variable QContactPhoneNumber::FieldNumber
-
-   The constant key for which the phone number value is stored in
-   details of the QContactPhoneNumber type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::FieldNumber, "PhoneNumber");
-
-/*!
-   \variable QContactPhoneNumber::FieldSubTypes
-
-   The constant key for which the subtype values are stored in details
-   of the QContactPhoneNumber type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::FieldSubTypes, "SubTypes");
-
-/*!
-   \variable QContactEmailAddress::FieldEmailAddress
-
-   The constant key for which the email address value is stored in
-   details of the QContactEmailAddress type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactEmailAddress::FieldEmailAddress, "EmailAddress");
-
-/*!
-   \variable QContactFamily::FieldSpouse
-
-   The constant key for which the spouse name value is stored in
-   details of the QContactFamily type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactFamily::FieldSpouse, "Spouse");
-
-/*!
-   \variable QContactFamily::FieldChildren
-
-   The constant key for which the children names value is stored in
-   details of the QContactFamily type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactFamily::FieldChildren, "Children");
-
-/*!
-   \variable QContactGuid::FieldGuid
-
-   The constant key for which the globally unique identifier value is
-   stored in details of the QContactGuid type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGuid::FieldGuid, "Guid");
-
-/*!
-   \variable QContactSyncTarget::FieldSyncTarget
-
-   The constant key for which the value of the target store for
-   synchronization is stored in details of the QContactSyncTarget type.
+    \variable QContactSyncTarget::FieldSyncTarget
+
+   The field key constant for the sync target value.
+   \sa syncTarget(), setSyncTarget()
  */
 Q_DEFINE_LATIN1_CONSTANT(QContactSyncTarget::FieldSyncTarget, "SyncTarget");
 
 /*!
-   \variable QContactAvatar::FieldImageUrl
-
-   The constant key for which the url of the avatar image value is stored in
-   details of the QContactAvatar type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAvatar::FieldImageUrl, "ImageUrl");
-
-/*!
-   \variable QContactAvatar::FieldVideoUrl
-
-   The constant key for which the url of the avatar video value is stored in
-   details of the QContactAvatar type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAvatar::FieldVideoUrl, "VideoUrl");
-
-/*!
-   \variable QContactName::FieldPrefix
-
-   The constant key for which the name prefix value is stored in
-   details of the QContactName type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactName::FieldPrefix, "Prefix");
-
-/*!
-   \variable QContactName::FieldFirstName
-
-   The constant key for which the first name value is stored in
-   details of the QContactName type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactName::FieldFirstName, "FirstName");
-
-/*!
-   \variable QContactName::FieldMiddleName
-
-   The constant key for which the middle name value is stored in
-   details of the QContactName type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactName::FieldMiddleName, "MiddleName");
-
-/*!
-   \variable QContactName::FieldLastName
-
-   The constant key for which the last name value is stored in details
-   of the QContactName type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactName::FieldLastName, "LastName");
-
-/*!
-   \variable QContactName::FieldSuffix
-
-   The constant key for which the name suffix value is stored in
-   details of the QContactName type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactName::FieldSuffix, "Suffix");
-
-/*!
-   \variable QContactName::FieldCustomLabel
-
-   The constant key for which the custom name label value is stored in
-   details of the QContactName type, if supported.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactName::FieldCustomLabel, "CustomLabel");
-
-/*!
-   \variable QContactNickname::FieldNickname
-
-   The constant key for which the nickname value is stored in details
-   of the QContactNickname type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactNickname::FieldNickname, "Nickname");
-
-/*!
-   \variable QContactNote::FieldNote
-
-   The constant key for which the note value is stored in details of
-   the QContactNote type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactNote::FieldNote, "Note");
-
-/*!
-   \variable QContactAddress::FieldStreet
-
-   The constant key for which the street value is stored in details of
-   the QContactAddress type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAddress::FieldStreet, "Street");
-
-/*!
-   \variable QContactAddress::FieldLocality
-
-   The constant key for which the locality value is stored in details
-   of the QContactAddress type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAddress::FieldLocality, "Locality");
-
-/*!
-   \variable QContactAddress::FieldRegion
-
-   The constant key for which the region value is stored in details of
-   the QContactAddress type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAddress::FieldRegion, "Region");
-
-/*!
-   \variable QContactAddress::FieldPostcode
-
-   The constant key for which the postcode value is stored in details
-   of the QContactAddress type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAddress::FieldPostcode, "Postcode");
-
-/*!
-   \variable QContactAddress::FieldCountry
-
-   The constant key for which the country value is stored in details
-   of the QContactAddress type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAddress::FieldCountry, "Country");
-
-/*!
-   \variable QContactAddress::FieldPostOfficeBox
-
-   The constant key for which the post office box value is stored in
-   details of the QContactAddress type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAddress::FieldPostOfficeBox, "PostOfficeBox");
-
-/*!
-   \variable QContactAddress::FieldSubTypes
-
-   The constant key for which the subtypes value is stored in details
-   of the QContactAddress type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAddress::FieldSubTypes, "SubTypes");
-
-/*!
-   \variable QContactUrl::FieldUrl
-
-   The constant key for which the url value is stored in details of
-   the QContactUrl type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactUrl::FieldUrl, "Url");
-
-/*!
-   \variable QContactUrl::FieldSubType
-
-   The constant key for which the subtypes value is stored in details
-   of the QContactUrl type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactUrl::FieldSubType, "SubType");
-
-/*!
-   \variable QContactBirthday::FieldBirthday
-
-   The constant key for which the birthday date value is stored in
-   details of the QContactBirthday type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactBirthday::FieldBirthday, "Birthday");
-
-/*!
-   \variable QContactAnniversary::FieldOriginalDate
-
-   The constant key for which the anniversary original event date
-   value is stored in details of the QContactAnniversary type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::FieldOriginalDate, "OriginalDate");
-
-/*!
-   \variable QContactAnniversary::FieldEvent
-
-   The constant key for which the name of the event is stored in
-   details of the QContactAnniversary type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::FieldEvent, "Event");
-
-/*!
-   \variable QContactAnniversary::FieldCalendarId
-
-   The constant key for which the value of the identifier of the
-   associated calendar entry is stored in details of the
-   QContactAnniversary type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::FieldCalendarId, "CalendarId");
-
-/*!
-   \variable QContactAnniversary::FieldSubType
-
-   The constant key for which the subtypes value is stored in details
-   of the QContactAnniversary type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::FieldSubType, "SubType");
-
-/*!
-   \variable QContactDisplayLabel::FieldLabel
-
-   The constant key for which the display label value is stored in
-   details of the QContactDisplayLabel type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactDisplayLabel::FieldLabel, "Label");
-
-/*!
-   \variable QContactGender::FieldGender
-
-   The constant key for which the gender value is stored in details of
-   the QContactGender type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGender::FieldGender, "Gender");
-
-/*!
-   \variable QContactGender::GenderMale
-   The value that identifies this contact as being male.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGender::GenderMale, "Male");
-
-/*!
-   \variable QContactGender::GenderFemale
-   The value that identifies this contact as being female.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGender::GenderFemale, "Female");
-
-/*!
-   \variable QContactGender::GenderUnspecified
-   The value that identifies this contact as being of unspecified gender.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGender::GenderUnspecified, "Unspecified");
-
-/*!
-   \variable QContactGeoLocation::FieldLabel
-
-   The constant key for which the location label value is stored in
-   details of the QContactGeoLocation type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldLabel, "Label");
-
-/*!
-   \variable QContactGeoLocation::FieldLatitude
-
-   The constant key for which the latitude value is stored in details
-   of the QContactGeoLocation type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldLatitude, "Latitude");
-
-/*!
-   \variable QContactGeoLocation::FieldLongitude
-
-   The constant key for which the longitude value is stored in details
-   of the QContactGeoLocation type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldLongitude, "Longitude");
-
-/*!
-   \variable QContactGeoLocation::FieldAccuracy
-
-   The constant key for which the location accuracy value is stored in
-   details of the QContactGeoLocation type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldAccuracy, "Accuracy");
-
-/*!
-   \variable QContactGeoLocation::FieldAltitude
-
-   The constant key for which the altitude value is stored in details
-   of the QContactGeoLocation type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldAltitude, "Altitude");
-
-
-/*!
-   \variable QContactGeoLocation::FieldAltitudeAccuracy
-
-   The constant key for which the altitude accuracy value is stored in
-   details of the QContactGeoLocation type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldAltitudeAccuracy, "AltitudeAccuracy");
-
-/*!
-   \variable QContactGeoLocation::FieldHeading
-
-   The constant key for which the heading value is stored in details
-   of the QContactGeoLocation type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldHeading, "Heading");
-
-/*!
-   \variable QContactGeoLocation::FieldSpeed
-
-   The constant key for which the speed value is stored in details of
-   the QContactGeoLocation type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldSpeed, "Speed");
-
-/*!
-   \variable QContactTag::FieldTag
-
-   The constant key for which the tag value is stored in details
-   of the QContactTag type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactTag::FieldTag, "Tag");
-
-/*!
-   \variable QContactGeoLocation::FieldTimestamp
-
-   The constant key for which the timestamp value is stored in details
-   of the QContactGeoLocation type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldTimestamp, "Timestamp");
-
-/*!
-   \variable QContactOrganization::FieldName
-
-   The constant key for which the name value is stored in details of
-   the QContactOrganization type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::FieldName, "Name");
-
-/*!
-   \variable QContactOrganization::FieldLogoUrl
-
-   The constant key for which the logo url is stored in details
-   of the QContactOrganization type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::FieldLogoUrl, "LogoUrl");
-
-/*!
-   \variable QContactOrganization::FieldDepartment
-
-   The constant key for which the organization's department value is
-   stored in details of the QContactOrganization type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::FieldDepartment, "Department");
-
-/*!
-   \variable QContactOrganization::FieldLocation
-
-   The constant key for which the organization's location (or the
-   location of the contact's part of the organization) value is stored
-   in details of the QContactOrganization type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::FieldLocation, "Location");
-
-/*!
-   \variable QContactOrganization::FieldRole
-
-   The constant key for which the contact's role within the
-   organization is stored in details of the QContactOrganization type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::FieldRole, "Role");
-
-/*!
-   \variable QContactOrganization::FieldTitle
-
-   The constant key for which the contact's title within the
-   organization is stored in details of the QContactOrganization type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::FieldTitle, "Title");
-
-/*!
-   \variable QContactOrganization::FieldAssistantName
-
-   The constant key for which the contact's assistant name within the
-   organization is stored in details of the QContactOrganization type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::FieldAssistantName, "AssistantName");
-
-/*!
-   \variable QContactRingtone::FieldAudioRingtoneUrl
-
-   The constant key for which the uri of the audio ringtone value is
-   stored in details of the QContactRingtone type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactRingtone::FieldAudioRingtoneUrl, "AudioRingtoneUrl");
-
-/*!
-   \variable QContactRingtone::FieldVideoRingtoneUrl
-
-   The constant key for which the uri of the video ringtone value is
-   stored in details of the QContactRingtone type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactRingtone::FieldVideoRingtoneUrl, "VideoRingtoneUrl");
-
-/*!
-   \variable QContactRingtone::FieldVibrationRingtoneUrl
-
-   The constant key for which the uri of the vibration ringtone value is
-   stored in details of the QContactRingtone type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactRingtone::FieldVibrationRingtoneUrl, "VibrationRingtoneUrl");
-
-/*!
-   \variable QContactThumbnail::FieldThumbnail
-
-   The constant key for which the thumbnail image is stored in details
-   of the QContactThumbnail type.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactThumbnail::FieldThumbnail, "Thumbnail");
-
-/*!
-   \variable QContactTimestamp::FieldModificationTimestamp
-
-   The constant key for the value which is stored in details of the
-   QContactTimestamp type which describes the last modification date
-   and time of a contact.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactTimestamp::FieldModificationTimestamp, "ModificationTimestamp");
-
-/*!
-   \variable QContactTimestamp::FieldCreationTimestamp
-
-   The constant key for the value which is stored in details of the
-   QContactTimestamp type which describes the creation date and time
-   of a contact.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactTimestamp::FieldCreationTimestamp, "CreationTimestamp");
-
-/*!
-   \variable QContactType::FieldType
-
-   The constant key for the type value which is stored in details of
-   the QContactType definition.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactType::FieldType, "Type");
-
-
-/*!
-   \variable QContactType::TypeContact
-
-   The constant attribute value which describes the contact as being
-   an ordinary contact.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactType::TypeContact, "Contact");
-
-/*!
-   \variable QContactType::TypeGroup
-
-   The constant attribute value which describes the contact as being a
-   group.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactType::TypeGroup, "Group");
-
-/*!
-   \variable QContactPhoneNumber::SubTypeLandline
-
-   The constant attribute value which describes the phone number as
-   identifying a landline phone.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeLandline, "Landline");
-
-/*!
-   \variable QContactPhoneNumber::SubTypeMobile
-
-   The constant attribute value which describes the phone number as
-   identifying a mobile phone.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeMobile, "Mobile");
-
-/*!
-   \variable QContactPhoneNumber::SubTypeFax
-
-   The constant attribute value which describes the phone number as
-   identifying a fax machine.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeFax, "Fax");
-
-/*!
-   \variable QContactPhoneNumber::SubTypePager
-
-   The constant attribute value which describes the phone number as
-   identifying a pager device.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypePager, "Pager");
-
-/*!
-   \variable QContactPhoneNumber::SubTypeCar
-
-   The constant attribute value which describes the phone number as
-   identifying a car phone.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeCar, "Car");
-
-/*!
-   \variable QContactPhoneNumber::SubTypeBulletinBoardSystem
-
-   The constant attribute value which describes the phone number as
-   identifying a bulletin board system.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeBulletinBoardSystem, "BulletinBoardSystem");
-
-/*!
-   \variable QContactPhoneNumber::SubTypeVoice
-
-   The constant attribute value which describes the phone number as
-   supporting voice transmission.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeVoice, "Voice");
-
-/*!
-   \variable QContactPhoneNumber::SubTypeModem
-
-   The constant attribute value which describes the phone number as
-   supporting digital data transfer.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeModem, "Modem");
-
-/*!
-   \variable QContactPhoneNumber::SubTypeVideo
-
-   The constant attribute value which describes the phone number as
-   supporting video transmission.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeVideo, "Video");
-
-/*!
-   \variable QContactPhoneNumber::SubTypeMessagingCapable
-
-   The constant attribute value which describes the phone number as
-   supporting messaging services.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeMessagingCapable, "MessagingCapable");
-
-/*!
-   \variable QContactPhoneNumber::SubTypeAssistant
-
-   The constant attribute value which describes the phone number as an
-   assistant phone number.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeAssistant, "Assistant");
-
-/*!
-   \variable QContactPhoneNumber::SubTypeDtmfMenu
-
-   The constant attribute value which describes the phone number as
-   supporting DTMF-controlled electronic menu navigation.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeDtmfMenu, "DtmfMenu");
-
-/*!
-   \variable QContactAddress::SubTypeParcel
-
-   The constant attribute value which describes the address as being
-   an address for parcel delivery.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAddress::SubTypeParcel, "Parcel");
-
-/*!
-   \variable QContactAddress::SubTypePostal
-
-   The constant attribute value which describes the address as being
-   an address for postal delivery.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAddress::SubTypePostal, "Postal");
-
-/*!
-   \variable QContactAddress::SubTypeDomestic
-
-   The constant attribute value which describes the address as being a
-   domestic address.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAddress::SubTypeDomestic, "Domestic");
-
-/*!
-   \variable QContactAddress::SubTypeInternational
-
-   The constant attribute value which describes the address as being
-   an international address.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAddress::SubTypeInternational, "International");
-
-/*!
-   \variable QContactUrl::SubTypeHomePage
-
-   The constant attribute value which describes the url as being the
-   homepage of the contact.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactUrl::SubTypeHomePage, "HomePage");
-
-/*!
-   \variable QContactUrl::SubTypeFavourite
-
-   The constant attribute value which describes the url as being a
-   favourite page of the contact.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactUrl::SubTypeFavourite, "Favourite");
-
-/*!
-   \variable QContactAnniversary::SubTypeWedding
-
-   The constant attribute value which describes the anniversary as
-   being a wedding anniversary.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::SubTypeWedding, "Wedding");
-
-/*!
-   \variable QContactAnniversary::SubTypeEngagement
-
-   The constant attribute value which describes the anniversary as
-   being an engagement anniversary.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::SubTypeEngagement, "Engagement");
-
-/*!
-   \variable QContactAnniversary::SubTypeHouse
-
-   The constant attribute value which describes the anniversary as
-   being an anniversary of ownership of a particular residence.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::SubTypeHouse, "House");
-
-/*!
-   \variable QContactAnniversary::SubTypeEmployment
-
-   The constant attribute value which describes the anniversary as
-   being an anniversary of employment at a particular company.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::SubTypeEmployment, "Employment");
-
-/*!
-   \variable QContactAnniversary::SubTypeMemorial
-
-   The constant attribute value which describes the anniversary as
-   being an anniversary of an event of sentimental significance.
- */
-Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::SubTypeMemorial, "Memorial");
-
-
-/*!
    \fn QContactSyncTarget::syncTarget() const
 
    Returns the identifier of the backend store to which the contact
@@ -1236,6 +108,31 @@
    containing this detail should be synchronized to \a syncTarget.
  */
 
+/* ==================== QContactEmailAddress ======================= */
+
+
+/*!
+   \class QContactEmailAddress
+
+   \brief The QContactEmailAddress class contains an email address of
+   a contact.
+   \ingroup contacts-details
+ */
+
+/*!
+   \variable QContactEmailAddress::DefinitionName
+   The string constant for the definition name of QContactEmailAddress details.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactEmailAddress::DefinitionName, "EmailAddress");
+
+/*!
+   \variable QContactEmailAddress::FieldEmailAddress
+
+   The field key constant for the email address value.
+   \sa emailAddress(), setEmailAddress()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactEmailAddress::FieldEmailAddress, "EmailAddress");
+
 /*!
    \fn QContactEmailAddress::emailAddress() const
    Returns the email address of the contact which is stored in this detail.
@@ -1246,6 +143,36 @@
    Sets the email address of the contact which is stored in this detail to \a emailAddress.
  */
 
+/* ==================== QContactFamily ======================= */
+/*!
+   \class QContactFamily
+   \brief The QContactFamily class contains names of
+   family members of a contact.
+   \ingroup contacts-details
+ */
+
+/*!
+   \variable QContactFamily::DefinitionName
+   The string constant for the definition name of QContactFamily details.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactFamily::DefinitionName, "Family");
+
+/*!
+   \variable QContactFamily::FieldSpouse
+
+   The field key constant for the value containing the name of a spouse.
+   \sa spouse(), setSpouse()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactFamily::FieldSpouse, "Spouse");
+
+/*!
+   \variable QContactFamily::FieldChildren
+
+   The field key constant for the value containing the names of children.
+   \sa children(), setChildren()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactFamily::FieldChildren, "Children");
+
 /*!
    \fn QContactFamily::spouse() const
    Returns the name of the spouse of the contact which is stored in this detail.
@@ -1266,6 +193,100 @@
    Sets the names of the children of the contact which is stored in this detail to \a childrenNames.
  */
 
+/* ==================== QContactAnniversary ======================= */
+
+/*!
+   \class QContactAnniversary
+   \brief The QContactAnniversary class contains an anniversary of a contact.
+   \ingroup contacts-details
+ */
+
+/*!
+   \variable QContactAnniversary::DefinitionName
+   The string constant for the definition name of QContactAnniversary details.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::DefinitionName, "Anniversary");
+
+/*!
+   \variable QContactAnniversary::FieldOriginalDate
+
+   The field key constant for the original anniversary date value.
+   \sa originalDate(), setOriginalDate()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::FieldOriginalDate, "OriginalDate");
+
+/*!
+   \variable QContactAnniversary::FieldEvent
+
+   The field key constant for the name of the event value.
+   \sa event(), setEvent()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::FieldEvent, "Event");
+
+/*!
+   \variable QContactAnniversary::FieldCalendarId
+
+   The field key constant for the value containing the id of the calendar event.
+   \sa calendarId(), setCalendarId()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::FieldCalendarId, "CalendarId");
+
+/*!
+   \variable QContactAnniversary::FieldSubType
+
+   The field key constant for the field that stores the sub type of a QContactAnniversary.
+   \sa subType(), setSubType()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::FieldSubType, "SubType");
+
+
+/*!
+   \variable QContactAnniversary::SubTypeWedding
+
+    The predefined string constant for a sub type value,
+    indicating this anniversary is a wedding anniversary.
+    \sa subType(), setSubType()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::SubTypeWedding, "Wedding");
+
+/*!
+   \variable QContactAnniversary::SubTypeEngagement
+
+    The predefined string constant for a sub type value,
+    indicating this anniversary is the anniversary of an engagement.
+    \sa subType(), setSubType()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::SubTypeEngagement, "Engagement");
+
+/*!
+   \variable QContactAnniversary::SubTypeHouse
+   \internal
+
+    The predefined string constant for a sub type value,
+    indicating this anniversary is the anniversary of a new residence.
+    \sa subType(), setSubType()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::SubTypeHouse, "House");
+
+/*!
+   \variable QContactAnniversary::SubTypeEmployment
+
+    The predefined string constant for a sub type value,
+    indicating this anniversary is the anniversary of a start of
+    employment.
+    \sa subType(), setSubType()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::SubTypeEmployment, "Employment");
+
+/*!
+   \variable QContactAnniversary::SubTypeMemorial
+
+    The predefined string constant for a sub type value,
+    indicating this anniversary is an anniversary of an event of sentimental significance.
+    \sa subType(), setSubType()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAnniversary::SubTypeMemorial, "Memorial");
+
 /*!
    \fn QContactAnniversary::originalDate() const
    Returns the original date of occurrence of the event stored in this detail.
@@ -1306,6 +327,36 @@
    Returns the subtype that this detail implements, if defined.
  */
 
+/* ==================== QContactAvatar ======================= */
+
+/*!
+   \class QContactAvatar
+   \brief The QContactAvatar class contains the avatar of a contact.
+   \ingroup contacts-details
+ */
+
+/*!
+   \variable QContactAvatar::DefinitionName
+   The string constant for the definition name of QContactAvatar details.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAvatar::DefinitionName, "Avatar");
+
+/*!
+   \variable QContactAvatar::FieldImageUrl
+
+   The field key constant for the value containing the URL of the avatar image.
+   \sa imageUrl(), setImageUrl()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAvatar::FieldImageUrl, "ImageUrl");
+
+/*!
+   \variable QContactAvatar::FieldVideoUrl
+
+   The field key constant for the value containing the URL of a video avatar.
+   \sa videoUrl(), setVideoUrl()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAvatar::FieldVideoUrl, "VideoUrl");
+
 /*!
   \fn QContactAvatar::imageUrl() const
   Returns the url of an avatar image associated with the contact
@@ -1326,6 +377,114 @@
   Sets the url of an avatar video associated with the contact to \a videoUrl
  */
 
+/* ==================== QContactAddress ======================= */
+
+
+// XXX TODO - explain the different segments and their typical mapping
+/*!
+   \class QContactAddress
+   \brief The QContactAddress class contains an address of a contact.
+   \ingroup contacts-details
+ */
+
+/*!
+   \variable QContactAddress::DefinitionName
+   The string constant for the definition name of QContactAddress details.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::DefinitionName, "Address");
+
+/*!
+   \variable QContactAddress::FieldStreet
+
+   The field key constant for the value containing the street segment.
+   \sa street(), setStreet()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::FieldStreet, "Street");
+
+/*!
+   \variable QContactAddress::FieldLocality
+
+   The field key constant for the value containing the locality segment.
+   \sa locality(), setLocality()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::FieldLocality, "Locality");
+
+/*!
+   \variable QContactAddress::FieldRegion
+
+   The field key constant for the value containing the region segment.
+   \sa region(), setRegion()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::FieldRegion, "Region");
+
+/*!
+   \variable QContactAddress::FieldPostcode
+
+   The field key constant for the value containing the postcode segment.
+   \sa postcode(), setPostcode()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::FieldPostcode, "Postcode");
+
+/*!
+   \variable QContactAddress::FieldCountry
+
+   The field key constant for the value containing the country segment.
+   \sa country(), setCountry()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::FieldCountry, "Country");
+
+/*!
+   \variable QContactAddress::FieldPostOfficeBox
+
+   The field key constant for the value containing the post office box segment.
+   \sa postOfficeBox(), setPostOfficeBox()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::FieldPostOfficeBox, "PostOfficeBox");
+
+/*!
+   \variable QContactAddress::FieldSubTypes
+
+   The field key constant for the field that stores the sub types of a QContactAddress.
+   \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::FieldSubTypes, "SubTypes");
+
+/*!
+   \variable QContactAddress::SubTypeParcel
+
+    The predefined string constant for a sub type value,
+    indicating this address is an address for parcel delivery.
+    \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::SubTypeParcel, "Parcel");
+
+/*!
+   \variable QContactAddress::SubTypePostal
+
+    The predefined string constant for a sub type value,
+    indicating this address is an address for postal delivery.
+    \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::SubTypePostal, "Postal");
+
+/*!
+   \variable QContactAddress::SubTypeDomestic
+
+    The predefined string constant for a sub type value,
+    indicating this address is an address for domestic mail delivery.
+    \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::SubTypeDomestic, "Domestic");
+
+/*!
+   \variable QContactAddress::SubTypeInternational
+
+    The predefined string constant for a sub type value,
+    indicating this address is an address for international mail delivery.
+    \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactAddress::SubTypeInternational, "International");
+
 /*!
    \fn QContactAddress::postOfficeBox() const
    Returns the post office box segment of the address stored in this detail.
@@ -1401,6 +560,55 @@
    Returns the list of subtypes that this detail implements.
  */
 
+/* ==================== QContactUrl ======================= */
+
+/*!
+   \class QContactUrl
+   \brief The QContactUrl class contains a url associated with
+   a contact.
+   \ingroup contacts-details
+ */
+
+/*!
+   \variable QContactUrl::DefinitionName
+   The string constant for the definition name of QContactUrl details.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactUrl::DefinitionName, "Url");
+
+/*!
+   \variable QContactUrl::FieldUrl
+
+   The field key constant for the value containing the URL.
+   \sa url(), setUrl()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactUrl::FieldUrl, "Url");
+
+/*!
+   \variable QContactUrl::FieldSubType
+
+   The field key constant for the field that stores the sub type of a QContactUrl.
+   \sa subType(), setSubType()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactUrl::FieldSubType, "SubType");
+
+/*!
+   \variable QContactUrl::SubTypeHomePage
+
+    The predefined string constant for a sub type value,
+    indicating this url is a contact's home page.
+    \sa subType(), setSubType()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactUrl::SubTypeHomePage, "HomePage");
+
+/*!
+   \variable QContactUrl::SubTypeFavourite
+
+    The predefined string constant for a sub type value,
+    indicating this url is one of the contact's favourite URLs (or bookmarks).
+    \sa subType(), setSubType()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactUrl::SubTypeFavourite, "Favourite");
+
 /*!
    \fn QContactUrl::url() const
    Returns the url stored in this detail.
@@ -1421,6 +629,147 @@
    Returns the subtype that this detail implements, if defined.
  */
 
+/* ==================== QContactPhonenumber ======================= */
+
+/*!
+    \class QContactPhoneNumber
+    \brief The QContactPhoneNumber class provides a phone number
+    of a contact.
+    \ingroup contacts-details
+*/
+
+
+/*!
+    \variable QContactPhoneNumber::DefinitionName
+    The string constant for the definition name of QContactPhoneNumber details.
+*/
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::DefinitionName, "PhoneNumber");
+
+/*!
+   \variable QContactPhoneNumber::FieldNumber
+
+   The field key constant for the value containing the phone number.
+   \sa number(), setNumber()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::FieldNumber, "PhoneNumber");
+
+/*!
+   \variable QContactPhoneNumber::FieldSubTypes
+
+   The field key constant for the field that stores the sub types of a QContactPhoneNumber.
+   \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::FieldSubTypes, "SubTypes");
+
+/*!
+   \variable QContactPhoneNumber::SubTypeLandline
+
+    The predefined string constant for a sub type value,
+    indicating this phone number is a landline number.
+    \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeLandline, "Landline");
+
+/*!
+   \variable QContactPhoneNumber::SubTypeMobile
+
+    The predefined string constant for a sub type value,
+    indicating this phone number is a mobile (cellular) number.
+    \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeMobile, "Mobile");
+
+/*!
+   \variable QContactPhoneNumber::SubTypeFax
+
+    The predefined string constant for a sub type value,
+    indicating this phone number is a fax number.
+    \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeFax, "Fax");
+
+/*!
+   \variable QContactPhoneNumber::SubTypePager
+
+    The predefined string constant for a sub type value,
+    indicating this phone number is a pager number.
+    \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypePager, "Pager");
+
+/*!
+   \variable QContactPhoneNumber::SubTypeCar
+
+    The predefined string constant for a sub type value,
+    indicating this phone number is a car phone.
+    \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeCar, "Car");
+
+/*!
+   \variable QContactPhoneNumber::SubTypeBulletinBoardSystem
+
+    The predefined string constant for a sub type value,
+    indicating this phone number is a bulletin board system.
+    \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeBulletinBoardSystem, "BulletinBoardSystem");
+
+/*!
+   \variable QContactPhoneNumber::SubTypeVoice
+
+    The predefined string constant for a sub type value,
+    indicating this phone number supports voice transmission.
+    \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeVoice, "Voice");
+
+/*!
+   \variable QContactPhoneNumber::SubTypeModem
+
+    The predefined string constant for a sub type value,
+    indicating this phone number supports data transmission.
+    \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeModem, "Modem");
+
+/*!
+   \variable QContactPhoneNumber::SubTypeVideo
+
+    The predefined string constant for a sub type value,
+    indicating this phone number supports video transmission.
+    \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeVideo, "Video");
+
+/*!
+   \variable QContactPhoneNumber::SubTypeMessagingCapable
+
+    The predefined string constant for a sub type value,
+    indicating this phone number supports messaging services.
+    \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeMessagingCapable, "MessagingCapable");
+
+/*!
+   \variable QContactPhoneNumber::SubTypeAssistant
+
+    The predefined string constant for a sub type value,
+    indicating this phone number is the number of an assistant.
+    \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeAssistant, "Assistant");
+
+/*!
+   \variable QContactPhoneNumber::SubTypeDtmfMenu
+
+    The predefined string constant for a sub type value,
+    indicating this phone number supports DTMF-controlled voice menu navigation.
+    \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPhoneNumber::SubTypeDtmfMenu, "DtmfMenu");
+
+
 /*!
    \fn QContactPhoneNumber::number() const
    Returns the phone number stored in this detail.
@@ -1446,6 +795,28 @@
    Returns the list of subtypes that this detail implements.
  */
 
+/* ==================== QContactBirthday ======================= */
+
+/*!
+   \class QContactBirthday
+   \brief The QContactBirthday class contains a birthday of a contact.
+   \ingroup contacts-details
+ */
+
+/*!
+   \variable QContactBirthday::DefinitionName
+   The string constant for the definition name of QContactBirthday details.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactBirthday::DefinitionName, "Birthday");
+
+/*!
+   \variable QContactBirthday::FieldBirthday
+
+   The field key constant for the value containing the birthday date.
+   \sa date(), setDate()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactBirthday::FieldBirthday, "Birthday");
+
 /*!
    \fn QContactBirthday::date() const
    Returns the date of the birthday which is stored in this detail.
@@ -1456,6 +827,46 @@
    Sets the date of the birthday which is stored in this detail to \a date.
  */
 
+/* ==================== QContactGender ======================= */
+
+/*!
+   \class QContactGender
+   \brief The QContactGender class contains the gender of a contact.
+   \ingroup contacts-details
+ */
+
+/*!
+   \variable QContactGender::DefinitionName
+   The string constant for the definition name of QContactGender details.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGender::DefinitionName, "Gender");
+
+/*!
+   \variable QContactGender::FieldGender
+
+   The field key constant for the value containing the gender.
+   \sa gender(), setGender()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGender::FieldGender, "Gender");
+
+/*!
+   \variable QContactGender::GenderMale
+   The value that identifies this contact as being male.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGender::GenderMale, "Male");
+
+/*!
+   \variable QContactGender::GenderFemale
+   The value that identifies this contact as being female.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGender::GenderFemale, "Female");
+
+/*!
+   \variable QContactGender::GenderUnspecified
+   The value that identifies this contact as being of unspecified gender.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGender::GenderUnspecified, "Unspecified");
+
 /*!
    \fn QContactGender::gender() const
 
@@ -1472,6 +883,94 @@
    it to "Unspecified".
  */
 
+/* ==================== QContactGeolocation ======================= */
+
+/*!
+   \class QContactGeoLocation
+   \brief The QContactGeoLocation class contains a global location
+   coordinate associated with a contact.
+   \ingroup contacts-details
+*/
+
+/*!
+   \variable QContactGeoLocation::DefinitionName
+   The string constant for the definition name of QContactGeoLocation details.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::DefinitionName, "GeoLocation");
+
+/*!
+   \variable QContactGeoLocation::FieldLabel
+
+   The field key constant for the value containing the location label.
+   \sa label(), setLabel()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldLabel, "Label");
+
+/*!
+   \variable QContactGeoLocation::FieldLatitude
+
+   The field key constant for the value containing the latitude.
+   \sa latitude(), setLatitude()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldLatitude, "Latitude");
+
+/*!
+   \variable QContactGeoLocation::FieldLongitude
+
+   The field key constant for the value containing the longitude.
+   \sa longitude(), setLongitude()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldLongitude, "Longitude");
+
+/*!
+   \variable QContactGeoLocation::FieldAccuracy
+
+   The field key constant for the value containing the location (latitude/longitude) accuracy.
+   \sa accuracy(), setAccuracy()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldAccuracy, "Accuracy");
+
+/*!
+   \variable QContactGeoLocation::FieldAltitude
+
+   The field key constant for the value containing the altitude.
+   \sa altitude(), setAltitude()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldAltitude, "Altitude");
+
+
+/*!
+   \variable QContactGeoLocation::FieldAltitudeAccuracy
+
+   The field key constant for the value containing the accuracy of the altitude.
+   \sa altitudeAccuracy(), setAltitudeAccuracy()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldAltitudeAccuracy, "AltitudeAccuracy");
+
+/*!
+   \variable QContactGeoLocation::FieldHeading
+
+   The field key constant for the value containing the heading.
+   \sa heading(), setHeading()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldHeading, "Heading");
+
+/*!
+   \variable QContactGeoLocation::FieldSpeed
+
+   The field key constant for the value containing the speed.
+   \sa speed(), setSpeed()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldSpeed, "Speed");
+
+/*!
+   \variable QContactGeoLocation::FieldTimestamp
+
+   The field key constant for the value containing the timestamp of the location information.
+   \sa timestamp(), setTimestamp()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGeoLocation::FieldTimestamp, "Timestamp");
+
 /*!
    \fn QContactGeoLocation::setLabel(const QString& label)
    Sets the label of the location stored in the detail to \a label.
@@ -1595,6 +1094,29 @@
    detail.
  */
 
+/* ==================== QContactGuid ======================= */
+
+/*!
+   \class QContactGuid
+   \brief The QContactGuid class contains a globally unique
+   Id of a contact, for use in synchronization with other datastores.
+   \ingroup contacts-details
+ */
+
+/*!
+   \variable QContactGuid::DefinitionName
+   The string constant for the definition name of QContactGuid details.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGuid::DefinitionName, "Guid");
+
+/*!
+   \variable QContactGuid::FieldGuid
+
+   The field key constant for the value containing the GUID.
+   \sa guid(), setGuid()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGuid::FieldGuid, "Guid");
+
 /*!
    \fn QContactGuid::guid() const
 
@@ -1607,6 +1129,68 @@
    Sets the globally unique identifier which is stored in this detail to \a guid.
  */
 
+/* ==================== QContactName ======================= */
+
+/*!
+   \class QContactName
+   \brief The QContactName class contains a name of a contact.
+   \ingroup contacts-details
+ */
+
+/*!
+   \variable QContactName::DefinitionName
+   The string constant for the definition name of QContactName details.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactName::DefinitionName, "Name");
+
+/*!
+   \variable QContactName::FieldPrefix
+
+   The field key constant for the value containing the prefix part of the name.
+   \sa prefix(), setPrefix()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactName::FieldPrefix, "Prefix");
+
+/*!
+   \variable QContactName::FieldFirstName
+
+   The field key constant for the value containing the first name part of the name.
+   \sa firstName(), setFirstName()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactName::FieldFirstName, "FirstName");
+
+/*!
+   \variable QContactName::FieldMiddleName
+
+   The field key constant for the value containing the middle name part of the name.
+   \sa middleName(), setMiddleName()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactName::FieldMiddleName, "MiddleName");
+
+/*!
+   \variable QContactName::FieldLastName
+
+   The field key constant for the value containing the last name part of the name.
+   \sa lastName(), setLastName()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactName::FieldLastName, "LastName");
+
+/*!
+   \variable QContactName::FieldSuffix
+
+   The field key constant for the value containing the suffix part of the name.
+   \sa suffix(), setSuffix()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactName::FieldSuffix, "Suffix");
+
+/*!
+   \variable QContactName::FieldCustomLabel
+
+   The field key constant for the value containing a custom formatted label.
+   \sa customLabel(), setCustomLabel()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactName::FieldCustomLabel, "CustomLabel");
+
 /*!
    \fn QContactName::prefix() const
    Returns the prefix segment of the name stored in this detail.
@@ -1671,6 +1255,28 @@
    Sets the custom label of the name stored in this detail to \a customLabel.
  */
 
+/* ==================== QContactNickname ======================= */
+
+/*!
+   \class QContactNickname
+   \brief The QContactNickname class contains a nickname of a contact.
+   \ingroup contacts-details
+ */
+
+/*!
+\variable QContactNickname::DefinitionName
+The string constant for the definition name of QContactNickname details.
+*/
+Q_DEFINE_LATIN1_CONSTANT(QContactNickname::DefinitionName, "Nickname");
+
+/*!
+   \variable QContactNickname::FieldNickname
+
+   The field key constant for the value containing the nickname.
+   \sa nickname(), setNickname()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactNickname::FieldNickname, "Nickname");
+
 /*!
    \fn QContactNickname::setNickname(const QString& nickname)
    Sets the nickname of the contact which is stored in this detail to \a nickname.
@@ -1681,6 +1287,30 @@
    Returns the nickname of the contact which is stored in this detail.
  */
 
+/* ==================== QContactNote ======================= */
+
+/*!
+   \class QContactNote
+   \brief The QContactNote class contains a note associated
+   with a contact.
+   \ingroup contacts-details
+ */
+
+/*!
+   \variable QContactNote::DefinitionName
+   The string constant for the definition name of QContactNote details.
+*/
+Q_DEFINE_LATIN1_CONSTANT(QContactNote::DefinitionName, "Note");
+
+/*!
+   \variable QContactNote::FieldNote
+
+   The field key constant for the value containing the note.
+   \sa note(), setNote()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactNote::FieldNote, "Note");
+
+
 /*!
    \fn QContactNote::setNote(const QString& note)
    Sets a note associated with a contact to \a note.
@@ -1691,6 +1321,29 @@
    Returns a string for a note associated with a contact.
  */
 
+/* ==================== QContactTag ======================= */
+
+/*!
+   \class QContactTag
+   \brief The QContactTag class contains a tag associated with a
+   contact.
+   \ingroup contacts-details
+ */
+
+/*!
+   \variable QContactTag::DefinitionName
+   The string constant for the definition name of QContactTag details.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactTag::DefinitionName, "Tag");
+
+/*!
+   \variable QContactTag::FieldTag
+
+    The field key constant for the value containing the tag.
+   \sa tag(), setTag()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactTag::FieldTag, "Tag");
+
 /*!
    \fn QContactTag::setTag(const QString& tag)
    Sets the tag associated with a contact which is stored in this detail to \a tag.
@@ -1701,6 +1354,29 @@
    Returns the tag associated with a contact which is stored in this detail.
  */
 
+/* ==================== QContactThumbnail ======================= */
+
+/*!
+   \class QContactThumbnail
+   \brief The QContactThumbnail class contains a thumbnail used
+   in display lists to represent the contact.
+   \ingroup contacts-details
+ */
+
+/*!
+   \variable QContactThumbnail::DefinitionName
+   The string constant for the definition name of QContactThumbnail details.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactThumbnail::DefinitionName, "Thumbnail");
+
+/*!
+   \variable QContactThumbnail::FieldThumbnail
+
+   The field key constant for the value containing the thumbnail image.
+   \sa thumbnail(), setThumbnail()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactThumbnail::FieldThumbnail, "Thumbnail");
+
 /*!
   \fn QContactThumbnail::thumbnail() const
   Returns the thumbnail image of the contact
@@ -1711,6 +1387,37 @@
   Sets the thumbnail image of the contact to be \a thumbnail
  */
 
+/* ==================== QContactTimestamp ======================= */
+
+/*!
+   \class QContactTimestamp
+   \brief The QContactTimestamp class contains the creation and
+   last-modified timestamp associated with the contact.
+   \ingroup contacts-details
+ */
+
+/*!
+\variable QContactTimestamp::DefinitionName
+The string constant for the definition name of QContactTimestamp details.
+*/
+Q_DEFINE_LATIN1_CONSTANT(QContactTimestamp::DefinitionName, "Timestamp");
+
+/*!
+   \variable QContactTimestamp::FieldModificationTimestamp
+
+   The field key constant for the value of the last modified timestamp.
+   \sa lastModified(), setLastModified()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactTimestamp::FieldModificationTimestamp, "ModificationTimestamp");
+
+/*!
+   \variable QContactTimestamp::FieldCreationTimestamp
+
+   The field key constant for the value of the timestamp a contact was created.
+   \sa created(), setCreated()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactTimestamp::FieldCreationTimestamp, "CreationTimestamp");
+
 /*!
    \fn QContactTimestamp::created() const
    Returns the creation timestamp saved in this detail.
@@ -1731,6 +1438,55 @@
    Sets the last-modified timestamp saved in this detail to \a dateTime.
  */
 
+/* ==================== QContactType ======================= */
+
+/*!
+   \class QContactType
+   \brief The QContactType class describes the type of the contact.
+   \ingroup contacts-details
+ */
+
+/*!
+\variable QContactType::DefinitionName
+The string constant for the definition name of QContactType details.
+*/
+Q_DEFINE_LATIN1_CONSTANT(QContactType::DefinitionName, "Type");
+
+/*!
+   \variable QContactType::FieldType
+
+   The field key constant for the type value which is stored in details of
+   the QContactType definition.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactType::FieldType, "Type");
+
+
+/*!
+   \variable QContactType::TypeContact
+
+    The predefined string constant for a type value,
+    indicating this contact is an ordinary contact.
+    \sa setType(), type()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactType::TypeContact, "Contact");
+
+/*!
+   \variable QContactType::TypeGroup
+
+    The predefined string constant for a type value,
+    indicating this contact is a group contact.
+
+    Contacts of this type are able to be the first contact in
+    relationships of the \c QContactRelationship::HasMember type.
+
+    To enumerate the ids of members of a group, the client should
+    retrieve the relationships which involve the group from the manager
+    in which the group is saved.
+
+    \sa setType(), type()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactType::TypeGroup, "Group");
+
 /*!
    \fn QContactType::type() const
    Returns the contact type value stored in this detail.
@@ -1741,12 +1497,135 @@
    Sets the type of the contact to be the give \a type.
  */
 
+/* ==================== QContactDisplayLabel ======================= */
+
+// XXX TODO make this better
+/*!
+   \class QContactDisplayLabel
+   \brief The QContactDisplayLabel class is the (possibly synthesized)
+   display label of a contact.
+   \ingroup contacts-details
+ */
+
+/*!
+   \variable QContactDisplayLabel::DefinitionName
+
+   The string constant for the definition name of QContactDisplayLabel details.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactDisplayLabel::DefinitionName, "DisplayLabel");
+
+
+/*!
+   \variable QContactDisplayLabel::FieldLabel
+
+   The field key constant for the value of the display label.
+   \sa label()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactDisplayLabel::FieldLabel, "Label");
 
 /*!
    \fn QContactDisplayLabel::label() const
    Returns the display label of the contact.
  */
 
+/* ==================== QContactOnlineAccount ======================= */
+
+// XXX TODO explain link to QContactPresence
+
+/*!
+   \class QContactOnlineAccount
+   \brief The QContactOnlineAccount class provides an online account,
+   which the contact uses to communicate with friends and family.
+
+   A QContactOnlineAccount consists of the account details required to
+   communicate with the contact, including the account URI, the capabilities
+   of the account, the service provider of the account, and the type of the account.
+
+   Presence information for a particular QContactOnlineAccount detail is provided
+   in a QContactPresence detail which is linked (via linkedDetailUris()) to the
+   account detail.  This information is generally provided by the backend, and is
+   not modifiable by clients.
+
+   \sa QContactPresence
+
+   \ingroup contacts-details
+ */
+
+/*!
+   \variable QContactOnlineAccount::DefinitionName
+   The string constant for the definition name of QContactOnlineAccount details.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::DefinitionName, "OnlineAccount");
+
+/*!
+   \variable QContactOnlineAccount::FieldCapabilities
+
+   The field key constant for the account capabilities value.
+   \sa capabilities(), setCapabilities()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::FieldCapabilities, "Capabilities");
+
+/*!
+   \variable QContactOnlineAccount::FieldAccountUri
+
+   The field key constant for the account uri value.
+   \sa accountUri(), setAccountUri()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::FieldAccountUri, "AccountUri");
+
+/*!
+   \variable QContactOnlineAccount::FieldServiceProvider
+
+   The field key constant for the account service provider name.
+   \sa serviceProvider(), setServiceProvider()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::FieldServiceProvider, "ServiceProvider");
+
+/*!
+   \variable QContactOnlineAccount::FieldSubTypes
+
+   The field key constant for the field that stores the sub types of a QContactOnlineAccount.
+   \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::FieldSubTypes, "SubTypes");
+
+/*!
+   \variable QContactOnlineAccount::SubTypeSip
+
+    The predefined string constant for a sub type value,
+    indicating this online account supports SIP.
+    \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::SubTypeSip, "Sip");
+
+/*!
+   \variable QContactOnlineAccount::SubTypeSipVoip
+
+    The predefined string constant for a sub type value,
+    indicating this online account supports SIP based VOIP.
+    \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::SubTypeSipVoip, "SipVoip");
+
+/*!
+   \variable QContactOnlineAccount::SubTypeImpp
+
+    The predefined string constant for a sub type value,
+    indicating this online account supports IMPP.
+    \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::SubTypeImpp, "Impp");
+
+/*!
+   \variable QContactOnlineAccount::SubTypeVideoShare
+
+    The predefined string constant for a sub type value,
+    indicating this online account supports VideoShare.
+    \sa subTypes(), setSubTypes()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOnlineAccount::SubTypeVideoShare, "VideoShare");
+
+
 /*!
    \fn QContactOnlineAccount::setAccountUri(const QString& accountUri)
    
@@ -1806,6 +1685,77 @@
    presence information.
  */
 
+/* ==================== QContactOrganization ======================= */
+
+/*!
+   \class QContactOrganization
+   \brief The QContactOrganization class provides details about an
+   organization that the contact is either a part of, or stands for.
+   \ingroup contacts-details
+ */
+
+/*!
+   \variable QContactOrganization::DefinitionName
+   The string constant for the definition name of QContactOrganization details.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::DefinitionName, "Organization");
+
+/*!
+   \variable QContactOrganization::FieldName
+
+   The field key constant for the value of the organization name.
+   \sa name(), setName()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::FieldName, "Name");
+
+/*!
+   \variable QContactOrganization::FieldLogoUrl
+
+   The field key constant for the URL of the organization logo image.
+   \sa logoUrl(), setLogoUrl()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::FieldLogoUrl, "LogoUrl");
+
+/*!
+   \variable QContactOrganization::FieldDepartment
+
+   The field key constant for the value of the department name.
+   \sa department(), setDepartment()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::FieldDepartment, "Department");
+
+/*!
+   \variable QContactOrganization::FieldLocation
+
+   The field key constant for the value of the location of the organization.
+   \sa location(), setLocation()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::FieldLocation, "Location");
+
+/*!
+   \variable QContactOrganization::FieldRole
+
+   The field key constant for the value of the contact's role in the organization.
+   \sa role(), setRole()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::FieldRole, "Role");
+
+/*!
+   \variable QContactOrganization::FieldTitle
+
+   The field key constant for the value of the contact's title in the organization.
+   \sa title(), setTitle()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::FieldTitle, "Title");
+
+/*!
+   \variable QContactOrganization::FieldAssistantName
+
+   The field key constant for the value of the name of the contact's assistant.
+   \sa assistantName(), setAssistantName()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactOrganization::FieldAssistantName, "AssistantName");
+
 /*!
    \fn QContactOrganization::setName(const QString& name)
    Sets the name of the organization stored in this detail to \a name.
@@ -1888,6 +1838,45 @@
    this organization.
  */
 
+/* ==================== QContactRingtone ======================= */
+
+/*!
+   \class QContactRingtone
+   \brief The QContactRingtone class provides a ringtone associated
+   with a contact
+   \ingroup contacts-details
+ */
+
+/*!
+\variable QContactRingtone::DefinitionName
+The string constant for the definition name of QContactRingtone details.
+*/
+Q_DEFINE_LATIN1_CONSTANT(QContactRingtone::DefinitionName, "Ringtone");
+
+/*!
+   \variable QContactRingtone::FieldAudioRingtoneUrl
+
+   The field key constant for the value of the URL for an audio ringtone.
+   \sa setAudioRingtoneUrl(), audioRingtoneUrl()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactRingtone::FieldAudioRingtoneUrl, "AudioRingtoneUrl");
+
+/*!
+   \variable QContactRingtone::FieldVideoRingtoneUrl
+
+   The field key constant for the value of the URL for a video ringtone.
+   \sa setVideoRingtoneUrl(), videoRingtoneUrl()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactRingtone::FieldVideoRingtoneUrl, "VideoRingtoneUrl");
+
+/*!
+   \variable QContactRingtone::FieldVibrationRingtoneUrl
+
+   The field key constant for the value of the URL for a vibration ringtone.
+   \sa setVibrationRingtoneUrl(), vibrationRingtoneUrl()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactRingtone::FieldVibrationRingtoneUrl, "VibrationRingtoneUrl");
+
 /*!
   \fn QContactRingtone::audioRingtoneUrl() const
 
@@ -1927,10 +1916,80 @@
   to \a vibrationRingtoneUrl.
  */
 
+/* ==================== QContactPresence ======================= */
+
+// XXX TODO add more stuff here
+/*!
+   \class QContactPresence
+   \brief The QContactPresence class provides presence information
+   for an online account of a contact.
+
+   Presence information for a particular QContactOnlineAccount detail is provided
+   in a QContactPresence detail which is linked (via linkedDetailUris()) to the
+   account detail.  This information is generally provided by the backend, and is
+   not modifiable by clients.
+
+   Presence information can include update timestamp, screen name,
+   and the status icon, status value, and status text provided by
+   the service provider, as well as user defined status message.
+
+   \sa QContactOnlineAccount
+
+   \ingroup contacts-details
+ */
+
+/*!
+   \variable QContactPresence::DefinitionName
+   The string constant for the definition name of QContactPresence details.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPresence::DefinitionName, "Presence");
+
+/*!
+   \variable QContactPresence::FieldTimestamp
+   The field key constant for the timestamp value.
+   \sa setTimestamp(), timestamp()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPresence::FieldTimestamp, "Timestamp");
+
+/*!
+   \variable QContactPresence::FieldNickname
+   The field key constant for the nickname value.
+   \sa setNickname(), nickname()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPresence::FieldNickname, "Nickname");
+
+/*!
+   \variable QContactPresence::FieldPresenceState
+   The field key constant for the presence state enumeration value.
+   \sa setPresenceState(), presenceState()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPresence::FieldPresenceState, "PresenceState");
+
+/*!
+   \variable QContactPresence::FieldPresenceStateText
+   The field key constant for the presence state description value.
+   \sa setPresenceStateText(), presenceStateText()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPresence::FieldPresenceStateText, "PresenceStateText");
+
+/*!
+   \variable QContactPresence::FieldPresenceStateImageUrl
+   The field key constant for the presence state image URL.
+   \sa setPresenceStateImageUrl(), presenceStateImageUrl()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPresence::FieldPresenceStateImageUrl, "PresenceStateImageUrl");
+
+/*!
+   \variable QContactPresence::FieldCustomMessage
+   The field key constant for the user-entered custom presence message.
+   \sa setCustomMessage(), customMessage()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactPresence::FieldCustomMessage, "CustomMessage");
+
 /*!
    \fn QContactPresence::setTimestamp(const QDateTime& updateTimestamp)
 
-   Sets the update timestamp of the presence detail to be
+   Sets the timestamp for the last update of the presence detail to be
    \a updateTimestamp.
  */
 
@@ -1959,6 +2018,7 @@
   \enum QContactPresence::PresenceState
 
   This enum defines the possible presence states supported by the default schema.
+  Not all presence providers support all of these states.
 
   \value PresenceUnknown Signifies that the presence state of the contact is not currently known
   \value PresenceAvailable Signifies that the contact is available
@@ -2003,6 +2063,8 @@
 
    Sets the custom status message from the contact for the online account
    about which this detail stores presence information, to \a customMessage.
+   This custom message would have been set by the contact,
+   and does not necessarily correspond to a particular presence state.
  */
 
 /*!
@@ -2026,6 +2088,64 @@
    about which this detail stores presence information.
  */
 
+/* ==================== QContactGlobalPresence ======================= */
+
+/*!
+   \class QContactGlobalPresence
+   \brief The QContactGlobalPresence class provides aggregated presence information
+   for a contact, synthesized or supplied by the backend.
+   \ingroup contacts-details
+ */
+
+/*!
+   \variable QContactGlobalPresence::DefinitionName
+   The string constant for the definition name of QContactGlobalPresence details.
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGlobalPresence::DefinitionName, "GlobalPresence");
+
+/*!
+   \variable QContactGlobalPresence::FieldTimestamp
+   The field key constant for the timestamp value.
+   \sa setTimestamp(), timestamp()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGlobalPresence::FieldTimestamp, "Timestamp");
+
+/*!
+   \variable QContactGlobalPresence::FieldNickname
+   The field key constant for the nickname value.
+   \sa setNickname(), nickname()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGlobalPresence::FieldNickname, "Nickname");
+
+/*!
+   \variable QContactGlobalPresence::FieldPresenceState
+   The field key constant for the presence state enumeration value.
+   \sa setPresenceState(), presenceState()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGlobalPresence::FieldPresenceState, "PresenceState");
+
+/*!
+   \variable QContactGlobalPresence::FieldPresenceStateText
+   The field key constant for the presence state description value.
+   \sa setPresenceStateText(), presenceStateText()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGlobalPresence::FieldPresenceStateText, "PresenceStateText");
+
+/*!
+   \variable QContactGlobalPresence::FieldPresenceStateImageUrl
+   The field key constant for the presence state image URL.
+   \sa setPresenceStateImageUrl(), presenceStateImageUrl()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGlobalPresence::FieldPresenceStateImageUrl, "PresenceStateImageUrl");
+
+/*!
+   \variable QContactGlobalPresence::FieldCustomMessage
+
+   The field key constant for the user-entered custom presence message.
+   \sa setCustomMessage(), customMessage()
+ */
+Q_DEFINE_LATIN1_CONSTANT(QContactGlobalPresence::FieldCustomMessage, "CustomMessage");
+
 /*!
    \fn QContactGlobalPresence::setTimestamp(const QDateTime& updateTimestamp)
 
@@ -2113,26 +2233,28 @@
 
 
 
-/* Convenience filters */
+
+/* ==================== Convenience Filters ======================= */
 
 /*!
-    Returns a filter suitable for finding
-    contacts with a display label matching the specified \a label.
+    Returns a filter suitable for finding contacts with a display label containing the specified
+    \a label.
 */
 QContactFilter QContactDisplayLabel::match(const QString &label)
 {
     QContactDetailFilter f;
-    f.setDetailDefinitionName(QContactDisplayLabel::DefinitionName);
+    f.setDetailDefinitionName(QContactDisplayLabel::DefinitionName,
+                              QContactDisplayLabel::FieldLabel);
     f.setValue(label);
+    f.setMatchFlags(QContactFilter::MatchContains);
 
     return f;
 }
 
 /*!
-    Returns a filter suitable for finding
-    contacts with a name matching the specified \a firstName and
-    \a lastName.  If either parameter is empty, any value will match
-    that component.
+    Returns a filter suitable for finding contacts with a name with a first name containing the
+    specified \a firstName and a last name containing the specified \a lastName.  If either
+    parameter is empty, any value will match that component.
 */
 QContactFilter QContactName::match(const QString &firstName, const QString &lastName)
 {
@@ -2147,6 +2269,7 @@
             QContactDetailFilter f;
             f.setDetailDefinitionName(QContactName::DefinitionName, QContactName::FieldLastName);
             f.setValue(lastName);
+            f.setMatchFlags(QContactFilter::MatchContains);
             return f;
         }
     } else {
@@ -2155,6 +2278,7 @@
             QContactDetailFilter f;
             f.setDetailDefinitionName(QContactName::DefinitionName, QContactName::FieldFirstName);
             f.setValue(firstName);
+            f.setMatchFlags(QContactFilter::MatchContains);
             return f;
         } else {
             // Match a contact with the specified first and last names
@@ -2164,9 +2288,11 @@
             QContactDetailFilter f;
             f.setDetailDefinitionName(QContactName::DefinitionName, QContactName::FieldFirstName);
             f.setValue(firstName);
+            f.setMatchFlags(QContactFilter::MatchContains);
             QContactDetailFilter l;
             l.setDetailDefinitionName(QContactName::DefinitionName, QContactName::FieldLastName);
             l.setValue(lastName);
+            l.setMatchFlags(QContactFilter::MatchContains);
 
             return f & l;
         }
@@ -2174,33 +2300,45 @@
 }
 
 /*!
-    Returns a filter suitable for finding
-    contacts with a name field (e.g. first, last) that
-    matches the supplied \a name.
+    Returns a filter suitable for finding contacts with any name field (e.g. first, last) that
+    contains the supplied \a name.
 */
 QContactFilter QContactName::match(const QString &name)
 {
-    QContactDetailFilter l;
-    l.setDetailDefinitionName(QContactName::DefinitionName);
-    l.setValue(name);
-    return l;
+    QContactUnionFilter nameFilter;
+    QStringList nameFields;
+    nameFields << QContactName::FieldCustomLabel
+            << QContactName::FieldFirstName
+            << QContactName::FieldLastName
+            << QContactName::FieldMiddleName
+            << QContactName::FieldPrefix
+            << QContactName::FieldSuffix;
+    foreach (const QString& fieldName, nameFields) {
+        QContactDetailFilter subFilter;
+        subFilter.setDetailDefinitionName(QContactName::DefinitionName, fieldName);
+        subFilter.setValue(name);
+        subFilter.setMatchFlags(QContactFilter::MatchContains);
+        nameFilter.append(subFilter);
+    }
+    return nameFilter;
 }
 
 /*!
-    Returns a filter suitable for finding
-    contacts with an email address matching the specified \a emailAddress.
+    Returns a filter suitable for finding contacts with an email address containing the specified
+    \a emailAddress.
 */
 QContactFilter QContactEmailAddress::match(const QString &emailAddress)
 {
     QContactDetailFilter l;
     l.setDetailDefinitionName(QContactEmailAddress::DefinitionName, QContactEmailAddress::FieldEmailAddress);
     l.setValue(emailAddress);
+    l.setMatchFlags(QContactFilter::MatchContains);
     return l;
 }
 
 /*!
-    Returns a filter suitable for finding
-    contacts with a phone number matching the specified \a number.
+    Returns a filter suitable for finding contacts with a phone number containing the specified
+    \a number.
 */
 QContactFilter QContactPhoneNumber::match(const QString &number)
 {

--- a/qtmobility/src/contacts/engines/qcontactinvalidbackend_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/engines/qcontactinvalidbackend_p.h	Fri May 14 16:41:33 2010 +0300
@@ -69,53 +69,9 @@
     QString managerName() const;
 
     /*! \reimp */
-    QMap<QString, QString> managerParameters() const {return QMap<QString, QString>();}
-    /*! \reimp */
     int managerVersion() const {return 0;}
 
     /*! \reimp */
-    QList<QContactLocalId> contactIds(const QContactFilter&, const QList<QContactSortOrder>&, QContactManager::Error* error) const
-    {
-        *error =  QContactManager::NotSupportedError;
-        return QList<QContactLocalId>();
-    }
-
-    /*! \reimp */
-    QList<QContact> contacts(const QContactFilter&, const QList<QContactSortOrder>&, const QContactFetchHint&, QContactManager::Error* error) const
-    {
-        *error =  QContactManager::NotSupportedError;
-        return QList<QContact>();
-    }
-
-    /*! \reimp */
-    QContact contact(const QContactLocalId&, const QContactFetchHint&, QContactManager::Error* error) const
-    {
-        *error =  QContactManager::NotSupportedError;
-        return QContact();
-    }
-
-    /*! \reimp */
-    bool saveContacts(QList<QContact>*, QMap<int, QContactManager::Error>*, QContactManager::Error* error)
-    {
-        *error =  QContactManager::NotSupportedError;
-        return false;
-    }
-
-    /*! \reimp */
-    bool removeContacts(const QList<QContactLocalId>&, QMap<int, QContactManager::Error>*, QContactManager::Error* error)
-    {
-        *error =  QContactManager::NotSupportedError;
-        return false;
-    }
-
-    /*! \reimp */
-    QContact conformingContact(const QContact&, QContactManager::Error* error)
-    {
-        *error =  QContactManager::NotSupportedError;
-        return QContact();
-    }
-
-    /*! \reimp */
     virtual QString synthesizedDisplayLabel(const QContact&, QContactManager::Error* error) const
     {
         *error =  QContactManager::NotSupportedError;
@@ -123,126 +79,11 @@
     }
 
     /*! \reimp */
-    virtual bool setSelfContactId(const QContactLocalId&, QContactManager::Error* error)
-    {
-        *error =  QContactManager::NotSupportedError;
-        return false;
-    }
-
-    /*! \reimp */
-    virtual QContactLocalId selfContactId(QContactManager::Error* error) const
-    {
-        *error =  QContactManager::NotSupportedError;
-        return 0;
-    }
-
-    /*! \reimp */
-    virtual QList<QContactRelationship> relationships(const QString&, const QContactId&, QContactRelationship::Role, QContactManager::Error* error) const
-    {
-        *error =  QContactManager::NotSupportedError;
-        return QList<QContactRelationship>();
-    }
-
-    /*! \reimp */
-    virtual bool saveRelationships(QList<QContactRelationship>*, QMap<int, QContactManager::Error>*, QContactManager::Error* error)
-    {
-        *error =  QContactManager::NotSupportedError;
-        return false;
-    }
-
-    /*! \reimp */
-    virtual bool removeRelationships(const QList<QContactRelationship>&, QMap<int, QContactManager::Error>*, QContactManager::Error* error)
-    {
-        *error =  QContactManager::NotSupportedError;
-        return false;
-    }
-
-    /*! \reimp */
     virtual QContact compatibleContact(const QContact&, QContactManager::Error* error) const
     {
         *error =  QContactManager::NotSupportedError;
         return QContact();
     }
-
-    /*! \reimp */
-    virtual bool validateContact(const QContact&, QContactManager::Error* error) const
-    {
-        *error =  QContactManager::NotSupportedError;
-        return false;
-    }
-
-    /*! \reimp */
-    virtual bool validateDefinition(const QContactDetailDefinition&, QContactManager::Error* error) const
-    {
-        *error =  QContactManager::NotSupportedError;
-        return false;
-    }
-
-    /*! \reimp */
-    virtual QMap<QString, QContactDetailDefinition> detailDefinitions(const QString&, QContactManager::Error* error) const
-    {
-        *error =  QContactManager::NotSupportedError;
-        return QMap<QString, QContactDetailDefinition>();
-    }
-
-    /*! \reimp */
-    virtual QContactDetailDefinition detailDefinition(const QString&, const QString&, QContactManager::Error* error) const
-    {
-        *error =  QContactManager::NotSupportedError;
-        return QContactDetailDefinition();
-    }
-
-    /*! \reimp */
-    virtual bool saveDetailDefinition(const QContactDetailDefinition&, const QString&, QContactManager::Error* error)
-    {
-        *error =  QContactManager::NotSupportedError;
-        return false;
-    }
-
-    /*! \reimp */
-    virtual bool removeDetailDefinition(const QString&, const QString&, QContactManager::Error* error)
-    {
-        *error =  QContactManager::NotSupportedError;
-        return false;
-    }
-
-    /*! \reimp */
-    virtual void requestDestroyed(QContactAbstractRequest*) {}
-    /*! \reimp */
-    virtual bool startRequest(QContactAbstractRequest*) {return false;}
-    /*! \reimp */
-    virtual bool cancelRequest(QContactAbstractRequest*) {return false;}
-    /*! \reimp */
-    virtual bool waitForRequestFinished(QContactAbstractRequest*, int) {return false;}
-
-    /*! \reimp */
-    virtual bool hasFeature(QContactManager::ManagerFeature, const QString&) const
-    {
-        return false;
-    }
-
-    /*! \reimp */
-    virtual bool isRelationshipTypeSupported(const QString&, const QString&) const
-    {
-        return false;
-    }
-
-    /*! \reimp */
-    virtual bool isFilterSupported(const QContactFilter&) const
-    {
-        return false;
-    }
-
-    /*! \reimp */
-    virtual QList<QVariant::Type> supportedDataTypes() const
-    {
-        return QList<QVariant::Type>();
-    }
-    /*! \reimp */
-    virtual QStringList supportedContactTypes() const
-    {
-        return QStringList();
-    }
 };
 
 QTM_END_NAMESPACE

--- a/qtmobility/src/contacts/filters/filters.pri	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/filters/filters.pri	Fri May 14 16:41:33 2010 +0300
@@ -1,7 +1,6 @@
 INCLUDEPATH += filters
 
 PUBLIC_HEADERS += \
-    filters/qcontactactionfilter.h \
     filters/qcontactchangelogfilter.h \
     filters/qcontactdetailfilter.h \
     filters/qcontactdetailrangefilter.h \
@@ -13,7 +12,6 @@
     filters/qcontactunionfilter.h
 
 PRIVATE_HEADERS += \
-    filters/qcontactactionfilter_p.h \
     filters/qcontactchangelogfilter_p.h \
     filters/qcontactdetailfilter_p.h \
     filters/qcontactdetailrangefilter_p.h \
@@ -23,7 +21,6 @@
     filters/qcontactunionfilter_p.h
 
 SOURCES += \
-    filters/qcontactactionfilter.cpp \
     filters/qcontactchangelogfilter.cpp \
     filters/qcontactdetailfilter.cpp \
     filters/qcontactdetailrangefilter.cpp \

--- a/qtmobility/src/contacts/filters/qcontactactionfilter.cpp	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 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 "qcontactactionfilter.h"
-#include "qcontactactionfilter_p.h"
-#include "qcontactfilter_p.h"
-#include "qcontactmanager.h"
-
-QTM_BEGIN_NAMESPACE
-
-/*!
-  \class QContactActionFilter
-  \brief The QContactActionFilter class provides a filter based around an
-  action availability criterion.
- 
-  \ingroup contacts-filters
-    
-  It may be used to select contacts for which a particular action is
-  available, or contacts which contain a detail of a particular value for
-  which the action is available.
- */
-
-Q_IMPLEMENT_CONTACTFILTER_PRIVATE(QContactActionFilter);
-
-/*!
- * \fn QContactActionFilter::QContactActionFilter(const QContactFilter& other)
- * Constructs a copy of \a other if possible, otherwise constructs a new action filter
- */
-
-/*!
- * Constructs a new action filter
- */
-QContactActionFilter::QContactActionFilter()
-    : QContactFilter(new QContactActionFilterPrivate)
-{
-}
-
-/*!
- * Sets the name of the action whose availability is required to \a action
- * \sa actionName()
- */
-void QContactActionFilter::setActionName(const QString& action)
-{
-    Q_D(QContactActionFilter);
-    d->m_action = action;
-}
-
-/*!
- * Sets the value criterion of the detail for which the action must be available to \a value
- * \sa value()
- */
-void QContactActionFilter::setValue(const QVariant& value)
-{
-    Q_D(QContactActionFilter);
-    d->m_value = value;
-}
-
-/*!
- * Sets the vendor details criterion of the action whose availability is required to the given \a vendorName and \a implementationVersion
- * \sa vendorName(), implementationVersion()
- */
-void QContactActionFilter::setVendor(const QString& vendorName, int implementationVersion)
-{
-    Q_D(QContactActionFilter);
-    d->m_vendorName = vendorName;
-    if (!vendorName.isEmpty()) {
-        d->m_implementationVersion = implementationVersion;
-        return;
-    }
-
-    d->m_implementationVersion = -1;
-}
-
-/*!
- * Returns the action name criterion of the filter
- * \sa setActionName()
- */
-QString QContactActionFilter::actionName() const
-{
-    Q_D(const QContactActionFilter);
-    return d->m_action;
-}
-
-/*!
- * Returns the value criterion of the filter
- * \sa setValue()
- */
-QVariant QContactActionFilter::value() const
-{
-    Q_D(const QContactActionFilter);
-    return d->m_value;
-}
-
-/*!
- * Returns the vendor name criterion of the filter
- * \sa setVendor()
- */
-QString QContactActionFilter::vendorName() const
-{
-    Q_D(const QContactActionFilter);
-    return d->m_vendorName;
-}
-
-/*!
- * Returns the vendor-specified action implementation version criterion of the filter
- * \sa setVendor()
- */
-int QContactActionFilter::implementationVersion() const
-{
-    Q_D(const QContactActionFilter);
-    return d->m_implementationVersion;
-}
-
-QTM_END_NAMESPACE

--- a/qtmobility/src/contacts/filters/qcontactactionfilter.h	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 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$
-**
-****************************************************************************/
-
-#ifndef QCONTACTACTIONFILTER_H
-#define QCONTACTACTIONFILTER_H
-
-#include "qcontactfilter.h"
-
-QTM_BEGIN_NAMESPACE
-
-class QContactActionFilterPrivate;
-class Q_CONTACTS_EXPORT QContactActionFilter : public QContactFilter
-{
-public:
-    QContactActionFilter();
-    QContactActionFilter(const QContactFilter& other);
-
-    void setActionName(const QString& action);
-    void setValue(const QVariant& value);
-    void setVendor(const QString& vendorName, int implementationVersion = -1);
-
-    /* Accessors */
-    QString actionName() const;
-    QVariant value() const;
-    QString vendorName() const;
-    int implementationVersion() const;
-
-private:
-    Q_DECLARE_CONTACTFILTER_PRIVATE(QContactActionFilter)
-};
-
-QTM_END_NAMESPACE
-
-#endif

--- a/qtmobility/src/contacts/filters/qcontactactionfilter_p.h	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 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$
-**
-****************************************************************************/
-
-#ifndef QCONTACTACTIONFILTER_P_H
-#define QCONTACTACTIONFILTER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qcontactfilter_p.h"
-#include "qcontactfilter.h"
-
-#include <QString>
-#include <QVariant>
-
-QTM_BEGIN_NAMESPACE
-
-class QContactActionFilterPrivate : public QContactFilterPrivate
-{
-public:
-    QContactActionFilterPrivate()
-        : QContactFilterPrivate(),
-        m_implementationVersion(-1)
-    {
-    }
-
-    QContactActionFilterPrivate(const QContactActionFilterPrivate& other)
-        : QContactFilterPrivate(other),
-        m_action(other.m_action),
-        m_value(other.m_value),
-        m_vendorName(other.m_vendorName),
-        m_implementationVersion(other.m_implementationVersion)
-    {
-    }
-
-    virtual bool compare(const QContactFilterPrivate* other) const
-    {
-        const QContactActionFilterPrivate *od = static_cast<const QContactActionFilterPrivate*>(other);
-        if (m_action != od->m_action)
-            return false;
-        if (m_value != od->m_value)
-            return false;
-        if (m_vendorName != od->m_vendorName)
-            return false;
-        if (m_implementationVersion != od->m_implementationVersion)
-            return false;
-        return true;
-    }
-
-    Q_IMPLEMENT_CONTACTFILTER_VIRTUALCTORS(QContactActionFilter, QContactFilter::ActionFilter)
-
-    QString m_action;
-    QVariant m_value;
-    QString m_vendorName;
-    int m_implementationVersion;
-};
-
-QTM_END_NAMESPACE
-
-#endif

--- a/qtmobility/src/contacts/filters/qcontactfilters.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactfilters.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,6 @@
 // this file includes all of the leaf filter classes
 // provided by the Qt Contacts API.
 
-#include "qcontactactionfilter.h"
 #include "qcontactchangelogfilter.h"
 #include "qcontactdetailfilter.h"
 #include "qcontactdetailrangefilter.h"

--- a/qtmobility/src/contacts/qcontact.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/qcontact.cpp	Fri May 14 16:41:33 2010 +0300
@@ -46,7 +46,6 @@
 #include "qcontact_p.h"
 #include "qcontactdetail_p.h"
 #include "qcontactmanager_p.h"
-#include "qcontactaction.h"
 
 QTM_BEGIN_NAMESPACE
 
@@ -56,38 +55,78 @@
   \brief The QContact class represents an addressbook contact.
 
   \ingroup contacts-main
- 
-  A QContact consists of zero or more details.
+
+  Individual contacts, groups, and other types of contacts are represented with
+  a QContact object.  In addition to the type, a QContact consists of information
+  that belongs to the contact and some information about the relationships that the
+  contact has.
+
+  A QContact object has a collection of details (like a name, phone numbers and
+  email addresses).  Each detail (which can have multiple fields) is stored
+  in an appropriate subclass of QContactDetail, and the QContact allows
+  retrieving these details in various ways.
+
+  A QContact may have zero or more relationships with other contacts.  For example,
+  a group contact would have a \c "HasMember" relationship with the QContacts that
+  are its members.  Spouses, managers and assistants can also be represented this
+  way.
  
-  An instance of the QContact class represents an in-memory contact,
-  and may not reflect the state of that contact found in persistent
-  storage until the appropriate synchronization method is called
-  on the QContactManager (i.e., saveContact, removeContact).
+  A QContact instance represents the in-memory version of an addressbook contact,
+  and has no tie to a specific QContactManager.  It is possible for the contents
+  of a QContact to change independently of the contents that are stored persistently
+  in a QContactManager.  A QContact has an ID associated with it when it is first
+  retrieved from a QContactManager, or after it has been first saved, and this allows
+  clients to track changes using the signals in QContactManager.
+
+  A QContact has a number of mandatory details:
+  \list
+   \o A QContactType, with the type of the contact (individual contact, group etc)
+   \o A QContactDisplayLabel, representing the text to display
+  \endlist
+
+  If you have edited the contents of a QContact (via saving or removing details),
+  you will need to ask a specific QContactManager for the new display label for the
+  contact, since system settings (like the order of first or last names) can vary
+  between managers.
  
   \sa QContactManager, QContactDetail
  */
 
 /*!
  * \fn QList<T> QContact::details() const
- * Returns a list of details of the template type
+ * Returns a list of details of the template parameter type.  The type must be
+ * a subclass of QContactDetail.
+ *
+ * For example:
+ *  \snippet doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp 3
  */
 
 /*!
  * \fn QList<T> QContact::details(const QString& fieldName, const QString& value) const
- * Returns a list of details of the template type which match the \a fieldName and \a value criteria
+ * Returns a list of details of the template parameter type which have field called \a fieldName, with matching \a value.
+ * The type must be a subclass of QContactDetail.
+ *
+ * For example:
+ *  \snippet doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp 4
  */
 
 /*!
  * \fn T QContact::detail() const
- * Returns the first detail of the template type
+ * Returns the first detail of the template parameter type, as returned by the template details() function.
+ * The type must be a subclass of QContactDetail.
  */
 
 /*!
  * \fn QContact::operator!=(const QContact &other) const
- * Returns true if this contacts Id or details are different to those of the \a other contact
+ * Returns true if this contacts id or details are different to those of the \a other contact.
  */
 
-/*! Construct an empty contact. */
+/*!
+    Construct an empty contact.
+
+    The contact will have an empty display label, an empty id, and have type \l QContactType::TypeContact.
+    The isEmpty() function will return true.
+*/
 QContact::QContact()
     : d(new QContactData)
 {
@@ -153,13 +192,36 @@
 {
 }
 
-/*! Returns the QContactId that identifies this contact */
+/*!
+    Returns the QContactId that identifies this contact.
+
+    This may have been set when the contact was retrieved from
+    a particular manager, or when the contact was first saved
+    in a manager.  The QContactId is only valid with a specific
+    manager.  See \l QContactManager::saveContact() for more
+    information.
+
+    \sa localId()
+ */
 QContactId QContact::id() const
 {
     return d->m_id;
 }
 
-/*! Returns the QContactLocalId that identifies this contact within its manager */
+/*!
+    Returns the QContactLocalId that identifies this contact within its manager
+
+    This may have been set when the contact was retrieved from
+    a particular manager, or when the contact was first saved
+    in a manager.  The QContactLocalId is associated with a specific
+    manager, but other contacts with the same local id might exist in
+    different managers.
+
+    See \l QContactManager::saveContact() for more
+    information.
+
+   \sa id()
+*/
 QContactLocalId QContact::localId() const
 {
     return d->m_id.localId();
@@ -195,7 +257,7 @@
 }
 
 /*!
- * Sets the type of the contact to the given \a type.
+ * Sets the type of the contact to the given \a type detail.
  */
 void QContact::setType(const QContactType& type)
 {
@@ -205,8 +267,20 @@
 }
 
 /*!
- * Returns the read-only display label of this contact.
- * A contact which has been retrieved from a manager will have a display label synthesized for it.
+ * Returns the display label of this contact.
+ *
+ * A contact which has been retrieved from a manager will have a display label set when
+ * the contact is retrieved.
+ *
+ * The display label is usually read-only, since some managers do not support arbitrary
+ * labels (see also \l QContactName::setCustomLabel()).  If you modify the contact in a way
+ * that would affect the display label, you can call QContactManager::synthesizeContactDisplayLabel() to get an
+ * up-to-date display label.
+ *
+ * See the following example for more information:
+ * \snippet doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp Updating the display label of a contact
+ *
+ * \sa QContactManager::synthesizeContactDisplayLabel()
  */
 QString QContact::displayLabel() const
 {
@@ -214,24 +288,67 @@
 }
 
 /*!
- * Sets the id of this contact to \a id.  Note that this only affects
- * this structure, not any corresponding structures stored
+ * Sets the id of this contact to \a id.
+ *
+ * Note that this only affects this object, not any corresponding structures stored
  * by a QContactManager.
  *
  * If you change the id of a contact and save the contact
  * in a manager, the previously existing contact will still
  * exist.  You can do this to create copies (possibly modified)
- * of an existing contact.
+ * of an existing contact, or to save a contact in a different manager.
  *
- * Returns true if the \a id was set successfully, otherwise
- * returns false.
+ * \sa QContactManager::saveContact()
  */
 void QContact::setId(const QContactId& id)
 {
     d->m_id = id;
 }
 
-/*! Returns the first detail stored in the contact which is of the given \a definitionName */
+/*!
+    \fn QContactDetail QContact::detail(const QLatin1Constant& definitionName) const
+    Returns the first detail stored in the contact which with the given \a definitionName.
+    The \a definitionName argument is typically the detail name constant provided by a
+    specific subclass of QContactDetail.  For example:
+
+    \snippet doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp 0
+
+    It would usually be more convenient to use the template version of this function, in
+    the following manner:
+
+    \snippet doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp 1
+*/
+
+/*!
+    \fn QList<QContactDetail> QContact::details(const QLatin1Constant& definitionName) const
+    Returns a list of details of the given \a definitionName.
+
+    The \a definitionName argument is typically the detail name constant provided by a
+    specific subclass of QContactDetail.  For example:
+
+    \snippet doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp 2
+
+    It would usually be more convenient to use the template version of this function, in
+    the following manner:
+
+    \snippet doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp 3
+*/
+
+/*!
+    \fn QList<QContactDetail> QContact::details(const QLatin1Constant& definitionName, const QLatin1Constant& fieldName, const QString& value)
+    Returns a list of details of the given \a definitionName, with fields named \a fieldName and with value \a value.
+*/
+
+/*!
+    \fn QList<T> QContact::details(const char* fieldName, const QString& value) const
+    \internal
+
+    Returns a list of details of the template type which match the \a fieldName and \a value criteria
+*/
+
+/*!
+    Returns the first detail stored in the contact with the given \a definitionName
+*/
 QContactDetail QContact::detail(const QString& definitionName) const
 {
     if (definitionName.isEmpty())
@@ -248,7 +365,13 @@
     return QContactDetail();
 }
 
-/*! Returns a list of details of the given \a definitionName */
+/*! Returns a list of details with the given \a definitionName
+    The definitionName string can be determined by the DefinitionName attribute
+    of defined objects (e.g. QContactPhoneNumber::DefinitionName) or by
+    requesting a list of all the definition names using
+    \l {QContactManager::detailDefinitions()}{detailDefinitions()} or the
+    asynchronous \l
+    {QContactDetailDefinitionFetchRequest::definitionNames()}{definitionNames()}.*/
 QList<QContactDetail> QContact::details(const QString& definitionName) const
 {
     // build the sub-list of matching details.
@@ -269,7 +392,14 @@
     return sublist;
 }
 
-/*! Returns a list of details of the given \a definitionName, \a fieldName and field \a value*/
+/*!
+    Returns a list of details of the given \a definitionName, with fields named \a fieldName and with value \a value.
+    The definitionName string can be determined by the DefinitionName attribute
+    of defined objects (e.g. QContactPhoneNumber::DefinitionName) or by
+    requesting a list of all the definition names using
+    \l {QContactManager::detailDefinitions()}{detailDefinitions()} or the
+    asynchronous \l
+    {QContactDetailDefinitionFetchRequest::definitionNames()}{definitionNames()}.*/
 QList<QContactDetail> QContact::details(const QString& definitionName, const QString& fieldName, const QString& value) const
 {
     // build the sub-list of matching details.
@@ -291,7 +421,10 @@
     return sublist;
 }
 
-/*! Returns the first detail stored in the contact which is of the given \a definitionName */
+/*!
+    \internal
+    Returns the first detail stored in the contact which with the given \a definitionName
+*/
 QContactDetail QContact::detail(const char* definitionName) const
 {
     if (definitionName == 0)
@@ -308,7 +441,10 @@
     return QContactDetail();
 }
 
-/*! Returns a list of details of the given \a definitionName */
+/*!
+    \internal
+    Returns a list of details with the given \a definitionName
+*/
 QList<QContactDetail> QContact::details(const char* definitionName) const
 {
     // build the sub-list of matching details.
@@ -329,7 +465,10 @@
     return sublist;
 }
 
-/*! Returns a list of details of the given \a definitionName, \a fieldName and field \a value*/
+/*!
+    \internal
+    Returns a list of details with the given \a definitionName, \a fieldName and field \a value
+*/
 QList<QContactDetail> QContact::details(const char* definitionName, const char* fieldName, const QString& value) const
 {
     // build the sub-list of matching details.
@@ -352,45 +491,48 @@
 }
 
 /*!
- * Saves the given \a detail in the list of stored details, and sets its Id.
- * If another detail of the same type and Id has been previously saved in
- * this contact, that detail is overwritten.  Otherwise, a new Id is generated
- * and set in the detail, and the detail is added to the list.
+ * Saves the given \a detail in the list of stored details, and sets the detail's id.
+ * If another detail of the same type and id has been previously saved in
+ * this contact, that detail is overwritten.  Otherwise, a new id is generated
+ * and set in the detail, and the detail is added to the contact.
  *
  * If the detail's access constraint includes \c QContactDetail::ReadOnly,
- * this function will return false.
+ * this function will return true and save the detail in the contact,
+ * however attempting to save the contact in a manager may fail (if that manager
+ * decides that the read only detail should not be updated).
+ * Details with the \c QContactDetail::ReadOnly constraint set are typically provided
+ * in a contact by the manager, and are usually information that is either
+ * synthesized, or not intended to be changed by the user (e.g. presence information
+ * for other contacts).
  *
- * If \a detail is a contact type, the existing contact type will
+ * If \a detail is a QContactType, the existing contact type will
  * be overwritten with \a detail.  There is never more than one contact type
- * in a contact.  The supplied \a detail will have its accessConstraint set to
- * QContactDetail::Irremovable.
+ * in a contact.
  *
- * If \a detail is a display label, the supplied \a detail will have its
- * accessConstraint set to QContactDetail::Irremovable | QContactDetail::ReadOnly,
- * and the function will return false.
+ * If \a detail is a QContactDisplayLabel, the contact will not be updated,
+ * and the function will return false.  Since the display label formatting is specific
+ * to each manager, use the QContactManager::synthesizeContactDisplayLabel() function
+ * instead.
  *
  * Returns true if the detail was saved successfully, otherwise returns false.
  *
  * Note that the caller retains ownership of the detail.
+ * \sa QContactManager::synthesizeContactDisplayLabel()
  */
 bool QContact::saveDetail(QContactDetail* detail)
 {
     if (!detail)
         return false;
 
-    if (detail->accessConstraints() & QContactDetail::ReadOnly)
-        return false;
-
     /* Also handle contact type specially - only one of them. */
     if (QContactDetailPrivate::detailPrivate(*detail)->m_definitionName == QContactType::DefinitionName.latin1()) {
-        detail->d->m_access = QContactDetail::Irremovable;
+        detail->d->m_access |= QContactDetail::Irremovable;
         d->m_details[1] = *detail;
         return true;
     }
 
     /* And display label.. */
     if (QContactDetailPrivate::detailPrivate(*detail)->m_definitionName == QContactDisplayLabel::DefinitionName.latin1()) {
-        detail->d->m_access = QContactDetail::Irremovable | QContactDetail::ReadOnly;
         return false;
     }
 
@@ -416,8 +558,8 @@
  * Removes the \a detail from the contact.
  *
  * The detail in the contact which has the same key as that of the given \a detail
- * will be removed if it exists.  That is, the information in the detail may be different.
- * Any preference for the given field is also removed.
+ * will be removed if it exists.  Only the key is used for comparison - that is, the
+ * information in the detail may be different.
  *
  * If the detail's access constraint includes \c QContactDetail::Irremovable,
  * this function will return false.
@@ -450,16 +592,7 @@
     if (!d->m_details.contains(*detail))
         return false;
 
-    // remove any preferences we may have stored for the detail.
-    QStringList keys = d->m_preferences.keys();
-    for (int i = 0; i < keys.size(); i++) {
-        QString prefKey = keys.at(i);
-        if (d->m_preferences.value(prefKey) == detail->d->m_id) {
-            d->m_preferences.remove(prefKey);
-        }
-    }
-
-    // then remove the detail.  // OLD BEHAVIOUR (24/12/2009): d->m_details.removeOne(*detail);
+    // then remove the detail.
     d->m_details.removeAt(removeIndex);
     return true;
 }
@@ -471,7 +604,10 @@
         other.d->m_details == d->m_details;
 }
 
-/*! Returns the hash value for \a key. */
+/*!
+    \relates QContact
+    Returns the hash value for \a key.
+*/
 uint qHash(const QContact &key)
 {
     uint hash = qHash(key.id());
@@ -490,49 +626,18 @@
     return dbg.maybeSpace();
 }
 
-/*! Retrieve the first detail for which the given \a actionName is available */
-QContactDetail QContact::detailWithAction(const QString& actionName) const
-{
-    if (actionName.isEmpty())
-        return QContactDetail();
-
-    QList<QContactDetail> dets = detailsWithAction(actionName);
-    if (dets.isEmpty())
-        return QContactDetail();
+/*!
+    Returns a list of relationships of the given \a relationshipType in which this contact is a participant.
 
-    QContactDetail retn = dets.first();
-    return retn;
-}
-
-/*! Retrieve any details for which the given \a actionName is available */
-QList<QContactDetail> QContact::detailsWithAction(const QString& actionName) const
-{
-    if (actionName.isEmpty())
-        return QList<QContactDetail>();
+    If \a relationshipType is empty, all relationships will be returned.
 
-    // ascertain which details are supported by any implementation of the given action
-    QList<QContactDetail> retn;
-    QList<QContactActionDescriptor> descriptors = QContactManagerData::actionDescriptors(actionName);
-    for (int i = 0; i < descriptors.size(); i++) {
-        QContactAction *currImpl = QContactManagerData::action(descriptors.at(i));
-        for (int i = 0; i < d->m_details.size(); i++) {
-            QContactDetail detail = d->m_details.at(i);
-            if (currImpl->isDetailSupported(detail, *this)) {
-                retn.append(detail);
-                break;
-            }
-        }
+    \note This function only examines the relationships that were present when this contact
+    was retrieved from a manager.  You can also query the manager directly, if you require
+    the most up to date information.
 
-        // clean up
-        delete currImpl;
-    }
+    \snippet doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp 5
 
-    return retn;
-}
-
-/*!
- * \preliminary
- * Returns a list of relationships of the given \a relationshipType in which the contact was a participant at the time that it was retrieved from the manager
+    \sa QContactRelationshipFetchRequest, QContactManager::relationships()
  */
 QList<QContactRelationship> QContact::relationships(const QString& relationshipType) const
 {
@@ -553,9 +658,18 @@
 }
 
 /*!
-  Returns a list of ids of contacts which are related to this contact in a relationship of the
-  given \a relationshipType, where those other contacts participate in the relationship in the
-  given \a role.
+    Returns a list of the ids of contacts which have a relationship of the given \a relationshipType with this contact.
+    The \a role parameter describes the role that the related contacts have in the relationship.
+
+    If \a relationshipType is empty, relationships of all types will be considered.
+
+    \note This function only examines the relationships that were present when this contact
+    was retrieved from a manager.  You can also query the manager directly, if you require
+    the most up to date information.
+
+    \snippet doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp 6
+
+    \sa QContactRelationshipFetchRequest, QContactManager::relationships()
  */
 QList<QContactId> QContact::relatedContacts(const QString& relationshipType, QContactRelationship::Role role) const
 {
@@ -593,121 +707,4 @@
     return retn;
 }
 
-/*!
- * Return a list of actions available to be performed on this contact which are offered
- * by the vendor whose name is the given \a vendorName, where the action instance has
- * the implementation version given by \a implementationVersion.
- * If \a vendorName is empty, actions from any vendor are supplied; if \a implementationVersion
- * is \c -1, action implementations of any version will be returned.
- */
-QList<QContactActionDescriptor> QContact::availableActions(const QString& vendorName, int implementationVersion) const
-{
-    // check every action implementation to see if it supports me.
-    QSet<QContactActionDescriptor> retn;
-    QList<QContactActionDescriptor> descriptors = QContactManagerData::actionDescriptors();
-    for (int i = 0; i < descriptors.size(); i++) {
-        QContactActionDescriptor currDescriptor = descriptors.at(i);
-        QContactAction *currImpl = QContactManagerData::action(currDescriptor);
-        if (QContactManagerEngine::testFilter(currImpl->contactFilter(), *this)) {
-            if ((vendorName.isEmpty() || currDescriptor.vendorName() == vendorName) &&
-                    (implementationVersion == -1 || currDescriptor.implementationVersion() == implementationVersion)) {
-                retn.insert(currDescriptor);
-            }
-        }
-
-        // clean up the implementation to avoid leak.
-        delete currImpl;
-    }
-
-    return retn.toList();
-}
-
-/*!
- * \preliminary
- * Set a particular detail as the \a preferredDetail for a given \a actionName.  Returns
- * true if the detail exists in the contact and was successfully set as the preferred detail for the action
- * identified by \a actionName, otherwise returns false.
- * Note that since QContact is a value class, no error checking is done on the action name
- * (to ensure that an action of that name is available) in this function.
- */
-bool QContact::setPreferredDetail(const QString& actionName, const QContactDetail& preferredDetail)
-{
-    // if the given action name is empty, bad argument.
-    if (actionName.isEmpty())
-        return false;
-
-    // check to see whether the the given preferredDetail is saved in this contact
-    if (!d->m_details.contains(preferredDetail))
-        return false;
-
-    // otherwise, save the preference.
-    d->m_preferences.insert(actionName, preferredDetail.d->m_id);
-    return true;
-}
-
-/*!
- * \preliminary
- *
- * Returns true if the given \a detail is a preferred detail for the given \a actionName, or for any action if the \a actionName is empty
- */
-bool QContact::isPreferredDetail(const QString& actionName, const QContactDetail& detail) const
-{
-    if (!d->m_details.contains(detail))
-        return false;
-
-    if (actionName.isEmpty())
-         return d->m_preferences.values().contains(detail.d->m_id);
-
-    QMap<QString, int>::const_iterator it = d->m_preferences.find(actionName);
-    if (it != d->m_preferences.end() && it.value() == detail.d->m_id)
-        return true;
-
-    return false;
-}
-
-/*!
- * \preliminary
- * Returns the preferred detail for a given \a actionName
- */
-QContactDetail QContact::preferredDetail(const QString& actionName) const
-{
-    // if the given action name is empty, bad argument.
-    if (actionName.isEmpty())
-        return QContactDetail();
-
-    if (!d->m_preferences.contains(actionName))
-        return QContactDetail();
-
-    QContactDetail retn;
-    int detId = d->m_preferences.value(actionName);
-    for (int i = 0; i < d->m_details.size(); i++) {
-        QContactDetail det = d->m_details.at(i);
-        if (det.d->m_id == detId) {
-            // found it.
-            retn = det;
-            break;
-        }
-    }
-
-    return retn;
-}
-
-
-
-/*!
- * \preliminary
- * Returns a map of action name to the preferred detail for the action of that name.
- */
-QMap<QString, QContactDetail> QContact::preferredDetails() const
-{
-    QMap<QString, QContactDetail> ret;
-    QMap<QString, int>::const_iterator it = d->m_preferences.constBegin();
-    while (it != d->m_preferences.constEnd()) {
-        ret.insert(it.key(), d->m_details.at(it.value()));
-        ++it;
-    }
-
-    return ret;
-}
-
 QTM_END_NAMESPACE

--- a/qtmobility/src/contacts/qcontact.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/qcontact.h	Fri May 14 16:41:33 2010 +0300
@@ -95,11 +95,8 @@
     bool isEmpty() const;
     void clearDetails();
 
-    /* Access details of particular type or which support a particular action */
     QContactDetail detail(const QString& definitionId) const;
     QList<QContactDetail> details(const QString& definitionId = QString()) const;
-    QContactDetail detailWithAction(const QString& actionName) const;
-    QList<QContactDetail> detailsWithAction(const QString& actionName) const;
 
     QList<QContactDetail> details(const QString& definitionName, const QString& fieldName, const QString& value) const;
 
@@ -108,6 +105,11 @@
     QList<QContactDetail> details(const char* definitionId, const char* fieldName, const QString& value) const;
 
     /* Templated retrieval for definition names */
+#ifdef Q_QDOC
+    QContactDetail detail(const QLatin1Constant& definitionName) const;
+    QList<QContactDetail> details(const QLatin1Constant& definitionName) const;
+    QList<QContactDetail> details(const QLatin1Constant& definitionName, const QLatin1Constant& fieldName, const QString& value);
+#else
     template <int N> QContactDetail detail(const QLatin1Constant<N>& definitionName) const
     {
         return detail(definitionName.latin1());
@@ -120,6 +122,7 @@
     {
         return details(definitionName.latin1(), fieldName.latin1(), value);
     }
+#endif
 
     /* Templated (type-specific) detail retrieval */
     template<typename T> QList<T> details() const
@@ -163,15 +166,6 @@
     QList<QContactRelationship> relationships(const QString& relationshipType = QString()) const;
     QList<QContactId> relatedContacts(const QString& relationshipType = QString(), QContactRelationship::Role role = QContactRelationship::Either) const;
 
-    /* Actions available to be performed on this contact */
-    QList<QContactActionDescriptor> availableActions(const QString& vendorName = QString(), int implementationVersion = -1) const;
-
-    /* Preferences (eg, set a particular detail preferred for the SMS action) - subject to change! */
-    bool setPreferredDetail(const QString& actionName, const QContactDetail& preferredDetail);
-    bool isPreferredDetail(const QString& actionName, const QContactDetail& detail) const;
-    QContactDetail preferredDetail(const QString& actionName) const;
-    QMap<QString, QContactDetail> preferredDetails() const;
-
 private:
     friend class QContactManager;
     friend class QContactManagerData;

--- a/qtmobility/src/contacts/qcontact_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/qcontact_p.h	Fri May 14 16:41:33 2010 +0300
@@ -75,9 +75,7 @@
         : QSharedData(other),
         m_id(other.m_id),
         m_details(other.m_details),
-        m_relationshipsCache(other.m_relationshipsCache),
-        m_reorderedRelationshipsCache(other.m_reorderedRelationshipsCache),
-        m_preferences(other.m_preferences)
+        m_relationshipsCache(other.m_relationshipsCache)
     {
     }
 
@@ -86,8 +84,6 @@
     QContactId m_id;
     QList<QContactDetail> m_details;
     QList<QContactRelationship> m_relationshipsCache;
-    QList<QContactRelationship> m_reorderedRelationshipsCache;
-    QMap<QString, int> m_preferences;
 };
 
 QTM_END_NAMESPACE

--- a/qtmobility/src/contacts/qcontactabstractrequest.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/qcontactabstractrequest.cpp	Fri May 14 16:41:33 2010 +0300
@@ -56,7 +56,19 @@
   \ingroup contacts-main
 
   It allows a client to asynchronously request some functionality of a
-  particular QContactManager.
+  particular QContactManager.  Instances of the class will emit signals
+  when the state of the request changes, or when more results become
+  available.
+
+  Clients should not attempt to create instances of this class directly,
+  but should instead use the use-case-specific classes derived from this
+  class.
+
+  After creating any sort of request, the client retains ownership and
+  must delete the request to avoid leaking memory.  The client may either
+  do this directly (if not within a slot connected to a signal emitted
+  by the request) or by using the deleteLater() slot to schedule the
+  request for deletion when control returns to the event loop.
  */
 
 /*!
@@ -101,16 +113,17 @@
  */
 
 /*!
-  \fn QContactAbstractRequest::QContactAbstractRequest()
-  Constructs a new, invalid asynchronous request
+  \fn QContactAbstractRequest::QContactAbstractRequest(QObject* parent)
+  Constructs a new, invalid asynchronous request with the specified \a parent
  */
 
 /*!
   \internal
-  Constructs a new request from the given request data \a otherd
+  Constructs a new request from the given request data \a otherd with
+  the given parent \a parent
 */
-QContactAbstractRequest::QContactAbstractRequest(QContactAbstractRequestPrivate* otherd)
-    : d_ptr(otherd)
+QContactAbstractRequest::QContactAbstractRequest(QContactAbstractRequestPrivate* otherd, QObject* parent)
+    : QObject(parent), d_ptr(otherd)
 {
 }

--- a/qtmobility/src/contacts/qcontactabstractrequest.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/qcontactabstractrequest.h	Fri May 14 16:41:33 2010 +0300
@@ -54,7 +54,6 @@
     Q_OBJECT
 
 public:
-    QContactAbstractRequest() {}
     ~QContactAbstractRequest();
 
     enum State {
@@ -104,10 +103,11 @@
     void resultsAvailable();
 
 protected:
-    QContactAbstractRequest(QContactAbstractRequestPrivate* otherd);
+    QContactAbstractRequest(QContactAbstractRequestPrivate* otherd, QObject* parent = 0);
     QContactAbstractRequestPrivate* d_ptr;
 
 private:
+    QContactAbstractRequest(QObject* parent = 0) : QObject(parent), d_ptr(0) {}
     Q_DISABLE_COPY(QContactAbstractRequest)
     friend class QContactManagerEngine;
 };

--- a/qtmobility/src/contacts/qcontactaction.cpp	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,213 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 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 "qcontactaction.h"
-#include "qcontactmanager_p.h"
-#include "qcontactactiondescriptor.h"
-
-#include <QSet>
-#include <QString>
-
-QTM_BEGIN_NAMESPACE
-
-QContactAction::~QContactAction()
-{
-}
-
-/*!
-  \class QContactAction
-  \brief The QContactAction class provides an interface for performing an
-  action on a QContact or QContactDetail.
-  \ingroup contacts-main
-  \ingroup contacts-actions
-
-  An action is anything that can be performed on a contact, or a detail of a contact.  An example
-  of an action might be "Send Email" or "Dial" or "Plot Navigation Route".  One action may be
-  implemented by multiple vendors, and indeed one vendor may provide multiple implementations of
-  the same action.  The name of an action identifies its semantics, while its implementation version
-  distinguishes it from other implementations of the action by the same vendor.
-
-  Invocation of an action is asynchronous; at some stage after calling \l invokeAction() the
-  action instance will emit the \l progress() signal.  Any results of the action may be retrieved
-  by calling \l result().
-
-  Each instance of a QContactAction is created by a \l QContactActionFactory when
-  \l QContactActionFactory::instance() is called; the caller takes ownership of the action instance.
- 
-  \sa QContactActionFactory, QContactActionFilter
- */
-
-/*!
-  \fn QContactAction::~QContactAction()
-  Clears any memory in use by this instance of the action implementation
- */
-
-/*!
-  \fn QContactAction::actionDescriptor() const
-  Returns the descriptor which uniquely identifies this action implementation.  A descriptor
-  consists of an action name, a vendor name and an implementation version.
-  The name of the action identifies the action provided; different implementations of an action
-  with the same name must provide the same functionality, but may differ in implementation semantics.
-  Hence, the action name includes the major version of the interface definition implemented.
-  The vendor name is the identification string of the vendor which has provided this implementation.
-  The implementation version is the (minor) version of the implementation, and is vendor-specific.
-
-  \sa QContactActionDescriptor
- */
-
-/*!
-  \fn QContactAction::metaData() const
-  Returns the meta-data associated with this action, such as icons, labels or sound cues
- */
-
-/*!
-  \fn QContactAction::contactFilter(const QVariant& value) const
-  Returns a filter which may be used to filter contacts by the availability of this action implementation for them.
-  If \a value is valid, only contacts which have a detail with the given value and for which the action is available are returned
- */
-
-/*!
-  \fn QContactAction::supportsDetail(const QContactDetail& detail) const
-  Returns true if the provided \a detail contains the fields required for this action to be
-  performed on it; otherwise, returns false
- */
-
-/*!
-  \fn QContactAction::supportedDetails(const QContact& contact) const
-  Returns a list of the details saved in the given \a contact which contain the fields required
-  for this action to be performed on them.
-
-  The default implementation of this function simply tests all the details in the contact
-  using \l supportsDetail()
- */
-QList<QContactDetail> QContactAction::supportedDetails(const QContact& contact) const
-{
-    QList<QContactDetail> ret;
-    QList<QContactDetail> details = contact.details();
-    for (int j=0; j < details.count(); j++) {
-        if (isDetailSupported(details.at(j), contact))
-            ret.append(details.at(j));
-    }
-    return ret;
-}
-
-/*!
-  \fn QContactAction::invokeAction(const QContact& contact, const QContactDetail& detail = QContactDetail())
-  Initiates the implemented action on the specified \a detail of the given \a contact, or on the first
-  eligible detail saved in the contact if the given \a detail is empty.
-  At some point after invocation, one or more \l progress() signals will be emitted by the action instance.
-  The results of the action (if any) may be retrieved by calling \l result().
-
-  \sa result(), progress()
- */
-
-/*!
-  \fn QContactAction::result() const
-  Returns the result of the action, if any exists.  Calling this function prior to receiving the \l progress()
-  signal will not return a meaningful result.
- */
-
-/*!
-  \enum QContactAction::State
-  Describes the current status of the asynchronous action operation
-  \value InactiveState The operation has not yet been initiated
-  \value AutonomousState The operation was initiated but no further information is or will be available
-  \value ActiveState The operation was initiated and is not yet finished
-  \value FinishedState The operation successfully completed
-  \value FinishedWithErrorState The operation has finished, but an error occurred
- */
-
-/*!
-  \fn QContactAction::progress(QContactAction::State state, const QVariantMap& result)
-  This signal is emitted by an action instance whose functionality has been initiated with \l invokeAction().
-  It provides clients with the current \a state of the action, and any \a result associated with the action.
-  This signal must be emitted at least once by every action instance after \l invokeAction() is called.
-
-  If the action implementation is incapable of reporting the status of the operation (for example, the
-  action is implemented via a one-way IPC call) it should emit the progress signal with \a state
-  set to \c QContactAction::AutonomousState.
- */
-
-/*!
-  Returns a list of identifiers of the available actions which are provided by the given \a vendor and of the given \a implementationVersion.
-  If \a vendor is empty, actions from all vendors and of any implementation version are returned; if \a implementationVersion is empty,
-  any actions from the given \a vendor (regardless of implementation version) are returned.
- */
-QStringList QContactAction::availableActions(const QString& vendor, int implementationVersion)
-{
-    // SLOW naive implementation...
-    QSet<QString> ret;
-    QContactManagerData::loadFactories();
-    QList<QContactActionDescriptor> actionDescriptors = QContactManagerData::actionDescriptors(QString(), vendor, implementationVersion);
-    for (int i = 0; i < actionDescriptors.size(); i++) {
-        QContactActionDescriptor descriptor = actionDescriptors.at(i);
-        ret.insert(descriptor.actionName());
-    }
-
-    return ret.toList();
-}
-
-/*!
-  Returns a list of QContactActionDescriptor instances which identified implementations of the given \a actionName which are provided by the
-  given \a vendorName and are of the given \a implementationVersion.  If \a actionName is empty, descriptors for
-  implementations of all actions are returned; if \a vendorName is empty, descriptors for implementations provided by any vendor and
-  of any implementation version are returned; if \a implementationVersion is empty, descriptors for any implementations provided by the
-  given \a vendorName of the given \a actionName are returned.
- */
-QList<QContactActionDescriptor> QContactAction::actionDescriptors(const QString& actionName, const QString& vendorName, int implementationVersion)
-{
-    QContactManagerData::loadFactories();
-    return QContactManagerData::actionDescriptors(actionName, vendorName, implementationVersion);
-}
-
-/*!
-  Returns a pointer to a new instance of the action implementation identified by the given \a descriptor.
-  The caller takes ownership of the action implementation and must delete it to avoid leaking memory.
- */
-QContactAction* QContactAction::action(const QContactActionDescriptor& descriptor)
-{
-    QContactManagerData::loadFactories();
-    return QContactManagerData::action(descriptor);
-}
-
-#include "moc_qcontactaction.cpp"
-
-QTM_END_NAMESPACE

--- a/qtmobility/src/contacts/qcontactaction.h	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 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$
-**
-****************************************************************************/
-
-
-#ifndef QCONTACTACTION_H
-#define QCONTACTACTION_H
-
-#include "qtcontactsglobal.h"
-
-#include "qcontactfilter.h"
-#include "qcontactdetail.h"
-#include "qcontact.h"
-
-#include <QObject>
-
-QTM_BEGIN_NAMESPACE
-
-class QContactActionDescriptor;
-class QContactActionData;
-class Q_CONTACTS_EXPORT QContactAction : public QObject
-{
-    Q_OBJECT
-
-public:
-    /* return a list of names of actions which are available */
-    static QStringList availableActions(const QString& vendorName = QString(), int implementationVersion = -1);
-
-    /* return a list of descriptors for action implementations matching the given criteria */
-    static QList<QContactActionDescriptor> actionDescriptors(const QString& actionName = QString(), const QString& vendorName = QString(), int implementationVersion = -1);
-
-    /* return a pointer to an implementation of the action identified by the given descriptor */
-    static QContactAction* action(const QContactActionDescriptor& descriptor);
-
-public:
-    virtual ~QContactAction() = 0;
-
-    virtual QContactActionDescriptor actionDescriptor() const = 0;          // the descriptor which uniquely identifies this action
-    virtual QVariantMap metaData() const = 0;                               // label, icon etc - under discussion! - replaces the above
-
-    virtual QContactFilter contactFilter(const QVariant& value = QVariant()) const = 0; // use for matching
-    virtual bool isDetailSupported(const QContactDetail &detail, const QContact &contact = QContact()) const = 0;
-    virtual QList<QContactDetail> supportedDetails(const QContact& contact) const = 0;
-
-    /* Initiate the asynchronous action on the given contact (and optionally detail) */
-    virtual bool invokeAction(const QContact& contact, const QContactDetail& detail = QContactDetail(), const QVariantMap& parameters = QVariantMap()) = 0;
-
-    /* The possible states of an action */
-    enum State {
-        InactiveState = 0,      // operation not yet started
-        ActiveState,            // operation started, not yet finished
-        FinishedState,          // operation successfully completed
-        FinishedDetachedState,  // operation started, no further information available - name under discussion.
-        FinishedWithErrorState  // operation finished, but error occurred
-    };
-
-    virtual State state() const = 0;
-
-    /* Returns the most recently received result, or an empty QVariantMap if no results received */
-    virtual QVariantMap results() const = 0;
-
-Q_SIGNALS:
-    void stateChanged(QContactAction::State);
-    void resultsAvailable();
-};
-
-QTM_END_NAMESPACE
-
-#endif

--- a/qtmobility/src/contacts/qcontactactiondescriptor.cpp	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,195 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 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 "qcontactactiondescriptor.h"
-#include "qcontactactiondescriptor_p.h"
-#include <QHash>
-
-QTM_BEGIN_NAMESPACE
-
-/*!
-  \class QContactActionDescriptor
-  \brief The QContactActionDescriptor class provides information that
-  uniquely identifies a specific implementation of an action
-  \ingroup contacts-actions
-*/
-
-/*!
- * Constructs a new action descriptor for the implementation of the action identified by the given \a actionName
- * of the given implementation \a vendorVersion, as implemented by the vendor identified by the given \a vendorName
- */
-QContactActionDescriptor::QContactActionDescriptor(const QString& actionName, const QString& vendorName, int vendorVersion)
-        : d(new QContactActionDescriptorPrivate(actionName, vendorName, vendorVersion))
-{
-}
-
-/*!
- * Constructs a copy of the \a other action descriptor
- */
-QContactActionDescriptor::QContactActionDescriptor(const QContactActionDescriptor& other)
-        : d(other.d)
-{
-}
-
-/*!
- * Assigns this action descriptor to be equal to \a other
- */
-QContactActionDescriptor& QContactActionDescriptor::operator=(const QContactActionDescriptor& other)
-{
-    d = other.d;
-    return *this;
-}
-
-/*!
- * Cleans up any memory in use by the action descriptor
- */
-QContactActionDescriptor::~QContactActionDescriptor()
-{
-}
-
-/*!
- * Sets the name of the action identified by this action descriptor to \a actionName
- */
-void QContactActionDescriptor::setActionName(const QString& actionName)
-{
-    d->m_actionName = actionName;
-}
-
-/*!
- * Sets the name of the vendor of the action implementation identified by this action descriptor to \a vendorName
- */
-void QContactActionDescriptor::setVendorName(const QString& vendorName)
-{
-    d->m_vendorName = vendorName;
-}
-
-/*!
- * Sets the vendor-specified implementation version of the action implementation identified by this action descriptor to \a implementationVersion
- */
-void QContactActionDescriptor::setImplementationVersion(int implementationVersion)
-{
-    d->m_implementationVersion = implementationVersion;
-}
-
-/*!
- * Returns the name of the action which is identified by the action descriptor
- */
-QString QContactActionDescriptor::actionName() const
-{
-    return d->m_actionName;
-}
-
-/*!
- * Returns the name of the vendor of the action implementation which is identified by the action descriptor
- */
-QString QContactActionDescriptor::vendorName() const
-{
-    return d->m_vendorName;
-}
-
-/*!
- * Returns the vendor-specified version of the action implementation which is identified by the action descriptor
- */
-int QContactActionDescriptor::implementationVersion() const
-{
-    return d->m_implementationVersion;
-}
-
-/*!
- * Returns true if either the name, vendor and version of the descriptor are missing from the descriptor.
- * An empty descriptor cannot uniquely identify an action.
- */
-bool QContactActionDescriptor::isEmpty() const
-{
-    if (d->m_actionName.isEmpty())
-        return true;
-    if (d->m_vendorName.isEmpty())
-        return true;
-    if (d->m_implementationVersion <= 0)
-        return true;
-    return false;
-}
-
-/*!
- * Returns true if the action name, vendor name and vendor-specified implementation version
- * specified by this action descriptor are equal to those specified by \a other
- */
-bool QContactActionDescriptor::operator==(const QContactActionDescriptor& other) const
-{
-    return d->m_actionName == other.d->m_actionName
-            && d->m_vendorName == other.d->m_vendorName
-            && d->m_implementationVersion == other.d->m_implementationVersion;
-}
-
-/*!
- * Returns true if the action name, vendor name or vendor-specified implementation version
- * specified by this action descriptor are different to that specified by \a other
- */
-bool QContactActionDescriptor::operator!=(const QContactActionDescriptor& other) const
-{
-    return !(*this == other);
-}
-
-/*!
- * Returns true if the action descriptor is less than the \a other action descriptor.  The
- * comparison is performed first on the vendor name, then the action name, then the implementation
- * version.
- */
-bool QContactActionDescriptor::operator<(const QContactActionDescriptor& other) const
-{
-    int comp = d->m_vendorName.compare(other.d->m_vendorName);
-    if (comp != 0)
-        return comp < 0;
-    comp = d->m_actionName.compare(other.d->m_actionName);
-    if (comp != 0)
-        return comp < 0;
-    return d->m_implementationVersion < other.d->m_implementationVersion;
-}
-
-/*! Returns the hash value for \a key. */
-uint qHash(const QContactActionDescriptor& key)
-{
-    return QT_PREPEND_NAMESPACE(qHash)(key.vendorName())
-            + QT_PREPEND_NAMESPACE(qHash)(key.actionName())
-            + QT_PREPEND_NAMESPACE(qHash)(key.implementationVersion());
-}
-
-QTM_END_NAMESPACE

--- a/qtmobility/src/contacts/qcontactactiondescriptor.h	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 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$
-**
-****************************************************************************/
-
-
-#ifndef QCONTACTACTIONDESCRIPTOR_H
-#define QCONTACTACTIONDESCRIPTOR_H
-
-#include "qtcontactsglobal.h"
-#include <QString>
-#include <QSharedDataPointer>
-
-QTM_BEGIN_NAMESPACE
-
-class QContactActionDescriptorPrivate;
-class Q_CONTACTS_EXPORT QContactActionDescriptor
-{
-public:
-    explicit QContactActionDescriptor(const QString& actionName = QString(), const QString& vendorName = QString(), int vendorVersion = -1);
-    QContactActionDescriptor(const QContactActionDescriptor& other);
-    QContactActionDescriptor& operator=(const QContactActionDescriptor& other);
-    ~QContactActionDescriptor();
-
-    bool isEmpty() const;
-    bool operator==(const QContactActionDescriptor& other) const;
-    bool operator!=(const QContactActionDescriptor& other) const;
-    bool operator<(const QContactActionDescriptor& other) const;
-
-    void setActionName(const QString& actionName);
-    void setVendorName(const QString& vendorName);
-    void setImplementationVersion(int implementationVersion);
-
-    QString actionName() const;
-    QString vendorName() const;
-    int implementationVersion() const;
-
-private:
-    QSharedDataPointer<QContactActionDescriptorPrivate> d;
-};
-
-Q_CONTACTS_EXPORT uint qHash(const QContactActionDescriptor& key);
-
-QTM_END_NAMESPACE
-
-Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QContactActionDescriptor), Q_MOVABLE_TYPE);
-
-#endif

--- a/qtmobility/src/contacts/qcontactactiondescriptor_p.h	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 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$
-**
-****************************************************************************/
-
-#ifndef QCONTACTACTIONDESCRIPTOR_P_H
-#define QCONTACTACTIONDESCRIPTOR_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QSharedData>
-#include <QString>
-
-QTM_BEGIN_NAMESPACE
-
-class QContactActionDescriptorPrivate : public QSharedData
-{
-public:
-    QContactActionDescriptorPrivate(const QString& action, const QString& vendor, int version)
-            : QSharedData(),
-            m_actionName(action),
-            m_vendorName(vendor),
-            m_implementationVersion(version)
-    {
-    }
-
-    ~QContactActionDescriptorPrivate()
-    {
-    }
-
-    /*
-    bool operator <(const QContactActionDescriptorPrivate& other) const
-    {
-        if (m_actionName < other.m_actionName)
-            return true;
-        if (m_actionName == other.m_actionName) {
-            if (m_vendorName < other.m_vendorName)
-                return true;
-            else if (m_vendorName == other.m_vendorName) {
-                if (m_implementationVersion < other.m_implementationVersion)
-                    return true;
-                else if (m_implementationVersion == other.m_implementationVersion)
-                    return this < &other; // equality, try to be stable
-            }
-        }
-        return false;
-    }
-    */
-
-    QString m_actionName;
-    QString m_vendorName;
-    int m_implementationVersion;
-};
-
-QTM_END_NAMESPACE
-
-#endif

--- a/qtmobility/src/contacts/qcontactactionfactory.cpp	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 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 "qcontactactionfactory.h"
-
-QTM_BEGIN_NAMESPACE
-
-/*!
-  \class QContactActionFactory
-  \brief The QContactActionFactory class provides an interface for clients
-  to retrieve instances of action implementations
-  \ingroup contacts-actions
- */
-
-QContactActionFactory::~QContactActionFactory()
-{
-}
-
-/*!
- * \fn QContactActionFactory::~QContactActionFactory()
- * Clears any memory in use by this factory
- */
-
-/*!
- * \fn QContactActionFactory::name() const
- * Returns the name of this factory.  The name is used to identify the factory
- * when it is retrieved using the Qt Plugin framework.
- */
-
-/*!
- * \fn QContactActionFactory::actionDescriptors() const
- * Returns a list of descriptors of the actions of which instances of their implementations are able to be retrieved
- * from this factory.
- */
-
-/*!
- * \fn QContactActionFactory::instance(const QContactActionDescriptor& descriptor) const
- * Returns a pointer to an instance of the implementation of the action described by the given \a descriptor.
- * The caller takes ownership of the action instance returned from this function, and must delete it when
- * they are finished using it in order to avoid a memory leak.
- */
-
-/*!
- * \fn QContactActionFactory::actionMetadata(const QContactActionDescriptor& descriptor) const
- * Returns the metadata associated with the action identified by the given \a descriptor
- */
-
-#include "moc_qcontactactionfactory.cpp"
-
-QTM_END_NAMESPACE

--- a/qtmobility/src/contacts/qcontactactionfactory.h	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 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$
-**
-****************************************************************************/
-
-
-#ifndef QCONTACTACTIONFACTORY_H
-#define QCONTACTACTIONFACTORY_H
-
-#include "qtcontactsglobal.h"
-#include "qcontactactiondescriptor.h"
-
-#include <QObject>
-#include <QtPlugin>
-#include <QString>
-#include <QList>
-#include <QVariantMap>
-#include <QStringList>
-#include <QHash>
-
-QTM_BEGIN_NAMESPACE
-
-class QContactAction;
-class Q_CONTACTS_EXPORT QContactActionFactory : public QObject
-{
-    Q_OBJECT
-
-public:
-    virtual ~QContactActionFactory() = 0;
-    virtual QString name() const = 0;
-    virtual QList<QContactActionDescriptor> actionDescriptors() const = 0;
-    virtual QContactAction* instance(const QContactActionDescriptor& descriptor) const = 0;
-    virtual QVariantMap actionMetadata(const QContactActionDescriptor& descriptor) const = 0;
-};
-
-QTM_END_NAMESPACE
-
-QT_BEGIN_NAMESPACE
-#define QT_CONTACTS_ACTION_FACTORY_INTERFACE "com.nokia.qt.mobility.contacts.actionfactory/1.0"
-Q_DECLARE_INTERFACE(QtMobility::QContactActionFactory, QT_CONTACTS_ACTION_FACTORY_INTERFACE);
-QT_END_NAMESPACE
-
-
-#endif

--- a/qtmobility/src/contacts/qcontactdetail.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/qcontactdetail.cpp	Fri May 14 16:41:33 2010 +0300
@@ -57,23 +57,6 @@
 Q_DEFINE_LATIN1_CONSTANT(QContactDetail::ContextHome, "Home");
 Q_DEFINE_LATIN1_CONSTANT(QContactDetail::ContextWork, "Work");
 
-static uint qHash(const QContactStringHolder& holder)
-{
-    if (!holder.m_str)
-        return 0;
-    uint h = 0;
-    uint g;
-    const register uchar*p = (const uchar*)holder.m_str;
-
-    while (*p) {
-        h = (h << 4) + *p++;
-        if ((g = (h & 0xf0000000)) != 0)
-            h ^= g >> 23;
-        h &= ~g;
-    }
-    return h;
-}
-
 /* Storage */
 QHash<QString, char*> QContactStringHolder::s_allocated;
 QHash<const char *, QString> QContactStringHolder::s_qstrings;
@@ -101,13 +84,19 @@
   All of the information for a contact is stored in one or more QContactDetail objects.
  
   A detail is a group of logically related bits of data - for example, a street address is a single
-  detail that has multiple fields (number, region, country etc).  Every QContactDetail has an
-  associated QContactDetailDefinition id that describes the fields, their data type, any
-  restrictions on their values, and any restrictions on creating or updating details of that
-  definition.
- 
-  One field which is common to all details is the context field.  This field is intended to store the
-  context or contexts that this detail is associated with.  Commonly this will be something like
+  detail that has multiple fields (number, region, country etc).  Every QContactDetail has the name of an
+  associated QContactDetailDefinition that describes the fields, their data type, and any
+  restrictions on their values.  Different contact managers might have different detail definitions
+  for the same name, depending on their capabilities.  For example, for the QContactName definition name,
+  one manager might not support the middle name field, while a different manager may add an extra field for
+  specific extra information not present in the default schema.
+
+  Both the names of all the fields, and the name of the associated QContactDetailDefinition are stored
+  as 8-bit strings encoded in Latin 1 for memory conservation.  Note, however, that the values stored
+  in each field are not constrained in this way, and full unicode QStrings or QVariant data can be stored.
+
+  One field which is common to all details is the context field.  This field is intended to store one or
+  more contexts that this detail is associated with.  Commonly this will be something like
   "Home" and/or "Work", although no limitations are placed on which values may be stored in this field
   in the default schema.
 
@@ -115,21 +104,34 @@
   \a QContactDetail::FieldDetailUri, which stores the unique URI of the detail if one exists.
   The field is not mandatory, and backends are not required to verify that the given URI is indeed
   unique within the contact.  The second field is \a QContactDetail::LinkedDetailUris, which stores
-  a list of detail URIs to which this detail is linked.  The link is one-way, and intended mainly
-  for use by read-only details which are populated by the backend (for example, a presence detail
-  which is linked to a particular online account detail of the contact).
- 
+  a list of detail URIs to which this detail is linked.  The link is one-way, and can be used to show
+  how or where a detail was derived.  This is useful for things like presence information and avatars,
+  which are linked to a particular online account detail of the contact.
+
+  When a QContactDetail has been retrieved in a QContact from a QContactManager, it may have certain
+  access constraints provided with it, like \l ReadOnly or \l Irremovable.  This might mean that the
+  supplied detail is calculated or otherwise not modifiable by the user - presence information is a
+  good example.  Also, some details may be marked \l Irremovable.  These are typically things that
+  a contact has to have - like a QContactDisplayLabel or a QContactType.
+
   It is possible to inherit from QContactDetail to provide convenience or
   standardized access to values.  For example, \l QContactPhoneNumber provides
   a convenient API for manipulating a QContactDetail as a phone number, according
   to the schema.
  
+  In general, QContactDetail and the built in subclasses (like \l QContactPhoneNumber) provide
+  constants for the names of fields (like \l QContactPhoneNumber::FieldNumber), and for predefined
+  common values like \l QContactDetail::ContextHome.  Typically the constants for field names start
+  with \c Field, and the constants for predefined values of a field start with the name of that field
+  (e.g. \c ContextHome is a predefined constant for \c FieldContext).
+
   If you wish to create your own, customized contact detail, you should use
   the \l Q_DECLARE_CUSTOM_CONTACT_DETAIL macro in order to ensure proper
-  operation.  See the predefined leaf classes (like \l QContactPhoneNumber,
+  operation, and declare your own field constants with \l Q_DECLARE_LATIN1_CONSTANT.
+  See the predefined detail subclasses (like \l QContactPhoneNumber,
   \l QContactAddress) for more information.
  
-  QContactDetail objects act like values.  In general, you can assign them
+  QContactDetail objects act like type checked values.  In general, you can assign them
   to and fro and have reasonable behaviour, like the following example.
  
   \code
@@ -137,27 +139,25 @@
   QContactPhoneNumber number;
   number.setNumber("555-1212");
   // number.value(QContactPhoneNumber::FieldNumber) == "555-1212";
-  // number.definitionName() == QContactPhoneNumber::staticType()
+  // number.definitionName() == QContactPhoneNumber::DefinitionName
  
   QContactDetail detail = number;
   // detail.value(QContactPhoneNumber::FieldNumber) == "555-1212";
-  // detail.definitionName() == QContactPhoneNumber::staticType()
+  // detail.definitionName() == QContactPhoneNumber::DefinitionName
  
   QContactPhoneNumber otherNumber = detail;
   // otherNumber.number() == "555-1212";
-  // otherNumber.definitionName() == QContactPhoneNumber::staticType()
+  // otherNumber.definitionName() == QContactPhoneNumber::DefinitionName
  
   QContactAddress address = detail;
   // address is now a default constructed QContactAddress
-  // address.error() == QContactDetail::IncompatibleAssignmentError
   // address.value(QContactPhoneNumber::FieldNumber) is empty
-  // address.definitionName() == QContactAddress::staticType()
+  // address.definitionName() == QContactAddress::DefinitionName
  
   QContactAddress otherAddress = number;
   // otherAddress is now a default constructed QContactAddress
-  // otherAddress.error() == QContactDetail::IncompatibleAssignmentError
   // otherAddress.value(QContactPhoneNumber::FieldNumber) is empty
-  // otherAddress.definitionName() == QContactAddress::staticType()
+  // otherAddress.definitionName() == QContactAddress::DefinitionName
   \endcode
  
   \sa QContact, QContactDetailDefinition, QContactDetailFilter, QContactDetailRangeFilter, Q_DECLARE_CUSTOM_CONTACT_DETAIL
@@ -169,6 +169,9 @@
 
   Macro for simplifying declaring custom (leaf) detail classes.
 
+  The first argument is the name of the class, and the second argument
+  is a Latin-1 string literal naming the detail type.
+
   If you are creating a convenience class for a type of QContactDetail,
   you should use this macro when declaring your class to ensure that
   it interoperates with other contact functionality.
@@ -182,6 +185,97 @@
  */
 
 /*!
+    \class QLatin1Constant
+    \headerfile
+    \brief The QLatin1Constant class holds a Latin 1 string constant
+
+*/
+
+/*!
+    \fn QLatin1Constant::operator QString() const
+    \internal
+ */
+/*!
+    \fn QLatin1Constant::operator QLatin1String() const
+    \internal
+ */
+/*!
+    \fn QLatin1Constant::operator QVariant() const
+    \internal
+ */
+/*!
+    \fn bool QLatin1Constant::operator ==(const QLatin1Constant& other) const
+
+    Returns true if this QLatin1Constant is the same as \a other (either same object or
+    same string literal), and false otherwise.
+ */
+/*!
+    \fn bool QLatin1Constant::operator !=(const QLatin1Constant& other) const
+
+    Returns false if this QLatin1Constant is the same as \a other (either same object or
+    same string literal), and true otherwise.
+*/
+/*!
+    \fn inline const char * QLatin1Constant::latin1() const
+
+    Returns the value of this literal as a C style string (null terminated).
+*/
+
+
+/*!
+  \macro Q_DECLARE_LATIN1_CONSTANT
+  \relates QLatin1Constant
+
+  This macro, along with the related Q_DEFINE_LATIN1_CONSTANT macro,
+  allows you to describe a "Latin 1 string constant".
+
+  The resulting constant can be passed to functions accepting a
+  QLatin1String, a QString, or a QVariant.
+
+  The first parameter is the name of the variable to declare.  The
+  second parameter is the value of the constant, as a string literal.
+
+  For example:
+  \code
+  // in a header file
+  Q_DECLARE_LATIN1_CONSTANT(MyConstant, "MYCONSTANT");
+  \endcode
+
+  The declaration should be paired with a matching Q_DEFINE_LATIN1_CONSTANT
+  with the same arguments to actually define the constant.
+
+  \sa Q_DEFINE_LATIN1_CONSTANT
+*/
+
+/*!
+  \macro Q_DEFINE_LATIN1_CONSTANT
+  \relates QLatin1Constant
+
+  This macro, along with the related Q_DECLARE_LATIN1_CONSTANT macro,
+  allows you to describe a "Latin 1 string constant".
+
+  The resulting constant can be passed to functions accepting a
+  QLatin1String, a QString, or a QVariant.
+
+  The first parameter is the name of the variable to define.  The
+  second parameter is the value of the constant, as a string literal.
+
+  For example:
+  \code
+  // in a header file
+  Q_DECLARE_LATIN1_CONSTANT(MyConstant, "MYCONSTANT");
+
+  // in source file
+  Q_DEFINE_LATIN1_CONSTANT(MyConstant, "MYCONSTANT");
+  \endcode
+
+  You can use this macro without the matching DECLARE macro if
+  you are using the constant only in a single compilation unit.
+
+  \sa Q_DECLARE_LATIN1_CONSTANT
+*/
+
+/*!
   \fn QContactDetail::operator!=(const QContactDetail& other) const
   Returns true if the values or id of this detail is different to those of the \a other detail
  */
@@ -204,7 +298,13 @@
     d->m_definitionName = thisDefinitionId;
 }
 
-/*! Constructs a new, empty detail of the definition identified by \a thisDefinitionId */
+/*!
+    Constructs a new, empty detail of the definition identified by \a thisDefinitionId
+
+    The supplied pointer must be valid for the lifetime of the program.  In general
+    this means it should be a constant, and not allocated on the stack.  If you cannot
+    meet this requirement, use the alternative constructor that takes a QString instead.
+*/
 QContactDetail::QContactDetail(const char* thisDefinitionId)
     : d(new QContactDetailPrivate)
 {
@@ -218,9 +318,13 @@
 }
 
 /*!
+    \internal
+
     Constructs a detail that is a copy of \a other if \a other is of the expected definition
     identified by \a expectedDefinitionId, else constructs a new, empty detail of the
-    definition identified by the \a expectedDefinitionId
+    definition identified by the \a expectedDefinitionId.
+
+    The \a expectedDefinitionId pointer must be valid for the lifetime of the program.
 */
 QContactDetail::QContactDetail(const QContactDetail& other, const char* expectedDefinitionId)
 {
@@ -233,6 +337,8 @@
 }
 
 /*!
+    \internal
+
     Constructs a detail that is a copy of \a other if \a other is of the expected definition
     identified by \a expectedDefinitionId, else constructs a new, empty detail of the
     definition identified by the \a expectedDefinitionId
@@ -256,6 +362,8 @@
 }
 
 /*!
+    \internal
+
     Assigns this detail to \a other if the definition of \a other is that identified
     by the given \a expectedDefinitionId, else assigns this detail to be a new, empty
     detail of the definition identified by the given \a expectedDefinitionId
@@ -274,6 +382,8 @@
 }
 
 /*!
+    \internal
+
     Assigns this detail to \a other if the definition of \a other is that identified
     by the given \a expectedDefinitionId, else assigns this detail to be a new, empty
     detail of the definition identified by the given \a expectedDefinitionId
@@ -296,15 +406,20 @@
 {
 }
 
-/*! Returns the (unique) name of the definition which defines the semantics and structure of this detail */
+/*!
+    Returns the (unique) name of the definition which defines the semantics and structure of this detail.
+    The actual QContactDetailDefinition should be retrieved from the relevant QContactManager using this name.
+ */
 QString QContactDetail::definitionName() const
 {
-    return d.constData()->m_definitionName;
+    return d.constData()->m_definitionName.toQString();
 }
 
-/*! Compares this detail to \a other.  Returns true if the definition and values of \a other are equal to those of this detail.
+/*!
+    Compares this detail to \a other.  Returns true if the definition, access constraints and values of \a other are equal to those of this detail.
     The keys of each detail are not considered during the comparison, in order to allow details from different contacts to
-    be compared according to their values. */
+    be compared according to their values.
+ */
 bool QContactDetail::operator==(const QContactDetail& other) const
 {
     if (! (d.constData()->m_definitionName == other.d.constData()->m_definitionName))
@@ -319,15 +434,32 @@
     return true;
 }
 
+uint qHash(const QContactStringHolder& key)
+{
+    if (!key.m_str)
+        return 0;
+    uint h = 0;
+    uint g;
+    const register uchar*p = (const uchar*)key.m_str;
+
+    while (*p) {
+        h = (h << 4) + *p++;
+        if ((g = (h & 0xf0000000)) != 0)
+            h ^= g >> 23;
+        h &= ~g;
+    }
+    return h;
+}
+
 /*! Returns the hash value for \a key. */
 uint qHash(const QContactDetail &key)
 {
     const QContactDetailPrivate* dptr= QContactDetailPrivate::detailPrivate(key);
-    uint hash = QT_PREPEND_NAMESPACE(qHash)(dptr->m_definitionName)
+    uint hash = qHash(dptr->m_definitionName)
                 + QT_PREPEND_NAMESPACE(qHash)(dptr->m_access);
     QHash<QContactStringHolder, QVariant>::const_iterator it = dptr->m_values.constBegin();
     while(it != dptr->m_values.constEnd()) {
-        hash += QT_PREPEND_NAMESPACE(qHash)(it.key())
+        hash += qHash(it.key())
                 + QT_PREPEND_NAMESPACE(qHash)(it.value().toString());
         ++it;
     }
@@ -348,7 +480,9 @@
 }
 #endif
 
-/*! Returns true if no values are contained in this detail.  Note that context is stored as a value; hence, if a context is set, this function will return false. */
+/*!
+    Returns true if no values are contained in this detail.  Note that context is stored as a value; hence, if a context is set, this function will return false.
+ */
 bool QContactDetail::isEmpty() const
 {
     if (!d.constData()->m_values.isEmpty())
@@ -375,31 +509,36 @@
   no value for the given \a key exists */
 QString QContactDetail::value(const QString& key) const
 {
-    return d.constData()->m_values.value(key.toLatin1().constData()).toString();
+    return d.constData()->m_values.value(QContactStringHolder(key)).toString();
 }
 
-
-/*! \overload
-  Returns the value stored in this detail for the given \a key as a QString, or an empty QString if
-  no value for the given \a key exists */
+/*!
+    \internal
+    \overload
+    Returns the value stored in this detail for the given \a key as a QString, or an empty QString if
+    no value for the given \a key exists
+*/
 QString QContactDetail::value(const char* key) const
 {
     return d.constData()->m_values.value(key).toString();
 }
 
-// A bug in qdoc means this comment needs to appear below the comment for the other value().
 /*!
-  \fn T QContactDetail::value(const QString& key) const
-  Returns the value of the template type associated with the given \a key
- */
+    \fn T QContactDetail::value(const char* key) const
+    \internal
+    \overload
+*/
 
 /*! Returns the value stored in this detail for the given \a key as a QVariant, or an invalid QVariant if no value for the given \a key exists */
 QVariant QContactDetail::variantValue(const QString& key) const
 {
-    return d.constData()->m_values.value(key.toLatin1().constData());
+    return d.constData()->m_values.value(QContactStringHolder(key));
 }
 
-/*! Returns the value stored in this detail for the given \a key as a QVariant, or an invalid QVariant if no value for the given \a key exists */
+/*!
+    \internal
+    Returns the value stored in this detail for the given \a key as a QVariant, or an invalid QVariant if no value for the given \a key exists
+ */
 QVariant QContactDetail::variantValue(const char* key) const
 {
     return d.constData()->m_values.value(key);
@@ -410,10 +549,11 @@
  */
 bool QContactDetail::hasValue(const QString& key) const
 {
-    return d.constData()->m_values.contains(key.toLatin1().constData());
+    return d.constData()->m_values.contains(QContactStringHolder(key));
 }
 
 /*!
+  \internal
   Returns true if this detail has a field with the given \a key, or false otherwise.
  */
 bool QContactDetail::hasValue(const char * key) const
@@ -434,10 +574,14 @@
     return true;
 }
 
-/*! Inserts \a value into the detail for the given \a key if \a value is valid.  If \a value is invalid,
+/*!
+    \internal
+
+    Inserts \a value into the detail for the given \a key if \a value is valid.  If \a value is invalid,
     removes the field with the given \a key from the detail.  Returns true if the given \a value was set
     for the \a key (if the \a value was valid), or if the given \a key was removed from detail (if the
-    \a value was invalid), and returns false if the key was unable to be removed (and the \a value was invalid) */
+    \a value was invalid), and returns false if the key was unable to be removed (and the \a value was invalid)
+*/
 bool QContactDetail::setValue(const char* key, const QVariant& value)
 {
     if (!value.isValid())
@@ -447,14 +591,22 @@
     return true;
 }
 
-/*! Removes the value stored in this detail for the given \a key.  Returns true if a value was stored for the given \a key and the operation succeeded, and false otherwise */
+/*!
+    Removes the value stored in this detail for the given \a key.  Returns true if a value was stored
+    for the given \a key and the operation succeeded, and false otherwise.
+*/
 bool QContactDetail::removeValue(const QString& key)
 {
-    if(d->m_values.remove(key.toLatin1().constData()))
+    if(d->m_values.remove(QContactStringHolder(key)))
         return true;
     return false;
 }
-/*! Removes the value stored in this detail for the given \a key.  Returns true if a value was stored for the given \a key and the operation succeeded, and false otherwise */
+
+/*!
+    \internal
+    Removes the value stored in this detail for the given \a key.  Returns true if a value was stored
+    for the given \a key and the operation succeeded, and false otherwise.
+*/
 bool QContactDetail::removeValue(const char * key)
 {
     if(d->m_values.remove(key))
@@ -470,13 +622,54 @@
     QVariantMap ret;
     QHash<QContactStringHolder, QVariant>::const_iterator it = d.constData()->m_values.constBegin();
     while(it != d.constData()->m_values.constEnd()) {
-        ret.insert(it.key(), it.value());
+        ret.insert(it.key().toQString(), it.value());
         ++it;
     }
 
     return ret;
 }
 
+
+/*!
+    \fn bool QContactDetail::setValue(const QLatin1Constant& key, const QVariant& value)
+
+    Inserts \a value into the detail for the given \a key if \a value is valid.  If \a value is invalid,
+    removes the field with the given \a key from the detail.  Returns true if the given \a value was set
+    for the \a key (if the \a value was valid), or if the given \a key was removed from detail (if the
+    \a value was invalid), and returns false if the key was unable to be removed (and the \a value was invalid)
+*/
+/*!
+    \fn bool QContactDetail::removeValue(const QLatin1Constant& key)
+
+    Removes the value stored in this detail for the given \a key.  Returns true if a value was stored
+    for the given \a key and the operation succeeded, and false otherwise.
+*/
+
+/*!
+    \fn bool QContactDetail::hasValue(const QLatin1Constant& key) const
+    Returns true if this detail has a field with the given \a key, or false otherwise.
+ */
+
+/*!
+    \fn QVariant QContactDetail::variantValue(const QLatin1Constant& key) const
+    Returns the value stored in this detail for the given \a key as a QVariant, or an invalid QVariant if no value for the given \a key exists
+ */
+
+/*!
+    \fn T QContactDetail::value(const QLatin1Constant& key) const
+    \overload
+    Returns the value of the template type associated with the given \a key
+ */
+/*!
+    \fn QString QContactDetail::value(const QLatin1Constant& key) const
+    Returns the value stored in this detail for the given \a key as a QString, or an empty QString if
+    no value for the given \a key exists
+*/
+/*!
+    \fn T QContactDetail::value(const QString& key) const
+    Returns the value of the template type associated with the given \a key
+ */
+
 /*!
   \enum QContactDetail::AccessConstraint

--- a/qtmobility/src/contacts/qcontactdetail.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/qcontactdetail.h	Fri May 14 16:41:33 2010 +0300
@@ -44,7 +44,6 @@
 #define QCONTACTDETAIL_H
 
 #include "qtcontactsglobal.h"
-#include "qcontactactiondescriptor.h"
 
 #include <QSharedDataPointer>
 #include <QStringList>
@@ -57,8 +56,8 @@
 {
 public:
     QContactDetail();
-    QContactDetail(const char* definitionName); // possibly internal
-    QContactDetail(const QString& definitionName);
+    explicit QContactDetail(const char* definitionName); // possibly internal
+    explicit QContactDetail(const QString& definitionName);
     ~QContactDetail();
 
     QContactDetail(const QContactDetail& other);
@@ -121,6 +120,14 @@
     {
         return variantValue(key).value<T>();
     }
+#ifdef Q_QDOC
+    QString value(const QLatin1Constant& key) const;
+    bool setValue(const QLatin1Constant& key, const QVariant& value);
+    bool removeValue(const QLatin1Constant& key);
+    bool hasValue(const QLatin1Constant& key) const;
+    QVariant variantValue(const QLatin1Constant& key) const;
+    T value(const QLatin1Constant& key) const;
+#else
     template<int N> QString value(const QLatin1Constant<N>& key) const
     {
         return value(key.latin1());
@@ -145,6 +152,7 @@
     {
         return value<T>(key.latin1());
     }
+#endif
 
     void setContexts(const QStringList& contexts)
     {

--- a/qtmobility/src/contacts/qcontactdetail_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/qcontactdetail_p.h	Fri May 14 16:41:33 2010 +0300
@@ -135,7 +135,7 @@
         return (other.m_str == m_str) || (qstrcmp(other.m_str, m_str) == 0);
     }
 
-    operator QString() const
+    QString toQString() const
     {
         QString s = s_qstrings.value(m_str);
         if (!s.isEmpty())
@@ -153,6 +153,8 @@
     static QHash<const char *, QString> s_qstrings;
 };
 
+uint qHash(const QContactStringHolder& key);
+
 class QContactDetailPrivate : public QSharedData
 {
 public:

--- a/qtmobility/src/contacts/qcontactfetchhint.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/qcontactfetchhint.cpp	Fri May 14 16:41:33 2010 +0300
@@ -63,7 +63,7 @@
    \o a list of relationship types which the client is interested in
   (empty if interested in all relationships)
    \o some optimization flags which allow the client to tell the backend if they are
-  not interested in any relationships, any action preferences, or any binary blobs (images etc).
+  not interested in any relationships or any binary blobs (images etc).
   \endlist
 
   Important note: a client should not make changes to a contact which has been retrieved
@@ -81,7 +81,7 @@
 
   \value AllRequired Tells the backend that all information is required
   \value NoRelationships Tells the backend that the client does not require retrieved contacts to include a cache of relationships
-  \value NoActionPreferences Tells the backend that the client does not require retrieved contacts to include a cache of action preferences
+  \omitvalue NoActionPreferences Tells the backend that the client does not require retrieved contacts to include a cache of action preferences
   \value NoBinaryBlobs Tells the backend that the client does not require retrieved contacts to include binary blobs such as thumbnail images
  */
 
@@ -173,7 +173,7 @@
   Returns the optimization hint flags specified by the client.
   These hints may be ignored by the backend, in which case it will return
   the full set of information accessible in a contact, including
-  relationships, action preferences, and binary blobs.
+  relationships and binary blobs.
 
   \sa setOptimizationHints()
  */
@@ -186,7 +186,7 @@
   Sets the optimization hint flags specified by the client to \a hints.
   These hints may be ignored by the backend, in which case it will return
   the full set of information accessible in a contact, including
-  relationships, action preferences, and binary blobs.
+  relationships and binary blobs.
 
   \sa optimizationHints()
  */

--- a/qtmobility/src/contacts/qcontactfilter.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/qcontactfilter.cpp	Fri May 14 16:41:33 2010 +0300
@@ -67,7 +67,7 @@
   \value ContactDetailFilter A filter which matches contacts containing one or more details of a particular definition with a particular value
   \value ContactDetailRangeFilter A filter which matches contacts containing one or more details of a particular definition whose values are within a particular range
   \value ChangeLogFilter A filter which matches contacts whose timestamps have been updated since some particular date and time
-  \value ActionFilter A filter which matches contacts for which a particular action is available, or which contain a detail with a particular value for which a particular action is available
+  \omitvalue ActionFilter A filter which matches contacts for which a particular action is available, or which contain a detail with a particular value for which a particular action is available
   \value RelationshipFilter A filter which matches contacts which participate in a particular type of relationship, or relationship with a specified contact
   \value IntersectionFilter A filter which matches all contacts that are matched by all filters it includes
   \value UnionFilter A filter which matches any contact that is matched by any of the filters it includes

--- a/qtmobility/src/contacts/qcontactmanager.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/qcontactmanager.cpp	Fri May 14 16:41:33 2010 +0300
@@ -57,8 +57,16 @@
   \brief The QContactManager class provides an interface which allows clients with access to contact information stored in a particular backend.
   \ingroup contacts-main
  
-  This class provides adding, updating and removal of contacts.
-  It also provides definitions for details and fields that can be found in contacts.
+  This class provides an abstraction of a datastore or aggregation of datastores which contains contact information.
+  It provides methods to retrieve and manipulate contact information, contact relationship information, and
+  supported schema definitions.  It also provides metadata and error information reporting.
+
+  The functions provided by QContactManager are purely synchronous; to access the same functionality in an
+  asynchronous manner, clients should use the use-case-specific classes derived from QContactAbstractRequest.
+
+  Some functionality provided by QContactManager directly is not accessible using the asynchronous API; see
+  the \l{Contacts Synchronous API}{synchronous} and \l{Contacts Asynchronous API}{asynchronous} API
+  information from the \l{Contacts}{contacts module} API documentation.
  */
 
 /*!
@@ -332,6 +340,7 @@
  */
 QList<QContactLocalId> QContactManager::contactIds(const QList<QContactSortOrder>& sortOrders) const
 {
+    d->m_error = QContactManager::NoError;
     return d->m_engine->contactIds(QContactFilter(), sortOrders, &d->m_error);
 }
 
@@ -341,6 +350,7 @@
  */
 QList<QContactLocalId> QContactManager::contactIds(const QContactFilter& filter, const QList<QContactSortOrder>& sortOrders) const
 {
+    d->m_error = QContactManager::NoError;
     return d->m_engine->contactIds(filter, sortOrders, &d->m_error);
 }
 
@@ -348,7 +358,7 @@
   Returns the list of contacts stored in the manager sorted according to the given list of \a sortOrders.
 
   The \a fetchHint parameter describes the optimization hints that a manager may take.
-  If the \a fetchHint is the default constructed hint, all existing details, relationships and action preferences
+  If the \a fetchHint is the default constructed hint, all existing details and relationships
   in the matching contacts will be returned.  A client should not make changes to a contact which has
   been retrieved using a fetch hint other than the default fetch hint.  Doing so will result in information
   loss when saving the contact back to the manager (as the "new" restricted contact will
@@ -358,6 +368,7 @@
  */
 QList<QContact> QContactManager::contacts(const QList<QContactSortOrder>& sortOrders, const QContactFetchHint& fetchHint) const
 {
+    d->m_error = QContactManager::NoError;
     return d->m_engine->contacts(QContactFilter(), sortOrders, fetchHint, &d->m_error);
 }
 
@@ -368,7 +379,7 @@
   contacts and testing them against the supplied filter - see the \l isFilterSupported() function.
 
   The \a fetchHint parameter describes the optimization hints that a manager may take.
-  If the \a fetchHint is the default constructed hint, all existing details, relationships and action preferences
+  If the \a fetchHint is the default constructed hint, all existing details and relationships
   in the matching contacts will be returned.  A client should not make changes to a contact which has
   been retrieved using a fetch hint other than the default fetch hint.  Doing so will result in information
   loss when saving the contact back to the manager (as the "new" restricted contact will
@@ -378,6 +389,7 @@
  */
 QList<QContact> QContactManager::contacts(const QContactFilter& filter, const QList<QContactSortOrder>& sortOrders, const QContactFetchHint& fetchHint) const
 {
+    d->m_error = QContactManager::NoError;
     return d->m_engine->contacts(filter, sortOrders, fetchHint, &d->m_error);
 }
 
@@ -388,7 +400,7 @@
   and the error returned by \l error() will be \c QContactManager::DoesNotExistError.
 
   The \a fetchHint parameter describes the optimization hints that a manager may take.
-  If the \a fetchHint is the default constructed hint, all existing details, relationships and action preferences
+  If the \a fetchHint is the default constructed hint, all existing details and relationships
   in the matching contact will be returned.  A client should not make changes to a contact which has
   been retrieved using a fetch hint other than the default fetch hint.  Doing so will result in information
   loss when saving the contact back to the manager (as the "new" restricted contact will
@@ -398,6 +410,7 @@
  */
 QContact QContactManager::contact(const QContactLocalId& contactId, const QContactFetchHint& fetchHint) const
 {
+    d->m_error = QContactManager::NoError;
     return d->m_engine->contact(contactId, fetchHint, &d->m_error);
 }
 
@@ -440,6 +453,7 @@
 bool QContactManager::saveContact(QContact* contact)
 {
     if (contact) {
+        d->m_error = QContactManager::NoError;
         return d->m_engine->saveContact(contact, &d->m_error);
     } else {
         d->m_error = QContactManager::BadArgumentError;
@@ -455,6 +469,7 @@
  */
 bool QContactManager::removeContact(const QContactLocalId& contactId)
 {
+    d->m_error = QContactManager::NoError;
     return d->m_engine->removeContact(contactId, &d->m_error);
 }
 
@@ -482,6 +497,8 @@
         d->m_error =QContactManager::BadArgumentError;
         return false;
     }
+
+    d->m_error = QContactManager::NoError;
     return d->m_engine->saveContacts(contacts, errorMap, &d->m_error);
 }
 
@@ -512,13 +529,14 @@
  */
 bool QContactManager::removeContacts(const QList<QContactLocalId>& contactIds, QMap<int, QContactManager::Error>* errorMap)
 {
+    if (errorMap)
+        errorMap->clear();
     if (contactIds.isEmpty()) {
         d->m_error = QContactManager::BadArgumentError;
         return false;
     }
 
-    if (errorMap)
-        errorMap->clear();
+    d->m_error = QContactManager::NoError;
     return d->m_engine->removeContacts(contactIds, errorMap, &d->m_error);
 }
 
@@ -533,18 +551,54 @@
  */
 QContact QContactManager::compatibleContact(const QContact& original)
 {
+    d->m_error = QContactManager::NoError;
     return d->m_engine->compatibleContact(original, &d->m_error);
 }
 
 /*!
-  Returns a display label for a \a contact which is synthesized from its details in a platform-specific manner
+  Returns a display label for a \a contact which is synthesized from its details in a manager specific
+  manner.
+
+  If you want to update the display label stored in the contact, use the synthesizeContactDisplayLabel()
+  function instead.
+
+  \sa synthesizeContactDisplayLabel()
  */
-QString QContactManager::synthesizedDisplayLabel(const QContact& contact) const
+QString QContactManager::synthesizedContactDisplayLabel(const QContact& contact) const
 {
+    d->m_error = QContactManager::NoError;
     return d->m_engine->synthesizedDisplayLabel(contact, &d->m_error);
 }
 
 /*!
+ * Updates the display label of the supplied \a contact, according to the formatting rules
+ * of this manager.
+ *
+ * Different managers can format the display label of a contact in different ways -
+ * some managers may only consider first or last name, or might put them in different
+ * orders.  Others might consider an organization, a nickname, or a freeform label.
+ *
+ * This function will update the QContactDisplayLabel of this contact, and the string
+ * returned by QContact::displayLabel().
+ *
+ * If \a contact is null, nothing will happen.
+ *
+ * See the following example for more information:
+ * \snippet doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp Updating the display label of a contact
+ *
+ * \sa synthesizedContactDisplayLabel(), QContact::displayLabel()
+ */
+void QContactManager::synthesizeContactDisplayLabel(QContact *contact) const
+{
+    if (contact) {
+        d->m_error = QContactManager::NoError;
+        QContactManagerEngine::setContactDisplayLabel(contact, d->m_engine->synthesizedDisplayLabel(*contact, &d->m_error));
+    } else {
+        d->m_error = QContactManager::BadArgumentError;
+    }
+}
+
+/*!
   Sets the id of the "self" contact to the given \a contactId.
   Returns true if the "self" contact id was set successfully.
   If the given \a contactId does not identify a contact
@@ -557,6 +611,7 @@
  */
 bool QContactManager::setSelfContactId(const QContactLocalId& contactId)
 {
+    d->m_error = QContactManager::NoError;
     return d->m_engine->setSelfContactId(contactId, &d->m_error);
 }
 
@@ -569,6 +624,7 @@
  */
 QContactLocalId QContactManager::selfContactId() const
 {
+    d->m_error = QContactManager::NoError;
     return d->m_engine->selfContactId(&d->m_error);
 }
 
@@ -579,6 +635,7 @@
  */
 QList<QContactRelationship> QContactManager::relationships(const QContactId& participantId, QContactRelationship::Role role) const
 {
+    d->m_error = QContactManager::NoError;
     return d->m_engine->relationships(QString(), participantId, role, &d->m_error);
 }
 
@@ -589,6 +646,7 @@
  */
 QList<QContactRelationship> QContactManager::relationships(const QString& relationshipType, const QContactId& participantId, QContactRelationship::Role role) const
 {
+    d->m_error = QContactManager::NoError;
     return d->m_engine->relationships(relationshipType, participantId, role, &d->m_error);
 }
 
@@ -608,6 +666,7 @@
 bool QContactManager::saveRelationship(QContactRelationship* relationship)
 {
     if (relationship) {
+        d->m_error = QContactManager::NoError;
         return d->m_engine->saveRelationship(relationship, &d->m_error);
     } else {
         d->m_error =QContactManager::BadArgumentError;
@@ -623,13 +682,14 @@
  */
 bool QContactManager::saveRelationships(QList<QContactRelationship>* relationships, QMap<int, QContactManager::Error>* errorMap)
 {
-    // check arguments
     if (errorMap)
         errorMap->clear();
     if (!relationships) {
         d->m_error =QContactManager::BadArgumentError;
         return false;
     }
+
+    d->m_error = QContactManager::NoError;
     return d->m_engine->saveRelationships(relationships, errorMap, &d->m_error);
 }
 
@@ -641,6 +701,7 @@
  */
 bool QContactManager::removeRelationship(const QContactRelationship& relationship)
 {
+    d->m_error = QContactManager::NoError;
     return d->m_engine->removeRelationship(relationship, &d->m_error);
 }
 
@@ -654,6 +715,7 @@
 {
     if (errorMap)
         errorMap->clear();
+    d->m_error = QContactManager::NoError;
     return d->m_engine->removeRelationships(relationships, errorMap, &d->m_error);
 }
 
@@ -668,6 +730,7 @@
         return QMap<QString, QContactDetailDefinition>();
     }
 
+    d->m_error = QContactManager::NoError;
     return d->m_engine->detailDefinitions(contactType, &d->m_error);
 }
 
@@ -679,6 +742,7 @@
         return QContactDetailDefinition();
     }
 
+    d->m_error = QContactManager::NoError;
     return d->m_engine->detailDefinition(definitionName, contactType, &d->m_error);
 }
 
@@ -690,6 +754,7 @@
         return false;
     }
 
+    d->m_error = QContactManager::NoError;
     return d->m_engine->saveDetailDefinition(def, contactType, &d->m_error);
 }
 
@@ -701,14 +766,15 @@
         return false;
     }
 
+    d->m_error = QContactManager::NoError;
     return d->m_engine->removeDetailDefinition(definitionName, contactType, &d->m_error);
 }
 
 /*!
   \enum QContactManager::ManagerFeature
   This enum describes the possible features that a particular manager may support
-  \value Groups The manager supports all QContactGroup related operations, and emits the appropriate signals
-  \value ActionPreferences The manager supports saving preferred details per action per contact
+  \value Groups The manager supports saving contacts of the \c QContactType::TypeGroup type
+  \omitvalue ActionPreferences The manager supports saving preferred details per action per contact
   \value DetailOrdering When a contact is retrieved, the manager will return the details in the same order in which they were saved
   \value Relationships The manager supports at least some types of relationships between contacts
   \value ArbitraryRelationshipTypes The manager supports relationships of arbitrary types between contacts

--- a/qtmobility/src/contacts/qcontactmanager.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/qcontactmanager.h	Fri May 14 16:41:33 2010 +0300
@@ -61,8 +61,6 @@
 QTM_BEGIN_NAMESPACE
 
 class QContactFilter;
-class QContactAction;
-
 class QContactManagerData;
 class Q_CONTACTS_EXPORT QContactManager : public QObject
 {
@@ -70,13 +68,13 @@
 
 public:
 #if Q_QDOC // qdoc's parser fails to recognise the default map argument
-    QContactManager(const QString& managerName = QString(), const QMap<QString, QString>& parameters = 0, QObject* parent = 0);
+    explicit QContactManager(const QString& managerName = QString(), const QMap<QString, QString>& parameters = 0, QObject* parent = 0);
     QContactManager(const QString& managerName, int implementationVersion, const QMap<QString, QString>& parameters = 0, QObject* parent = 0);
 #else
-    QContactManager(const QString& managerName = QString(), const QMap<QString, QString>& parameters = (QMap<QString, QString>()), QObject* parent = 0);
+    explicit QContactManager(const QString& managerName = QString(), const QMap<QString, QString>& parameters = (QMap<QString, QString>()), QObject* parent = 0);
     QContactManager(const QString& managerName, int implementationVersion, const QMap<QString, QString>& parameters = (QMap<QString, QString>()), QObject* parent = 0);
 #endif
-    QContactManager(QObject* parent);
+    explicit QContactManager(QObject* parent);
 
     static QContactManager* fromUri(const QString& uri, QObject* parent = 0);
     ~QContactManager();                     // dtor
@@ -127,7 +125,8 @@
     QContact compatibleContact(const QContact& original); // Preliminary function!
 
     /* Synthesize the display label of a contact */
-    QString synthesizedDisplayLabel(const QContact& contact) const;
+    QString synthesizedContactDisplayLabel(const QContact& contact) const;
+    void synthesizeContactDisplayLabel(QContact* contact) const;
 
     /* "Self" contact id (MyCard) */
     bool setSelfContactId(const QContactLocalId& contactId);

--- a/qtmobility/src/contacts/qcontactmanager_p.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/qcontactmanager_p.cpp	Fri May 14 16:41:33 2010 +0300
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-
+#include <src/global/qbuildcfg.h>
 #include "qcontactmanager.h"
 #include "qcontactmanager_p.h"
 #include "qcontactmanagerengine.h"
@@ -47,10 +47,6 @@
 
 #include "qcontact_p.h"
 
-#include "qcontactaction.h"
-#include "qcontactactiondescriptor.h"
-#include "qcontactactionfactory.h"
-
 #include <QSharedData>
 #include <QtPlugin>
 #include <QPluginLoader>
@@ -71,12 +67,7 @@
 QTM_BEGIN_NAMESPACE
 
 /* Shared QContactManager stuff here, default engine stuff below */
-QList<QContactActionFactory*> QContactManagerData::m_actionfactories; // list of all factories
-QList<QContactActionDescriptor> QContactManagerData::m_descriptors;
 QHash<QString, QContactManagerEngineFactory*> QContactManagerData::m_engines;
-QContactManagerData::DescriptorHash QContactManagerData::m_descriptormap;
-QHash<QString, int> QContactManagerData::m_vendormap;
-QHash<QString, int> QContactManagerData::m_actionmap;
 
 bool QContactManagerData::m_discovered;
 bool QContactManagerData::m_discoveredStatic;
@@ -86,20 +77,10 @@
 {
     QContactManagerData::m_discovered = false;
     QList<QContactManagerEngineFactory*> factories = QContactManagerData::m_engines.values();
-    QList<QContactActionFactory*> actionfactories = QContactManagerData::m_actionfactories;
-
     for (int i=0; i < factories.count(); i++) {
         delete factories.at(i);
     }
-    for(int i=0; i < actionfactories.count(); i++) {
-        delete actionfactories.at(i);
-    }
     QContactManagerData::m_engines.clear();
-    QContactManagerData::m_actionfactories.clear();
-    QContactManagerData::m_descriptors.clear();
-    QContactManagerData::m_descriptormap.clear();
-    QContactManagerData::m_actionmap.clear();
-    QContactManagerData::m_vendormap.clear();
 }
 
 
@@ -189,7 +170,6 @@
         QObjectList staticPlugins = QPluginLoader::staticInstances();
         for (int i=0; i < staticPlugins.count(); i++ ){
             QContactManagerEngineFactory *f = qobject_cast<QContactManagerEngineFactory*>(staticPlugins.at(i));
-            QContactActionFactory *g = qobject_cast<QContactActionFactory*>(staticPlugins.at(i));
             if (f) {
                 QString name = f->managerName();
 #if !defined QT_NO_DEBUG
@@ -207,29 +187,6 @@
                     qWarning() << "Static contacts plugin with reserved name" << name << "ignored";
                 }
             }
-
-            if (g) {
-                QString name = g->name();
-#if !defined QT_NO_DEBUG
-                if (showDebug)
-                    qDebug() << "Static: found an action factory" << g << "with name" << name;
-#endif
-                if (m_actionfactories.contains(g)) {
-                    qWarning() << "Static contacts plugin" << name << "has the same name as currently loaded plugin; ignored";
-                } else {
-                    m_actionfactories.append(g);
-
-                    QList<QContactActionDescriptor> actions = g->actionDescriptors();
-                    QMap<QContactActionDescriptor, QContactActionFactory*>::iterator it;
-                    for (int j = 0; j < actions.size(); j++) {
-                        QContactActionDescriptor desc = actions.at(j);
-                        m_descriptormap.insert(desc, g);
-                        m_descriptors.append(desc);
-                        m_actionmap.insertMulti(desc.actionName(), m_descriptors.count() - 1);
-                        m_vendormap.insertMulti(desc.vendorName(), m_descriptors.count() - 1);
-                    }
-                }
-            }
         }
     }
 }
@@ -313,6 +270,10 @@
         QSet<QString> processed;
 
         paths << QApplication::applicationDirPath() << QApplication::libraryPaths();
+        QString val = qt_mobility_configure_prefix_path_str;
+        if(val.length() > 0){
+            paths << val;
+        }
 #if !defined QT_NO_DEBUG
         if (showDebug)
             qDebug() << "Plugin paths:" << paths;
@@ -362,8 +323,6 @@
         for (int i=0; i < plugins.count(); i++) {
             QPluginLoader qpl(plugins.at(i));
             QContactManagerEngineFactory *f = qobject_cast<QContactManagerEngineFactory*>(qpl.instance());
-            QContactActionFactory *g = qobject_cast<QContactActionFactory*>(qpl.instance());
-
             if (f) {
                 QString name = f->managerName();
 #if !defined QT_NO_DEBUG
@@ -382,33 +341,9 @@
                 }
             }
 
-            if (g) {
-                QString name = g->name();
-#if !defined QT_NO_DEBUG
-                if (showDebug)
-                    qDebug() << "Dynamic: found a contact action factory" << g << "with name" << name;
-#endif
-                // we also need to ensure that we haven't already loaded this factory.
-                if (m_actionfactories.contains(g)) {
-                    qWarning() << "Contacts plugin" << plugins.at(i) << "has the same name as currently loaded plugin" << name << "; ignored";
-                } else {
-                    m_actionfactories.append(g);
-
-                    QList<QContactActionDescriptor> actions = g->actionDescriptors();
-                    QMap<QContactActionDescriptor, QContactActionFactory*>::iterator it;
-                    for (int j = 0; j < actions.size(); j++) {
-                        const QContactActionDescriptor& desc = actions.at(j);
-                        m_descriptormap.insert(desc, g);
-                        m_descriptors.append(desc);
-                        m_actionmap.insertMulti(desc.actionName(), m_descriptors.count() - 1);
-                        m_vendormap.insertMulti(desc.vendorName(), m_descriptors.count() - 1);
-                    }
-                }
-            }
-
             /* Debugging */
 #if !defined QT_NO_DEBUG
-            if (showDebug && !f && !g) {
+            if (showDebug && !f) {
                 qDebug() << "Unknown plugin:" << qpl.errorString();
                 if (qpl.instance()) {
                     qDebug() << "[qobject:" << qpl.instance() << "]";
@@ -428,65 +363,11 @@
 #if !defined QT_NO_DEBUG
         if (showDebug) {
             qDebug() << "Found engines:" << engineNames;
-            qDebug() << "Found actions:" << m_actionmap.keys();
         }
 #endif
     }
 }
 
-QList<QContactActionDescriptor> QContactManagerData::actionDescriptors(const QString& actionName, const QString& vendorName, int implementationVersion)
-{
-    loadFactories();
-
-    bool restrict = false;
-    QSet<int> subset;
-    QList<QContactActionDescriptor> descriptors;
-
-    // Go through our list of descriptors, looking for a match
-    if (!actionName.isEmpty()) {
-        subset = m_actionmap.values(actionName).toSet();
-        restrict = true;
-    }
-
-    if (!vendorName.isEmpty()) {
-        if (restrict)
-            subset &= m_vendormap.values(vendorName).toSet();
-        else
-            subset = m_vendormap.values(vendorName).toSet();
-        restrict = true;
-
-        /* We still have to check versions, since we don't hash that */
-        if (implementationVersion != -1) {
-            QMutableSetIterator<int> it(subset);
-            while(it.hasNext()) {
-                if (m_descriptors.at(it.next()).implementationVersion() != implementationVersion)
-                    it.remove();
-            }
-        }
-    }
-
-    if (restrict) {
-        QSetIterator<int> it(subset);
-        while(it.hasNext()) {
-            descriptors << m_descriptors.at(it.next());
-        }
-    } else {
-        /* No restrictions, just iterate over all descriptors and return all actions (!) */
-        descriptors = m_descriptors;
-    }
-
-    return descriptors;
-}
-
-QContactAction* QContactManagerData::action(const QContactActionDescriptor& actionDescriptor)
-{
-    loadFactories();
-    QContactActionFactory* actionFactory = m_descriptormap.value(actionDescriptor, 0);
-    if (actionFactory)
-        return actionFactory->instance(actionDescriptor);
-    return 0;
-}
-
 // trampoline for private classes
 QContactManagerEngine* QContactManagerData::engine(const QContactManager* manager)
 {

--- a/qtmobility/src/contacts/qcontactmanager_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/qcontactmanager_p.h	Fri May 14 16:41:33 2010 +0300
@@ -62,9 +62,6 @@
 #include "qcontactmanager.h"
 #include "qcontactmanagerengine.h"
 
-#include "qcontactactiondescriptor.h"
-#include "qcontactactionfactory.h"
-
 QTM_BEGIN_NAMESPACE
 
 class QContactManagerEngineFactory;
@@ -86,8 +83,6 @@
 
     void createEngine(const QString& managerName, const QMap<QString, QString>& parameters);
     static QContactManagerEngine* engine(const QContactManager* manager);
-    static QList<QContactActionDescriptor> actionDescriptors(const QString& actionName = QString(), const QString& vendorName = QString(), int implementationVersion = -1);
-    static QContactAction* action(const QContactActionDescriptor& actionDescriptor);
 
     QContactManagerEngine* m_engine;
     QContactManager::Error m_error;
@@ -100,14 +95,6 @@
     static void loadFactories();
     static void loadStaticFactories();
 
-    /* Action Implementations */
-    typedef QHash<QContactActionDescriptor, QContactActionFactory*> DescriptorHash;
-    static QList<QContactActionFactory*> m_actionfactories; // list of all factories
-    static QList<QContactActionDescriptor> m_descriptors; // all descriptors
-    static DescriptorHash m_descriptormap;
-    static QHash<QString, int> m_actionmap;
-    static QHash<QString, int> m_vendormap;
-
 private:
     Q_DISABLE_COPY(QContactManagerData)
 };

--- a/qtmobility/src/contacts/qcontactmanagerengine.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/qcontactmanagerengine.cpp	Fri May 14 16:41:33 2010 +0300
@@ -46,8 +46,6 @@
 #include "qcontactdetails.h"
 #include "qcontactsortorder.h"
 #include "qcontactfilters.h"
-#include "qcontactaction.h"
-#include "qcontactactiondescriptor.h"
 #include "qcontactabstractrequest.h"
 #include "qcontactabstractrequest_p.h"
 #include "qcontactrequests.h"
@@ -228,7 +226,7 @@
   Any operation error which occurs will be saved in \a error.
 
   The \a fetchHint parameter describes the optimization hints that a manager may take.
-  If the \a fetchHint is the default constructed hint, all existing details, relationships and action preferences
+  If the \a fetchHint is the default constructed hint, all existing details and relationships
   in the matching contacts will be returned.  A client should not make changes to a contact which has
   been retrieved using a fetch hint other than the default fetch hint.  Doing so will result in information
   loss when saving the contact back to the manager (as the "new" restricted contact will
@@ -254,7 +252,7 @@
   Any operation error which occurs will be saved in \a error.
 
   The \a fetchHint parameter describes the optimization hints that a manager may take.
-  If the \a fetchHint is the default constructed hint, all existing details, relationships and action preferences
+  If the \a fetchHint is the default constructed hint, all existing details and relationships
   in the matching contact will be returned.  A client should not make changes to a contact which has
   been retrieved using a fetch hint other than the default fetch hint.  Doing so will result in information
   loss when saving the contact back to the manager (as the "new" restricted contact will
@@ -489,7 +487,7 @@
 {
     QContactDisplayLabel dl;
     dl.setValue(QContactDisplayLabel::FieldLabel, displayLabel);
-    setDetailAccessConstraints(&dl, QContactDetail::Irremovable);
+    setDetailAccessConstraints(&dl, QContactDetail::Irremovable | QContactDetail::ReadOnly);
     contact->d->m_details.replace(0, dl);
 }
 
@@ -509,8 +507,6 @@
 
   Some of the following transformations may be applied:
   \list
-   \o Any QContactActionFilters are transformed into the corresponding
-     QContactFilters returned by matching actions
    \o Any QContactInvalidFilters contained in a union filter will be removed
    \o Any default QContactFilters contained in an intersection filter will be removed
    \o Any QContactIntersectionFilters with a QContactInvalidFilter contained will be
@@ -528,40 +524,6 @@
 QContactFilter QContactManagerEngine::canonicalizedFilter(const QContactFilter &filter)
 {
     switch(filter.type()) {
-        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());
-
-            QList<QContactFilter> filters;
-            // There's a small wrinkle if there's a value specified in the action filter
-            // we have to adjust any contained QContactDetailFilters to have that value
-            // or test if a QContactDetailRangeFilter contains this value already
-            for (int j = 0; j < descriptors.count(); j++) {
-                QContactAction* action = QContactAction::action(descriptors.at(j));
-
-                // Action filters are not allowed to return action filters, at all
-                // it's too annoying to check for recursion
-                QContactFilter d = action->contactFilter(af.value());
-                delete action; // clean up.
-                if (!validateActionFilter(d))
-                    continue;
-
-                filters.append(d);
-            }
-
-            if (filters.count() == 0)
-                return QContactInvalidFilter();
-            if (filters.count() == 1)
-                return filters.first();
-
-            QContactUnionFilter f;
-            f.setFilters(filters);
-            return canonicalizedFilter(f);
-        }
-        break;
-
         case QContactFilter::IntersectionFilter:
         {
             QContactIntersectionFilter f(filter);
@@ -589,7 +551,7 @@
             f.setFilters(filters);
             return f;
         }
-        break;
+        // unreachable
 
         case QContactFilter::UnionFilter:
         {
@@ -618,7 +580,7 @@
             f.setFilters(filters);
             return f;
         }
-        break;
+        // unreachable
 
         case QContactFilter::LocalIdFilter:
         {
@@ -1182,10 +1144,9 @@
     QList<QString> uniqueDefinitionIds;
 
     // check that each detail conforms to its definition as supported by this manager.
-    for (int i=0; i < contact.details().count(); i++) {
-        const QContactDetail& d = contact.details().at(i);
-        QVariantMap values = d.variantValues();
-        QContactDetailDefinition def = detailDefinition(d.definitionName(), contact.type(), error);
+    foreach (const QContactDetail& detail, contact.details()) {
+        QVariantMap values = detail.variantValues();
+        QContactDetailDefinition def = detailDefinition(detail.definitionName(), contact.type(), error);
         // check that the definition is supported
         if (*error != QContactManager::NoError) {
             *error = QContactManager::InvalidDetailError;
@@ -1201,9 +1162,11 @@
             uniqueDefinitionIds.append(def.name());
         }
 
-        QList<QString> keys = values.keys();
-        for (int i=0; i < keys.count(); i++) {
-            const QString& key = keys.at(i);
+        QMapIterator<QString,QVariant> fieldIt(values);
+        while (fieldIt.hasNext()) {
+            fieldIt.next();
+            const QString& key = fieldIt.key();
+            const QVariant& variant = fieldIt.value();
             // check that no values exist for nonexistent fields.
             if (!def.fields().contains(key)) {
                 *error = QContactManager::InvalidDetailError;
@@ -1212,7 +1175,7 @@
 
             QContactDetailFieldDefinition field = def.fields().value(key);
             // check that the type of each value corresponds to the allowable field type
-            if (static_cast<int>(field.dataType()) != values.value(key).userType()) {
+            if (static_cast<int>(field.dataType()) != variant.userType()) {
                 *error = QContactManager::InvalidDetailError;
                 return false; // type doesn't match.
             }
@@ -1222,14 +1185,15 @@
             if (!field.allowableValues().isEmpty()) {
                 // if the field datatype is a list, check that it contains only allowable values
                 if (field.dataType() == QVariant::List || field.dataType() == QVariant::StringList) {
-                    QList<QVariant> innerValues = values.value(key).toList();
-                    for (int i = 0; i < innerValues.size(); i++) {
-                        if (!field.allowableValues().contains(innerValues.at(i))) {
+                    QList<QVariant> innerValues = variant.toList();
+                    QListIterator<QVariant> it(innerValues);
+                    while (it.hasNext()) {
+                        if (!field.allowableValues().contains(it.next())) {
                             *error = QContactManager::InvalidDetailError;
                             return false; // value not allowed.
                         }
                     }
-                } else if (!field.allowableValues().contains(values.value(key))) {
+                } else if (!field.allowableValues().contains(variant)) {
                     // the datatype is not a list; the value wasn't allowed.
                     *error = QContactManager::InvalidDetailError;
                     return false; // value not allowed.
@@ -1508,26 +1472,24 @@
 
 /*!
   Returns a pruned or modified version of the \a original contact which is valid and can be saved in the manager.
-  The returned contact might have entire details removed or arbitrarily changed.  The cache of relationships
+  The returned contact might have details removed or arbitrarily changed.  The cache of relationships
   in the contact are ignored entirely when considering compatibility with the backend, as they are
   saved and validated separately.  Any error which occurs will be saved to \a error.
  */
 QContact QContactManagerEngine::compatibleContact(const QContact& original, QContactManager::Error* error) const
 {
     QContact conforming;
+    conforming.setId(original.id());
     QContactManager::Error tempError;
     QList<QString> uniqueDefinitionIds;
-    QList<QContactDetail> allDetails = original.details();
-    QMap<QString, QContactDetailDefinition> defs = detailDefinitions(original.type(), &tempError);
-    for (int j = 0; j < allDetails.size(); j++) {
+    foreach (QContactDetail detail, original.details()) {
         // check that the detail conforms to the definition in this manager.
         // if so, then add it to the conforming contact to be returned.  if not, prune it.
-        const QContactDetail& d = allDetails.at(j);
 
-        QVariantMap values = d.variantValues();
-        QContactDetailDefinition def = detailDefinition(d.definitionName(), original.type(), &tempError);
+        QVariantMap values = detail.variantValues();
+        QContactDetailDefinition def = detailDefinition(detail.definitionName(), original.type(), &tempError);
         // check that the definition is supported
-        if (*error != QContactManager::NoError) {
+        if (tempError != QContactManager::NoError) {
             continue; // this definition is not supported.
         }
 
@@ -1539,48 +1501,47 @@
             uniqueDefinitionIds.append(def.name());
         }
 
-        bool addToConforming = true;
-        QList<QString> keys = values.keys();
-        for (int i=0; i < keys.count(); i++) {
-            const QString& key = keys.at(i);
-            // check that no values exist for nonexistent fields.
+        QMapIterator<QString,QVariant> fieldIt(values);
+        while (fieldIt.hasNext()) {
+            fieldIt.next();
+            const QString& key = fieldIt.key();
+            const QVariant& variant = fieldIt.value();
+            // prune values for nonexistent fields.
             if (!def.fields().contains(key)) {
-                addToConforming = false;
-                break; // value for nonexistent field.
+                detail.removeValue(key);
             }
 
             QContactDetailFieldDefinition field = def.fields().value(key);
-            // check that the type of each value corresponds to the allowable field type
-            if (static_cast<int>(field.dataType()) != values.value(key).userType()) {
-                addToConforming = false;
-                break; // type doesn't match.
+            // prune values that do not correspond to the allowable field type
+            if (static_cast<int>(field.dataType()) != variant.userType()) {
+                detail.removeValue(key);
             }
 
             // check that the value is allowable
             // if the allowable values is an empty list, any are allowed.
             if (!field.allowableValues().isEmpty()) {
-                // if the field datatype is a list, check that it contains only allowable values
+                // if the field datatype is a list, remove non-allowable values
                 if (field.dataType() == QVariant::List || field.dataType() == QVariant::StringList) {
-                    QList<QVariant> innerValues = values.value(key).toList();
-                    for (int i = 0; i < innerValues.size(); i++) {
-                        if (!field.allowableValues().contains(innerValues.at(i))) {
-                            addToConforming = false;
-                            break; // value not allowed.
+                    QList<QVariant> innerValues = variant.toList();
+                    QMutableListIterator<QVariant> it(innerValues);
+                    while (it.hasNext()) {
+                        if (!field.allowableValues().contains(it.next())) {
+                            it.remove();
                         }
                     }
-                } else if (!field.allowableValues().contains(values.value(key))) {
-                    // the datatype is not a list; the value wasn't allowed.
-                    addToConforming = false;
-                    break; // value not allowed.
+                    if (innerValues.isEmpty())
+                        detail.removeValue(key);
+                    else
+                        detail.setValue(key, innerValues);
+                } else if (!field.allowableValues().contains(variant)) {
+                    detail.removeValue(key);
                 }
             }
         }
 
-        // if it conforms to this manager's schema, save it in the conforming contact
-        // else, ignore it (prune it out of the conforming contact).
-        if (addToConforming) {
-            QContactDetail saveCopy = d;
-            conforming.saveDetail(&saveCopy);
+        // if it hasn't been pruned away to nothing, save it in the conforming contact
+        if (!detail.isEmpty()) {
+            conforming.saveDetail(&detail);
         }
     }
 
@@ -1662,6 +1623,7 @@
 {
     switch(filter.type()) {
         case QContactFilter::InvalidFilter:
+        case QContactFilter::ActionFilter:
             return false;
 
         case QContactFilter::DefaultFilter:
@@ -1990,33 +1952,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());
-
-                // There's a small wrinkle if there's a value specified in the action filter
-                // we have to adjust any contained QContactDetailFilters to have that value
-                // or test if a QContactDetailRangeFilter contains this value already
-                for (int j = 0; j < descriptors.count(); j++) {
-                    QContactAction* action = QContactAction::action(descriptors.at(j));
-
-                    // Action filters are not allowed to return action filters, at all
-                    // it's too annoying to check for recursion
-                    QContactFilter d = action->contactFilter(af.value());
-                    delete action; // clean up.
-                    if (!validateActionFilter(d))
-                        return false;
-
-                    // Check for values etc...
-                    if (testFilter(d, contact))
-                        return true;
-                }
-                // Fall through to end
-            }
-            break;
-
         case QContactFilter::IntersectionFilter:
             {
                 /* XXX In theory we could reorder the terms to put the native tests first */
@@ -2055,40 +1990,11 @@
 }
 
 /*!
-  Given a QContactFilter \a filter retrieved from a QContactAction,
-  check that it is valid and cannot cause infinite recursion.
-
-  In particular, a filter from a QContactAction cannot contain
-  any instances of a QContactActionFilter.
-
-  Returns true if \a filter seems ok, or false otherwise.
- */
-
-bool QContactManagerEngine::validateActionFilter(const QContactFilter& filter)
-{
-    QList<QContactFilter> toVerify;
-    toVerify << filter;
-
-    while(toVerify.count() > 0) {
-        QContactFilter f = toVerify.takeFirst();
-        if (f.type() == QContactFilter::ActionFilter)
-            return false;
-        if (f.type() == QContactFilter::IntersectionFilter)
-            toVerify.append(QContactIntersectionFilter(f).filters());
-        if (f.type() == QContactFilter::UnionFilter)
-            toVerify.append(QContactUnionFilter(f).filters());
-    }
-
-    return true;
-}
-
-/*!
   Sets the cached relationships in the given \a contact to \a relationships
  */
 void QContactManagerEngine::setContactRelationships(QContact* contact, const QList<QContactRelationship>& relationships)
 {
     contact->d->m_relationshipsCache = relationships;
-    contact->d->m_reorderedRelationshipsCache = relationships;
 }
 
 
@@ -2110,10 +2016,23 @@
         const QVariant& aVal = a.detail(sortOrder.detailDefinitionName()).variantValue(sortOrder.detailFieldName());
         const QVariant& bVal = b.detail(sortOrder.detailDefinitionName()).variantValue(sortOrder.detailFieldName());
 
+        bool aIsNull = false;
+        bool bIsNull = false;
+
+        // treat empty strings as null qvariants.
+        if ((aVal.type() == QVariant::String && aVal.toString().isEmpty()) || aVal.isNull()) {
+            aIsNull = true;
+        }
+        if ((bVal.type() == QVariant::String && bVal.toString().isEmpty()) || bVal.isNull()) {
+            bIsNull = true;
+        }
+
         // early exit error checking
-        if (aVal.isNull())
+        if (aIsNull && bIsNull)
+            continue; // use next sort criteria.
+        if (aIsNull)
             return (sortOrder.blankPolicy() == QContactSortOrder::BlanksFirst ? -1 : 1);
-        if (bVal.isNull())
+        if (bIsNull)
             return (sortOrder.blankPolicy() == QContactSortOrder::BlanksFirst ? 1 : -1);
 
         // real comparison

--- a/qtmobility/src/contacts/qcontactmanagerengine.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/qcontactmanagerengine.h	Fri May 14 16:41:33 2010 +0300
@@ -72,62 +72,62 @@
 
     /* URI reporting */
     virtual QString managerName() const = 0;                       // e.g. "Symbian"
-    virtual QMap<QString, QString> managerParameters() const = 0;  // e.g. "filename=private.db"
+    virtual QMap<QString, QString> managerParameters() const;  // e.g. "filename=private.db"
     virtual int managerVersion() const = 0;
 
     /* Default and only implementation of this */
     QString managerUri() const;
 
     /* Filtering */
-    virtual QList<QContactLocalId> contactIds(const QContactFilter& filter, const QList<QContactSortOrder>& sortOrders, QContactManager::Error* error) const = 0;
-    virtual QList<QContact> contacts(const QContactFilter& filter, const QList<QContactSortOrder>& sortOrders, const QContactFetchHint& fetchHint, QContactManager::Error* error) const = 0;
-    virtual QContact contact(const QContactLocalId& contactId, const QContactFetchHint& fetchHint, QContactManager::Error* error) const = 0;
+    virtual QList<QContactLocalId> contactIds(const QContactFilter& filter, const QList<QContactSortOrder>& sortOrders, QContactManager::Error* error) const;
+    virtual QList<QContact> contacts(const QContactFilter& filter, const QList<QContactSortOrder>& sortOrders, const QContactFetchHint& fetchHint, QContactManager::Error* error) const;
+    virtual QContact contact(const QContactLocalId& contactId, const QContactFetchHint& fetchHint, QContactManager::Error* error) const;
 
     virtual bool saveContact(QContact* contact, QContactManager::Error* error);
     virtual bool removeContact(const QContactLocalId& contactId, QContactManager::Error* error);
     virtual bool saveRelationship(QContactRelationship* relationship, QContactManager::Error* error);
     virtual bool removeRelationship(const QContactRelationship& relationship, QContactManager::Error* error);
 
-    virtual bool saveContacts(QList<QContact>* contacts, QMap<int, QContactManager::Error>* errorMap, QContactManager::Error* error) = 0;
-    virtual bool removeContacts(const QList<QContactLocalId>& contactIds, QMap<int, QContactManager::Error>* errorMap, QContactManager::Error* error) = 0;
+    virtual bool saveContacts(QList<QContact>* contacts, QMap<int, QContactManager::Error>* errorMap, QContactManager::Error* error);
+    virtual bool removeContacts(const QList<QContactLocalId>& contactIds, QMap<int, QContactManager::Error>* errorMap, QContactManager::Error* error);
 
     /* Return a pruned or modified contact which is valid and can be saved in the backend */
-    virtual QContact compatibleContact(const QContact& original, QContactManager::Error* error) const = 0;
+    virtual QContact compatibleContact(const QContact& original, QContactManager::Error* error) const;
 
     /* Synthesize the display label of a contact */
-    virtual QString synthesizedDisplayLabel(const QContact& contact, QContactManager::Error* error) const = 0;
+    virtual QString synthesizedDisplayLabel(const QContact& contact, QContactManager::Error* error) const;
 
     /* "Self" contact id (MyCard) */
-    virtual bool setSelfContactId(const QContactLocalId& contactId, QContactManager::Error* error) = 0;
-    virtual QContactLocalId selfContactId(QContactManager::Error* error) const = 0;
+    virtual bool setSelfContactId(const QContactLocalId& contactId, QContactManager::Error* error);
+    virtual QContactLocalId selfContactId(QContactManager::Error* error) const;
 
     /* Relationships between contacts */
-    virtual QList<QContactRelationship> relationships(const QString& relationshipType, const QContactId& participantId, QContactRelationship::Role role, QContactManager::Error* error) const = 0;
-    virtual bool saveRelationships(QList<QContactRelationship>* relationships, QMap<int, QContactManager::Error>* errorMap, QContactManager::Error* error) = 0;
-    virtual bool removeRelationships(const QList<QContactRelationship>& relationships, QMap<int, QContactManager::Error>* errorMap, QContactManager::Error* error) = 0;
+    virtual QList<QContactRelationship> relationships(const QString& relationshipType, const QContactId& participantId, QContactRelationship::Role role, QContactManager::Error* error) const;
+    virtual bool saveRelationships(QList<QContactRelationship>* relationships, QMap<int, QContactManager::Error>* errorMap, QContactManager::Error* error);
+    virtual bool removeRelationships(const QList<QContactRelationship>& relationships, QMap<int, QContactManager::Error>* errorMap, QContactManager::Error* error);
 
     /* Validation for saving */
-    virtual bool validateContact(const QContact& contact, QContactManager::Error* error) const = 0;
-    virtual bool validateDefinition(const QContactDetailDefinition& def, QContactManager::Error* error) const = 0;
+    virtual bool validateContact(const QContact& contact, QContactManager::Error* error) const;
+    virtual bool validateDefinition(const QContactDetailDefinition& def, QContactManager::Error* error) const;
 
     /* Definitions - Accessors and Mutators */
-    virtual QMap<QString, QContactDetailDefinition> detailDefinitions(const QString& contactType, QContactManager::Error* error) const = 0;
-    virtual QContactDetailDefinition detailDefinition(const QString& definitionId, const QString& contactType, QContactManager::Error* error) const = 0;
-    virtual bool saveDetailDefinition(const QContactDetailDefinition& def, const QString& contactType, QContactManager::Error* error) = 0;
-    virtual bool removeDetailDefinition(const QString& definitionId, const QString& contactType, QContactManager::Error* error) = 0;
+    virtual QMap<QString, QContactDetailDefinition> detailDefinitions(const QString& contactType, QContactManager::Error* error) const;
+    virtual QContactDetailDefinition detailDefinition(const QString& definitionId, const QString& contactType, QContactManager::Error* error) const;
+    virtual bool saveDetailDefinition(const QContactDetailDefinition& def, const QString& contactType, QContactManager::Error* error);
+    virtual bool removeDetailDefinition(const QString& definitionId, const QString& contactType, QContactManager::Error* error);
 
     /* Asynchronous Request Support */
-    virtual void requestDestroyed(QContactAbstractRequest* req) = 0;
-    virtual bool startRequest(QContactAbstractRequest* req) = 0;
-    virtual bool cancelRequest(QContactAbstractRequest* req) = 0;
-    virtual bool waitForRequestFinished(QContactAbstractRequest* req, int msecs) = 0;
+    virtual void requestDestroyed(QContactAbstractRequest* req);
+    virtual bool startRequest(QContactAbstractRequest* req);
+    virtual bool cancelRequest(QContactAbstractRequest* req);
+    virtual bool waitForRequestFinished(QContactAbstractRequest* req, int msecs);
 
     /* Capabilities reporting */
-    virtual bool hasFeature(QContactManager::ManagerFeature feature, const QString& contactType) const = 0;
-    virtual bool isRelationshipTypeSupported(const QString& relationshipType, const QString& contactType) const = 0;
-    virtual bool isFilterSupported(const QContactFilter& filter) const = 0;
-    virtual QList<QVariant::Type> supportedDataTypes() const = 0;
-    virtual QStringList supportedContactTypes() const = 0;
+    virtual bool hasFeature(QContactManager::ManagerFeature feature, const QString& contactType) const;
+    virtual bool isRelationshipTypeSupported(const QString& relationshipType, const QString& contactType) const;
+    virtual bool isFilterSupported(const QContactFilter& filter) const;
+    virtual QList<QVariant::Type> supportedDataTypes() const;
+    virtual QStringList supportedContactTypes() const;
 
     /* Reports the built-in definitions from the schema */
     static QMap<QString, QMap<QString, QContactDetailDefinition> > schemaDefinitions();
@@ -166,7 +166,6 @@
     static void addSorted(QList<QContact>* sorted, const QContact& toAdd, const QList<QContactSortOrder>& sortOrders);
     static int compareVariant(const QVariant& first, const QVariant& second, Qt::CaseSensitivity sensitivity);
     static bool testFilter(const QContactFilter& filter, const QContact& contact);
-    static bool validateActionFilter(const QContactFilter& filter);
     static QList<QContactLocalId> sortContacts(const QList<QContact>& contacts, const QList<QContactSortOrder>& sortOrders);
 
     static QContactFilter canonicalizedFilter(const QContactFilter& filter);

--- a/qtmobility/src/contacts/qtcontacts.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/qtcontacts.h	Fri May 14 16:41:33 2010 +0300
@@ -59,9 +59,6 @@
 #include "qcontactfilter.h"                     // contact filter
 #include "qcontactfilters.h"                    // leaf filter classes
 #include "qcontactsortorder.h"                  // contact sorting
-#include "qcontactaction.h"                     // actions
-#include "qcontactactiondescriptor.h"           // action descriptors
-#include "qcontactactionfactory.h"              // action factory
 #include "qcontactabstractrequest.h"            // asynchronous request
 #include "qcontactrequests.h"                   // request leaf classes
 #include "qcontactrelationship.h"               // contact relationships

--- a/qtmobility/src/contacts/requests/qcontactdetaildefinitionfetchrequest.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactdetaildefinitionfetchrequest.cpp	Fri May 14 16:41:33 2010 +0300
@@ -57,12 +57,25 @@
   \ingroup contacts-requests
  */
 
-/*! Constructs a new detail definition fetch request */
-QContactDetailDefinitionFetchRequest::QContactDetailDefinitionFetchRequest()
-    : QContactAbstractRequest(new QContactDetailDefinitionFetchRequestPrivate)
+/*! Constructs a new detail definition fetch request whose parent is the specified \a parent */
+QContactDetailDefinitionFetchRequest::QContactDetailDefinitionFetchRequest(QObject* parent)
+    : QContactAbstractRequest(new QContactDetailDefinitionFetchRequestPrivate, parent)
 {
 }
 
+/*! Sets the name of the detail definition to retrieve to \a definitionName.
+    Equivalent to calling
+    \code
+        setDefinitionNames(QList<QContactDetailDefinition>() << definitionName);
+    \endcode
+ */
+void QContactDetailDefinitionFetchRequest::setDefinitionName(const QString& definitionName)
+{
+    Q_D(QContactDetailDefinitionFetchRequest);
+    d->m_names.clear();
+    d->m_names.append(definitionName);
+}
+
 /*! Sets the names of the detail definitions to retrieve to \a names */
 void QContactDetailDefinitionFetchRequest::setDefinitionNames(const QStringList& names)
 {

--- a/qtmobility/src/contacts/requests/qcontactdetaildefinitionfetchrequest.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactdetaildefinitionfetchrequest.h	Fri May 14 16:41:33 2010 +0300
@@ -57,9 +57,10 @@
     Q_OBJECT
 
 public:
-    QContactDetailDefinitionFetchRequest();
+    QContactDetailDefinitionFetchRequest(QObject* parent = 0);
 
     /* Selection */
+    void setDefinitionName(const QString& definitionName);
     void setDefinitionNames(const QStringList& names);
     QStringList definitionNames() const;
     void setContactType(const QString& contactType);

--- a/qtmobility/src/contacts/requests/qcontactdetaildefinitionremoverequest.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactdetaildefinitionremoverequest.cpp	Fri May 14 16:41:33 2010 +0300
@@ -57,21 +57,39 @@
   \ingroup contacts-requests
  */
 
-/*! Constructs a new detail definition remove request */
-QContactDetailDefinitionRemoveRequest::QContactDetailDefinitionRemoveRequest()
-    : QContactAbstractRequest(new QContactDetailDefinitionRemoveRequestPrivate)
+/*! Constructs a new detail definition remove request whose parent is the specified \a parent */
+QContactDetailDefinitionRemoveRequest::QContactDetailDefinitionRemoveRequest(QObject* parent)
+    : QContactAbstractRequest(new QContactDetailDefinitionRemoveRequestPrivate, parent)
 {
 }
 
 /*!
-  Sets the type of contact for which detail definitions should be removed to \a contactType, and the names of the detail definitions to remove from the manager to \a names.
+  Sets the name of the detail definition to remove from the manager to \a definitionName.
   Managers may store different definitions which are valid for different contact types, and so attempting to remove definitions with certain names may fail if no such
-  definitions exist for contacts of the given contact type, or if \a contactType is empty.
+  definitions exist for contacts of the given contact type, specified via setContactType().
+  Equivalent to calling:
+  \code
+      setDefinitionNames(QStringList(definitionName));
+  \endcode
+
+  \sa setContactType()
  */
-void QContactDetailDefinitionRemoveRequest::setDefinitionNames(const QString& contactType, const QStringList& names)
+void QContactDetailDefinitionRemoveRequest::setDefinitionName(const QString& definitionName)
 {
     Q_D(QContactDetailDefinitionRemoveRequest);
-    d->m_contactType = contactType;
+    d->m_names.clear();
+    d->m_names.append(definitionName);
+}
+
+/*!
+  Sets the names of the detail definitions to remove from the manager to \a names.
+  Managers may store different definitions which are valid for different contact types, and so attempting to remove definitions with certain names may fail if no such
+  definitions exist for contacts of the given contact type, specified via setContactType().
+  \sa setContactType()
+ */
+void QContactDetailDefinitionRemoveRequest::setDefinitionNames(const QStringList& names)
+{
+    Q_D(QContactDetailDefinitionRemoveRequest);
     d->m_names = names;
 }
 
@@ -82,6 +100,15 @@
     return d->m_names;
 }
 
+/*!
+  Sets the type of contact for which detail definitions should be removed to \a contactType
+ */
+void QContactDetailDefinitionRemoveRequest::setContactType(const QString& contactType)
+{
+    Q_D(QContactDetailDefinitionRemoveRequest);
+    d->m_contactType = contactType;
+}
+
 /*! Returns the type of contact for which detail definitions will be removed */
 QString QContactDetailDefinitionRemoveRequest::contactType() const
 {

--- a/qtmobility/src/contacts/requests/qcontactdetaildefinitionremoverequest.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactdetaildefinitionremoverequest.h	Fri May 14 16:41:33 2010 +0300
@@ -55,11 +55,13 @@
     Q_OBJECT
 
 public:
-    QContactDetailDefinitionRemoveRequest();
+    QContactDetailDefinitionRemoveRequest(QObject* parent = 0);
 
     /* Selection */
-    void setDefinitionNames(const QString& contactType, const QStringList& names);
+    void setDefinitionName(const QString& definitionName);
+    void setDefinitionNames(const QStringList& names);
     QStringList definitionNames() const;
+    void setContactType(const QString& contactType);
     QString contactType() const;
 
     /* Results */

--- a/qtmobility/src/contacts/requests/qcontactdetaildefinitionsaverequest.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactdetaildefinitionsaverequest.cpp	Fri May 14 16:41:33 2010 +0300
@@ -58,12 +58,26 @@
   \ingroup contacts-requests
  */
 
-/*! Constructs a new detail definition save request */
-QContactDetailDefinitionSaveRequest::QContactDetailDefinitionSaveRequest()
-    : QContactAbstractRequest(new QContactDetailDefinitionSaveRequestPrivate)
+/*! Constructs a new detail definition save request whose parent is the specified \a parent */
+QContactDetailDefinitionSaveRequest::QContactDetailDefinitionSaveRequest(QObject* parent)
+    : QContactAbstractRequest(new QContactDetailDefinitionSaveRequestPrivate, parent)
 {
 }
 
+/*!
+  Sets the definition to save to be the given \a definition.
+  Equivalent to calling:
+  \code
+      setDefinitions(QList<QContactDetailDefinition>() << definition);
+  \endcode
+ */
+void QContactDetailDefinitionSaveRequest::setDefinition(const QContactDetailDefinition& definition)
+{
+    Q_D(QContactDetailDefinitionSaveRequest);
+    d->m_definitions.clear();
+    d->m_definitions.append(definition);
+}
+
 /*! Sets the definitions to save to be \a definitions */
 void QContactDetailDefinitionSaveRequest::setDefinitions(const QList<QContactDetailDefinition>& definitions)
 {

--- a/qtmobility/src/contacts/requests/qcontactdetaildefinitionsaverequest.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactdetaildefinitionsaverequest.h	Fri May 14 16:41:33 2010 +0300
@@ -57,9 +57,10 @@
     Q_OBJECT
 
 public:
-    QContactDetailDefinitionSaveRequest();
+    QContactDetailDefinitionSaveRequest(QObject* parent = 0);
 
     /* Selection */
+    void setDefinition(const QContactDetailDefinition& definition);
     void setDefinitions(const QList<QContactDetailDefinition>& definitions);
     void setContactType(const QString& contactType);
     QString contactType() const;

--- a/qtmobility/src/contacts/requests/qcontactfetchrequest.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactfetchrequest.cpp	Fri May 14 16:41:33 2010 +0300
@@ -57,9 +57,9 @@
   \ingroup contacts-requests
  */
 
-/*! Constructs a new contact fetch request */
-QContactFetchRequest::QContactFetchRequest()
-    : QContactAbstractRequest(new QContactFetchRequestPrivate)
+/*! Constructs a new contact fetch request whose parent is the specified \a parent */
+QContactFetchRequest::QContactFetchRequest(QObject* parent)
+    : QContactAbstractRequest(new QContactFetchRequestPrivate, parent)
 {
 }

--- a/qtmobility/src/contacts/requests/qcontactfetchrequest.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactfetchrequest.h	Fri May 14 16:41:33 2010 +0300
@@ -60,7 +60,7 @@
     Q_OBJECT
 
 public:
-    QContactFetchRequest();
+    QContactFetchRequest(QObject* parent = 0);
 
     /* Selection, restriction and sorting */
     void setFilter(const QContactFilter& filter);

--- a/qtmobility/src/contacts/requests/qcontactlocalidfetchrequest.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactlocalidfetchrequest.cpp	Fri May 14 16:41:33 2010 +0300
@@ -57,9 +57,9 @@
   \ingroup contacts-requests
  */
 
-/*! Constructs a new contact id fetch request */
-QContactLocalIdFetchRequest::QContactLocalIdFetchRequest()
-    : QContactAbstractRequest(new QContactLocalIdFetchRequestPrivate)
+/*! Constructs a new contact id fetch request whose parent is the specified \a parent */
+QContactLocalIdFetchRequest::QContactLocalIdFetchRequest(QObject* parent)
+    : QContactAbstractRequest(new QContactLocalIdFetchRequestPrivate, parent)
 {
 }

--- a/qtmobility/src/contacts/requests/qcontactlocalidfetchrequest.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactlocalidfetchrequest.h	Fri May 14 16:41:33 2010 +0300
@@ -58,7 +58,7 @@
     Q_OBJECT
 
 public:
-    QContactLocalIdFetchRequest();
+    QContactLocalIdFetchRequest(QObject* parent = 0);
 
     /* Selection, restriction and sorting */
     void setFilter(const QContactFilter& filter);

--- a/qtmobility/src/contacts/requests/qcontactrelationshipfetchrequest.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactrelationshipfetchrequest.cpp	Fri May 14 16:41:33 2010 +0300
@@ -59,10 +59,10 @@
   \ingroup contacts-requests
  */
 
-/*! Constructs a new relationship fetch request
+/*! Constructs a new relationship fetch request whose parent is the specified \a parent
  */
-QContactRelationshipFetchRequest::QContactRelationshipFetchRequest()
-    : QContactAbstractRequest(new QContactRelationshipFetchRequestPrivate)
+QContactRelationshipFetchRequest::QContactRelationshipFetchRequest(QObject* parent)
+    : QContactAbstractRequest(new QContactRelationshipFetchRequestPrivate, parent)
 {
 }

--- a/qtmobility/src/contacts/requests/qcontactrelationshipfetchrequest.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactrelationshipfetchrequest.h	Fri May 14 16:41:33 2010 +0300
@@ -59,7 +59,7 @@
     Q_OBJECT
 
 public:
-    QContactRelationshipFetchRequest();
+    QContactRelationshipFetchRequest(QObject* parent = 0);
 
     /* Selection */
     void setFirst(const QContactId& firstId);

--- a/qtmobility/src/contacts/requests/qcontactrelationshipremoverequest.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactrelationshipremoverequest.cpp	Fri May 14 16:41:33 2010 +0300
@@ -58,12 +58,26 @@
   \ingroup contacts-requests
  */
 
-/*! Constructs a new relationship remove request */
-QContactRelationshipRemoveRequest::QContactRelationshipRemoveRequest()
-    : QContactAbstractRequest(new QContactRelationshipRemoveRequestPrivate)
+/*! Constructs a new relationship remove request whose parent is the specified \a parent */
+QContactRelationshipRemoveRequest::QContactRelationshipRemoveRequest(QObject* parent)
+    : QContactAbstractRequest(new QContactRelationshipRemoveRequestPrivate, parent)
 {
 }
 
+/*!
+  Sets the relationship which will be removed to \a relationship.
+  Equivalent to calling:
+  \code
+      setRelationships(QList<QContactRelationship>() << relationship);
+  \endcode
+ */
+void QContactRelationshipRemoveRequest::setRelationship(const QContactRelationship& relationship)
+{
+    Q_D(QContactRelationshipRemoveRequest);
+    d->m_relationships.clear();
+    d->m_relationships.append(relationship);
+}
+
 /*! Sets the list of relationships which will be removed to \a relationships */
 void QContactRelationshipRemoveRequest::setRelationships(const QList<QContactRelationship>& relationships)
 {

--- a/qtmobility/src/contacts/requests/qcontactrelationshipremoverequest.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactrelationshipremoverequest.h	Fri May 14 16:41:33 2010 +0300
@@ -55,9 +55,10 @@
     Q_OBJECT
 
 public:
-    QContactRelationshipRemoveRequest();
+    QContactRelationshipRemoveRequest(QObject* parent = 0);
 
     /* Selection */
+    void setRelationship(const QContactRelationship& relationship);
     void setRelationships(const QList<QContactRelationship>& relationships);
     QList<QContactRelationship> relationships() const;

--- a/qtmobility/src/contacts/requests/qcontactrelationshipsaverequest.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactrelationshipsaverequest.cpp	Fri May 14 16:41:33 2010 +0300
@@ -57,12 +57,26 @@
   \ingroup contacts-requests
  */
 
-/*! Constructs a new relationship save request */
-QContactRelationshipSaveRequest::QContactRelationshipSaveRequest()
-    : QContactAbstractRequest(new QContactRelationshipSaveRequestPrivate)
+/*! Constructs a new relationship save request whose parent is the specified \a parent */
+QContactRelationshipSaveRequest::QContactRelationshipSaveRequest(QObject* parent)
+    : QContactAbstractRequest(new QContactRelationshipSaveRequestPrivate, parent)
 {
 }
 
+/*!
+  Sets the relationship to save to be \a contactRelationship.
+  Equivalent to calling:
+  \code
+      setRelationships(QList<QContactRelationship>() << contactRelationships);
+  \endcode
+ */
+void QContactRelationshipSaveRequest::setRelationship(const QContactRelationship& contactRelationship)
+{
+    Q_D(QContactRelationshipSaveRequest);
+    d->m_relationships.clear();
+    d->m_relationships.append(contactRelationship);
+}
+
 /*! Sets the relationships to save to be \a contactRelationships */
 void QContactRelationshipSaveRequest::setRelationships(const QList<QContactRelationship>& contactRelationships)
 {

--- a/qtmobility/src/contacts/requests/qcontactrelationshipsaverequest.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactrelationshipsaverequest.h	Fri May 14 16:41:33 2010 +0300
@@ -57,9 +57,10 @@
     Q_OBJECT
 
 public:
-    QContactRelationshipSaveRequest();
+    QContactRelationshipSaveRequest(QObject* parent = 0);
 
     /* Selection */
+    void setRelationship(const QContactRelationship& contactRelationship);
     void setRelationships(const QList<QContactRelationship>& contactRelationships);
 
     /* Results */

--- a/qtmobility/src/contacts/requests/qcontactremoverequest.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactremoverequest.cpp	Fri May 14 16:41:33 2010 +0300
@@ -56,12 +56,26 @@
   \ingroup contacts-requests
  */
 
-/*! Constructs a new contact remove request */
-QContactRemoveRequest::QContactRemoveRequest()
-    : QContactAbstractRequest(new QContactRemoveRequestPrivate)
+/*! Constructs a new contact remove request whose parent is the specified \a parent */
+QContactRemoveRequest::QContactRemoveRequest(QObject* parent)
+    : QContactAbstractRequest(new QContactRemoveRequestPrivate, parent)
 {
 }
 
+/*!
+  Sets the id of the contact which will be removed to \a contactId.
+  Equivalent to calling:
+  \code
+      setContactIds(QList<QContactLocalId>() << contactIds);
+  \endcode
+ */
+void QContactRemoveRequest::setContactId(const QContactLocalId& contactId)
+{
+    Q_D(QContactRemoveRequest);
+    d->m_contactIds.clear();
+    d->m_contactIds.append(contactId);
+}
+
 /*! Sets the list of ids of contacts which will be removed to \a contactIds */
 void QContactRemoveRequest::setContactIds(const QList<QContactLocalId>& contactIds)
 {

--- a/qtmobility/src/contacts/requests/qcontactremoverequest.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactremoverequest.h	Fri May 14 16:41:33 2010 +0300
@@ -56,9 +56,10 @@
     Q_OBJECT
 
 public:
-    QContactRemoveRequest();
+    QContactRemoveRequest(QObject* parent = 0);
 
     /* Selection */
+    void setContactId(const QContactLocalId& contactId);
     void setContactIds(const QList<QContactLocalId>& contactIds);
     QList<QContactLocalId> contactIds() const;

--- a/qtmobility/src/contacts/requests/qcontactrequests_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactrequests_p.h	Fri May 14 16:41:33 2010 +0300
@@ -158,7 +158,8 @@
 {
 public:
     QContactDetailDefinitionFetchRequestPrivate()
-        : QContactAbstractRequestPrivate()
+        : QContactAbstractRequestPrivate(),
+        m_contactType(QString(QLatin1String(QContactType::TypeContact)))
     {
     }
 
@@ -181,7 +182,8 @@
 {
 public:
     QContactDetailDefinitionSaveRequestPrivate()
-        : QContactAbstractRequestPrivate()
+        : QContactAbstractRequestPrivate(),
+        m_contactType(QString(QLatin1String(QContactType::TypeContact)))
     {
     }
 
@@ -203,7 +205,8 @@
 {
 public:
     QContactDetailDefinitionRemoveRequestPrivate()
-        : QContactAbstractRequestPrivate()
+        : QContactAbstractRequestPrivate(),
+        m_contactType(QString(QLatin1String(QContactType::TypeContact)))
     {
     }

--- a/qtmobility/src/contacts/requests/qcontactsaverequest.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactsaverequest.cpp	Fri May 14 16:41:33 2010 +0300
@@ -57,12 +57,26 @@
   \ingroup contacts-requests
  */
 
-/*! Constructs a new contact save request */
-QContactSaveRequest::QContactSaveRequest()
-    : QContactAbstractRequest(new QContactSaveRequestPrivate)
+/*! Constructs a new contact save request whose parent is the specified \a parent */
+QContactSaveRequest::QContactSaveRequest(QObject* parent)
+    : QContactAbstractRequest(new QContactSaveRequestPrivate, parent)
 {
 }
 
+/*!
+  Sets the contact to be saved to \a contact.
+  Equivalent to calling:
+  \code
+      setContacts(QList<QContact>() << contact);
+  \endcode
+ */
+void QContactSaveRequest::setContact(const QContact& contact)
+{
+    Q_D(QContactSaveRequest);
+    d->m_contacts.clear();
+    d->m_contacts.append(contact);
+}
+
 /*! Sets the list of contacts to be saved to \a contacts */
 void QContactSaveRequest::setContacts(const QList<QContact>& contacts)
 {

--- a/qtmobility/src/contacts/requests/qcontactsaverequest.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactsaverequest.h	Fri May 14 16:41:33 2010 +0300
@@ -56,9 +56,10 @@
     Q_OBJECT
 
 public:
-    QContactSaveRequest();
+    QContactSaveRequest(QObject* parent = 0);
 
     /* Selection */
+    void setContact(const QContact& contact);
     void setContacts(const QList<QContact>& contacts);
 
     /* Results */

--- a/qtmobility/src/location/qgeopositioninfosource_s60.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/location/qgeopositioninfosource_s60.cpp	Fri May 14 16:41:33 2010 +0300
@@ -322,6 +322,28 @@
             }
         }
     }
+
+    if (index != -1) {
+        return index;
+    }
+
+    bool minSet = false;
+    microSeconds = 0;
+
+    for (TInt i = 0 ; i < mListSize; i++) {
+        if (mList[i].mIsAvailable
+                //&& posMethods.testFlag(mList[i].mPosMethod)
+                && (mList[i].mStatus != TPositionModuleStatus::EDeviceUnknown)
+                && (mList[i].mStatus != TPositionModuleStatus::EDeviceError)
+                && (((aBits >> i) & 1))) {
+            if (!minSet || (mList[i].mTimeToFirstFix < microSeconds)) {
+                index = i;
+                minSet = true;
+                microSeconds = mList[i].mTimeToFirstFix;
+            }
+        }
+    }
+
     return index;
 }
 
@@ -694,6 +716,11 @@
     if (mReqUpdateAO && mReqUpdateAO->isRequestPending())
         return;
 
+    if (aTimeout < 0 || (aTimeout != 0 && aTimeout < minimumUpdateInterval())) {
+        emit updateTimeout();
+        return;
+    }
+
     if (aTimeout == 0)
         aTimeout = 20000;

--- a/qtmobility/src/location/qgeosatelliteinfosource_s60.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/location/qgeosatelliteinfosource_s60.cpp	Fri May 14 16:41:33 2010 +0300
@@ -238,6 +238,26 @@
             }
         }
     }
+
+    if (index != -1)
+        return index;
+
+    bool minSet = false;
+    microSeconds = 0;
+
+    for (TInt i = 0 ; i < mListSize; i++) {
+        if (mList[i].mIsAvailable
+                && (mList[i].mStatus != TPositionModuleStatus::EDeviceUnknown)
+                && (mList[i].mStatus != TPositionModuleStatus::EDeviceError)
+                && (((aBits >> i) & 1))) {
+            if (!minSet || (mList[i].mTimeToFirstFix < microSeconds)) {
+                index = i;
+                minSet = true;
+                microSeconds = mList[i].mTimeToFirstFix;
+            }
+        }
+    }
+
     return index;
 }

--- a/qtmobility/src/location/qmlbackendao_s60.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/location/qmlbackendao_s60.cpp	Fri May 14 16:41:33 2010 +0300
@@ -296,7 +296,6 @@
 
     mPositioner.SetUpdateOptions(aPosOption);
 
-    //setUpdateInterval(aTimeout);
     startUpdates();
 }
 
@@ -406,8 +405,7 @@
 int CQMLBackendAO::setUpdateInterval(int aMilliSec)
 {
     int minimumUpdateInterval = 0;
-    TInt64 mUpdateInterval = 0 ;
-
+    TInt64 mUpdateInterval = 0;
 
     if (mRequester)
         minimumUpdateInterval = mRequester->minimumUpdateInterval();

--- a/qtmobility/src/messaging/maemohelpers.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/maemohelpers.cpp	Fri May 14 16:41:33 2010 +0300
@@ -269,4 +269,239 @@
     }
 }
 
+void MessagingHelper::handleNestedFiltersFromFolderFilter(QMessageFolderFilter &filter)
+{
+    QMessageStore* store = QMessageStore::instance();
+
+    QMessageFolderFilterPrivate* pMFFilter = QMessageFolderFilterPrivate::implementation(filter);
+    if (pMFFilter->_filterList.count() > 0) {
+        int filterListCount = pMFFilter->_filterList.count();
+        for (int i=0; i < filterListCount; i++) {
+            for (int j=0; j < pMFFilter->_filterList[i].count(); j++) {
+                QMessageFolderFilterPrivate* pMFFilter2 = QMessageFolderFilterPrivate::implementation(pMFFilter->_filterList[i][j]);
+                if (pMFFilter2->_field == QMessageFolderFilterPrivate::ParentAccountIdFilter) {
+                    QMessageAccountIdList accountIds = store->queryAccounts(*pMFFilter2->_accountFilter, QMessageAccountSortOrder(), 0, 0);
+                    QMessageDataComparator::InclusionComparator cmp(static_cast<QMessageDataComparator::InclusionComparator>(pMFFilter2->_comparatorValue));
+                    if (accountIds.count() > 0) {
+                        pMFFilter->_filterList[i].removeAt(j);
+                        if (cmp == QMessageDataComparator::Includes) {
+                            for (int x = 0; x < accountIds.count(); x++) {
+                                if (x == 0) {
+                                    if (x+1 < accountIds.count()) {
+                                        pMFFilter->_filterList.append(pMFFilter->_filterList[i]);
+                                    }
+                                    pMFFilter->_filterList[i].append(QMessageFolderFilter::byParentAccountId(accountIds[x],QMessageDataComparator::Equal));
+                                    qSort(pMFFilter->_filterList[i].begin(), pMFFilter->_filterList[i].end(), QMessageFolderFilterPrivate::lessThan);
+                                } else {
+                                    if (x+1 < accountIds.count()) {
+                                        pMFFilter->_filterList.append(pMFFilter->_filterList[pMFFilter->_filterList.count()-1]);
+                                        pMFFilter->_filterList[pMFFilter->_filterList.count()-2].append(QMessageFolderFilter::byParentAccountId(accountIds[x],QMessageDataComparator::Equal));
+                                        qSort(pMFFilter->_filterList[pMFFilter->_filterList.count()-2].begin(), pMFFilter->_filterList[pMFFilter->_filterList.count()-2].end(), QMessageFolderFilterPrivate::lessThan);
+                                    } else {
+                                        pMFFilter->_filterList[pMFFilter->_filterList.count()-1].append(QMessageFolderFilter::byParentAccountId(accountIds[x],QMessageDataComparator::Equal));
+                                        qSort(pMFFilter->_filterList[pMFFilter->_filterList.count()-1].begin(), pMFFilter->_filterList[pMFFilter->_filterList.count()-1].end(), QMessageFolderFilterPrivate::lessThan);
+                                    }
+                                }
+                            }
+                        } else { // Excludes
+                            for (int x = 0; x < accountIds.count(); x++) {
+                                pMFFilter->_filterList[i].append(QMessageFolderFilter::byParentAccountId(accountIds[x],QMessageDataComparator::NotEqual));
+                            }
+                            qSort(pMFFilter->_filterList[i].begin(), pMFFilter->_filterList[i].end(), QMessageFolderFilterPrivate::lessThan);
+                        }
+                    } else {
+                        delete pMFFilter2->_accountFilter;
+                        pMFFilter2->_accountFilter = 0;
+                        pMFFilter2->_field = QMessageFolderFilterPrivate::Id;
+                        qSort(pMFFilter->_filterList[i].begin(), pMFFilter->_filterList[i].end(), QMessageFolderFilterPrivate::lessThan);
+                    }
+                } else {
+                    break;
+                }
+            }
+        }
+    } else {
+        if (pMFFilter->_field == QMessageFolderFilterPrivate::ParentAccountIdFilter) {
+            QMessageAccountIdList accountIds = store->queryAccounts(*pMFFilter->_accountFilter, QMessageAccountSortOrder(), 0, 0);
+            QMessageDataComparator::InclusionComparator cmp(static_cast<QMessageDataComparator::InclusionComparator>(pMFFilter->_comparatorValue));
+            if (accountIds.count() > 0) {
+                for (int i=0; i < accountIds.count(); i++) {
+                    if (i == 0) {
+                        delete pMFFilter->_accountFilter;
+                        pMFFilter->_accountFilter = 0;
+                        pMFFilter->_field = QMessageFolderFilterPrivate::ParentAccountId;
+                        pMFFilter->_value = accountIds[0].toString();
+                        pMFFilter->_comparatorType = QMessageFolderFilterPrivate::Equality;
+                        if (cmp == QMessageDataComparator::Includes) {
+                            pMFFilter->_comparatorValue = static_cast<int>(QMessageDataComparator::Equal);
+                        } else { // Excludes
+                            pMFFilter->_comparatorValue = static_cast<int>(QMessageDataComparator::NotEqual);
+                        }
+                    } else {
+                        if (cmp == QMessageDataComparator::Includes) {
+                            filter |= QMessageFolderFilter::byParentAccountId(accountIds[i],QMessageDataComparator::Equal);
+                        } else { // Excludes
+                            filter &= QMessageFolderFilter::byParentAccountId(accountIds[i],QMessageDataComparator::NotEqual);
+                        }
+                    }
+                }
+            } else {
+                delete pMFFilter->_accountFilter;
+                pMFFilter->_accountFilter = 0;
+                pMFFilter->_field = QMessageFolderFilterPrivate::Id;
+            }
+        }
+    }
+}
+
+void MessagingHelper::handleNestedFiltersFromMessageFilter(QMessageFilter &filter)
+{
+    QMessageStore* store = QMessageStore::instance();
+
+    QMessageFilterPrivate* pMFFilter = QMessageFilterPrivate::implementation(filter);
+    if (pMFFilter->_filterList.count() > 0) {
+        int filterListCount = pMFFilter->_filterList.count();
+        for (int i=0; i < filterListCount; i++) {
+            for (int j=0; j < pMFFilter->_filterList[i].count(); j++) {
+                QMessageFilterPrivate* pMFFilter2 = QMessageFilterPrivate::implementation(pMFFilter->_filterList[i][j]);
+                if (pMFFilter2->_field == QMessageFilterPrivate::ParentAccountIdFilter) {
+                    QMessageAccountIdList accountIds = store->queryAccounts(*pMFFilter2->_accountFilter, QMessageAccountSortOrder(), 0, 0);
+                    QMessageDataComparator::InclusionComparator cmp(static_cast<QMessageDataComparator::InclusionComparator>(pMFFilter2->_comparatorValue));
+                    if (accountIds.count() > 0) {
+                        pMFFilter->_filterList[i].removeAt(j);
+                        if (cmp == QMessageDataComparator::Includes) {
+                            for (int x = 0; x < accountIds.count(); x++) {
+                                if (x == 0) {
+                                    if (x+1 < accountIds.count()) {
+                                        pMFFilter->_filterList.append(pMFFilter->_filterList[i]);
+                                    }
+                                    pMFFilter->_filterList[i].append(QMessageFilter::byParentAccountId(accountIds[x],QMessageDataComparator::Equal));
+                                    qSort(pMFFilter->_filterList[i].begin(), pMFFilter->_filterList[i].end(), QMessageFilterPrivate::lessThan);
+                                } else {
+                                    if (x+1 < accountIds.count()) {
+                                        pMFFilter->_filterList.append(pMFFilter->_filterList[pMFFilter->_filterList.count()-1]);
+                                        pMFFilter->_filterList[pMFFilter->_filterList.count()-2].append(QMessageFilter::byParentAccountId(accountIds[x],QMessageDataComparator::Equal));
+                                        qSort(pMFFilter->_filterList[pMFFilter->_filterList.count()-2].begin(), pMFFilter->_filterList[pMFFilter->_filterList.count()-2].end(), QMessageFilterPrivate::lessThan);
+                                    } else {
+                                        pMFFilter->_filterList[pMFFilter->_filterList.count()-1].append(QMessageFilter::byParentAccountId(accountIds[x],QMessageDataComparator::Equal));
+                                        qSort(pMFFilter->_filterList[pMFFilter->_filterList.count()-1].begin(), pMFFilter->_filterList[pMFFilter->_filterList.count()-1].end(), QMessageFilterPrivate::lessThan);
+                                    }
+                                }
+                            }
+                        } else { // Excludes
+                            for (int x = 0; x < accountIds.count(); x++) {
+                                pMFFilter->_filterList[i].append(QMessageFilter::byParentAccountId(accountIds[x],QMessageDataComparator::NotEqual));
+                            }
+                            qSort(pMFFilter->_filterList[i].begin(), pMFFilter->_filterList[i].end(), QMessageFilterPrivate::lessThan);
+                        }
+                    } else {
+                        delete pMFFilter2->_accountFilter;
+                        pMFFilter2->_accountFilter = 0;
+                        pMFFilter2->_field = QMessageFilterPrivate::Id;
+                        qSort(pMFFilter->_filterList[i].begin(), pMFFilter->_filterList[i].end(), QMessageFilterPrivate::lessThan);
+                    }
+                } else if (pMFFilter2->_field == QMessageFilterPrivate::ParentFolderIdFilter) {
+                    QMessageFolderIdList folderIds = store->queryFolders(*pMFFilter2->_folderFilter, QMessageFolderSortOrder(), 0, 0);
+                    QMessageDataComparator::InclusionComparator cmp(static_cast<QMessageDataComparator::InclusionComparator>(pMFFilter2->_comparatorValue));
+                    if (folderIds.count() > 0) {
+                        pMFFilter->_filterList[i].removeAt(j);
+                        if (cmp == QMessageDataComparator::Includes) {
+                            for (int x = 0; x < folderIds.count(); x++) {
+                                if (x == 0) {
+                                    if (x+1 < folderIds.count()) {
+                                        pMFFilter->_filterList.append(pMFFilter->_filterList[i]);
+                                    }
+                                    pMFFilter->_filterList[i].append(QMessageFilter::byParentFolderId(folderIds[x],QMessageDataComparator::Equal));
+                                    qSort(pMFFilter->_filterList[i].begin(), pMFFilter->_filterList[i].end(), QMessageFilterPrivate::lessThan);
+                                } else {
+                                    if (x+1 < folderIds.count()) {
+                                        pMFFilter->_filterList.append(pMFFilter->_filterList[pMFFilter->_filterList.count()-1]);
+                                        pMFFilter->_filterList[pMFFilter->_filterList.count()-2].append(QMessageFilter::byParentFolderId(folderIds[x],QMessageDataComparator::Equal));
+                                        qSort(pMFFilter->_filterList[pMFFilter->_filterList.count()-2].begin(), pMFFilter->_filterList[pMFFilter->_filterList.count()-2].end(), QMessageFilterPrivate::lessThan);
+                                    } else {
+                                        pMFFilter->_filterList[pMFFilter->_filterList.count()-1].append(QMessageFilter::byParentFolderId(folderIds[x],QMessageDataComparator::Equal));
+                                        qSort(pMFFilter->_filterList[pMFFilter->_filterList.count()-1].begin(), pMFFilter->_filterList[pMFFilter->_filterList.count()-1].end(), QMessageFilterPrivate::lessThan);
+                                    }
+                                }
+                            }
+                        } else { // Excludes
+                            for (int x = 0; x < folderIds.count(); x++) {
+                                pMFFilter->_filterList[i].append(QMessageFilter::byParentFolderId(folderIds[x],QMessageDataComparator::NotEqual));
+                            }
+                            qSort(pMFFilter->_filterList[i].begin(), pMFFilter->_filterList[i].end(), QMessageFilterPrivate::lessThan);
+                        }
+                    } else {
+                        delete pMFFilter2->_folderFilter;
+                        pMFFilter2->_folderFilter = 0;
+                        pMFFilter2->_field = QMessageFilterPrivate::Id;
+                        qSort(pMFFilter->_filterList[i].begin(), pMFFilter->_filterList[i].end(), QMessageFilterPrivate::lessThan);
+                    }
+                } else {
+                    break;
+                }
+            }
+        }
+    } else {
+        if (pMFFilter->_field == QMessageFilterPrivate::ParentAccountIdFilter) {
+            QMessageAccountIdList accountIds = store->queryAccounts(*pMFFilter->_accountFilter, QMessageAccountSortOrder(), 0, 0);
+            QMessageDataComparator::InclusionComparator cmp(static_cast<QMessageDataComparator::InclusionComparator>(pMFFilter->_comparatorValue));
+            if (accountIds.count() > 0) {
+                for (int i=0; i < accountIds.count(); i++) {
+                    if (i == 0) {
+                        delete pMFFilter->_accountFilter;
+                        pMFFilter->_accountFilter = 0;
+                        pMFFilter->_field = QMessageFilterPrivate::ParentAccountId;
+                        pMFFilter->_value = accountIds[0].toString();
+                        pMFFilter->_comparatorType = QMessageFilterPrivate::Equality;
+                        if (cmp == QMessageDataComparator::Includes) {
+                            pMFFilter->_comparatorValue = static_cast<int>(QMessageDataComparator::Equal);
+                        } else { // Excludes
+                            pMFFilter->_comparatorValue = static_cast<int>(QMessageDataComparator::NotEqual);
+                        }
+                    } else {
+                        if (cmp == QMessageDataComparator::Includes) {
+                            filter |= QMessageFilter::byParentAccountId(accountIds[i],QMessageDataComparator::Equal);
+                        } else { // Excludes
+                            filter &= QMessageFilter::byParentAccountId(accountIds[i],QMessageDataComparator::NotEqual);
+                        }
+                    }
+                }
+            } else {
+                delete pMFFilter->_accountFilter;
+                pMFFilter->_accountFilter = 0;
+                pMFFilter->_field = QMessageFilterPrivate::Id;
+            }
+        } else if (pMFFilter->_field == QMessageFilterPrivate::ParentFolderIdFilter) {
+            QMessageFolderIdList folderIds = store->queryFolders(*pMFFilter->_folderFilter, QMessageFolderSortOrder(), 0, 0);
+            QMessageDataComparator::InclusionComparator cmp(static_cast<QMessageDataComparator::InclusionComparator>(pMFFilter->_comparatorValue));
+            if (folderIds.count() > 0) {
+                for (int i=0; i < folderIds.count(); i++) {
+                    if (i == 0) {
+                        delete pMFFilter->_folderFilter;
+                        pMFFilter->_folderFilter = 0;
+                        pMFFilter->_field = QMessageFilterPrivate::ParentFolderId;
+                        pMFFilter->_value = folderIds[0].toString();
+                        pMFFilter->_comparatorType = QMessageFilterPrivate::Equality;
+                        if (cmp == QMessageDataComparator::Includes) {
+                            pMFFilter->_comparatorValue = static_cast<int>(QMessageDataComparator::Equal);
+                        } else { // Excludes
+                            pMFFilter->_comparatorValue = static_cast<int>(QMessageDataComparator::NotEqual);
+                        }
+                    } else {
+                        if (cmp == QMessageDataComparator::Includes) {
+                            filter |= QMessageFilter::byParentFolderId(folderIds[i],QMessageDataComparator::Equal);
+                        } else { // Excludes
+                            filter &= QMessageFilter::byParentFolderId(folderIds[i],QMessageDataComparator::NotEqual);
+                        }
+                    }
+                }
+            } else {
+                delete pMFFilter->_folderFilter;
+                pMFFilter->_folderFilter = 0;
+                pMFFilter->_field = QMessageFilterPrivate::Id;
+            }
+        }
+    }
+}
+
 QTM_END_NAMESPACE

--- a/qtmobility/src/messaging/maemohelpers_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/maemohelpers_p.h	Fri May 14 16:41:33 2010 +0300
@@ -79,6 +79,9 @@
     static void orderMessages(QMessageIdList& messageIds,  const QMessageSortOrder &sortOrder);
     static void applyOffsetAndLimitToMessageIdList(QMessageIdList& messageIds, int limit, int offset);
 
+    static void handleNestedFiltersFromFolderFilter(QMessageFolderFilter &filter);
+    static void handleNestedFiltersFromMessageFilter(QMessageFilter &filter);
+
 private:
    static bool accountLessThan(const QMessageAccountId accountId1, const QMessageAccountId accountId2);
    static bool folderLessThan(const QMessageFolderId folderId1, const QMessageFolderId folderId2);

--- a/qtmobility/src/messaging/messaging.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/messaging.pro	Fri May 14 16:41:33 2010 +0300
@@ -85,6 +85,7 @@
         PUBLIC_HEADERS -= qmessagecontentcontainer_p.h
         PRIVATE_HEADERS -= qmessagecontentcontainer_p.h
         HEADERS += qmessagecontentcontainer_maemo_p.h \
+            qmessageservice_maemo_p.h \
             modestengine_maemo_p.h \
             telepathyengine_maemo_p.h \
             maemohelpers_p.h\
@@ -133,9 +134,6 @@
             documentation
         LIBS += -lgconf-2 -lrtcom-eventlogger -lmodest-dbus-client-1.0 -losso -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 -ltpsession -ltelepathy-qt4
     }
-    maemo5 { 
-        LIBS += -lgconf-2 -lrtcom-eventlogger -lmodest-dbus-client-1.0 -losso -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 -ltpsession -ltelepathy-qt4
-    }
     symbian { 
         INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
         HEADERS -= qmessagestore_p.h \

--- a/qtmobility/src/messaging/modestengine_maemo.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/modestengine_maemo.cpp	Fri May 14 16:41:33 2010 +0300
@@ -235,6 +235,7 @@
 ModestEngine::ModestEngine()
  : m_queryIds(0)
 {
+    qWarning() << "ModestEngine::ModestEngine Starting to initialize";
     g_type_init();
     m_gconfclient = gconf_client_get_default();
     if (!m_gconfclient) {
@@ -243,12 +244,18 @@
         updateEmailAccounts();
     }
 
+    qWarning() << "ModestEngine::ModestEngine Connecting to Modest DBus Interface";
     // Setup DBus Interface for Modest
     m_ModestDBusInterface = new QDBusInterface(MODEST_DBUS_SERVICE,
                                                MODEST_DBUS_OBJECT,
                                                MODEST_DBUS_IFACE,
                                                QDBusConnection::sessionBus(),
                                                this);
+    if (m_ModestDBusInterface->isValid()) {
+        qWarning() << "ModestEngine::ModestEngine Connected to Modest DBus Interface";
+    } else {
+        qWarning() << "ModestEngine::ModestEngine Unable to connect to Modest DBus Interface";
+    }
 
     // Get notifications of Incoming Messages
     m_ModestDBusInterface->connection().connect(MODEST_DBUS_SERVICE,
@@ -264,6 +271,7 @@
                                                 MODEST_DBUS_SIGNAL_MSG_READ_CHANGED,
                                                this, SLOT(messageReadChangedSlot(QDBusMessage)));
 
+    qWarning() << "ModestEngine::ModestEngine Connecting to Qt Mobility Modest Plugin DBus Interface";
     // Setup Qt Mobility Modest Plugin based DBus Interface for Modest
     m_QtmPluginDBusInterface = new QDBusInterface(MODESTENGINE_QTM_PLUGIN_NAME,
                                                   MODESTENGINE_QTM_PLUGIN_PATH,
@@ -271,6 +279,12 @@
                                                   QDBusConnection::sessionBus(),
                                                   this);
 
+    if (m_QtmPluginDBusInterface->isValid()) {
+        qWarning() << "ModestEngine::ModestEngine Connected to Qt Mobility Modest Plugin DBus Interface";
+    } else {
+        qWarning() << "ModestEngine::ModestEngine Unable to connect to Qt Mobility Modest Plugin DBus Interface";
+    }
+
     qDBusRegisterMetaType< ModestStringMap >();
     qDBusRegisterMetaType< ModestStringMapList >();
 
@@ -298,6 +312,7 @@
     connect(pendingCallWatcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
             this, SLOT(pendingGetUnreadMessagesFinishedSlot(QDBusPendingCallWatcher*)));
 
+    qWarning() << "ModestEngine::ModestEngine Initialized successfully";
 }
 
 ModestEngine::~ModestEngine()
@@ -315,6 +330,10 @@
 {
     MessagingModestMessage modestMessage;
 
+    if (!m_QtmPluginDBusInterface->isValid() || iAccounts.isEmpty()) {
+        return modestMessage;
+    }
+
     QDBusPendingCall pendingCall = m_QtmPluginDBusInterface->asyncCall("GetMessage",
                                                                        accountId,
                                                                        folderId,
@@ -350,7 +369,7 @@
         modestMessage.dateSent = 0;
         modestMessage.size = 0;
         modestMessage.flags = MessagingModestMessageNotDefined;
-        modestMessage.priority = MessagingModestMessagePriorityDefined;
+        modestMessage.priority = MessagingModestMessagePriorityNotDefined;
     }
 
     return modestMessage;
@@ -483,6 +502,10 @@
 
     QMessageAccountIdList accountIds;
 
+    if (!m_QtmPluginDBusInterface->isValid()) {
+        return accountIds;
+    }
+
     updateEmailAccounts();
     foreach (QMessageAccount value, iAccounts) {
         accountIds.append(value.id());
@@ -736,9 +759,16 @@
 
     QMessageFolderIdList folderIds;
 
+    if (!m_QtmPluginDBusInterface->isValid()) {
+        return folderIds;
+    }
+
     updateEmailAccounts();
 
-    //QDBusMessage msg = m_ModestDBusInterface->call(MODEST_DBUS_METHOD_GET_FOLDERS);
+    if (iAccounts.isEmpty()) {
+        return folderIds;
+    }
+
     QFileInfoList localFolders = this->localFolders();
     QString localRootFolder = this->localRootFolder();
 
@@ -848,7 +878,7 @@
 
     int filenameBegin = filePath.lastIndexOf('/')+1;
     QString fileName = filePath.mid(filenameBegin,filePath.lastIndexOf('.')-filenameBegin);
-    if (fileName != "summary") {
+    if (!fileName.endsWith("summary")) {
         if (events & (IN_MOVED_TO | IN_CREATE)) {
             if (events != (IN_MOVED_TO | IN_MOVED_FROM)) {
                 notification(messageIdFromModestMessageFilePath(filePath), ModestEngine::Added);
@@ -861,6 +891,10 @@
 
 bool ModestEngine::sendEmail(QMessage &message)
 {
+    if (!m_QtmPluginDBusInterface->isValid() || iAccounts.isEmpty()) {
+        return false;
+    }
+
     ModestStringMap senderInfo;
     ModestStringMap recipients;
     ModestStringMap messageData;
@@ -1131,7 +1165,7 @@
 
             QMessageContentContainerId existingBodyId(message.bodyId());
             if (existingBodyId.isValid()) {
-                if (existingBodyId == container->bodyContentId()) {
+                if (existingBodyId == QMessageContentContainerPrivate::bodyContentId()) {
                     // The body content is in the message itself
                     container->_containingMessageId = messageId.toString();
                     container->_attachmentId = contentId;
@@ -1164,7 +1198,7 @@
                     container->_charset = charset;
                     container->_size = 0;
                     container->_available = true;
-                    privateMessage->_bodyId = container->bodyContentId();
+                    privateMessage->_bodyId = QMessageContentContainerPrivate::bodyContentId();
                 } else {
                     // Add the body as the first attachment
                     QMessageContentContainer newBody;
@@ -1304,6 +1338,10 @@
 
 bool ModestEngine::addMessage(QMessage &message)
 {
+    if (!m_QtmPluginDBusInterface->isValid() || iAccounts.isEmpty()) {
+        return false;
+    }
+
     QString modestFolder;
     ModestStringMap senderInfo;
     ModestStringMap recipients;
@@ -1420,6 +1458,10 @@
 {
     QMessageIdList ids;
 
+    if (!m_QtmPluginDBusInterface->isValid() || iAccounts.isEmpty()) {
+        return ids;
+    }
+
     QMessageServicePrivate* privateService = QMessageServicePrivate::implementation(m_service);
     if (privateService->queryMessages(m_service, filter, sortOrder, limit, offset,
                                       QMessageServicePrivate::EnginesToCallModest)) {
@@ -1444,6 +1486,10 @@
 {
     QMessageIdList ids;
 
+    if (!m_QtmPluginDBusInterface->isValid() || iAccounts.isEmpty()) {
+        return ids;
+    }
+
     QMessageServicePrivate* privateService = QMessageServicePrivate::implementation(m_service);
     if (privateService->queryMessages(m_service, filter, body, matchFlags,
                                       sortOrder, limit, offset,
@@ -1466,6 +1512,10 @@
 {
     int count;
 
+    if (!m_QtmPluginDBusInterface->isValid() || iAccounts.isEmpty()) {
+        return 0;
+    }
+
     QMessageServicePrivate* privateService = QMessageServicePrivate::implementation(m_service);
     if (privateService->countMessages(m_service, filter, QMessageServicePrivate::EnginesToCallModest)) {
         QObject::connect(&m_service, SIGNAL(stateChanged(QMessageService::State)),
@@ -1500,6 +1550,10 @@
 
 bool ModestEngine::countMessages(QMessageService& messageService, const QMessageFilter &filter)
 {
+    if (!m_QtmPluginDBusInterface->isValid() || iAccounts.isEmpty()) {
+        return false;
+    }
+
     m_pendingMessageQueries.append(MessageQueryInfo());
 
     MessageQueryInfo &queryInfo = m_pendingMessageQueries[m_pendingMessageQueries.count()-1];
@@ -1526,6 +1580,10 @@
                                  QMessageDataComparator::MatchFlags matchFlags, const QMessageSortOrder &sortOrder,
                                  uint limit, uint offset) const
 {
+    if (!m_QtmPluginDBusInterface->isValid() || iAccounts.isEmpty()) {
+        return false;
+    }
+
     m_pendingMessageQueries.append(MessageQueryInfo());
 
     MessageQueryInfo &queryInfo = m_pendingMessageQueries[m_pendingMessageQueries.count()-1];
@@ -1543,8 +1601,28 @@
     queryInfo.returnWithSingleShot = false;
 
     if (!startQueryingAndFilteringMessages(m_pendingMessageQueries[m_pendingMessageQueries.count()-1])) {
-        QMessageServicePrivate::implementation(messageService)->setFinished(false);
         m_pendingMessageQueries.removeAt(m_pendingMessageQueries.count()-1);
+        if (m_pendingMessageQueries.count() == 0) {
+            // This was last query in pending queries queue
+            // => Disconnect from "GetHeaders" request related DBus signals
+            // Note: Disconnecting signals is done to optimize signal handling
+            //       <=> Disconnecting prevents unnecessary handling of signals
+            //           which have been sent from other applications using
+            //           Qt Mobility Messaging API
+            m_QtmPluginDBusInterface->connection().disconnect(MODESTENGINE_QTM_PLUGIN_NAME,
+                                                              MODESTENGINE_QTM_PLUGIN_PATH,
+                                                              MODESTENGINE_QTM_PLUGIN_NAME,
+                                                              "HeadersReceived",
+                                                              (ModestEngine*)this,
+                                                              SLOT(searchMessagesHeadersReceivedSlot(QDBusMessage)));
+
+            m_QtmPluginDBusInterface->connection().disconnect(MODESTENGINE_QTM_PLUGIN_NAME,
+                                                              MODESTENGINE_QTM_PLUGIN_PATH,
+                                                              MODESTENGINE_QTM_PLUGIN_NAME,
+                                                              "HeadersFetched",
+                                                              (ModestEngine*)this,
+                                                              SLOT(searchMessagesHeadersFetchedSlot(QDBusMessage)));
+        }
         return false;
     }
 
@@ -1657,7 +1735,9 @@
                 if (cmp == QMessageDataComparator::Equal) {
                     if (pf->_value.toString().length() > 0) {
                         accountIds.append(modestAccountIdFromAccountId(pf->_value.toString()));
-                        msgQueryInfo.realAccountId = pf->_value.toString();
+                        // Local folders are not account specific
+                        // => Make sure that account specific messages are searched from local_folders account
+                        accountIds.append("local_folders");
                         handled = true;
                     }
                 }
@@ -1705,10 +1785,23 @@
                 if (cmp == QMessageDataComparator::Equal) {
                     QMessage::StandardFolder standardFolder = static_cast<QMessage::StandardFolder>(pf->_value.toInt());
                     if (standardFolder == QMessage::SentFolder) {
+                        // Possible "real" accountIds can be ignored in this phase
+                        // because messages are searched from "local_folders" account
+                        // <=> Actual account filtering is done when search from Modest
+                        //     has finished
+                        accountIds.clear();
+
+                        accountIds.append("local_folders");
                         folderUris.append("sent");
-                        if (accountIds.count() == 0) {
-                            accountIds.append("local_folders");
-                        }
+                    } else if (standardFolder == QMessage::DraftsFolder) {
+                        // Possible "real" accountIds can be ignored in this phase
+                        // because messages are searched from "local_folders" account
+                        // <=> Actual account filtering is done when search from Modest
+                        //     has finished
+                        accountIds.clear();
+
+                        accountIds.append("local_folders");
+                        folderUris.append("drafts");
                     }
                     handled = true;
                 }
@@ -1864,40 +1957,6 @@
         m_messageCache.clear();
         msgQueryInfo.queryId = reply.arguments().takeFirst().toInt();
     } else {
-        // Request failed
-        int index = -1;
-        for (int i=0; i < m_pendingMessageQueries.count(); i++) {
-            if (m_pendingMessageQueries[i].queryId == msgQueryInfo.queryId) {
-                index = i;
-                break;
-            }
-        }
-        if (index > -1) {
-            m_pendingMessageQueries.removeAt(index);
-        }
-        msgQueryInfo.privateService->setFinished(false);
-
-        if (m_pendingMessageQueries.count() == 0) {
-            // This was last query in pending queries queue
-            // => Disconnect from "GetHeaders" request related DBus signals
-            // Note: Disconnecting signals is done to optimize signal handling
-            //       <=> Disconnecting prevents unnecessary handling of signals
-            //           which have been sent from other applications using
-            //           Qt Mobility Messaging API
-            m_QtmPluginDBusInterface->connection().disconnect(MODESTENGINE_QTM_PLUGIN_NAME,
-                                                              MODESTENGINE_QTM_PLUGIN_PATH,
-                                                              MODESTENGINE_QTM_PLUGIN_NAME,
-                                                              "HeadersReceived",
-                                                              (ModestEngine*)this,
-                                                              SLOT(searchMessagesHeadersReceivedSlot(QDBusMessage)));
-
-            m_QtmPluginDBusInterface->connection().disconnect(MODESTENGINE_QTM_PLUGIN_NAME,
-                                                              MODESTENGINE_QTM_PLUGIN_PATH,
-                                                              MODESTENGINE_QTM_PLUGIN_NAME,
-                                                              "HeadersFetched",
-                                                              (ModestEngine*)this,
-                                                              SLOT(searchMessagesHeadersFetchedSlot(QDBusMessage)));
-        }
         return false;
     }
 
@@ -1966,7 +2025,8 @@
         modestMessage.dateSent = 0;
         modestMessage.size = 0;
         modestMessage.flags = MessagingModestMessageNotDefined;
-        modestMessage.priority = MessagingModestMessagePriorityDefined;
+        modestMessage.priority = MessagingModestMessagePriorityNotDefined;
+
         QMapIterator<QString, QVariant> j(messages[i]);
         while (j.hasNext()) {
             j.next();
@@ -2271,7 +2331,6 @@
     reply.waitForFinished();
 
     if (reply.isError()) {
-        qWarning () << reply.error();
         return result;
     }
 
@@ -2288,9 +2347,14 @@
 
     QFile file(filePath);
 
-    if (file.open(QIODevice::ReadWrite) == false) {
+    QIODevice::OpenMode openMode = QIODevice::ReadOnly;
+    if (expunge) {
+        openMode = QIODevice::ReadWrite;
+    }
+    
+    if (file.open(openMode) == false) {
         qWarning() << "Failed to open file" << filePath << ": "
-                << file.error();
+                << file.errorString();
         return result;
     }
 
@@ -2308,21 +2372,34 @@
 void ModestEngine::notification(const QMessageId& messageId, NotificationType notificationType) const
 {
     QMessageId realMessageId = messageId;
-
-    if (notificationType == ModestEngine::Removed) {
-        // Make sure that there will not be many Removed notifications
-        // in a row for a same message
-        QString modestMessageId = modestMessageIdFromMessageId(messageId);
-        if (!m_latestRemoveNotifications.contains(modestMessageId)) {
-            if (m_latestRemoveNotifications.count() > 10) {
-                // Remove oldest notification from the beginning of the list
-                m_latestRemoveNotifications.removeFirst();
+    QString modestAccountId = modestAccountIdFromMessageId(messageId);
+    QString modestFolderId = modestFolderIdFromMessageId(messageId);
+    QString modestMessageId = modestMessageIdFromMessageId(messageId);
+
+    // Make sure that there will not be many Added or Removed notifications
+    // in a row for the same message
+    // Make also sure that there will not be updated notification for a
+    // message that has already been notified to be removed.
+    QString searchId;
+    if (notificationType == ModestEngine::Added) {
+        searchId = "A"+modestAccountId+modestFolderId+modestMessageId;
+    } else {
+        searchId = "D"+modestAccountId+modestFolderId+modestMessageId;
+    }
+    if (!m_latestAddOrRemoveNotifications.contains(searchId)) {
+        if ((notificationType == ModestEngine::Added) || (notificationType == ModestEngine::Removed)) {
+            // Only Added & Removed notification will be checked
+            if (m_latestAddOrRemoveNotifications.count() > 10) {
+                // Remove the oldest notification from the beginning of the list
+                m_latestAddOrRemoveNotifications.removeFirst();
             }
             // Append new notification
-            m_latestRemoveNotifications.append(modestMessageId);
-        } else {
-            return;
+            m_latestAddOrRemoveNotifications.append(searchId);
         }
+    } else {
+        // Add or Remove notification for the message was already handled!
+        // => Skip unwanted notification
+        return;
     }
 
     QMessageManager::NotificationFilterIdSet matchingFilters;
@@ -2336,10 +2413,6 @@
         const QMessageFilter &filter(it.value());
 
         if (!messageRetrieved) {
-            QString modestAccountId = modestAccountIdFromMessageId(messageId);
-            QString modestFolderId = modestFolderIdFromMessageId(messageId);
-            QString modestMessageId = modestMessageIdFromMessageId(messageId);
-
             MessagingModestMessage modestMessage = messageFromModest(modestAccountId,
                                                                      modestFolderId,
                                                                      modestMessageId);
@@ -3127,6 +3200,11 @@
     return ModestStringMap(); // stub
 }
 
+void ModestEngine::clearHeaderCache()
+{
+    m_messageCache.clear();
+}
+
 #include "moc_modestengine_maemo_p.cpp"
 
 QTM_END_NAMESPACE

--- a/qtmobility/src/messaging/modestengine_maemo_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/modestengine_maemo_p.h	Fri May 14 16:41:33 2010 +0300
@@ -67,7 +67,7 @@
 typedef QMap< QString, QString > ModestStringMap;
 typedef QList< ModestStringMap > ModestStringMapList;
 
-static const int maxCacheSize = 1000;
+static const int maxCacheSize = 100000;
 
 class QMessageService;
 class QMessageServicePrivate;
@@ -134,11 +134,11 @@
 } MessagingModestMessageFlags;
 
 typedef enum {
-    MessagingModestMessagePriorityDefined   = 0,
-    MessagingModestMessageHighPriority      = 1<<9|1<<10,
-    MessagingModestMessageNormalPriority    = 0<<9|0<<10,
-    MessagingModestMessageLowPriority       = 0<<9|1<<10,
-    MessagingModestMessageSuspendedPriority = 1<<9|0<<10
+    MessagingModestMessagePriorityNotDefined = 0,
+    MessagingModestMessageHighPriority       = 1<<9|1<<10,
+    MessagingModestMessageNormalPriority     = 0<<9|0<<10,
+    MessagingModestMessageLowPriority        = 0<<9|1<<10,
+    MessagingModestMessageSuspendedPriority  = 1<<9|0<<10
 } MessagingModestMessagePriority;
 
 struct MessagingModestMimePart
@@ -280,6 +280,8 @@
     void unregisterNotificationFilter(QMessageManager::NotificationFilterId notificationFilterId);
     QByteArray getMimePart (const QMessageId &id, const QString &attachmentId);
 
+    void clearHeaderCache();
+
 private:
     QFileInfoList localFolders() const;
     void appendLocalSubFolders(QFileInfoList& fileInfoList, int startIndex) const;
@@ -386,7 +388,7 @@
 
     QMap<QString, QDateTime> accountsLatestTimestamp;
 
-    mutable QStringList m_latestRemoveNotifications;
+    mutable QStringList m_latestAddOrRemoveNotifications;
 
     mutable QMap<QString, QMessage> m_messageCache;

--- a/qtmobility/src/messaging/qmessage_maemo.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessage_maemo.cpp	Fri May 14 16:41:33 2010 +0300
@@ -178,6 +178,9 @@
 
 QString QMessage::subject() const
 {
+    if (d_ptr->_subject.isEmpty() && d_ptr->_type == QMessage::Sms) {
+        return textContent().left(100);
+    }
     return d_ptr->_subject;
 }

--- a/qtmobility/src/messaging/qmessage_qmf.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessage_qmf.cpp	Fri May 14 16:41:33 2010 +0300
@@ -97,7 +97,7 @@
         }
     }
 
-    return QMessage::DraftsFolder;
+    return QMessage::InboxFolder;
 }
 
 QMessage QMessagePrivate::convert(const QMailMessage &message)
@@ -294,6 +294,8 @@
 
 QMessage::StandardFolder QMessage::standardFolder() const
 {
+    if (!d_ptr->_message.parentFolderId().isValid())
+        return QMessage::DraftsFolder;
     return QMessagePrivate::standardFolder(convert(d_ptr->_message.parentFolderId()));
 }

--- a/qtmobility/src/messaging/qmessageaccount.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccount.cpp	Fri May 14 16:41:33 2010 +0300
@@ -108,7 +108,7 @@
 /*!
     \fn QMessageAccount::messageTypes() const
     
-    Returns the types of messages this account deals with.
+    Returns the types of messages this account handles.
 */
 
 /*!

--- a/qtmobility/src/messaging/qmessageaccountid_qmf.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountid_qmf.cpp	Fri May 14 16:41:33 2010 +0300
@@ -65,7 +65,7 @@
 QMessageAccountId::QMessageAccountId(const QString& id)
     : d_ptr(0)
 {
-    QMailAccountId aid(id.toULongLong());
+    QMailAccountId aid(QmfHelpers::stripIdentifierPrefix(id).toULongLong());
     if (aid.isValid()) {
         d_ptr = new QMessageAccountIdPrivate;
         d_ptr->_id = aid;
@@ -117,7 +117,8 @@
 
 QString QMessageAccountId::toString() const
 {
-    return (isValid() ? QString::number(d_ptr->_id.toULongLong()) : QString());
+    QString result = (isValid() ? QString::number(d_ptr->_id.toULongLong()) : QString());
+    return QmfHelpers::prefixIdentifier(result);
 }
 
 bool QMessageAccountId::isValid() const

--- a/qtmobility/src/messaging/qmessageaccountid_win.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountid_win.cpp	Fri May 14 16:41:33 2010 +0300
@@ -90,7 +90,7 @@
 QMessageAccountId::QMessageAccountId(const QString& id)
     : d_ptr(new QMessageAccountIdPrivate(this))
 {
-    QDataStream idStream(QByteArray::fromBase64(id.toLatin1()));
+	QDataStream idStream(QByteArray::fromBase64(WinHelpers::stripIdPrefix(id).toLatin1()));
     idStream >> d_ptr->_storeRecordKey;
 }
 
@@ -134,7 +134,7 @@
     QDataStream encodedIdStream(&encodedId, QIODevice::WriteOnly);
     encodedIdStream << d_ptr->_storeRecordKey;
 
-    return encodedId.toBase64();
+	return WinHelpers::addIdPrefix(encodedId.toBase64());
 }
 
 bool QMessageAccountId::isValid() const

--- a/qtmobility/src/messaging/qmessagecontentcontainer_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessagecontentcontainer_p.h	Fri May 14 16:41:33 2010 +0300
@@ -355,7 +355,7 @@
             return;
         }
 #endif
-        container.d_ptr->_id = QMessageContentContainerId(QString::number(_attachments.count()+1));
+		container.d_ptr->_id = QMessageContentContainerId(WinHelpers::addIdPrefix(QString::number(_attachments.count()+1)));
         _attachments.append(container);
         return container.d_ptr->_id;
     }
@@ -370,14 +370,14 @@
 #endif
         _attachments.prepend(container);
         for (int i = 0; i < _attachments.count(); ++i) {
-            _attachments[i].d_ptr->_id = QMessageContentContainerId(QString::number(i+1));
+			_attachments[i].d_ptr->_id = QMessageContentContainerId(WinHelpers::addIdPrefix(QString::number(i+1)));
         }
         return _attachments[0].d_ptr->_id;
     }
 
     QMessageContentContainerId bodyContentId() const
     {
-        return QMessageContentContainerId(QString::number(0));
+		return QMessageContentContainerId(WinHelpers::addIdPrefix(QString::number(0)));
     }
 
     static QString attachmentFilename(const QMessageContentContainer& container)

--- a/qtmobility/src/messaging/qmessagecontentcontainerid_qmf.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessagecontentcontainerid_qmf.cpp	Fri May 14 16:41:33 2010 +0300
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 #include "qmessagecontentcontainerid.h"
-
+#include "qmfhelpers_p.h"
 #include <qmailmessage.h>
 
 QTM_BEGIN_NAMESPACE
@@ -115,7 +115,7 @@
 QMessageContentContainerId::QMessageContentContainerId(const QString& id)
     : d_ptr(new QMessageContentContainerIdPrivate)
 {
-    QString input(id);
+    QString input(QmfHelpers::stripIdentifierPrefix(id));
 
     if (input.startsWith("body:")) {
         d_ptr->_body = true;
@@ -161,7 +161,7 @@
         location.prepend("body:");
     }
 
-    return location;
+    return QmfHelpers::prefixIdentifier(location);
 }
 
 bool QMessageContentContainerId::isValid() const

--- a/qtmobility/src/messaging/qmessagecontentcontainerid_win.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessagecontentcontainerid_win.cpp	Fri May 14 16:41:33 2010 +0300
@@ -40,6 +40,7 @@
 ****************************************************************************/
 #include "qmessagecontentcontainerid.h"
 #include "qmessagecontentcontainerid_p.h"
+#include "winhelpers_p.h"
 
 QTM_BEGIN_NAMESPACE
 
@@ -58,7 +59,7 @@
     : d_ptr(new QMessageContentContainerIdPrivate)
 {
     if (!id.isEmpty()) {
-        d_ptr->_number = id.toUInt();
+		d_ptr->_number = WinHelpers::stripIdPrefix(id).toUInt();
     }
 }
 
@@ -83,7 +84,7 @@
 
 QString QMessageContentContainerId::toString() const
 {
-    return QString::number(d_ptr->_number);
+	return WinHelpers::addIdPrefix(QString::number(d_ptr->_number));
 }
 
 bool QMessageContentContainerId::isValid() const

--- a/qtmobility/src/messaging/qmessagefilter.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefilter.cpp	Fri May 14 16:41:33 2010 +0300
@@ -321,7 +321,7 @@
     \fn QMessageFilter::byPriority(QMessage::Priority value, QMessageDataComparator::EqualityComparator cmp)
   
     Returns a filter matching messages whose priority matches \a value, according to \a cmp.
-
+    
     \sa QMessage::priority()
 */

--- a/qtmobility/src/messaging/qmessagefilter_maemo.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefilter_maemo.cpp	Fri May 14 16:41:33 2010 +0300
@@ -182,22 +182,18 @@
             }
         } else if (filter._comparatorType == QMessageFilterPrivate::Inclusion) {
             QMessageDataComparator::InclusionComparator cmp(static_cast<QMessageDataComparator::InclusionComparator>(filter._comparatorValue));
-            if (filter._ids.count() > 0) { // QMessageIdList
-               if (cmp == QMessageDataComparator::Includes) {
-                   if (filter._ids.contains(message.id())) {
-                       return true;
-                   }
-               } else { // Excludes
-                   if (!filter._ids.contains(message.id())) {
-                       return true;
-                   }
-               }
-            } else { // QMessageFilter
-               if (cmp == QMessageDataComparator::Includes) {
-                   // TODO:
-               } else { // Excludes
-                   // TODO:
-               }
+            if (cmp == QMessageDataComparator::Includes) {
+                if (filter._ids.isEmpty()) {
+                    return false;
+                } else if (filter._ids.contains(message.id())) {
+                    return true;
+                }
+            } else { // Excludes
+                if (filter._ids.isEmpty()) {
+                    return true;
+                } else if (!filter._ids.contains(message.id())) {
+                   return true;
+                }
             }
         }
         break;

--- a/qtmobility/src/messaging/qmessagefolderfilter_maemo.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolderfilter_maemo.cpp	Fri May 14 16:41:33 2010 +0300
@@ -161,21 +161,17 @@
             }
         } else if (filter._comparatorType == QMessageFolderFilterPrivate::Inclusion) {
             QMessageDataComparator::InclusionComparator cmp(static_cast<QMessageDataComparator::InclusionComparator>(filter._comparatorValue));
-            if (filter._ids.count() > 0) { // QMessageIdList
-                if (cmp == QMessageDataComparator::Includes) {
-                    if (filter._ids.contains(messageFolder.id())) {
-                        retVal = true;
-                    }
-                } else { // Excludes
-                    if (!filter._ids.contains(messageFolder.id())) {
-                        retVal = true;
-                    }
+            if (cmp == QMessageDataComparator::Includes) {
+                if (filter._ids.isEmpty()) {
+                    retVal = false;
+                } else if (filter._ids.contains(messageFolder.id())) {
+                    retVal = true;
                 }
-            } else { // QMessageFilter
-                if (cmp == QMessageDataComparator::Includes) {
-                    // Not supported
-                } else { // Excludes
-                                        // Not supported
+            } else { // Excludes
+                if (filter._ids.isEmpty()) {
+                    retVal = true;
+                } if (!filter._ids.contains(messageFolder.id())) {
+                    retVal = true;
                 }
             }
         }

--- a/qtmobility/src/messaging/qmessagefolderid_qmf.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolderid_qmf.cpp	Fri May 14 16:41:33 2010 +0300
@@ -65,7 +65,7 @@
 QMessageFolderId::QMessageFolderId(const QString& id)
     : d_ptr(0)
 {
-    QMailFolderId fid(id.toULongLong());
+    QMailFolderId fid(QmfHelpers::stripIdentifierPrefix(id).toULongLong());
     if (fid.isValid()) {
         d_ptr = new QMessageFolderIdPrivate;
         d_ptr->_id = fid;
@@ -117,7 +117,8 @@
 
 QString QMessageFolderId::toString() const
 {
-    return (isValid() ? QString::number(d_ptr->_id.toULongLong()) : QString());
+    QString result = (isValid() ? QString::number(d_ptr->_id.toULongLong()) : QString());
+    return QmfHelpers::prefixIdentifier(result);
 }
 
 bool QMessageFolderId::isValid() const

--- a/qtmobility/src/messaging/qmessagefolderid_win.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolderid_win.cpp	Fri May 14 16:41:33 2010 +0300
@@ -108,7 +108,7 @@
 QMessageFolderId::QMessageFolderId(const QString& id)
     : d_ptr(new QMessageFolderIdPrivate(this))
 {
-    QDataStream idStream(QByteArray::fromBase64(id.toLatin1()));
+	QDataStream idStream(QByteArray::fromBase64(WinHelpers::stripIdPrefix(id).toLatin1()));
     d_ptr->_valid = true;
 #ifdef _WIN32_WCE
     idStream >> d_ptr->_entryId;
@@ -201,7 +201,7 @@
     if (d_ptr->_entryId.count())
         encodedIdStream << d_ptr->_entryId;
 #endif
-    return encodedId.toBase64();
+	return WinHelpers::addIdPrefix(encodedId.toBase64());
 }
 
 bool QMessageFolderId::isValid() const

--- a/qtmobility/src/messaging/qmessageid_qmf.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessageid_qmf.cpp	Fri May 14 16:41:33 2010 +0300
@@ -66,7 +66,7 @@
 QMessageId::QMessageId(const QString& id)
     : d_ptr(0)
 {
-    QMailMessageId mid(id.toULongLong());
+    QMailMessageId mid(QmfHelpers::stripIdentifierPrefix(id).toULongLong());
     if (mid.isValid()) {
         d_ptr = new QMessageIdPrivate;
         d_ptr->_id = mid;
@@ -119,7 +119,8 @@
 
 QString QMessageId::toString() const
 {
-    return (isValid() ? QString::number(d_ptr->_id.toULongLong()) : QString());
+    QString result = (isValid() ? QString::number(d_ptr->_id.toULongLong()) : QString());
+    return QmfHelpers::prefixIdentifier(result);
 }
 
 bool QMessageId::isValid() const

--- a/qtmobility/src/messaging/qmessageid_win.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessageid_win.cpp	Fri May 14 16:41:33 2010 +0300
@@ -180,7 +180,7 @@
 QMessageId::QMessageId(const QString& id)
     : d_ptr(new QMessageIdPrivate(this))
 {
-    QDataStream idStream(QByteArray::fromBase64(id.toLatin1()));
+	QDataStream idStream(QByteArray::fromBase64(WinHelpers::stripIdPrefix(id).toLatin1()));
 
 #ifdef _WIN32_WCE
     idStream >> d_ptr->_entryId;
@@ -290,7 +290,7 @@
     encodedIdStream << d_ptr->_folderRecordKey;
     encodedIdStream << d_ptr->_storeRecordKey;
 
-    return encodedId.toBase64();
+	return WinHelpers::addIdPrefix(encodedId.toBase64());
 }
 
 bool QMessageId::isValid() const

--- a/qtmobility/src/messaging/qmessagemanager.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessagemanager.cpp	Fri May 14 16:41:33 2010 +0300
@@ -179,6 +179,9 @@
     ids in the list returned.
     \a offset specifies how many ids to skip at the beginning of the list returned.
     
+    The performance of querying messages is currently significantly less than 
+    optimal for some querying criteria on some platforms.
+    
     \sa error(), countMessages()
 */
 QMessageIdList QMessageManager::queryMessages(const QMessageFilter &filter, const QMessageSortOrder &sortOrder, uint limit, uint offset) const
@@ -198,6 +201,9 @@
     ids in the list returned.
     \a offset specifies how many ids to skip at the beginning of the list returned.
     
+    The performance of querying messages is currently significantly less than 
+    optimal for some querying criteria on some platforms.
+    
     \sa error(), countMessages()
 */
 QMessageIdList QMessageManager::queryMessages(const QMessageFilter &filter, const QList<QMessageSortOrder> &sortOrders, uint limit, uint offset) const
@@ -227,6 +233,9 @@
     \a offset specifies how many ids to skip at the beginning of the list returned.
     \a matchFlags specifies the matching method to use.
     
+    The performance of querying messages is currently significantly less than 
+    optimal for some querying criteria on some platforms.
+    
     \sa error(), countMessages()
 */
 QMessageIdList QMessageManager::queryMessages(const QMessageFilter &filter, const QString &body, QMessageDataComparator::MatchFlags matchFlags, const QMessageSortOrder &sortOrder, uint limit, uint offset) const
@@ -248,6 +257,9 @@
     \a offset specifies how many ids to skip at the beginning of the list returned.
     \a matchFlags specifies the matching method to use.
     
+    The performance of querying messages is currently significantly less than 
+    optimal for some querying criteria on some platforms.
+    
     \sa error(), countMessages()
 */
 QMessageIdList QMessageManager::queryMessages(const QMessageFilter &filter, const QString &body, QMessageDataComparator::MatchFlags matchFlags, const QList<QMessageSortOrder> &sortOrders, uint limit, uint offset) const
@@ -360,6 +372,9 @@
     in QMessageFilter \a filter. If \a filter is empty the count of all 
     available messages is returned.
     
+    The performance of counting messages is currently significantly less than optimal 
+    for some filters on some platforms.
+    
     \sa error(), queryMessages()
 */
 int QMessageManager::countMessages(const QMessageFilter& filter) const
@@ -462,7 +477,12 @@
     
     To ensure the change is propagated to any affected external server
     QMessageService::exportUpdates() should be subsequently called.
-
+    
+    On the Maemo 5 (Fremantle) platform for SMS type messages this function is not yet 
+    supported.
+    
+    Using this function to explicitly set a size or date is not currently supported on some platforms.
+    
     \sa message(), updateMessage(), removeMessage(), QMessageService::exportUpdates()
 */
 bool QMessageManager::addMessage(QMessage *m)
@@ -482,6 +502,10 @@
 
     To ensure the change is propagated to any affected external server 
     QMessageService::exportUpdates() should be subsequently called.
+
+    Using this function to explicitly set a size or date is not currently supported on some platforms.
+    
+    On the Maemo 5 (Fremantle) platform this function is not yet supported.
     
     \sa addMessage(), removeMessage(), QMessageService::exportUpdates()
 */
@@ -556,6 +580,9 @@
     Signal that is emitted when the message identified by \a id is added to the message store.
     \a matchingFilterIds contains a set of values identifiying registered notification filters 
     that matched the message.
+    
+    Currently on the Maemo 5 (Fremantle) platform this signal is not reported for messages in the 
+    inbox when the inbox is open in modest.
 
     \sa messageRemoved(), messageUpdated(), registerNotificationFilter()
 */

--- a/qtmobility/src/messaging/qmessageservice.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessageservice.cpp	Fri May 14 16:41:33 2010 +0300
@@ -60,7 +60,7 @@
     the same interface for communicating status, and progress information.
 
     All service request operations communicate changes in their operational state 
-    by emitting the activityChanged() signal.
+    by emitting the stateChanged() signal.
 
     Service request operations report progress information by emitting the 
     progressChanged() signal.
@@ -129,6 +129,9 @@
     signal with a total of 0 indicates that the number of progress steps is
     unknown.
     
+    The performance of querying messages is currently significantly less than 
+    optimal for some querying criteria on some platforms.
+    
     Returns true if the operation can be initiated; otherwise returns false.
 
     Note: This function should not initiate network activity, instead only message data
@@ -156,6 +159,9 @@
     signal with a total of 0 indicates that the number of progress steps is
     unknown.
 
+    The performance of querying messages is currently significantly less than 
+    optimal for some querying criteria on some platforms.
+    
     Returns true if the operation can be initiated; otherwise returns false.
     
     Note: This function should not initiate network activity, instead only message data
@@ -175,6 +181,9 @@
     signal with a total of 0 indicates that the number of progress steps is
     unknown.
     
+    The performance of counting messages is currently significantly less than optimal 
+    for some filters on some platforms.
+    
     Returns true if the operation can be initiated; otherwise returns false.
     
     Note: This function should not initiate network activity, instead only message data
@@ -194,6 +203,10 @@
     transmission, or moved to that folder if it is already stored in another folder.
     If transmission is successful, the message will be moved to the standard Sent
     folder for the account.
+    
+    Currently on the Maemo 5 (Fremantle) and Windows Mobile platforms the service 
+    action object enters the FinishedState when the message is queued for sending 
+    rather than actually sent.
   
     Returns true if the operation can be initiated; otherwise returns false.
     
@@ -263,6 +276,8 @@
 
     Returns true if the operation can be initiated; otherwise returns false.
     
+    On the Maemo 5 (Fremantle) platform this function is not yet supported for SMS type messages.
+    
     On the QMF platform implementation of this function is left as a task for system 
     integrators.

--- a/qtmobility/src/messaging/qmessageservice_maemo.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessageservice_maemo.cpp	Fri May 14 16:41:33 2010 +0300
@@ -72,65 +72,43 @@
                                            uint limit, uint offset,
                                            EnginesToCall enginesToCall)
 {
-  qDebug() << "QMessageServicePrivate::queryMessages 1";
     if (_active) {
         return false;
     }
 
+    _filter = filter;
+    MessagingHelper::handleNestedFiltersFromMessageFilter(_filter);
+
     _ids.clear();
     _sorted = true;
     _filtered = true;
 
     _active = true;
     _error = QMessageManager::NoError;
-    bool modestEngineCalled=false;
-
-    if (enginesToCall & EnginesToCallTelepathy) {
-      _ids= EventLoggerEngine::instance()->filterAndOrderMessages(filter,sortOrder,QString(),QMessageDataComparator::MatchFlags());
-      qDebug() << "QMessageServicePrivate::queryMessages filterAndOrderMessages:";
-    }
 
     _pendingRequestCount = 0;
+
+    if (enginesToCall & EnginesToCallTelepathy) {
+        _ids = EventLoggerEngine::instance()->filterAndOrderMessages(filter,sortOrder,QString(),QMessageDataComparator::MatchFlags());
+        QMetaObject::invokeMethod(this, "messagesFoundSlot", Qt::QueuedConnection);
+        _pendingRequestCount++;
+    }
+
     if (enginesToCall & EnginesToCallModest) {
-      qDebug() << "QMessageServicePrivate::queryMessages modest";
-      modestEngineCalled=true;
-      if (ModestEngine::instance()->queryMessages(messageService, filter, sortOrder, limit, offset)) {
-	  qDebug() << "QMessageServicePrivate::queryMessages modest done";
-	  _pendingRequestCount++;
-
+        if (ModestEngine::instance()->queryMessages(messageService, _filter, sortOrder, limit, offset)) {
+            _pendingRequestCount++;
         }
-      qDebug() << "QMessageServicePrivate::queryMessages modest done 2";
     } 
 
-    if (!modestEngineCalled && enginesToCall & EnginesToCallTelepathy && _pendingRequestCount==0 ) {
-      qDebug() << "QMessageServicePrivate::queryMessages only eventloggerengine";
-      if (!_sorted) {
-	MessagingHelper::orderMessages(_ids, sortOrder);
-      }
-      MessagingHelper::applyOffsetAndLimitToMessageIdList(_ids, limit, offset);
-      
-      emit q_ptr->messagesFound(_ids);
-
-      qDebug() << "QMessageServicePrivate::queryMessages setFinished(true)";
-      setFinished(true);
-      
-      _ids.clear();
-      qDebug() << "QMessageServicePrivate::queryMessages return true";
-      return true; // Operation initialized and completed
-    }
-
-
     if (_pendingRequestCount > 0) {
-        _filter = filter;
         _sortOrder = sortOrder;
         _limit = limit;
         _offset = offset;
 
-        _state = QMessageService::ActiveState;
-        emit messageService.stateChanged(_state);
+        stateChanged(QMessageService::ActiveState);
     } else {
-      qDebug() << "QMessageServicePrivate::queryMessages setFinixhed() active=" << _active;
-      if(_active)setFinished(false);
+        _filter = QMessageFilter();
+        setFinished(false);
     }
 
     return _active;
@@ -144,11 +122,13 @@
                                            uint limit, uint offset,
                                            EnginesToCall enginesToCall)
 {
-  qDebug() << "QMessageServicePrivate::queryMessages 2";
     if (_active) {
         return false;
     }
 
+    _filter = filter;
+    MessagingHelper::handleNestedFiltersFromMessageFilter(_filter);
+
     _ids.clear();
     _sorted = true;
     _filtered = true;
@@ -158,44 +138,28 @@
 
     _pendingRequestCount = 0;
 
-    bool modestEngineCalled=false;
-    
     if (enginesToCall & EnginesToCallTelepathy) {
         _ids= EventLoggerEngine::instance()->filterAndOrderMessages(filter,sortOrder,body,matchFlags); 
+        QMetaObject::invokeMethod(this, "messagesFoundSlot", Qt::QueuedConnection);
+        _pendingRequestCount++;
     }
 
     if (enginesToCall & EnginesToCallModest) {
-      modestEngineCalled=true;
-        if (ModestEngine::instance()->queryMessages(messageService, filter, body, matchFlags,
+        if (ModestEngine::instance()->queryMessages(messageService, _filter, body, matchFlags,
                                                     sortOrder, limit, offset)) {
             _pendingRequestCount++;
         }
     }
 
-    if (!modestEngineCalled && enginesToCall & EnginesToCallTelepathy && _pendingRequestCount==0 ) {
-      if (!_sorted) {
-	MessagingHelper::orderMessages(_ids, sortOrder);
-      }
-      MessagingHelper::applyOffsetAndLimitToMessageIdList(_ids, limit, offset);
-      
-      emit q_ptr->messagesFound(_ids);
-      setFinished(true);
-      
-      _ids.clear();
-      qDebug() << "QMessageServicePrivate::queryMessages return true";
-      return true; // Operation initialized and completed
-    }
-
     if (_pendingRequestCount > 0) {
-        _filter = filter;
         _sortOrder = sortOrder;
         _limit = limit;
         _offset = offset;
 
-        _state = QMessageService::ActiveState;
-        emit stateChanged(_state);
+        stateChanged(QMessageService::ActiveState);
     } else {
-      if(_active)setFinished(false);
+        _filter = QMessageFilter();
+        setFinished(false);
     }
 
     return _active;
@@ -209,25 +173,28 @@
         return false;
     }
 
+    QMessageFilter handledFilter = filter;
+    MessagingHelper::handleNestedFiltersFromMessageFilter(handledFilter);
+
     _count = 0;
 
     _active = true;
     _error = QMessageManager::NoError;
 
     _pendingRequestCount = 0;
-    if (enginesToCall & EnginesToCallModest) {
-        if (ModestEngine::instance()->countMessages(messageService, filter)) {
-            _pendingRequestCount++;
-        }
-    }
 
     //TODO: SMS count support
     //if (enginesToCall & EnginesToCallTelepathy) {
     //}
 
+    if (enginesToCall & EnginesToCallModest) {
+        if (ModestEngine::instance()->countMessages(messageService, handledFilter)) {
+            _pendingRequestCount++;
+        }
+    }
+
     if (_pendingRequestCount > 0) {
-        _state = QMessageService::ActiveState;
-        emit stateChanged(_state);
+        stateChanged(QMessageService::ActiveState);
     } else {
         setFinished(false);
     }
@@ -238,7 +205,6 @@
 
 void QMessageServicePrivate::setFinished(bool successful)
 {
-  qDebug() << "setFinished" << successful;
     if (!successful && _pendingRequestCount > 0) {
         _pendingRequestCount--;
     }
@@ -248,23 +214,20 @@
             // We must report an error of some sort
             _error = QMessageManager::RequestIncomplete;
         }
-	qDebug() << "emit stateChanged(FinishedState)";
-        _state = QMessageService::FinishedState;
+
         _active = false;
-        emit q_ptr->stateChanged(_state);
+        stateChanged(QMessageService::FinishedState);
     }
 }
 
 void QMessageServicePrivate::stateChanged(QMessageService::State state)
 {
     _state = state;
-    qDebug() <<" StateChanged" << state;
     emit q_ptr->stateChanged(_state);
 }
 
 void QMessageServicePrivate::messagesFound(const QMessageIdList &ids, bool isFiltered, bool isSorted)
 {
-    qDebug() <<" MessagesFound";
     _pendingRequestCount--;
 
     if (!isFiltered) {
@@ -290,6 +253,8 @@
         }
         MessagingHelper::applyOffsetAndLimitToMessageIdList(_ids, _limit, _offset);
 
+        ModestEngine::instance()->clearHeaderCache();
+
         emit q_ptr->messagesFound(_ids);
 
         setFinished(true);
@@ -303,8 +268,12 @@
 void QMessageServicePrivate::messagesCounted(int count)
 {
     _pendingRequestCount--;
+
     _count += count;
+
     if (_pendingRequestCount == 0) {
+        ModestEngine::instance()->clearHeaderCache();
+
         emit q_ptr->messagesCounted(_count);
 
         setFinished(true);
@@ -318,6 +287,15 @@
     emit q_ptr->progressChanged(value, total);
 }
 
+void QMessageServicePrivate::messagesFoundSlot()
+{
+    messagesFound(QMessageIdList(), true, false);
+}
+
+void QMessageServicePrivate::messagesCountedSlot()
+{
+    messagesCounted(0);
+}
 
 
 QMessageService::QMessageService(QObject *parent)
@@ -561,4 +539,6 @@
     return d_ptr->_error;
 }
 
+#include "moc_qmessageservice_maemo_p.cpp"
+
 QTM_END_NAMESPACE

--- a/qtmobility/src/messaging/qmessageservice_maemo_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessageservice_maemo_p.h	Fri May 14 16:41:33 2010 +0300
@@ -41,10 +41,14 @@
 
 #include "qmessageservice.h"
 
+#include <QObject>
+
 QTM_BEGIN_NAMESPACE
 
-class QMessageServicePrivate
+class QMessageServicePrivate : public QObject
 {
+    Q_OBJECT
+
 public:
     enum EnginesToCall
     {
@@ -75,6 +79,10 @@
     void messagesCounted(int count);
     void progressChanged(uint value, uint total);
 
+public slots:
+    void messagesFoundSlot();
+    void messagesCountedSlot();
+
 public:
     QMessageService* q_ptr;
     QMessageService::State _state;

--- a/qtmobility/src/messaging/qmessagestore_maemo.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmessagestore_maemo.cpp	Fri May 14 16:41:33 2010 +0300
@@ -130,23 +130,27 @@
 {
     QMessageIdList messageIds;
 
+    QMessageFilter handledFilter = filter;
+    MessagingHelper::handleNestedFiltersFromMessageFilter(handledFilter);
+
     bool isFiltered = false;
     bool isSorted = false;
     
-    messageIds = ModestEngine::instance()->queryMessagesSync(filter, sortOrder, limit, offset,
+    messageIds = ModestEngine::instance()->queryMessagesSync(handledFilter, sortOrder, limit, offset,
                                                              isFiltered, isSorted);
     
-    //    messageIds += d_ptr->p_ptr->el->filterAndOrderMessages(filter,sortOrder,QString(),QMessageDataComparator::MatchFlags());
-    messageIds += EventLoggerEngine::instance()->filterAndOrderMessages(filter,sortOrder,QString(),QMessageDataComparator::MatchFlags());
+    messageIds += EventLoggerEngine::instance()->filterAndOrderMessages(handledFilter,sortOrder,QString(),QMessageDataComparator::MatchFlags());
 
     if (!isFiltered) {
-        MessagingHelper::filterMessages(messageIds, filter);
+        MessagingHelper::filterMessages(messageIds, handledFilter);
     }
     if (!isSorted) {
         MessagingHelper::orderMessages(messageIds, sortOrder);
     }
     MessagingHelper::applyOffsetAndLimitToMessageIdList(messageIds, limit, offset);
 
+    ModestEngine::instance()->clearHeaderCache();
+
     return messageIds;
 }
 
@@ -154,21 +158,26 @@
 {
     QMessageIdList messageIds;
 
+    QMessageFilter handledFilter = filter;
+    MessagingHelper::handleNestedFiltersFromMessageFilter(handledFilter);
+
     bool isFiltered = false;
     bool isSorted = false;
-    messageIds = ModestEngine::instance()->queryMessagesSync(filter, body, matchFlags, sortOrder, limit, offset,
-                                                             isFiltered, isSorted);
-    //    messageIds +=d_ptr->p_ptr->el->filterAndOrderMessages(filter,sortOrder,body,matchFlags);
-    messageIds +=EventLoggerEngine::instance()->filterAndOrderMessages(filter,sortOrder,body,matchFlags);
+    messageIds = ModestEngine::instance()->queryMessagesSync(handledFilter, body, matchFlags, sortOrder,
+                                                             limit, offset, isFiltered, isSorted);
+
+    messageIds +=EventLoggerEngine::instance()->filterAndOrderMessages(handledFilter,sortOrder,body,matchFlags);
 
     if (!isFiltered) {
-        MessagingHelper::filterMessages(messageIds, filter);
+        MessagingHelper::filterMessages(messageIds, handledFilter);
     }
     if (!isSorted) {
         MessagingHelper::orderMessages(messageIds, sortOrder);
     }
     MessagingHelper::applyOffsetAndLimitToMessageIdList(messageIds, limit, offset);
 
+    ModestEngine::instance()->clearHeaderCache();
+
     return messageIds;
 }
 
@@ -176,9 +185,12 @@
 {
     QMessageFolderIdList folderIds;
 
+    QMessageFolderFilter handledFilter = filter;
+    MessagingHelper::handleNestedFiltersFromFolderFilter(handledFilter);
+
     bool isFiltered = false;
     bool isSorted = false;
-    folderIds = ModestEngine::instance()->queryFolders(filter, sortOrder, limit, offset, isFiltered, isSorted);
+    folderIds = ModestEngine::instance()->queryFolders(handledFilter, sortOrder, limit, offset, isFiltered, isSorted);
     if (!isFiltered) {
         MessagingHelper::filterFolders(folderIds, filter);
     }
@@ -216,7 +228,12 @@
 {
     int count = 0;
 
-    count += ModestEngine::instance()->countMessagesSync(filter);
+    QMessageFilter handledFilter = filter;
+    MessagingHelper::handleNestedFiltersFromMessageFilter(handledFilter);
+
+    count += ModestEngine::instance()->countMessagesSync(handledFilter);
+
+    ModestEngine::instance()->clearHeaderCache();
 
     return count;
 }

--- a/qtmobility/src/messaging/qmfhelpers.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmfhelpers.cpp	Fri May 14 16:41:33 2010 +0300
@@ -59,34 +59,44 @@
 
 namespace QmfHelpers {
 
+QString stripIdentifierPrefix(const QString &s)
+{
+    return s.mid(4);
+}
+    
+QString prefixIdentifier(const QString &s)
+{
+    return "QMF_" + s;
+}
+    
 QMessageId convert(const QMailMessageId &id)
 {
-    return QMessageId(QString::number(id.toULongLong()));
+    return QMessageId(prefixIdentifier(QString::number(id.toULongLong())));
 }
 
 QMailMessageId convert(const QMessageId &id)
 {
-    return QMailMessageId(id.toString().toULongLong());
+    return QMailMessageId(stripIdentifierPrefix(id.toString()).toULongLong());
 }
 
 QMessageAccountId convert(const QMailAccountId &id)
 {
-    return QMessageAccountId(QString::number(id.toULongLong()));
+    return QMessageAccountId(prefixIdentifier(QString::number(id.toULongLong())));
 }
 
 QMailAccountId convert(const QMessageAccountId &id)
 {
-    return QMailAccountId(id.toString().toULongLong());
+    return QMailAccountId(stripIdentifierPrefix(id.toString()).toULongLong());
 }
 
 QMessageFolderId convert(const QMailFolderId &id)
 {
-    return QMessageFolderId(QString::number(id.toULongLong()));
+    return QMessageFolderId(prefixIdentifier(QString::number(id.toULongLong())));
 }
 
 QMailFolderId convert(const QMessageFolderId &id)
 {
-    return QMailFolderId(id.toString().toULongLong());
+    return QMailFolderId(stripIdentifierPrefix(id.toString()).toULongLong());
 }
 
 /* in qmessagecontentcontainerid_qmf.cpp

--- a/qtmobility/src/messaging/qmfhelpers_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/qmfhelpers_p.h	Fri May 14 16:41:33 2010 +0300
@@ -67,6 +67,9 @@
 
 namespace QmfHelpers {
 
+    Q_AUTOTEST_EXPORT QString stripIdentifierPrefix(const QString &s);
+    Q_AUTOTEST_EXPORT QString prefixIdentifier(const QString &s);
+
     Q_AUTOTEST_EXPORT QMessageId convert(const QMailMessageId &id);
     Q_AUTOTEST_EXPORT QMailMessageId convert(const QMessageId &id);

--- a/qtmobility/src/messaging/winhelpers.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/winhelpers.cpp	Fri May 14 16:41:33 2010 +0300
@@ -91,6 +91,24 @@
 #include <QTimer>
 #include <QMutexLocker>
 
+QTM_BEGIN_NAMESPACE
+
+namespace WinHelpers {
+	QString addIdPrefix(const QString& id)
+	{
+		Q_ASSERT(!id.startsWith(QString(idPrefix)));
+		return QString(idPrefix) + id;
+	}
+
+	QString stripIdPrefix(const QString& id)
+	{
+		Q_ASSERT(id.startsWith(QString(id)));
+		return id.right(id.length() - QString(idPrefix).length());
+	}
+}
+
+QTM_END_NAMESPACE
+
 
 #include <shlwapi.h>
 #include <shlguid.h>
@@ -120,6 +138,8 @@
 
 namespace WinHelpers
 {
+	
+
     bool setMapiProperty(IMAPIProp *object, ULONG tag, const QString &value)
     {
         SPropValue prop = { 0 };

--- a/qtmobility/src/messaging/winhelpers_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/messaging/winhelpers_p.h	Fri May 14 16:41:33 2010 +0300
@@ -53,6 +53,16 @@
 #include <QQueue>
 #include <QEvent>
 
+QTM_BEGIN_NAMESPACE
+
+namespace WinHelpers {
+	QString addIdPrefix(const QString& id);
+	QString stripIdPrefix(const QString& id);
+	static const char* idPrefix = "WIN_";
+};
+
+QTM_END_NAMESPACE
+
 #ifndef _WIN32_WCE
 
 #define USES_IID_IMAPIForm
@@ -129,6 +139,7 @@
 
 namespace WinHelpers {
 
+
 enum SavePropertyOption { DontSavePropertyChanges = 0, SavePropertyChanges };
 
 QString QStringFromLpctstr(LPCTSTR lpszValue);

--- a/qtmobility/src/multimedia/qaudiocapturesource.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qaudiocapturesource.cpp	Fri May 14 16:41:33 2010 +0300
@@ -43,7 +43,7 @@
 #include <qaudiocapturesource.h>
 #include "qaudioendpointselector.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QAudioCaptureSource
@@ -96,14 +96,14 @@
                        SIGNAL(availableAudioInputsChanged()));
             q->connect(audioEndpointSelector, SIGNAL(availableEndpointsChanged()),
                        SLOT(statusChanged()));
-            errorState = QtMedia::NoError;
+            errorState = QtMediaServices::NoError;
         }
     }
 
-    QAudioCaptureSourcePrivate():provider(0), audioEndpointSelector(0), errorState(QtMedia::ServiceMissingError) {}
+    QAudioCaptureSourcePrivate():provider(0), audioEndpointSelector(0), errorState(QtMediaServices::ServiceMissingError) {}
     QMediaServiceProvider *provider;
     QAudioEndpointSelector   *audioEndpointSelector;
-    QtMedia::AvailabilityError errorState;
+    QtMediaServices::AvailabilityError errorState;
 };
 
 /*!
@@ -148,7 +148,7 @@
     Returns the error state of the audio capture service.
 */
 
-QtMedia::AvailabilityError QAudioCaptureSource::availabilityError() const
+QtMediaServices::AvailabilityError QAudioCaptureSource::availabilityError() const
 {
     Q_D(const QAudioCaptureSource);
 
@@ -260,18 +260,18 @@
 
     if (d->audioEndpointSelector) {
         if (d->audioEndpointSelector->availableEndpoints().size() > 0) {
-            d->errorState = QtMedia::NoError;
+            d->errorState = QtMediaServices::NoError;
             emit availabilityChanged(true);
         } else {
-            d->errorState = QtMedia::BusyError;
+            d->errorState = QtMediaServices::BusyError;
             emit availabilityChanged(false);
         }
     } else {
-        d->errorState = QtMedia::ServiceMissingError;
+        d->errorState = QtMediaServices::ServiceMissingError;
         emit availabilityChanged(false);
     }
 }
 
 #include "moc_qaudiocapturesource.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qaudiocapturesource.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qaudiocapturesource.h	Fri May 14 16:41:33 2010 +0300
@@ -55,7 +55,7 @@
 
 #include "qmediaserviceprovider.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QAudioCaptureSourcePrivate;
 
@@ -70,7 +70,7 @@
     ~QAudioCaptureSource();
 
     bool isAvailable() const;
-    QtMedia::AvailabilityError availabilityError() const;
+    QtMediaServices::AvailabilityError availabilityError() const;
 
     QList<QString> audioInputs() const;
 
@@ -92,6 +92,6 @@
     Q_DECLARE_PRIVATE(QAudioCaptureSource)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif  // QAUDIOCAPTURESOURCE_H

--- a/qtmobility/src/multimedia/qaudioencodercontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qaudioencodercontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -42,7 +42,7 @@
 #include "qaudioencodercontrol.h"
 #include <QtCore/qstringlist.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 
 /*!
@@ -151,5 +151,5 @@
 */
 
 #include "moc_qaudioencodercontrol.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qaudioencodercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qaudioencodercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -52,7 +52,7 @@
 class QAudioFormat;
 QT_END_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class Q_MEDIA_EXPORT QAudioEncoderControl : public QMediaControl
 {
@@ -82,6 +82,6 @@
 #define QAudioEncoderControl_iid "com.nokia.Qt.QAudioEncoderControl/1.0"
 Q_MEDIA_DECLARE_CONTROL(QAudioEncoderControl, QAudioEncoderControl_iid)
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QAUDIOCAPTUREPROPERTIESCONTROL_H

--- a/qtmobility/src/multimedia/qaudioendpointselector.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qaudioendpointselector.cpp	Fri May 14 16:41:33 2010 +0300
@@ -41,7 +41,7 @@
 
 #include "qaudioendpointselector.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QAudioEndpointSelector
@@ -126,5 +126,5 @@
 */
 
 #include "moc_qaudioendpointselector.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qaudioendpointselector.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qaudioendpointselector.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 #include <QtMultimedia/qaudio.h>
 #include "qmediacontrol.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class Q_MEDIA_EXPORT QAudioEndpointSelector : public QMediaControl
 {
@@ -73,6 +73,6 @@
 #define QAudioEndpointSelector_iid "com.nokia.Qt.QAudioEndpointSelector/1.0"
 Q_MEDIA_DECLARE_CONTROL(QAudioEndpointSelector, QAudioEndpointSelector_iid)
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QAUDIOENDPOINTSELECTOR_H

--- a/qtmobility/src/multimedia/qgraphicsvideoitem.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qgraphicsvideoitem.cpp	Fri May 14 16:41:33 2010 +0300
@@ -55,7 +55,7 @@
 #include <QtOpenGL/qgl.h>
 #endif
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGraphicsVideoItemPrivate
 {
@@ -420,4 +420,4 @@
 }
 
 #include "moc_qgraphicsvideoitem.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qgraphicsvideoitem.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qgraphicsvideoitem.h	Fri May 14 16:41:33 2010 +0300
@@ -50,7 +50,7 @@
 class QVideoSurfaceFormat;
 QT_END_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QGraphicsVideoItemPrivate;
 class  Q_MEDIA_EXPORT QGraphicsVideoItem : public QGraphicsObject
@@ -100,6 +100,6 @@
     Q_PRIVATE_SLOT(d_func(), void _q_mediaObjectDestroyed())
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/src/multimedia/qgraphicsvideoitem_maemo5.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qgraphicsvideoitem_maemo5.cpp	Fri May 14 16:41:33 2010 +0300
@@ -61,7 +61,7 @@
 #include "qxvideosurface_maemo5_p.h"
 
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 //update overlay geometry slightly later,
 //to ensure color key is alredy replaced with static frame
@@ -664,4 +664,4 @@
 }
 
 #include "moc_qgraphicsvideoitem.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qimageencodercontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qimageencodercontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -42,7 +42,7 @@
 #include "qimageencodercontrol.h"
 #include <QtCore/qstringlist.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QImageEncoderControl
@@ -127,5 +127,5 @@
 */
 
 #include "moc_qimageencodercontrol.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qimageencodercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qimageencodercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -53,7 +53,7 @@
 class QStringList;
 QT_END_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class Q_MEDIA_EXPORT QImageEncoderControl : public QMediaControl
 {
@@ -78,6 +78,6 @@
 #define QImageEncoderControl_iid "com.nokia.Qt.QImageEncoderControl/1.0"
 Q_MEDIA_DECLARE_CONTROL(QImageEncoderControl, QImageEncoderControl_iid)
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/src/multimedia/qlocalmediaplaylistprovider.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qlocalmediaplaylistprovider.cpp	Fri May 14 16:41:33 2010 +0300
@@ -43,7 +43,7 @@
 #include "qmediaplaylistprovider_p.h"
 #include "qmediacontent.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLocalMediaPlaylistProviderPrivate: public QMediaPlaylistProviderPrivate
 {
@@ -190,5 +190,5 @@
 }
 
 #include "moc_qlocalmediaplaylistprovider.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qlocalmediaplaylistprovider.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qlocalmediaplaylistprovider.h	Fri May 14 16:41:33 2010 +0300
@@ -44,7 +44,7 @@
 
 #include "qmediaplaylistprovider.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QLocalMediaPlaylistProviderPrivate;
 class Q_MEDIA_EXPORT QLocalMediaPlaylistProvider : public QMediaPlaylistProvider
@@ -74,6 +74,6 @@
     Q_DECLARE_PRIVATE(QLocalMediaPlaylistProvider)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QLOCALMEDIAPAYLISTSOURCE_H

--- a/qtmobility/src/multimedia/qmediacontainercontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediacontainercontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -42,7 +42,7 @@
 
 #include "qmediacontainercontrol.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaContainerControl
@@ -116,5 +116,5 @@
 */
 
 #include "moc_qmediacontainercontrol.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmediacontainercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediacontainercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 
 #include "qmediacontrol.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class Q_MEDIA_EXPORT QMediaContainerControl : public QMediaControl
 {
@@ -67,6 +67,6 @@
 #define QMediaContainerControl_iid "com.nokia.Qt.QMediaContainerControl/1.0"
 Q_MEDIA_DECLARE_CONTROL(QMediaContainerControl, QMediaContainerControl_iid)
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QMEDIACONTAINERCONTROL_H

--- a/qtmobility/src/multimedia/qmediacontent.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediacontent.cpp	Fri May 14 16:41:33 2010 +0300
@@ -44,7 +44,7 @@
 
 #include "qmediacontent.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 
 class QMediaContentPrivate : public QSharedData
@@ -235,5 +235,5 @@
             : QMediaResourceList();
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmediacontent.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediacontent.h	Fri May 14 16:41:33 2010 +0300
@@ -50,7 +50,7 @@
 #include <qmobilityglobal.h>
 
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaContentPrivate;
 class Q_MEDIA_EXPORT QMediaContent
@@ -81,9 +81,9 @@
     QSharedDataPointer<QMediaContentPrivate> d;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QMediaContent))
+Q_DECLARE_METATYPE(QMediaContent)

--- a/qtmobility/src/multimedia/qmediacontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediacontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -47,7 +47,7 @@
 
 
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaControl
@@ -134,5 +134,5 @@
 }
 
 #include "moc_qmediacontrol.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmediacontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediacontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,7 @@
 #include <QtCore/qvariant.h>
 
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaControlPrivate;
 class Q_MEDIA_EXPORT QMediaControl : public QObject
@@ -74,6 +74,6 @@
 #define Q_MEDIA_DECLARE_CONTROL(Class, IId) \
     template <> inline const char *qmediacontrol_iid<Class *>() { return IId; }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif  // QABSTRACTMEDIACONTROL_H

--- a/qtmobility/src/multimedia/qmediacontrol_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediacontrol_p.h	Fri May 14 16:41:33 2010 +0300
@@ -55,7 +55,7 @@
 
 #include <qmobilityglobal.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaControl;
 
@@ -67,6 +67,6 @@
     QMediaControl *q_ptr;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/src/multimedia/qmediaencodersettings.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaencodersettings.cpp	Fri May 14 16:41:33 2010 +0300
@@ -41,18 +41,18 @@
 
 #include "qmediaencodersettings.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QAudioEncoderSettingsPrivate  : public QSharedData
 {
 public:
     QAudioEncoderSettingsPrivate() :
         isNull(true),
-        encodingMode(QtMedia::ConstantQualityEncoding),
+        encodingMode(QtMediaServices::ConstantQualityEncoding),
         bitrate(-1),
         sampleRate(-1),
         channels(-1),
-        quality(QtMedia::NormalQuality)
+        quality(QtMediaServices::NormalQuality)
     {
     }
 
@@ -69,12 +69,12 @@
     }
 
     bool isNull;
-    QtMedia::EncodingMode encodingMode;
+    QtMediaServices::EncodingMode encodingMode;
     QString codec;
     int bitrate;
     int sampleRate;
     int channels;
-    QtMedia::EncodingQuality quality;
+    QtMediaServices::EncodingQuality quality;
 
 private:
     QAudioEncoderSettingsPrivate& operator=(const QAudioEncoderSettingsPrivate &other);
@@ -184,9 +184,9 @@
 /*!
     Returns the audio encoding mode.
 
-    \sa QtMedia::EncodingMode
+    \sa QtMediaServices::EncodingMode
 */
-QtMedia::EncodingMode QAudioEncoderSettings::encodingMode() const
+QtMediaServices::EncodingMode QAudioEncoderSettings::encodingMode() const
 {
     return d->encodingMode;
 }
@@ -194,16 +194,16 @@
 /*!
     Sets the audio encoding \a mode setting.
 
-    If QtMedia::ConstantQualityEncoding is set,
+    If QtMediaServices::ConstantQualityEncoding is set,
     the quality encoding parameter is used and bit rate is ignored,
     otherwise the bitrate is used.
 
     The audio codec, channels count and sample rate settings
     are used in all the encoding modes.
 
-    \sa encodingMode(), QtMedia::EncodingMode
+    \sa encodingMode(), QtMediaServices::EncodingMode
 */
-void QAudioEncoderSettings::setEncodingMode(QtMedia::EncodingMode mode)
+void QAudioEncoderSettings::setEncodingMode(QtMediaServices::EncodingMode mode)
 {
     d->encodingMode = mode;
 }
@@ -286,7 +286,7 @@
     Returns the audio encoding quality.
 */
 
-QtMedia::EncodingQuality QAudioEncoderSettings::quality() const
+QtMediaServices::EncodingQuality QAudioEncoderSettings::quality() const
 {
     return d->quality;
 }
@@ -298,9 +298,9 @@
     set of encoding parameters to achieve the desired quality level.
 
     The \a quality settings parameter is only used in the
-    \l {QtMedia::ConstantQualityEncoding}{constant quality} \l{encodingMode()}{encoding mode}.
+    \l {QtMediaServices::ConstantQualityEncoding}{constant quality} \l{encodingMode()}{encoding mode}.
 */
-void QAudioEncoderSettings::setQuality(QtMedia::EncodingQuality quality)
+void QAudioEncoderSettings::setQuality(QtMediaServices::EncodingQuality quality)
 {
     d->isNull = false;
     d->quality = quality;
@@ -311,10 +311,10 @@
 public:
     QVideoEncoderSettingsPrivate() :
         isNull(true),
-        encodingMode(QtMedia::ConstantQualityEncoding),
+        encodingMode(QtMediaServices::ConstantQualityEncoding),
         bitrate(-1),
         frameRate(0),
-        quality(QtMedia::NormalQuality)
+        quality(QtMediaServices::NormalQuality)
     {
     }
 
@@ -331,12 +331,12 @@
     }
 
     bool isNull;
-    QtMedia::EncodingMode encodingMode;
+    QtMediaServices::EncodingMode encodingMode;
     QString codec;
     int bitrate;
     QSize resolution;
     qreal frameRate;
-    QtMedia::EncodingQuality quality;
+    QtMediaServices::EncodingQuality quality;
 
 private:
     QVideoEncoderSettingsPrivate& operator=(const QVideoEncoderSettingsPrivate &other);
@@ -440,9 +440,9 @@
 /*!
     Returns the video encoding mode.
 
-    \sa QtMedia::EncodingMode
+    \sa QtMediaServices::EncodingMode
 */
-QtMedia::EncodingMode QVideoEncoderSettings::encodingMode() const
+QtMediaServices::EncodingMode QVideoEncoderSettings::encodingMode() const
 {
     return d->encodingMode;
 }
@@ -450,15 +450,15 @@
 /*!
     Sets the video encoding \a mode.
 
-    If QtMedia::ConstantQualityEncoding is set,
+    If QtMediaServices::ConstantQualityEncoding is set,
     the quality encoding parameter is used and bit rate is ignored,
     otherwise the bitrate is used.
 
     The rest of encoding settings are respected regardless of encoding mode.
 
-    \sa QtMedia::EncodingMode
+    \sa QtMediaServices::EncodingMode
 */
-void QVideoEncoderSettings::setEncodingMode(QtMedia::EncodingMode mode)
+void QVideoEncoderSettings::setEncodingMode(QtMediaServices::EncodingMode mode)
 {
     d->isNull = false;
     d->encodingMode = mode;
@@ -561,7 +561,7 @@
     Returns the video encoding quality.
 */
 
-QtMedia::EncodingQuality QVideoEncoderSettings::quality() const
+QtMediaServices::EncodingQuality QVideoEncoderSettings::quality() const
 {
     return d->quality;
 }
@@ -573,10 +573,10 @@
     set of encoding parameters to achieve the desired quality level.
 
     The \a quality settings parameter is only used in the
-    \l {QtMedia::ConstantQualityEncoding}{constant quality} \l{encodingMode()}{encoding mode}.
+    \l {QtMediaServices::ConstantQualityEncoding}{constant quality} \l{encodingMode()}{encoding mode}.
 */
 
-void QVideoEncoderSettings::setQuality(QtMedia::EncodingQuality quality)
+void QVideoEncoderSettings::setQuality(QtMediaServices::EncodingQuality quality)
 {
     d->isNull = false;
     d->quality = quality;
@@ -589,7 +589,7 @@
 public:
     QImageEncoderSettingsPrivate() :
         isNull(true),
-        quality(QtMedia::NormalQuality)
+        quality(QtMediaServices::NormalQuality)
     {
     }
 
@@ -605,7 +605,7 @@
     bool isNull;
     QString codec;
     QSize resolution;
-    QtMedia::EncodingQuality quality;
+    QtMediaServices::EncodingQuality quality;
 
 private:
     QImageEncoderSettingsPrivate& operator=(const QImageEncoderSettingsPrivate &other);
@@ -764,7 +764,7 @@
     Returns the image encoding quality.
 */
 
-QtMedia::EncodingQuality QImageEncoderSettings::quality() const
+QtMediaServices::EncodingQuality QImageEncoderSettings::quality() const
 {
     return d->quality;
 }
@@ -773,10 +773,10 @@
     Sets the image encoding \a quality.
 */
 
-void QImageEncoderSettings::setQuality(QtMedia::EncodingQuality quality)
+void QImageEncoderSettings::setQuality(QtMediaServices::EncodingQuality quality)
 {
     d->isNull = false;
     d->quality = quality;
 }
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmediaencodersettings.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaencodersettings.h	Fri May 14 16:41:33 2010 +0300
@@ -48,7 +48,7 @@
 #include <qmobilityglobal.h>
 #include "qtmedianamespace.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 
 class QAudioEncoderSettingsPrivate;
@@ -66,8 +66,8 @@
 
     bool isNull() const;
 
-    QtMedia::EncodingMode encodingMode() const;
-    void setEncodingMode(QtMedia::EncodingMode);
+    QtMediaServices::EncodingMode encodingMode() const;
+    void setEncodingMode(QtMediaServices::EncodingMode);
 
     QString codec() const;
     void setCodec(const QString& codec);
@@ -81,8 +81,8 @@
     int sampleRate() const;
     void setSampleRate(int rate);
 
-    QtMedia::EncodingQuality quality() const;
-    void setQuality(QtMedia::EncodingQuality quality);
+    QtMediaServices::EncodingQuality quality() const;
+    void setQuality(QtMediaServices::EncodingQuality quality);
 
 private:
     QSharedDataPointer<QAudioEncoderSettingsPrivate> d;
@@ -103,8 +103,8 @@
 
     bool isNull() const;
 
-    QtMedia::EncodingMode encodingMode() const;
-    void setEncodingMode(QtMedia::EncodingMode);
+    QtMediaServices::EncodingMode encodingMode() const;
+    void setEncodingMode(QtMediaServices::EncodingMode);
 
     QString codec() const;
     void setCodec(const QString &);
@@ -119,8 +119,8 @@
     int bitRate() const;
     void setBitRate(int bitrate);
 
-    QtMedia::EncodingQuality quality() const;
-    void setQuality(QtMedia::EncodingQuality quality);
+    QtMediaServices::EncodingQuality quality() const;
+    void setQuality(QtMediaServices::EncodingQuality quality);
 
 private:
     QSharedDataPointer<QVideoEncoderSettingsPrivate> d;
@@ -148,13 +148,13 @@
     void setResolution(const QSize &);
     void setResolution(int width, int height);
 
-    QtMedia::EncodingQuality quality() const;
-    void setQuality(QtMedia::EncodingQuality quality);
+    QtMediaServices::EncodingQuality quality() const;
+    void setQuality(QtMediaServices::EncodingQuality quality);
 
 private:
     QSharedDataPointer<QImageEncoderSettingsPrivate> d;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/src/multimedia/qmediaimageviewer.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaimageviewer.cpp	Fri May 14 16:41:33 2010 +0300
@@ -52,7 +52,7 @@
 #include <QtCore/qtextstream.h>
 #include <QtCore/qdatetime.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaImageViewerPrivate : public QMediaObjectPrivate
 {
@@ -494,5 +494,5 @@
 }
 
 #include "moc_qmediaimageviewer.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmediaimageviewer.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaimageviewer.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 #include "qmediaobject.h"
 #include "qmediacontent.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 
 class QMediaImageViewerPrivate;
@@ -113,6 +113,6 @@
     Q_PRIVATE_SLOT(d_func(), void _q_playlistDestroyed())
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/src/multimedia/qmediaimageviewerservice.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaimageviewerservice.cpp	Fri May 14 16:41:33 2010 +0300
@@ -64,7 +64,7 @@
 #include <QtMultimedia/qabstractvideosurface.h>
 #include <QtMultimedia/qvideosurfaceformat.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaImageViewerServicePrivate : public QMediaServicePrivate
 {
@@ -468,5 +468,5 @@
 
 
 #include "moc_qmediaimageviewerservice_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmediaimageviewerservice_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaimageviewerservice_p.h	Fri May 14 16:41:33 2010 +0300
@@ -68,7 +68,7 @@
 class QNetworkAccessManager;
 QT_END_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaImageViewerServicePrivate;
 
@@ -154,6 +154,6 @@
     Output m_output;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/src/multimedia/qmediaobject.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaobject.cpp	Fri May 14 16:41:33 2010 +0300
@@ -47,7 +47,7 @@
 #include "qmetadatacontrol.h"
 
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 void QMediaObjectPrivate::_q_notify()
 {
@@ -96,9 +96,9 @@
     Returns the service availability error state.
 */
 
-QtMedia::AvailabilityError QMediaObject::availabilityError() const
+QtMediaServices::AvailabilityError QMediaObject::availabilityError() const
 {
-    return QtMedia::ServiceMissingError;
+    return QtMediaServices::ServiceMissingError;
 }
 
 /*!
@@ -305,7 +305,7 @@
 /*!
     Returns the value associated with a meta-data \a key.
 */
-QVariant QMediaObject::metaData(QtMedia::MetaData key) const
+QVariant QMediaObject::metaData(QtMediaServices::MetaData key) const
 {
     Q_D(const QMediaObject);
 
@@ -317,7 +317,7 @@
 /*!
     Sets a \a value for a meta-data \a key.
 */
-void QMediaObject::setMetaData(QtMedia::MetaData key, const QVariant &value)
+void QMediaObject::setMetaData(QtMediaServices::MetaData key, const QVariant &value)
 {
     Q_D(QMediaObject);
 
@@ -328,13 +328,13 @@
 /*!
     Returns a list of keys there is meta-data available for.
 */
-QList<QtMedia::MetaData> QMediaObject::availableMetaData() const
+QList<QtMediaServices::MetaData> QMediaObject::availableMetaData() const
 {
     Q_D(const QMediaObject);
 
     return d->metaDataControl
             ? d->metaDataControl->availableMetaData()
-            : QList<QtMedia::MetaData>();
+            : QList<QtMediaServices::MetaData>();
 }
 
 /*!
@@ -413,5 +413,5 @@
 
 
 #include "moc_qmediaobject.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmediaobject.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaobject.h	Fri May 14 16:41:33 2010 +0300
@@ -48,7 +48,7 @@
 #include <qmobilityglobal.h>
 #include "qtmedianamespace.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaService;
 
@@ -63,7 +63,7 @@
     ~QMediaObject();
 
     virtual bool isAvailable() const;
-    virtual QtMedia::AvailabilityError availabilityError() const;
+    virtual QtMediaServices::AvailabilityError availabilityError() const;
 
     virtual QMediaService* service() const;
 
@@ -76,9 +76,9 @@
     bool isMetaDataAvailable() const;
     bool isMetaDataWritable() const;
 
-    QVariant metaData(QtMedia::MetaData key) const;
-    void setMetaData(QtMedia::MetaData key, const QVariant &value);
-    QList<QtMedia::MetaData> availableMetaData() const;
+    QVariant metaData(QtMediaServices::MetaData key) const;
+    void setMetaData(QtMediaServices::MetaData key, const QVariant &value);
+    QList<QtMediaServices::MetaData> availableMetaData() const;
 
     QVariant extendedMetaData(const QString &key) const;
     void setExtendedMetaData(const QString &key, const QVariant &value);
@@ -110,6 +110,6 @@
 };
 
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif  // QABSTRACTMEDIAOBJECT_H

--- a/qtmobility/src/multimedia/qmediaobject_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaobject_p.h	Fri May 14 16:41:33 2010 +0300
@@ -59,7 +59,7 @@
 
 #include "qmediaobject.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMetaDataControl;
 
@@ -86,6 +86,6 @@
     QMediaObject *q_ptr;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/src/multimedia/qmediaplayer.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplayer.cpp	Fri May 14 16:41:33 2010 +0300
@@ -57,7 +57,7 @@
 #include "qvideowidget.h"
 #include "qgraphicsvideoitem.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaPlayer
@@ -649,7 +649,7 @@
     The \a flags argument allows additional requirements such as performance indicators to be
     specified.
 */
-QtMedia::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType,
+QtMediaServices::SupportEstimate QMediaPlayer::hasSupport(const QString &mimeType,
                                                const QStringList& codecs,
                                                Flags flags)
 {
@@ -957,5 +957,5 @@
 */
 
 #include "moc_qmediaplayer.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmediaplayer.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplayer.h	Fri May 14 16:41:33 2010 +0300
@@ -46,8 +46,9 @@
 #include "qmediaobject.h"
 #include "qmediacontent.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_HEADER
 
+QT_BEGIN_NAMESPACE
 
 class QMediaPlaylist;
 
@@ -113,7 +114,7 @@
     QMediaPlayer(QObject *parent = 0, Flags flags = 0, QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider());
     ~QMediaPlayer();
 
-    static QtMedia::SupportEstimate hasSupport(const QString &mimeType,
+    static QtMediaServices::SupportEstimate hasSupport(const QString &mimeType,
                                             const QStringList& codecs = QStringList(),
                                             Flags flags = 0);
     static QStringList supportedMimeTypes(Flags flags = 0);
@@ -188,11 +189,12 @@
     Q_PRIVATE_SLOT(d_func(), void _q_playlistDestroyed())
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QMediaPlayer::State))
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QMediaPlayer::MediaStatus))
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QMediaPlayer::Error))
+Q_DECLARE_METATYPE(QMediaPlayer::State)
+Q_DECLARE_METATYPE(QMediaPlayer::MediaStatus)
+Q_DECLARE_METATYPE(QMediaPlayer::Error)
 
+QT_END_HEADER
 
 #endif  // QMEDIAPLAYER_H

--- a/qtmobility/src/multimedia/qmediaplayercontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplayercontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -43,7 +43,7 @@
 #include "qmediacontrol_p.h"
 #include "qmediaplayer.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 
 /*!
@@ -372,5 +372,5 @@
 */
 
 #include "moc_qmediaplayercontrol.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmediaplayercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplayercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -48,7 +48,7 @@
 
 #include <QtCore/qpair.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaPlaylist;
 
@@ -117,7 +117,7 @@
 #define QMediaPlayerControl_iid "com.nokia.Qt.QMediaPlayerControl/1.0"
 Q_MEDIA_DECLARE_CONTROL(QMediaPlayerControl, QMediaPlayerControl_iid)
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif  // QMEDIAPLAYERCONTROL_H

--- a/qtmobility/src/multimedia/qmediaplaylist.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylist.cpp	Fri May 14 16:41:33 2010 +0300
@@ -56,7 +56,7 @@
 
 #include "qmediapluginloader_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, playlistIOLoader,
         (QMediaPlaylistIOInterface_iid, QLatin1String("/playlistformats"), Qt::CaseInsensitive))
@@ -714,5 +714,5 @@
 
 #include "moc_qmediaplaylist.cpp"
 #include "moc_qmediaplaylist_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmediaplaylist.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylist.h	Fri May 14 16:41:33 2010 +0300
@@ -48,7 +48,7 @@
 #include "qmediaobject.h"
 
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaPlaylistProvider;
 
@@ -133,10 +133,10 @@
     Q_PRIVATE_SLOT(d_func(), void _q_loadFailed(QMediaPlaylist::Error, const QString &))
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QMediaPlaylist::PlaybackMode))
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QMediaPlaylist::Error))
+Q_DECLARE_METATYPE(QMediaPlaylist::PlaybackMode)
+Q_DECLARE_METATYPE(QMediaPlaylist::Error)
 
 
 #endif  // QMEDIAPLAYLIST_H

--- a/qtmobility/src/multimedia/qmediaplaylist_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylist_p.h	Fri May 14 16:41:33 2010 +0300
@@ -66,7 +66,7 @@
 # pragma Q_MOC_EXPAND_MACROS
 #endif
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaPlaylistControl;
 class QMediaPlaylistProvider;
@@ -163,6 +163,6 @@
 };
 
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QMEDIAPLAYLIST_P_H

--- a/qtmobility/src/multimedia/qmediaplaylistcontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylistcontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -43,7 +43,7 @@
 #include "qmediaplaylistcontrol.h"
 #include "qmediacontrol_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaPlaylistControl
@@ -198,5 +198,5 @@
 */
 
 #include "moc_qmediaplaylistcontrol.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmediaplaylistcontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylistcontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -47,7 +47,7 @@
 #include "qmediaplaylistnavigator.h"
 
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaPlaylistProvider;
 
@@ -85,6 +85,6 @@
 #define QMediaPlaylistControl_iid "com.nokia.Qt.QMediaPlaylistControl/1.0"
 Q_MEDIA_DECLARE_CONTROL(QMediaPlaylistControl, QMediaPlaylistControl_iid)
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QMEDIAPLAYLISTCONTROL_H

--- a/qtmobility/src/multimedia/qmediaplaylistioplugin.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylistioplugin.cpp	Fri May 14 16:41:33 2010 +0300
@@ -41,7 +41,7 @@
 
 #include "qmediaplaylistioplugin.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaPlaylistReader
@@ -184,5 +184,5 @@
 */
 
 #include "moc_qmediaplaylistioplugin.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmediaplaylistioplugin.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylistioplugin.h	Fri May 14 16:41:33 2010 +0300
@@ -56,9 +56,6 @@
 class QByteArray;
 class QIODevice;
 class QStringList;
-QT_END_NAMESPACE
-
-QTM_BEGIN_NAMESPACE
 
 class Q_MEDIA_EXPORT QMediaPlaylistReader
 {
@@ -92,21 +89,13 @@
     virtual QMediaPlaylistWriter *createWriter(QIODevice *device, const QByteArray &format) = 0;
 };
 
-QTM_END_NAMESPACE
-
 #define QMediaPlaylistIOInterface_iid "com.nokia.Qt.QMediaPlaylistIOInterface"
-//MOC doesn't recognire paramitized macros
-//Q_DECLARE_INTERFACE(QTM_PREPEND_NAMESPACE(QMediaPlaylistIOInterface), QMediaPlaylistIOInterface_iid);
-QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(QtMobility::QMediaPlaylistIOInterface, QMediaPlaylistIOInterface_iid);
-QT_END_NAMESPACE
-
-QTM_BEGIN_NAMESPACE
+Q_DECLARE_INTERFACE(QMediaPlaylistIOInterface, QMediaPlaylistIOInterface_iid);
 
 class Q_MEDIA_EXPORT QMediaPlaylistIOPlugin : public QObject, public QMediaPlaylistIOInterface
 {
 Q_OBJECT
-Q_INTERFACES(QtMobility::QMediaPlaylistIOInterface:QFactoryInterface)
+Q_INTERFACES(QMediaPlaylistIOInterface:QFactoryInterface)
 public:
     explicit QMediaPlaylistIOPlugin(QObject *parent = 0);
     virtual ~QMediaPlaylistIOPlugin();
@@ -124,6 +113,6 @@
     virtual QMediaPlaylistWriter *createWriter(QIODevice *device, const QByteArray &format) = 0;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QMEDIAPLAYLISTIOPLUGIN_H

--- a/qtmobility/src/multimedia/qmediaplaylistnavigator.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylistnavigator.cpp	Fri May 14 16:41:33 2010 +0300
@@ -46,7 +46,7 @@
 
 #include <QtCore/qdebug.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaPlaylistNullProvider : public QMediaPlaylistProvider
 {
@@ -539,5 +539,5 @@
 */
 
 #include "moc_qmediaplaylistnavigator.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmediaplaylistnavigator.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylistnavigator.h	Fri May 14 16:41:33 2010 +0300
@@ -46,7 +46,7 @@
 #include "qmediaplaylist.h"
 #include <QtCore/qobject.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaPlaylistNavigatorPrivate;
 class Q_MEDIA_EXPORT QMediaPlaylistNavigator : public QObject
@@ -102,6 +102,6 @@
     Q_PRIVATE_SLOT(d_func(), void _q_mediaChanged(int start, int end))
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QMEDIAPLAYLISTNAVIGATOR_H

--- a/qtmobility/src/multimedia/qmediaplaylistprovider.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylistprovider.cpp	Fri May 14 16:41:33 2010 +0300
@@ -44,7 +44,7 @@
 
 #include <QtCore/qurl.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaPlaylistProvider
@@ -301,5 +301,5 @@
 */
 
 #include "moc_qmediaplaylistprovider.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmediaplaylistprovider.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylistprovider.h	Fri May 14 16:41:33 2010 +0300
@@ -51,7 +51,7 @@
 class QString;
 QT_END_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaPlaylistProviderPrivate;
 class Q_MEDIA_EXPORT QMediaPlaylistProvider : public QObject
@@ -102,6 +102,6 @@
     Q_DECLARE_PRIVATE(QMediaPlaylistProvider)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QMEDIAPLAYLISTPROVIDER_H

--- a/qtmobility/src/multimedia/qmediaplaylistprovider_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylistprovider_p.h	Fri May 14 16:41:33 2010 +0300
@@ -55,7 +55,7 @@
 
 #include "qmediaplaylist.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaPlaylistProviderPrivate
 {
@@ -66,7 +66,7 @@
     {}
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 
 #endif // QMEDIAPLAYLISTSOURCE_P_H

--- a/qtmobility/src/multimedia/qmediapluginloader.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediapluginloader.cpp	Fri May 14 16:41:33 2010 +0300
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 
+#include <src/global/qbuildcfg.h>
 #include "qmediapluginloader_p.h"
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qpluginloader.h>
@@ -47,7 +48,7 @@
 
 #include "qmediaserviceproviderplugin.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 
 typedef QMap<QString,QObjectList> ObjectListMap;
@@ -98,6 +99,12 @@
         }
     } else {
         QStringList     paths = QCoreApplication::libraryPaths();
+        QString val = qt_mobility_configure_prefix_path_str;
+        if(val.length() > 0){
+            val += "/plugins";
+            paths << val;
+        }
+
 
 #ifdef QTM_PLUGIN_PATH
         paths << QTM_PLUGIN_PATH;
@@ -131,5 +138,5 @@
         }
     }
 }
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmediapluginloader_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediapluginloader_p.h	Fri May 14 16:41:33 2010 +0300
@@ -62,7 +62,7 @@
 class QObject;
 QT_END_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaServiceProviderPlugin;
 
@@ -87,6 +87,6 @@
     QMap<QString, QObject*> m_instances;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif  // QMEDIAPLUGINLOADER_H

--- a/qtmobility/src/multimedia/qmediarecorder.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediarecorder.cpp	Fri May 14 16:41:33 2010 +0300
@@ -56,7 +56,7 @@
 
 #include <QtMultimedia/qaudioformat.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaRecorder
@@ -80,7 +80,7 @@
 
     QAudioEncoderSettings audioSettings;
     audioSettings.setCodec("audio/vorbis");
-    audioSettings.setQuality(QtMedia::HighQuality);
+    audioSettings.setQuality(QtMediaServices::HighQuality);
 
     recorder->setEncodingSettings(audioSettings);
 
@@ -235,12 +235,12 @@
 /*!
     Returns the availability error code.
 */
-QtMedia::AvailabilityError QMediaRecorder::availabilityError() const
+QtMediaServices::AvailabilityError QMediaRecorder::availabilityError() const
 {
     if (d_func()->control != NULL)
-        return QtMedia::NoError;
+        return QtMediaServices::NoError;
     else
-        return QtMedia::ServiceMissingError;
+        return QtMediaServices::ServiceMissingError;
 }
 
 QUrl QMediaRecorder::outputLocation() const
@@ -563,5 +563,5 @@
 
 
 #include "moc_qmediarecorder.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmediarecorder.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediarecorder.h	Fri May 14 16:41:33 2010 +0300
@@ -54,7 +54,7 @@
 class QAudioFormat;
 QT_END_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaRecorderService;
 class QAudioEncoderSettings;
@@ -88,7 +88,7 @@
     ~QMediaRecorder();
 
     bool isAvailable() const;
-    QtMedia::AvailabilityError availabilityError() const;
+    QtMediaServices::AvailabilityError availabilityError() const;
 
     QUrl outputLocation() const;
     bool setOutputLocation(const QUrl &location);
@@ -144,9 +144,9 @@
     Q_PRIVATE_SLOT(d_func(), void _q_error(int, const QString &))
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QMediaRecorder::State))
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QMediaRecorder::Error))
+Q_DECLARE_METATYPE(QMediaRecorder::State)
+Q_DECLARE_METATYPE(QMediaRecorder::Error)
 
 #endif  // QMEDIARECORDER_H

--- a/qtmobility/src/multimedia/qmediarecordercontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediarecordercontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -41,7 +41,7 @@
 
 #include "qmediarecordercontrol.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 
 /*!
@@ -166,5 +166,5 @@
 */
 
 #include "moc_qmediarecordercontrol.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmediarecordercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediarecordercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,7 @@
 class QUrl;
 QT_END_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class Q_MEDIA_EXPORT QMediaRecorderControl : public QMediaControl
 {
@@ -84,6 +84,6 @@
 #define QMediaRecorderControl_iid "com.nokia.Qt.QMediaRecorderControl/1.0"
 Q_MEDIA_DECLARE_CONTROL(QMediaRecorderControl, QMediaRecorderControl_iid)
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/src/multimedia/qmediaresource.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaresource.cpp	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 #include <QtCore/qurl.h>
 #include <QtCore/qvariant.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaResource
@@ -393,5 +393,5 @@
     else
         values.remove(Resolution);
 }
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmediaresource.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaresource.h	Fri May 14 16:41:33 2010 +0300
@@ -48,7 +48,7 @@
 
 #include <qmobilityglobal.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class Q_MEDIA_EXPORT QMediaResource
 {
@@ -119,10 +119,10 @@
 
 typedef QList<QMediaResource> QMediaResourceList;
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QMediaResource))
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QMediaResourceList))
+Q_DECLARE_METATYPE(QMediaResource)
+Q_DECLARE_METATYPE(QMediaResourceList)
 
 
 #endif

--- a/qtmobility/src/multimedia/qmediaservice.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaservice.cpp	Fri May 14 16:41:33 2010 +0300
@@ -46,7 +46,7 @@
 
 
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 
 /*!
@@ -131,5 +131,5 @@
 
 #include "moc_qmediaservice.cpp"
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmediaservice.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaservice.h	Fri May 14 16:41:33 2010 +0300
@@ -48,7 +48,7 @@
 
 #include "qmediacontrol.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaServicePrivate;
 class Q_MEDIA_EXPORT QMediaService : public QObject
@@ -79,7 +79,7 @@
     Q_DECLARE_PRIVATE(QMediaService)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif  // QABSTRACTMEDIASERVICE_H

--- a/qtmobility/src/multimedia/qmediaservice_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaservice_p.h	Fri May 14 16:41:33 2010 +0300
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QAudioDeviceControl;
 
@@ -66,7 +66,7 @@
     QMediaService *q_ptr;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 
 #endif

--- a/qtmobility/src/multimedia/qmediaserviceprovider.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaserviceprovider.cpp	Fri May 14 16:41:33 2010 +0300
@@ -48,7 +48,7 @@
 #include "qmediapluginloader_p.h"
 #include "qmediaplayer.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaServiceProviderHintPrivate : public QSharedData
 {
@@ -336,9 +336,9 @@
                 }
                 break;
             case QMediaServiceProviderHint::ContentType: {
-                    QtMedia::SupportEstimate estimate = QtMedia::NotSupported;
+                    QtMediaServices::SupportEstimate estimate = QtMediaServices::NotSupported;
                     foreach (QMediaServiceProviderPlugin *currentPlugin, plugins) {
-                        QtMedia::SupportEstimate currentEstimate = QtMedia::MaybeSupported;
+                        QtMediaServices::SupportEstimate currentEstimate = QtMediaServices::MaybeSupported;
                         QMediaServiceSupportedFormatsInterface *iface =
                                 qobject_cast<QMediaServiceSupportedFormatsInterface*>(currentPlugin);
 
@@ -349,7 +349,7 @@
                             estimate = currentEstimate;
                             plugin = currentPlugin;
 
-                            if (currentEstimate == QtMedia::PreferredService)
+                            if (currentEstimate == QtMediaServices::PreferredService)
                                 break;
                         }
                     }
@@ -380,7 +380,7 @@
         }
     }
 
-    QtMedia::SupportEstimate hasSupport(const QByteArray &serviceType,
+    QtMediaServices::SupportEstimate hasSupport(const QByteArray &serviceType,
                                      const QString &mimeType,
                                      const QStringList& codecs,
                                      int flags) const
@@ -388,10 +388,10 @@
         QList<QObject*> instances = loader()->instances(serviceType);
 
         if (instances.isEmpty())
-            return QtMedia::NotSupported;
+            return QtMediaServices::NotSupported;
 
         bool allServicesProvideInterface = true;
-        QtMedia::SupportEstimate supportEstimate = QtMedia::NotSupported;
+        QtMediaServices::SupportEstimate supportEstimate = QtMediaServices::NotSupported;
 
         foreach(QObject *obj, instances) {
             QMediaServiceSupportedFormatsInterface *iface =
@@ -425,12 +425,12 @@
         }
 
         //don't return PreferredService
-        supportEstimate = qMin(supportEstimate, QtMedia::ProbablySupported);
+        supportEstimate = qMin(supportEstimate, QtMediaServices::ProbablySupported);
 
         //Return NotSupported only if no services are available of serviceType
         //or all the services returned NotSupported, otherwise return at least MaybeSupported
         if (!allServicesProvideInterface)
-            supportEstimate = qMax(QtMedia::MaybeSupported, supportEstimate);
+            supportEstimate = qMax(QtMediaServices::MaybeSupported, supportEstimate);
 
         return supportEstimate;
     }
@@ -534,13 +534,13 @@
 */
 
 /*!
-    \fn QtMedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const
+    \fn QtMediaServices::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType, const QString &mimeType, const QStringList& codecs, int flags) const
 
     Returns how confident a media service provider is that is can provide a \a serviceType
     service that is able to play media of a specific \a mimeType that is encoded using the listed
     \a codecs while adhearing to constraints identified in \a flags.
 */
-QtMedia::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType,
+QtMediaServices::SupportEstimate QMediaServiceProvider::hasSupport(const QByteArray &serviceType,
                                                         const QString &mimeType,
                                                         const QStringList& codecs,
                                                         int flags) const
@@ -550,7 +550,7 @@
     Q_UNUSED(codecs);
     Q_UNUSED(flags);
 
-    return QtMedia::MaybeSupported;
+    return QtMediaServices::MaybeSupported;
 }
 
 /*!
@@ -724,5 +724,5 @@
 
 #include "moc_qmediaserviceprovider.cpp"
 #include "moc_qmediaserviceproviderplugin.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmediaserviceprovider.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaserviceprovider.h	Fri May 14 16:41:33 2010 +0300
@@ -47,7 +47,7 @@
 #include <qmobilityglobal.h>
 #include "qtmedianamespace.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaService;
 
@@ -101,7 +101,7 @@
     virtual QMediaService* requestService(const QByteArray &type, const QMediaServiceProviderHint &hint = QMediaServiceProviderHint()) = 0;
     virtual void releaseService(QMediaService *service) = 0;
 
-    virtual QtMedia::SupportEstimate hasSupport(const QByteArray &serviceType,
+    virtual QtMediaServices::SupportEstimate hasSupport(const QByteArray &serviceType,
                                              const QString &mimeType,
                                              const QStringList& codecs,
                                              int flags = 0) const;
@@ -162,6 +162,6 @@
 #define Q_MEDIASERVICE_RADIO "com.nokia.qt.radio"
 
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif  // QMEDIASERVICEPROVIDER_H

--- a/qtmobility/src/multimedia/qmediaserviceproviderplugin.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaserviceproviderplugin.h	Fri May 14 16:41:33 2010 +0300
@@ -52,7 +52,7 @@
 # pragma Q_MOC_EXPAND_MACROS
 #endif
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaService;
 
@@ -63,32 +63,22 @@
     virtual void release(QMediaService *service) = 0;
 };
 
-QTM_END_NAMESPACE
-
 #define QMediaServiceProviderFactoryInterface_iid \
     "com.nokia.Qt.QMediaServiceProviderFactoryInterface/1.0"
-QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(QtMobility::QMediaServiceProviderFactoryInterface, QMediaServiceProviderFactoryInterface_iid)
-QT_END_NAMESPACE
+Q_DECLARE_INTERFACE(QMediaServiceProviderFactoryInterface, QMediaServiceProviderFactoryInterface_iid)
 
-QTM_BEGIN_NAMESPACE
 
 struct Q_MEDIA_EXPORT QMediaServiceSupportedFormatsInterface
 {
     virtual ~QMediaServiceSupportedFormatsInterface() {}
-    virtual QtMedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const = 0;
+    virtual QtMediaServices::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const = 0;
     virtual QStringList supportedMimeTypes() const = 0;
 };
 
-QTM_END_NAMESPACE
-
 #define QMediaServiceSupportedFormatsInterface_iid \
     "com.nokia.Qt.QMediaServiceSupportedFormatsInterface/1.0"
-QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(QtMobility::QMediaServiceSupportedFormatsInterface, QMediaServiceSupportedFormatsInterface_iid)
-QT_END_NAMESPACE
+Q_DECLARE_INTERFACE(QMediaServiceSupportedFormatsInterface, QMediaServiceSupportedFormatsInterface_iid)
 
-QTM_BEGIN_NAMESPACE
 
 struct Q_MEDIA_EXPORT QMediaServiceSupportedDevicesInterface
 {
@@ -97,15 +87,11 @@
     virtual QString deviceDescription(const QByteArray &service, const QByteArray &device) = 0;
 };
 
-QTM_END_NAMESPACE
-
 #define QMediaServiceSupportedDevicesInterface_iid \
     "com.nokia.Qt.QMediaServiceSupportedDevicesInterface/1.0"
-QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(QtMobility::QMediaServiceSupportedDevicesInterface, QMediaServiceSupportedDevicesInterface_iid)
-QT_END_NAMESPACE
+Q_DECLARE_INTERFACE(QMediaServiceSupportedDevicesInterface, QMediaServiceSupportedDevicesInterface_iid)
 
-QTM_BEGIN_NAMESPACE
+
 
 struct Q_MEDIA_EXPORT QMediaServiceFeaturesInterface
 {
@@ -113,21 +99,15 @@
     virtual QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const = 0;
 };
 
-QTM_END_NAMESPACE
-
-//MOC doesn't recognire paramitized macros
 #define QMediaServiceFeaturesInterface_iid \
     "com.nokia.Qt.QMediaServiceFeaturesInterface/1.0"
-QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(QtMobility::QMediaServiceFeaturesInterface, QMediaServiceFeaturesInterface_iid)
-QT_END_NAMESPACE
+Q_DECLARE_INTERFACE(QMediaServiceFeaturesInterface, QMediaServiceFeaturesInterface_iid)
 
-QTM_BEGIN_NAMESPACE
 
 class Q_MEDIA_EXPORT QMediaServiceProviderPlugin : public QObject, public QMediaServiceProviderFactoryInterface
 {
     Q_OBJECT
-    Q_INTERFACES(QtMobility::QMediaServiceProviderFactoryInterface:QFactoryInterface)
+    Q_INTERFACES(QMediaServiceProviderFactoryInterface:QFactoryInterface)
 
 public:
     virtual QStringList keys() const = 0;
@@ -135,7 +115,7 @@
     virtual void release(QMediaService *service) = 0;
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 
 #endif  // QMEDIASERVICEPROVIDERPLUGIN_H

--- a/qtmobility/src/multimedia/qmediastreamscontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediastreamscontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -42,7 +42,7 @@
 #include "qmediastreamscontrol.h"
 #include "qmediacontrol_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaStreamsControl
@@ -111,11 +111,11 @@
 */
 
 /*!
-    \fn QMediaStreamsControl::metaData(int stream, QtMedia::MetaData key)
+    \fn QMediaStreamsControl::metaData(int stream, QtMediaServices::MetaData key)
 
     Returns the meta-data value of \a key for a given \a stream.
 
-    Useful metadata keya are QtMedia::Title, QtMedia::Description and QtMedia::Language.
+    Useful metadata keya are QtMediaServices::Title, QtMediaServices::Description and QtMediaServices::Language.
 */
 
 /*!
@@ -147,5 +147,5 @@
 */
 
 #include "moc_qmediastreamscontrol.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmediastreamscontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediastreamscontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -45,8 +45,9 @@
 
 #include "qmediacontrol.h"
 #include "qtmedianamespace.h"
+#include "qmobilityglobal.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class Q_MEDIA_EXPORT QMediaStreamsControl : public QMediaControl
 {
@@ -60,7 +61,7 @@
     virtual int streamCount() = 0;
     virtual StreamType streamType(int streamNumber) = 0;
 
-    virtual QVariant metaData(int streamNumber, QtMedia::MetaData key) = 0;
+    virtual QVariant metaData(int streamNumber, QtMediaServices::MetaData key) = 0;
 
     virtual bool isActive(int streamNumber) = 0;
     virtual void setActive(int streamNumber, bool state) = 0;
@@ -76,7 +77,7 @@
 #define QMediaStreamsControl_iid "com.nokia.Qt.QMediaStreamsControl/1.0"
 Q_MEDIA_DECLARE_CONTROL(QMediaStreamsControl, QMediaStreamsControl_iid)
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QMEDIASTREAMSCONTROL_H

--- a/qtmobility/src/multimedia/qmediatimerange.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediatimerange.cpp	Fri May 14 16:41:33 2010 +0300
@@ -41,7 +41,7 @@
 
 #include "qmediatimerange.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QMediaTimeInterval
@@ -701,5 +701,5 @@
     return (QMediaTimeRange(r1) -= r2);
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmediatimerange.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmediatimerange.h	Fri May 14 16:41:33 2010 +0300
@@ -46,7 +46,7 @@
 #include "qtmedianamespace.h"
 #include <QtCore/qshareddata.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaTimeRangePrivate;
 
@@ -124,6 +124,6 @@
 Q_MEDIA_EXPORT QMediaTimeRange operator-(const QMediaTimeRange&, const QMediaTimeRange&);
 
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif  // QMEDIATIMERANGE_H

--- a/qtmobility/src/multimedia/qmetadatacontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmetadatacontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -42,7 +42,7 @@
 #include "qmediacontrol_p.h"
 #include "qmetadatacontrol.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 
 /*!
@@ -57,7 +57,7 @@
     its current media it will implement QMetaDataControl.  This control
     provides functions for both retrieving and setting meta-data values.
     Meta-data may be addressed by the well defined keys in the
-    QtMedia::MetaData enumeration using the metaData() functions, or by
+    QtMediaServices::MetaData enumeration using the metaData() functions, or by
     string keys using the extendedMetaData() functions.
 
     The functionality provided by this control is exposed to application
@@ -116,13 +116,13 @@
 */
 
 /*!
-    \fn QVariant QMetaDataControl::metaData(QtMedia::MetaData key) const
+    \fn QVariant QMetaDataControl::metaData(QtMediaServices::MetaData key) const
 
     Returns the meta-data for the given \a key.
 */
 
 /*!
-    \fn void QMetaDataControl::setMetaData(QtMedia::MetaData key, const QVariant &value)
+    \fn void QMetaDataControl::setMetaData(QtMediaServices::MetaData key, const QVariant &value)
 
     Sets the \a value of the meta-data element with the given \a key.
 */
@@ -179,5 +179,5 @@
 */
 
 #include "moc_qmetadatacontrol.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qmetadatacontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qmetadatacontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -47,7 +47,7 @@
 
 #include "qmediaresource.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 
 class Q_MEDIA_EXPORT QMetaDataControl : public QMediaControl
@@ -60,9 +60,9 @@
     virtual bool isWritable() const = 0;
     virtual bool isMetaDataAvailable() const = 0;
 
-    virtual QVariant metaData(QtMedia::MetaData key) const = 0;
-    virtual void setMetaData(QtMedia::MetaData key, const QVariant &value) = 0;
-    virtual QList<QtMedia::MetaData> availableMetaData() const = 0;
+    virtual QVariant metaData(QtMediaServices::MetaData key) const = 0;
+    virtual void setMetaData(QtMediaServices::MetaData key, const QVariant &value) = 0;
+    virtual QList<QtMediaServices::MetaData> availableMetaData() const = 0;
 
     virtual QVariant extendedMetaData(const QString &key) const = 0;
     virtual void setExtendedMetaData(const QString &key, const QVariant &value) = 0;
@@ -82,6 +82,6 @@
 #define QMetaDataControl_iid "com.nokia.Qt.QMetaDataControl/1.0"
 Q_MEDIA_DECLARE_CONTROL(QMetaDataControl, QMetaDataControl_iid)
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif  // QMETADATAPROVIDER_H

--- a/qtmobility/src/multimedia/qpaintervideosurface.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qpaintervideosurface.cpp	Fri May 14 16:41:33 2010 +0300
@@ -52,7 +52,7 @@
 #endif
 
 #include <QtDebug>
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QVideoSurfacePainter
 {
@@ -1575,6 +1575,6 @@
 }
 
 #include "moc_qpaintervideosurface_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qpaintervideosurface_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qpaintervideosurface_p.h	Fri May 14 16:41:33 2010 +0300
@@ -67,7 +67,7 @@
 
 QT_USE_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QVideoSurfacePainter;
 class Q_AUTOTEST_EXPORT QPainterVideoSurface : public QAbstractVideoSurface
@@ -152,6 +152,6 @@
 Q_DECLARE_OPERATORS_FOR_FLAGS(QPainterVideoSurface::ShaderTypes)
 #endif
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/src/multimedia/qradiotuner.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qradiotuner.cpp	Fri May 14 16:41:33 2010 +0300
@@ -47,7 +47,7 @@
 #include <QPair>
 
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QRadioTuner
@@ -141,12 +141,12 @@
 /*!
     Returns the availability error state.
 */
-QtMedia::AvailabilityError QRadioTuner::availabilityError() const
+QtMediaServices::AvailabilityError QRadioTuner::availabilityError() const
 {
     if (d_func()->control != NULL)
         return d_func()->control->availabilityError();
     else
-        return QtMedia::ServiceMissingError;
+        return QtMediaServices::ServiceMissingError;
 }
 
 /*!
@@ -580,5 +580,5 @@
  */
 
 #include "moc_qradiotuner.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qradiotuner.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qradiotuner.h	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,7 @@
 
 #include <QPair>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QRadioTunerPrivate;
 class Q_MEDIA_EXPORT QRadioTuner : public QMediaObject
@@ -79,7 +79,7 @@
     ~QRadioTuner();
 
     bool isAvailable() const;
-    QtMedia::AvailabilityError availabilityError() const;
+    QtMediaServices::AvailabilityError availabilityError() const;
 
     State state() const;
 
@@ -135,11 +135,11 @@
     Q_DECLARE_PRIVATE(QRadioTuner)
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QRadioTuner)::State);
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QRadioTuner)::Band);
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QRadioTuner)::Error);
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QRadioTuner)::StereoMode);
+Q_DECLARE_METATYPE(QRadioTuner::State);
+Q_DECLARE_METATYPE(QRadioTuner::Band);
+Q_DECLARE_METATYPE(QRadioTuner::Error);
+Q_DECLARE_METATYPE(QRadioTuner::StereoMode);
 
 #endif  // QRADIOPLAYER_H

--- a/qtmobility/src/multimedia/qradiotunercontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qradiotunercontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -43,7 +43,7 @@
 #include "qradiotunercontrol.h"
 #include "qmediacontrol_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 
 /*!
@@ -103,7 +103,7 @@
 */
 
 /*!
-    \fn QtMedia::AvailabilityError QRadioTunerControl::availabilityError() const
+    \fn QtMediaServices::AvailabilityError QRadioTunerControl::availabilityError() const
 
     Returns the error state of the radio service.
 */
@@ -323,5 +323,5 @@
 */
 
 #include "moc_qradiotunercontrol.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qradiotunercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qradiotunercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 #include "qmediacontrol.h"
 #include "qradiotuner.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class Q_MEDIA_EXPORT QRadioTunerControl : public QMediaControl
 {
@@ -55,7 +55,7 @@
     ~QRadioTunerControl();
 
     virtual bool isAvailable() const = 0;
-    virtual QtMedia::AvailabilityError availabilityError() const = 0;
+    virtual QtMediaServices::AvailabilityError availabilityError() const = 0;
 
     virtual QRadioTuner::State state() const = 0;
 
@@ -110,6 +110,6 @@
 #define QRadioTunerControl_iid "com.nokia.Qt.QRadioTunerControl/1.0"
 Q_MEDIA_DECLARE_CONTROL(QRadioTunerControl, QRadioTunerControl_iid)
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif  // QRADIOTUNERCONTROL_H

--- a/qtmobility/src/multimedia/qtmedianamespace.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qtmedianamespace.h	Fri May 14 16:41:33 2010 +0300
@@ -47,9 +47,9 @@
 
 #include <qmobilityglobal.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
-namespace QtMedia
+namespace QtMediaServices
 {
     enum MetaData
     {
@@ -142,7 +142,12 @@
         Contrast,
         Saturation,
         Sharpness,
-        DeviceSettingDescription
+        DeviceSettingDescription,
+
+        PosterImage,
+        CoverArtImage,
+        ThumbnailImage
+
     };
 
     enum SupportEstimate
@@ -180,6 +185,6 @@
 
 }
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/src/multimedia/qtmedianamespace.qdoc	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qtmedianamespace.qdoc	Fri May 14 16:41:33 2010 +0300
@@ -40,15 +40,15 @@
 ****************************************************************************/
 
 /*!
-    \namespace QtMedia
+    \namespace QtMediaServices
     \ingroup multimedia
 
-    \brief The QtMedia namespace contains miscellaneous identifiers used throughout the Qt Media
-    library.
+    \brief The QtMediaServices namespace contains miscellaneous identifiers used throughout the Qt Media
+    services library.
 */
 
 /*!
-    \enum QtMedia::MetaData
+    \enum QtMediaServices::MetaData
 
     This enum provides identifiers for meta-data attributes.
 
@@ -98,6 +98,7 @@
 
     \value CoverArtUrlSmall The URL of a small cover art image. QUrl.
     \value CoverArtUrlLarge The URL of a large cover art image. QUrl.
+    \value CoverArtImage An embedded cover art image. QImage.
 
     Image and video attributes
     \value Resolution The dimensions of an image or video.  QSize.
@@ -109,6 +110,7 @@
     \value VideoCodec The codec of the media's video stream.  QString.
 
     \value PosterUrl The URL of a poster image.  QUrl.
+    \value PosterImage An embedded poster image.  QImage.
 
     Movie attributes
     \value ChapterNumber The chapter number of the media.  int.
@@ -162,10 +164,12 @@
         Indicates the direction of sharpness processing applied by the camera when the image was shot.
     \value DeviceSettingDescription
         Exif tag, indicates information on the picture-taking conditions of a particular camera model. QString
+
+    \value ThumbnailImage An embedded thumbnail image.  QImage.
 */
 
 /*!
-    \enum QtMedia::SupportEstimate
+    \enum QtMediaServices::SupportEstimate
 
     Enumerates the levels of support a media service provider may have for a feature.
 
@@ -176,7 +180,7 @@
 */
 
 /*!
-    \enum QtMedia::EncodingQuality
+    \enum QtMediaServices::EncodingQuality
 
     Enumerates quality encoding levels.
 
@@ -188,7 +192,7 @@
 */
 
 /*!
-    \enum QtMedia::EncodingMode
+    \enum QtMediaServices::EncodingMode
 
     Enumerates encoding modes.
 
@@ -199,7 +203,7 @@
 */
 
 /*!
-    \enum QtMedia::AvailabilityError
+    \enum QtMediaServices::AvailabilityError
 
     Enumerates Service status errors.

--- a/qtmobility/src/multimedia/qvideodevicecontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qvideodevicecontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -41,7 +41,7 @@
 
 #include "qvideodevicecontrol.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QVideoDeviceControl
@@ -143,5 +143,5 @@
 */
 
 #include "moc_qvideodevicecontrol.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qvideodevicecontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qvideodevicecontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -44,7 +44,7 @@
 
 #include "qmediacontrol.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class Q_MEDIA_EXPORT QVideoDeviceControl : public QMediaControl
 {
@@ -78,6 +78,6 @@
 Q_MEDIA_DECLARE_CONTROL(QVideoDeviceControl, QVideoDeviceControl_iid)
 
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QVIDEODEVICECONTROL_H

--- a/qtmobility/src/multimedia/qvideoencodercontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qvideoencodercontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -43,7 +43,7 @@
 #include <QtCore/qstringlist.h>
 #include <QtCore/qvariant.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QVideoEncoderControl
@@ -172,5 +172,5 @@
 */
 
 #include "moc_qvideoencodercontrol.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qvideoencodercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qvideoencodercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -53,7 +53,7 @@
 class QStringList;
 QT_END_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class Q_MEDIA_EXPORT QVideoEncoderControl : public QMediaControl
 {
@@ -85,6 +85,6 @@
 #define QVideoEncoderControl_iid "com.nokia.Qt.QVideoEncoderControl/1.0"
 Q_MEDIA_DECLARE_CONTROL(QVideoEncoderControl, QVideoEncoderControl_iid)
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/src/multimedia/qvideooutputcontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qvideooutputcontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -41,7 +41,7 @@
 
 #include "qvideooutputcontrol.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QVideoOutputControl
@@ -129,5 +129,5 @@
 */
 
 #include "moc_qvideooutputcontrol.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qvideooutputcontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qvideooutputcontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -44,7 +44,7 @@
 
 #include "qmediacontrol.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class Q_MEDIA_EXPORT QVideoOutputControl : public QMediaControl
 {
@@ -78,6 +78,6 @@
 #define QVideoOutputControl_iid "com.nokia.Qt.QVideoOutputControl/1.0"
 Q_MEDIA_DECLARE_CONTROL(QVideoOutputControl, QVideoOutputControl_iid)
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/src/multimedia/qvideorenderercontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qvideorenderercontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -43,7 +43,7 @@
 
 #include "qmediacontrol_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QVideoRendererControl
@@ -118,5 +118,5 @@
 */
 
 #include "moc_qvideorenderercontrol.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qvideorenderercontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qvideorenderercontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -48,7 +48,7 @@
 class QAbstractVideoSurface;
 QT_END_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 
 class Q_MEDIA_EXPORT QVideoRendererControl : public QMediaControl
@@ -68,6 +68,6 @@
 #define QVideoRendererControl_iid "com.nokia.Qt.QVideoRendererControl/1.0"
 Q_MEDIA_DECLARE_CONTROL(QVideoRendererControl, QVideoRendererControl_iid)
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif // QVIDEORENDERERCONTROL_H

--- a/qtmobility/src/multimedia/qvideowidget.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qvideowidget.cpp	Fri May 14 16:41:33 2010 +0300
@@ -60,7 +60,7 @@
 
 using namespace Qt;
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 QVideoWidgetControlBackend::QVideoWidgetControlBackend(
         QVideoWidgetControl *control, QWidget *widget)
@@ -940,5 +940,5 @@
 
 #include "moc_qvideowidget.cpp"
 #include "moc_qvideowidget_p.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qvideowidget.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qvideowidget.h	Fri May 14 16:41:33 2010 +0300
@@ -46,7 +46,7 @@
 
 #include <qmobilityglobal.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QMediaObject;
 
@@ -120,6 +120,6 @@
     Q_PRIVATE_SLOT(d_func(), void _q_dimensionsChanged());
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/src/multimedia/qvideowidget_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qvideowidget_p.h	Fri May 14 16:41:33 2010 +0300
@@ -62,7 +62,7 @@
 
 #include "qpaintervideosurface_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QVideoWidgetControlInterface
 {
@@ -261,6 +261,6 @@
     void _q_dimensionsChanged();
 };
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/src/multimedia/qvideowidgetcontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qvideowidgetcontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -42,7 +42,7 @@
 #include "qvideowidgetcontrol.h"
 #include "qmediacontrol_p.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QVideoWidgetControl
@@ -229,5 +229,5 @@
 */
 
 #include "moc_qvideowidgetcontrol.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qvideowidgetcontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qvideowidgetcontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -47,7 +47,7 @@
 
 #include <QtGui/qwidget.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QVideoWidgetControlPrivate;
 
@@ -92,6 +92,6 @@
 #define QVideoWidgetControl_iid "com.nokia.Qt.QVideoWidgetControl/1.0"
 Q_MEDIA_DECLARE_CONTROL(QVideoWidgetControl, QVideoWidgetControl_iid)
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/src/multimedia/qvideowindowcontrol.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qvideowindowcontrol.cpp	Fri May 14 16:41:33 2010 +0300
@@ -41,7 +41,7 @@
 
 #include "qvideowindowcontrol.h"
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QVideoWindowControl
@@ -268,5 +268,5 @@
 */
 
 #include "moc_qvideowindowcontrol.cpp"
-QTM_END_NAMESPACE
+QT_END_NAMESPACE

--- a/qtmobility/src/multimedia/qvideowindowcontrol.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/multimedia/qvideowindowcontrol.h	Fri May 14 16:41:33 2010 +0300
@@ -47,7 +47,7 @@
 
 #include <QtGui/qwidget.h>
 
-QTM_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class Q_MEDIA_EXPORT QVideoWindowControl : public QMediaControl
 {
@@ -99,6 +99,6 @@
 #define QVideoWindowControl_iid "com.nokia.Qt.QVideoWindowControl/1.0"
 Q_MEDIA_DECLARE_CONTROL(QVideoWindowControl, QVideoWindowControl_iid)
 
-QTM_END_NAMESPACE
+QT_END_NAMESPACE
 
 #endif

--- a/qtmobility/src/publishsubscribe/pathmapper_proxy_symbian.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/publishsubscribe/pathmapper_proxy_symbian.cpp	Fri May 14 16:41:33 2010 +0300
@@ -193,7 +193,7 @@
     if (findServer.Next(name) != KErrNone) {
         TRequestStatus status;
         RProcess server;
-        ret = server.Create(KPSPathMapperServerName, KNullDesC);
+        ret = server.Create(KPSPathMapperServerProcess, KNullDesC);
         if(ret != KErrNone) {
             return ret;
         }

--- a/qtmobility/src/publishsubscribe/psmapperserver_symbian/clientservercommon.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/publishsubscribe/psmapperserver_symbian/clientservercommon.h	Fri May 14 16:41:33 2010 +0300
@@ -43,7 +43,8 @@
 
 #include <e32base.h>
 
-_LIT(KPSPathMapperServerName, "PSPathMapperServer");
+_LIT(KPSPathMapperServerName, "!qpspathmapperserver");
+_LIT(KPSPathMapperServerProcess, "qpspathmapperserver");
 
 const TUint KServerMajorVersionNumber = 0;
 const TUint KServerMinorVersionNumber = 1;

--- a/qtmobility/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.pan	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.pan	Fri May 14 16:41:33 2010 +0300
@@ -42,7 +42,7 @@
 #define PSPATHMAPPERSERVER_PAN_
 
 // Panic category
-_LIT(KPSPathMapperServer, "PSPathMapperServer");
+_LIT(KPSPathMapperServer, "!qpspathmapperserver");
 _LIT(KUnknownOpCode, "Unknown op code");
 _LIT(KBadDescriptor, "Bad descriptor");

--- a/qtmobility/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.pro	Fri May 14 16:41:33 2010 +0300
@@ -1,5 +1,5 @@
 TEMPLATE = app
-TARGET = PSPathMapperServer
+TARGET = qpspathmapperserver
 QT = core
 TARGET.UID3 = 0x2002AC88
 
@@ -28,5 +28,7 @@
     pspathmappersession.cpp \
     
 LIBS += -lefsrv
-            
-TARGET.CAPABILITY = ALL -TCB
+
+#The ProtServ capability is needed for the server to reside in 
+#protected namespace (server name starting with exclamation mark).
+TARGET.CAPABILITY = ProtServ

--- a/qtmobility/src/publishsubscribe/publishsubscribe.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/publishsubscribe/publishsubscribe.pro	Fri May 14 16:41:33 2010 +0300
@@ -47,7 +47,7 @@
     TARGET.CAPABILITY = ALL -TCB
     TARGET.UID3 = 0x2002AC78
 
-    QtPublishSubscribeDeployment.sources = QtPublishSubscribe.dll PSPathMapperServer.exe
+    QtPublishSubscribeDeployment.sources = QtPublishSubscribe.dll qpspathmapperserver.exe
     QtPublishSubscribeDeployment.path = /sys/bin
     DEPLOYMENT += QtPublishSubscribeDeployment
 }

--- a/qtmobility/src/s60installs/bwins/QtContactsu.def	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/s60installs/bwins/QtContactsu.def	Fri May 14 16:41:33 2010 +0300
@@ -1,1102 +1,997 @@
 EXPORTS
-	??0QContact@QtMobility@@QAE@ABV01@@Z @ 1 NONAME ; QtMobility::QContact::QContact(class QtMobility::QContact const &)
-	??0QContact@QtMobility@@QAE@XZ @ 2 NONAME ; QtMobility::QContact::QContact(void)
-	??0QContactAbstractRequest@QtMobility@@IAE@PAVQContactAbstractRequestPrivate@1@@Z @ 3 NONAME ; QtMobility::QContactAbstractRequest::QContactAbstractRequest(class QtMobility::QContactAbstractRequestPrivate *)
-	??0QContactAbstractRequest@QtMobility@@QAE@XZ @ 4 NONAME ; QtMobility::QContactAbstractRequest::QContactAbstractRequest(void)
-	??0QContactActionDescriptor@QtMobility@@QAE@ABV01@@Z @ 5 NONAME ; QtMobility::QContactActionDescriptor::QContactActionDescriptor(class QtMobility::QContactActionDescriptor const &)
-	??0QContactActionDescriptor@QtMobility@@QAE@ABVQString@@0H@Z @ 6 NONAME ; QtMobility::QContactActionDescriptor::QContactActionDescriptor(class QString const &, class QString const &, int)
-	??0QContactActionFilter@QtMobility@@QAE@ABVQContactFilter@1@@Z @ 7 NONAME ; QtMobility::QContactActionFilter::QContactActionFilter(class QtMobility::QContactFilter const &)
-	??0QContactActionFilter@QtMobility@@QAE@XZ @ 8 NONAME ; QtMobility::QContactActionFilter::QContactActionFilter(void)
-	??0QContactAddress@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 9 NONAME ; QtMobility::QContactAddress::QContactAddress(class QtMobility::QContactDetail const &)
-	??0QContactAddress@QtMobility@@QAE@XZ @ 10 NONAME ; QtMobility::QContactAddress::QContactAddress(void)
-	??0QContactAnniversary@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 11 NONAME ; QtMobility::QContactAnniversary::QContactAnniversary(class QtMobility::QContactDetail const &)
-	??0QContactAnniversary@QtMobility@@QAE@XZ @ 12 NONAME ; QtMobility::QContactAnniversary::QContactAnniversary(void)
-	??0QContactAvatar@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 13 NONAME ; QtMobility::QContactAvatar::QContactAvatar(class QtMobility::QContactDetail const &)
-	??0QContactAvatar@QtMobility@@QAE@XZ @ 14 NONAME ; QtMobility::QContactAvatar::QContactAvatar(void)
-	??0QContactBirthday@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 15 NONAME ; QtMobility::QContactBirthday::QContactBirthday(class QtMobility::QContactDetail const &)
-	??0QContactBirthday@QtMobility@@QAE@XZ @ 16 NONAME ; QtMobility::QContactBirthday::QContactBirthday(void)
-	??0QContactChangeLogFilter@QtMobility@@QAE@ABVQContactFilter@1@@Z @ 17 NONAME ; QtMobility::QContactChangeLogFilter::QContactChangeLogFilter(class QtMobility::QContactFilter const &)
-	??0QContactChangeLogFilter@QtMobility@@QAE@W4EventType@01@@Z @ 18 NONAME ; QtMobility::QContactChangeLogFilter::QContactChangeLogFilter(enum QtMobility::QContactChangeLogFilter::EventType)
-	??0QContactChangeSet@QtMobility@@QAE@ABV01@@Z @ 19 NONAME ; QtMobility::QContactChangeSet::QContactChangeSet(class QtMobility::QContactChangeSet const &)
-	??0QContactChangeSet@QtMobility@@QAE@XZ @ 20 NONAME ; QtMobility::QContactChangeSet::QContactChangeSet(void)
-	??0QContactDetail@QtMobility@@IAE@ABV01@ABVQString@@@Z @ 21 NONAME ; QtMobility::QContactDetail::QContactDetail(class QtMobility::QContactDetail const &, class QString const &)
-	??0QContactDetail@QtMobility@@QAE@ABV01@@Z @ 22 NONAME ; QtMobility::QContactDetail::QContactDetail(class QtMobility::QContactDetail const &)
-	??0QContactDetail@QtMobility@@QAE@ABVQString@@@Z @ 23 NONAME ; QtMobility::QContactDetail::QContactDetail(class QString const &)
-	??0QContactDetail@QtMobility@@QAE@XZ @ 24 NONAME ; QtMobility::QContactDetail::QContactDetail(void)
-	??0QContactDetailDefinition@QtMobility@@QAE@ABV01@@Z @ 25 NONAME ; QtMobility::QContactDetailDefinition::QContactDetailDefinition(class QtMobility::QContactDetailDefinition const &)
-	??0QContactDetailDefinition@QtMobility@@QAE@XZ @ 26 NONAME ; QtMobility::QContactDetailDefinition::QContactDetailDefinition(void)
-	??0QContactDetailDefinitionFetchRequest@QtMobility@@QAE@XZ @ 27 NONAME ; QtMobility::QContactDetailDefinitionFetchRequest::QContactDetailDefinitionFetchRequest(void)
-	??0QContactDetailDefinitionRemoveRequest@QtMobility@@QAE@XZ @ 28 NONAME ; QtMobility::QContactDetailDefinitionRemoveRequest::QContactDetailDefinitionRemoveRequest(void)
-	??0QContactDetailDefinitionSaveRequest@QtMobility@@QAE@XZ @ 29 NONAME ; QtMobility::QContactDetailDefinitionSaveRequest::QContactDetailDefinitionSaveRequest(void)
-	??0QContactDetailFieldDefinition@QtMobility@@QAE@ABV01@@Z @ 30 NONAME ; QtMobility::QContactDetailFieldDefinition::QContactDetailFieldDefinition(class QtMobility::QContactDetailFieldDefinition const &)
-	??0QContactDetailFieldDefinition@QtMobility@@QAE@XZ @ 31 NONAME ; QtMobility::QContactDetailFieldDefinition::QContactDetailFieldDefinition(void)
-	??0QContactDetailFilter@QtMobility@@QAE@ABVQContactFilter@1@@Z @ 32 NONAME ; QtMobility::QContactDetailFilter::QContactDetailFilter(class QtMobility::QContactFilter const &)
-	??0QContactDetailFilter@QtMobility@@QAE@XZ @ 33 NONAME ; QtMobility::QContactDetailFilter::QContactDetailFilter(void)
-	??0QContactDetailRangeFilter@QtMobility@@QAE@ABVQContactFilter@1@@Z @ 34 NONAME ; QtMobility::QContactDetailRangeFilter::QContactDetailRangeFilter(class QtMobility::QContactFilter const &)
-	??0QContactDetailRangeFilter@QtMobility@@QAE@XZ @ 35 NONAME ; QtMobility::QContactDetailRangeFilter::QContactDetailRangeFilter(void)
-	??0QContactDisplayLabel@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 36 NONAME ; QtMobility::QContactDisplayLabel::QContactDisplayLabel(class QtMobility::QContactDetail const &)
-	??0QContactDisplayLabel@QtMobility@@QAE@XZ @ 37 NONAME ; QtMobility::QContactDisplayLabel::QContactDisplayLabel(void)
-	??0QContactEmailAddress@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 38 NONAME ; QtMobility::QContactEmailAddress::QContactEmailAddress(class QtMobility::QContactDetail const &)
-	??0QContactEmailAddress@QtMobility@@QAE@XZ @ 39 NONAME ; QtMobility::QContactEmailAddress::QContactEmailAddress(void)
-	??0QContactFamily@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 40 NONAME ; QtMobility::QContactFamily::QContactFamily(class QtMobility::QContactDetail const &)
-	??0QContactFamily@QtMobility@@QAE@XZ @ 41 NONAME ; QtMobility::QContactFamily::QContactFamily(void)
-	??0QContactFetchHint@QtMobility@@QAE@ABV01@@Z @ 42 NONAME ; QtMobility::QContactFetchHint::QContactFetchHint(class QtMobility::QContactFetchHint const &)
-	??0QContactFetchHint@QtMobility@@QAE@XZ @ 43 NONAME ; QtMobility::QContactFetchHint::QContactFetchHint(void)
-	??0QContactFetchRequest@QtMobility@@QAE@XZ @ 44 NONAME ; QtMobility::QContactFetchRequest::QContactFetchRequest(void)
-	??0QContactFilter@QtMobility@@IAE@PAVQContactFilterPrivate@1@@Z @ 45 NONAME ; QtMobility::QContactFilter::QContactFilter(class QtMobility::QContactFilterPrivate *)
-	??0QContactFilter@QtMobility@@QAE@ABV01@@Z @ 46 NONAME ; QtMobility::QContactFilter::QContactFilter(class QtMobility::QContactFilter const &)
-	??0QContactFilter@QtMobility@@QAE@XZ @ 47 NONAME ; QtMobility::QContactFilter::QContactFilter(void)
-	??0QContactGender@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 48 NONAME ; QtMobility::QContactGender::QContactGender(class QtMobility::QContactDetail const &)
-	??0QContactGender@QtMobility@@QAE@XZ @ 49 NONAME ; QtMobility::QContactGender::QContactGender(void)
-	??0QContactGeoLocation@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 50 NONAME ; QtMobility::QContactGeoLocation::QContactGeoLocation(class QtMobility::QContactDetail const &)
-	??0QContactGeoLocation@QtMobility@@QAE@XZ @ 51 NONAME ; QtMobility::QContactGeoLocation::QContactGeoLocation(void)
-	??0QContactGlobalPresence@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 52 NONAME ; QtMobility::QContactGlobalPresence::QContactGlobalPresence(class QtMobility::QContactDetail const &)
-	??0QContactGlobalPresence@QtMobility@@QAE@XZ @ 53 NONAME ; QtMobility::QContactGlobalPresence::QContactGlobalPresence(void)
-	??0QContactGuid@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 54 NONAME ; QtMobility::QContactGuid::QContactGuid(class QtMobility::QContactDetail const &)
-	??0QContactGuid@QtMobility@@QAE@XZ @ 55 NONAME ; QtMobility::QContactGuid::QContactGuid(void)
-	??0QContactId@QtMobility@@QAE@ABV01@@Z @ 56 NONAME ; QtMobility::QContactId::QContactId(class QtMobility::QContactId const &)
-	??0QContactId@QtMobility@@QAE@XZ @ 57 NONAME ; QtMobility::QContactId::QContactId(void)
-	??0QContactIntersectionFilter@QtMobility@@QAE@ABVQContactFilter@1@@Z @ 58 NONAME ; QtMobility::QContactIntersectionFilter::QContactIntersectionFilter(class QtMobility::QContactFilter const &)
-	??0QContactIntersectionFilter@QtMobility@@QAE@XZ @ 59 NONAME ; QtMobility::QContactIntersectionFilter::QContactIntersectionFilter(void)
-	??0QContactInvalidFilter@QtMobility@@QAE@ABVQContactFilter@1@@Z @ 60 NONAME ; QtMobility::QContactInvalidFilter::QContactInvalidFilter(class QtMobility::QContactFilter const &)
-	??0QContactInvalidFilter@QtMobility@@QAE@XZ @ 61 NONAME ; QtMobility::QContactInvalidFilter::QContactInvalidFilter(void)
-	??0QContactLocalIdFetchRequest@QtMobility@@QAE@XZ @ 62 NONAME ; QtMobility::QContactLocalIdFetchRequest::QContactLocalIdFetchRequest(void)
-	??0QContactLocalIdFilter@QtMobility@@QAE@ABVQContactFilter@1@@Z @ 63 NONAME ; QtMobility::QContactLocalIdFilter::QContactLocalIdFilter(class QtMobility::QContactFilter const &)
-	??0QContactLocalIdFilter@QtMobility@@QAE@XZ @ 64 NONAME ; QtMobility::QContactLocalIdFilter::QContactLocalIdFilter(void)
-	??0QContactManager@QtMobility@@QAE@ABVQString@@ABV?$QMap@VQString@@V1@@@PAVQObject@@@Z @ 65 NONAME ; QtMobility::QContactManager::QContactManager(class QString const &, class QMap<class QString, class QString> const &, class QObject *)
-	??0QContactManager@QtMobility@@QAE@ABVQString@@HABV?$QMap@VQString@@V1@@@PAVQObject@@@Z @ 66 NONAME ; QtMobility::QContactManager::QContactManager(class QString const &, int, class QMap<class QString, class QString> const &, class QObject *)
-	??0QContactManager@QtMobility@@QAE@PAVQObject@@@Z @ 67 NONAME ; QtMobility::QContactManager::QContactManager(class QObject *)
-	??0QContactManagerEngine@QtMobility@@QAE@XZ @ 68 NONAME ; QtMobility::QContactManagerEngine::QContactManagerEngine(void)
-	??0QContactName@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 69 NONAME ; QtMobility::QContactName::QContactName(class QtMobility::QContactDetail const &)
-	??0QContactName@QtMobility@@QAE@XZ @ 70 NONAME ; QtMobility::QContactName::QContactName(void)
-	??0QContactNickname@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 71 NONAME ; QtMobility::QContactNickname::QContactNickname(class QtMobility::QContactDetail const &)
-	??0QContactNickname@QtMobility@@QAE@XZ @ 72 NONAME ; QtMobility::QContactNickname::QContactNickname(void)
-	??0QContactNote@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 73 NONAME ; QtMobility::QContactNote::QContactNote(class QtMobility::QContactDetail const &)
-	??0QContactNote@QtMobility@@QAE@XZ @ 74 NONAME ; QtMobility::QContactNote::QContactNote(void)
-	??0QContactOnlineAccount@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 75 NONAME ; QtMobility::QContactOnlineAccount::QContactOnlineAccount(class QtMobility::QContactDetail const &)
-	??0QContactOnlineAccount@QtMobility@@QAE@XZ @ 76 NONAME ; QtMobility::QContactOnlineAccount::QContactOnlineAccount(void)
-	??0QContactOrganization@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 77 NONAME ; QtMobility::QContactOrganization::QContactOrganization(class QtMobility::QContactDetail const &)
-	??0QContactOrganization@QtMobility@@QAE@XZ @ 78 NONAME ; QtMobility::QContactOrganization::QContactOrganization(void)
-	??0QContactPhoneNumber@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 79 NONAME ; QtMobility::QContactPhoneNumber::QContactPhoneNumber(class QtMobility::QContactDetail const &)
-	??0QContactPhoneNumber@QtMobility@@QAE@XZ @ 80 NONAME ; QtMobility::QContactPhoneNumber::QContactPhoneNumber(void)
-	??0QContactPresence@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 81 NONAME ; QtMobility::QContactPresence::QContactPresence(class QtMobility::QContactDetail const &)
-	??0QContactPresence@QtMobility@@QAE@XZ @ 82 NONAME ; QtMobility::QContactPresence::QContactPresence(void)
-	??0QContactRelationship@QtMobility@@QAE@ABV01@@Z @ 83 NONAME ; QtMobility::QContactRelationship::QContactRelationship(class QtMobility::QContactRelationship const &)
-	??0QContactRelationship@QtMobility@@QAE@XZ @ 84 NONAME ; QtMobility::QContactRelationship::QContactRelationship(void)
-	??0QContactRelationshipFetchRequest@QtMobility@@QAE@XZ @ 85 NONAME ; QtMobility::QContactRelationshipFetchRequest::QContactRelationshipFetchRequest(void)
-	??0QContactRelationshipFilter@QtMobility@@QAE@ABVQContactFilter@1@@Z @ 86 NONAME ; QtMobility::QContactRelationshipFilter::QContactRelationshipFilter(class QtMobility::QContactFilter const &)
-	??0QContactRelationshipFilter@QtMobility@@QAE@XZ @ 87 NONAME ; QtMobility::QContactRelationshipFilter::QContactRelationshipFilter(void)
-	??0QContactRelationshipRemoveRequest@QtMobility@@QAE@XZ @ 88 NONAME ; QtMobility::QContactRelationshipRemoveRequest::QContactRelationshipRemoveRequest(void)
-	??0QContactRelationshipSaveRequest@QtMobility@@QAE@XZ @ 89 NONAME ; QtMobility::QContactRelationshipSaveRequest::QContactRelationshipSaveRequest(void)
-	??0QContactRemoveRequest@QtMobility@@QAE@XZ @ 90 NONAME ; QtMobility::QContactRemoveRequest::QContactRemoveRequest(void)
-	??0QContactRingtone@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 91 NONAME ; QtMobility::QContactRingtone::QContactRingtone(class QtMobility::QContactDetail const &)
-	??0QContactRingtone@QtMobility@@QAE@XZ @ 92 NONAME ; QtMobility::QContactRingtone::QContactRingtone(void)
-	??0QContactSaveRequest@QtMobility@@QAE@XZ @ 93 NONAME ; QtMobility::QContactSaveRequest::QContactSaveRequest(void)
-	??0QContactSortOrder@QtMobility@@QAE@ABV01@@Z @ 94 NONAME ; QtMobility::QContactSortOrder::QContactSortOrder(class QtMobility::QContactSortOrder const &)
-	??0QContactSortOrder@QtMobility@@QAE@XZ @ 95 NONAME ; QtMobility::QContactSortOrder::QContactSortOrder(void)
-	??0QContactSyncTarget@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 96 NONAME ; QtMobility::QContactSyncTarget::QContactSyncTarget(class QtMobility::QContactDetail const &)
-	??0QContactSyncTarget@QtMobility@@QAE@XZ @ 97 NONAME ; QtMobility::QContactSyncTarget::QContactSyncTarget(void)
-	??0QContactTag@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 98 NONAME ; QtMobility::QContactTag::QContactTag(class QtMobility::QContactDetail const &)
-	??0QContactTag@QtMobility@@QAE@XZ @ 99 NONAME ; QtMobility::QContactTag::QContactTag(void)
-	??0QContactThumbnail@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 100 NONAME ; QtMobility::QContactThumbnail::QContactThumbnail(class QtMobility::QContactDetail const &)
-	??0QContactThumbnail@QtMobility@@QAE@XZ @ 101 NONAME ; QtMobility::QContactThumbnail::QContactThumbnail(void)
-	??0QContactTimestamp@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 102 NONAME ; QtMobility::QContactTimestamp::QContactTimestamp(class QtMobility::QContactDetail const &)
-	??0QContactTimestamp@QtMobility@@QAE@XZ @ 103 NONAME ; QtMobility::QContactTimestamp::QContactTimestamp(void)
-	??0QContactType@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 104 NONAME ; QtMobility::QContactType::QContactType(class QtMobility::QContactDetail const &)
-	??0QContactType@QtMobility@@QAE@XZ @ 105 NONAME ; QtMobility::QContactType::QContactType(void)
-	??0QContactUnionFilter@QtMobility@@QAE@ABVQContactFilter@1@@Z @ 106 NONAME ; QtMobility::QContactUnionFilter::QContactUnionFilter(class QtMobility::QContactFilter const &)
-	??0QContactUnionFilter@QtMobility@@QAE@XZ @ 107 NONAME ; QtMobility::QContactUnionFilter::QContactUnionFilter(void)
-	??0QContactUrl@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 108 NONAME ; QtMobility::QContactUrl::QContactUrl(class QtMobility::QContactDetail const &)
-	??0QContactUrl@QtMobility@@QAE@XZ @ 109 NONAME ; QtMobility::QContactUrl::QContactUrl(void)
-	??1QContact@QtMobility@@QAE@XZ @ 110 NONAME ; QtMobility::QContact::~QContact(void)
-	??1QContactAbstractRequest@QtMobility@@UAE@XZ @ 111 NONAME ; QtMobility::QContactAbstractRequest::~QContactAbstractRequest(void)
-	??1QContactAction@QtMobility@@UAE@XZ @ 112 NONAME ; QtMobility::QContactAction::~QContactAction(void)
-	??1QContactActionDescriptor@QtMobility@@QAE@XZ @ 113 NONAME ; QtMobility::QContactActionDescriptor::~QContactActionDescriptor(void)
-	??1QContactActionFactory@QtMobility@@UAE@XZ @ 114 NONAME ; QtMobility::QContactActionFactory::~QContactActionFactory(void)
-	??1QContactActionFilter@QtMobility@@UAE@XZ @ 115 NONAME ; QtMobility::QContactActionFilter::~QContactActionFilter(void)
-	??1QContactAddress@QtMobility@@UAE@XZ @ 116 NONAME ; QtMobility::QContactAddress::~QContactAddress(void)
-	??1QContactAnniversary@QtMobility@@UAE@XZ @ 117 NONAME ; QtMobility::QContactAnniversary::~QContactAnniversary(void)
-	??1QContactAvatar@QtMobility@@UAE@XZ @ 118 NONAME ; QtMobility::QContactAvatar::~QContactAvatar(void)
-	??1QContactBirthday@QtMobility@@UAE@XZ @ 119 NONAME ; QtMobility::QContactBirthday::~QContactBirthday(void)
-	??1QContactChangeLogFilter@QtMobility@@UAE@XZ @ 120 NONAME ; QtMobility::QContactChangeLogFilter::~QContactChangeLogFilter(void)
-	??1QContactChangeSet@QtMobility@@QAE@XZ @ 121 NONAME ; QtMobility::QContactChangeSet::~QContactChangeSet(void)
-	??1QContactDetail@QtMobility@@UAE@XZ @ 122 NONAME ; QtMobility::QContactDetail::~QContactDetail(void)
-	??1QContactDetailDefinition@QtMobility@@QAE@XZ @ 123 NONAME ; QtMobility::QContactDetailDefinition::~QContactDetailDefinition(void)
-	??1QContactDetailDefinitionFetchRequest@QtMobility@@UAE@XZ @ 124 NONAME ; QtMobility::QContactDetailDefinitionFetchRequest::~QContactDetailDefinitionFetchRequest(void)
-	??1QContactDetailDefinitionRemoveRequest@QtMobility@@UAE@XZ @ 125 NONAME ; QtMobility::QContactDetailDefinitionRemoveRequest::~QContactDetailDefinitionRemoveRequest(void)
-	??1QContactDetailDefinitionSaveRequest@QtMobility@@UAE@XZ @ 126 NONAME ; QtMobility::QContactDetailDefinitionSaveRequest::~QContactDetailDefinitionSaveRequest(void)
-	??1QContactDetailFieldDefinition@QtMobility@@QAE@XZ @ 127 NONAME ; QtMobility::QContactDetailFieldDefinition::~QContactDetailFieldDefinition(void)
-	??1QContactDetailFilter@QtMobility@@UAE@XZ @ 128 NONAME ; QtMobility::QContactDetailFilter::~QContactDetailFilter(void)
-	??1QContactDetailRangeFilter@QtMobility@@UAE@XZ @ 129 NONAME ; QtMobility::QContactDetailRangeFilter::~QContactDetailRangeFilter(void)
-	??1QContactDisplayLabel@QtMobility@@UAE@XZ @ 130 NONAME ; QtMobility::QContactDisplayLabel::~QContactDisplayLabel(void)
-	??1QContactEmailAddress@QtMobility@@UAE@XZ @ 131 NONAME ; QtMobility::QContactEmailAddress::~QContactEmailAddress(void)
-	??1QContactFamily@QtMobility@@UAE@XZ @ 132 NONAME ; QtMobility::QContactFamily::~QContactFamily(void)
-	??1QContactFetchHint@QtMobility@@QAE@XZ @ 133 NONAME ; QtMobility::QContactFetchHint::~QContactFetchHint(void)
-	??1QContactFetchRequest@QtMobility@@UAE@XZ @ 134 NONAME ; QtMobility::QContactFetchRequest::~QContactFetchRequest(void)
-	??1QContactFilter@QtMobility@@UAE@XZ @ 135 NONAME ; QtMobility::QContactFilter::~QContactFilter(void)
-	??1QContactGender@QtMobility@@UAE@XZ @ 136 NONAME ; QtMobility::QContactGender::~QContactGender(void)
-	??1QContactGeoLocation@QtMobility@@UAE@XZ @ 137 NONAME ; QtMobility::QContactGeoLocation::~QContactGeoLocation(void)
-	??1QContactGlobalPresence@QtMobility@@UAE@XZ @ 138 NONAME ; QtMobility::QContactGlobalPresence::~QContactGlobalPresence(void)
-	??1QContactGuid@QtMobility@@UAE@XZ @ 139 NONAME ; QtMobility::QContactGuid::~QContactGuid(void)
-	??1QContactId@QtMobility@@QAE@XZ @ 140 NONAME ; QtMobility::QContactId::~QContactId(void)
-	??1QContactIntersectionFilter@QtMobility@@UAE@XZ @ 141 NONAME ; QtMobility::QContactIntersectionFilter::~QContactIntersectionFilter(void)
-	??1QContactInvalidFilter@QtMobility@@UAE@XZ @ 142 NONAME ; QtMobility::QContactInvalidFilter::~QContactInvalidFilter(void)
-	??1QContactLocalIdFetchRequest@QtMobility@@UAE@XZ @ 143 NONAME ; QtMobility::QContactLocalIdFetchRequest::~QContactLocalIdFetchRequest(void)
-	??1QContactLocalIdFilter@QtMobility@@UAE@XZ @ 144 NONAME ; QtMobility::QContactLocalIdFilter::~QContactLocalIdFilter(void)
-	??1QContactManager@QtMobility@@UAE@XZ @ 145 NONAME ; QtMobility::QContactManager::~QContactManager(void)
-	??1QContactManagerEngine@QtMobility@@UAE@XZ @ 146 NONAME ; QtMobility::QContactManagerEngine::~QContactManagerEngine(void)
-	??1QContactManagerEngineFactory@QtMobility@@UAE@XZ @ 147 NONAME ; QtMobility::QContactManagerEngineFactory::~QContactManagerEngineFactory(void)
-	??1QContactName@QtMobility@@UAE@XZ @ 148 NONAME ; QtMobility::QContactName::~QContactName(void)
-	??1QContactNickname@QtMobility@@UAE@XZ @ 149 NONAME ; QtMobility::QContactNickname::~QContactNickname(void)
-	??1QContactNote@QtMobility@@UAE@XZ @ 150 NONAME ; QtMobility::QContactNote::~QContactNote(void)
-	??1QContactOnlineAccount@QtMobility@@UAE@XZ @ 151 NONAME ; QtMobility::QContactOnlineAccount::~QContactOnlineAccount(void)
-	??1QContactOrganization@QtMobility@@UAE@XZ @ 152 NONAME ; QtMobility::QContactOrganization::~QContactOrganization(void)
-	??1QContactPhoneNumber@QtMobility@@UAE@XZ @ 153 NONAME ; QtMobility::QContactPhoneNumber::~QContactPhoneNumber(void)
-	??1QContactPresence@QtMobility@@UAE@XZ @ 154 NONAME ; QtMobility::QContactPresence::~QContactPresence(void)
-	??1QContactRelationship@QtMobility@@QAE@XZ @ 155 NONAME ; QtMobility::QContactRelationship::~QContactRelationship(void)
-	??1QContactRelationshipFetchRequest@QtMobility@@UAE@XZ @ 156 NONAME ; QtMobility::QContactRelationshipFetchRequest::~QContactRelationshipFetchRequest(void)
-	??1QContactRelationshipFilter@QtMobility@@UAE@XZ @ 157 NONAME ; QtMobility::QContactRelationshipFilter::~QContactRelationshipFilter(void)
-	??1QContactRelationshipRemoveRequest@QtMobility@@UAE@XZ @ 158 NONAME ; QtMobility::QContactRelationshipRemoveRequest::~QContactRelationshipRemoveRequest(void)
-	??1QContactRelationshipSaveRequest@QtMobility@@UAE@XZ @ 159 NONAME ; QtMobility::QContactRelationshipSaveRequest::~QContactRelationshipSaveRequest(void)
-	??1QContactRemoveRequest@QtMobility@@UAE@XZ @ 160 NONAME ; QtMobility::QContactRemoveRequest::~QContactRemoveRequest(void)
-	??1QContactRingtone@QtMobility@@UAE@XZ @ 161 NONAME ; QtMobility::QContactRingtone::~QContactRingtone(void)
-	??1QContactSaveRequest@QtMobility@@UAE@XZ @ 162 NONAME ; QtMobility::QContactSaveRequest::~QContactSaveRequest(void)
-	??1QContactSortOrder@QtMobility@@QAE@XZ @ 163 NONAME ; QtMobility::QContactSortOrder::~QContactSortOrder(void)
-	??1QContactSyncTarget@QtMobility@@UAE@XZ @ 164 NONAME ; QtMobility::QContactSyncTarget::~QContactSyncTarget(void)
-	??1QContactTag@QtMobility@@UAE@XZ @ 165 NONAME ; QtMobility::QContactTag::~QContactTag(void)
-	??1QContactThumbnail@QtMobility@@UAE@XZ @ 166 NONAME ; QtMobility::QContactThumbnail::~QContactThumbnail(void)
-	??1QContactTimestamp@QtMobility@@UAE@XZ @ 167 NONAME ; QtMobility::QContactTimestamp::~QContactTimestamp(void)
-	??1QContactType@QtMobility@@UAE@XZ @ 168 NONAME ; QtMobility::QContactType::~QContactType(void)
-	??1QContactUnionFilter@QtMobility@@UAE@XZ @ 169 NONAME ; QtMobility::QContactUnionFilter::~QContactUnionFilter(void)
-	??1QContactUrl@QtMobility@@UAE@XZ @ 170 NONAME ; QtMobility::QContactUrl::~QContactUrl(void)
-	??4QContact@QtMobility@@QAEAAV01@ABV01@@Z @ 171 NONAME ; class QtMobility::QContact & QtMobility::QContact::operator=(class QtMobility::QContact const &)
-	??4QContactActionDescriptor@QtMobility@@QAEAAV01@ABV01@@Z @ 172 NONAME ; class QtMobility::QContactActionDescriptor & QtMobility::QContactActionDescriptor::operator=(class QtMobility::QContactActionDescriptor const &)
-	??4QContactAddress@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 173 NONAME ; class QtMobility::QContactAddress & QtMobility::QContactAddress::operator=(class QtMobility::QContactDetail const &)
-	??4QContactAnniversary@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 174 NONAME ; class QtMobility::QContactAnniversary & QtMobility::QContactAnniversary::operator=(class QtMobility::QContactDetail const &)
-	??4QContactAvatar@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 175 NONAME ; class QtMobility::QContactAvatar & QtMobility::QContactAvatar::operator=(class QtMobility::QContactDetail const &)
-	??4QContactBirthday@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 176 NONAME ; class QtMobility::QContactBirthday & QtMobility::QContactBirthday::operator=(class QtMobility::QContactDetail const &)
-	??4QContactChangeSet@QtMobility@@QAEAAV01@ABV01@@Z @ 177 NONAME ; class QtMobility::QContactChangeSet & QtMobility::QContactChangeSet::operator=(class QtMobility::QContactChangeSet const &)
-	??4QContactDetail@QtMobility@@QAEAAV01@ABV01@@Z @ 178 NONAME ; class QtMobility::QContactDetail & QtMobility::QContactDetail::operator=(class QtMobility::QContactDetail const &)
-	??4QContactDetailDefinition@QtMobility@@QAEAAV01@ABV01@@Z @ 179 NONAME ; class QtMobility::QContactDetailDefinition & QtMobility::QContactDetailDefinition::operator=(class QtMobility::QContactDetailDefinition const &)
-	??4QContactDetailFieldDefinition@QtMobility@@QAEAAV01@ABV01@@Z @ 180 NONAME ; class QtMobility::QContactDetailFieldDefinition & QtMobility::QContactDetailFieldDefinition::operator=(class QtMobility::QContactDetailFieldDefinition const &)
-	??4QContactDisplayLabel@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 181 NONAME ; class QtMobility::QContactDisplayLabel & QtMobility::QContactDisplayLabel::operator=(class QtMobility::QContactDetail const &)
-	??4QContactEmailAddress@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 182 NONAME ; class QtMobility::QContactEmailAddress & QtMobility::QContactEmailAddress::operator=(class QtMobility::QContactDetail const &)
-	??4QContactFamily@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 183 NONAME ; class QtMobility::QContactFamily & QtMobility::QContactFamily::operator=(class QtMobility::QContactDetail const &)
-	??4QContactFetchHint@QtMobility@@QAEAAV01@ABV01@@Z @ 184 NONAME ; class QtMobility::QContactFetchHint & QtMobility::QContactFetchHint::operator=(class QtMobility::QContactFetchHint const &)
-	??4QContactFilter@QtMobility@@QAEAAV01@ABV01@@Z @ 185 NONAME ; class QtMobility::QContactFilter & QtMobility::QContactFilter::operator=(class QtMobility::QContactFilter const &)
-	??4QContactGender@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 186 NONAME ; class QtMobility::QContactGender & QtMobility::QContactGender::operator=(class QtMobility::QContactDetail const &)
-	??4QContactGeoLocation@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 187 NONAME ; class QtMobility::QContactGeoLocation & QtMobility::QContactGeoLocation::operator=(class QtMobility::QContactDetail const &)
-	??4QContactGlobalPresence@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 188 NONAME ; class QtMobility::QContactGlobalPresence & QtMobility::QContactGlobalPresence::operator=(class QtMobility::QContactDetail const &)
-	??4QContactGuid@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 189 NONAME ; class QtMobility::QContactGuid & QtMobility::QContactGuid::operator=(class QtMobility::QContactDetail const &)
-	??4QContactId@QtMobility@@QAEAAV01@ABV01@@Z @ 190 NONAME ; class QtMobility::QContactId & QtMobility::QContactId::operator=(class QtMobility::QContactId const &)
-	??4QContactName@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 191 NONAME ; class QtMobility::QContactName & QtMobility::QContactName::operator=(class QtMobility::QContactDetail const &)
-	??4QContactNickname@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 192 NONAME ; class QtMobility::QContactNickname & QtMobility::QContactNickname::operator=(class QtMobility::QContactDetail const &)
-	??4QContactNote@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 193 NONAME ; class QtMobility::QContactNote & QtMobility::QContactNote::operator=(class QtMobility::QContactDetail const &)
-	??4QContactOnlineAccount@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 194 NONAME ; class QtMobility::QContactOnlineAccount & QtMobility::QContactOnlineAccount::operator=(class QtMobility::QContactDetail const &)
-	??4QContactOrganization@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 195 NONAME ; class QtMobility::QContactOrganization & QtMobility::QContactOrganization::operator=(class QtMobility::QContactDetail const &)
-	??4QContactPhoneNumber@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 196 NONAME ; class QtMobility::QContactPhoneNumber & QtMobility::QContactPhoneNumber::operator=(class QtMobility::QContactDetail const &)
-	??4QContactPresence@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 197 NONAME ; class QtMobility::QContactPresence & QtMobility::QContactPresence::operator=(class QtMobility::QContactDetail const &)
-	??4QContactRelationship@QtMobility@@QAEAAV01@ABV01@@Z @ 198 NONAME ; class QtMobility::QContactRelationship & QtMobility::QContactRelationship::operator=(class QtMobility::QContactRelationship const &)
-	??4QContactRingtone@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 199 NONAME ; class QtMobility::QContactRingtone & QtMobility::QContactRingtone::operator=(class QtMobility::QContactDetail const &)
-	??4QContactSortOrder@QtMobility@@QAEAAV01@ABV01@@Z @ 200 NONAME ; class QtMobility::QContactSortOrder & QtMobility::QContactSortOrder::operator=(class QtMobility::QContactSortOrder const &)
-	??4QContactSyncTarget@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 201 NONAME ; class QtMobility::QContactSyncTarget & QtMobility::QContactSyncTarget::operator=(class QtMobility::QContactDetail const &)
-	??4QContactTag@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 202 NONAME ; class QtMobility::QContactTag & QtMobility::QContactTag::operator=(class QtMobility::QContactDetail const &)
-	??4QContactThumbnail@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 203 NONAME ; class QtMobility::QContactThumbnail & QtMobility::QContactThumbnail::operator=(class QtMobility::QContactDetail const &)
-	??4QContactTimestamp@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 204 NONAME ; class QtMobility::QContactTimestamp & QtMobility::QContactTimestamp::operator=(class QtMobility::QContactDetail const &)
-	??4QContactType@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 205 NONAME ; class QtMobility::QContactType & QtMobility::QContactType::operator=(class QtMobility::QContactDetail const &)
-	??4QContactUrl@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 206 NONAME ; class QtMobility::QContactUrl & QtMobility::QContactUrl::operator=(class QtMobility::QContactDetail const &)
-	??6QContactIntersectionFilter@QtMobility@@QAEAAV01@ABVQContactFilter@1@@Z @ 207 NONAME ; class QtMobility::QContactIntersectionFilter & QtMobility::QContactIntersectionFilter::operator<<(class QtMobility::QContactFilter const &)
-	??6QContactUnionFilter@QtMobility@@QAEAAV01@ABVQContactFilter@1@@Z @ 208 NONAME ; class QtMobility::QContactUnionFilter & QtMobility::QContactUnionFilter::operator<<(class QtMobility::QContactFilter const &)
-	??6QtMobility@@YA?AVQDebug@@V1@ABVQContact@0@@Z @ 209 NONAME ; class QDebug QtMobility::operator<<(class QDebug, class QtMobility::QContact const &)
-	??6QtMobility@@YA?AVQDebug@@V1@ABVQContactDetail@0@@Z @ 210 NONAME ; class QDebug QtMobility::operator<<(class QDebug, class QtMobility::QContactDetail const &)
-	??6QtMobility@@YA?AVQDebug@@V1@ABVQContactId@0@@Z @ 211 NONAME ; class QDebug QtMobility::operator<<(class QDebug, class QtMobility::QContactId const &)
-	??6QtMobility@@YA?AVQDebug@@V1@ABVQContactRelationship@0@@Z @ 212 NONAME ; class QDebug QtMobility::operator<<(class QDebug, class QtMobility::QContactRelationship const &)
-	??8QContact@QtMobility@@QBE_NABV01@@Z @ 213 NONAME ; bool QtMobility::QContact::operator==(class QtMobility::QContact const &) const
-	??8QContactActionDescriptor@QtMobility@@QBE_NABV01@@Z @ 214 NONAME ; bool QtMobility::QContactActionDescriptor::operator==(class QtMobility::QContactActionDescriptor const &) const
-	??8QContactDetail@QtMobility@@QBE_NABV01@@Z @ 215 NONAME ; bool QtMobility::QContactDetail::operator==(class QtMobility::QContactDetail const &) const
-	??8QContactDetailDefinition@QtMobility@@QBE_NABV01@@Z @ 216 NONAME ; bool QtMobility::QContactDetailDefinition::operator==(class QtMobility::QContactDetailDefinition const &) const
-	??8QContactDetailFieldDefinition@QtMobility@@QBE_NABV01@@Z @ 217 NONAME ; bool QtMobility::QContactDetailFieldDefinition::operator==(class QtMobility::QContactDetailFieldDefinition const &) const
-	??8QContactFilter@QtMobility@@QBE_NABV01@@Z @ 218 NONAME ; bool QtMobility::QContactFilter::operator==(class QtMobility::QContactFilter const &) const
-	??8QContactId@QtMobility@@QBE_NABV01@@Z @ 219 NONAME ; bool QtMobility::QContactId::operator==(class QtMobility::QContactId const &) const
-	??8QContactRelationship@QtMobility@@QBE_NABV01@@Z @ 220 NONAME ; bool QtMobility::QContactRelationship::operator==(class QtMobility::QContactRelationship const &) const
-	??8QContactSortOrder@QtMobility@@QBE_NABV01@@Z @ 221 NONAME ; bool QtMobility::QContactSortOrder::operator==(class QtMobility::QContactSortOrder const &) const
-	??9QContact@QtMobility@@QBE_NABV01@@Z @ 222 NONAME ; bool QtMobility::QContact::operator!=(class QtMobility::QContact const &) const
-	??9QContactActionDescriptor@QtMobility@@QBE_NABV01@@Z @ 223 NONAME ; bool QtMobility::QContactActionDescriptor::operator!=(class QtMobility::QContactActionDescriptor const &) const
-	??9QContactDetail@QtMobility@@QBE_NABV01@@Z @ 224 NONAME ; bool QtMobility::QContactDetail::operator!=(class QtMobility::QContactDetail const &) const
-	??9QContactDetailDefinition@QtMobility@@QBE_NABV01@@Z @ 225 NONAME ; bool QtMobility::QContactDetailDefinition::operator!=(class QtMobility::QContactDetailDefinition const &) const
-	??9QContactDetailFieldDefinition@QtMobility@@QBE_NABV01@@Z @ 226 NONAME ; bool QtMobility::QContactDetailFieldDefinition::operator!=(class QtMobility::QContactDetailFieldDefinition const &) const
-	??9QContactFilter@QtMobility@@QBE_NABV01@@Z @ 227 NONAME ; bool QtMobility::QContactFilter::operator!=(class QtMobility::QContactFilter const &) const
-	??9QContactId@QtMobility@@QBE_NABV01@@Z @ 228 NONAME ; bool QtMobility::QContactId::operator!=(class QtMobility::QContactId const &) const
-	??9QContactRelationship@QtMobility@@QBE_NABV01@@Z @ 229 NONAME ; bool QtMobility::QContactRelationship::operator!=(class QtMobility::QContactRelationship const &) const
-	??9QContactSortOrder@QtMobility@@QBE_NABV01@@Z @ 230 NONAME ; bool QtMobility::QContactSortOrder::operator!=(class QtMobility::QContactSortOrder const &) const
-	??BQContactSortOrder@QtMobility@@QBE?AV?$QList@VQContactSortOrder@QtMobility@@@@XZ @ 231 NONAME ; QtMobility::QContactSortOrder::operator class QList<class QtMobility::QContactSortOrder>(void) const
-	??IQtMobility@@YA?BVQContactFilter@0@ABV10@0@Z @ 232 NONAME ; class QtMobility::QContactFilter const QtMobility::operator&(class QtMobility::QContactFilter const &, class QtMobility::QContactFilter const &)
-	??MQContactActionDescriptor@QtMobility@@QBE_NABV01@@Z @ 233 NONAME ; bool QtMobility::QContactActionDescriptor::operator<(class QtMobility::QContactActionDescriptor const &) const
-	??MQContactId@QtMobility@@QBE_NABV01@@Z @ 234 NONAME ; bool QtMobility::QContactId::operator<(class QtMobility::QContactId const &) const
-	??UQtMobility@@YA?BVQContactFilter@0@ABV10@0@Z @ 235 NONAME ; class QtMobility::QContactFilter const QtMobility::operator|(class QtMobility::QContactFilter const &, class QtMobility::QContactFilter const &)
-	??_EQContact@QtMobility@@QAE@I@Z @ 236 NONAME ; QtMobility::QContact::~QContact(unsigned int)
-	??_EQContactAbstractRequest@QtMobility@@UAE@I@Z @ 237 NONAME ; QtMobility::QContactAbstractRequest::~QContactAbstractRequest(unsigned int)
-	??_EQContactAction@QtMobility@@UAE@I@Z @ 238 NONAME ; QtMobility::QContactAction::~QContactAction(unsigned int)
-	??_EQContactActionDescriptor@QtMobility@@QAE@I@Z @ 239 NONAME ; QtMobility::QContactActionDescriptor::~QContactActionDescriptor(unsigned int)
-	??_EQContactActionFactory@QtMobility@@UAE@I@Z @ 240 NONAME ; QtMobility::QContactActionFactory::~QContactActionFactory(unsigned int)
-	??_EQContactActionFilter@QtMobility@@UAE@I@Z @ 241 NONAME ; QtMobility::QContactActionFilter::~QContactActionFilter(unsigned int)
-	??_EQContactAddress@QtMobility@@UAE@I@Z @ 242 NONAME ; QtMobility::QContactAddress::~QContactAddress(unsigned int)
-	??_EQContactAnniversary@QtMobility@@UAE@I@Z @ 243 NONAME ; QtMobility::QContactAnniversary::~QContactAnniversary(unsigned int)
-	??_EQContactAvatar@QtMobility@@UAE@I@Z @ 244 NONAME ; QtMobility::QContactAvatar::~QContactAvatar(unsigned int)
-	??_EQContactBirthday@QtMobility@@UAE@I@Z @ 245 NONAME ; QtMobility::QContactBirthday::~QContactBirthday(unsigned int)
-	??_EQContactChangeLogFilter@QtMobility@@UAE@I@Z @ 246 NONAME ; QtMobility::QContactChangeLogFilter::~QContactChangeLogFilter(unsigned int)
-	??_EQContactDetail@QtMobility@@UAE@I@Z @ 247 NONAME ; QtMobility::QContactDetail::~QContactDetail(unsigned int)
-	??_EQContactDetailDefinition@QtMobility@@QAE@I@Z @ 248 NONAME ; QtMobility::QContactDetailDefinition::~QContactDetailDefinition(unsigned int)
-	??_EQContactDetailDefinitionFetchRequest@QtMobility@@UAE@I@Z @ 249 NONAME ; QtMobility::QContactDetailDefinitionFetchRequest::~QContactDetailDefinitionFetchRequest(unsigned int)
-	??_EQContactDetailDefinitionRemoveRequest@QtMobility@@UAE@I@Z @ 250 NONAME ; QtMobility::QContactDetailDefinitionRemoveRequest::~QContactDetailDefinitionRemoveRequest(unsigned int)
-	??_EQContactDetailDefinitionSaveRequest@QtMobility@@UAE@I@Z @ 251 NONAME ; QtMobility::QContactDetailDefinitionSaveRequest::~QContactDetailDefinitionSaveRequest(unsigned int)
-	??_EQContactDetailFilter@QtMobility@@UAE@I@Z @ 252 NONAME ; QtMobility::QContactDetailFilter::~QContactDetailFilter(unsigned int)
-	??_EQContactDetailRangeFilter@QtMobility@@UAE@I@Z @ 253 NONAME ; QtMobility::QContactDetailRangeFilter::~QContactDetailRangeFilter(unsigned int)
-	??_EQContactDisplayLabel@QtMobility@@UAE@I@Z @ 254 NONAME ; QtMobility::QContactDisplayLabel::~QContactDisplayLabel(unsigned int)
-	??_EQContactEmailAddress@QtMobility@@UAE@I@Z @ 255 NONAME ; QtMobility::QContactEmailAddress::~QContactEmailAddress(unsigned int)
-	??_EQContactFamily@QtMobility@@UAE@I@Z @ 256 NONAME ; QtMobility::QContactFamily::~QContactFamily(unsigned int)
-	??_EQContactFetchRequest@QtMobility@@UAE@I@Z @ 257 NONAME ; QtMobility::QContactFetchRequest::~QContactFetchRequest(unsigned int)
-	??_EQContactFilter@QtMobility@@UAE@I@Z @ 258 NONAME ; QtMobility::QContactFilter::~QContactFilter(unsigned int)
-	??_EQContactGender@QtMobility@@UAE@I@Z @ 259 NONAME ; QtMobility::QContactGender::~QContactGender(unsigned int)
-	??_EQContactGeoLocation@QtMobility@@UAE@I@Z @ 260 NONAME ; QtMobility::QContactGeoLocation::~QContactGeoLocation(unsigned int)
-	??_EQContactGlobalPresence@QtMobility@@UAE@I@Z @ 261 NONAME ; QtMobility::QContactGlobalPresence::~QContactGlobalPresence(unsigned int)
-	??_EQContactGuid@QtMobility@@UAE@I@Z @ 262 NONAME ; QtMobility::QContactGuid::~QContactGuid(unsigned int)
-	??_EQContactId@QtMobility@@QAE@I@Z @ 263 NONAME ; QtMobility::QContactId::~QContactId(unsigned int)
-	??_EQContactIntersectionFilter@QtMobility@@UAE@I@Z @ 264 NONAME ; QtMobility::QContactIntersectionFilter::~QContactIntersectionFilter(unsigned int)
-	??_EQContactInvalidFilter@QtMobility@@UAE@I@Z @ 265 NONAME ; QtMobility::QContactInvalidFilter::~QContactInvalidFilter(unsigned int)
-	??_EQContactLocalIdFetchRequest@QtMobility@@UAE@I@Z @ 266 NONAME ; QtMobility::QContactLocalIdFetchRequest::~QContactLocalIdFetchRequest(unsigned int)
-	??_EQContactLocalIdFilter@QtMobility@@UAE@I@Z @ 267 NONAME ; QtMobility::QContactLocalIdFilter::~QContactLocalIdFilter(unsigned int)
-	??_EQContactManager@QtMobility@@UAE@I@Z @ 268 NONAME ; QtMobility::QContactManager::~QContactManager(unsigned int)
-	??_EQContactManagerEngine@QtMobility@@UAE@I@Z @ 269 NONAME ; QtMobility::QContactManagerEngine::~QContactManagerEngine(unsigned int)
-	??_EQContactManagerEngineFactory@QtMobility@@UAE@I@Z @ 270 NONAME ; QtMobility::QContactManagerEngineFactory::~QContactManagerEngineFactory(unsigned int)
-	??_EQContactName@QtMobility@@UAE@I@Z @ 271 NONAME ; QtMobility::QContactName::~QContactName(unsigned int)
-	??_EQContactNickname@QtMobility@@UAE@I@Z @ 272 NONAME ; QtMobility::QContactNickname::~QContactNickname(unsigned int)
-	??_EQContactNote@QtMobility@@UAE@I@Z @ 273 NONAME ; QtMobility::QContactNote::~QContactNote(unsigned int)
-	??_EQContactOnlineAccount@QtMobility@@UAE@I@Z @ 274 NONAME ; QtMobility::QContactOnlineAccount::~QContactOnlineAccount(unsigned int)
-	??_EQContactOrganization@QtMobility@@UAE@I@Z @ 275 NONAME ; QtMobility::QContactOrganization::~QContactOrganization(unsigned int)
-	??_EQContactPhoneNumber@QtMobility@@UAE@I@Z @ 276 NONAME ; QtMobility::QContactPhoneNumber::~QContactPhoneNumber(unsigned int)
-	??_EQContactPresence@QtMobility@@UAE@I@Z @ 277 NONAME ; QtMobility::QContactPresence::~QContactPresence(unsigned int)
-	??_EQContactRelationship@QtMobility@@QAE@I@Z @ 278 NONAME ; QtMobility::QContactRelationship::~QContactRelationship(unsigned int)
-	??_EQContactRelationshipFetchRequest@QtMobility@@UAE@I@Z @ 279 NONAME ; QtMobility::QContactRelationshipFetchRequest::~QContactRelationshipFetchRequest(unsigned int)
-	??_EQContactRelationshipFilter@QtMobility@@UAE@I@Z @ 280 NONAME ; QtMobility::QContactRelationshipFilter::~QContactRelationshipFilter(unsigned int)
-	??_EQContactRelationshipRemoveRequest@QtMobility@@UAE@I@Z @ 281 NONAME ; QtMobility::QContactRelationshipRemoveRequest::~QContactRelationshipRemoveRequest(unsigned int)
-	??_EQContactRelationshipSaveRequest@QtMobility@@UAE@I@Z @ 282 NONAME ; QtMobility::QContactRelationshipSaveRequest::~QContactRelationshipSaveRequest(unsigned int)
-	??_EQContactRemoveRequest@QtMobility@@UAE@I@Z @ 283 NONAME ; QtMobility::QContactRemoveRequest::~QContactRemoveRequest(unsigned int)
-	??_EQContactRingtone@QtMobility@@UAE@I@Z @ 284 NONAME ; QtMobility::QContactRingtone::~QContactRingtone(unsigned int)
-	??_EQContactSaveRequest@QtMobility@@UAE@I@Z @ 285 NONAME ; QtMobility::QContactSaveRequest::~QContactSaveRequest(unsigned int)
-	??_EQContactSortOrder@QtMobility@@QAE@I@Z @ 286 NONAME ; QtMobility::QContactSortOrder::~QContactSortOrder(unsigned int)
-	??_EQContactSyncTarget@QtMobility@@UAE@I@Z @ 287 NONAME ; QtMobility::QContactSyncTarget::~QContactSyncTarget(unsigned int)
-	??_EQContactTag@QtMobility@@UAE@I@Z @ 288 NONAME ; QtMobility::QContactTag::~QContactTag(unsigned int)
-	??_EQContactThumbnail@QtMobility@@UAE@I@Z @ 289 NONAME ; QtMobility::QContactThumbnail::~QContactThumbnail(unsigned int)
-	??_EQContactTimestamp@QtMobility@@UAE@I@Z @ 290 NONAME ; QtMobility::QContactTimestamp::~QContactTimestamp(unsigned int)
-	??_EQContactType@QtMobility@@UAE@I@Z @ 291 NONAME ; QtMobility::QContactType::~QContactType(unsigned int)
-	??_EQContactUnionFilter@QtMobility@@UAE@I@Z @ 292 NONAME ; QtMobility::QContactUnionFilter::~QContactUnionFilter(unsigned int)
-	??_EQContactUrl@QtMobility@@UAE@I@Z @ 293 NONAME ; QtMobility::QContactUrl::~QContactUrl(unsigned int)
-	?accessConstraints@QContactDetail@QtMobility@@QBE?AV?$QFlags@W4AccessConstraint@QContactDetail@QtMobility@@@@XZ @ 294 NONAME ; class QFlags<enum QtMobility::QContactDetail::AccessConstraint> QtMobility::QContactDetail::accessConstraints(void) const
-	?accountUri@QContactOnlineAccount@QtMobility@@QBE?AVQString@@XZ @ 295 NONAME ; class QString QtMobility::QContactOnlineAccount::accountUri(void) const
-	?accuracy@QContactGeoLocation@QtMobility@@QBENXZ @ 296 NONAME ; double QtMobility::QContactGeoLocation::accuracy(void) const
-	?action@QContactAction@QtMobility@@SAPAV12@ABVQContactActionDescriptor@2@@Z @ 297 NONAME ; class QtMobility::QContactAction * QtMobility::QContactAction::action(class QtMobility::QContactActionDescriptor const &)
-	?actionDescriptors@QContactAction@QtMobility@@SA?AV?$QList@VQContactActionDescriptor@QtMobility@@@@ABVQString@@0H@Z @ 298 NONAME ; class QList<class QtMobility::QContactActionDescriptor> QtMobility::QContactAction::actionDescriptors(class QString const &, class QString const &, int)
-	?actionName@QContactActionDescriptor@QtMobility@@QBE?AVQString@@XZ @ 299 NONAME ; class QString QtMobility::QContactActionDescriptor::actionName(void) const
-	?actionName@QContactActionFilter@QtMobility@@QBE?AVQString@@XZ @ 300 NONAME ; class QString QtMobility::QContactActionFilter::actionName(void) const
-	?addSorted@QContactManagerEngine@QtMobility@@SAXPAV?$QList@VQContact@QtMobility@@@@ABVQContact@2@ABV?$QList@VQContactSortOrder@QtMobility@@@@@Z @ 301 NONAME ; void QtMobility::QContactManagerEngine::addSorted(class QList<class QtMobility::QContact> *, class QtMobility::QContact const &, class QList<class QtMobility::QContactSortOrder> const &)
-	?addedContacts@QContactChangeSet@QtMobility@@QBE?AV?$QSet@I@@XZ @ 302 NONAME ; class QSet<unsigned int> QtMobility::QContactChangeSet::addedContacts(void) const
-	?addedRelationshipsContacts@QContactChangeSet@QtMobility@@QBE?AV?$QSet@I@@XZ @ 303 NONAME ; class QSet<unsigned int> QtMobility::QContactChangeSet::addedRelationshipsContacts(void) const
-	?allowableValues@QContactDetailFieldDefinition@QtMobility@@QBE?AV?$QList@VQVariant@@@@XZ @ 304 NONAME ; class QList<class QVariant> QtMobility::QContactDetailFieldDefinition::allowableValues(void) const
-	?altitude@QContactGeoLocation@QtMobility@@QBENXZ @ 305 NONAME ; double QtMobility::QContactGeoLocation::altitude(void) const
-	?altitudeAccuracy@QContactGeoLocation@QtMobility@@QBENXZ @ 306 NONAME ; double QtMobility::QContactGeoLocation::altitudeAccuracy(void) const
-	?append@QContactIntersectionFilter@QtMobility@@QAEXABVQContactFilter@2@@Z @ 307 NONAME ; void QtMobility::QContactIntersectionFilter::append(class QtMobility::QContactFilter const &)
-	?append@QContactUnionFilter@QtMobility@@QAEXABVQContactFilter@2@@Z @ 308 NONAME ; void QtMobility::QContactUnionFilter::append(class QtMobility::QContactFilter const &)
-	?assign@QContactDetail@QtMobility@@IAEAAV12@ABV12@ABVQString@@@Z @ 309 NONAME ; class QtMobility::QContactDetail & QtMobility::QContactDetail::assign(class QtMobility::QContactDetail const &, class QString const &)
-	?assistantName@QContactOrganization@QtMobility@@QBE?AVQString@@XZ @ 310 NONAME ; class QString QtMobility::QContactOrganization::assistantName(void) const
-	?audioRingtoneUrl@QContactRingtone@QtMobility@@QBE?AVQUrl@@XZ @ 311 NONAME ; class QUrl QtMobility::QContactRingtone::audioRingtoneUrl(void) const
-	?availableActions@QContact@QtMobility@@QBE?AV?$QList@VQContactActionDescriptor@QtMobility@@@@ABVQString@@H@Z @ 312 NONAME ; class QList<class QtMobility::QContactActionDescriptor> QtMobility::QContact::availableActions(class QString const &, int) const
-	?availableActions@QContactAction@QtMobility@@SA?AVQStringList@@ABVQString@@H@Z @ 313 NONAME ; class QStringList QtMobility::QContactAction::availableActions(class QString const &, int)
-	?availableManagers@QContactManager@QtMobility@@SA?AVQStringList@@XZ @ 314 NONAME ; class QStringList QtMobility::QContactManager::availableManagers(void)
-	?blankPolicy@QContactSortOrder@QtMobility@@QBE?AW4BlankPolicy@12@XZ @ 315 NONAME ; enum QtMobility::QContactSortOrder::BlankPolicy QtMobility::QContactSortOrder::blankPolicy(void) const
-	?buildUri@QContactManager@QtMobility@@SA?AVQString@@ABV3@ABV?$QMap@VQString@@V1@@@H@Z @ 316 NONAME ; class QString QtMobility::QContactManager::buildUri(class QString const &, class QMap<class QString, class QString> const &, int)
-	?calendarId@QContactAnniversary@QtMobility@@QBE?AVQString@@XZ @ 317 NONAME ; class QString QtMobility::QContactAnniversary::calendarId(void) const
-	?cancel@QContactAbstractRequest@QtMobility@@QAE_NXZ @ 318 NONAME ; bool QtMobility::QContactAbstractRequest::cancel(void)
-	?cancelRequest@QContactManagerEngine@QtMobility@@UAE_NPAVQContactAbstractRequest@2@@Z @ 319 NONAME ; bool QtMobility::QContactManagerEngine::cancelRequest(class QtMobility::QContactAbstractRequest *)
-	?canonicalizedFilter@QContactManagerEngine@QtMobility@@SA?AVQContactFilter@2@ABV32@@Z @ 320 NONAME ; class QtMobility::QContactFilter QtMobility::QContactManagerEngine::canonicalizedFilter(class QtMobility::QContactFilter const &)
-	?capabilities@QContactOnlineAccount@QtMobility@@QBE?AVQStringList@@XZ @ 321 NONAME ; class QStringList QtMobility::QContactOnlineAccount::capabilities(void) const
-	?caseSensitivity@QContactSortOrder@QtMobility@@QBE?AW4CaseSensitivity@Qt@@XZ @ 322 NONAME ; enum Qt::CaseSensitivity QtMobility::QContactSortOrder::caseSensitivity(void) const
-	?changedContacts@QContactChangeSet@QtMobility@@QBE?AV?$QSet@I@@XZ @ 323 NONAME ; class QSet<unsigned int> QtMobility::QContactChangeSet::changedContacts(void) const
-	?children@QContactFamily@QtMobility@@QBE?AVQStringList@@XZ @ 324 NONAME ; class QStringList QtMobility::QContactFamily::children(void) const
-	?clearAddedContacts@QContactChangeSet@QtMobility@@QAEXXZ @ 325 NONAME ; void QtMobility::QContactChangeSet::clearAddedContacts(void)
-	?clearAddedRelationshipsContacts@QContactChangeSet@QtMobility@@QAEXXZ @ 326 NONAME ; void QtMobility::QContactChangeSet::clearAddedRelationshipsContacts(void)
-	?clearAll@QContactChangeSet@QtMobility@@QAEXXZ @ 327 NONAME ; void QtMobility::QContactChangeSet::clearAll(void)
-	?clearChangedContacts@QContactChangeSet@QtMobility@@QAEXXZ @ 328 NONAME ; void QtMobility::QContactChangeSet::clearChangedContacts(void)
-	?clearDetails@QContact@QtMobility@@QAEXXZ @ 329 NONAME ; void QtMobility::QContact::clearDetails(void)
-	?clearRemovedContacts@QContactChangeSet@QtMobility@@QAEXXZ @ 330 NONAME ; void QtMobility::QContactChangeSet::clearRemovedContacts(void)
-	?clearRemovedRelationshipsContacts@QContactChangeSet@QtMobility@@QAEXXZ @ 331 NONAME ; void QtMobility::QContactChangeSet::clearRemovedRelationshipsContacts(void)
-	?compareContact@QContactManagerEngine@QtMobility@@SAHABVQContact@2@0ABV?$QList@VQContactSortOrder@QtMobility@@@@@Z @ 332 NONAME ; int QtMobility::QContactManagerEngine::compareContact(class QtMobility::QContact const &, class QtMobility::QContact const &, class QList<class QtMobility::QContactSortOrder> const &)
-	?compareVariant@QContactManagerEngine@QtMobility@@SAHABVQVariant@@0W4CaseSensitivity@Qt@@@Z @ 333 NONAME ; int QtMobility::QContactManagerEngine::compareVariant(class QVariant const &, class QVariant const &, enum Qt::CaseSensitivity)
-	?compatibleContact@QContactManager@QtMobility@@QAE?AVQContact@2@ABV32@@Z @ 334 NONAME ; class QtMobility::QContact QtMobility::QContactManager::compatibleContact(class QtMobility::QContact const &)
-	?compatibleContact@QContactManagerEngine@QtMobility@@UBE?AVQContact@2@ABV32@PAW4Error@QContactManager@2@@Z @ 335 NONAME ; class QtMobility::QContact QtMobility::QContactManagerEngine::compatibleContact(class QtMobility::QContact const &, enum QtMobility::QContactManager::Error *) const
-	?contact@QContactManager@QtMobility@@QBE?AVQContact@2@ABIABVQContactFetchHint@2@@Z @ 336 NONAME ; class QtMobility::QContact QtMobility::QContactManager::contact(unsigned int const &, class QtMobility::QContactFetchHint const &) const
-	?contact@QContactManagerEngine@QtMobility@@UBE?AVQContact@2@ABIABVQContactFetchHint@2@PAW4Error@QContactManager@2@@Z @ 337 NONAME ; class QtMobility::QContact QtMobility::QContactManagerEngine::contact(unsigned int const &, class QtMobility::QContactFetchHint const &, enum QtMobility::QContactManager::Error *) const
-	?contactIds@QContactManager@QtMobility@@QBE?AV?$QList@I@@ABV?$QList@VQContactSortOrder@QtMobility@@@@@Z @ 338 NONAME ; class QList<unsigned int> QtMobility::QContactManager::contactIds(class QList<class QtMobility::QContactSortOrder> const &) const
-	?contactIds@QContactManager@QtMobility@@QBE?AV?$QList@I@@ABVQContactFilter@2@ABV?$QList@VQContactSortOrder@QtMobility@@@@@Z @ 339 NONAME ; class QList<unsigned int> QtMobility::QContactManager::contactIds(class QtMobility::QContactFilter const &, class QList<class QtMobility::QContactSortOrder> const &) const
-	?contactIds@QContactManagerEngine@QtMobility@@UBE?AV?$QList@I@@ABVQContactFilter@2@ABV?$QList@VQContactSortOrder@QtMobility@@@@PAW4Error@QContactManager@2@@Z @ 340 NONAME ; class QList<unsigned int> QtMobility::QContactManagerEngine::contactIds(class QtMobility::QContactFilter const &, class QList<class QtMobility::QContactSortOrder> const &, enum QtMobility::QContactManager::Error *) const
-	?contactIds@QContactRemoveRequest@QtMobility@@QBE?AV?$QList@I@@XZ @ 341 NONAME ; class QList<unsigned int> QtMobility::QContactRemoveRequest::contactIds(void) const
-	?contactType@QContactDetailDefinitionFetchRequest@QtMobility@@QBE?AVQString@@XZ @ 342 NONAME ; class QString QtMobility::QContactDetailDefinitionFetchRequest::contactType(void) const
-	?contactType@QContactDetailDefinitionRemoveRequest@QtMobility@@QBE?AVQString@@XZ @ 343 NONAME ; class QString QtMobility::QContactDetailDefinitionRemoveRequest::contactType(void) const
-	?contactType@QContactDetailDefinitionSaveRequest@QtMobility@@QBE?AVQString@@XZ @ 344 NONAME ; class QString QtMobility::QContactDetailDefinitionSaveRequest::contactType(void) const
-	?contacts@QContactFetchRequest@QtMobility@@QBE?AV?$QList@VQContact@QtMobility@@@@XZ @ 345 NONAME ; class QList<class QtMobility::QContact> QtMobility::QContactFetchRequest::contacts(void) const
-	?contacts@QContactManager@QtMobility@@QBE?AV?$QList@VQContact@QtMobility@@@@ABV?$QList@VQContactSortOrder@QtMobility@@@@ABVQContactFetchHint@2@@Z @ 346 NONAME ; class QList<class QtMobility::QContact> QtMobility::QContactManager::contacts(class QList<class QtMobility::QContactSortOrder> const &, class QtMobility::QContactFetchHint const &) const
-	?contacts@QContactManager@QtMobility@@QBE?AV?$QList@VQContact@QtMobility@@@@ABVQContactFilter@2@ABV?$QList@VQContactSortOrder@QtMobility@@@@ABVQContactFetchHint@2@@Z @ 347 NONAME ; class QList<class QtMobility::QContact> QtMobility::QContactManager::contacts(class QtMobility::QContactFilter const &, class QList<class QtMobility::QContactSortOrder> const &, class QtMobility::QContactFetchHint const &) const
-	?contacts@QContactManagerEngine@QtMobility@@UBE?AV?$QList@VQContact@QtMobility@@@@ABVQContactFilter@2@ABV?$QList@VQContactSortOrder@QtMobility@@@@ABVQContactFetchHint@2@PAW4Error@QContactManager@2@@Z @ 348 NONAME ; class QList<class QtMobility::QContact> QtMobility::QContactManagerEngine::contacts(class QtMobility::QContactFilter const &, class QList<class QtMobility::QContactSortOrder> const &, class QtMobility::QContactFetchHint const &, enum QtMobility::QContactManager::Error *) const
-	?contacts@QContactSaveRequest@QtMobility@@QBE?AV?$QList@VQContact@QtMobility@@@@XZ @ 349 NONAME ; class QList<class QtMobility::QContact> QtMobility::QContactSaveRequest::contacts(void) const
-	?contactsAdded@QContactManager@QtMobility@@IAEXABV?$QList@I@@@Z @ 350 NONAME ; void QtMobility::QContactManager::contactsAdded(class QList<unsigned int> const &)
-	?contactsAdded@QContactManagerEngine@QtMobility@@IAEXABV?$QList@I@@@Z @ 351 NONAME ; void QtMobility::QContactManagerEngine::contactsAdded(class QList<unsigned int> const &)
-	?contactsChanged@QContactManager@QtMobility@@IAEXABV?$QList@I@@@Z @ 352 NONAME ; void QtMobility::QContactManager::contactsChanged(class QList<unsigned int> const &)
-	?contactsChanged@QContactManagerEngine@QtMobility@@IAEXABV?$QList@I@@@Z @ 353 NONAME ; void QtMobility::QContactManagerEngine::contactsChanged(class QList<unsigned int> const &)
-	?contactsRemoved@QContactManager@QtMobility@@IAEXABV?$QList@I@@@Z @ 354 NONAME ; void QtMobility::QContactManager::contactsRemoved(class QList<unsigned int> const &)
-	?contactsRemoved@QContactManagerEngine@QtMobility@@IAEXABV?$QList@I@@@Z @ 355 NONAME ; void QtMobility::QContactManagerEngine::contactsRemoved(class QList<unsigned int> const &)
-	?contexts@QContactDetail@QtMobility@@QBE?AVQStringList@@XZ @ 356 NONAME ; class QStringList QtMobility::QContactDetail::contexts(void) const
-	?country@QContactAddress@QtMobility@@QBE?AVQString@@XZ @ 357 NONAME ; class QString QtMobility::QContactAddress::country(void) const
-	?createEngine@QContactManager@QtMobility@@AAEXABVQString@@ABV?$QMap@VQString@@V1@@@@Z @ 358 NONAME ; void QtMobility::QContactManager::createEngine(class QString const &, class QMap<class QString, class QString> const &)
-	?created@QContactTimestamp@QtMobility@@QBE?AVQDateTime@@XZ @ 359 NONAME ; class QDateTime QtMobility::QContactTimestamp::created(void) const
-	?customLabel@QContactName@QtMobility@@QBE?AVQString@@XZ @ 360 NONAME ; class QString QtMobility::QContactName::customLabel(void) const
-	?customMessage@QContactGlobalPresence@QtMobility@@QBE?AVQString@@XZ @ 361 NONAME ; class QString QtMobility::QContactGlobalPresence::customMessage(void) const
-	?customMessage@QContactPresence@QtMobility@@QBE?AVQString@@XZ @ 362 NONAME ; class QString QtMobility::QContactPresence::customMessage(void) const
-	?d_func@QContactActionFilter@QtMobility@@AAEPAVQContactActionFilterPrivate@2@XZ @ 363 NONAME ; class QtMobility::QContactActionFilterPrivate * QtMobility::QContactActionFilter::d_func(void)
-	?d_func@QContactActionFilter@QtMobility@@ABEPBVQContactActionFilterPrivate@2@XZ @ 364 NONAME ; class QtMobility::QContactActionFilterPrivate const * QtMobility::QContactActionFilter::d_func(void) const
-	?d_func@QContactChangeLogFilter@QtMobility@@AAEPAVQContactChangeLogFilterPrivate@2@XZ @ 365 NONAME ; class QtMobility::QContactChangeLogFilterPrivate * QtMobility::QContactChangeLogFilter::d_func(void)
-	?d_func@QContactChangeLogFilter@QtMobility@@ABEPBVQContactChangeLogFilterPrivate@2@XZ @ 366 NONAME ; class QtMobility::QContactChangeLogFilterPrivate const * QtMobility::QContactChangeLogFilter::d_func(void) const
-	?d_func@QContactDetailDefinitionFetchRequest@QtMobility@@AAEPAVQContactDetailDefinitionFetchRequestPrivate@2@XZ @ 367 NONAME ; class QtMobility::QContactDetailDefinitionFetchRequestPrivate * QtMobility::QContactDetailDefinitionFetchRequest::d_func(void)
-	?d_func@QContactDetailDefinitionFetchRequest@QtMobility@@ABEPBVQContactDetailDefinitionFetchRequestPrivate@2@XZ @ 368 NONAME ; class QtMobility::QContactDetailDefinitionFetchRequestPrivate const * QtMobility::QContactDetailDefinitionFetchRequest::d_func(void) const
-	?d_func@QContactDetailDefinitionRemoveRequest@QtMobility@@AAEPAVQContactDetailDefinitionRemoveRequestPrivate@2@XZ @ 369 NONAME ; class QtMobility::QContactDetailDefinitionRemoveRequestPrivate * QtMobility::QContactDetailDefinitionRemoveRequest::d_func(void)
-	?d_func@QContactDetailDefinitionRemoveRequest@QtMobility@@ABEPBVQContactDetailDefinitionRemoveRequestPrivate@2@XZ @ 370 NONAME ; class QtMobility::QContactDetailDefinitionRemoveRequestPrivate const * QtMobility::QContactDetailDefinitionRemoveRequest::d_func(void) const
-	?d_func@QContactDetailDefinitionSaveRequest@QtMobility@@AAEPAVQContactDetailDefinitionSaveRequestPrivate@2@XZ @ 371 NONAME ; class QtMobility::QContactDetailDefinitionSaveRequestPrivate * QtMobility::QContactDetailDefinitionSaveRequest::d_func(void)
-	?d_func@QContactDetailDefinitionSaveRequest@QtMobility@@ABEPBVQContactDetailDefinitionSaveRequestPrivate@2@XZ @ 372 NONAME ; class QtMobility::QContactDetailDefinitionSaveRequestPrivate const * QtMobility::QContactDetailDefinitionSaveRequest::d_func(void) const
-	?d_func@QContactDetailFilter@QtMobility@@AAEPAVQContactDetailFilterPrivate@2@XZ @ 373 NONAME ; class QtMobility::QContactDetailFilterPrivate * QtMobility::QContactDetailFilter::d_func(void)
-	?d_func@QContactDetailFilter@QtMobility@@ABEPBVQContactDetailFilterPrivate@2@XZ @ 374 NONAME ; class QtMobility::QContactDetailFilterPrivate const * QtMobility::QContactDetailFilter::d_func(void) const
-	?d_func@QContactDetailRangeFilter@QtMobility@@AAEPAVQContactDetailRangeFilterPrivate@2@XZ @ 375 NONAME ; class QtMobility::QContactDetailRangeFilterPrivate * QtMobility::QContactDetailRangeFilter::d_func(void)
-	?d_func@QContactDetailRangeFilter@QtMobility@@ABEPBVQContactDetailRangeFilterPrivate@2@XZ @ 376 NONAME ; class QtMobility::QContactDetailRangeFilterPrivate const * QtMobility::QContactDetailRangeFilter::d_func(void) const
-	?d_func@QContactFetchRequest@QtMobility@@AAEPAVQContactFetchRequestPrivate@2@XZ @ 377 NONAME ; class QtMobility::QContactFetchRequestPrivate * QtMobility::QContactFetchRequest::d_func(void)
-	?d_func@QContactFetchRequest@QtMobility@@ABEPBVQContactFetchRequestPrivate@2@XZ @ 378 NONAME ; class QtMobility::QContactFetchRequestPrivate const * QtMobility::QContactFetchRequest::d_func(void) const
-	?d_func@QContactIntersectionFilter@QtMobility@@AAEPAVQContactIntersectionFilterPrivate@2@XZ @ 379 NONAME ; class QtMobility::QContactIntersectionFilterPrivate * QtMobility::QContactIntersectionFilter::d_func(void)
-	?d_func@QContactIntersectionFilter@QtMobility@@ABEPBVQContactIntersectionFilterPrivate@2@XZ @ 380 NONAME ; class QtMobility::QContactIntersectionFilterPrivate const * QtMobility::QContactIntersectionFilter::d_func(void) const
-	?d_func@QContactLocalIdFetchRequest@QtMobility@@AAEPAVQContactLocalIdFetchRequestPrivate@2@XZ @ 381 NONAME ; class QtMobility::QContactLocalIdFetchRequestPrivate * QtMobility::QContactLocalIdFetchRequest::d_func(void)
-	?d_func@QContactLocalIdFetchRequest@QtMobility@@ABEPBVQContactLocalIdFetchRequestPrivate@2@XZ @ 382 NONAME ; class QtMobility::QContactLocalIdFetchRequestPrivate const * QtMobility::QContactLocalIdFetchRequest::d_func(void) const
-	?d_func@QContactLocalIdFilter@QtMobility@@AAEPAVQContactLocalIdFilterPrivate@2@XZ @ 383 NONAME ; class QtMobility::QContactLocalIdFilterPrivate * QtMobility::QContactLocalIdFilter::d_func(void)
-	?d_func@QContactLocalIdFilter@QtMobility@@ABEPBVQContactLocalIdFilterPrivate@2@XZ @ 384 NONAME ; class QtMobility::QContactLocalIdFilterPrivate const * QtMobility::QContactLocalIdFilter::d_func(void) const
-	?d_func@QContactRelationshipFetchRequest@QtMobility@@AAEPAVQContactRelationshipFetchRequestPrivate@2@XZ @ 385 NONAME ; class QtMobility::QContactRelationshipFetchRequestPrivate * QtMobility::QContactRelationshipFetchRequest::d_func(void)
-	?d_func@QContactRelationshipFetchRequest@QtMobility@@ABEPBVQContactRelationshipFetchRequestPrivate@2@XZ @ 386 NONAME ; class QtMobility::QContactRelationshipFetchRequestPrivate const * QtMobility::QContactRelationshipFetchRequest::d_func(void) const
-	?d_func@QContactRelationshipFilter@QtMobility@@AAEPAVQContactRelationshipFilterPrivate@2@XZ @ 387 NONAME ; class QtMobility::QContactRelationshipFilterPrivate * QtMobility::QContactRelationshipFilter::d_func(void)
-	?d_func@QContactRelationshipFilter@QtMobility@@ABEPBVQContactRelationshipFilterPrivate@2@XZ @ 388 NONAME ; class QtMobility::QContactRelationshipFilterPrivate const * QtMobility::QContactRelationshipFilter::d_func(void) const
-	?d_func@QContactRelationshipRemoveRequest@QtMobility@@AAEPAVQContactRelationshipRemoveRequestPrivate@2@XZ @ 389 NONAME ; class QtMobility::QContactRelationshipRemoveRequestPrivate * QtMobility::QContactRelationshipRemoveRequest::d_func(void)
-	?d_func@QContactRelationshipRemoveRequest@QtMobility@@ABEPBVQContactRelationshipRemoveRequestPrivate@2@XZ @ 390 NONAME ; class QtMobility::QContactRelationshipRemoveRequestPrivate const * QtMobility::QContactRelationshipRemoveRequest::d_func(void) const
-	?d_func@QContactRelationshipSaveRequest@QtMobility@@AAEPAVQContactRelationshipSaveRequestPrivate@2@XZ @ 391 NONAME ; class QtMobility::QContactRelationshipSaveRequestPrivate * QtMobility::QContactRelationshipSaveRequest::d_func(void)
-	?d_func@QContactRelationshipSaveRequest@QtMobility@@ABEPBVQContactRelationshipSaveRequestPrivate@2@XZ @ 392 NONAME ; class QtMobility::QContactRelationshipSaveRequestPrivate const * QtMobility::QContactRelationshipSaveRequest::d_func(void) const
-	?d_func@QContactRemoveRequest@QtMobility@@AAEPAVQContactRemoveRequestPrivate@2@XZ @ 393 NONAME ; class QtMobility::QContactRemoveRequestPrivate * QtMobility::QContactRemoveRequest::d_func(void)
-	?d_func@QContactRemoveRequest@QtMobility@@ABEPBVQContactRemoveRequestPrivate@2@XZ @ 394 NONAME ; class QtMobility::QContactRemoveRequestPrivate const * QtMobility::QContactRemoveRequest::d_func(void) const
-	?d_func@QContactSaveRequest@QtMobility@@AAEPAVQContactSaveRequestPrivate@2@XZ @ 395 NONAME ; class QtMobility::QContactSaveRequestPrivate * QtMobility::QContactSaveRequest::d_func(void)
-	?d_func@QContactSaveRequest@QtMobility@@ABEPBVQContactSaveRequestPrivate@2@XZ @ 396 NONAME ; class QtMobility::QContactSaveRequestPrivate const * QtMobility::QContactSaveRequest::d_func(void) const
-	?d_func@QContactUnionFilter@QtMobility@@AAEPAVQContactUnionFilterPrivate@2@XZ @ 397 NONAME ; class QtMobility::QContactUnionFilterPrivate * QtMobility::QContactUnionFilter::d_func(void)
-	?d_func@QContactUnionFilter@QtMobility@@ABEPBVQContactUnionFilterPrivate@2@XZ @ 398 NONAME ; class QtMobility::QContactUnionFilterPrivate const * QtMobility::QContactUnionFilter::d_func(void) const
-	?dataChanged@QContactChangeSet@QtMobility@@QAE_NXZ @ 399 NONAME ; bool QtMobility::QContactChangeSet::dataChanged(void)
-	?dataChanged@QContactManager@QtMobility@@IAEXXZ @ 400 NONAME ; void QtMobility::QContactManager::dataChanged(void)
-	?dataChanged@QContactManagerEngine@QtMobility@@IAEXXZ @ 401 NONAME ; void QtMobility::QContactManagerEngine::dataChanged(void)
-	?dataType@QContactDetailFieldDefinition@QtMobility@@QBE?AW4Type@QVariant@@XZ @ 402 NONAME ; enum QVariant::Type QtMobility::QContactDetailFieldDefinition::dataType(void) const
-	?date@QContactBirthday@QtMobility@@QBE?AVQDate@@XZ @ 403 NONAME ; class QDate QtMobility::QContactBirthday::date(void) const
-	?definitionName@QContactDetail@QtMobility@@QBE?AVQString@@XZ @ 404 NONAME ; class QString QtMobility::QContactDetail::definitionName(void) const
-	?definitionNames@QContactDetailDefinitionFetchRequest@QtMobility@@QBE?AVQStringList@@XZ @ 405 NONAME ; class QStringList QtMobility::QContactDetailDefinitionFetchRequest::definitionNames(void) const
-	?definitionNames@QContactDetailDefinitionRemoveRequest@QtMobility@@QBE?AVQStringList@@XZ @ 406 NONAME ; class QStringList QtMobility::QContactDetailDefinitionRemoveRequest::definitionNames(void) const
-	?definitions@QContactDetailDefinitionFetchRequest@QtMobility@@QBE?AV?$QMap@VQString@@VQContactDetailDefinition@QtMobility@@@@XZ @ 407 NONAME ; class QMap<class QString, class QtMobility::QContactDetailDefinition> QtMobility::QContactDetailDefinitionFetchRequest::definitions(void) const
-	?definitions@QContactDetailDefinitionSaveRequest@QtMobility@@QBE?AV?$QList@VQContactDetailDefinition@QtMobility@@@@XZ @ 408 NONAME ; class QList<class QtMobility::QContactDetailDefinition> QtMobility::QContactDetailDefinitionSaveRequest::definitions(void) const
-	?department@QContactOrganization@QtMobility@@QBE?AVQStringList@@XZ @ 409 NONAME ; class QStringList QtMobility::QContactOrganization::department(void) const
-	?detail@QContact@QtMobility@@QBE?AVQContactDetail@2@ABVQString@@@Z @ 410 NONAME ; class QtMobility::QContactDetail QtMobility::QContact::detail(class QString const &) const
-	?detailDefinition@QContactManager@QtMobility@@QBE?AVQContactDetailDefinition@2@ABVQString@@0@Z @ 411 NONAME ; class QtMobility::QContactDetailDefinition QtMobility::QContactManager::detailDefinition(class QString const &, class QString const &) const
-	?detailDefinition@QContactManagerEngine@QtMobility@@UBE?AVQContactDetailDefinition@2@ABVQString@@0PAW4Error@QContactManager@2@@Z @ 412 NONAME ; class QtMobility::QContactDetailDefinition QtMobility::QContactManagerEngine::detailDefinition(class QString const &, class QString const &, enum QtMobility::QContactManager::Error *) const
-	?detailDefinitionName@QContactDetailFilter@QtMobility@@QBE?AVQString@@XZ @ 413 NONAME ; class QString QtMobility::QContactDetailFilter::detailDefinitionName(void) const
-	?detailDefinitionName@QContactDetailRangeFilter@QtMobility@@QBE?AVQString@@XZ @ 414 NONAME ; class QString QtMobility::QContactDetailRangeFilter::detailDefinitionName(void) const
-	?detailDefinitionName@QContactSortOrder@QtMobility@@QBE?AVQString@@XZ @ 415 NONAME ; class QString QtMobility::QContactSortOrder::detailDefinitionName(void) const
-	?detailDefinitions@QContactManager@QtMobility@@QBE?AV?$QMap@VQString@@VQContactDetailDefinition@QtMobility@@@@ABVQString@@@Z @ 416 NONAME ; class QMap<class QString, class QtMobility::QContactDetailDefinition> QtMobility::QContactManager::detailDefinitions(class QString const &) const
-	?detailDefinitions@QContactManagerEngine@QtMobility@@UBE?AV?$QMap@VQString@@VQContactDetailDefinition@QtMobility@@@@ABVQString@@PAW4Error@QContactManager@2@@Z @ 417 NONAME ; class QMap<class QString, class QtMobility::QContactDetailDefinition> QtMobility::QContactManagerEngine::detailDefinitions(class QString const &, enum QtMobility::QContactManager::Error *) const
-	?detailDefinitionsHint@QContactFetchHint@QtMobility@@QBE?AVQStringList@@XZ @ 418 NONAME ; class QStringList QtMobility::QContactFetchHint::detailDefinitionsHint(void) const
-	?detailFieldName@QContactDetailFilter@QtMobility@@QBE?AVQString@@XZ @ 419 NONAME ; class QString QtMobility::QContactDetailFilter::detailFieldName(void) const
-	?detailFieldName@QContactDetailRangeFilter@QtMobility@@QBE?AVQString@@XZ @ 420 NONAME ; class QString QtMobility::QContactDetailRangeFilter::detailFieldName(void) const
-	?detailFieldName@QContactSortOrder@QtMobility@@QBE?AVQString@@XZ @ 421 NONAME ; class QString QtMobility::QContactSortOrder::detailFieldName(void) const
-	?detailUri@QContactDetail@QtMobility@@QBE?AVQString@@XZ @ 422 NONAME ; class QString QtMobility::QContactDetail::detailUri(void) const
-	?detailWithAction@QContact@QtMobility@@QBE?AVQContactDetail@2@ABVQString@@@Z @ 423 NONAME ; class QtMobility::QContactDetail QtMobility::QContact::detailWithAction(class QString const &) const
-	?details@QContact@QtMobility@@QBE?AV?$QList@VQContactDetail@QtMobility@@@@ABVQString@@00@Z @ 424 NONAME ; class QList<class QtMobility::QContactDetail> QtMobility::QContact::details(class QString const &, class QString const &, class QString const &) const
-	?details@QContact@QtMobility@@QBE?AV?$QList@VQContactDetail@QtMobility@@@@ABVQString@@@Z @ 425 NONAME ; class QList<class QtMobility::QContactDetail> QtMobility::QContact::details(class QString const &) const
-	?detailsWithAction@QContact@QtMobility@@QBE?AV?$QList@VQContactDetail@QtMobility@@@@ABVQString@@@Z @ 426 NONAME ; class QList<class QtMobility::QContactDetail> QtMobility::QContact::detailsWithAction(class QString const &) const
-	?direction@QContactSortOrder@QtMobility@@QBE?AW4SortOrder@Qt@@XZ @ 427 NONAME ; enum Qt::SortOrder QtMobility::QContactSortOrder::direction(void) const
-	?displayLabel@QContact@QtMobility@@QBE?AVQString@@XZ @ 428 NONAME ; class QString QtMobility::QContact::displayLabel(void) const
-	?emailAddress@QContactEmailAddress@QtMobility@@QBE?AVQString@@XZ @ 429 NONAME ; class QString QtMobility::QContactEmailAddress::emailAddress(void) const
-	?emitSignals@QContactChangeSet@QtMobility@@QAEXPAVQContactManagerEngine@2@@Z @ 430 NONAME ; void QtMobility::QContactChangeSet::emitSignals(class QtMobility::QContactManagerEngine *)
-	?error@QContactAbstractRequest@QtMobility@@QBE?AW4Error@QContactManager@2@XZ @ 431 NONAME ; enum QtMobility::QContactManager::Error QtMobility::QContactAbstractRequest::error(void) const
-	?error@QContactManager@QtMobility@@QBE?AW4Error@12@XZ @ 432 NONAME ; enum QtMobility::QContactManager::Error QtMobility::QContactManager::error(void) const
-	?errorMap@QContactDetailDefinitionFetchRequest@QtMobility@@QBE?AV?$QMap@HW4Error@QContactManager@QtMobility@@@@XZ @ 433 NONAME ; class QMap<int, enum QtMobility::QContactManager::Error> QtMobility::QContactDetailDefinitionFetchRequest::errorMap(void) const
-	?errorMap@QContactDetailDefinitionRemoveRequest@QtMobility@@QBE?AV?$QMap@HW4Error@QContactManager@QtMobility@@@@XZ @ 434 NONAME ; class QMap<int, enum QtMobility::QContactManager::Error> QtMobility::QContactDetailDefinitionRemoveRequest::errorMap(void) const
-	?errorMap@QContactDetailDefinitionSaveRequest@QtMobility@@QBE?AV?$QMap@HW4Error@QContactManager@QtMobility@@@@XZ @ 435 NONAME ; class QMap<int, enum QtMobility::QContactManager::Error> QtMobility::QContactDetailDefinitionSaveRequest::errorMap(void) const
-	?errorMap@QContactRelationshipRemoveRequest@QtMobility@@QBE?AV?$QMap@HW4Error@QContactManager@QtMobility@@@@XZ @ 436 NONAME ; class QMap<int, enum QtMobility::QContactManager::Error> QtMobility::QContactRelationshipRemoveRequest::errorMap(void) const
-	?errorMap@QContactRelationshipSaveRequest@QtMobility@@QBE?AV?$QMap@HW4Error@QContactManager@QtMobility@@@@XZ @ 437 NONAME ; class QMap<int, enum QtMobility::QContactManager::Error> QtMobility::QContactRelationshipSaveRequest::errorMap(void) const
-	?errorMap@QContactRemoveRequest@QtMobility@@QBE?AV?$QMap@HW4Error@QContactManager@QtMobility@@@@XZ @ 438 NONAME ; class QMap<int, enum QtMobility::QContactManager::Error> QtMobility::QContactRemoveRequest::errorMap(void) const
-	?errorMap@QContactSaveRequest@QtMobility@@QBE?AV?$QMap@HW4Error@QContactManager@QtMobility@@@@XZ @ 439 NONAME ; class QMap<int, enum QtMobility::QContactManager::Error> QtMobility::QContactSaveRequest::errorMap(void) const
-	?event@QContactAnniversary@QtMobility@@QBE?AVQString@@XZ @ 440 NONAME ; class QString QtMobility::QContactAnniversary::event(void) const
-	?eventType@QContactChangeLogFilter@QtMobility@@QBE?AW4EventType@12@XZ @ 441 NONAME ; enum QtMobility::QContactChangeLogFilter::EventType QtMobility::QContactChangeLogFilter::eventType(void) const
-	?fetchHint@QContactFetchRequest@QtMobility@@QBE?AVQContactFetchHint@2@XZ @ 442 NONAME ; class QtMobility::QContactFetchHint QtMobility::QContactFetchRequest::fetchHint(void) const
-	?fields@QContactDetailDefinition@QtMobility@@QBE?AV?$QMap@VQString@@VQContactDetailFieldDefinition@QtMobility@@@@XZ @ 443 NONAME ; class QMap<class QString, class QtMobility::QContactDetailFieldDefinition> QtMobility::QContactDetailDefinition::fields(void) const
-	?filter@QContactFetchRequest@QtMobility@@QBE?AVQContactFilter@2@XZ @ 444 NONAME ; class QtMobility::QContactFilter QtMobility::QContactFetchRequest::filter(void) const
-	?filter@QContactLocalIdFetchRequest@QtMobility@@QBE?AVQContactFilter@2@XZ @ 445 NONAME ; class QtMobility::QContactFilter QtMobility::QContactLocalIdFetchRequest::filter(void) const
-	?filters@QContactIntersectionFilter@QtMobility@@QBE?AV?$QList@VQContactFilter@QtMobility@@@@XZ @ 446 NONAME ; class QList<class QtMobility::QContactFilter> QtMobility::QContactIntersectionFilter::filters(void) const
-	?filters@QContactUnionFilter@QtMobility@@QBE?AV?$QList@VQContactFilter@QtMobility@@@@XZ @ 447 NONAME ; class QList<class QtMobility::QContactFilter> QtMobility::QContactUnionFilter::filters(void) const
-	?first@QContactRelationship@QtMobility@@QBE?AVQContactId@2@XZ @ 448 NONAME ; class QtMobility::QContactId QtMobility::QContactRelationship::first(void) const
-	?first@QContactRelationshipFetchRequest@QtMobility@@QBE?AVQContactId@2@XZ @ 449 NONAME ; class QtMobility::QContactId QtMobility::QContactRelationshipFetchRequest::first(void) const
-	?firstName@QContactName@QtMobility@@QBE?AVQString@@XZ @ 450 NONAME ; class QString QtMobility::QContactName::firstName(void) const
-	?fromUri@QContactManager@QtMobility@@SAPAV12@ABVQString@@PAVQObject@@@Z @ 451 NONAME ; class QtMobility::QContactManager * QtMobility::QContactManager::fromUri(class QString const &, class QObject *)
-	?gender@QContactGender@QtMobility@@QBE?AVQString@@XZ @ 452 NONAME ; class QString QtMobility::QContactGender::gender(void) const
-	?getStaticMetaObject@QContactAbstractRequest@QtMobility@@SAABUQMetaObject@@XZ @ 453 NONAME ; struct QMetaObject const & QtMobility::QContactAbstractRequest::getStaticMetaObject(void)
-	?getStaticMetaObject@QContactAction@QtMobility@@SAABUQMetaObject@@XZ @ 454 NONAME ; struct QMetaObject const & QtMobility::QContactAction::getStaticMetaObject(void)
-	?getStaticMetaObject@QContactActionFactory@QtMobility@@SAABUQMetaObject@@XZ @ 455 NONAME ; struct QMetaObject const & QtMobility::QContactActionFactory::getStaticMetaObject(void)
-	?getStaticMetaObject@QContactDetailDefinitionFetchRequest@QtMobility@@SAABUQMetaObject@@XZ @ 456 NONAME ; struct QMetaObject const & QtMobility::QContactDetailDefinitionFetchRequest::getStaticMetaObject(void)
-	?getStaticMetaObject@QContactDetailDefinitionRemoveRequest@QtMobility@@SAABUQMetaObject@@XZ @ 457 NONAME ; struct QMetaObject const & QtMobility::QContactDetailDefinitionRemoveRequest::getStaticMetaObject(void)
-	?getStaticMetaObject@QContactDetailDefinitionSaveRequest@QtMobility@@SAABUQMetaObject@@XZ @ 458 NONAME ; struct QMetaObject const & QtMobility::QContactDetailDefinitionSaveRequest::getStaticMetaObject(void)
-	?getStaticMetaObject@QContactFetchRequest@QtMobility@@SAABUQMetaObject@@XZ @ 459 NONAME ; struct QMetaObject const & QtMobility::QContactFetchRequest::getStaticMetaObject(void)
-	?getStaticMetaObject@QContactLocalIdFetchRequest@QtMobility@@SAABUQMetaObject@@XZ @ 460 NONAME ; struct QMetaObject const & QtMobility::QContactLocalIdFetchRequest::getStaticMetaObject(void)
-	?getStaticMetaObject@QContactManager@QtMobility@@SAABUQMetaObject@@XZ @ 461 NONAME ; struct QMetaObject const & QtMobility::QContactManager::getStaticMetaObject(void)
-	?getStaticMetaObject@QContactManagerEngine@QtMobility@@SAABUQMetaObject@@XZ @ 462 NONAME ; struct QMetaObject const & QtMobility::QContactManagerEngine::getStaticMetaObject(void)
-	?getStaticMetaObject@QContactRelationshipFetchRequest@QtMobility@@SAABUQMetaObject@@XZ @ 463 NONAME ; struct QMetaObject const & QtMobility::QContactRelationshipFetchRequest::getStaticMetaObject(void)
-	?getStaticMetaObject@QContactRelationshipRemoveRequest@QtMobility@@SAABUQMetaObject@@XZ @ 464 NONAME ; struct QMetaObject const & QtMobility::QContactRelationshipRemoveRequest::getStaticMetaObject(void)
-	?getStaticMetaObject@QContactRelationshipSaveRequest@QtMobility@@SAABUQMetaObject@@XZ @ 465 NONAME ; struct QMetaObject const & QtMobility::QContactRelationshipSaveRequest::getStaticMetaObject(void)
-	?getStaticMetaObject@QContactRemoveRequest@QtMobility@@SAABUQMetaObject@@XZ @ 466 NONAME ; struct QMetaObject const & QtMobility::QContactRemoveRequest::getStaticMetaObject(void)
-	?getStaticMetaObject@QContactSaveRequest@QtMobility@@SAABUQMetaObject@@XZ @ 467 NONAME ; struct QMetaObject const & QtMobility::QContactSaveRequest::getStaticMetaObject(void)
-	?guid@QContactGuid@QtMobility@@QBE?AVQString@@XZ @ 468 NONAME ; class QString QtMobility::QContactGuid::guid(void) const
-	?hasFeature@QContactManager@QtMobility@@QBE_NW4ManagerFeature@12@ABVQString@@@Z @ 469 NONAME ; bool QtMobility::QContactManager::hasFeature(enum QtMobility::QContactManager::ManagerFeature, class QString const &) const
-	?hasFeature@QContactManagerEngine@QtMobility@@UBE_NW4ManagerFeature@QContactManager@2@ABVQString@@@Z @ 470 NONAME ; bool QtMobility::QContactManagerEngine::hasFeature(enum QtMobility::QContactManager::ManagerFeature, class QString const &) const
-	?hasValue@QContactDetail@QtMobility@@QBE_NABVQString@@@Z @ 471 NONAME ; bool QtMobility::QContactDetail::hasValue(class QString const &) const
-	?heading@QContactGeoLocation@QtMobility@@QBENXZ @ 472 NONAME ; double QtMobility::QContactGeoLocation::heading(void) const
-	?id@QContact@QtMobility@@QBE?AVQContactId@2@XZ @ 473 NONAME ; class QtMobility::QContactId QtMobility::QContact::id(void) const
-	?ids@QContactLocalIdFetchRequest@QtMobility@@QBE?AV?$QList@I@@XZ @ 474 NONAME ; class QList<unsigned int> QtMobility::QContactLocalIdFetchRequest::ids(void) const
-	?ids@QContactLocalIdFilter@QtMobility@@QBE?AV?$QList@I@@XZ @ 475 NONAME ; class QList<unsigned int> QtMobility::QContactLocalIdFilter::ids(void) const
-	?imageUrl@QContactAvatar@QtMobility@@QBE?AVQUrl@@XZ @ 476 NONAME ; class QUrl QtMobility::QContactAvatar::imageUrl(void) const
-	?implementationVersion@QContactActionDescriptor@QtMobility@@QBEHXZ @ 477 NONAME ; int QtMobility::QContactActionDescriptor::implementationVersion(void) const
-	?implementationVersion@QContactActionFilter@QtMobility@@QBEHXZ @ 478 NONAME ; int QtMobility::QContactActionFilter::implementationVersion(void) const
-	?insertAddedContact@QContactChangeSet@QtMobility@@QAEXI@Z @ 479 NONAME ; void QtMobility::QContactChangeSet::insertAddedContact(unsigned int)
-	?insertAddedContacts@QContactChangeSet@QtMobility@@QAEXABV?$QList@I@@@Z @ 480 NONAME ; void QtMobility::QContactChangeSet::insertAddedContacts(class QList<unsigned int> const &)
-	?insertAddedRelationshipsContact@QContactChangeSet@QtMobility@@QAEXI@Z @ 481 NONAME ; void QtMobility::QContactChangeSet::insertAddedRelationshipsContact(unsigned int)
-	?insertAddedRelationshipsContacts@QContactChangeSet@QtMobility@@QAEXABV?$QList@I@@@Z @ 482 NONAME ; void QtMobility::QContactChangeSet::insertAddedRelationshipsContacts(class QList<unsigned int> const &)
-	?insertChangedContact@QContactChangeSet@QtMobility@@QAEXI@Z @ 483 NONAME ; void QtMobility::QContactChangeSet::insertChangedContact(unsigned int)
-	?insertChangedContacts@QContactChangeSet@QtMobility@@QAEXABV?$QList@I@@@Z @ 484 NONAME ; void QtMobility::QContactChangeSet::insertChangedContacts(class QList<unsigned int> const &)
-	?insertField@QContactDetailDefinition@QtMobility@@QAEXABVQString@@ABVQContactDetailFieldDefinition@2@@Z @ 485 NONAME ; void QtMobility::QContactDetailDefinition::insertField(class QString const &, class QtMobility::QContactDetailFieldDefinition const &)
-	?insertRemovedContact@QContactChangeSet@QtMobility@@QAEXI@Z @ 486 NONAME ; void QtMobility::QContactChangeSet::insertRemovedContact(unsigned int)
-	?insertRemovedContacts@QContactChangeSet@QtMobility@@QAEXABV?$QList@I@@@Z @ 487 NONAME ; void QtMobility::QContactChangeSet::insertRemovedContacts(class QList<unsigned int> const &)
-	?insertRemovedRelationshipsContact@QContactChangeSet@QtMobility@@QAEXI@Z @ 488 NONAME ; void QtMobility::QContactChangeSet::insertRemovedRelationshipsContact(unsigned int)
-	?insertRemovedRelationshipsContacts@QContactChangeSet@QtMobility@@QAEXABV?$QList@I@@@Z @ 489 NONAME ; void QtMobility::QContactChangeSet::insertRemovedRelationshipsContacts(class QList<unsigned int> const &)
-	?isActive@QContactAbstractRequest@QtMobility@@QBE_NXZ @ 490 NONAME ; bool QtMobility::QContactAbstractRequest::isActive(void) const
-	?isCanceled@QContactAbstractRequest@QtMobility@@QBE_NXZ @ 491 NONAME ; bool QtMobility::QContactAbstractRequest::isCanceled(void) const
-	?isEmpty@QContact@QtMobility@@QBE_NXZ @ 492 NONAME ; bool QtMobility::QContact::isEmpty(void) const
-	?isEmpty@QContactActionDescriptor@QtMobility@@QBE_NXZ @ 493 NONAME ; bool QtMobility::QContactActionDescriptor::isEmpty(void) const
-	?isEmpty@QContactDetail@QtMobility@@QBE_NXZ @ 494 NONAME ; bool QtMobility::QContactDetail::isEmpty(void) const
-	?isEmpty@QContactDetailDefinition@QtMobility@@QBE_NXZ @ 495 NONAME ; bool QtMobility::QContactDetailDefinition::isEmpty(void) const
-	?isFilterSupported@QContactManager@QtMobility@@QBE_NABVQContactFilter@2@@Z @ 496 NONAME ; bool QtMobility::QContactManager::isFilterSupported(class QtMobility::QContactFilter const &) const
-	?isFilterSupported@QContactManagerEngine@QtMobility@@UBE_NABVQContactFilter@2@@Z @ 497 NONAME ; bool QtMobility::QContactManagerEngine::isFilterSupported(class QtMobility::QContactFilter const &) const
-	?isFinished@QContactAbstractRequest@QtMobility@@QBE_NXZ @ 498 NONAME ; bool QtMobility::QContactAbstractRequest::isFinished(void) const
-	?isInactive@QContactAbstractRequest@QtMobility@@QBE_NXZ @ 499 NONAME ; bool QtMobility::QContactAbstractRequest::isInactive(void) const
-	?isPreferredDetail@QContact@QtMobility@@QBE_NABVQString@@ABVQContactDetail@2@@Z @ 500 NONAME ; bool QtMobility::QContact::isPreferredDetail(class QString const &, class QtMobility::QContactDetail const &) const
-	?isRelationshipTypeSupported@QContactManager@QtMobility@@QBE_NABVQString@@0@Z @ 501 NONAME ; bool QtMobility::QContactManager::isRelationshipTypeSupported(class QString const &, class QString const &) const
-	?isRelationshipTypeSupported@QContactManagerEngine@QtMobility@@UBE_NABVQString@@0@Z @ 502 NONAME ; bool QtMobility::QContactManagerEngine::isRelationshipTypeSupported(class QString const &, class QString const &) const
-	?isUnique@QContactDetailDefinition@QtMobility@@QBE_NXZ @ 503 NONAME ; bool QtMobility::QContactDetailDefinition::isUnique(void) const
-	?isValid@QContactSortOrder@QtMobility@@QBE_NXZ @ 504 NONAME ; bool QtMobility::QContactSortOrder::isValid(void) const
-	?key@QContactDetail@QtMobility@@QBEHXZ @ 505 NONAME ; int QtMobility::QContactDetail::key(void) const
-	?label@QContactDisplayLabel@QtMobility@@QBE?AVQString@@XZ @ 506 NONAME ; class QString QtMobility::QContactDisplayLabel::label(void) const
-	?label@QContactGeoLocation@QtMobility@@QBE?AVQString@@XZ @ 507 NONAME ; class QString QtMobility::QContactGeoLocation::label(void) const
-	?lastModified@QContactTimestamp@QtMobility@@QBE?AVQDateTime@@XZ @ 508 NONAME ; class QDateTime QtMobility::QContactTimestamp::lastModified(void) const
-	?lastName@QContactName@QtMobility@@QBE?AVQString@@XZ @ 509 NONAME ; class QString QtMobility::QContactName::lastName(void) const
-	?latitude@QContactGeoLocation@QtMobility@@QBENXZ @ 510 NONAME ; double QtMobility::QContactGeoLocation::latitude(void) const
-	?linkedDetailUris@QContactDetail@QtMobility@@QBE?AVQStringList@@XZ @ 511 NONAME ; class QStringList QtMobility::QContactDetail::linkedDetailUris(void) const
-	?localId@QContact@QtMobility@@QBEIXZ @ 512 NONAME ; unsigned int QtMobility::QContact::localId(void) const
-	?localId@QContactId@QtMobility@@QBEIXZ @ 513 NONAME ; unsigned int QtMobility::QContactId::localId(void) const
-	?locality@QContactAddress@QtMobility@@QBE?AVQString@@XZ @ 514 NONAME ; class QString QtMobility::QContactAddress::locality(void) const
-	?location@QContactOrganization@QtMobility@@QBE?AVQString@@XZ @ 515 NONAME ; class QString QtMobility::QContactOrganization::location(void) const
-	?logoUrl@QContactOrganization@QtMobility@@QBE?AVQUrl@@XZ @ 516 NONAME ; class QUrl QtMobility::QContactOrganization::logoUrl(void) const
-	?longitude@QContactGeoLocation@QtMobility@@QBENXZ @ 517 NONAME ; double QtMobility::QContactGeoLocation::longitude(void) const
-	?manager@QContactAbstractRequest@QtMobility@@QBEPAVQContactManager@2@XZ @ 518 NONAME ; class QtMobility::QContactManager * QtMobility::QContactAbstractRequest::manager(void) const
-	?managerName@QContactManager@QtMobility@@QBE?AVQString@@XZ @ 519 NONAME ; class QString QtMobility::QContactManager::managerName(void) const
-	?managerName@QContactManagerEngine@QtMobility@@UBE?AVQString@@XZ @ 520 NONAME ; class QString QtMobility::QContactManagerEngine::managerName(void) const
-	?managerParameters@QContactManager@QtMobility@@QBE?AV?$QMap@VQString@@V1@@@XZ @ 521 NONAME ; class QMap<class QString, class QString> QtMobility::QContactManager::managerParameters(void) const
-	?managerParameters@QContactManagerEngine@QtMobility@@UBE?AV?$QMap@VQString@@V1@@@XZ @ 522 NONAME ; class QMap<class QString, class QString> QtMobility::QContactManagerEngine::managerParameters(void) const
-	?managerUri@QContactId@QtMobility@@QBE?AVQString@@XZ @ 523 NONAME ; class QString QtMobility::QContactId::managerUri(void) const
-	?managerUri@QContactManager@QtMobility@@QBE?AVQString@@XZ @ 524 NONAME ; class QString QtMobility::QContactManager::managerUri(void) const
-	?managerUri@QContactManagerEngine@QtMobility@@QBE?AVQString@@XZ @ 525 NONAME ; class QString QtMobility::QContactManagerEngine::managerUri(void) const
-	?managerVersion@QContactManager@QtMobility@@QBEHXZ @ 526 NONAME ; int QtMobility::QContactManager::managerVersion(void) const
-	?match@QContactDisplayLabel@QtMobility@@SA?AVQContactFilter@2@ABVQString@@@Z @ 527 NONAME ; class QtMobility::QContactFilter QtMobility::QContactDisplayLabel::match(class QString const &)
-	?match@QContactEmailAddress@QtMobility@@SA?AVQContactFilter@2@ABVQString@@@Z @ 528 NONAME ; class QtMobility::QContactFilter QtMobility::QContactEmailAddress::match(class QString const &)
-	?match@QContactName@QtMobility@@SA?AVQContactFilter@2@ABVQString@@0@Z @ 529 NONAME ; class QtMobility::QContactFilter QtMobility::QContactName::match(class QString const &, class QString const &)
-	?match@QContactName@QtMobility@@SA?AVQContactFilter@2@ABVQString@@@Z @ 530 NONAME ; class QtMobility::QContactFilter QtMobility::QContactName::match(class QString const &)
-	?match@QContactPhoneNumber@QtMobility@@SA?AVQContactFilter@2@ABVQString@@@Z @ 531 NONAME ; class QtMobility::QContactFilter QtMobility::QContactPhoneNumber::match(class QString const &)
-	?matchFlags@QContactDetailFilter@QtMobility@@QBE?AV?$QFlags@W4MatchFlag@QContactFilter@QtMobility@@@@XZ @ 532 NONAME ; class QFlags<enum QtMobility::QContactFilter::MatchFlag> QtMobility::QContactDetailFilter::matchFlags(void) const
-	?matchFlags@QContactDetailRangeFilter@QtMobility@@QBE?AV?$QFlags@W4MatchFlag@QContactFilter@QtMobility@@@@XZ @ 533 NONAME ; class QFlags<enum QtMobility::QContactFilter::MatchFlag> QtMobility::QContactDetailRangeFilter::matchFlags(void) const
-	?maxValue@QContactDetailRangeFilter@QtMobility@@QBE?AVQVariant@@XZ @ 534 NONAME ; class QVariant QtMobility::QContactDetailRangeFilter::maxValue(void) const
-	?metaObject@QContactAbstractRequest@QtMobility@@UBEPBUQMetaObject@@XZ @ 535 NONAME ; struct QMetaObject const * QtMobility::QContactAbstractRequest::metaObject(void) const
-	?metaObject@QContactAction@QtMobility@@UBEPBUQMetaObject@@XZ @ 536 NONAME ; struct QMetaObject const * QtMobility::QContactAction::metaObject(void) const
-	?metaObject@QContactActionFactory@QtMobility@@UBEPBUQMetaObject@@XZ @ 537 NONAME ; struct QMetaObject const * QtMobility::QContactActionFactory::metaObject(void) const
-	?metaObject@QContactDetailDefinitionFetchRequest@QtMobility@@UBEPBUQMetaObject@@XZ @ 538 NONAME ; struct QMetaObject const * QtMobility::QContactDetailDefinitionFetchRequest::metaObject(void) const
-	?metaObject@QContactDetailDefinitionRemoveRequest@QtMobility@@UBEPBUQMetaObject@@XZ @ 539 NONAME ; struct QMetaObject const * QtMobility::QContactDetailDefinitionRemoveRequest::metaObject(void) const
-	?metaObject@QContactDetailDefinitionSaveRequest@QtMobility@@UBEPBUQMetaObject@@XZ @ 540 NONAME ; struct QMetaObject const * QtMobility::QContactDetailDefinitionSaveRequest::metaObject(void) const
-	?metaObject@QContactFetchRequest@QtMobility@@UBEPBUQMetaObject@@XZ @ 541 NONAME ; struct QMetaObject const * QtMobility::QContactFetchRequest::metaObject(void) const
-	?metaObject@QContactLocalIdFetchRequest@QtMobility@@UBEPBUQMetaObject@@XZ @ 542 NONAME ; struct QMetaObject const * QtMobility::QContactLocalIdFetchRequest::metaObject(void) const
-	?metaObject@QContactManager@QtMobility@@UBEPBUQMetaObject@@XZ @ 543 NONAME ; struct QMetaObject const * QtMobility::QContactManager::metaObject(void) const
-	?metaObject@QContactManagerEngine@QtMobility@@UBEPBUQMetaObject@@XZ @ 544 NONAME ; struct QMetaObject const * QtMobility::QContactManagerEngine::metaObject(void) const
-	?metaObject@QContactRelationshipFetchRequest@QtMobility@@UBEPBUQMetaObject@@XZ @ 545 NONAME ; struct QMetaObject const * QtMobility::QContactRelationshipFetchRequest::metaObject(void) const
-	?metaObject@QContactRelationshipRemoveRequest@QtMobility@@UBEPBUQMetaObject@@XZ @ 546 NONAME ; struct QMetaObject const * QtMobility::QContactRelationshipRemoveRequest::metaObject(void) const
-	?metaObject@QContactRelationshipSaveRequest@QtMobility@@UBEPBUQMetaObject@@XZ @ 547 NONAME ; struct QMetaObject const * QtMobility::QContactRelationshipSaveRequest::metaObject(void) const
-	?metaObject@QContactRemoveRequest@QtMobility@@UBEPBUQMetaObject@@XZ @ 548 NONAME ; struct QMetaObject const * QtMobility::QContactRemoveRequest::metaObject(void) const
-	?metaObject@QContactSaveRequest@QtMobility@@UBEPBUQMetaObject@@XZ @ 549 NONAME ; struct QMetaObject const * QtMobility::QContactSaveRequest::metaObject(void) const
-	?middleName@QContactName@QtMobility@@QBE?AVQString@@XZ @ 550 NONAME ; class QString QtMobility::QContactName::middleName(void) const
-	?minValue@QContactDetailRangeFilter@QtMobility@@QBE?AVQVariant@@XZ @ 551 NONAME ; class QVariant QtMobility::QContactDetailRangeFilter::minValue(void) const
-	?name@QContactDetailDefinition@QtMobility@@QBE?AVQString@@XZ @ 552 NONAME ; class QString QtMobility::QContactDetailDefinition::name(void) const
-	?name@QContactOrganization@QtMobility@@QBE?AVQString@@XZ @ 553 NONAME ; class QString QtMobility::QContactOrganization::name(void) const
-	?nickname@QContactGlobalPresence@QtMobility@@QBE?AVQString@@XZ @ 554 NONAME ; class QString QtMobility::QContactGlobalPresence::nickname(void) const
-	?nickname@QContactNickname@QtMobility@@QBE?AVQString@@XZ @ 555 NONAME ; class QString QtMobility::QContactNickname::nickname(void) const
-	?nickname@QContactPresence@QtMobility@@QBE?AVQString@@XZ @ 556 NONAME ; class QString QtMobility::QContactPresence::nickname(void) const
-	?note@QContactNote@QtMobility@@QBE?AVQString@@XZ @ 557 NONAME ; class QString QtMobility::QContactNote::note(void) const
-	?number@QContactPhoneNumber@QtMobility@@QBE?AVQString@@XZ @ 558 NONAME ; class QString QtMobility::QContactPhoneNumber::number(void) const
-	?oldAndNewSelfContactId@QContactChangeSet@QtMobility@@QBE?AU?$QPair@II@@XZ @ 559 NONAME ; struct QPair<unsigned int, unsigned int> QtMobility::QContactChangeSet::oldAndNewSelfContactId(void) const
-	?optimizationHints@QContactFetchHint@QtMobility@@QBE?AV?$QFlags@W4OptimizationHint@QContactFetchHint@QtMobility@@@@XZ @ 560 NONAME ; class QFlags<enum QtMobility::QContactFetchHint::OptimizationHint> QtMobility::QContactFetchHint::optimizationHints(void) const
-	?originalDate@QContactAnniversary@QtMobility@@QBE?AVQDate@@XZ @ 561 NONAME ; class QDate QtMobility::QContactAnniversary::originalDate(void) const
-	?parseUri@QContactManager@QtMobility@@SA_NABVQString@@PAV3@PAV?$QMap@VQString@@V1@@@@Z @ 562 NONAME ; bool QtMobility::QContactManager::parseUri(class QString const &, class QString *, class QMap<class QString, class QString> *)
-	?postOfficeBox@QContactAddress@QtMobility@@QBE?AVQString@@XZ @ 563 NONAME ; class QString QtMobility::QContactAddress::postOfficeBox(void) const
-	?postcode@QContactAddress@QtMobility@@QBE?AVQString@@XZ @ 564 NONAME ; class QString QtMobility::QContactAddress::postcode(void) const
-	?preferredDetail@QContact@QtMobility@@QBE?AVQContactDetail@2@ABVQString@@@Z @ 565 NONAME ; class QtMobility::QContactDetail QtMobility::QContact::preferredDetail(class QString const &) const
-	?preferredDetails@QContact@QtMobility@@QBE?AV?$QMap@VQString@@VQContactDetail@QtMobility@@@@XZ @ 566 NONAME ; class QMap<class QString, class QtMobility::QContactDetail> QtMobility::QContact::preferredDetails(void) const
-	?prefix@QContactName@QtMobility@@QBE?AVQString@@XZ @ 567 NONAME ; class QString QtMobility::QContactName::prefix(void) const
-	?prepend@QContactIntersectionFilter@QtMobility@@QAEXABVQContactFilter@2@@Z @ 568 NONAME ; void QtMobility::QContactIntersectionFilter::prepend(class QtMobility::QContactFilter const &)
-	?prepend@QContactUnionFilter@QtMobility@@QAEXABVQContactFilter@2@@Z @ 569 NONAME ; void QtMobility::QContactUnionFilter::prepend(class QtMobility::QContactFilter const &)
-	?presenceState@QContactGlobalPresence@QtMobility@@QBE?AW4PresenceState@QContactPresence@2@XZ @ 570 NONAME ; enum QtMobility::QContactPresence::PresenceState QtMobility::QContactGlobalPresence::presenceState(void) const
-	?presenceState@QContactPresence@QtMobility@@QBE?AW4PresenceState@12@XZ @ 571 NONAME ; enum QtMobility::QContactPresence::PresenceState QtMobility::QContactPresence::presenceState(void) const
-	?presenceStateImageUrl@QContactGlobalPresence@QtMobility@@QBE?AVQUrl@@XZ @ 572 NONAME ; class QUrl QtMobility::QContactGlobalPresence::presenceStateImageUrl(void) const
-	?presenceStateImageUrl@QContactPresence@QtMobility@@QBE?AVQUrl@@XZ @ 573 NONAME ; class QUrl QtMobility::QContactPresence::presenceStateImageUrl(void) const
-	?presenceStateText@QContactGlobalPresence@QtMobility@@QBE?AVQString@@XZ @ 574 NONAME ; class QString QtMobility::QContactGlobalPresence::presenceStateText(void) const
-	?presenceStateText@QContactPresence@QtMobility@@QBE?AVQString@@XZ @ 575 NONAME ; class QString QtMobility::QContactPresence::presenceStateText(void) const
-	?qHash@QtMobility@@YAIABVQContact@1@@Z @ 576 NONAME ; unsigned int QtMobility::qHash(class QtMobility::QContact const &)
-	?qHash@QtMobility@@YAIABVQContactActionDescriptor@1@@Z @ 577 NONAME ; unsigned int QtMobility::qHash(class QtMobility::QContactActionDescriptor const &)
-	?qHash@QtMobility@@YAIABVQContactDetail@1@@Z @ 578 NONAME ; unsigned int QtMobility::qHash(class QtMobility::QContactDetail const &)
-	?qHash@QtMobility@@YAIABVQContactId@1@@Z @ 579 NONAME ; unsigned int QtMobility::qHash(class QtMobility::QContactId const &)
-	?qHash@QtMobility@@YAIABVQContactRelationship@1@@Z @ 580 NONAME ; unsigned int QtMobility::qHash(class QtMobility::QContactRelationship const &)
-	?qt_metacall@QContactAbstractRequest@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 581 NONAME ; int QtMobility::QContactAbstractRequest::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QContactAction@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 582 NONAME ; int QtMobility::QContactAction::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QContactActionFactory@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 583 NONAME ; int QtMobility::QContactActionFactory::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QContactDetailDefinitionFetchRequest@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 584 NONAME ; int QtMobility::QContactDetailDefinitionFetchRequest::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QContactDetailDefinitionRemoveRequest@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 585 NONAME ; int QtMobility::QContactDetailDefinitionRemoveRequest::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QContactDetailDefinitionSaveRequest@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 586 NONAME ; int QtMobility::QContactDetailDefinitionSaveRequest::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QContactFetchRequest@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 587 NONAME ; int QtMobility::QContactFetchRequest::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QContactLocalIdFetchRequest@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 588 NONAME ; int QtMobility::QContactLocalIdFetchRequest::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QContactManager@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 589 NONAME ; int QtMobility::QContactManager::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QContactManagerEngine@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 590 NONAME ; int QtMobility::QContactManagerEngine::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QContactRelationshipFetchRequest@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 591 NONAME ; int QtMobility::QContactRelationshipFetchRequest::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QContactRelationshipRemoveRequest@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 592 NONAME ; int QtMobility::QContactRelationshipRemoveRequest::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QContactRelationshipSaveRequest@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 593 NONAME ; int QtMobility::QContactRelationshipSaveRequest::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QContactRemoveRequest@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 594 NONAME ; int QtMobility::QContactRemoveRequest::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QContactSaveRequest@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 595 NONAME ; int QtMobility::QContactSaveRequest::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacast@QContactAbstractRequest@QtMobility@@UAEPAXPBD@Z @ 596 NONAME ; void * QtMobility::QContactAbstractRequest::qt_metacast(char const *)
-	?qt_metacast@QContactAction@QtMobility@@UAEPAXPBD@Z @ 597 NONAME ; void * QtMobility::QContactAction::qt_metacast(char const *)
-	?qt_metacast@QContactActionFactory@QtMobility@@UAEPAXPBD@Z @ 598 NONAME ; void * QtMobility::QContactActionFactory::qt_metacast(char const *)
-	?qt_metacast@QContactDetailDefinitionFetchRequest@QtMobility@@UAEPAXPBD@Z @ 599 NONAME ; void * QtMobility::QContactDetailDefinitionFetchRequest::qt_metacast(char const *)
-	?qt_metacast@QContactDetailDefinitionRemoveRequest@QtMobility@@UAEPAXPBD@Z @ 600 NONAME ; void * QtMobility::QContactDetailDefinitionRemoveRequest::qt_metacast(char const *)
-	?qt_metacast@QContactDetailDefinitionSaveRequest@QtMobility@@UAEPAXPBD@Z @ 601 NONAME ; void * QtMobility::QContactDetailDefinitionSaveRequest::qt_metacast(char const *)
-	?qt_metacast@QContactFetchRequest@QtMobility@@UAEPAXPBD@Z @ 602 NONAME ; void * QtMobility::QContactFetchRequest::qt_metacast(char const *)
-	?qt_metacast@QContactLocalIdFetchRequest@QtMobility@@UAEPAXPBD@Z @ 603 NONAME ; void * QtMobility::QContactLocalIdFetchRequest::qt_metacast(char const *)
-	?qt_metacast@QContactManager@QtMobility@@UAEPAXPBD@Z @ 604 NONAME ; void * QtMobility::QContactManager::qt_metacast(char const *)
-	?qt_metacast@QContactManagerEngine@QtMobility@@UAEPAXPBD@Z @ 605 NONAME ; void * QtMobility::QContactManagerEngine::qt_metacast(char const *)
-	?qt_metacast@QContactRelationshipFetchRequest@QtMobility@@UAEPAXPBD@Z @ 606 NONAME ; void * QtMobility::QContactRelationshipFetchRequest::qt_metacast(char const *)
-	?qt_metacast@QContactRelationshipRemoveRequest@QtMobility@@UAEPAXPBD@Z @ 607 NONAME ; void * QtMobility::QContactRelationshipRemoveRequest::qt_metacast(char const *)
-	?qt_metacast@QContactRelationshipSaveRequest@QtMobility@@UAEPAXPBD@Z @ 608 NONAME ; void * QtMobility::QContactRelationshipSaveRequest::qt_metacast(char const *)
-	?qt_metacast@QContactRemoveRequest@QtMobility@@UAEPAXPBD@Z @ 609 NONAME ; void * QtMobility::QContactRemoveRequest::qt_metacast(char const *)
-	?qt_metacast@QContactSaveRequest@QtMobility@@UAEPAXPBD@Z @ 610 NONAME ; void * QtMobility::QContactSaveRequest::qt_metacast(char const *)
-	?rangeFlags@QContactDetailRangeFilter@QtMobility@@QBE?AV?$QFlags@W4RangeFlag@QContactDetailRangeFilter@QtMobility@@@@XZ @ 611 NONAME ; class QFlags<enum QtMobility::QContactDetailRangeFilter::RangeFlag> QtMobility::QContactDetailRangeFilter::rangeFlags(void) const
-	?region@QContactAddress@QtMobility@@QBE?AVQString@@XZ @ 612 NONAME ; class QString QtMobility::QContactAddress::region(void) const
-	?relatedContactId@QContactRelationshipFilter@QtMobility@@QBE?AVQContactId@2@XZ @ 613 NONAME ; class QtMobility::QContactId QtMobility::QContactRelationshipFilter::relatedContactId(void) const
-	?relatedContactRole@QContactRelationshipFilter@QtMobility@@QBE?AW4Role@QContactRelationship@2@XZ @ 614 NONAME ; enum QtMobility::QContactRelationship::Role QtMobility::QContactRelationshipFilter::relatedContactRole(void) const
-	?relatedContacts@QContact@QtMobility@@QBE?AV?$QList@VQContactId@QtMobility@@@@ABVQString@@W4Role@QContactRelationship@2@@Z @ 615 NONAME ; class QList<class QtMobility::QContactId> QtMobility::QContact::relatedContacts(class QString const &, enum QtMobility::QContactRelationship::Role) const
-	?relationshipType@QContactRelationship@QtMobility@@QBE?AVQString@@XZ @ 616 NONAME ; class QString QtMobility::QContactRelationship::relationshipType(void) const
-	?relationshipType@QContactRelationshipFetchRequest@QtMobility@@QBE?AVQString@@XZ @ 617 NONAME ; class QString QtMobility::QContactRelationshipFetchRequest::relationshipType(void) const
-	?relationshipType@QContactRelationshipFilter@QtMobility@@QBE?AVQString@@XZ @ 618 NONAME ; class QString QtMobility::QContactRelationshipFilter::relationshipType(void) const
-	?relationshipTypesHint@QContactFetchHint@QtMobility@@QBE?AVQStringList@@XZ @ 619 NONAME ; class QStringList QtMobility::QContactFetchHint::relationshipTypesHint(void) const
-	?relationships@QContact@QtMobility@@QBE?AV?$QList@VQContactRelationship@QtMobility@@@@ABVQString@@@Z @ 620 NONAME ; class QList<class QtMobility::QContactRelationship> QtMobility::QContact::relationships(class QString const &) const
-	?relationships@QContactManager@QtMobility@@QBE?AV?$QList@VQContactRelationship@QtMobility@@@@ABVQContactId@2@W4Role@QContactRelationship@2@@Z @ 621 NONAME ; class QList<class QtMobility::QContactRelationship> QtMobility::QContactManager::relationships(class QtMobility::QContactId const &, enum QtMobility::QContactRelationship::Role) const
-	?relationships@QContactManager@QtMobility@@QBE?AV?$QList@VQContactRelationship@QtMobility@@@@ABVQString@@ABVQContactId@2@W4Role@QContactRelationship@2@@Z @ 622 NONAME ; class QList<class QtMobility::QContactRelationship> QtMobility::QContactManager::relationships(class QString const &, class QtMobility::QContactId const &, enum QtMobility::QContactRelationship::Role) const
-	?relationships@QContactManagerEngine@QtMobility@@UBE?AV?$QList@VQContactRelationship@QtMobility@@@@ABVQString@@ABVQContactId@2@W4Role@QContactRelationship@2@PAW4Error@QContactManager@2@@Z @ 623 NONAME ; class QList<class QtMobility::QContactRelationship> QtMobility::QContactManagerEngine::relationships(class QString const &, class QtMobility::QContactId const &, enum QtMobility::QContactRelationship::Role, enum QtMobility::QContactManager::Error *) const
-	?relationships@QContactRelationshipFetchRequest@QtMobility@@QBE?AV?$QList@VQContactRelationship@QtMobility@@@@XZ @ 624 NONAME ; class QList<class QtMobility::QContactRelationship> QtMobility::QContactRelationshipFetchRequest::relationships(void) const
-	?relationships@QContactRelationshipRemoveRequest@QtMobility@@QBE?AV?$QList@VQContactRelationship@QtMobility@@@@XZ @ 625 NONAME ; class QList<class QtMobility::QContactRelationship> QtMobility::QContactRelationshipRemoveRequest::relationships(void) const
-	?relationships@QContactRelationshipSaveRequest@QtMobility@@QBE?AV?$QList@VQContactRelationship@QtMobility@@@@XZ @ 626 NONAME ; class QList<class QtMobility::QContactRelationship> QtMobility::QContactRelationshipSaveRequest::relationships(void) const
-	?relationshipsAdded@QContactManager@QtMobility@@IAEXABV?$QList@I@@@Z @ 627 NONAME ; void QtMobility::QContactManager::relationshipsAdded(class QList<unsigned int> const &)
-	?relationshipsAdded@QContactManagerEngine@QtMobility@@IAEXABV?$QList@I@@@Z @ 628 NONAME ; void QtMobility::QContactManagerEngine::relationshipsAdded(class QList<unsigned int> const &)
-	?relationshipsRemoved@QContactManager@QtMobility@@IAEXABV?$QList@I@@@Z @ 629 NONAME ; void QtMobility::QContactManager::relationshipsRemoved(class QList<unsigned int> const &)
-	?relationshipsRemoved@QContactManagerEngine@QtMobility@@IAEXABV?$QList@I@@@Z @ 630 NONAME ; void QtMobility::QContactManagerEngine::relationshipsRemoved(class QList<unsigned int> const &)
-	?remove@QContactIntersectionFilter@QtMobility@@QAEXABVQContactFilter@2@@Z @ 631 NONAME ; void QtMobility::QContactIntersectionFilter::remove(class QtMobility::QContactFilter const &)
-	?remove@QContactUnionFilter@QtMobility@@QAEXABVQContactFilter@2@@Z @ 632 NONAME ; void QtMobility::QContactUnionFilter::remove(class QtMobility::QContactFilter const &)
-	?removeContact@QContactManager@QtMobility@@QAE_NABI@Z @ 633 NONAME ; bool QtMobility::QContactManager::removeContact(unsigned int const &)
-	?removeContact@QContactManagerEngine@QtMobility@@UAE_NABIPAW4Error@QContactManager@2@@Z @ 634 NONAME ; bool QtMobility::QContactManagerEngine::removeContact(unsigned int const &, enum QtMobility::QContactManager::Error *)
-	?removeContacts@QContactManager@QtMobility@@QAE_NABV?$QList@I@@PAV?$QMap@HW4Error@QContactManager@QtMobility@@@@@Z @ 635 NONAME ; bool QtMobility::QContactManager::removeContacts(class QList<unsigned int> const &, class QMap<int, enum QtMobility::QContactManager::Error> *)
-	?removeContacts@QContactManagerEngine@QtMobility@@UAE_NABV?$QList@I@@PAV?$QMap@HW4Error@QContactManager@QtMobility@@@@PAW4Error@QContactManager@2@@Z @ 636 NONAME ; bool QtMobility::QContactManagerEngine::removeContacts(class QList<unsigned int> const &, class QMap<int, enum QtMobility::QContactManager::Error> *, enum QtMobility::QContactManager::Error *)
-	?removeDetail@QContact@QtMobility@@QAE_NPAVQContactDetail@2@@Z @ 637 NONAME ; bool QtMobility::QContact::removeDetail(class QtMobility::QContactDetail *)
-	?removeDetailDefinition@QContactManager@QtMobility@@QAE_NABVQString@@0@Z @ 638 NONAME ; bool QtMobility::QContactManager::removeDetailDefinition(class QString const &, class QString const &)
-	?removeDetailDefinition@QContactManagerEngine@QtMobility@@UAE_NABVQString@@0PAW4Error@QContactManager@2@@Z @ 639 NONAME ; bool QtMobility::QContactManagerEngine::removeDetailDefinition(class QString const &, class QString const &, enum QtMobility::QContactManager::Error *)
-	?removeField@QContactDetailDefinition@QtMobility@@QAEXABVQString@@@Z @ 640 NONAME ; void QtMobility::QContactDetailDefinition::removeField(class QString const &)
-	?removeRelationship@QContactManager@QtMobility@@QAE_NABVQContactRelationship@2@@Z @ 641 NONAME ; bool QtMobility::QContactManager::removeRelationship(class QtMobility::QContactRelationship const &)
-	?removeRelationship@QContactManagerEngine@QtMobility@@UAE_NABVQContactRelationship@2@PAW4Error@QContactManager@2@@Z @ 642 NONAME ; bool QtMobility::QContactManagerEngine::removeRelationship(class QtMobility::QContactRelationship const &, enum QtMobility::QContactManager::Error *)
-	?removeRelationships@QContactManager@QtMobility@@QAE_NABV?$QList@VQContactRelationship@QtMobility@@@@PAV?$QMap@HW4Error@QContactManager@QtMobility@@@@@Z @ 643 NONAME ; bool QtMobility::QContactManager::removeRelationships(class QList<class QtMobility::QContactRelationship> const &, class QMap<int, enum QtMobility::QContactManager::Error> *)
-	?removeRelationships@QContactManagerEngine@QtMobility@@UAE_NABV?$QList@VQContactRelationship@QtMobility@@@@PAV?$QMap@HW4Error@QContactManager@QtMobility@@@@PAW4Error@QContactManager@2@@Z @ 644 NONAME ; bool QtMobility::QContactManagerEngine::removeRelationships(class QList<class QtMobility::QContactRelationship> const &, class QMap<int, enum QtMobility::QContactManager::Error> *, enum QtMobility::QContactManager::Error *)
-	?removeValue@QContactDetail@QtMobility@@QAE_NABVQString@@@Z @ 645 NONAME ; bool QtMobility::QContactDetail::removeValue(class QString const &)
-	?removedContacts@QContactChangeSet@QtMobility@@QBE?AV?$QSet@I@@XZ @ 646 NONAME ; class QSet<unsigned int> QtMobility::QContactChangeSet::removedContacts(void) const
-	?removedRelationshipsContacts@QContactChangeSet@QtMobility@@QBE?AV?$QSet@I@@XZ @ 647 NONAME ; class QSet<unsigned int> QtMobility::QContactChangeSet::removedRelationshipsContacts(void) const
-	?requestDestroyed@QContactManagerEngine@QtMobility@@UAEXPAVQContactAbstractRequest@2@@Z @ 648 NONAME ; void QtMobility::QContactManagerEngine::requestDestroyed(class QtMobility::QContactAbstractRequest *)
-	?resetKey@QContactDetail@QtMobility@@QAEXXZ @ 649 NONAME ; void QtMobility::QContactDetail::resetKey(void)
-	?resultsAvailable@QContactAbstractRequest@QtMobility@@IAEXXZ @ 650 NONAME ; void QtMobility::QContactAbstractRequest::resultsAvailable(void)
-	?resultsAvailable@QContactAction@QtMobility@@IAEXXZ @ 651 NONAME ; void QtMobility::QContactAction::resultsAvailable(void)
-	?role@QContactOrganization@QtMobility@@QBE?AVQString@@XZ @ 652 NONAME ; class QString QtMobility::QContactOrganization::role(void) const
-	?saveContact@QContactManager@QtMobility@@QAE_NPAVQContact@2@@Z @ 653 NONAME ; bool QtMobility::QContactManager::saveContact(class QtMobility::QContact *)
-	?saveContact@QContactManagerEngine@QtMobility@@UAE_NPAVQContact@2@PAW4Error@QContactManager@2@@Z @ 654 NONAME ; bool QtMobility::QContactManagerEngine::saveContact(class QtMobility::QContact *, enum QtMobility::QContactManager::Error *)
-	?saveContacts@QContactManager@QtMobility@@QAE_NPAV?$QList@VQContact@QtMobility@@@@PAV?$QMap@HW4Error@QContactManager@QtMobility@@@@@Z @ 655 NONAME ; bool QtMobility::QContactManager::saveContacts(class QList<class QtMobility::QContact> *, class QMap<int, enum QtMobility::QContactManager::Error> *)
-	?saveContacts@QContactManagerEngine@QtMobility@@UAE_NPAV?$QList@VQContact@QtMobility@@@@PAV?$QMap@HW4Error@QContactManager@QtMobility@@@@PAW4Error@QContactManager@2@@Z @ 656 NONAME ; bool QtMobility::QContactManagerEngine::saveContacts(class QList<class QtMobility::QContact> *, class QMap<int, enum QtMobility::QContactManager::Error> *, enum QtMobility::QContactManager::Error *)
-	?saveDetail@QContact@QtMobility@@QAE_NPAVQContactDetail@2@@Z @ 657 NONAME ; bool QtMobility::QContact::saveDetail(class QtMobility::QContactDetail *)
-	?saveDetailDefinition@QContactManager@QtMobility@@QAE_NABVQContactDetailDefinition@2@ABVQString@@@Z @ 658 NONAME ; bool QtMobility::QContactManager::saveDetailDefinition(class QtMobility::QContactDetailDefinition const &, class QString const &)
-	?saveDetailDefinition@QContactManagerEngine@QtMobility@@UAE_NABVQContactDetailDefinition@2@ABVQString@@PAW4Error@QContactManager@2@@Z @ 659 NONAME ; bool QtMobility::QContactManagerEngine::saveDetailDefinition(class QtMobility::QContactDetailDefinition const &, class QString const &, enum QtMobility::QContactManager::Error *)
-	?saveRelationship@QContactManager@QtMobility@@QAE_NPAVQContactRelationship@2@@Z @ 660 NONAME ; bool QtMobility::QContactManager::saveRelationship(class QtMobility::QContactRelationship *)
-	?saveRelationship@QContactManagerEngine@QtMobility@@UAE_NPAVQContactRelationship@2@PAW4Error@QContactManager@2@@Z @ 661 NONAME ; bool QtMobility::QContactManagerEngine::saveRelationship(class QtMobility::QContactRelationship *, enum QtMobility::QContactManager::Error *)
-	?saveRelationships@QContactManager@QtMobility@@QAE_NPAV?$QList@VQContactRelationship@QtMobility@@@@PAV?$QMap@HW4Error@QContactManager@QtMobility@@@@@Z @ 662 NONAME ; bool QtMobility::QContactManager::saveRelationships(class QList<class QtMobility::QContactRelationship> *, class QMap<int, enum QtMobility::QContactManager::Error> *)
-	?saveRelationships@QContactManagerEngine@QtMobility@@UAE_NPAV?$QList@VQContactRelationship@QtMobility@@@@PAV?$QMap@HW4Error@QContactManager@QtMobility@@@@PAW4Error@QContactManager@2@@Z @ 663 NONAME ; bool QtMobility::QContactManagerEngine::saveRelationships(class QList<class QtMobility::QContactRelationship> *, class QMap<int, enum QtMobility::QContactManager::Error> *, enum QtMobility::QContactManager::Error *)
-	?schemaDefinitions@QContactManagerEngine@QtMobility@@SA?AV?$QMap@VQString@@V?$QMap@VQString@@VQContactDetailDefinition@QtMobility@@@@@@XZ @ 664 NONAME ; class QMap<class QString, class QMap<class QString, class QtMobility::QContactDetailDefinition> > QtMobility::QContactManagerEngine::schemaDefinitions(void)
-	?second@QContactRelationship@QtMobility@@QBE?AVQContactId@2@XZ @ 665 NONAME ; class QtMobility::QContactId QtMobility::QContactRelationship::second(void) const
-	?second@QContactRelationshipFetchRequest@QtMobility@@QBE?AVQContactId@2@XZ @ 666 NONAME ; class QtMobility::QContactId QtMobility::QContactRelationshipFetchRequest::second(void) const
-	?selfContactId@QContactManager@QtMobility@@QBEIXZ @ 667 NONAME ; unsigned int QtMobility::QContactManager::selfContactId(void) const
-	?selfContactId@QContactManagerEngine@QtMobility@@UBEIPAW4Error@QContactManager@2@@Z @ 668 NONAME ; unsigned int QtMobility::QContactManagerEngine::selfContactId(enum QtMobility::QContactManager::Error *) const
-	?selfContactIdChanged@QContactManager@QtMobility@@IAEXABI0@Z @ 669 NONAME ; void QtMobility::QContactManager::selfContactIdChanged(unsigned int const &, unsigned int const &)
-	?selfContactIdChanged@QContactManagerEngine@QtMobility@@IAEXABI0@Z @ 670 NONAME ; void QtMobility::QContactManagerEngine::selfContactIdChanged(unsigned int const &, unsigned int const &)
-	?serviceProvider@QContactOnlineAccount@QtMobility@@QBE?AVQString@@XZ @ 671 NONAME ; class QString QtMobility::QContactOnlineAccount::serviceProvider(void) const
-	?setAccountUri@QContactOnlineAccount@QtMobility@@QAEXABVQString@@@Z @ 672 NONAME ; void QtMobility::QContactOnlineAccount::setAccountUri(class QString const &)
-	?setAccuracy@QContactGeoLocation@QtMobility@@QAEXN@Z @ 673 NONAME ; void QtMobility::QContactGeoLocation::setAccuracy(double)
-	?setActionName@QContactActionDescriptor@QtMobility@@QAEXABVQString@@@Z @ 674 NONAME ; void QtMobility::QContactActionDescriptor::setActionName(class QString const &)
-	?setActionName@QContactActionFilter@QtMobility@@QAEXABVQString@@@Z @ 675 NONAME ; void QtMobility::QContactActionFilter::setActionName(class QString const &)
-	?setAllowableValues@QContactDetailFieldDefinition@QtMobility@@QAEXV?$QList@VQVariant@@@@@Z @ 676 NONAME ; void QtMobility::QContactDetailFieldDefinition::setAllowableValues(class QList<class QVariant>)
-	?setAltitude@QContactGeoLocation@QtMobility@@QAEXN@Z @ 677 NONAME ; void QtMobility::QContactGeoLocation::setAltitude(double)
-	?setAltitudeAccuracy@QContactGeoLocation@QtMobility@@QAEXN@Z @ 678 NONAME ; void QtMobility::QContactGeoLocation::setAltitudeAccuracy(double)
-	?setAssistantName@QContactOrganization@QtMobility@@QAEXABVQString@@@Z @ 679 NONAME ; void QtMobility::QContactOrganization::setAssistantName(class QString const &)
-	?setAudioRingtoneUrl@QContactRingtone@QtMobility@@QAEXABVQUrl@@@Z @ 680 NONAME ; void QtMobility::QContactRingtone::setAudioRingtoneUrl(class QUrl const &)
-	?setBlankPolicy@QContactSortOrder@QtMobility@@QAEXW4BlankPolicy@12@@Z @ 681 NONAME ; void QtMobility::QContactSortOrder::setBlankPolicy(enum QtMobility::QContactSortOrder::BlankPolicy)
-	?setCalendarId@QContactAnniversary@QtMobility@@QAEXABVQString@@@Z @ 682 NONAME ; void QtMobility::QContactAnniversary::setCalendarId(class QString const &)
-	?setCapabilities@QContactOnlineAccount@QtMobility@@QAEXABVQStringList@@@Z @ 683 NONAME ; void QtMobility::QContactOnlineAccount::setCapabilities(class QStringList const &)
-	?setCaseSensitivity@QContactSortOrder@QtMobility@@QAEXW4CaseSensitivity@Qt@@@Z @ 684 NONAME ; void QtMobility::QContactSortOrder::setCaseSensitivity(enum Qt::CaseSensitivity)
-	?setChildren@QContactFamily@QtMobility@@QAEXABVQStringList@@@Z @ 685 NONAME ; void QtMobility::QContactFamily::setChildren(class QStringList const &)
-	?setContactDisplayLabel@QContactManagerEngine@QtMobility@@SAXPAVQContact@2@ABVQString@@@Z @ 686 NONAME ; void QtMobility::QContactManagerEngine::setContactDisplayLabel(class QtMobility::QContact *, class QString const &)
-	?setContactIds@QContactRemoveRequest@QtMobility@@QAEXABV?$QList@I@@@Z @ 687 NONAME ; void QtMobility::QContactRemoveRequest::setContactIds(class QList<unsigned int> const &)
-	?setContactRelationships@QContactManagerEngine@QtMobility@@SAXPAVQContact@2@ABV?$QList@VQContactRelationship@QtMobility@@@@@Z @ 688 NONAME ; void QtMobility::QContactManagerEngine::setContactRelationships(class QtMobility::QContact *, class QList<class QtMobility::QContactRelationship> const &)
-	?setContactType@QContactDetailDefinitionFetchRequest@QtMobility@@QAEXABVQString@@@Z @ 689 NONAME ; void QtMobility::QContactDetailDefinitionFetchRequest::setContactType(class QString const &)
-	?setContactType@QContactDetailDefinitionSaveRequest@QtMobility@@QAEXABVQString@@@Z @ 690 NONAME ; void QtMobility::QContactDetailDefinitionSaveRequest::setContactType(class QString const &)
-	?setContacts@QContactSaveRequest@QtMobility@@QAEXABV?$QList@VQContact@QtMobility@@@@@Z @ 691 NONAME ; void QtMobility::QContactSaveRequest::setContacts(class QList<class QtMobility::QContact> const &)
-	?setContexts@QContactDetail@QtMobility@@QAEXABVQString@@@Z @ 692 NONAME ; void QtMobility::QContactDetail::setContexts(class QString const &)
-	?setContexts@QContactDetail@QtMobility@@QAEXABVQStringList@@@Z @ 693 NONAME ; void QtMobility::QContactDetail::setContexts(class QStringList const &)
-	?setCountry@QContactAddress@QtMobility@@QAEXABVQString@@@Z @ 694 NONAME ; void QtMobility::QContactAddress::setCountry(class QString const &)
-	?setCreated@QContactTimestamp@QtMobility@@QAEXABVQDateTime@@@Z @ 695 NONAME ; void QtMobility::QContactTimestamp::setCreated(class QDateTime const &)
-	?setCustomLabel@QContactName@QtMobility@@QAEXABVQString@@@Z @ 696 NONAME ; void QtMobility::QContactName::setCustomLabel(class QString const &)
-	?setCustomMessage@QContactGlobalPresence@QtMobility@@QAEXABVQString@@@Z @ 697 NONAME ; void QtMobility::QContactGlobalPresence::setCustomMessage(class QString const &)
-	?setCustomMessage@QContactPresence@QtMobility@@QAEXABVQString@@@Z @ 698 NONAME ; void QtMobility::QContactPresence::setCustomMessage(class QString const &)
-	?setDataChanged@QContactChangeSet@QtMobility@@QAEX_N@Z @ 699 NONAME ; void QtMobility::QContactChangeSet::setDataChanged(bool)
-	?setDataType@QContactDetailFieldDefinition@QtMobility@@QAEXW4Type@QVariant@@@Z @ 700 NONAME ; void QtMobility::QContactDetailFieldDefinition::setDataType(enum QVariant::Type)
-	?setDate@QContactBirthday@QtMobility@@QAEXABVQDate@@@Z @ 701 NONAME ; void QtMobility::QContactBirthday::setDate(class QDate const &)
-	?setDefinitionNames@QContactDetailDefinitionFetchRequest@QtMobility@@QAEXABVQStringList@@@Z @ 702 NONAME ; void QtMobility::QContactDetailDefinitionFetchRequest::setDefinitionNames(class QStringList const &)
-	?setDefinitionNames@QContactDetailDefinitionRemoveRequest@QtMobility@@QAEXABVQString@@ABVQStringList@@@Z @ 703 NONAME ; void QtMobility::QContactDetailDefinitionRemoveRequest::setDefinitionNames(class QString const &, class QStringList const &)
-	?setDefinitions@QContactDetailDefinitionSaveRequest@QtMobility@@QAEXABV?$QList@VQContactDetailDefinition@QtMobility@@@@@Z @ 704 NONAME ; void QtMobility::QContactDetailDefinitionSaveRequest::setDefinitions(class QList<class QtMobility::QContactDetailDefinition> const &)
-	?setDepartment@QContactOrganization@QtMobility@@QAEXABVQStringList@@@Z @ 705 NONAME ; void QtMobility::QContactOrganization::setDepartment(class QStringList const &)
-	?setDetailAccessConstraints@QContactManagerEngine@QtMobility@@SAXPAVQContactDetail@2@V?$QFlags@W4AccessConstraint@QContactDetail@QtMobility@@@@@Z @ 706 NONAME ; void QtMobility::QContactManagerEngine::setDetailAccessConstraints(class QtMobility::QContactDetail *, class QFlags<enum QtMobility::QContactDetail::AccessConstraint>)
-	?setDetailDefinitionName@QContactDetailFilter@QtMobility@@QAEXABVQString@@0@Z @ 707 NONAME ; void QtMobility::QContactDetailFilter::setDetailDefinitionName(class QString const &, class QString const &)
-	?setDetailDefinitionName@QContactDetailRangeFilter@QtMobility@@QAEXABVQString@@0@Z @ 708 NONAME ; void QtMobility::QContactDetailRangeFilter::setDetailDefinitionName(class QString const &, class QString const &)
-	?setDetailDefinitionName@QContactSortOrder@QtMobility@@QAEXABVQString@@0@Z @ 709 NONAME ; void QtMobility::QContactSortOrder::setDetailDefinitionName(class QString const &, class QString const &)
-	?setDetailDefinitionsHint@QContactFetchHint@QtMobility@@QAEXABVQStringList@@@Z @ 710 NONAME ; void QtMobility::QContactFetchHint::setDetailDefinitionsHint(class QStringList const &)
-	?setDetailUri@QContactDetail@QtMobility@@QAEXABVQString@@@Z @ 711 NONAME ; void QtMobility::QContactDetail::setDetailUri(class QString const &)
-	?setDirection@QContactSortOrder@QtMobility@@QAEXW4SortOrder@Qt@@@Z @ 712 NONAME ; void QtMobility::QContactSortOrder::setDirection(enum Qt::SortOrder)
-	?setEmailAddress@QContactEmailAddress@QtMobility@@QAEXABVQString@@@Z @ 713 NONAME ; void QtMobility::QContactEmailAddress::setEmailAddress(class QString const &)
-	?setEvent@QContactAnniversary@QtMobility@@QAEXABVQString@@@Z @ 714 NONAME ; void QtMobility::QContactAnniversary::setEvent(class QString const &)
-	?setEventType@QContactChangeLogFilter@QtMobility@@QAEXW4EventType@12@@Z @ 715 NONAME ; void QtMobility::QContactChangeLogFilter::setEventType(enum QtMobility::QContactChangeLogFilter::EventType)
-	?setFetchHint@QContactFetchRequest@QtMobility@@QAEXABVQContactFetchHint@2@@Z @ 716 NONAME ; void QtMobility::QContactFetchRequest::setFetchHint(class QtMobility::QContactFetchHint const &)
-	?setFields@QContactDetailDefinition@QtMobility@@QAEXABV?$QMap@VQString@@VQContactDetailFieldDefinition@QtMobility@@@@@Z @ 717 NONAME ; void QtMobility::QContactDetailDefinition::setFields(class QMap<class QString, class QtMobility::QContactDetailFieldDefinition> const &)
-	?setFilter@QContactFetchRequest@QtMobility@@QAEXABVQContactFilter@2@@Z @ 718 NONAME ; void QtMobility::QContactFetchRequest::setFilter(class QtMobility::QContactFilter const &)
-	?setFilter@QContactLocalIdFetchRequest@QtMobility@@QAEXABVQContactFilter@2@@Z @ 719 NONAME ; void QtMobility::QContactLocalIdFetchRequest::setFilter(class QtMobility::QContactFilter const &)
-	?setFilters@QContactIntersectionFilter@QtMobility@@QAEXABV?$QList@VQContactFilter@QtMobility@@@@@Z @ 720 NONAME ; void QtMobility::QContactIntersectionFilter::setFilters(class QList<class QtMobility::QContactFilter> const &)
-	?setFilters@QContactUnionFilter@QtMobility@@QAEXABV?$QList@VQContactFilter@QtMobility@@@@@Z @ 721 NONAME ; void QtMobility::QContactUnionFilter::setFilters(class QList<class QtMobility::QContactFilter> const &)
-	?setFirst@QContactRelationship@QtMobility@@QAEXABVQContactId@2@@Z @ 722 NONAME ; void QtMobility::QContactRelationship::setFirst(class QtMobility::QContactId const &)
-	?setFirst@QContactRelationshipFetchRequest@QtMobility@@QAEXABVQContactId@2@@Z @ 723 NONAME ; void QtMobility::QContactRelationshipFetchRequest::setFirst(class QtMobility::QContactId const &)
-	?setFirstName@QContactName@QtMobility@@QAEXABVQString@@@Z @ 724 NONAME ; void QtMobility::QContactName::setFirstName(class QString const &)
-	?setGender@QContactGender@QtMobility@@QAEXABVQString@@@Z @ 725 NONAME ; void QtMobility::QContactGender::setGender(class QString const &)
-	?setGuid@QContactGuid@QtMobility@@QAEXABVQString@@@Z @ 726 NONAME ; void QtMobility::QContactGuid::setGuid(class QString const &)
-	?setHeading@QContactGeoLocation@QtMobility@@QAEXN@Z @ 727 NONAME ; void QtMobility::QContactGeoLocation::setHeading(double)
-	?setId@QContact@QtMobility@@QAEXABVQContactId@2@@Z @ 728 NONAME ; void QtMobility::QContact::setId(class QtMobility::QContactId const &)
-	?setIds@QContactLocalIdFilter@QtMobility@@QAEXABV?$QList@I@@@Z @ 729 NONAME ; void QtMobility::QContactLocalIdFilter::setIds(class QList<unsigned int> const &)
-	?setImageUrl@QContactAvatar@QtMobility@@QAEXABVQUrl@@@Z @ 730 NONAME ; void QtMobility::QContactAvatar::setImageUrl(class QUrl const &)
-	?setImplementationVersion@QContactActionDescriptor@QtMobility@@QAEXH@Z @ 731 NONAME ; void QtMobility::QContactActionDescriptor::setImplementationVersion(int)
-	?setLabel@QContactGeoLocation@QtMobility@@QAEXABVQString@@@Z @ 732 NONAME ; void QtMobility::QContactGeoLocation::setLabel(class QString const &)
-	?setLastModified@QContactTimestamp@QtMobility@@QAEXABVQDateTime@@@Z @ 733 NONAME ; void QtMobility::QContactTimestamp::setLastModified(class QDateTime const &)
-	?setLastName@QContactName@QtMobility@@QAEXABVQString@@@Z @ 734 NONAME ; void QtMobility::QContactName::setLastName(class QString const &)
-	?setLatitude@QContactGeoLocation@QtMobility@@QAEXN@Z @ 735 NONAME ; void QtMobility::QContactGeoLocation::setLatitude(double)
-	?setLinkedDetailUris@QContactDetail@QtMobility@@QAEXABVQString@@@Z @ 736 NONAME ; void QtMobility::QContactDetail::setLinkedDetailUris(class QString const &)
-	?setLinkedDetailUris@QContactDetail@QtMobility@@QAEXABVQStringList@@@Z @ 737 NONAME ; void QtMobility::QContactDetail::setLinkedDetailUris(class QStringList const &)
-	?setLocalId@QContactId@QtMobility@@QAEXABI@Z @ 738 NONAME ; void QtMobility::QContactId::setLocalId(unsigned int const &)
-	?setLocality@QContactAddress@QtMobility@@QAEXABVQString@@@Z @ 739 NONAME ; void QtMobility::QContactAddress::setLocality(class QString const &)
-	?setLocation@QContactOrganization@QtMobility@@QAEXABVQString@@@Z @ 740 NONAME ; void QtMobility::QContactOrganization::setLocation(class QString const &)
-	?setLogoUrl@QContactOrganization@QtMobility@@QAEXABVQUrl@@@Z @ 741 NONAME ; void QtMobility::QContactOrganization::setLogoUrl(class QUrl const &)
-	?setLongitude@QContactGeoLocation@QtMobility@@QAEXN@Z @ 742 NONAME ; void QtMobility::QContactGeoLocation::setLongitude(double)
-	?setManager@QContactAbstractRequest@QtMobility@@QAEXPAVQContactManager@2@@Z @ 743 NONAME ; void QtMobility::QContactAbstractRequest::setManager(class QtMobility::QContactManager *)
-	?setManagerUri@QContactId@QtMobility@@QAEXABVQString@@@Z @ 744 NONAME ; void QtMobility::QContactId::setManagerUri(class QString const &)
-	?setMatchFlags@QContactDetailFilter@QtMobility@@QAEXV?$QFlags@W4MatchFlag@QContactFilter@QtMobility@@@@@Z @ 745 NONAME ; void QtMobility::QContactDetailFilter::setMatchFlags(class QFlags<enum QtMobility::QContactFilter::MatchFlag>)
-	?setMatchFlags@QContactDetailRangeFilter@QtMobility@@QAEXV?$QFlags@W4MatchFlag@QContactFilter@QtMobility@@@@@Z @ 746 NONAME ; void QtMobility::QContactDetailRangeFilter::setMatchFlags(class QFlags<enum QtMobility::QContactFilter::MatchFlag>)
-	?setMiddleName@QContactName@QtMobility@@QAEXABVQString@@@Z @ 747 NONAME ; void QtMobility::QContactName::setMiddleName(class QString const &)
-	?setName@QContactDetailDefinition@QtMobility@@QAEXABVQString@@@Z @ 748 NONAME ; void QtMobility::QContactDetailDefinition::setName(class QString const &)
-	?setName@QContactOrganization@QtMobility@@QAEXABVQString@@@Z @ 749 NONAME ; void QtMobility::QContactOrganization::setName(class QString const &)
-	?setNickname@QContactGlobalPresence@QtMobility@@QAEXABVQString@@@Z @ 750 NONAME ; void QtMobility::QContactGlobalPresence::setNickname(class QString const &)
-	?setNickname@QContactNickname@QtMobility@@QAEXABVQString@@@Z @ 751 NONAME ; void QtMobility::QContactNickname::setNickname(class QString const &)
+	?FieldStreet@QContactAddress@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 1 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactAddress::FieldStreet
+	?setEventType@QContactChangeLogFilter@QtMobility@@QAEXW4EventType@12@@Z @ 2 NONAME ; void QtMobility::QContactChangeLogFilter::setEventType(enum QtMobility::QContactChangeLogFilter::EventType)
+	?FieldCountry@QContactAddress@QtMobility@@2U?$QLatin1Constant@$07@2@B @ 3 NONAME ; struct QtMobility::QLatin1Constant<8> const QtMobility::QContactAddress::FieldCountry
+	??0QContactRingtone@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 4 NONAME ; QtMobility::QContactRingtone::QContactRingtone(class QtMobility::QContactDetail const &)
+	?setTimestamp@QContactPresence@QtMobility@@QAEXABVQDateTime@@@Z @ 5 NONAME ; void QtMobility::QContactPresence::setTimestamp(class QDateTime const &)
+	?supportedDataTypes@QContactManagerEngine@QtMobility@@UBE?AV?$QList@W4Type@QVariant@@@@XZ @ 6 NONAME ; class QList<enum QVariant::Type> QtMobility::QContactManagerEngine::supportedDataTypes(void) const
+	?metaObject@QContactRelationshipRemoveRequest@QtMobility@@UBEPBUQMetaObject@@XZ @ 7 NONAME ; struct QMetaObject const * QtMobility::QContactRelationshipRemoveRequest::metaObject(void) const
+	?qt_metacall@QContactLocalIdFetchRequest@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 8 NONAME ; int QtMobility::QContactLocalIdFetchRequest::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?imageUrl@QContactAvatar@QtMobility@@QBE?AVQUrl@@XZ @ 9 NONAME ; class QUrl QtMobility::QContactAvatar::imageUrl(void) const
+	?setPostcode@QContactAddress@QtMobility@@QAEXABVQString@@@Z @ 10 NONAME ; void QtMobility::QContactAddress::setPostcode(class QString const &)
+	?direction@QContactSortOrder@QtMobility@@QBE?AW4SortOrder@Qt@@XZ @ 11 NONAME ; enum Qt::SortOrder QtMobility::QContactSortOrder::direction(void) const
+	??4QContactFilter@QtMobility@@QAEAAV01@ABV01@@Z @ 12 NONAME ; class QtMobility::QContactFilter & QtMobility::QContactFilter::operator=(class QtMobility::QContactFilter const &)
+	?relationships@QContactRelationshipSaveRequest@QtMobility@@QBE?AV?$QList@VQContactRelationship@QtMobility@@@@XZ @ 13 NONAME ; class QList<class QtMobility::QContactRelationship> QtMobility::QContactRelationshipSaveRequest::relationships(void) const
+	?removeRelationship@QContactManager@QtMobility@@QAE_NABVQContactRelationship@2@@Z @ 14 NONAME ; bool QtMobility::QContactManager::removeRelationship(class QtMobility::QContactRelationship const &)
+	?setFirst@QContactRelationshipFetchRequest@QtMobility@@QAEXABVQContactId@2@@Z @ 15 NONAME ; void QtMobility::QContactRelationshipFetchRequest::setFirst(class QtMobility::QContactId const &)
+	??1QContactDetailFilter@QtMobility@@QAE@XZ @ 16 NONAME ; QtMobility::QContactDetailFilter::~QContactDetailFilter(void)
+	?FieldCreationTimestamp@QContactTimestamp@QtMobility@@2U?$QLatin1Constant@$0BC@@2@B @ 17 NONAME ; struct QtMobility::QLatin1Constant<18> const QtMobility::QContactTimestamp::FieldCreationTimestamp
+	??4QContactGuid@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 18 NONAME ; class QtMobility::QContactGuid & QtMobility::QContactGuid::operator=(class QtMobility::QContactDetail const &)
+	??0QContactRelationshipFetchRequest@QtMobility@@QAE@PAVQObject@@@Z @ 19 NONAME ; QtMobility::QContactRelationshipFetchRequest::QContactRelationshipFetchRequest(class QObject *)
+	?setRelatedContactId@QContactRelationshipFilter@QtMobility@@QAEXABVQContactId@2@@Z @ 20 NONAME ; void QtMobility::QContactRelationshipFilter::setRelatedContactId(class QtMobility::QContactId const &)
+	?d_func@QContactRelationshipFetchRequest@QtMobility@@AAEPAVQContactRelationshipFetchRequestPrivate@2@XZ @ 21 NONAME ; class QtMobility::QContactRelationshipFetchRequestPrivate * QtMobility::QContactRelationshipFetchRequest::d_func(void)
+	?addSorted@QContactManagerEngine@QtMobility@@SAXPAV?$QList@VQContact@QtMobility@@@@ABVQContact@2@ABV?$QList@VQContactSortOrder@QtMobility@@@@@Z @ 22 NONAME ; void QtMobility::QContactManagerEngine::addSorted(class QList<class QtMobility::QContact> *, class QtMobility::QContact const &, class QList<class QtMobility::QContactSortOrder> const &)
+	?supportedImplementationVersions@QContactManagerEngineFactory@QtMobility@@UBE?AV?$QList@H@@XZ @ 23 NONAME ; class QList<int> QtMobility::QContactManagerEngineFactory::supportedImplementationVersions(void) const
+	?changedContacts@QContactChangeSet@QtMobility@@QBE?AV?$QSet@I@@XZ @ 24 NONAME ; class QSet<unsigned int> QtMobility::QContactChangeSet::changedContacts(void) const
+	?manager@QContactAbstractRequest@QtMobility@@QBEPAVQContactManager@2@XZ @ 25 NONAME ; class QtMobility::QContactManager * QtMobility::QContactAbstractRequest::manager(void) const
+	??0QContactAnniversary@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 26 NONAME ; QtMobility::QContactAnniversary::QContactAnniversary(class QtMobility::QContactDetail const &)
+	?staticMetaObject@QContactFetchRequest@QtMobility@@2UQMetaObject@@B @ 27 NONAME ; struct QMetaObject const QtMobility::QContactFetchRequest::staticMetaObject
+	??0QContact@QtMobility@@QAE@ABV01@@Z @ 28 NONAME ; QtMobility::QContact::QContact(class QtMobility::QContact const &)
+	??0QContactDisplayLabel@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 29 NONAME ; QtMobility::QContactDisplayLabel::QContactDisplayLabel(class QtMobility::QContactDetail const &)
+	?setUrl@QContactUrl@QtMobility@@QAEXABVQString@@@Z @ 30 NONAME ; void QtMobility::QContactUrl::setUrl(class QString const &)
+	?setType@QContact@QtMobility@@QAEXABVQContactType@2@@Z @ 31 NONAME ; void QtMobility::QContact::setType(class QtMobility::QContactType const &)
+	??8QContactDetailDefinition@QtMobility@@QBE_NABV01@@Z @ 32 NONAME ; bool QtMobility::QContactDetailDefinition::operator==(class QtMobility::QContactDetailDefinition const &) const
+	?setLinkedDetailUris@QContactDetail@QtMobility@@QAEXABVQString@@@Z @ 33 NONAME ; void QtMobility::QContactDetail::setLinkedDetailUris(class QString const &)
+	?setGuid@QContactGuid@QtMobility@@QAEXABVQString@@@Z @ 34 NONAME ; void QtMobility::QContactGuid::setGuid(class QString const &)
+	?supportedDataTypes@QContactManager@QtMobility@@QBE?AV?$QList@W4Type@QVariant@@@@XZ @ 35 NONAME ; class QList<enum QVariant::Type> QtMobility::QContactManager::supportedDataTypes(void) const
+	?nickname@QContactNickname@QtMobility@@QBE?AVQString@@XZ @ 36 NONAME ; class QString QtMobility::QContactNickname::nickname(void) const
+	?qt_metacast@QContactRelationshipRemoveRequest@QtMobility@@UAEPAXPBD@Z @ 37 NONAME ; void * QtMobility::QContactRelationshipRemoveRequest::qt_metacast(char const *)
+	??1QContactRelationshipFilter@QtMobility@@QAE@XZ @ 38 NONAME ; QtMobility::QContactRelationshipFilter::~QContactRelationshipFilter(void)
+	??0QContactFetchHint@QtMobility@@QAE@XZ @ 39 NONAME ; QtMobility::QContactFetchHint::QContactFetchHint(void)
+	?updateDefinitionSaveRequest@QContactManagerEngine@QtMobility@@SAXPAVQContactDetailDefinitionSaveRequest@2@ABV?$QList@VQContactDetailDefinition@QtMobility@@@@W4Error@QContactManager@2@ABV?$QMap@HW4Error@QContactManager@QtMobility@@@@W4State@QContactAbstractRequest@2@@Z @ 40 NONAME ; void QtMobility::QContactManagerEngine::updateDefinitionSaveRequest(class QtMobility::QContactDetailDefinitionSaveRequest *, class QList<class QtMobility::QContactDetailDefinition> const &, enum QtMobility::QContactManager::Error, class QMap<int, enum QtMobility::QContactManager::Error> const &, enum QtMobility::QContactAbstractRequest::State)
+	?setAltitudeAccuracy@QContactGeoLocation@QtMobility@@QAEXN@Z @ 41 NONAME ; void QtMobility::QContactGeoLocation::setAltitudeAccuracy(double)
+	?remove@QContactIntersectionFilter@QtMobility@@QAEXABVQContactFilter@2@@Z @ 42 NONAME ; void QtMobility::QContactIntersectionFilter::remove(class QtMobility::QContactFilter const &)
+	?insertAddedContacts@QContactChangeSet@QtMobility@@QAEXABV?$QList@I@@@Z @ 43 NONAME ; void QtMobility::QContactChangeSet::insertAddedContacts(class QList<unsigned int> const &)
+	?d_func@QContactDetailDefinitionSaveRequest@QtMobility@@ABEPBVQContactDetailDefinitionSaveRequestPrivate@2@XZ @ 44 NONAME ; class QtMobility::QContactDetailDefinitionSaveRequestPrivate const * QtMobility::QContactDetailDefinitionSaveRequest::d_func(void) const
+	?compatibleContact@QContactManagerEngine@QtMobility@@UBE?AVQContact@2@ABV32@PAW4Error@QContactManager@2@@Z @ 45 NONAME ; class QtMobility::QContact QtMobility::QContactManagerEngine::compatibleContact(class QtMobility::QContact const &, enum QtMobility::QContactManager::Error *) const
+	?qt_metacall@QContactRelationshipFetchRequest@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 46 NONAME ; int QtMobility::QContactRelationshipFetchRequest::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??0QContactDetail@QtMobility@@IAE@ABV01@ABVQString@@@Z @ 47 NONAME ; QtMobility::QContactDetail::QContactDetail(class QtMobility::QContactDetail const &, class QString const &)
+	?saveContact@QContactManager@QtMobility@@QAE_NPAVQContact@2@@Z @ 48 NONAME ; bool QtMobility::QContactManager::saveContact(class QtMobility::QContact *)
+	?ids@QContactLocalIdFilter@QtMobility@@QBE?AV?$QList@I@@XZ @ 49 NONAME ; class QList<unsigned int> QtMobility::QContactLocalIdFilter::ids(void) const
+	??1QContactChangeSet@QtMobility@@QAE@XZ @ 50 NONAME ; QtMobility::QContactChangeSet::~QContactChangeSet(void)
+	?getStaticMetaObject@QContactDetailDefinitionRemoveRequest@QtMobility@@SAABUQMetaObject@@XZ @ 51 NONAME ; struct QMetaObject const & QtMobility::QContactDetailDefinitionRemoveRequest::getStaticMetaObject(void)
+	?SubTypeHouse@QContactAnniversary@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 52 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactAnniversary::SubTypeHouse
+	?SubTypeFavourite@QContactUrl@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 53 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactUrl::SubTypeFavourite
+	?getStaticMetaObject@QContactManager@QtMobility@@SAABUQMetaObject@@XZ @ 54 NONAME ; struct QMetaObject const & QtMobility::QContactManager::getStaticMetaObject(void)
+	?IsSameAs@QContactRelationship@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 55 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactRelationship::IsSameAs
+	?tr@QContactRemoveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 56 NONAME ; class QString QtMobility::QContactRemoveRequest::tr(char const *, char const *, int)
+	?setValue@QContactDetailFilter@QtMobility@@QAEXABVQVariant@@@Z @ 57 NONAME ; void QtMobility::QContactDetailFilter::setValue(class QVariant const &)
+	?name@QContactOrganization@QtMobility@@QBE?AVQString@@XZ @ 58 NONAME ; class QString QtMobility::QContactOrganization::name(void) const
+	?first@QContactRelationshipFetchRequest@QtMobility@@QBE?AVQContactId@2@XZ @ 59 NONAME ; class QtMobility::QContactId QtMobility::QContactRelationshipFetchRequest::first(void) const
+	?setManager@QContactAbstractRequest@QtMobility@@QAEXPAVQContactManager@2@@Z @ 60 NONAME ; void QtMobility::QContactAbstractRequest::setManager(class QtMobility::QContactManager *)
+	?qt_metacall@QContactAbstractRequest@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 61 NONAME ; int QtMobility::QContactAbstractRequest::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?subTypes@QContactAddress@QtMobility@@QBE?AVQStringList@@XZ @ 62 NONAME ; class QStringList QtMobility::QContactAddress::subTypes(void) const
+	?fetchHint@QContactFetchRequest@QtMobility@@QBE?AVQContactFetchHint@2@XZ @ 63 NONAME ; class QtMobility::QContactFetchHint QtMobility::QContactFetchRequest::fetchHint(void) const
+	?relationshipsAdded@QContactManagerEngine@QtMobility@@IAEXABV?$QList@I@@@Z @ 64 NONAME ; void QtMobility::QContactManagerEngine::relationshipsAdded(class QList<unsigned int> const &)
+	?videoRingtoneUrl@QContactRingtone@QtMobility@@QBE?AVQUrl@@XZ @ 65 NONAME ; class QUrl QtMobility::QContactRingtone::videoRingtoneUrl(void) const
+	?variantValue@QContactDetail@QtMobility@@QBE?AVQVariant@@PBD@Z @ 66 NONAME ; class QVariant QtMobility::QContactDetail::variantValue(char const *) const
+	?tr@QContactSaveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 67 NONAME ; class QString QtMobility::QContactSaveRequest::tr(char const *, char const *)
+	?FieldTimestamp@QContactGlobalPresence@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 68 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactGlobalPresence::FieldTimestamp
+	??4QContactSortOrder@QtMobility@@QAEAAV01@ABV01@@Z @ 69 NONAME ; class QtMobility::QContactSortOrder & QtMobility::QContactSortOrder::operator=(class QtMobility::QContactSortOrder const &)
+	??0QContactFilter@QtMobility@@QAE@ABV01@@Z @ 70 NONAME ; QtMobility::QContactFilter::QContactFilter(class QtMobility::QContactFilter const &)
+	??_EQContactRemoveRequest@QtMobility@@UAE@I@Z @ 71 NONAME ; QtMobility::QContactRemoveRequest::~QContactRemoveRequest(unsigned int)
+	?setDetailDefinitionName@QContactDetailFilter@QtMobility@@QAEXABVQString@@0@Z @ 72 NONAME ; void QtMobility::QContactDetailFilter::setDetailDefinitionName(class QString const &, class QString const &)
+	??_EQContactRelationshipRemoveRequest@QtMobility@@UAE@I@Z @ 73 NONAME ; QtMobility::QContactRelationshipRemoveRequest::~QContactRelationshipRemoveRequest(unsigned int)
+	?definitionNames@QContactDetailDefinitionRemoveRequest@QtMobility@@QBE?AVQStringList@@XZ @ 74 NONAME ; class QStringList QtMobility::QContactDetailDefinitionRemoveRequest::definitionNames(void) const
+	?FieldAudioRingtoneUrl@QContactRingtone@QtMobility@@2U?$QLatin1Constant@$0BB@@2@B @ 75 NONAME ; struct QtMobility::QLatin1Constant<17> const QtMobility::QContactRingtone::FieldAudioRingtoneUrl
+	?clearAddedContacts@QContactChangeSet@QtMobility@@QAEXXZ @ 76 NONAME ; void QtMobility::QContactChangeSet::clearAddedContacts(void)
+	??0QContactDetailDefinition@QtMobility@@QAE@XZ @ 77 NONAME ; QtMobility::QContactDetailDefinition::QContactDetailDefinition(void)
+	?linkedDetailUris@QContactDetail@QtMobility@@QBE?AVQStringList@@XZ @ 78 NONAME ; class QStringList QtMobility::QContactDetail::linkedDetailUris(void) const
+	??0QContactManagerEngine@QtMobility@@QAE@XZ @ 79 NONAME ; QtMobility::QContactManagerEngine::QContactManagerEngine(void)
+	?contactIds@QContactManager@QtMobility@@QBE?AV?$QList@I@@ABVQContactFilter@2@ABV?$QList@VQContactSortOrder@QtMobility@@@@@Z @ 80 NONAME ; class QList<unsigned int> QtMobility::QContactManager::contactIds(class QtMobility::QContactFilter const &, class QList<class QtMobility::QContactSortOrder> const &) const
+	?logoUrl@QContactOrganization@QtMobility@@QBE?AVQUrl@@XZ @ 81 NONAME ; class QUrl QtMobility::QContactOrganization::logoUrl(void) const
+	?HasSpouse@QContactRelationship@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 82 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactRelationship::HasSpouse
+	??0QContactAbstractRequest@QtMobility@@IAE@PAVQContactAbstractRequestPrivate@1@PAVQObject@@@Z @ 83 NONAME ; QtMobility::QContactAbstractRequest::QContactAbstractRequest(class QtMobility::QContactAbstractRequestPrivate *, class QObject *)
+	??0QContactGlobalPresence@QtMobility@@QAE@XZ @ 84 NONAME ; QtMobility::QContactGlobalPresence::QContactGlobalPresence(void)
+	?SubTypeEmployment@QContactAnniversary@QtMobility@@2U?$QLatin1Constant@$0L@@2@B @ 85 NONAME ; struct QtMobility::QLatin1Constant<11> const QtMobility::QContactAnniversary::SubTypeEmployment
+	?setSyncTarget@QContactSyncTarget@QtMobility@@QAEXABVQString@@@Z @ 86 NONAME ; void QtMobility::QContactSyncTarget::setSyncTarget(class QString const &)
+	??4QContactAvatar@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 87 NONAME ; class QtMobility::QContactAvatar & QtMobility::QContactAvatar::operator=(class QtMobility::QContactDetail const &)
+	?trUtf8@QContactManagerEngine@QtMobility@@SA?AVQString@@PBD0H@Z @ 88 NONAME ; class QString QtMobility::QContactManagerEngine::trUtf8(char const *, char const *, int)
+	?relationshipType@QContactRelationshipFetchRequest@QtMobility@@QBE?AVQString@@XZ @ 89 NONAME ; class QString QtMobility::QContactRelationshipFetchRequest::relationshipType(void) const
+	?qHash@QtMobility@@YAIABVQContactId@1@@Z @ 90 NONAME ; unsigned int QtMobility::qHash(class QtMobility::QContactId const &)
+	?second@QContactRelationship@QtMobility@@QBE?AVQContactId@2@XZ @ 91 NONAME ; class QtMobility::QContactId QtMobility::QContactRelationship::second(void) const
+	?FieldHeading@QContactGeoLocation@QtMobility@@2U?$QLatin1Constant@$07@2@B @ 92 NONAME ; struct QtMobility::QLatin1Constant<8> const QtMobility::QContactGeoLocation::FieldHeading
+	?d_func@QContactRelationshipSaveRequest@QtMobility@@AAEPAVQContactRelationshipSaveRequestPrivate@2@XZ @ 93 NONAME ; class QtMobility::QContactRelationshipSaveRequestPrivate * QtMobility::QContactRelationshipSaveRequest::d_func(void)
+	??1QContactFilter@QtMobility@@QAE@XZ @ 94 NONAME ; QtMobility::QContactFilter::~QContactFilter(void)
+	?DefinitionName@QContactUrl@QtMobility@@2U?$QLatin1Constant@$03@2@B @ 95 NONAME ; struct QtMobility::QLatin1Constant<4> const QtMobility::QContactUrl::DefinitionName
+	??4QContactName@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 96 NONAME ; class QtMobility::QContactName & QtMobility::QContactName::operator=(class QtMobility::QContactDetail const &)
+	?DefinitionName@QContactNickname@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 97 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactNickname::DefinitionName
+	?GenderFemale@QContactGender@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 98 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactGender::GenderFemale
+	??0QContactManager@QtMobility@@QAE@ABVQString@@ABV?$QMap@VQString@@V1@@@PAVQObject@@@Z @ 99 NONAME ; QtMobility::QContactManager::QContactManager(class QString const &, class QMap<class QString, class QString> const &, class QObject *)
+	??0QContactPhoneNumber@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 100 NONAME ; QtMobility::QContactPhoneNumber::QContactPhoneNumber(class QtMobility::QContactDetail const &)
+	?DefinitionName@QContactAnniversary@QtMobility@@2U?$QLatin1Constant@$0M@@2@B @ 101 NONAME ; struct QtMobility::QLatin1Constant<12> const QtMobility::QContactAnniversary::DefinitionName
+	?cancel@QContactAbstractRequest@QtMobility@@QAE_NXZ @ 102 NONAME ; bool QtMobility::QContactAbstractRequest::cancel(void)
+	?d_func@QContactLocalIdFilter@QtMobility@@ABEPBVQContactLocalIdFilterPrivate@2@XZ @ 103 NONAME ; class QtMobility::QContactLocalIdFilterPrivate const * QtMobility::QContactLocalIdFilter::d_func(void) const
+	?saveRelationships@QContactManagerEngine@QtMobility@@UAE_NPAV?$QList@VQContactRelationship@QtMobility@@@@PAV?$QMap@HW4Error@QContactManager@QtMobility@@@@PAW4Error@QContactManager@2@@Z @ 104 NONAME ; bool QtMobility::QContactManagerEngine::saveRelationships(class QList<class QtMobility::QContactRelationship> *, class QMap<int, enum QtMobility::QContactManager::Error> *, enum QtMobility::QContactManager::Error *)
+	?SubTypeLandline@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 105 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactPhoneNumber::SubTypeLandline
+	?FieldLocation@QContactOrganization@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 106 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactOrganization::FieldLocation
+	?contacts@QContactManager@QtMobility@@QBE?AV?$QList@VQContact@QtMobility@@@@ABVQContactFilter@2@ABV?$QList@VQContactSortOrder@QtMobility@@@@ABVQContactFetchHint@2@@Z @ 107 NONAME ; class QList<class QtMobility::QContact> QtMobility::QContactManager::contacts(class QtMobility::QContactFilter const &, class QList<class QtMobility::QContactSortOrder> const &, class QtMobility::QContactFetchHint const &) const
+	??0QContactPresence@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 108 NONAME ; QtMobility::QContactPresence::QContactPresence(class QtMobility::QContactDetail const &)
+	?setMatchFlags@QContactDetailRangeFilter@QtMobility@@QAEXV?$QFlags@W4MatchFlag@QContactFilter@QtMobility@@@@@Z @ 109 NONAME ; void QtMobility::QContactDetailRangeFilter::setMatchFlags(class QFlags<enum QtMobility::QContactFilter::MatchFlag>)
+	?detailDefinitionName@QContactSortOrder@QtMobility@@QBE?AVQString@@XZ @ 110 NONAME ; class QString QtMobility::QContactSortOrder::detailDefinitionName(void) const
+	?type@QContactAbstractRequest@QtMobility@@QBE?AW4RequestType@12@XZ @ 111 NONAME ; enum QtMobility::QContactAbstractRequest::RequestType QtMobility::QContactAbstractRequest::type(void) const
+	?definitions@QContactDetailDefinitionSaveRequest@QtMobility@@QBE?AV?$QList@VQContactDetailDefinition@QtMobility@@@@XZ @ 112 NONAME ; class QList<class QtMobility::QContactDetailDefinition> QtMobility::QContactDetailDefinitionSaveRequest::definitions(void) const
+	??0QContactDetail@QtMobility@@QAE@ABV01@@Z @ 113 NONAME ; QtMobility::QContactDetail::QContactDetail(class QtMobility::QContactDetail const &)
+	?type@QContactFilter@QtMobility@@QBE?AW4FilterType@12@XZ @ 114 NONAME ; enum QtMobility::QContactFilter::FilterType QtMobility::QContactFilter::type(void) const
+	?detailDefinitionsHint@QContactFetchHint@QtMobility@@QBE?AVQStringList@@XZ @ 115 NONAME ; class QStringList QtMobility::QContactFetchHint::detailDefinitionsHint(void) const
+	?street@QContactAddress@QtMobility@@QBE?AVQString@@XZ @ 116 NONAME ; class QString QtMobility::QContactAddress::street(void) const
+	?allowableValues@QContactDetailFieldDefinition@QtMobility@@QBE?AV?$QList@VQVariant@@@@XZ @ 117 NONAME ; class QList<class QVariant> QtMobility::QContactDetailFieldDefinition::allowableValues(void) const
+	?SubTypeAssistant@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 118 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactPhoneNumber::SubTypeAssistant
+	?localId@QContactId@QtMobility@@QBEIXZ @ 119 NONAME ; unsigned int QtMobility::QContactId::localId(void) const
+	?clearAll@QContactChangeSet@QtMobility@@QAEXXZ @ 120 NONAME ; void QtMobility::QContactChangeSet::clearAll(void)
+	?d_func@QContactDetailRangeFilter@QtMobility@@ABEPBVQContactDetailRangeFilterPrivate@2@XZ @ 121 NONAME ; class QtMobility::QContactDetailRangeFilterPrivate const * QtMobility::QContactDetailRangeFilter::d_func(void) const
+	?tr@QContactLocalIdFetchRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 122 NONAME ; class QString QtMobility::QContactLocalIdFetchRequest::tr(char const *, char const *, int)
+	?supportedContactTypes@QContactManager@QtMobility@@QBE?AVQStringList@@XZ @ 123 NONAME ; class QStringList QtMobility::QContactManager::supportedContactTypes(void) const
+	?FieldDetailUri@QContactDetail@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 124 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactDetail::FieldDetailUri
+	?type@QContactType@QtMobility@@QBE?AVQString@@XZ @ 125 NONAME ; class QString QtMobility::QContactType::type(void) const
+	?FieldPresenceState@QContactGlobalPresence@QtMobility@@2U?$QLatin1Constant@$0O@@2@B @ 126 NONAME ; struct QtMobility::QLatin1Constant<14> const QtMobility::QContactGlobalPresence::FieldPresenceState
+	?d_func@QContactLocalIdFetchRequest@QtMobility@@ABEPBVQContactLocalIdFetchRequestPrivate@2@XZ @ 127 NONAME ; class QtMobility::QContactLocalIdFetchRequestPrivate const * QtMobility::QContactLocalIdFetchRequest::d_func(void) const
+	?FieldPostcode@QContactAddress@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 128 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactAddress::FieldPostcode
+	??_EQContactLocalIdFetchRequest@QtMobility@@UAE@I@Z @ 129 NONAME ; QtMobility::QContactLocalIdFetchRequest::~QContactLocalIdFetchRequest(unsigned int)
+	?setSubTypes@QContactOnlineAccount@QtMobility@@QAEXABVQString@@@Z @ 130 NONAME ; void QtMobility::QContactOnlineAccount::setSubTypes(class QString const &)
+	?FieldPrefix@QContactName@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 131 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactName::FieldPrefix
+	??1QContactIntersectionFilter@QtMobility@@QAE@XZ @ 132 NONAME ; QtMobility::QContactIntersectionFilter::~QContactIntersectionFilter(void)
+	?setImageUrl@QContactAvatar@QtMobility@@QAEXABVQUrl@@@Z @ 133 NONAME ; void QtMobility::QContactAvatar::setImageUrl(class QUrl const &)
+	??8QContactFilter@QtMobility@@QBE_NABV01@@Z @ 134 NONAME ; bool QtMobility::QContactFilter::operator==(class QtMobility::QContactFilter const &) const
+	?metaObject@QContactFetchRequest@QtMobility@@UBEPBUQMetaObject@@XZ @ 135 NONAME ; struct QMetaObject const * QtMobility::QContactFetchRequest::metaObject(void) const
+	?DefinitionName@QContactGender@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 136 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactGender::DefinitionName
+	?schemaDefinitions@QContactManagerEngine@QtMobility@@SA?AV?$QMap@VQString@@V?$QMap@VQString@@VQContactDetailDefinition@QtMobility@@@@@@XZ @ 137 NONAME ; class QMap<class QString, class QMap<class QString, class QtMobility::QContactDetailDefinition> > QtMobility::QContactManagerEngine::schemaDefinitions(void)
+	?errorMap@QContactDetailDefinitionRemoveRequest@QtMobility@@QBE?AV?$QMap@HW4Error@QContactManager@QtMobility@@@@XZ @ 138 NONAME ; class QMap<int, enum QtMobility::QContactManager::Error> QtMobility::QContactDetailDefinitionRemoveRequest::errorMap(void) const
+	?setOptimizationHints@QContactFetchHint@QtMobility@@QAEXV?$QFlags@W4OptimizationHint@QContactFetchHint@QtMobility@@@@@Z @ 139 NONAME ; void QtMobility::QContactFetchHint::setOptimizationHints(class QFlags<enum QtMobility::QContactFetchHint::OptimizationHint>)
+	?isEmpty@QContactDetailDefinition@QtMobility@@QBE_NXZ @ 140 NONAME ; bool QtMobility::QContactDetailDefinition::isEmpty(void) const
+	?detailDefinitionName@QContactDetailFilter@QtMobility@@QBE?AVQString@@XZ @ 141 NONAME ; class QString QtMobility::QContactDetailFilter::detailDefinitionName(void) const
+	?caseSensitivity@QContactSortOrder@QtMobility@@QBE?AW4CaseSensitivity@Qt@@XZ @ 142 NONAME ; enum Qt::CaseSensitivity QtMobility::QContactSortOrder::caseSensitivity(void) const
+	?getStaticMetaObject@QContactLocalIdFetchRequest@QtMobility@@SAABUQMetaObject@@XZ @ 143 NONAME ; struct QMetaObject const & QtMobility::QContactLocalIdFetchRequest::getStaticMetaObject(void)
+	?customMessage@QContactGlobalPresence@QtMobility@@QBE?AVQString@@XZ @ 144 NONAME ; class QString QtMobility::QContactGlobalPresence::customMessage(void) const
+	?setName@QContactDetailDefinition@QtMobility@@QAEXABVQString@@@Z @ 145 NONAME ; void QtMobility::QContactDetailDefinition::setName(class QString const &)
+	?displayLabel@QContact@QtMobility@@QBE?AVQString@@XZ @ 146 NONAME ; class QString QtMobility::QContact::displayLabel(void) const
+	?assign@QContactDetail@QtMobility@@IAEAAV12@ABV12@ABVQString@@@Z @ 147 NONAME ; class QtMobility::QContactDetail & QtMobility::QContactDetail::assign(class QtMobility::QContactDetail const &, class QString const &)
+	?d_func@QContactIntersectionFilter@QtMobility@@ABEPBVQContactIntersectionFilterPrivate@2@XZ @ 148 NONAME ; class QtMobility::QContactIntersectionFilterPrivate const * QtMobility::QContactIntersectionFilter::d_func(void) const
+	??4QContactEmailAddress@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 149 NONAME ; class QtMobility::QContactEmailAddress & QtMobility::QContactEmailAddress::operator=(class QtMobility::QContactDetail const &)
+	??1QContactDetail@QtMobility@@QAE@XZ @ 150 NONAME ; QtMobility::QContactDetail::~QContactDetail(void)
+	?FieldCustomMessage@QContactGlobalPresence@QtMobility@@2U?$QLatin1Constant@$0O@@2@B @ 151 NONAME ; struct QtMobility::QLatin1Constant<14> const QtMobility::QContactGlobalPresence::FieldCustomMessage
+	?tr@QContactRemoveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 152 NONAME ; class QString QtMobility::QContactRemoveRequest::tr(char const *, char const *)
+	?tr@QContactSaveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 153 NONAME ; class QString QtMobility::QContactSaveRequest::tr(char const *, char const *, int)
+	?getStaticMetaObject@QContactRemoveRequest@QtMobility@@SAABUQMetaObject@@XZ @ 154 NONAME ; struct QMetaObject const & QtMobility::QContactRemoveRequest::getStaticMetaObject(void)
+	?qt_metacall@QContactRelationshipSaveRequest@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 155 NONAME ; int QtMobility::QContactRelationshipSaveRequest::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?supportedContactTypes@QContactManagerEngine@QtMobility@@UBE?AVQStringList@@XZ @ 156 NONAME ; class QStringList QtMobility::QContactManagerEngine::supportedContactTypes(void) const
+	?setLastName@QContactName@QtMobility@@QAEXABVQString@@@Z @ 157 NONAME ; void QtMobility::QContactName::setLastName(class QString const &)
+	??0QContactRelationship@QtMobility@@QAE@ABV01@@Z @ 158 NONAME ; QtMobility::QContactRelationship::QContactRelationship(class QtMobility::QContactRelationship const &)
+	?serviceProvider@QContactOnlineAccount@QtMobility@@QBE?AVQString@@XZ @ 159 NONAME ; class QString QtMobility::QContactOnlineAccount::serviceProvider(void) const
+	?trUtf8@QContactManager@QtMobility@@SA?AVQString@@PBD0H@Z @ 160 NONAME ; class QString QtMobility::QContactManager::trUtf8(char const *, char const *, int)
+	?d_func@QContactDetailDefinitionRemoveRequest@QtMobility@@ABEPBVQContactDetailDefinitionRemoveRequestPrivate@2@XZ @ 161 NONAME ; class QtMobility::QContactDetailDefinitionRemoveRequestPrivate const * QtMobility::QContactDetailDefinitionRemoveRequest::d_func(void) const
+	?tr@QContactDetailDefinitionRemoveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 162 NONAME ; class QString QtMobility::QContactDetailDefinitionRemoveRequest::tr(char const *, char const *, int)
+	??0QContactAbstractRequest@QtMobility@@AAE@PAVQObject@@@Z @ 163 NONAME ; QtMobility::QContactAbstractRequest::QContactAbstractRequest(class QObject *)
+	?DefinitionName@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$0M@@2@B @ 164 NONAME ; struct QtMobility::QLatin1Constant<12> const QtMobility::QContactPhoneNumber::DefinitionName
+	?customLabel@QContactName@QtMobility@@QBE?AVQString@@XZ @ 165 NONAME ; class QString QtMobility::QContactName::customLabel(void) const
+	?definitions@QContactDetailDefinitionFetchRequest@QtMobility@@QBE?AV?$QMap@VQString@@VQContactDetailDefinition@QtMobility@@@@XZ @ 166 NONAME ; class QMap<class QString, class QtMobility::QContactDetailDefinition> QtMobility::QContactDetailDefinitionFetchRequest::definitions(void) const
+	??1QContactInvalidFilter@QtMobility@@QAE@XZ @ 167 NONAME ; QtMobility::QContactInvalidFilter::~QContactInvalidFilter(void)
+	?sorting@QContactLocalIdFetchRequest@QtMobility@@QBE?AV?$QList@VQContactSortOrder@QtMobility@@@@XZ @ 168 NONAME ; class QList<class QtMobility::QContactSortOrder> QtMobility::QContactLocalIdFetchRequest::sorting(void) const
+	?setSubType@QContactAnniversary@QtMobility@@QAEXABVQString@@@Z @ 169 NONAME ; void QtMobility::QContactAnniversary::setSubType(class QString const &)
+	??1QContact@QtMobility@@QAE@XZ @ 170 NONAME ; QtMobility::QContact::~QContact(void)
+	?FieldVideoRingtoneUrl@QContactRingtone@QtMobility@@2U?$QLatin1Constant@$0BB@@2@B @ 171 NONAME ; struct QtMobility::QLatin1Constant<17> const QtMobility::QContactRingtone::FieldVideoRingtoneUrl
+	?trUtf8@QContactDetailDefinitionSaveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 172 NONAME ; class QString QtMobility::QContactDetailDefinitionSaveRequest::trUtf8(char const *, char const *)
+	?name@QContactDetailDefinition@QtMobility@@QBE?AVQString@@XZ @ 173 NONAME ; class QString QtMobility::QContactDetailDefinition::name(void) const
+	??0QContactRelationshipSaveRequest@QtMobility@@QAE@PAVQObject@@@Z @ 174 NONAME ; QtMobility::QContactRelationshipSaveRequest::QContactRelationshipSaveRequest(class QObject *)
+	?definitionName@QContactDetail@QtMobility@@QBE?AVQString@@XZ @ 175 NONAME ; class QString QtMobility::QContactDetail::definitionName(void) const
+	?qHash@QtMobility@@YAIABVQContactDetail@1@@Z @ 176 NONAME ; unsigned int QtMobility::qHash(class QtMobility::QContactDetail const &)
+	?setDetailUri@QContactDetail@QtMobility@@QAEXABVQString@@@Z @ 177 NONAME ; void QtMobility::QContactDetail::setDetailUri(class QString const &)
+	??9QContactSortOrder@QtMobility@@QBE_NABV01@@Z @ 178 NONAME ; bool QtMobility::QContactSortOrder::operator!=(class QtMobility::QContactSortOrder const &) const
+	?setLinkedDetailUris@QContactDetail@QtMobility@@QAEXABVQStringList@@@Z @ 179 NONAME ; void QtMobility::QContactDetail::setLinkedDetailUris(class QStringList const &)
+	?trUtf8@QContactManager@QtMobility@@SA?AVQString@@PBD0@Z @ 180 NONAME ; class QString QtMobility::QContactManager::trUtf8(char const *, char const *)
+	?details@QContact@QtMobility@@QBE?AV?$QList@VQContactDetail@QtMobility@@@@ABVQString@@00@Z @ 181 NONAME ; class QList<class QtMobility::QContactDetail> QtMobility::QContact::details(class QString const &, class QString const &, class QString const &) const
+	?setName@QContactOrganization@QtMobility@@QAEXABVQString@@@Z @ 182 NONAME ; void QtMobility::QContactOrganization::setName(class QString const &)
+	?d_func@QContactDetailFilter@QtMobility@@AAEPAVQContactDetailFilterPrivate@2@XZ @ 183 NONAME ; class QtMobility::QContactDetailFilterPrivate * QtMobility::QContactDetailFilter::d_func(void)
+	??0QContactSaveRequest@QtMobility@@QAE@PAVQObject@@@Z @ 184 NONAME ; QtMobility::QContactSaveRequest::QContactSaveRequest(class QObject *)
+	?isRelationshipTypeSupported@QContactManager@QtMobility@@QBE_NABVQString@@0@Z @ 185 NONAME ; bool QtMobility::QContactManager::isRelationshipTypeSupported(class QString const &, class QString const &) const
+	?DefinitionName@QContactNote@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 186 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactNote::DefinitionName
+	?timestamp@QContactGeoLocation@QtMobility@@QBE?AVQDateTime@@XZ @ 187 NONAME ; class QDateTime QtMobility::QContactGeoLocation::timestamp(void) const
+	?saveRelationship@QContactManager@QtMobility@@QAE_NPAVQContactRelationship@2@@Z @ 188 NONAME ; bool QtMobility::QContactManager::saveRelationship(class QtMobility::QContactRelationship *)
+	?tr@QContactDetailDefinitionFetchRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 189 NONAME ; class QString QtMobility::QContactDetailDefinitionFetchRequest::tr(char const *, char const *, int)
+	?setFilter@QContactFetchRequest@QtMobility@@QAEXABVQContactFilter@2@@Z @ 190 NONAME ; void QtMobility::QContactFetchRequest::setFilter(class QtMobility::QContactFilter const &)
+	?eventType@QContactChangeLogFilter@QtMobility@@QBE?AW4EventType@12@XZ @ 191 NONAME ; enum QtMobility::QContactChangeLogFilter::EventType QtMobility::QContactChangeLogFilter::eventType(void) const
+	?append@QContactUnionFilter@QtMobility@@QAEXABVQContactFilter@2@@Z @ 192 NONAME ; void QtMobility::QContactUnionFilter::append(class QtMobility::QContactFilter const &)
+	?setSubTypes@QContactPhoneNumber@QtMobility@@QAEXABVQStringList@@@Z @ 193 NONAME ; void QtMobility::QContactPhoneNumber::setSubTypes(class QStringList const &)
+	?match@QContactName@QtMobility@@SA?AVQContactFilter@2@ABVQString@@0@Z @ 194 NONAME ; class QtMobility::QContactFilter QtMobility::QContactName::match(class QString const &, class QString const &)
+	??0QContactGeoLocation@QtMobility@@QAE@XZ @ 195 NONAME ; QtMobility::QContactGeoLocation::QContactGeoLocation(void)
+	?isFinished@QContactAbstractRequest@QtMobility@@QBE_NXZ @ 196 NONAME ; bool QtMobility::QContactAbstractRequest::isFinished(void) const
+	?remove@QContactUnionFilter@QtMobility@@QAEXABVQContactFilter@2@@Z @ 197 NONAME ; void QtMobility::QContactUnionFilter::remove(class QtMobility::QContactFilter const &)
+	?FieldModificationTimestamp@QContactTimestamp@QtMobility@@2U?$QLatin1Constant@$0BG@@2@B @ 198 NONAME ; struct QtMobility::QLatin1Constant<22> const QtMobility::QContactTimestamp::FieldModificationTimestamp
+	??0QContactChangeSet@QtMobility@@QAE@XZ @ 199 NONAME ; QtMobility::QContactChangeSet::QContactChangeSet(void)
+	?managerUri@QContactManager@QtMobility@@QBE?AVQString@@XZ @ 200 NONAME ; class QString QtMobility::QContactManager::managerUri(void) const
+	??0QContactInvalidFilter@QtMobility@@QAE@ABVQContactFilter@1@@Z @ 201 NONAME ; QtMobility::QContactInvalidFilter::QContactInvalidFilter(class QtMobility::QContactFilter const &)
+	?FieldAccuracy@QContactGeoLocation@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 202 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactGeoLocation::FieldAccuracy
+	?ContextOther@QContactDetail@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 203 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactDetail::ContextOther
+	?removeDetailDefinition@QContactManagerEngine@QtMobility@@UAE_NABVQString@@0PAW4Error@QContactManager@2@@Z @ 204 NONAME ; bool QtMobility::QContactManagerEngine::removeDetailDefinition(class QString const &, class QString const &, enum QtMobility::QContactManager::Error *)
+	?createEngine@QContactManager@QtMobility@@AAEXABVQString@@ABV?$QMap@VQString@@V1@@@@Z @ 205 NONAME ; void QtMobility::QContactManager::createEngine(class QString const &, class QMap<class QString, class QString> const &)
+	??0QContactAddress@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 206 NONAME ; QtMobility::QContactAddress::QContactAddress(class QtMobility::QContactDetail const &)
+	?FieldLabel@QContactGeoLocation@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 207 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactGeoLocation::FieldLabel
+	??1QContactRelationship@QtMobility@@QAE@XZ @ 208 NONAME ; QtMobility::QContactRelationship::~QContactRelationship(void)
+	?d_func@QContactRelationshipFetchRequest@QtMobility@@ABEPBVQContactRelationshipFetchRequestPrivate@2@XZ @ 209 NONAME ; class QtMobility::QContactRelationshipFetchRequestPrivate const * QtMobility::QContactRelationshipFetchRequest::d_func(void) const
+	??4QContactTag@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 210 NONAME ; class QtMobility::QContactTag & QtMobility::QContactTag::operator=(class QtMobility::QContactDetail const &)
+	??0QContactChangeLogFilter@QtMobility@@QAE@W4EventType@01@@Z @ 211 NONAME ; QtMobility::QContactChangeLogFilter::QContactChangeLogFilter(enum QtMobility::QContactChangeLogFilter::EventType)
+	?tr@QContactRelationshipRemoveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 212 NONAME ; class QString QtMobility::QContactRelationshipRemoveRequest::tr(char const *, char const *, int)
+	?trUtf8@QContactAbstractRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 213 NONAME ; class QString QtMobility::QContactAbstractRequest::trUtf8(char const *, char const *, int)
+	??4QContactDetail@QtMobility@@QAEAAV01@ABV01@@Z @ 214 NONAME ; class QtMobility::QContactDetail & QtMobility::QContactDetail::operator=(class QtMobility::QContactDetail const &)
+	?trUtf8@QContactManagerEngine@QtMobility@@SA?AVQString@@PBD0@Z @ 215 NONAME ; class QString QtMobility::QContactManagerEngine::trUtf8(char const *, char const *)
+	?setContexts@QContactDetail@QtMobility@@QAEXABVQString@@@Z @ 216 NONAME ; void QtMobility::QContactDetail::setContexts(class QString const &)
+	?dataType@QContactDetailFieldDefinition@QtMobility@@QBE?AW4Type@QVariant@@XZ @ 217 NONAME ; enum QVariant::Type QtMobility::QContactDetailFieldDefinition::dataType(void) const
+	?SubTypeEngagement@QContactAnniversary@QtMobility@@2U?$QLatin1Constant@$0L@@2@B @ 218 NONAME ; struct QtMobility::QLatin1Constant<11> const QtMobility::QContactAnniversary::SubTypeEngagement
+	?value@QContactDetailFilter@QtMobility@@QBE?AVQVariant@@XZ @ 219 NONAME ; class QVariant QtMobility::QContactDetailFilter::value(void) const
+	??0QContactId@QtMobility@@QAE@XZ @ 220 NONAME ; QtMobility::QContactId::QContactId(void)
+	?DefinitionName@QContactAddress@QtMobility@@2U?$QLatin1Constant@$07@2@B @ 221 NONAME ; struct QtMobility::QLatin1Constant<8> const QtMobility::QContactAddress::DefinitionName
+	??4QContactGeoLocation@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 222 NONAME ; class QtMobility::QContactGeoLocation & QtMobility::QContactGeoLocation::operator=(class QtMobility::QContactDetail const &)
+	?url@QContactUrl@QtMobility@@QBE?AVQString@@XZ @ 223 NONAME ; class QString QtMobility::QContactUrl::url(void) const
+	?setPostOfficeBox@QContactAddress@QtMobility@@QAEXABVQString@@@Z @ 224 NONAME ; void QtMobility::QContactAddress::setPostOfficeBox(class QString const &)
+	??_EQContactAbstractRequest@QtMobility@@UAE@I@Z @ 225 NONAME ; QtMobility::QContactAbstractRequest::~QContactAbstractRequest(unsigned int)
+	?clearAddedRelationshipsContacts@QContactChangeSet@QtMobility@@QAEXXZ @ 226 NONAME ; void QtMobility::QContactChangeSet::clearAddedRelationshipsContacts(void)
+	?DefinitionName@QContactPresence@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 227 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactPresence::DefinitionName
+	?number@QContactPhoneNumber@QtMobility@@QBE?AVQString@@XZ @ 228 NONAME ; class QString QtMobility::QContactPhoneNumber::number(void) const
+	??1QContactDetailDefinitionSaveRequest@QtMobility@@UAE@XZ @ 229 NONAME ; QtMobility::QContactDetailDefinitionSaveRequest::~QContactDetailDefinitionSaveRequest(void)
+	?trUtf8@QContactSaveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 230 NONAME ; class QString QtMobility::QContactSaveRequest::trUtf8(char const *, char const *)
+	?trUtf8@QContactRelationshipFetchRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 231 NONAME ; class QString QtMobility::QContactRelationshipFetchRequest::trUtf8(char const *, char const *, int)
+	?location@QContactOrganization@QtMobility@@QBE?AVQString@@XZ @ 232 NONAME ; class QString QtMobility::QContactOrganization::location(void) const
+	?minValue@QContactDetailRangeFilter@QtMobility@@QBE?AVQVariant@@XZ @ 233 NONAME ; class QVariant QtMobility::QContactDetailRangeFilter::minValue(void) const
+	??_EQContactRelationshipFetchRequest@QtMobility@@UAE@I@Z @ 234 NONAME ; QtMobility::QContactRelationshipFetchRequest::~QContactRelationshipFetchRequest(unsigned int)
+	??0QContactManager@QtMobility@@QAE@ABVQString@@HABV?$QMap@VQString@@V1@@@PAVQObject@@@Z @ 235 NONAME ; QtMobility::QContactManager::QContactManager(class QString const &, int, class QMap<class QString, class QString> const &, class QObject *)
+	?videoUrl@QContactAvatar@QtMobility@@QBE?AVQUrl@@XZ @ 236 NONAME ; class QUrl QtMobility::QContactAvatar::videoUrl(void) const
+	?setDataType@QContactDetailFieldDefinition@QtMobility@@QAEXW4Type@QVariant@@@Z @ 237 NONAME ; void QtMobility::QContactDetailFieldDefinition::setDataType(enum QVariant::Type)
+	?capabilities@QContactOnlineAccount@QtMobility@@QBE?AVQStringList@@XZ @ 238 NONAME ; class QStringList QtMobility::QContactOnlineAccount::capabilities(void) const
+	?qt_metacall@QContactDetailDefinitionRemoveRequest@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 239 NONAME ; int QtMobility::QContactDetailDefinitionRemoveRequest::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?d_func@QContactFetchRequest@QtMobility@@ABEPBVQContactFetchRequestPrivate@2@XZ @ 240 NONAME ; class QtMobility::QContactFetchRequestPrivate const * QtMobility::QContactFetchRequest::d_func(void) const
+	??0QContactTag@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 241 NONAME ; QtMobility::QContactTag::QContactTag(class QtMobility::QContactDetail const &)
+	??4QContactBirthday@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 242 NONAME ; class QtMobility::QContactBirthday & QtMobility::QContactBirthday::operator=(class QtMobility::QContactDetail const &)
+	??0QContactDetail@QtMobility@@QAE@PBD@Z @ 243 NONAME ; QtMobility::QContactDetail::QContactDetail(char const *)
+	?FieldNumber@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$0M@@2@B @ 244 NONAME ; struct QtMobility::QLatin1Constant<12> const QtMobility::QContactPhoneNumber::FieldNumber
+	?accountUri@QContactOnlineAccount@QtMobility@@QBE?AVQString@@XZ @ 245 NONAME ; class QString QtMobility::QContactOnlineAccount::accountUri(void) const
+	??0QContactOnlineAccount@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 246 NONAME ; QtMobility::QContactOnlineAccount::QContactOnlineAccount(class QtMobility::QContactDetail const &)
+	??0QContactDisplayLabel@QtMobility@@QAE@XZ @ 247 NONAME ; QtMobility::QContactDisplayLabel::QContactDisplayLabel(void)
+	?synthesizedDisplayLabel@QContactManagerEngine@QtMobility@@UBE?AVQString@@ABVQContact@2@PAW4Error@QContactManager@2@@Z @ 248 NONAME ; class QString QtMobility::QContactManagerEngine::synthesizedDisplayLabel(class QtMobility::QContact const &, enum QtMobility::QContactManager::Error *) const
+	?setPresenceStateImageUrl@QContactPresence@QtMobility@@QAEXABVQUrl@@@Z @ 249 NONAME ; void QtMobility::QContactPresence::setPresenceStateImageUrl(class QUrl const &)
+	??4QContactRelationship@QtMobility@@QAEAAV01@ABV01@@Z @ 250 NONAME ; class QtMobility::QContactRelationship & QtMobility::QContactRelationship::operator=(class QtMobility::QContactRelationship const &)
+	?date@QContactBirthday@QtMobility@@QBE?AVQDate@@XZ @ 251 NONAME ; class QDate QtMobility::QContactBirthday::date(void) const
+	?setAllowableValues@QContactDetailFieldDefinition@QtMobility@@QAEXV?$QList@VQVariant@@@@@Z @ 252 NONAME ; void QtMobility::QContactDetailFieldDefinition::setAllowableValues(class QList<class QVariant>)
+	??1QContactDetailFieldDefinition@QtMobility@@QAE@XZ @ 253 NONAME ; QtMobility::QContactDetailFieldDefinition::~QContactDetailFieldDefinition(void)
+	?d_func@QContactUnionFilter@QtMobility@@ABEPBVQContactUnionFilterPrivate@2@XZ @ 254 NONAME ; class QtMobility::QContactUnionFilterPrivate const * QtMobility::QContactUnionFilter::d_func(void) const
+	?FieldMiddleName@QContactName@QtMobility@@2U?$QLatin1Constant@$0L@@2@B @ 255 NONAME ; struct QtMobility::QLatin1Constant<11> const QtMobility::QContactName::FieldMiddleName
+	??0QContactFetchHint@QtMobility@@QAE@ABV01@@Z @ 256 NONAME ; QtMobility::QContactFetchHint::QContactFetchHint(class QtMobility::QContactFetchHint const &)
+	?detailFieldName@QContactDetailRangeFilter@QtMobility@@QBE?AVQString@@XZ @ 257 NONAME ; class QString QtMobility::QContactDetailRangeFilter::detailFieldName(void) const
+	??6QtMobility@@YA?AVQDebug@@V1@ABVQContactRelationship@0@@Z @ 258 NONAME ; class QDebug QtMobility::operator<<(class QDebug, class QtMobility::QContactRelationship const &)
+	?trUtf8@QContactRelationshipRemoveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 259 NONAME ; class QString QtMobility::QContactRelationshipRemoveRequest::trUtf8(char const *, char const *, int)
+	?setFirst@QContactRelationship@QtMobility@@QAEXABVQContactId@2@@Z @ 260 NONAME ; void QtMobility::QContactRelationship::setFirst(class QtMobility::QContactId const &)
+	??9QContactDetail@QtMobility@@QBE_NABV01@@Z @ 261 NONAME ; bool QtMobility::QContactDetail::operator!=(class QtMobility::QContactDetail const &) const
+	?setBlankPolicy@QContactSortOrder@QtMobility@@QAEXW4BlankPolicy@12@@Z @ 262 NONAME ; void QtMobility::QContactSortOrder::setBlankPolicy(enum QtMobility::QContactSortOrder::BlankPolicy)
+	?definitionNames@QContactDetailDefinitionFetchRequest@QtMobility@@QBE?AVQStringList@@XZ @ 263 NONAME ; class QStringList QtMobility::QContactDetailDefinitionFetchRequest::definitionNames(void) const
+	?FieldPresenceStateText@QContactPresence@QtMobility@@2U?$QLatin1Constant@$0BC@@2@B @ 264 NONAME ; struct QtMobility::QLatin1Constant<18> const QtMobility::QContactPresence::FieldPresenceStateText
+	?tr@QContactManager@QtMobility@@SA?AVQString@@PBD0H@Z @ 265 NONAME ; class QString QtMobility::QContactManager::tr(char const *, char const *, int)
+	??0QContactEmailAddress@QtMobility@@QAE@XZ @ 266 NONAME ; QtMobility::QContactEmailAddress::QContactEmailAddress(void)
+	?assign@QContactDetail@QtMobility@@IAEAAV12@ABV12@PBD@Z @ 267 NONAME ; class QtMobility::QContactDetail & QtMobility::QContactDetail::assign(class QtMobility::QContactDetail const &, char const *)
+	??0QContactLocalIdFetchRequest@QtMobility@@QAE@PAVQObject@@@Z @ 268 NONAME ; QtMobility::QContactLocalIdFetchRequest::QContactLocalIdFetchRequest(class QObject *)
+	?tag@QContactTag@QtMobility@@QBE?AVQString@@XZ @ 269 NONAME ; class QString QtMobility::QContactTag::tag(void) const
+	?staticMetaObject@QContactRelationshipFetchRequest@QtMobility@@2UQMetaObject@@B @ 270 NONAME ; struct QMetaObject const QtMobility::QContactRelationshipFetchRequest::staticMetaObject
+	?setContact@QContactSaveRequest@QtMobility@@QAEXABVQContact@2@@Z @ 271 NONAME ; void QtMobility::QContactSaveRequest::setContact(class QtMobility::QContact const &)
+	?setVideoRingtoneUrl@QContactRingtone@QtMobility@@QAEXABVQUrl@@@Z @ 272 NONAME ; void QtMobility::QContactRingtone::setVideoRingtoneUrl(class QUrl const &)
+	?SubTypeFax@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$03@2@B @ 273 NONAME ; struct QtMobility::QLatin1Constant<4> const QtMobility::QContactPhoneNumber::SubTypeFax
+	?DefinitionName@QContactBirthday@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 274 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactBirthday::DefinitionName
+	?FieldBirthday@QContactBirthday@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 275 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactBirthday::FieldBirthday
+	?setTimestamp@QContactGeoLocation@QtMobility@@QAEXABVQDateTime@@@Z @ 276 NONAME ; void QtMobility::QContactGeoLocation::setTimestamp(class QDateTime const &)
+	?insertField@QContactDetailDefinition@QtMobility@@QAEXABVQString@@ABVQContactDetailFieldDefinition@2@@Z @ 277 NONAME ; void QtMobility::QContactDetailDefinition::insertField(class QString const &, class QtMobility::QContactDetailFieldDefinition const &)
+	?setSpeed@QContactGeoLocation@QtMobility@@QAEXN@Z @ 278 NONAME ; void QtMobility::QContactGeoLocation::setSpeed(double)
+	?setSuffix@QContactName@QtMobility@@QAEXABVQString@@@Z @ 279 NONAME ; void QtMobility::QContactName::setSuffix(class QString const &)
+	?setSecond@QContactRelationshipFetchRequest@QtMobility@@QAEXABVQContactId@2@@Z @ 280 NONAME ; void QtMobility::QContactRelationshipFetchRequest::setSecond(class QtMobility::QContactId const &)
+	?lastModified@QContactTimestamp@QtMobility@@QBE?AVQDateTime@@XZ @ 281 NONAME ; class QDateTime QtMobility::QContactTimestamp::lastModified(void) const
+	?removeContact@QContactManagerEngine@QtMobility@@UAE_NABIPAW4Error@QContactManager@2@@Z @ 282 NONAME ; bool QtMobility::QContactManagerEngine::removeContact(unsigned int const &, enum QtMobility::QContactManager::Error *)
+	?setAltitude@QContactGeoLocation@QtMobility@@QAEXN@Z @ 283 NONAME ; void QtMobility::QContactGeoLocation::setAltitude(double)
+	?removeField@QContactDetailDefinition@QtMobility@@QAEXABVQString@@@Z @ 284 NONAME ; void QtMobility::QContactDetailDefinition::removeField(class QString const &)
+	?oldAndNewSelfContactId@QContactChangeSet@QtMobility@@QBE?AU?$QPair@II@@XZ @ 285 NONAME ; struct QPair<unsigned int, unsigned int> QtMobility::QContactChangeSet::oldAndNewSelfContactId(void) const
+	?managerName@QContactManagerEngine@QtMobility@@UBE?AVQString@@XZ @ 286 NONAME ; class QString QtMobility::QContactManagerEngine::managerName(void) const
+	?cancelRequest@QContactManagerEngine@QtMobility@@UAE_NPAVQContactAbstractRequest@2@@Z @ 287 NONAME ; bool QtMobility::QContactManagerEngine::cancelRequest(class QtMobility::QContactAbstractRequest *)
+	?FieldName@QContactOrganization@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 288 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactOrganization::FieldName
+	?filters@QContactIntersectionFilter@QtMobility@@QBE?AV?$QList@VQContactFilter@QtMobility@@@@XZ @ 289 NONAME ; class QList<class QtMobility::QContactFilter> QtMobility::QContactIntersectionFilter::filters(void) const
+	?trUtf8@QContactFetchRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 290 NONAME ; class QString QtMobility::QContactFetchRequest::trUtf8(char const *, char const *)
+	?trUtf8@QContactRelationshipSaveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 291 NONAME ; class QString QtMobility::QContactRelationshipSaveRequest::trUtf8(char const *, char const *)
+	?setUnique@QContactDetailDefinition@QtMobility@@QAEX_N@Z @ 292 NONAME ; void QtMobility::QContactDetailDefinition::setUnique(bool)
+	??0QContactManager@QtMobility@@QAE@PAVQObject@@@Z @ 293 NONAME ; QtMobility::QContactManager::QContactManager(class QObject *)
+	?subType@QContactAnniversary@QtMobility@@QBE?AVQString@@XZ @ 294 NONAME ; class QString QtMobility::QContactAnniversary::subType(void) const
+	?setRelatedContactRole@QContactRelationshipFilter@QtMobility@@QAEXW4Role@QContactRelationship@2@@Z @ 295 NONAME ; void QtMobility::QContactRelationshipFilter::setRelatedContactRole(enum QtMobility::QContactRelationship::Role)
+	??6QContactIntersectionFilter@QtMobility@@QAEAAV01@ABVQContactFilter@1@@Z @ 296 NONAME ; class QtMobility::QContactIntersectionFilter & QtMobility::QContactIntersectionFilter::operator<<(class QtMobility::QContactFilter const &)
+	??9QContact@QtMobility@@QBE_NABV01@@Z @ 297 NONAME ; bool QtMobility::QContact::operator!=(class QtMobility::QContact const &) const
+	??9QContactRelationship@QtMobility@@QBE_NABV01@@Z @ 298 NONAME ; bool QtMobility::QContactRelationship::operator!=(class QtMobility::QContactRelationship const &) const
+	?removeValue@QContactDetail@QtMobility@@QAE_NPBD@Z @ 299 NONAME ; bool QtMobility::QContactDetail::removeValue(char const *)
+	?getStaticMetaObject@QContactRelationshipSaveRequest@QtMobility@@SAABUQMetaObject@@XZ @ 300 NONAME ; struct QMetaObject const & QtMobility::QContactRelationshipSaveRequest::getStaticMetaObject(void)
+	?setServiceProvider@QContactOnlineAccount@QtMobility@@QAEXABVQString@@@Z @ 301 NONAME ; void QtMobility::QContactOnlineAccount::setServiceProvider(class QString const &)
+	??4QContactId@QtMobility@@QAEAAV01@ABV01@@Z @ 302 NONAME ; class QtMobility::QContactId & QtMobility::QContactId::operator=(class QtMobility::QContactId const &)
+	?saveContact@QContactManagerEngine@QtMobility@@UAE_NPAVQContact@2@PAW4Error@QContactManager@2@@Z @ 303 NONAME ; bool QtMobility::QContactManagerEngine::saveContact(class QtMobility::QContact *, enum QtMobility::QContactManager::Error *)
+	??4QContact@QtMobility@@QAEAAV01@ABV01@@Z @ 304 NONAME ; class QtMobility::QContact & QtMobility::QContact::operator=(class QtMobility::QContact const &)
+	?FieldTitle@QContactOrganization@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 305 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactOrganization::FieldTitle
+	?SubTypeSipVoip@QContactOnlineAccount@QtMobility@@2U?$QLatin1Constant@$07@2@B @ 306 NONAME ; struct QtMobility::QLatin1Constant<8> const QtMobility::QContactOnlineAccount::SubTypeSipVoip
+	??4QContactNickname@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 307 NONAME ; class QtMobility::QContactNickname & QtMobility::QContactNickname::operator=(class QtMobility::QContactDetail const &)
+	??0QContactAvatar@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 308 NONAME ; QtMobility::QContactAvatar::QContactAvatar(class QtMobility::QContactDetail const &)
+	?DefinitionName@QContactEmailAddress@QtMobility@@2U?$QLatin1Constant@$0N@@2@B @ 309 NONAME ; struct QtMobility::QLatin1Constant<13> const QtMobility::QContactEmailAddress::DefinitionName
+	?subTypes@QContactPhoneNumber@QtMobility@@QBE?AVQStringList@@XZ @ 310 NONAME ; class QStringList QtMobility::QContactPhoneNumber::subTypes(void) const
+	?prepend@QContactUnionFilter@QtMobility@@QAEXABVQContactFilter@2@@Z @ 311 NONAME ; void QtMobility::QContactUnionFilter::prepend(class QtMobility::QContactFilter const &)
+	?postcode@QContactAddress@QtMobility@@QBE?AVQString@@XZ @ 312 NONAME ; class QString QtMobility::QContactAddress::postcode(void) const
+	?audioRingtoneUrl@QContactRingtone@QtMobility@@QBE?AVQUrl@@XZ @ 313 NONAME ; class QUrl QtMobility::QContactRingtone::audioRingtoneUrl(void) const
+	?start@QContactAbstractRequest@QtMobility@@QAE_NXZ @ 314 NONAME ; bool QtMobility::QContactAbstractRequest::start(void)
+	?setLastModified@QContactTimestamp@QtMobility@@QAEXABVQDateTime@@@Z @ 315 NONAME ; void QtMobility::QContactTimestamp::setLastModified(class QDateTime const &)
+	?setDetailDefinitionsHint@QContactFetchHint@QtMobility@@QAEXABVQStringList@@@Z @ 316 NONAME ; void QtMobility::QContactFetchHint::setDetailDefinitionsHint(class QStringList const &)
+	?presenceStateImageUrl@QContactPresence@QtMobility@@QBE?AVQUrl@@XZ @ 317 NONAME ; class QUrl QtMobility::QContactPresence::presenceStateImageUrl(void) const
+	?isUnique@QContactDetailDefinition@QtMobility@@QBE_NXZ @ 318 NONAME ; bool QtMobility::QContactDetailDefinition::isUnique(void) const
+	?setEmailAddress@QContactEmailAddress@QtMobility@@QAEXABVQString@@@Z @ 319 NONAME ; void QtMobility::QContactEmailAddress::setEmailAddress(class QString const &)
+	?setDefinitionNames@QContactDetailDefinitionFetchRequest@QtMobility@@QAEXABVQStringList@@@Z @ 320 NONAME ; void QtMobility::QContactDetailDefinitionFetchRequest::setDefinitionNames(class QStringList const &)
+	?metaObject@QContactManagerEngine@QtMobility@@UBEPBUQMetaObject@@XZ @ 321 NONAME ; struct QMetaObject const * QtMobility::QContactManagerEngine::metaObject(void) const
+	?FieldRole@QContactOrganization@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 322 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactOrganization::FieldRole
+	?trUtf8@QContactDetailDefinitionFetchRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 323 NONAME ; class QString QtMobility::QContactDetailDefinitionFetchRequest::trUtf8(char const *, char const *, int)
+	?qt_metacall@QContactFetchRequest@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 324 NONAME ; int QtMobility::QContactFetchRequest::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?selfContactIdChanged@QContactManagerEngine@QtMobility@@IAEXABI0@Z @ 325 NONAME ; void QtMobility::QContactManagerEngine::selfContactIdChanged(unsigned int const &, unsigned int const &)
+	?metaObject@QContactManager@QtMobility@@UBEPBUQMetaObject@@XZ @ 326 NONAME ; struct QMetaObject const * QtMobility::QContactManager::metaObject(void) const
+	?d_func@QContactDetailDefinitionFetchRequest@QtMobility@@AAEPAVQContactDetailDefinitionFetchRequestPrivate@2@XZ @ 327 NONAME ; class QtMobility::QContactDetailDefinitionFetchRequestPrivate * QtMobility::QContactDetailDefinitionFetchRequest::d_func(void)
+	??0QContactOrganization@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 328 NONAME ; QtMobility::QContactOrganization::QContactOrganization(class QtMobility::QContactDetail const &)
+	??0QContact@QtMobility@@QAE@XZ @ 329 NONAME ; QtMobility::QContact::QContact(void)
+	?gender@QContactGender@QtMobility@@QBE?AVQString@@XZ @ 330 NONAME ; class QString QtMobility::QContactGender::gender(void) const
+	?setSelfContactId@QContactManagerEngine@QtMobility@@UAE_NABIPAW4Error@QContactManager@2@@Z @ 331 NONAME ; bool QtMobility::QContactManagerEngine::setSelfContactId(unsigned int const &, enum QtMobility::QContactManager::Error *)
+	??0QContactGender@QtMobility@@QAE@XZ @ 332 NONAME ; QtMobility::QContactGender::QContactGender(void)
+	?setCountry@QContactAddress@QtMobility@@QAEXABVQString@@@Z @ 333 NONAME ; void QtMobility::QContactAddress::setCountry(class QString const &)
+	?metaObject@QContactLocalIdFetchRequest@QtMobility@@UBEPBUQMetaObject@@XZ @ 334 NONAME ; struct QMetaObject const * QtMobility::QContactLocalIdFetchRequest::metaObject(void) const
+	?availableManagers@QContactManager@QtMobility@@SA?AVQStringList@@XZ @ 335 NONAME ; class QStringList QtMobility::QContactManager::availableManagers(void)
+	?setType@QContact@QtMobility@@QAEXABVQString@@@Z @ 336 NONAME ; void QtMobility::QContact::setType(class QString const &)
+	??0QContactNote@QtMobility@@QAE@XZ @ 337 NONAME ; QtMobility::QContactNote::QContactNote(void)
+	?isFilterSupported@QContactManager@QtMobility@@QBE_NABVQContactFilter@2@@Z @ 338 NONAME ; bool QtMobility::QContactManager::isFilterSupported(class QtMobility::QContactFilter const &) const
+	?removedContacts@QContactChangeSet@QtMobility@@QBE?AV?$QSet@I@@XZ @ 339 NONAME ; class QSet<unsigned int> QtMobility::QContactChangeSet::removedContacts(void) const
+	??4QContactDisplayLabel@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 340 NONAME ; class QtMobility::QContactDisplayLabel & QtMobility::QContactDisplayLabel::operator=(class QtMobility::QContactDetail const &)
+	?errorMap@QContactRelationshipSaveRequest@QtMobility@@QBE?AV?$QMap@HW4Error@QContactManager@QtMobility@@@@XZ @ 341 NONAME ; class QMap<int, enum QtMobility::QContactManager::Error> QtMobility::QContactRelationshipSaveRequest::errorMap(void) const
+	?sortContacts@QContactManagerEngine@QtMobility@@SA?AV?$QList@I@@ABV?$QList@VQContact@QtMobility@@@@ABV?$QList@VQContactSortOrder@QtMobility@@@@@Z @ 342 NONAME ; class QList<unsigned int> QtMobility::QContactManagerEngine::sortContacts(class QList<class QtMobility::QContact> const &, class QList<class QtMobility::QContactSortOrder> const &)
+	?setLogoUrl@QContactOrganization@QtMobility@@QAEXABVQUrl@@@Z @ 343 NONAME ; void QtMobility::QContactOrganization::setLogoUrl(class QUrl const &)
+	??0QContactNickname@QtMobility@@QAE@XZ @ 344 NONAME ; QtMobility::QContactNickname::QContactNickname(void)
+	?setCustomLabel@QContactName@QtMobility@@QAEXABVQString@@@Z @ 345 NONAME ; void QtMobility::QContactName::setCustomLabel(class QString const &)
+	?relationships@QContactManager@QtMobility@@QBE?AV?$QList@VQContactRelationship@QtMobility@@@@ABVQContactId@2@W4Role@QContactRelationship@2@@Z @ 346 NONAME ; class QList<class QtMobility::QContactRelationship> QtMobility::QContactManager::relationships(class QtMobility::QContactId const &, enum QtMobility::QContactRelationship::Role) const
+	?tr@QContactRelationshipSaveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 347 NONAME ; class QString QtMobility::QContactRelationshipSaveRequest::tr(char const *, char const *)
+	?tr@QContactAbstractRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 348 NONAME ; class QString QtMobility::QContactAbstractRequest::tr(char const *, char const *)
+	?relationshipsRemoved@QContactManager@QtMobility@@IAEXABV?$QList@I@@@Z @ 349 NONAME ; void QtMobility::QContactManager::relationshipsRemoved(class QList<unsigned int> const &)
+	?selfContactId@QContactManager@QtMobility@@QBEIXZ @ 350 NONAME ; unsigned int QtMobility::QContactManager::selfContactId(void) const
+	?presenceState@QContactGlobalPresence@QtMobility@@QBE?AW4PresenceState@QContactPresence@2@XZ @ 351 NONAME ; enum QtMobility::QContactPresence::PresenceState QtMobility::QContactGlobalPresence::presenceState(void) const
+	?contacts@QContactFetchRequest@QtMobility@@QBE?AV?$QList@VQContact@QtMobility@@@@XZ @ 352 NONAME ; class QList<class QtMobility::QContact> QtMobility::QContactFetchRequest::contacts(void) const
+	?setFirstName@QContactName@QtMobility@@QAEXABVQString@@@Z @ 353 NONAME ; void QtMobility::QContactName::setFirstName(class QString const &)
+	?d_func@QContactRelationshipSaveRequest@QtMobility@@ABEPBVQContactRelationshipSaveRequestPrivate@2@XZ @ 354 NONAME ; class QtMobility::QContactRelationshipSaveRequestPrivate const * QtMobility::QContactRelationshipSaveRequest::d_func(void) const
+	?isActive@QContactAbstractRequest@QtMobility@@QBE_NXZ @ 355 NONAME ; bool QtMobility::QContactAbstractRequest::isActive(void) const
+	?metaObject@QContactDetailDefinitionSaveRequest@QtMobility@@UBEPBUQMetaObject@@XZ @ 356 NONAME ; struct QMetaObject const * QtMobility::QContactDetailDefinitionSaveRequest::metaObject(void) const
+	??0QContactSortOrder@QtMobility@@QAE@ABV01@@Z @ 357 NONAME ; QtMobility::QContactSortOrder::QContactSortOrder(class QtMobility::QContactSortOrder const &)
+	?updateDefinitionFetchRequest@QContactManagerEngine@QtMobility@@SAXPAVQContactDetailDefinitionFetchRequest@2@ABV?$QMap@VQString@@VQContactDetailDefinition@QtMobility@@@@W4Error@QContactManager@2@ABV?$QMap@HW4Error@QContactManager@QtMobility@@@@W4State@QContactAbstractRequest@2@@Z @ 358 NONAME ; void QtMobility::QContactManagerEngine::updateDefinitionFetchRequest(class QtMobility::QContactDetailDefinitionFetchRequest *, class QMap<class QString, class QtMobility::QContactDetailDefinition> const &, enum QtMobility::QContactManager::Error, class QMap<int, enum QtMobility::QContactManager::Error> const &, enum QtMobility::QContactAbstractRequest::State)
+	?d_func@QContactChangeLogFilter@QtMobility@@AAEPAVQContactChangeLogFilterPrivate@2@XZ @ 359 NONAME ; class QtMobility::QContactChangeLogFilterPrivate * QtMobility::QContactChangeLogFilter::d_func(void)
+	??0QContactPhoneNumber@QtMobility@@QAE@XZ @ 360 NONAME ; QtMobility::QContactPhoneNumber::QContactPhoneNumber(void)
+	??4QContactThumbnail@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 361 NONAME ; class QtMobility::QContactThumbnail & QtMobility::QContactThumbnail::operator=(class QtMobility::QContactDetail const &)
+	?trUtf8@QContactRelationshipFetchRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 362 NONAME ; class QString QtMobility::QContactRelationshipFetchRequest::trUtf8(char const *, char const *)
+	?contact@QContactManager@QtMobility@@QBE?AVQContact@2@ABIABVQContactFetchHint@2@@Z @ 363 NONAME ; class QtMobility::QContact QtMobility::QContactManager::contact(unsigned int const &, class QtMobility::QContactFetchHint const &) const
+	?setHeading@QContactGeoLocation@QtMobility@@QAEXN@Z @ 364 NONAME ; void QtMobility::QContactGeoLocation::setHeading(double)
+	?HasAssistant@QContactRelationship@QtMobility@@2U?$QLatin1Constant@$0N@@2@B @ 365 NONAME ; struct QtMobility::QLatin1Constant<13> const QtMobility::QContactRelationship::HasAssistant
+	?errorMap@QContactSaveRequest@QtMobility@@QBE?AV?$QMap@HW4Error@QContactManager@QtMobility@@@@XZ @ 366 NONAME ; class QMap<int, enum QtMobility::QContactManager::Error> QtMobility::QContactSaveRequest::errorMap(void) const
+	?SubTypeMessagingCapable@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$0BB@@2@B @ 367 NONAME ; struct QtMobility::QLatin1Constant<17> const QtMobility::QContactPhoneNumber::SubTypeMessagingCapable
+	??0QContactOrganization@QtMobility@@QAE@XZ @ 368 NONAME ; QtMobility::QContactOrganization::QContactOrganization(void)
+	?setPresenceStateImageUrl@QContactGlobalPresence@QtMobility@@QAEXABVQUrl@@@Z @ 369 NONAME ; void QtMobility::QContactGlobalPresence::setPresenceStateImageUrl(class QUrl const &)
+	?updateRelationshipFetchRequest@QContactManagerEngine@QtMobility@@SAXPAVQContactRelationshipFetchRequest@2@ABV?$QList@VQContactRelationship@QtMobility@@@@W4Error@QContactManager@2@W4State@QContactAbstractRequest@2@@Z @ 370 NONAME ; void QtMobility::QContactManagerEngine::updateRelationshipFetchRequest(class QtMobility::QContactRelationshipFetchRequest *, class QList<class QtMobility::QContactRelationship> const &, enum QtMobility::QContactManager::Error, enum QtMobility::QContactAbstractRequest::State)
+	?setId@QContact@QtMobility@@QAEXABVQContactId@2@@Z @ 371 NONAME ; void QtMobility::QContact::setId(class QtMobility::QContactId const &)
+	?relationshipsRemoved@QContactManagerEngine@QtMobility@@IAEXABV?$QList@I@@@Z @ 372 NONAME ; void QtMobility::QContactManagerEngine::relationshipsRemoved(class QList<unsigned int> const &)
+	??0QContactRelationshipRemoveRequest@QtMobility@@QAE@PAVQObject@@@Z @ 373 NONAME ; QtMobility::QContactRelationshipRemoveRequest::QContactRelationshipRemoveRequest(class QObject *)
+	?setSubType@QContactUrl@QtMobility@@QAEXABVQString@@@Z @ 374 NONAME ; void QtMobility::QContactUrl::setSubType(class QString const &)
+	?setSince@QContactChangeLogFilter@QtMobility@@QAEXABVQDateTime@@@Z @ 375 NONAME ; void QtMobility::QContactChangeLogFilter::setSince(class QDateTime const &)
+	?SubTypeMemorial@QContactAnniversary@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 376 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactAnniversary::SubTypeMemorial
+	?setAudioRingtoneUrl@QContactRingtone@QtMobility@@QAEXABVQUrl@@@Z @ 377 NONAME ; void QtMobility::QContactRingtone::setAudioRingtoneUrl(class QUrl const &)
+	??0QContactFetchRequest@QtMobility@@QAE@PAVQObject@@@Z @ 378 NONAME ; QtMobility::QContactFetchRequest::QContactFetchRequest(class QObject *)
+	??4QContactNote@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 379 NONAME ; class QtMobility::QContactNote & QtMobility::QContactNote::operator=(class QtMobility::QContactDetail const &)
+	?setTimestamp@QContactGlobalPresence@QtMobility@@QAEXABVQDateTime@@@Z @ 380 NONAME ; void QtMobility::QContactGlobalPresence::setTimestamp(class QDateTime const &)
+	?metaObject@QContactAbstractRequest@QtMobility@@UBEPBUQMetaObject@@XZ @ 381 NONAME ; struct QMetaObject const * QtMobility::QContactAbstractRequest::metaObject(void) const
+	?setSubTypes@QContactAddress@QtMobility@@QAEXABVQString@@@Z @ 382 NONAME ; void QtMobility::QContactAddress::setSubTypes(class QString const &)
+	?FieldPostOfficeBox@QContactAddress@QtMobility@@2U?$QLatin1Constant@$0O@@2@B @ 383 NONAME ; struct QtMobility::QLatin1Constant<14> const QtMobility::QContactAddress::FieldPostOfficeBox
+	?DefinitionName@QContactDisplayLabel@QtMobility@@2U?$QLatin1Constant@$0N@@2@B @ 384 NONAME ; struct QtMobility::QLatin1Constant<13> const QtMobility::QContactDisplayLabel::DefinitionName
+	?event@QContactAnniversary@QtMobility@@QBE?AVQString@@XZ @ 385 NONAME ; class QString QtMobility::QContactAnniversary::event(void) const
+	??IQtMobility@@YA?BVQContactFilter@0@ABV10@0@Z @ 386 NONAME ; class QtMobility::QContactFilter const QtMobility::operator&(class QtMobility::QContactFilter const &, class QtMobility::QContactFilter const &)
+	?setCreated@QContactTimestamp@QtMobility@@QAEXABVQDateTime@@@Z @ 387 NONAME ; void QtMobility::QContactTimestamp::setCreated(class QDateTime const &)
+	?removeDetailDefinition@QContactManager@QtMobility@@QAE_NABVQString@@0@Z @ 388 NONAME ; bool QtMobility::QContactManager::removeDetailDefinition(class QString const &, class QString const &)
+	?relationships@QContactRelationshipFetchRequest@QtMobility@@QBE?AV?$QList@VQContactRelationship@QtMobility@@@@XZ @ 389 NONAME ; class QList<class QtMobility::QContactRelationship> QtMobility::QContactRelationshipFetchRequest::relationships(void) const
+	?insertRemovedContacts@QContactChangeSet@QtMobility@@QAEXABV?$QList@I@@@Z @ 390 NONAME ; void QtMobility::QContactChangeSet::insertRemovedContacts(class QList<unsigned int> const &)
+	?DefinitionName@QContactTag@QtMobility@@2U?$QLatin1Constant@$03@2@B @ 391 NONAME ; struct QtMobility::QLatin1Constant<4> const QtMobility::QContactTag::DefinitionName
+	??1QContactFetchRequest@QtMobility@@UAE@XZ @ 392 NONAME ; QtMobility::QContactFetchRequest::~QContactFetchRequest(void)
+	??0QContactFamily@QtMobility@@QAE@XZ @ 393 NONAME ; QtMobility::QContactFamily::QContactFamily(void)
+	??6QtMobility@@YA?AVQDebug@@V1@ABVQContact@0@@Z @ 394 NONAME ; class QDebug QtMobility::operator<<(class QDebug, class QtMobility::QContact const &)
+	?setEvent@QContactAnniversary@QtMobility@@QAEXABVQString@@@Z @ 395 NONAME ; void QtMobility::QContactAnniversary::setEvent(class QString const &)
+	?FieldServiceProvider@QContactOnlineAccount@QtMobility@@2U?$QLatin1Constant@$0BA@@2@B @ 396 NONAME ; struct QtMobility::QLatin1Constant<16> const QtMobility::QContactOnlineAccount::FieldServiceProvider
+	??1QContactChangeLogFilter@QtMobility@@QAE@XZ @ 397 NONAME ; QtMobility::QContactChangeLogFilter::~QContactChangeLogFilter(void)
+	?metaObject@QContactDetailDefinitionFetchRequest@QtMobility@@UBEPBUQMetaObject@@XZ @ 398 NONAME ; struct QMetaObject const * QtMobility::QContactDetailDefinitionFetchRequest::metaObject(void) const
+	?removeContacts@QContactManagerEngine@QtMobility@@UAE_NABV?$QList@I@@PAV?$QMap@HW4Error@QContactManager@QtMobility@@@@PAW4Error@QContactManager@2@@Z @ 399 NONAME ; bool QtMobility::QContactManagerEngine::removeContacts(class QList<unsigned int> const &, class QMap<int, enum QtMobility::QContactManager::Error> *, enum QtMobility::QContactManager::Error *)
+	?removeContacts@QContactManager@QtMobility@@QAE_NABV?$QList@I@@PAV?$QMap@HW4Error@QContactManager@QtMobility@@@@@Z @ 400 NONAME ; bool QtMobility::QContactManager::removeContacts(class QList<unsigned int> const &, class QMap<int, enum QtMobility::QContactManager::Error> *)
+	??0QContactAvatar@QtMobility@@QAE@XZ @ 401 NONAME ; QtMobility::QContactAvatar::QContactAvatar(void)
+	?insertRemovedContact@QContactChangeSet@QtMobility@@QAEXI@Z @ 402 NONAME ; void QtMobility::QContactChangeSet::insertRemovedContact(unsigned int)
+	??1QContactLocalIdFetchRequest@QtMobility@@UAE@XZ @ 403 NONAME ; QtMobility::QContactLocalIdFetchRequest::~QContactLocalIdFetchRequest(void)
+	?setCaseSensitivity@QContactSortOrder@QtMobility@@QAEXW4CaseSensitivity@Qt@@@Z @ 404 NONAME ; void QtMobility::QContactSortOrder::setCaseSensitivity(enum Qt::CaseSensitivity)
+	??0QContactOnlineAccount@QtMobility@@QAE@XZ @ 405 NONAME ; QtMobility::QContactOnlineAccount::QContactOnlineAccount(void)
+	?setSecond@QContactRelationship@QtMobility@@QAEXABVQContactId@2@@Z @ 406 NONAME ; void QtMobility::QContactRelationship::setSecond(class QtMobility::QContactId const &)
+	?insertAddedRelationshipsContacts@QContactChangeSet@QtMobility@@QAEXABV?$QList@I@@@Z @ 407 NONAME ; void QtMobility::QContactChangeSet::insertAddedRelationshipsContacts(class QList<unsigned int> const &)
+	?details@QContact@QtMobility@@QBE?AV?$QList@VQContactDetail@QtMobility@@@@PBD0ABVQString@@@Z @ 408 NONAME ; class QList<class QtMobility::QContactDetail> QtMobility::QContact::details(char const *, char const *, class QString const &) const
+	?country@QContactAddress@QtMobility@@QBE?AVQString@@XZ @ 409 NONAME ; class QString QtMobility::QContactAddress::country(void) const
+	?setTitle@QContactOrganization@QtMobility@@QAEXABVQString@@@Z @ 410 NONAME ; void QtMobility::QContactOrganization::setTitle(class QString const &)
+	?GenderMale@QContactGender@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 411 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactGender::GenderMale
+	?SubTypePostal@QContactAddress@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 412 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactAddress::SubTypePostal
+	?FieldPresenceStateText@QContactGlobalPresence@QtMobility@@2U?$QLatin1Constant@$0BC@@2@B @ 413 NONAME ; struct QtMobility::QLatin1Constant<18> const QtMobility::QContactGlobalPresence::FieldPresenceStateText
+	?FieldAltitudeAccuracy@QContactGeoLocation@QtMobility@@2U?$QLatin1Constant@$0BB@@2@B @ 414 NONAME ; struct QtMobility::QLatin1Constant<17> const QtMobility::QContactGeoLocation::FieldAltitudeAccuracy
+	?state@QContactAbstractRequest@QtMobility@@QBE?AW4State@12@XZ @ 415 NONAME ; enum QtMobility::QContactAbstractRequest::State QtMobility::QContactAbstractRequest::state(void) const
+	?trUtf8@QContactLocalIdFetchRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 416 NONAME ; class QString QtMobility::QContactLocalIdFetchRequest::trUtf8(char const *, char const *)
+	?setContactType@QContactDetailDefinitionRemoveRequest@QtMobility@@QAEXABVQString@@@Z @ 417 NONAME ; void QtMobility::QContactDetailDefinitionRemoveRequest::setContactType(class QString const &)
+	??0QContactFamily@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 418 NONAME ; QtMobility::QContactFamily::QContactFamily(class QtMobility::QContactDetail const &)
+	?setDefinitionNames@QContactDetailDefinitionRemoveRequest@QtMobility@@QAEXABVQStringList@@@Z @ 419 NONAME ; void QtMobility::QContactDetailDefinitionRemoveRequest::setDefinitionNames(class QStringList const &)
+	??1QContactManager@QtMobility@@UAE@XZ @ 420 NONAME ; QtMobility::QContactManager::~QContactManager(void)
+	?trUtf8@QContactDetailDefinitionRemoveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 421 NONAME ; class QString QtMobility::QContactDetailDefinitionRemoveRequest::trUtf8(char const *, char const *, int)
+	?FieldSyncTarget@QContactSyncTarget@QtMobility@@2U?$QLatin1Constant@$0L@@2@B @ 422 NONAME ; struct QtMobility::QLatin1Constant<11> const QtMobility::QContactSyncTarget::FieldSyncTarget
+	?FieldChildren@QContactFamily@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 423 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactFamily::FieldChildren
+	?insertAddedContact@QContactChangeSet@QtMobility@@QAEXI@Z @ 424 NONAME ; void QtMobility::QContactChangeSet::insertAddedContact(unsigned int)
+	??0QContactDetailDefinition@QtMobility@@QAE@ABV01@@Z @ 425 NONAME ; QtMobility::QContactDetailDefinition::QContactDetailDefinition(class QtMobility::QContactDetailDefinition const &)
+	?DefinitionName@QContactGuid@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 426 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactGuid::DefinitionName
+	?details@QContact@QtMobility@@QBE?AV?$QList@VQContactDetail@QtMobility@@@@PBD@Z @ 427 NONAME ; class QList<class QtMobility::QContactDetail> QtMobility::QContact::details(char const *) const
+	??1QContactName@QtMobility@@QAE@XZ @ 428 NONAME ; QtMobility::QContactName::~QContactName(void)
+	?prepend@QContactIntersectionFilter@QtMobility@@QAEXABVQContactFilter@2@@Z @ 429 NONAME ; void QtMobility::QContactIntersectionFilter::prepend(class QtMobility::QContactFilter const &)
+	??_EQContactManagerEngineFactory@QtMobility@@UAE@I@Z @ 430 NONAME ; QtMobility::QContactManagerEngineFactory::~QContactManagerEngineFactory(unsigned int)
+	?setFetchHint@QContactFetchRequest@QtMobility@@QAEXABVQContactFetchHint@2@@Z @ 431 NONAME ; void QtMobility::QContactFetchRequest::setFetchHint(class QtMobility::QContactFetchHint const &)
+	?parseUri@QContactManager@QtMobility@@SA_NABVQString@@PAV3@PAV?$QMap@VQString@@V1@@@@Z @ 432 NONAME ; bool QtMobility::QContactManager::parseUri(class QString const &, class QString *, class QMap<class QString, class QString> *)
+	?detailUri@QContactDetail@QtMobility@@QBE?AVQString@@XZ @ 433 NONAME ; class QString QtMobility::QContactDetail::detailUri(void) const
+	?tr@QContactRelationshipFetchRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 434 NONAME ; class QString QtMobility::QContactRelationshipFetchRequest::tr(char const *, char const *, int)
+	??_EQContactRelationshipSaveRequest@QtMobility@@UAE@I@Z @ 435 NONAME ; QtMobility::QContactRelationshipSaveRequest::~QContactRelationshipSaveRequest(unsigned int)
+	?setFilters@QContactUnionFilter@QtMobility@@QAEXABV?$QList@VQContactFilter@QtMobility@@@@@Z @ 436 NONAME ; void QtMobility::QContactUnionFilter::setFilters(class QList<class QtMobility::QContactFilter> const &)
+	?saveDetailDefinition@QContactManager@QtMobility@@QAE_NABVQContactDetailDefinition@2@ABVQString@@@Z @ 437 NONAME ; bool QtMobility::QContactManager::saveDetailDefinition(class QtMobility::QContactDetailDefinition const &, class QString const &)
+	??0QContactAnniversary@QtMobility@@QAE@XZ @ 438 NONAME ; QtMobility::QContactAnniversary::QContactAnniversary(void)
+	?setDefinition@QContactDetailDefinitionSaveRequest@QtMobility@@QAEXABVQContactDetailDefinition@2@@Z @ 439 NONAME ; void QtMobility::QContactDetailDefinitionSaveRequest::setDefinition(class QtMobility::QContactDetailDefinition const &)
+	?addedContacts@QContactChangeSet@QtMobility@@QBE?AV?$QSet@I@@XZ @ 440 NONAME ; class QSet<unsigned int> QtMobility::QContactChangeSet::addedContacts(void) const
+	?dataChanged@QContactChangeSet@QtMobility@@QAE_NXZ @ 441 NONAME ; bool QtMobility::QContactChangeSet::dataChanged(void)
+	?tr@QContactManagerEngine@QtMobility@@SA?AVQString@@PBD0@Z @ 442 NONAME ; class QString QtMobility::QContactManagerEngine::tr(char const *, char const *)
+	?managerParameters@QContactManagerEngine@QtMobility@@UBE?AV?$QMap@VQString@@V1@@@XZ @ 443 NONAME ; class QMap<class QString, class QString> QtMobility::QContactManagerEngine::managerParameters(void) const
+	??0QContactGeoLocation@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 444 NONAME ; QtMobility::QContactGeoLocation::QContactGeoLocation(class QtMobility::QContactDetail const &)
+	?updateRequestState@QContactManagerEngine@QtMobility@@SAXPAVQContactAbstractRequest@2@W4State@32@@Z @ 445 NONAME ; void QtMobility::QContactManagerEngine::updateRequestState(class QtMobility::QContactAbstractRequest *, enum QtMobility::QContactAbstractRequest::State)
+	?getStaticMetaObject@QContactManagerEngine@QtMobility@@SAABUQMetaObject@@XZ @ 446 NONAME ; struct QMetaObject const & QtMobility::QContactManagerEngine::getStaticMetaObject(void)
+	?relationships@QContactRelationshipRemoveRequest@QtMobility@@QBE?AV?$QList@VQContactRelationship@QtMobility@@@@XZ @ 447 NONAME ; class QList<class QtMobility::QContactRelationship> QtMobility::QContactRelationshipRemoveRequest::relationships(void) const
+	?fields@QContactDetailDefinition@QtMobility@@QBE?AV?$QMap@VQString@@VQContactDetailFieldDefinition@QtMobility@@@@XZ @ 448 NONAME ; class QMap<class QString, class QtMobility::QContactDetailFieldDefinition> QtMobility::QContactDetailDefinition::fields(void) const
+	??4QContactFetchHint@QtMobility@@QAEAAV01@ABV01@@Z @ 449 NONAME ; class QtMobility::QContactFetchHint & QtMobility::QContactFetchHint::operator=(class QtMobility::QContactFetchHint const &)
+	?lastName@QContactName@QtMobility@@QBE?AVQString@@XZ @ 450 NONAME ; class QString QtMobility::QContactName::lastName(void) const
+	??4QContactRingtone@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 451 NONAME ; class QtMobility::QContactRingtone & QtMobility::QContactRingtone::operator=(class QtMobility::QContactDetail const &)
+	?setLatitude@QContactGeoLocation@QtMobility@@QAEXN@Z @ 452 NONAME ; void QtMobility::QContactGeoLocation::setLatitude(double)
+	?waitForFinished@QContactAbstractRequest@QtMobility@@QAE_NH@Z @ 453 NONAME ; bool QtMobility::QContactAbstractRequest::waitForFinished(int)
+	?qt_metacast@QContactManager@QtMobility@@UAEPAXPBD@Z @ 454 NONAME ; void * QtMobility::QContactManager::qt_metacast(char const *)
+	?presenceStateImageUrl@QContactGlobalPresence@QtMobility@@QBE?AVQUrl@@XZ @ 455 NONAME ; class QUrl QtMobility::QContactGlobalPresence::presenceStateImageUrl(void) const
+	??0QContactDetailFieldDefinition@QtMobility@@QAE@XZ @ 456 NONAME ; QtMobility::QContactDetailFieldDefinition::QContactDetailFieldDefinition(void)
+	?trUtf8@QContactRemoveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 457 NONAME ; class QString QtMobility::QContactRemoveRequest::trUtf8(char const *, char const *, int)
+	?thumbnail@QContactThumbnail@QtMobility@@QBE?AVQImage@@XZ @ 458 NONAME ; class QImage QtMobility::QContactThumbnail::thumbnail(void) const
+	?qt_metacast@QContactSaveRequest@QtMobility@@UAEPAXPBD@Z @ 459 NONAME ; void * QtMobility::QContactSaveRequest::qt_metacast(char const *)
+	?DefinitionName@QContactGeoLocation@QtMobility@@2U?$QLatin1Constant@$0M@@2@B @ 460 NONAME ; struct QtMobility::QLatin1Constant<12> const QtMobility::QContactGeoLocation::DefinitionName
+	?emailAddress@QContactEmailAddress@QtMobility@@QBE?AVQString@@XZ @ 461 NONAME ; class QString QtMobility::QContactEmailAddress::emailAddress(void) const
+	?title@QContactOrganization@QtMobility@@QBE?AVQString@@XZ @ 462 NONAME ; class QString QtMobility::QContactOrganization::title(void) const
+	?HasMember@QContactRelationship@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 463 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactRelationship::HasMember
+	??1QContactRelationshipSaveRequest@QtMobility@@UAE@XZ @ 464 NONAME ; QtMobility::QContactRelationshipSaveRequest::~QContactRelationshipSaveRequest(void)
+	?isEmpty@QContactDetail@QtMobility@@QBE_NXZ @ 465 NONAME ; bool QtMobility::QContactDetail::isEmpty(void) const
+	?d_func@QContactLocalIdFilter@QtMobility@@AAEPAVQContactLocalIdFilterPrivate@2@XZ @ 466 NONAME ; class QtMobility::QContactLocalIdFilterPrivate * QtMobility::QContactLocalIdFilter::d_func(void)
+	?setCustomMessage@QContactPresence@QtMobility@@QAEXABVQString@@@Z @ 467 NONAME ; void QtMobility::QContactPresence::setCustomMessage(class QString const &)
+	??8QContactRelationship@QtMobility@@QBE_NABV01@@Z @ 468 NONAME ; bool QtMobility::QContactRelationship::operator==(class QtMobility::QContactRelationship const &) const
+	?since@QContactChangeLogFilter@QtMobility@@QBE?AVQDateTime@@XZ @ 469 NONAME ; class QDateTime QtMobility::QContactChangeLogFilter::since(void) const
+	?setFilter@QContactLocalIdFetchRequest@QtMobility@@QAEXABVQContactFilter@2@@Z @ 470 NONAME ; void QtMobility::QContactLocalIdFetchRequest::setFilter(class QtMobility::QContactFilter const &)
+	?presenceState@QContactPresence@QtMobility@@QBE?AW4PresenceState@12@XZ @ 471 NONAME ; enum QtMobility::QContactPresence::PresenceState QtMobility::QContactPresence::presenceState(void) const
+	?setNickname@QContactNickname@QtMobility@@QAEXABVQString@@@Z @ 472 NONAME ; void QtMobility::QContactNickname::setNickname(class QString const &)
+	?DefinitionName@QContactThumbnail@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 473 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactThumbnail::DefinitionName
+	?detailFieldName@QContactDetailFilter@QtMobility@@QBE?AVQString@@XZ @ 474 NONAME ; class QString QtMobility::QContactDetailFilter::detailFieldName(void) const
+	?d_func@QContactRelationshipFilter@QtMobility@@ABEPBVQContactRelationshipFilterPrivate@2@XZ @ 475 NONAME ; class QtMobility::QContactRelationshipFilterPrivate const * QtMobility::QContactRelationshipFilter::d_func(void) const
+	?d_func@QContactIntersectionFilter@QtMobility@@AAEPAVQContactIntersectionFilterPrivate@2@XZ @ 476 NONAME ; class QtMobility::QContactIntersectionFilterPrivate * QtMobility::QContactIntersectionFilter::d_func(void)
+	?contactType@QContactDetailDefinitionFetchRequest@QtMobility@@QBE?AVQString@@XZ @ 477 NONAME ; class QString QtMobility::QContactDetailDefinitionFetchRequest::contactType(void) const
+	?compareVariant@QContactManagerEngine@QtMobility@@SAHABVQVariant@@0W4CaseSensitivity@Qt@@@Z @ 478 NONAME ; int QtMobility::QContactManagerEngine::compareVariant(class QVariant const &, class QVariant const &, enum Qt::CaseSensitivity)
+	?ContextWork@QContactDetail@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 479 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactDetail::ContextWork
+	?setDetailAccessConstraints@QContactManagerEngine@QtMobility@@SAXPAVQContactDetail@2@V?$QFlags@W4AccessConstraint@QContactDetail@QtMobility@@@@@Z @ 480 NONAME ; void QtMobility::QContactManagerEngine::setDetailAccessConstraints(class QtMobility::QContactDetail *, class QFlags<enum QtMobility::QContactDetail::AccessConstraint>)
+	?setVibrationRingtoneUrl@QContactRingtone@QtMobility@@QAEXABVQUrl@@@Z @ 481 NONAME ; void QtMobility::QContactRingtone::setVibrationRingtoneUrl(class QUrl const &)
+	?blankPolicy@QContactSortOrder@QtMobility@@QBE?AW4BlankPolicy@12@XZ @ 482 NONAME ; enum QtMobility::QContactSortOrder::BlankPolicy QtMobility::QContactSortOrder::blankPolicy(void) const
+	?qt_metacast@QContactFetchRequest@QtMobility@@UAEPAXPBD@Z @ 483 NONAME ; void * QtMobility::QContactFetchRequest::qt_metacast(char const *)
+	?removeRelationships@QContactManager@QtMobility@@QAE_NABV?$QList@VQContactRelationship@QtMobility@@@@PAV?$QMap@HW4Error@QContactManager@QtMobility@@@@@Z @ 484 NONAME ; bool QtMobility::QContactManager::removeRelationships(class QList<class QtMobility::QContactRelationship> const &, class QMap<int, enum QtMobility::QContactManager::Error> *)
+	?relationshipType@QContactRelationship@QtMobility@@QBE?AVQString@@XZ @ 485 NONAME ; class QString QtMobility::QContactRelationship::relationshipType(void) const
+	?setSpouse@QContactFamily@QtMobility@@QAEXABVQString@@@Z @ 486 NONAME ; void QtMobility::QContactFamily::setSpouse(class QString const &)
+	?variantValue@QContactDetail@QtMobility@@QBE?AVQVariant@@ABVQString@@@Z @ 487 NONAME ; class QVariant QtMobility::QContactDetail::variantValue(class QString const &) const
+	?tr@QContactDetailDefinitionFetchRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 488 NONAME ; class QString QtMobility::QContactDetailDefinitionFetchRequest::tr(char const *, char const *)
+	?qt_metacast@QContactAbstractRequest@QtMobility@@UAEPAXPBD@Z @ 489 NONAME ; void * QtMobility::QContactAbstractRequest::qt_metacast(char const *)
+	?SubTypeParcel@QContactAddress@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 490 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactAddress::SubTypeParcel
+	?staticMetaObject@QContactManager@QtMobility@@2UQMetaObject@@B @ 491 NONAME ; struct QMetaObject const QtMobility::QContactManager::staticMetaObject
+	?relationships@QContactManagerEngine@QtMobility@@UBE?AV?$QList@VQContactRelationship@QtMobility@@@@ABVQString@@ABVQContactId@2@W4Role@QContactRelationship@2@PAW4Error@QContactManager@2@@Z @ 492 NONAME ; class QList<class QtMobility::QContactRelationship> QtMobility::QContactManagerEngine::relationships(class QString const &, class QtMobility::QContactId const &, enum QtMobility::QContactRelationship::Role, enum QtMobility::QContactManager::Error *) const
+	?qt_metacast@QContactDetailDefinitionSaveRequest@QtMobility@@UAEPAXPBD@Z @ 493 NONAME ; void * QtMobility::QContactDetailDefinitionSaveRequest::qt_metacast(char const *)
+	?qt_metacast@QContactManagerEngine@QtMobility@@UAEPAXPBD@Z @ 494 NONAME ; void * QtMobility::QContactManagerEngine::qt_metacast(char const *)
+	?clearDetails@QContact@QtMobility@@QAEXXZ @ 495 NONAME ; void QtMobility::QContact::clearDetails(void)
+	?FieldThumbnail@QContactThumbnail@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 496 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactThumbnail::FieldThumbnail
+	??0QContactRelationshipFilter@QtMobility@@QAE@ABVQContactFilter@1@@Z @ 497 NONAME ; QtMobility::QContactRelationshipFilter::QContactRelationshipFilter(class QtMobility::QContactFilter const &)
+	?d_func@QContactDetailDefinitionRemoveRequest@QtMobility@@AAEPAVQContactDetailDefinitionRemoveRequestPrivate@2@XZ @ 498 NONAME ; class QtMobility::QContactDetailDefinitionRemoveRequestPrivate * QtMobility::QContactDetailDefinitionRemoveRequest::d_func(void)
+	?setVideoUrl@QContactAvatar@QtMobility@@QAEXABVQUrl@@@Z @ 499 NONAME ; void QtMobility::QContactAvatar::setVideoUrl(class QUrl const &)
+	?FieldNickname@QContactNickname@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 500 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactNickname::FieldNickname
+	?match@QContactName@QtMobility@@SA?AVQContactFilter@2@ABVQString@@@Z @ 501 NONAME ; class QtMobility::QContactFilter QtMobility::QContactName::match(class QString const &)
+	?removeRelationship@QContactManagerEngine@QtMobility@@UAE_NABVQContactRelationship@2@PAW4Error@QContactManager@2@@Z @ 502 NONAME ; bool QtMobility::QContactManagerEngine::removeRelationship(class QtMobility::QContactRelationship const &, enum QtMobility::QContactManager::Error *)
+	?requestDestroyed@QContactManagerEngine@QtMobility@@UAEXPAVQContactAbstractRequest@2@@Z @ 503 NONAME ; void QtMobility::QContactManagerEngine::requestDestroyed(class QtMobility::QContactAbstractRequest *)
+	?FieldLabel@QContactDisplayLabel@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 504 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactDisplayLabel::FieldLabel
+	?FieldSubTypes@QContactOnlineAccount@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 505 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactOnlineAccount::FieldSubTypes
+	??0QContactInvalidFilter@QtMobility@@QAE@XZ @ 506 NONAME ; QtMobility::QContactInvalidFilter::QContactInvalidFilter(void)
+	??0QContactNote@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 507 NONAME ; QtMobility::QContactNote::QContactNote(class QtMobility::QContactDetail const &)
+	??MQContactId@QtMobility@@QBE_NABV01@@Z @ 508 NONAME ; bool QtMobility::QContactId::operator<(class QtMobility::QContactId const &) const
+	?trUtf8@QContactSaveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 509 NONAME ; class QString QtMobility::QContactSaveRequest::trUtf8(char const *, char const *, int)
+	?SubTypeCar@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$03@2@B @ 510 NONAME ; struct QtMobility::QLatin1Constant<4> const QtMobility::QContactPhoneNumber::SubTypeCar
+	?prefix@QContactName@QtMobility@@QBE?AVQString@@XZ @ 511 NONAME ; class QString QtMobility::QContactName::prefix(void) const
+	?match@QContactEmailAddress@QtMobility@@SA?AVQContactFilter@2@ABVQString@@@Z @ 512 NONAME ; class QtMobility::QContactFilter QtMobility::QContactEmailAddress::match(class QString const &)
+	??0QContactFilter@QtMobility@@IAE@PAVQContactFilterPrivate@1@@Z @ 513 NONAME ; QtMobility::QContactFilter::QContactFilter(class QtMobility::QContactFilterPrivate *)
+	?selfContactIdChanged@QContactManager@QtMobility@@IAEXABI0@Z @ 514 NONAME ; void QtMobility::QContactManager::selfContactIdChanged(unsigned int const &, unsigned int const &)
+	?HasManager@QContactRelationship@QtMobility@@2U?$QLatin1Constant@$0L@@2@B @ 515 NONAME ; struct QtMobility::QLatin1Constant<11> const QtMobility::QContactRelationship::HasManager
+	?value@QContactDetail@QtMobility@@QBE?AVQString@@PBD@Z @ 516 NONAME ; class QString QtMobility::QContactDetail::value(char const *) const
+	?staticMetaObject@QContactSaveRequest@QtMobility@@2UQMetaObject@@B @ 517 NONAME ; struct QMetaObject const QtMobility::QContactSaveRequest::staticMetaObject
+	?setValue@QContactDetail@QtMobility@@QAE_NABVQString@@ABVQVariant@@@Z @ 518 NONAME ; bool QtMobility::QContactDetail::setValue(class QString const &, class QVariant const &)
+	?setContactType@QContactDetailDefinitionSaveRequest@QtMobility@@QAEXABVQString@@@Z @ 519 NONAME ; void QtMobility::QContactDetailDefinitionSaveRequest::setContactType(class QString const &)
+	??1QContactRelationshipFetchRequest@QtMobility@@UAE@XZ @ 520 NONAME ; QtMobility::QContactRelationshipFetchRequest::~QContactRelationshipFetchRequest(void)
+	?detailDefinition@QContactManagerEngine@QtMobility@@UBE?AVQContactDetailDefinition@2@ABVQString@@0PAW4Error@QContactManager@2@@Z @ 521 NONAME ; class QtMobility::QContactDetailDefinition QtMobility::QContactManagerEngine::detailDefinition(class QString const &, class QString const &, enum QtMobility::QContactManager::Error *) const
+	??1QContactType@QtMobility@@QAE@XZ @ 522 NONAME ; QtMobility::QContactType::~QContactType(void)
+	??0QContactFilter@QtMobility@@QAE@XZ @ 523 NONAME ; QtMobility::QContactFilter::QContactFilter(void)
+	??0QContactUrl@QtMobility@@QAE@XZ @ 524 NONAME ; QtMobility::QContactUrl::QContactUrl(void)
+	??6QtMobility@@YA?AVQDebug@@V1@ABVQContactDetail@0@@Z @ 525 NONAME ; class QDebug QtMobility::operator<<(class QDebug, class QtMobility::QContactDetail const &)
+	?updateRelationshipRemoveRequest@QContactManagerEngine@QtMobility@@SAXPAVQContactRelationshipRemoveRequest@2@W4Error@QContactManager@2@ABV?$QMap@HW4Error@QContactManager@QtMobility@@@@W4State@QContactAbstractRequest@2@@Z @ 526 NONAME ; void QtMobility::QContactManagerEngine::updateRelationshipRemoveRequest(class QtMobility::QContactRelationshipRemoveRequest *, enum QtMobility::QContactManager::Error, class QMap<int, enum QtMobility::QContactManager::Error> const &, enum QtMobility::QContactAbstractRequest::State)
+	?FieldEmailAddress@QContactEmailAddress@QtMobility@@2U?$QLatin1Constant@$0N@@2@B @ 527 NONAME ; struct QtMobility::QLatin1Constant<13> const QtMobility::QContactEmailAddress::FieldEmailAddress
+	?errorMap@QContactRemoveRequest@QtMobility@@QBE?AV?$QMap@HW4Error@QContactManager@QtMobility@@@@XZ @ 528 NONAME ; class QMap<int, enum QtMobility::QContactManager::Error> QtMobility::QContactRemoveRequest::errorMap(void) const
+	?setStreet@QContactAddress@QtMobility@@QAEXABVQString@@@Z @ 529 NONAME ; void QtMobility::QContactAddress::setStreet(class QString const &)
+	??0QContactDetailDefinitionRemoveRequest@QtMobility@@QAE@PAVQObject@@@Z @ 530 NONAME ; QtMobility::QContactDetailDefinitionRemoveRequest::QContactDetailDefinitionRemoveRequest(class QObject *)
+	?contacts@QContactManagerEngine@QtMobility@@UBE?AV?$QList@VQContact@QtMobility@@@@ABVQContactFilter@2@ABV?$QList@VQContactSortOrder@QtMobility@@@@ABVQContactFetchHint@2@PAW4Error@QContactManager@2@@Z @ 531 NONAME ; class QList<class QtMobility::QContact> QtMobility::QContactManagerEngine::contacts(class QtMobility::QContactFilter const &, class QList<class QtMobility::QContactSortOrder> const &, class QtMobility::QContactFetchHint const &, enum QtMobility::QContactManager::Error *) const
+	?saveDetailDefinition@QContactManagerEngine@QtMobility@@UAE_NABVQContactDetailDefinition@2@ABVQString@@PAW4Error@QContactManager@2@@Z @ 532 NONAME ; bool QtMobility::QContactManagerEngine::saveDetailDefinition(class QtMobility::QContactDetailDefinition const &, class QString const &, enum QtMobility::QContactManager::Error *)
+	??0QContactBirthday@QtMobility@@QAE@XZ @ 533 NONAME ; QtMobility::QContactBirthday::QContactBirthday(void)
+	??9QContactId@QtMobility@@QBE_NABV01@@Z @ 534 NONAME ; bool QtMobility::QContactId::operator!=(class QtMobility::QContactId const &) const
+	??4QContactPhoneNumber@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 535 NONAME ; class QtMobility::QContactPhoneNumber & QtMobility::QContactPhoneNumber::operator=(class QtMobility::QContactDetail const &)
+	?syncTarget@QContactSyncTarget@QtMobility@@QBE?AVQString@@XZ @ 536 NONAME ; class QString QtMobility::QContactSyncTarget::syncTarget(void) const
+	?detailDefinitionName@QContactDetailRangeFilter@QtMobility@@QBE?AVQString@@XZ @ 537 NONAME ; class QString QtMobility::QContactDetailRangeFilter::detailDefinitionName(void) const
+	?setIds@QContactLocalIdFilter@QtMobility@@QAEXABV?$QList@I@@@Z @ 538 NONAME ; void QtMobility::QContactLocalIdFilter::setIds(class QList<unsigned int> const &)
+	?setDefinitionName@QContactDetailDefinitionRemoveRequest@QtMobility@@QAEXABVQString@@@Z @ 539 NONAME ; void QtMobility::QContactDetailDefinitionRemoveRequest::setDefinitionName(class QString const &)
+	?second@QContactRelationshipFetchRequest@QtMobility@@QBE?AVQContactId@2@XZ @ 540 NONAME ; class QtMobility::QContactId QtMobility::QContactRelationshipFetchRequest::second(void) const
+	?SubTypeImpp@QContactOnlineAccount@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 541 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactOnlineAccount::SubTypeImpp
+	?dataChanged@QContactManagerEngine@QtMobility@@IAEXXZ @ 542 NONAME ; void QtMobility::QContactManagerEngine::dataChanged(void)
+	??0QContactRemoveRequest@QtMobility@@QAE@PAVQObject@@@Z @ 543 NONAME ; QtMobility::QContactRemoveRequest::QContactRemoveRequest(class QObject *)
+	?d_func@QContactRemoveRequest@QtMobility@@ABEPBVQContactRemoveRequestPrivate@2@XZ @ 544 NONAME ; class QtMobility::QContactRemoveRequestPrivate const * QtMobility::QContactRemoveRequest::d_func(void) const
+	?getStaticMetaObject@QContactAbstractRequest@QtMobility@@SAABUQMetaObject@@XZ @ 545 NONAME ; struct QMetaObject const & QtMobility::QContactAbstractRequest::getStaticMetaObject(void)
+	?FieldTimestamp@QContactPresence@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 546 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactPresence::FieldTimestamp
+	?tr@QContactDetailDefinitionRemoveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 547 NONAME ; class QString QtMobility::QContactDetailDefinitionRemoveRequest::tr(char const *, char const *)
+	?qt_metacall@QContactRelationshipRemoveRequest@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 548 NONAME ; int QtMobility::QContactRelationshipRemoveRequest::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?FieldSubTypes@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 549 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactPhoneNumber::FieldSubTypes
+	?insertChangedContact@QContactChangeSet@QtMobility@@QAEXI@Z @ 550 NONAME ; void QtMobility::QContactChangeSet::insertChangedContact(unsigned int)
+	??4QContactUrl@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 551 NONAME ; class QtMobility::QContactUrl & QtMobility::QContactUrl::operator=(class QtMobility::QContactDetail const &)
+	?DefinitionName@QContactSyncTarget@QtMobility@@2U?$QLatin1Constant@$0L@@2@B @ 552 NONAME ; struct QtMobility::QLatin1Constant<11> const QtMobility::QContactSyncTarget::DefinitionName
+	?localId@QContact@QtMobility@@QBEIXZ @ 553 NONAME ; unsigned int QtMobility::QContact::localId(void) const
+	?value@QContactDetail@QtMobility@@QBE?AVQString@@ABV3@@Z @ 554 NONAME ; class QString QtMobility::QContactDetail::value(class QString const &) const
+	??4QContactPresence@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 555 NONAME ; class QtMobility::QContactPresence & QtMobility::QContactPresence::operator=(class QtMobility::QContactDetail const &)
+	?FieldVideoUrl@QContactAvatar@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 556 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactAvatar::FieldVideoUrl
+	??0QContactUrl@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 557 NONAME ; QtMobility::QContactUrl::QContactUrl(class QtMobility::QContactDetail const &)
+	?relationships@QContact@QtMobility@@QBE?AV?$QList@VQContactRelationship@QtMobility@@@@ABVQString@@@Z @ 558 NONAME ; class QList<class QtMobility::QContactRelationship> QtMobility::QContact::relationships(class QString const &) const
+	?assistantName@QContactOrganization@QtMobility@@QBE?AVQString@@XZ @ 559 NONAME ; class QString QtMobility::QContactOrganization::assistantName(void) const
+	?trUtf8@QContactFetchRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 560 NONAME ; class QString QtMobility::QContactFetchRequest::trUtf8(char const *, char const *, int)
+	?FieldContext@QContactDetail@QtMobility@@2U?$QLatin1Constant@$07@2@B @ 561 NONAME ; struct QtMobility::QLatin1Constant<8> const QtMobility::QContactDetail::FieldContext
+	?setDirection@QContactSortOrder@QtMobility@@QAEXW4SortOrder@Qt@@@Z @ 562 NONAME ; void QtMobility::QContactSortOrder::setDirection(enum Qt::SortOrder)
+	?contactIds@QContactManager@QtMobility@@QBE?AV?$QList@I@@ABV?$QList@VQContactSortOrder@QtMobility@@@@@Z @ 563 NONAME ; class QList<unsigned int> QtMobility::QContactManager::contactIds(class QList<class QtMobility::QContactSortOrder> const &) const
+	?d_func@QContactSaveRequest@QtMobility@@AAEPAVQContactSaveRequestPrivate@2@XZ @ 564 NONAME ; class QtMobility::QContactSaveRequestPrivate * QtMobility::QContactSaveRequest::d_func(void)
+	?setRole@QContactOrganization@QtMobility@@QAEXABVQString@@@Z @ 565 NONAME ; void QtMobility::QContactOrganization::setRole(class QString const &)
+	??8QContactSortOrder@QtMobility@@QBE_NABV01@@Z @ 566 NONAME ; bool QtMobility::QContactSortOrder::operator==(class QtMobility::QContactSortOrder const &) const
+	?append@QContactIntersectionFilter@QtMobility@@QAEXABVQContactFilter@2@@Z @ 567 NONAME ; void QtMobility::QContactIntersectionFilter::append(class QtMobility::QContactFilter const &)
+	?spouse@QContactFamily@QtMobility@@QBE?AVQString@@XZ @ 568 NONAME ; class QString QtMobility::QContactFamily::spouse(void) const
+	?selfContactId@QContactManagerEngine@QtMobility@@UBEIPAW4Error@QContactManager@2@@Z @ 569 NONAME ; unsigned int QtMobility::QContactManagerEngine::selfContactId(enum QtMobility::QContactManager::Error *) const
+	?latitude@QContactGeoLocation@QtMobility@@QBENXZ @ 570 NONAME ; double QtMobility::QContactGeoLocation::latitude(void) const
+	?tr@QContactLocalIdFetchRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 571 NONAME ; class QString QtMobility::QContactLocalIdFetchRequest::tr(char const *, char const *)
+	?setDetailDefinitionName@QContactSortOrder@QtMobility@@QAEXABVQString@@0@Z @ 572 NONAME ; void QtMobility::QContactSortOrder::setDetailDefinitionName(class QString const &, class QString const &)
+	??4QContactGlobalPresence@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 573 NONAME ; class QtMobility::QContactGlobalPresence & QtMobility::QContactGlobalPresence::operator=(class QtMobility::QContactDetail const &)
+	?trUtf8@QContactRelationshipRemoveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 574 NONAME ; class QString QtMobility::QContactRelationshipRemoveRequest::trUtf8(char const *, char const *)
+	?setType@QContactType@QtMobility@@QAEXABVQString@@@Z @ 575 NONAME ; void QtMobility::QContactType::setType(class QString const &)
+	?role@QContactOrganization@QtMobility@@QBE?AVQString@@XZ @ 576 NONAME ; class QString QtMobility::QContactOrganization::role(void) const
+	?removeValue@QContactDetail@QtMobility@@QAE_NABVQString@@@Z @ 577 NONAME ; bool QtMobility::QContactDetail::removeValue(class QString const &)
+	??0QContactId@QtMobility@@QAE@ABV01@@Z @ 578 NONAME ; QtMobility::QContactId::QContactId(class QtMobility::QContactId const &)
+	??0QContactDetail@QtMobility@@QAE@XZ @ 579 NONAME ; QtMobility::QContactDetail::QContactDetail(void)
+	??0QContactTag@QtMobility@@QAE@XZ @ 580 NONAME ; QtMobility::QContactTag::QContactTag(void)
+	?relationshipType@QContactRelationshipFilter@QtMobility@@QBE?AVQString@@XZ @ 581 NONAME ; class QString QtMobility::QContactRelationshipFilter::relationshipType(void) const
+	??4QContactFamily@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 582 NONAME ; class QtMobility::QContactFamily & QtMobility::QContactFamily::operator=(class QtMobility::QContactDetail const &)
+	??_EQContactManager@QtMobility@@UAE@I@Z @ 583 NONAME ; QtMobility::QContactManager::~QContactManager(unsigned int)
+	?buildUri@QContactManager@QtMobility@@SA?AVQString@@ABV3@ABV?$QMap@VQString@@V1@@@H@Z @ 584 NONAME ; class QString QtMobility::QContactManager::buildUri(class QString const &, class QMap<class QString, class QString> const &, int)
+	?trUtf8@QContactRelationshipSaveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 585 NONAME ; class QString QtMobility::QContactRelationshipSaveRequest::trUtf8(char const *, char const *, int)
+	??0QContactName@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 586 NONAME ; QtMobility::QContactName::QContactName(class QtMobility::QContactDetail const &)
+	?qt_metacast@QContactRelationshipSaveRequest@QtMobility@@UAEPAXPBD@Z @ 587 NONAME ; void * QtMobility::QContactRelationshipSaveRequest::qt_metacast(char const *)
+	?guid@QContactGuid@QtMobility@@QBE?AVQString@@XZ @ 588 NONAME ; class QString QtMobility::QContactGuid::guid(void) const
+	??8QContactDetail@QtMobility@@QBE_NABV01@@Z @ 589 NONAME ; bool QtMobility::QContactDetail::operator==(class QtMobility::QContactDetail const &) const
+	?setOriginalDate@QContactAnniversary@QtMobility@@QAEXABVQDate@@@Z @ 590 NONAME ; void QtMobility::QContactAnniversary::setOriginalDate(class QDate const &)
+	?validateDefinition@QContactManagerEngine@QtMobility@@UBE_NABVQContactDetailDefinition@2@PAW4Error@QContactManager@2@@Z @ 591 NONAME ; bool QtMobility::QContactManagerEngine::validateDefinition(class QtMobility::QContactDetailDefinition const &, enum QtMobility::QContactManager::Error *) const
+	?setPrefix@QContactName@QtMobility@@QAEXABVQString@@@Z @ 592 NONAME ; void QtMobility::QContactName::setPrefix(class QString const &)
+	?setRelationship@QContactRelationshipRemoveRequest@QtMobility@@QAEXABVQContactRelationship@2@@Z @ 593 NONAME ; void QtMobility::QContactRelationshipRemoveRequest::setRelationship(class QtMobility::QContactRelationship const &)
+	?setGender@QContactGender@QtMobility@@QAEXABVQString@@@Z @ 594 NONAME ; void QtMobility::QContactGender::setGender(class QString const &)
+	??0QContactDetailFilter@QtMobility@@QAE@XZ @ 595 NONAME ; QtMobility::QContactDetailFilter::QContactDetailFilter(void)
+	?d_func@QContactDetailFilter@QtMobility@@ABEPBVQContactDetailFilterPrivate@2@XZ @ 596 NONAME ; class QtMobility::QContactDetailFilterPrivate const * QtMobility::QContactDetailFilter::d_func(void) const
+	?errorMap@QContactRelationshipRemoveRequest@QtMobility@@QBE?AV?$QMap@HW4Error@QContactManager@QtMobility@@@@XZ @ 597 NONAME ; class QMap<int, enum QtMobility::QContactManager::Error> QtMobility::QContactRelationshipRemoveRequest::errorMap(void) const
+	?vibrationRingtoneUrl@QContactRingtone@QtMobility@@QBE?AVQUrl@@XZ @ 598 NONAME ; class QUrl QtMobility::QContactRingtone::vibrationRingtoneUrl(void) const
+	?setFilters@QContactIntersectionFilter@QtMobility@@QAEXABV?$QList@VQContactFilter@QtMobility@@@@@Z @ 599 NONAME ; void QtMobility::QContactIntersectionFilter::setFilters(class QList<class QtMobility::QContactFilter> const &)
+	?SubTypeVideo@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 600 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactPhoneNumber::SubTypeVideo
+	?qt_metacast@QContactDetailDefinitionFetchRequest@QtMobility@@UAEPAXPBD@Z @ 601 NONAME ; void * QtMobility::QContactDetailDefinitionFetchRequest::qt_metacast(char const *)
+	?fromUri@QContactManager@QtMobility@@SAPAV12@ABVQString@@PAVQObject@@@Z @ 602 NONAME ; class QtMobility::QContactManager * QtMobility::QContactManager::fromUri(class QString const &, class QObject *)
+	?optimizationHints@QContactFetchHint@QtMobility@@QBE?AV?$QFlags@W4OptimizationHint@QContactFetchHint@QtMobility@@@@XZ @ 603 NONAME ; class QFlags<enum QtMobility::QContactFetchHint::OptimizationHint> QtMobility::QContactFetchHint::optimizationHints(void) const
+	?setRelationshipType@QContactRelationshipFilter@QtMobility@@QAEXABVQString@@@Z @ 604 NONAME ; void QtMobility::QContactRelationshipFilter::setRelationshipType(class QString const &)
+	?compatibleContact@QContactManager@QtMobility@@QAE?AVQContact@2@ABV32@@Z @ 605 NONAME ; class QtMobility::QContact QtMobility::QContactManager::compatibleContact(class QtMobility::QContact const &)
+	??1QContactSaveRequest@QtMobility@@UAE@XZ @ 606 NONAME ; QtMobility::QContactSaveRequest::~QContactSaveRequest(void)
+	?contactsAdded@QContactManagerEngine@QtMobility@@IAEXABV?$QList@I@@@Z @ 607 NONAME ; void QtMobility::QContactManagerEngine::contactsAdded(class QList<unsigned int> const &)
+	?trUtf8@QContactAbstractRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 608 NONAME ; class QString QtMobility::QContactAbstractRequest::trUtf8(char const *, char const *)
+	?setFields@QContactDetailDefinition@QtMobility@@QAEXABV?$QMap@VQString@@VQContactDetailFieldDefinition@QtMobility@@@@@Z @ 609 NONAME ; void QtMobility::QContactDetailDefinition::setFields(class QMap<class QString, class QtMobility::QContactDetailFieldDefinition> const &)
+	?tr@QContactManager@QtMobility@@SA?AVQString@@PBD0@Z @ 610 NONAME ; class QString QtMobility::QContactManager::tr(char const *, char const *)
+	?filter@QContactFetchRequest@QtMobility@@QBE?AVQContactFilter@2@XZ @ 611 NONAME ; class QtMobility::QContactFilter QtMobility::QContactFetchRequest::filter(void) const
+	?staticMetaObject@QContactRelationshipSaveRequest@QtMobility@@2UQMetaObject@@B @ 612 NONAME ; struct QMetaObject const QtMobility::QContactRelationshipSaveRequest::staticMetaObject
+	?presenceStateText@QContactGlobalPresence@QtMobility@@QBE?AVQString@@XZ @ 613 NONAME ; class QString QtMobility::QContactGlobalPresence::presenceStateText(void) const
+	?note@QContactNote@QtMobility@@QBE?AVQString@@XZ @ 614 NONAME ; class QString QtMobility::QContactNote::note(void) const
+	?staticMetaObject@QContactRelationshipRemoveRequest@QtMobility@@2UQMetaObject@@B @ 615 NONAME ; struct QMetaObject const QtMobility::QContactRelationshipRemoveRequest::staticMetaObject
+	?tr@QContactRelationshipFetchRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 616 NONAME ; class QString QtMobility::QContactRelationshipFetchRequest::tr(char const *, char const *)
+	??1QContactSortOrder@QtMobility@@QAE@XZ @ 617 NONAME ; QtMobility::QContactSortOrder::~QContactSortOrder(void)
+	?firstName@QContactName@QtMobility@@QBE?AVQString@@XZ @ 618 NONAME ; class QString QtMobility::QContactName::firstName(void) const
+	?suffix@QContactName@QtMobility@@QBE?AVQString@@XZ @ 619 NONAME ; class QString QtMobility::QContactName::suffix(void) const
+	?setRelationshipType@QContactRelationshipFetchRequest@QtMobility@@QAEXABVQString@@@Z @ 620 NONAME ; void QtMobility::QContactRelationshipFetchRequest::setRelationshipType(class QString const &)
+	?contact@QContactManagerEngine@QtMobility@@UBE?AVQContact@2@ABIABVQContactFetchHint@2@PAW4Error@QContactManager@2@@Z @ 621 NONAME ; class QtMobility::QContact QtMobility::QContactManagerEngine::contact(unsigned int const &, class QtMobility::QContactFetchHint const &, enum QtMobility::QContactManager::Error *) const
+	?setSubTypes@QContactAddress@QtMobility@@QAEXABVQStringList@@@Z @ 622 NONAME ; void QtMobility::QContactAddress::setSubTypes(class QStringList const &)
+	?subType@QContactUrl@QtMobility@@QBE?AVQString@@XZ @ 623 NONAME ; class QString QtMobility::QContactUrl::subType(void) const
+	?qHash@QtMobility@@YAIABVQContact@1@@Z @ 624 NONAME ; unsigned int QtMobility::qHash(class QtMobility::QContact const &)
+	?isRelationshipTypeSupported@QContactManagerEngine@QtMobility@@UBE_NABVQString@@0@Z @ 625 NONAME ; bool QtMobility::QContactManagerEngine::isRelationshipTypeSupported(class QString const &, class QString const &) const
+	?d_func@QContactChangeLogFilter@QtMobility@@ABEPBVQContactChangeLogFilterPrivate@2@XZ @ 626 NONAME ; class QtMobility::QContactChangeLogFilterPrivate const * QtMobility::QContactChangeLogFilter::d_func(void) const
+	?setOldAndNewSelfContactId@QContactChangeSet@QtMobility@@QAEXABU?$QPair@II@@@Z @ 627 NONAME ; void QtMobility::QContactChangeSet::setOldAndNewSelfContactId(struct QPair<unsigned int, unsigned int> const &)
+	?isFilterSupported@QContactManagerEngine@QtMobility@@UBE_NABVQContactFilter@2@@Z @ 628 NONAME ; bool QtMobility::QContactManagerEngine::isFilterSupported(class QtMobility::QContactFilter const &) const
+	?FieldNickname@QContactPresence@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 629 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactPresence::FieldNickname
+	??0QContactGuid@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 630 NONAME ; QtMobility::QContactGuid::QContactGuid(class QtMobility::QContactDetail const &)
+	??1QContactManagerEngine@QtMobility@@UAE@XZ @ 631 NONAME ; QtMobility::QContactManagerEngine::~QContactManagerEngine(void)
+	??0QContactSyncTarget@QtMobility@@QAE@XZ @ 632 NONAME ; QtMobility::QContactSyncTarget::QContactSyncTarget(void)
+	?qt_metacall@QContactDetailDefinitionSaveRequest@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 633 NONAME ; int QtMobility::QContactDetailDefinitionSaveRequest::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?FieldPresenceStateImageUrl@QContactPresence@QtMobility@@2U?$QLatin1Constant@$0BG@@2@B @ 634 NONAME ; struct QtMobility::QLatin1Constant<22> const QtMobility::QContactPresence::FieldPresenceStateImageUrl
+	?resultsAvailable@QContactAbstractRequest@QtMobility@@IAEXXZ @ 635 NONAME ; void QtMobility::QContactAbstractRequest::resultsAvailable(void)
+	??4QContactOnlineAccount@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 636 NONAME ; class QtMobility::QContactOnlineAccount & QtMobility::QContactOnlineAccount::operator=(class QtMobility::QContactDetail const &)
+	?DefinitionName@QContactType@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 637 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactType::DefinitionName
+	?staticMetaObject@QContactLocalIdFetchRequest@QtMobility@@2UQMetaObject@@B @ 638 NONAME ; struct QMetaObject const QtMobility::QContactLocalIdFetchRequest::staticMetaObject
+	?detailDefinition@QContactManager@QtMobility@@QBE?AVQContactDetailDefinition@2@ABVQString@@0@Z @ 639 NONAME ; class QtMobility::QContactDetailDefinition QtMobility::QContactManager::detailDefinition(class QString const &, class QString const &) const
+	??1QContactLocalIdFilter@QtMobility@@QAE@XZ @ 640 NONAME ; QtMobility::QContactLocalIdFilter::~QContactLocalIdFilter(void)
+	?d_func@QContactRelationshipRemoveRequest@QtMobility@@AAEPAVQContactRelationshipRemoveRequestPrivate@2@XZ @ 641 NONAME ; class QtMobility::QContactRelationshipRemoveRequestPrivate * QtMobility::QContactRelationshipRemoveRequest::d_func(void)
+	??4QContactAddress@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 642 NONAME ; class QtMobility::QContactAddress & QtMobility::QContactAddress::operator=(class QtMobility::QContactDetail const &)
+	?contactType@QContactDetailDefinitionSaveRequest@QtMobility@@QBE?AVQString@@XZ @ 643 NONAME ; class QString QtMobility::QContactDetailDefinitionSaveRequest::contactType(void) const
+	??0QContactRelationshipFilter@QtMobility@@QAE@XZ @ 644 NONAME ; QtMobility::QContactRelationshipFilter::QContactRelationshipFilter(void)
+	?id@QContact@QtMobility@@QBE?AVQContactId@2@XZ @ 645 NONAME ; class QtMobility::QContactId QtMobility::QContact::id(void) const
+	?getStaticMetaObject@QContactRelationshipFetchRequest@QtMobility@@SAABUQMetaObject@@XZ @ 646 NONAME ; struct QMetaObject const & QtMobility::QContactRelationshipFetchRequest::getStaticMetaObject(void)
+	??0QContactBirthday@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 647 NONAME ; QtMobility::QContactBirthday::QContactBirthday(class QtMobility::QContactDetail const &)
+	??0QContactRingtone@QtMobility@@QAE@XZ @ 648 NONAME ; QtMobility::QContactRingtone::QContactRingtone(void)
+	?updateContactRemoveRequest@QContactManagerEngine@QtMobility@@SAXPAVQContactRemoveRequest@2@W4Error@QContactManager@2@ABV?$QMap@HW4Error@QContactManager@QtMobility@@@@W4State@QContactAbstractRequest@2@@Z @ 649 NONAME ; void QtMobility::QContactManagerEngine::updateContactRemoveRequest(class QtMobility::QContactRemoveRequest *, enum QtMobility::QContactManager::Error, class QMap<int, enum QtMobility::QContactManager::Error> const &, enum QtMobility::QContactAbstractRequest::State)
+	?saveRelationships@QContactManager@QtMobility@@QAE_NPAV?$QList@VQContactRelationship@QtMobility@@@@PAV?$QMap@HW4Error@QContactManager@QtMobility@@@@@Z @ 650 NONAME ; bool QtMobility::QContactManager::saveRelationships(class QList<class QtMobility::QContactRelationship> *, class QMap<int, enum QtMobility::QContactManager::Error> *)
+	?maxValue@QContactDetailRangeFilter@QtMobility@@QBE?AVQVariant@@XZ @ 651 NONAME ; class QVariant QtMobility::QContactDetailRangeFilter::maxValue(void) const
+	?tr@QContactDetailDefinitionSaveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 652 NONAME ; class QString QtMobility::QContactDetailDefinitionSaveRequest::tr(char const *, char const *)
+	?setSubTypes@QContactOnlineAccount@QtMobility@@QAEXABVQStringList@@@Z @ 653 NONAME ; void QtMobility::QContactOnlineAccount::setSubTypes(class QStringList const &)
+	?synthesizeContactDisplayLabel@QContactManager@QtMobility@@QBEXPAVQContact@2@@Z @ 654 NONAME ; void QtMobility::QContactManager::synthesizeContactDisplayLabel(class QtMobility::QContact *) const
+	?setRelationships@QContactRelationshipRemoveRequest@QtMobility@@QAEXABV?$QList@VQContactRelationship@QtMobility@@@@@Z @ 655 NONAME ; void QtMobility::QContactRelationshipRemoveRequest::setRelationships(class QList<class QtMobility::QContactRelationship> const &)
+	?setLongitude@QContactGeoLocation@QtMobility@@QAEXN@Z @ 656 NONAME ; void QtMobility::QContactGeoLocation::setLongitude(double)
+	??1QContactDisplayLabel@QtMobility@@QAE@XZ @ 657 NONAME ; QtMobility::QContactDisplayLabel::~QContactDisplayLabel(void)
+	?emitSignals@QContactChangeSet@QtMobility@@QAEXPAVQContactManagerEngine@2@@Z @ 658 NONAME ; void QtMobility::QContactChangeSet::emitSignals(class QtMobility::QContactManagerEngine *)
+	?setTag@QContactTag@QtMobility@@QAEXABVQString@@@Z @ 659 NONAME ; void QtMobility::QContactTag::setTag(class QString const &)
+	?altitudeAccuracy@QContactGeoLocation@QtMobility@@QBENXZ @ 660 NONAME ; double QtMobility::QContactGeoLocation::altitudeAccuracy(void) const
+	?SubTypeVoice@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 661 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactPhoneNumber::SubTypeVoice
+	??UQtMobility@@YA?BVQContactFilter@0@ABV10@0@Z @ 662 NONAME ; class QtMobility::QContactFilter const QtMobility::operator|(class QtMobility::QContactFilter const &, class QtMobility::QContactFilter const &)
+	??8QContact@QtMobility@@QBE_NABV01@@Z @ 663 NONAME ; bool QtMobility::QContact::operator==(class QtMobility::QContact const &) const
+	??8QContactDetailFieldDefinition@QtMobility@@QBE_NABV01@@Z @ 664 NONAME ; bool QtMobility::QContactDetailFieldDefinition::operator==(class QtMobility::QContactDetailFieldDefinition const &) const
+	?calendarId@QContactAnniversary@QtMobility@@QBE?AVQString@@XZ @ 665 NONAME ; class QString QtMobility::QContactAnniversary::calendarId(void) const
+	?canonicalizedFilter@QContactManagerEngine@QtMobility@@SA?AVQContactFilter@2@ABV32@@Z @ 666 NONAME ; class QtMobility::QContactFilter QtMobility::QContactManagerEngine::canonicalizedFilter(class QtMobility::QContactFilter const &)
+	?staticMetaObject@QContactRemoveRequest@QtMobility@@2UQMetaObject@@B @ 667 NONAME ; struct QMetaObject const QtMobility::QContactRemoveRequest::staticMetaObject
+	??0QContactChangeLogFilter@QtMobility@@QAE@ABVQContactFilter@1@@Z @ 668 NONAME ; QtMobility::QContactChangeLogFilter::QContactChangeLogFilter(class QtMobility::QContactFilter const &)
+	?contactsChanged@QContactManager@QtMobility@@IAEXABV?$QList@I@@@Z @ 669 NONAME ; void QtMobility::QContactManager::contactsChanged(class QList<unsigned int> const &)
+	?FieldCustomMessage@QContactPresence@QtMobility@@2U?$QLatin1Constant@$0O@@2@B @ 670 NONAME ; struct QtMobility::QLatin1Constant<14> const QtMobility::QContactPresence::FieldCustomMessage
+	?setCalendarId@QContactAnniversary@QtMobility@@QAEXABVQString@@@Z @ 671 NONAME ; void QtMobility::QContactAnniversary::setCalendarId(class QString const &)
+	?contactsChanged@QContactManagerEngine@QtMobility@@IAEXABV?$QList@I@@@Z @ 672 NONAME ; void QtMobility::QContactManagerEngine::contactsChanged(class QList<unsigned int> const &)
+	??1QContactDetailDefinition@QtMobility@@QAE@XZ @ 673 NONAME ; QtMobility::QContactDetailDefinition::~QContactDetailDefinition(void)
+	?clearRemovedRelationshipsContacts@QContactChangeSet@QtMobility@@QAEXXZ @ 674 NONAME ; void QtMobility::QContactChangeSet::clearRemovedRelationshipsContacts(void)
+	??0QContactGlobalPresence@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 675 NONAME ; QtMobility::QContactGlobalPresence::QContactGlobalPresence(class QtMobility::QContactDetail const &)
+	?errorMap@QContactDetailDefinitionSaveRequest@QtMobility@@QBE?AV?$QMap@HW4Error@QContactManager@QtMobility@@@@XZ @ 676 NONAME ; class QMap<int, enum QtMobility::QContactManager::Error> QtMobility::QContactDetailDefinitionSaveRequest::errorMap(void) const
+	?trUtf8@QContactDetailDefinitionRemoveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 677 NONAME ; class QString QtMobility::QContactDetailDefinitionRemoveRequest::trUtf8(char const *, char const *)
+	?setDepartment@QContactOrganization@QtMobility@@QAEXABVQStringList@@@Z @ 678 NONAME ; void QtMobility::QContactOrganization::setDepartment(class QStringList const &)
+	?metaObject@QContactDetailDefinitionRemoveRequest@QtMobility@@UBEPBUQMetaObject@@XZ @ 679 NONAME ; struct QMetaObject const * QtMobility::QContactDetailDefinitionRemoveRequest::metaObject(void) const
+	??4QContactGender@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 680 NONAME ; class QtMobility::QContactGender & QtMobility::QContactGender::operator=(class QtMobility::QContactDetail const &)
+	?qt_metacast@QContactRemoveRequest@QtMobility@@UAEPAXPBD@Z @ 681 NONAME ; void * QtMobility::QContactRemoveRequest::qt_metacast(char const *)
+	?nickname@QContactPresence@QtMobility@@QBE?AVQString@@XZ @ 682 NONAME ; class QString QtMobility::QContactPresence::nickname(void) const
+	?updateContactFetchRequest@QContactManagerEngine@QtMobility@@SAXPAVQContactFetchRequest@2@ABV?$QList@VQContact@QtMobility@@@@W4Error@QContactManager@2@W4State@QContactAbstractRequest@2@@Z @ 683 NONAME ; void QtMobility::QContactManagerEngine::updateContactFetchRequest(class QtMobility::QContactFetchRequest *, class QList<class QtMobility::QContact> const &, enum QtMobility::QContactManager::Error, enum QtMobility::QContactAbstractRequest::State)
+	?tr@QContactManagerEngine@QtMobility@@SA?AVQString@@PBD0H@Z @ 684 NONAME ; class QString QtMobility::QContactManagerEngine::tr(char const *, char const *, int)
+	?Aggregates@QContactRelationship@QtMobility@@2U?$QLatin1Constant@$0L@@2@B @ 685 NONAME ; struct QtMobility::QLatin1Constant<11> const QtMobility::QContactRelationship::Aggregates
+	??1QContactDetailDefinitionRemoveRequest@QtMobility@@UAE@XZ @ 686 NONAME ; QtMobility::QContactDetailDefinitionRemoveRequest::~QContactDetailDefinitionRemoveRequest(void)
+	?contactsRemoved@QContactManager@QtMobility@@IAEXABV?$QList@I@@@Z @ 687 NONAME ; void QtMobility::QContactManager::contactsRemoved(class QList<unsigned int> const &)
+	?contactType@QContactDetailDefinitionRemoveRequest@QtMobility@@QBE?AVQString@@XZ @ 688 NONAME ; class QString QtMobility::QContactDetailDefinitionRemoveRequest::contactType(void) const
+	??8QContactId@QtMobility@@QBE_NABV01@@Z @ 689 NONAME ; bool QtMobility::QContactId::operator==(class QtMobility::QContactId const &) const
+	?FieldUrl@QContactUrl@QtMobility@@2U?$QLatin1Constant@$03@2@B @ 690 NONAME ; struct QtMobility::QLatin1Constant<4> const QtMobility::QContactUrl::FieldUrl
+	?setPresenceState@QContactGlobalPresence@QtMobility@@QAEXW4PresenceState@QContactPresence@2@@Z @ 691 NONAME ; void QtMobility::QContactGlobalPresence::setPresenceState(enum QtMobility::QContactPresence::PresenceState)
+	?relatedContactId@QContactRelationshipFilter@QtMobility@@QBE?AVQContactId@2@XZ @ 692 NONAME ; class QtMobility::QContactId QtMobility::QContactRelationshipFilter::relatedContactId(void) const
+	?FieldGuid@QContactGuid@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 693 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactGuid::FieldGuid
+	?metaObject@QContactRemoveRequest@QtMobility@@UBEPBUQMetaObject@@XZ @ 694 NONAME ; struct QMetaObject const * QtMobility::QContactRemoveRequest::metaObject(void) const
+	?contexts@QContactDetail@QtMobility@@QBE?AVQStringList@@XZ @ 695 NONAME ; class QStringList QtMobility::QContactDetail::contexts(void) const
+	?FieldAltitude@QContactGeoLocation@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 696 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactGeoLocation::FieldAltitude
+	?error@QContactAbstractRequest@QtMobility@@QBE?AW4Error@QContactManager@2@XZ @ 697 NONAME ; enum QtMobility::QContactManager::Error QtMobility::QContactAbstractRequest::error(void) const
+	?error@QContactManager@QtMobility@@QBE?AW4Error@12@XZ @ 698 NONAME ; enum QtMobility::QContactManager::Error QtMobility::QContactManager::error(void) const
+	?setSorting@QContactLocalIdFetchRequest@QtMobility@@QAEXABV?$QList@VQContactSortOrder@QtMobility@@@@@Z @ 699 NONAME ; void QtMobility::QContactLocalIdFetchRequest::setSorting(class QList<class QtMobility::QContactSortOrder> const &)
+	?relationshipTypesHint@QContactFetchHint@QtMobility@@QBE?AVQStringList@@XZ @ 700 NONAME ; class QStringList QtMobility::QContactFetchHint::relationshipTypesHint(void) const
+	?startRequest@QContactManagerEngine@QtMobility@@UAE_NPAVQContactAbstractRequest@2@@Z @ 701 NONAME ; bool QtMobility::QContactManagerEngine::startRequest(class QtMobility::QContactAbstractRequest *)
+	?setAccountUri@QContactOnlineAccount@QtMobility@@QAEXABVQString@@@Z @ 702 NONAME ; void QtMobility::QContactOnlineAccount::setAccountUri(class QString const &)
+	?updateContactSaveRequest@QContactManagerEngine@QtMobility@@SAXPAVQContactSaveRequest@2@ABV?$QList@VQContact@QtMobility@@@@W4Error@QContactManager@2@ABV?$QMap@HW4Error@QContactManager@QtMobility@@@@W4State@QContactAbstractRequest@2@@Z @ 703 NONAME ; void QtMobility::QContactManagerEngine::updateContactSaveRequest(class QtMobility::QContactSaveRequest *, class QList<class QtMobility::QContact> const &, enum QtMobility::QContactManager::Error, class QMap<int, enum QtMobility::QContactManager::Error> const &, enum QtMobility::QContactAbstractRequest::State)
+	?setNumber@QContactPhoneNumber@QtMobility@@QAEXABVQString@@@Z @ 704 NONAME ; void QtMobility::QContactPhoneNumber::setNumber(class QString const &)
+	?trUtf8@QContactDetailDefinitionFetchRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 705 NONAME ; class QString QtMobility::QContactDetailDefinitionFetchRequest::trUtf8(char const *, char const *)
+	?FieldType@QContactType@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 706 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactType::FieldType
+	?FieldImageUrl@QContactAvatar@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 707 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactAvatar::FieldImageUrl
+	?FieldRegion@QContactAddress@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 708 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactAddress::FieldRegion
+	?tr@QContactDetailDefinitionSaveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 709 NONAME ; class QString QtMobility::QContactDetailDefinitionSaveRequest::tr(char const *, char const *, int)
+	??4QContactDetailDefinition@QtMobility@@QAEAAV01@ABV01@@Z @ 710 NONAME ; class QtMobility::QContactDetailDefinition & QtMobility::QContactDetailDefinition::operator=(class QtMobility::QContactDetailDefinition const &)
+	??_EQContactDetailDefinitionFetchRequest@QtMobility@@UAE@I@Z @ 711 NONAME ; QtMobility::QContactDetailDefinitionFetchRequest::~QContactDetailDefinitionFetchRequest(unsigned int)
+	?detail@QContact@QtMobility@@QBE?AVQContactDetail@2@ABVQString@@@Z @ 712 NONAME ; class QtMobility::QContactDetail QtMobility::QContact::detail(class QString const &) const
+	?first@QContactRelationship@QtMobility@@QBE?AVQContactId@2@XZ @ 713 NONAME ; class QtMobility::QContactId QtMobility::QContactRelationship::first(void) const
+	??1QContactRelationshipRemoveRequest@QtMobility@@UAE@XZ @ 714 NONAME ; QtMobility::QContactRelationshipRemoveRequest::~QContactRelationshipRemoveRequest(void)
+	?FieldNote@QContactNote@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 715 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactNote::FieldNote
+	??4QContactDetailFieldDefinition@QtMobility@@QAEAAV01@ABV01@@Z @ 716 NONAME ; class QtMobility::QContactDetailFieldDefinition & QtMobility::QContactDetailFieldDefinition::operator=(class QtMobility::QContactDetailFieldDefinition const &)
+	?FieldVibrationRingtoneUrl@QContactRingtone@QtMobility@@2U?$QLatin1Constant@$0BF@@2@B @ 717 NONAME ; struct QtMobility::QLatin1Constant<21> const QtMobility::QContactRingtone::FieldVibrationRingtoneUrl
+	?qt_metacall@QContactManagerEngine@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 718 NONAME ; int QtMobility::QContactManagerEngine::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?DefinitionName@QContactOrganization@QtMobility@@2U?$QLatin1Constant@$0N@@2@B @ 719 NONAME ; struct QtMobility::QLatin1Constant<13> const QtMobility::QContactOrganization::DefinitionName
+	?timestamp@QContactGlobalPresence@QtMobility@@QBE?AVQDateTime@@XZ @ 720 NONAME ; class QDateTime QtMobility::QContactGlobalPresence::timestamp(void) const
+	?DefinitionName@QContactOnlineAccount@QtMobility@@2U?$QLatin1Constant@$0O@@2@B @ 721 NONAME ; struct QtMobility::QLatin1Constant<14> const QtMobility::QContactOnlineAccount::DefinitionName
+	??0QContactDetailRangeFilter@QtMobility@@QAE@ABVQContactFilter@1@@Z @ 722 NONAME ; QtMobility::QContactDetailRangeFilter::QContactDetailRangeFilter(class QtMobility::QContactFilter const &)
+	?setPresenceStateText@QContactPresence@QtMobility@@QAEXABVQString@@@Z @ 723 NONAME ; void QtMobility::QContactPresence::setPresenceStateText(class QString const &)
+	?saveContacts@QContactManager@QtMobility@@QAE_NPAV?$QList@VQContact@QtMobility@@@@PAV?$QMap@HW4Error@QContactManager@QtMobility@@@@@Z @ 724 NONAME ; bool QtMobility::QContactManager::saveContacts(class QList<class QtMobility::QContact> *, class QMap<int, enum QtMobility::QContactManager::Error> *)
+	?hasFeature@QContactManager@QtMobility@@QBE_NW4ManagerFeature@12@ABVQString@@@Z @ 725 NONAME ; bool QtMobility::QContactManager::hasFeature(enum QtMobility::QContactManager::ManagerFeature, class QString const &) const
+	??1QContactDetailDefinitionFetchRequest@QtMobility@@UAE@XZ @ 726 NONAME ; QtMobility::QContactDetailDefinitionFetchRequest::~QContactDetailDefinitionFetchRequest(void)
+	?detailFieldName@QContactSortOrder@QtMobility@@QBE?AVQString@@XZ @ 727 NONAME ; class QString QtMobility::QContactSortOrder::detailFieldName(void) const
+	?setAssistantName@QContactOrganization@QtMobility@@QAEXABVQString@@@Z @ 728 NONAME ; void QtMobility::QContactOrganization::setAssistantName(class QString const &)
+	?staticMetaObject@QContactManagerEngine@QtMobility@@2UQMetaObject@@B @ 729 NONAME ; struct QMetaObject const QtMobility::QContactManagerEngine::staticMetaObject
+	?timestamp@QContactPresence@QtMobility@@QBE?AVQDateTime@@XZ @ 730 NONAME ; class QDateTime QtMobility::QContactPresence::timestamp(void) const
+	?FieldLatitude@QContactGeoLocation@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 731 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactGeoLocation::FieldLatitude
+	?setRange@QContactDetailRangeFilter@QtMobility@@QAEXABVQVariant@@0V?$QFlags@W4RangeFlag@QContactDetailRangeFilter@QtMobility@@@@@Z @ 732 NONAME ; void QtMobility::QContactDetailRangeFilter::setRange(class QVariant const &, class QVariant const &, class QFlags<enum QtMobility::QContactDetailRangeFilter::RangeFlag>)
+	?setMiddleName@QContactName@QtMobility@@QAEXABVQString@@@Z @ 733 NONAME ; void QtMobility::QContactName::setMiddleName(class QString const &)
+	?removeDetail@QContact@QtMobility@@QAE_NPAVQContactDetail@2@@Z @ 734 NONAME ; bool QtMobility::QContact::removeDetail(class QtMobility::QContactDetail *)
+	??0QContactIntersectionFilter@QtMobility@@QAE@XZ @ 735 NONAME ; QtMobility::QContactIntersectionFilter::QContactIntersectionFilter(void)
+	?setRelationshipTypesHint@QContactFetchHint@QtMobility@@QAEXABVQStringList@@@Z @ 736 NONAME ; void QtMobility::QContactFetchHint::setRelationshipTypesHint(class QStringList const &)
+	?setDetailDefinitionName@QContactDetailRangeFilter@QtMobility@@QAEXABVQString@@0@Z @ 737 NONAME ; void QtMobility::QContactDetailRangeFilter::setDetailDefinitionName(class QString const &, class QString const &)
+	?saveContacts@QContactManagerEngine@QtMobility@@UAE_NPAV?$QList@VQContact@QtMobility@@@@PAV?$QMap@HW4Error@QContactManager@QtMobility@@@@PAW4Error@QContactManager@2@@Z @ 738 NONAME ; bool QtMobility::QContactManagerEngine::saveContacts(class QList<class QtMobility::QContact> *, class QMap<int, enum QtMobility::QContactManager::Error> *, enum QtMobility::QContactManager::Error *)
+	?FieldCalendarId@QContactAnniversary@QtMobility@@2U?$QLatin1Constant@$0L@@2@B @ 739 NONAME ; struct QtMobility::QLatin1Constant<11> const QtMobility::QContactAnniversary::FieldCalendarId
+	?SubTypeDomestic@QContactAddress@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 740 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactAddress::SubTypeDomestic
+	?SubTypePager@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 741 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactPhoneNumber::SubTypePager
+	?setLocation@QContactOrganization@QtMobility@@QAEXABVQString@@@Z @ 742 NONAME ; void QtMobility::QContactOrganization::setLocation(class QString const &)
+	??_EQContactFetchRequest@QtMobility@@UAE@I@Z @ 743 NONAME ; QtMobility::QContactFetchRequest::~QContactFetchRequest(unsigned int)
+	?heading@QContactGeoLocation@QtMobility@@QBENXZ @ 744 NONAME ; double QtMobility::QContactGeoLocation::heading(void) const
+	??0QContactDetail@QtMobility@@IAE@ABV01@PBD@Z @ 745 NONAME ; QtMobility::QContactDetail::QContactDetail(class QtMobility::QContactDetail const &, char const *)
+	?setPresenceStateText@QContactGlobalPresence@QtMobility@@QAEXABVQString@@@Z @ 746 NONAME ; void QtMobility::QContactGlobalPresence::setPresenceStateText(class QString const &)
+	?presenceStateText@QContactPresence@QtMobility@@QBE?AVQString@@XZ @ 747 NONAME ; class QString QtMobility::QContactPresence::presenceStateText(void) const
+	?qt_metacall@QContactRemoveRequest@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 748 NONAME ; int QtMobility::QContactRemoveRequest::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?rangeFlags@QContactDetailRangeFilter@QtMobility@@QBE?AV?$QFlags@W4RangeFlag@QContactDetailRangeFilter@QtMobility@@@@XZ @ 749 NONAME ; class QFlags<enum QtMobility::QContactDetailRangeFilter::RangeFlag> QtMobility::QContactDetailRangeFilter::rangeFlags(void) const
+	?compareContact@QContactManagerEngine@QtMobility@@SAHABVQContact@2@0ABV?$QList@VQContactSortOrder@QtMobility@@@@@Z @ 750 NONAME ; int QtMobility::QContactManagerEngine::compareContact(class QtMobility::QContact const &, class QtMobility::QContact const &, class QList<class QtMobility::QContactSortOrder> const &)
+	?saveRelationship@QContactManagerEngine@QtMobility@@UAE_NPAVQContactRelationship@2@PAW4Error@QContactManager@2@@Z @ 751 NONAME ; bool QtMobility::QContactManagerEngine::saveRelationship(class QtMobility::QContactRelationship *, enum QtMobility::QContactManager::Error *)
 	?setNickname@QContactPresence@QtMobility@@QAEXABVQString@@@Z @ 752 NONAME ; void QtMobility::QContactPresence::setNickname(class QString const &)
-	?setNote@QContactNote@QtMobility@@QAEXABVQString@@@Z @ 753 NONAME ; void QtMobility::QContactNote::setNote(class QString const &)
-	?setNumber@QContactPhoneNumber@QtMobility@@QAEXABVQString@@@Z @ 754 NONAME ; void QtMobility::QContactPhoneNumber::setNumber(class QString const &)
-	?setOldAndNewSelfContactId@QContactChangeSet@QtMobility@@QAEXABU?$QPair@II@@@Z @ 755 NONAME ; void QtMobility::QContactChangeSet::setOldAndNewSelfContactId(struct QPair<unsigned int, unsigned int> const &)
-	?setOptimizationHints@QContactFetchHint@QtMobility@@QAEXV?$QFlags@W4OptimizationHint@QContactFetchHint@QtMobility@@@@@Z @ 756 NONAME ; void QtMobility::QContactFetchHint::setOptimizationHints(class QFlags<enum QtMobility::QContactFetchHint::OptimizationHint>)
-	?setOriginalDate@QContactAnniversary@QtMobility@@QAEXABVQDate@@@Z @ 757 NONAME ; void QtMobility::QContactAnniversary::setOriginalDate(class QDate const &)
-	?setPostOfficeBox@QContactAddress@QtMobility@@QAEXABVQString@@@Z @ 758 NONAME ; void QtMobility::QContactAddress::setPostOfficeBox(class QString const &)
-	?setPostcode@QContactAddress@QtMobility@@QAEXABVQString@@@Z @ 759 NONAME ; void QtMobility::QContactAddress::setPostcode(class QString const &)
-	?setPreferredDetail@QContact@QtMobility@@QAE_NABVQString@@ABVQContactDetail@2@@Z @ 760 NONAME ; bool QtMobility::QContact::setPreferredDetail(class QString const &, class QtMobility::QContactDetail const &)
-	?setPrefix@QContactName@QtMobility@@QAEXABVQString@@@Z @ 761 NONAME ; void QtMobility::QContactName::setPrefix(class QString const &)
-	?setPresenceState@QContactGlobalPresence@QtMobility@@QAEXW4PresenceState@QContactPresence@2@@Z @ 762 NONAME ; void QtMobility::QContactGlobalPresence::setPresenceState(enum QtMobility::QContactPresence::PresenceState)
-	?setPresenceState@QContactPresence@QtMobility@@QAEXW4PresenceState@12@@Z @ 763 NONAME ; void QtMobility::QContactPresence::setPresenceState(enum QtMobility::QContactPresence::PresenceState)
-	?setPresenceStateImageUrl@QContactGlobalPresence@QtMobility@@QAEXABVQUrl@@@Z @ 764 NONAME ; void QtMobility::QContactGlobalPresence::setPresenceStateImageUrl(class QUrl const &)
-	?setPresenceStateImageUrl@QContactPresence@QtMobility@@QAEXABVQUrl@@@Z @ 765 NONAME ; void QtMobility::QContactPresence::setPresenceStateImageUrl(class QUrl const &)
-	?setPresenceStateText@QContactGlobalPresence@QtMobility@@QAEXABVQString@@@Z @ 766 NONAME ; void QtMobility::QContactGlobalPresence::setPresenceStateText(class QString const &)
-	?setPresenceStateText@QContactPresence@QtMobility@@QAEXABVQString@@@Z @ 767 NONAME ; void QtMobility::QContactPresence::setPresenceStateText(class QString const &)
-	?setRange@QContactDetailRangeFilter@QtMobility@@QAEXABVQVariant@@0V?$QFlags@W4RangeFlag@QContactDetailRangeFilter@QtMobility@@@@@Z @ 768 NONAME ; void QtMobility::QContactDetailRangeFilter::setRange(class QVariant const &, class QVariant const &, class QFlags<enum QtMobility::QContactDetailRangeFilter::RangeFlag>)
-	?setRegion@QContactAddress@QtMobility@@QAEXABVQString@@@Z @ 769 NONAME ; void QtMobility::QContactAddress::setRegion(class QString const &)
-	?setRelatedContactId@QContactRelationshipFilter@QtMobility@@QAEXABVQContactId@2@@Z @ 770 NONAME ; void QtMobility::QContactRelationshipFilter::setRelatedContactId(class QtMobility::QContactId const &)
-	?setRelatedContactRole@QContactRelationshipFilter@QtMobility@@QAEXW4Role@QContactRelationship@2@@Z @ 771 NONAME ; void QtMobility::QContactRelationshipFilter::setRelatedContactRole(enum QtMobility::QContactRelationship::Role)
-	?setRelationshipType@QContactRelationship@QtMobility@@QAEXABVQString@@@Z @ 772 NONAME ; void QtMobility::QContactRelationship::setRelationshipType(class QString const &)
-	?setRelationshipType@QContactRelationshipFetchRequest@QtMobility@@QAEXABVQString@@@Z @ 773 NONAME ; void QtMobility::QContactRelationshipFetchRequest::setRelationshipType(class QString const &)
-	?setRelationshipType@QContactRelationshipFilter@QtMobility@@QAEXABVQString@@@Z @ 774 NONAME ; void QtMobility::QContactRelationshipFilter::setRelationshipType(class QString const &)
-	?setRelationshipTypesHint@QContactFetchHint@QtMobility@@QAEXABVQStringList@@@Z @ 775 NONAME ; void QtMobility::QContactFetchHint::setRelationshipTypesHint(class QStringList const &)
-	?setRelationships@QContactRelationshipRemoveRequest@QtMobility@@QAEXABV?$QList@VQContactRelationship@QtMobility@@@@@Z @ 776 NONAME ; void QtMobility::QContactRelationshipRemoveRequest::setRelationships(class QList<class QtMobility::QContactRelationship> const &)
-	?setRelationships@QContactRelationshipSaveRequest@QtMobility@@QAEXABV?$QList@VQContactRelationship@QtMobility@@@@@Z @ 777 NONAME ; void QtMobility::QContactRelationshipSaveRequest::setRelationships(class QList<class QtMobility::QContactRelationship> const &)
-	?setRole@QContactOrganization@QtMobility@@QAEXABVQString@@@Z @ 778 NONAME ; void QtMobility::QContactOrganization::setRole(class QString const &)
-	?setSecond@QContactRelationship@QtMobility@@QAEXABVQContactId@2@@Z @ 779 NONAME ; void QtMobility::QContactRelationship::setSecond(class QtMobility::QContactId const &)
-	?setSecond@QContactRelationshipFetchRequest@QtMobility@@QAEXABVQContactId@2@@Z @ 780 NONAME ; void QtMobility::QContactRelationshipFetchRequest::setSecond(class QtMobility::QContactId const &)
-	?setSelfContactId@QContactManager@QtMobility@@QAE_NABI@Z @ 781 NONAME ; bool QtMobility::QContactManager::setSelfContactId(unsigned int const &)
-	?setSelfContactId@QContactManagerEngine@QtMobility@@UAE_NABIPAW4Error@QContactManager@2@@Z @ 782 NONAME ; bool QtMobility::QContactManagerEngine::setSelfContactId(unsigned int const &, enum QtMobility::QContactManager::Error *)
-	?setServiceProvider@QContactOnlineAccount@QtMobility@@QAEXABVQString@@@Z @ 783 NONAME ; void QtMobility::QContactOnlineAccount::setServiceProvider(class QString const &)
-	?setSince@QContactChangeLogFilter@QtMobility@@QAEXABVQDateTime@@@Z @ 784 NONAME ; void QtMobility::QContactChangeLogFilter::setSince(class QDateTime const &)
-	?setSorting@QContactFetchRequest@QtMobility@@QAEXABV?$QList@VQContactSortOrder@QtMobility@@@@@Z @ 785 NONAME ; void QtMobility::QContactFetchRequest::setSorting(class QList<class QtMobility::QContactSortOrder> const &)
-	?setSorting@QContactLocalIdFetchRequest@QtMobility@@QAEXABV?$QList@VQContactSortOrder@QtMobility@@@@@Z @ 786 NONAME ; void QtMobility::QContactLocalIdFetchRequest::setSorting(class QList<class QtMobility::QContactSortOrder> const &)
-	?setSpeed@QContactGeoLocation@QtMobility@@QAEXN@Z @ 787 NONAME ; void QtMobility::QContactGeoLocation::setSpeed(double)
-	?setSpouse@QContactFamily@QtMobility@@QAEXABVQString@@@Z @ 788 NONAME ; void QtMobility::QContactFamily::setSpouse(class QString const &)
-	?setStreet@QContactAddress@QtMobility@@QAEXABVQString@@@Z @ 789 NONAME ; void QtMobility::QContactAddress::setStreet(class QString const &)
-	?setSubType@QContactAnniversary@QtMobility@@QAEXABVQString@@@Z @ 790 NONAME ; void QtMobility::QContactAnniversary::setSubType(class QString const &)
-	?setSubType@QContactUrl@QtMobility@@QAEXABVQString@@@Z @ 791 NONAME ; void QtMobility::QContactUrl::setSubType(class QString const &)
-	?setSubTypes@QContactAddress@QtMobility@@QAEXABVQString@@@Z @ 792 NONAME ; void QtMobility::QContactAddress::setSubTypes(class QString const &)
-	?setSubTypes@QContactAddress@QtMobility@@QAEXABVQStringList@@@Z @ 793 NONAME ; void QtMobility::QContactAddress::setSubTypes(class QStringList const &)
-	?setSubTypes@QContactOnlineAccount@QtMobility@@QAEXABVQString@@@Z @ 794 NONAME ; void QtMobility::QContactOnlineAccount::setSubTypes(class QString const &)
-	?setSubTypes@QContactOnlineAccount@QtMobility@@QAEXABVQStringList@@@Z @ 795 NONAME ; void QtMobility::QContactOnlineAccount::setSubTypes(class QStringList const &)
-	?setSubTypes@QContactPhoneNumber@QtMobility@@QAEXABVQString@@@Z @ 796 NONAME ; void QtMobility::QContactPhoneNumber::setSubTypes(class QString const &)
-	?setSubTypes@QContactPhoneNumber@QtMobility@@QAEXABVQStringList@@@Z @ 797 NONAME ; void QtMobility::QContactPhoneNumber::setSubTypes(class QStringList const &)
-	?setSuffix@QContactName@QtMobility@@QAEXABVQString@@@Z @ 798 NONAME ; void QtMobility::QContactName::setSuffix(class QString const &)
-	?setSyncTarget@QContactSyncTarget@QtMobility@@QAEXABVQString@@@Z @ 799 NONAME ; void QtMobility::QContactSyncTarget::setSyncTarget(class QString const &)
-	?setTag@QContactTag@QtMobility@@QAEXABVQString@@@Z @ 800 NONAME ; void QtMobility::QContactTag::setTag(class QString const &)
-	?setThumbnail@QContactThumbnail@QtMobility@@QAEXABVQImage@@@Z @ 801 NONAME ; void QtMobility::QContactThumbnail::setThumbnail(class QImage const &)
-	?setTimestamp@QContactGeoLocation@QtMobility@@QAEXABVQDateTime@@@Z @ 802 NONAME ; void QtMobility::QContactGeoLocation::setTimestamp(class QDateTime const &)
-	?setTimestamp@QContactGlobalPresence@QtMobility@@QAEXABVQDateTime@@@Z @ 803 NONAME ; void QtMobility::QContactGlobalPresence::setTimestamp(class QDateTime const &)
-	?setTimestamp@QContactPresence@QtMobility@@QAEXABVQDateTime@@@Z @ 804 NONAME ; void QtMobility::QContactPresence::setTimestamp(class QDateTime const &)
-	?setTitle@QContactOrganization@QtMobility@@QAEXABVQString@@@Z @ 805 NONAME ; void QtMobility::QContactOrganization::setTitle(class QString const &)
-	?setType@QContact@QtMobility@@QAEXABVQContactType@2@@Z @ 806 NONAME ; void QtMobility::QContact::setType(class QtMobility::QContactType const &)
-	?setType@QContact@QtMobility@@QAEXABVQString@@@Z @ 807 NONAME ; void QtMobility::QContact::setType(class QString const &)
-	?setType@QContactType@QtMobility@@QAEXABVQString@@@Z @ 808 NONAME ; void QtMobility::QContactType::setType(class QString const &)
-	?setUnique@QContactDetailDefinition@QtMobility@@QAEX_N@Z @ 809 NONAME ; void QtMobility::QContactDetailDefinition::setUnique(bool)
-	?setUrl@QContactUrl@QtMobility@@QAEXABVQString@@@Z @ 810 NONAME ; void QtMobility::QContactUrl::setUrl(class QString const &)
-	?setValue@QContactActionFilter@QtMobility@@QAEXABVQVariant@@@Z @ 811 NONAME ; void QtMobility::QContactActionFilter::setValue(class QVariant const &)
-	?setValue@QContactDetail@QtMobility@@QAE_NABVQString@@ABVQVariant@@@Z @ 812 NONAME ; bool QtMobility::QContactDetail::setValue(class QString const &, class QVariant const &)
-	?setValue@QContactDetailFilter@QtMobility@@QAEXABVQVariant@@@Z @ 813 NONAME ; void QtMobility::QContactDetailFilter::setValue(class QVariant const &)
-	?setVendor@QContactActionFilter@QtMobility@@QAEXABVQString@@H@Z @ 814 NONAME ; void QtMobility::QContactActionFilter::setVendor(class QString const &, int)
-	?setVendorName@QContactActionDescriptor@QtMobility@@QAEXABVQString@@@Z @ 815 NONAME ; void QtMobility::QContactActionDescriptor::setVendorName(class QString const &)
-	?setVibrationRingtoneUrl@QContactRingtone@QtMobility@@QAEXABVQUrl@@@Z @ 816 NONAME ; void QtMobility::QContactRingtone::setVibrationRingtoneUrl(class QUrl const &)
-	?setVideoRingtoneUrl@QContactRingtone@QtMobility@@QAEXABVQUrl@@@Z @ 817 NONAME ; void QtMobility::QContactRingtone::setVideoRingtoneUrl(class QUrl const &)
-	?setVideoUrl@QContactAvatar@QtMobility@@QAEXABVQUrl@@@Z @ 818 NONAME ; void QtMobility::QContactAvatar::setVideoUrl(class QUrl const &)
-	?since@QContactChangeLogFilter@QtMobility@@QBE?AVQDateTime@@XZ @ 819 NONAME ; class QDateTime QtMobility::QContactChangeLogFilter::since(void) const
-	?sortContacts@QContactManagerEngine@QtMobility@@SA?AV?$QList@I@@ABV?$QList@VQContact@QtMobility@@@@ABV?$QList@VQContactSortOrder@QtMobility@@@@@Z @ 820 NONAME ; class QList<unsigned int> QtMobility::QContactManagerEngine::sortContacts(class QList<class QtMobility::QContact> const &, class QList<class QtMobility::QContactSortOrder> const &)
-	?sorting@QContactFetchRequest@QtMobility@@QBE?AV?$QList@VQContactSortOrder@QtMobility@@@@XZ @ 821 NONAME ; class QList<class QtMobility::QContactSortOrder> QtMobility::QContactFetchRequest::sorting(void) const
-	?sorting@QContactLocalIdFetchRequest@QtMobility@@QBE?AV?$QList@VQContactSortOrder@QtMobility@@@@XZ @ 822 NONAME ; class QList<class QtMobility::QContactSortOrder> QtMobility::QContactLocalIdFetchRequest::sorting(void) const
-	?speed@QContactGeoLocation@QtMobility@@QBENXZ @ 823 NONAME ; double QtMobility::QContactGeoLocation::speed(void) const
-	?spouse@QContactFamily@QtMobility@@QBE?AVQString@@XZ @ 824 NONAME ; class QString QtMobility::QContactFamily::spouse(void) const
-	?start@QContactAbstractRequest@QtMobility@@QAE_NXZ @ 825 NONAME ; bool QtMobility::QContactAbstractRequest::start(void)
-	?startRequest@QContactManagerEngine@QtMobility@@UAE_NPAVQContactAbstractRequest@2@@Z @ 826 NONAME ; bool QtMobility::QContactManagerEngine::startRequest(class QtMobility::QContactAbstractRequest *)
-	?state@QContactAbstractRequest@QtMobility@@QBE?AW4State@12@XZ @ 827 NONAME ; enum QtMobility::QContactAbstractRequest::State QtMobility::QContactAbstractRequest::state(void) const
-	?stateChanged@QContactAbstractRequest@QtMobility@@IAEXW4State@12@@Z @ 828 NONAME ; void QtMobility::QContactAbstractRequest::stateChanged(enum QtMobility::QContactAbstractRequest::State)
-	?stateChanged@QContactAction@QtMobility@@IAEXW4State@12@@Z @ 829 NONAME ; void QtMobility::QContactAction::stateChanged(enum QtMobility::QContactAction::State)
-	?street@QContactAddress@QtMobility@@QBE?AVQString@@XZ @ 830 NONAME ; class QString QtMobility::QContactAddress::street(void) const
-	?subType@QContactAnniversary@QtMobility@@QBE?AVQString@@XZ @ 831 NONAME ; class QString QtMobility::QContactAnniversary::subType(void) const
-	?subType@QContactUrl@QtMobility@@QBE?AVQString@@XZ @ 832 NONAME ; class QString QtMobility::QContactUrl::subType(void) const
-	?subTypes@QContactAddress@QtMobility@@QBE?AVQStringList@@XZ @ 833 NONAME ; class QStringList QtMobility::QContactAddress::subTypes(void) const
-	?subTypes@QContactOnlineAccount@QtMobility@@QBE?AVQStringList@@XZ @ 834 NONAME ; class QStringList QtMobility::QContactOnlineAccount::subTypes(void) const
-	?subTypes@QContactPhoneNumber@QtMobility@@QBE?AVQStringList@@XZ @ 835 NONAME ; class QStringList QtMobility::QContactPhoneNumber::subTypes(void) const
-	?suffix@QContactName@QtMobility@@QBE?AVQString@@XZ @ 836 NONAME ; class QString QtMobility::QContactName::suffix(void) const
-	?supportedContactTypes@QContactManager@QtMobility@@QBE?AVQStringList@@XZ @ 837 NONAME ; class QStringList QtMobility::QContactManager::supportedContactTypes(void) const
-	?supportedContactTypes@QContactManagerEngine@QtMobility@@UBE?AVQStringList@@XZ @ 838 NONAME ; class QStringList QtMobility::QContactManagerEngine::supportedContactTypes(void) const
-	?supportedDataTypes@QContactManager@QtMobility@@QBE?AV?$QList@W4Type@QVariant@@@@XZ @ 839 NONAME ; class QList<enum QVariant::Type> QtMobility::QContactManager::supportedDataTypes(void) const
-	?supportedDataTypes@QContactManagerEngine@QtMobility@@UBE?AV?$QList@W4Type@QVariant@@@@XZ @ 840 NONAME ; class QList<enum QVariant::Type> QtMobility::QContactManagerEngine::supportedDataTypes(void) const
-	?supportedDetails@QContactAction@QtMobility@@UBE?AV?$QList@VQContactDetail@QtMobility@@@@ABVQContact@2@@Z @ 841 NONAME ; class QList<class QtMobility::QContactDetail> QtMobility::QContactAction::supportedDetails(class QtMobility::QContact const &) const
-	?supportedImplementationVersions@QContactManagerEngineFactory@QtMobility@@UBE?AV?$QList@H@@XZ @ 842 NONAME ; class QList<int> QtMobility::QContactManagerEngineFactory::supportedImplementationVersions(void) const
-	?syncTarget@QContactSyncTarget@QtMobility@@QBE?AVQString@@XZ @ 843 NONAME ; class QString QtMobility::QContactSyncTarget::syncTarget(void) const
-	?synthesizedDisplayLabel@QContactManager@QtMobility@@QBE?AVQString@@ABVQContact@2@@Z @ 844 NONAME ; class QString QtMobility::QContactManager::synthesizedDisplayLabel(class QtMobility::QContact const &) const
-	?synthesizedDisplayLabel@QContactManagerEngine@QtMobility@@UBE?AVQString@@ABVQContact@2@PAW4Error@QContactManager@2@@Z @ 845 NONAME ; class QString QtMobility::QContactManagerEngine::synthesizedDisplayLabel(class QtMobility::QContact const &, enum QtMobility::QContactManager::Error *) const
-	?tag@QContactTag@QtMobility@@QBE?AVQString@@XZ @ 846 NONAME ; class QString QtMobility::QContactTag::tag(void) const
-	?testFilter@QContactManagerEngine@QtMobility@@SA_NABVQContactFilter@2@ABVQContact@2@@Z @ 847 NONAME ; bool QtMobility::QContactManagerEngine::testFilter(class QtMobility::QContactFilter const &, class QtMobility::QContact const &)
-	?thumbnail@QContactThumbnail@QtMobility@@QBE?AVQImage@@XZ @ 848 NONAME ; class QImage QtMobility::QContactThumbnail::thumbnail(void) const
-	?timestamp@QContactGeoLocation@QtMobility@@QBE?AVQDateTime@@XZ @ 849 NONAME ; class QDateTime QtMobility::QContactGeoLocation::timestamp(void) const
-	?timestamp@QContactGlobalPresence@QtMobility@@QBE?AVQDateTime@@XZ @ 850 NONAME ; class QDateTime QtMobility::QContactGlobalPresence::timestamp(void) const
-	?timestamp@QContactPresence@QtMobility@@QBE?AVQDateTime@@XZ @ 851 NONAME ; class QDateTime QtMobility::QContactPresence::timestamp(void) const
-	?title@QContactOrganization@QtMobility@@QBE?AVQString@@XZ @ 852 NONAME ; class QString QtMobility::QContactOrganization::title(void) const
-	?tr@QContactAbstractRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 853 NONAME ; class QString QtMobility::QContactAbstractRequest::tr(char const *, char const *)
-	?tr@QContactAbstractRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 854 NONAME ; class QString QtMobility::QContactAbstractRequest::tr(char const *, char const *, int)
-	?tr@QContactAction@QtMobility@@SA?AVQString@@PBD0@Z @ 855 NONAME ; class QString QtMobility::QContactAction::tr(char const *, char const *)
-	?tr@QContactAction@QtMobility@@SA?AVQString@@PBD0H@Z @ 856 NONAME ; class QString QtMobility::QContactAction::tr(char const *, char const *, int)
-	?tr@QContactActionFactory@QtMobility@@SA?AVQString@@PBD0@Z @ 857 NONAME ; class QString QtMobility::QContactActionFactory::tr(char const *, char const *)
-	?tr@QContactActionFactory@QtMobility@@SA?AVQString@@PBD0H@Z @ 858 NONAME ; class QString QtMobility::QContactActionFactory::tr(char const *, char const *, int)
-	?tr@QContactDetailDefinitionFetchRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 859 NONAME ; class QString QtMobility::QContactDetailDefinitionFetchRequest::tr(char const *, char const *)
-	?tr@QContactDetailDefinitionFetchRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 860 NONAME ; class QString QtMobility::QContactDetailDefinitionFetchRequest::tr(char const *, char const *, int)
-	?tr@QContactDetailDefinitionRemoveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 861 NONAME ; class QString QtMobility::QContactDetailDefinitionRemoveRequest::tr(char const *, char const *)
-	?tr@QContactDetailDefinitionRemoveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 862 NONAME ; class QString QtMobility::QContactDetailDefinitionRemoveRequest::tr(char const *, char const *, int)
-	?tr@QContactDetailDefinitionSaveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 863 NONAME ; class QString QtMobility::QContactDetailDefinitionSaveRequest::tr(char const *, char const *)
-	?tr@QContactDetailDefinitionSaveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 864 NONAME ; class QString QtMobility::QContactDetailDefinitionSaveRequest::tr(char const *, char const *, int)
-	?tr@QContactFetchRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 865 NONAME ; class QString QtMobility::QContactFetchRequest::tr(char const *, char const *)
-	?tr@QContactFetchRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 866 NONAME ; class QString QtMobility::QContactFetchRequest::tr(char const *, char const *, int)
-	?tr@QContactLocalIdFetchRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 867 NONAME ; class QString QtMobility::QContactLocalIdFetchRequest::tr(char const *, char const *)
-	?tr@QContactLocalIdFetchRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 868 NONAME ; class QString QtMobility::QContactLocalIdFetchRequest::tr(char const *, char const *, int)
-	?tr@QContactManager@QtMobility@@SA?AVQString@@PBD0@Z @ 869 NONAME ; class QString QtMobility::QContactManager::tr(char const *, char const *)
-	?tr@QContactManager@QtMobility@@SA?AVQString@@PBD0H@Z @ 870 NONAME ; class QString QtMobility::QContactManager::tr(char const *, char const *, int)
-	?tr@QContactManagerEngine@QtMobility@@SA?AVQString@@PBD0@Z @ 871 NONAME ; class QString QtMobility::QContactManagerEngine::tr(char const *, char const *)
-	?tr@QContactManagerEngine@QtMobility@@SA?AVQString@@PBD0H@Z @ 872 NONAME ; class QString QtMobility::QContactManagerEngine::tr(char const *, char const *, int)
-	?tr@QContactRelationshipFetchRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 873 NONAME ; class QString QtMobility::QContactRelationshipFetchRequest::tr(char const *, char const *)
-	?tr@QContactRelationshipFetchRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 874 NONAME ; class QString QtMobility::QContactRelationshipFetchRequest::tr(char const *, char const *, int)
-	?tr@QContactRelationshipRemoveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 875 NONAME ; class QString QtMobility::QContactRelationshipRemoveRequest::tr(char const *, char const *)
-	?tr@QContactRelationshipRemoveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 876 NONAME ; class QString QtMobility::QContactRelationshipRemoveRequest::tr(char const *, char const *, int)
-	?tr@QContactRelationshipSaveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 877 NONAME ; class QString QtMobility::QContactRelationshipSaveRequest::tr(char const *, char const *)
-	?tr@QContactRelationshipSaveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 878 NONAME ; class QString QtMobility::QContactRelationshipSaveRequest::tr(char const *, char const *, int)
-	?tr@QContactRemoveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 879 NONAME ; class QString QtMobility::QContactRemoveRequest::tr(char const *, char const *)
-	?tr@QContactRemoveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 880 NONAME ; class QString QtMobility::QContactRemoveRequest::tr(char const *, char const *, int)
-	?tr@QContactSaveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 881 NONAME ; class QString QtMobility::QContactSaveRequest::tr(char const *, char const *)
-	?tr@QContactSaveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 882 NONAME ; class QString QtMobility::QContactSaveRequest::tr(char const *, char const *, int)
-	?trUtf8@QContactAbstractRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 883 NONAME ; class QString QtMobility::QContactAbstractRequest::trUtf8(char const *, char const *)
-	?trUtf8@QContactAbstractRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 884 NONAME ; class QString QtMobility::QContactAbstractRequest::trUtf8(char const *, char const *, int)
-	?trUtf8@QContactAction@QtMobility@@SA?AVQString@@PBD0@Z @ 885 NONAME ; class QString QtMobility::QContactAction::trUtf8(char const *, char const *)
-	?trUtf8@QContactAction@QtMobility@@SA?AVQString@@PBD0H@Z @ 886 NONAME ; class QString QtMobility::QContactAction::trUtf8(char const *, char const *, int)
-	?trUtf8@QContactActionFactory@QtMobility@@SA?AVQString@@PBD0@Z @ 887 NONAME ; class QString QtMobility::QContactActionFactory::trUtf8(char const *, char const *)
-	?trUtf8@QContactActionFactory@QtMobility@@SA?AVQString@@PBD0H@Z @ 888 NONAME ; class QString QtMobility::QContactActionFactory::trUtf8(char const *, char const *, int)
-	?trUtf8@QContactDetailDefinitionFetchRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 889 NONAME ; class QString QtMobility::QContactDetailDefinitionFetchRequest::trUtf8(char const *, char const *)
-	?trUtf8@QContactDetailDefinitionFetchRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 890 NONAME ; class QString QtMobility::QContactDetailDefinitionFetchRequest::trUtf8(char const *, char const *, int)
-	?trUtf8@QContactDetailDefinitionRemoveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 891 NONAME ; class QString QtMobility::QContactDetailDefinitionRemoveRequest::trUtf8(char const *, char const *)
-	?trUtf8@QContactDetailDefinitionRemoveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 892 NONAME ; class QString QtMobility::QContactDetailDefinitionRemoveRequest::trUtf8(char const *, char const *, int)
-	?trUtf8@QContactDetailDefinitionSaveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 893 NONAME ; class QString QtMobility::QContactDetailDefinitionSaveRequest::trUtf8(char const *, char const *)
-	?trUtf8@QContactDetailDefinitionSaveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 894 NONAME ; class QString QtMobility::QContactDetailDefinitionSaveRequest::trUtf8(char const *, char const *, int)
-	?trUtf8@QContactFetchRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 895 NONAME ; class QString QtMobility::QContactFetchRequest::trUtf8(char const *, char const *)
-	?trUtf8@QContactFetchRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 896 NONAME ; class QString QtMobility::QContactFetchRequest::trUtf8(char const *, char const *, int)
-	?trUtf8@QContactLocalIdFetchRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 897 NONAME ; class QString QtMobility::QContactLocalIdFetchRequest::trUtf8(char const *, char const *)
-	?trUtf8@QContactLocalIdFetchRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 898 NONAME ; class QString QtMobility::QContactLocalIdFetchRequest::trUtf8(char const *, char const *, int)
-	?trUtf8@QContactManager@QtMobility@@SA?AVQString@@PBD0@Z @ 899 NONAME ; class QString QtMobility::QContactManager::trUtf8(char const *, char const *)
-	?trUtf8@QContactManager@QtMobility@@SA?AVQString@@PBD0H@Z @ 900 NONAME ; class QString QtMobility::QContactManager::trUtf8(char const *, char const *, int)
-	?trUtf8@QContactManagerEngine@QtMobility@@SA?AVQString@@PBD0@Z @ 901 NONAME ; class QString QtMobility::QContactManagerEngine::trUtf8(char const *, char const *)
-	?trUtf8@QContactManagerEngine@QtMobility@@SA?AVQString@@PBD0H@Z @ 902 NONAME ; class QString QtMobility::QContactManagerEngine::trUtf8(char const *, char const *, int)
-	?trUtf8@QContactRelationshipFetchRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 903 NONAME ; class QString QtMobility::QContactRelationshipFetchRequest::trUtf8(char const *, char const *)
-	?trUtf8@QContactRelationshipFetchRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 904 NONAME ; class QString QtMobility::QContactRelationshipFetchRequest::trUtf8(char const *, char const *, int)
-	?trUtf8@QContactRelationshipRemoveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 905 NONAME ; class QString QtMobility::QContactRelationshipRemoveRequest::trUtf8(char const *, char const *)
-	?trUtf8@QContactRelationshipRemoveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 906 NONAME ; class QString QtMobility::QContactRelationshipRemoveRequest::trUtf8(char const *, char const *, int)
-	?trUtf8@QContactRelationshipSaveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 907 NONAME ; class QString QtMobility::QContactRelationshipSaveRequest::trUtf8(char const *, char const *)
-	?trUtf8@QContactRelationshipSaveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 908 NONAME ; class QString QtMobility::QContactRelationshipSaveRequest::trUtf8(char const *, char const *, int)
-	?trUtf8@QContactRemoveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 909 NONAME ; class QString QtMobility::QContactRemoveRequest::trUtf8(char const *, char const *)
-	?trUtf8@QContactRemoveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 910 NONAME ; class QString QtMobility::QContactRemoveRequest::trUtf8(char const *, char const *, int)
-	?trUtf8@QContactSaveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 911 NONAME ; class QString QtMobility::QContactSaveRequest::trUtf8(char const *, char const *)
-	?trUtf8@QContactSaveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 912 NONAME ; class QString QtMobility::QContactSaveRequest::trUtf8(char const *, char const *, int)
-	?type@QContact@QtMobility@@QBE?AVQString@@XZ @ 913 NONAME ; class QString QtMobility::QContact::type(void) const
-	?type@QContactAbstractRequest@QtMobility@@QBE?AW4RequestType@12@XZ @ 914 NONAME ; enum QtMobility::QContactAbstractRequest::RequestType QtMobility::QContactAbstractRequest::type(void) const
-	?type@QContactFilter@QtMobility@@QBE?AW4FilterType@12@XZ @ 915 NONAME ; enum QtMobility::QContactFilter::FilterType QtMobility::QContactFilter::type(void) const
-	?type@QContactType@QtMobility@@QBE?AVQString@@XZ @ 916 NONAME ; class QString QtMobility::QContactType::type(void) const
-	?updateContactFetchRequest@QContactManagerEngine@QtMobility@@SAXPAVQContactFetchRequest@2@ABV?$QList@VQContact@QtMobility@@@@W4Error@QContactManager@2@W4State@QContactAbstractRequest@2@@Z @ 917 NONAME ; void QtMobility::QContactManagerEngine::updateContactFetchRequest(class QtMobility::QContactFetchRequest *, class QList<class QtMobility::QContact> const &, enum QtMobility::QContactManager::Error, enum QtMobility::QContactAbstractRequest::State)
-	?updateContactLocalIdFetchRequest@QContactManagerEngine@QtMobility@@SAXPAVQContactLocalIdFetchRequest@2@ABV?$QList@I@@W4Error@QContactManager@2@W4State@QContactAbstractRequest@2@@Z @ 918 NONAME ; void QtMobility::QContactManagerEngine::updateContactLocalIdFetchRequest(class QtMobility::QContactLocalIdFetchRequest *, class QList<unsigned int> const &, enum QtMobility::QContactManager::Error, enum QtMobility::QContactAbstractRequest::State)
-	?updateContactRemoveRequest@QContactManagerEngine@QtMobility@@SAXPAVQContactRemoveRequest@2@W4Error@QContactManager@2@ABV?$QMap@HW4Error@QContactManager@QtMobility@@@@W4State@QContactAbstractRequest@2@@Z @ 919 NONAME ; void QtMobility::QContactManagerEngine::updateContactRemoveRequest(class QtMobility::QContactRemoveRequest *, enum QtMobility::QContactManager::Error, class QMap<int, enum QtMobility::QContactManager::Error> const &, enum QtMobility::QContactAbstractRequest::State)
-	?updateContactSaveRequest@QContactManagerEngine@QtMobility@@SAXPAVQContactSaveRequest@2@ABV?$QList@VQContact@QtMobility@@@@W4Error@QContactManager@2@ABV?$QMap@HW4Error@QContactManager@QtMobility@@@@W4State@QContactAbstractRequest@2@@Z @ 920 NONAME ; void QtMobility::QContactManagerEngine::updateContactSaveRequest(class QtMobility::QContactSaveRequest *, class QList<class QtMobility::QContact> const &, enum QtMobility::QContactManager::Error, class QMap<int, enum QtMobility::QContactManager::Error> const &, enum QtMobility::QContactAbstractRequest::State)
-	?updateDefinitionFetchRequest@QContactManagerEngine@QtMobility@@SAXPAVQContactDetailDefinitionFetchRequest@2@ABV?$QMap@VQString@@VQContactDetailDefinition@QtMobility@@@@W4Error@QContactManager@2@ABV?$QMap@HW4Error@QContactManager@QtMobility@@@@W4State@QContactAbstractRequest@2@@Z @ 921 NONAME ; void QtMobility::QContactManagerEngine::updateDefinitionFetchRequest(class QtMobility::QContactDetailDefinitionFetchRequest *, class QMap<class QString, class QtMobility::QContactDetailDefinition> const &, enum QtMobility::QContactManager::Error, class QMap<int, enum QtMobility::QContactManager::Error> const &, enum QtMobility::QContactAbstractRequest::State)
-	?updateDefinitionRemoveRequest@QContactManagerEngine@QtMobility@@SAXPAVQContactDetailDefinitionRemoveRequest@2@W4Error@QContactManager@2@ABV?$QMap@HW4Error@QContactManager@QtMobility@@@@W4State@QContactAbstractRequest@2@@Z @ 922 NONAME ; void QtMobility::QContactManagerEngine::updateDefinitionRemoveRequest(class QtMobility::QContactDetailDefinitionRemoveRequest *, enum QtMobility::QContactManager::Error, class QMap<int, enum QtMobility::QContactManager::Error> const &, enum QtMobility::QContactAbstractRequest::State)
-	?updateDefinitionSaveRequest@QContactManagerEngine@QtMobility@@SAXPAVQContactDetailDefinitionSaveRequest@2@ABV?$QList@VQContactDetailDefinition@QtMobility@@@@W4Error@QContactManager@2@ABV?$QMap@HW4Error@QContactManager@QtMobility@@@@W4State@QContactAbstractRequest@2@@Z @ 923 NONAME ; void QtMobility::QContactManagerEngine::updateDefinitionSaveRequest(class QtMobility::QContactDetailDefinitionSaveRequest *, class QList<class QtMobility::QContactDetailDefinition> const &, enum QtMobility::QContactManager::Error, class QMap<int, enum QtMobility::QContactManager::Error> const &, enum QtMobility::QContactAbstractRequest::State)
-	?updateRelationshipFetchRequest@QContactManagerEngine@QtMobility@@SAXPAVQContactRelationshipFetchRequest@2@ABV?$QList@VQContactRelationship@QtMobility@@@@W4Error@QContactManager@2@W4State@QContactAbstractRequest@2@@Z @ 924 NONAME ; void QtMobility::QContactManagerEngine::updateRelationshipFetchRequest(class QtMobility::QContactRelationshipFetchRequest *, class QList<class QtMobility::QContactRelationship> const &, enum QtMobility::QContactManager::Error, enum QtMobility::QContactAbstractRequest::State)
-	?updateRelationshipRemoveRequest@QContactManagerEngine@QtMobility@@SAXPAVQContactRelationshipRemoveRequest@2@W4Error@QContactManager@2@ABV?$QMap@HW4Error@QContactManager@QtMobility@@@@W4State@QContactAbstractRequest@2@@Z @ 925 NONAME ; void QtMobility::QContactManagerEngine::updateRelationshipRemoveRequest(class QtMobility::QContactRelationshipRemoveRequest *, enum QtMobility::QContactManager::Error, class QMap<int, enum QtMobility::QContactManager::Error> const &, enum QtMobility::QContactAbstractRequest::State)
-	?updateRelationshipSaveRequest@QContactManagerEngine@QtMobility@@SAXPAVQContactRelationshipSaveRequest@2@ABV?$QList@VQContactRelationship@QtMobility@@@@W4Error@QContactManager@2@ABV?$QMap@HW4Error@QContactManager@QtMobility@@@@W4State@QContactAbstractRequest@2@@Z @ 926 NONAME ; void QtMobility::QContactManagerEngine::updateRelationshipSaveRequest(class QtMobility::QContactRelationshipSaveRequest *, class QList<class QtMobility::QContactRelationship> const &, enum QtMobility::QContactManager::Error, class QMap<int, enum QtMobility::QContactManager::Error> const &, enum QtMobility::QContactAbstractRequest::State)
-	?updateRequestState@QContactManagerEngine@QtMobility@@SAXPAVQContactAbstractRequest@2@W4State@32@@Z @ 927 NONAME ; void QtMobility::QContactManagerEngine::updateRequestState(class QtMobility::QContactAbstractRequest *, enum QtMobility::QContactAbstractRequest::State)
-	?url@QContactUrl@QtMobility@@QBE?AVQString@@XZ @ 928 NONAME ; class QString QtMobility::QContactUrl::url(void) const
-	?validateActionFilter@QContactManagerEngine@QtMobility@@SA_NABVQContactFilter@2@@Z @ 929 NONAME ; bool QtMobility::QContactManagerEngine::validateActionFilter(class QtMobility::QContactFilter const &)
-	?validateContact@QContactManagerEngine@QtMobility@@UBE_NABVQContact@2@PAW4Error@QContactManager@2@@Z @ 930 NONAME ; bool QtMobility::QContactManagerEngine::validateContact(class QtMobility::QContact const &, enum QtMobility::QContactManager::Error *) const
-	?validateDefinition@QContactManagerEngine@QtMobility@@UBE_NABVQContactDetailDefinition@2@PAW4Error@QContactManager@2@@Z @ 931 NONAME ; bool QtMobility::QContactManagerEngine::validateDefinition(class QtMobility::QContactDetailDefinition const &, enum QtMobility::QContactManager::Error *) const
-	?value@QContactActionFilter@QtMobility@@QBE?AVQVariant@@XZ @ 932 NONAME ; class QVariant QtMobility::QContactActionFilter::value(void) const
-	?value@QContactDetail@QtMobility@@QBE?AVQString@@ABV3@@Z @ 933 NONAME ; class QString QtMobility::QContactDetail::value(class QString const &) const
-	?value@QContactDetailFilter@QtMobility@@QBE?AVQVariant@@XZ @ 934 NONAME ; class QVariant QtMobility::QContactDetailFilter::value(void) const
-	?variantValue@QContactDetail@QtMobility@@QBE?AVQVariant@@ABVQString@@@Z @ 935 NONAME ; class QVariant QtMobility::QContactDetail::variantValue(class QString const &) const
-	?variantValues@QContactDetail@QtMobility@@QBE?AV?$QMap@VQString@@VQVariant@@@@XZ @ 936 NONAME ; class QMap<class QString, class QVariant> QtMobility::QContactDetail::variantValues(void) const
-	?vendorName@QContactActionDescriptor@QtMobility@@QBE?AVQString@@XZ @ 937 NONAME ; class QString QtMobility::QContactActionDescriptor::vendorName(void) const
-	?vendorName@QContactActionFilter@QtMobility@@QBE?AVQString@@XZ @ 938 NONAME ; class QString QtMobility::QContactActionFilter::vendorName(void) const
-	?vibrationRingtoneUrl@QContactRingtone@QtMobility@@QBE?AVQUrl@@XZ @ 939 NONAME ; class QUrl QtMobility::QContactRingtone::vibrationRingtoneUrl(void) const
-	?videoRingtoneUrl@QContactRingtone@QtMobility@@QBE?AVQUrl@@XZ @ 940 NONAME ; class QUrl QtMobility::QContactRingtone::videoRingtoneUrl(void) const
-	?videoUrl@QContactAvatar@QtMobility@@QBE?AVQUrl@@XZ @ 941 NONAME ; class QUrl QtMobility::QContactAvatar::videoUrl(void) const
-	?waitForFinished@QContactAbstractRequest@QtMobility@@QAE_NH@Z @ 942 NONAME ; bool QtMobility::QContactAbstractRequest::waitForFinished(int)
-	?waitForRequestFinished@QContactManagerEngine@QtMobility@@UAE_NPAVQContactAbstractRequest@2@H@Z @ 943 NONAME ; bool QtMobility::QContactManagerEngine::waitForRequestFinished(class QtMobility::QContactAbstractRequest *, int)
-	?SubTypeImpp@QContactOnlineAccount@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 944 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactOnlineAccount::SubTypeImpp
-	?DefinitionName@QContactSyncTarget@QtMobility@@2U?$QLatin1Constant@$0L@@2@B @ 945 NONAME ; struct QtMobility::QLatin1Constant<11> const QtMobility::QContactSyncTarget::DefinitionName
-	?GenderFemale@QContactGender@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 946 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactGender::GenderFemale
-	?SubTypeVideoShare@QContactOnlineAccount@QtMobility@@2U?$QLatin1Constant@$0L@@2@B @ 947 NONAME ; struct QtMobility::QLatin1Constant<11> const QtMobility::QContactOnlineAccount::SubTypeVideoShare
-	?SubTypeMemorial@QContactAnniversary@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 948 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactAnniversary::SubTypeMemorial
-	?DefinitionName@QContactGeoLocation@QtMobility@@2U?$QLatin1Constant@$0M@@2@B @ 949 NONAME ; struct QtMobility::QLatin1Constant<12> const QtMobility::QContactGeoLocation::DefinitionName
-	?DefinitionName@QContactAddress@QtMobility@@2U?$QLatin1Constant@$07@2@B @ 950 NONAME ; struct QtMobility::QLatin1Constant<8> const QtMobility::QContactAddress::DefinitionName
-	?FieldDepartment@QContactOrganization@QtMobility@@2U?$QLatin1Constant@$0L@@2@B @ 951 NONAME ; struct QtMobility::QLatin1Constant<11> const QtMobility::QContactOrganization::FieldDepartment
-	?FieldNote@QContactNote@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 952 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactNote::FieldNote
-	?FieldNickname@QContactGlobalPresence@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 953 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactGlobalPresence::FieldNickname
-	?DefinitionName@QContactUrl@QtMobility@@2U?$QLatin1Constant@$03@2@B @ 954 NONAME ; struct QtMobility::QLatin1Constant<4> const QtMobility::QContactUrl::DefinitionName
-	?SubTypeEmployment@QContactAnniversary@QtMobility@@2U?$QLatin1Constant@$0L@@2@B @ 955 NONAME ; struct QtMobility::QLatin1Constant<11> const QtMobility::QContactAnniversary::SubTypeEmployment
-	?SubTypeLandline@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 956 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactPhoneNumber::SubTypeLandline
-	?HasManager@QContactRelationship@QtMobility@@2U?$QLatin1Constant@$0L@@2@B @ 957 NONAME ; struct QtMobility::QLatin1Constant<11> const QtMobility::QContactRelationship::HasManager
-	?FieldDetailUri@QContactDetail@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 958 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactDetail::FieldDetailUri
-	?ContextOther@QContactDetail@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 959 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactDetail::ContextOther
-	?FieldOriginalDate@QContactAnniversary@QtMobility@@2U?$QLatin1Constant@$0N@@2@B @ 960 NONAME ; struct QtMobility::QLatin1Constant<13> const QtMobility::QContactAnniversary::FieldOriginalDate
-	?DefinitionName@QContactType@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 961 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactType::DefinitionName
-	?FieldNumber@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$0M@@2@B @ 962 NONAME ; struct QtMobility::QLatin1Constant<12> const QtMobility::QContactPhoneNumber::FieldNumber
-	?FieldPresenceStateText@QContactPresence@QtMobility@@2U?$QLatin1Constant@$0BC@@2@B @ 963 NONAME ; struct QtMobility::QLatin1Constant<18> const QtMobility::QContactPresence::FieldPresenceStateText
-	?SubTypeHouse@QContactAnniversary@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 964 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactAnniversary::SubTypeHouse
-	?SubTypeHomePage@QContactUrl@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 965 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactUrl::SubTypeHomePage
-	?FieldGuid@QContactGuid@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 966 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactGuid::FieldGuid
-	?staticMetaObject@QContactRelationshipSaveRequest@QtMobility@@2UQMetaObject@@B @ 967 NONAME ; struct QMetaObject const QtMobility::QContactRelationshipSaveRequest::staticMetaObject
-	?TypeGroup@QContactType@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 968 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactType::TypeGroup
-	?DefinitionName@QContactGlobalPresence@QtMobility@@2U?$QLatin1Constant@$0P@@2@B @ 969 NONAME ; struct QtMobility::QLatin1Constant<15> const QtMobility::QContactGlobalPresence::DefinitionName
-	?SubTypeDtmfMenu@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 970 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactPhoneNumber::SubTypeDtmfMenu
-	?FieldThumbnail@QContactThumbnail@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 971 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactThumbnail::FieldThumbnail
-	?staticMetaObject@QContactDetailDefinitionFetchRequest@QtMobility@@2UQMetaObject@@B @ 972 NONAME ; struct QMetaObject const QtMobility::QContactDetailDefinitionFetchRequest::staticMetaObject
-	?FieldLocation@QContactOrganization@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 973 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactOrganization::FieldLocation
-	?FieldPrefix@QContactName@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 974 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactName::FieldPrefix
-	?HasSpouse@QContactRelationship@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 975 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactRelationship::HasSpouse
-	?DefinitionName@QContactOrganization@QtMobility@@2U?$QLatin1Constant@$0N@@2@B @ 976 NONAME ; struct QtMobility::QLatin1Constant<13> const QtMobility::QContactOrganization::DefinitionName
-	?FieldAccountUri@QContactOnlineAccount@QtMobility@@2U?$QLatin1Constant@$0L@@2@B @ 977 NONAME ; struct QtMobility::QLatin1Constant<11> const QtMobility::QContactOnlineAccount::FieldAccountUri
-	?FieldPresenceStateImageUrl@QContactPresence@QtMobility@@2U?$QLatin1Constant@$0BG@@2@B @ 978 NONAME ; struct QtMobility::QLatin1Constant<22> const QtMobility::QContactPresence::FieldPresenceStateImageUrl
-	?FieldPresenceState@QContactPresence@QtMobility@@2U?$QLatin1Constant@$0O@@2@B @ 979 NONAME ; struct QtMobility::QLatin1Constant<14> const QtMobility::QContactPresence::FieldPresenceState
-	?SubTypeMessagingCapable@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$0BB@@2@B @ 980 NONAME ; struct QtMobility::QLatin1Constant<17> const QtMobility::QContactPhoneNumber::SubTypeMessagingCapable
-	?FieldSubTypes@QContactAddress@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 981 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactAddress::FieldSubTypes
-	?DefinitionName@QContactFamily@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 982 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactFamily::DefinitionName
-	?SubTypeCar@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$03@2@B @ 983 NONAME ; struct QtMobility::QLatin1Constant<4> const QtMobility::QContactPhoneNumber::SubTypeCar
-	?ContextWork@QContactDetail@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 984 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactDetail::ContextWork
-	?SubTypePager@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 985 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactPhoneNumber::SubTypePager
-	?FieldCountry@QContactAddress@QtMobility@@2U?$QLatin1Constant@$07@2@B @ 986 NONAME ; struct QtMobility::QLatin1Constant<8> const QtMobility::QContactAddress::FieldCountry
-	?FieldSuffix@QContactName@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 987 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactName::FieldSuffix
-	?FieldChildren@QContactFamily@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 988 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactFamily::FieldChildren
-	?DefinitionName@QContactNote@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 989 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactNote::DefinitionName
-	?staticMetaObject@QContactDetailDefinitionSaveRequest@QtMobility@@2UQMetaObject@@B @ 990 NONAME ; struct QMetaObject const QtMobility::QContactDetailDefinitionSaveRequest::staticMetaObject
-	?GenderUnspecified@QContactGender@QtMobility@@2U?$QLatin1Constant@$0M@@2@B @ 991 NONAME ; struct QtMobility::QLatin1Constant<12> const QtMobility::QContactGender::GenderUnspecified
-	?FieldSpouse@QContactFamily@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 992 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactFamily::FieldSpouse
-	?FieldSubTypes@QContactOnlineAccount@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 993 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactOnlineAccount::FieldSubTypes
-	?FieldAccuracy@QContactGeoLocation@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 994 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactGeoLocation::FieldAccuracy
-	?HasAssistant@QContactRelationship@QtMobility@@2U?$QLatin1Constant@$0N@@2@B @ 995 NONAME ; struct QtMobility::QLatin1Constant<13> const QtMobility::QContactRelationship::HasAssistant
-	?FieldLabel@QContactDisplayLabel@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 996 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactDisplayLabel::FieldLabel
-	?SubTypeWedding@QContactAnniversary@QtMobility@@2U?$QLatin1Constant@$07@2@B @ 997 NONAME ; struct QtMobility::QLatin1Constant<8> const QtMobility::QContactAnniversary::SubTypeWedding
-	?FieldVideoUrl@QContactAvatar@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 998 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactAvatar::FieldVideoUrl
-	?SubTypeParcel@QContactAddress@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 999 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactAddress::SubTypeParcel
-	?TypeContact@QContactType@QtMobility@@2U?$QLatin1Constant@$07@2@B @ 1000 NONAME ; struct QtMobility::QLatin1Constant<8> const QtMobility::QContactType::TypeContact
-	?staticMetaObject@QContactRelationshipRemoveRequest@QtMobility@@2UQMetaObject@@B @ 1001 NONAME ; struct QMetaObject const QtMobility::QContactRelationshipRemoveRequest::staticMetaObject
-	?FieldSpeed@QContactGeoLocation@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 1002 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactGeoLocation::FieldSpeed
-	?SubTypeModem@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 1003 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactPhoneNumber::SubTypeModem
-	?DefinitionName@QContactEmailAddress@QtMobility@@2U?$QLatin1Constant@$0N@@2@B @ 1004 NONAME ; struct QtMobility::QLatin1Constant<13> const QtMobility::QContactEmailAddress::DefinitionName
-	?DefinitionName@QContactRingtone@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 1005 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactRingtone::DefinitionName
-	?DefinitionName@QContactPresence@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 1006 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactPresence::DefinitionName
-	?FieldEmailAddress@QContactEmailAddress@QtMobility@@2U?$QLatin1Constant@$0N@@2@B @ 1007 NONAME ; struct QtMobility::QLatin1Constant<13> const QtMobility::QContactEmailAddress::FieldEmailAddress
-	?SubTypeMobile@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 1008 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactPhoneNumber::SubTypeMobile
-	?IsSameAs@QContactRelationship@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 1009 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactRelationship::IsSameAs
-	?FieldUrl@QContactUrl@QtMobility@@2U?$QLatin1Constant@$03@2@B @ 1010 NONAME ; struct QtMobility::QLatin1Constant<4> const QtMobility::QContactUrl::FieldUrl
-	?SubTypeAssistant@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 1011 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactPhoneNumber::SubTypeAssistant
-	?FieldFirstName@QContactName@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 1012 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactName::FieldFirstName
-	?staticMetaObject@QContactRemoveRequest@QtMobility@@2UQMetaObject@@B @ 1013 NONAME ; struct QMetaObject const QtMobility::QContactRemoveRequest::staticMetaObject
-	?Aggregates@QContactRelationship@QtMobility@@2U?$QLatin1Constant@$0L@@2@B @ 1014 NONAME ; struct QtMobility::QLatin1Constant<11> const QtMobility::QContactRelationship::Aggregates
-	?FieldAltitude@QContactGeoLocation@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 1015 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactGeoLocation::FieldAltitude
-	?FieldServiceProvider@QContactOnlineAccount@QtMobility@@2U?$QLatin1Constant@$0BA@@2@B @ 1016 NONAME ; struct QtMobility::QLatin1Constant<16> const QtMobility::QContactOnlineAccount::FieldServiceProvider
-	?GenderMale@QContactGender@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 1017 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactGender::GenderMale
-	?FieldPresenceState@QContactGlobalPresence@QtMobility@@2U?$QLatin1Constant@$0O@@2@B @ 1018 NONAME ; struct QtMobility::QLatin1Constant<14> const QtMobility::QContactGlobalPresence::FieldPresenceState
-	?DefinitionName@QContactNickname@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 1019 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactNickname::DefinitionName
-	?FieldHeading@QContactGeoLocation@QtMobility@@2U?$QLatin1Constant@$07@2@B @ 1020 NONAME ; struct QtMobility::QLatin1Constant<8> const QtMobility::QContactGeoLocation::FieldHeading
-	?SubTypeSipVoip@QContactOnlineAccount@QtMobility@@2U?$QLatin1Constant@$07@2@B @ 1021 NONAME ; struct QtMobility::QLatin1Constant<8> const QtMobility::QContactOnlineAccount::SubTypeSipVoip
-	?FieldCustomMessage@QContactGlobalPresence@QtMobility@@2U?$QLatin1Constant@$0O@@2@B @ 1022 NONAME ; struct QtMobility::QLatin1Constant<14> const QtMobility::QContactGlobalPresence::FieldCustomMessage
-	?FieldCalendarId@QContactAnniversary@QtMobility@@2U?$QLatin1Constant@$0L@@2@B @ 1023 NONAME ; struct QtMobility::QLatin1Constant<11> const QtMobility::QContactAnniversary::FieldCalendarId
-	?FieldAltitudeAccuracy@QContactGeoLocation@QtMobility@@2U?$QLatin1Constant@$0BB@@2@B @ 1024 NONAME ; struct QtMobility::QLatin1Constant<17> const QtMobility::QContactGeoLocation::FieldAltitudeAccuracy
-	?HasMember@QContactRelationship@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 1025 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactRelationship::HasMember
-	?FieldName@QContactOrganization@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 1026 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactOrganization::FieldName
-	?FieldStreet@QContactAddress@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 1027 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactAddress::FieldStreet
-	?SubTypeFax@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$03@2@B @ 1028 NONAME ; struct QtMobility::QLatin1Constant<4> const QtMobility::QContactPhoneNumber::SubTypeFax
-	?FieldTimestamp@QContactGlobalPresence@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 1029 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactGlobalPresence::FieldTimestamp
-	?FieldLatitude@QContactGeoLocation@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 1030 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactGeoLocation::FieldLatitude
-	?FieldLogoUrl@QContactOrganization@QtMobility@@2U?$QLatin1Constant@$07@2@B @ 1031 NONAME ; struct QtMobility::QLatin1Constant<8> const QtMobility::QContactOrganization::FieldLogoUrl
-	?DefinitionName@QContactDisplayLabel@QtMobility@@2U?$QLatin1Constant@$0N@@2@B @ 1032 NONAME ; struct QtMobility::QLatin1Constant<13> const QtMobility::QContactDisplayLabel::DefinitionName
-	?staticMetaObject@QContactFetchRequest@QtMobility@@2UQMetaObject@@B @ 1033 NONAME ; struct QMetaObject const QtMobility::QContactFetchRequest::staticMetaObject
-	?FieldRole@QContactOrganization@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 1034 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactOrganization::FieldRole
-	?FieldNickname@QContactPresence@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 1035 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactPresence::FieldNickname
-	?FieldTimestamp@QContactGeoLocation@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 1036 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactGeoLocation::FieldTimestamp
-	?DefinitionName@QContactThumbnail@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 1037 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactThumbnail::DefinitionName
-	?SubTypeVideo@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 1038 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactPhoneNumber::SubTypeVideo
-	?FieldCustomMessage@QContactPresence@QtMobility@@2U?$QLatin1Constant@$0O@@2@B @ 1039 NONAME ; struct QtMobility::QLatin1Constant<14> const QtMobility::QContactPresence::FieldCustomMessage
-	?SubTypeVoice@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 1040 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactPhoneNumber::SubTypeVoice
-	?DefinitionName@QContactAnniversary@QtMobility@@2U?$QLatin1Constant@$0M@@2@B @ 1041 NONAME ; struct QtMobility::QLatin1Constant<12> const QtMobility::QContactAnniversary::DefinitionName
-	?FieldAudioRingtoneUrl@QContactRingtone@QtMobility@@2U?$QLatin1Constant@$0BB@@2@B @ 1042 NONAME ; struct QtMobility::QLatin1Constant<17> const QtMobility::QContactRingtone::FieldAudioRingtoneUrl
-	?FieldTimestamp@QContactPresence@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 1043 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactPresence::FieldTimestamp
-	?FieldAssistantName@QContactOrganization@QtMobility@@2U?$QLatin1Constant@$0O@@2@B @ 1044 NONAME ; struct QtMobility::QLatin1Constant<14> const QtMobility::QContactOrganization::FieldAssistantName
-	?FieldCustomLabel@QContactName@QtMobility@@2U?$QLatin1Constant@$0M@@2@B @ 1045 NONAME ; struct QtMobility::QLatin1Constant<12> const QtMobility::QContactName::FieldCustomLabel
-	?SubTypeInternational@QContactAddress@QtMobility@@2U?$QLatin1Constant@$0O@@2@B @ 1046 NONAME ; struct QtMobility::QLatin1Constant<14> const QtMobility::QContactAddress::SubTypeInternational
-	?SubTypeEngagement@QContactAnniversary@QtMobility@@2U?$QLatin1Constant@$0L@@2@B @ 1047 NONAME ; struct QtMobility::QLatin1Constant<11> const QtMobility::QContactAnniversary::SubTypeEngagement
-	?FieldCreationTimestamp@QContactTimestamp@QtMobility@@2U?$QLatin1Constant@$0BC@@2@B @ 1048 NONAME ; struct QtMobility::QLatin1Constant<18> const QtMobility::QContactTimestamp::FieldCreationTimestamp
-	?DefinitionName@QContactGuid@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 1049 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactGuid::DefinitionName
-	?FieldSyncTarget@QContactSyncTarget@QtMobility@@2U?$QLatin1Constant@$0L@@2@B @ 1050 NONAME ; struct QtMobility::QLatin1Constant<11> const QtMobility::QContactSyncTarget::FieldSyncTarget
-	?FieldLastName@QContactName@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 1051 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactName::FieldLastName
-	?FieldNickname@QContactNickname@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 1052 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactNickname::FieldNickname
-	?DefinitionName@QContactTag@QtMobility@@2U?$QLatin1Constant@$03@2@B @ 1053 NONAME ; struct QtMobility::QLatin1Constant<4> const QtMobility::QContactTag::DefinitionName
-	?FieldMiddleName@QContactName@QtMobility@@2U?$QLatin1Constant@$0L@@2@B @ 1054 NONAME ; struct QtMobility::QLatin1Constant<11> const QtMobility::QContactName::FieldMiddleName
-	?FieldType@QContactType@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 1055 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactType::FieldType
-	?DefinitionName@QContactOnlineAccount@QtMobility@@2U?$QLatin1Constant@$0O@@2@B @ 1056 NONAME ; struct QtMobility::QLatin1Constant<14> const QtMobility::QContactOnlineAccount::DefinitionName
-	?DefinitionName@QContactTimestamp@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 1057 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactTimestamp::DefinitionName
-	?FieldTag@QContactTag@QtMobility@@2U?$QLatin1Constant@$03@2@B @ 1058 NONAME ; struct QtMobility::QLatin1Constant<4> const QtMobility::QContactTag::FieldTag
-	?FieldContext@QContactDetail@QtMobility@@2U?$QLatin1Constant@$07@2@B @ 1059 NONAME ; struct QtMobility::QLatin1Constant<8> const QtMobility::QContactDetail::FieldContext
-	?SubTypeFavourite@QContactUrl@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 1060 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactUrl::SubTypeFavourite
-	?FieldSubType@QContactAnniversary@QtMobility@@2U?$QLatin1Constant@$07@2@B @ 1061 NONAME ; struct QtMobility::QLatin1Constant<8> const QtMobility::QContactAnniversary::FieldSubType
-	?FieldModificationTimestamp@QContactTimestamp@QtMobility@@2U?$QLatin1Constant@$0BG@@2@B @ 1062 NONAME ; struct QtMobility::QLatin1Constant<22> const QtMobility::QContactTimestamp::FieldModificationTimestamp
-	?FieldGender@QContactGender@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 1063 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactGender::FieldGender
-	?staticMetaObject@QContactLocalIdFetchRequest@QtMobility@@2UQMetaObject@@B @ 1064 NONAME ; struct QMetaObject const QtMobility::QContactLocalIdFetchRequest::staticMetaObject
-	?FieldSubType@QContactUrl@QtMobility@@2U?$QLatin1Constant@$07@2@B @ 1065 NONAME ; struct QtMobility::QLatin1Constant<8> const QtMobility::QContactUrl::FieldSubType
-	?SubTypeBulletinBoardSystem@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$0BE@@2@B @ 1066 NONAME ; struct QtMobility::QLatin1Constant<20> const QtMobility::QContactPhoneNumber::SubTypeBulletinBoardSystem
-	?FieldEvent@QContactAnniversary@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 1067 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactAnniversary::FieldEvent
-	?staticMetaObject@QContactSaveRequest@QtMobility@@2UQMetaObject@@B @ 1068 NONAME ; struct QMetaObject const QtMobility::QContactSaveRequest::staticMetaObject
-	?FieldSubTypes@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 1069 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactPhoneNumber::FieldSubTypes
-	?SubTypeDomestic@QContactAddress@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 1070 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactAddress::SubTypeDomestic
-	?FieldLinkedDetailUris@QContactDetail@QtMobility@@2U?$QLatin1Constant@$0BB@@2@B @ 1071 NONAME ; struct QtMobility::QLatin1Constant<17> const QtMobility::QContactDetail::FieldLinkedDetailUris
-	?DefinitionName@QContactGender@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 1072 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactGender::DefinitionName
-	?FieldCapabilities@QContactOnlineAccount@QtMobility@@2U?$QLatin1Constant@$0N@@2@B @ 1073 NONAME ; struct QtMobility::QLatin1Constant<13> const QtMobility::QContactOnlineAccount::FieldCapabilities
-	?FieldPresenceStateImageUrl@QContactGlobalPresence@QtMobility@@2U?$QLatin1Constant@$0BG@@2@B @ 1074 NONAME ; struct QtMobility::QLatin1Constant<22> const QtMobility::QContactGlobalPresence::FieldPresenceStateImageUrl
-	?FieldLocality@QContactAddress@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 1075 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactAddress::FieldLocality
-	?staticMetaObject@QContactManager@QtMobility@@2UQMetaObject@@B @ 1076 NONAME ; struct QMetaObject const QtMobility::QContactManager::staticMetaObject
-	?SubTypeSip@QContactOnlineAccount@QtMobility@@2U?$QLatin1Constant@$03@2@B @ 1077 NONAME ; struct QtMobility::QLatin1Constant<4> const QtMobility::QContactOnlineAccount::SubTypeSip
-	?staticMetaObject@QContactRelationshipFetchRequest@QtMobility@@2UQMetaObject@@B @ 1078 NONAME ; struct QMetaObject const QtMobility::QContactRelationshipFetchRequest::staticMetaObject
-	?DefinitionName@QContactBirthday@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 1079 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactBirthday::DefinitionName
-	?FieldBirthday@QContactBirthday@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 1080 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactBirthday::FieldBirthday
-	?FieldLabel@QContactGeoLocation@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 1081 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactGeoLocation::FieldLabel
-	?FieldImageUrl@QContactAvatar@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 1082 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactAvatar::FieldImageUrl
-	?staticMetaObject@QContactManagerEngine@QtMobility@@2UQMetaObject@@B @ 1083 NONAME ; struct QMetaObject const QtMobility::QContactManagerEngine::staticMetaObject
-	?staticMetaObject@QContactAbstractRequest@QtMobility@@2UQMetaObject@@B @ 1084 NONAME ; struct QMetaObject const QtMobility::QContactAbstractRequest::staticMetaObject
-	?FieldTitle@QContactOrganization@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 1085 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactOrganization::FieldTitle
-	?staticMetaObject@QContactActionFactory@QtMobility@@2UQMetaObject@@B @ 1086 NONAME ; struct QMetaObject const QtMobility::QContactActionFactory::staticMetaObject
-	?FieldLongitude@QContactGeoLocation@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 1087 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactGeoLocation::FieldLongitude
-	?FieldPresenceStateText@QContactGlobalPresence@QtMobility@@2U?$QLatin1Constant@$0BC@@2@B @ 1088 NONAME ; struct QtMobility::QLatin1Constant<18> const QtMobility::QContactGlobalPresence::FieldPresenceStateText
-	?FieldRegion@QContactAddress@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 1089 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactAddress::FieldRegion
-	?SubTypePostal@QContactAddress@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 1090 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactAddress::SubTypePostal
-	?DefinitionName@QContactAvatar@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 1091 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactAvatar::DefinitionName
-	?FieldVibrationRingtoneUrl@QContactRingtone@QtMobility@@2U?$QLatin1Constant@$0BF@@2@B @ 1092 NONAME ; struct QtMobility::QLatin1Constant<21> const QtMobility::QContactRingtone::FieldVibrationRingtoneUrl
-	?staticMetaObject@QContactAction@QtMobility@@2UQMetaObject@@B @ 1093 NONAME ; struct QMetaObject const QtMobility::QContactAction::staticMetaObject
-	?ContextHome@QContactDetail@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 1094 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactDetail::ContextHome
-	?FieldPostcode@QContactAddress@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 1095 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactAddress::FieldPostcode
-	?staticMetaObject@QContactDetailDefinitionRemoveRequest@QtMobility@@2UQMetaObject@@B @ 1096 NONAME ; struct QMetaObject const QtMobility::QContactDetailDefinitionRemoveRequest::staticMetaObject
-	?FieldVideoRingtoneUrl@QContactRingtone@QtMobility@@2U?$QLatin1Constant@$0BB@@2@B @ 1097 NONAME ; struct QtMobility::QLatin1Constant<17> const QtMobility::QContactRingtone::FieldVideoRingtoneUrl
-	?DefinitionName@QContactName@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 1098 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactName::DefinitionName
-	?FieldPostOfficeBox@QContactAddress@QtMobility@@2U?$QLatin1Constant@$0O@@2@B @ 1099 NONAME ; struct QtMobility::QLatin1Constant<14> const QtMobility::QContactAddress::FieldPostOfficeBox
-	?DefinitionName@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$0M@@2@B @ 1100 NONAME ; struct QtMobility::QLatin1Constant<12> const QtMobility::QContactPhoneNumber::DefinitionName
+	?setContactId@QContactRemoveRequest@QtMobility@@QAEXABI@Z @ 753 NONAME ; void QtMobility::QContactRemoveRequest::setContactId(unsigned int const &)
+	?setCapabilities@QContactOnlineAccount@QtMobility@@QAEXABVQStringList@@@Z @ 754 NONAME ; void QtMobility::QContactOnlineAccount::setCapabilities(class QStringList const &)
+	?synthesizedContactDisplayLabel@QContactManager@QtMobility@@QBE?AVQString@@ABVQContact@2@@Z @ 755 NONAME ; class QString QtMobility::QContactManager::synthesizedContactDisplayLabel(class QtMobility::QContact const &) const
+	?setRelationship@QContactRelationshipSaveRequest@QtMobility@@QAEXABVQContactRelationship@2@@Z @ 756 NONAME ; void QtMobility::QContactRelationshipSaveRequest::setRelationship(class QtMobility::QContactRelationship const &)
+	?FieldNickname@QContactGlobalPresence@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 757 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactGlobalPresence::FieldNickname
+	?altitude@QContactGeoLocation@QtMobility@@QBENXZ @ 758 NONAME ; double QtMobility::QContactGeoLocation::altitude(void) const
+	?details@QContact@QtMobility@@QBE?AV?$QList@VQContactDetail@QtMobility@@@@ABVQString@@@Z @ 759 NONAME ; class QList<class QtMobility::QContactDetail> QtMobility::QContact::details(class QString const &) const
+	?FieldOriginalDate@QContactAnniversary@QtMobility@@2U?$QLatin1Constant@$0N@@2@B @ 760 NONAME ; struct QtMobility::QLatin1Constant<13> const QtMobility::QContactAnniversary::FieldOriginalDate
+	?d_func@QContactDetailDefinitionSaveRequest@QtMobility@@AAEPAVQContactDetailDefinitionSaveRequestPrivate@2@XZ @ 761 NONAME ; class QtMobility::QContactDetailDefinitionSaveRequestPrivate * QtMobility::QContactDetailDefinitionSaveRequest::d_func(void)
+	?setManagerUri@QContactId@QtMobility@@QAEXABVQString@@@Z @ 762 NONAME ; void QtMobility::QContactId::setManagerUri(class QString const &)
+	?insertAddedRelationshipsContact@QContactChangeSet@QtMobility@@QAEXI@Z @ 763 NONAME ; void QtMobility::QContactChangeSet::insertAddedRelationshipsContact(unsigned int)
+	??1QContactRemoveRequest@QtMobility@@UAE@XZ @ 764 NONAME ; QtMobility::QContactRemoveRequest::~QContactRemoveRequest(void)
+	?FieldAssistantName@QContactOrganization@QtMobility@@2U?$QLatin1Constant@$0O@@2@B @ 765 NONAME ; struct QtMobility::QLatin1Constant<14> const QtMobility::QContactOrganization::FieldAssistantName
+	??BQContactSortOrder@QtMobility@@QBE?AV?$QList@VQContactSortOrder@QtMobility@@@@XZ @ 766 NONAME ; QtMobility::QContactSortOrder::operator class QList<class QtMobility::QContactSortOrder>(void) const
+	?isInactive@QContactAbstractRequest@QtMobility@@QBE_NXZ @ 767 NONAME ; bool QtMobility::QContactAbstractRequest::isInactive(void) const
+	?key@QContactDetail@QtMobility@@QBEHXZ @ 768 NONAME ; int QtMobility::QContactDetail::key(void) const
+	?setSorting@QContactFetchRequest@QtMobility@@QAEXABV?$QList@VQContactSortOrder@QtMobility@@@@@Z @ 769 NONAME ; void QtMobility::QContactFetchRequest::setSorting(class QList<class QtMobility::QContactSortOrder> const &)
+	?qt_metacast@QContactDetailDefinitionRemoveRequest@QtMobility@@UAEPAXPBD@Z @ 770 NONAME ; void * QtMobility::QContactDetailDefinitionRemoveRequest::qt_metacast(char const *)
+	?matchFlags@QContactDetailFilter@QtMobility@@QBE?AV?$QFlags@W4MatchFlag@QContactFilter@QtMobility@@@@XZ @ 771 NONAME ; class QFlags<enum QtMobility::QContactFilter::MatchFlag> QtMobility::QContactDetailFilter::matchFlags(void) const
+	?FieldLongitude@QContactGeoLocation@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 772 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactGeoLocation::FieldLongitude
+	?SubTypeDtmfMenu@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 773 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactPhoneNumber::SubTypeDtmfMenu
+	?contactIds@QContactRemoveRequest@QtMobility@@QBE?AV?$QList@I@@XZ @ 774 NONAME ; class QList<unsigned int> QtMobility::QContactRemoveRequest::contactIds(void) const
+	?SubTypeWedding@QContactAnniversary@QtMobility@@2U?$QLatin1Constant@$07@2@B @ 775 NONAME ; struct QtMobility::QLatin1Constant<8> const QtMobility::QContactAnniversary::SubTypeWedding
+	??0QContactUnionFilter@QtMobility@@QAE@ABVQContactFilter@1@@Z @ 776 NONAME ; QtMobility::QContactUnionFilter::QContactUnionFilter(class QtMobility::QContactFilter const &)
+	??0QContactSortOrder@QtMobility@@QAE@XZ @ 777 NONAME ; QtMobility::QContactSortOrder::QContactSortOrder(void)
+	??0QContactEmailAddress@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 778 NONAME ; QtMobility::QContactEmailAddress::QContactEmailAddress(class QtMobility::QContactDetail const &)
+	?SubTypeBulletinBoardSystem@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$0BE@@2@B @ 779 NONAME ; struct QtMobility::QLatin1Constant<20> const QtMobility::QContactPhoneNumber::SubTypeBulletinBoardSystem
+	?TypeGroup@QContactType@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 780 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactType::TypeGroup
+	?d_func@QContactDetailDefinitionFetchRequest@QtMobility@@ABEPBVQContactDetailDefinitionFetchRequestPrivate@2@XZ @ 781 NONAME ; class QtMobility::QContactDetailDefinitionFetchRequestPrivate const * QtMobility::QContactDetailDefinitionFetchRequest::d_func(void) const
+	?FieldSubTypes@QContactAddress@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 782 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactAddress::FieldSubTypes
+	?metaObject@QContactRelationshipSaveRequest@QtMobility@@UBEPBUQMetaObject@@XZ @ 783 NONAME ; struct QMetaObject const * QtMobility::QContactRelationshipSaveRequest::metaObject(void) const
+	?SubTypeMobile@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 784 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactPhoneNumber::SubTypeMobile
+	?FieldSuffix@QContactName@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 785 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactName::FieldSuffix
+	?relatedContactRole@QContactRelationshipFilter@QtMobility@@QBE?AW4Role@QContactRelationship@2@XZ @ 786 NONAME ; enum QtMobility::QContactRelationship::Role QtMobility::QContactRelationshipFilter::relatedContactRole(void) const
+	?setRegion@QContactAddress@QtMobility@@QAEXABVQString@@@Z @ 787 NONAME ; void QtMobility::QContactAddress::setRegion(class QString const &)
+	?FieldSubType@QContactUrl@QtMobility@@2U?$QLatin1Constant@$07@2@B @ 788 NONAME ; struct QtMobility::QLatin1Constant<8> const QtMobility::QContactUrl::FieldSubType
+	?setMatchFlags@QContactDetailFilter@QtMobility@@QAEXV?$QFlags@W4MatchFlag@QContactFilter@QtMobility@@@@@Z @ 789 NONAME ; void QtMobility::QContactDetailFilter::setMatchFlags(class QFlags<enum QtMobility::QContactFilter::MatchFlag>)
+	?GenderUnspecified@QContactGender@QtMobility@@2U?$QLatin1Constant@$0M@@2@B @ 790 NONAME ; struct QtMobility::QLatin1Constant<12> const QtMobility::QContactGender::GenderUnspecified
+	??0QContactDetailFilter@QtMobility@@QAE@ABVQContactFilter@1@@Z @ 791 NONAME ; QtMobility::QContactDetailFilter::QContactDetailFilter(class QtMobility::QContactFilter const &)
+	?FieldLogoUrl@QContactOrganization@QtMobility@@2U?$QLatin1Constant@$07@2@B @ 792 NONAME ; struct QtMobility::QLatin1Constant<8> const QtMobility::QContactOrganization::FieldLogoUrl
+	?FieldAccountUri@QContactOnlineAccount@QtMobility@@2U?$QLatin1Constant@$0L@@2@B @ 793 NONAME ; struct QtMobility::QLatin1Constant<11> const QtMobility::QContactOnlineAccount::FieldAccountUri
+	?qt_metacall@QContactManager@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 794 NONAME ; int QtMobility::QContactManager::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?hasValue@QContactDetail@QtMobility@@QBE_NPBD@Z @ 795 NONAME ; bool QtMobility::QContactDetail::hasValue(char const *) const
+	??1QContactAbstractRequest@QtMobility@@UAE@XZ @ 796 NONAME ; QtMobility::QContactAbstractRequest::~QContactAbstractRequest(void)
+	??0QContactDetailDefinitionFetchRequest@QtMobility@@QAE@PAVQObject@@@Z @ 797 NONAME ; QtMobility::QContactDetailDefinitionFetchRequest::QContactDetailDefinitionFetchRequest(class QObject *)
+	?removedRelationshipsContacts@QContactChangeSet@QtMobility@@QBE?AV?$QSet@I@@XZ @ 798 NONAME ; class QSet<unsigned int> QtMobility::QContactChangeSet::removedRelationshipsContacts(void) const
+	?region@QContactAddress@QtMobility@@QBE?AVQString@@XZ @ 799 NONAME ; class QString QtMobility::QContactAddress::region(void) const
+	??_EQContactDetailDefinitionSaveRequest@QtMobility@@UAE@I@Z @ 800 NONAME ; QtMobility::QContactDetailDefinitionSaveRequest::~QContactDetailDefinitionSaveRequest(unsigned int)
+	??0QContactUnionFilter@QtMobility@@QAE@XZ @ 801 NONAME ; QtMobility::QContactUnionFilter::QContactUnionFilter(void)
+	?validateContact@QContactManagerEngine@QtMobility@@UBE_NABVQContact@2@PAW4Error@QContactManager@2@@Z @ 802 NONAME ; bool QtMobility::QContactManagerEngine::validateContact(class QtMobility::QContact const &, enum QtMobility::QContactManager::Error *) const
+	?managerVersion@QContactManager@QtMobility@@QBEHXZ @ 803 NONAME ; int QtMobility::QContactManager::managerVersion(void) const
+	??1QContactOrganization@QtMobility@@QAE@XZ @ 804 NONAME ; QtMobility::QContactOrganization::~QContactOrganization(void)
+	?setSubTypes@QContactPhoneNumber@QtMobility@@QAEXABVQString@@@Z @ 805 NONAME ; void QtMobility::QContactPhoneNumber::setSubTypes(class QString const &)
+	?DefinitionName@QContactGlobalPresence@QtMobility@@2U?$QLatin1Constant@$0P@@2@B @ 806 NONAME ; struct QtMobility::QLatin1Constant<15> const QtMobility::QContactGlobalPresence::DefinitionName
+	??0QContactRelationship@QtMobility@@QAE@XZ @ 807 NONAME ; QtMobility::QContactRelationship::QContactRelationship(void)
+	?tr@QContactRelationshipRemoveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 808 NONAME ; class QString QtMobility::QContactRelationshipRemoveRequest::tr(char const *, char const *)
+	??0QContactGender@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 809 NONAME ; QtMobility::QContactGender::QContactGender(class QtMobility::QContactDetail const &)
+	?SubTypeHomePage@QContactUrl@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 810 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactUrl::SubTypeHomePage
+	??9QContactFilter@QtMobility@@QBE_NABV01@@Z @ 811 NONAME ; bool QtMobility::QContactFilter::operator!=(class QtMobility::QContactFilter const &) const
+	?detailDefinitions@QContactManagerEngine@QtMobility@@UBE?AV?$QMap@VQString@@VQContactDetailDefinition@QtMobility@@@@ABVQString@@PAW4Error@QContactManager@2@@Z @ 812 NONAME ; class QMap<class QString, class QtMobility::QContactDetailDefinition> QtMobility::QContactManagerEngine::detailDefinitions(class QString const &, enum QtMobility::QContactManager::Error *) const
+	?setCustomMessage@QContactGlobalPresence@QtMobility@@QAEXABVQString@@@Z @ 813 NONAME ; void QtMobility::QContactGlobalPresence::setCustomMessage(class QString const &)
+	?tr@QContactFetchRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 814 NONAME ; class QString QtMobility::QContactFetchRequest::tr(char const *, char const *, int)
+	?d_func@QContactRelationshipFilter@QtMobility@@AAEPAVQContactRelationshipFilterPrivate@2@XZ @ 815 NONAME ; class QtMobility::QContactRelationshipFilterPrivate * QtMobility::QContactRelationshipFilter::d_func(void)
+	?managerUri@QContactId@QtMobility@@QBE?AVQString@@XZ @ 816 NONAME ; class QString QtMobility::QContactId::managerUri(void) const
+	?setNote@QContactNote@QtMobility@@QAEXABVQString@@@Z @ 817 NONAME ; void QtMobility::QContactNote::setNote(class QString const &)
+	?d_func@QContactRelationshipRemoveRequest@QtMobility@@ABEPBVQContactRelationshipRemoveRequestPrivate@2@XZ @ 818 NONAME ; class QtMobility::QContactRelationshipRemoveRequestPrivate const * QtMobility::QContactRelationshipRemoveRequest::d_func(void) const
+	?insertRemovedRelationshipsContact@QContactChangeSet@QtMobility@@QAEXI@Z @ 819 NONAME ; void QtMobility::QContactChangeSet::insertRemovedRelationshipsContact(unsigned int)
+	?DefinitionName@QContactFamily@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 820 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactFamily::DefinitionName
+	??0QContactThumbnail@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 821 NONAME ; QtMobility::QContactThumbnail::QContactThumbnail(class QtMobility::QContactDetail const &)
+	?setChildren@QContactFamily@QtMobility@@QAEXABVQStringList@@@Z @ 822 NONAME ; void QtMobility::QContactFamily::setChildren(class QStringList const &)
+	?label@QContactGeoLocation@QtMobility@@QBE?AVQString@@XZ @ 823 NONAME ; class QString QtMobility::QContactGeoLocation::label(void) const
+	?setContacts@QContactSaveRequest@QtMobility@@QAEXABV?$QList@VQContact@QtMobility@@@@@Z @ 824 NONAME ; void QtMobility::QContactSaveRequest::setContacts(class QList<class QtMobility::QContact> const &)
+	?DefinitionName@QContactTimestamp@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 825 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactTimestamp::DefinitionName
+	?setDataChanged@QContactChangeSet@QtMobility@@QAEX_N@Z @ 826 NONAME ; void QtMobility::QContactChangeSet::setDataChanged(bool)
+	??0QContactLocalIdFilter@QtMobility@@QAE@ABVQContactFilter@1@@Z @ 827 NONAME ; QtMobility::QContactLocalIdFilter::QContactLocalIdFilter(class QtMobility::QContactFilter const &)
+	??1QContactTimestamp@QtMobility@@QAE@XZ @ 828 NONAME ; QtMobility::QContactTimestamp::~QContactTimestamp(void)
+	?FieldCustomLabel@QContactName@QtMobility@@2U?$QLatin1Constant@$0M@@2@B @ 829 NONAME ; struct QtMobility::QLatin1Constant<12> const QtMobility::QContactName::FieldCustomLabel
+	?FieldGender@QContactGender@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 830 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactGender::FieldGender
+	?FieldTimestamp@QContactGeoLocation@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 831 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactGeoLocation::FieldTimestamp
+	??0QContactSyncTarget@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 832 NONAME ; QtMobility::QContactSyncTarget::QContactSyncTarget(class QtMobility::QContactDetail const &)
+	?subTypes@QContactOnlineAccount@QtMobility@@QBE?AVQStringList@@XZ @ 833 NONAME ; class QStringList QtMobility::QContactOnlineAccount::subTypes(void) const
+	?middleName@QContactName@QtMobility@@QBE?AVQString@@XZ @ 834 NONAME ; class QString QtMobility::QContactName::middleName(void) const
+	?contacts@QContactManager@QtMobility@@QBE?AV?$QList@VQContact@QtMobility@@@@ABV?$QList@VQContactSortOrder@QtMobility@@@@ABVQContactFetchHint@2@@Z @ 835 NONAME ; class QList<class QtMobility::QContact> QtMobility::QContactManager::contacts(class QList<class QtMobility::QContactSortOrder> const &, class QtMobility::QContactFetchHint const &) const
+	?d_func@QContactFetchRequest@QtMobility@@AAEPAVQContactFetchRequestPrivate@2@XZ @ 836 NONAME ; class QtMobility::QContactFetchRequestPrivate * QtMobility::QContactFetchRequest::d_func(void)
+	??0QContactNickname@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 837 NONAME ; QtMobility::QContactNickname::QContactNickname(class QtMobility::QContactDetail const &)
+	?d_func@QContactSaveRequest@QtMobility@@ABEPBVQContactSaveRequestPrivate@2@XZ @ 838 NONAME ; class QtMobility::QContactSaveRequestPrivate const * QtMobility::QContactSaveRequest::d_func(void) const
+	?setLocality@QContactAddress@QtMobility@@QAEXABVQString@@@Z @ 839 NONAME ; void QtMobility::QContactAddress::setLocality(class QString const &)
+	?FieldPresenceState@QContactPresence@QtMobility@@2U?$QLatin1Constant@$0O@@2@B @ 840 NONAME ; struct QtMobility::QLatin1Constant<14> const QtMobility::QContactPresence::FieldPresenceState
+	?nickname@QContactGlobalPresence@QtMobility@@QBE?AVQString@@XZ @ 841 NONAME ; class QString QtMobility::QContactGlobalPresence::nickname(void) const
+	?insertRemovedRelationshipsContacts@QContactChangeSet@QtMobility@@QAEXABV?$QList@I@@@Z @ 842 NONAME ; void QtMobility::QContactChangeSet::insertRemovedRelationshipsContacts(class QList<unsigned int> const &)
+	?removeContact@QContactManager@QtMobility@@QAE_NABI@Z @ 843 NONAME ; bool QtMobility::QContactManager::removeContact(unsigned int const &)
+	??6QContactUnionFilter@QtMobility@@QAEAAV01@ABVQContactFilter@1@@Z @ 844 NONAME ; class QtMobility::QContactUnionFilter & QtMobility::QContactUnionFilter::operator<<(class QtMobility::QContactFilter const &)
+	?clearRemovedContacts@QContactChangeSet@QtMobility@@QAEXXZ @ 845 NONAME ; void QtMobility::QContactChangeSet::clearRemovedContacts(void)
+	??0QContactDetailFieldDefinition@QtMobility@@QAE@ABV01@@Z @ 846 NONAME ; QtMobility::QContactDetailFieldDefinition::QContactDetailFieldDefinition(class QtMobility::QContactDetailFieldDefinition const &)
+	?tr@QContactRelationshipSaveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 847 NONAME ; class QString QtMobility::QContactRelationshipSaveRequest::tr(char const *, char const *, int)
+	?getStaticMetaObject@QContactFetchRequest@QtMobility@@SAABUQMetaObject@@XZ @ 848 NONAME ; struct QMetaObject const & QtMobility::QContactFetchRequest::getStaticMetaObject(void)
+	??1QContactId@QtMobility@@QAE@XZ @ 849 NONAME ; QtMobility::QContactId::~QContactId(void)
+	?detailDefinitions@QContactManager@QtMobility@@QBE?AV?$QMap@VQString@@VQContactDetailDefinition@QtMobility@@@@ABVQString@@@Z @ 850 NONAME ; class QMap<class QString, class QtMobility::QContactDetailDefinition> QtMobility::QContactManager::detailDefinitions(class QString const &) const
+	?type@QContact@QtMobility@@QBE?AVQString@@XZ @ 851 NONAME ; class QString QtMobility::QContact::type(void) const
+	?qHash@QtMobility@@YAIABVQContactRelationship@1@@Z @ 852 NONAME ; unsigned int QtMobility::qHash(class QtMobility::QContactRelationship const &)
+	??0QContactTimestamp@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 853 NONAME ; QtMobility::QContactTimestamp::QContactTimestamp(class QtMobility::QContactDetail const &)
+	?ContextHome@QContactDetail@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 854 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactDetail::ContextHome
+	?setContexts@QContactDetail@QtMobility@@QAEXABVQStringList@@@Z @ 855 NONAME ; void QtMobility::QContactDetail::setContexts(class QStringList const &)
+	??9QContactDetailFieldDefinition@QtMobility@@QBE_NABV01@@Z @ 856 NONAME ; bool QtMobility::QContactDetailFieldDefinition::operator!=(class QtMobility::QContactDetailFieldDefinition const &) const
+	?sorting@QContactFetchRequest@QtMobility@@QBE?AV?$QList@VQContactSortOrder@QtMobility@@@@XZ @ 857 NONAME ; class QList<class QtMobility::QContactSortOrder> QtMobility::QContactFetchRequest::sorting(void) const
+	?FieldTag@QContactTag@QtMobility@@2U?$QLatin1Constant@$03@2@B @ 858 NONAME ; struct QtMobility::QLatin1Constant<4> const QtMobility::QContactTag::FieldTag
+	?setDate@QContactBirthday@QtMobility@@QAEXABVQDate@@@Z @ 859 NONAME ; void QtMobility::QContactBirthday::setDate(class QDate const &)
+	?FieldLinkedDetailUris@QContactDetail@QtMobility@@2U?$QLatin1Constant@$0BB@@2@B @ 860 NONAME ; struct QtMobility::QLatin1Constant<17> const QtMobility::QContactDetail::FieldLinkedDetailUris
+	?staticMetaObject@QContactAbstractRequest@QtMobility@@2UQMetaObject@@B @ 861 NONAME ; struct QMetaObject const QtMobility::QContactAbstractRequest::staticMetaObject
+	?match@QContactPhoneNumber@QtMobility@@SA?AVQContactFilter@2@ABVQString@@@Z @ 862 NONAME ; class QtMobility::QContactFilter QtMobility::QContactPhoneNumber::match(class QString const &)
+	??0QContactDetail@QtMobility@@QAE@ABVQString@@@Z @ 863 NONAME ; QtMobility::QContactDetail::QContactDetail(class QString const &)
+	?d_func@QContactLocalIdFetchRequest@QtMobility@@AAEPAVQContactLocalIdFetchRequestPrivate@2@XZ @ 864 NONAME ; class QtMobility::QContactLocalIdFetchRequestPrivate * QtMobility::QContactLocalIdFetchRequest::d_func(void)
+	?hasValue@QContactDetail@QtMobility@@QBE_NABVQString@@@Z @ 865 NONAME ; bool QtMobility::QContactDetail::hasValue(class QString const &) const
+	??0QContactAddress@QtMobility@@QAE@XZ @ 866 NONAME ; QtMobility::QContactAddress::QContactAddress(void)
+	?DefinitionName@QContactRingtone@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 867 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactRingtone::DefinitionName
+	?FieldEvent@QContactAnniversary@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 868 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactAnniversary::FieldEvent
+	?FieldDepartment@QContactOrganization@QtMobility@@2U?$QLatin1Constant@$0L@@2@B @ 869 NONAME ; struct QtMobility::QLatin1Constant<11> const QtMobility::QContactOrganization::FieldDepartment
+	?contactIds@QContactManagerEngine@QtMobility@@UBE?AV?$QList@I@@ABVQContactFilter@2@ABV?$QList@VQContactSortOrder@QtMobility@@@@PAW4Error@QContactManager@2@@Z @ 870 NONAME ; class QList<unsigned int> QtMobility::QContactManagerEngine::contactIds(class QtMobility::QContactFilter const &, class QList<class QtMobility::QContactSortOrder> const &, enum QtMobility::QContactManager::Error *) const
+	?setNickname@QContactGlobalPresence@QtMobility@@QAEXABVQString@@@Z @ 871 NONAME ; void QtMobility::QContactGlobalPresence::setNickname(class QString const &)
+	??0QContactDetailDefinitionSaveRequest@QtMobility@@QAE@PAVQObject@@@Z @ 872 NONAME ; QtMobility::QContactDetailDefinitionSaveRequest::QContactDetailDefinitionSaveRequest(class QObject *)
+	??0QContactThumbnail@QtMobility@@QAE@XZ @ 873 NONAME ; QtMobility::QContactThumbnail::QContactThumbnail(void)
+	?variantValues@QContactDetail@QtMobility@@QBE?AV?$QMap@VQString@@VQVariant@@@@XZ @ 874 NONAME ; class QMap<class QString, class QVariant> QtMobility::QContactDetail::variantValues(void) const
+	?testFilter@QContactManagerEngine@QtMobility@@SA_NABVQContactFilter@2@ABVQContact@2@@Z @ 875 NONAME ; bool QtMobility::QContactManagerEngine::testFilter(class QtMobility::QContactFilter const &, class QtMobility::QContact const &)
+	??0QContactIntersectionFilter@QtMobility@@QAE@ABVQContactFilter@1@@Z @ 876 NONAME ; QtMobility::QContactIntersectionFilter::QContactIntersectionFilter(class QtMobility::QContactFilter const &)
+	?FieldSubType@QContactAnniversary@QtMobility@@2U?$QLatin1Constant@$07@2@B @ 877 NONAME ; struct QtMobility::QLatin1Constant<8> const QtMobility::QContactAnniversary::FieldSubType
+	?isEmpty@QContact@QtMobility@@QBE_NXZ @ 878 NONAME ; bool QtMobility::QContact::isEmpty(void) const
+	?FieldSpouse@QContactFamily@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 879 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactFamily::FieldSpouse
+	?getStaticMetaObject@QContactSaveRequest@QtMobility@@SAABUQMetaObject@@XZ @ 880 NONAME ; struct QMetaObject const & QtMobility::QContactSaveRequest::getStaticMetaObject(void)
+	?setContactDisplayLabel@QContactManagerEngine@QtMobility@@SAXPAVQContact@2@ABVQString@@@Z @ 881 NONAME ; void QtMobility::QContactManagerEngine::setContactDisplayLabel(class QtMobility::QContact *, class QString const &)
+	??6QtMobility@@YA?AVQDebug@@V1@ABVQContactId@0@@Z @ 882 NONAME ; class QDebug QtMobility::operator<<(class QDebug, class QtMobility::QContactId const &)
+	?addedRelationshipsContacts@QContactChangeSet@QtMobility@@QBE?AV?$QSet@I@@XZ @ 883 NONAME ; class QSet<unsigned int> QtMobility::QContactChangeSet::addedRelationshipsContacts(void) const
+	?setContactType@QContactDetailDefinitionFetchRequest@QtMobility@@QAEXABVQString@@@Z @ 884 NONAME ; void QtMobility::QContactDetailDefinitionFetchRequest::setContactType(class QString const &)
+	?managerParameters@QContactManager@QtMobility@@QBE?AV?$QMap@VQString@@V1@@@XZ @ 885 NONAME ; class QMap<class QString, class QString> QtMobility::QContactManager::managerParameters(void) const
+	??0QContactType@QtMobility@@QAE@ABVQContactDetail@1@@Z @ 886 NONAME ; QtMobility::QContactType::QContactType(class QtMobility::QContactDetail const &)
+	??4QContactType@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 887 NONAME ; class QtMobility::QContactType & QtMobility::QContactType::operator=(class QtMobility::QContactDetail const &)
+	?accessConstraints@QContactDetail@QtMobility@@QBE?AV?$QFlags@W4AccessConstraint@QContactDetail@QtMobility@@@@XZ @ 888 NONAME ; class QFlags<enum QtMobility::QContactDetail::AccessConstraint> QtMobility::QContactDetail::accessConstraints(void) const
+	?SubTypeSip@QContactOnlineAccount@QtMobility@@2U?$QLatin1Constant@$03@2@B @ 889 NONAME ; struct QtMobility::QLatin1Constant<4> const QtMobility::QContactOnlineAccount::SubTypeSip
+	?tr@QContactAbstractRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 890 NONAME ; class QString QtMobility::QContactAbstractRequest::tr(char const *, char const *, int)
+	?setRelationships@QContactRelationshipSaveRequest@QtMobility@@QAEXABV?$QList@VQContactRelationship@QtMobility@@@@@Z @ 891 NONAME ; void QtMobility::QContactRelationshipSaveRequest::setRelationships(class QList<class QtMobility::QContactRelationship> const &)
+	??1QContactFetchHint@QtMobility@@QAE@XZ @ 892 NONAME ; QtMobility::QContactFetchHint::~QContactFetchHint(void)
+	?FieldSpeed@QContactGeoLocation@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 893 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactGeoLocation::FieldSpeed
+	??4QContactTimestamp@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 894 NONAME ; class QtMobility::QContactTimestamp & QtMobility::QContactTimestamp::operator=(class QtMobility::QContactDetail const &)
+	?setLocalId@QContactId@QtMobility@@QAEXABI@Z @ 895 NONAME ; void QtMobility::QContactId::setLocalId(unsigned int const &)
+	?getStaticMetaObject@QContactDetailDefinitionFetchRequest@QtMobility@@SAABUQMetaObject@@XZ @ 896 NONAME ; struct QMetaObject const & QtMobility::QContactDetailDefinitionFetchRequest::getStaticMetaObject(void)
+	??0QContactPresence@QtMobility@@QAE@XZ @ 897 NONAME ; QtMobility::QContactPresence::QContactPresence(void)
+	??0QContactName@QtMobility@@QAE@XZ @ 898 NONAME ; QtMobility::QContactName::QContactName(void)
+	??_EQContactManagerEngine@QtMobility@@UAE@I@Z @ 899 NONAME ; QtMobility::QContactManagerEngine::~QContactManagerEngine(unsigned int)
+	?customMessage@QContactPresence@QtMobility@@QBE?AVQString@@XZ @ 900 NONAME ; class QString QtMobility::QContactPresence::customMessage(void) const
+	?setLabel@QContactGeoLocation@QtMobility@@QAEXABVQString@@@Z @ 901 NONAME ; void QtMobility::QContactGeoLocation::setLabel(class QString const &)
+	?managerUri@QContactManagerEngine@QtMobility@@QBE?AVQString@@XZ @ 902 NONAME ; class QString QtMobility::QContactManagerEngine::managerUri(void) const
+	?hasFeature@QContactManagerEngine@QtMobility@@UBE_NW4ManagerFeature@QContactManager@2@ABVQString@@@Z @ 903 NONAME ; bool QtMobility::QContactManagerEngine::hasFeature(enum QtMobility::QContactManager::ManagerFeature, class QString const &) const
+	?DefinitionName@QContactName@QtMobility@@2U?$QLatin1Constant@$04@2@B @ 904 NONAME ; struct QtMobility::QLatin1Constant<5> const QtMobility::QContactName::DefinitionName
+	?filter@QContactLocalIdFetchRequest@QtMobility@@QBE?AVQContactFilter@2@XZ @ 905 NONAME ; class QtMobility::QContactFilter QtMobility::QContactLocalIdFetchRequest::filter(void) const
+	?trUtf8@QContactLocalIdFetchRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 906 NONAME ; class QString QtMobility::QContactLocalIdFetchRequest::trUtf8(char const *, char const *, int)
+	?setDefinitions@QContactDetailDefinitionSaveRequest@QtMobility@@QAEXABV?$QList@VQContactDetailDefinition@QtMobility@@@@@Z @ 907 NONAME ; void QtMobility::QContactDetailDefinitionSaveRequest::setDefinitions(class QList<class QtMobility::QContactDetailDefinition> const &)
+	??_EQContactSaveRequest@QtMobility@@UAE@I@Z @ 908 NONAME ; QtMobility::QContactSaveRequest::~QContactSaveRequest(unsigned int)
+	?locality@QContactAddress@QtMobility@@QBE?AVQString@@XZ @ 909 NONAME ; class QString QtMobility::QContactAddress::locality(void) const
+	?relationshipsAdded@QContactManager@QtMobility@@IAEXABV?$QList@I@@@Z @ 910 NONAME ; void QtMobility::QContactManager::relationshipsAdded(class QList<unsigned int> const &)
+	?SubTypeModem@QContactPhoneNumber@QtMobility@@2U?$QLatin1Constant@$05@2@B @ 911 NONAME ; struct QtMobility::QLatin1Constant<6> const QtMobility::QContactPhoneNumber::SubTypeModem
+	?match@QContactDisplayLabel@QtMobility@@SA?AVQContactFilter@2@ABVQString@@@Z @ 912 NONAME ; class QtMobility::QContactFilter QtMobility::QContactDisplayLabel::match(class QString const &)
+	?d_func@QContactRemoveRequest@QtMobility@@AAEPAVQContactRemoveRequestPrivate@2@XZ @ 913 NONAME ; class QtMobility::QContactRemoveRequestPrivate * QtMobility::QContactRemoveRequest::d_func(void)
+	?setSelfContactId@QContactManager@QtMobility@@QAE_NABI@Z @ 914 NONAME ; bool QtMobility::QContactManager::setSelfContactId(unsigned int const &)
+	?setContactIds@QContactRemoveRequest@QtMobility@@QAEXABV?$QList@I@@@Z @ 915 NONAME ; void QtMobility::QContactRemoveRequest::setContactIds(class QList<unsigned int> const &)
+	?FieldLocality@QContactAddress@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 916 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactAddress::FieldLocality
+	?removeRelationships@QContactManagerEngine@QtMobility@@UAE_NABV?$QList@VQContactRelationship@QtMobility@@@@PAV?$QMap@HW4Error@QContactManager@QtMobility@@@@PAW4Error@QContactManager@2@@Z @ 917 NONAME ; bool QtMobility::QContactManagerEngine::removeRelationships(class QList<class QtMobility::QContactRelationship> const &, class QMap<int, enum QtMobility::QContactManager::Error> *, enum QtMobility::QContactManager::Error *)
+	?FieldCapabilities@QContactOnlineAccount@QtMobility@@2U?$QLatin1Constant@$0N@@2@B @ 918 NONAME ; struct QtMobility::QLatin1Constant<13> const QtMobility::QContactOnlineAccount::FieldCapabilities
+	??0QContactGuid@QtMobility@@QAE@XZ @ 919 NONAME ; QtMobility::QContactGuid::QContactGuid(void)
+	?setContactRelationships@QContactManagerEngine@QtMobility@@SAXPAVQContact@2@ABV?$QList@VQContactRelationship@QtMobility@@@@@Z @ 920 NONAME ; void QtMobility::QContactManagerEngine::setContactRelationships(class QtMobility::QContact *, class QList<class QtMobility::QContactRelationship> const &)
+	?getStaticMetaObject@QContactRelationshipRemoveRequest@QtMobility@@SAABUQMetaObject@@XZ @ 921 NONAME ; struct QMetaObject const & QtMobility::QContactRelationshipRemoveRequest::getStaticMetaObject(void)
+	??1QContactManagerEngineFactory@QtMobility@@UAE@XZ @ 922 NONAME ; QtMobility::QContactManagerEngineFactory::~QContactManagerEngineFactory(void)
+	?saveDetail@QContact@QtMobility@@QAE_NPAVQContactDetail@2@@Z @ 923 NONAME ; bool QtMobility::QContact::saveDetail(class QtMobility::QContactDetail *)
+	?contactsRemoved@QContactManagerEngine@QtMobility@@IAEXABV?$QList@I@@@Z @ 924 NONAME ; void QtMobility::QContactManagerEngine::contactsRemoved(class QList<unsigned int> const &)
+	?speed@QContactGeoLocation@QtMobility@@QBENXZ @ 925 NONAME ; double QtMobility::QContactGeoLocation::speed(void) const
+	?trUtf8@QContactRemoveRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 926 NONAME ; class QString QtMobility::QContactRemoveRequest::trUtf8(char const *, char const *)
+	?isValid@QContactSortOrder@QtMobility@@QBE_NXZ @ 927 NONAME ; bool QtMobility::QContactSortOrder::isValid(void) const
+	??9QContactDetailDefinition@QtMobility@@QBE_NABV01@@Z @ 928 NONAME ; bool QtMobility::QContactDetailDefinition::operator!=(class QtMobility::QContactDetailDefinition const &) const
+	?trUtf8@QContactDetailDefinitionSaveRequest@QtMobility@@SA?AVQString@@PBD0H@Z @ 929 NONAME ; class QString QtMobility::QContactDetailDefinitionSaveRequest::trUtf8(char const *, char const *, int)
+	?metaObject@QContactRelationshipFetchRequest@QtMobility@@UBEPBUQMetaObject@@XZ @ 930 NONAME ; struct QMetaObject const * QtMobility::QContactRelationshipFetchRequest::metaObject(void) const
+	?FieldLastName@QContactName@QtMobility@@2U?$QLatin1Constant@$08@2@B @ 931 NONAME ; struct QtMobility::QLatin1Constant<9> const QtMobility::QContactName::FieldLastName
+	?tr@QContactFetchRequest@QtMobility@@SA?AVQString@@PBD0@Z @ 932 NONAME ; class QString QtMobility::QContactFetchRequest::tr(char const *, char const *)
+	?metaObject@QContactSaveRequest@QtMobility@@UBEPBUQMetaObject@@XZ @ 933 NONAME ; struct QMetaObject const * QtMobility::QContactSaveRequest::metaObject(void) const
+	?setAccuracy@QContactGeoLocation@QtMobility@@QAEXN@Z @ 934 NONAME ; void QtMobility::QContactGeoLocation::setAccuracy(double)
+	?postOfficeBox@QContactAddress@QtMobility@@QBE?AVQString@@XZ @ 935 NONAME ; class QString QtMobility::QContactAddress::postOfficeBox(void) const
+	?originalDate@QContactAnniversary@QtMobility@@QBE?AVQDate@@XZ @ 936 NONAME ; class QDate QtMobility::QContactAnniversary::originalDate(void) const
+	?updateContactLocalIdFetchRequest@QContactManagerEngine@QtMobility@@SAXPAVQContactLocalIdFetchRequest@2@ABV?$QList@I@@W4Error@QContactManager@2@W4State@QContactAbstractRequest@2@@Z @ 937 NONAME ; void QtMobility::QContactManagerEngine::updateContactLocalIdFetchRequest(class QtMobility::QContactLocalIdFetchRequest *, class QList<unsigned int> const &, enum QtMobility::QContactManager::Error, enum QtMobility::QContactAbstractRequest::State)
+	??0QContactChangeSet@QtMobility@@QAE@ABV01@@Z @ 938 NONAME ; QtMobility::QContactChangeSet::QContactChangeSet(class QtMobility::QContactChangeSet const &)
+	?filters@QContactUnionFilter@QtMobility@@QBE?AV?$QList@VQContactFilter@QtMobility@@@@XZ @ 939 NONAME ; class QList<class QtMobility::QContactFilter> QtMobility::QContactUnionFilter::filters(void) const
+	?TypeContact@QContactType@QtMobility@@2U?$QLatin1Constant@$07@2@B @ 940 NONAME ; struct QtMobility::QLatin1Constant<8> const QtMobility::QContactType::TypeContact
+	?setPresenceState@QContactPresence@QtMobility@@QAEXW4PresenceState@12@@Z @ 941 NONAME ; void QtMobility::QContactPresence::setPresenceState(enum QtMobility::QContactPresence::PresenceState)
+	?setDefinitionName@QContactDetailDefinitionFetchRequest@QtMobility@@QAEXABVQString@@@Z @ 942 NONAME ; void QtMobility::QContactDetailDefinitionFetchRequest::setDefinitionName(class QString const &)
+	?qt_metacast@QContactRelationshipFetchRequest@QtMobility@@UAEPAXPBD@Z @ 943 NONAME ; void * QtMobility::QContactRelationshipFetchRequest::qt_metacast(char const *)
+	?managerName@QContactManager@QtMobility@@QBE?AVQString@@XZ @ 944 NONAME ; class QString QtMobility::QContactManager::managerName(void) const
+	?SubTypeInternational@QContactAddress@QtMobility@@2U?$QLatin1Constant@$0O@@2@B @ 945 NONAME ; struct QtMobility::QLatin1Constant<14> const QtMobility::QContactAddress::SubTypeInternational
+	?isCanceled@QContactAbstractRequest@QtMobility@@QBE_NXZ @ 946 NONAME ; bool QtMobility::QContactAbstractRequest::isCanceled(void) const
+	?qt_metacall@QContactSaveRequest@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 947 NONAME ; int QtMobility::QContactSaveRequest::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??4QContactSyncTarget@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 948 NONAME ; class QtMobility::QContactSyncTarget & QtMobility::QContactSyncTarget::operator=(class QtMobility::QContactDetail const &)
+	?label@QContactDisplayLabel@QtMobility@@QBE?AVQString@@XZ @ 949 NONAME ; class QString QtMobility::QContactDisplayLabel::label(void) const
+	?waitForRequestFinished@QContactManagerEngine@QtMobility@@UAE_NPAVQContactAbstractRequest@2@H@Z @ 950 NONAME ; bool QtMobility::QContactManagerEngine::waitForRequestFinished(class QtMobility::QContactAbstractRequest *, int)
+	?ids@QContactLocalIdFetchRequest@QtMobility@@QBE?AV?$QList@I@@XZ @ 951 NONAME ; class QList<unsigned int> QtMobility::QContactLocalIdFetchRequest::ids(void) const
+	??4QContactChangeSet@QtMobility@@QAEAAV01@ABV01@@Z @ 952 NONAME ; class QtMobility::QContactChangeSet & QtMobility::QContactChangeSet::operator=(class QtMobility::QContactChangeSet const &)
+	?staticMetaObject@QContactDetailDefinitionRemoveRequest@QtMobility@@2UQMetaObject@@B @ 953 NONAME ; struct QMetaObject const QtMobility::QContactDetailDefinitionRemoveRequest::staticMetaObject
+	?relatedContacts@QContact@QtMobility@@QBE?AV?$QList@VQContactId@QtMobility@@@@ABVQString@@W4Role@QContactRelationship@2@@Z @ 954 NONAME ; class QList<class QtMobility::QContactId> QtMobility::QContact::relatedContacts(class QString const &, enum QtMobility::QContactRelationship::Role) const
+	?qt_metacast@QContactLocalIdFetchRequest@QtMobility@@UAEPAXPBD@Z @ 955 NONAME ; void * QtMobility::QContactLocalIdFetchRequest::qt_metacast(char const *)
+	??1QContactDetailRangeFilter@QtMobility@@QAE@XZ @ 956 NONAME ; QtMobility::QContactDetailRangeFilter::~QContactDetailRangeFilter(void)
+	?dataChanged@QContactManager@QtMobility@@IAEXXZ @ 957 NONAME ; void QtMobility::QContactManager::dataChanged(void)
+	?getStaticMetaObject@QContactDetailDefinitionSaveRequest@QtMobility@@SAABUQMetaObject@@XZ @ 958 NONAME ; struct QMetaObject const & QtMobility::QContactDetailDefinitionSaveRequest::getStaticMetaObject(void)
+	??0QContactTimestamp@QtMobility@@QAE@XZ @ 959 NONAME ; QtMobility::QContactTimestamp::QContactTimestamp(void)
+	?contacts@QContactSaveRequest@QtMobility@@QBE?AV?$QList@VQContact@QtMobility@@@@XZ @ 960 NONAME ; class QList<class QtMobility::QContact> QtMobility::QContactSaveRequest::contacts(void) const
+	?errorMap@QContactDetailDefinitionFetchRequest@QtMobility@@QBE?AV?$QMap@HW4Error@QContactManager@QtMobility@@@@XZ @ 961 NONAME ; class QMap<int, enum QtMobility::QContactManager::Error> QtMobility::QContactDetailDefinitionFetchRequest::errorMap(void) const
+	?relationships@QContactManager@QtMobility@@QBE?AV?$QList@VQContactRelationship@QtMobility@@@@ABVQString@@ABVQContactId@2@W4Role@QContactRelationship@2@@Z @ 962 NONAME ; class QList<class QtMobility::QContactRelationship> QtMobility::QContactManager::relationships(class QString const &, class QtMobility::QContactId const &, enum QtMobility::QContactRelationship::Role) const
+	?updateDefinitionRemoveRequest@QContactManagerEngine@QtMobility@@SAXPAVQContactDetailDefinitionRemoveRequest@2@W4Error@QContactManager@2@ABV?$QMap@HW4Error@QContactManager@QtMobility@@@@W4State@QContactAbstractRequest@2@@Z @ 963 NONAME ; void QtMobility::QContactManagerEngine::updateDefinitionRemoveRequest(class QtMobility::QContactDetailDefinitionRemoveRequest *, enum QtMobility::QContactManager::Error, class QMap<int, enum QtMobility::QContactManager::Error> const &, enum QtMobility::QContactAbstractRequest::State)
+	?qt_metacall@QContactDetailDefinitionFetchRequest@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 964 NONAME ; int QtMobility::QContactDetailDefinitionFetchRequest::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?staticMetaObject@QContactDetailDefinitionFetchRequest@QtMobility@@2UQMetaObject@@B @ 965 NONAME ; struct QMetaObject const QtMobility::QContactDetailDefinitionFetchRequest::staticMetaObject
+	??4QContactAnniversary@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 966 NONAME ; class QtMobility::QContactAnniversary & QtMobility::QContactAnniversary::operator=(class QtMobility::QContactDetail const &)
+	?clearChangedContacts@QContactChangeSet@QtMobility@@QAEXXZ @ 967 NONAME ; void QtMobility::QContactChangeSet::clearChangedContacts(void)
+	?detail@QContact@QtMobility@@QBE?AVQContactDetail@2@PBD@Z @ 968 NONAME ; class QtMobility::QContactDetail QtMobility::QContact::detail(char const *) const
+	?stateChanged@QContactAbstractRequest@QtMobility@@IAEXW4State@12@@Z @ 969 NONAME ; void QtMobility::QContactAbstractRequest::stateChanged(enum QtMobility::QContactAbstractRequest::State)
+	??0QContactLocalIdFilter@QtMobility@@QAE@XZ @ 970 NONAME ; QtMobility::QContactLocalIdFilter::QContactLocalIdFilter(void)
+	?d_func@QContactDetailRangeFilter@QtMobility@@AAEPAVQContactDetailRangeFilterPrivate@2@XZ @ 971 NONAME ; class QtMobility::QContactDetailRangeFilterPrivate * QtMobility::QContactDetailRangeFilter::d_func(void)
+	?longitude@QContactGeoLocation@QtMobility@@QBENXZ @ 972 NONAME ; double QtMobility::QContactGeoLocation::longitude(void) const
+	??1QContactUnionFilter@QtMobility@@QAE@XZ @ 973 NONAME ; QtMobility::QContactUnionFilter::~QContactUnionFilter(void)
+	??0QContactDetailRangeFilter@QtMobility@@QAE@XZ @ 974 NONAME ; QtMobility::QContactDetailRangeFilter::QContactDetailRangeFilter(void)
+	?created@QContactTimestamp@QtMobility@@QBE?AVQDateTime@@XZ @ 975 NONAME ; class QDateTime QtMobility::QContactTimestamp::created(void) const
+	?SubTypeVideoShare@QContactOnlineAccount@QtMobility@@2U?$QLatin1Constant@$0L@@2@B @ 976 NONAME ; struct QtMobility::QLatin1Constant<11> const QtMobility::QContactOnlineAccount::SubTypeVideoShare
+	?setValue@QContactDetail@QtMobility@@QAE_NPBDABVQVariant@@@Z @ 977 NONAME ; bool QtMobility::QContactDetail::setValue(char const *, class QVariant const &)
+	?FieldPresenceStateImageUrl@QContactGlobalPresence@QtMobility@@2U?$QLatin1Constant@$0BG@@2@B @ 978 NONAME ; struct QtMobility::QLatin1Constant<22> const QtMobility::QContactGlobalPresence::FieldPresenceStateImageUrl
+	?matchFlags@QContactDetailRangeFilter@QtMobility@@QBE?AV?$QFlags@W4MatchFlag@QContactFilter@QtMobility@@@@XZ @ 979 NONAME ; class QFlags<enum QtMobility::QContactFilter::MatchFlag> QtMobility::QContactDetailRangeFilter::matchFlags(void) const
+	??4QContactOrganization@QtMobility@@QAEAAV01@ABVQContactDetail@1@@Z @ 980 NONAME ; class QtMobility::QContactOrganization & QtMobility::QContactOrganization::operator=(class QtMobility::QContactDetail const &)
+	?accuracy@QContactGeoLocation@QtMobility@@QBENXZ @ 981 NONAME ; double QtMobility::QContactGeoLocation::accuracy(void) const
+	?setRelationshipType@QContactRelationship@QtMobility@@QAEXABVQString@@@Z @ 982 NONAME ; void QtMobility::QContactRelationship::setRelationshipType(class QString const &)
+	??0QContactType@QtMobility@@QAE@XZ @ 983 NONAME ; QtMobility::QContactType::QContactType(void)
+	?insertChangedContacts@QContactChangeSet@QtMobility@@QAEXABV?$QList@I@@@Z @ 984 NONAME ; void QtMobility::QContactChangeSet::insertChangedContacts(class QList<unsigned int> const &)
+	?updateRelationshipSaveRequest@QContactManagerEngine@QtMobility@@SAXPAVQContactRelationshipSaveRequest@2@ABV?$QList@VQContactRelationship@QtMobility@@@@W4Error@QContactManager@2@ABV?$QMap@HW4Error@QContactManager@QtMobility@@@@W4State@QContactAbstractRequest@2@@Z @ 985 NONAME ; void QtMobility::QContactManagerEngine::updateRelationshipSaveRequest(class QtMobility::QContactRelationshipSaveRequest *, class QList<class QtMobility::QContactRelationship> const &, enum QtMobility::QContactManager::Error, class QMap<int, enum QtMobility::QContactManager::Error> const &, enum QtMobility::QContactAbstractRequest::State)
+	?children@QContactFamily@QtMobility@@QBE?AVQStringList@@XZ @ 986 NONAME ; class QStringList QtMobility::QContactFamily::children(void) const
+	?department@QContactOrganization@QtMobility@@QBE?AVQStringList@@XZ @ 987 NONAME ; class QStringList QtMobility::QContactOrganization::department(void) const
+	?setThumbnail@QContactThumbnail@QtMobility@@QAEXABVQImage@@@Z @ 988 NONAME ; void QtMobility::QContactThumbnail::setThumbnail(class QImage const &)
+	?resetKey@QContactDetail@QtMobility@@QAEXXZ @ 989 NONAME ; void QtMobility::QContactDetail::resetKey(void)
+	?DefinitionName@QContactAvatar@QtMobility@@2U?$QLatin1Constant@$06@2@B @ 990 NONAME ; struct QtMobility::QLatin1Constant<7> const QtMobility::QContactAvatar::DefinitionName
+	?FieldFirstName@QContactName@QtMobility@@2U?$QLatin1Constant@$09@2@B @ 991 NONAME ; struct QtMobility::QLatin1Constant<10> const QtMobility::QContactName::FieldFirstName
+	?contactsAdded@QContactManager@QtMobility@@IAEXABV?$QList@I@@@Z @ 992 NONAME ; void QtMobility::QContactManager::contactsAdded(class QList<unsigned int> const &)
+	?d_func@QContactUnionFilter@QtMobility@@AAEPAVQContactUnionFilterPrivate@2@XZ @ 993 NONAME ; class QtMobility::QContactUnionFilterPrivate * QtMobility::QContactUnionFilter::d_func(void)
+	??_EQContactDetailDefinitionRemoveRequest@QtMobility@@UAE@I@Z @ 994 NONAME ; QtMobility::QContactDetailDefinitionRemoveRequest::~QContactDetailDefinitionRemoveRequest(unsigned int)
+	?staticMetaObject@QContactDetailDefinitionSaveRequest@QtMobility@@2UQMetaObject@@B @ 995 NONAME ; struct QMetaObject const QtMobility::QContactDetailDefinitionSaveRequest::staticMetaObject

--- a/qtmobility/src/s60installs/bwins/QtLocationu.def	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/s60installs/bwins/QtLocationu.def	Fri May 14 16:41:33 2010 +0300
@@ -1,137 +1,137 @@
 EXPORTS
-	?supportedPositioningMethods@QNmeaPositionInfoSource@QtMobility@@UBE?AV?$QFlags@W4PositioningMethod@QGeoPositionInfoSource@QtMobility@@@@XZ @ 1 NONAME ; class QFlags<enum QtMobility::QGeoPositionInfoSource::PositioningMethod> QtMobility::QNmeaPositionInfoSource::supportedPositioningMethods(void) const
-	?setUpdateInterval@QNmeaPositionInfoSource@QtMobility@@UAEXH@Z @ 2 NONAME ; void QtMobility::QNmeaPositionInfoSource::setUpdateInterval(int)
-	??6QtMobility@@YA?AVQDebug@@V1@ABVQGeoCoordinate@0@@Z @ 3 NONAME ; class QDebug QtMobility::operator<<(class QDebug, class QtMobility::QGeoCoordinate const &)
-	?positionUpdated@QGeoPositionInfoSource@QtMobility@@IAEXABVQGeoPositionInfo@2@@Z @ 4 NONAME ; void QtMobility::QGeoPositionInfoSource::positionUpdated(class QtMobility::QGeoPositionInfo const &)
-	?getStaticMetaObject@QNmeaPositionInfoSource@QtMobility@@SAABUQMetaObject@@XZ @ 5 NONAME ; struct QMetaObject const & QtMobility::QNmeaPositionInfoSource::getStaticMetaObject(void)
-	??0QGeoPositionInfoSource@QtMobility@@QAE@PAVQObject@@@Z @ 6 NONAME ; QtMobility::QGeoPositionInfoSource::QGeoPositionInfoSource(class QObject *)
-	?tr@QGeoAreaMonitor@QtMobility@@SA?AVQString@@PBD0@Z @ 7 NONAME ; class QString QtMobility::QGeoAreaMonitor::tr(char const *, char const *)
-	?qt_metacall@QNmeaPositionInfoSource@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 8 NONAME ; int QtMobility::QNmeaPositionInfoSource::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??1QGeoPositionInfoSource@QtMobility@@UAE@XZ @ 9 NONAME ; QtMobility::QGeoPositionInfoSource::~QGeoPositionInfoSource(void)
-	?parsePosInfoFromNmeaData@QNmeaPositionInfoSource@QtMobility@@MAE_NPBDHPAVQGeoPositionInfo@2@PA_N@Z @ 10 NONAME ; bool QtMobility::QNmeaPositionInfoSource::parsePosInfoFromNmeaData(char const *, int, class QtMobility::QGeoPositionInfo *, bool *)
-	??5QtMobility@@YAAAVQDataStream@@AAV1@AAVQGeoPositionInfo@0@@Z @ 11 NONAME ; class QDataStream & QtMobility::operator>>(class QDataStream &, class QtMobility::QGeoPositionInfo &)
-	??1QGeoSatelliteInfo@QtMobility@@QAE@XZ @ 12 NONAME ; QtMobility::QGeoSatelliteInfo::~QGeoSatelliteInfo(void)
-	?setCoordinate@QGeoPositionInfo@QtMobility@@QAEXABVQGeoCoordinate@2@@Z @ 13 NONAME ; void QtMobility::QGeoPositionInfo::setCoordinate(class QtMobility::QGeoCoordinate const &)
-	?setCenter@QGeoAreaMonitor@QtMobility@@UAEXABVQGeoCoordinate@2@@Z @ 14 NONAME ; void QtMobility::QGeoAreaMonitor::setCenter(class QtMobility::QGeoCoordinate const &)
-	??0QNmeaPositionInfoSource@QtMobility@@QAE@W4UpdateMode@01@PAVQObject@@@Z @ 15 NONAME ; QtMobility::QNmeaPositionInfoSource::QNmeaPositionInfoSource(enum QtMobility::QNmeaPositionInfoSource::UpdateMode, class QObject *)
-	?updateTimeout@QGeoPositionInfoSource@QtMobility@@IAEXXZ @ 16 NONAME ; void QtMobility::QGeoPositionInfoSource::updateTimeout(void)
-	??0QGeoCoordinate@QtMobility@@QAE@NN@Z @ 17 NONAME ; QtMobility::QGeoCoordinate::QGeoCoordinate(double, double)
-	?updateInterval@QGeoPositionInfoSource@QtMobility@@QBEHXZ @ 18 NONAME ; int QtMobility::QGeoPositionInfoSource::updateInterval(void) const
-	?type@QGeoCoordinate@QtMobility@@QBE?AW4CoordinateType@12@XZ @ 19 NONAME ; enum QtMobility::QGeoCoordinate::CoordinateType QtMobility::QGeoCoordinate::type(void) const
-	?device@QNmeaPositionInfoSource@QtMobility@@QBEPAVQIODevice@@XZ @ 20 NONAME ; class QIODevice * QtMobility::QNmeaPositionInfoSource::device(void) const
-	??8QGeoCoordinate@QtMobility@@QBE_NABV01@@Z @ 21 NONAME ; bool QtMobility::QGeoCoordinate::operator==(class QtMobility::QGeoCoordinate const &) const
-	?setPreferredPositioningMethods@QGeoPositionInfoSource@QtMobility@@UAEXV?$QFlags@W4PositioningMethod@QGeoPositionInfoSource@QtMobility@@@@@Z @ 22 NONAME ; void QtMobility::QGeoPositionInfoSource::setPreferredPositioningMethods(class QFlags<enum QtMobility::QGeoPositionInfoSource::PositioningMethod>)
-	?setAttribute@QGeoPositionInfo@QtMobility@@QAEXW4Attribute@12@M@Z @ 23 NONAME ; void QtMobility::QGeoPositionInfo::setAttribute(enum QtMobility::QGeoPositionInfo::Attribute, float)
-	?hasAttribute@QGeoSatelliteInfo@QtMobility@@QBE_NW4Attribute@12@@Z @ 24 NONAME ; bool QtMobility::QGeoSatelliteInfo::hasAttribute(enum QtMobility::QGeoSatelliteInfo::Attribute) const
-	?signalStrength@QGeoSatelliteInfo@QtMobility@@QBEHXZ @ 25 NONAME ; int QtMobility::QGeoSatelliteInfo::signalStrength(void) const
-	??0QGeoCoordinate@QtMobility@@QAE@NNN@Z @ 26 NONAME ; QtMobility::QGeoCoordinate::QGeoCoordinate(double, double, double)
-	?updateMode@QNmeaPositionInfoSource@QtMobility@@QBE?AW4UpdateMode@12@XZ @ 27 NONAME ; enum QtMobility::QNmeaPositionInfoSource::UpdateMode QtMobility::QNmeaPositionInfoSource::updateMode(void) const
-	?setSignalStrength@QGeoSatelliteInfo@QtMobility@@QAEXH@Z @ 28 NONAME ; void QtMobility::QGeoSatelliteInfo::setSignalStrength(int)
-	??1QGeoCoordinate@QtMobility@@QAE@XZ @ 29 NONAME ; QtMobility::QGeoCoordinate::~QGeoCoordinate(void)
-	?setLatitude@QGeoCoordinate@QtMobility@@QAEXN@Z @ 30 NONAME ; void QtMobility::QGeoCoordinate::setLatitude(double)
-	?setAttribute@QGeoSatelliteInfo@QtMobility@@QAEXW4Attribute@12@M@Z @ 31 NONAME ; void QtMobility::QGeoSatelliteInfo::setAttribute(enum QtMobility::QGeoSatelliteInfo::Attribute, float)
-	?metaObject@QGeoSatelliteInfoSource@QtMobility@@UBEPBUQMetaObject@@XZ @ 32 NONAME ; struct QMetaObject const * QtMobility::QGeoSatelliteInfoSource::metaObject(void) const
-	?tr@QGeoSatelliteInfoSource@QtMobility@@SA?AVQString@@PBD0H@Z @ 33 NONAME ; class QString QtMobility::QGeoSatelliteInfoSource::tr(char const *, char const *, int)
-	??1QGeoPositionInfo@QtMobility@@QAE@XZ @ 34 NONAME ; QtMobility::QGeoPositionInfo::~QGeoPositionInfo(void)
-	??6QtMobility@@YAAAVQDataStream@@AAV1@ABVQGeoPositionInfo@0@@Z @ 35 NONAME ; class QDataStream & QtMobility::operator<<(class QDataStream &, class QtMobility::QGeoPositionInfo const &)
-	?tr@QNmeaPositionInfoSource@QtMobility@@SA?AVQString@@PBD0@Z @ 36 NONAME ; class QString QtMobility::QNmeaPositionInfoSource::tr(char const *, char const *)
-	?trUtf8@QNmeaPositionInfoSource@QtMobility@@SA?AVQString@@PBD0@Z @ 37 NONAME ; class QString QtMobility::QNmeaPositionInfoSource::trUtf8(char const *, char const *)
-	??0QGeoPositionInfo@QtMobility@@QAE@ABV01@@Z @ 38 NONAME ; QtMobility::QGeoPositionInfo::QGeoPositionInfo(class QtMobility::QGeoPositionInfo const &)
-	?getStaticMetaObject@QGeoSatelliteInfoSource@QtMobility@@SAABUQMetaObject@@XZ @ 39 NONAME ; struct QMetaObject const & QtMobility::QGeoSatelliteInfoSource::getStaticMetaObject(void)
-	??5QtMobility@@YAAAVQDataStream@@AAV1@AAVQGeoCoordinate@0@@Z @ 40 NONAME ; class QDataStream & QtMobility::operator>>(class QDataStream &, class QtMobility::QGeoCoordinate &)
-	?attribute@QGeoPositionInfo@QtMobility@@QBEMW4Attribute@12@@Z @ 41 NONAME ; float QtMobility::QGeoPositionInfo::attribute(enum QtMobility::QGeoPositionInfo::Attribute) const
-	?attribute@QGeoSatelliteInfo@QtMobility@@QBEMW4Attribute@12@@Z @ 42 NONAME ; float QtMobility::QGeoSatelliteInfo::attribute(enum QtMobility::QGeoSatelliteInfo::Attribute) const
-	?trUtf8@QGeoAreaMonitor@QtMobility@@SA?AVQString@@PBD0H@Z @ 43 NONAME ; class QString QtMobility::QGeoAreaMonitor::trUtf8(char const *, char const *, int)
-	?hasAttribute@QGeoPositionInfo@QtMobility@@QBE_NW4Attribute@12@@Z @ 44 NONAME ; bool QtMobility::QGeoPositionInfo::hasAttribute(enum QtMobility::QGeoPositionInfo::Attribute) const
-	?trUtf8@QGeoAreaMonitor@QtMobility@@SA?AVQString@@PBD0@Z @ 45 NONAME ; class QString QtMobility::QGeoAreaMonitor::trUtf8(char const *, char const *)
-	?satellitesInViewUpdated@QGeoSatelliteInfoSource@QtMobility@@IAEXABV?$QList@VQGeoSatelliteInfo@QtMobility@@@@@Z @ 46 NONAME ; void QtMobility::QGeoSatelliteInfoSource::satellitesInViewUpdated(class QList<class QtMobility::QGeoSatelliteInfo> const &)
-	??6QtMobility@@YAAAVQDataStream@@AAV1@ABVQGeoSatelliteInfo@0@@Z @ 47 NONAME ; class QDataStream & QtMobility::operator<<(class QDataStream &, class QtMobility::QGeoSatelliteInfo const &)
-	??8QGeoSatelliteInfo@QtMobility@@QBE_NABV01@@Z @ 48 NONAME ; bool QtMobility::QGeoSatelliteInfo::operator==(class QtMobility::QGeoSatelliteInfo const &) const
-	?timestamp@QGeoPositionInfo@QtMobility@@QBE?AVQDateTime@@XZ @ 49 NONAME ; class QDateTime QtMobility::QGeoPositionInfo::timestamp(void) const
-	?setUpdateInterval@QGeoPositionInfoSource@QtMobility@@UAEXH@Z @ 50 NONAME ; void QtMobility::QGeoPositionInfoSource::setUpdateInterval(int)
-	?tr@QGeoPositionInfoSource@QtMobility@@SA?AVQString@@PBD0@Z @ 51 NONAME ; class QString QtMobility::QGeoPositionInfoSource::tr(char const *, char const *)
-	??0QGeoPositionInfo@QtMobility@@QAE@XZ @ 52 NONAME ; QtMobility::QGeoPositionInfo::QGeoPositionInfo(void)
-	?setPrnNumber@QGeoSatelliteInfo@QtMobility@@QAEXH@Z @ 53 NONAME ; void QtMobility::QGeoSatelliteInfo::setPrnNumber(int)
-	?coordinate@QGeoPositionInfo@QtMobility@@QBE?AVQGeoCoordinate@2@XZ @ 54 NONAME ; class QtMobility::QGeoCoordinate QtMobility::QGeoPositionInfo::coordinate(void) const
-	?setTimestamp@QGeoPositionInfo@QtMobility@@QAEXABVQDateTime@@@Z @ 55 NONAME ; void QtMobility::QGeoPositionInfo::setTimestamp(class QDateTime const &)
-	?metaObject@QGeoPositionInfoSource@QtMobility@@UBEPBUQMetaObject@@XZ @ 56 NONAME ; struct QMetaObject const * QtMobility::QGeoPositionInfoSource::metaObject(void) const
-	?removeAttribute@QGeoPositionInfo@QtMobility@@QAEXW4Attribute@12@@Z @ 57 NONAME ; void QtMobility::QGeoPositionInfo::removeAttribute(enum QtMobility::QGeoPositionInfo::Attribute)
-	?metaObject@QNmeaPositionInfoSource@QtMobility@@UBEPBUQMetaObject@@XZ @ 58 NONAME ; struct QMetaObject const * QtMobility::QNmeaPositionInfoSource::metaObject(void) const
-	?tr@QNmeaPositionInfoSource@QtMobility@@SA?AVQString@@PBD0H@Z @ 59 NONAME ; class QString QtMobility::QNmeaPositionInfoSource::tr(char const *, char const *, int)
-	?qt_metacast@QGeoPositionInfoSource@QtMobility@@UAEPAXPBD@Z @ 60 NONAME ; void * QtMobility::QGeoPositionInfoSource::qt_metacast(char const *)
-	?altitude@QGeoCoordinate@QtMobility@@QBENXZ @ 61 NONAME ; double QtMobility::QGeoCoordinate::altitude(void) const
-	?setAltitude@QGeoCoordinate@QtMobility@@QAEXN@Z @ 62 NONAME ; void QtMobility::QGeoCoordinate::setAltitude(double)
-	?stopUpdates@QNmeaPositionInfoSource@QtMobility@@UAEXXZ @ 63 NONAME ; void QtMobility::QNmeaPositionInfoSource::stopUpdates(void)
-	??0QGeoAreaMonitor@QtMobility@@QAE@PAVQObject@@@Z @ 64 NONAME ; QtMobility::QGeoAreaMonitor::QGeoAreaMonitor(class QObject *)
-	?staticMetaObject@QGeoAreaMonitor@QtMobility@@2UQMetaObject@@B @ 65 NONAME ; struct QMetaObject const QtMobility::QGeoAreaMonitor::staticMetaObject
-	?lastKnownPosition@QNmeaPositionInfoSource@QtMobility@@UBE?AVQGeoPositionInfo@2@_N@Z @ 66 NONAME ; class QtMobility::QGeoPositionInfo QtMobility::QNmeaPositionInfoSource::lastKnownPosition(bool) const
-	?qt_metacall@QGeoPositionInfoSource@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 67 NONAME ; int QtMobility::QGeoPositionInfoSource::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??6QtMobility@@YAAAVQDataStream@@AAV1@ABVQGeoCoordinate@0@@Z @ 68 NONAME ; class QDataStream & QtMobility::operator<<(class QDataStream &, class QtMobility::QGeoCoordinate const &)
-	?setRadius@QGeoAreaMonitor@QtMobility@@UAEXM@Z @ 69 NONAME ; void QtMobility::QGeoAreaMonitor::setRadius(float)
-	??_EQGeoPositionInfoSource@QtMobility@@UAE@I@Z @ 70 NONAME ; QtMobility::QGeoPositionInfoSource::~QGeoPositionInfoSource(unsigned int)
-	?trUtf8@QGeoSatelliteInfoSource@QtMobility@@SA?AVQString@@PBD0H@Z @ 71 NONAME ; class QString QtMobility::QGeoSatelliteInfoSource::trUtf8(char const *, char const *, int)
-	?staticMetaObject@QGeoPositionInfoSource@QtMobility@@2UQMetaObject@@B @ 72 NONAME ; struct QMetaObject const QtMobility::QGeoPositionInfoSource::staticMetaObject
-	?qt_metacast@QGeoSatelliteInfoSource@QtMobility@@UAEPAXPBD@Z @ 73 NONAME ; void * QtMobility::QGeoSatelliteInfoSource::qt_metacast(char const *)
-	?setLongitude@QGeoCoordinate@QtMobility@@QAEXN@Z @ 74 NONAME ; void QtMobility::QGeoCoordinate::setLongitude(double)
-	?tr@QGeoSatelliteInfoSource@QtMobility@@SA?AVQString@@PBD0@Z @ 75 NONAME ; class QString QtMobility::QGeoSatelliteInfoSource::tr(char const *, char const *)
-	?trUtf8@QGeoSatelliteInfoSource@QtMobility@@SA?AVQString@@PBD0@Z @ 76 NONAME ; class QString QtMobility::QGeoSatelliteInfoSource::trUtf8(char const *, char const *)
-	?createDefaultSource@QGeoPositionInfoSource@QtMobility@@SAPAV12@PAVQObject@@@Z @ 77 NONAME ; class QtMobility::QGeoPositionInfoSource * QtMobility::QGeoPositionInfoSource::createDefaultSource(class QObject *)
-	??0QGeoPositionInfo@QtMobility@@QAE@ABVQGeoCoordinate@1@ABVQDateTime@@@Z @ 78 NONAME ; QtMobility::QGeoPositionInfo::QGeoPositionInfo(class QtMobility::QGeoCoordinate const &, class QDateTime const &)
-	?requestTimeout@QGeoSatelliteInfoSource@QtMobility@@IAEXXZ @ 79 NONAME ; void QtMobility::QGeoSatelliteInfoSource::requestTimeout(void)
-	?staticMetaObject@QNmeaPositionInfoSource@QtMobility@@2UQMetaObject@@B @ 80 NONAME ; struct QMetaObject const QtMobility::QNmeaPositionInfoSource::staticMetaObject
-	??_EQGeoSatelliteInfoSource@QtMobility@@UAE@I@Z @ 81 NONAME ; QtMobility::QGeoSatelliteInfoSource::~QGeoSatelliteInfoSource(unsigned int)
-	?tr@QGeoPositionInfoSource@QtMobility@@SA?AVQString@@PBD0H@Z @ 82 NONAME ; class QString QtMobility::QGeoPositionInfoSource::tr(char const *, char const *, int)
-	?createDefaultSource@QGeoSatelliteInfoSource@QtMobility@@SAPAV12@PAVQObject@@@Z @ 83 NONAME ; class QtMobility::QGeoSatelliteInfoSource * QtMobility::QGeoSatelliteInfoSource::createDefaultSource(class QObject *)
+	??0QGeoAreaMonitor@QtMobility@@QAE@PAVQObject@@@Z @ 1 NONAME ; QtMobility::QGeoAreaMonitor::QGeoAreaMonitor(class QObject *)
+	??0QGeoCoordinate@QtMobility@@QAE@ABV01@@Z @ 2 NONAME ; QtMobility::QGeoCoordinate::QGeoCoordinate(class QtMobility::QGeoCoordinate const &)
+	??0QGeoCoordinate@QtMobility@@QAE@NN@Z @ 3 NONAME ; QtMobility::QGeoCoordinate::QGeoCoordinate(double, double)
+	??0QGeoCoordinate@QtMobility@@QAE@NNN@Z @ 4 NONAME ; QtMobility::QGeoCoordinate::QGeoCoordinate(double, double, double)
+	??0QGeoCoordinate@QtMobility@@QAE@XZ @ 5 NONAME ; QtMobility::QGeoCoordinate::QGeoCoordinate(void)
+	??0QGeoPositionInfo@QtMobility@@QAE@ABV01@@Z @ 6 NONAME ; QtMobility::QGeoPositionInfo::QGeoPositionInfo(class QtMobility::QGeoPositionInfo const &)
+	??0QGeoPositionInfo@QtMobility@@QAE@ABVQGeoCoordinate@1@ABVQDateTime@@@Z @ 7 NONAME ; QtMobility::QGeoPositionInfo::QGeoPositionInfo(class QtMobility::QGeoCoordinate const &, class QDateTime const &)
+	??0QGeoPositionInfo@QtMobility@@QAE@XZ @ 8 NONAME ; QtMobility::QGeoPositionInfo::QGeoPositionInfo(void)
+	??0QGeoPositionInfoSource@QtMobility@@QAE@PAVQObject@@@Z @ 9 NONAME ; QtMobility::QGeoPositionInfoSource::QGeoPositionInfoSource(class QObject *)
+	??0QGeoSatelliteInfo@QtMobility@@QAE@ABV01@@Z @ 10 NONAME ; QtMobility::QGeoSatelliteInfo::QGeoSatelliteInfo(class QtMobility::QGeoSatelliteInfo const &)
+	??0QGeoSatelliteInfo@QtMobility@@QAE@XZ @ 11 NONAME ; QtMobility::QGeoSatelliteInfo::QGeoSatelliteInfo(void)
+	??0QGeoSatelliteInfoSource@QtMobility@@QAE@PAVQObject@@@Z @ 12 NONAME ; QtMobility::QGeoSatelliteInfoSource::QGeoSatelliteInfoSource(class QObject *)
+	??0QNmeaPositionInfoSource@QtMobility@@QAE@W4UpdateMode@01@PAVQObject@@@Z @ 13 NONAME ; QtMobility::QNmeaPositionInfoSource::QNmeaPositionInfoSource(enum QtMobility::QNmeaPositionInfoSource::UpdateMode, class QObject *)
+	??1QGeoAreaMonitor@QtMobility@@UAE@XZ @ 14 NONAME ; QtMobility::QGeoAreaMonitor::~QGeoAreaMonitor(void)
+	??1QGeoCoordinate@QtMobility@@QAE@XZ @ 15 NONAME ; QtMobility::QGeoCoordinate::~QGeoCoordinate(void)
+	??1QGeoPositionInfo@QtMobility@@QAE@XZ @ 16 NONAME ; QtMobility::QGeoPositionInfo::~QGeoPositionInfo(void)
+	??1QGeoPositionInfoSource@QtMobility@@UAE@XZ @ 17 NONAME ; QtMobility::QGeoPositionInfoSource::~QGeoPositionInfoSource(void)
+	??1QGeoSatelliteInfo@QtMobility@@QAE@XZ @ 18 NONAME ; QtMobility::QGeoSatelliteInfo::~QGeoSatelliteInfo(void)
+	??1QGeoSatelliteInfoSource@QtMobility@@UAE@XZ @ 19 NONAME ; QtMobility::QGeoSatelliteInfoSource::~QGeoSatelliteInfoSource(void)
+	??1QNmeaPositionInfoSource@QtMobility@@UAE@XZ @ 20 NONAME ; QtMobility::QNmeaPositionInfoSource::~QNmeaPositionInfoSource(void)
+	??4QGeoCoordinate@QtMobility@@QAEAAV01@ABV01@@Z @ 21 NONAME ; class QtMobility::QGeoCoordinate & QtMobility::QGeoCoordinate::operator=(class QtMobility::QGeoCoordinate const &)
+	??4QGeoPositionInfo@QtMobility@@QAEAAV01@ABV01@@Z @ 22 NONAME ; class QtMobility::QGeoPositionInfo & QtMobility::QGeoPositionInfo::operator=(class QtMobility::QGeoPositionInfo const &)
+	??4QGeoSatelliteInfo@QtMobility@@QAEAAV01@ABV01@@Z @ 23 NONAME ; class QtMobility::QGeoSatelliteInfo & QtMobility::QGeoSatelliteInfo::operator=(class QtMobility::QGeoSatelliteInfo const &)
+	??5QtMobility@@YAAAVQDataStream@@AAV1@AAVQGeoCoordinate@0@@Z @ 24 NONAME ; class QDataStream & QtMobility::operator>>(class QDataStream &, class QtMobility::QGeoCoordinate &)
+	??5QtMobility@@YAAAVQDataStream@@AAV1@AAVQGeoPositionInfo@0@@Z @ 25 NONAME ; class QDataStream & QtMobility::operator>>(class QDataStream &, class QtMobility::QGeoPositionInfo &)
+	??5QtMobility@@YAAAVQDataStream@@AAV1@AAVQGeoSatelliteInfo@0@@Z @ 26 NONAME ; class QDataStream & QtMobility::operator>>(class QDataStream &, class QtMobility::QGeoSatelliteInfo &)
+	??6QtMobility@@YA?AVQDebug@@V1@ABVQGeoCoordinate@0@@Z @ 27 NONAME ; class QDebug QtMobility::operator<<(class QDebug, class QtMobility::QGeoCoordinate const &)
+	??6QtMobility@@YA?AVQDebug@@V1@ABVQGeoPositionInfo@0@@Z @ 28 NONAME ; class QDebug QtMobility::operator<<(class QDebug, class QtMobility::QGeoPositionInfo const &)
+	??6QtMobility@@YA?AVQDebug@@V1@ABVQGeoSatelliteInfo@0@@Z @ 29 NONAME ; class QDebug QtMobility::operator<<(class QDebug, class QtMobility::QGeoSatelliteInfo const &)
+	??6QtMobility@@YAAAVQDataStream@@AAV1@ABVQGeoCoordinate@0@@Z @ 30 NONAME ; class QDataStream & QtMobility::operator<<(class QDataStream &, class QtMobility::QGeoCoordinate const &)
+	??6QtMobility@@YAAAVQDataStream@@AAV1@ABVQGeoPositionInfo@0@@Z @ 31 NONAME ; class QDataStream & QtMobility::operator<<(class QDataStream &, class QtMobility::QGeoPositionInfo const &)
+	??6QtMobility@@YAAAVQDataStream@@AAV1@ABVQGeoSatelliteInfo@0@@Z @ 32 NONAME ; class QDataStream & QtMobility::operator<<(class QDataStream &, class QtMobility::QGeoSatelliteInfo const &)
+	??8QGeoCoordinate@QtMobility@@QBE_NABV01@@Z @ 33 NONAME ; bool QtMobility::QGeoCoordinate::operator==(class QtMobility::QGeoCoordinate const &) const
+	??8QGeoPositionInfo@QtMobility@@QBE_NABV01@@Z @ 34 NONAME ; bool QtMobility::QGeoPositionInfo::operator==(class QtMobility::QGeoPositionInfo const &) const
+	??8QGeoSatelliteInfo@QtMobility@@QBE_NABV01@@Z @ 35 NONAME ; bool QtMobility::QGeoSatelliteInfo::operator==(class QtMobility::QGeoSatelliteInfo const &) const
+	??9QGeoCoordinate@QtMobility@@QBE_NABV01@@Z @ 36 NONAME ; bool QtMobility::QGeoCoordinate::operator!=(class QtMobility::QGeoCoordinate const &) const
+	??9QGeoPositionInfo@QtMobility@@QBE_NABV01@@Z @ 37 NONAME ; bool QtMobility::QGeoPositionInfo::operator!=(class QtMobility::QGeoPositionInfo const &) const
+	??9QGeoSatelliteInfo@QtMobility@@QBE_NABV01@@Z @ 38 NONAME ; bool QtMobility::QGeoSatelliteInfo::operator!=(class QtMobility::QGeoSatelliteInfo const &) const
+	??_EQGeoAreaMonitor@QtMobility@@UAE@I@Z @ 39 NONAME ; QtMobility::QGeoAreaMonitor::~QGeoAreaMonitor(unsigned int)
+	??_EQGeoPositionInfoSource@QtMobility@@UAE@I@Z @ 40 NONAME ; QtMobility::QGeoPositionInfoSource::~QGeoPositionInfoSource(unsigned int)
+	??_EQGeoSatelliteInfoSource@QtMobility@@UAE@I@Z @ 41 NONAME ; QtMobility::QGeoSatelliteInfoSource::~QGeoSatelliteInfoSource(unsigned int)
+	??_EQNmeaPositionInfoSource@QtMobility@@UAE@I@Z @ 42 NONAME ; QtMobility::QNmeaPositionInfoSource::~QNmeaPositionInfoSource(unsigned int)
+	?altitude@QGeoCoordinate@QtMobility@@QBENXZ @ 43 NONAME ; double QtMobility::QGeoCoordinate::altitude(void) const
+	?areaEntered@QGeoAreaMonitor@QtMobility@@IAEXABVQGeoPositionInfo@2@@Z @ 44 NONAME ; void QtMobility::QGeoAreaMonitor::areaEntered(class QtMobility::QGeoPositionInfo const &)
+	?areaExited@QGeoAreaMonitor@QtMobility@@IAEXABVQGeoPositionInfo@2@@Z @ 45 NONAME ; void QtMobility::QGeoAreaMonitor::areaExited(class QtMobility::QGeoPositionInfo const &)
+	?attribute@QGeoPositionInfo@QtMobility@@QBEMW4Attribute@12@@Z @ 46 NONAME ; float QtMobility::QGeoPositionInfo::attribute(enum QtMobility::QGeoPositionInfo::Attribute) const
+	?attribute@QGeoSatelliteInfo@QtMobility@@QBEMW4Attribute@12@@Z @ 47 NONAME ; float QtMobility::QGeoSatelliteInfo::attribute(enum QtMobility::QGeoSatelliteInfo::Attribute) const
+	?azimuthTo@QGeoCoordinate@QtMobility@@QBEMABV12@@Z @ 48 NONAME ; float QtMobility::QGeoCoordinate::azimuthTo(class QtMobility::QGeoCoordinate const &) const
+	?center@QGeoAreaMonitor@QtMobility@@QBE?AVQGeoCoordinate@2@XZ @ 49 NONAME ; class QtMobility::QGeoCoordinate QtMobility::QGeoAreaMonitor::center(void) const
+	?coordinate@QGeoPositionInfo@QtMobility@@QBE?AVQGeoCoordinate@2@XZ @ 50 NONAME ; class QtMobility::QGeoCoordinate QtMobility::QGeoPositionInfo::coordinate(void) const
+	?createDefaultMonitor@QGeoAreaMonitor@QtMobility@@SAPAV12@PAVQObject@@@Z @ 51 NONAME ; class QtMobility::QGeoAreaMonitor * QtMobility::QGeoAreaMonitor::createDefaultMonitor(class QObject *)
+	?createDefaultSource@QGeoPositionInfoSource@QtMobility@@SAPAV12@PAVQObject@@@Z @ 52 NONAME ; class QtMobility::QGeoPositionInfoSource * QtMobility::QGeoPositionInfoSource::createDefaultSource(class QObject *)
+	?createDefaultSource@QGeoSatelliteInfoSource@QtMobility@@SAPAV12@PAVQObject@@@Z @ 53 NONAME ; class QtMobility::QGeoSatelliteInfoSource * QtMobility::QGeoSatelliteInfoSource::createDefaultSource(class QObject *)
+	?device@QNmeaPositionInfoSource@QtMobility@@QBEPAVQIODevice@@XZ @ 54 NONAME ; class QIODevice * QtMobility::QNmeaPositionInfoSource::device(void) const
+	?distanceTo@QGeoCoordinate@QtMobility@@QBEMABV12@@Z @ 55 NONAME ; float QtMobility::QGeoCoordinate::distanceTo(class QtMobility::QGeoCoordinate const &) const
+	?getStaticMetaObject@QGeoAreaMonitor@QtMobility@@SAABUQMetaObject@@XZ @ 56 NONAME ; struct QMetaObject const & QtMobility::QGeoAreaMonitor::getStaticMetaObject(void)
+	?getStaticMetaObject@QGeoPositionInfoSource@QtMobility@@SAABUQMetaObject@@XZ @ 57 NONAME ; struct QMetaObject const & QtMobility::QGeoPositionInfoSource::getStaticMetaObject(void)
+	?getStaticMetaObject@QGeoSatelliteInfoSource@QtMobility@@SAABUQMetaObject@@XZ @ 58 NONAME ; struct QMetaObject const & QtMobility::QGeoSatelliteInfoSource::getStaticMetaObject(void)
+	?getStaticMetaObject@QNmeaPositionInfoSource@QtMobility@@SAABUQMetaObject@@XZ @ 59 NONAME ; struct QMetaObject const & QtMobility::QNmeaPositionInfoSource::getStaticMetaObject(void)
+	?hasAttribute@QGeoPositionInfo@QtMobility@@QBE_NW4Attribute@12@@Z @ 60 NONAME ; bool QtMobility::QGeoPositionInfo::hasAttribute(enum QtMobility::QGeoPositionInfo::Attribute) const
+	?hasAttribute@QGeoSatelliteInfo@QtMobility@@QBE_NW4Attribute@12@@Z @ 61 NONAME ; bool QtMobility::QGeoSatelliteInfo::hasAttribute(enum QtMobility::QGeoSatelliteInfo::Attribute) const
+	?isValid@QGeoCoordinate@QtMobility@@QBE_NXZ @ 62 NONAME ; bool QtMobility::QGeoCoordinate::isValid(void) const
+	?isValid@QGeoPositionInfo@QtMobility@@QBE_NXZ @ 63 NONAME ; bool QtMobility::QGeoPositionInfo::isValid(void) const
+	?lastKnownPosition@QNmeaPositionInfoSource@QtMobility@@UBE?AVQGeoPositionInfo@2@_N@Z @ 64 NONAME ; class QtMobility::QGeoPositionInfo QtMobility::QNmeaPositionInfoSource::lastKnownPosition(bool) const
+	?latitude@QGeoCoordinate@QtMobility@@QBENXZ @ 65 NONAME ; double QtMobility::QGeoCoordinate::latitude(void) const
+	?longitude@QGeoCoordinate@QtMobility@@QBENXZ @ 66 NONAME ; double QtMobility::QGeoCoordinate::longitude(void) const
+	?metaObject@QGeoAreaMonitor@QtMobility@@UBEPBUQMetaObject@@XZ @ 67 NONAME ; struct QMetaObject const * QtMobility::QGeoAreaMonitor::metaObject(void) const
+	?metaObject@QGeoPositionInfoSource@QtMobility@@UBEPBUQMetaObject@@XZ @ 68 NONAME ; struct QMetaObject const * QtMobility::QGeoPositionInfoSource::metaObject(void) const
+	?metaObject@QGeoSatelliteInfoSource@QtMobility@@UBEPBUQMetaObject@@XZ @ 69 NONAME ; struct QMetaObject const * QtMobility::QGeoSatelliteInfoSource::metaObject(void) const
+	?metaObject@QNmeaPositionInfoSource@QtMobility@@UBEPBUQMetaObject@@XZ @ 70 NONAME ; struct QMetaObject const * QtMobility::QNmeaPositionInfoSource::metaObject(void) const
+	?minimumUpdateInterval@QNmeaPositionInfoSource@QtMobility@@UBEHXZ @ 71 NONAME ; int QtMobility::QNmeaPositionInfoSource::minimumUpdateInterval(void) const
+	?parsePosInfoFromNmeaData@QNmeaPositionInfoSource@QtMobility@@MAE_NPBDHPAVQGeoPositionInfo@2@PA_N@Z @ 72 NONAME ; bool QtMobility::QNmeaPositionInfoSource::parsePosInfoFromNmeaData(char const *, int, class QtMobility::QGeoPositionInfo *, bool *)
+	?positionUpdated@QGeoPositionInfoSource@QtMobility@@IAEXABVQGeoPositionInfo@2@@Z @ 73 NONAME ; void QtMobility::QGeoPositionInfoSource::positionUpdated(class QtMobility::QGeoPositionInfo const &)
+	?preferredPositioningMethods@QGeoPositionInfoSource@QtMobility@@QBE?AV?$QFlags@W4PositioningMethod@QGeoPositionInfoSource@QtMobility@@@@XZ @ 74 NONAME ; class QFlags<enum QtMobility::QGeoPositionInfoSource::PositioningMethod> QtMobility::QGeoPositionInfoSource::preferredPositioningMethods(void) const
+	?prnNumber@QGeoSatelliteInfo@QtMobility@@QBEHXZ @ 75 NONAME ; int QtMobility::QGeoSatelliteInfo::prnNumber(void) const
+	?qt_metacall@QGeoAreaMonitor@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 76 NONAME ; int QtMobility::QGeoAreaMonitor::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QGeoPositionInfoSource@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 77 NONAME ; int QtMobility::QGeoPositionInfoSource::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QGeoSatelliteInfoSource@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 78 NONAME ; int QtMobility::QGeoSatelliteInfoSource::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QNmeaPositionInfoSource@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 79 NONAME ; int QtMobility::QNmeaPositionInfoSource::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacast@QGeoAreaMonitor@QtMobility@@UAEPAXPBD@Z @ 80 NONAME ; void * QtMobility::QGeoAreaMonitor::qt_metacast(char const *)
+	?qt_metacast@QGeoPositionInfoSource@QtMobility@@UAEPAXPBD@Z @ 81 NONAME ; void * QtMobility::QGeoPositionInfoSource::qt_metacast(char const *)
+	?qt_metacast@QGeoSatelliteInfoSource@QtMobility@@UAEPAXPBD@Z @ 82 NONAME ; void * QtMobility::QGeoSatelliteInfoSource::qt_metacast(char const *)
+	?qt_metacast@QNmeaPositionInfoSource@QtMobility@@UAEPAXPBD@Z @ 83 NONAME ; void * QtMobility::QNmeaPositionInfoSource::qt_metacast(char const *)
 	?radius@QGeoAreaMonitor@QtMobility@@QBEMXZ @ 84 NONAME ; float QtMobility::QGeoAreaMonitor::radius(void) const
-	?trUtf8@QGeoPositionInfoSource@QtMobility@@SA?AVQString@@PBD0H@Z @ 85 NONAME ; class QString QtMobility::QGeoPositionInfoSource::trUtf8(char const *, char const *, int)
-	?areaEntered@QGeoAreaMonitor@QtMobility@@IAEXABVQGeoPositionInfo@2@@Z @ 86 NONAME ; void QtMobility::QGeoAreaMonitor::areaEntered(class QtMobility::QGeoPositionInfo const &)
-	?prnNumber@QGeoSatelliteInfo@QtMobility@@QBEHXZ @ 87 NONAME ; int QtMobility::QGeoSatelliteInfo::prnNumber(void) const
-	??4QGeoCoordinate@QtMobility@@QAEAAV01@ABV01@@Z @ 88 NONAME ; class QtMobility::QGeoCoordinate & QtMobility::QGeoCoordinate::operator=(class QtMobility::QGeoCoordinate const &)
-	?azimuthTo@QGeoCoordinate@QtMobility@@QBEMABV12@@Z @ 89 NONAME ; float QtMobility::QGeoCoordinate::azimuthTo(class QtMobility::QGeoCoordinate const &) const
-	??0QGeoCoordinate@QtMobility@@QAE@ABV01@@Z @ 90 NONAME ; QtMobility::QGeoCoordinate::QGeoCoordinate(class QtMobility::QGeoCoordinate const &)
-	??1QNmeaPositionInfoSource@QtMobility@@UAE@XZ @ 91 NONAME ; QtMobility::QNmeaPositionInfoSource::~QNmeaPositionInfoSource(void)
-	?staticMetaObject@QGeoSatelliteInfoSource@QtMobility@@2UQMetaObject@@B @ 92 NONAME ; struct QMetaObject const QtMobility::QGeoSatelliteInfoSource::staticMetaObject
-	??0QGeoSatelliteInfo@QtMobility@@QAE@XZ @ 93 NONAME ; QtMobility::QGeoSatelliteInfo::QGeoSatelliteInfo(void)
-	?minimumUpdateInterval@QNmeaPositionInfoSource@QtMobility@@UBEHXZ @ 94 NONAME ; int QtMobility::QNmeaPositionInfoSource::minimumUpdateInterval(void) const
-	?isValid@QGeoCoordinate@QtMobility@@QBE_NXZ @ 95 NONAME ; bool QtMobility::QGeoCoordinate::isValid(void) const
-	?qt_metacast@QNmeaPositionInfoSource@QtMobility@@UAEPAXPBD@Z @ 96 NONAME ; void * QtMobility::QNmeaPositionInfoSource::qt_metacast(char const *)
-	?areaExited@QGeoAreaMonitor@QtMobility@@IAEXABVQGeoPositionInfo@2@@Z @ 97 NONAME ; void QtMobility::QGeoAreaMonitor::areaExited(class QtMobility::QGeoPositionInfo const &)
-	?trUtf8@QNmeaPositionInfoSource@QtMobility@@SA?AVQString@@PBD0H@Z @ 98 NONAME ; class QString QtMobility::QNmeaPositionInfoSource::trUtf8(char const *, char const *, int)
-	?tr@QGeoAreaMonitor@QtMobility@@SA?AVQString@@PBD0H@Z @ 99 NONAME ; class QString QtMobility::QGeoAreaMonitor::tr(char const *, char const *, int)
-	??_EQGeoAreaMonitor@QtMobility@@UAE@I@Z @ 100 NONAME ; QtMobility::QGeoAreaMonitor::~QGeoAreaMonitor(unsigned int)
-	?getStaticMetaObject@QGeoPositionInfoSource@QtMobility@@SAABUQMetaObject@@XZ @ 101 NONAME ; struct QMetaObject const & QtMobility::QGeoPositionInfoSource::getStaticMetaObject(void)
-	??5QtMobility@@YAAAVQDataStream@@AAV1@AAVQGeoSatelliteInfo@0@@Z @ 102 NONAME ; class QDataStream & QtMobility::operator>>(class QDataStream &, class QtMobility::QGeoSatelliteInfo &)
-	??1QGeoAreaMonitor@QtMobility@@UAE@XZ @ 103 NONAME ; QtMobility::QGeoAreaMonitor::~QGeoAreaMonitor(void)
-	??0QGeoSatelliteInfo@QtMobility@@QAE@ABV01@@Z @ 104 NONAME ; QtMobility::QGeoSatelliteInfo::QGeoSatelliteInfo(class QtMobility::QGeoSatelliteInfo const &)
-	??9QGeoSatelliteInfo@QtMobility@@QBE_NABV01@@Z @ 105 NONAME ; bool QtMobility::QGeoSatelliteInfo::operator!=(class QtMobility::QGeoSatelliteInfo const &) const
-	??4QGeoSatelliteInfo@QtMobility@@QAEAAV01@ABV01@@Z @ 106 NONAME ; class QtMobility::QGeoSatelliteInfo & QtMobility::QGeoSatelliteInfo::operator=(class QtMobility::QGeoSatelliteInfo const &)
-	??9QGeoCoordinate@QtMobility@@QBE_NABV01@@Z @ 107 NONAME ; bool QtMobility::QGeoCoordinate::operator!=(class QtMobility::QGeoCoordinate const &) const
-	??8QGeoPositionInfo@QtMobility@@QBE_NABV01@@Z @ 108 NONAME ; bool QtMobility::QGeoPositionInfo::operator==(class QtMobility::QGeoPositionInfo const &) const
-	?qt_metacast@QGeoAreaMonitor@QtMobility@@UAEPAXPBD@Z @ 109 NONAME ; void * QtMobility::QGeoAreaMonitor::qt_metacast(char const *)
-	??1QGeoSatelliteInfoSource@QtMobility@@UAE@XZ @ 110 NONAME ; QtMobility::QGeoSatelliteInfoSource::~QGeoSatelliteInfoSource(void)
-	?createDefaultMonitor@QGeoAreaMonitor@QtMobility@@SAPAV12@PAVQObject@@@Z @ 111 NONAME ; class QtMobility::QGeoAreaMonitor * QtMobility::QGeoAreaMonitor::createDefaultMonitor(class QObject *)
-	?getStaticMetaObject@QGeoAreaMonitor@QtMobility@@SAABUQMetaObject@@XZ @ 112 NONAME ; struct QMetaObject const & QtMobility::QGeoAreaMonitor::getStaticMetaObject(void)
-	?longitude@QGeoCoordinate@QtMobility@@QBENXZ @ 113 NONAME ; double QtMobility::QGeoCoordinate::longitude(void) const
-	?preferredPositioningMethods@QGeoPositionInfoSource@QtMobility@@QBE?AV?$QFlags@W4PositioningMethod@QGeoPositionInfoSource@QtMobility@@@@XZ @ 114 NONAME ; class QFlags<enum QtMobility::QGeoPositionInfoSource::PositioningMethod> QtMobility::QGeoPositionInfoSource::preferredPositioningMethods(void) const
-	??9QGeoPositionInfo@QtMobility@@QBE_NABV01@@Z @ 115 NONAME ; bool QtMobility::QGeoPositionInfo::operator!=(class QtMobility::QGeoPositionInfo const &) const
-	?requestUpdate@QNmeaPositionInfoSource@QtMobility@@UAEXH@Z @ 116 NONAME ; void QtMobility::QNmeaPositionInfoSource::requestUpdate(int)
-	??0QGeoSatelliteInfoSource@QtMobility@@QAE@PAVQObject@@@Z @ 117 NONAME ; QtMobility::QGeoSatelliteInfoSource::QGeoSatelliteInfoSource(class QObject *)
-	?latitude@QGeoCoordinate@QtMobility@@QBENXZ @ 118 NONAME ; double QtMobility::QGeoCoordinate::latitude(void) const
-	?distanceTo@QGeoCoordinate@QtMobility@@QBEMABV12@@Z @ 119 NONAME ; float QtMobility::QGeoCoordinate::distanceTo(class QtMobility::QGeoCoordinate const &) const
-	?setDevice@QNmeaPositionInfoSource@QtMobility@@QAEXPAVQIODevice@@@Z @ 120 NONAME ; void QtMobility::QNmeaPositionInfoSource::setDevice(class QIODevice *)
-	?center@QGeoAreaMonitor@QtMobility@@QBE?AVQGeoCoordinate@2@XZ @ 121 NONAME ; class QtMobility::QGeoCoordinate QtMobility::QGeoAreaMonitor::center(void) const
-	?qt_metacall@QGeoSatelliteInfoSource@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 122 NONAME ; int QtMobility::QGeoSatelliteInfoSource::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??6QtMobility@@YA?AVQDebug@@V1@ABVQGeoPositionInfo@0@@Z @ 123 NONAME ; class QDebug QtMobility::operator<<(class QDebug, class QtMobility::QGeoPositionInfo const &)
-	??4QGeoPositionInfo@QtMobility@@QAEAAV01@ABV01@@Z @ 124 NONAME ; class QtMobility::QGeoPositionInfo & QtMobility::QGeoPositionInfo::operator=(class QtMobility::QGeoPositionInfo const &)
-	?isValid@QGeoPositionInfo@QtMobility@@QBE_NXZ @ 125 NONAME ; bool QtMobility::QGeoPositionInfo::isValid(void) const
-	??6QtMobility@@YA?AVQDebug@@V1@ABVQGeoSatelliteInfo@0@@Z @ 126 NONAME ; class QDebug QtMobility::operator<<(class QDebug, class QtMobility::QGeoSatelliteInfo const &)
-	?qt_metacall@QGeoAreaMonitor@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 127 NONAME ; int QtMobility::QGeoAreaMonitor::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?satellitesInUseUpdated@QGeoSatelliteInfoSource@QtMobility@@IAEXABV?$QList@VQGeoSatelliteInfo@QtMobility@@@@@Z @ 128 NONAME ; void QtMobility::QGeoSatelliteInfoSource::satellitesInUseUpdated(class QList<class QtMobility::QGeoSatelliteInfo> const &)
-	??0QGeoCoordinate@QtMobility@@QAE@XZ @ 129 NONAME ; QtMobility::QGeoCoordinate::QGeoCoordinate(void)
-	??_EQNmeaPositionInfoSource@QtMobility@@UAE@I@Z @ 130 NONAME ; QtMobility::QNmeaPositionInfoSource::~QNmeaPositionInfoSource(unsigned int)
-	?removeAttribute@QGeoSatelliteInfo@QtMobility@@QAEXW4Attribute@12@@Z @ 131 NONAME ; void QtMobility::QGeoSatelliteInfo::removeAttribute(enum QtMobility::QGeoSatelliteInfo::Attribute)
-	?trUtf8@QGeoPositionInfoSource@QtMobility@@SA?AVQString@@PBD0@Z @ 132 NONAME ; class QString QtMobility::QGeoPositionInfoSource::trUtf8(char const *, char const *)
-	?metaObject@QGeoAreaMonitor@QtMobility@@UBEPBUQMetaObject@@XZ @ 133 NONAME ; struct QMetaObject const * QtMobility::QGeoAreaMonitor::metaObject(void) const
-	?startUpdates@QNmeaPositionInfoSource@QtMobility@@UAEXXZ @ 134 NONAME ; void QtMobility::QNmeaPositionInfoSource::startUpdates(void)
-	?toString@QGeoCoordinate@QtMobility@@QBE?AVQString@@W4CoordinateFormat@12@@Z @ 135 NONAME ; class QString QtMobility::QGeoCoordinate::toString(enum QtMobility::QGeoCoordinate::CoordinateFormat) const
+	?removeAttribute@QGeoPositionInfo@QtMobility@@QAEXW4Attribute@12@@Z @ 85 NONAME ; void QtMobility::QGeoPositionInfo::removeAttribute(enum QtMobility::QGeoPositionInfo::Attribute)
+	?removeAttribute@QGeoSatelliteInfo@QtMobility@@QAEXW4Attribute@12@@Z @ 86 NONAME ; void QtMobility::QGeoSatelliteInfo::removeAttribute(enum QtMobility::QGeoSatelliteInfo::Attribute)
+	?requestTimeout@QGeoSatelliteInfoSource@QtMobility@@IAEXXZ @ 87 NONAME ; void QtMobility::QGeoSatelliteInfoSource::requestTimeout(void)
+	?requestUpdate@QNmeaPositionInfoSource@QtMobility@@UAEXH@Z @ 88 NONAME ; void QtMobility::QNmeaPositionInfoSource::requestUpdate(int)
+	?satellitesInUseUpdated@QGeoSatelliteInfoSource@QtMobility@@IAEXABV?$QList@VQGeoSatelliteInfo@QtMobility@@@@@Z @ 89 NONAME ; void QtMobility::QGeoSatelliteInfoSource::satellitesInUseUpdated(class QList<class QtMobility::QGeoSatelliteInfo> const &)
+	?satellitesInViewUpdated@QGeoSatelliteInfoSource@QtMobility@@IAEXABV?$QList@VQGeoSatelliteInfo@QtMobility@@@@@Z @ 90 NONAME ; void QtMobility::QGeoSatelliteInfoSource::satellitesInViewUpdated(class QList<class QtMobility::QGeoSatelliteInfo> const &)
+	?setAltitude@QGeoCoordinate@QtMobility@@QAEXN@Z @ 91 NONAME ; void QtMobility::QGeoCoordinate::setAltitude(double)
+	?setAttribute@QGeoPositionInfo@QtMobility@@QAEXW4Attribute@12@M@Z @ 92 NONAME ; void QtMobility::QGeoPositionInfo::setAttribute(enum QtMobility::QGeoPositionInfo::Attribute, float)
+	?setAttribute@QGeoSatelliteInfo@QtMobility@@QAEXW4Attribute@12@M@Z @ 93 NONAME ; void QtMobility::QGeoSatelliteInfo::setAttribute(enum QtMobility::QGeoSatelliteInfo::Attribute, float)
+	?setCenter@QGeoAreaMonitor@QtMobility@@UAEXABVQGeoCoordinate@2@@Z @ 94 NONAME ; void QtMobility::QGeoAreaMonitor::setCenter(class QtMobility::QGeoCoordinate const &)
+	?setCoordinate@QGeoPositionInfo@QtMobility@@QAEXABVQGeoCoordinate@2@@Z @ 95 NONAME ; void QtMobility::QGeoPositionInfo::setCoordinate(class QtMobility::QGeoCoordinate const &)
+	?setDevice@QNmeaPositionInfoSource@QtMobility@@QAEXPAVQIODevice@@@Z @ 96 NONAME ; void QtMobility::QNmeaPositionInfoSource::setDevice(class QIODevice *)
+	?setLatitude@QGeoCoordinate@QtMobility@@QAEXN@Z @ 97 NONAME ; void QtMobility::QGeoCoordinate::setLatitude(double)
+	?setLongitude@QGeoCoordinate@QtMobility@@QAEXN@Z @ 98 NONAME ; void QtMobility::QGeoCoordinate::setLongitude(double)
+	?setPreferredPositioningMethods@QGeoPositionInfoSource@QtMobility@@UAEXV?$QFlags@W4PositioningMethod@QGeoPositionInfoSource@QtMobility@@@@@Z @ 99 NONAME ; void QtMobility::QGeoPositionInfoSource::setPreferredPositioningMethods(class QFlags<enum QtMobility::QGeoPositionInfoSource::PositioningMethod>)
+	?setPrnNumber@QGeoSatelliteInfo@QtMobility@@QAEXH@Z @ 100 NONAME ; void QtMobility::QGeoSatelliteInfo::setPrnNumber(int)
+	?setRadius@QGeoAreaMonitor@QtMobility@@UAEXM@Z @ 101 NONAME ; void QtMobility::QGeoAreaMonitor::setRadius(float)
+	?setSignalStrength@QGeoSatelliteInfo@QtMobility@@QAEXH@Z @ 102 NONAME ; void QtMobility::QGeoSatelliteInfo::setSignalStrength(int)
+	?setTimestamp@QGeoPositionInfo@QtMobility@@QAEXABVQDateTime@@@Z @ 103 NONAME ; void QtMobility::QGeoPositionInfo::setTimestamp(class QDateTime const &)
+	?setUpdateInterval@QGeoPositionInfoSource@QtMobility@@UAEXH@Z @ 104 NONAME ; void QtMobility::QGeoPositionInfoSource::setUpdateInterval(int)
+	?setUpdateInterval@QNmeaPositionInfoSource@QtMobility@@UAEXH@Z @ 105 NONAME ; void QtMobility::QNmeaPositionInfoSource::setUpdateInterval(int)
+	?signalStrength@QGeoSatelliteInfo@QtMobility@@QBEHXZ @ 106 NONAME ; int QtMobility::QGeoSatelliteInfo::signalStrength(void) const
+	?startUpdates@QNmeaPositionInfoSource@QtMobility@@UAEXXZ @ 107 NONAME ; void QtMobility::QNmeaPositionInfoSource::startUpdates(void)
+	?stopUpdates@QNmeaPositionInfoSource@QtMobility@@UAEXXZ @ 108 NONAME ; void QtMobility::QNmeaPositionInfoSource::stopUpdates(void)
+	?supportedPositioningMethods@QNmeaPositionInfoSource@QtMobility@@UBE?AV?$QFlags@W4PositioningMethod@QGeoPositionInfoSource@QtMobility@@@@XZ @ 109 NONAME ; class QFlags<enum QtMobility::QGeoPositionInfoSource::PositioningMethod> QtMobility::QNmeaPositionInfoSource::supportedPositioningMethods(void) const
+	?timestamp@QGeoPositionInfo@QtMobility@@QBE?AVQDateTime@@XZ @ 110 NONAME ; class QDateTime QtMobility::QGeoPositionInfo::timestamp(void) const
+	?toString@QGeoCoordinate@QtMobility@@QBE?AVQString@@W4CoordinateFormat@12@@Z @ 111 NONAME ; class QString QtMobility::QGeoCoordinate::toString(enum QtMobility::QGeoCoordinate::CoordinateFormat) const
+	?tr@QGeoAreaMonitor@QtMobility@@SA?AVQString@@PBD0@Z @ 112 NONAME ; class QString QtMobility::QGeoAreaMonitor::tr(char const *, char const *)
+	?tr@QGeoAreaMonitor@QtMobility@@SA?AVQString@@PBD0H@Z @ 113 NONAME ; class QString QtMobility::QGeoAreaMonitor::tr(char const *, char const *, int)
+	?tr@QGeoPositionInfoSource@QtMobility@@SA?AVQString@@PBD0@Z @ 114 NONAME ; class QString QtMobility::QGeoPositionInfoSource::tr(char const *, char const *)
+	?tr@QGeoPositionInfoSource@QtMobility@@SA?AVQString@@PBD0H@Z @ 115 NONAME ; class QString QtMobility::QGeoPositionInfoSource::tr(char const *, char const *, int)
+	?tr@QGeoSatelliteInfoSource@QtMobility@@SA?AVQString@@PBD0@Z @ 116 NONAME ; class QString QtMobility::QGeoSatelliteInfoSource::tr(char const *, char const *)
+	?tr@QGeoSatelliteInfoSource@QtMobility@@SA?AVQString@@PBD0H@Z @ 117 NONAME ; class QString QtMobility::QGeoSatelliteInfoSource::tr(char const *, char const *, int)
+	?tr@QNmeaPositionInfoSource@QtMobility@@SA?AVQString@@PBD0@Z @ 118 NONAME ; class QString QtMobility::QNmeaPositionInfoSource::tr(char const *, char const *)
+	?tr@QNmeaPositionInfoSource@QtMobility@@SA?AVQString@@PBD0H@Z @ 119 NONAME ; class QString QtMobility::QNmeaPositionInfoSource::tr(char const *, char const *, int)
+	?trUtf8@QGeoAreaMonitor@QtMobility@@SA?AVQString@@PBD0@Z @ 120 NONAME ; class QString QtMobility::QGeoAreaMonitor::trUtf8(char const *, char const *)
+	?trUtf8@QGeoAreaMonitor@QtMobility@@SA?AVQString@@PBD0H@Z @ 121 NONAME ; class QString QtMobility::QGeoAreaMonitor::trUtf8(char const *, char const *, int)
+	?trUtf8@QGeoPositionInfoSource@QtMobility@@SA?AVQString@@PBD0@Z @ 122 NONAME ; class QString QtMobility::QGeoPositionInfoSource::trUtf8(char const *, char const *)
+	?trUtf8@QGeoPositionInfoSource@QtMobility@@SA?AVQString@@PBD0H@Z @ 123 NONAME ; class QString QtMobility::QGeoPositionInfoSource::trUtf8(char const *, char const *, int)
+	?trUtf8@QGeoSatelliteInfoSource@QtMobility@@SA?AVQString@@PBD0@Z @ 124 NONAME ; class QString QtMobility::QGeoSatelliteInfoSource::trUtf8(char const *, char const *)
+	?trUtf8@QGeoSatelliteInfoSource@QtMobility@@SA?AVQString@@PBD0H@Z @ 125 NONAME ; class QString QtMobility::QGeoSatelliteInfoSource::trUtf8(char const *, char const *, int)
+	?trUtf8@QNmeaPositionInfoSource@QtMobility@@SA?AVQString@@PBD0@Z @ 126 NONAME ; class QString QtMobility::QNmeaPositionInfoSource::trUtf8(char const *, char const *)
+	?trUtf8@QNmeaPositionInfoSource@QtMobility@@SA?AVQString@@PBD0H@Z @ 127 NONAME ; class QString QtMobility::QNmeaPositionInfoSource::trUtf8(char const *, char const *, int)
+	?type@QGeoCoordinate@QtMobility@@QBE?AW4CoordinateType@12@XZ @ 128 NONAME ; enum QtMobility::QGeoCoordinate::CoordinateType QtMobility::QGeoCoordinate::type(void) const
+	?updateInterval@QGeoPositionInfoSource@QtMobility@@QBEHXZ @ 129 NONAME ; int QtMobility::QGeoPositionInfoSource::updateInterval(void) const
+	?updateMode@QNmeaPositionInfoSource@QtMobility@@QBE?AW4UpdateMode@12@XZ @ 130 NONAME ; enum QtMobility::QNmeaPositionInfoSource::UpdateMode QtMobility::QNmeaPositionInfoSource::updateMode(void) const
+	?updateTimeout@QGeoPositionInfoSource@QtMobility@@IAEXXZ @ 131 NONAME ; void QtMobility::QGeoPositionInfoSource::updateTimeout(void)
+	?staticMetaObject@QGeoAreaMonitor@QtMobility@@2UQMetaObject@@B @ 132 NONAME ; struct QMetaObject const QtMobility::QGeoAreaMonitor::staticMetaObject
+	?staticMetaObject@QGeoPositionInfoSource@QtMobility@@2UQMetaObject@@B @ 133 NONAME ; struct QMetaObject const QtMobility::QGeoPositionInfoSource::staticMetaObject
+	?staticMetaObject@QNmeaPositionInfoSource@QtMobility@@2UQMetaObject@@B @ 134 NONAME ; struct QMetaObject const QtMobility::QNmeaPositionInfoSource::staticMetaObject
+	?staticMetaObject@QGeoSatelliteInfoSource@QtMobility@@2UQMetaObject@@B @ 135 NONAME ; struct QMetaObject const QtMobility::QGeoSatelliteInfoSource::staticMetaObject

--- a/qtmobility/src/s60installs/bwins/QtMediau.def	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/s60installs/bwins/QtMediau.def	Fri May 14 16:41:33 2010 +0300
@@ -1,928 +1,928 @@
 EXPORTS
-	?qt_metacast@QMediaPlaylistIOPlugin@QtMobility@@UAEPAXPBD@Z @ 1 NONAME ; void * QtMobility::QMediaPlaylistIOPlugin::qt_metacast(char const *)
-	?hueChanged@QVideoWidgetControl@QtMobility@@IAEXH@Z @ 2 NONAME ; void QtMobility::QVideoWidgetControl::hueChanged(int)
-	??YQMediaTimeRange@QtMobility@@QAEAAV01@ABV01@@Z @ 3 NONAME ; class QtMobility::QMediaTimeRange & QtMobility::QMediaTimeRange::operator+=(class QtMobility::QMediaTimeRange const &)
-	?qt_metacall@QAudioCaptureSource@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 4 NONAME ; int QtMobility::QAudioCaptureSource::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QVideoWidgetControl@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 5 NONAME ; int QtMobility::QVideoWidgetControl::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??8QMediaServiceProviderHint@QtMobility@@QBE_NABV01@@Z @ 6 NONAME ; bool QtMobility::QMediaServiceProviderHint::operator==(class QtMobility::QMediaServiceProviderHint const &) const
-	?tr@QImageEncoderControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 7 NONAME ; class QString QtMobility::QImageEncoderControl::tr(char const *, char const *, int)
-	?staticMetaObject@QMediaPlaylistNavigator@QtMobility@@2UQMetaObject@@B @ 8 NONAME ; struct QMetaObject const QtMobility::QMediaPlaylistNavigator::staticMetaObject
-	?load@QMediaPlaylistProvider@QtMobility@@UAE_NPAVQIODevice@@PBD@Z @ 9 NONAME ; bool QtMobility::QMediaPlaylistProvider::load(class QIODevice *, char const *)
-	?stateChanged@QMediaRecorderControl@QtMobility@@IAEXW4State@QMediaRecorder@2@@Z @ 10 NONAME ; void QtMobility::QMediaRecorderControl::stateChanged(enum QtMobility::QMediaRecorder::State)
-	?tr@QMediaRecorder@QtMobility@@SA?AVQString@@PBD0@Z @ 11 NONAME ; class QString QtMobility::QMediaRecorder::tr(char const *, char const *)
-	?getStaticMetaObject@QMediaServiceProviderPlugin@QtMobility@@SAABUQMetaObject@@XZ @ 12 NONAME ; struct QMetaObject const & QtMobility::QMediaServiceProviderPlugin::getStaticMetaObject(void)
-	?trUtf8@QMediaPlaylistControl@QtMobility@@SA?AVQString@@PBD0@Z @ 13 NONAME ; class QString QtMobility::QMediaPlaylistControl::trUtf8(char const *, char const *)
-	?setOffset@QGraphicsVideoItem@QtMobility@@QAEXABVQPointF@@@Z @ 14 NONAME ; void QtMobility::QGraphicsVideoItem::setOffset(class QPointF const &)
-	?previousItem@QMediaPlaylistNavigator@QtMobility@@QBE?AVQMediaContent@2@H@Z @ 15 NONAME ; class QtMobility::QMediaContent QtMobility::QMediaPlaylistNavigator::previousItem(int) const
-	?setBand@QRadioTuner@QtMobility@@QAEXW4Band@12@@Z @ 16 NONAME ; void QtMobility::QRadioTuner::setBand(enum QtMobility::QRadioTuner::Band)
-	?error@QMediaPlayer@QtMobility@@QBE?AW4Error@12@XZ @ 17 NONAME ; enum QtMobility::QMediaPlayer::Error QtMobility::QMediaPlayer::error(void) const
-	?staticMetaObject@QAudioCaptureSource@QtMobility@@2UQMetaObject@@B @ 18 NONAME ; struct QMetaObject const QtMobility::QAudioCaptureSource::staticMetaObject
-	?paintEvent@QVideoWidget@QtMobility@@MAEXPAVQPaintEvent@@@Z @ 19 NONAME ; void QtMobility::QVideoWidget::paintEvent(class QPaintEvent *)
-	?devices@QMediaServiceProvider@QtMobility@@UBE?AV?$QList@VQByteArray@@@@ABVQByteArray@@@Z @ 20 NONAME ; class QList<class QByteArray> QtMobility::QMediaServiceProvider::devices(class QByteArray const &) const
-	?trUtf8@QLocalMediaPlaylistProvider@QtMobility@@SA?AVQString@@PBD0@Z @ 21 NONAME ; class QString QtMobility::QLocalMediaPlaylistProvider::trUtf8(char const *, char const *)
-	?tr@QLocalMediaPlaylistProvider@QtMobility@@SA?AVQString@@PBD0H@Z @ 22 NONAME ; class QString QtMobility::QLocalMediaPlaylistProvider::tr(char const *, char const *, int)
-	?qt_metacall@QMediaPlaylistNavigator@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 23 NONAME ; int QtMobility::QMediaPlaylistNavigator::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?mimeType@QMediaResource@QtMobility@@QBE?AVQString@@XZ @ 24 NONAME ; class QString QtMobility::QMediaResource::mimeType(void) const
-	?playlistProviderChanged@QMediaPlaylistControl@QtMobility@@IAEXXZ @ 25 NONAME ; void QtMobility::QMediaPlaylistControl::playlistProviderChanged(void)
-	??0QRadioTuner@QtMobility@@QAE@PAVQObject@@PAVQMediaServiceProvider@1@@Z @ 26 NONAME ; QtMobility::QRadioTuner::QRadioTuner(class QObject *, class QtMobility::QMediaServiceProvider *)
-	??0QMediaTimeInterval@QtMobility@@QAE@ABV01@@Z @ 27 NONAME ; QtMobility::QMediaTimeInterval::QMediaTimeInterval(class QtMobility::QMediaTimeInterval const &)
-	??1QImageEncoderSettings@QtMobility@@QAE@XZ @ 28 NONAME ; QtMobility::QImageEncoderSettings::~QImageEncoderSettings(void)
-	?tr@QMetaDataControl@QtMobility@@SA?AVQString@@PBD0@Z @ 29 NONAME ; class QString QtMobility::QMetaDataControl::tr(char const *, char const *)
-	?getStaticMetaObject@QMediaPlaylist@QtMobility@@SAABUQMetaObject@@XZ @ 30 NONAME ; struct QMetaObject const & QtMobility::QMediaPlaylist::getStaticMetaObject(void)
-	?removeMedia@QMediaPlaylistProvider@QtMobility@@UAE_NH@Z @ 31 NONAME ; bool QtMobility::QMediaPlaylistProvider::removeMedia(int)
-	?playbackModeChanged@QMediaPlaylistNavigator@QtMobility@@IAEXW4PlaybackMode@QMediaPlaylist@2@@Z @ 32 NONAME ; void QtMobility::QMediaPlaylistNavigator::playbackModeChanged(enum QtMobility::QMediaPlaylist::PlaybackMode)
-	??_EQMediaPlayerControl@QtMobility@@UAE@I@Z @ 33 NONAME ; QtMobility::QMediaPlayerControl::~QMediaPlayerControl(unsigned int)
-	?stateChanged@QRadioTuner@QtMobility@@IAEXW4State@12@@Z @ 34 NONAME ; void QtMobility::QRadioTuner::stateChanged(enum QtMobility::QRadioTuner::State)
-	?metaObject@QMediaServiceProviderPlugin@QtMobility@@UBEPBUQMetaObject@@XZ @ 35 NONAME ; struct QMetaObject const * QtMobility::QMediaServiceProviderPlugin::metaObject(void) const
-	?videoCodec@QMediaResource@QtMobility@@QBE?AVQString@@XZ @ 36 NONAME ; class QString QtMobility::QMediaResource::videoCodec(void) const
-	?seekableChanged@QMediaPlayer@QtMobility@@IAEX_N@Z @ 37 NONAME ; void QtMobility::QMediaPlayer::seekableChanged(bool)
-	?tr@QMediaPlayerControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 38 NONAME ; class QString QtMobility::QMediaPlayerControl::tr(char const *, char const *, int)
-	?staticMetaObject@QRadioTunerControl@QtMobility@@2UQMetaObject@@B @ 39 NONAME ; struct QMetaObject const QtMobility::QRadioTunerControl::staticMetaObject
-	?qt_metacast@QImageEncoderControl@QtMobility@@UAEPAXPBD@Z @ 40 NONAME ; void * QtMobility::QImageEncoderControl::qt_metacast(char const *)
-	?isEmpty@QMediaTimeRange@QtMobility@@QBE_NXZ @ 41 NONAME ; bool QtMobility::QMediaTimeRange::isEmpty(void) const
-	??4QMediaResource@QtMobility@@QAEAAV01@ABV01@@Z @ 42 NONAME ; class QtMobility::QMediaResource & QtMobility::QMediaResource::operator=(class QtMobility::QMediaResource const &)
-	??1QMediaPlaylistNavigator@QtMobility@@UAE@XZ @ 43 NONAME ; QtMobility::QMediaPlaylistNavigator::~QMediaPlaylistNavigator(void)
-	?trUtf8@QAudioEndpointSelector@QtMobility@@SA?AVQString@@PBD0@Z @ 44 NONAME ; class QString QtMobility::QAudioEndpointSelector::trUtf8(char const *, char const *)
-	?qt_metacall@QMediaPlaylistProvider@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 45 NONAME ; int QtMobility::QMediaPlaylistProvider::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?position@QMediaPlayer@QtMobility@@QBE_JXZ @ 46 NONAME ; long long QtMobility::QMediaPlayer::position(void) const
-	?trUtf8@QVideoRendererControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 47 NONAME ; class QString QtMobility::QVideoRendererControl::trUtf8(char const *, char const *, int)
-	?tr@QMediaStreamsControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 48 NONAME ; class QString QtMobility::QMediaStreamsControl::tr(char const *, char const *, int)
-	?searchingChanged@QRadioTuner@QtMobility@@IAEX_N@Z @ 49 NONAME ; void QtMobility::QRadioTuner::searchingChanged(bool)
-	?qt_metacall@QVideoWidget@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 50 NONAME ; int QtMobility::QVideoWidget::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?features@QMediaServiceProviderHint@QtMobility@@QBE?AV?$QFlags@W4Feature@QMediaServiceProviderHint@QtMobility@@@@XZ @ 51 NONAME ; class QFlags<enum QtMobility::QMediaServiceProviderHint::Feature> QtMobility::QMediaServiceProviderHint::features(void) const
-	?tr@QMediaPlaylistControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 52 NONAME ; class QString QtMobility::QMediaPlaylistControl::tr(char const *, char const *, int)
-	?trUtf8@QMediaObject@QtMobility@@SA?AVQString@@PBD0@Z @ 53 NONAME ; class QString QtMobility::QMediaObject::trUtf8(char const *, char const *)
-	?frequencyStep@QRadioTuner@QtMobility@@QBEHW4Band@12@@Z @ 54 NONAME ; int QtMobility::QRadioTuner::frequencyStep(enum QtMobility::QRadioTuner::Band) const
-	?trUtf8@QMediaRecorderControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 55 NONAME ; class QString QtMobility::QMediaRecorderControl::trUtf8(char const *, char const *, int)
-	?metaObject@QRadioTunerControl@QtMobility@@UBEPBUQMetaObject@@XZ @ 56 NONAME ; struct QMetaObject const * QtMobility::QRadioTunerControl::metaObject(void) const
-	?trUtf8@QVideoEncoderControl@QtMobility@@SA?AVQString@@PBD0@Z @ 57 NONAME ; class QString QtMobility::QVideoEncoderControl::trUtf8(char const *, char const *)
-	?previousIndex@QMediaPlaylistNavigator@QtMobility@@QBEHH@Z @ 58 NONAME ; int QtMobility::QMediaPlaylistNavigator::previousIndex(int) const
-	??1QAudioEndpointSelector@QtMobility@@UAE@XZ @ 59 NONAME ; QtMobility::QAudioEndpointSelector::~QAudioEndpointSelector(void)
-	?playbackRateChanged@QMediaPlayerControl@QtMobility@@IAEXM@Z @ 60 NONAME ; void QtMobility::QMediaPlayerControl::playbackRateChanged(float)
-	?getStaticMetaObject@QMediaService@QtMobility@@SAABUQMetaObject@@XZ @ 61 NONAME ; struct QMetaObject const & QtMobility::QMediaService::getStaticMetaObject(void)
-	??1QMediaServiceProvider@QtMobility@@UAE@XZ @ 62 NONAME ; QtMobility::QMediaServiceProvider::~QMediaServiceProvider(void)
-	?setPlaybackMode@QMediaPlaylist@QtMobility@@QAEXW4PlaybackMode@12@@Z @ 63 NONAME ; void QtMobility::QMediaPlaylist::setPlaybackMode(enum QtMobility::QMediaPlaylist::PlaybackMode)
-	?staticMetaObject@QMediaPlaylistControl@QtMobility@@2UQMetaObject@@B @ 64 NONAME ; struct QMetaObject const QtMobility::QMediaPlaylistControl::staticMetaObject
-	?moveEvent@QVideoWidget@QtMobility@@MAEXPAVQMoveEvent@@@Z @ 65 NONAME ; void QtMobility::QVideoWidget::moveEvent(class QMoveEvent *)
-	?metaObject@QVideoWidget@QtMobility@@UBEPBUQMetaObject@@XZ @ 66 NONAME ; struct QMetaObject const * QtMobility::QVideoWidget::metaObject(void) const
-	?normalized@QMediaTimeInterval@QtMobility@@QBE?AV12@XZ @ 67 NONAME ; class QtMobility::QMediaTimeInterval QtMobility::QMediaTimeInterval::normalized(void) const
-	?shuffle@QLocalMediaPlaylistProvider@QtMobility@@UAEXXZ @ 68 NONAME ; void QtMobility::QLocalMediaPlaylistProvider::shuffle(void)
-	?extendedMetaData@QMediaObject@QtMobility@@QBE?AVQVariant@@ABVQString@@@Z @ 69 NONAME ; class QVariant QtMobility::QMediaObject::extendedMetaData(class QString const &) const
-	?addMedia@QMediaPlaylistProvider@QtMobility@@UAE_NABV?$QList@VQMediaContent@QtMobility@@@@@Z @ 70 NONAME ; bool QtMobility::QMediaPlaylistProvider::addMedia(class QList<class QtMobility::QMediaContent> const &)
-	??1QVideoWindowControl@QtMobility@@UAE@XZ @ 71 NONAME ; QtMobility::QVideoWindowControl::~QVideoWindowControl(void)
-	?mediaChanged@QMediaPlayerControl@QtMobility@@IAEXABVQMediaContent@2@@Z @ 72 NONAME ; void QtMobility::QMediaPlayerControl::mediaChanged(class QtMobility::QMediaContent const &)
-	?qt_metacall@QImageEncoderControl@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 73 NONAME ; int QtMobility::QImageEncoderControl::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?trUtf8@QAudioEncoderControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 74 NONAME ; class QString QtMobility::QAudioEncoderControl::trUtf8(char const *, char const *, int)
-	?tr@QMediaPlayer@QtMobility@@SA?AVQString@@PBD0H@Z @ 75 NONAME ; class QString QtMobility::QMediaPlayer::tr(char const *, char const *, int)
-	?mediaInserted@QMediaPlaylistProvider@QtMobility@@IAEXHH@Z @ 76 NONAME ; void QtMobility::QMediaPlaylistProvider::mediaInserted(int, int)
-	?isAudioAvailable@QMediaPlayer@QtMobility@@QBE_NXZ @ 77 NONAME ; bool QtMobility::QMediaPlayer::isAudioAvailable(void) const
-	?tr@QRadioTunerControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 78 NONAME ; class QString QtMobility::QRadioTunerControl::tr(char const *, char const *, int)
-	?setOutputLocation@QMediaRecorder@QtMobility@@QAE_NABVQUrl@@@Z @ 79 NONAME ; bool QtMobility::QMediaRecorder::setOutputLocation(class QUrl const &)
-	?setMetaData@QMediaObject@QtMobility@@QAEXW4MetaData@QtMedia@2@ABVQVariant@@@Z @ 80 NONAME ; void QtMobility::QMediaObject::setMetaData(enum QtMobility::QtMedia::MetaData, class QVariant const &)
-	?d_func@QMediaPlaylist@QtMobility@@ABEPBVQMediaPlaylistPrivate@2@XZ @ 81 NONAME ; class QtMobility::QMediaPlaylistPrivate const * QtMobility::QMediaPlaylist::d_func(void) const
-	??1QMediaControl@QtMobility@@UAE@XZ @ 82 NONAME ; QtMobility::QMediaControl::~QMediaControl(void)
-	?isReadOnly@QLocalMediaPlaylistProvider@QtMobility@@UBE_NXZ @ 83 NONAME ; bool QtMobility::QLocalMediaPlaylistProvider::isReadOnly(void) const
-	?isMuted@QRadioTuner@QtMobility@@QBE_NXZ @ 84 NONAME ; bool QtMobility::QRadioTuner::isMuted(void) const
-	?addPropertyWatch@QMediaObject@QtMobility@@IAEXABVQByteArray@@@Z @ 85 NONAME ; void QtMobility::QMediaObject::addPropertyWatch(class QByteArray const &)
-	?mediaStatusChanged@QMediaPlayerControl@QtMobility@@IAEXW4MediaStatus@QMediaPlayer@2@@Z @ 86 NONAME ; void QtMobility::QMediaPlayerControl::mediaStatusChanged(enum QtMobility::QMediaPlayer::MediaStatus)
-	?qt_metacall@QMediaControl@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 87 NONAME ; int QtMobility::QMediaControl::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??0QMediaPlaylistProvider@QtMobility@@QAE@PAVQObject@@@Z @ 88 NONAME ; QtMobility::QMediaPlaylistProvider::QMediaPlaylistProvider(class QObject *)
-	?isNull@QMediaServiceProviderHint@QtMobility@@QBE_NXZ @ 89 NONAME ; bool QtMobility::QMediaServiceProviderHint::isNull(void) const
-	?setMediaObject@QVideoWidget@QtMobility@@QAEXPAVQMediaObject@2@@Z @ 90 NONAME ; void QtMobility::QVideoWidget::setMediaObject(class QtMobility::QMediaObject *)
-	?setFullScreen@QVideoWidget@QtMobility@@QAEX_N@Z @ 91 NONAME ; void QtMobility::QVideoWidget::setFullScreen(bool)
-	?tr@QMediaService@QtMobility@@SA?AVQString@@PBD0H@Z @ 92 NONAME ; class QString QtMobility::QMediaService::tr(char const *, char const *, int)
-	??_EQVideoEncoderControl@QtMobility@@UAE@I@Z @ 93 NONAME ; QtMobility::QVideoEncoderControl::~QVideoEncoderControl(unsigned int)
-	?qt_metacall@QMediaServiceProviderPlugin@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 94 NONAME ; int QtMobility::QMediaServiceProviderPlugin::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?metaObject@QMediaPlaylist@QtMobility@@UBEPBUQMetaObject@@XZ @ 95 NONAME ; struct QMetaObject const * QtMobility::QMediaPlaylist::metaObject(void) const
-	?clear@QMediaTimeRange@QtMobility@@QAEXXZ @ 96 NONAME ; void QtMobility::QMediaTimeRange::clear(void)
-	?trUtf8@QVideoDeviceControl@QtMobility@@SA?AVQString@@PBD0@Z @ 97 NONAME ; class QString QtMobility::QVideoDeviceControl::trUtf8(char const *, char const *)
-	?trUtf8@QMediaPlaylistIOPlugin@QtMobility@@SA?AVQString@@PBD0@Z @ 98 NONAME ; class QString QtMobility::QMediaPlaylistIOPlugin::trUtf8(char const *, char const *)
-	?brightnessChanged@QVideoWidget@QtMobility@@IAEXH@Z @ 99 NONAME ; void QtMobility::QVideoWidget::brightnessChanged(int)
-	?setCodec@QAudioEncoderSettings@QtMobility@@QAEXABVQString@@@Z @ 100 NONAME ; void QtMobility::QAudioEncoderSettings::setCodec(class QString const &)
-	?trUtf8@QAudioCaptureSource@QtMobility@@SA?AVQString@@PBD0@Z @ 101 NONAME ; class QString QtMobility::QAudioCaptureSource::trUtf8(char const *, char const *)
-	?devicesChanged@QVideoDeviceControl@QtMobility@@IAEXXZ @ 102 NONAME ; void QtMobility::QVideoDeviceControl::devicesChanged(void)
-	?setLanguage@QMediaResource@QtMobility@@QAEXABVQString@@@Z @ 103 NONAME ; void QtMobility::QMediaResource::setLanguage(class QString const &)
-	?qt_metacast@QMediaPlayerControl@QtMobility@@UAEPAXPBD@Z @ 104 NONAME ; void * QtMobility::QMediaPlayerControl::qt_metacast(char const *)
-	?loadFailed@QMediaPlaylistProvider@QtMobility@@IAEXW4Error@QMediaPlaylist@2@ABVQString@@@Z @ 105 NONAME ; void QtMobility::QMediaPlaylistProvider::loadFailed(enum QtMobility::QMediaPlaylist::Error, class QString const &)
-	?mediaChanged@QMediaPlayer@QtMobility@@IAEXABVQMediaContent@2@@Z @ 106 NONAME ; void QtMobility::QMediaPlayer::mediaChanged(class QtMobility::QMediaContent const &)
-	?channelCount@QMediaResource@QtMobility@@QBEHXZ @ 107 NONAME ; int QtMobility::QMediaResource::channelCount(void) const
-	??0QVideoRendererControl@QtMobility@@IAE@PAVQObject@@@Z @ 108 NONAME ; QtMobility::QVideoRendererControl::QVideoRendererControl(class QObject *)
-	?getStaticMetaObject@QVideoWidget@QtMobility@@SAABUQMetaObject@@XZ @ 109 NONAME ; struct QMetaObject const & QtMobility::QVideoWidget::getStaticMetaObject(void)
-	??4QMediaContent@QtMobility@@QAEAAV01@ABV01@@Z @ 110 NONAME ; class QtMobility::QMediaContent & QtMobility::QMediaContent::operator=(class QtMobility::QMediaContent const &)
-	?qt_metacall@QMediaPlayer@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 111 NONAME ; int QtMobility::QMediaPlayer::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??0QAudioEncoderSettings@QtMobility@@QAE@XZ @ 112 NONAME ; QtMobility::QAudioEncoderSettings::QAudioEncoderSettings(void)
-	??1QMediaRecorder@QtMobility@@UAE@XZ @ 113 NONAME ; QtMobility::QMediaRecorder::~QMediaRecorder(void)
-	?staticMetaObject@QVideoDeviceControl@QtMobility@@2UQMetaObject@@B @ 114 NONAME ; struct QMetaObject const QtMobility::QVideoDeviceControl::staticMetaObject
-	?setExtendedMetaData@QMediaObject@QtMobility@@QAEXABVQString@@ABVQVariant@@@Z @ 115 NONAME ; void QtMobility::QMediaObject::setExtendedMetaData(class QString const &, class QVariant const &)
-	?sizeHint@QVideoWidget@QtMobility@@UBE?AVQSize@@XZ @ 116 NONAME ; class QSize QtMobility::QVideoWidget::sizeHint(void) const
-	??_EQMediaImageViewer@QtMobility@@UAE@I@Z @ 117 NONAME ; QtMobility::QMediaImageViewer::~QMediaImageViewer(unsigned int)
-	?tr@QMediaObject@QtMobility@@SA?AVQString@@PBD0@Z @ 118 NONAME ; class QString QtMobility::QMediaObject::tr(char const *, char const *)
-	?metaDataChanged@QMetaDataControl@QtMobility@@IAEXXZ @ 119 NONAME ; void QtMobility::QMetaDataControl::metaDataChanged(void)
-	??_EQVideoWidget@QtMobility@@UAE@I@Z @ 120 NONAME ; QtMobility::QVideoWidget::~QVideoWidget(unsigned int)
-	?setFrequency@QRadioTuner@QtMobility@@QAEXH@Z @ 121 NONAME ; void QtMobility::QRadioTuner::setFrequency(int)
-	?currentItem@QMediaPlaylistNavigator@QtMobility@@QBE?AVQMediaContent@2@XZ @ 122 NONAME ; class QtMobility::QMediaContent QtMobility::QMediaPlaylistNavigator::currentItem(void) const
-	?setPlaybackRate@QMediaPlayer@QtMobility@@QAEXM@Z @ 123 NONAME ; void QtMobility::QMediaPlayer::setPlaybackRate(float)
-	??0QMediaObject@QtMobility@@IAE@PAVQObject@@PAVQMediaService@1@@Z @ 124 NONAME ; QtMobility::QMediaObject::QMediaObject(class QObject *, class QtMobility::QMediaService *)
-	??1QMediaContent@QtMobility@@QAE@XZ @ 125 NONAME ; QtMobility::QMediaContent::~QMediaContent(void)
-	?mediaObject@QVideoWidget@QtMobility@@QBEPAVQMediaObject@2@XZ @ 126 NONAME ; class QtMobility::QMediaObject * QtMobility::QVideoWidget::mediaObject(void) const
-	?itemAt@QMediaPlaylistNavigator@QtMobility@@QBE?AVQMediaContent@2@H@Z @ 127 NONAME ; class QtMobility::QMediaContent QtMobility::QMediaPlaylistNavigator::itemAt(int) const
-	??0QAudioEncoderControl@QtMobility@@IAE@PAVQObject@@@Z @ 128 NONAME ; QtMobility::QAudioEncoderControl::QAudioEncoderControl(class QObject *)
-	?play@QMediaPlayer@QtMobility@@QAEXXZ @ 129 NONAME ; void QtMobility::QMediaPlayer::play(void)
-	?timeout@QMediaImageViewer@QtMobility@@QBEHXZ @ 130 NONAME ; int QtMobility::QMediaImageViewer::timeout(void) const
-	?showEvent@QVideoWidget@QtMobility@@MAEXPAVQShowEvent@@@Z @ 131 NONAME ; void QtMobility::QVideoWidget::showEvent(class QShowEvent *)
-	?videoAvailableChanged@QMediaPlayer@QtMobility@@IAEX_N@Z @ 132 NONAME ; void QtMobility::QMediaPlayer::videoAvailableChanged(bool)
-	?load@QMediaPlaylist@QtMobility@@QAEXABVQUrl@@PBD@Z @ 133 NONAME ; void QtMobility::QMediaPlaylist::load(class QUrl const &, char const *)
-	??8QtMobility@@YA_NABVQMediaTimeInterval@0@0@Z @ 134 NONAME ; bool QtMobility::operator==(class QtMobility::QMediaTimeInterval const &, class QtMobility::QMediaTimeInterval const &)
-	?getStaticMetaObject@QMediaPlaylistNavigator@QtMobility@@SAABUQMetaObject@@XZ @ 135 NONAME ; struct QMetaObject const & QtMobility::QMediaPlaylistNavigator::getStaticMetaObject(void)
-	?save@QMediaPlaylistProvider@QtMobility@@UAE_NABVQUrl@@PBD@Z @ 136 NONAME ; bool QtMobility::QMediaPlaylistProvider::save(class QUrl const &, char const *)
-	?metaData@QMediaObject@QtMobility@@QBE?AVQVariant@@W4MetaData@QtMedia@2@@Z @ 137 NONAME ; class QVariant QtMobility::QMediaObject::metaData(enum QtMobility::QtMedia::MetaData) const
-	?media@QMediaImageViewer@QtMobility@@QBE?AVQMediaContent@2@XZ @ 138 NONAME ; class QtMobility::QMediaContent QtMobility::QMediaImageViewer::media(void) const
-	?frequencyChanged@QRadioTuner@QtMobility@@IAEXH@Z @ 139 NONAME ; void QtMobility::QRadioTuner::frequencyChanged(int)
-	??_EQVideoWidgetControl@QtMobility@@UAE@I@Z @ 140 NONAME ; QtMobility::QVideoWidgetControl::~QVideoWidgetControl(unsigned int)
-	?qt_metacast@QMediaService@QtMobility@@UAEPAXPBD@Z @ 141 NONAME ; void * QtMobility::QMediaService::qt_metacast(char const *)
-	?qt_metacall@QMediaServiceProvider@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 142 NONAME ; int QtMobility::QMediaServiceProvider::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?volumeChanged@QMediaPlayer@QtMobility@@IAEXH@Z @ 143 NONAME ; void QtMobility::QMediaPlayer::volumeChanged(int)
-	?trUtf8@QMediaPlaylist@QtMobility@@SA?AVQString@@PBD0@Z @ 144 NONAME ; class QString QtMobility::QMediaPlaylist::trUtf8(char const *, char const *)
-	??0QMediaService@QtMobility@@IAE@PAVQObject@@@Z @ 145 NONAME ; QtMobility::QMediaService::QMediaService(class QObject *)
-	?timerEvent@QMediaImageViewer@QtMobility@@MAEXPAVQTimerEvent@@@Z @ 146 NONAME ; void QtMobility::QMediaImageViewer::timerEvent(class QTimerEvent *)
-	??1QMediaPlaylistProvider@QtMobility@@UAE@XZ @ 147 NONAME ; QtMobility::QMediaPlaylistProvider::~QMediaPlaylistProvider(void)
-	?media@QMediaPlaylist@QtMobility@@QBE?AVQMediaContent@2@H@Z @ 148 NONAME ; class QtMobility::QMediaContent QtMobility::QMediaPlaylist::media(int) const
-	?bind@QMediaPlayer@QtMobility@@UAEXPAVQObject@@@Z @ 149 NONAME ; void QtMobility::QMediaPlayer::bind(class QObject *)
-	??_EQMediaPlaylistNavigator@QtMobility@@UAE@I@Z @ 150 NONAME ; QtMobility::QMediaPlaylistNavigator::~QMediaPlaylistNavigator(unsigned int)
-	?trUtf8@QMediaImageViewer@QtMobility@@SA?AVQString@@PBD0H@Z @ 151 NONAME ; class QString QtMobility::QMediaImageViewer::trUtf8(char const *, char const *, int)
-	??1QMediaResource@QtMobility@@QAE@XZ @ 152 NONAME ; QtMobility::QMediaResource::~QMediaResource(void)
-	?trUtf8@QMediaStreamsControl@QtMobility@@SA?AVQString@@PBD0@Z @ 153 NONAME ; class QString QtMobility::QMediaStreamsControl::trUtf8(char const *, char const *)
-	?qt_metacast@QVideoWidgetControl@QtMobility@@UAEPAXPBD@Z @ 154 NONAME ; void * QtMobility::QVideoWidgetControl::qt_metacast(char const *)
-	?tr@QVideoWidget@QtMobility@@SA?AVQString@@PBD0H@Z @ 155 NONAME ; class QString QtMobility::QVideoWidget::tr(char const *, char const *, int)
-	??1QMediaTimeRange@QtMobility@@QAE@XZ @ 156 NONAME ; QtMobility::QMediaTimeRange::~QMediaTimeRange(void)
-	?tr@QLocalMediaPlaylistProvider@QtMobility@@SA?AVQString@@PBD0@Z @ 157 NONAME ; class QString QtMobility::QLocalMediaPlaylistProvider::tr(char const *, char const *)
-	?mediaAboutToBeInserted@QMediaPlaylistProvider@QtMobility@@IAEXHH@Z @ 158 NONAME ; void QtMobility::QMediaPlaylistProvider::mediaAboutToBeInserted(int, int)
-	?deviceDescription@QMediaServiceProvider@QtMobility@@UAE?AVQString@@ABVQByteArray@@0@Z @ 159 NONAME ; class QString QtMobility::QMediaServiceProvider::deviceDescription(class QByteArray const &, class QByteArray const &)
-	?setMuted@QMediaPlayer@QtMobility@@QAEX_N@Z @ 160 NONAME ; void QtMobility::QMediaPlayer::setMuted(bool)
-	?setEncodingMode@QAudioEncoderSettings@QtMobility@@QAEXW4EncodingMode@QtMedia@2@@Z @ 161 NONAME ; void QtMobility::QAudioEncoderSettings::setEncodingMode(enum QtMobility::QtMedia::EncodingMode)
-	?setVideoBitRate@QMediaResource@QtMobility@@QAEXH@Z @ 162 NONAME ; void QtMobility::QMediaResource::setVideoBitRate(int)
-	?pause@QMediaRecorder@QtMobility@@QAEXXZ @ 163 NONAME ; void QtMobility::QMediaRecorder::pause(void)
-	??_EQAudioEndpointSelector@QtMobility@@UAE@I@Z @ 164 NONAME ; QtMobility::QAudioEndpointSelector::~QAudioEndpointSelector(unsigned int)
-	?playbackRateChanged@QMediaPlayer@QtMobility@@IAEXM@Z @ 165 NONAME ; void QtMobility::QMediaPlayer::playbackRateChanged(float)
-	?d_func@QGraphicsVideoItem@QtMobility@@AAEPAVQGraphicsVideoItemPrivate@2@XZ @ 166 NONAME ; class QtMobility::QGraphicsVideoItemPrivate * QtMobility::QGraphicsVideoItem::d_func(void)
-	??0QAudioEndpointSelector@QtMobility@@IAE@PAVQObject@@@Z @ 167 NONAME ; QtMobility::QAudioEndpointSelector::QAudioEndpointSelector(class QObject *)
-	?mediaInserted@QMediaPlaylist@QtMobility@@IAEXHH@Z @ 168 NONAME ; void QtMobility::QMediaPlaylist::mediaInserted(int, int)
-	?staticMetaObject@QMediaContainerControl@QtMobility@@2UQMetaObject@@B @ 169 NONAME ; struct QMetaObject const QtMobility::QMediaContainerControl::staticMetaObject
-	?qt_metacast@QMediaPlayer@QtMobility@@UAEPAXPBD@Z @ 170 NONAME ; void * QtMobility::QMediaPlayer::qt_metacast(char const *)
-	?defaultServiceProvider@QMediaServiceProvider@QtMobility@@SAPAV12@XZ @ 171 NONAME ; class QtMobility::QMediaServiceProvider * QtMobility::QMediaServiceProvider::defaultServiceProvider(void)
-	?d_func@QAudioCaptureSource@QtMobility@@ABEPBVQAudioCaptureSourcePrivate@2@XZ @ 172 NONAME ; class QtMobility::QAudioCaptureSourcePrivate const * QtMobility::QAudioCaptureSource::d_func(void) const
-	??_EQMetaDataControl@QtMobility@@UAE@I@Z @ 173 NONAME ; QtMobility::QMetaDataControl::~QMetaDataControl(unsigned int)
-	??0QVideoEncoderControl@QtMobility@@IAE@PAVQObject@@@Z @ 174 NONAME ; QtMobility::QVideoEncoderControl::QVideoEncoderControl(class QObject *)
-	?setCurrentIndex@QMediaPlaylist@QtMobility@@QAEXH@Z @ 175 NONAME ; void QtMobility::QMediaPlaylist::setCurrentIndex(int)
-	?qt_metacall@QVideoRendererControl@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 176 NONAME ; int QtMobility::QVideoRendererControl::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?metaObject@QVideoDeviceControl@QtMobility@@UBEPBUQMetaObject@@XZ @ 177 NONAME ; struct QMetaObject const * QtMobility::QVideoDeviceControl::metaObject(void) const
-	?durationChanged@QMediaPlayerControl@QtMobility@@IAEX_J@Z @ 178 NONAME ; void QtMobility::QMediaPlayerControl::durationChanged(long long)
-	?addMedia@QLocalMediaPlaylistProvider@QtMobility@@UAE_NABV?$QList@VQMediaContent@QtMobility@@@@@Z @ 179 NONAME ; bool QtMobility::QLocalMediaPlaylistProvider::addMedia(class QList<class QtMobility::QMediaContent> const &)
-	??_EQLocalMediaPlaylistProvider@QtMobility@@UAE@I@Z @ 180 NONAME ; QtMobility::QLocalMediaPlaylistProvider::~QLocalMediaPlaylistProvider(unsigned int)
-	?supportedAudioCodecs@QMediaRecorder@QtMobility@@QBE?AVQStringList@@XZ @ 181 NONAME ; class QStringList QtMobility::QMediaRecorder::supportedAudioCodecs(void) const
-	?canonicalResource@QMediaContent@QtMobility@@QBE?AVQMediaResource@2@XZ @ 182 NONAME ; class QtMobility::QMediaResource QtMobility::QMediaContent::canonicalResource(void) const
-	?bitRate@QAudioEncoderSettings@QtMobility@@QBEHXZ @ 183 NONAME ; int QtMobility::QAudioEncoderSettings::bitRate(void) const
-	?setChannelCount@QAudioEncoderSettings@QtMobility@@QAEXH@Z @ 184 NONAME ; void QtMobility::QAudioEncoderSettings::setChannelCount(int)
-	??0QMediaPlayer@QtMobility@@QAE@PAVQObject@@V?$QFlags@W4Flag@QMediaPlayer@QtMobility@@@@PAVQMediaServiceProvider@1@@Z @ 185 NONAME ; QtMobility::QMediaPlayer::QMediaPlayer(class QObject *, class QFlags<enum QtMobility::QMediaPlayer::Flag>, class QtMobility::QMediaServiceProvider *)
-	?trUtf8@QMediaContainerControl@QtMobility@@SA?AVQString@@PBD0@Z @ 186 NONAME ; class QString QtMobility::QMediaContainerControl::trUtf8(char const *, char const *)
-	?contains@QMediaTimeInterval@QtMobility@@QBE_N_J@Z @ 187 NONAME ; bool QtMobility::QMediaTimeInterval::contains(long long) const
-	?qt_metacall@QVideoEncoderControl@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 188 NONAME ; int QtMobility::QVideoEncoderControl::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?trUtf8@QMediaObject@QtMobility@@SA?AVQString@@PBD0H@Z @ 189 NONAME ; class QString QtMobility::QMediaObject::trUtf8(char const *, char const *, int)
-	?state@QRadioTuner@QtMobility@@QBE?AW4State@12@XZ @ 190 NONAME ; enum QtMobility::QRadioTuner::State QtMobility::QRadioTuner::state(void) const
-	??0QVideoWidgetControl@QtMobility@@IAE@PAVQObject@@@Z @ 191 NONAME ; QtMobility::QVideoWidgetControl::QVideoWidgetControl(class QObject *)
-	?setQuality@QVideoEncoderSettings@QtMobility@@QAEXW4EncodingQuality@QtMedia@2@@Z @ 192 NONAME ; void QtMobility::QVideoEncoderSettings::setQuality(enum QtMobility::QtMedia::EncodingQuality)
-	?shuffle@QMediaPlaylist@QtMobility@@QAEXXZ @ 193 NONAME ; void QtMobility::QMediaPlaylist::shuffle(void)
-	?notifyInterval@QMediaObject@QtMobility@@QBEHXZ @ 194 NONAME ; int QtMobility::QMediaObject::notifyInterval(void) const
-	?trUtf8@QMediaPlaylistNavigator@QtMobility@@SA?AVQString@@PBD0@Z @ 195 NONAME ; class QString QtMobility::QMediaPlaylistNavigator::trUtf8(char const *, char const *)
-	??_EQMediaPlaylistIOPlugin@QtMobility@@UAE@I@Z @ 196 NONAME ; QtMobility::QMediaPlaylistIOPlugin::~QMediaPlaylistIOPlugin(unsigned int)
-	?removeInterval@QMediaTimeRange@QtMobility@@QAEX_J0@Z @ 197 NONAME ; void QtMobility::QMediaTimeRange::removeInterval(long long, long long)
-	?paint@QGraphicsVideoItem@QtMobility@@UAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 198 NONAME ; void QtMobility::QGraphicsVideoItem::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
-	?qt_metacast@QMediaRecorderControl@QtMobility@@UAEPAXPBD@Z @ 199 NONAME ; void * QtMobility::QMediaRecorderControl::qt_metacast(char const *)
-	?mutedChanged@QMediaPlayerControl@QtMobility@@IAEX_N@Z @ 200 NONAME ; void QtMobility::QMediaPlayerControl::mutedChanged(bool)
-	??8QAudioEncoderSettings@QtMobility@@QBE_NABV01@@Z @ 201 NONAME ; bool QtMobility::QAudioEncoderSettings::operator==(class QtMobility::QAudioEncoderSettings const &) const
-	??0QMediaStreamsControl@QtMobility@@IAE@PAVQObject@@@Z @ 202 NONAME ; QtMobility::QMediaStreamsControl::QMediaStreamsControl(class QObject *)
-	?isReadOnly@QMediaPlaylist@QtMobility@@QBE_NXZ @ 203 NONAME ; bool QtMobility::QMediaPlaylist::isReadOnly(void) const
-	?activeAudioInputChanged@QAudioCaptureSource@QtMobility@@IAEXABVQString@@@Z @ 204 NONAME ; void QtMobility::QAudioCaptureSource::activeAudioInputChanged(class QString const &)
-	??_EQImageEncoderControl@QtMobility@@UAE@I@Z @ 205 NONAME ; QtMobility::QImageEncoderControl::~QImageEncoderControl(unsigned int)
-	??0QMediaPlaylistIOPlugin@QtMobility@@QAE@PAVQObject@@@Z @ 206 NONAME ; QtMobility::QMediaPlaylistIOPlugin::QMediaPlaylistIOPlugin(class QObject *)
-	?positionChanged@QMediaPlayer@QtMobility@@IAEX_J@Z @ 207 NONAME ; void QtMobility::QMediaPlayer::positionChanged(long long)
-	?metaObject@QAudioEndpointSelector@QtMobility@@UBEPBUQMetaObject@@XZ @ 208 NONAME ; struct QMetaObject const * QtMobility::QAudioEndpointSelector::metaObject(void) const
-	?loaded@QMediaPlaylist@QtMobility@@IAEXXZ @ 209 NONAME ; void QtMobility::QMediaPlaylist::loaded(void)
-	?tr@QMediaPlaylistProvider@QtMobility@@SA?AVQString@@PBD0H@Z @ 210 NONAME ; class QString QtMobility::QMediaPlaylistProvider::tr(char const *, char const *, int)
-	?d_func@QMediaPlaylistNavigator@QtMobility@@AAEPAVQMediaPlaylistNavigatorPrivate@2@XZ @ 211 NONAME ; class QtMobility::QMediaPlaylistNavigatorPrivate * QtMobility::QMediaPlaylistNavigator::d_func(void)
-	?metaObject@QMediaPlaylistIOPlugin@QtMobility@@UBEPBUQMetaObject@@XZ @ 212 NONAME ; struct QMetaObject const * QtMobility::QMediaPlaylistIOPlugin::metaObject(void) const
-	??0QMediaResource@QtMobility@@QAE@ABVQNetworkRequest@@ABVQString@@@Z @ 213 NONAME ; QtMobility::QMediaResource::QMediaResource(class QNetworkRequest const &, class QString const &)
-	?videoCodecDescription@QMediaRecorder@QtMobility@@QBE?AVQString@@ABV3@@Z @ 214 NONAME ; class QString QtMobility::QMediaRecorder::videoCodecDescription(class QString const &) const
-	?nextIndex@QMediaPlaylistNavigator@QtMobility@@QBEHH@Z @ 215 NONAME ; int QtMobility::QMediaPlaylistNavigator::nextIndex(int) const
-	?d_func@QRadioTuner@QtMobility@@AAEPAVQRadioTunerPrivate@2@XZ @ 216 NONAME ; class QtMobility::QRadioTunerPrivate * QtMobility::QRadioTuner::d_func(void)
-	?containerDescription@QMediaRecorder@QtMobility@@QBE?AVQString@@ABV3@@Z @ 217 NONAME ; class QString QtMobility::QMediaRecorder::containerDescription(class QString const &) const
-	?removeMedia@QMediaPlaylist@QtMobility@@QAE_NH@Z @ 218 NONAME ; bool QtMobility::QMediaPlaylist::removeMedia(int)
-	?event@QVideoWidget@QtMobility@@MAE_NPAVQEvent@@@Z @ 219 NONAME ; bool QtMobility::QVideoWidget::event(class QEvent *)
-	?mediaRemoved@QMediaPlaylist@QtMobility@@IAEXHH@Z @ 220 NONAME ; void QtMobility::QMediaPlaylist::mediaRemoved(int, int)
-	?metaObject@QLocalMediaPlaylistProvider@QtMobility@@UBEPBUQMetaObject@@XZ @ 221 NONAME ; struct QMetaObject const * QtMobility::QLocalMediaPlaylistProvider::metaObject(void) const
-	?tr@QMediaPlaylistControl@QtMobility@@SA?AVQString@@PBD0@Z @ 222 NONAME ; class QString QtMobility::QMediaPlaylistControl::tr(char const *, char const *)
-	?trUtf8@QMediaPlaylistNavigator@QtMobility@@SA?AVQString@@PBD0H@Z @ 223 NONAME ; class QString QtMobility::QMediaPlaylistNavigator::trUtf8(char const *, char const *, int)
-	?getStaticMetaObject@QMediaPlaylistControl@QtMobility@@SAABUQMetaObject@@XZ @ 224 NONAME ; struct QMetaObject const & QtMobility::QMediaPlaylistControl::getStaticMetaObject(void)
-	?canonicalRequest@QMediaContent@QtMobility@@QBE?AVQNetworkRequest@@XZ @ 225 NONAME ; class QNetworkRequest QtMobility::QMediaContent::canonicalRequest(void) const
-	??_EQVideoDeviceControl@QtMobility@@UAE@I@Z @ 226 NONAME ; QtMobility::QVideoDeviceControl::~QVideoDeviceControl(unsigned int)
-	??_EQRadioTuner@QtMobility@@UAE@I@Z @ 227 NONAME ; QtMobility::QRadioTuner::~QRadioTuner(unsigned int)
-	?surroundingItemsChanged@QMediaPlaylistNavigator@QtMobility@@IAEXXZ @ 228 NONAME ; void QtMobility::QMediaPlaylistNavigator::surroundingItemsChanged(void)
-	?trUtf8@QMediaImageViewer@QtMobility@@SA?AVQString@@PBD0@Z @ 229 NONAME ; class QString QtMobility::QMediaImageViewer::trUtf8(char const *, char const *)
-	?setResolution@QVideoEncoderSettings@QtMobility@@QAEXABVQSize@@@Z @ 230 NONAME ; void QtMobility::QVideoEncoderSettings::setResolution(class QSize const &)
-	?tr@QMetaDataControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 231 NONAME ; class QString QtMobility::QMetaDataControl::tr(char const *, char const *, int)
-	?qt_metacall@QLocalMediaPlaylistProvider@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 232 NONAME ; int QtMobility::QLocalMediaPlaylistProvider::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?isNull@QMediaResource@QtMobility@@QBE_NXZ @ 233 NONAME ; bool QtMobility::QMediaResource::isNull(void) const
-	?save@QMediaPlaylist@QtMobility@@QAE_NABVQUrl@@PBD@Z @ 234 NONAME ; bool QtMobility::QMediaPlaylist::save(class QUrl const &, char const *)
-	?setResolution@QImageEncoderSettings@QtMobility@@QAEXHH@Z @ 235 NONAME ; void QtMobility::QImageEncoderSettings::setResolution(int, int)
-	?metaDataAvailableChanged@QMediaObject@QtMobility@@IAEX_N@Z @ 236 NONAME ; void QtMobility::QMediaObject::metaDataAvailableChanged(bool)
-	??0QVideoEncoderSettings@QtMobility@@QAE@XZ @ 237 NONAME ; QtMobility::QVideoEncoderSettings::QVideoEncoderSettings(void)
-	?volumeChanged@QRadioTunerControl@QtMobility@@IAEXH@Z @ 238 NONAME ; void QtMobility::QRadioTunerControl::volumeChanged(int)
-	?trUtf8@QRadioTunerControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 239 NONAME ; class QString QtMobility::QRadioTunerControl::trUtf8(char const *, char const *, int)
-	?tr@QRadioTuner@QtMobility@@SA?AVQString@@PBD0@Z @ 240 NONAME ; class QString QtMobility::QRadioTuner::tr(char const *, char const *)
-	??9QtMobility@@YA_NABVQMediaTimeRange@0@0@Z @ 241 NONAME ; bool QtMobility::operator!=(class QtMobility::QMediaTimeRange const &, class QtMobility::QMediaTimeRange const &)
-	?trUtf8@QMediaPlayer@QtMobility@@SA?AVQString@@PBD0@Z @ 242 NONAME ; class QString QtMobility::QMediaPlayer::trUtf8(char const *, char const *)
-	?sampleRate@QAudioEncoderSettings@QtMobility@@QBEHXZ @ 243 NONAME ; int QtMobility::QAudioEncoderSettings::sampleRate(void) const
-	?contrastChanged@QVideoWindowControl@QtMobility@@IAEXH@Z @ 244 NONAME ; void QtMobility::QVideoWindowControl::contrastChanged(int)
-	?setResolution@QMediaResource@QtMobility@@QAEXABVQSize@@@Z @ 245 NONAME ; void QtMobility::QMediaResource::setResolution(class QSize const &)
-	?insertMedia@QMediaPlaylist@QtMobility@@QAE_NHABV?$QList@VQMediaContent@QtMobility@@@@@Z @ 246 NONAME ; bool QtMobility::QMediaPlaylist::insertMedia(int, class QList<class QtMobility::QMediaContent> const &)
-	?setEncodingSettings@QMediaRecorder@QtMobility@@QAEXABVQAudioEncoderSettings@2@ABVQVideoEncoderSettings@2@ABVQString@@@Z @ 247 NONAME ; void QtMobility::QMediaRecorder::setEncodingSettings(class QtMobility::QAudioEncoderSettings const &, class QtMobility::QVideoEncoderSettings const &, class QString const &)
-	??0QVideoOutputControl@QtMobility@@IAE@PAVQObject@@@Z @ 248 NONAME ; QtMobility::QVideoOutputControl::QVideoOutputControl(class QObject *)
-	?bufferStatusChanged@QMediaPlayer@QtMobility@@IAEXH@Z @ 249 NONAME ; void QtMobility::QMediaPlayer::bufferStatusChanged(int)
-	?getStaticMetaObject@QVideoWindowControl@QtMobility@@SAABUQMetaObject@@XZ @ 250 NONAME ; struct QMetaObject const & QtMobility::QVideoWindowControl::getStaticMetaObject(void)
-	?setQuality@QAudioEncoderSettings@QtMobility@@QAEXW4EncodingQuality@QtMedia@2@@Z @ 251 NONAME ; void QtMobility::QAudioEncoderSettings::setQuality(enum QtMobility::QtMedia::EncodingQuality)
-	?availabilityError@QMediaObject@QtMobility@@UBE?AW4AvailabilityError@QtMedia@2@XZ @ 252 NONAME ; enum QtMobility::QtMedia::AvailabilityError QtMobility::QMediaObject::availabilityError(void) const
-	??1QMediaPlaylistReader@QtMobility@@UAE@XZ @ 253 NONAME ; QtMobility::QMediaPlaylistReader::~QMediaPlaylistReader(void)
-	?trUtf8@QVideoOutputControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 254 NONAME ; class QString QtMobility::QVideoOutputControl::trUtf8(char const *, char const *, int)
-	?unbind@QMediaImageViewer@QtMobility@@UAEXPAVQObject@@@Z @ 255 NONAME ; void QtMobility::QMediaImageViewer::unbind(class QObject *)
-	?setSize@QGraphicsVideoItem@QtMobility@@QAEXABVQSizeF@@@Z @ 256 NONAME ; void QtMobility::QGraphicsVideoItem::setSize(class QSizeF const &)
-	?streamsChanged@QMediaStreamsControl@QtMobility@@IAEXXZ @ 257 NONAME ; void QtMobility::QMediaStreamsControl::streamsChanged(void)
-	?stereoStatusChanged@QRadioTuner@QtMobility@@IAEX_N@Z @ 258 NONAME ; void QtMobility::QRadioTuner::stereoStatusChanged(bool)
-	?isStereo@QRadioTuner@QtMobility@@QBE_NXZ @ 259 NONAME ; bool QtMobility::QRadioTuner::isStereo(void) const
-	??1QGraphicsVideoItem@QtMobility@@UAE@XZ @ 260 NONAME ; QtMobility::QGraphicsVideoItem::~QGraphicsVideoItem(void)
-	?playlist@QMediaPlaylistNavigator@QtMobility@@QBEPAVQMediaPlaylistProvider@2@XZ @ 261 NONAME ; class QtMobility::QMediaPlaylistProvider * QtMobility::QMediaPlaylistNavigator::playlist(void) const
-	?isAvailable@QMediaObject@QtMobility@@UBE_NXZ @ 262 NONAME ; bool QtMobility::QMediaObject::isAvailable(void) const
-	?stateChanged@QMediaImageViewer@QtMobility@@IAEXW4State@12@@Z @ 263 NONAME ; void QtMobility::QMediaImageViewer::stateChanged(enum QtMobility::QMediaImageViewer::State)
-	??0QMediaTimeRange@QtMobility@@QAE@ABVQMediaTimeInterval@1@@Z @ 264 NONAME ; QtMobility::QMediaTimeRange::QMediaTimeRange(class QtMobility::QMediaTimeInterval const &)
-	??0QMediaTimeRange@QtMobility@@QAE@_J0@Z @ 265 NONAME ; QtMobility::QMediaTimeRange::QMediaTimeRange(long long, long long)
-	??_EQAudioCaptureSource@QtMobility@@UAE@I@Z @ 266 NONAME ; QtMobility::QAudioCaptureSource::~QAudioCaptureSource(unsigned int)
-	?loadFailed@QMediaPlaylist@QtMobility@@IAEXXZ @ 267 NONAME ; void QtMobility::QMediaPlaylist::loadFailed(void)
-	?getStaticMetaObject@QAudioEncoderControl@QtMobility@@SAABUQMetaObject@@XZ @ 268 NONAME ; struct QMetaObject const & QtMobility::QAudioEncoderControl::getStaticMetaObject(void)
-	??0QMediaRecorder@QtMobility@@QAE@PAVQMediaObject@1@PAVQObject@@@Z @ 269 NONAME ; QtMobility::QMediaRecorder::QMediaRecorder(class QtMobility::QMediaObject *, class QObject *)
-	??_EQMediaRecorderControl@QtMobility@@UAE@I@Z @ 270 NONAME ; QtMobility::QMediaRecorderControl::~QMediaRecorderControl(unsigned int)
-	?positionChanged@QMediaPlayerControl@QtMobility@@IAEX_J@Z @ 271 NONAME ; void QtMobility::QMediaPlayerControl::positionChanged(long long)
-	?duration@QMediaRecorder@QtMobility@@QBE_JXZ @ 272 NONAME ; long long QtMobility::QMediaRecorder::duration(void) const
-	??4QMediaTimeRange@QtMobility@@QAEAAV01@ABVQMediaTimeInterval@1@@Z @ 273 NONAME ; class QtMobility::QMediaTimeRange & QtMobility::QMediaTimeRange::operator=(class QtMobility::QMediaTimeInterval const &)
-	?load@QMediaPlaylist@QtMobility@@QAEXPAVQIODevice@@PBD@Z @ 274 NONAME ; void QtMobility::QMediaPlaylist::load(class QIODevice *, char const *)
-	?qt_metacall@QMediaContainerControl@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 275 NONAME ; int QtMobility::QMediaContainerControl::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?trUtf8@QMediaServiceProviderPlugin@QtMobility@@SA?AVQString@@PBD0@Z @ 276 NONAME ; class QString QtMobility::QMediaServiceProviderPlugin::trUtf8(char const *, char const *)
-	?notifyIntervalChanged@QMediaObject@QtMobility@@IAEXH@Z @ 277 NONAME ; void QtMobility::QMediaObject::notifyIntervalChanged(int)
-	?metaObject@QVideoRendererControl@QtMobility@@UBEPBUQMetaObject@@XZ @ 278 NONAME ; struct QMetaObject const * QtMobility::QVideoRendererControl::metaObject(void) const
-	?mediaChanged@QMediaImageViewer@QtMobility@@IAEXABVQMediaContent@2@@Z @ 279 NONAME ; void QtMobility::QMediaImageViewer::mediaChanged(class QtMobility::QMediaContent const &)
-	?volumeChanged@QMediaPlayerControl@QtMobility@@IAEXH@Z @ 280 NONAME ; void QtMobility::QMediaPlayerControl::volumeChanged(int)
-	?getStaticMetaObject@QMediaObject@QtMobility@@SAABUQMetaObject@@XZ @ 281 NONAME ; struct QMetaObject const & QtMobility::QMediaObject::getStaticMetaObject(void)
-	?media@QMediaPlayer@QtMobility@@QBE?AVQMediaContent@2@XZ @ 282 NONAME ; class QtMobility::QMediaContent QtMobility::QMediaPlayer::media(void) const
-	?staticMetaObject@QRadioTuner@QtMobility@@2UQMetaObject@@B @ 283 NONAME ; struct QMetaObject const QtMobility::QRadioTuner::staticMetaObject
-	?start@QRadioTuner@QtMobility@@QAEXXZ @ 284 NONAME ; void QtMobility::QRadioTuner::start(void)
-	?setResolution@QVideoEncoderSettings@QtMobility@@QAEXHH@Z @ 285 NONAME ; void QtMobility::QVideoEncoderSettings::setResolution(int, int)
-	?setMedia@QMediaPlayer@QtMobility@@QAEXABVQMediaContent@2@PAVQIODevice@@@Z @ 286 NONAME ; void QtMobility::QMediaPlayer::setMedia(class QtMobility::QMediaContent const &, class QIODevice *)
-	?previous@QMediaPlaylist@QtMobility@@QAEXXZ @ 287 NONAME ; void QtMobility::QMediaPlaylist::previous(void)
-	??0QVideoDeviceControl@QtMobility@@IAE@PAVQObject@@@Z @ 288 NONAME ; QtMobility::QVideoDeviceControl::QVideoDeviceControl(class QObject *)
-	??1QMediaStreamsControl@QtMobility@@UAE@XZ @ 289 NONAME ; QtMobility::QMediaStreamsControl::~QMediaStreamsControl(void)
-	?qt_metacall@QMediaObject@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 290 NONAME ; int QtMobility::QMediaObject::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacast@QAudioEncoderControl@QtMobility@@UAEPAXPBD@Z @ 291 NONAME ; void * QtMobility::QAudioEncoderControl::qt_metacast(char const *)
-	?metaObject@QMediaRecorderControl@QtMobility@@UBEPBUQMetaObject@@XZ @ 292 NONAME ; struct QMetaObject const * QtMobility::QMediaRecorderControl::metaObject(void) const
-	??_EQMediaServiceProvider@QtMobility@@UAE@I@Z @ 293 NONAME ; QtMobility::QMediaServiceProvider::~QMediaServiceProvider(unsigned int)
-	?removeMedia@QMediaPlaylistProvider@QtMobility@@UAE_NHH@Z @ 294 NONAME ; bool QtMobility::QMediaPlaylistProvider::removeMedia(int, int)
-	?trUtf8@QVideoEncoderControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 295 NONAME ; class QString QtMobility::QVideoEncoderControl::trUtf8(char const *, char const *, int)
-	??0QAudioEncoderSettings@QtMobility@@QAE@ABV01@@Z @ 296 NONAME ; QtMobility::QAudioEncoderSettings::QAudioEncoderSettings(class QtMobility::QAudioEncoderSettings const &)
-	?isMetaDataAvailable@QMediaObject@QtMobility@@QBE_NXZ @ 297 NONAME ; bool QtMobility::QMediaObject::isMetaDataAvailable(void) const
-	?metaObject@QMediaService@QtMobility@@UBEPBUQMetaObject@@XZ @ 298 NONAME ; struct QMetaObject const * QtMobility::QMediaService::metaObject(void) const
-	??1QRadioTunerControl@QtMobility@@UAE@XZ @ 299 NONAME ; QtMobility::QRadioTunerControl::~QRadioTunerControl(void)
-	?contrast@QVideoWidget@QtMobility@@QBEHXZ @ 300 NONAME ; int QtMobility::QVideoWidget::contrast(void) const
-	?duration@QMediaPlayer@QtMobility@@QBE_JXZ @ 301 NONAME ; long long QtMobility::QMediaPlayer::duration(void) const
-	??1QAudioEncoderControl@QtMobility@@UAE@XZ @ 302 NONAME ; QtMobility::QAudioEncoderControl::~QAudioEncoderControl(void)
-	??1QVideoDeviceControl@QtMobility@@UAE@XZ @ 303 NONAME ; QtMobility::QVideoDeviceControl::~QVideoDeviceControl(void)
-	?staticMetaObject@QMediaPlaylistProvider@QtMobility@@2UQMetaObject@@B @ 304 NONAME ; struct QMetaObject const QtMobility::QMediaPlaylistProvider::staticMetaObject
-	?stateChanged@QMediaPlayerControl@QtMobility@@IAEXW4State@QMediaPlayer@2@@Z @ 305 NONAME ; void QtMobility::QMediaPlayerControl::stateChanged(enum QtMobility::QMediaPlayer::State)
-	?language@QMediaResource@QtMobility@@QBE?AVQString@@XZ @ 306 NONAME ; class QString QtMobility::QMediaResource::language(void) const
-	?tr@QAudioEncoderControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 307 NONAME ; class QString QtMobility::QAudioEncoderControl::tr(char const *, char const *, int)
-	?getStaticMetaObject@QRadioTuner@QtMobility@@SAABUQMetaObject@@XZ @ 308 NONAME ; struct QMetaObject const & QtMobility::QRadioTuner::getStaticMetaObject(void)
-	?mediaAboutToBeRemoved@QMediaPlaylist@QtMobility@@IAEXHH@Z @ 309 NONAME ; void QtMobility::QMediaPlaylist::mediaAboutToBeRemoved(int, int)
-	??_EQVideoOutputControl@QtMobility@@UAE@I@Z @ 310 NONAME ; QtMobility::QVideoOutputControl::~QVideoOutputControl(unsigned int)
-	?metaObject@QVideoWidgetControl@QtMobility@@UBEPBUQMetaObject@@XZ @ 311 NONAME ; struct QMetaObject const * QtMobility::QVideoWidgetControl::metaObject(void) const
-	??_EQMediaObject@QtMobility@@UAE@I@Z @ 312 NONAME ; QtMobility::QMediaObject::~QMediaObject(unsigned int)
-	?bitRate@QVideoEncoderSettings@QtMobility@@QBEHXZ @ 313 NONAME ; int QtMobility::QVideoEncoderSettings::bitRate(void) const
-	?elapsedTimeChanged@QMediaImageViewer@QtMobility@@IAEXH@Z @ 314 NONAME ; void QtMobility::QMediaImageViewer::elapsedTimeChanged(int)
-	?defaultAudioInput@QAudioCaptureSource@QtMobility@@QBE?AVQString@@XZ @ 315 NONAME ; class QString QtMobility::QAudioCaptureSource::defaultAudioInput(void) const
-	?staticMetaObject@QMediaRecorder@QtMobility@@2UQMetaObject@@B @ 316 NONAME ; struct QMetaObject const QtMobility::QMediaRecorder::staticMetaObject
-	?seekableChanged@QMediaPlayerControl@QtMobility@@IAEX_N@Z @ 317 NONAME ; void QtMobility::QMediaPlayerControl::seekableChanged(bool)
-	?qt_metacall@QMediaPlaylist@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 318 NONAME ; int QtMobility::QMediaPlaylist::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?mediaStatus@QMediaPlayer@QtMobility@@QBE?AW4MediaStatus@12@XZ @ 319 NONAME ; enum QtMobility::QMediaPlayer::MediaStatus QtMobility::QMediaPlayer::mediaStatus(void) const
-	?tr@QMediaPlayer@QtMobility@@SA?AVQString@@PBD0@Z @ 320 NONAME ; class QString QtMobility::QMediaPlayer::tr(char const *, char const *)
-	?insertMedia@QLocalMediaPlaylistProvider@QtMobility@@UAE_NHABVQMediaContent@2@@Z @ 321 NONAME ; bool QtMobility::QLocalMediaPlaylistProvider::insertMedia(int, class QtMobility::QMediaContent const &)
-	?audioAvailableChanged@QMediaPlayerControl@QtMobility@@IAEX_N@Z @ 322 NONAME ; void QtMobility::QMediaPlayerControl::audioAvailableChanged(bool)
-	?tr@QMediaPlaylistProvider@QtMobility@@SA?AVQString@@PBD0@Z @ 323 NONAME ; class QString QtMobility::QMediaPlaylistProvider::tr(char const *, char const *)
-	?metaObject@QMediaContainerControl@QtMobility@@UBEPBUQMetaObject@@XZ @ 324 NONAME ; struct QMetaObject const * QtMobility::QMediaContainerControl::metaObject(void) const
-	?audioInputs@QAudioCaptureSource@QtMobility@@QBE?AV?$QList@VQString@@@@XZ @ 325 NONAME ; class QList<class QString> QtMobility::QAudioCaptureSource::audioInputs(void) const
-	?metaObject@QImageEncoderControl@QtMobility@@UBEPBUQMetaObject@@XZ @ 326 NONAME ; struct QMetaObject const * QtMobility::QImageEncoderControl::metaObject(void) const
-	??1QMediaPlaylistIOPlugin@QtMobility@@UAE@XZ @ 327 NONAME ; QtMobility::QMediaPlaylistIOPlugin::~QMediaPlaylistIOPlugin(void)
-	?d_func@QLocalMediaPlaylistProvider@QtMobility@@AAEPAVQLocalMediaPlaylistProviderPrivate@2@XZ @ 328 NONAME ; class QtMobility::QLocalMediaPlaylistProviderPrivate * QtMobility::QLocalMediaPlaylistProvider::d_func(void)
-	?trUtf8@QVideoWindowControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 329 NONAME ; class QString QtMobility::QVideoWindowControl::trUtf8(char const *, char const *, int)
-	?audioBitRate@QMediaResource@QtMobility@@QBEHXZ @ 330 NONAME ; int QtMobility::QMediaResource::audioBitRate(void) const
-	??0QAudioCaptureSource@QtMobility@@QAE@PAVQMediaObject@1@PAVQObject@@@Z @ 331 NONAME ; QtMobility::QAudioCaptureSource::QAudioCaptureSource(class QtMobility::QMediaObject *, class QObject *)
-	?d_func@QGraphicsVideoItem@QtMobility@@ABEPBVQGraphicsVideoItemPrivate@2@XZ @ 332 NONAME ; class QtMobility::QGraphicsVideoItemPrivate const * QtMobility::QGraphicsVideoItem::d_func(void) const
-	?tr@QMediaServiceProvider@QtMobility@@SA?AVQString@@PBD0H@Z @ 333 NONAME ; class QString QtMobility::QMediaServiceProvider::tr(char const *, char const *, int)
-	?trUtf8@QMediaServiceProvider@QtMobility@@SA?AVQString@@PBD0@Z @ 334 NONAME ; class QString QtMobility::QMediaServiceProvider::trUtf8(char const *, char const *)
-	?getStaticMetaObject@QMediaRecorder@QtMobility@@SAABUQMetaObject@@XZ @ 335 NONAME ; struct QMetaObject const & QtMobility::QMediaRecorder::getStaticMetaObject(void)
-	??_EQMediaPlaylistProvider@QtMobility@@UAE@I@Z @ 336 NONAME ; QtMobility::QMediaPlaylistProvider::~QMediaPlaylistProvider(unsigned int)
-	?setupMetaData@QMediaObject@QtMobility@@AAEXXZ @ 337 NONAME ; void QtMobility::QMediaObject::setupMetaData(void)
-	?metaDataAvailableChanged@QMetaDataControl@QtMobility@@IAEX_N@Z @ 338 NONAME ; void QtMobility::QMetaDataControl::metaDataAvailableChanged(bool)
-	??_EQMediaRecorder@QtMobility@@UAE@I@Z @ 339 NONAME ; QtMobility::QMediaRecorder::~QMediaRecorder(unsigned int)
-	?audioSettings@QMediaRecorder@QtMobility@@QBE?AVQAudioEncoderSettings@2@XZ @ 340 NONAME ; class QtMobility::QAudioEncoderSettings QtMobility::QMediaRecorder::audioSettings(void) const
-	?addMedia@QMediaPlaylist@QtMobility@@QAE_NABVQMediaContent@2@@Z @ 341 NONAME ; bool QtMobility::QMediaPlaylist::addMedia(class QtMobility::QMediaContent const &)
-	?availabilityError@QRadioTuner@QtMobility@@UBE?AW4AvailabilityError@QtMedia@2@XZ @ 342 NONAME ; enum QtMobility::QtMedia::AvailabilityError QtMobility::QRadioTuner::availabilityError(void) const
-	?isMetaDataWritable@QMediaObject@QtMobility@@QBE_NXZ @ 343 NONAME ; bool QtMobility::QMediaObject::isMetaDataWritable(void) const
-	?setCodec@QImageEncoderSettings@QtMobility@@QAEXABVQString@@@Z @ 344 NONAME ; void QtMobility::QImageEncoderSettings::setCodec(class QString const &)
-	?staticMetaObject@QLocalMediaPlaylistProvider@QtMobility@@2UQMetaObject@@B @ 345 NONAME ; struct QMetaObject const QtMobility::QLocalMediaPlaylistProvider::staticMetaObject
-	?selectedDeviceChanged@QVideoDeviceControl@QtMobility@@IAEXH@Z @ 346 NONAME ; void QtMobility::QVideoDeviceControl::selectedDeviceChanged(int)
-	??0QImageEncoderSettings@QtMobility@@QAE@XZ @ 347 NONAME ; QtMobility::QImageEncoderSettings::QImageEncoderSettings(void)
-	?availabilityChanged@QMediaObject@QtMobility@@IAEX_N@Z @ 348 NONAME ; void QtMobility::QMediaObject::availabilityChanged(bool)
-	??0QRadioTunerControl@QtMobility@@IAE@PAVQObject@@@Z @ 349 NONAME ; QtMobility::QRadioTunerControl::QRadioTunerControl(class QObject *)
-	?tr@QAudioEncoderControl@QtMobility@@SA?AVQString@@PBD0@Z @ 350 NONAME ; class QString QtMobility::QAudioEncoderControl::tr(char const *, char const *)
-	?isVideoAvailable@QMediaPlayer@QtMobility@@QBE_NXZ @ 351 NONAME ; bool QtMobility::QMediaPlayer::isVideoAvailable(void) const
-	?activeStreamsChanged@QMediaStreamsControl@QtMobility@@IAEXXZ @ 352 NONAME ; void QtMobility::QMediaStreamsControl::activeStreamsChanged(void)
-	?next@QMediaPlaylistNavigator@QtMobility@@QAEXXZ @ 353 NONAME ; void QtMobility::QMediaPlaylistNavigator::next(void)
-	?getStaticMetaObject@QGraphicsVideoItem@QtMobility@@SAABUQMetaObject@@XZ @ 354 NONAME ; struct QMetaObject const & QtMobility::QGraphicsVideoItem::getStaticMetaObject(void)
-	??0QMediaServiceProviderHint@QtMobility@@QAE@ABVQByteArray@@@Z @ 355 NONAME ; QtMobility::QMediaServiceProviderHint::QMediaServiceProviderHint(class QByteArray const &)
-	?d_func@QMediaImageViewer@QtMobility@@AAEPAVQMediaImageViewerPrivate@2@XZ @ 356 NONAME ; class QtMobility::QMediaImageViewerPrivate * QtMobility::QMediaImageViewer::d_func(void)
-	?qt_metacall@QMediaPlaylistIOPlugin@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 357 NONAME ; int QtMobility::QMediaPlaylistIOPlugin::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??1QMediaContainerControl@QtMobility@@UAE@XZ @ 358 NONAME ; QtMobility::QMediaContainerControl::~QMediaContainerControl(void)
-	?earliestTime@QMediaTimeRange@QtMobility@@QBE_JXZ @ 359 NONAME ; long long QtMobility::QMediaTimeRange::earliestTime(void) const
-	?getStaticMetaObject@QVideoOutputControl@QtMobility@@SAABUQMetaObject@@XZ @ 360 NONAME ; struct QMetaObject const & QtMobility::QVideoOutputControl::getStaticMetaObject(void)
-	?availableExtendedMetaData@QMediaObject@QtMobility@@QBE?AVQStringList@@XZ @ 361 NONAME ; class QStringList QtMobility::QMediaObject::availableExtendedMetaData(void) const
-	?qt_metacast@QMediaStreamsControl@QtMobility@@UAEPAXPBD@Z @ 362 NONAME ; void * QtMobility::QMediaStreamsControl::qt_metacast(char const *)
-	?qt_metacast@QAudioEndpointSelector@QtMobility@@UAEPAXPBD@Z @ 363 NONAME ; void * QtMobility::QAudioEndpointSelector::qt_metacast(char const *)
-	?staticMetaObject@QMediaPlayerControl@QtMobility@@2UQMetaObject@@B @ 364 NONAME ; struct QMetaObject const QtMobility::QMediaPlayerControl::staticMetaObject
-	?staticMetaObject@QAudioEncoderControl@QtMobility@@2UQMetaObject@@B @ 365 NONAME ; struct QMetaObject const QtMobility::QAudioEncoderControl::staticMetaObject
-	?qt_metacast@QMediaPlaylistNavigator@QtMobility@@UAEPAXPBD@Z @ 366 NONAME ; void * QtMobility::QMediaPlaylistNavigator::qt_metacast(char const *)
-	?frequencyChanged@QRadioTunerControl@QtMobility@@IAEXH@Z @ 367 NONAME ; void QtMobility::QRadioTunerControl::frequencyChanged(int)
-	?error@QMediaPlayer@QtMobility@@IAEXW4Error@12@@Z @ 368 NONAME ; void QtMobility::QMediaPlayer::error(enum QtMobility::QMediaPlayer::Error)
-	??ZQMediaTimeRange@QtMobility@@QAEAAV01@ABV01@@Z @ 369 NONAME ; class QtMobility::QMediaTimeRange & QtMobility::QMediaTimeRange::operator-=(class QtMobility::QMediaTimeRange const &)
-	??_EQMediaService@QtMobility@@UAE@I@Z @ 370 NONAME ; QtMobility::QMediaService::~QMediaService(unsigned int)
-	?setEncodingMode@QVideoEncoderSettings@QtMobility@@QAEXW4EncodingMode@QtMedia@2@@Z @ 371 NONAME ; void QtMobility::QVideoEncoderSettings::setEncodingMode(enum QtMobility::QtMedia::EncodingMode)
-	?metaObject@QMediaStreamsControl@QtMobility@@UBEPBUQMetaObject@@XZ @ 372 NONAME ; struct QMetaObject const * QtMobility::QMediaStreamsControl::metaObject(void) const
-	?isMuted@QMediaPlayer@QtMobility@@QBE_NXZ @ 373 NONAME ; bool QtMobility::QMediaPlayer::isMuted(void) const
-	?tr@QMediaRecorder@QtMobility@@SA?AVQString@@PBD0H@Z @ 374 NONAME ; class QString QtMobility::QMediaRecorder::tr(char const *, char const *, int)
-	?saturationChanged@QVideoWindowControl@QtMobility@@IAEXH@Z @ 375 NONAME ; void QtMobility::QVideoWindowControl::saturationChanged(int)
-	?trUtf8@QMediaPlayerControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 376 NONAME ; class QString QtMobility::QMediaPlayerControl::trUtf8(char const *, char const *, int)
-	?playbackModeChanged@QMediaPlaylist@QtMobility@@IAEXW4PlaybackMode@12@@Z @ 377 NONAME ; void QtMobility::QMediaPlaylist::playbackModeChanged(enum QtMobility::QMediaPlaylist::PlaybackMode)
-	?metaDataChanged@QMediaObject@QtMobility@@IAEXXZ @ 378 NONAME ; void QtMobility::QMediaObject::metaDataChanged(void)
-	??0QMediaPlaylistNavigator@QtMobility@@QAE@PAVQMediaPlaylistProvider@1@PAVQObject@@@Z @ 379 NONAME ; QtMobility::QMediaPlaylistNavigator::QMediaPlaylistNavigator(class QtMobility::QMediaPlaylistProvider *, class QObject *)
-	?metaObject@QAudioCaptureSource@QtMobility@@UBEPBUQMetaObject@@XZ @ 380 NONAME ; struct QMetaObject const * QtMobility::QAudioCaptureSource::metaObject(void) const
-	?error@QMediaPlaylist@QtMobility@@QBE?AW4Error@12@XZ @ 381 NONAME ; enum QtMobility::QMediaPlaylist::Error QtMobility::QMediaPlaylist::error(void) const
-	?tr@QMediaControl@QtMobility@@SA?AVQString@@PBD0@Z @ 382 NONAME ; class QString QtMobility::QMediaControl::tr(char const *, char const *)
-	?setMediaObject@QGraphicsVideoItem@QtMobility@@QAEXPAVQMediaObject@2@@Z @ 383 NONAME ; void QtMobility::QGraphicsVideoItem::setMediaObject(class QtMobility::QMediaObject *)
-	?error@QRadioTuner@QtMobility@@QBE?AW4Error@12@XZ @ 384 NONAME ; enum QtMobility::QRadioTuner::Error QtMobility::QRadioTuner::error(void) const
-	??4QImageEncoderSettings@QtMobility@@QAEAAV01@ABV01@@Z @ 385 NONAME ; class QtMobility::QImageEncoderSettings & QtMobility::QImageEncoderSettings::operator=(class QtMobility::QImageEncoderSettings const &)
-	?trUtf8@QMediaService@QtMobility@@SA?AVQString@@PBD0@Z @ 386 NONAME ; class QString QtMobility::QMediaService::trUtf8(char const *, char const *)
-	??0QVideoWindowControl@QtMobility@@IAE@PAVQObject@@@Z @ 387 NONAME ; QtMobility::QVideoWindowControl::QVideoWindowControl(class QObject *)
-	?removeMedia@QLocalMediaPlaylistProvider@QtMobility@@UAE_NH@Z @ 388 NONAME ; bool QtMobility::QLocalMediaPlaylistProvider::removeMedia(int)
-	?mediaObject@QGraphicsVideoItem@QtMobility@@QBEPAVQMediaObject@2@XZ @ 389 NONAME ; class QtMobility::QMediaObject * QtMobility::QGraphicsVideoItem::mediaObject(void) const
-	?saturation@QVideoWidget@QtMobility@@QBEHXZ @ 390 NONAME ; int QtMobility::QVideoWidget::saturation(void) const
-	?tr@QVideoDeviceControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 391 NONAME ; class QString QtMobility::QVideoDeviceControl::tr(char const *, char const *, int)
-	?errorString@QMediaPlayer@QtMobility@@QBE?AVQString@@XZ @ 392 NONAME ; class QString QtMobility::QMediaPlayer::errorString(void) const
-	?supportedMimeTypes@QMediaPlayer@QtMobility@@SA?AVQStringList@@V?$QFlags@W4Flag@QMediaPlayer@QtMobility@@@@@Z @ 393 NONAME ; class QStringList QtMobility::QMediaPlayer::supportedMimeTypes(class QFlags<enum QtMobility::QMediaPlayer::Flag>)
-	?stateChanged@QMediaPlayer@QtMobility@@IAEXW4State@12@@Z @ 394 NONAME ; void QtMobility::QMediaPlayer::stateChanged(enum QtMobility::QMediaPlayer::State)
-	?nextIndex@QMediaPlaylist@QtMobility@@QBEHH@Z @ 395 NONAME ; int QtMobility::QMediaPlaylist::nextIndex(int) const
-	?metaObject@QMediaPlaylistNavigator@QtMobility@@UBEPBUQMetaObject@@XZ @ 396 NONAME ; struct QMetaObject const * QtMobility::QMediaPlaylistNavigator::metaObject(void) const
-	?addTimeRange@QMediaTimeRange@QtMobility@@QAEXABV12@@Z @ 397 NONAME ; void QtMobility::QMediaTimeRange::addTimeRange(class QtMobility::QMediaTimeRange const &)
-	?hueChanged@QVideoWindowControl@QtMobility@@IAEXH@Z @ 398 NONAME ; void QtMobility::QVideoWindowControl::hueChanged(int)
-	?frequency@QRadioTuner@QtMobility@@QBEHXZ @ 399 NONAME ; int QtMobility::QRadioTuner::frequency(void) const
-	?trUtf8@QMediaPlaylist@QtMobility@@SA?AVQString@@PBD0H@Z @ 400 NONAME ; class QString QtMobility::QMediaPlaylist::trUtf8(char const *, char const *, int)
-	?fullScreenChanged@QVideoWidgetControl@QtMobility@@IAEX_N@Z @ 401 NONAME ; void QtMobility::QVideoWidgetControl::fullScreenChanged(bool)
-	?setContrast@QVideoWidget@QtMobility@@QAEXH@Z @ 402 NONAME ; void QtMobility::QVideoWidget::setContrast(int)
-	?playbackRate@QMediaPlayer@QtMobility@@QBEMXZ @ 403 NONAME ; float QtMobility::QMediaPlayer::playbackRate(void) const
-	?mimeType@QMediaServiceProviderHint@QtMobility@@QBE?AVQString@@XZ @ 404 NONAME ; class QString QtMobility::QMediaServiceProviderHint::mimeType(void) const
-	??0QMediaPlaylist@QtMobility@@QAE@PAVQObject@@@Z @ 405 NONAME ; QtMobility::QMediaPlaylist::QMediaPlaylist(class QObject *)
-	?staticMetaObject@QVideoRendererControl@QtMobility@@2UQMetaObject@@B @ 406 NONAME ; struct QMetaObject const QtMobility::QVideoRendererControl::staticMetaObject
-	?staticMetaObject@QMetaDataControl@QtMobility@@2UQMetaObject@@B @ 407 NONAME ; struct QMetaObject const QtMobility::QMetaDataControl::staticMetaObject
-	?pause@QMediaPlayer@QtMobility@@QAEXXZ @ 408 NONAME ; void QtMobility::QMediaPlayer::pause(void)
-	?getStaticMetaObject@QMediaPlaylistProvider@QtMobility@@SAABUQMetaObject@@XZ @ 409 NONAME ; struct QMetaObject const & QtMobility::QMediaPlaylistProvider::getStaticMetaObject(void)
-	?fullScreenChanged@QVideoWindowControl@QtMobility@@IAEX_N@Z @ 410 NONAME ; void QtMobility::QVideoWindowControl::fullScreenChanged(bool)
-	?staticMetaObject@QMediaServiceProviderPlugin@QtMobility@@2UQMetaObject@@B @ 411 NONAME ; struct QMetaObject const QtMobility::QMediaServiceProviderPlugin::staticMetaObject
-	?staticMetaObject@QMediaRecorderControl@QtMobility@@2UQMetaObject@@B @ 412 NONAME ; struct QMetaObject const QtMobility::QMediaRecorderControl::staticMetaObject
-	?hue@QVideoWidget@QtMobility@@QBEHXZ @ 413 NONAME ; int QtMobility::QVideoWidget::hue(void) const
-	?insertMedia@QMediaPlaylistProvider@QtMobility@@UAE_NHABVQMediaContent@2@@Z @ 414 NONAME ; bool QtMobility::QMediaPlaylistProvider::insertMedia(int, class QtMobility::QMediaContent const &)
-	?staticMetaObject@QMediaServiceProvider@QtMobility@@2UQMetaObject@@B @ 415 NONAME ; struct QMetaObject const QtMobility::QMediaServiceProvider::staticMetaObject
-	?getStaticMetaObject@QMediaImageViewer@QtMobility@@SAABUQMetaObject@@XZ @ 416 NONAME ; struct QMetaObject const & QtMobility::QMediaImageViewer::getStaticMetaObject(void)
-	?currentIndex@QMediaPlaylistNavigator@QtMobility@@QBEHXZ @ 417 NONAME ; int QtMobility::QMediaPlaylistNavigator::currentIndex(void) const
-	??1QMediaPlaylistControl@QtMobility@@UAE@XZ @ 418 NONAME ; QtMobility::QMediaPlaylistControl::~QMediaPlaylistControl(void)
-	?tr@QMediaServiceProviderPlugin@QtMobility@@SA?AVQString@@PBD0@Z @ 419 NONAME ; class QString QtMobility::QMediaServiceProviderPlugin::tr(char const *, char const *)
-	?d_func@QMediaRecorder@QtMobility@@AAEPAVQMediaRecorderPrivate@2@XZ @ 420 NONAME ; class QtMobility::QMediaRecorderPrivate * QtMobility::QMediaRecorder::d_func(void)
-	??_EQMediaPlaylistIOInterface@QtMobility@@UAE@I@Z @ 421 NONAME ; QtMobility::QMediaPlaylistIOInterface::~QMediaPlaylistIOInterface(unsigned int)
-	?bind@QMediaObject@QtMobility@@UAEXPAVQObject@@@Z @ 422 NONAME ; void QtMobility::QMediaObject::bind(class QObject *)
-	?trUtf8@QRadioTuner@QtMobility@@SA?AVQString@@PBD0H@Z @ 423 NONAME ; class QString QtMobility::QRadioTuner::trUtf8(char const *, char const *, int)
-	?tr@QVideoWindowControl@QtMobility@@SA?AVQString@@PBD0@Z @ 424 NONAME ; class QString QtMobility::QVideoWindowControl::tr(char const *, char const *)
-	??1QMediaServiceFeaturesInterface@QtMobility@@UAE@XZ @ 425 NONAME ; QtMobility::QMediaServiceFeaturesInterface::~QMediaServiceFeaturesInterface(void)
-	??_EQMediaContainerControl@QtMobility@@UAE@I@Z @ 426 NONAME ; QtMobility::QMediaContainerControl::~QMediaContainerControl(unsigned int)
-	?stop@QMediaPlayer@QtMobility@@QAEXXZ @ 427 NONAME ; void QtMobility::QMediaPlayer::stop(void)
-	?qt_metacast@QMediaServiceProvider@QtMobility@@UAEPAXPBD@Z @ 428 NONAME ; void * QtMobility::QMediaServiceProvider::qt_metacast(char const *)
-	?mediaStatusChanged@QMediaImageViewer@QtMobility@@IAEXW4MediaStatus@12@@Z @ 429 NONAME ; void QtMobility::QMediaImageViewer::mediaStatusChanged(enum QtMobility::QMediaImageViewer::MediaStatus)
-	?audioCodecDescription@QMediaRecorder@QtMobility@@QBE?AVQString@@ABV3@@Z @ 430 NONAME ; class QString QtMobility::QMediaRecorder::audioCodecDescription(class QString const &) const
-	??0QMediaPlaylistProvider@QtMobility@@IAE@AAVQMediaPlaylistProviderPrivate@1@PAVQObject@@@Z @ 431 NONAME ; QtMobility::QMediaPlaylistProvider::QMediaPlaylistProvider(class QtMobility::QMediaPlaylistProviderPrivate &, class QObject *)
-	?qt_metacast@QVideoWidget@QtMobility@@UAEPAXPBD@Z @ 432 NONAME ; void * QtMobility::QVideoWidget::qt_metacast(char const *)
-	?type@QMediaServiceProviderHint@QtMobility@@QBE?AW4Type@12@XZ @ 433 NONAME ; enum QtMobility::QMediaServiceProviderHint::Type QtMobility::QMediaServiceProviderHint::type(void) const
-	?qt_metacast@QMediaContainerControl@QtMobility@@UAEPAXPBD@Z @ 434 NONAME ; void * QtMobility::QMediaContainerControl::qt_metacast(char const *)
-	?trUtf8@QMediaPlaylistControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 435 NONAME ; class QString QtMobility::QMediaPlaylistControl::trUtf8(char const *, char const *, int)
-	?qt_metacast@QMediaServiceProviderPlugin@QtMobility@@UAEPAXPBD@Z @ 436 NONAME ; void * QtMobility::QMediaServiceProviderPlugin::qt_metacast(char const *)
-	??1QMediaPlayer@QtMobility@@UAE@XZ @ 437 NONAME ; QtMobility::QMediaPlayer::~QMediaPlayer(void)
-	?state@QMediaPlayer@QtMobility@@QBE?AW4State@12@XZ @ 438 NONAME ; enum QtMobility::QMediaPlayer::State QtMobility::QMediaPlayer::state(void) const
-	?d_func@QRadioTuner@QtMobility@@ABEPBVQRadioTunerPrivate@2@XZ @ 439 NONAME ; class QtMobility::QRadioTunerPrivate const * QtMobility::QRadioTuner::d_func(void) const
-	?brightnessChanged@QVideoWidgetControl@QtMobility@@IAEXH@Z @ 440 NONAME ; void QtMobility::QVideoWidgetControl::brightnessChanged(int)
-	?currentIndex@QMediaPlaylist@QtMobility@@QBEHXZ @ 441 NONAME ; int QtMobility::QMediaPlaylist::currentIndex(void) const
-	?getStaticMetaObject@QRadioTunerControl@QtMobility@@SAABUQMetaObject@@XZ @ 442 NONAME ; struct QMetaObject const & QtMobility::QRadioTunerControl::getStaticMetaObject(void)
-	?qt_metacall@QVideoWindowControl@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 443 NONAME ; int QtMobility::QVideoWindowControl::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?brightness@QVideoWidget@QtMobility@@QBEHXZ @ 444 NONAME ; int QtMobility::QVideoWidget::brightness(void) const
-	?getStaticMetaObject@QImageEncoderControl@QtMobility@@SAABUQMetaObject@@XZ @ 445 NONAME ; struct QMetaObject const & QtMobility::QImageEncoderControl::getStaticMetaObject(void)
-	?trUtf8@QMediaRecorder@QtMobility@@SA?AVQString@@PBD0@Z @ 446 NONAME ; class QString QtMobility::QMediaRecorder::trUtf8(char const *, char const *)
-	?availableAudioInputsChanged@QAudioCaptureSource@QtMobility@@IAEXXZ @ 447 NONAME ; void QtMobility::QAudioCaptureSource::availableAudioInputsChanged(void)
-	?trUtf8@QMediaPlaylistProvider@QtMobility@@SA?AVQString@@PBD0H@Z @ 448 NONAME ; class QString QtMobility::QMediaPlaylistProvider::trUtf8(char const *, char const *, int)
-	?quality@QImageEncoderSettings@QtMobility@@QBE?AW4EncodingQuality@QtMedia@2@XZ @ 449 NONAME ; enum QtMobility::QtMedia::EncodingQuality QtMobility::QImageEncoderSettings::quality(void) const
-	?d_func@QMediaControl@QtMobility@@ABEPBVQMediaControlPrivate@2@XZ @ 450 NONAME ; class QtMobility::QMediaControlPrivate const * QtMobility::QMediaControl::d_func(void) const
-	?volume@QMediaPlayer@QtMobility@@QBEHXZ @ 451 NONAME ; int QtMobility::QMediaPlayer::volume(void) const
-	?setTimeout@QMediaImageViewer@QtMobility@@QAEXH@Z @ 452 NONAME ; void QtMobility::QMediaImageViewer::setTimeout(int)
-	?setPlaybackMode@QMediaPlaylistNavigator@QtMobility@@QAEXW4PlaybackMode@QMediaPlaylist@2@@Z @ 453 NONAME ; void QtMobility::QMediaPlaylistNavigator::setPlaybackMode(enum QtMobility::QMediaPlaylist::PlaybackMode)
-	?currentMedia@QMediaPlaylist@QtMobility@@QBE?AVQMediaContent@2@XZ @ 454 NONAME ; class QtMobility::QMediaContent QtMobility::QMediaPlaylist::currentMedia(void) const
-	??0QMediaServiceProviderHint@QtMobility@@QAE@ABVQString@@ABVQStringList@@@Z @ 455 NONAME ; QtMobility::QMediaServiceProviderHint::QMediaServiceProviderHint(class QString const &, class QStringList const &)
-	?qt_metacast@QGraphicsVideoItem@QtMobility@@UAEPAXPBD@Z @ 456 NONAME ; void * QtMobility::QGraphicsVideoItem::qt_metacast(char const *)
-	?mutedChanged@QRadioTuner@QtMobility@@IAEX_N@Z @ 457 NONAME ; void QtMobility::QRadioTuner::mutedChanged(bool)
-	?getStaticMetaObject@QMediaPlayer@QtMobility@@SAABUQMetaObject@@XZ @ 458 NONAME ; struct QMetaObject const & QtMobility::QMediaPlayer::getStaticMetaObject(void)
-	?mediaCount@QLocalMediaPlaylistProvider@QtMobility@@UBEHXZ @ 459 NONAME ; int QtMobility::QLocalMediaPlaylistProvider::mediaCount(void) const
-	??9QMediaServiceProviderHint@QtMobility@@QBE_NABV01@@Z @ 460 NONAME ; bool QtMobility::QMediaServiceProviderHint::operator!=(class QtMobility::QMediaServiceProviderHint const &) const
-	?outputLocation@QMediaRecorder@QtMobility@@QBE?AVQUrl@@XZ @ 461 NONAME ; class QUrl QtMobility::QMediaRecorder::outputLocation(void) const
-	?d_func@QMediaPlaylistNavigator@QtMobility@@ABEPBVQMediaPlaylistNavigatorPrivate@2@XZ @ 462 NONAME ; class QtMobility::QMediaPlaylistNavigatorPrivate const * QtMobility::QMediaPlaylistNavigator::d_func(void) const
-	??_EQMediaPlaylistReader@QtMobility@@UAE@I@Z @ 463 NONAME ; QtMobility::QMediaPlaylistReader::~QMediaPlaylistReader(unsigned int)
-	??9QMediaResource@QtMobility@@QBE_NABV01@@Z @ 464 NONAME ; bool QtMobility::QMediaResource::operator!=(class QtMobility::QMediaResource const &) const
-	?bandChanged@QRadioTunerControl@QtMobility@@IAEXW4Band@QRadioTuner@2@@Z @ 465 NONAME ; void QtMobility::QRadioTunerControl::bandChanged(enum QtMobility::QRadioTuner::Band)
-	?durationChanged@QMediaPlayer@QtMobility@@IAEX_J@Z @ 466 NONAME ; void QtMobility::QMediaPlayer::durationChanged(long long)
-	?errorString@QMediaPlaylist@QtMobility@@QBE?AVQString@@XZ @ 467 NONAME ; class QString QtMobility::QMediaPlaylist::errorString(void) const
-	?audioDescription@QAudioCaptureSource@QtMobility@@QBE?AVQString@@ABV3@@Z @ 468 NONAME ; class QString QtMobility::QAudioCaptureSource::audioDescription(class QString const &) const
-	?canonicalUrl@QMediaContent@QtMobility@@QBE?AVQUrl@@XZ @ 469 NONAME ; class QUrl QtMobility::QMediaContent::canonicalUrl(void) const
-	??1QImageEncoderControl@QtMobility@@UAE@XZ @ 470 NONAME ; QtMobility::QImageEncoderControl::~QImageEncoderControl(void)
-	?d_func@QMediaImageViewer@QtMobility@@ABEPBVQMediaImageViewerPrivate@2@XZ @ 471 NONAME ; class QtMobility::QMediaImageViewerPrivate const * QtMobility::QMediaImageViewer::d_func(void) const
-	?qt_metacast@QMediaObject@QtMobility@@UAEPAXPBD@Z @ 472 NONAME ; void * QtMobility::QMediaObject::qt_metacast(char const *)
-	?setAudioInput@QAudioCaptureSource@QtMobility@@QAEXABVQString@@@Z @ 473 NONAME ; void QtMobility::QAudioCaptureSource::setAudioInput(class QString const &)
-	?videoAvailableChanged@QMediaPlayerControl@QtMobility@@IAEX_N@Z @ 474 NONAME ; void QtMobility::QMediaPlayerControl::videoAvailableChanged(bool)
-	?supportedAudioSampleRates@QMediaRecorder@QtMobility@@QBE?AV?$QList@H@@ABVQAudioEncoderSettings@2@PA_N@Z @ 475 NONAME ; class QList<int> QtMobility::QMediaRecorder::supportedAudioSampleRates(class QtMobility::QAudioEncoderSettings const &, bool *) const
-	?setSampleRate@QAudioEncoderSettings@QtMobility@@QAEXH@Z @ 476 NONAME ; void QtMobility::QAudioEncoderSettings::setSampleRate(int)
-	?mediaStream@QMediaPlayer@QtMobility@@QBEPBVQIODevice@@XZ @ 477 NONAME ; class QIODevice const * QtMobility::QMediaPlayer::mediaStream(void) const
-	?trUtf8@QMediaRecorderControl@QtMobility@@SA?AVQString@@PBD0@Z @ 478 NONAME ; class QString QtMobility::QMediaRecorderControl::trUtf8(char const *, char const *)
-	??0QMediaImageViewer@QtMobility@@QAE@PAVQObject@@@Z @ 479 NONAME ; QtMobility::QMediaImageViewer::QMediaImageViewer(class QObject *)
-	?metaObject@QMediaObject@QtMobility@@UBEPBUQMetaObject@@XZ @ 480 NONAME ; struct QMetaObject const * QtMobility::QMediaObject::metaObject(void) const
-	?setStereoMode@QRadioTuner@QtMobility@@QAEXW4StereoMode@12@@Z @ 481 NONAME ; void QtMobility::QRadioTuner::setStereoMode(enum QtMobility::QRadioTuner::StereoMode)
-	??9QAudioEncoderSettings@QtMobility@@QBE_NABV01@@Z @ 482 NONAME ; bool QtMobility::QAudioEncoderSettings::operator!=(class QtMobility::QAudioEncoderSettings const &) const
-	??8QMediaContent@QtMobility@@QBE_NABV01@@Z @ 483 NONAME ; bool QtMobility::QMediaContent::operator==(class QtMobility::QMediaContent const &) const
-	?tr@QMediaControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 484 NONAME ; class QString QtMobility::QMediaControl::tr(char const *, char const *, int)
-	?tr@QRadioTuner@QtMobility@@SA?AVQString@@PBD0H@Z @ 485 NONAME ; class QString QtMobility::QRadioTuner::tr(char const *, char const *, int)
-	?getStaticMetaObject@QVideoWidgetControl@QtMobility@@SAABUQMetaObject@@XZ @ 486 NONAME ; struct QMetaObject const & QtMobility::QVideoWidgetControl::getStaticMetaObject(void)
-	?addMedia@QLocalMediaPlaylistProvider@QtMobility@@UAE_NABVQMediaContent@2@@Z @ 487 NONAME ; bool QtMobility::QLocalMediaPlaylistProvider::addMedia(class QtMobility::QMediaContent const &)
-	?metaDataWritableChanged@QMediaObject@QtMobility@@IAEX_N@Z @ 488 NONAME ; void QtMobility::QMediaObject::metaDataWritableChanged(bool)
-	?setQuality@QImageEncoderSettings@QtMobility@@QAEXW4EncodingQuality@QtMedia@2@@Z @ 489 NONAME ; void QtMobility::QImageEncoderSettings::setQuality(enum QtMobility::QtMedia::EncodingQuality)
-	?tr@QAudioEndpointSelector@QtMobility@@SA?AVQString@@PBD0H@Z @ 490 NONAME ; class QString QtMobility::QAudioEndpointSelector::tr(char const *, char const *, int)
-	?setNotifyInterval@QMediaObject@QtMobility@@QAEXH@Z @ 491 NONAME ; void QtMobility::QMediaObject::setNotifyInterval(int)
-	?tr@QVideoEncoderControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 492 NONAME ; class QString QtMobility::QVideoEncoderControl::tr(char const *, char const *, int)
-	?latestTime@QMediaTimeRange@QtMobility@@QBE_JXZ @ 493 NONAME ; long long QtMobility::QMediaTimeRange::latestTime(void) const
-	?tr@QMediaPlaylistIOPlugin@QtMobility@@SA?AVQString@@PBD0H@Z @ 494 NONAME ; class QString QtMobility::QMediaPlaylistIOPlugin::tr(char const *, char const *, int)
-	?getStaticMetaObject@QMediaPlayerControl@QtMobility@@SAABUQMetaObject@@XZ @ 495 NONAME ; struct QMetaObject const & QtMobility::QMediaPlayerControl::getStaticMetaObject(void)
-	?mediaRemoved@QMediaPlaylistProvider@QtMobility@@IAEXHH@Z @ 496 NONAME ; void QtMobility::QMediaPlaylistProvider::mediaRemoved(int, int)
-	?tr@QVideoWidgetControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 497 NONAME ; class QString QtMobility::QVideoWidgetControl::tr(char const *, char const *, int)
-	?setResolution@QImageEncoderSettings@QtMobility@@QAEXABVQSize@@@Z @ 498 NONAME ; void QtMobility::QImageEncoderSettings::setResolution(class QSize const &)
-	?stop@QMediaImageViewer@QtMobility@@QAEXXZ @ 499 NONAME ; void QtMobility::QMediaImageViewer::stop(void)
-	?pause@QMediaImageViewer@QtMobility@@QAEXXZ @ 500 NONAME ; void QtMobility::QMediaImageViewer::pause(void)
-	?stereoMode@QRadioTuner@QtMobility@@QBE?AW4StereoMode@12@XZ @ 501 NONAME ; enum QtMobility::QRadioTuner::StereoMode QtMobility::QRadioTuner::stereoMode(void) const
-	??1QMediaPlaylistIOInterface@QtMobility@@UAE@XZ @ 502 NONAME ; QtMobility::QMediaPlaylistIOInterface::~QMediaPlaylistIOInterface(void)
-	?activated@QMediaPlaylistNavigator@QtMobility@@IAEXABVQMediaContent@2@@Z @ 503 NONAME ; void QtMobility::QMediaPlaylistNavigator::activated(class QtMobility::QMediaContent const &)
-	?errorString@QRadioTuner@QtMobility@@QBE?AVQString@@XZ @ 504 NONAME ; class QString QtMobility::QRadioTuner::errorString(void) const
-	??0QMediaTimeRange@QtMobility@@QAE@XZ @ 505 NONAME ; QtMobility::QMediaTimeRange::QMediaTimeRange(void)
-	?previousIndex@QMediaPlaylist@QtMobility@@QBEHH@Z @ 506 NONAME ; int QtMobility::QMediaPlaylist::previousIndex(int) const
-	?nativeSizeChanged@QGraphicsVideoItem@QtMobility@@IAEXABVQSizeF@@@Z @ 507 NONAME ; void QtMobility::QGraphicsVideoItem::nativeSizeChanged(class QSizeF const &)
-	?sampleRate@QMediaResource@QtMobility@@QBEHXZ @ 508 NONAME ; int QtMobility::QMediaResource::sampleRate(void) const
-	??_EQMediaPlayer@QtMobility@@UAE@I@Z @ 509 NONAME ; QtMobility::QMediaPlayer::~QMediaPlayer(unsigned int)
-	?resolution@QMediaResource@QtMobility@@QBE?AVQSize@@XZ @ 510 NONAME ; class QSize QtMobility::QMediaResource::resolution(void) const
-	?nextItem@QMediaPlaylistNavigator@QtMobility@@QBE?AVQMediaContent@2@H@Z @ 511 NONAME ; class QtMobility::QMediaContent QtMobility::QMediaPlaylistNavigator::nextItem(int) const
-	?state@QMediaRecorder@QtMobility@@QBE?AW4State@12@XZ @ 512 NONAME ; enum QtMobility::QMediaRecorder::State QtMobility::QMediaRecorder::state(void) const
-	?searchBackward@QRadioTuner@QtMobility@@QAEXXZ @ 513 NONAME ; void QtMobility::QRadioTuner::searchBackward(void)
-	?qt_metacast@QVideoDeviceControl@QtMobility@@UAEPAXPBD@Z @ 514 NONAME ; void * QtMobility::QVideoDeviceControl::qt_metacast(char const *)
-	?qt_metacast@QMediaImageViewer@QtMobility@@UAEPAXPBD@Z @ 515 NONAME ; void * QtMobility::QMediaImageViewer::qt_metacast(char const *)
-	??_EQMediaPlaylist@QtMobility@@UAE@I@Z @ 516 NONAME ; QtMobility::QMediaPlaylist::~QMediaPlaylist(unsigned int)
-	?mutedChanged@QRadioTunerControl@QtMobility@@IAEX_N@Z @ 517 NONAME ; void QtMobility::QRadioTunerControl::mutedChanged(bool)
-	?bufferStatusChanged@QMediaPlayerControl@QtMobility@@IAEXH@Z @ 518 NONAME ; void QtMobility::QMediaPlayerControl::bufferStatusChanged(int)
-	?staticMetaObject@QVideoOutputControl@QtMobility@@2UQMetaObject@@B @ 519 NONAME ; struct QMetaObject const QtMobility::QVideoOutputControl::staticMetaObject
-	?resources@QMediaContent@QtMobility@@QBE?AV?$QList@VQMediaResource@QtMobility@@@@XZ @ 520 NONAME ; class QList<class QtMobility::QMediaResource> QtMobility::QMediaContent::resources(void) const
-	??8QVideoEncoderSettings@QtMobility@@QBE_NABV01@@Z @ 521 NONAME ; bool QtMobility::QVideoEncoderSettings::operator==(class QtMobility::QVideoEncoderSettings const &) const
-	?getStaticMetaObject@QMetaDataControl@QtMobility@@SAABUQMetaObject@@XZ @ 522 NONAME ; struct QMetaObject const & QtMobility::QMetaDataControl::getStaticMetaObject(void)
-	?codec@QImageEncoderSettings@QtMobility@@QBE?AVQString@@XZ @ 523 NONAME ; class QString QtMobility::QImageEncoderSettings::codec(void) const
-	?play@QMediaImageViewer@QtMobility@@QAEXXZ @ 524 NONAME ; void QtMobility::QMediaImageViewer::play(void)
-	?tr@QVideoOutputControl@QtMobility@@SA?AVQString@@PBD0@Z @ 525 NONAME ; class QString QtMobility::QVideoOutputControl::tr(char const *, char const *)
-	?qt_metacall@QMediaService@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 526 NONAME ; int QtMobility::QMediaService::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QMediaRecorder@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 527 NONAME ; int QtMobility::QMediaRecorder::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?addInterval@QMediaTimeRange@QtMobility@@QAEX_J0@Z @ 528 NONAME ; void QtMobility::QMediaTimeRange::addInterval(long long, long long)
-	?tr@QImageEncoderControl@QtMobility@@SA?AVQString@@PBD0@Z @ 529 NONAME ; class QString QtMobility::QImageEncoderControl::tr(char const *, char const *)
-	?hasSupport@QMediaPlayer@QtMobility@@SA?AW4SupportEstimate@QtMedia@2@ABVQString@@ABVQStringList@@V?$QFlags@W4Flag@QMediaPlayer@QtMobility@@@@@Z @ 530 NONAME ; enum QtMobility::QtMedia::SupportEstimate QtMobility::QMediaPlayer::hasSupport(class QString const &, class QStringList const &, class QFlags<enum QtMobility::QMediaPlayer::Flag>)
-	?nativeSize@QGraphicsVideoItem@QtMobility@@QBE?AVQSizeF@@XZ @ 531 NONAME ; class QSizeF QtMobility::QGraphicsVideoItem::nativeSize(void) const
-	??1QMediaImageViewer@QtMobility@@UAE@XZ @ 532 NONAME ; QtMobility::QMediaImageViewer::~QMediaImageViewer(void)
-	??1QMetaDataControl@QtMobility@@UAE@XZ @ 533 NONAME ; QtMobility::QMetaDataControl::~QMetaDataControl(void)
-	?isNull@QImageEncoderSettings@QtMobility@@QBE_NXZ @ 534 NONAME ; bool QtMobility::QImageEncoderSettings::isNull(void) const
-	?trUtf8@QMediaService@QtMobility@@SA?AVQString@@PBD0H@Z @ 535 NONAME ; class QString QtMobility::QMediaService::trUtf8(char const *, char const *, int)
-	??_EQVideoWindowControl@QtMobility@@UAE@I@Z @ 536 NONAME ; QtMobility::QVideoWindowControl::~QVideoWindowControl(unsigned int)
-	??4QAudioEncoderSettings@QtMobility@@QAEAAV01@ABV01@@Z @ 537 NONAME ; class QtMobility::QAudioEncoderSettings & QtMobility::QAudioEncoderSettings::operator=(class QtMobility::QAudioEncoderSettings const &)
-	?tr@QMediaServiceProvider@QtMobility@@SA?AVQString@@PBD0@Z @ 538 NONAME ; class QString QtMobility::QMediaServiceProvider::tr(char const *, char const *)
-	??0QMediaResource@QtMobility@@QAE@ABVQUrl@@ABVQString@@@Z @ 539 NONAME ; QtMobility::QMediaResource::QMediaResource(class QUrl const &, class QString const &)
-	??0QMediaRecorderControl@QtMobility@@IAE@PAVQObject@@@Z @ 540 NONAME ; QtMobility::QMediaRecorderControl::QMediaRecorderControl(class QObject *)
-	??_EQMediaStreamsControl@QtMobility@@UAE@I@Z @ 541 NONAME ; QtMobility::QMediaStreamsControl::~QMediaStreamsControl(unsigned int)
-	?unbind@QMediaPlayer@QtMobility@@UAEXPAVQObject@@@Z @ 542 NONAME ; void QtMobility::QMediaPlayer::unbind(class QObject *)
-	?getStaticMetaObject@QMediaServiceProvider@QtMobility@@SAABUQMetaObject@@XZ @ 543 NONAME ; struct QMetaObject const & QtMobility::QMediaServiceProvider::getStaticMetaObject(void)
-	?mediaCount@QMediaPlaylist@QtMobility@@QBEHXZ @ 544 NONAME ; int QtMobility::QMediaPlaylist::mediaCount(void) const
-	?signalStrength@QRadioTuner@QtMobility@@QBEHXZ @ 545 NONAME ; int QtMobility::QRadioTuner::signalStrength(void) const
-	?mediaObject@QMediaPlaylist@QtMobility@@QBEPAVQMediaObject@2@XZ @ 546 NONAME ; class QtMobility::QMediaObject * QtMobility::QMediaPlaylist::mediaObject(void) const
-	?d_func@QMediaService@QtMobility@@ABEPBVQMediaServicePrivate@2@XZ @ 547 NONAME ; class QtMobility::QMediaServicePrivate const * QtMobility::QMediaService::d_func(void) const
-	?supportedResolutions@QMediaRecorder@QtMobility@@QBE?AV?$QList@VQSize@@@@ABVQVideoEncoderSettings@2@PA_N@Z @ 548 NONAME ; class QList<class QSize> QtMobility::QMediaRecorder::supportedResolutions(class QtMobility::QVideoEncoderSettings const &, bool *) const
-	??HQtMobility@@YA?AVQMediaTimeRange@0@ABV10@0@Z @ 549 NONAME ; class QtMobility::QMediaTimeRange QtMobility::operator+(class QtMobility::QMediaTimeRange const &, class QtMobility::QMediaTimeRange const &)
-	??8QtMobility@@YA_NABVQMediaTimeRange@0@0@Z @ 550 NONAME ; bool QtMobility::operator==(class QtMobility::QMediaTimeRange const &, class QtMobility::QMediaTimeRange const &)
-	?audioCodec@QMediaResource@QtMobility@@QBE?AVQString@@XZ @ 551 NONAME ; class QString QtMobility::QMediaResource::audioCodec(void) const
-	??0QMediaControl@QtMobility@@IAE@PAVQObject@@@Z @ 552 NONAME ; QtMobility::QMediaControl::QMediaControl(class QObject *)
-	??1QMediaService@QtMobility@@UAE@XZ @ 553 NONAME ; QtMobility::QMediaService::~QMediaService(void)
-	?timerEvent@QGraphicsVideoItem@QtMobility@@MAEXPAVQTimerEvent@@@Z @ 554 NONAME ; void QtMobility::QGraphicsVideoItem::timerEvent(class QTimerEvent *)
-	?availablePlaybackRangesChanged@QMediaPlayerControl@QtMobility@@IAEXABVQMediaTimeRange@2@@Z @ 555 NONAME ; void QtMobility::QMediaPlayerControl::availablePlaybackRangesChanged(class QtMobility::QMediaTimeRange const &)
-	?setMuted@QRadioTuner@QtMobility@@QAEX_N@Z @ 556 NONAME ; void QtMobility::QRadioTuner::setMuted(bool)
-	??YQMediaTimeRange@QtMobility@@QAEAAV01@ABVQMediaTimeInterval@1@@Z @ 557 NONAME ; class QtMobility::QMediaTimeRange & QtMobility::QMediaTimeRange::operator+=(class QtMobility::QMediaTimeInterval const &)
-	?mutedChanged@QMediaPlayer@QtMobility@@IAEX_N@Z @ 558 NONAME ; void QtMobility::QMediaPlayer::mutedChanged(bool)
-	?setHue@QVideoWidget@QtMobility@@QAEXH@Z @ 559 NONAME ; void QtMobility::QVideoWidget::setHue(int)
-	?setBitRate@QVideoEncoderSettings@QtMobility@@QAEXH@Z @ 560 NONAME ; void QtMobility::QVideoEncoderSettings::setBitRate(int)
-	?statusChanged@QAudioCaptureSource@QtMobility@@AAEXXZ @ 561 NONAME ; void QtMobility::QAudioCaptureSource::statusChanged(void)
-	??0QMediaResource@QtMobility@@QAE@XZ @ 562 NONAME ; QtMobility::QMediaResource::QMediaResource(void)
-	?trUtf8@QVideoRendererControl@QtMobility@@SA?AVQString@@PBD0@Z @ 563 NONAME ; class QString QtMobility::QVideoRendererControl::trUtf8(char const *, char const *)
-	?playbackModeChanged@QMediaPlaylistControl@QtMobility@@IAEXW4PlaybackMode@QMediaPlaylist@2@@Z @ 564 NONAME ; void QtMobility::QMediaPlaylistControl::playbackModeChanged(enum QtMobility::QMediaPlaylist::PlaybackMode)
-	??GQtMobility@@YA?AVQMediaTimeRange@0@ABV10@0@Z @ 565 NONAME ; class QtMobility::QMediaTimeRange QtMobility::operator-(class QtMobility::QMediaTimeRange const &, class QtMobility::QMediaTimeRange const &)
-	?trUtf8@QMediaServiceProviderPlugin@QtMobility@@SA?AVQString@@PBD0H@Z @ 566 NONAME ; class QString QtMobility::QMediaServiceProviderPlugin::trUtf8(char const *, char const *, int)
-	??0QMediaContent@QtMobility@@QAE@XZ @ 567 NONAME ; QtMobility::QMediaContent::QMediaContent(void)
-	?d_func@QMediaObject@QtMobility@@ABEPBVQMediaObjectPrivate@2@XZ @ 568 NONAME ; class QtMobility::QMediaObjectPrivate const * QtMobility::QMediaObject::d_func(void) const
-	?trUtf8@QVideoWindowControl@QtMobility@@SA?AVQString@@PBD0@Z @ 569 NONAME ; class QString QtMobility::QVideoWindowControl::trUtf8(char const *, char const *)
-	??1QVideoWidgetControl@QtMobility@@UAE@XZ @ 570 NONAME ; QtMobility::QVideoWidgetControl::~QVideoWidgetControl(void)
-	?d_func@QLocalMediaPlaylistProvider@QtMobility@@ABEPBVQLocalMediaPlaylistProviderPrivate@2@XZ @ 571 NONAME ; class QtMobility::QLocalMediaPlaylistProviderPrivate const * QtMobility::QLocalMediaPlaylistProvider::d_func(void) const
-	?getStaticMetaObject@QVideoEncoderControl@QtMobility@@SAABUQMetaObject@@XZ @ 572 NONAME ; struct QMetaObject const & QtMobility::QVideoEncoderControl::getStaticMetaObject(void)
-	?tr@QMediaObject@QtMobility@@SA?AVQString@@PBD0H@Z @ 573 NONAME ; class QString QtMobility::QMediaObject::tr(char const *, char const *, int)
-	??4QMediaTimeRange@QtMobility@@QAEAAV01@ABV01@@Z @ 574 NONAME ; class QtMobility::QMediaTimeRange & QtMobility::QMediaTimeRange::operator=(class QtMobility::QMediaTimeRange const &)
-	?aspectRatioMode@QVideoWidget@QtMobility@@QBE?AW4AspectRatioMode@Qt@@XZ @ 575 NONAME ; enum Qt::AspectRatioMode QtMobility::QVideoWidget::aspectRatioMode(void) const
-	??1QLocalMediaPlaylistProvider@QtMobility@@UAE@XZ @ 576 NONAME ; QtMobility::QLocalMediaPlaylistProvider::~QLocalMediaPlaylistProvider(void)
-	?tr@QAudioCaptureSource@QtMobility@@SA?AVQString@@PBD0H@Z @ 577 NONAME ; class QString QtMobility::QAudioCaptureSource::tr(char const *, char const *, int)
-	?addMedia@QMediaPlaylist@QtMobility@@QAE_NABV?$QList@VQMediaContent@QtMobility@@@@@Z @ 578 NONAME ; bool QtMobility::QMediaPlaylist::addMedia(class QList<class QtMobility::QMediaContent> const &)
-	?stop@QRadioTuner@QtMobility@@QAEXXZ @ 579 NONAME ; void QtMobility::QRadioTuner::stop(void)
-	?boundingRect@QGraphicsVideoItem@QtMobility@@UBE?AVQRectF@@XZ @ 580 NONAME ; class QRectF QtMobility::QGraphicsVideoItem::boundingRect(void) const
-	?currentMediaChanged@QMediaPlaylistControl@QtMobility@@IAEXABVQMediaContent@2@@Z @ 581 NONAME ; void QtMobility::QMediaPlaylistControl::currentMediaChanged(class QtMobility::QMediaContent const &)
-	?media@QLocalMediaPlaylistProvider@QtMobility@@UBE?AVQMediaContent@2@H@Z @ 582 NONAME ; class QtMobility::QMediaContent QtMobility::QLocalMediaPlaylistProvider::media(int) const
-	??0QMediaContent@QtMobility@@QAE@ABVQMediaResource@1@@Z @ 583 NONAME ; QtMobility::QMediaContent::QMediaContent(class QtMobility::QMediaResource const &)
-	??4QVideoEncoderSettings@QtMobility@@QAEAAV01@ABV01@@Z @ 584 NONAME ; class QtMobility::QVideoEncoderSettings & QtMobility::QVideoEncoderSettings::operator=(class QtMobility::QVideoEncoderSettings const &)
-	?durationChanged@QMediaRecorderControl@QtMobility@@IAEX_J@Z @ 585 NONAME ; void QtMobility::QMediaRecorderControl::durationChanged(long long)
-	?save@QMediaPlaylistProvider@QtMobility@@UAE_NPAVQIODevice@@PBD@Z @ 586 NONAME ; bool QtMobility::QMediaPlaylistProvider::save(class QIODevice *, char const *)
-	?qt_metacall@QVideoDeviceControl@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 587 NONAME ; int QtMobility::QVideoDeviceControl::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?volumeChanged@QRadioTuner@QtMobility@@IAEXH@Z @ 588 NONAME ; void QtMobility::QRadioTuner::volumeChanged(int)
-	?setVolume@QMediaPlayer@QtMobility@@QAEXH@Z @ 589 NONAME ; void QtMobility::QMediaPlayer::setVolume(int)
-	?setBitRate@QAudioEncoderSettings@QtMobility@@QAEXH@Z @ 590 NONAME ; void QtMobility::QAudioEncoderSettings::setBitRate(int)
-	?videoSettings@QMediaRecorder@QtMobility@@QBE?AVQVideoEncoderSettings@2@XZ @ 591 NONAME ; class QtMobility::QVideoEncoderSettings QtMobility::QMediaRecorder::videoSettings(void) const
-	?staticMetaObject@QMediaImageViewer@QtMobility@@2UQMetaObject@@B @ 592 NONAME ; struct QMetaObject const QtMobility::QMediaImageViewer::staticMetaObject
-	?record@QMediaRecorder@QtMobility@@QAEXXZ @ 593 NONAME ; void QtMobility::QMediaRecorder::record(void)
-	?isAvailable@QRadioTuner@QtMobility@@UBE_NXZ @ 594 NONAME ; bool QtMobility::QRadioTuner::isAvailable(void) const
-	??_EQMediaPlaylistWriter@QtMobility@@UAE@I@Z @ 595 NONAME ; QtMobility::QMediaPlaylistWriter::~QMediaPlaylistWriter(unsigned int)
-	?tr@QMediaContainerControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 596 NONAME ; class QString QtMobility::QMediaContainerControl::tr(char const *, char const *, int)
-	?codecs@QMediaServiceProviderHint@QtMobility@@QBE?AVQStringList@@XZ @ 597 NONAME ; class QStringList QtMobility::QMediaServiceProviderHint::codecs(void) const
-	?frameRate@QVideoEncoderSettings@QtMobility@@QBEMXZ @ 598 NONAME ; float QtMobility::QVideoEncoderSettings::frameRate(void) const
-	?d_func@QMediaPlaylistProvider@QtMobility@@ABEPBVQMediaPlaylistProviderPrivate@2@XZ @ 599 NONAME ; class QtMobility::QMediaPlaylistProviderPrivate const * QtMobility::QMediaPlaylistProvider::d_func(void) const
-	?staticMetaObject@QMediaPlaylist@QtMobility@@2UQMetaObject@@B @ 600 NONAME ; struct QMetaObject const QtMobility::QMediaPlaylist::staticMetaObject
-	?tr@QAudioEndpointSelector@QtMobility@@SA?AVQString@@PBD0@Z @ 601 NONAME ; class QString QtMobility::QAudioEndpointSelector::tr(char const *, char const *)
-	?isEmpty@QMediaPlaylist@QtMobility@@QBE_NXZ @ 602 NONAME ; bool QtMobility::QMediaPlaylist::isEmpty(void) const
-	?removePropertyWatch@QMediaObject@QtMobility@@IAEXABVQByteArray@@@Z @ 603 NONAME ; void QtMobility::QMediaObject::removePropertyWatch(class QByteArray const &)
-	?qt_metacast@QMediaPlaylistProvider@QtMobility@@UAEPAXPBD@Z @ 604 NONAME ; void * QtMobility::QMediaPlaylistProvider::qt_metacast(char const *)
-	??0QMediaTimeRange@QtMobility@@QAE@ABV01@@Z @ 605 NONAME ; QtMobility::QMediaTimeRange::QMediaTimeRange(class QtMobility::QMediaTimeRange const &)
-	?metaObject@QAudioEncoderControl@QtMobility@@UBEPBUQMetaObject@@XZ @ 606 NONAME ; struct QMetaObject const * QtMobility::QAudioEncoderControl::metaObject(void) const
-	?tr@QVideoRendererControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 607 NONAME ; class QString QtMobility::QVideoRendererControl::tr(char const *, char const *, int)
-	?isBandSupported@QRadioTuner@QtMobility@@QBE_NW4Band@12@@Z @ 608 NONAME ; bool QtMobility::QRadioTuner::isBandSupported(enum QtMobility::QRadioTuner::Band) const
-	?metaObject@QMediaRecorder@QtMobility@@UBEPBUQMetaObject@@XZ @ 609 NONAME ; struct QMetaObject const * QtMobility::QMediaRecorder::metaObject(void) const
-	?tr@QGraphicsVideoItem@QtMobility@@SA?AVQString@@PBD0@Z @ 610 NONAME ; class QString QtMobility::QGraphicsVideoItem::tr(char const *, char const *)
-	?error@QMediaRecorder@QtMobility@@QBE?AW4Error@12@XZ @ 611 NONAME ; enum QtMobility::QMediaRecorder::Error QtMobility::QMediaRecorder::error(void) const
-	?staticMetaObject@QMediaService@QtMobility@@2UQMetaObject@@B @ 612 NONAME ; struct QMetaObject const QtMobility::QMediaService::staticMetaObject
-	?loaded@QMediaPlaylistProvider@QtMobility@@IAEXXZ @ 613 NONAME ; void QtMobility::QMediaPlaylistProvider::loaded(void)
-	?getStaticMetaObject@QMediaControl@QtMobility@@SAABUQMetaObject@@XZ @ 614 NONAME ; struct QMetaObject const & QtMobility::QMediaControl::getStaticMetaObject(void)
-	?nativeSizeChanged@QVideoWindowControl@QtMobility@@IAEXXZ @ 615 NONAME ; void QtMobility::QVideoWindowControl::nativeSizeChanged(void)
-	?supportedFrameRates@QMediaRecorder@QtMobility@@QBE?AV?$QList@M@@ABVQVideoEncoderSettings@2@PA_N@Z @ 616 NONAME ; class QList<float> QtMobility::QMediaRecorder::supportedFrameRates(class QtMobility::QVideoEncoderSettings const &, bool *) const
-	??ZQMediaTimeRange@QtMobility@@QAEAAV01@ABVQMediaTimeInterval@1@@Z @ 617 NONAME ; class QtMobility::QMediaTimeRange & QtMobility::QMediaTimeRange::operator-=(class QtMobility::QMediaTimeInterval const &)
-	?tr@QMediaRecorderControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 618 NONAME ; class QString QtMobility::QMediaRecorderControl::tr(char const *, char const *, int)
-	?qt_metacast@QMediaRecorder@QtMobility@@UAEPAXPBD@Z @ 619 NONAME ; void * QtMobility::QMediaRecorder::qt_metacast(char const *)
-	?stateChanged@QRadioTunerControl@QtMobility@@IAEXW4State@QRadioTuner@2@@Z @ 620 NONAME ; void QtMobility::QRadioTunerControl::stateChanged(enum QtMobility::QRadioTuner::State)
-	?addMedia@QMediaPlaylistProvider@QtMobility@@UAE_NABVQMediaContent@2@@Z @ 621 NONAME ; bool QtMobility::QMediaPlaylistProvider::addMedia(class QtMobility::QMediaContent const &)
-	??8QImageEncoderSettings@QtMobility@@QBE_NABV01@@Z @ 622 NONAME ; bool QtMobility::QImageEncoderSettings::operator==(class QtMobility::QImageEncoderSettings const &) const
-	??_EQMediaPlaylistControl@QtMobility@@UAE@I@Z @ 623 NONAME ; QtMobility::QMediaPlaylistControl::~QMediaPlaylistControl(unsigned int)
-	??0QVideoWidget@QtMobility@@QAE@PAVQWidget@@@Z @ 624 NONAME ; QtMobility::QVideoWidget::QVideoWidget(class QWidget *)
-	?resolution@QVideoEncoderSettings@QtMobility@@QBE?AVQSize@@XZ @ 625 NONAME ; class QSize QtMobility::QVideoEncoderSettings::resolution(void) const
-	?metaObject@QGraphicsVideoItem@QtMobility@@UBEPBUQMetaObject@@XZ @ 626 NONAME ; struct QMetaObject const * QtMobility::QGraphicsVideoItem::metaObject(void) const
-	?trUtf8@QMetaDataControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 627 NONAME ; class QString QtMobility::QMetaDataControl::trUtf8(char const *, char const *, int)
-	?trUtf8@QMediaPlayer@QtMobility@@SA?AVQString@@PBD0H@Z @ 628 NONAME ; class QString QtMobility::QMediaPlayer::trUtf8(char const *, char const *, int)
-	?qt_metacast@QVideoWindowControl@QtMobility@@UAEPAXPBD@Z @ 629 NONAME ; void * QtMobility::QVideoWindowControl::qt_metacast(char const *)
-	?clear@QMediaPlaylist@QtMobility@@QAE_NXZ @ 630 NONAME ; bool QtMobility::QMediaPlaylist::clear(void)
-	?setMediaObject@QMediaPlaylist@QtMobility@@QAEXPAVQMediaObject@2@@Z @ 631 NONAME ; void QtMobility::QMediaPlaylist::setMediaObject(class QtMobility::QMediaObject *)
-	??0QMediaService@QtMobility@@IAE@AAVQMediaServicePrivate@1@PAVQObject@@@Z @ 632 NONAME ; QtMobility::QMediaService::QMediaService(class QtMobility::QMediaServicePrivate &, class QObject *)
-	?videoBitRate@QMediaResource@QtMobility@@QBEHXZ @ 633 NONAME ; int QtMobility::QMediaResource::videoBitRate(void) const
-	?setChannelCount@QMediaResource@QtMobility@@QAEXH@Z @ 634 NONAME ; void QtMobility::QMediaResource::setChannelCount(int)
-	?d_func@QMediaPlaylist@QtMobility@@AAEPAVQMediaPlaylistPrivate@2@XZ @ 635 NONAME ; class QtMobility::QMediaPlaylistPrivate * QtMobility::QMediaPlaylist::d_func(void)
-	?tr@QMediaPlaylist@QtMobility@@SA?AVQString@@PBD0@Z @ 636 NONAME ; class QString QtMobility::QMediaPlaylist::tr(char const *, char const *)
-	?staticMetaObject@QVideoWidgetControl@QtMobility@@2UQMetaObject@@B @ 637 NONAME ; struct QMetaObject const QtMobility::QVideoWidgetControl::staticMetaObject
-	?mediaStatusChanged@QMediaPlayer@QtMobility@@IAEXW4MediaStatus@12@@Z @ 638 NONAME ; void QtMobility::QMediaPlayer::mediaStatusChanged(enum QtMobility::QMediaPlayer::MediaStatus)
-	?metaObject@QVideoOutputControl@QtMobility@@UBEPBUQMetaObject@@XZ @ 639 NONAME ; struct QMetaObject const * QtMobility::QVideoOutputControl::metaObject(void) const
-	?activeEndpointChanged@QAudioEndpointSelector@QtMobility@@IAEXABVQString@@@Z @ 640 NONAME ; void QtMobility::QAudioEndpointSelector::activeEndpointChanged(class QString const &)
-	?qt_metacall@QAudioEndpointSelector@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 641 NONAME ; int QtMobility::QAudioEndpointSelector::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?tr@QGraphicsVideoItem@QtMobility@@SA?AVQString@@PBD0H@Z @ 642 NONAME ; class QString QtMobility::QGraphicsVideoItem::tr(char const *, char const *, int)
-	?hideEvent@QVideoWidget@QtMobility@@MAEXPAVQHideEvent@@@Z @ 643 NONAME ; void QtMobility::QVideoWidget::hideEvent(class QHideEvent *)
-	?insertMedia@QLocalMediaPlaylistProvider@QtMobility@@UAE_NHABV?$QList@VQMediaContent@QtMobility@@@@@Z @ 644 NONAME ; bool QtMobility::QLocalMediaPlaylistProvider::insertMedia(int, class QList<class QtMobility::QMediaContent> const &)
-	?qt_metacast@QVideoOutputControl@QtMobility@@UAEPAXPBD@Z @ 645 NONAME ; void * QtMobility::QVideoOutputControl::qt_metacast(char const *)
-	?removeInterval@QMediaTimeRange@QtMobility@@QAEXABVQMediaTimeInterval@2@@Z @ 646 NONAME ; void QtMobility::QMediaTimeRange::removeInterval(class QtMobility::QMediaTimeInterval const &)
-	?playbackMode@QMediaPlaylist@QtMobility@@QBE?AW4PlaybackMode@12@XZ @ 647 NONAME ; enum QtMobility::QMediaPlaylist::PlaybackMode QtMobility::QMediaPlaylist::playbackMode(void) const
-	?addInterval@QMediaTimeRange@QtMobility@@QAEXABVQMediaTimeInterval@2@@Z @ 648 NONAME ; void QtMobility::QMediaTimeRange::addInterval(class QtMobility::QMediaTimeInterval const &)
-	?metaObject@QMediaPlaylistControl@QtMobility@@UBEPBUQMetaObject@@XZ @ 649 NONAME ; struct QMetaObject const * QtMobility::QMediaPlaylistControl::metaObject(void) const
-	?audioAvailableChanged@QMediaPlayer@QtMobility@@IAEX_N@Z @ 650 NONAME ; void QtMobility::QMediaPlayer::audioAvailableChanged(bool)
-	?staticMetaObject@QMediaPlaylistIOPlugin@QtMobility@@2UQMetaObject@@B @ 651 NONAME ; struct QMetaObject const QtMobility::QMediaPlaylistIOPlugin::staticMetaObject
-	??1QMediaRecorderControl@QtMobility@@UAE@XZ @ 652 NONAME ; QtMobility::QMediaRecorderControl::~QMediaRecorderControl(void)
-	?selectedDeviceChanged@QVideoDeviceControl@QtMobility@@IAEXABVQString@@@Z @ 653 NONAME ; void QtMobility::QVideoDeviceControl::selectedDeviceChanged(class QString const &)
-	??1QAudioCaptureSource@QtMobility@@UAE@XZ @ 654 NONAME ; QtMobility::QAudioCaptureSource::~QAudioCaptureSource(void)
-	?tr@QVideoWidgetControl@QtMobility@@SA?AVQString@@PBD0@Z @ 655 NONAME ; class QString QtMobility::QVideoWidgetControl::tr(char const *, char const *)
-	?tr@QVideoEncoderControl@QtMobility@@SA?AVQString@@PBD0@Z @ 656 NONAME ; class QString QtMobility::QVideoEncoderControl::tr(char const *, char const *)
-	?tr@QMediaPlaylistIOPlugin@QtMobility@@SA?AVQString@@PBD0@Z @ 657 NONAME ; class QString QtMobility::QMediaPlaylistIOPlugin::tr(char const *, char const *)
-	??0QMediaTimeInterval@QtMobility@@QAE@_J0@Z @ 658 NONAME ; QtMobility::QMediaTimeInterval::QMediaTimeInterval(long long, long long)
-	??_EQMediaControl@QtMobility@@UAE@I@Z @ 659 NONAME ; QtMobility::QMediaControl::~QMediaControl(unsigned int)
-	?d_func@QMediaObject@QtMobility@@AAEPAVQMediaObjectPrivate@2@XZ @ 660 NONAME ; class QtMobility::QMediaObjectPrivate * QtMobility::QMediaObject::d_func(void)
-	?staticMetaObject@QMediaStreamsControl@QtMobility@@2UQMetaObject@@B @ 661 NONAME ; struct QMetaObject const QtMobility::QMediaStreamsControl::staticMetaObject
-	?hasSupport@QMediaServiceProvider@QtMobility@@UBE?AW4SupportEstimate@QtMedia@2@ABVQByteArray@@ABVQString@@ABVQStringList@@H@Z @ 662 NONAME ; enum QtMobility::QtMedia::SupportEstimate QtMobility::QMediaServiceProvider::hasSupport(class QByteArray const &, class QString const &, class QStringList const &, int) const
-	?getStaticMetaObject@QMediaStreamsControl@QtMobility@@SAABUQMetaObject@@XZ @ 663 NONAME ; struct QMetaObject const & QtMobility::QMediaStreamsControl::getStaticMetaObject(void)
-	?setSampleRate@QMediaResource@QtMobility@@QAEXH@Z @ 664 NONAME ; void QtMobility::QMediaResource::setSampleRate(int)
-	?qt_metacast@QMediaPlaylist@QtMobility@@UAEPAXPBD@Z @ 665 NONAME ; void * QtMobility::QMediaPlaylist::qt_metacast(char const *)
-	?aspectRatioMode@QGraphicsVideoItem@QtMobility@@QBE?AW4AspectRatioMode@Qt@@XZ @ 666 NONAME ; enum Qt::AspectRatioMode QtMobility::QGraphicsVideoItem::aspectRatioMode(void) const
-	?tr@QMediaPlayerControl@QtMobility@@SA?AVQString@@PBD0@Z @ 667 NONAME ; class QString QtMobility::QMediaPlayerControl::tr(char const *, char const *)
-	?band@QRadioTuner@QtMobility@@QBE?AW4Band@12@XZ @ 668 NONAME ; enum QtMobility::QRadioTuner::Band QtMobility::QRadioTuner::band(void) const
-	?load@QMediaPlaylistProvider@QtMobility@@UAE_NABVQUrl@@PBD@Z @ 669 NONAME ; bool QtMobility::QMediaPlaylistProvider::load(class QUrl const &, char const *)
-	?metaObject@QMediaControl@QtMobility@@UBEPBUQMetaObject@@XZ @ 670 NONAME ; struct QMetaObject const * QtMobility::QMediaControl::metaObject(void) const
-	?trUtf8@QAudioEncoderControl@QtMobility@@SA?AVQString@@PBD0@Z @ 671 NONAME ; class QString QtMobility::QAudioEncoderControl::trUtf8(char const *, char const *)
-	??1QVideoWidget@QtMobility@@UAE@XZ @ 672 NONAME ; QtMobility::QVideoWidget::~QVideoWidget(void)
-	?cancelSearch@QRadioTuner@QtMobility@@QAEXXZ @ 673 NONAME ; void QtMobility::QRadioTuner::cancelSearch(void)
-	?qt_metacall@QRadioTunerControl@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 674 NONAME ; int QtMobility::QRadioTunerControl::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??_EQGraphicsVideoItem@QtMobility@@UAE@I@Z @ 675 NONAME ; QtMobility::QGraphicsVideoItem::~QGraphicsVideoItem(unsigned int)
-	?isReadOnly@QMediaPlaylistProvider@QtMobility@@UBE_NXZ @ 676 NONAME ; bool QtMobility::QMediaPlaylistProvider::isReadOnly(void) const
-	?isNull@QVideoEncoderSettings@QtMobility@@QBE_NXZ @ 677 NONAME ; bool QtMobility::QVideoEncoderSettings::isNull(void) const
-	?d_func@QMediaPlaylistProvider@QtMobility@@AAEPAVQMediaPlaylistProviderPrivate@2@XZ @ 678 NONAME ; class QtMobility::QMediaPlaylistProviderPrivate * QtMobility::QMediaPlaylistProvider::d_func(void)
-	?frequencyRange@QRadioTuner@QtMobility@@QBE?AU?$QPair@HH@@W4Band@12@@Z @ 679 NONAME ; struct QPair<int, int> QtMobility::QRadioTuner::frequencyRange(enum QtMobility::QRadioTuner::Band) const
-	?setCodec@QVideoEncoderSettings@QtMobility@@QAEXABVQString@@@Z @ 680 NONAME ; void QtMobility::QVideoEncoderSettings::setCodec(class QString const &)
-	?qt_metacall@QGraphicsVideoItem@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 681 NONAME ; int QtMobility::QGraphicsVideoItem::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?trUtf8@QVideoOutputControl@QtMobility@@SA?AVQString@@PBD0@Z @ 682 NONAME ; class QString QtMobility::QVideoOutputControl::trUtf8(char const *, char const *)
-	?availabilityError@QAudioCaptureSource@QtMobility@@UBE?AW4AvailabilityError@QtMedia@2@XZ @ 683 NONAME ; enum QtMobility::QtMedia::AvailabilityError QtMobility::QAudioCaptureSource::availabilityError(void) const
-	?trUtf8@QRadioTuner@QtMobility@@SA?AVQString@@PBD0@Z @ 684 NONAME ; class QString QtMobility::QRadioTuner::trUtf8(char const *, char const *)
-	?trUtf8@QMediaPlaylistProvider@QtMobility@@SA?AVQString@@PBD0@Z @ 685 NONAME ; class QString QtMobility::QMediaPlaylistProvider::trUtf8(char const *, char const *)
-	?service@QMediaObject@QtMobility@@UBEPAVQMediaService@2@XZ @ 686 NONAME ; class QtMobility::QMediaService * QtMobility::QMediaObject::service(void) const
-	??1QVideoEncoderControl@QtMobility@@UAE@XZ @ 687 NONAME ; QtMobility::QVideoEncoderControl::~QVideoEncoderControl(void)
-	?codec@QAudioEncoderSettings@QtMobility@@QBE?AVQString@@XZ @ 688 NONAME ; class QString QtMobility::QAudioEncoderSettings::codec(void) const
-	?getStaticMetaObject@QLocalMediaPlaylistProvider@QtMobility@@SAABUQMetaObject@@XZ @ 689 NONAME ; struct QMetaObject const & QtMobility::QLocalMediaPlaylistProvider::getStaticMetaObject(void)
-	?availableMetaData@QMediaObject@QtMobility@@QBE?AV?$QList@W4MetaData@QtMedia@QtMobility@@@@XZ @ 690 NONAME ; class QList<enum QtMobility::QtMedia::MetaData> QtMobility::QMediaObject::availableMetaData(void) const
-	?insertMedia@QMediaPlaylist@QtMobility@@QAE_NHABVQMediaContent@2@@Z @ 691 NONAME ; bool QtMobility::QMediaPlaylist::insertMedia(int, class QtMobility::QMediaContent const &)
-	?tr@QMediaRecorderControl@QtMobility@@SA?AVQString@@PBD0@Z @ 692 NONAME ; class QString QtMobility::QMediaRecorderControl::tr(char const *, char const *)
-	?getStaticMetaObject@QAudioEndpointSelector@QtMobility@@SAABUQMetaObject@@XZ @ 693 NONAME ; struct QMetaObject const & QtMobility::QAudioEndpointSelector::getStaticMetaObject(void)
-	?getStaticMetaObject@QMediaRecorderControl@QtMobility@@SAABUQMetaObject@@XZ @ 694 NONAME ; struct QMetaObject const & QtMobility::QMediaRecorderControl::getStaticMetaObject(void)
-	?staticMetaObject@QMediaPlayer@QtMobility@@2UQMetaObject@@B @ 695 NONAME ; struct QMetaObject const QtMobility::QMediaPlayer::staticMetaObject
-	?trUtf8@QMediaServiceProvider@QtMobility@@SA?AVQString@@PBD0H@Z @ 696 NONAME ; class QString QtMobility::QMediaServiceProvider::trUtf8(char const *, char const *, int)
-	?removeMedia@QLocalMediaPlaylistProvider@QtMobility@@UAE_NHH@Z @ 697 NONAME ; bool QtMobility::QLocalMediaPlaylistProvider::removeMedia(int, int)
-	?qt_metacast@QVideoEncoderControl@QtMobility@@UAEPAXPBD@Z @ 698 NONAME ; void * QtMobility::QVideoEncoderControl::qt_metacast(char const *)
-	?tr@QRadioTunerControl@QtMobility@@SA?AVQString@@PBD0@Z @ 699 NONAME ; class QString QtMobility::QRadioTunerControl::tr(char const *, char const *)
-	??9QtMobility@@YA_NABVQMediaTimeInterval@0@0@Z @ 700 NONAME ; bool QtMobility::operator!=(class QtMobility::QMediaTimeInterval const &, class QtMobility::QMediaTimeInterval const &)
-	?isContinuous@QMediaTimeRange@QtMobility@@QBE_NXZ @ 701 NONAME ; bool QtMobility::QMediaTimeRange::isContinuous(void) const
-	?resizeEvent@QVideoWidget@QtMobility@@MAEXPAVQResizeEvent@@@Z @ 702 NONAME ; void QtMobility::QVideoWidget::resizeEvent(class QResizeEvent *)
-	?isNull@QAudioEncoderSettings@QtMobility@@QBE_NXZ @ 703 NONAME ; bool QtMobility::QAudioEncoderSettings::isNull(void) const
-	?setVideoCodec@QMediaResource@QtMobility@@QAEXABVQString@@@Z @ 704 NONAME ; void QtMobility::QMediaResource::setVideoCodec(class QString const &)
-	?getStaticMetaObject@QVideoDeviceControl@QtMobility@@SAABUQMetaObject@@XZ @ 705 NONAME ; struct QMetaObject const & QtMobility::QVideoDeviceControl::getStaticMetaObject(void)
-	?staticMetaObject@QMediaObject@QtMobility@@2UQMetaObject@@B @ 706 NONAME ; struct QMetaObject const QtMobility::QMediaObject::staticMetaObject
-	?hueChanged@QVideoWidget@QtMobility@@IAEXH@Z @ 707 NONAME ; void QtMobility::QVideoWidget::hueChanged(int)
-	?quality@QAudioEncoderSettings@QtMobility@@QBE?AW4EncodingQuality@QtMedia@2@XZ @ 708 NONAME ; enum QtMobility::QtMedia::EncodingQuality QtMobility::QAudioEncoderSettings::quality(void) const
-	?trUtf8@QVideoWidget@QtMobility@@SA?AVQString@@PBD0H@Z @ 709 NONAME ; class QString QtMobility::QVideoWidget::trUtf8(char const *, char const *, int)
-	?start@QMediaTimeInterval@QtMobility@@QBE_JXZ @ 710 NONAME ; long long QtMobility::QMediaTimeInterval::start(void) const
-	?setSaturation@QVideoWidget@QtMobility@@QAEXH@Z @ 711 NONAME ; void QtMobility::QVideoWidget::setSaturation(int)
-	?d_func@QMediaPlayer@QtMobility@@ABEPBVQMediaPlayerPrivate@2@XZ @ 712 NONAME ; class QtMobility::QMediaPlayerPrivate const * QtMobility::QMediaPlayer::d_func(void) const
-	?url@QMediaResource@QtMobility@@QBE?AVQUrl@@XZ @ 713 NONAME ; class QUrl QtMobility::QMediaResource::url(void) const
-	?getStaticMetaObject@QAudioCaptureSource@QtMobility@@SAABUQMetaObject@@XZ @ 714 NONAME ; struct QMetaObject const & QtMobility::QAudioCaptureSource::getStaticMetaObject(void)
-	?metaObject@QVideoWindowControl@QtMobility@@UBEPBUQMetaObject@@XZ @ 715 NONAME ; struct QMetaObject const * QtMobility::QVideoWindowControl::metaObject(void) const
-	?staticMetaObject@QVideoEncoderControl@QtMobility@@2UQMetaObject@@B @ 716 NONAME ; struct QMetaObject const QtMobility::QVideoEncoderControl::staticMetaObject
-	?trUtf8@QVideoDeviceControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 717 NONAME ; class QString QtMobility::QVideoDeviceControl::trUtf8(char const *, char const *, int)
-	?removeTimeRange@QMediaTimeRange@QtMobility@@QAEXABV12@@Z @ 718 NONAME ; void QtMobility::QMediaTimeRange::removeTimeRange(class QtMobility::QMediaTimeRange const &)
-	?bandChanged@QRadioTuner@QtMobility@@IAEXW4Band@12@@Z @ 719 NONAME ; void QtMobility::QRadioTuner::bandChanged(enum QtMobility::QRadioTuner::Band)
-	?activeAudioInput@QAudioCaptureSource@QtMobility@@QBE?AVQString@@XZ @ 720 NONAME ; class QString QtMobility::QAudioCaptureSource::activeAudioInput(void) const
-	?currentMediaChanged@QMediaPlaylist@QtMobility@@IAEXABVQMediaContent@2@@Z @ 721 NONAME ; void QtMobility::QMediaPlaylist::currentMediaChanged(class QtMobility::QMediaContent const &)
-	?setFrameRate@QVideoEncoderSettings@QtMobility@@QAEXM@Z @ 722 NONAME ; void QtMobility::QVideoEncoderSettings::setFrameRate(float)
-	?trUtf8@QImageEncoderControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 723 NONAME ; class QString QtMobility::QImageEncoderControl::trUtf8(char const *, char const *, int)
-	?error@QMediaPlayerControl@QtMobility@@IAEXHABVQString@@@Z @ 724 NONAME ; void QtMobility::QMediaPlayerControl::error(int, class QString const &)
-	?next@QMediaPlaylist@QtMobility@@QAEXXZ @ 725 NONAME ; void QtMobility::QMediaPlaylist::next(void)
-	??1QMediaServiceProviderHint@QtMobility@@QAE@XZ @ 726 NONAME ; QtMobility::QMediaServiceProviderHint::~QMediaServiceProviderHint(void)
-	?qt_metacall@QMediaStreamsControl@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 727 NONAME ; int QtMobility::QMediaStreamsControl::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??0QMediaControl@QtMobility@@IAE@AAVQMediaControlPrivate@1@PAVQObject@@@Z @ 728 NONAME ; QtMobility::QMediaControl::QMediaControl(class QtMobility::QMediaControlPrivate &, class QObject *)
-	?mediaAboutToBeRemoved@QMediaPlaylistProvider@QtMobility@@IAEXHH@Z @ 729 NONAME ; void QtMobility::QMediaPlaylistProvider::mediaAboutToBeRemoved(int, int)
-	?trUtf8@QAudioEndpointSelector@QtMobility@@SA?AVQString@@PBD0H@Z @ 730 NONAME ; class QString QtMobility::QAudioEndpointSelector::trUtf8(char const *, char const *, int)
-	?state@QMediaImageViewer@QtMobility@@QBE?AW4State@12@XZ @ 731 NONAME ; enum QtMobility::QMediaImageViewer::State QtMobility::QMediaImageViewer::state(void) const
-	?setDataSize@QMediaResource@QtMobility@@QAEX_J@Z @ 732 NONAME ; void QtMobility::QMediaResource::setDataSize(long long)
-	?qt_metacast@QLocalMediaPlaylistProvider@QtMobility@@UAEPAXPBD@Z @ 733 NONAME ; void * QtMobility::QLocalMediaPlaylistProvider::qt_metacast(char const *)
-	?contains@QMediaTimeRange@QtMobility@@QBE_N_J@Z @ 734 NONAME ; bool QtMobility::QMediaTimeRange::contains(long long) const
-	??0QMediaTimeInterval@QtMobility@@QAE@XZ @ 735 NONAME ; QtMobility::QMediaTimeInterval::QMediaTimeInterval(void)
-	?offset@QGraphicsVideoItem@QtMobility@@QBE?AVQPointF@@XZ @ 736 NONAME ; class QPointF QtMobility::QGraphicsVideoItem::offset(void) const
-	?trUtf8@QMediaPlaylistIOPlugin@QtMobility@@SA?AVQString@@PBD0H@Z @ 737 NONAME ; class QString QtMobility::QMediaPlaylistIOPlugin::trUtf8(char const *, char const *, int)
-	?codec@QVideoEncoderSettings@QtMobility@@QBE?AVQString@@XZ @ 738 NONAME ; class QString QtMobility::QVideoEncoderSettings::codec(void) const
-	?bufferStatus@QMediaPlayer@QtMobility@@QBEHXZ @ 739 NONAME ; int QtMobility::QMediaPlayer::bufferStatus(void) const
-	?setVolume@QRadioTuner@QtMobility@@QAEXH@Z @ 740 NONAME ; void QtMobility::QRadioTuner::setVolume(int)
-	?currentIndexChanged@QMediaPlaylist@QtMobility@@IAEXH@Z @ 741 NONAME ; void QtMobility::QMediaPlaylist::currentIndexChanged(int)
-	?qt_metacast@QMediaControl@QtMobility@@UAEPAXPBD@Z @ 742 NONAME ; void * QtMobility::QMediaControl::qt_metacast(char const *)
-	??1QAudioEncoderSettings@QtMobility@@QAE@XZ @ 743 NONAME ; QtMobility::QAudioEncoderSettings::~QAudioEncoderSettings(void)
-	??0QMediaServiceProviderHint@QtMobility@@QAE@XZ @ 744 NONAME ; QtMobility::QMediaServiceProviderHint::QMediaServiceProviderHint(void)
-	?tr@QMediaContainerControl@QtMobility@@SA?AVQString@@PBD0@Z @ 745 NONAME ; class QString QtMobility::QMediaContainerControl::tr(char const *, char const *)
-	?qt_metacast@QRadioTuner@QtMobility@@UAEPAXPBD@Z @ 746 NONAME ; void * QtMobility::QRadioTuner::qt_metacast(char const *)
-	?request@QMediaResource@QtMobility@@QBE?AVQNetworkRequest@@XZ @ 747 NONAME ; class QNetworkRequest QtMobility::QMediaResource::request(void) const
-	?qt_metacall@QMediaImageViewer@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 748 NONAME ; int QtMobility::QMediaImageViewer::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?getStaticMetaObject@QMediaPlaylistIOPlugin@QtMobility@@SAABUQMetaObject@@XZ @ 749 NONAME ; struct QMetaObject const & QtMobility::QMediaPlaylistIOPlugin::getStaticMetaObject(void)
-	??1QMediaPlaylist@QtMobility@@UAE@XZ @ 750 NONAME ; QtMobility::QMediaPlaylist::~QMediaPlaylist(void)
-	?trUtf8@QLocalMediaPlaylistProvider@QtMobility@@SA?AVQString@@PBD0H@Z @ 751 NONAME ; class QString QtMobility::QLocalMediaPlaylistProvider::trUtf8(char const *, char const *, int)
-	?saturationChanged@QVideoWidget@QtMobility@@IAEXH@Z @ 752 NONAME ; void QtMobility::QVideoWidget::saturationChanged(int)
-	?size@QGraphicsVideoItem@QtMobility@@QBE?AVQSizeF@@XZ @ 753 NONAME ; class QSizeF QtMobility::QGraphicsVideoItem::size(void) const
-	??0QGraphicsVideoItem@QtMobility@@QAE@PAVQGraphicsItem@@@Z @ 754 NONAME ; QtMobility::QGraphicsVideoItem::QGraphicsVideoItem(class QGraphicsItem *)
-	?tr@QMediaImageViewer@QtMobility@@SA?AVQString@@PBD0@Z @ 755 NONAME ; class QString QtMobility::QMediaImageViewer::tr(char const *, char const *)
-	??1QMediaServiceSupportedDevicesInterface@QtMobility@@UAE@XZ @ 756 NONAME ; QtMobility::QMediaServiceSupportedDevicesInterface::~QMediaServiceSupportedDevicesInterface(void)
-	?stereoStatusChanged@QRadioTunerControl@QtMobility@@IAEX_N@Z @ 757 NONAME ; void QtMobility::QRadioTunerControl::stereoStatusChanged(bool)
-	?setResolution@QMediaResource@QtMobility@@QAEXHH@Z @ 758 NONAME ; void QtMobility::QMediaResource::setResolution(int, int)
-	?tr@QMediaStreamsControl@QtMobility@@SA?AVQString@@PBD0@Z @ 759 NONAME ; class QString QtMobility::QMediaStreamsControl::tr(char const *, char const *)
-	?supportedMimeTypes@QMediaServiceProvider@QtMobility@@UBE?AVQStringList@@ABVQByteArray@@H@Z @ 760 NONAME ; class QStringList QtMobility::QMediaServiceProvider::supportedMimeTypes(class QByteArray const &, int) const
-	?setPosition@QMediaPlayer@QtMobility@@QAEX_J@Z @ 761 NONAME ; void QtMobility::QMediaPlayer::setPosition(long long)
-	?encodingMode@QVideoEncoderSettings@QtMobility@@QBE?AW4EncodingMode@QtMedia@2@XZ @ 762 NONAME ; enum QtMobility::QtMedia::EncodingMode QtMobility::QVideoEncoderSettings::encodingMode(void) const
-	?tr@QMediaService@QtMobility@@SA?AVQString@@PBD0@Z @ 763 NONAME ; class QString QtMobility::QMediaService::tr(char const *, char const *)
-	?shuffle@QMediaPlaylistProvider@QtMobility@@UAEXXZ @ 764 NONAME ; void QtMobility::QMediaPlaylistProvider::shuffle(void)
-	?setPlaylist@QMediaPlaylistNavigator@QtMobility@@QAEXPAVQMediaPlaylistProvider@2@@Z @ 765 NONAME ; void QtMobility::QMediaPlaylistNavigator::setPlaylist(class QtMobility::QMediaPlaylistProvider *)
-	?tr@QMediaServiceProviderPlugin@QtMobility@@SA?AVQString@@PBD0H@Z @ 766 NONAME ; class QString QtMobility::QMediaServiceProviderPlugin::tr(char const *, char const *, int)
-	?metaObject@QMediaPlayerControl@QtMobility@@UBEPBUQMetaObject@@XZ @ 767 NONAME ; struct QMetaObject const * QtMobility::QMediaPlayerControl::metaObject(void) const
-	?searchForward@QRadioTuner@QtMobility@@QAEXXZ @ 768 NONAME ; void QtMobility::QRadioTuner::searchForward(void)
-	?fullScreenChanged@QVideoWidget@QtMobility@@IAEX_N@Z @ 769 NONAME ; void QtMobility::QVideoWidget::fullScreenChanged(bool)
-	?qt_metacall@QMediaRecorderControl@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 770 NONAME ; int QtMobility::QMediaRecorderControl::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?playbackMode@QMediaPlaylistNavigator@QtMobility@@QBE?AW4PlaybackMode@QMediaPlaylist@2@XZ @ 771 NONAME ; enum QtMobility::QMediaPlaylist::PlaybackMode QtMobility::QMediaPlaylistNavigator::playbackMode(void) const
-	?trUtf8@QMediaStreamsControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 772 NONAME ; class QString QtMobility::QMediaStreamsControl::trUtf8(char const *, char const *, int)
-	?qt_metacall@QVideoOutputControl@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 773 NONAME ; int QtMobility::QVideoOutputControl::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??8QMediaResource@QtMobility@@QBE_NABV01@@Z @ 774 NONAME ; bool QtMobility::QMediaResource::operator==(class QtMobility::QMediaResource const &) const
-	?d_func@QVideoWidget@QtMobility@@ABEPBVQVideoWidgetPrivate@2@XZ @ 775 NONAME ; class QtMobility::QVideoWidgetPrivate const * QtMobility::QVideoWidget::d_func(void) const
-	?tr@QVideoRendererControl@QtMobility@@SA?AVQString@@PBD0@Z @ 776 NONAME ; class QString QtMobility::QVideoRendererControl::tr(char const *, char const *)
-	?contrastChanged@QVideoWidgetControl@QtMobility@@IAEXH@Z @ 777 NONAME ; void QtMobility::QVideoWidgetControl::contrastChanged(int)
-	??_EQMediaServiceSupportedFormatsInterface@QtMobility@@UAE@I@Z @ 778 NONAME ; QtMobility::QMediaServiceSupportedFormatsInterface::~QMediaServiceSupportedFormatsInterface(unsigned int)
-	?getStaticMetaObject@QVideoRendererControl@QtMobility@@SAABUQMetaObject@@XZ @ 779 NONAME ; struct QMetaObject const & QtMobility::QVideoRendererControl::getStaticMetaObject(void)
-	?qt_metacast@QAudioCaptureSource@QtMobility@@UAEPAXPBD@Z @ 780 NONAME ; void * QtMobility::QAudioCaptureSource::qt_metacast(char const *)
-	?durationChanged@QMediaRecorder@QtMobility@@IAEX_J@Z @ 781 NONAME ; void QtMobility::QMediaRecorder::durationChanged(long long)
-	?trUtf8@QGraphicsVideoItem@QtMobility@@SA?AVQString@@PBD0@Z @ 782 NONAME ; class QString QtMobility::QGraphicsVideoItem::trUtf8(char const *, char const *)
-	?error@QRadioTunerControl@QtMobility@@IAEXW4Error@QRadioTuner@2@@Z @ 783 NONAME ; void QtMobility::QRadioTunerControl::error(enum QtMobility::QRadioTuner::Error)
-	?qt_metacast@QRadioTunerControl@QtMobility@@UAEPAXPBD@Z @ 784 NONAME ; void * QtMobility::QRadioTunerControl::qt_metacast(char const *)
-	?availableOutputsChanged@QVideoOutputControl@QtMobility@@IAEXABV?$QList@W4Output@QVideoOutputControl@QtMobility@@@@@Z @ 785 NONAME ; void QtMobility::QVideoOutputControl::availableOutputsChanged(class QList<enum QtMobility::QVideoOutputControl::Output> const &)
-	?setBrightness@QVideoWidget@QtMobility@@QAEXH@Z @ 786 NONAME ; void QtMobility::QVideoWidget::setBrightness(int)
-	??0QMediaContent@QtMobility@@QAE@ABV?$QList@VQMediaResource@QtMobility@@@@@Z @ 787 NONAME ; QtMobility::QMediaContent::QMediaContent(class QList<class QtMobility::QMediaResource> const &)
-	?mediaChanged@QMediaPlaylistProvider@QtMobility@@IAEXHH@Z @ 788 NONAME ; void QtMobility::QMediaPlaylistProvider::mediaChanged(int, int)
-	?d_func@QMediaRecorder@QtMobility@@ABEPBVQMediaRecorderPrivate@2@XZ @ 789 NONAME ; class QtMobility::QMediaRecorderPrivate const * QtMobility::QMediaRecorder::d_func(void) const
-	?stop@QMediaRecorder@QtMobility@@QAEXXZ @ 790 NONAME ; void QtMobility::QMediaRecorder::stop(void)
-	?staticMetaObject@QAudioEndpointSelector@QtMobility@@2UQMetaObject@@B @ 791 NONAME ; struct QMetaObject const QtMobility::QAudioEndpointSelector::staticMetaObject
-	?encodingMode@QAudioEncoderSettings@QtMobility@@QBE?AW4EncodingMode@QtMedia@2@XZ @ 792 NONAME ; enum QtMobility::QtMedia::EncodingMode QtMobility::QAudioEncoderSettings::encodingMode(void) const
-	?tr@QMediaPlaylist@QtMobility@@SA?AVQString@@PBD0H@Z @ 793 NONAME ; class QString QtMobility::QMediaPlaylist::tr(char const *, char const *, int)
-	?staticMetaObject@QVideoWindowControl@QtMobility@@2UQMetaObject@@B @ 794 NONAME ; struct QMetaObject const QtMobility::QVideoWindowControl::staticMetaObject
-	?error@QMediaRecorderControl@QtMobility@@IAEXHABVQString@@@Z @ 795 NONAME ; void QtMobility::QMediaRecorderControl::error(int, class QString const &)
-	?volume@QRadioTuner@QtMobility@@QBEHXZ @ 796 NONAME ; int QtMobility::QRadioTuner::volume(void) const
-	?stateChanged@QMediaRecorder@QtMobility@@IAEXW4State@12@@Z @ 797 NONAME ; void QtMobility::QMediaRecorder::stateChanged(enum QtMobility::QMediaRecorder::State)
-	?mediaChanged@QMediaPlaylist@QtMobility@@IAEXHH@Z @ 798 NONAME ; void QtMobility::QMediaPlaylist::mediaChanged(int, int)
-	?trUtf8@QGraphicsVideoItem@QtMobility@@SA?AVQString@@PBD0H@Z @ 799 NONAME ; class QString QtMobility::QGraphicsVideoItem::trUtf8(char const *, char const *, int)
-	?isAvailable@QMediaRecorder@QtMobility@@UBE_NXZ @ 800 NONAME ; bool QtMobility::QMediaRecorder::isAvailable(void) const
-	??9QVideoEncoderSettings@QtMobility@@QBE_NABV01@@Z @ 801 NONAME ; bool QtMobility::QVideoEncoderSettings::operator!=(class QtMobility::QVideoEncoderSettings const &) const
-	??0QMediaContent@QtMobility@@QAE@ABV01@@Z @ 802 NONAME ; QtMobility::QMediaContent::QMediaContent(class QtMobility::QMediaContent const &)
-	??0QVideoEncoderSettings@QtMobility@@QAE@ABV01@@Z @ 803 NONAME ; QtMobility::QVideoEncoderSettings::QVideoEncoderSettings(class QtMobility::QVideoEncoderSettings const &)
-	?metaObject@QMetaDataControl@QtMobility@@UBEPBUQMetaObject@@XZ @ 804 NONAME ; struct QMetaObject const * QtMobility::QMetaDataControl::metaObject(void) const
-	?resolution@QImageEncoderSettings@QtMobility@@QBE?AVQSize@@XZ @ 805 NONAME ; class QSize QtMobility::QImageEncoderSettings::resolution(void) const
-	?d_func@QMediaControl@QtMobility@@AAEPAVQMediaControlPrivate@2@XZ @ 806 NONAME ; class QtMobility::QMediaControlPrivate * QtMobility::QMediaControl::d_func(void)
-	?mediaStatus@QMediaImageViewer@QtMobility@@QBE?AW4MediaStatus@12@XZ @ 807 NONAME ; enum QtMobility::QMediaImageViewer::MediaStatus QtMobility::QMediaImageViewer::mediaStatus(void) const
-	??0QLocalMediaPlaylistProvider@QtMobility@@QAE@PAVQObject@@@Z @ 808 NONAME ; QtMobility::QLocalMediaPlaylistProvider::QLocalMediaPlaylistProvider(class QObject *)
-	?metaObject@QRadioTuner@QtMobility@@UBEPBUQMetaObject@@XZ @ 809 NONAME ; struct QMetaObject const * QtMobility::QRadioTuner::metaObject(void) const
-	?unbind@QMediaObject@QtMobility@@UAEXPAVQObject@@@Z @ 810 NONAME ; void QtMobility::QMediaObject::unbind(class QObject *)
-	?bind@QMediaImageViewer@QtMobility@@UAEXPAVQObject@@@Z @ 811 NONAME ; void QtMobility::QMediaImageViewer::bind(class QObject *)
-	?d_func@QMediaPlayer@QtMobility@@AAEPAVQMediaPlayerPrivate@2@XZ @ 812 NONAME ; class QtMobility::QMediaPlayerPrivate * QtMobility::QMediaPlayer::d_func(void)
-	?metaObject@QVideoEncoderControl@QtMobility@@UBEPBUQMetaObject@@XZ @ 813 NONAME ; struct QMetaObject const * QtMobility::QVideoEncoderControl::metaObject(void) const
-	?trUtf8@QVideoWidgetControl@QtMobility@@SA?AVQString@@PBD0@Z @ 814 NONAME ; class QString QtMobility::QVideoWidgetControl::trUtf8(char const *, char const *)
-	?mediaAboutToBeInserted@QMediaPlaylist@QtMobility@@IAEXHH@Z @ 815 NONAME ; void QtMobility::QMediaPlaylist::mediaAboutToBeInserted(int, int)
-	?isAvailable@QAudioCaptureSource@QtMobility@@UBE_NXZ @ 816 NONAME ; bool QtMobility::QAudioCaptureSource::isAvailable(void) const
-	?dataSize@QMediaResource@QtMobility@@QBE_JXZ @ 817 NONAME ; long long QtMobility::QMediaResource::dataSize(void) const
-	??_EQMediaServiceSupportedDevicesInterface@QtMobility@@UAE@I@Z @ 818 NONAME ; QtMobility::QMediaServiceSupportedDevicesInterface::~QMediaServiceSupportedDevicesInterface(unsigned int)
-	?setMedia@QMediaImageViewer@QtMobility@@QAEXABVQMediaContent@2@@Z @ 819 NONAME ; void QtMobility::QMediaImageViewer::setMedia(class QtMobility::QMediaContent const &)
-	??1QMediaPlayerControl@QtMobility@@UAE@XZ @ 820 NONAME ; QtMobility::QMediaPlayerControl::~QMediaPlayerControl(void)
-	?error@QRadioTuner@QtMobility@@IAEXW4Error@12@@Z @ 821 NONAME ; void QtMobility::QRadioTuner::error(enum QtMobility::QRadioTuner::Error)
-	??1QMediaObject@QtMobility@@UAE@XZ @ 822 NONAME ; QtMobility::QMediaObject::~QMediaObject(void)
-	?trUtf8@QMediaPlayerControl@QtMobility@@SA?AVQString@@PBD0@Z @ 823 NONAME ; class QString QtMobility::QMediaPlayerControl::trUtf8(char const *, char const *)
-	?trUtf8@QMediaContainerControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 824 NONAME ; class QString QtMobility::QMediaContainerControl::trUtf8(char const *, char const *, int)
-	??0QMediaObject@QtMobility@@IAE@AAVQMediaObjectPrivate@1@PAVQObject@@PAVQMediaService@1@@Z @ 825 NONAME ; QtMobility::QMediaObject::QMediaObject(class QtMobility::QMediaObjectPrivate &, class QObject *, class QtMobility::QMediaService *)
-	??4QMediaServiceProviderHint@QtMobility@@QAEAAV01@ABV01@@Z @ 826 NONAME ; class QtMobility::QMediaServiceProviderHint & QtMobility::QMediaServiceProviderHint::operator=(class QtMobility::QMediaServiceProviderHint const &)
-	??0QMediaContent@QtMobility@@QAE@ABVQUrl@@@Z @ 827 NONAME ; QtMobility::QMediaContent::QMediaContent(class QUrl const &)
-	?removeMedia@QMediaPlaylist@QtMobility@@QAE_NHH@Z @ 828 NONAME ; bool QtMobility::QMediaPlaylist::removeMedia(int, int)
-	?trUtf8@QVideoWidgetControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 829 NONAME ; class QString QtMobility::QVideoWidgetControl::trUtf8(char const *, char const *, int)
-	?trUtf8@QVideoWidget@QtMobility@@SA?AVQString@@PBD0@Z @ 830 NONAME ; class QString QtMobility::QVideoWidget::trUtf8(char const *, char const *)
-	?brightnessChanged@QVideoWindowControl@QtMobility@@IAEXH@Z @ 831 NONAME ; void QtMobility::QVideoWindowControl::brightnessChanged(int)
-	?getStaticMetaObject@QMediaContainerControl@QtMobility@@SAABUQMetaObject@@XZ @ 832 NONAME ; struct QMetaObject const & QtMobility::QMediaContainerControl::getStaticMetaObject(void)
-	?signalStrengthChanged@QRadioTuner@QtMobility@@IAEXH@Z @ 833 NONAME ; void QtMobility::QRadioTuner::signalStrengthChanged(int)
-	?qt_metacall@QMediaPlaylistControl@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 834 NONAME ; int QtMobility::QMediaPlaylistControl::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?errorString@QMediaRecorder@QtMobility@@QBE?AVQString@@XZ @ 835 NONAME ; class QString QtMobility::QMediaRecorder::errorString(void) const
-	??0QMediaPlaylistControl@QtMobility@@IAE@PAVQObject@@@Z @ 836 NONAME ; QtMobility::QMediaPlaylistControl::QMediaPlaylistControl(class QObject *)
-	?setAudioBitRate@QMediaResource@QtMobility@@QAEXH@Z @ 837 NONAME ; void QtMobility::QMediaResource::setAudioBitRate(int)
-	??0QMediaResource@QtMobility@@QAE@ABV01@@Z @ 838 NONAME ; QtMobility::QMediaResource::QMediaResource(class QtMobility::QMediaResource const &)
-	?metaObject@QMediaImageViewer@QtMobility@@UBEPBUQMetaObject@@XZ @ 839 NONAME ; struct QMetaObject const * QtMobility::QMediaImageViewer::metaObject(void) const
-	??0QMediaContent@QtMobility@@QAE@ABVQNetworkRequest@@@Z @ 840 NONAME ; QtMobility::QMediaContent::QMediaContent(class QNetworkRequest const &)
-	?staticMetaObject@QGraphicsVideoItem@QtMobility@@2UQMetaObject@@B @ 841 NONAME ; struct QMetaObject const QtMobility::QGraphicsVideoItem::staticMetaObject
-	?clear@QMediaPlaylistProvider@QtMobility@@UAE_NXZ @ 842 NONAME ; bool QtMobility::QMediaPlaylistProvider::clear(void)
-	?writableChanged@QMetaDataControl@QtMobility@@IAEX_N@Z @ 843 NONAME ; void QtMobility::QMetaDataControl::writableChanged(bool)
-	?containerMimeType@QMediaRecorder@QtMobility@@QBE?AVQString@@XZ @ 844 NONAME ; class QString QtMobility::QMediaRecorder::containerMimeType(void) const
-	?tr@QVideoOutputControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 845 NONAME ; class QString QtMobility::QVideoOutputControl::tr(char const *, char const *, int)
-	??1QVideoEncoderSettings@QtMobility@@QAE@XZ @ 846 NONAME ; QtMobility::QVideoEncoderSettings::~QVideoEncoderSettings(void)
-	?setAspectRatioMode@QVideoWidget@QtMobility@@QAEXW4AspectRatioMode@Qt@@@Z @ 847 NONAME ; void QtMobility::QVideoWidget::setAspectRatioMode(enum Qt::AspectRatioMode)
-	?tr@QMediaPlaylistNavigator@QtMobility@@SA?AVQString@@PBD0H@Z @ 848 NONAME ; class QString QtMobility::QMediaPlaylistNavigator::tr(char const *, char const *, int)
-	?currentIndexChanged@QMediaPlaylistNavigator@QtMobility@@IAEXH@Z @ 849 NONAME ; void QtMobility::QMediaPlaylistNavigator::currentIndexChanged(int)
-	??0QMediaServiceProviderHint@QtMobility@@QAE@ABV01@@Z @ 850 NONAME ; QtMobility::QMediaServiceProviderHint::QMediaServiceProviderHint(class QtMobility::QMediaServiceProviderHint const &)
-	??_EQMediaServiceFeaturesInterface@QtMobility@@UAE@I@Z @ 851 NONAME ; QtMobility::QMediaServiceFeaturesInterface::~QMediaServiceFeaturesInterface(unsigned int)
-	?metaObject@QMediaPlaylistProvider@QtMobility@@UBEPBUQMetaObject@@XZ @ 852 NONAME ; struct QMetaObject const * QtMobility::QMediaPlaylistProvider::metaObject(void) const
-	?trUtf8@QMetaDataControl@QtMobility@@SA?AVQString@@PBD0@Z @ 853 NONAME ; class QString QtMobility::QMetaDataControl::trUtf8(char const *, char const *)
-	?supportedContainers@QMediaRecorder@QtMobility@@QBE?AVQStringList@@XZ @ 854 NONAME ; class QStringList QtMobility::QMediaRecorder::supportedContainers(void) const
-	?device@QMediaServiceProviderHint@QtMobility@@QBE?AVQByteArray@@XZ @ 855 NONAME ; class QByteArray QtMobility::QMediaServiceProviderHint::device(void) const
-	?clear@QLocalMediaPlaylistProvider@QtMobility@@UAE_NXZ @ 856 NONAME ; bool QtMobility::QLocalMediaPlaylistProvider::clear(void)
-	?elapsedTime@QMediaImageViewer@QtMobility@@QBEHXZ @ 857 NONAME ; int QtMobility::QMediaImageViewer::elapsedTime(void) const
-	?trUtf8@QImageEncoderControl@QtMobility@@SA?AVQString@@PBD0@Z @ 858 NONAME ; class QString QtMobility::QImageEncoderControl::trUtf8(char const *, char const *)
-	?searchingChanged@QRadioTunerControl@QtMobility@@IAEX_N@Z @ 859 NONAME ; void QtMobility::QRadioTunerControl::searchingChanged(bool)
-	?staticMetaObject@QMediaControl@QtMobility@@2UQMetaObject@@B @ 860 NONAME ; struct QMetaObject const QtMobility::QMediaControl::staticMetaObject
-	?availableEndpointsChanged@QAudioEndpointSelector@QtMobility@@IAEXXZ @ 861 NONAME ; void QtMobility::QAudioEndpointSelector::availableEndpointsChanged(void)
-	??0QAudioCaptureSource@QtMobility@@QAE@PAVQObject@@PAVQMediaServiceProvider@1@@Z @ 862 NONAME ; QtMobility::QAudioCaptureSource::QAudioCaptureSource(class QObject *, class QtMobility::QMediaServiceProvider *)
-	?quality@QVideoEncoderSettings@QtMobility@@QBE?AW4EncodingQuality@QtMedia@2@XZ @ 863 NONAME ; enum QtMobility::QtMedia::EncodingQuality QtMobility::QVideoEncoderSettings::quality(void) const
-	??1QMediaServiceSupportedFormatsInterface@QtMobility@@UAE@XZ @ 864 NONAME ; QtMobility::QMediaServiceSupportedFormatsInterface::~QMediaServiceSupportedFormatsInterface(void)
-	??9QMediaContent@QtMobility@@QBE_NABV01@@Z @ 865 NONAME ; bool QtMobility::QMediaContent::operator!=(class QtMobility::QMediaContent const &) const
-	?d_func@QVideoWidget@QtMobility@@AAEPAVQVideoWidgetPrivate@2@XZ @ 866 NONAME ; class QtMobility::QVideoWidgetPrivate * QtMobility::QVideoWidget::d_func(void)
-	?d_func@QAudioCaptureSource@QtMobility@@AAEPAVQAudioCaptureSourcePrivate@2@XZ @ 867 NONAME ; class QtMobility::QAudioCaptureSourcePrivate * QtMobility::QAudioCaptureSource::d_func(void)
-	??_EQVideoRendererControl@QtMobility@@UAE@I@Z @ 868 NONAME ; QtMobility::QVideoRendererControl::~QVideoRendererControl(unsigned int)
-	??0QMediaPlayerControl@QtMobility@@IAE@PAVQObject@@@Z @ 869 NONAME ; QtMobility::QMediaPlayerControl::QMediaPlayerControl(class QObject *)
-	??0QMediaContainerControl@QtMobility@@IAE@PAVQObject@@@Z @ 870 NONAME ; QtMobility::QMediaContainerControl::QMediaContainerControl(class QObject *)
-	?isSeekable@QMediaPlayer@QtMobility@@QBE_NXZ @ 871 NONAME ; bool QtMobility::QMediaPlayer::isSeekable(void) const
-	?setAspectRatioMode@QGraphicsVideoItem@QtMobility@@QAEXW4AspectRatioMode@Qt@@@Z @ 872 NONAME ; void QtMobility::QGraphicsVideoItem::setAspectRatioMode(enum Qt::AspectRatioMode)
-	?channelCount@QAudioEncoderSettings@QtMobility@@QBEHXZ @ 873 NONAME ; int QtMobility::QAudioEncoderSettings::channelCount(void) const
-	?isNormal@QMediaTimeInterval@QtMobility@@QBE_NXZ @ 874 NONAME ; bool QtMobility::QMediaTimeInterval::isNormal(void) const
-	?signalStrengthChanged@QRadioTunerControl@QtMobility@@IAEXH@Z @ 875 NONAME ; void QtMobility::QRadioTunerControl::signalStrengthChanged(int)
-	?trUtf8@QRadioTunerControl@QtMobility@@SA?AVQString@@PBD0@Z @ 876 NONAME ; class QString QtMobility::QRadioTunerControl::trUtf8(char const *, char const *)
-	?tr@QVideoDeviceControl@QtMobility@@SA?AVQString@@PBD0@Z @ 877 NONAME ; class QString QtMobility::QVideoDeviceControl::tr(char const *, char const *)
-	?insertMedia@QMediaPlaylistProvider@QtMobility@@UAE_NHABV?$QList@VQMediaContent@QtMobility@@@@@Z @ 878 NONAME ; bool QtMobility::QMediaPlaylistProvider::insertMedia(int, class QList<class QtMobility::QMediaContent> const &)
-	??1QVideoOutputControl@QtMobility@@UAE@XZ @ 879 NONAME ; QtMobility::QVideoOutputControl::~QVideoOutputControl(void)
-	?supportedVideoCodecs@QMediaRecorder@QtMobility@@QBE?AVQStringList@@XZ @ 880 NONAME ; class QStringList QtMobility::QMediaRecorder::supportedVideoCodecs(void) const
-	?tr@QAudioCaptureSource@QtMobility@@SA?AVQString@@PBD0@Z @ 881 NONAME ; class QString QtMobility::QAudioCaptureSource::tr(char const *, char const *)
-	?jump@QMediaPlaylistNavigator@QtMobility@@QAEXH@Z @ 882 NONAME ; void QtMobility::QMediaPlaylistNavigator::jump(int)
-	?translated@QMediaTimeInterval@QtMobility@@QBE?AV12@_J@Z @ 883 NONAME ; class QtMobility::QMediaTimeInterval QtMobility::QMediaTimeInterval::translated(long long) const
-	?qt_metacall@QMetaDataControl@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 884 NONAME ; int QtMobility::QMetaDataControl::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?staticMetaObject@QVideoWidget@QtMobility@@2UQMetaObject@@B @ 885 NONAME ; struct QMetaObject const QtMobility::QVideoWidget::staticMetaObject
-	?staticMetaObject@QImageEncoderControl@QtMobility@@2UQMetaObject@@B @ 886 NONAME ; struct QMetaObject const QtMobility::QImageEncoderControl::staticMetaObject
-	?tr@QMediaPlaylistNavigator@QtMobility@@SA?AVQString@@PBD0@Z @ 887 NONAME ; class QString QtMobility::QMediaPlaylistNavigator::tr(char const *, char const *)
-	?save@QMediaPlaylist@QtMobility@@QAE_NPAVQIODevice@@PBD@Z @ 888 NONAME ; bool QtMobility::QMediaPlaylist::save(class QIODevice *, char const *)
-	?setAudioCodec@QMediaResource@QtMobility@@QAEXABVQString@@@Z @ 889 NONAME ; void QtMobility::QMediaResource::setAudioCodec(class QString const &)
-	??0QMetaDataControl@QtMobility@@IAE@PAVQObject@@@Z @ 890 NONAME ; QtMobility::QMetaDataControl::QMetaDataControl(class QObject *)
-	?itemChange@QGraphicsVideoItem@QtMobility@@MAE?AVQVariant@@W4GraphicsItemChange@QGraphicsItem@@ABV3@@Z @ 891 NONAME ; class QVariant QtMobility::QGraphicsVideoItem::itemChange(enum QGraphicsItem::GraphicsItemChange, class QVariant const &)
-	??9QImageEncoderSettings@QtMobility@@QBE_NABV01@@Z @ 892 NONAME ; bool QtMobility::QImageEncoderSettings::operator!=(class QtMobility::QImageEncoderSettings const &) const
-	?trUtf8@QMediaRecorder@QtMobility@@SA?AVQString@@PBD0H@Z @ 893 NONAME ; class QString QtMobility::QMediaRecorder::trUtf8(char const *, char const *, int)
-	?previous@QMediaPlaylistNavigator@QtMobility@@QAEXXZ @ 894 NONAME ; void QtMobility::QMediaPlaylistNavigator::previous(void)
-	??1QVideoRendererControl@QtMobility@@UAE@XZ @ 895 NONAME ; QtMobility::QVideoRendererControl::~QVideoRendererControl(void)
-	??0QMediaServiceProviderHint@QtMobility@@QAE@V?$QFlags@W4Feature@QMediaServiceProviderHint@QtMobility@@@@@Z @ 896 NONAME ; QtMobility::QMediaServiceProviderHint::QMediaServiceProviderHint(class QFlags<enum QtMobility::QMediaServiceProviderHint::Feature>)
-	??1QMediaPlaylistWriter@QtMobility@@UAE@XZ @ 897 NONAME ; QtMobility::QMediaPlaylistWriter::~QMediaPlaylistWriter(void)
-	?d_func@QMediaService@QtMobility@@AAEPAVQMediaServicePrivate@2@XZ @ 898 NONAME ; class QtMobility::QMediaServicePrivate * QtMobility::QMediaService::d_func(void)
-	?qt_metacast@QMediaPlaylistControl@QtMobility@@UAEPAXPBD@Z @ 899 NONAME ; void * QtMobility::QMediaPlaylistControl::qt_metacast(char const *)
-	?tr@QVideoWidget@QtMobility@@SA?AVQString@@PBD0@Z @ 900 NONAME ; class QString QtMobility::QVideoWidget::tr(char const *, char const *)
-	??0QImageEncoderControl@QtMobility@@IAE@PAVQObject@@@Z @ 901 NONAME ; QtMobility::QImageEncoderControl::QImageEncoderControl(class QObject *)
-	?saturationChanged@QVideoWidgetControl@QtMobility@@IAEXH@Z @ 902 NONAME ; void QtMobility::QVideoWidgetControl::saturationChanged(int)
-	??1QRadioTuner@QtMobility@@UAE@XZ @ 903 NONAME ; QtMobility::QRadioTuner::~QRadioTuner(void)
-	?qt_metacast@QVideoRendererControl@QtMobility@@UAEPAXPBD@Z @ 904 NONAME ; void * QtMobility::QVideoRendererControl::qt_metacast(char const *)
-	?qt_metacall@QMediaPlayerControl@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 905 NONAME ; int QtMobility::QMediaPlayerControl::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?trUtf8@QAudioCaptureSource@QtMobility@@SA?AVQString@@PBD0H@Z @ 906 NONAME ; class QString QtMobility::QAudioCaptureSource::trUtf8(char const *, char const *, int)
-	?isSearching@QRadioTuner@QtMobility@@QBE_NXZ @ 907 NONAME ; bool QtMobility::QRadioTuner::isSearching(void) const
-	?tr@QMediaImageViewer@QtMobility@@SA?AVQString@@PBD0H@Z @ 908 NONAME ; class QString QtMobility::QMediaImageViewer::tr(char const *, char const *, int)
-	?currentIndexChanged@QMediaPlaylistControl@QtMobility@@IAEXH@Z @ 909 NONAME ; void QtMobility::QMediaPlaylistControl::currentIndexChanged(int)
-	?isNull@QMediaContent@QtMobility@@QBE_NXZ @ 910 NONAME ; bool QtMobility::QMediaContent::isNull(void) const
-	?error@QMediaRecorder@QtMobility@@IAEXW4Error@12@@Z @ 911 NONAME ; void QtMobility::QMediaRecorder::error(enum QtMobility::QMediaRecorder::Error)
-	?metaObject@QMediaPlayer@QtMobility@@UBEPBUQMetaObject@@XZ @ 912 NONAME ; struct QMetaObject const * QtMobility::QMediaPlayer::metaObject(void) const
-	?end@QMediaTimeInterval@QtMobility@@QBE_JXZ @ 913 NONAME ; long long QtMobility::QMediaTimeInterval::end(void) const
-	?contrastChanged@QVideoWidget@QtMobility@@IAEXH@Z @ 914 NONAME ; void QtMobility::QVideoWidget::contrastChanged(int)
-	??0QImageEncoderSettings@QtMobility@@QAE@ABV01@@Z @ 915 NONAME ; QtMobility::QImageEncoderSettings::QImageEncoderSettings(class QtMobility::QImageEncoderSettings const &)
-	?intervals@QMediaTimeRange@QtMobility@@QBE?AV?$QList@VQMediaTimeInterval@QtMobility@@@@XZ @ 916 NONAME ; class QList<class QtMobility::QMediaTimeInterval> QtMobility::QMediaTimeRange::intervals(void) const
-	?tr@QVideoWindowControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 917 NONAME ; class QString QtMobility::QVideoWindowControl::tr(char const *, char const *, int)
-	?qt_metacall@QRadioTuner@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 918 NONAME ; int QtMobility::QRadioTuner::qt_metacall(enum QMetaObject::Call, int, void * *)
-	??_EQAudioEncoderControl@QtMobility@@UAE@I@Z @ 919 NONAME ; QtMobility::QAudioEncoderControl::~QAudioEncoderControl(unsigned int)
-	?metaObject@QMediaServiceProvider@QtMobility@@UBEPBUQMetaObject@@XZ @ 920 NONAME ; struct QMetaObject const * QtMobility::QMediaServiceProvider::metaObject(void) const
-	?qt_metacast@QMetaDataControl@QtMobility@@UAEPAXPBD@Z @ 921 NONAME ; void * QtMobility::QMetaDataControl::qt_metacast(char const *)
-	??_EQRadioTunerControl@QtMobility@@UAE@I@Z @ 922 NONAME ; QtMobility::QRadioTunerControl::~QRadioTunerControl(unsigned int)
-	?trUtf8@QMediaControl@QtMobility@@SA?AVQString@@PBD0H@Z @ 923 NONAME ; class QString QtMobility::QMediaControl::trUtf8(char const *, char const *, int)
-	?availabilityError@QMediaRecorder@QtMobility@@UBE?AW4AvailabilityError@QtMedia@2@XZ @ 924 NONAME ; enum QtMobility::QtMedia::AvailabilityError QtMobility::QMediaRecorder::availabilityError(void) const
-	?trUtf8@QMediaControl@QtMobility@@SA?AVQString@@PBD0@Z @ 925 NONAME ; class QString QtMobility::QMediaControl::trUtf8(char const *, char const *)
-	?qt_metacall@QAudioEncoderControl@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 926 NONAME ; int QtMobility::QAudioEncoderControl::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?setOffset@QGraphicsVideoItem@@QAEXABVQPointF@@@Z @ 1 NONAME ; void QGraphicsVideoItem::setOffset(class QPointF const &)
+	??_EQAudioEncoderControl@@UAE@I@Z @ 2 NONAME ; QAudioEncoderControl::~QAudioEncoderControl(unsigned int)
+	?tr@QMediaRecorderControl@@SA?AVQString@@PBD0H@Z @ 3 NONAME ; class QString QMediaRecorderControl::tr(char const *, char const *, int)
+	?qt_metacast@QLocalMediaPlaylistProvider@@UAEPAXPBD@Z @ 4 NONAME ; void * QLocalMediaPlaylistProvider::qt_metacast(char const *)
+	?resizeEvent@QVideoWidget@@MAEXPAVQResizeEvent@@@Z @ 5 NONAME ; void QVideoWidget::resizeEvent(class QResizeEvent *)
+	?isReadOnly@QLocalMediaPlaylistProvider@@UBE_NXZ @ 6 NONAME ; bool QLocalMediaPlaylistProvider::isReadOnly(void) const
+	?elapsedTimeChanged@QMediaImageViewer@@IAEXH@Z @ 7 NONAME ; void QMediaImageViewer::elapsedTimeChanged(int)
+	?d_func@QMediaPlayer@@AAEPAVQMediaPlayerPrivate@@XZ @ 8 NONAME ; class QMediaPlayerPrivate * QMediaPlayer::d_func(void)
+	?stop@QRadioTuner@@QAEXXZ @ 9 NONAME ; void QRadioTuner::stop(void)
+	??1QMediaServiceProvider@@UAE@XZ @ 10 NONAME ; QMediaServiceProvider::~QMediaServiceProvider(void)
+	??0QMediaTimeInterval@@QAE@XZ @ 11 NONAME ; QMediaTimeInterval::QMediaTimeInterval(void)
+	?setDataSize@QMediaResource@@QAEX_J@Z @ 12 NONAME ; void QMediaResource::setDataSize(long long)
+	?trUtf8@QAudioEndpointSelector@@SA?AVQString@@PBD0H@Z @ 13 NONAME ; class QString QAudioEndpointSelector::trUtf8(char const *, char const *, int)
+	?qt_metacall@QAudioCaptureSource@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 14 NONAME ; int QAudioCaptureSource::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?mediaRemoved@QMediaPlaylist@@IAEXHH@Z @ 15 NONAME ; void QMediaPlaylist::mediaRemoved(int, int)
+	?audioDescription@QAudioCaptureSource@@QBE?AVQString@@ABV2@@Z @ 16 NONAME ; class QString QAudioCaptureSource::audioDescription(class QString const &) const
+	?media@QLocalMediaPlaylistProvider@@UBE?AVQMediaContent@@H@Z @ 17 NONAME ; class QMediaContent QLocalMediaPlaylistProvider::media(int) const
+	?isSearching@QRadioTuner@@QBE_NXZ @ 18 NONAME ; bool QRadioTuner::isSearching(void) const
+	??0QMediaResource@@QAE@ABVQNetworkRequest@@ABVQString@@@Z @ 19 NONAME ; QMediaResource::QMediaResource(class QNetworkRequest const &, class QString const &)
+	?devicesChanged@QVideoDeviceControl@@IAEXXZ @ 20 NONAME ; void QVideoDeviceControl::devicesChanged(void)
+	?supportedVideoCodecs@QMediaRecorder@@QBE?AVQStringList@@XZ @ 21 NONAME ; class QStringList QMediaRecorder::supportedVideoCodecs(void) const
+	?searchForward@QRadioTuner@@QAEXXZ @ 22 NONAME ; void QRadioTuner::searchForward(void)
+	?saturation@QVideoWidget@@QBEHXZ @ 23 NONAME ; int QVideoWidget::saturation(void) const
+	?mediaInserted@QMediaPlaylistProvider@@IAEXHH@Z @ 24 NONAME ; void QMediaPlaylistProvider::mediaInserted(int, int)
+	?insertMedia@QMediaPlaylist@@QAE_NHABVQMediaContent@@@Z @ 25 NONAME ; bool QMediaPlaylist::insertMedia(int, class QMediaContent const &)
+	?staticMetaObject@QGraphicsVideoItem@@2UQMetaObject@@B @ 26 NONAME ; struct QMetaObject const QGraphicsVideoItem::staticMetaObject
+	?isAvailable@QAudioCaptureSource@@UBE_NXZ @ 27 NONAME ; bool QAudioCaptureSource::isAvailable(void) const
+	??1QImageEncoderSettings@@QAE@XZ @ 28 NONAME ; QImageEncoderSettings::~QImageEncoderSettings(void)
+	??0QVideoWidgetControl@@IAE@PAVQObject@@@Z @ 29 NONAME ; QVideoWidgetControl::QVideoWidgetControl(class QObject *)
+	?getStaticMetaObject@QAudioEndpointSelector@@SAABUQMetaObject@@XZ @ 30 NONAME ; struct QMetaObject const & QAudioEndpointSelector::getStaticMetaObject(void)
+	?addTimeRange@QMediaTimeRange@@QAEXABV1@@Z @ 31 NONAME ; void QMediaTimeRange::addTimeRange(class QMediaTimeRange const &)
+	??0QMediaObject@@IAE@PAVQObject@@PAVQMediaService@@@Z @ 32 NONAME ; QMediaObject::QMediaObject(class QObject *, class QMediaService *)
+	?encodingMode@QAudioEncoderSettings@@QBE?AW4EncodingMode@QtMediaServices@@XZ @ 33 NONAME ; enum QtMediaServices::EncodingMode QAudioEncoderSettings::encodingMode(void) const
+	??_EQMediaServiceSupportedFormatsInterface@@UAE@I@Z @ 34 NONAME ; QMediaServiceSupportedFormatsInterface::~QMediaServiceSupportedFormatsInterface(unsigned int)
+	?timerEvent@QMediaImageViewer@@MAEXPAVQTimerEvent@@@Z @ 35 NONAME ; void QMediaImageViewer::timerEvent(class QTimerEvent *)
+	?getStaticMetaObject@QMediaPlaylistIOPlugin@@SAABUQMetaObject@@XZ @ 36 NONAME ; struct QMetaObject const & QMediaPlaylistIOPlugin::getStaticMetaObject(void)
+	?metaObject@QMetaDataControl@@UBEPBUQMetaObject@@XZ @ 37 NONAME ; struct QMetaObject const * QMetaDataControl::metaObject(void) const
+	?metaObject@QLocalMediaPlaylistProvider@@UBEPBUQMetaObject@@XZ @ 38 NONAME ; struct QMetaObject const * QLocalMediaPlaylistProvider::metaObject(void) const
+	?currentIndexChanged@QMediaPlaylist@@IAEXH@Z @ 39 NONAME ; void QMediaPlaylist::currentIndexChanged(int)
+	?staticMetaObject@QVideoDeviceControl@@2UQMetaObject@@B @ 40 NONAME ; struct QMetaObject const QVideoDeviceControl::staticMetaObject
+	?videoCodecDescription@QMediaRecorder@@QBE?AVQString@@ABV2@@Z @ 41 NONAME ; class QString QMediaRecorder::videoCodecDescription(class QString const &) const
+	?trUtf8@QMediaImageViewer@@SA?AVQString@@PBD0H@Z @ 42 NONAME ; class QString QMediaImageViewer::trUtf8(char const *, char const *, int)
+	?tr@QImageEncoderControl@@SA?AVQString@@PBD0H@Z @ 43 NONAME ; class QString QImageEncoderControl::tr(char const *, char const *, int)
+	?stop@QMediaImageViewer@@QAEXXZ @ 44 NONAME ; void QMediaImageViewer::stop(void)
+	?isNull@QVideoEncoderSettings@@QBE_NXZ @ 45 NONAME ; bool QVideoEncoderSettings::isNull(void) const
+	?availableEndpointsChanged@QAudioEndpointSelector@@IAEXXZ @ 46 NONAME ; void QAudioEndpointSelector::availableEndpointsChanged(void)
+	?trUtf8@QMetaDataControl@@SA?AVQString@@PBD0@Z @ 47 NONAME ; class QString QMetaDataControl::trUtf8(char const *, char const *)
+	?stateChanged@QMediaRecorder@@IAEXW4State@1@@Z @ 48 NONAME ; void QMediaRecorder::stateChanged(enum QMediaRecorder::State)
+	?isEmpty@QMediaPlaylist@@QBE_NXZ @ 49 NONAME ; bool QMediaPlaylist::isEmpty(void) const
+	?qt_metacast@QMediaPlayerControl@@UAEPAXPBD@Z @ 50 NONAME ; void * QMediaPlayerControl::qt_metacast(char const *)
+	?supportedMimeTypes@QMediaPlayer@@SA?AVQStringList@@V?$QFlags@W4Flag@QMediaPlayer@@@@@Z @ 51 NONAME ; class QStringList QMediaPlayer::supportedMimeTypes(class QFlags<enum QMediaPlayer::Flag>)
+	?insertMedia@QMediaPlaylist@@QAE_NHABV?$QList@VQMediaContent@@@@@Z @ 52 NONAME ; bool QMediaPlaylist::insertMedia(int, class QList<class QMediaContent> const &)
+	??1QMediaTimeRange@@QAE@XZ @ 53 NONAME ; QMediaTimeRange::~QMediaTimeRange(void)
+	?metaObject@QMediaPlaylistNavigator@@UBEPBUQMetaObject@@XZ @ 54 NONAME ; struct QMetaObject const * QMediaPlaylistNavigator::metaObject(void) const
+	?addMedia@QMediaPlaylist@@QAE_NABVQMediaContent@@@Z @ 55 NONAME ; bool QMediaPlaylist::addMedia(class QMediaContent const &)
+	?tr@QMediaPlayer@@SA?AVQString@@PBD0H@Z @ 56 NONAME ; class QString QMediaPlayer::tr(char const *, char const *, int)
+	?staticMetaObject@QRadioTunerControl@@2UQMetaObject@@B @ 57 NONAME ; struct QMetaObject const QRadioTunerControl::staticMetaObject
+	?dataSize@QMediaResource@@QBE_JXZ @ 58 NONAME ; long long QMediaResource::dataSize(void) const
+	?tr@QMediaPlaylistNavigator@@SA?AVQString@@PBD0@Z @ 59 NONAME ; class QString QMediaPlaylistNavigator::tr(char const *, char const *)
+	?error@QMediaPlayerControl@@IAEXHABVQString@@@Z @ 60 NONAME ; void QMediaPlayerControl::error(int, class QString const &)
+	?d_func@QMediaPlaylist@@ABEPBVQMediaPlaylistPrivate@@XZ @ 61 NONAME ; class QMediaPlaylistPrivate const * QMediaPlaylist::d_func(void) const
+	?metaObject@QRadioTuner@@UBEPBUQMetaObject@@XZ @ 62 NONAME ; struct QMetaObject const * QRadioTuner::metaObject(void) const
+	?tr@QMediaService@@SA?AVQString@@PBD0H@Z @ 63 NONAME ; class QString QMediaService::tr(char const *, char const *, int)
+	?staticMetaObject@QVideoWidget@@2UQMetaObject@@B @ 64 NONAME ; struct QMetaObject const QVideoWidget::staticMetaObject
+	?resolution@QVideoEncoderSettings@@QBE?AVQSize@@XZ @ 65 NONAME ; class QSize QVideoEncoderSettings::resolution(void) const
+	?setContrast@QVideoWidget@@QAEXH@Z @ 66 NONAME ; void QVideoWidget::setContrast(int)
+	??_EQMediaControl@@UAE@I@Z @ 67 NONAME ; QMediaControl::~QMediaControl(unsigned int)
+	?media@QMediaPlaylist@@QBE?AVQMediaContent@@H@Z @ 68 NONAME ; class QMediaContent QMediaPlaylist::media(int) const
+	??1QMediaServiceSupportedFormatsInterface@@UAE@XZ @ 69 NONAME ; QMediaServiceSupportedFormatsInterface::~QMediaServiceSupportedFormatsInterface(void)
+	??0QAudioCaptureSource@@QAE@PAVQObject@@PAVQMediaServiceProvider@@@Z @ 70 NONAME ; QAudioCaptureSource::QAudioCaptureSource(class QObject *, class QMediaServiceProvider *)
+	??1QMediaControl@@UAE@XZ @ 71 NONAME ; QMediaControl::~QMediaControl(void)
+	?staticMetaObject@QMediaObject@@2UQMetaObject@@B @ 72 NONAME ; struct QMetaObject const QMediaObject::staticMetaObject
+	?qt_metacast@QMediaPlaylistProvider@@UAEPAXPBD@Z @ 73 NONAME ; void * QMediaPlaylistProvider::qt_metacast(char const *)
+	??0QMediaServiceProviderHint@@QAE@ABVQByteArray@@@Z @ 74 NONAME ; QMediaServiceProviderHint::QMediaServiceProviderHint(class QByteArray const &)
+	?aspectRatioMode@QVideoWidget@@QBE?AW4AspectRatioMode@Qt@@XZ @ 75 NONAME ; enum Qt::AspectRatioMode QVideoWidget::aspectRatioMode(void) const
+	?activeStreamsChanged@QMediaStreamsControl@@IAEXXZ @ 76 NONAME ; void QMediaStreamsControl::activeStreamsChanged(void)
+	?searchingChanged@QRadioTunerControl@@IAEX_N@Z @ 77 NONAME ; void QRadioTunerControl::searchingChanged(bool)
+	??1QMediaRecorder@@UAE@XZ @ 78 NONAME ; QMediaRecorder::~QMediaRecorder(void)
+	?tr@QMediaObject@@SA?AVQString@@PBD0@Z @ 79 NONAME ; class QString QMediaObject::tr(char const *, char const *)
+	?trUtf8@QMediaPlaylistControl@@SA?AVQString@@PBD0H@Z @ 80 NONAME ; class QString QMediaPlaylistControl::trUtf8(char const *, char const *, int)
+	?end@QMediaTimeInterval@@QBE_JXZ @ 81 NONAME ; long long QMediaTimeInterval::end(void) const
+	??1QMetaDataControl@@UAE@XZ @ 82 NONAME ; QMetaDataControl::~QMetaDataControl(void)
+	??0QImageEncoderControl@@IAE@PAVQObject@@@Z @ 83 NONAME ; QImageEncoderControl::QImageEncoderControl(class QObject *)
+	?next@QMediaPlaylistNavigator@@QAEXXZ @ 84 NONAME ; void QMediaPlaylistNavigator::next(void)
+	?d_func@QGraphicsVideoItem@@AAEPAVQGraphicsVideoItemPrivate@@XZ @ 85 NONAME ; class QGraphicsVideoItemPrivate * QGraphicsVideoItem::d_func(void)
+	?setMedia@QMediaPlayer@@QAEXABVQMediaContent@@PAVQIODevice@@@Z @ 86 NONAME ; void QMediaPlayer::setMedia(class QMediaContent const &, class QIODevice *)
+	?d_func@QRadioTuner@@AAEPAVQRadioTunerPrivate@@XZ @ 87 NONAME ; class QRadioTunerPrivate * QRadioTuner::d_func(void)
+	?trUtf8@QMediaPlaylistProvider@@SA?AVQString@@PBD0H@Z @ 88 NONAME ; class QString QMediaPlaylistProvider::trUtf8(char const *, char const *, int)
+	??_EQMediaPlaylistControl@@UAE@I@Z @ 89 NONAME ; QMediaPlaylistControl::~QMediaPlaylistControl(unsigned int)
+	?staticMetaObject@QMediaPlaylistIOPlugin@@2UQMetaObject@@B @ 90 NONAME ; struct QMetaObject const QMediaPlaylistIOPlugin::staticMetaObject
+	?isStereo@QRadioTuner@@QBE_NXZ @ 91 NONAME ; bool QRadioTuner::isStereo(void) const
+	?bind@QMediaPlayer@@UAEXPAVQObject@@@Z @ 92 NONAME ; void QMediaPlayer::bind(class QObject *)
+	?tr@QAudioEndpointSelector@@SA?AVQString@@PBD0H@Z @ 93 NONAME ; class QString QAudioEndpointSelector::tr(char const *, char const *, int)
+	?qt_metacall@QVideoEncoderControl@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 94 NONAME ; int QVideoEncoderControl::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?tr@QMediaImageViewer@@SA?AVQString@@PBD0@Z @ 95 NONAME ; class QString QMediaImageViewer::tr(char const *, char const *)
+	??_EQMediaServiceProvider@@UAE@I@Z @ 96 NONAME ; QMediaServiceProvider::~QMediaServiceProvider(unsigned int)
+	?setStereoMode@QRadioTuner@@QAEXW4StereoMode@1@@Z @ 97 NONAME ; void QRadioTuner::setStereoMode(enum QRadioTuner::StereoMode)
+	?qt_metacall@QMediaServiceProvider@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 98 NONAME ; int QMediaServiceProvider::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?trUtf8@QMediaObject@@SA?AVQString@@PBD0H@Z @ 99 NONAME ; class QString QMediaObject::trUtf8(char const *, char const *, int)
+	?metaObject@QVideoEncoderControl@@UBEPBUQMetaObject@@XZ @ 100 NONAME ; struct QMetaObject const * QVideoEncoderControl::metaObject(void) const
+	?mediaInserted@QMediaPlaylist@@IAEXHH@Z @ 101 NONAME ; void QMediaPlaylist::mediaInserted(int, int)
+	??_EQVideoEncoderControl@@UAE@I@Z @ 102 NONAME ; QVideoEncoderControl::~QVideoEncoderControl(unsigned int)
+	?getStaticMetaObject@QGraphicsVideoItem@@SAABUQMetaObject@@XZ @ 103 NONAME ; struct QMetaObject const & QGraphicsVideoItem::getStaticMetaObject(void)
+	?currentIndex@QMediaPlaylistNavigator@@QBEHXZ @ 104 NONAME ; int QMediaPlaylistNavigator::currentIndex(void) const
+	?duration@QMediaRecorder@@QBE_JXZ @ 105 NONAME ; long long QMediaRecorder::duration(void) const
+	??1QAudioEncoderSettings@@QAE@XZ @ 106 NONAME ; QAudioEncoderSettings::~QAudioEncoderSettings(void)
+	?quality@QAudioEncoderSettings@@QBE?AW4EncodingQuality@QtMediaServices@@XZ @ 107 NONAME ; enum QtMediaServices::EncodingQuality QAudioEncoderSettings::quality(void) const
+	??0QMediaContent@@QAE@XZ @ 108 NONAME ; QMediaContent::QMediaContent(void)
+	?metaObject@QMediaPlayer@@UBEPBUQMetaObject@@XZ @ 109 NONAME ; struct QMetaObject const * QMediaPlayer::metaObject(void) const
+	?language@QMediaResource@@QBE?AVQString@@XZ @ 110 NONAME ; class QString QMediaResource::language(void) const
+	??1QRadioTunerControl@@UAE@XZ @ 111 NONAME ; QRadioTunerControl::~QRadioTunerControl(void)
+	??1QMediaContainerControl@@UAE@XZ @ 112 NONAME ; QMediaContainerControl::~QMediaContainerControl(void)
+	?trUtf8@QLocalMediaPlaylistProvider@@SA?AVQString@@PBD0@Z @ 113 NONAME ; class QString QLocalMediaPlaylistProvider::trUtf8(char const *, char const *)
+	?setMediaObject@QVideoWidget@@QAEXPAVQMediaObject@@@Z @ 114 NONAME ; void QVideoWidget::setMediaObject(class QMediaObject *)
+	??1QGraphicsVideoItem@@UAE@XZ @ 115 NONAME ; QGraphicsVideoItem::~QGraphicsVideoItem(void)
+	?tr@QVideoDeviceControl@@SA?AVQString@@PBD0@Z @ 116 NONAME ; class QString QVideoDeviceControl::tr(char const *, char const *)
+	??0QVideoDeviceControl@@IAE@PAVQObject@@@Z @ 117 NONAME ; QVideoDeviceControl::QVideoDeviceControl(class QObject *)
+	?frequency@QRadioTuner@@QBEHXZ @ 118 NONAME ; int QRadioTuner::frequency(void) const
+	?previousIndex@QMediaPlaylistNavigator@@QBEHH@Z @ 119 NONAME ; int QMediaPlaylistNavigator::previousIndex(int) const
+	?isAvailable@QMediaRecorder@@UBE_NXZ @ 120 NONAME ; bool QMediaRecorder::isAvailable(void) const
+	?trUtf8@QMediaContainerControl@@SA?AVQString@@PBD0@Z @ 121 NONAME ; class QString QMediaContainerControl::trUtf8(char const *, char const *)
+	?trUtf8@QGraphicsVideoItem@@SA?AVQString@@PBD0H@Z @ 122 NONAME ; class QString QGraphicsVideoItem::trUtf8(char const *, char const *, int)
+	?positionChanged@QMediaPlayerControl@@IAEX_J@Z @ 123 NONAME ; void QMediaPlayerControl::positionChanged(long long)
+	?metaObject@QMediaServiceProviderPlugin@@UBEPBUQMetaObject@@XZ @ 124 NONAME ; struct QMetaObject const * QMediaServiceProviderPlugin::metaObject(void) const
+	?currentMediaChanged@QMediaPlaylist@@IAEXABVQMediaContent@@@Z @ 125 NONAME ; void QMediaPlaylist::currentMediaChanged(class QMediaContent const &)
+	?tr@QMediaPlaylistProvider@@SA?AVQString@@PBD0@Z @ 126 NONAME ; class QString QMediaPlaylistProvider::tr(char const *, char const *)
+	?searchBackward@QRadioTuner@@QAEXXZ @ 127 NONAME ; void QRadioTuner::searchBackward(void)
+	?metaObject@QVideoDeviceControl@@UBEPBUQMetaObject@@XZ @ 128 NONAME ; struct QMetaObject const * QVideoDeviceControl::metaObject(void) const
+	?removeMedia@QMediaPlaylist@@QAE_NH@Z @ 129 NONAME ; bool QMediaPlaylist::removeMedia(int)
+	?getStaticMetaObject@QMediaPlaylist@@SAABUQMetaObject@@XZ @ 130 NONAME ; struct QMetaObject const & QMediaPlaylist::getStaticMetaObject(void)
+	?trUtf8@QImageEncoderControl@@SA?AVQString@@PBD0@Z @ 131 NONAME ; class QString QImageEncoderControl::trUtf8(char const *, char const *)
+	?getStaticMetaObject@QVideoWindowControl@@SAABUQMetaObject@@XZ @ 132 NONAME ; struct QMetaObject const & QVideoWindowControl::getStaticMetaObject(void)
+	?d_func@QMediaObject@@AAEPAVQMediaObjectPrivate@@XZ @ 133 NONAME ; class QMediaObjectPrivate * QMediaObject::d_func(void)
+	?qt_metacast@QMediaPlaylistControl@@UAEPAXPBD@Z @ 134 NONAME ; void * QMediaPlaylistControl::qt_metacast(char const *)
+	??0QAudioEndpointSelector@@IAE@PAVQObject@@@Z @ 135 NONAME ; QAudioEndpointSelector::QAudioEndpointSelector(class QObject *)
+	?audioSettings@QMediaRecorder@@QBE?AVQAudioEncoderSettings@@XZ @ 136 NONAME ; class QAudioEncoderSettings QMediaRecorder::audioSettings(void) const
+	?mediaStatus@QMediaImageViewer@@QBE?AW4MediaStatus@1@XZ @ 137 NONAME ; enum QMediaImageViewer::MediaStatus QMediaImageViewer::mediaStatus(void) const
+	?tr@QVideoWidgetControl@@SA?AVQString@@PBD0@Z @ 138 NONAME ; class QString QVideoWidgetControl::tr(char const *, char const *)
+	?trUtf8@QMediaRecorderControl@@SA?AVQString@@PBD0@Z @ 139 NONAME ; class QString QMediaRecorderControl::trUtf8(char const *, char const *)
+	?qt_metacall@QMediaPlaylistNavigator@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 140 NONAME ; int QMediaPlaylistNavigator::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??_EQMetaDataControl@@UAE@I@Z @ 141 NONAME ; QMetaDataControl::~QMetaDataControl(unsigned int)
+	?normalized@QMediaTimeInterval@@QBE?AV1@XZ @ 142 NONAME ; class QMediaTimeInterval QMediaTimeInterval::normalized(void) const
+	?metaObject@QMediaPlaylistControl@@UBEPBUQMetaObject@@XZ @ 143 NONAME ; struct QMetaObject const * QMediaPlaylistControl::metaObject(void) const
+	?durationChanged@QMediaPlayerControl@@IAEX_J@Z @ 144 NONAME ; void QMediaPlayerControl::durationChanged(long long)
+	?qt_metacast@QVideoEncoderControl@@UAEPAXPBD@Z @ 145 NONAME ; void * QVideoEncoderControl::qt_metacast(char const *)
+	?trUtf8@QMediaContainerControl@@SA?AVQString@@PBD0H@Z @ 146 NONAME ; class QString QMediaContainerControl::trUtf8(char const *, char const *, int)
+	?mediaChanged@QMediaImageViewer@@IAEXABVQMediaContent@@@Z @ 147 NONAME ; void QMediaImageViewer::mediaChanged(class QMediaContent const &)
+	?getStaticMetaObject@QMetaDataControl@@SAABUQMetaObject@@XZ @ 148 NONAME ; struct QMetaObject const & QMetaDataControl::getStaticMetaObject(void)
+	?errorString@QRadioTuner@@QBE?AVQString@@XZ @ 149 NONAME ; class QString QRadioTuner::errorString(void) const
+	?addMedia@QLocalMediaPlaylistProvider@@UAE_NABV?$QList@VQMediaContent@@@@@Z @ 150 NONAME ; bool QLocalMediaPlaylistProvider::addMedia(class QList<class QMediaContent> const &)
+	?d_func@QMediaPlaylistNavigator@@ABEPBVQMediaPlaylistNavigatorPrivate@@XZ @ 151 NONAME ; class QMediaPlaylistNavigatorPrivate const * QMediaPlaylistNavigator::d_func(void) const
+	?contrastChanged@QVideoWidgetControl@@IAEXH@Z @ 152 NONAME ; void QVideoWidgetControl::contrastChanged(int)
+	?staticMetaObject@QLocalMediaPlaylistProvider@@2UQMetaObject@@B @ 153 NONAME ; struct QMetaObject const QLocalMediaPlaylistProvider::staticMetaObject
+	?addMedia@QMediaPlaylist@@QAE_NABV?$QList@VQMediaContent@@@@@Z @ 154 NONAME ; bool QMediaPlaylist::addMedia(class QList<class QMediaContent> const &)
+	??0QVideoRendererControl@@IAE@PAVQObject@@@Z @ 155 NONAME ; QVideoRendererControl::QVideoRendererControl(class QObject *)
+	?trUtf8@QMediaObject@@SA?AVQString@@PBD0@Z @ 156 NONAME ; class QString QMediaObject::trUtf8(char const *, char const *)
+	?tr@QMediaImageViewer@@SA?AVQString@@PBD0H@Z @ 157 NONAME ; class QString QMediaImageViewer::tr(char const *, char const *, int)
+	?hueChanged@QVideoWidget@@IAEXH@Z @ 158 NONAME ; void QVideoWidget::hueChanged(int)
+	??4QVideoEncoderSettings@@QAEAAV0@ABV0@@Z @ 159 NONAME ; class QVideoEncoderSettings & QVideoEncoderSettings::operator=(class QVideoEncoderSettings const &)
+	?videoSettings@QMediaRecorder@@QBE?AVQVideoEncoderSettings@@XZ @ 160 NONAME ; class QVideoEncoderSettings QMediaRecorder::videoSettings(void) const
+	?qt_metacast@QVideoWidget@@UAEPAXPBD@Z @ 161 NONAME ; void * QVideoWidget::qt_metacast(char const *)
+	?playbackModeChanged@QMediaPlaylist@@IAEXW4PlaybackMode@1@@Z @ 162 NONAME ; void QMediaPlaylist::playbackModeChanged(enum QMediaPlaylist::PlaybackMode)
+	?activeAudioInput@QAudioCaptureSource@@QBE?AVQString@@XZ @ 163 NONAME ; class QString QAudioCaptureSource::activeAudioInput(void) const
+	?qt_metacall@QMediaImageViewer@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 164 NONAME ; int QMediaImageViewer::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??1QMediaPlaylistProvider@@UAE@XZ @ 165 NONAME ; QMediaPlaylistProvider::~QMediaPlaylistProvider(void)
+	?tr@QMediaPlaylistProvider@@SA?AVQString@@PBD0H@Z @ 166 NONAME ; class QString QMediaPlaylistProvider::tr(char const *, char const *, int)
+	?tr@QMediaPlaylistNavigator@@SA?AVQString@@PBD0H@Z @ 167 NONAME ; class QString QMediaPlaylistNavigator::tr(char const *, char const *, int)
+	?tr@QVideoOutputControl@@SA?AVQString@@PBD0@Z @ 168 NONAME ; class QString QVideoOutputControl::tr(char const *, char const *)
+	?showEvent@QVideoWidget@@MAEXPAVQShowEvent@@@Z @ 169 NONAME ; void QVideoWidget::showEvent(class QShowEvent *)
+	?insertMedia@QLocalMediaPlaylistProvider@@UAE_NHABV?$QList@VQMediaContent@@@@@Z @ 170 NONAME ; bool QLocalMediaPlaylistProvider::insertMedia(int, class QList<class QMediaContent> const &)
+	?error@QMediaPlayer@@QBE?AW4Error@1@XZ @ 171 NONAME ; enum QMediaPlayer::Error QMediaPlayer::error(void) const
+	?codecs@QMediaServiceProviderHint@@QBE?AVQStringList@@XZ @ 172 NONAME ; class QStringList QMediaServiceProviderHint::codecs(void) const
+	?mediaStream@QMediaPlayer@@QBEPBVQIODevice@@XZ @ 173 NONAME ; class QIODevice const * QMediaPlayer::mediaStream(void) const
+	?getStaticMetaObject@QMediaPlaylistControl@@SAABUQMetaObject@@XZ @ 174 NONAME ; struct QMetaObject const & QMediaPlaylistControl::getStaticMetaObject(void)
+	?setResolution@QImageEncoderSettings@@QAEXABVQSize@@@Z @ 175 NONAME ; void QImageEncoderSettings::setResolution(class QSize const &)
+	?audioInputs@QAudioCaptureSource@@QBE?AV?$QList@VQString@@@@XZ @ 176 NONAME ; class QList<class QString> QAudioCaptureSource::audioInputs(void) const
+	??0QMediaPlaylistProvider@@IAE@AAVQMediaPlaylistProviderPrivate@@PAVQObject@@@Z @ 177 NONAME ; QMediaPlaylistProvider::QMediaPlaylistProvider(class QMediaPlaylistProviderPrivate &, class QObject *)
+	??H@YA?AVQMediaTimeRange@@ABV0@0@Z @ 178 NONAME ; class QMediaTimeRange operator+(class QMediaTimeRange const &, class QMediaTimeRange const &)
+	??0QImageEncoderSettings@@QAE@ABV0@@Z @ 179 NONAME ; QImageEncoderSettings::QImageEncoderSettings(class QImageEncoderSettings const &)
+	?record@QMediaRecorder@@QAEXXZ @ 180 NONAME ; void QMediaRecorder::record(void)
+	?metaObject@QMediaService@@UBEPBUQMetaObject@@XZ @ 181 NONAME ; struct QMetaObject const * QMediaService::metaObject(void) const
+	?state@QMediaImageViewer@@QBE?AW4State@1@XZ @ 182 NONAME ; enum QMediaImageViewer::State QMediaImageViewer::state(void) const
+	?isMuted@QRadioTuner@@QBE_NXZ @ 183 NONAME ; bool QRadioTuner::isMuted(void) const
+	?availabilityChanged@QMediaObject@@IAEX_N@Z @ 184 NONAME ; void QMediaObject::availabilityChanged(bool)
+	?trUtf8@QVideoEncoderControl@@SA?AVQString@@PBD0@Z @ 185 NONAME ; class QString QVideoEncoderControl::trUtf8(char const *, char const *)
+	?setLanguage@QMediaResource@@QAEXABVQString@@@Z @ 186 NONAME ; void QMediaResource::setLanguage(class QString const &)
+	??0QMediaResource@@QAE@ABVQUrl@@ABVQString@@@Z @ 187 NONAME ; QMediaResource::QMediaResource(class QUrl const &, class QString const &)
+	?clear@QMediaPlaylist@@QAE_NXZ @ 188 NONAME ; bool QMediaPlaylist::clear(void)
+	?surroundingItemsChanged@QMediaPlaylistNavigator@@IAEXXZ @ 189 NONAME ; void QMediaPlaylistNavigator::surroundingItemsChanged(void)
+	?getStaticMetaObject@QMediaPlaylistProvider@@SAABUQMetaObject@@XZ @ 190 NONAME ; struct QMetaObject const & QMediaPlaylistProvider::getStaticMetaObject(void)
+	?d_func@QMediaService@@ABEPBVQMediaServicePrivate@@XZ @ 191 NONAME ; class QMediaServicePrivate const * QMediaService::d_func(void) const
+	?availablePlaybackRangesChanged@QMediaPlayerControl@@IAEXABVQMediaTimeRange@@@Z @ 192 NONAME ; void QMediaPlayerControl::availablePlaybackRangesChanged(class QMediaTimeRange const &)
+	?mutedChanged@QRadioTuner@@IAEX_N@Z @ 193 NONAME ; void QRadioTuner::mutedChanged(bool)
+	?currentIndex@QMediaPlaylist@@QBEHXZ @ 194 NONAME ; int QMediaPlaylist::currentIndex(void) const
+	?aspectRatioMode@QGraphicsVideoItem@@QBE?AW4AspectRatioMode@Qt@@XZ @ 195 NONAME ; enum Qt::AspectRatioMode QGraphicsVideoItem::aspectRatioMode(void) const
+	??0QMediaTimeRange@@QAE@ABVQMediaTimeInterval@@@Z @ 196 NONAME ; QMediaTimeRange::QMediaTimeRange(class QMediaTimeInterval const &)
+	?quality@QImageEncoderSettings@@QBE?AW4EncodingQuality@QtMediaServices@@XZ @ 197 NONAME ; enum QtMediaServices::EncodingQuality QImageEncoderSettings::quality(void) const
+	?qt_metacall@QMediaPlaylistProvider@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 198 NONAME ; int QMediaPlaylistProvider::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??_EQVideoWidgetControl@@UAE@I@Z @ 199 NONAME ; QVideoWidgetControl::~QVideoWidgetControl(unsigned int)
+	?trUtf8@QVideoDeviceControl@@SA?AVQString@@PBD0H@Z @ 200 NONAME ; class QString QVideoDeviceControl::trUtf8(char const *, char const *, int)
+	?seekableChanged@QMediaPlayer@@IAEX_N@Z @ 201 NONAME ; void QMediaPlayer::seekableChanged(bool)
+	??0QVideoOutputControl@@IAE@PAVQObject@@@Z @ 202 NONAME ; QVideoOutputControl::QVideoOutputControl(class QObject *)
+	?unbind@QMediaPlayer@@UAEXPAVQObject@@@Z @ 203 NONAME ; void QMediaPlayer::unbind(class QObject *)
+	?tr@QMediaPlaylistControl@@SA?AVQString@@PBD0@Z @ 204 NONAME ; class QString QMediaPlaylistControl::tr(char const *, char const *)
+	?setVolume@QMediaPlayer@@QAEXH@Z @ 205 NONAME ; void QMediaPlayer::setVolume(int)
+	?setPlaylist@QMediaPlaylistNavigator@@QAEXPAVQMediaPlaylistProvider@@@Z @ 206 NONAME ; void QMediaPlaylistNavigator::setPlaylist(class QMediaPlaylistProvider *)
+	?setSampleRate@QMediaResource@@QAEXH@Z @ 207 NONAME ; void QMediaResource::setSampleRate(int)
+	?clear@QLocalMediaPlaylistProvider@@UAE_NXZ @ 208 NONAME ; bool QLocalMediaPlaylistProvider::clear(void)
+	??1QVideoEncoderSettings@@QAE@XZ @ 209 NONAME ; QVideoEncoderSettings::~QVideoEncoderSettings(void)
+	?setBand@QRadioTuner@@QAEXW4Band@1@@Z @ 210 NONAME ; void QRadioTuner::setBand(enum QRadioTuner::Band)
+	?trUtf8@QAudioEncoderControl@@SA?AVQString@@PBD0@Z @ 211 NONAME ; class QString QAudioEncoderControl::trUtf8(char const *, char const *)
+	?mediaChanged@QMediaPlayerControl@@IAEXABVQMediaContent@@@Z @ 212 NONAME ; void QMediaPlayerControl::mediaChanged(class QMediaContent const &)
+	?getStaticMetaObject@QMediaObject@@SAABUQMetaObject@@XZ @ 213 NONAME ; struct QMetaObject const & QMediaObject::getStaticMetaObject(void)
+	??1QMediaServiceProviderHint@@QAE@XZ @ 214 NONAME ; QMediaServiceProviderHint::~QMediaServiceProviderHint(void)
+	?removeMedia@QMediaPlaylist@@QAE_NHH@Z @ 215 NONAME ; bool QMediaPlaylist::removeMedia(int, int)
+	?mediaCount@QMediaPlaylist@@QBEHXZ @ 216 NONAME ; int QMediaPlaylist::mediaCount(void) const
+	?load@QMediaPlaylist@@QAEXABVQUrl@@PBD@Z @ 217 NONAME ; void QMediaPlaylist::load(class QUrl const &, char const *)
+	?earliestTime@QMediaTimeRange@@QBE_JXZ @ 218 NONAME ; long long QMediaTimeRange::earliestTime(void) const
+	?d_func@QGraphicsVideoItem@@ABEPBVQGraphicsVideoItemPrivate@@XZ @ 219 NONAME ; class QGraphicsVideoItemPrivate const * QGraphicsVideoItem::d_func(void) const
+	?itemChange@QGraphicsVideoItem@@MAE?AVQVariant@@W4GraphicsItemChange@QGraphicsItem@@ABV2@@Z @ 220 NONAME ; class QVariant QGraphicsVideoItem::itemChange(enum QGraphicsItem::GraphicsItemChange, class QVariant const &)
+	?stateChanged@QRadioTuner@@IAEXW4State@1@@Z @ 221 NONAME ; void QRadioTuner::stateChanged(enum QRadioTuner::State)
+	?getStaticMetaObject@QMediaControl@@SAABUQMetaObject@@XZ @ 222 NONAME ; struct QMetaObject const & QMediaControl::getStaticMetaObject(void)
+	?tr@QMediaContainerControl@@SA?AVQString@@PBD0H@Z @ 223 NONAME ; class QString QMediaContainerControl::tr(char const *, char const *, int)
+	?qt_metacall@QMediaService@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 224 NONAME ; int QMediaService::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?tr@QVideoWidget@@SA?AVQString@@PBD0@Z @ 225 NONAME ; class QString QVideoWidget::tr(char const *, char const *)
+	?bitRate@QAudioEncoderSettings@@QBEHXZ @ 226 NONAME ; int QAudioEncoderSettings::bitRate(void) const
+	?getStaticMetaObject@QMediaPlaylistNavigator@@SAABUQMetaObject@@XZ @ 227 NONAME ; struct QMetaObject const & QMediaPlaylistNavigator::getStaticMetaObject(void)
+	??0QMediaControl@@IAE@AAVQMediaControlPrivate@@PAVQObject@@@Z @ 228 NONAME ; QMediaControl::QMediaControl(class QMediaControlPrivate &, class QObject *)
+	?videoAvailableChanged@QMediaPlayerControl@@IAEX_N@Z @ 229 NONAME ; void QMediaPlayerControl::videoAvailableChanged(bool)
+	?tr@QLocalMediaPlaylistProvider@@SA?AVQString@@PBD0@Z @ 230 NONAME ; class QString QLocalMediaPlaylistProvider::tr(char const *, char const *)
+	?supportedResolutions@QMediaRecorder@@QBE?AV?$QList@VQSize@@@@ABVQVideoEncoderSettings@@PA_N@Z @ 231 NONAME ; class QList<class QSize> QMediaRecorder::supportedResolutions(class QVideoEncoderSettings const &, bool *) const
+	?removeMedia@QLocalMediaPlaylistProvider@@UAE_NH@Z @ 232 NONAME ; bool QLocalMediaPlaylistProvider::removeMedia(int)
+	?qt_metacast@QMediaImageViewer@@UAEPAXPBD@Z @ 233 NONAME ; void * QMediaImageViewer::qt_metacast(char const *)
+	?contrast@QVideoWidget@@QBEHXZ @ 234 NONAME ; int QVideoWidget::contrast(void) const
+	?trUtf8@QMediaStreamsControl@@SA?AVQString@@PBD0@Z @ 235 NONAME ; class QString QMediaStreamsControl::trUtf8(char const *, char const *)
+	??0QMediaResource@@QAE@ABV0@@Z @ 236 NONAME ; QMediaResource::QMediaResource(class QMediaResource const &)
+	?previous@QMediaPlaylistNavigator@@QAEXXZ @ 237 NONAME ; void QMediaPlaylistNavigator::previous(void)
+	?d_func@QMediaPlaylistNavigator@@AAEPAVQMediaPlaylistNavigatorPrivate@@XZ @ 238 NONAME ; class QMediaPlaylistNavigatorPrivate * QMediaPlaylistNavigator::d_func(void)
+	?save@QMediaPlaylistProvider@@UAE_NABVQUrl@@PBD@Z @ 239 NONAME ; bool QMediaPlaylistProvider::save(class QUrl const &, char const *)
+	?frequencyRange@QRadioTuner@@QBE?AU?$QPair@HH@@W4Band@1@@Z @ 240 NONAME ; struct QPair<int, int> QRadioTuner::frequencyRange(enum QRadioTuner::Band) const
+	?fullScreenChanged@QVideoWidget@@IAEX_N@Z @ 241 NONAME ; void QVideoWidget::fullScreenChanged(bool)
+	?setSaturation@QVideoWidget@@QAEXH@Z @ 242 NONAME ; void QVideoWidget::setSaturation(int)
+	?setResolution@QMediaResource@@QAEXABVQSize@@@Z @ 243 NONAME ; void QMediaResource::setResolution(class QSize const &)
+	?positionChanged@QMediaPlayer@@IAEX_J@Z @ 244 NONAME ; void QMediaPlayer::positionChanged(long long)
+	?bandChanged@QRadioTuner@@IAEXW4Band@1@@Z @ 245 NONAME ; void QRadioTuner::bandChanged(enum QRadioTuner::Band)
+	??1QAudioCaptureSource@@UAE@XZ @ 246 NONAME ; QAudioCaptureSource::~QAudioCaptureSource(void)
+	?staticMetaObject@QMediaRecorder@@2UQMetaObject@@B @ 247 NONAME ; struct QMetaObject const QMediaRecorder::staticMetaObject
+	?d_func@QMediaPlayer@@ABEPBVQMediaPlayerPrivate@@XZ @ 248 NONAME ; class QMediaPlayerPrivate const * QMediaPlayer::d_func(void) const
+	?setMuted@QRadioTuner@@QAEX_N@Z @ 249 NONAME ; void QRadioTuner::setMuted(bool)
+	?getStaticMetaObject@QMediaRecorder@@SAABUQMetaObject@@XZ @ 250 NONAME ; struct QMetaObject const & QMediaRecorder::getStaticMetaObject(void)
+	?streamsChanged@QMediaStreamsControl@@IAEXXZ @ 251 NONAME ; void QMediaStreamsControl::streamsChanged(void)
+	?loadFailed@QMediaPlaylistProvider@@IAEXW4Error@QMediaPlaylist@@ABVQString@@@Z @ 252 NONAME ; void QMediaPlaylistProvider::loadFailed(enum QMediaPlaylist::Error, class QString const &)
+	?mediaStatusChanged@QMediaPlayer@@IAEXW4MediaStatus@1@@Z @ 253 NONAME ; void QMediaPlayer::mediaStatusChanged(enum QMediaPlayer::MediaStatus)
+	??0QMediaServiceProviderHint@@QAE@V?$QFlags@W4Feature@QMediaServiceProviderHint@@@@@Z @ 254 NONAME ; QMediaServiceProviderHint::QMediaServiceProviderHint(class QFlags<enum QMediaServiceProviderHint::Feature>)
+	?trUtf8@QMediaPlaylistIOPlugin@@SA?AVQString@@PBD0H@Z @ 255 NONAME ; class QString QMediaPlaylistIOPlugin::trUtf8(char const *, char const *, int)
+	?availabilityError@QAudioCaptureSource@@UBE?AW4AvailabilityError@QtMediaServices@@XZ @ 256 NONAME ; enum QtMediaServices::AvailabilityError QAudioCaptureSource::availabilityError(void) const
+	??_EQMediaPlayer@@UAE@I@Z @ 257 NONAME ; QMediaPlayer::~QMediaPlayer(unsigned int)
+	?tr@QVideoWidget@@SA?AVQString@@PBD0H@Z @ 258 NONAME ; class QString QVideoWidget::tr(char const *, char const *, int)
+	?mimeType@QMediaResource@@QBE?AVQString@@XZ @ 259 NONAME ; class QString QMediaResource::mimeType(void) const
+	??0QAudioEncoderSettings@@QAE@ABV0@@Z @ 260 NONAME ; QAudioEncoderSettings::QAudioEncoderSettings(class QAudioEncoderSettings const &)
+	?videoAvailableChanged@QMediaPlayer@@IAEX_N@Z @ 261 NONAME ; void QMediaPlayer::videoAvailableChanged(bool)
+	?nextIndex@QMediaPlaylist@@QBEHH@Z @ 262 NONAME ; int QMediaPlaylist::nextIndex(int) const
+	?stateChanged@QMediaRecorderControl@@IAEXW4State@QMediaRecorder@@@Z @ 263 NONAME ; void QMediaRecorderControl::stateChanged(enum QMediaRecorder::State)
+	?qt_metacall@QMediaPlayer@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 264 NONAME ; int QMediaPlayer::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??0QMediaService@@IAE@PAVQObject@@@Z @ 265 NONAME ; QMediaService::QMediaService(class QObject *)
+	?sampleRate@QMediaResource@@QBEHXZ @ 266 NONAME ; int QMediaResource::sampleRate(void) const
+	??0QRadioTunerControl@@IAE@PAVQObject@@@Z @ 267 NONAME ; QRadioTunerControl::QRadioTunerControl(class QObject *)
+	??4QAudioEncoderSettings@@QAEAAV0@ABV0@@Z @ 268 NONAME ; class QAudioEncoderSettings & QAudioEncoderSettings::operator=(class QAudioEncoderSettings const &)
+	?staticMetaObject@QMediaPlaylist@@2UQMetaObject@@B @ 269 NONAME ; struct QMetaObject const QMediaPlaylist::staticMetaObject
+	?playbackModeChanged@QMediaPlaylistNavigator@@IAEXW4PlaybackMode@QMediaPlaylist@@@Z @ 270 NONAME ; void QMediaPlaylistNavigator::playbackModeChanged(enum QMediaPlaylist::PlaybackMode)
+	??_EQMediaStreamsControl@@UAE@I@Z @ 271 NONAME ; QMediaStreamsControl::~QMediaStreamsControl(unsigned int)
+	?staticMetaObject@QAudioCaptureSource@@2UQMetaObject@@B @ 272 NONAME ; struct QMetaObject const QAudioCaptureSource::staticMetaObject
+	??0QMediaContent@@QAE@ABV?$QList@VQMediaResource@@@@@Z @ 273 NONAME ; QMediaContent::QMediaContent(class QList<class QMediaResource> const &)
+	?staticMetaObject@QMediaContainerControl@@2UQMetaObject@@B @ 274 NONAME ; struct QMetaObject const QMediaContainerControl::staticMetaObject
+	?qt_metacast@QMediaServiceProviderPlugin@@UAEPAXPBD@Z @ 275 NONAME ; void * QMediaServiceProviderPlugin::qt_metacast(char const *)
+	?deviceDescription@QMediaServiceProvider@@UAE?AVQString@@ABVQByteArray@@0@Z @ 276 NONAME ; class QString QMediaServiceProvider::deviceDescription(class QByteArray const &, class QByteArray const &)
+	??9@YA_NABVQMediaTimeInterval@@0@Z @ 277 NONAME ; bool operator!=(class QMediaTimeInterval const &, class QMediaTimeInterval const &)
+	??9@YA_NABVQMediaTimeRange@@0@Z @ 278 NONAME ; bool operator!=(class QMediaTimeRange const &, class QMediaTimeRange const &)
+	??_EQVideoRendererControl@@UAE@I@Z @ 279 NONAME ; QVideoRendererControl::~QVideoRendererControl(unsigned int)
+	?staticMetaObject@QVideoOutputControl@@2UQMetaObject@@B @ 280 NONAME ; struct QMetaObject const QVideoOutputControl::staticMetaObject
+	?availableAudioInputsChanged@QAudioCaptureSource@@IAEXXZ @ 281 NONAME ; void QAudioCaptureSource::availableAudioInputsChanged(void)
+	?tr@QMetaDataControl@@SA?AVQString@@PBD0H@Z @ 282 NONAME ; class QString QMetaDataControl::tr(char const *, char const *, int)
+	?setAudioBitRate@QMediaResource@@QAEXH@Z @ 283 NONAME ; void QMediaResource::setAudioBitRate(int)
+	?load@QMediaPlaylist@@QAEXPAVQIODevice@@PBD@Z @ 284 NONAME ; void QMediaPlaylist::load(class QIODevice *, char const *)
+	?setFullScreen@QVideoWidget@@QAEX_N@Z @ 285 NONAME ; void QVideoWidget::setFullScreen(bool)
+	?currentMediaChanged@QMediaPlaylistControl@@IAEXABVQMediaContent@@@Z @ 286 NONAME ; void QMediaPlaylistControl::currentMediaChanged(class QMediaContent const &)
+	?isReadOnly@QMediaPlaylist@@QBE_NXZ @ 287 NONAME ; bool QMediaPlaylist::isReadOnly(void) const
+	?supportedFrameRates@QMediaRecorder@@QBE?AV?$QList@M@@ABVQVideoEncoderSettings@@PA_N@Z @ 288 NONAME ; class QList<float> QMediaRecorder::supportedFrameRates(class QVideoEncoderSettings const &, bool *) const
+	?start@QRadioTuner@@QAEXXZ @ 289 NONAME ; void QRadioTuner::start(void)
+	?play@QMediaPlayer@@QAEXXZ @ 290 NONAME ; void QMediaPlayer::play(void)
+	?metaObject@QGraphicsVideoItem@@UBEPBUQMetaObject@@XZ @ 291 NONAME ; struct QMetaObject const * QGraphicsVideoItem::metaObject(void) const
+	??0QVideoWidget@@QAE@PAVQWidget@@@Z @ 292 NONAME ; QVideoWidget::QVideoWidget(class QWidget *)
+	??1QAudioEndpointSelector@@UAE@XZ @ 293 NONAME ; QAudioEndpointSelector::~QAudioEndpointSelector(void)
+	??_EQMediaPlayerControl@@UAE@I@Z @ 294 NONAME ; QMediaPlayerControl::~QMediaPlayerControl(unsigned int)
+	?trUtf8@QVideoWidget@@SA?AVQString@@PBD0@Z @ 295 NONAME ; class QString QVideoWidget::trUtf8(char const *, char const *)
+	?stereoStatusChanged@QRadioTunerControl@@IAEX_N@Z @ 296 NONAME ; void QRadioTunerControl::stereoStatusChanged(bool)
+	?d_func@QMediaService@@AAEPAVQMediaServicePrivate@@XZ @ 297 NONAME ; class QMediaServicePrivate * QMediaService::d_func(void)
+	?audioCodecDescription@QMediaRecorder@@QBE?AVQString@@ABV2@@Z @ 298 NONAME ; class QString QMediaRecorder::audioCodecDescription(class QString const &) const
+	?setAspectRatioMode@QGraphicsVideoItem@@QAEXW4AspectRatioMode@Qt@@@Z @ 299 NONAME ; void QGraphicsVideoItem::setAspectRatioMode(enum Qt::AspectRatioMode)
+	??4QMediaResource@@QAEAAV0@ABV0@@Z @ 300 NONAME ; class QMediaResource & QMediaResource::operator=(class QMediaResource const &)
+	?isVideoAvailable@QMediaPlayer@@QBE_NXZ @ 301 NONAME ; bool QMediaPlayer::isVideoAvailable(void) const
+	?playbackMode@QMediaPlaylist@@QBE?AW4PlaybackMode@1@XZ @ 302 NONAME ; enum QMediaPlaylist::PlaybackMode QMediaPlaylist::playbackMode(void) const
+	?qt_metacast@QAudioCaptureSource@@UAEPAXPBD@Z @ 303 NONAME ; void * QAudioCaptureSource::qt_metacast(char const *)
+	?metaDataChanged@QMediaObject@@IAEXXZ @ 304 NONAME ; void QMediaObject::metaDataChanged(void)
+	?metaObject@QVideoWidget@@UBEPBUQMetaObject@@XZ @ 305 NONAME ; struct QMetaObject const * QVideoWidget::metaObject(void) const
+	?defaultAudioInput@QAudioCaptureSource@@QBE?AVQString@@XZ @ 306 NONAME ; class QString QAudioCaptureSource::defaultAudioInput(void) const
+	?trUtf8@QAudioCaptureSource@@SA?AVQString@@PBD0@Z @ 307 NONAME ; class QString QAudioCaptureSource::trUtf8(char const *, char const *)
+	?trUtf8@QImageEncoderControl@@SA?AVQString@@PBD0H@Z @ 308 NONAME ; class QString QImageEncoderControl::trUtf8(char const *, char const *, int)
+	??1QMediaPlaylistWriter@@UAE@XZ @ 309 NONAME ; QMediaPlaylistWriter::~QMediaPlaylistWriter(void)
+	?translated@QMediaTimeInterval@@QBE?AV1@_J@Z @ 310 NONAME ; class QMediaTimeInterval QMediaTimeInterval::translated(long long) const
+	?trUtf8@QGraphicsVideoItem@@SA?AVQString@@PBD0@Z @ 311 NONAME ; class QString QGraphicsVideoItem::trUtf8(char const *, char const *)
+	?position@QMediaPlayer@@QBE_JXZ @ 312 NONAME ; long long QMediaPlayer::position(void) const
+	?qt_metacall@QVideoOutputControl@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 313 NONAME ; int QVideoOutputControl::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??_EQMediaPlaylistIOInterface@@UAE@I@Z @ 314 NONAME ; QMediaPlaylistIOInterface::~QMediaPlaylistIOInterface(unsigned int)
+	?supportedAudioSampleRates@QMediaRecorder@@QBE?AV?$QList@H@@ABVQAudioEncoderSettings@@PA_N@Z @ 315 NONAME ; class QList<int> QMediaRecorder::supportedAudioSampleRates(class QAudioEncoderSettings const &, bool *) const
+	?save@QMediaPlaylist@@QAE_NPAVQIODevice@@PBD@Z @ 316 NONAME ; bool QMediaPlaylist::save(class QIODevice *, char const *)
+	??_EQVideoWidget@@UAE@I@Z @ 317 NONAME ; QVideoWidget::~QVideoWidget(unsigned int)
+	?itemAt@QMediaPlaylistNavigator@@QBE?AVQMediaContent@@H@Z @ 318 NONAME ; class QMediaContent QMediaPlaylistNavigator::itemAt(int) const
+	?contains@QMediaTimeInterval@@QBE_N_J@Z @ 319 NONAME ; bool QMediaTimeInterval::contains(long long) const
+	?quality@QVideoEncoderSettings@@QBE?AW4EncodingQuality@QtMediaServices@@XZ @ 320 NONAME ; enum QtMediaServices::EncodingQuality QVideoEncoderSettings::quality(void) const
+	?mediaStatus@QMediaPlayer@@QBE?AW4MediaStatus@1@XZ @ 321 NONAME ; enum QMediaPlayer::MediaStatus QMediaPlayer::mediaStatus(void) const
+	?bitRate@QVideoEncoderSettings@@QBEHXZ @ 322 NONAME ; int QVideoEncoderSettings::bitRate(void) const
+	?d_func@QMediaControl@@ABEPBVQMediaControlPrivate@@XZ @ 323 NONAME ; class QMediaControlPrivate const * QMediaControl::d_func(void) const
+	??_EQMediaServiceSupportedDevicesInterface@@UAE@I@Z @ 324 NONAME ; QMediaServiceSupportedDevicesInterface::~QMediaServiceSupportedDevicesInterface(unsigned int)
+	?brightnessChanged@QVideoWidget@@IAEXH@Z @ 325 NONAME ; void QVideoWidget::brightnessChanged(int)
+	?setResolution@QVideoEncoderSettings@@QAEXHH@Z @ 326 NONAME ; void QVideoEncoderSettings::setResolution(int, int)
+	?mediaObject@QMediaPlaylist@@QBEPAVQMediaObject@@XZ @ 327 NONAME ; class QMediaObject * QMediaPlaylist::mediaObject(void) const
+	??_EQMediaPlaylistProvider@@UAE@I@Z @ 328 NONAME ; QMediaPlaylistProvider::~QMediaPlaylistProvider(unsigned int)
+	?trUtf8@QMediaControl@@SA?AVQString@@PBD0@Z @ 329 NONAME ; class QString QMediaControl::trUtf8(char const *, char const *)
+	??_EQMediaObject@@UAE@I@Z @ 330 NONAME ; QMediaObject::~QMediaObject(unsigned int)
+	?tr@QMediaPlaylistIOPlugin@@SA?AVQString@@PBD0H@Z @ 331 NONAME ; class QString QMediaPlaylistIOPlugin::tr(char const *, char const *, int)
+	?qt_metacast@QGraphicsVideoItem@@UAEPAXPBD@Z @ 332 NONAME ; void * QGraphicsVideoItem::qt_metacast(char const *)
+	?extendedMetaData@QMediaObject@@QBE?AVQVariant@@ABVQString@@@Z @ 333 NONAME ; class QVariant QMediaObject::extendedMetaData(class QString const &) const
+	?duration@QMediaPlayer@@QBE_JXZ @ 334 NONAME ; long long QMediaPlayer::duration(void) const
+	?tr@QRadioTuner@@SA?AVQString@@PBD0H@Z @ 335 NONAME ; class QString QRadioTuner::tr(char const *, char const *, int)
+	?setMedia@QMediaImageViewer@@QAEXABVQMediaContent@@@Z @ 336 NONAME ; void QMediaImageViewer::setMedia(class QMediaContent const &)
+	?notifyIntervalChanged@QMediaObject@@IAEXH@Z @ 337 NONAME ; void QMediaObject::notifyIntervalChanged(int)
+	?tr@QMediaStreamsControl@@SA?AVQString@@PBD0H@Z @ 338 NONAME ; class QString QMediaStreamsControl::tr(char const *, char const *, int)
+	?audioAvailableChanged@QMediaPlayer@@IAEX_N@Z @ 339 NONAME ; void QMediaPlayer::audioAvailableChanged(bool)
+	?mutedChanged@QMediaPlayerControl@@IAEX_N@Z @ 340 NONAME ; void QMediaPlayerControl::mutedChanged(bool)
+	?getStaticMetaObject@QMediaServiceProviderPlugin@@SAABUQMetaObject@@XZ @ 341 NONAME ; struct QMetaObject const & QMediaServiceProviderPlugin::getStaticMetaObject(void)
+	??9QAudioEncoderSettings@@QBE_NABV0@@Z @ 342 NONAME ; bool QAudioEncoderSettings::operator!=(class QAudioEncoderSettings const &) const
+	??YQMediaTimeRange@@QAEAAV0@ABV0@@Z @ 343 NONAME ; class QMediaTimeRange & QMediaTimeRange::operator+=(class QMediaTimeRange const &)
+	?setMediaObject@QGraphicsVideoItem@@QAEXPAVQMediaObject@@@Z @ 344 NONAME ; void QGraphicsVideoItem::setMediaObject(class QMediaObject *)
+	?getStaticMetaObject@QVideoWidget@@SAABUQMetaObject@@XZ @ 345 NONAME ; struct QMetaObject const & QVideoWidget::getStaticMetaObject(void)
+	?tr@QVideoWindowControl@@SA?AVQString@@PBD0@Z @ 346 NONAME ; class QString QVideoWindowControl::tr(char const *, char const *)
+	??1QMediaPlaylistIOInterface@@UAE@XZ @ 347 NONAME ; QMediaPlaylistIOInterface::~QMediaPlaylistIOInterface(void)
+	??1QMediaContent@@QAE@XZ @ 348 NONAME ; QMediaContent::~QMediaContent(void)
+	??0QRadioTuner@@QAE@PAVQObject@@PAVQMediaServiceProvider@@@Z @ 349 NONAME ; QRadioTuner::QRadioTuner(class QObject *, class QMediaServiceProvider *)
+	?qt_metacall@QVideoWidget@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 350 NONAME ; int QVideoWidget::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?setSampleRate@QAudioEncoderSettings@@QAEXH@Z @ 351 NONAME ; void QAudioEncoderSettings::setSampleRate(int)
+	?qt_metacall@QMediaServiceProviderPlugin@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 352 NONAME ; int QMediaServiceProviderPlugin::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?tr@QVideoRendererControl@@SA?AVQString@@PBD0H@Z @ 353 NONAME ; class QString QVideoRendererControl::tr(char const *, char const *, int)
+	?type@QMediaServiceProviderHint@@QBE?AW4Type@1@XZ @ 354 NONAME ; enum QMediaServiceProviderHint::Type QMediaServiceProviderHint::type(void) const
+	?staticMetaObject@QVideoWidgetControl@@2UQMetaObject@@B @ 355 NONAME ; struct QMetaObject const QVideoWidgetControl::staticMetaObject
+	?isNormal@QMediaTimeInterval@@QBE_NXZ @ 356 NONAME ; bool QMediaTimeInterval::isNormal(void) const
+	?qt_metacall@QMetaDataControl@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 357 NONAME ; int QMetaDataControl::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??0QMediaPlayer@@QAE@PAVQObject@@V?$QFlags@W4Flag@QMediaPlayer@@@@PAVQMediaServiceProvider@@@Z @ 358 NONAME ; QMediaPlayer::QMediaPlayer(class QObject *, class QFlags<enum QMediaPlayer::Flag>, class QMediaServiceProvider *)
+	??_EQMediaService@@UAE@I@Z @ 359 NONAME ; QMediaService::~QMediaService(unsigned int)
+	?setChannelCount@QAudioEncoderSettings@@QAEXH@Z @ 360 NONAME ; void QAudioEncoderSettings::setChannelCount(int)
+	?mediaRemoved@QMediaPlaylistProvider@@IAEXHH@Z @ 361 NONAME ; void QMediaPlaylistProvider::mediaRemoved(int, int)
+	?qt_metacall@QRadioTunerControl@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 362 NONAME ; int QRadioTunerControl::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?activeAudioInputChanged@QAudioCaptureSource@@IAEXABVQString@@@Z @ 363 NONAME ; void QAudioCaptureSource::activeAudioInputChanged(class QString const &)
+	?audioBitRate@QMediaResource@@QBEHXZ @ 364 NONAME ; int QMediaResource::audioBitRate(void) const
+	?trUtf8@QMediaRecorder@@SA?AVQString@@PBD0H@Z @ 365 NONAME ; class QString QMediaRecorder::trUtf8(char const *, char const *, int)
+	?d_func@QMediaObject@@ABEPBVQMediaObjectPrivate@@XZ @ 366 NONAME ; class QMediaObjectPrivate const * QMediaObject::d_func(void) const
+	?bufferStatus@QMediaPlayer@@QBEHXZ @ 367 NONAME ; int QMediaPlayer::bufferStatus(void) const
+	?errorString@QMediaPlaylist@@QBE?AVQString@@XZ @ 368 NONAME ; class QString QMediaPlaylist::errorString(void) const
+	?trUtf8@QRadioTunerControl@@SA?AVQString@@PBD0H@Z @ 369 NONAME ; class QString QRadioTunerControl::trUtf8(char const *, char const *, int)
+	??0QMetaDataControl@@IAE@PAVQObject@@@Z @ 370 NONAME ; QMetaDataControl::QMetaDataControl(class QObject *)
+	??0QMediaTimeRange@@QAE@_J0@Z @ 371 NONAME ; QMediaTimeRange::QMediaTimeRange(long long, long long)
+	?mediaAboutToBeInserted@QMediaPlaylistProvider@@IAEXHH@Z @ 372 NONAME ; void QMediaPlaylistProvider::mediaAboutToBeInserted(int, int)
+	?setAspectRatioMode@QVideoWidget@@QAEXW4AspectRatioMode@Qt@@@Z @ 373 NONAME ; void QVideoWidget::setAspectRatioMode(enum Qt::AspectRatioMode)
+	?trUtf8@QMediaPlayerControl@@SA?AVQString@@PBD0@Z @ 374 NONAME ; class QString QMediaPlayerControl::trUtf8(char const *, char const *)
+	??1QMediaPlayer@@UAE@XZ @ 375 NONAME ; QMediaPlayer::~QMediaPlayer(void)
+	?qt_metacall@QVideoWindowControl@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 376 NONAME ; int QVideoWindowControl::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?isBandSupported@QRadioTuner@@QBE_NW4Band@1@@Z @ 377 NONAME ; bool QRadioTuner::isBandSupported(enum QRadioTuner::Band) const
+	?trUtf8@QMediaPlayer@@SA?AVQString@@PBD0H@Z @ 378 NONAME ; class QString QMediaPlayer::trUtf8(char const *, char const *, int)
+	?supportedAudioCodecs@QMediaRecorder@@QBE?AVQStringList@@XZ @ 379 NONAME ; class QStringList QMediaRecorder::supportedAudioCodecs(void) const
+	??0QMediaContainerControl@@IAE@PAVQObject@@@Z @ 380 NONAME ; QMediaContainerControl::QMediaContainerControl(class QObject *)
+	??0QMediaContent@@QAE@ABVQUrl@@@Z @ 381 NONAME ; QMediaContent::QMediaContent(class QUrl const &)
+	?currentIndexChanged@QMediaPlaylistNavigator@@IAEXH@Z @ 382 NONAME ; void QMediaPlaylistNavigator::currentIndexChanged(int)
+	?qt_metacall@QVideoRendererControl@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 383 NONAME ; int QVideoRendererControl::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?mediaStatusChanged@QMediaPlayerControl@@IAEXW4MediaStatus@QMediaPlayer@@@Z @ 384 NONAME ; void QMediaPlayerControl::mediaStatusChanged(enum QMediaPlayer::MediaStatus)
+	?trUtf8@QRadioTuner@@SA?AVQString@@PBD0H@Z @ 385 NONAME ; class QString QRadioTuner::trUtf8(char const *, char const *, int)
+	?trUtf8@QMediaPlaylist@@SA?AVQString@@PBD0H@Z @ 386 NONAME ; class QString QMediaPlaylist::trUtf8(char const *, char const *, int)
+	??_EQMediaPlaylistReader@@UAE@I@Z @ 387 NONAME ; QMediaPlaylistReader::~QMediaPlaylistReader(unsigned int)
+	?channelCount@QMediaResource@@QBEHXZ @ 388 NONAME ; int QMediaResource::channelCount(void) const
+	?setResolution@QVideoEncoderSettings@@QAEXABVQSize@@@Z @ 389 NONAME ; void QVideoEncoderSettings::setResolution(class QSize const &)
+	?qt_metacall@QMediaRecorderControl@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 390 NONAME ; int QMediaRecorderControl::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??0QImageEncoderSettings@@QAE@XZ @ 391 NONAME ; QImageEncoderSettings::QImageEncoderSettings(void)
+	?setHue@QVideoWidget@@QAEXH@Z @ 392 NONAME ; void QVideoWidget::setHue(int)
+	?d_func@QMediaPlaylistProvider@@ABEPBVQMediaPlaylistProviderPrivate@@XZ @ 393 NONAME ; class QMediaPlaylistProviderPrivate const * QMediaPlaylistProvider::d_func(void) const
+	?shuffle@QMediaPlaylistProvider@@UAEXXZ @ 394 NONAME ; void QMediaPlaylistProvider::shuffle(void)
+	??0QMediaTimeRange@@QAE@XZ @ 395 NONAME ; QMediaTimeRange::QMediaTimeRange(void)
+	?tr@QGraphicsVideoItem@@SA?AVQString@@PBD0@Z @ 396 NONAME ; class QString QGraphicsVideoItem::tr(char const *, char const *)
+	?staticMetaObject@QAudioEndpointSelector@@2UQMetaObject@@B @ 397 NONAME ; struct QMetaObject const QAudioEndpointSelector::staticMetaObject
+	??1QMediaPlayerControl@@UAE@XZ @ 398 NONAME ; QMediaPlayerControl::~QMediaPlayerControl(void)
+	?d_func@QMediaControl@@AAEPAVQMediaControlPrivate@@XZ @ 399 NONAME ; class QMediaControlPrivate * QMediaControl::d_func(void)
+	?contrastChanged@QVideoWindowControl@@IAEXH@Z @ 400 NONAME ; void QVideoWindowControl::contrastChanged(int)
+	?addMedia@QMediaPlaylistProvider@@UAE_NABV?$QList@VQMediaContent@@@@@Z @ 401 NONAME ; bool QMediaPlaylistProvider::addMedia(class QList<class QMediaContent> const &)
+	?tr@QLocalMediaPlaylistProvider@@SA?AVQString@@PBD0H@Z @ 402 NONAME ; class QString QLocalMediaPlaylistProvider::tr(char const *, char const *, int)
+	?removeMedia@QLocalMediaPlaylistProvider@@UAE_NHH@Z @ 403 NONAME ; bool QLocalMediaPlaylistProvider::removeMedia(int, int)
+	?error@QMediaRecorderControl@@IAEXHABVQString@@@Z @ 404 NONAME ; void QMediaRecorderControl::error(int, class QString const &)
+	??0QMediaTimeInterval@@QAE@_J0@Z @ 405 NONAME ; QMediaTimeInterval::QMediaTimeInterval(long long, long long)
+	?trUtf8@QMediaServiceProvider@@SA?AVQString@@PBD0H@Z @ 406 NONAME ; class QString QMediaServiceProvider::trUtf8(char const *, char const *, int)
+	?isMuted@QMediaPlayer@@QBE_NXZ @ 407 NONAME ; bool QMediaPlayer::isMuted(void) const
+	??0QMediaPlaylistNavigator@@QAE@PAVQMediaPlaylistProvider@@PAVQObject@@@Z @ 408 NONAME ; QMediaPlaylistNavigator::QMediaPlaylistNavigator(class QMediaPlaylistProvider *, class QObject *)
+	?latestTime@QMediaTimeRange@@QBE_JXZ @ 409 NONAME ; long long QMediaTimeRange::latestTime(void) const
+	?setEncodingMode@QVideoEncoderSettings@@QAEXW4EncodingMode@QtMediaServices@@@Z @ 410 NONAME ; void QVideoEncoderSettings::setEncodingMode(enum QtMediaServices::EncodingMode)
+	??_EQAudioCaptureSource@@UAE@I@Z @ 411 NONAME ; QAudioCaptureSource::~QAudioCaptureSource(unsigned int)
+	?d_func@QMediaRecorder@@ABEPBVQMediaRecorderPrivate@@XZ @ 412 NONAME ; class QMediaRecorderPrivate const * QMediaRecorder::d_func(void) const
+	?metaObject@QAudioEndpointSelector@@UBEPBUQMetaObject@@XZ @ 413 NONAME ; struct QMetaObject const * QAudioEndpointSelector::metaObject(void) const
+	??0QMediaRecorder@@QAE@PAVQMediaObject@@PAVQObject@@@Z @ 414 NONAME ; QMediaRecorder::QMediaRecorder(class QMediaObject *, class QObject *)
+	??9QMediaResource@@QBE_NABV0@@Z @ 415 NONAME ; bool QMediaResource::operator!=(class QMediaResource const &) const
+	?qt_metacall@QMediaPlayerControl@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 416 NONAME ; int QMediaPlayerControl::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??0QMediaStreamsControl@@IAE@PAVQObject@@@Z @ 417 NONAME ; QMediaStreamsControl::QMediaStreamsControl(class QObject *)
+	?url@QMediaResource@@QBE?AVQUrl@@XZ @ 418 NONAME ; class QUrl QMediaResource::url(void) const
+	??ZQMediaTimeRange@@QAEAAV0@ABVQMediaTimeInterval@@@Z @ 419 NONAME ; class QMediaTimeRange & QMediaTimeRange::operator-=(class QMediaTimeInterval const &)
+	?canonicalUrl@QMediaContent@@QBE?AVQUrl@@XZ @ 420 NONAME ; class QUrl QMediaContent::canonicalUrl(void) const
+	?availableOutputsChanged@QVideoOutputControl@@IAEXABV?$QList@W4Output@QVideoOutputControl@@@@@Z @ 421 NONAME ; void QVideoOutputControl::availableOutputsChanged(class QList<enum QVideoOutputControl::Output> const &)
+	?tr@QVideoWidgetControl@@SA?AVQString@@PBD0H@Z @ 422 NONAME ; class QString QVideoWidgetControl::tr(char const *, char const *, int)
+	?metaData@QMediaObject@@QBE?AVQVariant@@W4MetaData@QtMediaServices@@@Z @ 423 NONAME ; class QVariant QMediaObject::metaData(enum QtMediaServices::MetaData) const
+	?d_func@QLocalMediaPlaylistProvider@@ABEPBVQLocalMediaPlaylistProviderPrivate@@XZ @ 424 NONAME ; class QLocalMediaPlaylistProviderPrivate const * QLocalMediaPlaylistProvider::d_func(void) const
+	?d_func@QMediaPlaylist@@AAEPAVQMediaPlaylistPrivate@@XZ @ 425 NONAME ; class QMediaPlaylistPrivate * QMediaPlaylist::d_func(void)
+	?trUtf8@QAudioEndpointSelector@@SA?AVQString@@PBD0@Z @ 426 NONAME ; class QString QAudioEndpointSelector::trUtf8(char const *, char const *)
+	?timeout@QMediaImageViewer@@QBEHXZ @ 427 NONAME ; int QMediaImageViewer::timeout(void) const
+	?shuffle@QMediaPlaylist@@QAEXXZ @ 428 NONAME ; void QMediaPlaylist::shuffle(void)
+	?writableChanged@QMetaDataControl@@IAEX_N@Z @ 429 NONAME ; void QMetaDataControl::writableChanged(bool)
+	??_EQMediaPlaylist@@UAE@I@Z @ 430 NONAME ; QMediaPlaylist::~QMediaPlaylist(unsigned int)
+	?trUtf8@QMediaPlaylistControl@@SA?AVQString@@PBD0@Z @ 431 NONAME ; class QString QMediaPlaylistControl::trUtf8(char const *, char const *)
+	?playbackMode@QMediaPlaylistNavigator@@QBE?AW4PlaybackMode@QMediaPlaylist@@XZ @ 432 NONAME ; enum QMediaPlaylist::PlaybackMode QMediaPlaylistNavigator::playbackMode(void) const
+	?d_func@QVideoWidget@@AAEPAVQVideoWidgetPrivate@@XZ @ 433 NONAME ; class QVideoWidgetPrivate * QVideoWidget::d_func(void)
+	?qt_metacast@QMediaPlaylist@@UAEPAXPBD@Z @ 434 NONAME ; void * QMediaPlaylist::qt_metacast(char const *)
+	??0QVideoWindowControl@@IAE@PAVQObject@@@Z @ 435 NONAME ; QVideoWindowControl::QVideoWindowControl(class QObject *)
+	?trUtf8@QMediaPlaylistIOPlugin@@SA?AVQString@@PBD0@Z @ 436 NONAME ; class QString QMediaPlaylistIOPlugin::trUtf8(char const *, char const *)
+	?stateChanged@QRadioTunerControl@@IAEXW4State@QRadioTuner@@@Z @ 437 NONAME ; void QRadioTunerControl::stateChanged(enum QRadioTuner::State)
+	?addMedia@QLocalMediaPlaylistProvider@@UAE_NABVQMediaContent@@@Z @ 438 NONAME ; bool QLocalMediaPlaylistProvider::addMedia(class QMediaContent const &)
+	?qt_metacast@QMediaStreamsControl@@UAEPAXPBD@Z @ 439 NONAME ; void * QMediaStreamsControl::qt_metacast(char const *)
+	?d_func@QMediaImageViewer@@AAEPAVQMediaImageViewerPrivate@@XZ @ 440 NONAME ; class QMediaImageViewerPrivate * QMediaImageViewer::d_func(void)
+	??_EQVideoWindowControl@@UAE@I@Z @ 441 NONAME ; QVideoWindowControl::~QVideoWindowControl(unsigned int)
+	?searchingChanged@QRadioTuner@@IAEX_N@Z @ 442 NONAME ; void QRadioTuner::searchingChanged(bool)
+	?error@QRadioTuner@@IAEXW4Error@1@@Z @ 443 NONAME ; void QRadioTuner::error(enum QRadioTuner::Error)
+	??_EQAudioEndpointSelector@@UAE@I@Z @ 444 NONAME ; QAudioEndpointSelector::~QAudioEndpointSelector(unsigned int)
+	?staticMetaObject@QMediaService@@2UQMetaObject@@B @ 445 NONAME ; struct QMetaObject const QMediaService::staticMetaObject
+	?seekableChanged@QMediaPlayerControl@@IAEX_N@Z @ 446 NONAME ; void QMediaPlayerControl::seekableChanged(bool)
+	?getStaticMetaObject@QRadioTunerControl@@SAABUQMetaObject@@XZ @ 447 NONAME ; struct QMetaObject const & QRadioTunerControl::getStaticMetaObject(void)
+	?d_func@QAudioCaptureSource@@AAEPAVQAudioCaptureSourcePrivate@@XZ @ 448 NONAME ; class QAudioCaptureSourcePrivate * QAudioCaptureSource::d_func(void)
+	??0QMediaServiceProviderHint@@QAE@ABV0@@Z @ 449 NONAME ; QMediaServiceProviderHint::QMediaServiceProviderHint(class QMediaServiceProviderHint const &)
+	??_EQMediaPlaylistNavigator@@UAE@I@Z @ 450 NONAME ; QMediaPlaylistNavigator::~QMediaPlaylistNavigator(unsigned int)
+	?qt_metacall@QMediaRecorder@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 451 NONAME ; int QMediaRecorder::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?tr@QAudioEncoderControl@@SA?AVQString@@PBD0H@Z @ 452 NONAME ; class QString QAudioEncoderControl::tr(char const *, char const *, int)
+	??0QAudioEncoderSettings@@QAE@XZ @ 453 NONAME ; QAudioEncoderSettings::QAudioEncoderSettings(void)
+	?addInterval@QMediaTimeRange@@QAEXABVQMediaTimeInterval@@@Z @ 454 NONAME ; void QMediaTimeRange::addInterval(class QMediaTimeInterval const &)
+	?setCodec@QImageEncoderSettings@@QAEXABVQString@@@Z @ 455 NONAME ; void QImageEncoderSettings::setCodec(class QString const &)
+	?trUtf8@QMediaRecorderControl@@SA?AVQString@@PBD0H@Z @ 456 NONAME ; class QString QMediaRecorderControl::trUtf8(char const *, char const *, int)
+	?nextItem@QMediaPlaylistNavigator@@QBE?AVQMediaContent@@H@Z @ 457 NONAME ; class QMediaContent QMediaPlaylistNavigator::nextItem(int) const
+	?metaObject@QMediaServiceProvider@@UBEPBUQMetaObject@@XZ @ 458 NONAME ; struct QMetaObject const * QMediaServiceProvider::metaObject(void) const
+	?isNull@QImageEncoderSettings@@QBE_NXZ @ 459 NONAME ; bool QImageEncoderSettings::isNull(void) const
+	?clear@QMediaPlaylistProvider@@UAE_NXZ @ 460 NONAME ; bool QMediaPlaylistProvider::clear(void)
+	?saturationChanged@QVideoWidget@@IAEXH@Z @ 461 NONAME ; void QVideoWidget::saturationChanged(int)
+	??4QMediaTimeRange@@QAEAAV0@ABVQMediaTimeInterval@@@Z @ 462 NONAME ; class QMediaTimeRange & QMediaTimeRange::operator=(class QMediaTimeInterval const &)
+	?availableMetaData@QMediaObject@@QBE?AV?$QList@W4MetaData@QtMediaServices@@@@XZ @ 463 NONAME ; class QList<enum QtMediaServices::MetaData> QMediaObject::availableMetaData(void) const
+	?setTimeout@QMediaImageViewer@@QAEXH@Z @ 464 NONAME ; void QMediaImageViewer::setTimeout(int)
+	??0QMediaRecorderControl@@IAE@PAVQObject@@@Z @ 465 NONAME ; QMediaRecorderControl::QMediaRecorderControl(class QObject *)
+	?qt_metacast@QVideoWindowControl@@UAEPAXPBD@Z @ 466 NONAME ; void * QVideoWindowControl::qt_metacast(char const *)
+	?staticMetaObject@QVideoWindowControl@@2UQMetaObject@@B @ 467 NONAME ; struct QMetaObject const QVideoWindowControl::staticMetaObject
+	?sampleRate@QAudioEncoderSettings@@QBEHXZ @ 468 NONAME ; int QAudioEncoderSettings::sampleRate(void) const
+	?nativeSizeChanged@QVideoWindowControl@@IAEXXZ @ 469 NONAME ; void QVideoWindowControl::nativeSizeChanged(void)
+	?tr@QVideoWindowControl@@SA?AVQString@@PBD0H@Z @ 470 NONAME ; class QString QVideoWindowControl::tr(char const *, char const *, int)
+	?signalStrengthChanged@QRadioTunerControl@@IAEXH@Z @ 471 NONAME ; void QRadioTunerControl::signalStrengthChanged(int)
+	?jump@QMediaPlaylistNavigator@@QAEXH@Z @ 472 NONAME ; void QMediaPlaylistNavigator::jump(int)
+	?setVolume@QRadioTuner@@QAEXH@Z @ 473 NONAME ; void QRadioTuner::setVolume(int)
+	?qt_metacall@QAudioEndpointSelector@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 474 NONAME ; int QAudioEndpointSelector::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?setFrequency@QRadioTuner@@QAEXH@Z @ 475 NONAME ; void QRadioTuner::setFrequency(int)
+	?qt_metacall@QMediaPlaylistIOPlugin@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 476 NONAME ; int QMediaPlaylistIOPlugin::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??8QMediaServiceProviderHint@@QBE_NABV0@@Z @ 477 NONAME ; bool QMediaServiceProviderHint::operator==(class QMediaServiceProviderHint const &) const
+	?cancelSearch@QRadioTuner@@QAEXXZ @ 478 NONAME ; void QRadioTuner::cancelSearch(void)
+	?qt_metacast@QAudioEndpointSelector@@UAEPAXPBD@Z @ 479 NONAME ; void * QAudioEndpointSelector::qt_metacast(char const *)
+	??0QMediaContent@@QAE@ABVQNetworkRequest@@@Z @ 480 NONAME ; QMediaContent::QMediaContent(class QNetworkRequest const &)
+	?metaObject@QMediaPlaylistProvider@@UBEPBUQMetaObject@@XZ @ 481 NONAME ; struct QMetaObject const * QMediaPlaylistProvider::metaObject(void) const
+	?hasSupport@QMediaServiceProvider@@UBE?AW4SupportEstimate@QtMediaServices@@ABVQByteArray@@ABVQString@@ABVQStringList@@H@Z @ 482 NONAME ; enum QtMediaServices::SupportEstimate QMediaServiceProvider::hasSupport(class QByteArray const &, class QString const &, class QStringList const &, int) const
+	?mediaCount@QLocalMediaPlaylistProvider@@UBEHXZ @ 483 NONAME ; int QLocalMediaPlaylistProvider::mediaCount(void) const
+	?tr@QMediaServiceProviderPlugin@@SA?AVQString@@PBD0H@Z @ 484 NONAME ; class QString QMediaServiceProviderPlugin::tr(char const *, char const *, int)
+	?staticMetaObject@QImageEncoderControl@@2UQMetaObject@@B @ 485 NONAME ; struct QMetaObject const QImageEncoderControl::staticMetaObject
+	?stop@QMediaPlayer@@QAEXXZ @ 486 NONAME ; void QMediaPlayer::stop(void)
+	?durationChanged@QMediaPlayer@@IAEX_J@Z @ 487 NONAME ; void QMediaPlayer::durationChanged(long long)
+	?tr@QMediaService@@SA?AVQString@@PBD0@Z @ 488 NONAME ; class QString QMediaService::tr(char const *, char const *)
+	?setCurrentIndex@QMediaPlaylist@@QAEXH@Z @ 489 NONAME ; void QMediaPlaylist::setCurrentIndex(int)
+	?size@QGraphicsVideoItem@@QBE?AVQSizeF@@XZ @ 490 NONAME ; class QSizeF QGraphicsVideoItem::size(void) const
+	?qt_metacast@QMediaObject@@UAEPAXPBD@Z @ 491 NONAME ; void * QMediaObject::qt_metacast(char const *)
+	?tr@QVideoOutputControl@@SA?AVQString@@PBD0H@Z @ 492 NONAME ; class QString QVideoOutputControl::tr(char const *, char const *, int)
+	?signalStrengthChanged@QRadioTuner@@IAEXH@Z @ 493 NONAME ; void QRadioTuner::signalStrengthChanged(int)
+	?qt_metacast@QMediaPlaylistIOPlugin@@UAEPAXPBD@Z @ 494 NONAME ; void * QMediaPlaylistIOPlugin::qt_metacast(char const *)
+	?media@QMediaImageViewer@@QBE?AVQMediaContent@@XZ @ 495 NONAME ; class QMediaContent QMediaImageViewer::media(void) const
+	?selectedDeviceChanged@QVideoDeviceControl@@IAEXH@Z @ 496 NONAME ; void QVideoDeviceControl::selectedDeviceChanged(int)
+	?isNull@QMediaServiceProviderHint@@QBE_NXZ @ 497 NONAME ; bool QMediaServiceProviderHint::isNull(void) const
+	?metaObject@QImageEncoderControl@@UBEPBUQMetaObject@@XZ @ 498 NONAME ; struct QMetaObject const * QImageEncoderControl::metaObject(void) const
+	?staticMetaObject@QMetaDataControl@@2UQMetaObject@@B @ 499 NONAME ; struct QMetaObject const QMetaDataControl::staticMetaObject
+	?staticMetaObject@QMediaImageViewer@@2UQMetaObject@@B @ 500 NONAME ; struct QMetaObject const QMediaImageViewer::staticMetaObject
+	?mutedChanged@QRadioTunerControl@@IAEX_N@Z @ 501 NONAME ; void QRadioTunerControl::mutedChanged(bool)
+	?paint@QGraphicsVideoItem@@UAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 502 NONAME ; void QGraphicsVideoItem::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
+	?tr@QMediaPlayerControl@@SA?AVQString@@PBD0H@Z @ 503 NONAME ; class QString QMediaPlayerControl::tr(char const *, char const *, int)
+	?metaObject@QRadioTunerControl@@UBEPBUQMetaObject@@XZ @ 504 NONAME ; struct QMetaObject const * QRadioTunerControl::metaObject(void) const
+	??1QMediaObject@@UAE@XZ @ 505 NONAME ; QMediaObject::~QMediaObject(void)
+	?metaObject@QMediaRecorderControl@@UBEPBUQMetaObject@@XZ @ 506 NONAME ; struct QMetaObject const * QMediaRecorderControl::metaObject(void) const
+	??_EQRadioTunerControl@@UAE@I@Z @ 507 NONAME ; QRadioTunerControl::~QRadioTunerControl(unsigned int)
+	?mediaStatusChanged@QMediaImageViewer@@IAEXW4MediaStatus@1@@Z @ 508 NONAME ; void QMediaImageViewer::mediaStatusChanged(enum QMediaImageViewer::MediaStatus)
+	?setVideoCodec@QMediaResource@@QAEXABVQString@@@Z @ 509 NONAME ; void QMediaResource::setVideoCodec(class QString const &)
+	?bufferStatusChanged@QMediaPlayerControl@@IAEXH@Z @ 510 NONAME ; void QMediaPlayerControl::bufferStatusChanged(int)
+	?paintEvent@QVideoWidget@@MAEXPAVQPaintEvent@@@Z @ 511 NONAME ; void QVideoWidget::paintEvent(class QPaintEvent *)
+	?brightnessChanged@QVideoWidgetControl@@IAEXH@Z @ 512 NONAME ; void QVideoWidgetControl::brightnessChanged(int)
+	?addMedia@QMediaPlaylistProvider@@UAE_NABVQMediaContent@@@Z @ 513 NONAME ; bool QMediaPlaylistProvider::addMedia(class QMediaContent const &)
+	?staticMetaObject@QVideoRendererControl@@2UQMetaObject@@B @ 514 NONAME ; struct QMetaObject const QVideoRendererControl::staticMetaObject
+	??0QMediaPlaylist@@QAE@PAVQObject@@@Z @ 515 NONAME ; QMediaPlaylist::QMediaPlaylist(class QObject *)
+	??0QMediaPlaylistIOPlugin@@QAE@PAVQObject@@@Z @ 516 NONAME ; QMediaPlaylistIOPlugin::QMediaPlaylistIOPlugin(class QObject *)
+	??4QMediaServiceProviderHint@@QAEAAV0@ABV0@@Z @ 517 NONAME ; class QMediaServiceProviderHint & QMediaServiceProviderHint::operator=(class QMediaServiceProviderHint const &)
+	?qt_metacast@QVideoRendererControl@@UAEPAXPBD@Z @ 518 NONAME ; void * QVideoRendererControl::qt_metacast(char const *)
+	?containerMimeType@QMediaRecorder@@QBE?AVQString@@XZ @ 519 NONAME ; class QString QMediaRecorder::containerMimeType(void) const
+	?qt_metacall@QLocalMediaPlaylistProvider@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 520 NONAME ; int QLocalMediaPlaylistProvider::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??YQMediaTimeRange@@QAEAAV0@ABVQMediaTimeInterval@@@Z @ 521 NONAME ; class QMediaTimeRange & QMediaTimeRange::operator+=(class QMediaTimeInterval const &)
+	??9QVideoEncoderSettings@@QBE_NABV0@@Z @ 522 NONAME ; bool QVideoEncoderSettings::operator!=(class QVideoEncoderSettings const &) const
+	?getStaticMetaObject@QVideoRendererControl@@SAABUQMetaObject@@XZ @ 523 NONAME ; struct QMetaObject const & QVideoRendererControl::getStaticMetaObject(void)
+	?error@QMediaPlaylist@@QBE?AW4Error@1@XZ @ 524 NONAME ; enum QMediaPlaylist::Error QMediaPlaylist::error(void) const
+	?metaObject@QMediaContainerControl@@UBEPBUQMetaObject@@XZ @ 525 NONAME ; struct QMetaObject const * QMediaContainerControl::metaObject(void) const
+	??8@YA_NABVQMediaTimeRange@@0@Z @ 526 NONAME ; bool operator==(class QMediaTimeRange const &, class QMediaTimeRange const &)
+	?qt_metacast@QVideoOutputControl@@UAEPAXPBD@Z @ 527 NONAME ; void * QVideoOutputControl::qt_metacast(char const *)
+	?qt_metacall@QImageEncoderControl@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 528 NONAME ; int QImageEncoderControl::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?setQuality@QVideoEncoderSettings@@QAEXW4EncodingQuality@QtMediaServices@@@Z @ 529 NONAME ; void QVideoEncoderSettings::setQuality(enum QtMediaServices::EncodingQuality)
+	??0QVideoEncoderSettings@@QAE@ABV0@@Z @ 530 NONAME ; QVideoEncoderSettings::QVideoEncoderSettings(class QVideoEncoderSettings const &)
+	?metaDataAvailableChanged@QMetaDataControl@@IAEX_N@Z @ 531 NONAME ; void QMetaDataControl::metaDataAvailableChanged(bool)
+	??0QMediaImageViewer@@QAE@PAVQObject@@@Z @ 532 NONAME ; QMediaImageViewer::QMediaImageViewer(class QObject *)
+	??1QMediaPlaylistIOPlugin@@UAE@XZ @ 533 NONAME ; QMediaPlaylistIOPlugin::~QMediaPlaylistIOPlugin(void)
+	?device@QMediaServiceProviderHint@@QBE?AVQByteArray@@XZ @ 534 NONAME ; class QByteArray QMediaServiceProviderHint::device(void) const
+	?qt_metacast@QMediaRecorder@@UAEPAXPBD@Z @ 535 NONAME ; void * QMediaRecorder::qt_metacast(char const *)
+	?playbackRateChanged@QMediaPlayerControl@@IAEXM@Z @ 536 NONAME ; void QMediaPlayerControl::playbackRateChanged(float)
+	??0QMediaServiceProviderHint@@QAE@ABVQString@@ABVQStringList@@@Z @ 537 NONAME ; QMediaServiceProviderHint::QMediaServiceProviderHint(class QString const &, class QStringList const &)
+	?staticMetaObject@QRadioTuner@@2UQMetaObject@@B @ 538 NONAME ; struct QMetaObject const QRadioTuner::staticMetaObject
+	?staticMetaObject@QMediaPlayerControl@@2UQMetaObject@@B @ 539 NONAME ; struct QMetaObject const QMediaPlayerControl::staticMetaObject
+	??0QVideoEncoderSettings@@QAE@XZ @ 540 NONAME ; QVideoEncoderSettings::QVideoEncoderSettings(void)
+	?trUtf8@QVideoWidget@@SA?AVQString@@PBD0H@Z @ 541 NONAME ; class QString QVideoWidget::trUtf8(char const *, char const *, int)
+	?trUtf8@QVideoDeviceControl@@SA?AVQString@@PBD0@Z @ 542 NONAME ; class QString QVideoDeviceControl::trUtf8(char const *, char const *)
+	?playbackModeChanged@QMediaPlaylistControl@@IAEXW4PlaybackMode@QMediaPlaylist@@@Z @ 543 NONAME ; void QMediaPlaylistControl::playbackModeChanged(enum QMediaPlaylist::PlaybackMode)
+	??1QImageEncoderControl@@UAE@XZ @ 544 NONAME ; QImageEncoderControl::~QImageEncoderControl(void)
+	?volume@QRadioTuner@@QBEHXZ @ 545 NONAME ; int QRadioTuner::volume(void) const
+	??0QMediaControl@@IAE@PAVQObject@@@Z @ 546 NONAME ; QMediaControl::QMediaControl(class QObject *)
+	?currentItem@QMediaPlaylistNavigator@@QBE?AVQMediaContent@@XZ @ 547 NONAME ; class QMediaContent QMediaPlaylistNavigator::currentItem(void) const
+	?mediaAboutToBeRemoved@QMediaPlaylistProvider@@IAEXHH@Z @ 548 NONAME ; void QMediaPlaylistProvider::mediaAboutToBeRemoved(int, int)
+	?tr@QVideoRendererControl@@SA?AVQString@@PBD0@Z @ 549 NONAME ; class QString QVideoRendererControl::tr(char const *, char const *)
+	?boundingRect@QGraphicsVideoItem@@UBE?AVQRectF@@XZ @ 550 NONAME ; class QRectF QGraphicsVideoItem::boundingRect(void) const
+	?trUtf8@QMediaStreamsControl@@SA?AVQString@@PBD0H@Z @ 551 NONAME ; class QString QMediaStreamsControl::trUtf8(char const *, char const *, int)
+	?qt_metacast@QAudioEncoderControl@@UAEPAXPBD@Z @ 552 NONAME ; void * QAudioEncoderControl::qt_metacast(char const *)
+	?load@QMediaPlaylistProvider@@UAE_NABVQUrl@@PBD@Z @ 553 NONAME ; bool QMediaPlaylistProvider::load(class QUrl const &, char const *)
+	??9QMediaContent@@QBE_NABV0@@Z @ 554 NONAME ; bool QMediaContent::operator!=(class QMediaContent const &) const
+	?qt_metacast@QMediaContainerControl@@UAEPAXPBD@Z @ 555 NONAME ; void * QMediaContainerControl::qt_metacast(char const *)
+	?trUtf8@QVideoWidgetControl@@SA?AVQString@@PBD0@Z @ 556 NONAME ; class QString QVideoWidgetControl::trUtf8(char const *, char const *)
+	??1QMediaServiceSupportedDevicesInterface@@UAE@XZ @ 557 NONAME ; QMediaServiceSupportedDevicesInterface::~QMediaServiceSupportedDevicesInterface(void)
+	?hueChanged@QVideoWidgetControl@@IAEXH@Z @ 558 NONAME ; void QVideoWidgetControl::hueChanged(int)
+	?tr@QMediaPlaylistControl@@SA?AVQString@@PBD0H@Z @ 559 NONAME ; class QString QMediaPlaylistControl::tr(char const *, char const *, int)
+	?qt_metacast@QRadioTunerControl@@UAEPAXPBD@Z @ 560 NONAME ; void * QRadioTunerControl::qt_metacast(char const *)
+	?availabilityError@QRadioTuner@@UBE?AW4AvailabilityError@QtMediaServices@@XZ @ 561 NONAME ; enum QtMediaServices::AvailabilityError QRadioTuner::availabilityError(void) const
+	?setChannelCount@QMediaResource@@QAEXH@Z @ 562 NONAME ; void QMediaResource::setChannelCount(int)
+	?qt_metacast@QRadioTuner@@UAEPAXPBD@Z @ 563 NONAME ; void * QRadioTuner::qt_metacast(char const *)
+	?isReadOnly@QMediaPlaylistProvider@@UBE_NXZ @ 564 NONAME ; bool QMediaPlaylistProvider::isReadOnly(void) const
+	?qt_metacall@QMediaContainerControl@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 565 NONAME ; int QMediaContainerControl::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?trUtf8@QMediaPlaylistProvider@@SA?AVQString@@PBD0@Z @ 566 NONAME ; class QString QMediaPlaylistProvider::trUtf8(char const *, char const *)
+	?audioAvailableChanged@QMediaPlayerControl@@IAEX_N@Z @ 567 NONAME ; void QMediaPlayerControl::audioAvailableChanged(bool)
+	?qt_metacast@QMediaServiceProvider@@UAEPAXPBD@Z @ 568 NONAME ; void * QMediaServiceProvider::qt_metacast(char const *)
+	?timerEvent@QGraphicsVideoItem@@MAEXPAVQTimerEvent@@@Z @ 569 NONAME ; void QGraphicsVideoItem::timerEvent(class QTimerEvent *)
+	?setExtendedMetaData@QMediaObject@@QAEXABVQString@@ABVQVariant@@@Z @ 570 NONAME ; void QMediaObject::setExtendedMetaData(class QString const &, class QVariant const &)
+	??1QMediaRecorderControl@@UAE@XZ @ 571 NONAME ; QMediaRecorderControl::~QMediaRecorderControl(void)
+	?isMetaDataAvailable@QMediaObject@@QBE_NXZ @ 572 NONAME ; bool QMediaObject::isMetaDataAvailable(void) const
+	?nextIndex@QMediaPlaylistNavigator@@QBEHH@Z @ 573 NONAME ; int QMediaPlaylistNavigator::nextIndex(int) const
+	?saturationChanged@QVideoWidgetControl@@IAEXH@Z @ 574 NONAME ; void QVideoWidgetControl::saturationChanged(int)
+	??8QAudioEncoderSettings@@QBE_NABV0@@Z @ 575 NONAME ; bool QAudioEncoderSettings::operator==(class QAudioEncoderSettings const &) const
+	?setMetaData@QMediaObject@@QAEXW4MetaData@QtMediaServices@@ABVQVariant@@@Z @ 576 NONAME ; void QMediaObject::setMetaData(enum QtMediaServices::MetaData, class QVariant const &)
+	?qt_metacall@QMediaStreamsControl@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 577 NONAME ; int QMediaStreamsControl::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?tr@QVideoEncoderControl@@SA?AVQString@@PBD0H@Z @ 578 NONAME ; class QString QVideoEncoderControl::tr(char const *, char const *, int)
+	?trUtf8@QMediaPlaylist@@SA?AVQString@@PBD0@Z @ 579 NONAME ; class QString QMediaPlaylist::trUtf8(char const *, char const *)
+	?channelCount@QAudioEncoderSettings@@QBEHXZ @ 580 NONAME ; int QAudioEncoderSettings::channelCount(void) const
+	?metaDataWritableChanged@QMediaObject@@IAEX_N@Z @ 581 NONAME ; void QMediaObject::metaDataWritableChanged(bool)
+	?getStaticMetaObject@QAudioCaptureSource@@SAABUQMetaObject@@XZ @ 582 NONAME ; struct QMetaObject const & QAudioCaptureSource::getStaticMetaObject(void)
+	?d_func@QMediaImageViewer@@ABEPBVQMediaImageViewerPrivate@@XZ @ 583 NONAME ; class QMediaImageViewerPrivate const * QMediaImageViewer::d_func(void) const
+	?insertMedia@QMediaPlaylistProvider@@UAE_NHABV?$QList@VQMediaContent@@@@@Z @ 584 NONAME ; bool QMediaPlaylistProvider::insertMedia(int, class QList<class QMediaContent> const &)
+	?isContinuous@QMediaTimeRange@@QBE_NXZ @ 585 NONAME ; bool QMediaTimeRange::isContinuous(void) const
+	?staticMetaObject@QMediaStreamsControl@@2UQMetaObject@@B @ 586 NONAME ; struct QMetaObject const QMediaStreamsControl::staticMetaObject
+	??_EQVideoOutputControl@@UAE@I@Z @ 587 NONAME ; QVideoOutputControl::~QVideoOutputControl(unsigned int)
+	?qt_metacast@QMediaPlaylistNavigator@@UAEPAXPBD@Z @ 588 NONAME ; void * QMediaPlaylistNavigator::qt_metacast(char const *)
+	??1QLocalMediaPlaylistProvider@@UAE@XZ @ 589 NONAME ; QLocalMediaPlaylistProvider::~QLocalMediaPlaylistProvider(void)
+	?activeEndpointChanged@QAudioEndpointSelector@@IAEXABVQString@@@Z @ 590 NONAME ; void QAudioEndpointSelector::activeEndpointChanged(class QString const &)
+	?trUtf8@QVideoOutputControl@@SA?AVQString@@PBD0@Z @ 591 NONAME ; class QString QVideoOutputControl::trUtf8(char const *, char const *)
+	?state@QRadioTuner@@QBE?AW4State@1@XZ @ 592 NONAME ; enum QRadioTuner::State QRadioTuner::state(void) const
+	?metaObject@QVideoWidgetControl@@UBEPBUQMetaObject@@XZ @ 593 NONAME ; struct QMetaObject const * QVideoWidgetControl::metaObject(void) const
+	?save@QMediaPlaylist@@QAE_NABVQUrl@@PBD@Z @ 594 NONAME ; bool QMediaPlaylist::save(class QUrl const &, char const *)
+	?qt_metacall@QMediaControl@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 595 NONAME ; int QMediaControl::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?setCodec@QVideoEncoderSettings@@QAEXABVQString@@@Z @ 596 NONAME ; void QVideoEncoderSettings::setCodec(class QString const &)
+	?d_func@QAudioCaptureSource@@ABEPBVQAudioCaptureSourcePrivate@@XZ @ 597 NONAME ; class QAudioCaptureSourcePrivate const * QAudioCaptureSource::d_func(void) const
+	?trUtf8@QMediaImageViewer@@SA?AVQString@@PBD0@Z @ 598 NONAME ; class QString QMediaImageViewer::trUtf8(char const *, char const *)
+	?pause@QMediaPlayer@@QAEXXZ @ 599 NONAME ; void QMediaPlayer::pause(void)
+	?staticMetaObject@QMediaControl@@2UQMetaObject@@B @ 600 NONAME ; struct QMetaObject const QMediaControl::staticMetaObject
+	?frameRate@QVideoEncoderSettings@@QBEMXZ @ 601 NONAME ; float QVideoEncoderSettings::frameRate(void) const
+	?isAvailable@QRadioTuner@@UBE_NXZ @ 602 NONAME ; bool QRadioTuner::isAvailable(void) const
+	??G@YA?AVQMediaTimeRange@@ABV0@0@Z @ 603 NONAME ; class QMediaTimeRange operator-(class QMediaTimeRange const &, class QMediaTimeRange const &)
+	?tr@QMediaContainerControl@@SA?AVQString@@PBD0@Z @ 604 NONAME ; class QString QMediaContainerControl::tr(char const *, char const *)
+	?qt_metacast@QVideoWidgetControl@@UAEPAXPBD@Z @ 605 NONAME ; void * QVideoWidgetControl::qt_metacast(char const *)
+	??4QMediaTimeRange@@QAEAAV0@ABV0@@Z @ 606 NONAME ; class QMediaTimeRange & QMediaTimeRange::operator=(class QMediaTimeRange const &)
+	?unbind@QMediaImageViewer@@UAEXPAVQObject@@@Z @ 607 NONAME ; void QMediaImageViewer::unbind(class QObject *)
+	?tr@QMetaDataControl@@SA?AVQString@@PBD0@Z @ 608 NONAME ; class QString QMetaDataControl::tr(char const *, char const *)
+	?qt_metacast@QImageEncoderControl@@UAEPAXPBD@Z @ 609 NONAME ; void * QImageEncoderControl::qt_metacast(char const *)
+	??9QImageEncoderSettings@@QBE_NABV0@@Z @ 610 NONAME ; bool QImageEncoderSettings::operator!=(class QImageEncoderSettings const &) const
+	??0QMediaServiceProviderHint@@QAE@XZ @ 611 NONAME ; QMediaServiceProviderHint::QMediaServiceProviderHint(void)
+	?signalStrength@QRadioTuner@@QBEHXZ @ 612 NONAME ; int QRadioTuner::signalStrength(void) const
+	?play@QMediaImageViewer@@QAEXXZ @ 613 NONAME ; void QMediaImageViewer::play(void)
+	?setPosition@QMediaPlayer@@QAEX_J@Z @ 614 NONAME ; void QMediaPlayer::setPosition(long long)
+	?setResolution@QMediaResource@@QAEXHH@Z @ 615 NONAME ; void QMediaResource::setResolution(int, int)
+	?videoCodec@QMediaResource@@QBE?AVQString@@XZ @ 616 NONAME ; class QString QMediaResource::videoCodec(void) const
+	??_EQVideoDeviceControl@@UAE@I@Z @ 617 NONAME ; QVideoDeviceControl::~QVideoDeviceControl(unsigned int)
+	?addInterval@QMediaTimeRange@@QAEX_J0@Z @ 618 NONAME ; void QMediaTimeRange::addInterval(long long, long long)
+	?mediaObject@QGraphicsVideoItem@@QBEPAVQMediaObject@@XZ @ 619 NONAME ; class QMediaObject * QGraphicsVideoItem::mediaObject(void) const
+	??0QMediaContent@@QAE@ABV0@@Z @ 620 NONAME ; QMediaContent::QMediaContent(class QMediaContent const &)
+	?videoBitRate@QMediaResource@@QBEHXZ @ 621 NONAME ; int QMediaResource::videoBitRate(void) const
+	?band@QRadioTuner@@QBE?AW4Band@1@XZ @ 622 NONAME ; enum QRadioTuner::Band QRadioTuner::band(void) const
+	?statusChanged@QAudioCaptureSource@@AAEXXZ @ 623 NONAME ; void QAudioCaptureSource::statusChanged(void)
+	?staticMetaObject@QMediaServiceProviderPlugin@@2UQMetaObject@@B @ 624 NONAME ; struct QMetaObject const QMediaServiceProviderPlugin::staticMetaObject
+	?insertMedia@QMediaPlaylistProvider@@UAE_NHABVQMediaContent@@@Z @ 625 NONAME ; bool QMediaPlaylistProvider::insertMedia(int, class QMediaContent const &)
+	?availabilityError@QMediaObject@@UBE?AW4AvailabilityError@QtMediaServices@@XZ @ 626 NONAME ; enum QtMediaServices::AvailabilityError QMediaObject::availabilityError(void) const
+	??1QRadioTuner@@UAE@XZ @ 627 NONAME ; QRadioTuner::~QRadioTuner(void)
+	?error@QMediaPlayer@@IAEXW4Error@1@@Z @ 628 NONAME ; void QMediaPlayer::error(enum QMediaPlayer::Error)
+	?tr@QGraphicsVideoItem@@SA?AVQString@@PBD0H@Z @ 629 NONAME ; class QString QGraphicsVideoItem::tr(char const *, char const *, int)
+	?getStaticMetaObject@QMediaServiceProvider@@SAABUQMetaObject@@XZ @ 630 NONAME ; struct QMetaObject const & QMediaServiceProvider::getStaticMetaObject(void)
+	?setBitRate@QAudioEncoderSettings@@QAEXH@Z @ 631 NONAME ; void QAudioEncoderSettings::setBitRate(int)
+	?frequencyChanged@QRadioTuner@@IAEXH@Z @ 632 NONAME ; void QRadioTuner::frequencyChanged(int)
+	?hideEvent@QVideoWidget@@MAEXPAVQHideEvent@@@Z @ 633 NONAME ; void QVideoWidget::hideEvent(class QHideEvent *)
+	?supportedMimeTypes@QMediaServiceProvider@@UBE?AVQStringList@@ABVQByteArray@@H@Z @ 634 NONAME ; class QStringList QMediaServiceProvider::supportedMimeTypes(class QByteArray const &, int) const
+	?isSeekable@QMediaPlayer@@QBE_NXZ @ 635 NONAME ; bool QMediaPlayer::isSeekable(void) const
+	?metaObject@QMediaPlaylistIOPlugin@@UBEPBUQMetaObject@@XZ @ 636 NONAME ; struct QMetaObject const * QMediaPlaylistIOPlugin::metaObject(void) const
+	?tr@QMediaPlayer@@SA?AVQString@@PBD0@Z @ 637 NONAME ; class QString QMediaPlayer::tr(char const *, char const *)
+	?setCodec@QAudioEncoderSettings@@QAEXABVQString@@@Z @ 638 NONAME ; void QAudioEncoderSettings::setCodec(class QString const &)
+	?qt_metacast@QMediaPlayer@@UAEPAXPBD@Z @ 639 NONAME ; void * QMediaPlayer::qt_metacast(char const *)
+	?setPlaybackMode@QMediaPlaylist@@QAEXW4PlaybackMode@1@@Z @ 640 NONAME ; void QMediaPlaylist::setPlaybackMode(enum QMediaPlaylist::PlaybackMode)
+	?metaDataAvailableChanged@QMediaObject@@IAEX_N@Z @ 641 NONAME ; void QMediaObject::metaDataAvailableChanged(bool)
+	?volumeChanged@QRadioTuner@@IAEXH@Z @ 642 NONAME ; void QRadioTuner::volumeChanged(int)
+	?metaObject@QVideoWindowControl@@UBEPBUQMetaObject@@XZ @ 643 NONAME ; struct QMetaObject const * QVideoWindowControl::metaObject(void) const
+	?trUtf8@QRadioTunerControl@@SA?AVQString@@PBD0@Z @ 644 NONAME ; class QString QRadioTunerControl::trUtf8(char const *, char const *)
+	?setEncodingMode@QAudioEncoderSettings@@QAEXW4EncodingMode@QtMediaServices@@@Z @ 645 NONAME ; void QAudioEncoderSettings::setEncodingMode(enum QtMediaServices::EncodingMode)
+	?trUtf8@QMediaControl@@SA?AVQString@@PBD0H@Z @ 646 NONAME ; class QString QMediaControl::trUtf8(char const *, char const *, int)
+	??0QAudioCaptureSource@@QAE@PAVQMediaObject@@PAVQObject@@@Z @ 647 NONAME ; QAudioCaptureSource::QAudioCaptureSource(class QMediaObject *, class QObject *)
+	?setFrameRate@QVideoEncoderSettings@@QAEXM@Z @ 648 NONAME ; void QVideoEncoderSettings::setFrameRate(float)
+	?selectedDeviceChanged@QVideoDeviceControl@@IAEXABVQString@@@Z @ 649 NONAME ; void QVideoDeviceControl::selectedDeviceChanged(class QString const &)
+	?request@QMediaResource@@QBE?AVQNetworkRequest@@XZ @ 650 NONAME ; class QNetworkRequest QMediaResource::request(void) const
+	??0QMediaPlaylistProvider@@QAE@PAVQObject@@@Z @ 651 NONAME ; QMediaPlaylistProvider::QMediaPlaylistProvider(class QObject *)
+	??_EQMediaImageViewer@@UAE@I@Z @ 652 NONAME ; QMediaImageViewer::~QMediaImageViewer(unsigned int)
+	?getStaticMetaObject@QMediaImageViewer@@SAABUQMetaObject@@XZ @ 653 NONAME ; struct QMetaObject const & QMediaImageViewer::getStaticMetaObject(void)
+	??1QMediaService@@UAE@XZ @ 654 NONAME ; QMediaService::~QMediaService(void)
+	?volume@QMediaPlayer@@QBEHXZ @ 655 NONAME ; int QMediaPlayer::volume(void) const
+	?trUtf8@QMediaServiceProviderPlugin@@SA?AVQString@@PBD0@Z @ 656 NONAME ; class QString QMediaServiceProviderPlugin::trUtf8(char const *, char const *)
+	?tr@QMediaServiceProvider@@SA?AVQString@@PBD0@Z @ 657 NONAME ; class QString QMediaServiceProvider::tr(char const *, char const *)
+	?supportedContainers@QMediaRecorder@@QBE?AVQStringList@@XZ @ 658 NONAME ; class QStringList QMediaRecorder::supportedContainers(void) const
+	?d_func@QVideoWidget@@ABEPBVQVideoWidgetPrivate@@XZ @ 659 NONAME ; class QVideoWidgetPrivate const * QVideoWidget::d_func(void) const
+	?durationChanged@QMediaRecorder@@IAEX_J@Z @ 660 NONAME ; void QMediaRecorder::durationChanged(long long)
+	?loaded@QMediaPlaylistProvider@@IAEXXZ @ 661 NONAME ; void QMediaPlaylistProvider::loaded(void)
+	?trUtf8@QVideoWidgetControl@@SA?AVQString@@PBD0H@Z @ 662 NONAME ; class QString QVideoWidgetControl::trUtf8(char const *, char const *, int)
+	?staticMetaObject@QMediaPlayer@@2UQMetaObject@@B @ 663 NONAME ; struct QMetaObject const QMediaPlayer::staticMetaObject
+	?errorString@QMediaRecorder@@QBE?AVQString@@XZ @ 664 NONAME ; class QString QMediaRecorder::errorString(void) const
+	??1QMediaPlaylist@@UAE@XZ @ 665 NONAME ; QMediaPlaylist::~QMediaPlaylist(void)
+	?playbackRateChanged@QMediaPlayer@@IAEXM@Z @ 666 NONAME ; void QMediaPlayer::playbackRateChanged(float)
+	?error@QRadioTunerControl@@IAEXW4Error@QRadioTuner@@@Z @ 667 NONAME ; void QRadioTunerControl::error(enum QRadioTuner::Error)
+	?getStaticMetaObject@QMediaContainerControl@@SAABUQMetaObject@@XZ @ 668 NONAME ; struct QMetaObject const & QMediaContainerControl::getStaticMetaObject(void)
+	?metaObject@QVideoOutputControl@@UBEPBUQMetaObject@@XZ @ 669 NONAME ; struct QMetaObject const * QVideoOutputControl::metaObject(void) const
+	?getStaticMetaObject@QMediaPlayerControl@@SAABUQMetaObject@@XZ @ 670 NONAME ; struct QMetaObject const & QMediaPlayerControl::getStaticMetaObject(void)
+	?mimeType@QMediaServiceProviderHint@@QBE?AVQString@@XZ @ 671 NONAME ; class QString QMediaServiceProviderHint::mimeType(void) const
+	?outputLocation@QMediaRecorder@@QBE?AVQUrl@@XZ @ 672 NONAME ; class QUrl QMediaRecorder::outputLocation(void) const
+	?qt_metacast@QMetaDataControl@@UAEPAXPBD@Z @ 673 NONAME ; void * QMetaDataControl::qt_metacast(char const *)
+	?bind@QMediaImageViewer@@UAEXPAVQObject@@@Z @ 674 NONAME ; void QMediaImageViewer::bind(class QObject *)
+	?load@QMediaPlaylistProvider@@UAE_NPAVQIODevice@@PBD@Z @ 675 NONAME ; bool QMediaPlaylistProvider::load(class QIODevice *, char const *)
+	?isMetaDataWritable@QMediaObject@@QBE_NXZ @ 676 NONAME ; bool QMediaObject::isMetaDataWritable(void) const
+	?setQuality@QImageEncoderSettings@@QAEXW4EncodingQuality@QtMediaServices@@@Z @ 677 NONAME ; void QImageEncoderSettings::setQuality(enum QtMediaServices::EncodingQuality)
+	?defaultServiceProvider@QMediaServiceProvider@@SAPAV1@XZ @ 678 NONAME ; class QMediaServiceProvider * QMediaServiceProvider::defaultServiceProvider(void)
+	?error@QMediaRecorder@@IAEXW4Error@1@@Z @ 679 NONAME ; void QMediaRecorder::error(enum QMediaRecorder::Error)
+	?tr@QAudioCaptureSource@@SA?AVQString@@PBD0H@Z @ 680 NONAME ; class QString QAudioCaptureSource::tr(char const *, char const *, int)
+	?start@QMediaTimeInterval@@QBE_JXZ @ 681 NONAME ; long long QMediaTimeInterval::start(void) const
+	?metaObject@QMediaPlayerControl@@UBEPBUQMetaObject@@XZ @ 682 NONAME ; struct QMetaObject const * QMediaPlayerControl::metaObject(void) const
+	??_EQMediaServiceFeaturesInterface@@UAE@I@Z @ 683 NONAME ; QMediaServiceFeaturesInterface::~QMediaServiceFeaturesInterface(unsigned int)
+	?staticMetaObject@QMediaPlaylistProvider@@2UQMetaObject@@B @ 684 NONAME ; struct QMetaObject const QMediaPlaylistProvider::staticMetaObject
+	?isEmpty@QMediaTimeRange@@QBE_NXZ @ 685 NONAME ; bool QMediaTimeRange::isEmpty(void) const
+	?staticMetaObject@QMediaPlaylistNavigator@@2UQMetaObject@@B @ 686 NONAME ; struct QMetaObject const QMediaPlaylistNavigator::staticMetaObject
+	?features@QMediaServiceProviderHint@@QBE?AV?$QFlags@W4Feature@QMediaServiceProviderHint@@@@XZ @ 687 NONAME ; class QFlags<enum QMediaServiceProviderHint::Feature> QMediaServiceProviderHint::features(void) const
+	??8QMediaResource@@QBE_NABV0@@Z @ 688 NONAME ; bool QMediaResource::operator==(class QMediaResource const &) const
+	?bufferStatusChanged@QMediaPlayer@@IAEXH@Z @ 689 NONAME ; void QMediaPlayer::bufferStatusChanged(int)
+	?isNull@QMediaResource@@QBE_NXZ @ 690 NONAME ; bool QMediaResource::isNull(void) const
+	?moveEvent@QVideoWidget@@MAEXPAVQMoveEvent@@@Z @ 691 NONAME ; void QVideoWidget::moveEvent(class QMoveEvent *)
+	?audioCodec@QMediaResource@@QBE?AVQString@@XZ @ 692 NONAME ; class QString QMediaResource::audioCodec(void) const
+	??_EQGraphicsVideoItem@@UAE@I@Z @ 693 NONAME ; QGraphicsVideoItem::~QGraphicsVideoItem(unsigned int)
+	?staticMetaObject@QVideoEncoderControl@@2UQMetaObject@@B @ 694 NONAME ; struct QMetaObject const QVideoEncoderControl::staticMetaObject
+	?d_func@QRadioTuner@@ABEPBVQRadioTunerPrivate@@XZ @ 695 NONAME ; class QRadioTunerPrivate const * QRadioTuner::d_func(void) const
+	??_EQLocalMediaPlaylistProvider@@UAE@I@Z @ 696 NONAME ; QLocalMediaPlaylistProvider::~QLocalMediaPlaylistProvider(unsigned int)
+	?getStaticMetaObject@QMediaService@@SAABUQMetaObject@@XZ @ 697 NONAME ; struct QMetaObject const & QMediaService::getStaticMetaObject(void)
+	?trUtf8@QAudioEncoderControl@@SA?AVQString@@PBD0H@Z @ 698 NONAME ; class QString QAudioEncoderControl::trUtf8(char const *, char const *, int)
+	?trUtf8@QMediaRecorder@@SA?AVQString@@PBD0@Z @ 699 NONAME ; class QString QMediaRecorder::trUtf8(char const *, char const *)
+	?trUtf8@QMediaPlayer@@SA?AVQString@@PBD0@Z @ 700 NONAME ; class QString QMediaPlayer::trUtf8(char const *, char const *)
+	?setResolution@QImageEncoderSettings@@QAEXHH@Z @ 701 NONAME ; void QImageEncoderSettings::setResolution(int, int)
+	??_EQRadioTuner@@UAE@I@Z @ 702 NONAME ; QRadioTuner::~QRadioTuner(unsigned int)
+	??8@YA_NABVQMediaTimeInterval@@0@Z @ 703 NONAME ; bool operator==(class QMediaTimeInterval const &, class QMediaTimeInterval const &)
+	?containerDescription@QMediaRecorder@@QBE?AVQString@@ABV2@@Z @ 704 NONAME ; class QString QMediaRecorder::containerDescription(class QString const &) const
+	?trUtf8@QVideoWindowControl@@SA?AVQString@@PBD0H@Z @ 705 NONAME ; class QString QVideoWindowControl::trUtf8(char const *, char const *, int)
+	?volumeChanged@QMediaPlayer@@IAEXH@Z @ 706 NONAME ; void QMediaPlayer::volumeChanged(int)
+	?setSize@QGraphicsVideoItem@@QAEXABVQSizeF@@@Z @ 707 NONAME ; void QGraphicsVideoItem::setSize(class QSizeF const &)
+	??1QVideoWidgetControl@@UAE@XZ @ 708 NONAME ; QVideoWidgetControl::~QVideoWidgetControl(void)
+	??_EQMediaRecorderControl@@UAE@I@Z @ 709 NONAME ; QMediaRecorderControl::~QMediaRecorderControl(unsigned int)
+	?codec@QAudioEncoderSettings@@QBE?AVQString@@XZ @ 710 NONAME ; class QString QAudioEncoderSettings::codec(void) const
+	?volumeChanged@QRadioTunerControl@@IAEXH@Z @ 711 NONAME ; void QRadioTunerControl::volumeChanged(int)
+	??_EQMediaContainerControl@@UAE@I@Z @ 712 NONAME ; QMediaContainerControl::~QMediaContainerControl(unsigned int)
+	?trUtf8@QMediaPlaylistNavigator@@SA?AVQString@@PBD0H@Z @ 713 NONAME ; class QString QMediaPlaylistNavigator::trUtf8(char const *, char const *, int)
+	??1QMediaImageViewer@@UAE@XZ @ 714 NONAME ; QMediaImageViewer::~QMediaImageViewer(void)
+	??8QMediaContent@@QBE_NABV0@@Z @ 715 NONAME ; bool QMediaContent::operator==(class QMediaContent const &) const
+	?getStaticMetaObject@QImageEncoderControl@@SAABUQMetaObject@@XZ @ 716 NONAME ; struct QMetaObject const & QImageEncoderControl::getStaticMetaObject(void)
+	?getStaticMetaObject@QLocalMediaPlaylistProvider@@SAABUQMetaObject@@XZ @ 717 NONAME ; struct QMetaObject const & QLocalMediaPlaylistProvider::getStaticMetaObject(void)
+	?durationChanged@QMediaRecorderControl@@IAEX_J@Z @ 718 NONAME ; void QMediaRecorderControl::durationChanged(long long)
+	?metaDataChanged@QMetaDataControl@@IAEXXZ @ 719 NONAME ; void QMetaDataControl::metaDataChanged(void)
+	?hue@QVideoWidget@@QBEHXZ @ 720 NONAME ; int QVideoWidget::hue(void) const
+	??1QMediaResource@@QAE@XZ @ 721 NONAME ; QMediaResource::~QMediaResource(void)
+	?save@QMediaPlaylistProvider@@UAE_NPAVQIODevice@@PBD@Z @ 722 NONAME ; bool QMediaPlaylistProvider::save(class QIODevice *, char const *)
+	?tr@QMediaObject@@SA?AVQString@@PBD0H@Z @ 723 NONAME ; class QString QMediaObject::tr(char const *, char const *, int)
+	?removeTimeRange@QMediaTimeRange@@QAEXABV1@@Z @ 724 NONAME ; void QMediaTimeRange::removeTimeRange(class QMediaTimeRange const &)
+	?d_func@QLocalMediaPlaylistProvider@@AAEPAVQLocalMediaPlaylistProviderPrivate@@XZ @ 725 NONAME ; class QLocalMediaPlaylistProviderPrivate * QLocalMediaPlaylistProvider::d_func(void)
+	?metaObject@QMediaRecorder@@UBEPBUQMetaObject@@XZ @ 726 NONAME ; struct QMetaObject const * QMediaRecorder::metaObject(void) const
+	??0QMediaObject@@IAE@AAVQMediaObjectPrivate@@PAVQObject@@PAVQMediaService@@@Z @ 727 NONAME ; QMediaObject::QMediaObject(class QMediaObjectPrivate &, class QObject *, class QMediaService *)
+	?d_func@QMediaPlaylistProvider@@AAEPAVQMediaPlaylistProviderPrivate@@XZ @ 728 NONAME ; class QMediaPlaylistProviderPrivate * QMediaPlaylistProvider::d_func(void)
+	?fullScreenChanged@QVideoWindowControl@@IAEX_N@Z @ 729 NONAME ; void QVideoWindowControl::fullScreenChanged(bool)
+	?trUtf8@QVideoOutputControl@@SA?AVQString@@PBD0H@Z @ 730 NONAME ; class QString QVideoOutputControl::trUtf8(char const *, char const *, int)
+	?contains@QMediaTimeRange@@QBE_N_J@Z @ 731 NONAME ; bool QMediaTimeRange::contains(long long) const
+	?setMuted@QMediaPlayer@@QAEX_N@Z @ 732 NONAME ; void QMediaPlayer::setMuted(bool)
+	?isAudioAvailable@QMediaPlayer@@QBE_NXZ @ 733 NONAME ; bool QMediaPlayer::isAudioAvailable(void) const
+	?tr@QRadioTunerControl@@SA?AVQString@@PBD0@Z @ 734 NONAME ; class QString QRadioTunerControl::tr(char const *, char const *)
+	?addPropertyWatch@QMediaObject@@IAEXABVQByteArray@@@Z @ 735 NONAME ; void QMediaObject::addPropertyWatch(class QByteArray const &)
+	?mediaAboutToBeInserted@QMediaPlaylist@@IAEXHH@Z @ 736 NONAME ; void QMediaPlaylist::mediaAboutToBeInserted(int, int)
+	??_EQMediaPlaylistIOPlugin@@UAE@I@Z @ 737 NONAME ; QMediaPlaylistIOPlugin::~QMediaPlaylistIOPlugin(unsigned int)
+	?trUtf8@QMediaPlayerControl@@SA?AVQString@@PBD0H@Z @ 738 NONAME ; class QString QMediaPlayerControl::trUtf8(char const *, char const *, int)
+	?setVideoBitRate@QMediaResource@@QAEXH@Z @ 739 NONAME ; void QMediaResource::setVideoBitRate(int)
+	?qt_metacall@QRadioTuner@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 740 NONAME ; int QRadioTuner::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QMediaObject@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 741 NONAME ; int QMediaObject::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?frequencyChanged@QRadioTunerControl@@IAEXH@Z @ 742 NONAME ; void QRadioTunerControl::frequencyChanged(int)
+	?getStaticMetaObject@QMediaPlayer@@SAABUQMetaObject@@XZ @ 743 NONAME ; struct QMetaObject const & QMediaPlayer::getStaticMetaObject(void)
+	?staticMetaObject@QMediaServiceProvider@@2UQMetaObject@@B @ 744 NONAME ; struct QMetaObject const QMediaServiceProvider::staticMetaObject
+	?fullScreenChanged@QVideoWidgetControl@@IAEX_N@Z @ 745 NONAME ; void QVideoWidgetControl::fullScreenChanged(bool)
+	?intervals@QMediaTimeRange@@QBE?AV?$QList@VQMediaTimeInterval@@@@XZ @ 746 NONAME ; class QList<class QMediaTimeInterval> QMediaTimeRange::intervals(void) const
+	?pause@QMediaRecorder@@QAEXXZ @ 747 NONAME ; void QMediaRecorder::pause(void)
+	?tr@QMediaServiceProviderPlugin@@SA?AVQString@@PBD0@Z @ 748 NONAME ; class QString QMediaServiceProviderPlugin::tr(char const *, char const *)
+	?getStaticMetaObject@QVideoEncoderControl@@SAABUQMetaObject@@XZ @ 749 NONAME ; struct QMetaObject const & QVideoEncoderControl::getStaticMetaObject(void)
+	?stateChanged@QMediaPlayerControl@@IAEXW4State@QMediaPlayer@@@Z @ 750 NONAME ; void QMediaPlayerControl::stateChanged(enum QMediaPlayer::State)
+	?previous@QMediaPlaylist@@QAEXXZ @ 751 NONAME ; void QMediaPlaylist::previous(void)
+	?stereoMode@QRadioTuner@@QBE?AW4StereoMode@1@XZ @ 752 NONAME ; enum QRadioTuner::StereoMode QRadioTuner::stereoMode(void) const
+	?qt_metacall@QMediaPlaylistControl@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 753 NONAME ; int QMediaPlaylistControl::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?metaObject@QMediaPlaylist@@UBEPBUQMetaObject@@XZ @ 754 NONAME ; struct QMetaObject const * QMediaPlaylist::metaObject(void) const
+	?trUtf8@QVideoWindowControl@@SA?AVQString@@PBD0@Z @ 755 NONAME ; class QString QVideoWindowControl::trUtf8(char const *, char const *)
+	?stop@QMediaRecorder@@QAEXXZ @ 756 NONAME ; void QMediaRecorder::stop(void)
+	??0QLocalMediaPlaylistProvider@@QAE@PAVQObject@@@Z @ 757 NONAME ; QLocalMediaPlaylistProvider::QLocalMediaPlaylistProvider(class QObject *)
+	?setPlaybackMode@QMediaPlaylistNavigator@@QAEXW4PlaybackMode@QMediaPlaylist@@@Z @ 758 NONAME ; void QMediaPlaylistNavigator::setPlaybackMode(enum QMediaPlaylist::PlaybackMode)
+	?notifyInterval@QMediaObject@@QBEHXZ @ 759 NONAME ; int QMediaObject::notifyInterval(void) const
+	??0QMediaContent@@QAE@ABVQMediaResource@@@Z @ 760 NONAME ; QMediaContent::QMediaContent(class QMediaResource const &)
+	?tr@QMediaPlaylist@@SA?AVQString@@PBD0@Z @ 761 NONAME ; class QString QMediaPlaylist::tr(char const *, char const *)
+	?playbackRate@QMediaPlayer@@QBEMXZ @ 762 NONAME ; float QMediaPlayer::playbackRate(void) const
+	?metaObject@QMediaStreamsControl@@UBEPBUQMetaObject@@XZ @ 763 NONAME ; struct QMetaObject const * QMediaStreamsControl::metaObject(void) const
+	?qt_metacall@QVideoDeviceControl@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 764 NONAME ; int QVideoDeviceControl::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?metaObject@QMediaObject@@UBEPBUQMetaObject@@XZ @ 765 NONAME ; struct QMetaObject const * QMediaObject::metaObject(void) const
+	?d_func@QMediaRecorder@@AAEPAVQMediaRecorderPrivate@@XZ @ 766 NONAME ; class QMediaRecorderPrivate * QMediaRecorder::d_func(void)
+	?brightnessChanged@QVideoWindowControl@@IAEXH@Z @ 767 NONAME ; void QVideoWindowControl::brightnessChanged(int)
+	?stereoStatusChanged@QRadioTuner@@IAEX_N@Z @ 768 NONAME ; void QRadioTuner::stereoStatusChanged(bool)
+	?trUtf8@QMetaDataControl@@SA?AVQString@@PBD0H@Z @ 769 NONAME ; class QString QMetaDataControl::trUtf8(char const *, char const *, int)
+	??1QVideoOutputControl@@UAE@XZ @ 770 NONAME ; QVideoOutputControl::~QVideoOutputControl(void)
+	??_EQMediaPlaylistWriter@@UAE@I@Z @ 771 NONAME ; QMediaPlaylistWriter::~QMediaPlaylistWriter(unsigned int)
+	?isNull@QAudioEncoderSettings@@QBE_NXZ @ 772 NONAME ; bool QAudioEncoderSettings::isNull(void) const
+	?availabilityError@QMediaRecorder@@UBE?AW4AvailabilityError@QtMediaServices@@XZ @ 773 NONAME ; enum QtMediaServices::AvailabilityError QMediaRecorder::availabilityError(void) const
+	?setAudioInput@QAudioCaptureSource@@QAEXABVQString@@@Z @ 774 NONAME ; void QAudioCaptureSource::setAudioInput(class QString const &)
+	?resources@QMediaContent@@QBE?AV?$QList@VQMediaResource@@@@XZ @ 775 NONAME ; class QList<class QMediaResource> QMediaContent::resources(void) const
+	?getStaticMetaObject@QAudioEncoderControl@@SAABUQMetaObject@@XZ @ 776 NONAME ; struct QMetaObject const & QAudioEncoderControl::getStaticMetaObject(void)
+	?shuffle@QLocalMediaPlaylistProvider@@UAEXXZ @ 777 NONAME ; void QLocalMediaPlaylistProvider::shuffle(void)
+	??8QVideoEncoderSettings@@QBE_NABV0@@Z @ 778 NONAME ; bool QVideoEncoderSettings::operator==(class QVideoEncoderSettings const &) const
+	?mediaAboutToBeRemoved@QMediaPlaylist@@IAEXHH@Z @ 779 NONAME ; void QMediaPlaylist::mediaAboutToBeRemoved(int, int)
+	?nativeSize@QGraphicsVideoItem@@QBE?AVQSizeF@@XZ @ 780 NONAME ; class QSizeF QGraphicsVideoItem::nativeSize(void) const
+	?setEncodingSettings@QMediaRecorder@@QAEXABVQAudioEncoderSettings@@ABVQVideoEncoderSettings@@ABVQString@@@Z @ 781 NONAME ; void QMediaRecorder::setEncodingSettings(class QAudioEncoderSettings const &, class QVideoEncoderSettings const &, class QString const &)
+	?event@QVideoWidget@@MAE_NPAVQEvent@@@Z @ 782 NONAME ; bool QVideoWidget::event(class QEvent *)
+	??0QMediaResource@@QAE@XZ @ 783 NONAME ; QMediaResource::QMediaResource(void)
+	?tr@QAudioCaptureSource@@SA?AVQString@@PBD0@Z @ 784 NONAME ; class QString QAudioCaptureSource::tr(char const *, char const *)
+	?staticMetaObject@QAudioEncoderControl@@2UQMetaObject@@B @ 785 NONAME ; struct QMetaObject const QAudioEncoderControl::staticMetaObject
+	?isAvailable@QMediaObject@@UBE_NXZ @ 786 NONAME ; bool QMediaObject::isAvailable(void) const
+	?volumeChanged@QMediaPlayerControl@@IAEXH@Z @ 787 NONAME ; void QMediaPlayerControl::volumeChanged(int)
+	?trUtf8@QVideoRendererControl@@SA?AVQString@@PBD0H@Z @ 788 NONAME ; class QString QVideoRendererControl::trUtf8(char const *, char const *, int)
+	?trUtf8@QVideoRendererControl@@SA?AVQString@@PBD0@Z @ 789 NONAME ; class QString QVideoRendererControl::trUtf8(char const *, char const *)
+	?trUtf8@QMediaService@@SA?AVQString@@PBD0@Z @ 790 NONAME ; class QString QMediaService::trUtf8(char const *, char const *)
+	??0QAudioEncoderControl@@IAE@PAVQObject@@@Z @ 791 NONAME ; QAudioEncoderControl::QAudioEncoderControl(class QObject *)
+	?getStaticMetaObject@QMediaRecorderControl@@SAABUQMetaObject@@XZ @ 792 NONAME ; struct QMetaObject const & QMediaRecorderControl::getStaticMetaObject(void)
+	?playlistProviderChanged@QMediaPlaylistControl@@IAEXXZ @ 793 NONAME ; void QMediaPlaylistControl::playlistProviderChanged(void)
+	??4QMediaContent@@QAEAAV0@ABV0@@Z @ 794 NONAME ; class QMediaContent & QMediaContent::operator=(class QMediaContent const &)
+	?setPlaybackRate@QMediaPlayer@@QAEXM@Z @ 795 NONAME ; void QMediaPlayer::setPlaybackRate(float)
+	?resolution@QImageEncoderSettings@@QBE?AVQSize@@XZ @ 796 NONAME ; class QSize QImageEncoderSettings::resolution(void) const
+	?getStaticMetaObject@QMediaStreamsControl@@SAABUQMetaObject@@XZ @ 797 NONAME ; struct QMetaObject const & QMediaStreamsControl::getStaticMetaObject(void)
+	??1QAudioEncoderControl@@UAE@XZ @ 798 NONAME ; QAudioEncoderControl::~QAudioEncoderControl(void)
+	?trUtf8@QLocalMediaPlaylistProvider@@SA?AVQString@@PBD0H@Z @ 799 NONAME ; class QString QLocalMediaPlaylistProvider::trUtf8(char const *, char const *, int)
+	?availableExtendedMetaData@QMediaObject@@QBE?AVQStringList@@XZ @ 800 NONAME ; class QStringList QMediaObject::availableExtendedMetaData(void) const
+	?bind@QMediaObject@@UAEXPAVQObject@@@Z @ 801 NONAME ; void QMediaObject::bind(class QObject *)
+	?setOutputLocation@QMediaRecorder@@QAE_NABVQUrl@@@Z @ 802 NONAME ; bool QMediaRecorder::setOutputLocation(class QUrl const &)
+	?canonicalRequest@QMediaContent@@QBE?AVQNetworkRequest@@XZ @ 803 NONAME ; class QNetworkRequest QMediaContent::canonicalRequest(void) const
+	??ZQMediaTimeRange@@QAEAAV0@ABV0@@Z @ 804 NONAME ; class QMediaTimeRange & QMediaTimeRange::operator-=(class QMediaTimeRange const &)
+	?error@QRadioTuner@@QBE?AW4Error@1@XZ @ 805 NONAME ; enum QRadioTuner::Error QRadioTuner::error(void) const
+	?codec@QVideoEncoderSettings@@QBE?AVQString@@XZ @ 806 NONAME ; class QString QVideoEncoderSettings::codec(void) const
+	?brightness@QVideoWidget@@QBEHXZ @ 807 NONAME ; int QVideoWidget::brightness(void) const
+	??0QMediaTimeRange@@QAE@ABV0@@Z @ 808 NONAME ; QMediaTimeRange::QMediaTimeRange(class QMediaTimeRange const &)
+	?state@QMediaRecorder@@QBE?AW4State@1@XZ @ 809 NONAME ; enum QMediaRecorder::State QMediaRecorder::state(void) const
+	?tr@QMediaRecorder@@SA?AVQString@@PBD0H@Z @ 810 NONAME ; class QString QMediaRecorder::tr(char const *, char const *, int)
+	?trUtf8@QVideoEncoderControl@@SA?AVQString@@PBD0H@Z @ 811 NONAME ; class QString QVideoEncoderControl::trUtf8(char const *, char const *, int)
+	?qt_metacast@QMediaService@@UAEPAXPBD@Z @ 812 NONAME ; void * QMediaService::qt_metacast(char const *)
+	?hueChanged@QVideoWindowControl@@IAEXH@Z @ 813 NONAME ; void QVideoWindowControl::hueChanged(int)
+	?qt_metacall@QAudioEncoderControl@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 814 NONAME ; int QAudioEncoderControl::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?trUtf8@QMediaService@@SA?AVQString@@PBD0H@Z @ 815 NONAME ; class QString QMediaService::trUtf8(char const *, char const *, int)
+	?removeMedia@QMediaPlaylistProvider@@UAE_NHH@Z @ 816 NONAME ; bool QMediaPlaylistProvider::removeMedia(int, int)
+	?tr@QMediaRecorderControl@@SA?AVQString@@PBD0@Z @ 817 NONAME ; class QString QMediaRecorderControl::tr(char const *, char const *)
+	?previousIndex@QMediaPlaylist@@QBEHH@Z @ 818 NONAME ; int QMediaPlaylist::previousIndex(int) const
+	?tr@QMediaControl@@SA?AVQString@@PBD0H@Z @ 819 NONAME ; class QString QMediaControl::tr(char const *, char const *, int)
+	?tr@QImageEncoderControl@@SA?AVQString@@PBD0@Z @ 820 NONAME ; class QString QImageEncoderControl::tr(char const *, char const *)
+	?nativeSizeChanged@QGraphicsVideoItem@@IAEXABVQSizeF@@@Z @ 821 NONAME ; void QGraphicsVideoItem::nativeSizeChanged(class QSizeF const &)
+	?saturationChanged@QVideoWindowControl@@IAEXH@Z @ 822 NONAME ; void QVideoWindowControl::saturationChanged(int)
+	??0QMediaPlaylistControl@@IAE@PAVQObject@@@Z @ 823 NONAME ; QMediaPlaylistControl::QMediaPlaylistControl(class QObject *)
+	?error@QMediaRecorder@@QBE?AW4Error@1@XZ @ 824 NONAME ; enum QMediaRecorder::Error QMediaRecorder::error(void) const
+	?canonicalResource@QMediaContent@@QBE?AVQMediaResource@@XZ @ 825 NONAME ; class QMediaResource QMediaContent::canonicalResource(void) const
+	?media@QMediaPlayer@@QBE?AVQMediaContent@@XZ @ 826 NONAME ; class QMediaContent QMediaPlayer::media(void) const
+	??0QMediaService@@IAE@AAVQMediaServicePrivate@@PAVQObject@@@Z @ 827 NONAME ; QMediaService::QMediaService(class QMediaServicePrivate &, class QObject *)
+	?resolution@QMediaResource@@QBE?AVQSize@@XZ @ 828 NONAME ; class QSize QMediaResource::resolution(void) const
+	?playlist@QMediaPlaylistNavigator@@QBEPAVQMediaPlaylistProvider@@XZ @ 829 NONAME ; class QMediaPlaylistProvider * QMediaPlaylistNavigator::playlist(void) const
+	?metaObject@QAudioCaptureSource@@UBEPBUQMetaObject@@XZ @ 830 NONAME ; struct QMetaObject const * QAudioCaptureSource::metaObject(void) const
+	?setBitRate@QVideoEncoderSettings@@QAEXH@Z @ 831 NONAME ; void QVideoEncoderSettings::setBitRate(int)
+	?staticMetaObject@QMediaPlaylistControl@@2UQMetaObject@@B @ 832 NONAME ; struct QMetaObject const QMediaPlaylistControl::staticMetaObject
+	?sizeHint@QVideoWidget@@UBE?AVQSize@@XZ @ 833 NONAME ; class QSize QVideoWidget::sizeHint(void) const
+	?qt_metacast@QVideoDeviceControl@@UAEPAXPBD@Z @ 834 NONAME ; void * QVideoDeviceControl::qt_metacast(char const *)
+	?qt_metacast@QMediaControl@@UAEPAXPBD@Z @ 835 NONAME ; void * QMediaControl::qt_metacast(char const *)
+	?metaObject@QVideoRendererControl@@UBEPBUQMetaObject@@XZ @ 836 NONAME ; struct QMetaObject const * QVideoRendererControl::metaObject(void) const
+	??1QMediaPlaylistReader@@UAE@XZ @ 837 NONAME ; QMediaPlaylistReader::~QMediaPlaylistReader(void)
+	?bandChanged@QRadioTunerControl@@IAEXW4Band@QRadioTuner@@@Z @ 838 NONAME ; void QRadioTunerControl::bandChanged(enum QRadioTuner::Band)
+	?getStaticMetaObject@QVideoDeviceControl@@SAABUQMetaObject@@XZ @ 839 NONAME ; struct QMetaObject const & QVideoDeviceControl::getStaticMetaObject(void)
+	?tr@QMediaPlaylist@@SA?AVQString@@PBD0H@Z @ 840 NONAME ; class QString QMediaPlaylist::tr(char const *, char const *, int)
+	?stateChanged@QMediaPlayer@@IAEXW4State@1@@Z @ 841 NONAME ; void QMediaPlayer::stateChanged(enum QMediaPlayer::State)
+	??1QMediaServiceFeaturesInterface@@UAE@XZ @ 842 NONAME ; QMediaServiceFeaturesInterface::~QMediaServiceFeaturesInterface(void)
+	?errorString@QMediaPlayer@@QBE?AVQString@@XZ @ 843 NONAME ; class QString QMediaPlayer::errorString(void) const
+	??0QMediaPlayerControl@@IAE@PAVQObject@@@Z @ 844 NONAME ; QMediaPlayerControl::QMediaPlayerControl(class QObject *)
+	?tr@QRadioTunerControl@@SA?AVQString@@PBD0H@Z @ 845 NONAME ; class QString QRadioTunerControl::tr(char const *, char const *, int)
+	?getStaticMetaObject@QVideoWidgetControl@@SAABUQMetaObject@@XZ @ 846 NONAME ; struct QMetaObject const & QVideoWidgetControl::getStaticMetaObject(void)
+	??9QMediaServiceProviderHint@@QBE_NABV0@@Z @ 847 NONAME ; bool QMediaServiceProviderHint::operator!=(class QMediaServiceProviderHint const &) const
+	?loadFailed@QMediaPlaylist@@IAEXXZ @ 848 NONAME ; void QMediaPlaylist::loadFailed(void)
+	?tr@QRadioTuner@@SA?AVQString@@PBD0@Z @ 849 NONAME ; class QString QRadioTuner::tr(char const *, char const *)
+	?elapsedTime@QMediaImageViewer@@QBEHXZ @ 850 NONAME ; int QMediaImageViewer::elapsedTime(void) const
+	?stateChanged@QMediaImageViewer@@IAEXW4State@1@@Z @ 851 NONAME ; void QMediaImageViewer::stateChanged(enum QMediaImageViewer::State)
+	?loaded@QMediaPlaylist@@IAEXXZ @ 852 NONAME ; void QMediaPlaylist::loaded(void)
+	?next@QMediaPlaylist@@QAEXXZ @ 853 NONAME ; void QMediaPlaylist::next(void)
+	??1QMediaPlaylistNavigator@@UAE@XZ @ 854 NONAME ; QMediaPlaylistNavigator::~QMediaPlaylistNavigator(void)
+	??8QImageEncoderSettings@@QBE_NABV0@@Z @ 855 NONAME ; bool QImageEncoderSettings::operator==(class QImageEncoderSettings const &) const
+	?encodingMode@QVideoEncoderSettings@@QBE?AW4EncodingMode@QtMediaServices@@XZ @ 856 NONAME ; enum QtMediaServices::EncodingMode QVideoEncoderSettings::encodingMode(void) const
+	?tr@QMediaPlayerControl@@SA?AVQString@@PBD0@Z @ 857 NONAME ; class QString QMediaPlayerControl::tr(char const *, char const *)
+	??1QMediaPlaylistControl@@UAE@XZ @ 858 NONAME ; QMediaPlaylistControl::~QMediaPlaylistControl(void)
+	?tr@QVideoEncoderControl@@SA?AVQString@@PBD0@Z @ 859 NONAME ; class QString QVideoEncoderControl::tr(char const *, char const *)
+	?setupMetaData@QMediaObject@@AAEXXZ @ 860 NONAME ; void QMediaObject::setupMetaData(void)
+	?qt_metacast@QMediaRecorderControl@@UAEPAXPBD@Z @ 861 NONAME ; void * QMediaRecorderControl::qt_metacast(char const *)
+	??_EQImageEncoderControl@@UAE@I@Z @ 862 NONAME ; QImageEncoderControl::~QImageEncoderControl(unsigned int)
+	??_EQMediaRecorder@@UAE@I@Z @ 863 NONAME ; QMediaRecorder::~QMediaRecorder(unsigned int)
+	?tr@QMediaRecorder@@SA?AVQString@@PBD0@Z @ 864 NONAME ; class QString QMediaRecorder::tr(char const *, char const *)
+	??1QVideoWidget@@UAE@XZ @ 865 NONAME ; QVideoWidget::~QVideoWidget(void)
+	?devices@QMediaServiceProvider@@UBE?AV?$QList@VQByteArray@@@@ABVQByteArray@@@Z @ 866 NONAME ; class QList<class QByteArray> QMediaServiceProvider::devices(class QByteArray const &) const
+	?staticMetaObject@QMediaRecorderControl@@2UQMetaObject@@B @ 867 NONAME ; struct QMetaObject const QMediaRecorderControl::staticMetaObject
+	?qt_metacall@QMediaPlaylist@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 868 NONAME ; int QMediaPlaylist::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?setBrightness@QVideoWidget@@QAEXH@Z @ 869 NONAME ; void QVideoWidget::setBrightness(int)
+	??1QVideoWindowControl@@UAE@XZ @ 870 NONAME ; QVideoWindowControl::~QVideoWindowControl(void)
+	??4QImageEncoderSettings@@QAEAAV0@ABV0@@Z @ 871 NONAME ; class QImageEncoderSettings & QImageEncoderSettings::operator=(class QImageEncoderSettings const &)
+	?trUtf8@QMediaServiceProviderPlugin@@SA?AVQString@@PBD0H@Z @ 872 NONAME ; class QString QMediaServiceProviderPlugin::trUtf8(char const *, char const *, int)
+	?hasSupport@QMediaPlayer@@SA?AW4SupportEstimate@QtMediaServices@@ABVQString@@ABVQStringList@@V?$QFlags@W4Flag@QMediaPlayer@@@@@Z @ 873 NONAME ; enum QtMediaServices::SupportEstimate QMediaPlayer::hasSupport(class QString const &, class QStringList const &, class QFlags<enum QMediaPlayer::Flag>)
+	?qt_metacall@QVideoWidgetControl@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 874 NONAME ; int QVideoWidgetControl::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?currentIndexChanged@QMediaPlaylistControl@@IAEXH@Z @ 875 NONAME ; void QMediaPlaylistControl::currentIndexChanged(int)
+	?isNull@QMediaContent@@QBE_NXZ @ 876 NONAME ; bool QMediaContent::isNull(void) const
+	??1QVideoDeviceControl@@UAE@XZ @ 877 NONAME ; QVideoDeviceControl::~QVideoDeviceControl(void)
+	?mutedChanged@QMediaPlayer@@IAEX_N@Z @ 878 NONAME ; void QMediaPlayer::mutedChanged(bool)
+	?tr@QVideoDeviceControl@@SA?AVQString@@PBD0H@Z @ 879 NONAME ; class QString QVideoDeviceControl::tr(char const *, char const *, int)
+	?mediaChanged@QMediaPlayer@@IAEXABVQMediaContent@@@Z @ 880 NONAME ; void QMediaPlayer::mediaChanged(class QMediaContent const &)
+	?mediaChanged@QMediaPlaylist@@IAEXHH@Z @ 881 NONAME ; void QMediaPlaylist::mediaChanged(int, int)
+	?pause@QMediaImageViewer@@QAEXXZ @ 882 NONAME ; void QMediaImageViewer::pause(void)
+	?tr@QMediaServiceProvider@@SA?AVQString@@PBD0H@Z @ 883 NONAME ; class QString QMediaServiceProvider::tr(char const *, char const *, int)
+	?getStaticMetaObject@QVideoOutputControl@@SAABUQMetaObject@@XZ @ 884 NONAME ; struct QMetaObject const & QVideoOutputControl::getStaticMetaObject(void)
+	?trUtf8@QRadioTuner@@SA?AVQString@@PBD0@Z @ 885 NONAME ; class QString QRadioTuner::trUtf8(char const *, char const *)
+	?setQuality@QAudioEncoderSettings@@QAEXW4EncodingQuality@QtMediaServices@@@Z @ 886 NONAME ; void QAudioEncoderSettings::setQuality(enum QtMediaServices::EncodingQuality)
+	?getStaticMetaObject@QRadioTuner@@SAABUQMetaObject@@XZ @ 887 NONAME ; struct QMetaObject const & QRadioTuner::getStaticMetaObject(void)
+	?trUtf8@QMediaServiceProvider@@SA?AVQString@@PBD0@Z @ 888 NONAME ; class QString QMediaServiceProvider::trUtf8(char const *, char const *)
+	?state@QMediaPlayer@@QBE?AW4State@1@XZ @ 889 NONAME ; enum QMediaPlayer::State QMediaPlayer::state(void) const
+	?tr@QAudioEncoderControl@@SA?AVQString@@PBD0@Z @ 890 NONAME ; class QString QAudioEncoderControl::tr(char const *, char const *)
+	?offset@QGraphicsVideoItem@@QBE?AVQPointF@@XZ @ 891 NONAME ; class QPointF QGraphicsVideoItem::offset(void) const
+	?mediaObject@QVideoWidget@@QBEPAVQMediaObject@@XZ @ 892 NONAME ; class QMediaObject * QVideoWidget::mediaObject(void) const
+	?trUtf8@QAudioCaptureSource@@SA?AVQString@@PBD0H@Z @ 893 NONAME ; class QString QAudioCaptureSource::trUtf8(char const *, char const *, int)
+	?metaObject@QAudioEncoderControl@@UBEPBUQMetaObject@@XZ @ 894 NONAME ; struct QMetaObject const * QAudioEncoderControl::metaObject(void) const
+	?previousItem@QMediaPlaylistNavigator@@QBE?AVQMediaContent@@H@Z @ 895 NONAME ; class QMediaContent QMediaPlaylistNavigator::previousItem(int) const
+	?removeMedia@QMediaPlaylistProvider@@UAE_NH@Z @ 896 NONAME ; bool QMediaPlaylistProvider::removeMedia(int)
+	??0QVideoEncoderControl@@IAE@PAVQObject@@@Z @ 897 NONAME ; QVideoEncoderControl::QVideoEncoderControl(class QObject *)
+	??0QMediaTimeInterval@@QAE@ABV0@@Z @ 898 NONAME ; QMediaTimeInterval::QMediaTimeInterval(class QMediaTimeInterval const &)
+	?contrastChanged@QVideoWidget@@IAEXH@Z @ 899 NONAME ; void QVideoWidget::contrastChanged(int)
+	?unbind@QMediaObject@@UAEXPAVQObject@@@Z @ 900 NONAME ; void QMediaObject::unbind(class QObject *)
+	?tr@QAudioEndpointSelector@@SA?AVQString@@PBD0@Z @ 901 NONAME ; class QString QAudioEndpointSelector::tr(char const *, char const *)
+	?qt_metacall@QGraphicsVideoItem@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 902 NONAME ; int QGraphicsVideoItem::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?mediaChanged@QMediaPlaylistProvider@@IAEXHH@Z @ 903 NONAME ; void QMediaPlaylistProvider::mediaChanged(int, int)
+	?metaObject@QMediaImageViewer@@UBEPBUQMetaObject@@XZ @ 904 NONAME ; struct QMetaObject const * QMediaImageViewer::metaObject(void) const
+	?service@QMediaObject@@UBEPAVQMediaService@@XZ @ 905 NONAME ; class QMediaService * QMediaObject::service(void) const
+	?tr@QMediaStreamsControl@@SA?AVQString@@PBD0@Z @ 906 NONAME ; class QString QMediaStreamsControl::tr(char const *, char const *)
+	?tr@QMediaPlaylistIOPlugin@@SA?AVQString@@PBD0@Z @ 907 NONAME ; class QString QMediaPlaylistIOPlugin::tr(char const *, char const *)
+	?removePropertyWatch@QMediaObject@@IAEXABVQByteArray@@@Z @ 908 NONAME ; void QMediaObject::removePropertyWatch(class QByteArray const &)
+	??0QGraphicsVideoItem@@QAE@PAVQGraphicsItem@@@Z @ 909 NONAME ; QGraphicsVideoItem::QGraphicsVideoItem(class QGraphicsItem *)
+	??1QVideoEncoderControl@@UAE@XZ @ 910 NONAME ; QVideoEncoderControl::~QVideoEncoderControl(void)
+	?metaObject@QMediaControl@@UBEPBUQMetaObject@@XZ @ 911 NONAME ; struct QMetaObject const * QMediaControl::metaObject(void) const
+	?removeInterval@QMediaTimeRange@@QAEXABVQMediaTimeInterval@@@Z @ 912 NONAME ; void QMediaTimeRange::removeInterval(class QMediaTimeInterval const &)
+	??1QMediaStreamsControl@@UAE@XZ @ 913 NONAME ; QMediaStreamsControl::~QMediaStreamsControl(void)
+	?codec@QImageEncoderSettings@@QBE?AVQString@@XZ @ 914 NONAME ; class QString QImageEncoderSettings::codec(void) const
+	?currentMedia@QMediaPlaylist@@QBE?AVQMediaContent@@XZ @ 915 NONAME ; class QMediaContent QMediaPlaylist::currentMedia(void) const
+	?frequencyStep@QRadioTuner@@QBEHW4Band@1@@Z @ 916 NONAME ; int QRadioTuner::frequencyStep(enum QRadioTuner::Band) const
+	?insertMedia@QLocalMediaPlaylistProvider@@UAE_NHABVQMediaContent@@@Z @ 917 NONAME ; bool QLocalMediaPlaylistProvider::insertMedia(int, class QMediaContent const &)
+	?setAudioCodec@QMediaResource@@QAEXABVQString@@@Z @ 918 NONAME ; void QMediaResource::setAudioCodec(class QString const &)
+	?activated@QMediaPlaylistNavigator@@IAEXABVQMediaContent@@@Z @ 919 NONAME ; void QMediaPlaylistNavigator::activated(class QMediaContent const &)
+	??1QVideoRendererControl@@UAE@XZ @ 920 NONAME ; QVideoRendererControl::~QVideoRendererControl(void)
+	?setNotifyInterval@QMediaObject@@QAEXH@Z @ 921 NONAME ; void QMediaObject::setNotifyInterval(int)
+	?trUtf8@QMediaPlaylistNavigator@@SA?AVQString@@PBD0@Z @ 922 NONAME ; class QString QMediaPlaylistNavigator::trUtf8(char const *, char const *)
+	?setMediaObject@QMediaPlaylist@@QAEXPAVQMediaObject@@@Z @ 923 NONAME ; void QMediaPlaylist::setMediaObject(class QMediaObject *)
+	?tr@QMediaControl@@SA?AVQString@@PBD0@Z @ 924 NONAME ; class QString QMediaControl::tr(char const *, char const *)
+	?clear@QMediaTimeRange@@QAEXXZ @ 925 NONAME ; void QMediaTimeRange::clear(void)
+	?removeInterval@QMediaTimeRange@@QAEX_J0@Z @ 926 NONAME ; void QMediaTimeRange::removeInterval(long long, long long)

--- a/qtmobility/src/s60installs/bwins/QtSensorsu.def	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/s60installs/bwins/QtSensorsu.def	Fri May 14 16:41:33 2010 +0300
@@ -1,351 +1,347 @@
 EXPORTS
-	??0QAccelerometer@QtMobility@@QAE@PAVQObject@@@Z @ 1 NONAME ; QtMobility::QAccelerometer::QAccelerometer(class QObject *)
-	??0QAccelerometerReading@QtMobility@@QAE@PAVQObject@@@Z @ 2 NONAME ; QtMobility::QAccelerometerReading::QAccelerometerReading(class QObject *)
-	??0QAmbientLightReading@QtMobility@@QAE@PAVQObject@@@Z @ 3 NONAME ; QtMobility::QAmbientLightReading::QAmbientLightReading(class QObject *)
-	??0QAmbientLightSensor@QtMobility@@QAE@PAVQObject@@@Z @ 4 NONAME ; QtMobility::QAmbientLightSensor::QAmbientLightSensor(class QObject *)
-	??0QCompass@QtMobility@@QAE@PAVQObject@@@Z @ 5 NONAME ; QtMobility::QCompass::QCompass(class QObject *)
-	??0QCompassReading@QtMobility@@QAE@PAVQObject@@@Z @ 6 NONAME ; QtMobility::QCompassReading::QCompassReading(class QObject *)
-	??0QMagnetometer@QtMobility@@QAE@PAVQObject@@@Z @ 7 NONAME ; QtMobility::QMagnetometer::QMagnetometer(class QObject *)
-	??0QMagnetometerReading@QtMobility@@QAE@PAVQObject@@@Z @ 8 NONAME ; QtMobility::QMagnetometerReading::QMagnetometerReading(class QObject *)
-	??0QOrientationReading@QtMobility@@QAE@PAVQObject@@@Z @ 9 NONAME ; QtMobility::QOrientationReading::QOrientationReading(class QObject *)
-	??0QOrientationSensor@QtMobility@@QAE@PAVQObject@@@Z @ 10 NONAME ; QtMobility::QOrientationSensor::QOrientationSensor(class QObject *)
-	??0QProximityReading@QtMobility@@QAE@PAVQObject@@@Z @ 11 NONAME ; QtMobility::QProximityReading::QProximityReading(class QObject *)
-	??0QProximitySensor@QtMobility@@QAE@PAVQObject@@@Z @ 12 NONAME ; QtMobility::QProximitySensor::QProximitySensor(class QObject *)
-	??0QRotationReading@QtMobility@@QAE@PAVQObject@@@Z @ 13 NONAME ; QtMobility::QRotationReading::QRotationReading(class QObject *)
-	??0QRotationSensor@QtMobility@@QAE@PAVQObject@@@Z @ 14 NONAME ; QtMobility::QRotationSensor::QRotationSensor(class QObject *)
-	??0QSensor@QtMobility@@QAE@ABVQByteArray@@PAVQObject@@@Z @ 15 NONAME ; QtMobility::QSensor::QSensor(class QByteArray const &, class QObject *)
-	??0QSensorBackend@QtMobility@@QAE@PAVQSensor@1@@Z @ 16 NONAME ; QtMobility::QSensorBackend::QSensorBackend(class QtMobility::QSensor *)
-	??0QSensorFilter@QtMobility@@IAE@XZ @ 17 NONAME ; QtMobility::QSensorFilter::QSensorFilter(void)
-	??0QSensorPluginLoader@QtMobility@@QAE@PBDABVQString@@@Z @ 18 NONAME ; QtMobility::QSensorPluginLoader::QSensorPluginLoader(char const *, class QString const &)
-	??0QSensorReading@QtMobility@@IAE@PAVQObject@@PAVQSensorReadingPrivate@1@@Z @ 19 NONAME ; QtMobility::QSensorReading::QSensorReading(class QObject *, class QtMobility::QSensorReadingPrivate *)
-	??0QTapReading@QtMobility@@QAE@PAVQObject@@@Z @ 20 NONAME ; QtMobility::QTapReading::QTapReading(class QObject *)
-	??0QTapSensor@QtMobility@@QAE@PAVQObject@@@Z @ 21 NONAME ; QtMobility::QTapSensor::QTapSensor(class QObject *)
-	??1QAccelerometer@QtMobility@@UAE@XZ @ 22 NONAME ; QtMobility::QAccelerometer::~QAccelerometer(void)
-	??1QAccelerometerReading@QtMobility@@UAE@XZ @ 23 NONAME ; QtMobility::QAccelerometerReading::~QAccelerometerReading(void)
-	??1QAmbientLightReading@QtMobility@@UAE@XZ @ 24 NONAME ; QtMobility::QAmbientLightReading::~QAmbientLightReading(void)
-	??1QAmbientLightSensor@QtMobility@@UAE@XZ @ 25 NONAME ; QtMobility::QAmbientLightSensor::~QAmbientLightSensor(void)
-	??1QCompass@QtMobility@@UAE@XZ @ 26 NONAME ; QtMobility::QCompass::~QCompass(void)
-	??1QCompassReading@QtMobility@@UAE@XZ @ 27 NONAME ; QtMobility::QCompassReading::~QCompassReading(void)
-	??1QMagnetometer@QtMobility@@UAE@XZ @ 28 NONAME ; QtMobility::QMagnetometer::~QMagnetometer(void)
-	??1QMagnetometerReading@QtMobility@@UAE@XZ @ 29 NONAME ; QtMobility::QMagnetometerReading::~QMagnetometerReading(void)
-	??1QOrientationReading@QtMobility@@UAE@XZ @ 30 NONAME ; QtMobility::QOrientationReading::~QOrientationReading(void)
-	??1QOrientationSensor@QtMobility@@UAE@XZ @ 31 NONAME ; QtMobility::QOrientationSensor::~QOrientationSensor(void)
-	??1QProximityReading@QtMobility@@UAE@XZ @ 32 NONAME ; QtMobility::QProximityReading::~QProximityReading(void)
-	??1QProximitySensor@QtMobility@@UAE@XZ @ 33 NONAME ; QtMobility::QProximitySensor::~QProximitySensor(void)
-	??1QRotationReading@QtMobility@@UAE@XZ @ 34 NONAME ; QtMobility::QRotationReading::~QRotationReading(void)
-	??1QRotationSensor@QtMobility@@UAE@XZ @ 35 NONAME ; QtMobility::QRotationSensor::~QRotationSensor(void)
-	??1QSensor@QtMobility@@UAE@XZ @ 36 NONAME ; QtMobility::QSensor::~QSensor(void)
-	??1QSensorBackend@QtMobility@@UAE@XZ @ 37 NONAME ; QtMobility::QSensorBackend::~QSensorBackend(void)
-	??1QSensorBackendFactory@QtMobility@@IAE@XZ @ 38 NONAME ; QtMobility::QSensorBackendFactory::~QSensorBackendFactory(void)
-	??1QSensorFilter@QtMobility@@IAE@XZ @ 39 NONAME ; QtMobility::QSensorFilter::~QSensorFilter(void)
-	??1QSensorPluginInterface@QtMobility@@IAE@XZ @ 40 NONAME ; QtMobility::QSensorPluginInterface::~QSensorPluginInterface(void)
-	??1QSensorPluginLoader@QtMobility@@QAE@XZ @ 41 NONAME ; QtMobility::QSensorPluginLoader::~QSensorPluginLoader(void)
-	??1QSensorReading@QtMobility@@UAE@XZ @ 42 NONAME ; QtMobility::QSensorReading::~QSensorReading(void)
-	??1QTapReading@QtMobility@@UAE@XZ @ 43 NONAME ; QtMobility::QTapReading::~QTapReading(void)
-	??1QTapSensor@QtMobility@@UAE@XZ @ 44 NONAME ; QtMobility::QTapSensor::~QTapSensor(void)
-	??_EQAccelerometer@QtMobility@@UAE@I@Z @ 45 NONAME ; QtMobility::QAccelerometer::~QAccelerometer(unsigned int)
-	??_EQAccelerometerReading@QtMobility@@UAE@I@Z @ 46 NONAME ; QtMobility::QAccelerometerReading::~QAccelerometerReading(unsigned int)
-	??_EQAmbientLightReading@QtMobility@@UAE@I@Z @ 47 NONAME ; QtMobility::QAmbientLightReading::~QAmbientLightReading(unsigned int)
-	??_EQAmbientLightSensor@QtMobility@@UAE@I@Z @ 48 NONAME ; QtMobility::QAmbientLightSensor::~QAmbientLightSensor(unsigned int)
-	??_EQCompass@QtMobility@@UAE@I@Z @ 49 NONAME ; QtMobility::QCompass::~QCompass(unsigned int)
-	??_EQCompassReading@QtMobility@@UAE@I@Z @ 50 NONAME ; QtMobility::QCompassReading::~QCompassReading(unsigned int)
-	??_EQMagnetometer@QtMobility@@UAE@I@Z @ 51 NONAME ; QtMobility::QMagnetometer::~QMagnetometer(unsigned int)
-	??_EQMagnetometerReading@QtMobility@@UAE@I@Z @ 52 NONAME ; QtMobility::QMagnetometerReading::~QMagnetometerReading(unsigned int)
-	??_EQOrientationReading@QtMobility@@UAE@I@Z @ 53 NONAME ; QtMobility::QOrientationReading::~QOrientationReading(unsigned int)
-	??_EQOrientationSensor@QtMobility@@UAE@I@Z @ 54 NONAME ; QtMobility::QOrientationSensor::~QOrientationSensor(unsigned int)
-	??_EQProximityReading@QtMobility@@UAE@I@Z @ 55 NONAME ; QtMobility::QProximityReading::~QProximityReading(unsigned int)
-	??_EQProximitySensor@QtMobility@@UAE@I@Z @ 56 NONAME ; QtMobility::QProximitySensor::~QProximitySensor(unsigned int)
-	??_EQRotationReading@QtMobility@@UAE@I@Z @ 57 NONAME ; QtMobility::QRotationReading::~QRotationReading(unsigned int)
-	??_EQRotationSensor@QtMobility@@UAE@I@Z @ 58 NONAME ; QtMobility::QRotationSensor::~QRotationSensor(unsigned int)
-	??_EQSensor@QtMobility@@UAE@I@Z @ 59 NONAME ; QtMobility::QSensor::~QSensor(unsigned int)
-	??_EQSensorBackend@QtMobility@@UAE@I@Z @ 60 NONAME ; QtMobility::QSensorBackend::~QSensorBackend(unsigned int)
-	??_EQSensorReading@QtMobility@@UAE@I@Z @ 61 NONAME ; QtMobility::QSensorReading::~QSensorReading(unsigned int)
-	??_EQTapReading@QtMobility@@UAE@I@Z @ 62 NONAME ; QtMobility::QTapReading::~QTapReading(unsigned int)
-	??_EQTapSensor@QtMobility@@UAE@I@Z @ 63 NONAME ; QtMobility::QTapSensor::~QTapSensor(unsigned int)
-	?addDataRate@QSensorBackend@QtMobility@@QAEXMM@Z @ 64 NONAME ; void QtMobility::QSensorBackend::addDataRate(float, float)
-	?addFilter@QSensor@QtMobility@@QAEXPAVQSensorFilter@2@@Z @ 65 NONAME ; void QtMobility::QSensor::addFilter(class QtMobility::QSensorFilter *)
-	?addOutputRange@QSensorBackend@QtMobility@@QAEXMMM@Z @ 66 NONAME ; void QtMobility::QSensorBackend::addOutputRange(float, float, float)
-	?availableDataRates@QSensor@QtMobility@@QBE?AV?$QList@U?$QPair@HH@@@@XZ @ 67 NONAME ; class QList<struct QPair<int, int> > QtMobility::QSensor::availableDataRates(void) const
-	?azimuth@QCompassReading@QtMobility@@QBEMXZ @ 68 NONAME ; float QtMobility::QCompassReading::azimuth(void) const
-	?busyChanged@QSensor@QtMobility@@IAEXXZ @ 69 NONAME ; void QtMobility::QSensor::busyChanged(void)
-	?calibrationLevel@QCompassReading@QtMobility@@QBEMXZ @ 70 NONAME ; float QtMobility::QCompassReading::calibrationLevel(void) const
-	?calibrationLevel@QMagnetometerReading@QtMobility@@QBEMXZ @ 71 NONAME ; float QtMobility::QMagnetometerReading::calibrationLevel(void) const
-	?close@QProximityReading@QtMobility@@QBE_NXZ @ 72 NONAME ; bool QtMobility::QProximityReading::close(void) const
-	?connectToBackend@QSensor@QtMobility@@QAE_NXZ @ 73 NONAME ; bool QtMobility::QSensor::connectToBackend(void)
-	?copyValuesFrom@QAccelerometerReading@QtMobility@@UAEXPAVQSensorReading@2@@Z @ 74 NONAME ; void QtMobility::QAccelerometerReading::copyValuesFrom(class QtMobility::QSensorReading *)
-	?copyValuesFrom@QAmbientLightReading@QtMobility@@UAEXPAVQSensorReading@2@@Z @ 75 NONAME ; void QtMobility::QAmbientLightReading::copyValuesFrom(class QtMobility::QSensorReading *)
-	?copyValuesFrom@QCompassReading@QtMobility@@UAEXPAVQSensorReading@2@@Z @ 76 NONAME ; void QtMobility::QCompassReading::copyValuesFrom(class QtMobility::QSensorReading *)
-	?copyValuesFrom@QMagnetometerReading@QtMobility@@UAEXPAVQSensorReading@2@@Z @ 77 NONAME ; void QtMobility::QMagnetometerReading::copyValuesFrom(class QtMobility::QSensorReading *)
-	?copyValuesFrom@QOrientationReading@QtMobility@@UAEXPAVQSensorReading@2@@Z @ 78 NONAME ; void QtMobility::QOrientationReading::copyValuesFrom(class QtMobility::QSensorReading *)
-	?copyValuesFrom@QProximityReading@QtMobility@@UAEXPAVQSensorReading@2@@Z @ 79 NONAME ; void QtMobility::QProximityReading::copyValuesFrom(class QtMobility::QSensorReading *)
-	?copyValuesFrom@QRotationReading@QtMobility@@UAEXPAVQSensorReading@2@@Z @ 80 NONAME ; void QtMobility::QRotationReading::copyValuesFrom(class QtMobility::QSensorReading *)
-	?copyValuesFrom@QTapReading@QtMobility@@UAEXPAVQSensorReading@2@@Z @ 81 NONAME ; void QtMobility::QTapReading::copyValuesFrom(class QtMobility::QSensorReading *)
-	?createBackend@QSensorManager@QtMobility@@SAPAVQSensorBackend@2@PAVQSensor@2@@Z @ 82 NONAME ; class QtMobility::QSensorBackend * QtMobility::QSensorManager::createBackend(class QtMobility::QSensor *)
-	?d_func@QSensor@QtMobility@@IBEPAVQSensorPrivate@2@XZ @ 83 NONAME ; class QtMobility::QSensorPrivate * QtMobility::QSensor::d_func(void) const
-	?d_ptr@QSensorReading@QtMobility@@IAEPAV?$QScopedPointer@VQSensorReadingPrivate@QtMobility@@U?$QScopedPointerDeleter@VQSensorReadingPrivate@QtMobility@@@@@@XZ @ 84 NONAME ; class QScopedPointer<class QtMobility::QSensorReadingPrivate, struct QScopedPointerDeleter<class QtMobility::QSensorReadingPrivate> > * QtMobility::QSensorReading::d_ptr(void)
-	?dataRate@QSensor@QtMobility@@QBEHXZ @ 85 NONAME ; int QtMobility::QSensor::dataRate(void) const
-	?defaultSensorForType@QSensor@QtMobility@@SA?AVQByteArray@@ABV3@@Z @ 86 NONAME ; class QByteArray QtMobility::QSensor::defaultSensorForType(class QByteArray const &)
-	?description@QSensor@QtMobility@@QBE?AVQString@@XZ @ 87 NONAME ; class QString QtMobility::QSensor::description(void) const
-	?error@QSensor@QtMobility@@QBEHXZ @ 88 NONAME ; int QtMobility::QSensor::error(void) const
-	?filter@QAccelerometerFilter@QtMobility@@EAE_NPAVQSensorReading@2@@Z @ 89 NONAME ; bool QtMobility::QAccelerometerFilter::filter(class QtMobility::QSensorReading *)
-	?filter@QAmbientLightFilter@QtMobility@@EAE_NPAVQSensorReading@2@@Z @ 90 NONAME ; bool QtMobility::QAmbientLightFilter::filter(class QtMobility::QSensorReading *)
-	?filter@QCompassFilter@QtMobility@@EAE_NPAVQSensorReading@2@@Z @ 91 NONAME ; bool QtMobility::QCompassFilter::filter(class QtMobility::QSensorReading *)
-	?filter@QMagnetometerFilter@QtMobility@@EAE_NPAVQSensorReading@2@@Z @ 92 NONAME ; bool QtMobility::QMagnetometerFilter::filter(class QtMobility::QSensorReading *)
-	?filter@QOrientationFilter@QtMobility@@EAE_NPAVQSensorReading@2@@Z @ 93 NONAME ; bool QtMobility::QOrientationFilter::filter(class QtMobility::QSensorReading *)
-	?filter@QProximityFilter@QtMobility@@EAE_NPAVQSensorReading@2@@Z @ 94 NONAME ; bool QtMobility::QProximityFilter::filter(class QtMobility::QSensorReading *)
-	?filter@QRotationFilter@QtMobility@@EAE_NPAVQSensorReading@2@@Z @ 95 NONAME ; bool QtMobility::QRotationFilter::filter(class QtMobility::QSensorReading *)
-	?filter@QTapFilter@QtMobility@@EAE_NPAVQSensorReading@2@@Z @ 96 NONAME ; bool QtMobility::QTapFilter::filter(class QtMobility::QSensorReading *)
-	?getStaticMetaObject@QAccelerometer@QtMobility@@SAABUQMetaObject@@XZ @ 97 NONAME ; struct QMetaObject const & QtMobility::QAccelerometer::getStaticMetaObject(void)
-	?getStaticMetaObject@QAccelerometerReading@QtMobility@@SAABUQMetaObject@@XZ @ 98 NONAME ; struct QMetaObject const & QtMobility::QAccelerometerReading::getStaticMetaObject(void)
-	?getStaticMetaObject@QAmbientLightReading@QtMobility@@SAABUQMetaObject@@XZ @ 99 NONAME ; struct QMetaObject const & QtMobility::QAmbientLightReading::getStaticMetaObject(void)
-	?getStaticMetaObject@QAmbientLightSensor@QtMobility@@SAABUQMetaObject@@XZ @ 100 NONAME ; struct QMetaObject const & QtMobility::QAmbientLightSensor::getStaticMetaObject(void)
-	?getStaticMetaObject@QCompass@QtMobility@@SAABUQMetaObject@@XZ @ 101 NONAME ; struct QMetaObject const & QtMobility::QCompass::getStaticMetaObject(void)
-	?getStaticMetaObject@QCompassReading@QtMobility@@SAABUQMetaObject@@XZ @ 102 NONAME ; struct QMetaObject const & QtMobility::QCompassReading::getStaticMetaObject(void)
-	?getStaticMetaObject@QMagnetometer@QtMobility@@SAABUQMetaObject@@XZ @ 103 NONAME ; struct QMetaObject const & QtMobility::QMagnetometer::getStaticMetaObject(void)
-	?getStaticMetaObject@QMagnetometerReading@QtMobility@@SAABUQMetaObject@@XZ @ 104 NONAME ; struct QMetaObject const & QtMobility::QMagnetometerReading::getStaticMetaObject(void)
-	?getStaticMetaObject@QOrientationReading@QtMobility@@SAABUQMetaObject@@XZ @ 105 NONAME ; struct QMetaObject const & QtMobility::QOrientationReading::getStaticMetaObject(void)
-	?getStaticMetaObject@QOrientationSensor@QtMobility@@SAABUQMetaObject@@XZ @ 106 NONAME ; struct QMetaObject const & QtMobility::QOrientationSensor::getStaticMetaObject(void)
-	?getStaticMetaObject@QProximityReading@QtMobility@@SAABUQMetaObject@@XZ @ 107 NONAME ; struct QMetaObject const & QtMobility::QProximityReading::getStaticMetaObject(void)
-	?getStaticMetaObject@QProximitySensor@QtMobility@@SAABUQMetaObject@@XZ @ 108 NONAME ; struct QMetaObject const & QtMobility::QProximitySensor::getStaticMetaObject(void)
-	?getStaticMetaObject@QRotationReading@QtMobility@@SAABUQMetaObject@@XZ @ 109 NONAME ; struct QMetaObject const & QtMobility::QRotationReading::getStaticMetaObject(void)
-	?getStaticMetaObject@QRotationSensor@QtMobility@@SAABUQMetaObject@@XZ @ 110 NONAME ; struct QMetaObject const & QtMobility::QRotationSensor::getStaticMetaObject(void)
-	?getStaticMetaObject@QSensor@QtMobility@@SAABUQMetaObject@@XZ @ 111 NONAME ; struct QMetaObject const & QtMobility::QSensor::getStaticMetaObject(void)
-	?getStaticMetaObject@QSensorBackend@QtMobility@@SAABUQMetaObject@@XZ @ 112 NONAME ; struct QMetaObject const & QtMobility::QSensorBackend::getStaticMetaObject(void)
-	?getStaticMetaObject@QSensorReading@QtMobility@@SAABUQMetaObject@@XZ @ 113 NONAME ; struct QMetaObject const & QtMobility::QSensorReading::getStaticMetaObject(void)
-	?getStaticMetaObject@QTapReading@QtMobility@@SAABUQMetaObject@@XZ @ 114 NONAME ; struct QMetaObject const & QtMobility::QTapReading::getStaticMetaObject(void)
-	?getStaticMetaObject@QTapSensor@QtMobility@@SAABUQMetaObject@@XZ @ 115 NONAME ; struct QMetaObject const & QtMobility::QTapSensor::getStaticMetaObject(void)
-	?identifier@QSensor@QtMobility@@QBE?AVQByteArray@@XZ @ 116 NONAME ; class QByteArray QtMobility::QSensor::identifier(void) const
-	?isActive@QSensor@QtMobility@@QBE_NXZ @ 117 NONAME ; bool QtMobility::QSensor::isActive(void) const
-	?isBusy@QSensor@QtMobility@@QBE_NXZ @ 118 NONAME ; bool QtMobility::QSensor::isBusy(void) const
-	?isConnectedToBackend@QSensor@QtMobility@@QBE_NXZ @ 119 NONAME ; bool QtMobility::QSensor::isConnectedToBackend(void) const
-	?isDoubleTap@QTapReading@QtMobility@@QBE_NXZ @ 120 NONAME ; bool QtMobility::QTapReading::isDoubleTap(void) const
-	?lightLevel@QAmbientLightReading@QtMobility@@QBE?AW4LightLevel@12@XZ @ 121 NONAME ; enum QtMobility::QAmbientLightReading::LightLevel QtMobility::QAmbientLightReading::lightLevel(void) const
-	?load@QSensorPluginLoader@QtMobility@@AAEXXZ @ 122 NONAME ; void QtMobility::QSensorPluginLoader::load(void)
-	?metaObject@QAccelerometer@QtMobility@@UBEPBUQMetaObject@@XZ @ 123 NONAME ; struct QMetaObject const * QtMobility::QAccelerometer::metaObject(void) const
-	?metaObject@QAccelerometerReading@QtMobility@@UBEPBUQMetaObject@@XZ @ 124 NONAME ; struct QMetaObject const * QtMobility::QAccelerometerReading::metaObject(void) const
-	?metaObject@QAmbientLightReading@QtMobility@@UBEPBUQMetaObject@@XZ @ 125 NONAME ; struct QMetaObject const * QtMobility::QAmbientLightReading::metaObject(void) const
-	?metaObject@QAmbientLightSensor@QtMobility@@UBEPBUQMetaObject@@XZ @ 126 NONAME ; struct QMetaObject const * QtMobility::QAmbientLightSensor::metaObject(void) const
-	?metaObject@QCompass@QtMobility@@UBEPBUQMetaObject@@XZ @ 127 NONAME ; struct QMetaObject const * QtMobility::QCompass::metaObject(void) const
-	?metaObject@QCompassReading@QtMobility@@UBEPBUQMetaObject@@XZ @ 128 NONAME ; struct QMetaObject const * QtMobility::QCompassReading::metaObject(void) const
-	?metaObject@QMagnetometer@QtMobility@@UBEPBUQMetaObject@@XZ @ 129 NONAME ; struct QMetaObject const * QtMobility::QMagnetometer::metaObject(void) const
-	?metaObject@QMagnetometerReading@QtMobility@@UBEPBUQMetaObject@@XZ @ 130 NONAME ; struct QMetaObject const * QtMobility::QMagnetometerReading::metaObject(void) const
-	?metaObject@QOrientationReading@QtMobility@@UBEPBUQMetaObject@@XZ @ 131 NONAME ; struct QMetaObject const * QtMobility::QOrientationReading::metaObject(void) const
-	?metaObject@QOrientationSensor@QtMobility@@UBEPBUQMetaObject@@XZ @ 132 NONAME ; struct QMetaObject const * QtMobility::QOrientationSensor::metaObject(void) const
-	?metaObject@QProximityReading@QtMobility@@UBEPBUQMetaObject@@XZ @ 133 NONAME ; struct QMetaObject const * QtMobility::QProximityReading::metaObject(void) const
-	?metaObject@QProximitySensor@QtMobility@@UBEPBUQMetaObject@@XZ @ 134 NONAME ; struct QMetaObject const * QtMobility::QProximitySensor::metaObject(void) const
-	?metaObject@QRotationReading@QtMobility@@UBEPBUQMetaObject@@XZ @ 135 NONAME ; struct QMetaObject const * QtMobility::QRotationReading::metaObject(void) const
-	?metaObject@QRotationSensor@QtMobility@@UBEPBUQMetaObject@@XZ @ 136 NONAME ; struct QMetaObject const * QtMobility::QRotationSensor::metaObject(void) const
-	?metaObject@QSensor@QtMobility@@UBEPBUQMetaObject@@XZ @ 137 NONAME ; struct QMetaObject const * QtMobility::QSensor::metaObject(void) const
-	?metaObject@QSensorBackend@QtMobility@@UBEPBUQMetaObject@@XZ @ 138 NONAME ; struct QMetaObject const * QtMobility::QSensorBackend::metaObject(void) const
-	?metaObject@QSensorReading@QtMobility@@UBEPBUQMetaObject@@XZ @ 139 NONAME ; struct QMetaObject const * QtMobility::QSensorReading::metaObject(void) const
-	?metaObject@QTapReading@QtMobility@@UBEPBUQMetaObject@@XZ @ 140 NONAME ; struct QMetaObject const * QtMobility::QTapReading::metaObject(void) const
-	?metaObject@QTapSensor@QtMobility@@UBEPBUQMetaObject@@XZ @ 141 NONAME ; struct QMetaObject const * QtMobility::QTapSensor::metaObject(void) const
-	?newReadingAvailable@QSensorBackend@QtMobility@@QAEXXZ @ 142 NONAME ; void QtMobility::QSensorBackend::newReadingAvailable(void)
-	?orientation@QOrientationReading@QtMobility@@QBE?AW4Orientation@12@XZ @ 143 NONAME ; enum QtMobility::QOrientationReading::Orientation QtMobility::QOrientationReading::orientation(void) const
-	?outputRange@QSensor@QtMobility@@QBEHXZ @ 144 NONAME ; int QtMobility::QSensor::outputRange(void) const
-	?outputRanges@QSensor@QtMobility@@QBE?AV?$QList@Uqoutputrange@QtMobility@@@@XZ @ 145 NONAME ; class QList<struct QtMobility::qoutputrange> QtMobility::QSensor::outputRanges(void) const
-	?plugins@QSensorPluginLoader@QtMobility@@QBE?AV?$QList@PAVQSensorPluginInterface@QtMobility@@@@XZ @ 146 NONAME ; class QList<class QtMobility::QSensorPluginInterface *> QtMobility::QSensorPluginLoader::plugins(void) const
-	?qt_metacall@QAccelerometer@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 147 NONAME ; int QtMobility::QAccelerometer::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QAccelerometerReading@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 148 NONAME ; int QtMobility::QAccelerometerReading::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QAmbientLightReading@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 149 NONAME ; int QtMobility::QAmbientLightReading::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QAmbientLightSensor@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 150 NONAME ; int QtMobility::QAmbientLightSensor::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QCompass@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 151 NONAME ; int QtMobility::QCompass::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QCompassReading@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 152 NONAME ; int QtMobility::QCompassReading::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QMagnetometer@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 153 NONAME ; int QtMobility::QMagnetometer::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QMagnetometerReading@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 154 NONAME ; int QtMobility::QMagnetometerReading::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QOrientationReading@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 155 NONAME ; int QtMobility::QOrientationReading::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QOrientationSensor@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 156 NONAME ; int QtMobility::QOrientationSensor::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QProximityReading@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 157 NONAME ; int QtMobility::QProximityReading::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QProximitySensor@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 158 NONAME ; int QtMobility::QProximitySensor::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QRotationReading@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 159 NONAME ; int QtMobility::QRotationReading::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QRotationSensor@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 160 NONAME ; int QtMobility::QRotationSensor::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QSensor@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 161 NONAME ; int QtMobility::QSensor::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QSensorBackend@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 162 NONAME ; int QtMobility::QSensorBackend::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QSensorReading@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 163 NONAME ; int QtMobility::QSensorReading::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QTapReading@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 164 NONAME ; int QtMobility::QTapReading::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QTapSensor@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 165 NONAME ; int QtMobility::QTapSensor::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacast@QAccelerometer@QtMobility@@UAEPAXPBD@Z @ 166 NONAME ; void * QtMobility::QAccelerometer::qt_metacast(char const *)
-	?qt_metacast@QAccelerometerReading@QtMobility@@UAEPAXPBD@Z @ 167 NONAME ; void * QtMobility::QAccelerometerReading::qt_metacast(char const *)
-	?qt_metacast@QAmbientLightReading@QtMobility@@UAEPAXPBD@Z @ 168 NONAME ; void * QtMobility::QAmbientLightReading::qt_metacast(char const *)
-	?qt_metacast@QAmbientLightSensor@QtMobility@@UAEPAXPBD@Z @ 169 NONAME ; void * QtMobility::QAmbientLightSensor::qt_metacast(char const *)
-	?qt_metacast@QCompass@QtMobility@@UAEPAXPBD@Z @ 170 NONAME ; void * QtMobility::QCompass::qt_metacast(char const *)
-	?qt_metacast@QCompassReading@QtMobility@@UAEPAXPBD@Z @ 171 NONAME ; void * QtMobility::QCompassReading::qt_metacast(char const *)
-	?qt_metacast@QMagnetometer@QtMobility@@UAEPAXPBD@Z @ 172 NONAME ; void * QtMobility::QMagnetometer::qt_metacast(char const *)
-	?qt_metacast@QMagnetometerReading@QtMobility@@UAEPAXPBD@Z @ 173 NONAME ; void * QtMobility::QMagnetometerReading::qt_metacast(char const *)
-	?qt_metacast@QOrientationReading@QtMobility@@UAEPAXPBD@Z @ 174 NONAME ; void * QtMobility::QOrientationReading::qt_metacast(char const *)
-	?qt_metacast@QOrientationSensor@QtMobility@@UAEPAXPBD@Z @ 175 NONAME ; void * QtMobility::QOrientationSensor::qt_metacast(char const *)
-	?qt_metacast@QProximityReading@QtMobility@@UAEPAXPBD@Z @ 176 NONAME ; void * QtMobility::QProximityReading::qt_metacast(char const *)
-	?qt_metacast@QProximitySensor@QtMobility@@UAEPAXPBD@Z @ 177 NONAME ; void * QtMobility::QProximitySensor::qt_metacast(char const *)
-	?qt_metacast@QRotationReading@QtMobility@@UAEPAXPBD@Z @ 178 NONAME ; void * QtMobility::QRotationReading::qt_metacast(char const *)
-	?qt_metacast@QRotationSensor@QtMobility@@UAEPAXPBD@Z @ 179 NONAME ; void * QtMobility::QRotationSensor::qt_metacast(char const *)
-	?qt_metacast@QSensor@QtMobility@@UAEPAXPBD@Z @ 180 NONAME ; void * QtMobility::QSensor::qt_metacast(char const *)
-	?qt_metacast@QSensorBackend@QtMobility@@UAEPAXPBD@Z @ 181 NONAME ; void * QtMobility::QSensorBackend::qt_metacast(char const *)
-	?qt_metacast@QSensorReading@QtMobility@@UAEPAXPBD@Z @ 182 NONAME ; void * QtMobility::QSensorReading::qt_metacast(char const *)
-	?qt_metacast@QTapReading@QtMobility@@UAEPAXPBD@Z @ 183 NONAME ; void * QtMobility::QTapReading::qt_metacast(char const *)
-	?qt_metacast@QTapSensor@QtMobility@@UAEPAXPBD@Z @ 184 NONAME ; void * QtMobility::QTapSensor::qt_metacast(char const *)
-	?reading@QAccelerometer@QtMobility@@QBEPAVQAccelerometerReading@2@XZ @ 185 NONAME ; class QtMobility::QAccelerometerReading * QtMobility::QAccelerometer::reading(void) const
-	?reading@QAmbientLightSensor@QtMobility@@QBEPAVQAmbientLightReading@2@XZ @ 186 NONAME ; class QtMobility::QAmbientLightReading * QtMobility::QAmbientLightSensor::reading(void) const
-	?reading@QCompass@QtMobility@@QBEPAVQCompassReading@2@XZ @ 187 NONAME ; class QtMobility::QCompassReading * QtMobility::QCompass::reading(void) const
-	?reading@QMagnetometer@QtMobility@@QBEPAVQMagnetometerReading@2@XZ @ 188 NONAME ; class QtMobility::QMagnetometerReading * QtMobility::QMagnetometer::reading(void) const
-	?reading@QOrientationSensor@QtMobility@@QBEPAVQOrientationReading@2@XZ @ 189 NONAME ; class QtMobility::QOrientationReading * QtMobility::QOrientationSensor::reading(void) const
-	?reading@QProximitySensor@QtMobility@@QBEPAVQProximityReading@2@XZ @ 190 NONAME ; class QtMobility::QProximityReading * QtMobility::QProximitySensor::reading(void) const
-	?reading@QRotationSensor@QtMobility@@QBEPAVQRotationReading@2@XZ @ 191 NONAME ; class QtMobility::QRotationReading * QtMobility::QRotationSensor::reading(void) const
-	?reading@QSensor@QtMobility@@QBEPAVQSensorReading@2@XZ @ 192 NONAME ; class QtMobility::QSensorReading * QtMobility::QSensor::reading(void) const
-	?reading@QSensorBackend@QtMobility@@QBEPAVQSensorReading@2@XZ @ 193 NONAME ; class QtMobility::QSensorReading * QtMobility::QSensorBackend::reading(void) const
-	?reading@QTapSensor@QtMobility@@QBEPAVQTapReading@2@XZ @ 194 NONAME ; class QtMobility::QTapReading * QtMobility::QTapSensor::reading(void) const
-	?readingChanged@QSensor@QtMobility@@IAEXXZ @ 195 NONAME ; void QtMobility::QSensor::readingChanged(void)
-	?registerBackend@QSensorManager@QtMobility@@SAXABVQByteArray@@0PAVQSensorBackendFactory@2@@Z @ 196 NONAME ; void QtMobility::QSensorManager::registerBackend(class QByteArray const &, class QByteArray const &, class QtMobility::QSensorBackendFactory *)
-	?registerStaticPlugin@QSensorManager@QtMobility@@SAXP6APAVQSensorPluginInterface@2@XZ@Z @ 197 NONAME ; void QtMobility::QSensorManager::registerStaticPlugin(class QtMobility::QSensorPluginInterface * (*)(void))
-	?removeFilter@QSensor@QtMobility@@QAEXPAVQSensorFilter@2@@Z @ 198 NONAME ; void QtMobility::QSensor::removeFilter(class QtMobility::QSensorFilter *)
-	?sensor@QSensorBackend@QtMobility@@QBEPAVQSensor@2@XZ @ 199 NONAME ; class QtMobility::QSensor * QtMobility::QSensorBackend::sensor(void) const
-	?sensorBusy@QSensorBackend@QtMobility@@QAEXXZ @ 200 NONAME ; void QtMobility::QSensorBackend::sensorBusy(void)
-	?sensorError@QSensor@QtMobility@@IAEXH@Z @ 201 NONAME ; void QtMobility::QSensor::sensorError(int)
-	?sensorError@QSensorBackend@QtMobility@@QAEXH@Z @ 202 NONAME ; void QtMobility::QSensorBackend::sensorError(int)
-	?sensorStopped@QSensorBackend@QtMobility@@QAEXXZ @ 203 NONAME ; void QtMobility::QSensorBackend::sensorStopped(void)
-	?sensorTypes@QSensor@QtMobility@@SA?AV?$QList@VQByteArray@@@@XZ @ 204 NONAME ; class QList<class QByteArray> QtMobility::QSensor::sensorTypes(void)
-	?sensorsForType@QSensor@QtMobility@@SA?AV?$QList@VQByteArray@@@@ABVQByteArray@@@Z @ 205 NONAME ; class QList<class QByteArray> QtMobility::QSensor::sensorsForType(class QByteArray const &)
-	?setAzimuth@QCompassReading@QtMobility@@QAEXM@Z @ 206 NONAME ; void QtMobility::QCompassReading::setAzimuth(float)
-	?setCalibrationLevel@QCompassReading@QtMobility@@QAEXM@Z @ 207 NONAME ; void QtMobility::QCompassReading::setCalibrationLevel(float)
-	?setCalibrationLevel@QMagnetometerReading@QtMobility@@QAEXM@Z @ 208 NONAME ; void QtMobility::QMagnetometerReading::setCalibrationLevel(float)
-	?setClose@QProximityReading@QtMobility@@QAEX_N@Z @ 209 NONAME ; void QtMobility::QProximityReading::setClose(bool)
-	?setDataRate@QSensor@QtMobility@@QAEXH@Z @ 210 NONAME ; void QtMobility::QSensor::setDataRate(int)
-	?setDataRates@QSensorBackend@QtMobility@@QAEXPBVQSensor@2@@Z @ 211 NONAME ; void QtMobility::QSensorBackend::setDataRates(class QtMobility::QSensor const *)
-	?setDescription@QSensorBackend@QtMobility@@QAEXABVQString@@@Z @ 212 NONAME ; void QtMobility::QSensorBackend::setDescription(class QString const &)
-	?setDoubleTap@QTapReading@QtMobility@@QAEX_N@Z @ 213 NONAME ; void QtMobility::QTapReading::setDoubleTap(bool)
-	?setIdentifier@QSensor@QtMobility@@QAEXABVQByteArray@@@Z @ 214 NONAME ; void QtMobility::QSensor::setIdentifier(class QByteArray const &)
-	?setLightLevel@QAmbientLightReading@QtMobility@@QAEXW4LightLevel@12@@Z @ 215 NONAME ; void QtMobility::QAmbientLightReading::setLightLevel(enum QtMobility::QAmbientLightReading::LightLevel)
-	?setOrientation@QOrientationReading@QtMobility@@QAEXW4Orientation@12@@Z @ 216 NONAME ; void QtMobility::QOrientationReading::setOrientation(enum QtMobility::QOrientationReading::Orientation)
-	?setOutputRange@QSensor@QtMobility@@QAEXH@Z @ 217 NONAME ; void QtMobility::QSensor::setOutputRange(int)
-	?setReadings@QSensorBackend@QtMobility@@AAEXPAVQSensorReading@2@00@Z @ 218 NONAME ; void QtMobility::QSensorBackend::setReadings(class QtMobility::QSensorReading *, class QtMobility::QSensorReading *, class QtMobility::QSensorReading *)
-	?setSensor@QSensorFilter@QtMobility@@MAEXPAVQSensor@2@@Z @ 219 NONAME ; void QtMobility::QSensorFilter::setSensor(class QtMobility::QSensor *)
-	?setTapDirection@QTapReading@QtMobility@@QAEXW4TapDirection@12@@Z @ 220 NONAME ; void QtMobility::QTapReading::setTapDirection(enum QtMobility::QTapReading::TapDirection)
-	?setTimestamp@QSensorReading@QtMobility@@QAEXVqtimestamp@2@@Z @ 221 NONAME ; void QtMobility::QSensorReading::setTimestamp(class QtMobility::qtimestamp)
-	?setX@QAccelerometerReading@QtMobility@@QAEXM@Z @ 222 NONAME ; void QtMobility::QAccelerometerReading::setX(float)
-	?setX@QMagnetometerReading@QtMobility@@QAEXM@Z @ 223 NONAME ; void QtMobility::QMagnetometerReading::setX(float)
-	?setX@QRotationReading@QtMobility@@QAEXM@Z @ 224 NONAME ; void QtMobility::QRotationReading::setX(float)
-	?setY@QAccelerometerReading@QtMobility@@QAEXM@Z @ 225 NONAME ; void QtMobility::QAccelerometerReading::setY(float)
-	?setY@QMagnetometerReading@QtMobility@@QAEXM@Z @ 226 NONAME ; void QtMobility::QMagnetometerReading::setY(float)
-	?setY@QRotationReading@QtMobility@@QAEXM@Z @ 227 NONAME ; void QtMobility::QRotationReading::setY(float)
-	?setZ@QAccelerometerReading@QtMobility@@QAEXM@Z @ 228 NONAME ; void QtMobility::QAccelerometerReading::setZ(float)
-	?setZ@QMagnetometerReading@QtMobility@@QAEXM@Z @ 229 NONAME ; void QtMobility::QMagnetometerReading::setZ(float)
-	?setZ@QRotationReading@QtMobility@@QAEXM@Z @ 230 NONAME ; void QtMobility::QRotationReading::setZ(float)
-	?start@QSensor@QtMobility@@QAE_NXZ @ 231 NONAME ; bool QtMobility::QSensor::start(void)
-	?stop@QSensor@QtMobility@@QAEXXZ @ 232 NONAME ; void QtMobility::QSensor::stop(void)
-	?tapDirection@QTapReading@QtMobility@@QBE?AW4TapDirection@12@XZ @ 233 NONAME ; enum QtMobility::QTapReading::TapDirection QtMobility::QTapReading::tapDirection(void) const
-	?timestamp@QSensorReading@QtMobility@@QBE?AVqtimestamp@2@XZ @ 234 NONAME ; class QtMobility::qtimestamp QtMobility::QSensorReading::timestamp(void) const
-	?tr@QAccelerometer@QtMobility@@SA?AVQString@@PBD0@Z @ 235 NONAME ; class QString QtMobility::QAccelerometer::tr(char const *, char const *)
-	?tr@QAccelerometer@QtMobility@@SA?AVQString@@PBD0H@Z @ 236 NONAME ; class QString QtMobility::QAccelerometer::tr(char const *, char const *, int)
-	?tr@QAccelerometerReading@QtMobility@@SA?AVQString@@PBD0@Z @ 237 NONAME ; class QString QtMobility::QAccelerometerReading::tr(char const *, char const *)
-	?tr@QAccelerometerReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 238 NONAME ; class QString QtMobility::QAccelerometerReading::tr(char const *, char const *, int)
-	?tr@QAmbientLightReading@QtMobility@@SA?AVQString@@PBD0@Z @ 239 NONAME ; class QString QtMobility::QAmbientLightReading::tr(char const *, char const *)
-	?tr@QAmbientLightReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 240 NONAME ; class QString QtMobility::QAmbientLightReading::tr(char const *, char const *, int)
-	?tr@QAmbientLightSensor@QtMobility@@SA?AVQString@@PBD0@Z @ 241 NONAME ; class QString QtMobility::QAmbientLightSensor::tr(char const *, char const *)
-	?tr@QAmbientLightSensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 242 NONAME ; class QString QtMobility::QAmbientLightSensor::tr(char const *, char const *, int)
-	?tr@QCompass@QtMobility@@SA?AVQString@@PBD0@Z @ 243 NONAME ; class QString QtMobility::QCompass::tr(char const *, char const *)
-	?tr@QCompass@QtMobility@@SA?AVQString@@PBD0H@Z @ 244 NONAME ; class QString QtMobility::QCompass::tr(char const *, char const *, int)
-	?tr@QCompassReading@QtMobility@@SA?AVQString@@PBD0@Z @ 245 NONAME ; class QString QtMobility::QCompassReading::tr(char const *, char const *)
-	?tr@QCompassReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 246 NONAME ; class QString QtMobility::QCompassReading::tr(char const *, char const *, int)
-	?tr@QMagnetometer@QtMobility@@SA?AVQString@@PBD0@Z @ 247 NONAME ; class QString QtMobility::QMagnetometer::tr(char const *, char const *)
-	?tr@QMagnetometer@QtMobility@@SA?AVQString@@PBD0H@Z @ 248 NONAME ; class QString QtMobility::QMagnetometer::tr(char const *, char const *, int)
-	?tr@QMagnetometerReading@QtMobility@@SA?AVQString@@PBD0@Z @ 249 NONAME ; class QString QtMobility::QMagnetometerReading::tr(char const *, char const *)
-	?tr@QMagnetometerReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 250 NONAME ; class QString QtMobility::QMagnetometerReading::tr(char const *, char const *, int)
+	?metaObject@QRotationReading@QtMobility@@UBEPBUQMetaObject@@XZ @ 1 NONAME ; struct QMetaObject const * QtMobility::QRotationReading::metaObject(void) const
+	??1QSensorReading@QtMobility@@UAE@XZ @ 2 NONAME ; QtMobility::QSensorReading::~QSensorReading(void)
+	?metaObject@QCompassReading@QtMobility@@UBEPBUQMetaObject@@XZ @ 3 NONAME ; struct QMetaObject const * QtMobility::QCompassReading::metaObject(void) const
+	??1QRotationReading@QtMobility@@UAE@XZ @ 4 NONAME ; QtMobility::QRotationReading::~QRotationReading(void)
+	?getStaticMetaObject@QSensorReading@QtMobility@@SAABUQMetaObject@@XZ @ 5 NONAME ; struct QMetaObject const & QtMobility::QSensorReading::getStaticMetaObject(void)
+	?tr@QRotationReading@QtMobility@@SA?AVQString@@PBD0@Z @ 6 NONAME ; class QString QtMobility::QRotationReading::tr(char const *, char const *)
+	?staticMetaObject@QAccelerometer@QtMobility@@2UQMetaObject@@B @ 7 NONAME ; struct QMetaObject const QtMobility::QAccelerometer::staticMetaObject
+	??0QAmbientLightSensor@QtMobility@@QAE@PAVQObject@@@Z @ 8 NONAME ; QtMobility::QAmbientLightSensor::QAmbientLightSensor(class QObject *)
+	?staticMetaObject@QSensor@QtMobility@@2UQMetaObject@@B @ 9 NONAME ; struct QMetaObject const QtMobility::QSensor::staticMetaObject
+	?tr@QAccelerometerReading@QtMobility@@SA?AVQString@@PBD0@Z @ 10 NONAME ; class QString QtMobility::QAccelerometerReading::tr(char const *, char const *)
+	?filter@QCompassFilter@QtMobility@@EAE_NPAVQSensorReading@2@@Z @ 11 NONAME ; bool QtMobility::QCompassFilter::filter(class QtMobility::QSensorReading *)
+	?trUtf8@QRotationSensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 12 NONAME ; class QString QtMobility::QRotationSensor::trUtf8(char const *, char const *, int)
+	?getStaticMetaObject@QAccelerometerReading@QtMobility@@SAABUQMetaObject@@XZ @ 13 NONAME ; struct QMetaObject const & QtMobility::QAccelerometerReading::getStaticMetaObject(void)
+	?identifier@QSensor@QtMobility@@QBE?AVQByteArray@@XZ @ 14 NONAME ; class QByteArray QtMobility::QSensor::identifier(void) const
+	?trUtf8@QOrientationReading@QtMobility@@SA?AVQString@@PBD0@Z @ 15 NONAME ; class QString QtMobility::QOrientationReading::trUtf8(char const *, char const *)
+	?getStaticMetaObject@QMagnetometer@QtMobility@@SAABUQMetaObject@@XZ @ 16 NONAME ; struct QMetaObject const & QtMobility::QMagnetometer::getStaticMetaObject(void)
+	?trUtf8@QMagnetometer@QtMobility@@SA?AVQString@@PBD0H@Z @ 17 NONAME ; class QString QtMobility::QMagnetometer::trUtf8(char const *, char const *, int)
+	?tr@QCompass@QtMobility@@SA?AVQString@@PBD0H@Z @ 18 NONAME ; class QString QtMobility::QCompass::tr(char const *, char const *, int)
+	?tr@QAccelerometer@QtMobility@@SA?AVQString@@PBD0@Z @ 19 NONAME ; class QString QtMobility::QAccelerometer::tr(char const *, char const *)
+	?qt_metacall@QTapReading@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 20 NONAME ; int QtMobility::QTapReading::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacast@QMagnetometerReading@QtMobility@@UAEPAXPBD@Z @ 21 NONAME ; void * QtMobility::QMagnetometerReading::qt_metacast(char const *)
+	?qt_metacast@QAmbientLightSensor@QtMobility@@UAEPAXPBD@Z @ 22 NONAME ; void * QtMobility::QAmbientLightSensor::qt_metacast(char const *)
+	?setX@QRotationReading@QtMobility@@QAEXM@Z @ 23 NONAME ; void QtMobility::QRotationReading::setX(float)
+	?getStaticMetaObject@QRotationSensor@QtMobility@@SAABUQMetaObject@@XZ @ 24 NONAME ; struct QMetaObject const & QtMobility::QRotationSensor::getStaticMetaObject(void)
+	?trUtf8@QSensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 25 NONAME ; class QString QtMobility::QSensor::trUtf8(char const *, char const *, int)
+	?tr@QMagnetometerReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 26 NONAME ; class QString QtMobility::QMagnetometerReading::tr(char const *, char const *, int)
+	?type@QCompass@QtMobility@@2PBDB @ 27 NONAME ; char const * const QtMobility::QCompass::type
+	?metaObject@QSensorBackend@QtMobility@@UBEPBUQMetaObject@@XZ @ 28 NONAME ; struct QMetaObject const * QtMobility::QSensorBackend::metaObject(void) const
+	?trUtf8@QCompass@QtMobility@@SA?AVQString@@PBD0@Z @ 29 NONAME ; class QString QtMobility::QCompass::trUtf8(char const *, char const *)
+	?setY@QRotationReading@QtMobility@@QAEXM@Z @ 30 NONAME ; void QtMobility::QRotationReading::setY(float)
+	?qt_metacast@QMagnetometer@QtMobility@@UAEPAXPBD@Z @ 31 NONAME ; void * QtMobility::QMagnetometer::qt_metacast(char const *)
+	?setTapDirection@QTapReading@QtMobility@@QAEXW4TapDirection@12@@Z @ 32 NONAME ; void QtMobility::QTapReading::setTapDirection(enum QtMobility::QTapReading::TapDirection)
+	?tr@QAmbientLightSensor@QtMobility@@SA?AVQString@@PBD0@Z @ 33 NONAME ; class QString QtMobility::QAmbientLightSensor::tr(char const *, char const *)
+	?getStaticMetaObject@QRotationReading@QtMobility@@SAABUQMetaObject@@XZ @ 34 NONAME ; struct QMetaObject const & QtMobility::QRotationReading::getStaticMetaObject(void)
+	?setZ@QRotationReading@QtMobility@@QAEXM@Z @ 35 NONAME ; void QtMobility::QRotationReading::setZ(float)
+	?qt_metacall@QOrientationSensor@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 36 NONAME ; int QtMobility::QOrientationSensor::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacast@QOrientationReading@QtMobility@@UAEPAXPBD@Z @ 37 NONAME ; void * QtMobility::QOrientationReading::qt_metacast(char const *)
+	?tr@QProximityReading@QtMobility@@SA?AVQString@@PBD0@Z @ 38 NONAME ; class QString QtMobility::QProximityReading::tr(char const *, char const *)
+	?tr@QMagnetometer@QtMobility@@SA?AVQString@@PBD0H@Z @ 39 NONAME ; class QString QtMobility::QMagnetometer::tr(char const *, char const *, int)
+	?reading@QSensorBackend@QtMobility@@QBEPAVQSensorReading@2@XZ @ 40 NONAME ; class QtMobility::QSensorReading * QtMobility::QSensorBackend::reading(void) const
+	??0QTapReading@QtMobility@@QAE@PAVQObject@@@Z @ 41 NONAME ; QtMobility::QTapReading::QTapReading(class QObject *)
+	?copyValuesFrom@QRotationReading@QtMobility@@UAEXPAVQSensorReading@2@@Z @ 42 NONAME ; void QtMobility::QRotationReading::copyValuesFrom(class QtMobility::QSensorReading *)
+	?tr@QAccelerometerReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 43 NONAME ; class QString QtMobility::QAccelerometerReading::tr(char const *, char const *, int)
+	?staticMetaObject@QCompassReading@QtMobility@@2UQMetaObject@@B @ 44 NONAME ; struct QMetaObject const QtMobility::QCompassReading::staticMetaObject
+	?setReadings@QSensorBackend@QtMobility@@AAEXPAVQSensorReading@2@00@Z @ 45 NONAME ; void QtMobility::QSensorBackend::setReadings(class QtMobility::QSensorReading *, class QtMobility::QSensorReading *, class QtMobility::QSensorReading *)
+	?qt_metacast@QAmbientLightReading@QtMobility@@UAEPAXPBD@Z @ 46 NONAME ; void * QtMobility::QAmbientLightReading::qt_metacast(char const *)
+	?qt_metacast@QProximitySensor@QtMobility@@UAEPAXPBD@Z @ 47 NONAME ; void * QtMobility::QProximitySensor::qt_metacast(char const *)
+	?isDoubleTap@QTapReading@QtMobility@@QBE_NXZ @ 48 NONAME ; bool QtMobility::QTapReading::isDoubleTap(void) const
+	?tr@QSensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 49 NONAME ; class QString QtMobility::QSensor::tr(char const *, char const *, int)
+	?qt_metacast@QAccelerometerReading@QtMobility@@UAEPAXPBD@Z @ 50 NONAME ; void * QtMobility::QAccelerometerReading::qt_metacast(char const *)
+	?d_ptr@QSensorReading@QtMobility@@IAEPAV?$QScopedPointer@VQSensorReadingPrivate@QtMobility@@U?$QScopedPointerDeleter@VQSensorReadingPrivate@QtMobility@@@@@@XZ @ 51 NONAME ; class QScopedPointer<class QtMobility::QSensorReadingPrivate, struct QScopedPointerDeleter<class QtMobility::QSensorReadingPrivate> > * QtMobility::QSensorReading::d_ptr(void)
+	?tr@QCompass@QtMobility@@SA?AVQString@@PBD0@Z @ 52 NONAME ; class QString QtMobility::QCompass::tr(char const *, char const *)
+	??0QProximityReading@QtMobility@@QAE@PAVQObject@@@Z @ 53 NONAME ; QtMobility::QProximityReading::QProximityReading(class QObject *)
+	??_EQProximityReading@QtMobility@@UAE@I@Z @ 54 NONAME ; QtMobility::QProximityReading::~QProximityReading(unsigned int)
+	?setDataRate@QSensor@QtMobility@@QAEXH@Z @ 55 NONAME ; void QtMobility::QSensor::setDataRate(int)
+	?qt_metacall@QSensorReading@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 56 NONAME ; int QtMobility::QSensorReading::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??1QCompass@QtMobility@@UAE@XZ @ 57 NONAME ; QtMobility::QCompass::~QCompass(void)
+	?staticMetaObject@QAmbientLightReading@QtMobility@@2UQMetaObject@@B @ 58 NONAME ; struct QMetaObject const QtMobility::QAmbientLightReading::staticMetaObject
+	?qt_metacall@QSensorBackend@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 59 NONAME ; int QtMobility::QSensorBackend::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??_EQOrientationSensor@QtMobility@@UAE@I@Z @ 60 NONAME ; QtMobility::QOrientationSensor::~QOrientationSensor(unsigned int)
+	?trUtf8@QMagnetometerReading@QtMobility@@SA?AVQString@@PBD0@Z @ 61 NONAME ; class QString QtMobility::QMagnetometerReading::trUtf8(char const *, char const *)
+	?qt_metacall@QAccelerometer@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 62 NONAME ; int QtMobility::QAccelerometer::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??0QMagnetometerReading@QtMobility@@QAE@PAVQObject@@@Z @ 63 NONAME ; QtMobility::QMagnetometerReading::QMagnetometerReading(class QObject *)
+	?filter@QRotationFilter@QtMobility@@EAE_NPAVQSensorReading@2@@Z @ 64 NONAME ; bool QtMobility::QRotationFilter::filter(class QtMobility::QSensorReading *)
+	??1QSensorBackendFactory@QtMobility@@IAE@XZ @ 65 NONAME ; QtMobility::QSensorBackendFactory::~QSensorBackendFactory(void)
+	?staticMetaObject@QAccelerometerReading@QtMobility@@2UQMetaObject@@B @ 66 NONAME ; struct QMetaObject const QtMobility::QAccelerometerReading::staticMetaObject
+	??1QSensor@QtMobility@@UAE@XZ @ 67 NONAME ; QtMobility::QSensor::~QSensor(void)
+	?qt_metacast@QOrientationSensor@QtMobility@@UAEPAXPBD@Z @ 68 NONAME ; void * QtMobility::QOrientationSensor::qt_metacast(char const *)
+	?copyValuesFrom@QAccelerometerReading@QtMobility@@UAEXPAVQSensorReading@2@@Z @ 69 NONAME ; void QtMobility::QAccelerometerReading::copyValuesFrom(class QtMobility::QSensorReading *)
+	?reading@QCompass@QtMobility@@QBEPAVQCompassReading@2@XZ @ 70 NONAME ; class QtMobility::QCompassReading * QtMobility::QCompass::reading(void) const
+	?qt_metacall@QMagnetometerReading@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 71 NONAME ; int QtMobility::QMagnetometerReading::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QAmbientLightSensor@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 72 NONAME ; int QtMobility::QAmbientLightSensor::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?isBusy@QSensor@QtMobility@@QBE_NXZ @ 73 NONAME ; bool QtMobility::QSensor::isBusy(void) const
+	?z@QRotationReading@QtMobility@@QBEMXZ @ 74 NONAME ; float QtMobility::QRotationReading::z(void) const
+	?tr@QRotationSensor@QtMobility@@SA?AVQString@@PBD0@Z @ 75 NONAME ; class QString QtMobility::QRotationSensor::tr(char const *, char const *)
+	?trUtf8@QProximitySensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 76 NONAME ; class QString QtMobility::QProximitySensor::trUtf8(char const *, char const *, int)
+	?outputRanges@QSensor@QtMobility@@QBE?AV?$QList@Uqoutputrange@QtMobility@@@@XZ @ 77 NONAME ; class QList<struct QtMobility::qoutputrange> QtMobility::QSensor::outputRanges(void) const
+	?trUtf8@QSensorBackend@QtMobility@@SA?AVQString@@PBD0@Z @ 78 NONAME ; class QString QtMobility::QSensorBackend::trUtf8(char const *, char const *)
+	?filter@QOrientationFilter@QtMobility@@EAE_NPAVQSensorReading@2@@Z @ 79 NONAME ; bool QtMobility::QOrientationFilter::filter(class QtMobility::QSensorReading *)
+	?trUtf8@QAmbientLightReading@QtMobility@@SA?AVQString@@PBD0@Z @ 80 NONAME ; class QString QtMobility::QAmbientLightReading::trUtf8(char const *, char const *)
+	?tr@QOrientationSensor@QtMobility@@SA?AVQString@@PBD0@Z @ 81 NONAME ; class QString QtMobility::QOrientationSensor::tr(char const *, char const *)
+	?setDescription@QSensorBackend@QtMobility@@QAEXABVQString@@@Z @ 82 NONAME ; void QtMobility::QSensorBackend::setDescription(class QString const &)
+	?reading@QOrientationSensor@QtMobility@@QBEPAVQOrientationReading@2@XZ @ 83 NONAME ; class QtMobility::QOrientationReading * QtMobility::QOrientationSensor::reading(void) const
+	??0QSensorFilter@QtMobility@@IAE@XZ @ 84 NONAME ; QtMobility::QSensorFilter::QSensorFilter(void)
+	?setIdentifier@QSensor@QtMobility@@QAEXABVQByteArray@@@Z @ 85 NONAME ; void QtMobility::QSensor::setIdentifier(class QByteArray const &)
+	??0QSensorReading@QtMobility@@IAE@PAVQObject@@PAVQSensorReadingPrivate@1@@Z @ 86 NONAME ; QtMobility::QSensorReading::QSensorReading(class QObject *, class QtMobility::QSensorReadingPrivate *)
+	?reading@QAmbientLightSensor@QtMobility@@QBEPAVQAmbientLightReading@2@XZ @ 87 NONAME ; class QtMobility::QAmbientLightReading * QtMobility::QAmbientLightSensor::reading(void) const
+	?calibrationLevel@QMagnetometerReading@QtMobility@@QBEMXZ @ 88 NONAME ; float QtMobility::QMagnetometerReading::calibrationLevel(void) const
+	?readingChanged@QSensor@QtMobility@@IAEXXZ @ 89 NONAME ; void QtMobility::QSensor::readingChanged(void)
+	?tr@QRotationSensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 90 NONAME ; class QString QtMobility::QRotationSensor::tr(char const *, char const *, int)
+	?copyValuesFrom@QTapReading@QtMobility@@UAEXPAVQSensorReading@2@@Z @ 91 NONAME ; void QtMobility::QTapReading::copyValuesFrom(class QtMobility::QSensorReading *)
+	?tr@QSensorBackend@QtMobility@@SA?AVQString@@PBD0@Z @ 92 NONAME ; class QString QtMobility::QSensorBackend::tr(char const *, char const *)
+	?filter@QMagnetometerFilter@QtMobility@@EAE_NPAVQSensorReading@2@@Z @ 93 NONAME ; bool QtMobility::QMagnetometerFilter::filter(class QtMobility::QSensorReading *)
+	?setTimestamp@QSensorReading@QtMobility@@QAEXVqtimestamp@2@@Z @ 94 NONAME ; void QtMobility::QSensorReading::setTimestamp(class QtMobility::qtimestamp)
+	?copyValuesFrom@QMagnetometerReading@QtMobility@@UAEXPAVQSensorReading@2@@Z @ 95 NONAME ; void QtMobility::QMagnetometerReading::copyValuesFrom(class QtMobility::QSensorReading *)
+	?getStaticMetaObject@QMagnetometerReading@QtMobility@@SAABUQMetaObject@@XZ @ 96 NONAME ; struct QMetaObject const & QtMobility::QMagnetometerReading::getStaticMetaObject(void)
+	?trUtf8@QSensorReading@QtMobility@@SA?AVQString@@PBD0@Z @ 97 NONAME ; class QString QtMobility::QSensorReading::trUtf8(char const *, char const *)
+	?value@QSensorReading@QtMobility@@QBE?AVQVariant@@H@Z @ 98 NONAME ; class QVariant QtMobility::QSensorReading::value(int) const
+	??1QSensorFilter@QtMobility@@IAE@XZ @ 99 NONAME ; QtMobility::QSensorFilter::~QSensorFilter(void)
+	?calibrationLevel@QCompassReading@QtMobility@@QBEMXZ @ 100 NONAME ; float QtMobility::QCompassReading::calibrationLevel(void) const
+	?trUtf8@QOrientationSensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 101 NONAME ; class QString QtMobility::QOrientationSensor::trUtf8(char const *, char const *, int)
+	?qt_metacast@QCompass@QtMobility@@UAEPAXPBD@Z @ 102 NONAME ; void * QtMobility::QCompass::qt_metacast(char const *)
+	??_EQTapReading@QtMobility@@UAE@I@Z @ 103 NONAME ; QtMobility::QTapReading::~QTapReading(unsigned int)
+	?metaObject@QAmbientLightSensor@QtMobility@@UBEPBUQMetaObject@@XZ @ 104 NONAME ; struct QMetaObject const * QtMobility::QAmbientLightSensor::metaObject(void) const
+	?error@QSensor@QtMobility@@QBEHXZ @ 105 NONAME ; int QtMobility::QSensor::error(void) const
+	??1QMagnetometer@QtMobility@@UAE@XZ @ 106 NONAME ; QtMobility::QMagnetometer::~QMagnetometer(void)
+	?metaObject@QAccelerometer@QtMobility@@UBEPBUQMetaObject@@XZ @ 107 NONAME ; struct QMetaObject const * QtMobility::QAccelerometer::metaObject(void) const
+	?sensorError@QSensor@QtMobility@@IAEXH@Z @ 108 NONAME ; void QtMobility::QSensor::sensorError(int)
+	?setClose@QProximityReading@QtMobility@@QAEX_N@Z @ 109 NONAME ; void QtMobility::QProximityReading::setClose(bool)
+	?reading@QSensor@QtMobility@@QBEPAVQSensorReading@2@XZ @ 110 NONAME ; class QtMobility::QSensorReading * QtMobility::QSensor::reading(void) const
+	?sensorBusy@QSensorBackend@QtMobility@@QAEXXZ @ 111 NONAME ; void QtMobility::QSensorBackend::sensorBusy(void)
+	?staticMetaObject@QSensorBackend@QtMobility@@2UQMetaObject@@B @ 112 NONAME ; struct QMetaObject const QtMobility::QSensorBackend::staticMetaObject
+	?qt_metacast@QSensorReading@QtMobility@@UAEPAXPBD@Z @ 113 NONAME ; void * QtMobility::QSensorReading::qt_metacast(char const *)
+	?availableDataRates@QSensor@QtMobility@@QBE?AV?$QList@U?$QPair@HH@@@@XZ @ 114 NONAME ; class QList<struct QPair<int, int> > QtMobility::QSensor::availableDataRates(void) const
+	?getStaticMetaObject@QAmbientLightReading@QtMobility@@SAABUQMetaObject@@XZ @ 115 NONAME ; struct QMetaObject const & QtMobility::QAmbientLightReading::getStaticMetaObject(void)
+	?addDataRate@QSensorBackend@QtMobility@@QAEXMM@Z @ 116 NONAME ; void QtMobility::QSensorBackend::addDataRate(float, float)
+	?reading@QRotationSensor@QtMobility@@QBEPAVQRotationReading@2@XZ @ 117 NONAME ; class QtMobility::QRotationReading * QtMobility::QRotationSensor::reading(void) const
+	??0QCompassReading@QtMobility@@QAE@PAVQObject@@@Z @ 118 NONAME ; QtMobility::QCompassReading::QCompassReading(class QObject *)
+	?tr@QAmbientLightReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 119 NONAME ; class QString QtMobility::QAmbientLightReading::tr(char const *, char const *, int)
+	??_EQCompass@QtMobility@@UAE@I@Z @ 120 NONAME ; QtMobility::QCompass::~QCompass(unsigned int)
+	?qt_metacast@QSensor@QtMobility@@UAEPAXPBD@Z @ 121 NONAME ; void * QtMobility::QSensor::qt_metacast(char const *)
+	?tr@QSensorReading@QtMobility@@SA?AVQString@@PBD0@Z @ 122 NONAME ; class QString QtMobility::QSensorReading::tr(char const *, char const *)
+	?timestamp@QSensorReading@QtMobility@@QBE?AVqtimestamp@2@XZ @ 123 NONAME ; class QtMobility::qtimestamp QtMobility::QSensorReading::timestamp(void) const
+	?trUtf8@QSensor@QtMobility@@SA?AVQString@@PBD0@Z @ 124 NONAME ; class QString QtMobility::QSensor::trUtf8(char const *, char const *)
+	?trUtf8@QRotationSensor@QtMobility@@SA?AVQString@@PBD0@Z @ 125 NONAME ; class QString QtMobility::QRotationSensor::trUtf8(char const *, char const *)
+	?tr@QProximitySensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 126 NONAME ; class QString QtMobility::QProximitySensor::tr(char const *, char const *, int)
+	?x@QMagnetometerReading@QtMobility@@QBEMXZ @ 127 NONAME ; float QtMobility::QMagnetometerReading::x(void) const
+	??0QTapSensor@QtMobility@@QAE@PAVQObject@@@Z @ 128 NONAME ; QtMobility::QTapSensor::QTapSensor(class QObject *)
+	??0QOrientationReading@QtMobility@@QAE@PAVQObject@@@Z @ 129 NONAME ; QtMobility::QOrientationReading::QOrientationReading(class QObject *)
+	?type@QAmbientLightSensor@QtMobility@@2PBDB @ 130 NONAME ; char const * const QtMobility::QAmbientLightSensor::type
+	?sensorsForType@QSensor@QtMobility@@SA?AV?$QList@VQByteArray@@@@ABVQByteArray@@@Z @ 131 NONAME ; class QList<class QByteArray> QtMobility::QSensor::sensorsForType(class QByteArray const &)
+	?reading@QTapSensor@QtMobility@@QBEPAVQTapReading@2@XZ @ 132 NONAME ; class QtMobility::QTapReading * QtMobility::QTapSensor::reading(void) const
+	?getStaticMetaObject@QOrientationReading@QtMobility@@SAABUQMetaObject@@XZ @ 133 NONAME ; struct QMetaObject const & QtMobility::QOrientationReading::getStaticMetaObject(void)
+	??_EQAmbientLightSensor@QtMobility@@UAE@I@Z @ 134 NONAME ; QtMobility::QAmbientLightSensor::~QAmbientLightSensor(unsigned int)
+	?defaultSensorForType@QSensor@QtMobility@@SA?AVQByteArray@@ABV3@@Z @ 135 NONAME ; class QByteArray QtMobility::QSensor::defaultSensorForType(class QByteArray const &)
+	?getStaticMetaObject@QTapSensor@QtMobility@@SAABUQMetaObject@@XZ @ 136 NONAME ; struct QMetaObject const & QtMobility::QTapSensor::getStaticMetaObject(void)
+	?getStaticMetaObject@QProximityReading@QtMobility@@SAABUQMetaObject@@XZ @ 137 NONAME ; struct QMetaObject const & QtMobility::QProximityReading::getStaticMetaObject(void)
+	?metaObject@QSensorReading@QtMobility@@UBEPBUQMetaObject@@XZ @ 138 NONAME ; struct QMetaObject const * QtMobility::QSensorReading::metaObject(void) const
+	??0QMagnetometer@QtMobility@@QAE@PAVQObject@@@Z @ 139 NONAME ; QtMobility::QMagnetometer::QMagnetometer(class QObject *)
+	??0QSensorBackend@QtMobility@@QAE@PAVQSensor@1@@Z @ 140 NONAME ; QtMobility::QSensorBackend::QSensorBackend(class QtMobility::QSensor *)
+	??_EQRotationSensor@QtMobility@@UAE@I@Z @ 141 NONAME ; QtMobility::QRotationSensor::~QRotationSensor(unsigned int)
+	?metaObject@QRotationSensor@QtMobility@@UBEPBUQMetaObject@@XZ @ 142 NONAME ; struct QMetaObject const * QtMobility::QRotationSensor::metaObject(void) const
+	??1QAccelerometerReading@QtMobility@@UAE@XZ @ 143 NONAME ; QtMobility::QAccelerometerReading::~QAccelerometerReading(void)
+	?sensorStopped@QSensorBackend@QtMobility@@QAEXXZ @ 144 NONAME ; void QtMobility::QSensorBackend::sensorStopped(void)
+	?metaObject@QSensor@QtMobility@@UBEPBUQMetaObject@@XZ @ 145 NONAME ; struct QMetaObject const * QtMobility::QSensor::metaObject(void) const
+	?setCalibrationLevel@QMagnetometerReading@QtMobility@@QAEXM@Z @ 146 NONAME ; void QtMobility::QMagnetometerReading::setCalibrationLevel(float)
+	?metaObject@QProximityReading@QtMobility@@UBEPBUQMetaObject@@XZ @ 147 NONAME ; struct QMetaObject const * QtMobility::QProximityReading::metaObject(void) const
+	?metaObject@QAccelerometerReading@QtMobility@@UBEPBUQMetaObject@@XZ @ 148 NONAME ; struct QMetaObject const * QtMobility::QAccelerometerReading::metaObject(void) const
+	??_EQSensorBackend@QtMobility@@UAE@I@Z @ 149 NONAME ; QtMobility::QSensorBackend::~QSensorBackend(unsigned int)
+	?trUtf8@QAmbientLightSensor@QtMobility@@SA?AVQString@@PBD0@Z @ 150 NONAME ; class QString QtMobility::QAmbientLightSensor::trUtf8(char const *, char const *)
+	?setOutputRange@QSensor@QtMobility@@QAEXH@Z @ 151 NONAME ; void QtMobility::QSensor::setOutputRange(int)
+	?metaObject@QCompass@QtMobility@@UBEPBUQMetaObject@@XZ @ 152 NONAME ; struct QMetaObject const * QtMobility::QCompass::metaObject(void) const
+	?tr@QTapSensor@QtMobility@@SA?AVQString@@PBD0@Z @ 153 NONAME ; class QString QtMobility::QTapSensor::tr(char const *, char const *)
+	?d_func@QSensor@QtMobility@@IBEPAVQSensorPrivate@2@XZ @ 154 NONAME ; class QtMobility::QSensorPrivate * QtMobility::QSensor::d_func(void) const
+	?setLightLevel@QAmbientLightReading@QtMobility@@QAEXW4LightLevel@12@@Z @ 155 NONAME ; void QtMobility::QAmbientLightReading::setLightLevel(enum QtMobility::QAmbientLightReading::LightLevel)
+	?trUtf8@QAmbientLightSensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 156 NONAME ; class QString QtMobility::QAmbientLightSensor::trUtf8(char const *, char const *, int)
+	?isConnectedToBackend@QSensor@QtMobility@@QBE_NXZ @ 157 NONAME ; bool QtMobility::QSensor::isConnectedToBackend(void) const
+	??0QAccelerometer@QtMobility@@QAE@PAVQObject@@@Z @ 158 NONAME ; QtMobility::QAccelerometer::QAccelerometer(class QObject *)
+	??0QSensor@QtMobility@@QAE@ABVQByteArray@@PAVQObject@@@Z @ 159 NONAME ; QtMobility::QSensor::QSensor(class QByteArray const &, class QObject *)
+	?qt_metacast@QTapSensor@QtMobility@@UAEPAXPBD@Z @ 160 NONAME ; void * QtMobility::QTapSensor::qt_metacast(char const *)
+	?tr@QMagnetometerReading@QtMobility@@SA?AVQString@@PBD0@Z @ 161 NONAME ; class QString QtMobility::QMagnetometerReading::tr(char const *, char const *)
+	?setX@QAccelerometerReading@QtMobility@@QAEXM@Z @ 162 NONAME ; void QtMobility::QAccelerometerReading::setX(float)
+	?metaObject@QOrientationReading@QtMobility@@UBEPBUQMetaObject@@XZ @ 163 NONAME ; struct QMetaObject const * QtMobility::QOrientationReading::metaObject(void) const
+	?z@QAccelerometerReading@QtMobility@@QBEMXZ @ 164 NONAME ; float QtMobility::QAccelerometerReading::z(void) const
+	?staticMetaObject@QOrientationSensor@QtMobility@@2UQMetaObject@@B @ 165 NONAME ; struct QMetaObject const QtMobility::QOrientationSensor::staticMetaObject
+	?reading@QAccelerometer@QtMobility@@QBEPAVQAccelerometerReading@2@XZ @ 166 NONAME ; class QtMobility::QAccelerometerReading * QtMobility::QAccelerometer::reading(void) const
+	?qt_metacast@QRotationReading@QtMobility@@UAEPAXPBD@Z @ 167 NONAME ; void * QtMobility::QRotationReading::qt_metacast(char const *)
+	?qt_metacall@QCompassReading@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 168 NONAME ; int QtMobility::QCompassReading::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?copyValuesFrom@QProximityReading@QtMobility@@UAEXPAVQSensorReading@2@@Z @ 169 NONAME ; void QtMobility::QProximityReading::copyValuesFrom(class QtMobility::QSensorReading *)
+	?registerBackend@QSensorManager@QtMobility@@SAXABVQByteArray@@0PAVQSensorBackendFactory@2@@Z @ 170 NONAME ; void QtMobility::QSensorManager::registerBackend(class QByteArray const &, class QByteArray const &, class QtMobility::QSensorBackendFactory *)
+	?y@QRotationReading@QtMobility@@QBEMXZ @ 171 NONAME ; float QtMobility::QRotationReading::y(void) const
+	?qt_metacall@QTapSensor@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 172 NONAME ; int QtMobility::QTapSensor::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?tr@QAmbientLightReading@QtMobility@@SA?AVQString@@PBD0@Z @ 173 NONAME ; class QString QtMobility::QAmbientLightReading::tr(char const *, char const *)
+	?qt_metacast@QRotationSensor@QtMobility@@UAEPAXPBD@Z @ 174 NONAME ; void * QtMobility::QRotationSensor::qt_metacast(char const *)
+	?filter@QTapFilter@QtMobility@@EAE_NPAVQSensorReading@2@@Z @ 175 NONAME ; bool QtMobility::QTapFilter::filter(class QtMobility::QSensorReading *)
+	?reading@QProximitySensor@QtMobility@@QBEPAVQProximityReading@2@XZ @ 176 NONAME ; class QtMobility::QProximityReading * QtMobility::QProximitySensor::reading(void) const
+	?staticMetaObject@QRotationReading@QtMobility@@2UQMetaObject@@B @ 177 NONAME ; struct QMetaObject const QtMobility::QRotationReading::staticMetaObject
+	?trUtf8@QTapReading@QtMobility@@SA?AVQString@@PBD0@Z @ 178 NONAME ; class QString QtMobility::QTapReading::trUtf8(char const *, char const *)
+	?setZ@QAccelerometerReading@QtMobility@@QAEXM@Z @ 179 NONAME ; void QtMobility::QAccelerometerReading::setZ(float)
+	??0QRotationReading@QtMobility@@QAE@PAVQObject@@@Z @ 180 NONAME ; QtMobility::QRotationReading::QRotationReading(class QObject *)
+	?type@QProximitySensor@QtMobility@@2PBDB @ 181 NONAME ; char const * const QtMobility::QProximitySensor::type
+	?metaObject@QMagnetometer@QtMobility@@UBEPBUQMetaObject@@XZ @ 182 NONAME ; struct QMetaObject const * QtMobility::QMagnetometer::metaObject(void) const
+	?type@QOrientationSensor@QtMobility@@2PBDB @ 183 NONAME ; char const * const QtMobility::QOrientationSensor::type
+	?addFilter@QSensor@QtMobility@@QAEXPAVQSensorFilter@2@@Z @ 184 NONAME ; void QtMobility::QSensor::addFilter(class QtMobility::QSensorFilter *)
+	??_EQAccelerometerReading@QtMobility@@UAE@I@Z @ 185 NONAME ; QtMobility::QAccelerometerReading::~QAccelerometerReading(unsigned int)
+	??1QAmbientLightSensor@QtMobility@@UAE@XZ @ 186 NONAME ; QtMobility::QAmbientLightSensor::~QAmbientLightSensor(void)
+	?staticMetaObject@QCompass@QtMobility@@2UQMetaObject@@B @ 187 NONAME ; struct QMetaObject const QtMobility::QCompass::staticMetaObject
+	?tr@QTapReading@QtMobility@@SA?AVQString@@PBD0@Z @ 188 NONAME ; class QString QtMobility::QTapReading::tr(char const *, char const *)
+	?tr@QMagnetometer@QtMobility@@SA?AVQString@@PBD0@Z @ 189 NONAME ; class QString QtMobility::QMagnetometer::tr(char const *, char const *)
+	?setSensor@QSensorFilter@QtMobility@@MAEXPAVQSensor@2@@Z @ 190 NONAME ; void QtMobility::QSensorFilter::setSensor(class QtMobility::QSensor *)
+	?tr@QSensor@QtMobility@@SA?AVQString@@PBD0@Z @ 191 NONAME ; class QString QtMobility::QSensor::tr(char const *, char const *)
+	?staticMetaObject@QProximityReading@QtMobility@@2UQMetaObject@@B @ 192 NONAME ; struct QMetaObject const QtMobility::QProximityReading::staticMetaObject
+	?trUtf8@QCompass@QtMobility@@SA?AVQString@@PBD0H@Z @ 193 NONAME ; class QString QtMobility::QCompass::trUtf8(char const *, char const *, int)
+	?tr@QProximityReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 194 NONAME ; class QString QtMobility::QProximityReading::tr(char const *, char const *, int)
+	?tr@QSensorBackend@QtMobility@@SA?AVQString@@PBD0H@Z @ 195 NONAME ; class QString QtMobility::QSensorBackend::tr(char const *, char const *, int)
+	??0QOrientationSensor@QtMobility@@QAE@PAVQObject@@@Z @ 196 NONAME ; QtMobility::QOrientationSensor::QOrientationSensor(class QObject *)
+	?stop@QSensor@QtMobility@@QAEXXZ @ 197 NONAME ; void QtMobility::QSensor::stop(void)
+	?busyChanged@QSensor@QtMobility@@IAEXXZ @ 198 NONAME ; void QtMobility::QSensor::busyChanged(void)
+	?metaObject@QProximitySensor@QtMobility@@UBEPBUQMetaObject@@XZ @ 199 NONAME ; struct QMetaObject const * QtMobility::QProximitySensor::metaObject(void) const
+	?trUtf8@QAccelerometerReading@QtMobility@@SA?AVQString@@PBD0@Z @ 200 NONAME ; class QString QtMobility::QAccelerometerReading::trUtf8(char const *, char const *)
+	?y@QAccelerometerReading@QtMobility@@QBEMXZ @ 201 NONAME ; float QtMobility::QAccelerometerReading::y(void) const
+	??_EQRotationReading@QtMobility@@UAE@I@Z @ 202 NONAME ; QtMobility::QRotationReading::~QRotationReading(unsigned int)
+	?metaObject@QTapReading@QtMobility@@UBEPBUQMetaObject@@XZ @ 203 NONAME ; struct QMetaObject const * QtMobility::QTapReading::metaObject(void) const
+	?trUtf8@QOrientationSensor@QtMobility@@SA?AVQString@@PBD0@Z @ 204 NONAME ; class QString QtMobility::QOrientationSensor::trUtf8(char const *, char const *)
+	?setDoubleTap@QTapReading@QtMobility@@QAEX_N@Z @ 205 NONAME ; void QtMobility::QTapReading::setDoubleTap(bool)
+	??0QRotationSensor@QtMobility@@QAE@PAVQObject@@@Z @ 206 NONAME ; QtMobility::QRotationSensor::QRotationSensor(class QObject *)
+	?copyValuesFrom@QOrientationReading@QtMobility@@UAEXPAVQSensorReading@2@@Z @ 207 NONAME ; void QtMobility::QOrientationReading::copyValuesFrom(class QtMobility::QSensorReading *)
+	?setZ@QMagnetometerReading@QtMobility@@QAEXM@Z @ 208 NONAME ; void QtMobility::QMagnetometerReading::setZ(float)
+	?trUtf8@QMagnetometerReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 209 NONAME ; class QString QtMobility::QMagnetometerReading::trUtf8(char const *, char const *, int)
+	?staticMetaObject@QTapReading@QtMobility@@2UQMetaObject@@B @ 210 NONAME ; struct QMetaObject const QtMobility::QTapReading::staticMetaObject
+	?copyValuesFrom@QCompassReading@QtMobility@@UAEXPAVQSensorReading@2@@Z @ 211 NONAME ; void QtMobility::QCompassReading::copyValuesFrom(class QtMobility::QSensorReading *)
+	?filter@QAmbientLightFilter@QtMobility@@EAE_NPAVQSensorReading@2@@Z @ 212 NONAME ; bool QtMobility::QAmbientLightFilter::filter(class QtMobility::QSensorReading *)
+	?qt_metacast@QSensorBackend@QtMobility@@UAEPAXPBD@Z @ 213 NONAME ; void * QtMobility::QSensorBackend::qt_metacast(char const *)
+	?type@QTapSensor@QtMobility@@2PBDB @ 214 NONAME ; char const * const QtMobility::QTapSensor::type
+	?trUtf8@QOrientationReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 215 NONAME ; class QString QtMobility::QOrientationReading::trUtf8(char const *, char const *, int)
+	?copyValuesFrom@QAmbientLightReading@QtMobility@@UAEXPAVQSensorReading@2@@Z @ 216 NONAME ; void QtMobility::QAmbientLightReading::copyValuesFrom(class QtMobility::QSensorReading *)
+	??_EQSensor@QtMobility@@UAE@I@Z @ 217 NONAME ; QtMobility::QSensor::~QSensor(unsigned int)
+	??0QAccelerometerReading@QtMobility@@QAE@PAVQObject@@@Z @ 218 NONAME ; QtMobility::QAccelerometerReading::QAccelerometerReading(class QObject *)
+	?filter@QProximityFilter@QtMobility@@EAE_NPAVQSensorReading@2@@Z @ 219 NONAME ; bool QtMobility::QProximityFilter::filter(class QtMobility::QSensorReading *)
+	?setAzimuth@QCompassReading@QtMobility@@QAEXM@Z @ 220 NONAME ; void QtMobility::QCompassReading::setAzimuth(float)
+	?trUtf8@QRotationReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 221 NONAME ; class QString QtMobility::QRotationReading::trUtf8(char const *, char const *, int)
+	?sensorTypes@QSensor@QtMobility@@SA?AV?$QList@VQByteArray@@@@XZ @ 222 NONAME ; class QList<class QByteArray> QtMobility::QSensor::sensorTypes(void)
+	?getStaticMetaObject@QOrientationSensor@QtMobility@@SAABUQMetaObject@@XZ @ 223 NONAME ; struct QMetaObject const & QtMobility::QOrientationSensor::getStaticMetaObject(void)
+	?description@QSensor@QtMobility@@QBE?AVQString@@XZ @ 224 NONAME ; class QString QtMobility::QSensor::description(void) const
+	?createBackend@QSensorManager@QtMobility@@SAPAVQSensorBackend@2@PAVQSensor@2@@Z @ 225 NONAME ; class QtMobility::QSensorBackend * QtMobility::QSensorManager::createBackend(class QtMobility::QSensor *)
+	?qt_metacall@QProximitySensor@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 226 NONAME ; int QtMobility::QProximitySensor::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?setOrientation@QOrientationReading@QtMobility@@QAEXW4Orientation@12@@Z @ 227 NONAME ; void QtMobility::QOrientationReading::setOrientation(enum QtMobility::QOrientationReading::Orientation)
+	?y@QMagnetometerReading@QtMobility@@QBEMXZ @ 228 NONAME ; float QtMobility::QMagnetometerReading::y(void) const
+	?getStaticMetaObject@QTapReading@QtMobility@@SAABUQMetaObject@@XZ @ 229 NONAME ; struct QMetaObject const & QtMobility::QTapReading::getStaticMetaObject(void)
+	??1QProximityReading@QtMobility@@UAE@XZ @ 230 NONAME ; QtMobility::QProximityReading::~QProximityReading(void)
+	?staticMetaObject@QMagnetometer@QtMobility@@2UQMetaObject@@B @ 231 NONAME ; struct QMetaObject const QtMobility::QMagnetometer::staticMetaObject
+	?trUtf8@QProximitySensor@QtMobility@@SA?AVQString@@PBD0@Z @ 232 NONAME ; class QString QtMobility::QProximitySensor::trUtf8(char const *, char const *)
+	?trUtf8@QCompassReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 233 NONAME ; class QString QtMobility::QCompassReading::trUtf8(char const *, char const *, int)
+	??1QTapReading@QtMobility@@UAE@XZ @ 234 NONAME ; QtMobility::QTapReading::~QTapReading(void)
+	?x@QAccelerometerReading@QtMobility@@QBEMXZ @ 235 NONAME ; float QtMobility::QAccelerometerReading::x(void) const
+	?newReadingAvailable@QSensorBackend@QtMobility@@QAEXXZ @ 236 NONAME ; void QtMobility::QSensorBackend::newReadingAvailable(void)
+	??_EQMagnetometerReading@QtMobility@@UAE@I@Z @ 237 NONAME ; QtMobility::QMagnetometerReading::~QMagnetometerReading(unsigned int)
+	?getStaticMetaObject@QCompassReading@QtMobility@@SAABUQMetaObject@@XZ @ 238 NONAME ; struct QMetaObject const & QtMobility::QCompassReading::getStaticMetaObject(void)
+	?orientation@QOrientationReading@QtMobility@@QBE?AW4Orientation@12@XZ @ 239 NONAME ; enum QtMobility::QOrientationReading::Orientation QtMobility::QOrientationReading::orientation(void) const
+	?qt_metacall@QProximityReading@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 240 NONAME ; int QtMobility::QProximityReading::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacast@QProximityReading@QtMobility@@UAEPAXPBD@Z @ 241 NONAME ; void * QtMobility::QProximityReading::qt_metacast(char const *)
+	?trUtf8@QSensorBackend@QtMobility@@SA?AVQString@@PBD0H@Z @ 242 NONAME ; class QString QtMobility::QSensorBackend::trUtf8(char const *, char const *, int)
+	??0QCompass@QtMobility@@QAE@PAVQObject@@@Z @ 243 NONAME ; QtMobility::QCompass::QCompass(class QObject *)
+	?setY@QMagnetometerReading@QtMobility@@QAEXM@Z @ 244 NONAME ; void QtMobility::QMagnetometerReading::setY(float)
+	?staticMetaObject@QProximitySensor@QtMobility@@2UQMetaObject@@B @ 245 NONAME ; struct QMetaObject const QtMobility::QProximitySensor::staticMetaObject
+	?getStaticMetaObject@QAmbientLightSensor@QtMobility@@SAABUQMetaObject@@XZ @ 246 NONAME ; struct QMetaObject const & QtMobility::QAmbientLightSensor::getStaticMetaObject(void)
+	?type@QMagnetometer@QtMobility@@2PBDB @ 247 NONAME ; char const * const QtMobility::QMagnetometer::type
+	?getStaticMetaObject@QCompass@QtMobility@@SAABUQMetaObject@@XZ @ 248 NONAME ; struct QMetaObject const & QtMobility::QCompass::getStaticMetaObject(void)
+	?qt_metacall@QMagnetometer@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 249 NONAME ; int QtMobility::QMagnetometer::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??1QAmbientLightReading@QtMobility@@UAE@XZ @ 250 NONAME ; QtMobility::QAmbientLightReading::~QAmbientLightReading(void)
 	?tr@QOrientationReading@QtMobility@@SA?AVQString@@PBD0@Z @ 251 NONAME ; class QString QtMobility::QOrientationReading::tr(char const *, char const *)
-	?tr@QOrientationReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 252 NONAME ; class QString QtMobility::QOrientationReading::tr(char const *, char const *, int)
-	?tr@QOrientationSensor@QtMobility@@SA?AVQString@@PBD0@Z @ 253 NONAME ; class QString QtMobility::QOrientationSensor::tr(char const *, char const *)
-	?tr@QOrientationSensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 254 NONAME ; class QString QtMobility::QOrientationSensor::tr(char const *, char const *, int)
-	?tr@QProximityReading@QtMobility@@SA?AVQString@@PBD0@Z @ 255 NONAME ; class QString QtMobility::QProximityReading::tr(char const *, char const *)
-	?tr@QProximityReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 256 NONAME ; class QString QtMobility::QProximityReading::tr(char const *, char const *, int)
-	?tr@QProximitySensor@QtMobility@@SA?AVQString@@PBD0@Z @ 257 NONAME ; class QString QtMobility::QProximitySensor::tr(char const *, char const *)
-	?tr@QProximitySensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 258 NONAME ; class QString QtMobility::QProximitySensor::tr(char const *, char const *, int)
-	?tr@QRotationReading@QtMobility@@SA?AVQString@@PBD0@Z @ 259 NONAME ; class QString QtMobility::QRotationReading::tr(char const *, char const *)
-	?tr@QRotationReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 260 NONAME ; class QString QtMobility::QRotationReading::tr(char const *, char const *, int)
-	?tr@QRotationSensor@QtMobility@@SA?AVQString@@PBD0@Z @ 261 NONAME ; class QString QtMobility::QRotationSensor::tr(char const *, char const *)
-	?tr@QRotationSensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 262 NONAME ; class QString QtMobility::QRotationSensor::tr(char const *, char const *, int)
-	?tr@QSensor@QtMobility@@SA?AVQString@@PBD0@Z @ 263 NONAME ; class QString QtMobility::QSensor::tr(char const *, char const *)
-	?tr@QSensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 264 NONAME ; class QString QtMobility::QSensor::tr(char const *, char const *, int)
-	?tr@QSensorBackend@QtMobility@@SA?AVQString@@PBD0@Z @ 265 NONAME ; class QString QtMobility::QSensorBackend::tr(char const *, char const *)
-	?tr@QSensorBackend@QtMobility@@SA?AVQString@@PBD0H@Z @ 266 NONAME ; class QString QtMobility::QSensorBackend::tr(char const *, char const *, int)
-	?tr@QSensorReading@QtMobility@@SA?AVQString@@PBD0@Z @ 267 NONAME ; class QString QtMobility::QSensorReading::tr(char const *, char const *)
-	?tr@QSensorReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 268 NONAME ; class QString QtMobility::QSensorReading::tr(char const *, char const *, int)
-	?tr@QTapReading@QtMobility@@SA?AVQString@@PBD0@Z @ 269 NONAME ; class QString QtMobility::QTapReading::tr(char const *, char const *)
-	?tr@QTapReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 270 NONAME ; class QString QtMobility::QTapReading::tr(char const *, char const *, int)
-	?tr@QTapSensor@QtMobility@@SA?AVQString@@PBD0@Z @ 271 NONAME ; class QString QtMobility::QTapSensor::tr(char const *, char const *)
-	?tr@QTapSensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 272 NONAME ; class QString QtMobility::QTapSensor::tr(char const *, char const *, int)
-	?trUtf8@QAccelerometer@QtMobility@@SA?AVQString@@PBD0@Z @ 273 NONAME ; class QString QtMobility::QAccelerometer::trUtf8(char const *, char const *)
-	?trUtf8@QAccelerometer@QtMobility@@SA?AVQString@@PBD0H@Z @ 274 NONAME ; class QString QtMobility::QAccelerometer::trUtf8(char const *, char const *, int)
-	?trUtf8@QAccelerometerReading@QtMobility@@SA?AVQString@@PBD0@Z @ 275 NONAME ; class QString QtMobility::QAccelerometerReading::trUtf8(char const *, char const *)
-	?trUtf8@QAccelerometerReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 276 NONAME ; class QString QtMobility::QAccelerometerReading::trUtf8(char const *, char const *, int)
-	?trUtf8@QAmbientLightReading@QtMobility@@SA?AVQString@@PBD0@Z @ 277 NONAME ; class QString QtMobility::QAmbientLightReading::trUtf8(char const *, char const *)
-	?trUtf8@QAmbientLightReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 278 NONAME ; class QString QtMobility::QAmbientLightReading::trUtf8(char const *, char const *, int)
-	?trUtf8@QAmbientLightSensor@QtMobility@@SA?AVQString@@PBD0@Z @ 279 NONAME ; class QString QtMobility::QAmbientLightSensor::trUtf8(char const *, char const *)
-	?trUtf8@QAmbientLightSensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 280 NONAME ; class QString QtMobility::QAmbientLightSensor::trUtf8(char const *, char const *, int)
-	?trUtf8@QCompass@QtMobility@@SA?AVQString@@PBD0@Z @ 281 NONAME ; class QString QtMobility::QCompass::trUtf8(char const *, char const *)
-	?trUtf8@QCompass@QtMobility@@SA?AVQString@@PBD0H@Z @ 282 NONAME ; class QString QtMobility::QCompass::trUtf8(char const *, char const *, int)
-	?trUtf8@QCompassReading@QtMobility@@SA?AVQString@@PBD0@Z @ 283 NONAME ; class QString QtMobility::QCompassReading::trUtf8(char const *, char const *)
-	?trUtf8@QCompassReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 284 NONAME ; class QString QtMobility::QCompassReading::trUtf8(char const *, char const *, int)
-	?trUtf8@QMagnetometer@QtMobility@@SA?AVQString@@PBD0@Z @ 285 NONAME ; class QString QtMobility::QMagnetometer::trUtf8(char const *, char const *)
-	?trUtf8@QMagnetometer@QtMobility@@SA?AVQString@@PBD0H@Z @ 286 NONAME ; class QString QtMobility::QMagnetometer::trUtf8(char const *, char const *, int)
-	?trUtf8@QMagnetometerReading@QtMobility@@SA?AVQString@@PBD0@Z @ 287 NONAME ; class QString QtMobility::QMagnetometerReading::trUtf8(char const *, char const *)
-	?trUtf8@QMagnetometerReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 288 NONAME ; class QString QtMobility::QMagnetometerReading::trUtf8(char const *, char const *, int)
-	?trUtf8@QOrientationReading@QtMobility@@SA?AVQString@@PBD0@Z @ 289 NONAME ; class QString QtMobility::QOrientationReading::trUtf8(char const *, char const *)
-	?trUtf8@QOrientationReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 290 NONAME ; class QString QtMobility::QOrientationReading::trUtf8(char const *, char const *, int)
-	?trUtf8@QOrientationSensor@QtMobility@@SA?AVQString@@PBD0@Z @ 291 NONAME ; class QString QtMobility::QOrientationSensor::trUtf8(char const *, char const *)
-	?trUtf8@QOrientationSensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 292 NONAME ; class QString QtMobility::QOrientationSensor::trUtf8(char const *, char const *, int)
-	?trUtf8@QProximityReading@QtMobility@@SA?AVQString@@PBD0@Z @ 293 NONAME ; class QString QtMobility::QProximityReading::trUtf8(char const *, char const *)
-	?trUtf8@QProximityReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 294 NONAME ; class QString QtMobility::QProximityReading::trUtf8(char const *, char const *, int)
-	?trUtf8@QProximitySensor@QtMobility@@SA?AVQString@@PBD0@Z @ 295 NONAME ; class QString QtMobility::QProximitySensor::trUtf8(char const *, char const *)
-	?trUtf8@QProximitySensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 296 NONAME ; class QString QtMobility::QProximitySensor::trUtf8(char const *, char const *, int)
-	?trUtf8@QRotationReading@QtMobility@@SA?AVQString@@PBD0@Z @ 297 NONAME ; class QString QtMobility::QRotationReading::trUtf8(char const *, char const *)
-	?trUtf8@QRotationReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 298 NONAME ; class QString QtMobility::QRotationReading::trUtf8(char const *, char const *, int)
-	?trUtf8@QRotationSensor@QtMobility@@SA?AVQString@@PBD0@Z @ 299 NONAME ; class QString QtMobility::QRotationSensor::trUtf8(char const *, char const *)
-	?trUtf8@QRotationSensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 300 NONAME ; class QString QtMobility::QRotationSensor::trUtf8(char const *, char const *, int)
-	?trUtf8@QSensor@QtMobility@@SA?AVQString@@PBD0@Z @ 301 NONAME ; class QString QtMobility::QSensor::trUtf8(char const *, char const *)
-	?trUtf8@QSensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 302 NONAME ; class QString QtMobility::QSensor::trUtf8(char const *, char const *, int)
-	?trUtf8@QSensorBackend@QtMobility@@SA?AVQString@@PBD0@Z @ 303 NONAME ; class QString QtMobility::QSensorBackend::trUtf8(char const *, char const *)
-	?trUtf8@QSensorBackend@QtMobility@@SA?AVQString@@PBD0H@Z @ 304 NONAME ; class QString QtMobility::QSensorBackend::trUtf8(char const *, char const *, int)
-	?trUtf8@QSensorReading@QtMobility@@SA?AVQString@@PBD0@Z @ 305 NONAME ; class QString QtMobility::QSensorReading::trUtf8(char const *, char const *)
-	?trUtf8@QSensorReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 306 NONAME ; class QString QtMobility::QSensorReading::trUtf8(char const *, char const *, int)
-	?trUtf8@QTapReading@QtMobility@@SA?AVQString@@PBD0@Z @ 307 NONAME ; class QString QtMobility::QTapReading::trUtf8(char const *, char const *)
-	?trUtf8@QTapReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 308 NONAME ; class QString QtMobility::QTapReading::trUtf8(char const *, char const *, int)
-	?trUtf8@QTapSensor@QtMobility@@SA?AVQString@@PBD0@Z @ 309 NONAME ; class QString QtMobility::QTapSensor::trUtf8(char const *, char const *)
-	?trUtf8@QTapSensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 310 NONAME ; class QString QtMobility::QTapSensor::trUtf8(char const *, char const *, int)
-	?type@QSensor@QtMobility@@QBE?AVQByteArray@@XZ @ 311 NONAME ; class QByteArray QtMobility::QSensor::type(void) const
-	?value@QSensorReading@QtMobility@@QBE?AVQVariant@@H@Z @ 312 NONAME ; class QVariant QtMobility::QSensorReading::value(int) const
-	?valueCount@QSensorReading@QtMobility@@QBEHXZ @ 313 NONAME ; int QtMobility::QSensorReading::valueCount(void) const
-	?x@QAccelerometerReading@QtMobility@@QBEMXZ @ 314 NONAME ; float QtMobility::QAccelerometerReading::x(void) const
-	?x@QMagnetometerReading@QtMobility@@QBEMXZ @ 315 NONAME ; float QtMobility::QMagnetometerReading::x(void) const
-	?x@QRotationReading@QtMobility@@QBEMXZ @ 316 NONAME ; float QtMobility::QRotationReading::x(void) const
-	?y@QAccelerometerReading@QtMobility@@QBEMXZ @ 317 NONAME ; float QtMobility::QAccelerometerReading::y(void) const
-	?y@QMagnetometerReading@QtMobility@@QBEMXZ @ 318 NONAME ; float QtMobility::QMagnetometerReading::y(void) const
-	?y@QRotationReading@QtMobility@@QBEMXZ @ 319 NONAME ; float QtMobility::QRotationReading::y(void) const
-	?z@QAccelerometerReading@QtMobility@@QBEMXZ @ 320 NONAME ; float QtMobility::QAccelerometerReading::z(void) const
-	?z@QMagnetometerReading@QtMobility@@QBEMXZ @ 321 NONAME ; float QtMobility::QMagnetometerReading::z(void) const
-	?z@QRotationReading@QtMobility@@QBEMXZ @ 322 NONAME ; float QtMobility::QRotationReading::z(void) const
-	?staticMetaObject@QAccelerometer@QtMobility@@2UQMetaObject@@B @ 323 NONAME ; struct QMetaObject const QtMobility::QAccelerometer::staticMetaObject
-	?staticMetaObject@QSensor@QtMobility@@2UQMetaObject@@B @ 324 NONAME ; struct QMetaObject const QtMobility::QSensor::staticMetaObject
-	?type@QCompass@QtMobility@@2PBDB @ 325 NONAME ; char const * const QtMobility::QCompass::type
-	?staticMetaObject@QCompassReading@QtMobility@@2UQMetaObject@@B @ 326 NONAME ; struct QMetaObject const QtMobility::QCompassReading::staticMetaObject
-	?staticMetaObject@QAmbientLightReading@QtMobility@@2UQMetaObject@@B @ 327 NONAME ; struct QMetaObject const QtMobility::QAmbientLightReading::staticMetaObject
-	?staticMetaObject@QAccelerometerReading@QtMobility@@2UQMetaObject@@B @ 328 NONAME ; struct QMetaObject const QtMobility::QAccelerometerReading::staticMetaObject
-	?staticMetaObject@QSensorBackend@QtMobility@@2UQMetaObject@@B @ 329 NONAME ; struct QMetaObject const QtMobility::QSensorBackend::staticMetaObject
-	?type@QAmbientLightSensor@QtMobility@@2PBDB @ 330 NONAME ; char const * const QtMobility::QAmbientLightSensor::type
-	?staticMetaObject@QOrientationSensor@QtMobility@@2UQMetaObject@@B @ 331 NONAME ; struct QMetaObject const QtMobility::QOrientationSensor::staticMetaObject
-	?staticMetaObject@QRotationReading@QtMobility@@2UQMetaObject@@B @ 332 NONAME ; struct QMetaObject const QtMobility::QRotationReading::staticMetaObject
-	?type@QProximitySensor@QtMobility@@2PBDB @ 333 NONAME ; char const * const QtMobility::QProximitySensor::type
-	?type@QOrientationSensor@QtMobility@@2PBDB @ 334 NONAME ; char const * const QtMobility::QOrientationSensor::type
-	?staticMetaObject@QCompass@QtMobility@@2UQMetaObject@@B @ 335 NONAME ; struct QMetaObject const QtMobility::QCompass::staticMetaObject
-	?staticMetaObject@QProximityReading@QtMobility@@2UQMetaObject@@B @ 336 NONAME ; struct QMetaObject const QtMobility::QProximityReading::staticMetaObject
-	?staticMetaObject@QTapReading@QtMobility@@2UQMetaObject@@B @ 337 NONAME ; struct QMetaObject const QtMobility::QTapReading::staticMetaObject
-	?type@QTapSensor@QtMobility@@2PBDB @ 338 NONAME ; char const * const QtMobility::QTapSensor::type
-	?staticMetaObject@QMagnetometer@QtMobility@@2UQMetaObject@@B @ 339 NONAME ; struct QMetaObject const QtMobility::QMagnetometer::staticMetaObject
-	?staticMetaObject@QProximitySensor@QtMobility@@2UQMetaObject@@B @ 340 NONAME ; struct QMetaObject const QtMobility::QProximitySensor::staticMetaObject
-	?type@QMagnetometer@QtMobility@@2PBDB @ 341 NONAME ; char const * const QtMobility::QMagnetometer::type
-	?staticMetaObject@QSensorReading@QtMobility@@2UQMetaObject@@B @ 342 NONAME ; struct QMetaObject const QtMobility::QSensorReading::staticMetaObject
-	?staticMetaObject@QRotationSensor@QtMobility@@2UQMetaObject@@B @ 343 NONAME ; struct QMetaObject const QtMobility::QRotationSensor::staticMetaObject
-	?staticMetaObject@QTapSensor@QtMobility@@2UQMetaObject@@B @ 344 NONAME ; struct QMetaObject const QtMobility::QTapSensor::staticMetaObject
-	?staticMetaObject@QOrientationReading@QtMobility@@2UQMetaObject@@B @ 345 NONAME ; struct QMetaObject const QtMobility::QOrientationReading::staticMetaObject
-	?staticMetaObject@QAmbientLightSensor@QtMobility@@2UQMetaObject@@B @ 346 NONAME ; struct QMetaObject const QtMobility::QAmbientLightSensor::staticMetaObject
-	?type@QRotationSensor@QtMobility@@2PBDB @ 347 NONAME ; char const * const QtMobility::QRotationSensor::type
-	?type@QAccelerometer@QtMobility@@2PBDB @ 348 NONAME ; char const * const QtMobility::QAccelerometer::type
-	?staticMetaObject@QMagnetometerReading@QtMobility@@2UQMetaObject@@B @ 349 NONAME ; struct QMetaObject const QtMobility::QMagnetometerReading::staticMetaObject
+	?tr@QAmbientLightSensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 252 NONAME ; class QString QtMobility::QAmbientLightSensor::tr(char const *, char const *, int)
+	??1QOrientationSensor@QtMobility@@UAE@XZ @ 253 NONAME ; QtMobility::QOrientationSensor::~QOrientationSensor(void)
+	?trUtf8@QMagnetometer@QtMobility@@SA?AVQString@@PBD0@Z @ 254 NONAME ; class QString QtMobility::QMagnetometer::trUtf8(char const *, char const *)
+	?staticMetaObject@QSensorReading@QtMobility@@2UQMetaObject@@B @ 255 NONAME ; struct QMetaObject const QtMobility::QSensorReading::staticMetaObject
+	??_EQMagnetometer@QtMobility@@UAE@I@Z @ 256 NONAME ; QtMobility::QMagnetometer::~QMagnetometer(unsigned int)
+	?trUtf8@QTapSensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 257 NONAME ; class QString QtMobility::QTapSensor::trUtf8(char const *, char const *, int)
+	??_EQOrientationReading@QtMobility@@UAE@I@Z @ 258 NONAME ; QtMobility::QOrientationReading::~QOrientationReading(unsigned int)
+	?metaObject@QMagnetometerReading@QtMobility@@UBEPBUQMetaObject@@XZ @ 259 NONAME ; struct QMetaObject const * QtMobility::QMagnetometerReading::metaObject(void) const
+	?getStaticMetaObject@QAccelerometer@QtMobility@@SAABUQMetaObject@@XZ @ 260 NONAME ; struct QMetaObject const & QtMobility::QAccelerometer::getStaticMetaObject(void)
+	??1QMagnetometerReading@QtMobility@@UAE@XZ @ 261 NONAME ; QtMobility::QMagnetometerReading::~QMagnetometerReading(void)
+	??1QCompassReading@QtMobility@@UAE@XZ @ 262 NONAME ; QtMobility::QCompassReading::~QCompassReading(void)
+	?trUtf8@QTapReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 263 NONAME ; class QString QtMobility::QTapReading::trUtf8(char const *, char const *, int)
+	?type@QSensor@QtMobility@@QBE?AVQByteArray@@XZ @ 264 NONAME ; class QByteArray QtMobility::QSensor::type(void) const
+	?isActive@QSensor@QtMobility@@QBE_NXZ @ 265 NONAME ; bool QtMobility::QSensor::isActive(void) const
+	??0QAmbientLightReading@QtMobility@@QAE@PAVQObject@@@Z @ 266 NONAME ; QtMobility::QAmbientLightReading::QAmbientLightReading(class QObject *)
+	?tr@QTapSensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 267 NONAME ; class QString QtMobility::QTapSensor::tr(char const *, char const *, int)
+	?tr@QRotationReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 268 NONAME ; class QString QtMobility::QRotationReading::tr(char const *, char const *, int)
+	?tr@QAccelerometer@QtMobility@@SA?AVQString@@PBD0H@Z @ 269 NONAME ; class QString QtMobility::QAccelerometer::tr(char const *, char const *, int)
+	?azimuth@QCompassReading@QtMobility@@QBEMXZ @ 270 NONAME ; float QtMobility::QCompassReading::azimuth(void) const
+	??1QTapSensor@QtMobility@@UAE@XZ @ 271 NONAME ; QtMobility::QTapSensor::~QTapSensor(void)
+	?x@QRotationReading@QtMobility@@QBEMXZ @ 272 NONAME ; float QtMobility::QRotationReading::x(void) const
+	?qt_metacall@QOrientationReading@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 273 NONAME ; int QtMobility::QOrientationReading::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?staticMetaObject@QRotationSensor@QtMobility@@2UQMetaObject@@B @ 274 NONAME ; struct QMetaObject const QtMobility::QRotationSensor::staticMetaObject
+	?lightLevel@QAmbientLightReading@QtMobility@@QBE?AW4LightLevel@12@XZ @ 275 NONAME ; enum QtMobility::QAmbientLightReading::LightLevel QtMobility::QAmbientLightReading::lightLevel(void) const
+	?valueCount@QSensorReading@QtMobility@@QBEHXZ @ 276 NONAME ; int QtMobility::QSensorReading::valueCount(void) const
+	?trUtf8@QRotationReading@QtMobility@@SA?AVQString@@PBD0@Z @ 277 NONAME ; class QString QtMobility::QRotationReading::trUtf8(char const *, char const *)
+	?qt_metacall@QRotationReading@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 278 NONAME ; int QtMobility::QRotationReading::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?setX@QMagnetometerReading@QtMobility@@QAEXM@Z @ 279 NONAME ; void QtMobility::QMagnetometerReading::setX(float)
+	?removeFilter@QSensor@QtMobility@@QAEXPAVQSensorFilter@2@@Z @ 280 NONAME ; void QtMobility::QSensor::removeFilter(class QtMobility::QSensorFilter *)
+	?dataRate@QSensor@QtMobility@@QBEHXZ @ 281 NONAME ; int QtMobility::QSensor::dataRate(void) const
+	??1QSensorPluginInterface@QtMobility@@IAE@XZ @ 282 NONAME ; QtMobility::QSensorPluginInterface::~QSensorPluginInterface(void)
+	?tr@QCompassReading@QtMobility@@SA?AVQString@@PBD0@Z @ 283 NONAME ; class QString QtMobility::QCompassReading::tr(char const *, char const *)
+	??_EQProximitySensor@QtMobility@@UAE@I@Z @ 284 NONAME ; QtMobility::QProximitySensor::~QProximitySensor(unsigned int)
+	?sensorError@QSensorBackend@QtMobility@@QAEXH@Z @ 285 NONAME ; void QtMobility::QSensorBackend::sensorError(int)
+	?setCalibrationLevel@QCompassReading@QtMobility@@QAEXM@Z @ 286 NONAME ; void QtMobility::QCompassReading::setCalibrationLevel(float)
+	?setDataRates@QSensorBackend@QtMobility@@QAEXPBVQSensor@2@@Z @ 287 NONAME ; void QtMobility::QSensorBackend::setDataRates(class QtMobility::QSensor const *)
+	?metaObject@QTapSensor@QtMobility@@UBEPBUQMetaObject@@XZ @ 288 NONAME ; struct QMetaObject const * QtMobility::QTapSensor::metaObject(void) const
+	?tr@QSensorReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 289 NONAME ; class QString QtMobility::QSensorReading::tr(char const *, char const *, int)
+	?qt_metacall@QAmbientLightReading@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 290 NONAME ; int QtMobility::QAmbientLightReading::qt_metacall(enum QMetaObject::Call, int, void * *)
+	??1QAccelerometer@QtMobility@@UAE@XZ @ 291 NONAME ; QtMobility::QAccelerometer::~QAccelerometer(void)
+	?staticMetaObject@QTapSensor@QtMobility@@2UQMetaObject@@B @ 292 NONAME ; struct QMetaObject const QtMobility::QTapSensor::staticMetaObject
+	?trUtf8@QAmbientLightReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 293 NONAME ; class QString QtMobility::QAmbientLightReading::trUtf8(char const *, char const *, int)
+	?staticMetaObject@QOrientationReading@QtMobility@@2UQMetaObject@@B @ 294 NONAME ; struct QMetaObject const QtMobility::QOrientationReading::staticMetaObject
+	??_EQAccelerometer@QtMobility@@UAE@I@Z @ 295 NONAME ; QtMobility::QAccelerometer::~QAccelerometer(unsigned int)
+	?staticMetaObject@QAmbientLightSensor@QtMobility@@2UQMetaObject@@B @ 296 NONAME ; struct QMetaObject const QtMobility::QAmbientLightSensor::staticMetaObject
+	??_EQAmbientLightReading@QtMobility@@UAE@I@Z @ 297 NONAME ; QtMobility::QAmbientLightReading::~QAmbientLightReading(unsigned int)
+	??1QOrientationReading@QtMobility@@UAE@XZ @ 298 NONAME ; QtMobility::QOrientationReading::~QOrientationReading(void)
+	?tr@QProximitySensor@QtMobility@@SA?AVQString@@PBD0@Z @ 299 NONAME ; class QString QtMobility::QProximitySensor::tr(char const *, char const *)
+	?tr@QCompassReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 300 NONAME ; class QString QtMobility::QCompassReading::tr(char const *, char const *, int)
+	?qt_metacast@QCompassReading@QtMobility@@UAEPAXPBD@Z @ 301 NONAME ; void * QtMobility::QCompassReading::qt_metacast(char const *)
+	?tr@QTapReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 302 NONAME ; class QString QtMobility::QTapReading::tr(char const *, char const *, int)
+	?reading@QMagnetometer@QtMobility@@QBEPAVQMagnetometerReading@2@XZ @ 303 NONAME ; class QtMobility::QMagnetometerReading * QtMobility::QMagnetometer::reading(void) const
+	?qt_metacall@QAccelerometerReading@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 304 NONAME ; int QtMobility::QAccelerometerReading::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?type@QRotationSensor@QtMobility@@2PBDB @ 305 NONAME ; char const * const QtMobility::QRotationSensor::type
+	?tr@QOrientationReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 306 NONAME ; class QString QtMobility::QOrientationReading::tr(char const *, char const *, int)
+	?metaObject@QOrientationSensor@QtMobility@@UBEPBUQMetaObject@@XZ @ 307 NONAME ; struct QMetaObject const * QtMobility::QOrientationSensor::metaObject(void) const
+	?qt_metacast@QAccelerometer@QtMobility@@UAEPAXPBD@Z @ 308 NONAME ; void * QtMobility::QAccelerometer::qt_metacast(char const *)
+	??_EQTapSensor@QtMobility@@UAE@I@Z @ 309 NONAME ; QtMobility::QTapSensor::~QTapSensor(unsigned int)
+	??1QRotationSensor@QtMobility@@UAE@XZ @ 310 NONAME ; QtMobility::QRotationSensor::~QRotationSensor(void)
+	?connectToBackend@QSensor@QtMobility@@QAE_NXZ @ 311 NONAME ; bool QtMobility::QSensor::connectToBackend(void)
+	??0QProximitySensor@QtMobility@@QAE@PAVQObject@@@Z @ 312 NONAME ; QtMobility::QProximitySensor::QProximitySensor(class QObject *)
+	?qt_metacast@QTapReading@QtMobility@@UAEPAXPBD@Z @ 313 NONAME ; void * QtMobility::QTapReading::qt_metacast(char const *)
+	?trUtf8@QAccelerometerReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 314 NONAME ; class QString QtMobility::QAccelerometerReading::trUtf8(char const *, char const *, int)
+	?trUtf8@QAccelerometer@QtMobility@@SA?AVQString@@PBD0H@Z @ 315 NONAME ; class QString QtMobility::QAccelerometer::trUtf8(char const *, char const *, int)
+	?getStaticMetaObject@QSensor@QtMobility@@SAABUQMetaObject@@XZ @ 316 NONAME ; struct QMetaObject const & QtMobility::QSensor::getStaticMetaObject(void)
+	?trUtf8@QProximityReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 317 NONAME ; class QString QtMobility::QProximityReading::trUtf8(char const *, char const *, int)
+	?tapDirection@QTapReading@QtMobility@@QBE?AW4TapDirection@12@XZ @ 318 NONAME ; enum QtMobility::QTapReading::TapDirection QtMobility::QTapReading::tapDirection(void) const
+	?trUtf8@QTapSensor@QtMobility@@SA?AVQString@@PBD0@Z @ 319 NONAME ; class QString QtMobility::QTapSensor::trUtf8(char const *, char const *)
+	??1QSensorBackend@QtMobility@@UAE@XZ @ 320 NONAME ; QtMobility::QSensorBackend::~QSensorBackend(void)
+	??1QProximitySensor@QtMobility@@UAE@XZ @ 321 NONAME ; QtMobility::QProximitySensor::~QProximitySensor(void)
+	?qt_metacall@QSensor@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 322 NONAME ; int QtMobility::QSensor::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?getStaticMetaObject@QSensorBackend@QtMobility@@SAABUQMetaObject@@XZ @ 323 NONAME ; struct QMetaObject const & QtMobility::QSensorBackend::getStaticMetaObject(void)
+	?outputRange@QSensor@QtMobility@@QBEHXZ @ 324 NONAME ; int QtMobility::QSensor::outputRange(void) const
+	??_EQSensorReading@QtMobility@@UAE@I@Z @ 325 NONAME ; QtMobility::QSensorReading::~QSensorReading(unsigned int)
+	?qt_metacall@QCompass@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 326 NONAME ; int QtMobility::QCompass::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?tr@QOrientationSensor@QtMobility@@SA?AVQString@@PBD0H@Z @ 327 NONAME ; class QString QtMobility::QOrientationSensor::tr(char const *, char const *, int)
+	?getStaticMetaObject@QProximitySensor@QtMobility@@SAABUQMetaObject@@XZ @ 328 NONAME ; struct QMetaObject const & QtMobility::QProximitySensor::getStaticMetaObject(void)
+	?close@QProximityReading@QtMobility@@QBE_NXZ @ 329 NONAME ; bool QtMobility::QProximityReading::close(void) const
+	?start@QSensor@QtMobility@@QAE_NXZ @ 330 NONAME ; bool QtMobility::QSensor::start(void)
+	?trUtf8@QCompassReading@QtMobility@@SA?AVQString@@PBD0@Z @ 331 NONAME ; class QString QtMobility::QCompassReading::trUtf8(char const *, char const *)
+	?type@QAccelerometer@QtMobility@@2PBDB @ 332 NONAME ; char const * const QtMobility::QAccelerometer::type
+	?trUtf8@QProximityReading@QtMobility@@SA?AVQString@@PBD0@Z @ 333 NONAME ; class QString QtMobility::QProximityReading::trUtf8(char const *, char const *)
+	?sensor@QSensorBackend@QtMobility@@QBEPAVQSensor@2@XZ @ 334 NONAME ; class QtMobility::QSensor * QtMobility::QSensorBackend::sensor(void) const
+	??_EQCompassReading@QtMobility@@UAE@I@Z @ 335 NONAME ; QtMobility::QCompassReading::~QCompassReading(unsigned int)
+	?qt_metacall@QRotationSensor@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 336 NONAME ; int QtMobility::QRotationSensor::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?addOutputRange@QSensorBackend@QtMobility@@QAEXMMM@Z @ 337 NONAME ; void QtMobility::QSensorBackend::addOutputRange(float, float, float)
+	?registerStaticPlugin@QSensorManager@QtMobility@@SAXP6APAVQSensorPluginInterface@2@XZ@Z @ 338 NONAME ; void QtMobility::QSensorManager::registerStaticPlugin(class QtMobility::QSensorPluginInterface * (*)(void))
+	?setY@QAccelerometerReading@QtMobility@@QAEXM@Z @ 339 NONAME ; void QtMobility::QAccelerometerReading::setY(float)
+	?trUtf8@QSensorReading@QtMobility@@SA?AVQString@@PBD0H@Z @ 340 NONAME ; class QString QtMobility::QSensorReading::trUtf8(char const *, char const *, int)
+	?metaObject@QAmbientLightReading@QtMobility@@UBEPBUQMetaObject@@XZ @ 341 NONAME ; struct QMetaObject const * QtMobility::QAmbientLightReading::metaObject(void) const
+	?trUtf8@QAccelerometer@QtMobility@@SA?AVQString@@PBD0@Z @ 342 NONAME ; class QString QtMobility::QAccelerometer::trUtf8(char const *, char const *)
+	?z@QMagnetometerReading@QtMobility@@QBEMXZ @ 343 NONAME ; float QtMobility::QMagnetometerReading::z(void) const
+	?filter@QAccelerometerFilter@QtMobility@@EAE_NPAVQSensorReading@2@@Z @ 344 NONAME ; bool QtMobility::QAccelerometerFilter::filter(class QtMobility::QSensorReading *)
+	?staticMetaObject@QMagnetometerReading@QtMobility@@2UQMetaObject@@B @ 345 NONAME ; struct QMetaObject const QtMobility::QMagnetometerReading::staticMetaObject

--- a/qtmobility/src/s60installs/bwins/SFWDatabaseManagerServeru.def	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-EXPORTS
-	?metaObject@QAbstractSecuritySession@QtMobility@@UBEPBUQMetaObject@@XZ @ 1 NONAME ; struct QMetaObject const * QtMobility::QAbstractSecuritySession::metaObject(void) const
-	?staticMetaObject@QAbstractSecuritySession@QtMobility@@2UQMetaObject@@B @ 2 NONAME ; struct QMetaObject const QtMobility::QAbstractSecuritySession::staticMetaObject
-	?minorVersion@QServiceFilter@QtMobility@@QBEHXZ @ 3 NONAME ; int QtMobility::QServiceFilter::minorVersion(void) const
-	?uninstallService@QServicePluginInterface@QtMobility@@UAEXXZ @ 4 NONAME ; void QtMobility::QServicePluginInterface::uninstallService(void)
-	?qt_metacall@QAbstractSecuritySession@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 5 NONAME ; int QtMobility::QAbstractSecuritySession::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?getStaticMetaObject@QAbstractSecuritySession@QtMobility@@SAABUQMetaObject@@XZ @ 6 NONAME ; struct QMetaObject const & QtMobility::QAbstractSecuritySession::getStaticMetaObject(void)
-	?serviceName@QServiceInterfaceDescriptor@QtMobility@@QBE?AVQString@@XZ @ 7 NONAME ; class QString QtMobility::QServiceInterfaceDescriptor::serviceName(void) const
-	??8QServiceInterfaceDescriptor@QtMobility@@QBE_NABV01@@Z @ 8 NONAME ; bool QtMobility::QServiceInterfaceDescriptor::operator==(class QtMobility::QServiceInterfaceDescriptor const &) const
-	??0QServiceInterfaceDescriptor@QtMobility@@QAE@XZ @ 9 NONAME ; QtMobility::QServiceInterfaceDescriptor::QServiceInterfaceDescriptor(void)
-	??1QServicePluginInterface@QtMobility@@UAE@XZ @ 10 NONAME ; QtMobility::QServicePluginInterface::~QServicePluginInterface(void)
-	?customAttribute@QServiceInterfaceDescriptor@QtMobility@@QBE?AVQString@@ABV3@@Z @ 11 NONAME ; class QString QtMobility::QServiceInterfaceDescriptor::customAttribute(class QString const &) const
-	??5QtMobility@@YAAAVQDataStream@@AAV1@AAVQServiceFilter@0@@Z @ 12 NONAME ; class QDataStream & QtMobility::operator>>(class QDataStream &, class QtMobility::QServiceFilter &)
-	?tr@QAbstractSecuritySession@QtMobility@@SA?AVQString@@PBD0H@Z @ 13 NONAME ; class QString QtMobility::QAbstractSecuritySession::tr(char const *, char const *, int)
-	?interfaceName@QServiceFilter@QtMobility@@QBE?AVQString@@XZ @ 14 NONAME ; class QString QtMobility::QServiceFilter::interfaceName(void) const
-	?minorVersion@QServiceInterfaceDescriptor@QtMobility@@QBEHXZ @ 15 NONAME ; int QtMobility::QServiceInterfaceDescriptor::minorVersion(void) const
-	??0QServiceFilter@QtMobility@@QAE@XZ @ 16 NONAME ; QtMobility::QServiceFilter::QServiceFilter(void)
-	?versionMatchRule@QServiceFilter@QtMobility@@QBE?AW4VersionMatchRule@12@XZ @ 17 NONAME ; enum QtMobility::QServiceFilter::VersionMatchRule QtMobility::QServiceFilter::versionMatchRule(void) const
-	?setInterface@QServiceFilter@QtMobility@@QAEXABVQString@@0W4VersionMatchRule@12@@Z @ 18 NONAME ; void QtMobility::QServiceFilter::setInterface(class QString const &, class QString const &, enum QtMobility::QServiceFilter::VersionMatchRule)
-	?customAttribute@QServiceFilter@QtMobility@@QBE?AVQString@@ABV3@@Z @ 19 NONAME ; class QString QtMobility::QServiceFilter::customAttribute(class QString const &) const
-	??1QServiceFilter@QtMobility@@QAE@XZ @ 20 NONAME ; QtMobility::QServiceFilter::~QServiceFilter(void)
-	??_ECDatabaseManagerServer@QtMobility@@UAE@I@Z @ 21 NONAME ; QtMobility::CDatabaseManagerServer::~CDatabaseManagerServer(unsigned int)
-	??1CDatabaseManagerServer@QtMobility@@UAE@XZ @ 22 NONAME ; QtMobility::CDatabaseManagerServer::~CDatabaseManagerServer(void)
-	?setServiceName@QServiceFilter@QtMobility@@QAEXABVQString@@@Z @ 23 NONAME ; void QtMobility::QServiceFilter::setServiceName(class QString const &)
-	?setCapabilities@QServiceFilter@QtMobility@@QAEXW4CapabilityMatchRule@12@ABVQStringList@@@Z @ 24 NONAME ; void QtMobility::QServiceFilter::setCapabilities(enum QtMobility::QServiceFilter::CapabilityMatchRule, class QStringList const &)
-	?scope@QServiceInterfaceDescriptor@QtMobility@@QBE?AW4Scope@QService@2@XZ @ 25 NONAME ; enum QtMobility::QService::Scope QtMobility::QServiceInterfaceDescriptor::scope(void) const
-	?customAttributes@QServiceFilter@QtMobility@@QBE?AVQStringList@@XZ @ 26 NONAME ; class QStringList QtMobility::QServiceFilter::customAttributes(void) const
-	??1QServiceInterfaceDescriptor@QtMobility@@QAE@XZ @ 27 NONAME ; QtMobility::QServiceInterfaceDescriptor::~QServiceInterfaceDescriptor(void)
-	??4QServiceInterfaceDescriptor@QtMobility@@QAEAAV01@ABV01@@Z @ 28 NONAME ; class QtMobility::QServiceInterfaceDescriptor & QtMobility::QServiceInterfaceDescriptor::operator=(class QtMobility::QServiceInterfaceDescriptor const &)
-	?majorVersion@QServiceInterfaceDescriptor@QtMobility@@QBEHXZ @ 29 NONAME ; int QtMobility::QServiceInterfaceDescriptor::majorVersion(void) const
-	?isValid@QServiceInterfaceDescriptor@QtMobility@@QBE_NXZ @ 30 NONAME ; bool QtMobility::QServiceInterfaceDescriptor::isValid(void) const
-	??0QAbstractSecuritySession@QtMobility@@QAE@PAVQObject@@@Z @ 31 NONAME ; QtMobility::QAbstractSecuritySession::QAbstractSecuritySession(class QObject *)
-	??4QServiceFilter@QtMobility@@QAEAAV01@ABV01@@Z @ 32 NONAME ; class QtMobility::QServiceFilter & QtMobility::QServiceFilter::operator=(class QtMobility::QServiceFilter const &)
-	?interfaceName@QServiceInterfaceDescriptor@QtMobility@@QBE?AVQString@@XZ @ 33 NONAME ; class QString QtMobility::QServiceInterfaceDescriptor::interfaceName(void) const
-	??6QtMobility@@YAAAVQDataStream@@AAV1@ABVQServiceInterfaceDescriptor@0@@Z @ 34 NONAME ; class QDataStream & QtMobility::operator<<(class QDataStream &, class QtMobility::QServiceInterfaceDescriptor const &)
-	??9QServiceInterfaceDescriptor@QtMobility@@QBE_NABV01@@Z @ 35 NONAME ; bool QtMobility::QServiceInterfaceDescriptor::operator!=(class QtMobility::QServiceInterfaceDescriptor const &) const
-	??1QAbstractSecuritySession@QtMobility@@UAE@XZ @ 36 NONAME ; QtMobility::QAbstractSecuritySession::~QAbstractSecuritySession(void)
-	?installService@QServicePluginInterface@QtMobility@@UAEXXZ @ 37 NONAME ; void QtMobility::QServicePluginInterface::installService(void)
-	?DecreaseSessions@CDatabaseManagerServer@QtMobility@@QAEXXZ @ 38 NONAME ; void QtMobility::CDatabaseManagerServer::DecreaseSessions(void)
-	??0QServiceFilter@QtMobility@@QAE@ABVQString@@0W4VersionMatchRule@01@@Z @ 39 NONAME ; QtMobility::QServiceFilter::QServiceFilter(class QString const &, class QString const &, enum QtMobility::QServiceFilter::VersionMatchRule)
-	?IncreaseSessions@CDatabaseManagerServer@QtMobility@@QAEXXZ @ 40 NONAME ; void QtMobility::CDatabaseManagerServer::IncreaseSessions(void)
-	?attribute@QServiceInterfaceDescriptor@QtMobility@@QBE?AVQVariant@@W4Attribute@12@@Z @ 41 NONAME ; class QVariant QtMobility::QServiceInterfaceDescriptor::attribute(enum QtMobility::QServiceInterfaceDescriptor::Attribute) const
-	?tr@QAbstractSecuritySession@QtMobility@@SA?AVQString@@PBD0@Z @ 42 NONAME ; class QString QtMobility::QAbstractSecuritySession::tr(char const *, char const *)
-	??0QServicePluginInterface@QtMobility@@QAE@XZ @ 43 NONAME ; QtMobility::QServicePluginInterface::QServicePluginInterface(void)
-	?clearCustomAttribute@QServiceFilter@QtMobility@@QAEXABVQString@@@Z @ 44 NONAME ; void QtMobility::QServiceFilter::clearCustomAttribute(class QString const &)
-	?majorVersion@QServiceFilter@QtMobility@@QBEHXZ @ 45 NONAME ; int QtMobility::QServiceFilter::majorVersion(void) const
-	?trUtf8@QAbstractSecuritySession@QtMobility@@SA?AVQString@@PBD0@Z @ 46 NONAME ; class QString QtMobility::QAbstractSecuritySession::trUtf8(char const *, char const *)
-	??0QServiceInterfaceDescriptor@QtMobility@@QAE@ABV01@@Z @ 47 NONAME ; QtMobility::QServiceInterfaceDescriptor::QServiceInterfaceDescriptor(class QtMobility::QServiceInterfaceDescriptor const &)
-	??0CDatabaseManagerServer@QtMobility@@QAE@XZ @ 48 NONAME ; QtMobility::CDatabaseManagerServer::CDatabaseManagerServer(void)
-	?capabilityMatchRule@QServiceFilter@QtMobility@@QBE?AW4CapabilityMatchRule@12@XZ @ 49 NONAME ; enum QtMobility::QServiceFilter::CapabilityMatchRule QtMobility::QServiceFilter::capabilityMatchRule(void) const
-	??5QtMobility@@YAAAVQDataStream@@AAV1@AAVQServiceInterfaceDescriptor@0@@Z @ 50 NONAME ; class QDataStream & QtMobility::operator>>(class QDataStream &, class QtMobility::QServiceInterfaceDescriptor &)
-	??_EQServicePluginInterface@QtMobility@@UAE@I@Z @ 51 NONAME ; QtMobility::QServicePluginInterface::~QServicePluginInterface(unsigned int)
-	?capabilities@QServiceFilter@QtMobility@@QBE?AVQStringList@@XZ @ 52 NONAME ; class QStringList QtMobility::QServiceFilter::capabilities(void) const
-	?serviceName@QServiceFilter@QtMobility@@QBE?AVQString@@XZ @ 53 NONAME ; class QString QtMobility::QServiceFilter::serviceName(void) const
-	??0QServiceFilter@QtMobility@@QAE@ABV01@@Z @ 54 NONAME ; QtMobility::QServiceFilter::QServiceFilter(class QtMobility::QServiceFilter const &)
-	??6QtMobility@@YAAAVQDataStream@@AAV1@ABVQServiceFilter@0@@Z @ 55 NONAME ; class QDataStream & QtMobility::operator<<(class QDataStream &, class QtMobility::QServiceFilter const &)
-	??6QtMobility@@YA?AVQDebug@@V1@ABVQServiceInterfaceDescriptor@0@@Z @ 56 NONAME ; class QDebug QtMobility::operator<<(class QDebug, class QtMobility::QServiceInterfaceDescriptor const &)
-	??_EQAbstractSecuritySession@QtMobility@@UAE@I@Z @ 57 NONAME ; QtMobility::QAbstractSecuritySession::~QAbstractSecuritySession(unsigned int)
-	?trUtf8@QAbstractSecuritySession@QtMobility@@SA?AVQString@@PBD0H@Z @ 58 NONAME ; class QString QtMobility::QAbstractSecuritySession::trUtf8(char const *, char const *, int)
-	?qt_metacast@QAbstractSecuritySession@QtMobility@@UAEPAXPBD@Z @ 59 NONAME ; void * QtMobility::QAbstractSecuritySession::qt_metacast(char const *)
-	?NewSessionL@CDatabaseManagerServer@QtMobility@@UBEPAVCSession2@@ABVTVersion@@ABVRMessage2@@@Z @ 60 NONAME ; class CSession2 * QtMobility::CDatabaseManagerServer::NewSessionL(class TVersion const &, class RMessage2 const &) const
-	?PanicServer@CDatabaseManagerServer@QtMobility@@SAXW4TDatabaseManagerSerververPanic@@@Z @ 61 NONAME ; void QtMobility::CDatabaseManagerServer::PanicServer(enum TDatabaseManagerSerververPanic)
-	?setCustomAttribute@QServiceFilter@QtMobility@@QAEXABVQString@@0@Z @ 62 NONAME ; void QtMobility::QServiceFilter::setCustomAttribute(class QString const &, class QString const &)
-	?customAttributes@QServiceInterfaceDescriptor@QtMobility@@QBE?AVQStringList@@XZ @ 63 NONAME ; class QStringList QtMobility::QServiceInterfaceDescriptor::customAttributes(void) const
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/src/s60installs/bwins/qsfwdatabasemanagerserveru.def	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,65 @@
+EXPORTS
+	?metaObject@QAbstractSecuritySession@QtMobility@@UBEPBUQMetaObject@@XZ @ 1 NONAME ; struct QMetaObject const * QtMobility::QAbstractSecuritySession::metaObject(void) const
+	?staticMetaObject@QAbstractSecuritySession@QtMobility@@2UQMetaObject@@B @ 2 NONAME ; struct QMetaObject const QtMobility::QAbstractSecuritySession::staticMetaObject
+	?minorVersion@QServiceFilter@QtMobility@@QBEHXZ @ 3 NONAME ; int QtMobility::QServiceFilter::minorVersion(void) const
+	?uninstallService@QServicePluginInterface@QtMobility@@UAEXXZ @ 4 NONAME ; void QtMobility::QServicePluginInterface::uninstallService(void)
+	?qt_metacall@QAbstractSecuritySession@QtMobility@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 5 NONAME ; int QtMobility::QAbstractSecuritySession::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?getStaticMetaObject@QAbstractSecuritySession@QtMobility@@SAABUQMetaObject@@XZ @ 6 NONAME ; struct QMetaObject const & QtMobility::QAbstractSecuritySession::getStaticMetaObject(void)
+	?serviceName@QServiceInterfaceDescriptor@QtMobility@@QBE?AVQString@@XZ @ 7 NONAME ; class QString QtMobility::QServiceInterfaceDescriptor::serviceName(void) const
+	??8QServiceInterfaceDescriptor@QtMobility@@QBE_NABV01@@Z @ 8 NONAME ; bool QtMobility::QServiceInterfaceDescriptor::operator==(class QtMobility::QServiceInterfaceDescriptor const &) const
+	??0QServiceInterfaceDescriptor@QtMobility@@QAE@XZ @ 9 NONAME ; QtMobility::QServiceInterfaceDescriptor::QServiceInterfaceDescriptor(void)
+	??1QServicePluginInterface@QtMobility@@UAE@XZ @ 10 NONAME ; QtMobility::QServicePluginInterface::~QServicePluginInterface(void)
+	?customAttribute@QServiceInterfaceDescriptor@QtMobility@@QBE?AVQString@@ABV3@@Z @ 11 NONAME ; class QString QtMobility::QServiceInterfaceDescriptor::customAttribute(class QString const &) const
+	??5QtMobility@@YAAAVQDataStream@@AAV1@AAVQServiceFilter@0@@Z @ 12 NONAME ; class QDataStream & QtMobility::operator>>(class QDataStream &, class QtMobility::QServiceFilter &)
+	?tr@QAbstractSecuritySession@QtMobility@@SA?AVQString@@PBD0H@Z @ 13 NONAME ; class QString QtMobility::QAbstractSecuritySession::tr(char const *, char const *, int)
+	?interfaceName@QServiceFilter@QtMobility@@QBE?AVQString@@XZ @ 14 NONAME ; class QString QtMobility::QServiceFilter::interfaceName(void) const
+	?minorVersion@QServiceInterfaceDescriptor@QtMobility@@QBEHXZ @ 15 NONAME ; int QtMobility::QServiceInterfaceDescriptor::minorVersion(void) const
+	??0QServiceFilter@QtMobility@@QAE@XZ @ 16 NONAME ; QtMobility::QServiceFilter::QServiceFilter(void)
+	?versionMatchRule@QServiceFilter@QtMobility@@QBE?AW4VersionMatchRule@12@XZ @ 17 NONAME ; enum QtMobility::QServiceFilter::VersionMatchRule QtMobility::QServiceFilter::versionMatchRule(void) const
+	?setInterface@QServiceFilter@QtMobility@@QAEXABVQString@@0W4VersionMatchRule@12@@Z @ 18 NONAME ; void QtMobility::QServiceFilter::setInterface(class QString const &, class QString const &, enum QtMobility::QServiceFilter::VersionMatchRule)
+	?customAttribute@QServiceFilter@QtMobility@@QBE?AVQString@@ABV3@@Z @ 19 NONAME ; class QString QtMobility::QServiceFilter::customAttribute(class QString const &) const
+	??1QServiceFilter@QtMobility@@QAE@XZ @ 20 NONAME ; QtMobility::QServiceFilter::~QServiceFilter(void)
+	??_ECDatabaseManagerServer@QtMobility@@UAE@I@Z @ 21 NONAME ; QtMobility::CDatabaseManagerServer::~CDatabaseManagerServer(unsigned int)
+	??1CDatabaseManagerServer@QtMobility@@UAE@XZ @ 22 NONAME ; QtMobility::CDatabaseManagerServer::~CDatabaseManagerServer(void)
+	?setServiceName@QServiceFilter@QtMobility@@QAEXABVQString@@@Z @ 23 NONAME ; void QtMobility::QServiceFilter::setServiceName(class QString const &)
+	?setCapabilities@QServiceFilter@QtMobility@@QAEXW4CapabilityMatchRule@12@ABVQStringList@@@Z @ 24 NONAME ; void QtMobility::QServiceFilter::setCapabilities(enum QtMobility::QServiceFilter::CapabilityMatchRule, class QStringList const &)
+	?scope@QServiceInterfaceDescriptor@QtMobility@@QBE?AW4Scope@QService@2@XZ @ 25 NONAME ; enum QtMobility::QService::Scope QtMobility::QServiceInterfaceDescriptor::scope(void) const
+	?customAttributes@QServiceFilter@QtMobility@@QBE?AVQStringList@@XZ @ 26 NONAME ; class QStringList QtMobility::QServiceFilter::customAttributes(void) const
+	??1QServiceInterfaceDescriptor@QtMobility@@QAE@XZ @ 27 NONAME ; QtMobility::QServiceInterfaceDescriptor::~QServiceInterfaceDescriptor(void)
+	??4QServiceInterfaceDescriptor@QtMobility@@QAEAAV01@ABV01@@Z @ 28 NONAME ; class QtMobility::QServiceInterfaceDescriptor & QtMobility::QServiceInterfaceDescriptor::operator=(class QtMobility::QServiceInterfaceDescriptor const &)
+	?majorVersion@QServiceInterfaceDescriptor@QtMobility@@QBEHXZ @ 29 NONAME ; int QtMobility::QServiceInterfaceDescriptor::majorVersion(void) const
+	?isValid@QServiceInterfaceDescriptor@QtMobility@@QBE_NXZ @ 30 NONAME ; bool QtMobility::QServiceInterfaceDescriptor::isValid(void) const
+	??0QAbstractSecuritySession@QtMobility@@QAE@PAVQObject@@@Z @ 31 NONAME ; QtMobility::QAbstractSecuritySession::QAbstractSecuritySession(class QObject *)
+	??4QServiceFilter@QtMobility@@QAEAAV01@ABV01@@Z @ 32 NONAME ; class QtMobility::QServiceFilter & QtMobility::QServiceFilter::operator=(class QtMobility::QServiceFilter const &)
+	?interfaceName@QServiceInterfaceDescriptor@QtMobility@@QBE?AVQString@@XZ @ 33 NONAME ; class QString QtMobility::QServiceInterfaceDescriptor::interfaceName(void) const
+	??6QtMobility@@YAAAVQDataStream@@AAV1@ABVQServiceInterfaceDescriptor@0@@Z @ 34 NONAME ; class QDataStream & QtMobility::operator<<(class QDataStream &, class QtMobility::QServiceInterfaceDescriptor const &)
+	??9QServiceInterfaceDescriptor@QtMobility@@QBE_NABV01@@Z @ 35 NONAME ; bool QtMobility::QServiceInterfaceDescriptor::operator!=(class QtMobility::QServiceInterfaceDescriptor const &) const
+	??1QAbstractSecuritySession@QtMobility@@UAE@XZ @ 36 NONAME ; QtMobility::QAbstractSecuritySession::~QAbstractSecuritySession(void)
+	?installService@QServicePluginInterface@QtMobility@@UAEXXZ @ 37 NONAME ; void QtMobility::QServicePluginInterface::installService(void)
+	?DecreaseSessions@CDatabaseManagerServer@QtMobility@@QAEXXZ @ 38 NONAME ; void QtMobility::CDatabaseManagerServer::DecreaseSessions(void)
+	??0QServiceFilter@QtMobility@@QAE@ABVQString@@0W4VersionMatchRule@01@@Z @ 39 NONAME ; QtMobility::QServiceFilter::QServiceFilter(class QString const &, class QString const &, enum QtMobility::QServiceFilter::VersionMatchRule)
+	?IncreaseSessions@CDatabaseManagerServer@QtMobility@@QAEXXZ @ 40 NONAME ; void QtMobility::CDatabaseManagerServer::IncreaseSessions(void)
+	?attribute@QServiceInterfaceDescriptor@QtMobility@@QBE?AVQVariant@@W4Attribute@12@@Z @ 41 NONAME ; class QVariant QtMobility::QServiceInterfaceDescriptor::attribute(enum QtMobility::QServiceInterfaceDescriptor::Attribute) const
+	?tr@QAbstractSecuritySession@QtMobility@@SA?AVQString@@PBD0@Z @ 42 NONAME ; class QString QtMobility::QAbstractSecuritySession::tr(char const *, char const *)
+	??0QServicePluginInterface@QtMobility@@QAE@XZ @ 43 NONAME ; QtMobility::QServicePluginInterface::QServicePluginInterface(void)
+	?clearCustomAttribute@QServiceFilter@QtMobility@@QAEXABVQString@@@Z @ 44 NONAME ; void QtMobility::QServiceFilter::clearCustomAttribute(class QString const &)
+	?majorVersion@QServiceFilter@QtMobility@@QBEHXZ @ 45 NONAME ; int QtMobility::QServiceFilter::majorVersion(void) const
+	?trUtf8@QAbstractSecuritySession@QtMobility@@SA?AVQString@@PBD0@Z @ 46 NONAME ; class QString QtMobility::QAbstractSecuritySession::trUtf8(char const *, char const *)
+	??0QServiceInterfaceDescriptor@QtMobility@@QAE@ABV01@@Z @ 47 NONAME ; QtMobility::QServiceInterfaceDescriptor::QServiceInterfaceDescriptor(class QtMobility::QServiceInterfaceDescriptor const &)
+	??0CDatabaseManagerServer@QtMobility@@QAE@XZ @ 48 NONAME ; QtMobility::CDatabaseManagerServer::CDatabaseManagerServer(void)
+	?capabilityMatchRule@QServiceFilter@QtMobility@@QBE?AW4CapabilityMatchRule@12@XZ @ 49 NONAME ; enum QtMobility::QServiceFilter::CapabilityMatchRule QtMobility::QServiceFilter::capabilityMatchRule(void) const
+	??5QtMobility@@YAAAVQDataStream@@AAV1@AAVQServiceInterfaceDescriptor@0@@Z @ 50 NONAME ; class QDataStream & QtMobility::operator>>(class QDataStream &, class QtMobility::QServiceInterfaceDescriptor &)
+	??_EQServicePluginInterface@QtMobility@@UAE@I@Z @ 51 NONAME ; QtMobility::QServicePluginInterface::~QServicePluginInterface(unsigned int)
+	?capabilities@QServiceFilter@QtMobility@@QBE?AVQStringList@@XZ @ 52 NONAME ; class QStringList QtMobility::QServiceFilter::capabilities(void) const
+	?serviceName@QServiceFilter@QtMobility@@QBE?AVQString@@XZ @ 53 NONAME ; class QString QtMobility::QServiceFilter::serviceName(void) const
+	??0QServiceFilter@QtMobility@@QAE@ABV01@@Z @ 54 NONAME ; QtMobility::QServiceFilter::QServiceFilter(class QtMobility::QServiceFilter const &)
+	??6QtMobility@@YAAAVQDataStream@@AAV1@ABVQServiceFilter@0@@Z @ 55 NONAME ; class QDataStream & QtMobility::operator<<(class QDataStream &, class QtMobility::QServiceFilter const &)
+	??6QtMobility@@YA?AVQDebug@@V1@ABVQServiceInterfaceDescriptor@0@@Z @ 56 NONAME ; class QDebug QtMobility::operator<<(class QDebug, class QtMobility::QServiceInterfaceDescriptor const &)
+	??_EQAbstractSecuritySession@QtMobility@@UAE@I@Z @ 57 NONAME ; QtMobility::QAbstractSecuritySession::~QAbstractSecuritySession(unsigned int)
+	?trUtf8@QAbstractSecuritySession@QtMobility@@SA?AVQString@@PBD0H@Z @ 58 NONAME ; class QString QtMobility::QAbstractSecuritySession::trUtf8(char const *, char const *, int)
+	?qt_metacast@QAbstractSecuritySession@QtMobility@@UAEPAXPBD@Z @ 59 NONAME ; void * QtMobility::QAbstractSecuritySession::qt_metacast(char const *)
+	?NewSessionL@CDatabaseManagerServer@QtMobility@@UBEPAVCSession2@@ABVTVersion@@ABVRMessage2@@@Z @ 60 NONAME ; class CSession2 * QtMobility::CDatabaseManagerServer::NewSessionL(class TVersion const &, class RMessage2 const &) const
+	?PanicServer@CDatabaseManagerServer@QtMobility@@SAXW4TDatabaseManagerSerververPanic@@@Z @ 61 NONAME ; void QtMobility::CDatabaseManagerServer::PanicServer(enum TDatabaseManagerSerververPanic)
+	?setCustomAttribute@QServiceFilter@QtMobility@@QAEXABVQString@@0@Z @ 62 NONAME ; void QtMobility::QServiceFilter::setCustomAttribute(class QString const &, class QString const &)
+	?customAttributes@QServiceInterfaceDescriptor@QtMobility@@QBE?AVQStringList@@XZ @ 63 NONAME ; class QStringList QtMobility::QServiceInterfaceDescriptor::customAttributes(void) const
+

--- a/qtmobility/src/s60installs/eabi/QtContactsu.def	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/s60installs/eabi/QtContactsu.def	Fri May 14 16:41:33 2010 +0300
@@ -32,806 +32,701 @@
 	_ZN10QtMobility12QContactType14DefinitionNameE @ 31 NONAME DATA 5
 	_ZN10QtMobility12QContactType9FieldTypeE @ 32 NONAME DATA 5
 	_ZN10QtMobility12QContactType9TypeGroupE @ 33 NONAME DATA 6
-	_ZN10QtMobility14QContactAction11qt_metacallEN11QMetaObject4CallEiPPv @ 34 NONAME
-	_ZN10QtMobility14QContactAction11qt_metacastEPKc @ 35 NONAME
-	_ZN10QtMobility14QContactAction12stateChangedENS0_5StateE @ 36 NONAME
-	_ZN10QtMobility14QContactAction16availableActionsERK7QStringi @ 37 NONAME
-	_ZN10QtMobility14QContactAction16resultsAvailableEv @ 38 NONAME
-	_ZN10QtMobility14QContactAction16staticMetaObjectE @ 39 NONAME DATA 16
-	_ZN10QtMobility14QContactAction17actionDescriptorsERK7QStringS3_i @ 40 NONAME
-	_ZN10QtMobility14QContactAction19getStaticMetaObjectEv @ 41 NONAME
-	_ZN10QtMobility14QContactAction6actionERKNS_24QContactActionDescriptorE @ 42 NONAME
-	_ZN10QtMobility14QContactActionD0Ev @ 43 NONAME
-	_ZN10QtMobility14QContactActionD1Ev @ 44 NONAME
-	_ZN10QtMobility14QContactActionD2Ev @ 45 NONAME
-	_ZN10QtMobility14QContactAvatar13FieldImageUrlE @ 46 NONAME DATA 9
-	_ZN10QtMobility14QContactAvatar13FieldVideoUrlE @ 47 NONAME DATA 9
-	_ZN10QtMobility14QContactAvatar14DefinitionNameE @ 48 NONAME DATA 7
-	_ZN10QtMobility14QContactDetail11ContextHomeE @ 49 NONAME DATA 5
-	_ZN10QtMobility14QContactDetail11ContextWorkE @ 50 NONAME DATA 5
-	_ZN10QtMobility14QContactDetail11removeValueERK7QString @ 51 NONAME
-	_ZN10QtMobility14QContactDetail12ContextOtherE @ 52 NONAME DATA 6
-	_ZN10QtMobility14QContactDetail12FieldContextE @ 53 NONAME DATA 8
-	_ZN10QtMobility14QContactDetail14FieldDetailUriE @ 54 NONAME DATA 10
-	_ZN10QtMobility14QContactDetail21FieldLinkedDetailUrisE @ 55 NONAME DATA 17
-	_ZN10QtMobility14QContactDetail6assignERKS0_RK7QString @ 56 NONAME
-	_ZN10QtMobility14QContactDetail8resetKeyEv @ 57 NONAME
-	_ZN10QtMobility14QContactDetail8setValueERK7QStringRK8QVariant @ 58 NONAME
-	_ZN10QtMobility14QContactDetailC1ERK7QString @ 59 NONAME
-	_ZN10QtMobility14QContactDetailC1ERKS0_ @ 60 NONAME
-	_ZN10QtMobility14QContactDetailC1ERKS0_RK7QString @ 61 NONAME
-	_ZN10QtMobility14QContactDetailC1Ev @ 62 NONAME
-	_ZN10QtMobility14QContactDetailC2ERK7QString @ 63 NONAME
-	_ZN10QtMobility14QContactDetailC2ERKS0_ @ 64 NONAME
-	_ZN10QtMobility14QContactDetailC2ERKS0_RK7QString @ 65 NONAME
-	_ZN10QtMobility14QContactDetailC2Ev @ 66 NONAME
-	_ZN10QtMobility14QContactDetailD0Ev @ 67 NONAME
-	_ZN10QtMobility14QContactDetailD1Ev @ 68 NONAME
-	_ZN10QtMobility14QContactDetailD2Ev @ 69 NONAME
-	_ZN10QtMobility14QContactDetailaSERKS0_ @ 70 NONAME
-	_ZN10QtMobility14QContactFamily11FieldSpouseE @ 71 NONAME DATA 7
-	_ZN10QtMobility14QContactFamily13FieldChildrenE @ 72 NONAME DATA 9
-	_ZN10QtMobility14QContactFamily14DefinitionNameE @ 73 NONAME DATA 7
-	_ZN10QtMobility14QContactFilterC1EPNS_21QContactFilterPrivateE @ 74 NONAME
-	_ZN10QtMobility14QContactFilterC1ERKS0_ @ 75 NONAME
-	_ZN10QtMobility14QContactFilterC1Ev @ 76 NONAME
-	_ZN10QtMobility14QContactFilterC2EPNS_21QContactFilterPrivateE @ 77 NONAME
-	_ZN10QtMobility14QContactFilterC2ERKS0_ @ 78 NONAME
-	_ZN10QtMobility14QContactFilterC2Ev @ 79 NONAME
-	_ZN10QtMobility14QContactFilterD0Ev @ 80 NONAME
-	_ZN10QtMobility14QContactFilterD1Ev @ 81 NONAME
-	_ZN10QtMobility14QContactFilterD2Ev @ 82 NONAME
-	_ZN10QtMobility14QContactFilteraSERKS0_ @ 83 NONAME
-	_ZN10QtMobility14QContactGender10GenderMaleE @ 84 NONAME DATA 5
-	_ZN10QtMobility14QContactGender11FieldGenderE @ 85 NONAME DATA 7
-	_ZN10QtMobility14QContactGender12GenderFemaleE @ 86 NONAME DATA 7
-	_ZN10QtMobility14QContactGender14DefinitionNameE @ 87 NONAME DATA 7
-	_ZN10QtMobility14QContactGender17GenderUnspecifiedE @ 88 NONAME DATA 12
-	_ZN10QtMobility15QContactAddress11FieldRegionE @ 89 NONAME DATA 7
-	_ZN10QtMobility15QContactAddress11FieldStreetE @ 90 NONAME DATA 7
-	_ZN10QtMobility15QContactAddress12FieldCountryE @ 91 NONAME DATA 8
-	_ZN10QtMobility15QContactAddress13FieldLocalityE @ 92 NONAME DATA 9
-	_ZN10QtMobility15QContactAddress13FieldPostcodeE @ 93 NONAME DATA 9
-	_ZN10QtMobility15QContactAddress13FieldSubTypesE @ 94 NONAME DATA 9
-	_ZN10QtMobility15QContactAddress13SubTypeParcelE @ 95 NONAME DATA 7
-	_ZN10QtMobility15QContactAddress13SubTypePostalE @ 96 NONAME DATA 7
-	_ZN10QtMobility15QContactAddress14DefinitionNameE @ 97 NONAME DATA 8
-	_ZN10QtMobility15QContactAddress15SubTypeDomesticE @ 98 NONAME DATA 9
-	_ZN10QtMobility15QContactAddress18FieldPostOfficeBoxE @ 99 NONAME DATA 14
-	_ZN10QtMobility15QContactAddress20SubTypeInternationalE @ 100 NONAME DATA 14
-	_ZN10QtMobility15QContactManager11dataChangedEv @ 101 NONAME
-	_ZN10QtMobility15QContactManager11qt_metacallEN11QMetaObject4CallEiPPv @ 102 NONAME
-	_ZN10QtMobility15QContactManager11qt_metacastEPKc @ 103 NONAME
-	_ZN10QtMobility15QContactManager11saveContactEPNS_8QContactE @ 104 NONAME
-	_ZN10QtMobility15QContactManager12createEngineERK7QStringRK4QMapIS1_S1_E @ 105 NONAME
-	_ZN10QtMobility15QContactManager12saveContactsEP5QListINS_8QContactEEP4QMapIiNS0_5ErrorEE @ 106 NONAME
-	_ZN10QtMobility15QContactManager13contactsAddedERK5QListIjE @ 107 NONAME
-	_ZN10QtMobility15QContactManager13removeContactERKj @ 108 NONAME
-	_ZN10QtMobility15QContactManager14removeContactsERK5QListIjEP4QMapIiNS0_5ErrorEE @ 109 NONAME
-	_ZN10QtMobility15QContactManager15contactsChangedERK5QListIjE @ 110 NONAME
-	_ZN10QtMobility15QContactManager15contactsRemovedERK5QListIjE @ 111 NONAME
-	_ZN10QtMobility15QContactManager16saveRelationshipEPNS_20QContactRelationshipE @ 112 NONAME
-	_ZN10QtMobility15QContactManager16setSelfContactIdERKj @ 113 NONAME
-	_ZN10QtMobility15QContactManager16staticMetaObjectE @ 114 NONAME DATA 16
-	_ZN10QtMobility15QContactManager17availableManagersEv @ 115 NONAME
-	_ZN10QtMobility15QContactManager17compatibleContactERKNS_8QContactE @ 116 NONAME
-	_ZN10QtMobility15QContactManager17saveRelationshipsEP5QListINS_20QContactRelationshipEEP4QMapIiNS0_5ErrorEE @ 117 NONAME
-	_ZN10QtMobility15QContactManager18relationshipsAddedERK5QListIjE @ 118 NONAME
-	_ZN10QtMobility15QContactManager18removeRelationshipERKNS_20QContactRelationshipE @ 119 NONAME
-	_ZN10QtMobility15QContactManager19getStaticMetaObjectEv @ 120 NONAME
-	_ZN10QtMobility15QContactManager19removeRelationshipsERK5QListINS_20QContactRelationshipEEP4QMapIiNS0_5ErrorEE @ 121 NONAME
-	_ZN10QtMobility15QContactManager20relationshipsRemovedERK5QListIjE @ 122 NONAME
-	_ZN10QtMobility15QContactManager20saveDetailDefinitionERKNS_24QContactDetailDefinitionERK7QString @ 123 NONAME
-	_ZN10QtMobility15QContactManager20selfContactIdChangedERKjS2_ @ 124 NONAME
-	_ZN10QtMobility15QContactManager22removeDetailDefinitionERK7QStringS3_ @ 125 NONAME
-	_ZN10QtMobility15QContactManager7fromUriERK7QStringP7QObject @ 126 NONAME
-	_ZN10QtMobility15QContactManager8buildUriERK7QStringRK4QMapIS1_S1_Ei @ 127 NONAME
-	_ZN10QtMobility15QContactManager8parseUriERK7QStringPS1_P4QMapIS1_S1_E @ 128 NONAME
-	_ZN10QtMobility15QContactManagerC1EP7QObject @ 129 NONAME
-	_ZN10QtMobility15QContactManagerC1ERK7QStringRK4QMapIS1_S1_EP7QObject @ 130 NONAME
-	_ZN10QtMobility15QContactManagerC1ERK7QStringiRK4QMapIS1_S1_EP7QObject @ 131 NONAME
-	_ZN10QtMobility15QContactManagerC2EP7QObject @ 132 NONAME
-	_ZN10QtMobility15QContactManagerC2ERK7QStringRK4QMapIS1_S1_EP7QObject @ 133 NONAME
-	_ZN10QtMobility15QContactManagerC2ERK7QStringiRK4QMapIS1_S1_EP7QObject @ 134 NONAME
-	_ZN10QtMobility15QContactManagerD0Ev @ 135 NONAME
-	_ZN10QtMobility15QContactManagerD1Ev @ 136 NONAME
-	_ZN10QtMobility15QContactManagerD2Ev @ 137 NONAME
-	_ZN10QtMobility16QContactBirthday13FieldBirthdayE @ 138 NONAME DATA 9
-	_ZN10QtMobility16QContactBirthday14DefinitionNameE @ 139 NONAME DATA 9
-	_ZN10QtMobility16QContactNickname13FieldNicknameE @ 140 NONAME DATA 9
-	_ZN10QtMobility16QContactNickname14DefinitionNameE @ 141 NONAME DATA 9
-	_ZN10QtMobility16QContactPresence13FieldNicknameE @ 142 NONAME DATA 9
-	_ZN10QtMobility16QContactPresence14DefinitionNameE @ 143 NONAME DATA 9
-	_ZN10QtMobility16QContactPresence14FieldTimestampE @ 144 NONAME DATA 10
-	_ZN10QtMobility16QContactPresence18FieldCustomMessageE @ 145 NONAME DATA 14
-	_ZN10QtMobility16QContactPresence18FieldPresenceStateE @ 146 NONAME DATA 14
-	_ZN10QtMobility16QContactPresence22FieldPresenceStateTextE @ 147 NONAME DATA 18
-	_ZN10QtMobility16QContactPresence26FieldPresenceStateImageUrlE @ 148 NONAME DATA 22
-	_ZN10QtMobility16QContactRingtone14DefinitionNameE @ 149 NONAME DATA 9
-	_ZN10QtMobility16QContactRingtone21FieldAudioRingtoneUrlE @ 150 NONAME DATA 17
-	_ZN10QtMobility16QContactRingtone21FieldVideoRingtoneUrlE @ 151 NONAME DATA 17
-	_ZN10QtMobility16QContactRingtone25FieldVibrationRingtoneUrlE @ 152 NONAME DATA 21
-	_ZN10QtMobility17QContactChangeSet11dataChangedEv @ 153 NONAME
-	_ZN10QtMobility17QContactChangeSet11emitSignalsEPNS_21QContactManagerEngineE @ 154 NONAME
-	_ZN10QtMobility17QContactChangeSet14setDataChangedEb @ 155 NONAME
-	_ZN10QtMobility17QContactChangeSet18clearAddedContactsEv @ 156 NONAME
-	_ZN10QtMobility17QContactChangeSet18insertAddedContactEj @ 157 NONAME
-	_ZN10QtMobility17QContactChangeSet19insertAddedContactsERK5QListIjE @ 158 NONAME
-	_ZN10QtMobility17QContactChangeSet20clearChangedContactsEv @ 159 NONAME
-	_ZN10QtMobility17QContactChangeSet20clearRemovedContactsEv @ 160 NONAME
-	_ZN10QtMobility17QContactChangeSet20insertChangedContactEj @ 161 NONAME
-	_ZN10QtMobility17QContactChangeSet20insertRemovedContactEj @ 162 NONAME
-	_ZN10QtMobility17QContactChangeSet21insertChangedContactsERK5QListIjE @ 163 NONAME
-	_ZN10QtMobility17QContactChangeSet21insertRemovedContactsERK5QListIjE @ 164 NONAME
-	_ZN10QtMobility17QContactChangeSet25setOldAndNewSelfContactIdERK5QPairIjjE @ 165 NONAME
-	_ZN10QtMobility17QContactChangeSet31clearAddedRelationshipsContactsEv @ 166 NONAME
-	_ZN10QtMobility17QContactChangeSet31insertAddedRelationshipsContactEj @ 167 NONAME
-	_ZN10QtMobility17QContactChangeSet32insertAddedRelationshipsContactsERK5QListIjE @ 168 NONAME
-	_ZN10QtMobility17QContactChangeSet33clearRemovedRelationshipsContactsEv @ 169 NONAME
-	_ZN10QtMobility17QContactChangeSet33insertRemovedRelationshipsContactEj @ 170 NONAME
-	_ZN10QtMobility17QContactChangeSet34insertRemovedRelationshipsContactsERK5QListIjE @ 171 NONAME
-	_ZN10QtMobility17QContactChangeSet8clearAllEv @ 172 NONAME
-	_ZN10QtMobility17QContactChangeSetC1ERKS0_ @ 173 NONAME
-	_ZN10QtMobility17QContactChangeSetC1Ev @ 174 NONAME
-	_ZN10QtMobility17QContactChangeSetC2ERKS0_ @ 175 NONAME
-	_ZN10QtMobility17QContactChangeSetC2Ev @ 176 NONAME
-	_ZN10QtMobility17QContactChangeSetD1Ev @ 177 NONAME
-	_ZN10QtMobility17QContactChangeSetD2Ev @ 178 NONAME
-	_ZN10QtMobility17QContactChangeSetaSERKS0_ @ 179 NONAME
-	_ZN10QtMobility17QContactFetchHint20setOptimizationHintsE6QFlagsINS0_16OptimizationHintEE @ 180 NONAME
-	_ZN10QtMobility17QContactFetchHint24setDetailDefinitionsHintERK11QStringList @ 181 NONAME
-	_ZN10QtMobility17QContactFetchHint24setRelationshipTypesHintERK11QStringList @ 182 NONAME
-	_ZN10QtMobility17QContactFetchHintC1ERKS0_ @ 183 NONAME
-	_ZN10QtMobility17QContactFetchHintC1Ev @ 184 NONAME
-	_ZN10QtMobility17QContactFetchHintC2ERKS0_ @ 185 NONAME
-	_ZN10QtMobility17QContactFetchHintC2Ev @ 186 NONAME
-	_ZN10QtMobility17QContactFetchHintD1Ev @ 187 NONAME
-	_ZN10QtMobility17QContactFetchHintD2Ev @ 188 NONAME
-	_ZN10QtMobility17QContactFetchHintaSERKS0_ @ 189 NONAME
-	_ZN10QtMobility17QContactSortOrder12setDirectionEN2Qt9SortOrderE @ 190 NONAME
-	_ZN10QtMobility17QContactSortOrder14setBlankPolicyENS0_11BlankPolicyE @ 191 NONAME
-	_ZN10QtMobility17QContactSortOrder18setCaseSensitivityEN2Qt15CaseSensitivityE @ 192 NONAME
-	_ZN10QtMobility17QContactSortOrder23setDetailDefinitionNameERK7QStringS3_ @ 193 NONAME
-	_ZN10QtMobility17QContactSortOrderC1ERKS0_ @ 194 NONAME
-	_ZN10QtMobility17QContactSortOrderC1Ev @ 195 NONAME
-	_ZN10QtMobility17QContactSortOrderC2ERKS0_ @ 196 NONAME
-	_ZN10QtMobility17QContactSortOrderC2Ev @ 197 NONAME
-	_ZN10QtMobility17QContactSortOrderD1Ev @ 198 NONAME
-	_ZN10QtMobility17QContactSortOrderD2Ev @ 199 NONAME
-	_ZN10QtMobility17QContactSortOrderaSERKS0_ @ 200 NONAME
-	_ZN10QtMobility17QContactThumbnail14DefinitionNameE @ 201 NONAME DATA 10
-	_ZN10QtMobility17QContactThumbnail14FieldThumbnailE @ 202 NONAME DATA 10
-	_ZN10QtMobility17QContactTimestamp14DefinitionNameE @ 203 NONAME DATA 10
-	_ZN10QtMobility17QContactTimestamp22FieldCreationTimestampE @ 204 NONAME DATA 18
-	_ZN10QtMobility17QContactTimestamp26FieldModificationTimestampE @ 205 NONAME DATA 22
-	_ZN10QtMobility18QContactSyncTarget14DefinitionNameE @ 206 NONAME DATA 11
-	_ZN10QtMobility18QContactSyncTarget15FieldSyncTargetE @ 207 NONAME DATA 11
-	_ZN10QtMobility19QContactAnniversary10FieldEventE @ 208 NONAME DATA 6
-	_ZN10QtMobility19QContactAnniversary12FieldSubTypeE @ 209 NONAME DATA 8
-	_ZN10QtMobility19QContactAnniversary12SubTypeHouseE @ 210 NONAME DATA 6
-	_ZN10QtMobility19QContactAnniversary14DefinitionNameE @ 211 NONAME DATA 12
-	_ZN10QtMobility19QContactAnniversary14SubTypeWeddingE @ 212 NONAME DATA 8
-	_ZN10QtMobility19QContactAnniversary15FieldCalendarIdE @ 213 NONAME DATA 11
-	_ZN10QtMobility19QContactAnniversary15SubTypeMemorialE @ 214 NONAME DATA 9
-	_ZN10QtMobility19QContactAnniversary17FieldOriginalDateE @ 215 NONAME DATA 13
-	_ZN10QtMobility19QContactAnniversary17SubTypeEmploymentE @ 216 NONAME DATA 11
-	_ZN10QtMobility19QContactAnniversary17SubTypeEngagementE @ 217 NONAME DATA 11
-	_ZN10QtMobility19QContactGeoLocation10FieldLabelE @ 218 NONAME DATA 6
-	_ZN10QtMobility19QContactGeoLocation10FieldSpeedE @ 219 NONAME DATA 6
-	_ZN10QtMobility19QContactGeoLocation12FieldHeadingE @ 220 NONAME DATA 8
-	_ZN10QtMobility19QContactGeoLocation13FieldAccuracyE @ 221 NONAME DATA 9
-	_ZN10QtMobility19QContactGeoLocation13FieldAltitudeE @ 222 NONAME DATA 9
-	_ZN10QtMobility19QContactGeoLocation13FieldLatitudeE @ 223 NONAME DATA 9
-	_ZN10QtMobility19QContactGeoLocation14DefinitionNameE @ 224 NONAME DATA 12
-	_ZN10QtMobility19QContactGeoLocation14FieldLongitudeE @ 225 NONAME DATA 10
-	_ZN10QtMobility19QContactGeoLocation14FieldTimestampE @ 226 NONAME DATA 10
-	_ZN10QtMobility19QContactGeoLocation21FieldAltitudeAccuracyE @ 227 NONAME DATA 17
-	_ZN10QtMobility19QContactPhoneNumber10SubTypeCarE @ 228 NONAME DATA 4
-	_ZN10QtMobility19QContactPhoneNumber10SubTypeFaxE @ 229 NONAME DATA 4
-	_ZN10QtMobility19QContactPhoneNumber11FieldNumberE @ 230 NONAME DATA 12
-	_ZN10QtMobility19QContactPhoneNumber12SubTypeModemE @ 231 NONAME DATA 6
-	_ZN10QtMobility19QContactPhoneNumber12SubTypePagerE @ 232 NONAME DATA 6
-	_ZN10QtMobility19QContactPhoneNumber12SubTypeVideoE @ 233 NONAME DATA 6
-	_ZN10QtMobility19QContactPhoneNumber12SubTypeVoiceE @ 234 NONAME DATA 6
-	_ZN10QtMobility19QContactPhoneNumber13FieldSubTypesE @ 235 NONAME DATA 9
-	_ZN10QtMobility19QContactPhoneNumber13SubTypeMobileE @ 236 NONAME DATA 7
-	_ZN10QtMobility19QContactPhoneNumber14DefinitionNameE @ 237 NONAME DATA 12
-	_ZN10QtMobility19QContactPhoneNumber15SubTypeDtmfMenuE @ 238 NONAME DATA 9
-	_ZN10QtMobility19QContactPhoneNumber15SubTypeLandlineE @ 239 NONAME DATA 9
-	_ZN10QtMobility19QContactPhoneNumber16SubTypeAssistantE @ 240 NONAME DATA 10
-	_ZN10QtMobility19QContactPhoneNumber23SubTypeMessagingCapableE @ 241 NONAME DATA 17
-	_ZN10QtMobility19QContactPhoneNumber26SubTypeBulletinBoardSystemE @ 242 NONAME DATA 20
-	_ZN10QtMobility19QContactPhoneNumber5matchERK7QString @ 243 NONAME
-	_ZN10QtMobility19QContactSaveRequest11qt_metacallEN11QMetaObject4CallEiPPv @ 244 NONAME
-	_ZN10QtMobility19QContactSaveRequest11qt_metacastEPKc @ 245 NONAME
-	_ZN10QtMobility19QContactSaveRequest11setContactsERK5QListINS_8QContactEE @ 246 NONAME
-	_ZN10QtMobility19QContactSaveRequest16staticMetaObjectE @ 247 NONAME DATA 16
-	_ZN10QtMobility19QContactSaveRequest19getStaticMetaObjectEv @ 248 NONAME
-	_ZN10QtMobility19QContactSaveRequestC1Ev @ 249 NONAME
-	_ZN10QtMobility19QContactSaveRequestC2Ev @ 250 NONAME
-	_ZN10QtMobility19QContactSaveRequestD0Ev @ 251 NONAME
-	_ZN10QtMobility19QContactSaveRequestD1Ev @ 252 NONAME
-	_ZN10QtMobility19QContactSaveRequestD2Ev @ 253 NONAME
-	_ZN10QtMobility19QContactUnionFilter10setFiltersERK5QListINS_14QContactFilterEE @ 254 NONAME
-	_ZN10QtMobility19QContactUnionFilter6appendERKNS_14QContactFilterE @ 255 NONAME
-	_ZN10QtMobility19QContactUnionFilter6removeERKNS_14QContactFilterE @ 256 NONAME
-	_ZN10QtMobility19QContactUnionFilter7prependERKNS_14QContactFilterE @ 257 NONAME
-	_ZN10QtMobility19QContactUnionFilterC1ERKNS_14QContactFilterE @ 258 NONAME
-	_ZN10QtMobility19QContactUnionFilterC1Ev @ 259 NONAME
-	_ZN10QtMobility19QContactUnionFilterC2ERKNS_14QContactFilterE @ 260 NONAME
-	_ZN10QtMobility19QContactUnionFilterC2Ev @ 261 NONAME
-	_ZN10QtMobility19QContactUnionFilterlsERKNS_14QContactFilterE @ 262 NONAME
-	_ZN10QtMobility20QContactActionFilter13setActionNameERK7QString @ 263 NONAME
-	_ZN10QtMobility20QContactActionFilter8setValueERK8QVariant @ 264 NONAME
-	_ZN10QtMobility20QContactActionFilter9setVendorERK7QStringi @ 265 NONAME
-	_ZN10QtMobility20QContactActionFilterC1ERKNS_14QContactFilterE @ 266 NONAME
-	_ZN10QtMobility20QContactActionFilterC1Ev @ 267 NONAME
-	_ZN10QtMobility20QContactActionFilterC2ERKNS_14QContactFilterE @ 268 NONAME
-	_ZN10QtMobility20QContactActionFilterC2Ev @ 269 NONAME
-	_ZN10QtMobility20QContactDetailFilter13setMatchFlagsE6QFlagsINS_14QContactFilter9MatchFlagEE @ 270 NONAME
-	_ZN10QtMobility20QContactDetailFilter23setDetailDefinitionNameERK7QStringS3_ @ 271 NONAME
-	_ZN10QtMobility20QContactDetailFilter8setValueERK8QVariant @ 272 NONAME
-	_ZN10QtMobility20QContactDetailFilterC1ERKNS_14QContactFilterE @ 273 NONAME
-	_ZN10QtMobility20QContactDetailFilterC1Ev @ 274 NONAME
-	_ZN10QtMobility20QContactDetailFilterC2ERKNS_14QContactFilterE @ 275 NONAME
-	_ZN10QtMobility20QContactDetailFilterC2Ev @ 276 NONAME
-	_ZN10QtMobility20QContactDisplayLabel10FieldLabelE @ 277 NONAME DATA 6
-	_ZN10QtMobility20QContactDisplayLabel14DefinitionNameE @ 278 NONAME DATA 13
-	_ZN10QtMobility20QContactDisplayLabel5matchERK7QString @ 279 NONAME
-	_ZN10QtMobility20QContactEmailAddress14DefinitionNameE @ 280 NONAME DATA 13
-	_ZN10QtMobility20QContactEmailAddress17FieldEmailAddressE @ 281 NONAME DATA 13
-	_ZN10QtMobility20QContactEmailAddress5matchERK7QString @ 282 NONAME
-	_ZN10QtMobility20QContactFetchRequest10setSortingERK5QListINS_17QContactSortOrderEE @ 283 NONAME
-	_ZN10QtMobility20QContactFetchRequest11qt_metacallEN11QMetaObject4CallEiPPv @ 284 NONAME
-	_ZN10QtMobility20QContactFetchRequest11qt_metacastEPKc @ 285 NONAME
-	_ZN10QtMobility20QContactFetchRequest12setFetchHintERKNS_17QContactFetchHintE @ 286 NONAME
-	_ZN10QtMobility20QContactFetchRequest16staticMetaObjectE @ 287 NONAME DATA 16
-	_ZN10QtMobility20QContactFetchRequest19getStaticMetaObjectEv @ 288 NONAME
-	_ZN10QtMobility20QContactFetchRequest9setFilterERKNS_14QContactFilterE @ 289 NONAME
-	_ZN10QtMobility20QContactFetchRequestC1Ev @ 290 NONAME
-	_ZN10QtMobility20QContactFetchRequestC2Ev @ 291 NONAME
-	_ZN10QtMobility20QContactFetchRequestD0Ev @ 292 NONAME
-	_ZN10QtMobility20QContactFetchRequestD1Ev @ 293 NONAME
-	_ZN10QtMobility20QContactFetchRequestD2Ev @ 294 NONAME
-	_ZN10QtMobility20QContactOrganization10FieldTitleE @ 295 NONAME DATA 6
-	_ZN10QtMobility20QContactOrganization12FieldLogoUrlE @ 296 NONAME DATA 8
-	_ZN10QtMobility20QContactOrganization13FieldLocationE @ 297 NONAME DATA 9
-	_ZN10QtMobility20QContactOrganization14DefinitionNameE @ 298 NONAME DATA 13
-	_ZN10QtMobility20QContactOrganization15FieldDepartmentE @ 299 NONAME DATA 11
-	_ZN10QtMobility20QContactOrganization18FieldAssistantNameE @ 300 NONAME DATA 14
-	_ZN10QtMobility20QContactOrganization9FieldNameE @ 301 NONAME DATA 5
-	_ZN10QtMobility20QContactOrganization9FieldRoleE @ 302 NONAME DATA 5
-	_ZN10QtMobility20QContactRelationship10AggregatesE @ 303 NONAME DATA 11
-	_ZN10QtMobility20QContactRelationship10HasManagerE @ 304 NONAME DATA 11
-	_ZN10QtMobility20QContactRelationship12HasAssistantE @ 305 NONAME DATA 13
-	_ZN10QtMobility20QContactRelationship19setRelationshipTypeERK7QString @ 306 NONAME
-	_ZN10QtMobility20QContactRelationship8IsSameAsE @ 307 NONAME DATA 9
-	_ZN10QtMobility20QContactRelationship8setFirstERKNS_10QContactIdE @ 308 NONAME
-	_ZN10QtMobility20QContactRelationship9HasMemberE @ 309 NONAME DATA 10
-	_ZN10QtMobility20QContactRelationship9HasSpouseE @ 310 NONAME DATA 10
-	_ZN10QtMobility20QContactRelationship9setSecondERKNS_10QContactIdE @ 311 NONAME
-	_ZN10QtMobility20QContactRelationshipC1ERKS0_ @ 312 NONAME
-	_ZN10QtMobility20QContactRelationshipC1Ev @ 313 NONAME
-	_ZN10QtMobility20QContactRelationshipC2ERKS0_ @ 314 NONAME
-	_ZN10QtMobility20QContactRelationshipC2Ev @ 315 NONAME
-	_ZN10QtMobility20QContactRelationshipD1Ev @ 316 NONAME
-	_ZN10QtMobility20QContactRelationshipD2Ev @ 317 NONAME
-	_ZN10QtMobility20QContactRelationshipaSERKS0_ @ 318 NONAME
-	_ZN10QtMobility21QContactActionFactory11qt_metacallEN11QMetaObject4CallEiPPv @ 319 NONAME
-	_ZN10QtMobility21QContactActionFactory11qt_metacastEPKc @ 320 NONAME
-	_ZN10QtMobility21QContactActionFactory16staticMetaObjectE @ 321 NONAME DATA 16
-	_ZN10QtMobility21QContactActionFactory19getStaticMetaObjectEv @ 322 NONAME
-	_ZN10QtMobility21QContactActionFactoryD0Ev @ 323 NONAME
-	_ZN10QtMobility21QContactActionFactoryD1Ev @ 324 NONAME
-	_ZN10QtMobility21QContactActionFactoryD2Ev @ 325 NONAME
-	_ZN10QtMobility21QContactInvalidFilterC1ERKNS_14QContactFilterE @ 326 NONAME
-	_ZN10QtMobility21QContactInvalidFilterC1Ev @ 327 NONAME
-	_ZN10QtMobility21QContactInvalidFilterC2ERKNS_14QContactFilterE @ 328 NONAME
-	_ZN10QtMobility21QContactInvalidFilterC2Ev @ 329 NONAME
-	_ZN10QtMobility21QContactLocalIdFilter6setIdsERK5QListIjE @ 330 NONAME
-	_ZN10QtMobility21QContactLocalIdFilterC1ERKNS_14QContactFilterE @ 331 NONAME
-	_ZN10QtMobility21QContactLocalIdFilterC1Ev @ 332 NONAME
-	_ZN10QtMobility21QContactLocalIdFilterC2ERKNS_14QContactFilterE @ 333 NONAME
-	_ZN10QtMobility21QContactLocalIdFilterC2Ev @ 334 NONAME
-	_ZN10QtMobility21QContactManagerEngine10testFilterERKNS_14QContactFilterERKNS_8QContactE @ 335 NONAME
-	_ZN10QtMobility21QContactManagerEngine11dataChangedEv @ 336 NONAME
-	_ZN10QtMobility21QContactManagerEngine11qt_metacallEN11QMetaObject4CallEiPPv @ 337 NONAME
-	_ZN10QtMobility21QContactManagerEngine11qt_metacastEPKc @ 338 NONAME
-	_ZN10QtMobility21QContactManagerEngine11saveContactEPNS_8QContactEPNS_15QContactManager5ErrorE @ 339 NONAME
-	_ZN10QtMobility21QContactManagerEngine12saveContactsEP5QListINS_8QContactEEP4QMapIiNS_15QContactManager5ErrorEEPS7_ @ 340 NONAME
-	_ZN10QtMobility21QContactManagerEngine12sortContactsERK5QListINS_8QContactEERKS1_INS_17QContactSortOrderEE @ 341 NONAME
-	_ZN10QtMobility21QContactManagerEngine12startRequestEPNS_23QContactAbstractRequestE @ 342 NONAME
-	_ZN10QtMobility21QContactManagerEngine13cancelRequestEPNS_23QContactAbstractRequestE @ 343 NONAME
-	_ZN10QtMobility21QContactManagerEngine13contactsAddedERK5QListIjE @ 344 NONAME
-	_ZN10QtMobility21QContactManagerEngine13removeContactERKjPNS_15QContactManager5ErrorE @ 345 NONAME
-	_ZN10QtMobility21QContactManagerEngine14compareContactERKNS_8QContactES3_RK5QListINS_17QContactSortOrderEE @ 346 NONAME
-	_ZN10QtMobility21QContactManagerEngine14compareVariantERK8QVariantS3_N2Qt15CaseSensitivityE @ 347 NONAME
-	_ZN10QtMobility21QContactManagerEngine14removeContactsERK5QListIjEP4QMapIiNS_15QContactManager5ErrorEEPS7_ @ 348 NONAME
-	_ZN10QtMobility21QContactManagerEngine15contactsChangedERK5QListIjE @ 349 NONAME
-	_ZN10QtMobility21QContactManagerEngine15contactsRemovedERK5QListIjE @ 350 NONAME
-	_ZN10QtMobility21QContactManagerEngine16requestDestroyedEPNS_23QContactAbstractRequestE @ 351 NONAME
-	_ZN10QtMobility21QContactManagerEngine16saveRelationshipEPNS_20QContactRelationshipEPNS_15QContactManager5ErrorE @ 352 NONAME
-	_ZN10QtMobility21QContactManagerEngine16setSelfContactIdERKjPNS_15QContactManager5ErrorE @ 353 NONAME
-	_ZN10QtMobility21QContactManagerEngine16staticMetaObjectE @ 354 NONAME DATA 16
-	_ZN10QtMobility21QContactManagerEngine17saveRelationshipsEP5QListINS_20QContactRelationshipEEP4QMapIiNS_15QContactManager5ErrorEEPS7_ @ 355 NONAME
-	_ZN10QtMobility21QContactManagerEngine17schemaDefinitionsEv @ 356 NONAME
-	_ZN10QtMobility21QContactManagerEngine18relationshipsAddedERK5QListIjE @ 357 NONAME
-	_ZN10QtMobility21QContactManagerEngine18removeRelationshipERKNS_20QContactRelationshipEPNS_15QContactManager5ErrorE @ 358 NONAME
-	_ZN10QtMobility21QContactManagerEngine18updateRequestStateEPNS_23QContactAbstractRequestENS1_5StateE @ 359 NONAME
-	_ZN10QtMobility21QContactManagerEngine19canonicalizedFilterERKNS_14QContactFilterE @ 360 NONAME
-	_ZN10QtMobility21QContactManagerEngine19getStaticMetaObjectEv @ 361 NONAME
-	_ZN10QtMobility21QContactManagerEngine19removeRelationshipsERK5QListINS_20QContactRelationshipEEP4QMapIiNS_15QContactManager5ErrorEEPS8_ @ 362 NONAME
-	_ZN10QtMobility21QContactManagerEngine20relationshipsRemovedERK5QListIjE @ 363 NONAME
-	_ZN10QtMobility21QContactManagerEngine20saveDetailDefinitionERKNS_24QContactDetailDefinitionERK7QStringPNS_15QContactManager5ErrorE @ 364 NONAME
-	_ZN10QtMobility21QContactManagerEngine20selfContactIdChangedERKjS2_ @ 365 NONAME
-	_ZN10QtMobility21QContactManagerEngine20validateActionFilterERKNS_14QContactFilterE @ 366 NONAME
-	_ZN10QtMobility21QContactManagerEngine22removeDetailDefinitionERK7QStringS3_PNS_15QContactManager5ErrorE @ 367 NONAME
-	_ZN10QtMobility21QContactManagerEngine22setContactDisplayLabelEPNS_8QContactERK7QString @ 368 NONAME
-	_ZN10QtMobility21QContactManagerEngine22waitForRequestFinishedEPNS_23QContactAbstractRequestEi @ 369 NONAME
-	_ZN10QtMobility21QContactManagerEngine23setContactRelationshipsEPNS_8QContactERK5QListINS_20QContactRelationshipEE @ 370 NONAME
-	_ZN10QtMobility21QContactManagerEngine24updateContactSaveRequestEPNS_19QContactSaveRequestERK5QListINS_8QContactEENS_15QContactManager5ErrorERK4QMapIiS9_ENS_23QContactAbstractRequest5StateE @ 371 NONAME
-	_ZN10QtMobility21QContactManagerEngine25updateContactFetchRequestEPNS_20QContactFetchRequestERK5QListINS_8QContactEENS_15QContactManager5ErrorENS_23QContactAbstractRequest5StateE @ 372 NONAME
-	_ZN10QtMobility21QContactManagerEngine26setDetailAccessConstraintsEPNS_14QContactDetailE6QFlagsINS1_16AccessConstraintEE @ 373 NONAME
-	_ZN10QtMobility21QContactManagerEngine26updateContactRemoveRequestEPNS_21QContactRemoveRequestENS_15QContactManager5ErrorERK4QMapIiS4_ENS_23QContactAbstractRequest5StateE @ 374 NONAME
-	_ZN10QtMobility21QContactManagerEngine27updateDefinitionSaveRequestEPNS_35QContactDetailDefinitionSaveRequestERK5QListINS_24QContactDetailDefinitionEENS_15QContactManager5ErrorERK4QMapIiS9_ENS_23QContactAbstractRequest5StateE @ 375 NONAME
-	_ZN10QtMobility21QContactManagerEngine28updateDefinitionFetchRequestEPNS_36QContactDetailDefinitionFetchRequestERK4QMapI7QStringNS_24QContactDetailDefinitionEENS_15QContactManager5ErrorERKS3_IiSA_ENS_23QContactAbstractRequest5StateE @ 376 NONAME
-	_ZN10QtMobility21QContactManagerEngine29updateDefinitionRemoveRequestEPNS_37QContactDetailDefinitionRemoveRequestENS_15QContactManager5ErrorERK4QMapIiS4_ENS_23QContactAbstractRequest5StateE @ 377 NONAME
-	_ZN10QtMobility21QContactManagerEngine29updateRelationshipSaveRequestEPNS_31QContactRelationshipSaveRequestERK5QListINS_20QContactRelationshipEENS_15QContactManager5ErrorERK4QMapIiS9_ENS_23QContactAbstractRequest5StateE @ 378 NONAME
-	_ZN10QtMobility21QContactManagerEngine30updateRelationshipFetchRequestEPNS_32QContactRelationshipFetchRequestERK5QListINS_20QContactRelationshipEENS_15QContactManager5ErrorENS_23QContactAbstractRequest5StateE @ 379 NONAME
-	_ZN10QtMobility21QContactManagerEngine31updateRelationshipRemoveRequestEPNS_33QContactRelationshipRemoveRequestENS_15QContactManager5ErrorERK4QMapIiS4_ENS_23QContactAbstractRequest5StateE @ 380 NONAME
-	_ZN10QtMobility21QContactManagerEngine32updateContactLocalIdFetchRequestEPNS_27QContactLocalIdFetchRequestERK5QListIjENS_15QContactManager5ErrorENS_23QContactAbstractRequest5StateE @ 381 NONAME
-	_ZN10QtMobility21QContactManagerEngine9addSortedEP5QListINS_8QContactEERKS2_RKS1_INS_17QContactSortOrderEE @ 382 NONAME
-	_ZN10QtMobility21QContactOnlineAccount10SubTypeSipE @ 383 NONAME DATA 4
-	_ZN10QtMobility21QContactOnlineAccount11SubTypeImppE @ 384 NONAME DATA 5
-	_ZN10QtMobility21QContactOnlineAccount13FieldSubTypesE @ 385 NONAME DATA 9
-	_ZN10QtMobility21QContactOnlineAccount14DefinitionNameE @ 386 NONAME DATA 14
-	_ZN10QtMobility21QContactOnlineAccount14SubTypeSipVoipE @ 387 NONAME DATA 8
-	_ZN10QtMobility21QContactOnlineAccount15FieldAccountUriE @ 388 NONAME DATA 11
-	_ZN10QtMobility21QContactOnlineAccount17FieldCapabilitiesE @ 389 NONAME DATA 13
-	_ZN10QtMobility21QContactOnlineAccount17SubTypeVideoShareE @ 390 NONAME DATA 11
-	_ZN10QtMobility21QContactOnlineAccount20FieldServiceProviderE @ 391 NONAME DATA 16
-	_ZN10QtMobility21QContactRemoveRequest11qt_metacallEN11QMetaObject4CallEiPPv @ 392 NONAME
-	_ZN10QtMobility21QContactRemoveRequest11qt_metacastEPKc @ 393 NONAME
-	_ZN10QtMobility21QContactRemoveRequest13setContactIdsERK5QListIjE @ 394 NONAME
-	_ZN10QtMobility21QContactRemoveRequest16staticMetaObjectE @ 395 NONAME DATA 16
-	_ZN10QtMobility21QContactRemoveRequest19getStaticMetaObjectEv @ 396 NONAME
-	_ZN10QtMobility21QContactRemoveRequestC1Ev @ 397 NONAME
-	_ZN10QtMobility21QContactRemoveRequestC2Ev @ 398 NONAME
-	_ZN10QtMobility21QContactRemoveRequestD0Ev @ 399 NONAME
-	_ZN10QtMobility21QContactRemoveRequestD1Ev @ 400 NONAME
-	_ZN10QtMobility21QContactRemoveRequestD2Ev @ 401 NONAME
-	_ZN10QtMobility22QContactGlobalPresence13FieldNicknameE @ 402 NONAME DATA 9
-	_ZN10QtMobility22QContactGlobalPresence14DefinitionNameE @ 403 NONAME DATA 15
-	_ZN10QtMobility22QContactGlobalPresence14FieldTimestampE @ 404 NONAME DATA 10
-	_ZN10QtMobility22QContactGlobalPresence18FieldCustomMessageE @ 405 NONAME DATA 14
-	_ZN10QtMobility22QContactGlobalPresence18FieldPresenceStateE @ 406 NONAME DATA 14
-	_ZN10QtMobility22QContactGlobalPresence22FieldPresenceStateTextE @ 407 NONAME DATA 18
-	_ZN10QtMobility22QContactGlobalPresence26FieldPresenceStateImageUrlE @ 408 NONAME DATA 22
-	_ZN10QtMobility23QContactAbstractRequest10setManagerEPNS_15QContactManagerE @ 409 NONAME
-	_ZN10QtMobility23QContactAbstractRequest11qt_metacallEN11QMetaObject4CallEiPPv @ 410 NONAME
-	_ZN10QtMobility23QContactAbstractRequest11qt_metacastEPKc @ 411 NONAME
-	_ZN10QtMobility23QContactAbstractRequest12stateChangedENS0_5StateE @ 412 NONAME
-	_ZN10QtMobility23QContactAbstractRequest15waitForFinishedEi @ 413 NONAME
-	_ZN10QtMobility23QContactAbstractRequest16resultsAvailableEv @ 414 NONAME
-	_ZN10QtMobility23QContactAbstractRequest16staticMetaObjectE @ 415 NONAME DATA 16
-	_ZN10QtMobility23QContactAbstractRequest19getStaticMetaObjectEv @ 416 NONAME
-	_ZN10QtMobility23QContactAbstractRequest5startEv @ 417 NONAME
-	_ZN10QtMobility23QContactAbstractRequest6cancelEv @ 418 NONAME
-	_ZN10QtMobility23QContactAbstractRequestC1EPNS_30QContactAbstractRequestPrivateE @ 419 NONAME
-	_ZN10QtMobility23QContactAbstractRequestC2EPNS_30QContactAbstractRequestPrivateE @ 420 NONAME
-	_ZN10QtMobility23QContactAbstractRequestD0Ev @ 421 NONAME
-	_ZN10QtMobility23QContactAbstractRequestD1Ev @ 422 NONAME
-	_ZN10QtMobility23QContactAbstractRequestD2Ev @ 423 NONAME
-	_ZN10QtMobility23QContactChangeLogFilter12setEventTypeENS0_9EventTypeE @ 424 NONAME
-	_ZN10QtMobility23QContactChangeLogFilter8setSinceERK9QDateTime @ 425 NONAME
-	_ZN10QtMobility23QContactChangeLogFilterC1ENS0_9EventTypeE @ 426 NONAME
-	_ZN10QtMobility23QContactChangeLogFilterC1ERKNS_14QContactFilterE @ 427 NONAME
-	_ZN10QtMobility23QContactChangeLogFilterC2ENS0_9EventTypeE @ 428 NONAME
-	_ZN10QtMobility23QContactChangeLogFilterC2ERKNS_14QContactFilterE @ 429 NONAME
-	_ZN10QtMobility24QContactActionDescriptor13setActionNameERK7QString @ 430 NONAME
-	_ZN10QtMobility24QContactActionDescriptor13setVendorNameERK7QString @ 431 NONAME
-	_ZN10QtMobility24QContactActionDescriptor24setImplementationVersionEi @ 432 NONAME
-	_ZN10QtMobility24QContactActionDescriptorC1ERK7QStringS3_i @ 433 NONAME
-	_ZN10QtMobility24QContactActionDescriptorC1ERKS0_ @ 434 NONAME
-	_ZN10QtMobility24QContactActionDescriptorC2ERK7QStringS3_i @ 435 NONAME
-	_ZN10QtMobility24QContactActionDescriptorC2ERKS0_ @ 436 NONAME
-	_ZN10QtMobility24QContactActionDescriptorD1Ev @ 437 NONAME
-	_ZN10QtMobility24QContactActionDescriptorD2Ev @ 438 NONAME
-	_ZN10QtMobility24QContactActionDescriptoraSERKS0_ @ 439 NONAME
-	_ZN10QtMobility24QContactDetailDefinition11insertFieldERK7QStringRKNS_29QContactDetailFieldDefinitionE @ 440 NONAME
-	_ZN10QtMobility24QContactDetailDefinition11removeFieldERK7QString @ 441 NONAME
-	_ZN10QtMobility24QContactDetailDefinition7setNameERK7QString @ 442 NONAME
-	_ZN10QtMobility24QContactDetailDefinition9setFieldsERK4QMapI7QStringNS_29QContactDetailFieldDefinitionEE @ 443 NONAME
-	_ZN10QtMobility24QContactDetailDefinition9setUniqueEb @ 444 NONAME
-	_ZN10QtMobility24QContactDetailDefinitionC1ERKS0_ @ 445 NONAME
-	_ZN10QtMobility24QContactDetailDefinitionC1Ev @ 446 NONAME
-	_ZN10QtMobility24QContactDetailDefinitionC2ERKS0_ @ 447 NONAME
-	_ZN10QtMobility24QContactDetailDefinitionC2Ev @ 448 NONAME
-	_ZN10QtMobility24QContactDetailDefinitionD1Ev @ 449 NONAME
-	_ZN10QtMobility24QContactDetailDefinitionD2Ev @ 450 NONAME
-	_ZN10QtMobility24QContactDetailDefinitionaSERKS0_ @ 451 NONAME
-	_ZN10QtMobility25QContactDetailRangeFilter13setMatchFlagsE6QFlagsINS_14QContactFilter9MatchFlagEE @ 452 NONAME
-	_ZN10QtMobility25QContactDetailRangeFilter23setDetailDefinitionNameERK7QStringS3_ @ 453 NONAME
-	_ZN10QtMobility25QContactDetailRangeFilter8setRangeERK8QVariantS3_6QFlagsINS0_9RangeFlagEE @ 454 NONAME
-	_ZN10QtMobility25QContactDetailRangeFilterC1ERKNS_14QContactFilterE @ 455 NONAME
-	_ZN10QtMobility25QContactDetailRangeFilterC1Ev @ 456 NONAME
-	_ZN10QtMobility25QContactDetailRangeFilterC2ERKNS_14QContactFilterE @ 457 NONAME
-	_ZN10QtMobility25QContactDetailRangeFilterC2Ev @ 458 NONAME
-	_ZN10QtMobility26QContactIntersectionFilter10setFiltersERK5QListINS_14QContactFilterEE @ 459 NONAME
-	_ZN10QtMobility26QContactIntersectionFilter6appendERKNS_14QContactFilterE @ 460 NONAME
-	_ZN10QtMobility26QContactIntersectionFilter6removeERKNS_14QContactFilterE @ 461 NONAME
-	_ZN10QtMobility26QContactIntersectionFilter7prependERKNS_14QContactFilterE @ 462 NONAME
-	_ZN10QtMobility26QContactIntersectionFilterC1ERKNS_14QContactFilterE @ 463 NONAME
-	_ZN10QtMobility26QContactIntersectionFilterC1Ev @ 464 NONAME
-	_ZN10QtMobility26QContactIntersectionFilterC2ERKNS_14QContactFilterE @ 465 NONAME
-	_ZN10QtMobility26QContactIntersectionFilterC2Ev @ 466 NONAME
-	_ZN10QtMobility26QContactIntersectionFilterlsERKNS_14QContactFilterE @ 467 NONAME
-	_ZN10QtMobility26QContactRelationshipFilter19setRelatedContactIdERKNS_10QContactIdE @ 468 NONAME
-	_ZN10QtMobility26QContactRelationshipFilter19setRelationshipTypeERK7QString @ 469 NONAME
-	_ZN10QtMobility26QContactRelationshipFilter21setRelatedContactRoleENS_20QContactRelationship4RoleE @ 470 NONAME
-	_ZN10QtMobility26QContactRelationshipFilterC1ERKNS_14QContactFilterE @ 471 NONAME
-	_ZN10QtMobility26QContactRelationshipFilterC1Ev @ 472 NONAME
-	_ZN10QtMobility26QContactRelationshipFilterC2ERKNS_14QContactFilterE @ 473 NONAME
-	_ZN10QtMobility26QContactRelationshipFilterC2Ev @ 474 NONAME
-	_ZN10QtMobility27QContactLocalIdFetchRequest10setSortingERK5QListINS_17QContactSortOrderEE @ 475 NONAME
-	_ZN10QtMobility27QContactLocalIdFetchRequest11qt_metacallEN11QMetaObject4CallEiPPv @ 476 NONAME
-	_ZN10QtMobility27QContactLocalIdFetchRequest11qt_metacastEPKc @ 477 NONAME
-	_ZN10QtMobility27QContactLocalIdFetchRequest16staticMetaObjectE @ 478 NONAME DATA 16
-	_ZN10QtMobility27QContactLocalIdFetchRequest19getStaticMetaObjectEv @ 479 NONAME
-	_ZN10QtMobility27QContactLocalIdFetchRequest9setFilterERKNS_14QContactFilterE @ 480 NONAME
-	_ZN10QtMobility27QContactLocalIdFetchRequestC1Ev @ 481 NONAME
-	_ZN10QtMobility27QContactLocalIdFetchRequestC2Ev @ 482 NONAME
-	_ZN10QtMobility27QContactLocalIdFetchRequestD0Ev @ 483 NONAME
-	_ZN10QtMobility27QContactLocalIdFetchRequestD1Ev @ 484 NONAME
-	_ZN10QtMobility27QContactLocalIdFetchRequestD2Ev @ 485 NONAME
-	_ZN10QtMobility28QContactManagerEngineFactoryD0Ev @ 486 NONAME
-	_ZN10QtMobility28QContactManagerEngineFactoryD1Ev @ 487 NONAME
-	_ZN10QtMobility28QContactManagerEngineFactoryD2Ev @ 488 NONAME
-	_ZN10QtMobility29QContactDetailFieldDefinition11setDataTypeEN8QVariant4TypeE @ 489 NONAME
-	_ZN10QtMobility29QContactDetailFieldDefinition18setAllowableValuesE5QListI8QVariantE @ 490 NONAME
-	_ZN10QtMobility29QContactDetailFieldDefinitionC1ERKS0_ @ 491 NONAME
-	_ZN10QtMobility29QContactDetailFieldDefinitionC1Ev @ 492 NONAME
-	_ZN10QtMobility29QContactDetailFieldDefinitionC2ERKS0_ @ 493 NONAME
-	_ZN10QtMobility29QContactDetailFieldDefinitionC2Ev @ 494 NONAME
-	_ZN10QtMobility29QContactDetailFieldDefinitionD1Ev @ 495 NONAME
-	_ZN10QtMobility29QContactDetailFieldDefinitionD2Ev @ 496 NONAME
-	_ZN10QtMobility29QContactDetailFieldDefinitionaSERKS0_ @ 497 NONAME
-	_ZN10QtMobility31QContactRelationshipSaveRequest11qt_metacallEN11QMetaObject4CallEiPPv @ 498 NONAME
-	_ZN10QtMobility31QContactRelationshipSaveRequest11qt_metacastEPKc @ 499 NONAME
-	_ZN10QtMobility31QContactRelationshipSaveRequest16setRelationshipsERK5QListINS_20QContactRelationshipEE @ 500 NONAME
-	_ZN10QtMobility31QContactRelationshipSaveRequest16staticMetaObjectE @ 501 NONAME DATA 16
-	_ZN10QtMobility31QContactRelationshipSaveRequest19getStaticMetaObjectEv @ 502 NONAME
-	_ZN10QtMobility31QContactRelationshipSaveRequestC1Ev @ 503 NONAME
-	_ZN10QtMobility31QContactRelationshipSaveRequestC2Ev @ 504 NONAME
-	_ZN10QtMobility31QContactRelationshipSaveRequestD0Ev @ 505 NONAME
-	_ZN10QtMobility31QContactRelationshipSaveRequestD1Ev @ 506 NONAME
-	_ZN10QtMobility31QContactRelationshipSaveRequestD2Ev @ 507 NONAME
-	_ZN10QtMobility32QContactRelationshipFetchRequest11qt_metacallEN11QMetaObject4CallEiPPv @ 508 NONAME
-	_ZN10QtMobility32QContactRelationshipFetchRequest11qt_metacastEPKc @ 509 NONAME
-	_ZN10QtMobility32QContactRelationshipFetchRequest16staticMetaObjectE @ 510 NONAME DATA 16
-	_ZN10QtMobility32QContactRelationshipFetchRequest19getStaticMetaObjectEv @ 511 NONAME
-	_ZN10QtMobility32QContactRelationshipFetchRequest19setRelationshipTypeERK7QString @ 512 NONAME
-	_ZN10QtMobility32QContactRelationshipFetchRequest8setFirstERKNS_10QContactIdE @ 513 NONAME
-	_ZN10QtMobility32QContactRelationshipFetchRequest9setSecondERKNS_10QContactIdE @ 514 NONAME
-	_ZN10QtMobility32QContactRelationshipFetchRequestC1Ev @ 515 NONAME
-	_ZN10QtMobility32QContactRelationshipFetchRequestC2Ev @ 516 NONAME
-	_ZN10QtMobility32QContactRelationshipFetchRequestD0Ev @ 517 NONAME
-	_ZN10QtMobility32QContactRelationshipFetchRequestD1Ev @ 518 NONAME
-	_ZN10QtMobility32QContactRelationshipFetchRequestD2Ev @ 519 NONAME
-	_ZN10QtMobility33QContactRelationshipRemoveRequest11qt_metacallEN11QMetaObject4CallEiPPv @ 520 NONAME
-	_ZN10QtMobility33QContactRelationshipRemoveRequest11qt_metacastEPKc @ 521 NONAME
-	_ZN10QtMobility33QContactRelationshipRemoveRequest16setRelationshipsERK5QListINS_20QContactRelationshipEE @ 522 NONAME
-	_ZN10QtMobility33QContactRelationshipRemoveRequest16staticMetaObjectE @ 523 NONAME DATA 16
-	_ZN10QtMobility33QContactRelationshipRemoveRequest19getStaticMetaObjectEv @ 524 NONAME
-	_ZN10QtMobility33QContactRelationshipRemoveRequestC1Ev @ 525 NONAME
-	_ZN10QtMobility33QContactRelationshipRemoveRequestC2Ev @ 526 NONAME
-	_ZN10QtMobility33QContactRelationshipRemoveRequestD0Ev @ 527 NONAME
-	_ZN10QtMobility33QContactRelationshipRemoveRequestD1Ev @ 528 NONAME
-	_ZN10QtMobility33QContactRelationshipRemoveRequestD2Ev @ 529 NONAME
-	_ZN10QtMobility35QContactDetailDefinitionSaveRequest11qt_metacallEN11QMetaObject4CallEiPPv @ 530 NONAME
-	_ZN10QtMobility35QContactDetailDefinitionSaveRequest11qt_metacastEPKc @ 531 NONAME
-	_ZN10QtMobility35QContactDetailDefinitionSaveRequest14setContactTypeERK7QString @ 532 NONAME
-	_ZN10QtMobility35QContactDetailDefinitionSaveRequest14setDefinitionsERK5QListINS_24QContactDetailDefinitionEE @ 533 NONAME
-	_ZN10QtMobility35QContactDetailDefinitionSaveRequest16staticMetaObjectE @ 534 NONAME DATA 16
-	_ZN10QtMobility35QContactDetailDefinitionSaveRequest19getStaticMetaObjectEv @ 535 NONAME
-	_ZN10QtMobility35QContactDetailDefinitionSaveRequestC1Ev @ 536 NONAME
-	_ZN10QtMobility35QContactDetailDefinitionSaveRequestC2Ev @ 537 NONAME
-	_ZN10QtMobility35QContactDetailDefinitionSaveRequestD0Ev @ 538 NONAME
-	_ZN10QtMobility35QContactDetailDefinitionSaveRequestD1Ev @ 539 NONAME
-	_ZN10QtMobility35QContactDetailDefinitionSaveRequestD2Ev @ 540 NONAME
-	_ZN10QtMobility36QContactDetailDefinitionFetchRequest11qt_metacallEN11QMetaObject4CallEiPPv @ 541 NONAME
-	_ZN10QtMobility36QContactDetailDefinitionFetchRequest11qt_metacastEPKc @ 542 NONAME
-	_ZN10QtMobility36QContactDetailDefinitionFetchRequest14setContactTypeERK7QString @ 543 NONAME
-	_ZN10QtMobility36QContactDetailDefinitionFetchRequest16staticMetaObjectE @ 544 NONAME DATA 16
-	_ZN10QtMobility36QContactDetailDefinitionFetchRequest18setDefinitionNamesERK11QStringList @ 545 NONAME
-	_ZN10QtMobility36QContactDetailDefinitionFetchRequest19getStaticMetaObjectEv @ 546 NONAME
-	_ZN10QtMobility36QContactDetailDefinitionFetchRequestC1Ev @ 547 NONAME
-	_ZN10QtMobility36QContactDetailDefinitionFetchRequestC2Ev @ 548 NONAME
-	_ZN10QtMobility36QContactDetailDefinitionFetchRequestD0Ev @ 549 NONAME
-	_ZN10QtMobility36QContactDetailDefinitionFetchRequestD1Ev @ 550 NONAME
-	_ZN10QtMobility36QContactDetailDefinitionFetchRequestD2Ev @ 551 NONAME
-	_ZN10QtMobility37QContactDetailDefinitionRemoveRequest11qt_metacallEN11QMetaObject4CallEiPPv @ 552 NONAME
-	_ZN10QtMobility37QContactDetailDefinitionRemoveRequest11qt_metacastEPKc @ 553 NONAME
-	_ZN10QtMobility37QContactDetailDefinitionRemoveRequest16staticMetaObjectE @ 554 NONAME DATA 16
-	_ZN10QtMobility37QContactDetailDefinitionRemoveRequest18setDefinitionNamesERK7QStringRK11QStringList @ 555 NONAME
-	_ZN10QtMobility37QContactDetailDefinitionRemoveRequest19getStaticMetaObjectEv @ 556 NONAME
-	_ZN10QtMobility37QContactDetailDefinitionRemoveRequestC1Ev @ 557 NONAME
-	_ZN10QtMobility37QContactDetailDefinitionRemoveRequestC2Ev @ 558 NONAME
-	_ZN10QtMobility37QContactDetailDefinitionRemoveRequestD0Ev @ 559 NONAME
-	_ZN10QtMobility37QContactDetailDefinitionRemoveRequestD1Ev @ 560 NONAME
-	_ZN10QtMobility37QContactDetailDefinitionRemoveRequestD2Ev @ 561 NONAME
-	_ZN10QtMobility5qHashERKNS_10QContactIdE @ 562 NONAME
-	_ZN10QtMobility5qHashERKNS_14QContactDetailE @ 563 NONAME
-	_ZN10QtMobility5qHashERKNS_20QContactRelationshipE @ 564 NONAME
-	_ZN10QtMobility5qHashERKNS_24QContactActionDescriptorE @ 565 NONAME
-	_ZN10QtMobility5qHashERKNS_8QContactE @ 566 NONAME
-	_ZN10QtMobility8QContact10saveDetailEPNS_14QContactDetailE @ 567 NONAME
-	_ZN10QtMobility8QContact12clearDetailsEv @ 568 NONAME
-	_ZN10QtMobility8QContact12removeDetailEPNS_14QContactDetailE @ 569 NONAME
-	_ZN10QtMobility8QContact18setPreferredDetailERK7QStringRKNS_14QContactDetailE @ 570 NONAME
-	_ZN10QtMobility8QContact5setIdERKNS_10QContactIdE @ 571 NONAME
-	_ZN10QtMobility8QContact7setTypeERK7QString @ 572 NONAME
-	_ZN10QtMobility8QContact7setTypeERKNS_12QContactTypeE @ 573 NONAME
-	_ZN10QtMobility8QContactC1ERKS0_ @ 574 NONAME
-	_ZN10QtMobility8QContactC1Ev @ 575 NONAME
-	_ZN10QtMobility8QContactC2ERKS0_ @ 576 NONAME
-	_ZN10QtMobility8QContactC2Ev @ 577 NONAME
-	_ZN10QtMobility8QContactD1Ev @ 578 NONAME
-	_ZN10QtMobility8QContactD2Ev @ 579 NONAME
-	_ZN10QtMobility8QContactaSERKS0_ @ 580 NONAME
-	_ZN10QtMobilityanERKNS_14QContactFilterES2_ @ 581 NONAME
-	_ZN10QtMobilitylsE6QDebugRKNS_10QContactIdE @ 582 NONAME
-	_ZN10QtMobilitylsE6QDebugRKNS_14QContactDetailE @ 583 NONAME
-	_ZN10QtMobilitylsE6QDebugRKNS_20QContactRelationshipE @ 584 NONAME
-	_ZN10QtMobilitylsE6QDebugRKNS_8QContactE @ 585 NONAME
-	_ZN10QtMobilityorERKNS_14QContactFilterES2_ @ 586 NONAME
-	_ZNK10QtMobility10QContactId10managerUriEv @ 587 NONAME
-	_ZNK10QtMobility10QContactId7localIdEv @ 588 NONAME
-	_ZNK10QtMobility10QContactIdeqERKS0_ @ 589 NONAME
-	_ZNK10QtMobility10QContactIdltERKS0_ @ 590 NONAME
-	_ZNK10QtMobility10QContactIdneERKS0_ @ 591 NONAME
-	_ZNK10QtMobility14QContactAction10metaObjectEv @ 592 NONAME
-	_ZNK10QtMobility14QContactAction16supportedDetailsERKNS_8QContactE @ 593 NONAME
-	_ZNK10QtMobility14QContactDetail12variantValueERK7QString @ 594 NONAME
-	_ZNK10QtMobility14QContactDetail13variantValuesEv @ 595 NONAME
-	_ZNK10QtMobility14QContactDetail14definitionNameEv @ 596 NONAME
-	_ZNK10QtMobility14QContactDetail17accessConstraintsEv @ 597 NONAME
-	_ZNK10QtMobility14QContactDetail3keyEv @ 598 NONAME
-	_ZNK10QtMobility14QContactDetail5valueERK7QString @ 599 NONAME
-	_ZNK10QtMobility14QContactDetail7isEmptyEv @ 600 NONAME
-	_ZNK10QtMobility14QContactDetail8hasValueERK7QString @ 601 NONAME
-	_ZNK10QtMobility14QContactDetaileqERKS0_ @ 602 NONAME
-	_ZNK10QtMobility14QContactFilter4typeEv @ 603 NONAME
-	_ZNK10QtMobility14QContactFiltereqERKS0_ @ 604 NONAME
-	_ZNK10QtMobility15QContactManager10contactIdsERK5QListINS_17QContactSortOrderEE @ 605 NONAME
-	_ZNK10QtMobility15QContactManager10contactIdsERKNS_14QContactFilterERK5QListINS_17QContactSortOrderEE @ 606 NONAME
-	_ZNK10QtMobility15QContactManager10hasFeatureENS0_14ManagerFeatureERK7QString @ 607 NONAME
-	_ZNK10QtMobility15QContactManager10managerUriEv @ 608 NONAME
-	_ZNK10QtMobility15QContactManager10metaObjectEv @ 609 NONAME
-	_ZNK10QtMobility15QContactManager11managerNameEv @ 610 NONAME
-	_ZNK10QtMobility15QContactManager13relationshipsERK7QStringRKNS_10QContactIdENS_20QContactRelationship4RoleE @ 611 NONAME
-	_ZNK10QtMobility15QContactManager13relationshipsERKNS_10QContactIdENS_20QContactRelationship4RoleE @ 612 NONAME
-	_ZNK10QtMobility15QContactManager13selfContactIdEv @ 613 NONAME
-	_ZNK10QtMobility15QContactManager14managerVersionEv @ 614 NONAME
-	_ZNK10QtMobility15QContactManager16detailDefinitionERK7QStringS3_ @ 615 NONAME
-	_ZNK10QtMobility15QContactManager17detailDefinitionsERK7QString @ 616 NONAME
-	_ZNK10QtMobility15QContactManager17isFilterSupportedERKNS_14QContactFilterE @ 617 NONAME
-	_ZNK10QtMobility15QContactManager17managerParametersEv @ 618 NONAME
-	_ZNK10QtMobility15QContactManager18supportedDataTypesEv @ 619 NONAME
-	_ZNK10QtMobility15QContactManager21supportedContactTypesEv @ 620 NONAME
-	_ZNK10QtMobility15QContactManager23synthesizedDisplayLabelERKNS_8QContactE @ 621 NONAME
-	_ZNK10QtMobility15QContactManager27isRelationshipTypeSupportedERK7QStringS3_ @ 622 NONAME
-	_ZNK10QtMobility15QContactManager5errorEv @ 623 NONAME
-	_ZNK10QtMobility15QContactManager7contactERKjRKNS_17QContactFetchHintE @ 624 NONAME
-	_ZNK10QtMobility15QContactManager8contactsERK5QListINS_17QContactSortOrderEERKNS_17QContactFetchHintE @ 625 NONAME
-	_ZNK10QtMobility15QContactManager8contactsERKNS_14QContactFilterERK5QListINS_17QContactSortOrderEERKNS_17QContactFetchHintE @ 626 NONAME
-	_ZNK10QtMobility17QContactChangeSet13addedContactsEv @ 627 NONAME
-	_ZNK10QtMobility17QContactChangeSet15changedContactsEv @ 628 NONAME
-	_ZNK10QtMobility17QContactChangeSet15removedContactsEv @ 629 NONAME
-	_ZNK10QtMobility17QContactChangeSet22oldAndNewSelfContactIdEv @ 630 NONAME
-	_ZNK10QtMobility17QContactChangeSet26addedRelationshipsContactsEv @ 631 NONAME
-	_ZNK10QtMobility17QContactChangeSet28removedRelationshipsContactsEv @ 632 NONAME
-	_ZNK10QtMobility17QContactFetchHint17optimizationHintsEv @ 633 NONAME
-	_ZNK10QtMobility17QContactFetchHint21detailDefinitionsHintEv @ 634 NONAME
-	_ZNK10QtMobility17QContactFetchHint21relationshipTypesHintEv @ 635 NONAME
-	_ZNK10QtMobility17QContactSortOrder11blankPolicyEv @ 636 NONAME
-	_ZNK10QtMobility17QContactSortOrder15caseSensitivityEv @ 637 NONAME
-	_ZNK10QtMobility17QContactSortOrder15detailFieldNameEv @ 638 NONAME
-	_ZNK10QtMobility17QContactSortOrder20detailDefinitionNameEv @ 639 NONAME
-	_ZNK10QtMobility17QContactSortOrder7isValidEv @ 640 NONAME
-	_ZNK10QtMobility17QContactSortOrder9directionEv @ 641 NONAME
-	_ZNK10QtMobility17QContactSortOrdereqERKS0_ @ 642 NONAME
-	_ZNK10QtMobility19QContactSaveRequest10metaObjectEv @ 643 NONAME
-	_ZNK10QtMobility19QContactSaveRequest8contactsEv @ 644 NONAME
-	_ZNK10QtMobility19QContactSaveRequest8errorMapEv @ 645 NONAME
-	_ZNK10QtMobility19QContactUnionFilter7filtersEv @ 646 NONAME
-	_ZNK10QtMobility20QContactActionFilter10actionNameEv @ 647 NONAME
-	_ZNK10QtMobility20QContactActionFilter10vendorNameEv @ 648 NONAME
-	_ZNK10QtMobility20QContactActionFilter21implementationVersionEv @ 649 NONAME
-	_ZNK10QtMobility20QContactActionFilter5valueEv @ 650 NONAME
-	_ZNK10QtMobility20QContactDetailFilter10matchFlagsEv @ 651 NONAME
-	_ZNK10QtMobility20QContactDetailFilter15detailFieldNameEv @ 652 NONAME
-	_ZNK10QtMobility20QContactDetailFilter20detailDefinitionNameEv @ 653 NONAME
-	_ZNK10QtMobility20QContactDetailFilter5valueEv @ 654 NONAME
-	_ZNK10QtMobility20QContactFetchRequest10metaObjectEv @ 655 NONAME
-	_ZNK10QtMobility20QContactFetchRequest6filterEv @ 656 NONAME
-	_ZNK10QtMobility20QContactFetchRequest7sortingEv @ 657 NONAME
-	_ZNK10QtMobility20QContactFetchRequest8contactsEv @ 658 NONAME
-	_ZNK10QtMobility20QContactFetchRequest9fetchHintEv @ 659 NONAME
-	_ZNK10QtMobility20QContactRelationship16relationshipTypeEv @ 660 NONAME
-	_ZNK10QtMobility20QContactRelationship5firstEv @ 661 NONAME
-	_ZNK10QtMobility20QContactRelationship6secondEv @ 662 NONAME
-	_ZNK10QtMobility20QContactRelationshipeqERKS0_ @ 663 NONAME
-	_ZNK10QtMobility21QContactActionFactory10metaObjectEv @ 664 NONAME
-	_ZNK10QtMobility21QContactLocalIdFilter3idsEv @ 665 NONAME
-	_ZNK10QtMobility21QContactManagerEngine10contactIdsERKNS_14QContactFilterERK5QListINS_17QContactSortOrderEEPNS_15QContactManager5ErrorE @ 666 NONAME
-	_ZNK10QtMobility21QContactManagerEngine10hasFeatureENS_15QContactManager14ManagerFeatureERK7QString @ 667 NONAME
-	_ZNK10QtMobility21QContactManagerEngine10managerUriEv @ 668 NONAME
-	_ZNK10QtMobility21QContactManagerEngine10metaObjectEv @ 669 NONAME
-	_ZNK10QtMobility21QContactManagerEngine11managerNameEv @ 670 NONAME
-	_ZNK10QtMobility21QContactManagerEngine13relationshipsERK7QStringRKNS_10QContactIdENS_20QContactRelationship4RoleEPNS_15QContactManager5ErrorE @ 671 NONAME
-	_ZNK10QtMobility21QContactManagerEngine13selfContactIdEPNS_15QContactManager5ErrorE @ 672 NONAME
-	_ZNK10QtMobility21QContactManagerEngine15validateContactERKNS_8QContactEPNS_15QContactManager5ErrorE @ 673 NONAME
-	_ZNK10QtMobility21QContactManagerEngine16detailDefinitionERK7QStringS3_PNS_15QContactManager5ErrorE @ 674 NONAME
-	_ZNK10QtMobility21QContactManagerEngine17compatibleContactERKNS_8QContactEPNS_15QContactManager5ErrorE @ 675 NONAME
-	_ZNK10QtMobility21QContactManagerEngine17detailDefinitionsERK7QStringPNS_15QContactManager5ErrorE @ 676 NONAME
-	_ZNK10QtMobility21QContactManagerEngine17isFilterSupportedERKNS_14QContactFilterE @ 677 NONAME
-	_ZNK10QtMobility21QContactManagerEngine17managerParametersEv @ 678 NONAME
-	_ZNK10QtMobility21QContactManagerEngine18supportedDataTypesEv @ 679 NONAME
-	_ZNK10QtMobility21QContactManagerEngine18validateDefinitionERKNS_24QContactDetailDefinitionEPNS_15QContactManager5ErrorE @ 680 NONAME
-	_ZNK10QtMobility21QContactManagerEngine21supportedContactTypesEv @ 681 NONAME
-	_ZNK10QtMobility21QContactManagerEngine23synthesizedDisplayLabelERKNS_8QContactEPNS_15QContactManager5ErrorE @ 682 NONAME
-	_ZNK10QtMobility21QContactManagerEngine27isRelationshipTypeSupportedERK7QStringS3_ @ 683 NONAME
-	_ZNK10QtMobility21QContactManagerEngine7contactERKjRKNS_17QContactFetchHintEPNS_15QContactManager5ErrorE @ 684 NONAME
-	_ZNK10QtMobility21QContactManagerEngine8contactsERKNS_14QContactFilterERK5QListINS_17QContactSortOrderEERKNS_17QContactFetchHintEPNS_15QContactManager5ErrorE @ 685 NONAME
-	_ZNK10QtMobility21QContactRemoveRequest10contactIdsEv @ 686 NONAME
-	_ZNK10QtMobility21QContactRemoveRequest10metaObjectEv @ 687 NONAME
-	_ZNK10QtMobility21QContactRemoveRequest8errorMapEv @ 688 NONAME
-	_ZNK10QtMobility23QContactAbstractRequest10isCanceledEv @ 689 NONAME
-	_ZNK10QtMobility23QContactAbstractRequest10isFinishedEv @ 690 NONAME
-	_ZNK10QtMobility23QContactAbstractRequest10isInactiveEv @ 691 NONAME
-	_ZNK10QtMobility23QContactAbstractRequest10metaObjectEv @ 692 NONAME
-	_ZNK10QtMobility23QContactAbstractRequest4typeEv @ 693 NONAME
-	_ZNK10QtMobility23QContactAbstractRequest5errorEv @ 694 NONAME
-	_ZNK10QtMobility23QContactAbstractRequest5stateEv @ 695 NONAME
-	_ZNK10QtMobility23QContactAbstractRequest7managerEv @ 696 NONAME
-	_ZNK10QtMobility23QContactAbstractRequest8isActiveEv @ 697 NONAME
-	_ZNK10QtMobility23QContactChangeLogFilter5sinceEv @ 698 NONAME
-	_ZNK10QtMobility23QContactChangeLogFilter9eventTypeEv @ 699 NONAME
-	_ZNK10QtMobility24QContactActionDescriptor10actionNameEv @ 700 NONAME
-	_ZNK10QtMobility24QContactActionDescriptor10vendorNameEv @ 701 NONAME
-	_ZNK10QtMobility24QContactActionDescriptor21implementationVersionEv @ 702 NONAME
-	_ZNK10QtMobility24QContactActionDescriptor7isEmptyEv @ 703 NONAME
-	_ZNK10QtMobility24QContactActionDescriptoreqERKS0_ @ 704 NONAME
-	_ZNK10QtMobility24QContactActionDescriptorltERKS0_ @ 705 NONAME
-	_ZNK10QtMobility24QContactActionDescriptorneERKS0_ @ 706 NONAME
-	_ZNK10QtMobility24QContactDetailDefinition4nameEv @ 707 NONAME
-	_ZNK10QtMobility24QContactDetailDefinition6fieldsEv @ 708 NONAME
-	_ZNK10QtMobility24QContactDetailDefinition7isEmptyEv @ 709 NONAME
-	_ZNK10QtMobility24QContactDetailDefinition8isUniqueEv @ 710 NONAME
-	_ZNK10QtMobility24QContactDetailDefinitioneqERKS0_ @ 711 NONAME
-	_ZNK10QtMobility25QContactDetailRangeFilter10matchFlagsEv @ 712 NONAME
-	_ZNK10QtMobility25QContactDetailRangeFilter10rangeFlagsEv @ 713 NONAME
-	_ZNK10QtMobility25QContactDetailRangeFilter15detailFieldNameEv @ 714 NONAME
-	_ZNK10QtMobility25QContactDetailRangeFilter20detailDefinitionNameEv @ 715 NONAME
-	_ZNK10QtMobility25QContactDetailRangeFilter8maxValueEv @ 716 NONAME
-	_ZNK10QtMobility25QContactDetailRangeFilter8minValueEv @ 717 NONAME
-	_ZNK10QtMobility26QContactIntersectionFilter7filtersEv @ 718 NONAME
-	_ZNK10QtMobility26QContactRelationshipFilter16relatedContactIdEv @ 719 NONAME
-	_ZNK10QtMobility26QContactRelationshipFilter16relationshipTypeEv @ 720 NONAME
-	_ZNK10QtMobility26QContactRelationshipFilter18relatedContactRoleEv @ 721 NONAME
-	_ZNK10QtMobility27QContactLocalIdFetchRequest10metaObjectEv @ 722 NONAME
-	_ZNK10QtMobility27QContactLocalIdFetchRequest3idsEv @ 723 NONAME
-	_ZNK10QtMobility27QContactLocalIdFetchRequest6filterEv @ 724 NONAME
-	_ZNK10QtMobility27QContactLocalIdFetchRequest7sortingEv @ 725 NONAME
-	_ZNK10QtMobility28QContactManagerEngineFactory31supportedImplementationVersionsEv @ 726 NONAME
-	_ZNK10QtMobility29QContactDetailFieldDefinition15allowableValuesEv @ 727 NONAME
-	_ZNK10QtMobility29QContactDetailFieldDefinition8dataTypeEv @ 728 NONAME
-	_ZNK10QtMobility29QContactDetailFieldDefinitioneqERKS0_ @ 729 NONAME
-	_ZNK10QtMobility29QContactDetailFieldDefinitionneERKS0_ @ 730 NONAME
-	_ZNK10QtMobility31QContactRelationshipSaveRequest10metaObjectEv @ 731 NONAME
-	_ZNK10QtMobility31QContactRelationshipSaveRequest13relationshipsEv @ 732 NONAME
-	_ZNK10QtMobility31QContactRelationshipSaveRequest8errorMapEv @ 733 NONAME
-	_ZNK10QtMobility32QContactRelationshipFetchRequest10metaObjectEv @ 734 NONAME
-	_ZNK10QtMobility32QContactRelationshipFetchRequest13relationshipsEv @ 735 NONAME
-	_ZNK10QtMobility32QContactRelationshipFetchRequest16relationshipTypeEv @ 736 NONAME
-	_ZNK10QtMobility32QContactRelationshipFetchRequest5firstEv @ 737 NONAME
-	_ZNK10QtMobility32QContactRelationshipFetchRequest6secondEv @ 738 NONAME
-	_ZNK10QtMobility33QContactRelationshipRemoveRequest10metaObjectEv @ 739 NONAME
-	_ZNK10QtMobility33QContactRelationshipRemoveRequest13relationshipsEv @ 740 NONAME
-	_ZNK10QtMobility33QContactRelationshipRemoveRequest8errorMapEv @ 741 NONAME
-	_ZNK10QtMobility35QContactDetailDefinitionSaveRequest10metaObjectEv @ 742 NONAME
-	_ZNK10QtMobility35QContactDetailDefinitionSaveRequest11contactTypeEv @ 743 NONAME
-	_ZNK10QtMobility35QContactDetailDefinitionSaveRequest11definitionsEv @ 744 NONAME
-	_ZNK10QtMobility35QContactDetailDefinitionSaveRequest8errorMapEv @ 745 NONAME
-	_ZNK10QtMobility36QContactDetailDefinitionFetchRequest10metaObjectEv @ 746 NONAME
-	_ZNK10QtMobility36QContactDetailDefinitionFetchRequest11contactTypeEv @ 747 NONAME
-	_ZNK10QtMobility36QContactDetailDefinitionFetchRequest11definitionsEv @ 748 NONAME
-	_ZNK10QtMobility36QContactDetailDefinitionFetchRequest15definitionNamesEv @ 749 NONAME
-	_ZNK10QtMobility36QContactDetailDefinitionFetchRequest8errorMapEv @ 750 NONAME
-	_ZNK10QtMobility37QContactDetailDefinitionRemoveRequest10metaObjectEv @ 751 NONAME
-	_ZNK10QtMobility37QContactDetailDefinitionRemoveRequest11contactTypeEv @ 752 NONAME
-	_ZNK10QtMobility37QContactDetailDefinitionRemoveRequest15definitionNamesEv @ 753 NONAME
-	_ZNK10QtMobility37QContactDetailDefinitionRemoveRequest8errorMapEv @ 754 NONAME
-	_ZNK10QtMobility8QContact12displayLabelEv @ 755 NONAME
-	_ZNK10QtMobility8QContact13relationshipsERK7QString @ 756 NONAME
-	_ZNK10QtMobility8QContact15preferredDetailERK7QString @ 757 NONAME
-	_ZNK10QtMobility8QContact15relatedContactsERK7QStringNS_20QContactRelationship4RoleE @ 758 NONAME
-	_ZNK10QtMobility8QContact16availableActionsERK7QStringi @ 759 NONAME
-	_ZNK10QtMobility8QContact16detailWithActionERK7QString @ 760 NONAME
-	_ZNK10QtMobility8QContact16preferredDetailsEv @ 761 NONAME
-	_ZNK10QtMobility8QContact17detailsWithActionERK7QString @ 762 NONAME
-	_ZNK10QtMobility8QContact17isPreferredDetailERK7QStringRKNS_14QContactDetailE @ 763 NONAME
-	_ZNK10QtMobility8QContact2idEv @ 764 NONAME
-	_ZNK10QtMobility8QContact4typeEv @ 765 NONAME
-	_ZNK10QtMobility8QContact6detailERK7QString @ 766 NONAME
-	_ZNK10QtMobility8QContact7detailsERK7QString @ 767 NONAME
-	_ZNK10QtMobility8QContact7detailsERK7QStringS3_S3_ @ 768 NONAME
-	_ZNK10QtMobility8QContact7isEmptyEv @ 769 NONAME
-	_ZNK10QtMobility8QContact7localIdEv @ 770 NONAME
-	_ZNK10QtMobility8QContacteqERKS0_ @ 771 NONAME
-	_ZTIN10QtMobility12QContactNameE @ 772 NONAME ; #<TI>#
-	_ZTIN10QtMobility12QContactTypeE @ 773 NONAME ; #<TI>#
-	_ZTIN10QtMobility14QContactActionE @ 774 NONAME ; #<TI>#
-	_ZTIN10QtMobility14QContactDetailE @ 775 NONAME ; #<TI>#
-	_ZTIN10QtMobility14QContactFilterE @ 776 NONAME ; #<TI>#
-	_ZTIN10QtMobility15QContactManagerE @ 777 NONAME ; #<TI>#
-	_ZTIN10QtMobility17QContactTimestampE @ 778 NONAME ; #<TI>#
-	_ZTIN10QtMobility19QContactSaveRequestE @ 779 NONAME ; #<TI>#
-	_ZTIN10QtMobility19QContactUnionFilterE @ 780 NONAME ; #<TI>#
-	_ZTIN10QtMobility20QContactActionFilterE @ 781 NONAME ; #<TI>#
-	_ZTIN10QtMobility20QContactDetailFilterE @ 782 NONAME ; #<TI>#
-	_ZTIN10QtMobility20QContactDisplayLabelE @ 783 NONAME ; #<TI>#
-	_ZTIN10QtMobility20QContactFetchRequestE @ 784 NONAME ; #<TI>#
-	_ZTIN10QtMobility20QContactOrganizationE @ 785 NONAME ; #<TI>#
-	_ZTIN10QtMobility21QContactActionFactoryE @ 786 NONAME ; #<TI>#
-	_ZTIN10QtMobility21QContactInvalidFilterE @ 787 NONAME ; #<TI>#
-	_ZTIN10QtMobility21QContactLocalIdFilterE @ 788 NONAME ; #<TI>#
-	_ZTIN10QtMobility21QContactManagerEngineE @ 789 NONAME ; #<TI>#
-	_ZTIN10QtMobility21QContactRemoveRequestE @ 790 NONAME ; #<TI>#
-	_ZTIN10QtMobility23QContactAbstractRequestE @ 791 NONAME ; #<TI>#
-	_ZTIN10QtMobility23QContactChangeLogFilterE @ 792 NONAME ; #<TI>#
-	_ZTIN10QtMobility25QContactDetailRangeFilterE @ 793 NONAME ; #<TI>#
-	_ZTIN10QtMobility26QContactIntersectionFilterE @ 794 NONAME ; #<TI>#
-	_ZTIN10QtMobility26QContactRelationshipFilterE @ 795 NONAME ; #<TI>#
-	_ZTIN10QtMobility27QContactLocalIdFetchRequestE @ 796 NONAME ; #<TI>#
-	_ZTIN10QtMobility28QContactManagerEngineFactoryE @ 797 NONAME ; #<TI>#
-	_ZTIN10QtMobility31QContactRelationshipSaveRequestE @ 798 NONAME ; #<TI>#
-	_ZTIN10QtMobility32QContactRelationshipFetchRequestE @ 799 NONAME ; #<TI>#
-	_ZTIN10QtMobility33QContactRelationshipRemoveRequestE @ 800 NONAME ; #<TI>#
-	_ZTIN10QtMobility35QContactDetailDefinitionSaveRequestE @ 801 NONAME ; #<TI>#
-	_ZTIN10QtMobility36QContactDetailDefinitionFetchRequestE @ 802 NONAME ; #<TI>#
-	_ZTIN10QtMobility37QContactDetailDefinitionRemoveRequestE @ 803 NONAME ; #<TI>#
-	_ZTVN10QtMobility12QContactNameE @ 804 NONAME ; #<VT>#
-	_ZTVN10QtMobility12QContactTypeE @ 805 NONAME ; #<VT>#
-	_ZTVN10QtMobility14QContactActionE @ 806 NONAME ; #<VT>#
-	_ZTVN10QtMobility14QContactDetailE @ 807 NONAME ; #<VT>#
-	_ZTVN10QtMobility14QContactFilterE @ 808 NONAME ; #<VT>#
-	_ZTVN10QtMobility15QContactManagerE @ 809 NONAME ; #<VT>#
-	_ZTVN10QtMobility17QContactTimestampE @ 810 NONAME ; #<VT>#
-	_ZTVN10QtMobility19QContactSaveRequestE @ 811 NONAME ; #<VT>#
-	_ZTVN10QtMobility19QContactUnionFilterE @ 812 NONAME ; #<VT>#
-	_ZTVN10QtMobility20QContactActionFilterE @ 813 NONAME ; #<VT>#
-	_ZTVN10QtMobility20QContactDetailFilterE @ 814 NONAME ; #<VT>#
-	_ZTVN10QtMobility20QContactDisplayLabelE @ 815 NONAME ; #<VT>#
-	_ZTVN10QtMobility20QContactFetchRequestE @ 816 NONAME ; #<VT>#
-	_ZTVN10QtMobility20QContactOrganizationE @ 817 NONAME ; #<VT>#
-	_ZTVN10QtMobility21QContactActionFactoryE @ 818 NONAME ; #<VT>#
-	_ZTVN10QtMobility21QContactInvalidFilterE @ 819 NONAME ; #<VT>#
-	_ZTVN10QtMobility21QContactLocalIdFilterE @ 820 NONAME ; #<VT>#
-	_ZTVN10QtMobility21QContactManagerEngineE @ 821 NONAME ; #<VT>#
-	_ZTVN10QtMobility21QContactRemoveRequestE @ 822 NONAME ; #<VT>#
-	_ZTVN10QtMobility23QContactAbstractRequestE @ 823 NONAME ; #<VT>#
-	_ZTVN10QtMobility23QContactChangeLogFilterE @ 824 NONAME ; #<VT>#
-	_ZTVN10QtMobility25QContactDetailRangeFilterE @ 825 NONAME ; #<VT>#
-	_ZTVN10QtMobility26QContactIntersectionFilterE @ 826 NONAME ; #<VT>#
-	_ZTVN10QtMobility26QContactRelationshipFilterE @ 827 NONAME ; #<VT>#
-	_ZTVN10QtMobility27QContactLocalIdFetchRequestE @ 828 NONAME ; #<VT>#
-	_ZTVN10QtMobility28QContactManagerEngineFactoryE @ 829 NONAME ; #<VT>#
-	_ZTVN10QtMobility31QContactRelationshipSaveRequestE @ 830 NONAME ; #<VT>#
-	_ZTVN10QtMobility32QContactRelationshipFetchRequestE @ 831 NONAME ; #<VT>#
-	_ZTVN10QtMobility33QContactRelationshipRemoveRequestE @ 832 NONAME ; #<VT>#
-	_ZTVN10QtMobility35QContactDetailDefinitionSaveRequestE @ 833 NONAME ; #<VT>#
-	_ZTVN10QtMobility36QContactDetailDefinitionFetchRequestE @ 834 NONAME ; #<VT>#
-	_ZTVN10QtMobility37QContactDetailDefinitionRemoveRequestE @ 835 NONAME ; #<VT>#
+	_ZN10QtMobility14QContactAvatar13FieldImageUrlE @ 34 NONAME DATA 9
+	_ZN10QtMobility14QContactAvatar13FieldVideoUrlE @ 35 NONAME DATA 9
+	_ZN10QtMobility14QContactAvatar14DefinitionNameE @ 36 NONAME DATA 7
+	_ZN10QtMobility14QContactDetail11ContextHomeE @ 37 NONAME DATA 5
+	_ZN10QtMobility14QContactDetail11ContextWorkE @ 38 NONAME DATA 5
+	_ZN10QtMobility14QContactDetail11removeValueEPKc @ 39 NONAME
+	_ZN10QtMobility14QContactDetail11removeValueERK7QString @ 40 NONAME
+	_ZN10QtMobility14QContactDetail12ContextOtherE @ 41 NONAME DATA 6
+	_ZN10QtMobility14QContactDetail12FieldContextE @ 42 NONAME DATA 8
+	_ZN10QtMobility14QContactDetail14FieldDetailUriE @ 43 NONAME DATA 10
+	_ZN10QtMobility14QContactDetail21FieldLinkedDetailUrisE @ 44 NONAME DATA 17
+	_ZN10QtMobility14QContactDetail6assignERKS0_PKc @ 45 NONAME
+	_ZN10QtMobility14QContactDetail6assignERKS0_RK7QString @ 46 NONAME
+	_ZN10QtMobility14QContactDetail8resetKeyEv @ 47 NONAME
+	_ZN10QtMobility14QContactDetail8setValueEPKcRK8QVariant @ 48 NONAME
+	_ZN10QtMobility14QContactDetail8setValueERK7QStringRK8QVariant @ 49 NONAME
+	_ZN10QtMobility14QContactDetailC1EPKc @ 50 NONAME
+	_ZN10QtMobility14QContactDetailC1ERK7QString @ 51 NONAME
+	_ZN10QtMobility14QContactDetailC1ERKS0_ @ 52 NONAME
+	_ZN10QtMobility14QContactDetailC1ERKS0_PKc @ 53 NONAME
+	_ZN10QtMobility14QContactDetailC1ERKS0_RK7QString @ 54 NONAME
+	_ZN10QtMobility14QContactDetailC1Ev @ 55 NONAME
+	_ZN10QtMobility14QContactDetailC2EPKc @ 56 NONAME
+	_ZN10QtMobility14QContactDetailC2ERK7QString @ 57 NONAME
+	_ZN10QtMobility14QContactDetailC2ERKS0_ @ 58 NONAME
+	_ZN10QtMobility14QContactDetailC2ERKS0_PKc @ 59 NONAME
+	_ZN10QtMobility14QContactDetailC2ERKS0_RK7QString @ 60 NONAME
+	_ZN10QtMobility14QContactDetailC2Ev @ 61 NONAME
+	_ZN10QtMobility14QContactDetailD1Ev @ 62 NONAME
+	_ZN10QtMobility14QContactDetailD2Ev @ 63 NONAME
+	_ZN10QtMobility14QContactDetailaSERKS0_ @ 64 NONAME
+	_ZN10QtMobility14QContactFamily11FieldSpouseE @ 65 NONAME DATA 7
+	_ZN10QtMobility14QContactFamily13FieldChildrenE @ 66 NONAME DATA 9
+	_ZN10QtMobility14QContactFamily14DefinitionNameE @ 67 NONAME DATA 7
+	_ZN10QtMobility14QContactFilterC1EPNS_21QContactFilterPrivateE @ 68 NONAME
+	_ZN10QtMobility14QContactFilterC1ERKS0_ @ 69 NONAME
+	_ZN10QtMobility14QContactFilterC1Ev @ 70 NONAME
+	_ZN10QtMobility14QContactFilterC2EPNS_21QContactFilterPrivateE @ 71 NONAME
+	_ZN10QtMobility14QContactFilterC2ERKS0_ @ 72 NONAME
+	_ZN10QtMobility14QContactFilterC2Ev @ 73 NONAME
+	_ZN10QtMobility14QContactFilterD1Ev @ 74 NONAME
+	_ZN10QtMobility14QContactFilterD2Ev @ 75 NONAME
+	_ZN10QtMobility14QContactFilteraSERKS0_ @ 76 NONAME
+	_ZN10QtMobility14QContactGender10GenderMaleE @ 77 NONAME DATA 5
+	_ZN10QtMobility14QContactGender11FieldGenderE @ 78 NONAME DATA 7
+	_ZN10QtMobility14QContactGender12GenderFemaleE @ 79 NONAME DATA 7
+	_ZN10QtMobility14QContactGender14DefinitionNameE @ 80 NONAME DATA 7
+	_ZN10QtMobility14QContactGender17GenderUnspecifiedE @ 81 NONAME DATA 12
+	_ZN10QtMobility15QContactAddress11FieldRegionE @ 82 NONAME DATA 7
+	_ZN10QtMobility15QContactAddress11FieldStreetE @ 83 NONAME DATA 7
+	_ZN10QtMobility15QContactAddress12FieldCountryE @ 84 NONAME DATA 8
+	_ZN10QtMobility15QContactAddress13FieldLocalityE @ 85 NONAME DATA 9
+	_ZN10QtMobility15QContactAddress13FieldPostcodeE @ 86 NONAME DATA 9
+	_ZN10QtMobility15QContactAddress13FieldSubTypesE @ 87 NONAME DATA 9
+	_ZN10QtMobility15QContactAddress13SubTypeParcelE @ 88 NONAME DATA 7
+	_ZN10QtMobility15QContactAddress13SubTypePostalE @ 89 NONAME DATA 7
+	_ZN10QtMobility15QContactAddress14DefinitionNameE @ 90 NONAME DATA 8
+	_ZN10QtMobility15QContactAddress15SubTypeDomesticE @ 91 NONAME DATA 9
+	_ZN10QtMobility15QContactAddress18FieldPostOfficeBoxE @ 92 NONAME DATA 14
+	_ZN10QtMobility15QContactAddress20SubTypeInternationalE @ 93 NONAME DATA 14
+	_ZN10QtMobility15QContactManager11dataChangedEv @ 94 NONAME
+	_ZN10QtMobility15QContactManager11qt_metacallEN11QMetaObject4CallEiPPv @ 95 NONAME
+	_ZN10QtMobility15QContactManager11qt_metacastEPKc @ 96 NONAME
+	_ZN10QtMobility15QContactManager11saveContactEPNS_8QContactE @ 97 NONAME
+	_ZN10QtMobility15QContactManager12createEngineERK7QStringRK4QMapIS1_S1_E @ 98 NONAME
+	_ZN10QtMobility15QContactManager12saveContactsEP5QListINS_8QContactEEP4QMapIiNS0_5ErrorEE @ 99 NONAME
+	_ZN10QtMobility15QContactManager13contactsAddedERK5QListIjE @ 100 NONAME
+	_ZN10QtMobility15QContactManager13removeContactERKj @ 101 NONAME
+	_ZN10QtMobility15QContactManager14removeContactsERK5QListIjEP4QMapIiNS0_5ErrorEE @ 102 NONAME
+	_ZN10QtMobility15QContactManager15contactsChangedERK5QListIjE @ 103 NONAME
+	_ZN10QtMobility15QContactManager15contactsRemovedERK5QListIjE @ 104 NONAME
+	_ZN10QtMobility15QContactManager16saveRelationshipEPNS_20QContactRelationshipE @ 105 NONAME
+	_ZN10QtMobility15QContactManager16setSelfContactIdERKj @ 106 NONAME
+	_ZN10QtMobility15QContactManager16staticMetaObjectE @ 107 NONAME DATA 16
+	_ZN10QtMobility15QContactManager17availableManagersEv @ 108 NONAME
+	_ZN10QtMobility15QContactManager17compatibleContactERKNS_8QContactE @ 109 NONAME
+	_ZN10QtMobility15QContactManager17saveRelationshipsEP5QListINS_20QContactRelationshipEEP4QMapIiNS0_5ErrorEE @ 110 NONAME
+	_ZN10QtMobility15QContactManager18relationshipsAddedERK5QListIjE @ 111 NONAME
+	_ZN10QtMobility15QContactManager18removeRelationshipERKNS_20QContactRelationshipE @ 112 NONAME
+	_ZN10QtMobility15QContactManager19getStaticMetaObjectEv @ 113 NONAME
+	_ZN10QtMobility15QContactManager19removeRelationshipsERK5QListINS_20QContactRelationshipEEP4QMapIiNS0_5ErrorEE @ 114 NONAME
+	_ZN10QtMobility15QContactManager20relationshipsRemovedERK5QListIjE @ 115 NONAME
+	_ZN10QtMobility15QContactManager20saveDetailDefinitionERKNS_24QContactDetailDefinitionERK7QString @ 116 NONAME
+	_ZN10QtMobility15QContactManager20selfContactIdChangedERKjS2_ @ 117 NONAME
+	_ZN10QtMobility15QContactManager22removeDetailDefinitionERK7QStringS3_ @ 118 NONAME
+	_ZN10QtMobility15QContactManager7fromUriERK7QStringP7QObject @ 119 NONAME
+	_ZN10QtMobility15QContactManager8buildUriERK7QStringRK4QMapIS1_S1_Ei @ 120 NONAME
+	_ZN10QtMobility15QContactManager8parseUriERK7QStringPS1_P4QMapIS1_S1_E @ 121 NONAME
+	_ZN10QtMobility15QContactManagerC1EP7QObject @ 122 NONAME
+	_ZN10QtMobility15QContactManagerC1ERK7QStringRK4QMapIS1_S1_EP7QObject @ 123 NONAME
+	_ZN10QtMobility15QContactManagerC1ERK7QStringiRK4QMapIS1_S1_EP7QObject @ 124 NONAME
+	_ZN10QtMobility15QContactManagerC2EP7QObject @ 125 NONAME
+	_ZN10QtMobility15QContactManagerC2ERK7QStringRK4QMapIS1_S1_EP7QObject @ 126 NONAME
+	_ZN10QtMobility15QContactManagerC2ERK7QStringiRK4QMapIS1_S1_EP7QObject @ 127 NONAME
+	_ZN10QtMobility15QContactManagerD0Ev @ 128 NONAME
+	_ZN10QtMobility15QContactManagerD1Ev @ 129 NONAME
+	_ZN10QtMobility15QContactManagerD2Ev @ 130 NONAME
+	_ZN10QtMobility16QContactBirthday13FieldBirthdayE @ 131 NONAME DATA 9
+	_ZN10QtMobility16QContactBirthday14DefinitionNameE @ 132 NONAME DATA 9
+	_ZN10QtMobility16QContactNickname13FieldNicknameE @ 133 NONAME DATA 9
+	_ZN10QtMobility16QContactNickname14DefinitionNameE @ 134 NONAME DATA 9
+	_ZN10QtMobility16QContactPresence13FieldNicknameE @ 135 NONAME DATA 9
+	_ZN10QtMobility16QContactPresence14DefinitionNameE @ 136 NONAME DATA 9
+	_ZN10QtMobility16QContactPresence14FieldTimestampE @ 137 NONAME DATA 10
+	_ZN10QtMobility16QContactPresence18FieldCustomMessageE @ 138 NONAME DATA 14
+	_ZN10QtMobility16QContactPresence18FieldPresenceStateE @ 139 NONAME DATA 14
+	_ZN10QtMobility16QContactPresence22FieldPresenceStateTextE @ 140 NONAME DATA 18
+	_ZN10QtMobility16QContactPresence26FieldPresenceStateImageUrlE @ 141 NONAME DATA 22
+	_ZN10QtMobility16QContactRingtone14DefinitionNameE @ 142 NONAME DATA 9
+	_ZN10QtMobility16QContactRingtone21FieldAudioRingtoneUrlE @ 143 NONAME DATA 17
+	_ZN10QtMobility16QContactRingtone21FieldVideoRingtoneUrlE @ 144 NONAME DATA 17
+	_ZN10QtMobility16QContactRingtone25FieldVibrationRingtoneUrlE @ 145 NONAME DATA 21
+	_ZN10QtMobility17QContactChangeSet11dataChangedEv @ 146 NONAME
+	_ZN10QtMobility17QContactChangeSet11emitSignalsEPNS_21QContactManagerEngineE @ 147 NONAME
+	_ZN10QtMobility17QContactChangeSet14setDataChangedEb @ 148 NONAME
+	_ZN10QtMobility17QContactChangeSet18clearAddedContactsEv @ 149 NONAME
+	_ZN10QtMobility17QContactChangeSet18insertAddedContactEj @ 150 NONAME
+	_ZN10QtMobility17QContactChangeSet19insertAddedContactsERK5QListIjE @ 151 NONAME
+	_ZN10QtMobility17QContactChangeSet20clearChangedContactsEv @ 152 NONAME
+	_ZN10QtMobility17QContactChangeSet20clearRemovedContactsEv @ 153 NONAME
+	_ZN10QtMobility17QContactChangeSet20insertChangedContactEj @ 154 NONAME
+	_ZN10QtMobility17QContactChangeSet20insertRemovedContactEj @ 155 NONAME
+	_ZN10QtMobility17QContactChangeSet21insertChangedContactsERK5QListIjE @ 156 NONAME
+	_ZN10QtMobility17QContactChangeSet21insertRemovedContactsERK5QListIjE @ 157 NONAME
+	_ZN10QtMobility17QContactChangeSet25setOldAndNewSelfContactIdERK5QPairIjjE @ 158 NONAME
+	_ZN10QtMobility17QContactChangeSet31clearAddedRelationshipsContactsEv @ 159 NONAME
+	_ZN10QtMobility17QContactChangeSet31insertAddedRelationshipsContactEj @ 160 NONAME
+	_ZN10QtMobility17QContactChangeSet32insertAddedRelationshipsContactsERK5QListIjE @ 161 NONAME
+	_ZN10QtMobility17QContactChangeSet33clearRemovedRelationshipsContactsEv @ 162 NONAME
+	_ZN10QtMobility17QContactChangeSet33insertRemovedRelationshipsContactEj @ 163 NONAME
+	_ZN10QtMobility17QContactChangeSet34insertRemovedRelationshipsContactsERK5QListIjE @ 164 NONAME
+	_ZN10QtMobility17QContactChangeSet8clearAllEv @ 165 NONAME
+	_ZN10QtMobility17QContactChangeSetC1ERKS0_ @ 166 NONAME
+	_ZN10QtMobility17QContactChangeSetC1Ev @ 167 NONAME
+	_ZN10QtMobility17QContactChangeSetC2ERKS0_ @ 168 NONAME
+	_ZN10QtMobility17QContactChangeSetC2Ev @ 169 NONAME
+	_ZN10QtMobility17QContactChangeSetD1Ev @ 170 NONAME
+	_ZN10QtMobility17QContactChangeSetD2Ev @ 171 NONAME
+	_ZN10QtMobility17QContactChangeSetaSERKS0_ @ 172 NONAME
+	_ZN10QtMobility17QContactFetchHint20setOptimizationHintsE6QFlagsINS0_16OptimizationHintEE @ 173 NONAME
+	_ZN10QtMobility17QContactFetchHint24setDetailDefinitionsHintERK11QStringList @ 174 NONAME
+	_ZN10QtMobility17QContactFetchHint24setRelationshipTypesHintERK11QStringList @ 175 NONAME
+	_ZN10QtMobility17QContactFetchHintC1ERKS0_ @ 176 NONAME
+	_ZN10QtMobility17QContactFetchHintC1Ev @ 177 NONAME
+	_ZN10QtMobility17QContactFetchHintC2ERKS0_ @ 178 NONAME
+	_ZN10QtMobility17QContactFetchHintC2Ev @ 179 NONAME
+	_ZN10QtMobility17QContactFetchHintD1Ev @ 180 NONAME
+	_ZN10QtMobility17QContactFetchHintD2Ev @ 181 NONAME
+	_ZN10QtMobility17QContactFetchHintaSERKS0_ @ 182 NONAME
+	_ZN10QtMobility17QContactSortOrder12setDirectionEN2Qt9SortOrderE @ 183 NONAME
+	_ZN10QtMobility17QContactSortOrder14setBlankPolicyENS0_11BlankPolicyE @ 184 NONAME
+	_ZN10QtMobility17QContactSortOrder18setCaseSensitivityEN2Qt15CaseSensitivityE @ 185 NONAME
+	_ZN10QtMobility17QContactSortOrder23setDetailDefinitionNameERK7QStringS3_ @ 186 NONAME
+	_ZN10QtMobility17QContactSortOrderC1ERKS0_ @ 187 NONAME
+	_ZN10QtMobility17QContactSortOrderC1Ev @ 188 NONAME
+	_ZN10QtMobility17QContactSortOrderC2ERKS0_ @ 189 NONAME
+	_ZN10QtMobility17QContactSortOrderC2Ev @ 190 NONAME
+	_ZN10QtMobility17QContactSortOrderD1Ev @ 191 NONAME
+	_ZN10QtMobility17QContactSortOrderD2Ev @ 192 NONAME
+	_ZN10QtMobility17QContactSortOrderaSERKS0_ @ 193 NONAME
+	_ZN10QtMobility17QContactThumbnail14DefinitionNameE @ 194 NONAME DATA 10
+	_ZN10QtMobility17QContactThumbnail14FieldThumbnailE @ 195 NONAME DATA 10
+	_ZN10QtMobility17QContactTimestamp14DefinitionNameE @ 196 NONAME DATA 10
+	_ZN10QtMobility17QContactTimestamp22FieldCreationTimestampE @ 197 NONAME DATA 18
+	_ZN10QtMobility17QContactTimestamp26FieldModificationTimestampE @ 198 NONAME DATA 22
+	_ZN10QtMobility18QContactSyncTarget14DefinitionNameE @ 199 NONAME DATA 11
+	_ZN10QtMobility18QContactSyncTarget15FieldSyncTargetE @ 200 NONAME DATA 11
+	_ZN10QtMobility19QContactAnniversary10FieldEventE @ 201 NONAME DATA 6
+	_ZN10QtMobility19QContactAnniversary12FieldSubTypeE @ 202 NONAME DATA 8
+	_ZN10QtMobility19QContactAnniversary12SubTypeHouseE @ 203 NONAME DATA 6
+	_ZN10QtMobility19QContactAnniversary14DefinitionNameE @ 204 NONAME DATA 12
+	_ZN10QtMobility19QContactAnniversary14SubTypeWeddingE @ 205 NONAME DATA 8
+	_ZN10QtMobility19QContactAnniversary15FieldCalendarIdE @ 206 NONAME DATA 11
+	_ZN10QtMobility19QContactAnniversary15SubTypeMemorialE @ 207 NONAME DATA 9
+	_ZN10QtMobility19QContactAnniversary17FieldOriginalDateE @ 208 NONAME DATA 13
+	_ZN10QtMobility19QContactAnniversary17SubTypeEmploymentE @ 209 NONAME DATA 11
+	_ZN10QtMobility19QContactAnniversary17SubTypeEngagementE @ 210 NONAME DATA 11
+	_ZN10QtMobility19QContactGeoLocation10FieldLabelE @ 211 NONAME DATA 6
+	_ZN10QtMobility19QContactGeoLocation10FieldSpeedE @ 212 NONAME DATA 6
+	_ZN10QtMobility19QContactGeoLocation12FieldHeadingE @ 213 NONAME DATA 8
+	_ZN10QtMobility19QContactGeoLocation13FieldAccuracyE @ 214 NONAME DATA 9
+	_ZN10QtMobility19QContactGeoLocation13FieldAltitudeE @ 215 NONAME DATA 9
+	_ZN10QtMobility19QContactGeoLocation13FieldLatitudeE @ 216 NONAME DATA 9
+	_ZN10QtMobility19QContactGeoLocation14DefinitionNameE @ 217 NONAME DATA 12
+	_ZN10QtMobility19QContactGeoLocation14FieldLongitudeE @ 218 NONAME DATA 10
+	_ZN10QtMobility19QContactGeoLocation14FieldTimestampE @ 219 NONAME DATA 10
+	_ZN10QtMobility19QContactGeoLocation21FieldAltitudeAccuracyE @ 220 NONAME DATA 17
+	_ZN10QtMobility19QContactPhoneNumber10SubTypeCarE @ 221 NONAME DATA 4
+	_ZN10QtMobility19QContactPhoneNumber10SubTypeFaxE @ 222 NONAME DATA 4
+	_ZN10QtMobility19QContactPhoneNumber11FieldNumberE @ 223 NONAME DATA 12
+	_ZN10QtMobility19QContactPhoneNumber12SubTypeModemE @ 224 NONAME DATA 6
+	_ZN10QtMobility19QContactPhoneNumber12SubTypePagerE @ 225 NONAME DATA 6
+	_ZN10QtMobility19QContactPhoneNumber12SubTypeVideoE @ 226 NONAME DATA 6
+	_ZN10QtMobility19QContactPhoneNumber12SubTypeVoiceE @ 227 NONAME DATA 6
+	_ZN10QtMobility19QContactPhoneNumber13FieldSubTypesE @ 228 NONAME DATA 9
+	_ZN10QtMobility19QContactPhoneNumber13SubTypeMobileE @ 229 NONAME DATA 7
+	_ZN10QtMobility19QContactPhoneNumber14DefinitionNameE @ 230 NONAME DATA 12
+	_ZN10QtMobility19QContactPhoneNumber15SubTypeDtmfMenuE @ 231 NONAME DATA 9
+	_ZN10QtMobility19QContactPhoneNumber15SubTypeLandlineE @ 232 NONAME DATA 9
+	_ZN10QtMobility19QContactPhoneNumber16SubTypeAssistantE @ 233 NONAME DATA 10
+	_ZN10QtMobility19QContactPhoneNumber23SubTypeMessagingCapableE @ 234 NONAME DATA 17
+	_ZN10QtMobility19QContactPhoneNumber26SubTypeBulletinBoardSystemE @ 235 NONAME DATA 20
+	_ZN10QtMobility19QContactPhoneNumber5matchERK7QString @ 236 NONAME
+	_ZN10QtMobility19QContactSaveRequest10setContactERKNS_8QContactE @ 237 NONAME
+	_ZN10QtMobility19QContactSaveRequest11qt_metacallEN11QMetaObject4CallEiPPv @ 238 NONAME
+	_ZN10QtMobility19QContactSaveRequest11qt_metacastEPKc @ 239 NONAME
+	_ZN10QtMobility19QContactSaveRequest11setContactsERK5QListINS_8QContactEE @ 240 NONAME
+	_ZN10QtMobility19QContactSaveRequest16staticMetaObjectE @ 241 NONAME DATA 16
+	_ZN10QtMobility19QContactSaveRequest19getStaticMetaObjectEv @ 242 NONAME
+	_ZN10QtMobility19QContactSaveRequestC1EP7QObject @ 243 NONAME
+	_ZN10QtMobility19QContactSaveRequestC2EP7QObject @ 244 NONAME
+	_ZN10QtMobility19QContactUnionFilter10setFiltersERK5QListINS_14QContactFilterEE @ 245 NONAME
+	_ZN10QtMobility19QContactUnionFilter6appendERKNS_14QContactFilterE @ 246 NONAME
+	_ZN10QtMobility19QContactUnionFilter6removeERKNS_14QContactFilterE @ 247 NONAME
+	_ZN10QtMobility19QContactUnionFilter7prependERKNS_14QContactFilterE @ 248 NONAME
+	_ZN10QtMobility19QContactUnionFilterC1ERKNS_14QContactFilterE @ 249 NONAME
+	_ZN10QtMobility19QContactUnionFilterC1Ev @ 250 NONAME
+	_ZN10QtMobility19QContactUnionFilterC2ERKNS_14QContactFilterE @ 251 NONAME
+	_ZN10QtMobility19QContactUnionFilterC2Ev @ 252 NONAME
+	_ZN10QtMobility19QContactUnionFilterlsERKNS_14QContactFilterE @ 253 NONAME
+	_ZN10QtMobility20QContactDetailFilter13setMatchFlagsE6QFlagsINS_14QContactFilter9MatchFlagEE @ 254 NONAME
+	_ZN10QtMobility20QContactDetailFilter23setDetailDefinitionNameERK7QStringS3_ @ 255 NONAME
+	_ZN10QtMobility20QContactDetailFilter8setValueERK8QVariant @ 256 NONAME
+	_ZN10QtMobility20QContactDetailFilterC1ERKNS_14QContactFilterE @ 257 NONAME
+	_ZN10QtMobility20QContactDetailFilterC1Ev @ 258 NONAME
+	_ZN10QtMobility20QContactDetailFilterC2ERKNS_14QContactFilterE @ 259 NONAME
+	_ZN10QtMobility20QContactDetailFilterC2Ev @ 260 NONAME
+	_ZN10QtMobility20QContactDisplayLabel10FieldLabelE @ 261 NONAME DATA 6
+	_ZN10QtMobility20QContactDisplayLabel14DefinitionNameE @ 262 NONAME DATA 13
+	_ZN10QtMobility20QContactDisplayLabel5matchERK7QString @ 263 NONAME
+	_ZN10QtMobility20QContactEmailAddress14DefinitionNameE @ 264 NONAME DATA 13
+	_ZN10QtMobility20QContactEmailAddress17FieldEmailAddressE @ 265 NONAME DATA 13
+	_ZN10QtMobility20QContactEmailAddress5matchERK7QString @ 266 NONAME
+	_ZN10QtMobility20QContactFetchRequest10setSortingERK5QListINS_17QContactSortOrderEE @ 267 NONAME
+	_ZN10QtMobility20QContactFetchRequest11qt_metacallEN11QMetaObject4CallEiPPv @ 268 NONAME
+	_ZN10QtMobility20QContactFetchRequest11qt_metacastEPKc @ 269 NONAME
+	_ZN10QtMobility20QContactFetchRequest12setFetchHintERKNS_17QContactFetchHintE @ 270 NONAME
+	_ZN10QtMobility20QContactFetchRequest16staticMetaObjectE @ 271 NONAME DATA 16
+	_ZN10QtMobility20QContactFetchRequest19getStaticMetaObjectEv @ 272 NONAME
+	_ZN10QtMobility20QContactFetchRequest9setFilterERKNS_14QContactFilterE @ 273 NONAME
+	_ZN10QtMobility20QContactFetchRequestC1EP7QObject @ 274 NONAME
+	_ZN10QtMobility20QContactFetchRequestC2EP7QObject @ 275 NONAME
+	_ZN10QtMobility20QContactOrganization10FieldTitleE @ 276 NONAME DATA 6
+	_ZN10QtMobility20QContactOrganization12FieldLogoUrlE @ 277 NONAME DATA 8
+	_ZN10QtMobility20QContactOrganization13FieldLocationE @ 278 NONAME DATA 9
+	_ZN10QtMobility20QContactOrganization14DefinitionNameE @ 279 NONAME DATA 13
+	_ZN10QtMobility20QContactOrganization15FieldDepartmentE @ 280 NONAME DATA 11
+	_ZN10QtMobility20QContactOrganization18FieldAssistantNameE @ 281 NONAME DATA 14
+	_ZN10QtMobility20QContactOrganization9FieldNameE @ 282 NONAME DATA 5
+	_ZN10QtMobility20QContactOrganization9FieldRoleE @ 283 NONAME DATA 5
+	_ZN10QtMobility20QContactRelationship10AggregatesE @ 284 NONAME DATA 11
+	_ZN10QtMobility20QContactRelationship10HasManagerE @ 285 NONAME DATA 11
+	_ZN10QtMobility20QContactRelationship12HasAssistantE @ 286 NONAME DATA 13
+	_ZN10QtMobility20QContactRelationship19setRelationshipTypeERK7QString @ 287 NONAME
+	_ZN10QtMobility20QContactRelationship8IsSameAsE @ 288 NONAME DATA 9
+	_ZN10QtMobility20QContactRelationship8setFirstERKNS_10QContactIdE @ 289 NONAME
+	_ZN10QtMobility20QContactRelationship9HasMemberE @ 290 NONAME DATA 10
+	_ZN10QtMobility20QContactRelationship9HasSpouseE @ 291 NONAME DATA 10
+	_ZN10QtMobility20QContactRelationship9setSecondERKNS_10QContactIdE @ 292 NONAME
+	_ZN10QtMobility20QContactRelationshipC1ERKS0_ @ 293 NONAME
+	_ZN10QtMobility20QContactRelationshipC1Ev @ 294 NONAME
+	_ZN10QtMobility20QContactRelationshipC2ERKS0_ @ 295 NONAME
+	_ZN10QtMobility20QContactRelationshipC2Ev @ 296 NONAME
+	_ZN10QtMobility20QContactRelationshipD1Ev @ 297 NONAME
+	_ZN10QtMobility20QContactRelationshipD2Ev @ 298 NONAME
+	_ZN10QtMobility20QContactRelationshipaSERKS0_ @ 299 NONAME
+	_ZN10QtMobility21QContactInvalidFilterC1ERKNS_14QContactFilterE @ 300 NONAME
+	_ZN10QtMobility21QContactInvalidFilterC1Ev @ 301 NONAME
+	_ZN10QtMobility21QContactInvalidFilterC2ERKNS_14QContactFilterE @ 302 NONAME
+	_ZN10QtMobility21QContactInvalidFilterC2Ev @ 303 NONAME
+	_ZN10QtMobility21QContactLocalIdFilter6setIdsERK5QListIjE @ 304 NONAME
+	_ZN10QtMobility21QContactLocalIdFilterC1ERKNS_14QContactFilterE @ 305 NONAME
+	_ZN10QtMobility21QContactLocalIdFilterC1Ev @ 306 NONAME
+	_ZN10QtMobility21QContactLocalIdFilterC2ERKNS_14QContactFilterE @ 307 NONAME
+	_ZN10QtMobility21QContactLocalIdFilterC2Ev @ 308 NONAME
+	_ZN10QtMobility21QContactManagerEngine10testFilterERKNS_14QContactFilterERKNS_8QContactE @ 309 NONAME
+	_ZN10QtMobility21QContactManagerEngine11dataChangedEv @ 310 NONAME
+	_ZN10QtMobility21QContactManagerEngine11qt_metacallEN11QMetaObject4CallEiPPv @ 311 NONAME
+	_ZN10QtMobility21QContactManagerEngine11qt_metacastEPKc @ 312 NONAME
+	_ZN10QtMobility21QContactManagerEngine11saveContactEPNS_8QContactEPNS_15QContactManager5ErrorE @ 313 NONAME
+	_ZN10QtMobility21QContactManagerEngine12saveContactsEP5QListINS_8QContactEEP4QMapIiNS_15QContactManager5ErrorEEPS7_ @ 314 NONAME
+	_ZN10QtMobility21QContactManagerEngine12sortContactsERK5QListINS_8QContactEERKS1_INS_17QContactSortOrderEE @ 315 NONAME
+	_ZN10QtMobility21QContactManagerEngine12startRequestEPNS_23QContactAbstractRequestE @ 316 NONAME
+	_ZN10QtMobility21QContactManagerEngine13cancelRequestEPNS_23QContactAbstractRequestE @ 317 NONAME
+	_ZN10QtMobility21QContactManagerEngine13contactsAddedERK5QListIjE @ 318 NONAME
+	_ZN10QtMobility21QContactManagerEngine13removeContactERKjPNS_15QContactManager5ErrorE @ 319 NONAME
+	_ZN10QtMobility21QContactManagerEngine14compareContactERKNS_8QContactES3_RK5QListINS_17QContactSortOrderEE @ 320 NONAME
+	_ZN10QtMobility21QContactManagerEngine14compareVariantERK8QVariantS3_N2Qt15CaseSensitivityE @ 321 NONAME
+	_ZN10QtMobility21QContactManagerEngine14removeContactsERK5QListIjEP4QMapIiNS_15QContactManager5ErrorEEPS7_ @ 322 NONAME
+	_ZN10QtMobility21QContactManagerEngine15contactsChangedERK5QListIjE @ 323 NONAME
+	_ZN10QtMobility21QContactManagerEngine15contactsRemovedERK5QListIjE @ 324 NONAME
+	_ZN10QtMobility21QContactManagerEngine16requestDestroyedEPNS_23QContactAbstractRequestE @ 325 NONAME
+	_ZN10QtMobility21QContactManagerEngine16saveRelationshipEPNS_20QContactRelationshipEPNS_15QContactManager5ErrorE @ 326 NONAME
+	_ZN10QtMobility21QContactManagerEngine16setSelfContactIdERKjPNS_15QContactManager5ErrorE @ 327 NONAME
+	_ZN10QtMobility21QContactManagerEngine16staticMetaObjectE @ 328 NONAME DATA 16
+	_ZN10QtMobility21QContactManagerEngine17saveRelationshipsEP5QListINS_20QContactRelationshipEEP4QMapIiNS_15QContactManager5ErrorEEPS7_ @ 329 NONAME
+	_ZN10QtMobility21QContactManagerEngine17schemaDefinitionsEv @ 330 NONAME
+	_ZN10QtMobility21QContactManagerEngine18relationshipsAddedERK5QListIjE @ 331 NONAME
+	_ZN10QtMobility21QContactManagerEngine18removeRelationshipERKNS_20QContactRelationshipEPNS_15QContactManager5ErrorE @ 332 NONAME
+	_ZN10QtMobility21QContactManagerEngine18updateRequestStateEPNS_23QContactAbstractRequestENS1_5StateE @ 333 NONAME
+	_ZN10QtMobility21QContactManagerEngine19canonicalizedFilterERKNS_14QContactFilterE @ 334 NONAME
+	_ZN10QtMobility21QContactManagerEngine19getStaticMetaObjectEv @ 335 NONAME
+	_ZN10QtMobility21QContactManagerEngine19removeRelationshipsERK5QListINS_20QContactRelationshipEEP4QMapIiNS_15QContactManager5ErrorEEPS8_ @ 336 NONAME
+	_ZN10QtMobility21QContactManagerEngine20relationshipsRemovedERK5QListIjE @ 337 NONAME
+	_ZN10QtMobility21QContactManagerEngine20saveDetailDefinitionERKNS_24QContactDetailDefinitionERK7QStringPNS_15QContactManager5ErrorE @ 338 NONAME
+	_ZN10QtMobility21QContactManagerEngine20selfContactIdChangedERKjS2_ @ 339 NONAME
+	_ZN10QtMobility21QContactManagerEngine22removeDetailDefinitionERK7QStringS3_PNS_15QContactManager5ErrorE @ 340 NONAME
+	_ZN10QtMobility21QContactManagerEngine22setContactDisplayLabelEPNS_8QContactERK7QString @ 341 NONAME
+	_ZN10QtMobility21QContactManagerEngine22waitForRequestFinishedEPNS_23QContactAbstractRequestEi @ 342 NONAME
+	_ZN10QtMobility21QContactManagerEngine23setContactRelationshipsEPNS_8QContactERK5QListINS_20QContactRelationshipEE @ 343 NONAME
+	_ZN10QtMobility21QContactManagerEngine24updateContactSaveRequestEPNS_19QContactSaveRequestERK5QListINS_8QContactEENS_15QContactManager5ErrorERK4QMapIiS9_ENS_23QContactAbstractRequest5StateE @ 344 NONAME
+	_ZN10QtMobility21QContactManagerEngine25updateContactFetchRequestEPNS_20QContactFetchRequestERK5QListINS_8QContactEENS_15QContactManager5ErrorENS_23QContactAbstractRequest5StateE @ 345 NONAME
+	_ZN10QtMobility21QContactManagerEngine26setDetailAccessConstraintsEPNS_14QContactDetailE6QFlagsINS1_16AccessConstraintEE @ 346 NONAME
+	_ZN10QtMobility21QContactManagerEngine26updateContactRemoveRequestEPNS_21QContactRemoveRequestENS_15QContactManager5ErrorERK4QMapIiS4_ENS_23QContactAbstractRequest5StateE @ 347 NONAME
+	_ZN10QtMobility21QContactManagerEngine27updateDefinitionSaveRequestEPNS_35QContactDetailDefinitionSaveRequestERK5QListINS_24QContactDetailDefinitionEENS_15QContactManager5ErrorERK4QMapIiS9_ENS_23QContactAbstractRequest5StateE @ 348 NONAME
+	_ZN10QtMobility21QContactManagerEngine28updateDefinitionFetchRequestEPNS_36QContactDetailDefinitionFetchRequestERK4QMapI7QStringNS_24QContactDetailDefinitionEENS_15QContactManager5ErrorERKS3_IiSA_ENS_23QContactAbstractRequest5StateE @ 349 NONAME
+	_ZN10QtMobility21QContactManagerEngine29updateDefinitionRemoveRequestEPNS_37QContactDetailDefinitionRemoveRequestENS_15QContactManager5ErrorERK4QMapIiS4_ENS_23QContactAbstractRequest5StateE @ 350 NONAME
+	_ZN10QtMobility21QContactManagerEngine29updateRelationshipSaveRequestEPNS_31QContactRelationshipSaveRequestERK5QListINS_20QContactRelationshipEENS_15QContactManager5ErrorERK4QMapIiS9_ENS_23QContactAbstractRequest5StateE @ 351 NONAME
+	_ZN10QtMobility21QContactManagerEngine30updateRelationshipFetchRequestEPNS_32QContactRelationshipFetchRequestERK5QListINS_20QContactRelationshipEENS_15QContactManager5ErrorENS_23QContactAbstractRequest5StateE @ 352 NONAME
+	_ZN10QtMobility21QContactManagerEngine31updateRelationshipRemoveRequestEPNS_33QContactRelationshipRemoveRequestENS_15QContactManager5ErrorERK4QMapIiS4_ENS_23QContactAbstractRequest5StateE @ 353 NONAME
+	_ZN10QtMobility21QContactManagerEngine32updateContactLocalIdFetchRequestEPNS_27QContactLocalIdFetchRequestERK5QListIjENS_15QContactManager5ErrorENS_23QContactAbstractRequest5StateE @ 354 NONAME
+	_ZN10QtMobility21QContactManagerEngine9addSortedEP5QListINS_8QContactEERKS2_RKS1_INS_17QContactSortOrderEE @ 355 NONAME
+	_ZN10QtMobility21QContactOnlineAccount10SubTypeSipE @ 356 NONAME DATA 4
+	_ZN10QtMobility21QContactOnlineAccount11SubTypeImppE @ 357 NONAME DATA 5
+	_ZN10QtMobility21QContactOnlineAccount13FieldSubTypesE @ 358 NONAME DATA 9
+	_ZN10QtMobility21QContactOnlineAccount14DefinitionNameE @ 359 NONAME DATA 14
+	_ZN10QtMobility21QContactOnlineAccount14SubTypeSipVoipE @ 360 NONAME DATA 8
+	_ZN10QtMobility21QContactOnlineAccount15FieldAccountUriE @ 361 NONAME DATA 11
+	_ZN10QtMobility21QContactOnlineAccount17FieldCapabilitiesE @ 362 NONAME DATA 13
+	_ZN10QtMobility21QContactOnlineAccount17SubTypeVideoShareE @ 363 NONAME DATA 11
+	_ZN10QtMobility21QContactOnlineAccount20FieldServiceProviderE @ 364 NONAME DATA 16
+	_ZN10QtMobility21QContactRemoveRequest11qt_metacallEN11QMetaObject4CallEiPPv @ 365 NONAME
+	_ZN10QtMobility21QContactRemoveRequest11qt_metacastEPKc @ 366 NONAME
+	_ZN10QtMobility21QContactRemoveRequest12setContactIdERKj @ 367 NONAME
+	_ZN10QtMobility21QContactRemoveRequest13setContactIdsERK5QListIjE @ 368 NONAME
+	_ZN10QtMobility21QContactRemoveRequest16staticMetaObjectE @ 369 NONAME DATA 16
+	_ZN10QtMobility21QContactRemoveRequest19getStaticMetaObjectEv @ 370 NONAME
+	_ZN10QtMobility21QContactRemoveRequestC1EP7QObject @ 371 NONAME
+	_ZN10QtMobility21QContactRemoveRequestC2EP7QObject @ 372 NONAME
+	_ZN10QtMobility22QContactGlobalPresence13FieldNicknameE @ 373 NONAME DATA 9
+	_ZN10QtMobility22QContactGlobalPresence14DefinitionNameE @ 374 NONAME DATA 15
+	_ZN10QtMobility22QContactGlobalPresence14FieldTimestampE @ 375 NONAME DATA 10
+	_ZN10QtMobility22QContactGlobalPresence18FieldCustomMessageE @ 376 NONAME DATA 14
+	_ZN10QtMobility22QContactGlobalPresence18FieldPresenceStateE @ 377 NONAME DATA 14
+	_ZN10QtMobility22QContactGlobalPresence22FieldPresenceStateTextE @ 378 NONAME DATA 18
+	_ZN10QtMobility22QContactGlobalPresence26FieldPresenceStateImageUrlE @ 379 NONAME DATA 22
+	_ZN10QtMobility23QContactAbstractRequest10setManagerEPNS_15QContactManagerE @ 380 NONAME
+	_ZN10QtMobility23QContactAbstractRequest11qt_metacallEN11QMetaObject4CallEiPPv @ 381 NONAME
+	_ZN10QtMobility23QContactAbstractRequest11qt_metacastEPKc @ 382 NONAME
+	_ZN10QtMobility23QContactAbstractRequest12stateChangedENS0_5StateE @ 383 NONAME
+	_ZN10QtMobility23QContactAbstractRequest15waitForFinishedEi @ 384 NONAME
+	_ZN10QtMobility23QContactAbstractRequest16resultsAvailableEv @ 385 NONAME
+	_ZN10QtMobility23QContactAbstractRequest16staticMetaObjectE @ 386 NONAME DATA 16
+	_ZN10QtMobility23QContactAbstractRequest19getStaticMetaObjectEv @ 387 NONAME
+	_ZN10QtMobility23QContactAbstractRequest5startEv @ 388 NONAME
+	_ZN10QtMobility23QContactAbstractRequest6cancelEv @ 389 NONAME
+	_ZN10QtMobility23QContactAbstractRequestC1EPNS_30QContactAbstractRequestPrivateEP7QObject @ 390 NONAME
+	_ZN10QtMobility23QContactAbstractRequestC2EPNS_30QContactAbstractRequestPrivateEP7QObject @ 391 NONAME
+	_ZN10QtMobility23QContactAbstractRequestD0Ev @ 392 NONAME
+	_ZN10QtMobility23QContactAbstractRequestD1Ev @ 393 NONAME
+	_ZN10QtMobility23QContactAbstractRequestD2Ev @ 394 NONAME
+	_ZN10QtMobility23QContactChangeLogFilter12setEventTypeENS0_9EventTypeE @ 395 NONAME
+	_ZN10QtMobility23QContactChangeLogFilter8setSinceERK9QDateTime @ 396 NONAME
+	_ZN10QtMobility23QContactChangeLogFilterC1ENS0_9EventTypeE @ 397 NONAME
+	_ZN10QtMobility23QContactChangeLogFilterC1ERKNS_14QContactFilterE @ 398 NONAME
+	_ZN10QtMobility23QContactChangeLogFilterC2ENS0_9EventTypeE @ 399 NONAME
+	_ZN10QtMobility23QContactChangeLogFilterC2ERKNS_14QContactFilterE @ 400 NONAME
+	_ZN10QtMobility24QContactDetailDefinition11insertFieldERK7QStringRKNS_29QContactDetailFieldDefinitionE @ 401 NONAME
+	_ZN10QtMobility24QContactDetailDefinition11removeFieldERK7QString @ 402 NONAME
+	_ZN10QtMobility24QContactDetailDefinition7setNameERK7QString @ 403 NONAME
+	_ZN10QtMobility24QContactDetailDefinition9setFieldsERK4QMapI7QStringNS_29QContactDetailFieldDefinitionEE @ 404 NONAME
+	_ZN10QtMobility24QContactDetailDefinition9setUniqueEb @ 405 NONAME
+	_ZN10QtMobility24QContactDetailDefinitionC1ERKS0_ @ 406 NONAME
+	_ZN10QtMobility24QContactDetailDefinitionC1Ev @ 407 NONAME
+	_ZN10QtMobility24QContactDetailDefinitionC2ERKS0_ @ 408 NONAME
+	_ZN10QtMobility24QContactDetailDefinitionC2Ev @ 409 NONAME
+	_ZN10QtMobility24QContactDetailDefinitionD1Ev @ 410 NONAME
+	_ZN10QtMobility24QContactDetailDefinitionD2Ev @ 411 NONAME
+	_ZN10QtMobility24QContactDetailDefinitionaSERKS0_ @ 412 NONAME
+	_ZN10QtMobility25QContactDetailRangeFilter13setMatchFlagsE6QFlagsINS_14QContactFilter9MatchFlagEE @ 413 NONAME
+	_ZN10QtMobility25QContactDetailRangeFilter23setDetailDefinitionNameERK7QStringS3_ @ 414 NONAME
+	_ZN10QtMobility25QContactDetailRangeFilter8setRangeERK8QVariantS3_6QFlagsINS0_9RangeFlagEE @ 415 NONAME
+	_ZN10QtMobility25QContactDetailRangeFilterC1ERKNS_14QContactFilterE @ 416 NONAME
+	_ZN10QtMobility25QContactDetailRangeFilterC1Ev @ 417 NONAME
+	_ZN10QtMobility25QContactDetailRangeFilterC2ERKNS_14QContactFilterE @ 418 NONAME
+	_ZN10QtMobility25QContactDetailRangeFilterC2Ev @ 419 NONAME
+	_ZN10QtMobility26QContactIntersectionFilter10setFiltersERK5QListINS_14QContactFilterEE @ 420 NONAME
+	_ZN10QtMobility26QContactIntersectionFilter6appendERKNS_14QContactFilterE @ 421 NONAME
+	_ZN10QtMobility26QContactIntersectionFilter6removeERKNS_14QContactFilterE @ 422 NONAME
+	_ZN10QtMobility26QContactIntersectionFilter7prependERKNS_14QContactFilterE @ 423 NONAME
+	_ZN10QtMobility26QContactIntersectionFilterC1ERKNS_14QContactFilterE @ 424 NONAME
+	_ZN10QtMobility26QContactIntersectionFilterC1Ev @ 425 NONAME
+	_ZN10QtMobility26QContactIntersectionFilterC2ERKNS_14QContactFilterE @ 426 NONAME
+	_ZN10QtMobility26QContactIntersectionFilterC2Ev @ 427 NONAME
+	_ZN10QtMobility26QContactIntersectionFilterlsERKNS_14QContactFilterE @ 428 NONAME
+	_ZN10QtMobility26QContactRelationshipFilter19setRelatedContactIdERKNS_10QContactIdE @ 429 NONAME
+	_ZN10QtMobility26QContactRelationshipFilter19setRelationshipTypeERK7QString @ 430 NONAME
+	_ZN10QtMobility26QContactRelationshipFilter21setRelatedContactRoleENS_20QContactRelationship4RoleE @ 431 NONAME
+	_ZN10QtMobility26QContactRelationshipFilterC1ERKNS_14QContactFilterE @ 432 NONAME
+	_ZN10QtMobility26QContactRelationshipFilterC1Ev @ 433 NONAME
+	_ZN10QtMobility26QContactRelationshipFilterC2ERKNS_14QContactFilterE @ 434 NONAME
+	_ZN10QtMobility26QContactRelationshipFilterC2Ev @ 435 NONAME
+	_ZN10QtMobility27QContactLocalIdFetchRequest10setSortingERK5QListINS_17QContactSortOrderEE @ 436 NONAME
+	_ZN10QtMobility27QContactLocalIdFetchRequest11qt_metacallEN11QMetaObject4CallEiPPv @ 437 NONAME
+	_ZN10QtMobility27QContactLocalIdFetchRequest11qt_metacastEPKc @ 438 NONAME
+	_ZN10QtMobility27QContactLocalIdFetchRequest16staticMetaObjectE @ 439 NONAME DATA 16
+	_ZN10QtMobility27QContactLocalIdFetchRequest19getStaticMetaObjectEv @ 440 NONAME
+	_ZN10QtMobility27QContactLocalIdFetchRequest9setFilterERKNS_14QContactFilterE @ 441 NONAME
+	_ZN10QtMobility27QContactLocalIdFetchRequestC1EP7QObject @ 442 NONAME
+	_ZN10QtMobility27QContactLocalIdFetchRequestC2EP7QObject @ 443 NONAME
+	_ZN10QtMobility28QContactManagerEngineFactoryD0Ev @ 444 NONAME
+	_ZN10QtMobility28QContactManagerEngineFactoryD1Ev @ 445 NONAME
+	_ZN10QtMobility28QContactManagerEngineFactoryD2Ev @ 446 NONAME
+	_ZN10QtMobility29QContactDetailFieldDefinition11setDataTypeEN8QVariant4TypeE @ 447 NONAME
+	_ZN10QtMobility29QContactDetailFieldDefinition18setAllowableValuesE5QListI8QVariantE @ 448 NONAME
+	_ZN10QtMobility29QContactDetailFieldDefinitionC1ERKS0_ @ 449 NONAME
+	_ZN10QtMobility29QContactDetailFieldDefinitionC1Ev @ 450 NONAME
+	_ZN10QtMobility29QContactDetailFieldDefinitionC2ERKS0_ @ 451 NONAME
+	_ZN10QtMobility29QContactDetailFieldDefinitionC2Ev @ 452 NONAME
+	_ZN10QtMobility29QContactDetailFieldDefinitionD1Ev @ 453 NONAME
+	_ZN10QtMobility29QContactDetailFieldDefinitionD2Ev @ 454 NONAME
+	_ZN10QtMobility29QContactDetailFieldDefinitionaSERKS0_ @ 455 NONAME
+	_ZN10QtMobility31QContactRelationshipSaveRequest11qt_metacallEN11QMetaObject4CallEiPPv @ 456 NONAME
+	_ZN10QtMobility31QContactRelationshipSaveRequest11qt_metacastEPKc @ 457 NONAME
+	_ZN10QtMobility31QContactRelationshipSaveRequest15setRelationshipERKNS_20QContactRelationshipE @ 458 NONAME
+	_ZN10QtMobility31QContactRelationshipSaveRequest16setRelationshipsERK5QListINS_20QContactRelationshipEE @ 459 NONAME
+	_ZN10QtMobility31QContactRelationshipSaveRequest16staticMetaObjectE @ 460 NONAME DATA 16
+	_ZN10QtMobility31QContactRelationshipSaveRequest19getStaticMetaObjectEv @ 461 NONAME
+	_ZN10QtMobility31QContactRelationshipSaveRequestC1EP7QObject @ 462 NONAME
+	_ZN10QtMobility31QContactRelationshipSaveRequestC2EP7QObject @ 463 NONAME
+	_ZN10QtMobility32QContactRelationshipFetchRequest11qt_metacallEN11QMetaObject4CallEiPPv @ 464 NONAME
+	_ZN10QtMobility32QContactRelationshipFetchRequest11qt_metacastEPKc @ 465 NONAME
+	_ZN10QtMobility32QContactRelationshipFetchRequest16staticMetaObjectE @ 466 NONAME DATA 16
+	_ZN10QtMobility32QContactRelationshipFetchRequest19getStaticMetaObjectEv @ 467 NONAME
+	_ZN10QtMobility32QContactRelationshipFetchRequest19setRelationshipTypeERK7QString @ 468 NONAME
+	_ZN10QtMobility32QContactRelationshipFetchRequest8setFirstERKNS_10QContactIdE @ 469 NONAME
+	_ZN10QtMobility32QContactRelationshipFetchRequest9setSecondERKNS_10QContactIdE @ 470 NONAME
+	_ZN10QtMobility32QContactRelationshipFetchRequestC1EP7QObject @ 471 NONAME
+	_ZN10QtMobility32QContactRelationshipFetchRequestC2EP7QObject @ 472 NONAME
+	_ZN10QtMobility33QContactRelationshipRemoveRequest11qt_metacallEN11QMetaObject4CallEiPPv @ 473 NONAME
+	_ZN10QtMobility33QContactRelationshipRemoveRequest11qt_metacastEPKc @ 474 NONAME
+	_ZN10QtMobility33QContactRelationshipRemoveRequest15setRelationshipERKNS_20QContactRelationshipE @ 475 NONAME
+	_ZN10QtMobility33QContactRelationshipRemoveRequest16setRelationshipsERK5QListINS_20QContactRelationshipEE @ 476 NONAME
+	_ZN10QtMobility33QContactRelationshipRemoveRequest16staticMetaObjectE @ 477 NONAME DATA 16
+	_ZN10QtMobility33QContactRelationshipRemoveRequest19getStaticMetaObjectEv @ 478 NONAME
+	_ZN10QtMobility33QContactRelationshipRemoveRequestC1EP7QObject @ 479 NONAME
+	_ZN10QtMobility33QContactRelationshipRemoveRequestC2EP7QObject @ 480 NONAME
+	_ZN10QtMobility35QContactDetailDefinitionSaveRequest11qt_metacallEN11QMetaObject4CallEiPPv @ 481 NONAME
+	_ZN10QtMobility35QContactDetailDefinitionSaveRequest11qt_metacastEPKc @ 482 NONAME
+	_ZN10QtMobility35QContactDetailDefinitionSaveRequest13setDefinitionERKNS_24QContactDetailDefinitionE @ 483 NONAME
+	_ZN10QtMobility35QContactDetailDefinitionSaveRequest14setContactTypeERK7QString @ 484 NONAME
+	_ZN10QtMobility35QContactDetailDefinitionSaveRequest14setDefinitionsERK5QListINS_24QContactDetailDefinitionEE @ 485 NONAME
+	_ZN10QtMobility35QContactDetailDefinitionSaveRequest16staticMetaObjectE @ 486 NONAME DATA 16
+	_ZN10QtMobility35QContactDetailDefinitionSaveRequest19getStaticMetaObjectEv @ 487 NONAME
+	_ZN10QtMobility35QContactDetailDefinitionSaveRequestC1EP7QObject @ 488 NONAME
+	_ZN10QtMobility35QContactDetailDefinitionSaveRequestC2EP7QObject @ 489 NONAME
+	_ZN10QtMobility36QContactDetailDefinitionFetchRequest11qt_metacallEN11QMetaObject4CallEiPPv @ 490 NONAME
+	_ZN10QtMobility36QContactDetailDefinitionFetchRequest11qt_metacastEPKc @ 491 NONAME
+	_ZN10QtMobility36QContactDetailDefinitionFetchRequest14setContactTypeERK7QString @ 492 NONAME
+	_ZN10QtMobility36QContactDetailDefinitionFetchRequest16staticMetaObjectE @ 493 NONAME DATA 16
+	_ZN10QtMobility36QContactDetailDefinitionFetchRequest17setDefinitionNameERK7QString @ 494 NONAME
+	_ZN10QtMobility36QContactDetailDefinitionFetchRequest18setDefinitionNamesERK11QStringList @ 495 NONAME
+	_ZN10QtMobility36QContactDetailDefinitionFetchRequest19getStaticMetaObjectEv @ 496 NONAME
+	_ZN10QtMobility36QContactDetailDefinitionFetchRequestC1EP7QObject @ 497 NONAME
+	_ZN10QtMobility36QContactDetailDefinitionFetchRequestC2EP7QObject @ 498 NONAME
+	_ZN10QtMobility37QContactDetailDefinitionRemoveRequest11qt_metacallEN11QMetaObject4CallEiPPv @ 499 NONAME
+	_ZN10QtMobility37QContactDetailDefinitionRemoveRequest11qt_metacastEPKc @ 500 NONAME
+	_ZN10QtMobility37QContactDetailDefinitionRemoveRequest14setContactTypeERK7QString @ 501 NONAME
+	_ZN10QtMobility37QContactDetailDefinitionRemoveRequest16staticMetaObjectE @ 502 NONAME DATA 16
+	_ZN10QtMobility37QContactDetailDefinitionRemoveRequest17setDefinitionNameERK7QString @ 503 NONAME
+	_ZN10QtMobility37QContactDetailDefinitionRemoveRequest18setDefinitionNamesERK11QStringList @ 504 NONAME
+	_ZN10QtMobility37QContactDetailDefinitionRemoveRequest19getStaticMetaObjectEv @ 505 NONAME
+	_ZN10QtMobility37QContactDetailDefinitionRemoveRequestC1EP7QObject @ 506 NONAME
+	_ZN10QtMobility37QContactDetailDefinitionRemoveRequestC2EP7QObject @ 507 NONAME
+	_ZN10QtMobility5qHashERKNS_10QContactIdE @ 508 NONAME
+	_ZN10QtMobility5qHashERKNS_14QContactDetailE @ 509 NONAME
+	_ZN10QtMobility5qHashERKNS_20QContactRelationshipE @ 510 NONAME
+	_ZN10QtMobility5qHashERKNS_8QContactE @ 511 NONAME
+	_ZN10QtMobility8QContact10saveDetailEPNS_14QContactDetailE @ 512 NONAME
+	_ZN10QtMobility8QContact12clearDetailsEv @ 513 NONAME
+	_ZN10QtMobility8QContact12removeDetailEPNS_14QContactDetailE @ 514 NONAME
+	_ZN10QtMobility8QContact5setIdERKNS_10QContactIdE @ 515 NONAME
+	_ZN10QtMobility8QContact7setTypeERK7QString @ 516 NONAME
+	_ZN10QtMobility8QContact7setTypeERKNS_12QContactTypeE @ 517 NONAME
+	_ZN10QtMobility8QContactC1ERKS0_ @ 518 NONAME
+	_ZN10QtMobility8QContactC1Ev @ 519 NONAME
+	_ZN10QtMobility8QContactC2ERKS0_ @ 520 NONAME
+	_ZN10QtMobility8QContactC2Ev @ 521 NONAME
+	_ZN10QtMobility8QContactD1Ev @ 522 NONAME
+	_ZN10QtMobility8QContactD2Ev @ 523 NONAME
+	_ZN10QtMobility8QContactaSERKS0_ @ 524 NONAME
+	_ZN10QtMobilityanERKNS_14QContactFilterES2_ @ 525 NONAME
+	_ZN10QtMobilitylsE6QDebugRKNS_10QContactIdE @ 526 NONAME
+	_ZN10QtMobilitylsE6QDebugRKNS_14QContactDetailE @ 527 NONAME
+	_ZN10QtMobilitylsE6QDebugRKNS_20QContactRelationshipE @ 528 NONAME
+	_ZN10QtMobilitylsE6QDebugRKNS_8QContactE @ 529 NONAME
+	_ZN10QtMobilityorERKNS_14QContactFilterES2_ @ 530 NONAME
+	_ZNK10QtMobility10QContactId10managerUriEv @ 531 NONAME
+	_ZNK10QtMobility10QContactId7localIdEv @ 532 NONAME
+	_ZNK10QtMobility10QContactIdeqERKS0_ @ 533 NONAME
+	_ZNK10QtMobility10QContactIdltERKS0_ @ 534 NONAME
+	_ZNK10QtMobility10QContactIdneERKS0_ @ 535 NONAME
+	_ZNK10QtMobility14QContactDetail12variantValueEPKc @ 536 NONAME
+	_ZNK10QtMobility14QContactDetail12variantValueERK7QString @ 537 NONAME
+	_ZNK10QtMobility14QContactDetail13variantValuesEv @ 538 NONAME
+	_ZNK10QtMobility14QContactDetail14definitionNameEv @ 539 NONAME
+	_ZNK10QtMobility14QContactDetail17accessConstraintsEv @ 540 NONAME
+	_ZNK10QtMobility14QContactDetail3keyEv @ 541 NONAME
+	_ZNK10QtMobility14QContactDetail5valueEPKc @ 542 NONAME
+	_ZNK10QtMobility14QContactDetail5valueERK7QString @ 543 NONAME
+	_ZNK10QtMobility14QContactDetail7isEmptyEv @ 544 NONAME
+	_ZNK10QtMobility14QContactDetail8hasValueEPKc @ 545 NONAME
+	_ZNK10QtMobility14QContactDetail8hasValueERK7QString @ 546 NONAME
+	_ZNK10QtMobility14QContactDetaileqERKS0_ @ 547 NONAME
+	_ZNK10QtMobility14QContactFilter4typeEv @ 548 NONAME
+	_ZNK10QtMobility14QContactFiltereqERKS0_ @ 549 NONAME
+	_ZNK10QtMobility15QContactManager10contactIdsERK5QListINS_17QContactSortOrderEE @ 550 NONAME
+	_ZNK10QtMobility15QContactManager10contactIdsERKNS_14QContactFilterERK5QListINS_17QContactSortOrderEE @ 551 NONAME
+	_ZNK10QtMobility15QContactManager10hasFeatureENS0_14ManagerFeatureERK7QString @ 552 NONAME
+	_ZNK10QtMobility15QContactManager10managerUriEv @ 553 NONAME
+	_ZNK10QtMobility15QContactManager10metaObjectEv @ 554 NONAME
+	_ZNK10QtMobility15QContactManager11managerNameEv @ 555 NONAME
+	_ZNK10QtMobility15QContactManager13relationshipsERK7QStringRKNS_10QContactIdENS_20QContactRelationship4RoleE @ 556 NONAME
+	_ZNK10QtMobility15QContactManager13relationshipsERKNS_10QContactIdENS_20QContactRelationship4RoleE @ 557 NONAME
+	_ZNK10QtMobility15QContactManager13selfContactIdEv @ 558 NONAME
+	_ZNK10QtMobility15QContactManager14managerVersionEv @ 559 NONAME
+	_ZNK10QtMobility15QContactManager16detailDefinitionERK7QStringS3_ @ 560 NONAME
+	_ZNK10QtMobility15QContactManager17detailDefinitionsERK7QString @ 561 NONAME
+	_ZNK10QtMobility15QContactManager17isFilterSupportedERKNS_14QContactFilterE @ 562 NONAME
+	_ZNK10QtMobility15QContactManager17managerParametersEv @ 563 NONAME
+	_ZNK10QtMobility15QContactManager18supportedDataTypesEv @ 564 NONAME
+	_ZNK10QtMobility15QContactManager21supportedContactTypesEv @ 565 NONAME
+	_ZNK10QtMobility15QContactManager27isRelationshipTypeSupportedERK7QStringS3_ @ 566 NONAME
+	_ZNK10QtMobility15QContactManager29synthesizeContactDisplayLabelEPNS_8QContactE @ 567 NONAME
+	_ZNK10QtMobility15QContactManager30synthesizedContactDisplayLabelERKNS_8QContactE @ 568 NONAME
+	_ZNK10QtMobility15QContactManager5errorEv @ 569 NONAME
+	_ZNK10QtMobility15QContactManager7contactERKjRKNS_17QContactFetchHintE @ 570 NONAME
+	_ZNK10QtMobility15QContactManager8contactsERK5QListINS_17QContactSortOrderEERKNS_17QContactFetchHintE @ 571 NONAME
+	_ZNK10QtMobility15QContactManager8contactsERKNS_14QContactFilterERK5QListINS_17QContactSortOrderEERKNS_17QContactFetchHintE @ 572 NONAME
+	_ZNK10QtMobility17QContactChangeSet13addedContactsEv @ 573 NONAME
+	_ZNK10QtMobility17QContactChangeSet15changedContactsEv @ 574 NONAME
+	_ZNK10QtMobility17QContactChangeSet15removedContactsEv @ 575 NONAME
+	_ZNK10QtMobility17QContactChangeSet22oldAndNewSelfContactIdEv @ 576 NONAME
+	_ZNK10QtMobility17QContactChangeSet26addedRelationshipsContactsEv @ 577 NONAME
+	_ZNK10QtMobility17QContactChangeSet28removedRelationshipsContactsEv @ 578 NONAME
+	_ZNK10QtMobility17QContactFetchHint17optimizationHintsEv @ 579 NONAME
+	_ZNK10QtMobility17QContactFetchHint21detailDefinitionsHintEv @ 580 NONAME
+	_ZNK10QtMobility17QContactFetchHint21relationshipTypesHintEv @ 581 NONAME
+	_ZNK10QtMobility17QContactSortOrder11blankPolicyEv @ 582 NONAME
+	_ZNK10QtMobility17QContactSortOrder15caseSensitivityEv @ 583 NONAME
+	_ZNK10QtMobility17QContactSortOrder15detailFieldNameEv @ 584 NONAME
+	_ZNK10QtMobility17QContactSortOrder20detailDefinitionNameEv @ 585 NONAME
+	_ZNK10QtMobility17QContactSortOrder7isValidEv @ 586 NONAME
+	_ZNK10QtMobility17QContactSortOrder9directionEv @ 587 NONAME
+	_ZNK10QtMobility17QContactSortOrdereqERKS0_ @ 588 NONAME
+	_ZNK10QtMobility19QContactSaveRequest10metaObjectEv @ 589 NONAME
+	_ZNK10QtMobility19QContactSaveRequest8contactsEv @ 590 NONAME
+	_ZNK10QtMobility19QContactSaveRequest8errorMapEv @ 591 NONAME
+	_ZNK10QtMobility19QContactUnionFilter7filtersEv @ 592 NONAME
+	_ZNK10QtMobility20QContactDetailFilter10matchFlagsEv @ 593 NONAME
+	_ZNK10QtMobility20QContactDetailFilter15detailFieldNameEv @ 594 NONAME
+	_ZNK10QtMobility20QContactDetailFilter20detailDefinitionNameEv @ 595 NONAME
+	_ZNK10QtMobility20QContactDetailFilter5valueEv @ 596 NONAME
+	_ZNK10QtMobility20QContactFetchRequest10metaObjectEv @ 597 NONAME
+	_ZNK10QtMobility20QContactFetchRequest6filterEv @ 598 NONAME
+	_ZNK10QtMobility20QContactFetchRequest7sortingEv @ 599 NONAME
+	_ZNK10QtMobility20QContactFetchRequest8contactsEv @ 600 NONAME
+	_ZNK10QtMobility20QContactFetchRequest9fetchHintEv @ 601 NONAME
+	_ZNK10QtMobility20QContactRelationship16relationshipTypeEv @ 602 NONAME
+	_ZNK10QtMobility20QContactRelationship5firstEv @ 603 NONAME
+	_ZNK10QtMobility20QContactRelationship6secondEv @ 604 NONAME
+	_ZNK10QtMobility20QContactRelationshipeqERKS0_ @ 605 NONAME
+	_ZNK10QtMobility21QContactLocalIdFilter3idsEv @ 606 NONAME
+	_ZNK10QtMobility21QContactManagerEngine10contactIdsERKNS_14QContactFilterERK5QListINS_17QContactSortOrderEEPNS_15QContactManager5ErrorE @ 607 NONAME
+	_ZNK10QtMobility21QContactManagerEngine10hasFeatureENS_15QContactManager14ManagerFeatureERK7QString @ 608 NONAME
+	_ZNK10QtMobility21QContactManagerEngine10managerUriEv @ 609 NONAME
+	_ZNK10QtMobility21QContactManagerEngine10metaObjectEv @ 610 NONAME
+	_ZNK10QtMobility21QContactManagerEngine11managerNameEv @ 611 NONAME
+	_ZNK10QtMobility21QContactManagerEngine13relationshipsERK7QStringRKNS_10QContactIdENS_20QContactRelationship4RoleEPNS_15QContactManager5ErrorE @ 612 NONAME
+	_ZNK10QtMobility21QContactManagerEngine13selfContactIdEPNS_15QContactManager5ErrorE @ 613 NONAME
+	_ZNK10QtMobility21QContactManagerEngine15validateContactERKNS_8QContactEPNS_15QContactManager5ErrorE @ 614 NONAME
+	_ZNK10QtMobility21QContactManagerEngine16detailDefinitionERK7QStringS3_PNS_15QContactManager5ErrorE @ 615 NONAME
+	_ZNK10QtMobility21QContactManagerEngine17compatibleContactERKNS_8QContactEPNS_15QContactManager5ErrorE @ 616 NONAME
+	_ZNK10QtMobility21QContactManagerEngine17detailDefinitionsERK7QStringPNS_15QContactManager5ErrorE @ 617 NONAME
+	_ZNK10QtMobility21QContactManagerEngine17isFilterSupportedERKNS_14QContactFilterE @ 618 NONAME
+	_ZNK10QtMobility21QContactManagerEngine17managerParametersEv @ 619 NONAME
+	_ZNK10QtMobility21QContactManagerEngine18supportedDataTypesEv @ 620 NONAME
+	_ZNK10QtMobility21QContactManagerEngine18validateDefinitionERKNS_24QContactDetailDefinitionEPNS_15QContactManager5ErrorE @ 621 NONAME
+	_ZNK10QtMobility21QContactManagerEngine21supportedContactTypesEv @ 622 NONAME
+	_ZNK10QtMobility21QContactManagerEngine23synthesizedDisplayLabelERKNS_8QContactEPNS_15QContactManager5ErrorE @ 623 NONAME
+	_ZNK10QtMobility21QContactManagerEngine27isRelationshipTypeSupportedERK7QStringS3_ @ 624 NONAME
+	_ZNK10QtMobility21QContactManagerEngine7contactERKjRKNS_17QContactFetchHintEPNS_15QContactManager5ErrorE @ 625 NONAME
+	_ZNK10QtMobility21QContactManagerEngine8contactsERKNS_14QContactFilterERK5QListINS_17QContactSortOrderEERKNS_17QContactFetchHintEPNS_15QContactManager5ErrorE @ 626 NONAME
+	_ZNK10QtMobility21QContactRemoveRequest10contactIdsEv @ 627 NONAME
+	_ZNK10QtMobility21QContactRemoveRequest10metaObjectEv @ 628 NONAME
+	_ZNK10QtMobility21QContactRemoveRequest8errorMapEv @ 629 NONAME
+	_ZNK10QtMobility23QContactAbstractRequest10isCanceledEv @ 630 NONAME
+	_ZNK10QtMobility23QContactAbstractRequest10isFinishedEv @ 631 NONAME
+	_ZNK10QtMobility23QContactAbstractRequest10isInactiveEv @ 632 NONAME
+	_ZNK10QtMobility23QContactAbstractRequest10metaObjectEv @ 633 NONAME
+	_ZNK10QtMobility23QContactAbstractRequest4typeEv @ 634 NONAME
+	_ZNK10QtMobility23QContactAbstractRequest5errorEv @ 635 NONAME
+	_ZNK10QtMobility23QContactAbstractRequest5stateEv @ 636 NONAME
+	_ZNK10QtMobility23QContactAbstractRequest7managerEv @ 637 NONAME
+	_ZNK10QtMobility23QContactAbstractRequest8isActiveEv @ 638 NONAME
+	_ZNK10QtMobility23QContactChangeLogFilter5sinceEv @ 639 NONAME
+	_ZNK10QtMobility23QContactChangeLogFilter9eventTypeEv @ 640 NONAME
+	_ZNK10QtMobility24QContactDetailDefinition4nameEv @ 641 NONAME
+	_ZNK10QtMobility24QContactDetailDefinition6fieldsEv @ 642 NONAME
+	_ZNK10QtMobility24QContactDetailDefinition7isEmptyEv @ 643 NONAME
+	_ZNK10QtMobility24QContactDetailDefinition8isUniqueEv @ 644 NONAME
+	_ZNK10QtMobility24QContactDetailDefinitioneqERKS0_ @ 645 NONAME
+	_ZNK10QtMobility25QContactDetailRangeFilter10matchFlagsEv @ 646 NONAME
+	_ZNK10QtMobility25QContactDetailRangeFilter10rangeFlagsEv @ 647 NONAME
+	_ZNK10QtMobility25QContactDetailRangeFilter15detailFieldNameEv @ 648 NONAME
+	_ZNK10QtMobility25QContactDetailRangeFilter20detailDefinitionNameEv @ 649 NONAME
+	_ZNK10QtMobility25QContactDetailRangeFilter8maxValueEv @ 650 NONAME
+	_ZNK10QtMobility25QContactDetailRangeFilter8minValueEv @ 651 NONAME
+	_ZNK10QtMobility26QContactIntersectionFilter7filtersEv @ 652 NONAME
+	_ZNK10QtMobility26QContactRelationshipFilter16relatedContactIdEv @ 653 NONAME
+	_ZNK10QtMobility26QContactRelationshipFilter16relationshipTypeEv @ 654 NONAME
+	_ZNK10QtMobility26QContactRelationshipFilter18relatedContactRoleEv @ 655 NONAME
+	_ZNK10QtMobility27QContactLocalIdFetchRequest10metaObjectEv @ 656 NONAME
+	_ZNK10QtMobility27QContactLocalIdFetchRequest3idsEv @ 657 NONAME
+	_ZNK10QtMobility27QContactLocalIdFetchRequest6filterEv @ 658 NONAME
+	_ZNK10QtMobility27QContactLocalIdFetchRequest7sortingEv @ 659 NONAME
+	_ZNK10QtMobility28QContactManagerEngineFactory31supportedImplementationVersionsEv @ 660 NONAME
+	_ZNK10QtMobility29QContactDetailFieldDefinition15allowableValuesEv @ 661 NONAME
+	_ZNK10QtMobility29QContactDetailFieldDefinition8dataTypeEv @ 662 NONAME
+	_ZNK10QtMobility29QContactDetailFieldDefinitioneqERKS0_ @ 663 NONAME
+	_ZNK10QtMobility29QContactDetailFieldDefinitionneERKS0_ @ 664 NONAME
+	_ZNK10QtMobility31QContactRelationshipSaveRequest10metaObjectEv @ 665 NONAME
+	_ZNK10QtMobility31QContactRelationshipSaveRequest13relationshipsEv @ 666 NONAME
+	_ZNK10QtMobility31QContactRelationshipSaveRequest8errorMapEv @ 667 NONAME
+	_ZNK10QtMobility32QContactRelationshipFetchRequest10metaObjectEv @ 668 NONAME
+	_ZNK10QtMobility32QContactRelationshipFetchRequest13relationshipsEv @ 669 NONAME
+	_ZNK10QtMobility32QContactRelationshipFetchRequest16relationshipTypeEv @ 670 NONAME
+	_ZNK10QtMobility32QContactRelationshipFetchRequest5firstEv @ 671 NONAME
+	_ZNK10QtMobility32QContactRelationshipFetchRequest6secondEv @ 672 NONAME
+	_ZNK10QtMobility33QContactRelationshipRemoveRequest10metaObjectEv @ 673 NONAME
+	_ZNK10QtMobility33QContactRelationshipRemoveRequest13relationshipsEv @ 674 NONAME
+	_ZNK10QtMobility33QContactRelationshipRemoveRequest8errorMapEv @ 675 NONAME
+	_ZNK10QtMobility35QContactDetailDefinitionSaveRequest10metaObjectEv @ 676 NONAME
+	_ZNK10QtMobility35QContactDetailDefinitionSaveRequest11contactTypeEv @ 677 NONAME
+	_ZNK10QtMobility35QContactDetailDefinitionSaveRequest11definitionsEv @ 678 NONAME
+	_ZNK10QtMobility35QContactDetailDefinitionSaveRequest8errorMapEv @ 679 NONAME
+	_ZNK10QtMobility36QContactDetailDefinitionFetchRequest10metaObjectEv @ 680 NONAME
+	_ZNK10QtMobility36QContactDetailDefinitionFetchRequest11contactTypeEv @ 681 NONAME
+	_ZNK10QtMobility36QContactDetailDefinitionFetchRequest11definitionsEv @ 682 NONAME
+	_ZNK10QtMobility36QContactDetailDefinitionFetchRequest15definitionNamesEv @ 683 NONAME
+	_ZNK10QtMobility36QContactDetailDefinitionFetchRequest8errorMapEv @ 684 NONAME
+	_ZNK10QtMobility37QContactDetailDefinitionRemoveRequest10metaObjectEv @ 685 NONAME
+	_ZNK10QtMobility37QContactDetailDefinitionRemoveRequest11contactTypeEv @ 686 NONAME
+	_ZNK10QtMobility37QContactDetailDefinitionRemoveRequest15definitionNamesEv @ 687 NONAME
+	_ZNK10QtMobility37QContactDetailDefinitionRemoveRequest8errorMapEv @ 688 NONAME
+	_ZNK10QtMobility8QContact12displayLabelEv @ 689 NONAME
+	_ZNK10QtMobility8QContact13relationshipsERK7QString @ 690 NONAME
+	_ZNK10QtMobility8QContact15relatedContactsERK7QStringNS_20QContactRelationship4RoleE @ 691 NONAME
+	_ZNK10QtMobility8QContact2idEv @ 692 NONAME
+	_ZNK10QtMobility8QContact4typeEv @ 693 NONAME
+	_ZNK10QtMobility8QContact6detailEPKc @ 694 NONAME
+	_ZNK10QtMobility8QContact6detailERK7QString @ 695 NONAME
+	_ZNK10QtMobility8QContact7detailsEPKc @ 696 NONAME
+	_ZNK10QtMobility8QContact7detailsEPKcS2_RK7QString @ 697 NONAME
+	_ZNK10QtMobility8QContact7detailsERK7QString @ 698 NONAME
+	_ZNK10QtMobility8QContact7detailsERK7QStringS3_S3_ @ 699 NONAME
+	_ZNK10QtMobility8QContact7isEmptyEv @ 700 NONAME
+	_ZNK10QtMobility8QContact7localIdEv @ 701 NONAME
+	_ZNK10QtMobility8QContacteqERKS0_ @ 702 NONAME
+	_ZTIN10QtMobility15QContactManagerE @ 703 NONAME
+	_ZTIN10QtMobility19QContactSaveRequestE @ 704 NONAME
+	_ZTIN10QtMobility20QContactFetchRequestE @ 705 NONAME
+	_ZTIN10QtMobility21QContactManagerEngineE @ 706 NONAME
+	_ZTIN10QtMobility21QContactRemoveRequestE @ 707 NONAME
+	_ZTIN10QtMobility23QContactAbstractRequestE @ 708 NONAME
+	_ZTIN10QtMobility27QContactLocalIdFetchRequestE @ 709 NONAME
+	_ZTIN10QtMobility28QContactManagerEngineFactoryE @ 710 NONAME
+	_ZTIN10QtMobility31QContactRelationshipSaveRequestE @ 711 NONAME
+	_ZTIN10QtMobility32QContactRelationshipFetchRequestE @ 712 NONAME
+	_ZTIN10QtMobility33QContactRelationshipRemoveRequestE @ 713 NONAME
+	_ZTIN10QtMobility35QContactDetailDefinitionSaveRequestE @ 714 NONAME
+	_ZTIN10QtMobility36QContactDetailDefinitionFetchRequestE @ 715 NONAME
+	_ZTIN10QtMobility37QContactDetailDefinitionRemoveRequestE @ 716 NONAME
+	_ZTVN10QtMobility15QContactManagerE @ 717 NONAME
+	_ZTVN10QtMobility19QContactSaveRequestE @ 718 NONAME
+	_ZTVN10QtMobility20QContactFetchRequestE @ 719 NONAME
+	_ZTVN10QtMobility21QContactManagerEngineE @ 720 NONAME
+	_ZTVN10QtMobility21QContactRemoveRequestE @ 721 NONAME
+	_ZTVN10QtMobility23QContactAbstractRequestE @ 722 NONAME
+	_ZTVN10QtMobility27QContactLocalIdFetchRequestE @ 723 NONAME
+	_ZTVN10QtMobility28QContactManagerEngineFactoryE @ 724 NONAME
+	_ZTVN10QtMobility31QContactRelationshipSaveRequestE @ 725 NONAME
+	_ZTVN10QtMobility32QContactRelationshipFetchRequestE @ 726 NONAME
+	_ZTVN10QtMobility33QContactRelationshipRemoveRequestE @ 727 NONAME
+	_ZTVN10QtMobility35QContactDetailDefinitionSaveRequestE @ 728 NONAME
+	_ZTVN10QtMobility36QContactDetailDefinitionFetchRequestE @ 729 NONAME
+	_ZTVN10QtMobility37QContactDetailDefinitionRemoveRequestE @ 730 NONAME

--- a/qtmobility/src/s60installs/eabi/QtLocationu.def	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/s60installs/eabi/QtLocationu.def	Fri May 14 16:41:33 2010 +0300
@@ -129,12 +129,12 @@
 	_ZNK10QtMobility23QNmeaPositionInfoSource21minimumUpdateIntervalEv @ 128 NONAME
 	_ZNK10QtMobility23QNmeaPositionInfoSource27supportedPositioningMethodsEv @ 129 NONAME
 	_ZNK10QtMobility23QNmeaPositionInfoSource6deviceEv @ 130 NONAME
-	_ZTIN10QtMobility15QGeoAreaMonitorE @ 131 NONAME
-	_ZTIN10QtMobility22QGeoPositionInfoSourceE @ 132 NONAME
-	_ZTIN10QtMobility23QGeoSatelliteInfoSourceE @ 133 NONAME
-	_ZTIN10QtMobility23QNmeaPositionInfoSourceE @ 134 NONAME
-	_ZTVN10QtMobility15QGeoAreaMonitorE @ 135 NONAME
-	_ZTVN10QtMobility22QGeoPositionInfoSourceE @ 136 NONAME
-	_ZTVN10QtMobility23QGeoSatelliteInfoSourceE @ 137 NONAME
-	_ZTVN10QtMobility23QNmeaPositionInfoSourceE @ 138 NONAME
+	_ZTIN10QtMobility15QGeoAreaMonitorE @ 131 NONAME ; #<TI>#
+	_ZTIN10QtMobility22QGeoPositionInfoSourceE @ 132 NONAME ; #<TI>#
+	_ZTIN10QtMobility23QGeoSatelliteInfoSourceE @ 133 NONAME ; #<TI>#
+	_ZTIN10QtMobility23QNmeaPositionInfoSourceE @ 134 NONAME ; #<TI>#
+	_ZTVN10QtMobility15QGeoAreaMonitorE @ 135 NONAME ; #<VT>#
+	_ZTVN10QtMobility22QGeoPositionInfoSourceE @ 136 NONAME ; #<VT>#
+	_ZTVN10QtMobility23QGeoSatelliteInfoSourceE @ 137 NONAME ; #<VT>#
+	_ZTVN10QtMobility23QNmeaPositionInfoSourceE @ 138 NONAME ; #<VT>#

--- a/qtmobility/src/s60installs/eabi/QtMediau.def	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/s60installs/eabi/QtMediau.def	Fri May 14 16:41:33 2010 +0300
@@ -1,922 +1,922 @@
 EXPORTS
-	_ZN10QtMobility11QRadioTuner11bandChangedENS0_4BandE @ 1 NONAME
-	_ZN10QtMobility11QRadioTuner11qt_metacallEN11QMetaObject4CallEiPPv @ 2 NONAME
-	_ZN10QtMobility11QRadioTuner11qt_metacastEPKc @ 3 NONAME
-	_ZN10QtMobility11QRadioTuner12cancelSearchEv @ 4 NONAME
-	_ZN10QtMobility11QRadioTuner12mutedChangedEb @ 5 NONAME
-	_ZN10QtMobility11QRadioTuner12setFrequencyEi @ 6 NONAME
-	_ZN10QtMobility11QRadioTuner12stateChangedENS0_5StateE @ 7 NONAME
-	_ZN10QtMobility11QRadioTuner13searchForwardEv @ 8 NONAME
-	_ZN10QtMobility11QRadioTuner13setStereoModeENS0_10StereoModeE @ 9 NONAME
-	_ZN10QtMobility11QRadioTuner13volumeChangedEi @ 10 NONAME
-	_ZN10QtMobility11QRadioTuner14searchBackwardEv @ 11 NONAME
-	_ZN10QtMobility11QRadioTuner16frequencyChangedEi @ 12 NONAME
-	_ZN10QtMobility11QRadioTuner16searchingChangedEb @ 13 NONAME
-	_ZN10QtMobility11QRadioTuner16staticMetaObjectE @ 14 NONAME DATA 16
-	_ZN10QtMobility11QRadioTuner19getStaticMetaObjectEv @ 15 NONAME
-	_ZN10QtMobility11QRadioTuner19stereoStatusChangedEb @ 16 NONAME
-	_ZN10QtMobility11QRadioTuner21signalStrengthChangedEi @ 17 NONAME
-	_ZN10QtMobility11QRadioTuner4stopEv @ 18 NONAME
-	_ZN10QtMobility11QRadioTuner5errorENS0_5ErrorE @ 19 NONAME
-	_ZN10QtMobility11QRadioTuner5startEv @ 20 NONAME
-	_ZN10QtMobility11QRadioTuner7setBandENS0_4BandE @ 21 NONAME
-	_ZN10QtMobility11QRadioTuner8setMutedEb @ 22 NONAME
-	_ZN10QtMobility11QRadioTuner9setVolumeEi @ 23 NONAME
-	_ZN10QtMobility11QRadioTunerC1EP7QObjectPNS_21QMediaServiceProviderE @ 24 NONAME
-	_ZN10QtMobility11QRadioTunerC2EP7QObjectPNS_21QMediaServiceProviderE @ 25 NONAME
-	_ZN10QtMobility11QRadioTunerD0Ev @ 26 NONAME
-	_ZN10QtMobility11QRadioTunerD1Ev @ 27 NONAME
-	_ZN10QtMobility11QRadioTunerD2Ev @ 28 NONAME
-	_ZN10QtMobility12QMediaObject11qt_metacallEN11QMetaObject4CallEiPPv @ 29 NONAME
-	_ZN10QtMobility12QMediaObject11qt_metacastEPKc @ 30 NONAME
-	_ZN10QtMobility12QMediaObject11setMetaDataENS_7QtMedia8MetaDataERK8QVariant @ 31 NONAME
-	_ZN10QtMobility12QMediaObject13setupMetaDataEv @ 32 NONAME
-	_ZN10QtMobility12QMediaObject15metaDataChangedEv @ 33 NONAME
-	_ZN10QtMobility12QMediaObject16addPropertyWatchERK10QByteArray @ 34 NONAME
-	_ZN10QtMobility12QMediaObject16staticMetaObjectE @ 35 NONAME DATA 16
-	_ZN10QtMobility12QMediaObject17setNotifyIntervalEi @ 36 NONAME
-	_ZN10QtMobility12QMediaObject19availabilityChangedEb @ 37 NONAME
-	_ZN10QtMobility12QMediaObject19getStaticMetaObjectEv @ 38 NONAME
-	_ZN10QtMobility12QMediaObject19removePropertyWatchERK10QByteArray @ 39 NONAME
-	_ZN10QtMobility12QMediaObject19setExtendedMetaDataERK7QStringRK8QVariant @ 40 NONAME
-	_ZN10QtMobility12QMediaObject21notifyIntervalChangedEi @ 41 NONAME
-	_ZN10QtMobility12QMediaObject23metaDataWritableChangedEb @ 42 NONAME
-	_ZN10QtMobility12QMediaObject24metaDataAvailableChangedEb @ 43 NONAME
-	_ZN10QtMobility12QMediaObject4bindEP7QObject @ 44 NONAME
-	_ZN10QtMobility12QMediaObject6unbindEP7QObject @ 45 NONAME
-	_ZN10QtMobility12QMediaObjectC1EP7QObjectPNS_13QMediaServiceE @ 46 NONAME
-	_ZN10QtMobility12QMediaObjectC1ERNS_19QMediaObjectPrivateEP7QObjectPNS_13QMediaServiceE @ 47 NONAME
-	_ZN10QtMobility12QMediaObjectC2EP7QObjectPNS_13QMediaServiceE @ 48 NONAME
-	_ZN10QtMobility12QMediaObjectC2ERNS_19QMediaObjectPrivateEP7QObjectPNS_13QMediaServiceE @ 49 NONAME
-	_ZN10QtMobility12QMediaObjectD0Ev @ 50 NONAME
-	_ZN10QtMobility12QMediaObjectD1Ev @ 51 NONAME
-	_ZN10QtMobility12QMediaObjectD2Ev @ 52 NONAME
-	_ZN10QtMobility12QMediaPlayer10hasSupportERK7QStringRK11QStringList6QFlagsINS0_4FlagEE @ 53 NONAME
-	_ZN10QtMobility12QMediaPlayer11qt_metacallEN11QMetaObject4CallEiPPv @ 54 NONAME
-	_ZN10QtMobility12QMediaPlayer11qt_metacastEPKc @ 55 NONAME
-	_ZN10QtMobility12QMediaPlayer11setPositionEx @ 56 NONAME
-	_ZN10QtMobility12QMediaPlayer12mediaChangedERKNS_13QMediaContentE @ 57 NONAME
-	_ZN10QtMobility12QMediaPlayer12mutedChangedEb @ 58 NONAME
-	_ZN10QtMobility12QMediaPlayer12stateChangedENS0_5StateE @ 59 NONAME
-	_ZN10QtMobility12QMediaPlayer13volumeChangedEi @ 60 NONAME
-	_ZN10QtMobility12QMediaPlayer15durationChangedEx @ 61 NONAME
-	_ZN10QtMobility12QMediaPlayer15positionChangedEx @ 62 NONAME
-	_ZN10QtMobility12QMediaPlayer15seekableChangedEb @ 63 NONAME
-	_ZN10QtMobility12QMediaPlayer15setPlaybackRateEf @ 64 NONAME
-	_ZN10QtMobility12QMediaPlayer16staticMetaObjectE @ 65 NONAME DATA 16
-	_ZN10QtMobility12QMediaPlayer18mediaStatusChangedENS0_11MediaStatusE @ 66 NONAME
-	_ZN10QtMobility12QMediaPlayer18supportedMimeTypesE6QFlagsINS0_4FlagEE @ 67 NONAME
-	_ZN10QtMobility12QMediaPlayer19bufferStatusChangedEi @ 68 NONAME
-	_ZN10QtMobility12QMediaPlayer19getStaticMetaObjectEv @ 69 NONAME
-	_ZN10QtMobility12QMediaPlayer19playbackRateChangedEf @ 70 NONAME
-	_ZN10QtMobility12QMediaPlayer21audioAvailableChangedEb @ 71 NONAME
-	_ZN10QtMobility12QMediaPlayer21videoAvailableChangedEb @ 72 NONAME
-	_ZN10QtMobility12QMediaPlayer4bindEP7QObject @ 73 NONAME
-	_ZN10QtMobility12QMediaPlayer4playEv @ 74 NONAME
-	_ZN10QtMobility12QMediaPlayer4stopEv @ 75 NONAME
-	_ZN10QtMobility12QMediaPlayer5errorENS0_5ErrorE @ 76 NONAME
-	_ZN10QtMobility12QMediaPlayer5pauseEv @ 77 NONAME
-	_ZN10QtMobility12QMediaPlayer6unbindEP7QObject @ 78 NONAME
-	_ZN10QtMobility12QMediaPlayer8setMediaERKNS_13QMediaContentEP9QIODevice @ 79 NONAME
-	_ZN10QtMobility12QMediaPlayer8setMutedEb @ 80 NONAME
-	_ZN10QtMobility12QMediaPlayer9setVolumeEi @ 81 NONAME
-	_ZN10QtMobility12QMediaPlayerC1EP7QObject6QFlagsINS0_4FlagEEPNS_21QMediaServiceProviderE @ 82 NONAME
-	_ZN10QtMobility12QMediaPlayerC2EP7QObject6QFlagsINS0_4FlagEEPNS_21QMediaServiceProviderE @ 83 NONAME
-	_ZN10QtMobility12QMediaPlayerD0Ev @ 84 NONAME
-	_ZN10QtMobility12QMediaPlayerD1Ev @ 85 NONAME
-	_ZN10QtMobility12QMediaPlayerD2Ev @ 86 NONAME
-	_ZN10QtMobility12QVideoWidget10hueChangedEi @ 87 NONAME
-	_ZN10QtMobility12QVideoWidget10paintEventEP11QPaintEvent @ 88 NONAME
-	_ZN10QtMobility12QVideoWidget11qt_metacallEN11QMetaObject4CallEiPPv @ 89 NONAME
-	_ZN10QtMobility12QVideoWidget11qt_metacastEPKc @ 90 NONAME
-	_ZN10QtMobility12QVideoWidget11resizeEventEP12QResizeEvent @ 91 NONAME
-	_ZN10QtMobility12QVideoWidget11setContrastEi @ 92 NONAME
-	_ZN10QtMobility12QVideoWidget13setBrightnessEi @ 93 NONAME
-	_ZN10QtMobility12QVideoWidget13setFullScreenEb @ 94 NONAME
-	_ZN10QtMobility12QVideoWidget13setSaturationEi @ 95 NONAME
-	_ZN10QtMobility12QVideoWidget14setMediaObjectEPNS_12QMediaObjectE @ 96 NONAME
-	_ZN10QtMobility12QVideoWidget15contrastChangedEi @ 97 NONAME
-	_ZN10QtMobility12QVideoWidget16staticMetaObjectE @ 98 NONAME DATA 16
-	_ZN10QtMobility12QVideoWidget17brightnessChangedEi @ 99 NONAME
-	_ZN10QtMobility12QVideoWidget17fullScreenChangedEb @ 100 NONAME
-	_ZN10QtMobility12QVideoWidget17saturationChangedEi @ 101 NONAME
-	_ZN10QtMobility12QVideoWidget18setAspectRatioModeEN2Qt15AspectRatioModeE @ 102 NONAME
-	_ZN10QtMobility12QVideoWidget19getStaticMetaObjectEv @ 103 NONAME
-	_ZN10QtMobility12QVideoWidget5eventEP6QEvent @ 104 NONAME
-	_ZN10QtMobility12QVideoWidget6setHueEi @ 105 NONAME
-	_ZN10QtMobility12QVideoWidget9hideEventEP10QHideEvent @ 106 NONAME
-	_ZN10QtMobility12QVideoWidget9moveEventEP10QMoveEvent @ 107 NONAME
-	_ZN10QtMobility12QVideoWidget9showEventEP10QShowEvent @ 108 NONAME
-	_ZN10QtMobility12QVideoWidgetC1EP7QWidget @ 109 NONAME
-	_ZN10QtMobility12QVideoWidgetC2EP7QWidget @ 110 NONAME
-	_ZN10QtMobility12QVideoWidgetD0Ev @ 111 NONAME
-	_ZN10QtMobility12QVideoWidgetD1Ev @ 112 NONAME
-	_ZN10QtMobility12QVideoWidgetD2Ev @ 113 NONAME
-	_ZN10QtMobility13QMediaContentC1ERK15QNetworkRequest @ 114 NONAME
-	_ZN10QtMobility13QMediaContentC1ERK4QUrl @ 115 NONAME
-	_ZN10QtMobility13QMediaContentC1ERK5QListINS_14QMediaResourceEE @ 116 NONAME
-	_ZN10QtMobility13QMediaContentC1ERKNS_14QMediaResourceE @ 117 NONAME
-	_ZN10QtMobility13QMediaContentC1ERKS0_ @ 118 NONAME
-	_ZN10QtMobility13QMediaContentC1Ev @ 119 NONAME
-	_ZN10QtMobility13QMediaContentC2ERK15QNetworkRequest @ 120 NONAME
-	_ZN10QtMobility13QMediaContentC2ERK4QUrl @ 121 NONAME
-	_ZN10QtMobility13QMediaContentC2ERK5QListINS_14QMediaResourceEE @ 122 NONAME
-	_ZN10QtMobility13QMediaContentC2ERKNS_14QMediaResourceE @ 123 NONAME
-	_ZN10QtMobility13QMediaContentC2ERKS0_ @ 124 NONAME
-	_ZN10QtMobility13QMediaContentC2Ev @ 125 NONAME
-	_ZN10QtMobility13QMediaContentD1Ev @ 126 NONAME
-	_ZN10QtMobility13QMediaContentD2Ev @ 127 NONAME
-	_ZN10QtMobility13QMediaContentaSERKS0_ @ 128 NONAME
-	_ZN10QtMobility13QMediaControl11qt_metacallEN11QMetaObject4CallEiPPv @ 129 NONAME
-	_ZN10QtMobility13QMediaControl11qt_metacastEPKc @ 130 NONAME
-	_ZN10QtMobility13QMediaControl16staticMetaObjectE @ 131 NONAME DATA 16
-	_ZN10QtMobility13QMediaControl19getStaticMetaObjectEv @ 132 NONAME
-	_ZN10QtMobility13QMediaControlC1EP7QObject @ 133 NONAME
-	_ZN10QtMobility13QMediaControlC1ERNS_20QMediaControlPrivateEP7QObject @ 134 NONAME
-	_ZN10QtMobility13QMediaControlC2EP7QObject @ 135 NONAME
-	_ZN10QtMobility13QMediaControlC2ERNS_20QMediaControlPrivateEP7QObject @ 136 NONAME
-	_ZN10QtMobility13QMediaControlD0Ev @ 137 NONAME
-	_ZN10QtMobility13QMediaControlD1Ev @ 138 NONAME
-	_ZN10QtMobility13QMediaControlD2Ev @ 139 NONAME
-	_ZN10QtMobility13QMediaService11qt_metacallEN11QMetaObject4CallEiPPv @ 140 NONAME
-	_ZN10QtMobility13QMediaService11qt_metacastEPKc @ 141 NONAME
-	_ZN10QtMobility13QMediaService16staticMetaObjectE @ 142 NONAME DATA 16
-	_ZN10QtMobility13QMediaService19getStaticMetaObjectEv @ 143 NONAME
-	_ZN10QtMobility13QMediaServiceC2EP7QObject @ 144 NONAME
-	_ZN10QtMobility13QMediaServiceC2ERNS_20QMediaServicePrivateEP7QObject @ 145 NONAME
-	_ZN10QtMobility13QMediaServiceD0Ev @ 146 NONAME
-	_ZN10QtMobility13QMediaServiceD1Ev @ 147 NONAME
-	_ZN10QtMobility13QMediaServiceD2Ev @ 148 NONAME
-	_ZN10QtMobility14QMediaPlaylist10loadFailedEv @ 149 NONAME
-	_ZN10QtMobility14QMediaPlaylist11insertMediaEiRK5QListINS_13QMediaContentEE @ 150 NONAME
-	_ZN10QtMobility14QMediaPlaylist11insertMediaEiRKNS_13QMediaContentE @ 151 NONAME
-	_ZN10QtMobility14QMediaPlaylist11qt_metacallEN11QMetaObject4CallEiPPv @ 152 NONAME
-	_ZN10QtMobility14QMediaPlaylist11qt_metacastEPKc @ 153 NONAME
-	_ZN10QtMobility14QMediaPlaylist11removeMediaEi @ 154 NONAME
-	_ZN10QtMobility14QMediaPlaylist11removeMediaEii @ 155 NONAME
-	_ZN10QtMobility14QMediaPlaylist12mediaChangedEii @ 156 NONAME
-	_ZN10QtMobility14QMediaPlaylist12mediaRemovedEii @ 157 NONAME
-	_ZN10QtMobility14QMediaPlaylist13mediaInsertedEii @ 158 NONAME
-	_ZN10QtMobility14QMediaPlaylist14setMediaObjectEPNS_12QMediaObjectE @ 159 NONAME
-	_ZN10QtMobility14QMediaPlaylist15setCurrentIndexEi @ 160 NONAME
-	_ZN10QtMobility14QMediaPlaylist15setPlaybackModeENS0_12PlaybackModeE @ 161 NONAME
-	_ZN10QtMobility14QMediaPlaylist16staticMetaObjectE @ 162 NONAME DATA 16
-	_ZN10QtMobility14QMediaPlaylist19currentIndexChangedEi @ 163 NONAME
-	_ZN10QtMobility14QMediaPlaylist19currentMediaChangedERKNS_13QMediaContentE @ 164 NONAME
-	_ZN10QtMobility14QMediaPlaylist19getStaticMetaObjectEv @ 165 NONAME
-	_ZN10QtMobility14QMediaPlaylist19playbackModeChangedENS0_12PlaybackModeE @ 166 NONAME
-	_ZN10QtMobility14QMediaPlaylist21mediaAboutToBeRemovedEii @ 167 NONAME
-	_ZN10QtMobility14QMediaPlaylist22mediaAboutToBeInsertedEii @ 168 NONAME
-	_ZN10QtMobility14QMediaPlaylist4loadEP9QIODevicePKc @ 169 NONAME
-	_ZN10QtMobility14QMediaPlaylist4loadERK4QUrlPKc @ 170 NONAME
-	_ZN10QtMobility14QMediaPlaylist4nextEv @ 171 NONAME
-	_ZN10QtMobility14QMediaPlaylist4saveEP9QIODevicePKc @ 172 NONAME
-	_ZN10QtMobility14QMediaPlaylist4saveERK4QUrlPKc @ 173 NONAME
-	_ZN10QtMobility14QMediaPlaylist5clearEv @ 174 NONAME
-	_ZN10QtMobility14QMediaPlaylist6loadedEv @ 175 NONAME
-	_ZN10QtMobility14QMediaPlaylist7shuffleEv @ 176 NONAME
-	_ZN10QtMobility14QMediaPlaylist8addMediaERK5QListINS_13QMediaContentEE @ 177 NONAME
-	_ZN10QtMobility14QMediaPlaylist8addMediaERKNS_13QMediaContentE @ 178 NONAME
-	_ZN10QtMobility14QMediaPlaylist8previousEv @ 179 NONAME
-	_ZN10QtMobility14QMediaPlaylistC1EP7QObject @ 180 NONAME
-	_ZN10QtMobility14QMediaPlaylistC2EP7QObject @ 181 NONAME
-	_ZN10QtMobility14QMediaPlaylistD0Ev @ 182 NONAME
-	_ZN10QtMobility14QMediaPlaylistD1Ev @ 183 NONAME
-	_ZN10QtMobility14QMediaPlaylistD2Ev @ 184 NONAME
-	_ZN10QtMobility14QMediaRecorder11qt_metacallEN11QMetaObject4CallEiPPv @ 185 NONAME
-	_ZN10QtMobility14QMediaRecorder11qt_metacastEPKc @ 186 NONAME
-	_ZN10QtMobility14QMediaRecorder12stateChangedENS0_5StateE @ 187 NONAME
-	_ZN10QtMobility14QMediaRecorder15durationChangedEx @ 188 NONAME
-	_ZN10QtMobility14QMediaRecorder16staticMetaObjectE @ 189 NONAME DATA 16
-	_ZN10QtMobility14QMediaRecorder17setOutputLocationERK4QUrl @ 190 NONAME
-	_ZN10QtMobility14QMediaRecorder19getStaticMetaObjectEv @ 191 NONAME
-	_ZN10QtMobility14QMediaRecorder19setEncodingSettingsERKNS_21QAudioEncoderSettingsERKNS_21QVideoEncoderSettingsERK7QString @ 192 NONAME
-	_ZN10QtMobility14QMediaRecorder4stopEv @ 193 NONAME
-	_ZN10QtMobility14QMediaRecorder5errorENS0_5ErrorE @ 194 NONAME
-	_ZN10QtMobility14QMediaRecorder5pauseEv @ 195 NONAME
-	_ZN10QtMobility14QMediaRecorder6recordEv @ 196 NONAME
-	_ZN10QtMobility14QMediaRecorderC1EPNS_12QMediaObjectEP7QObject @ 197 NONAME
-	_ZN10QtMobility14QMediaRecorderC2EPNS_12QMediaObjectEP7QObject @ 198 NONAME
-	_ZN10QtMobility14QMediaRecorderD0Ev @ 199 NONAME
-	_ZN10QtMobility14QMediaRecorderD1Ev @ 200 NONAME
-	_ZN10QtMobility14QMediaRecorderD2Ev @ 201 NONAME
-	_ZN10QtMobility14QMediaResource11setDataSizeEx @ 202 NONAME
-	_ZN10QtMobility14QMediaResource11setLanguageERK7QString @ 203 NONAME
-	_ZN10QtMobility14QMediaResource13setAudioCodecERK7QString @ 204 NONAME
-	_ZN10QtMobility14QMediaResource13setResolutionERK5QSize @ 205 NONAME
-	_ZN10QtMobility14QMediaResource13setResolutionEii @ 206 NONAME
-	_ZN10QtMobility14QMediaResource13setSampleRateEi @ 207 NONAME
-	_ZN10QtMobility14QMediaResource13setVideoCodecERK7QString @ 208 NONAME
-	_ZN10QtMobility14QMediaResource15setAudioBitRateEi @ 209 NONAME
-	_ZN10QtMobility14QMediaResource15setChannelCountEi @ 210 NONAME
-	_ZN10QtMobility14QMediaResource15setVideoBitRateEi @ 211 NONAME
-	_ZN10QtMobility14QMediaResourceC1ERK15QNetworkRequestRK7QString @ 212 NONAME
-	_ZN10QtMobility14QMediaResourceC1ERK4QUrlRK7QString @ 213 NONAME
-	_ZN10QtMobility14QMediaResourceC1ERKS0_ @ 214 NONAME
-	_ZN10QtMobility14QMediaResourceC1Ev @ 215 NONAME
-	_ZN10QtMobility14QMediaResourceC2ERK15QNetworkRequestRK7QString @ 216 NONAME
-	_ZN10QtMobility14QMediaResourceC2ERK4QUrlRK7QString @ 217 NONAME
-	_ZN10QtMobility14QMediaResourceC2ERKS0_ @ 218 NONAME
-	_ZN10QtMobility14QMediaResourceC2Ev @ 219 NONAME
-	_ZN10QtMobility14QMediaResourceD1Ev @ 220 NONAME
-	_ZN10QtMobility14QMediaResourceD2Ev @ 221 NONAME
-	_ZN10QtMobility14QMediaResourceaSERKS0_ @ 222 NONAME
-	_ZN10QtMobility15QMediaTimeRange11addIntervalERKNS_18QMediaTimeIntervalE @ 223 NONAME
-	_ZN10QtMobility15QMediaTimeRange11addIntervalExx @ 224 NONAME
-	_ZN10QtMobility15QMediaTimeRange12addTimeRangeERKS0_ @ 225 NONAME
-	_ZN10QtMobility15QMediaTimeRange14removeIntervalERKNS_18QMediaTimeIntervalE @ 226 NONAME
-	_ZN10QtMobility15QMediaTimeRange14removeIntervalExx @ 227 NONAME
-	_ZN10QtMobility15QMediaTimeRange15removeTimeRangeERKS0_ @ 228 NONAME
-	_ZN10QtMobility15QMediaTimeRange5clearEv @ 229 NONAME
-	_ZN10QtMobility15QMediaTimeRangeC1ERKNS_18QMediaTimeIntervalE @ 230 NONAME
-	_ZN10QtMobility15QMediaTimeRangeC1ERKS0_ @ 231 NONAME
-	_ZN10QtMobility15QMediaTimeRangeC1Ev @ 232 NONAME
-	_ZN10QtMobility15QMediaTimeRangeC1Exx @ 233 NONAME
-	_ZN10QtMobility15QMediaTimeRangeC2ERKNS_18QMediaTimeIntervalE @ 234 NONAME
-	_ZN10QtMobility15QMediaTimeRangeC2ERKS0_ @ 235 NONAME
-	_ZN10QtMobility15QMediaTimeRangeC2Ev @ 236 NONAME
-	_ZN10QtMobility15QMediaTimeRangeC2Exx @ 237 NONAME
-	_ZN10QtMobility15QMediaTimeRangeD1Ev @ 238 NONAME
-	_ZN10QtMobility15QMediaTimeRangeD2Ev @ 239 NONAME
-	_ZN10QtMobility15QMediaTimeRangeaSERKNS_18QMediaTimeIntervalE @ 240 NONAME
-	_ZN10QtMobility15QMediaTimeRangeaSERKS0_ @ 241 NONAME
-	_ZN10QtMobility15QMediaTimeRangemIERKNS_18QMediaTimeIntervalE @ 242 NONAME
-	_ZN10QtMobility15QMediaTimeRangemIERKS0_ @ 243 NONAME
-	_ZN10QtMobility15QMediaTimeRangepLERKNS_18QMediaTimeIntervalE @ 244 NONAME
-	_ZN10QtMobility15QMediaTimeRangepLERKS0_ @ 245 NONAME
-	_ZN10QtMobility16QMetaDataControl11qt_metacallEN11QMetaObject4CallEiPPv @ 246 NONAME
-	_ZN10QtMobility16QMetaDataControl11qt_metacastEPKc @ 247 NONAME
-	_ZN10QtMobility16QMetaDataControl15metaDataChangedEv @ 248 NONAME
-	_ZN10QtMobility16QMetaDataControl15writableChangedEb @ 249 NONAME
-	_ZN10QtMobility16QMetaDataControl16staticMetaObjectE @ 250 NONAME DATA 16
-	_ZN10QtMobility16QMetaDataControl19getStaticMetaObjectEv @ 251 NONAME
-	_ZN10QtMobility16QMetaDataControl24metaDataAvailableChangedEb @ 252 NONAME
-	_ZN10QtMobility16QMetaDataControlC2EP7QObject @ 253 NONAME
-	_ZN10QtMobility16QMetaDataControlD0Ev @ 254 NONAME
-	_ZN10QtMobility16QMetaDataControlD1Ev @ 255 NONAME
-	_ZN10QtMobility16QMetaDataControlD2Ev @ 256 NONAME
-	_ZN10QtMobility17QMediaImageViewer10setTimeoutEi @ 257 NONAME
-	_ZN10QtMobility17QMediaImageViewer10timerEventEP11QTimerEvent @ 258 NONAME
-	_ZN10QtMobility17QMediaImageViewer11qt_metacallEN11QMetaObject4CallEiPPv @ 259 NONAME
-	_ZN10QtMobility17QMediaImageViewer11qt_metacastEPKc @ 260 NONAME
-	_ZN10QtMobility17QMediaImageViewer12mediaChangedERKNS_13QMediaContentE @ 261 NONAME
-	_ZN10QtMobility17QMediaImageViewer12stateChangedENS0_5StateE @ 262 NONAME
-	_ZN10QtMobility17QMediaImageViewer16staticMetaObjectE @ 263 NONAME DATA 16
-	_ZN10QtMobility17QMediaImageViewer18elapsedTimeChangedEi @ 264 NONAME
-	_ZN10QtMobility17QMediaImageViewer18mediaStatusChangedENS0_11MediaStatusE @ 265 NONAME
-	_ZN10QtMobility17QMediaImageViewer19getStaticMetaObjectEv @ 266 NONAME
-	_ZN10QtMobility17QMediaImageViewer4bindEP7QObject @ 267 NONAME
-	_ZN10QtMobility17QMediaImageViewer4playEv @ 268 NONAME
-	_ZN10QtMobility17QMediaImageViewer4stopEv @ 269 NONAME
-	_ZN10QtMobility17QMediaImageViewer5pauseEv @ 270 NONAME
-	_ZN10QtMobility17QMediaImageViewer6unbindEP7QObject @ 271 NONAME
-	_ZN10QtMobility17QMediaImageViewer8setMediaERKNS_13QMediaContentE @ 272 NONAME
-	_ZN10QtMobility17QMediaImageViewerC1EP7QObject @ 273 NONAME
-	_ZN10QtMobility17QMediaImageViewerC2EP7QObject @ 274 NONAME
-	_ZN10QtMobility17QMediaImageViewerD0Ev @ 275 NONAME
-	_ZN10QtMobility17QMediaImageViewerD1Ev @ 276 NONAME
-	_ZN10QtMobility17QMediaImageViewerD2Ev @ 277 NONAME
-	_ZN10QtMobility18QGraphicsVideoItem10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 278 NONAME
-	_ZN10QtMobility18QGraphicsVideoItem10timerEventEP11QTimerEvent @ 279 NONAME
-	_ZN10QtMobility18QGraphicsVideoItem11qt_metacallEN11QMetaObject4CallEiPPv @ 280 NONAME
-	_ZN10QtMobility18QGraphicsVideoItem11qt_metacastEPKc @ 281 NONAME
-	_ZN10QtMobility18QGraphicsVideoItem14setMediaObjectEPNS_12QMediaObjectE @ 282 NONAME
-	_ZN10QtMobility18QGraphicsVideoItem16staticMetaObjectE @ 283 NONAME DATA 16
-	_ZN10QtMobility18QGraphicsVideoItem17nativeSizeChangedERK6QSizeF @ 284 NONAME
-	_ZN10QtMobility18QGraphicsVideoItem18setAspectRatioModeEN2Qt15AspectRatioModeE @ 285 NONAME
-	_ZN10QtMobility18QGraphicsVideoItem19getStaticMetaObjectEv @ 286 NONAME
-	_ZN10QtMobility18QGraphicsVideoItem5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 287 NONAME
-	_ZN10QtMobility18QGraphicsVideoItem7setSizeERK6QSizeF @ 288 NONAME
-	_ZN10QtMobility18QGraphicsVideoItem9setOffsetERK7QPointF @ 289 NONAME
-	_ZN10QtMobility18QGraphicsVideoItemC1EP13QGraphicsItem @ 290 NONAME
-	_ZN10QtMobility18QGraphicsVideoItemC2EP13QGraphicsItem @ 291 NONAME
-	_ZN10QtMobility18QGraphicsVideoItemD0Ev @ 292 NONAME
-	_ZN10QtMobility18QGraphicsVideoItemD1Ev @ 293 NONAME
-	_ZN10QtMobility18QGraphicsVideoItemD2Ev @ 294 NONAME
-	_ZN10QtMobility18QMediaTimeIntervalC1ERKS0_ @ 295 NONAME
-	_ZN10QtMobility18QMediaTimeIntervalC1Ev @ 296 NONAME
-	_ZN10QtMobility18QMediaTimeIntervalC1Exx @ 297 NONAME
-	_ZN10QtMobility18QMediaTimeIntervalC2ERKS0_ @ 298 NONAME
-	_ZN10QtMobility18QMediaTimeIntervalC2Ev @ 299 NONAME
-	_ZN10QtMobility18QMediaTimeIntervalC2Exx @ 300 NONAME
-	_ZN10QtMobility18QRadioTunerControl11bandChangedENS_11QRadioTuner4BandE @ 301 NONAME
-	_ZN10QtMobility18QRadioTunerControl11qt_metacallEN11QMetaObject4CallEiPPv @ 302 NONAME
-	_ZN10QtMobility18QRadioTunerControl11qt_metacastEPKc @ 303 NONAME
-	_ZN10QtMobility18QRadioTunerControl12mutedChangedEb @ 304 NONAME
-	_ZN10QtMobility18QRadioTunerControl12stateChangedENS_11QRadioTuner5StateE @ 305 NONAME
-	_ZN10QtMobility18QRadioTunerControl13volumeChangedEi @ 306 NONAME
-	_ZN10QtMobility18QRadioTunerControl16frequencyChangedEi @ 307 NONAME
-	_ZN10QtMobility18QRadioTunerControl16searchingChangedEb @ 308 NONAME
-	_ZN10QtMobility18QRadioTunerControl16staticMetaObjectE @ 309 NONAME DATA 16
-	_ZN10QtMobility18QRadioTunerControl19getStaticMetaObjectEv @ 310 NONAME
-	_ZN10QtMobility18QRadioTunerControl19stereoStatusChangedEb @ 311 NONAME
-	_ZN10QtMobility18QRadioTunerControl21signalStrengthChangedEi @ 312 NONAME
-	_ZN10QtMobility18QRadioTunerControl5errorENS_11QRadioTuner5ErrorE @ 313 NONAME
-	_ZN10QtMobility18QRadioTunerControlC2EP7QObject @ 314 NONAME
-	_ZN10QtMobility18QRadioTunerControlD0Ev @ 315 NONAME
-	_ZN10QtMobility18QRadioTunerControlD1Ev @ 316 NONAME
-	_ZN10QtMobility18QRadioTunerControlD2Ev @ 317 NONAME
-	_ZN10QtMobility19QAudioCaptureSource11qt_metacallEN11QMetaObject4CallEiPPv @ 318 NONAME
-	_ZN10QtMobility19QAudioCaptureSource11qt_metacastEPKc @ 319 NONAME
-	_ZN10QtMobility19QAudioCaptureSource13setAudioInputERK7QString @ 320 NONAME
-	_ZN10QtMobility19QAudioCaptureSource13statusChangedEv @ 321 NONAME
-	_ZN10QtMobility19QAudioCaptureSource16staticMetaObjectE @ 322 NONAME DATA 16
-	_ZN10QtMobility19QAudioCaptureSource19getStaticMetaObjectEv @ 323 NONAME
-	_ZN10QtMobility19QAudioCaptureSource23activeAudioInputChangedERK7QString @ 324 NONAME
-	_ZN10QtMobility19QAudioCaptureSource27availableAudioInputsChangedEv @ 325 NONAME
-	_ZN10QtMobility19QAudioCaptureSourceC1EP7QObjectPNS_21QMediaServiceProviderE @ 326 NONAME
-	_ZN10QtMobility19QAudioCaptureSourceC1EPNS_12QMediaObjectEP7QObject @ 327 NONAME
-	_ZN10QtMobility19QAudioCaptureSourceC2EP7QObjectPNS_21QMediaServiceProviderE @ 328 NONAME
-	_ZN10QtMobility19QAudioCaptureSourceC2EPNS_12QMediaObjectEP7QObject @ 329 NONAME
-	_ZN10QtMobility19QAudioCaptureSourceD0Ev @ 330 NONAME
-	_ZN10QtMobility19QAudioCaptureSourceD1Ev @ 331 NONAME
-	_ZN10QtMobility19QAudioCaptureSourceD2Ev @ 332 NONAME
-	_ZN10QtMobility19QMediaPlayerControl11qt_metacallEN11QMetaObject4CallEiPPv @ 333 NONAME
-	_ZN10QtMobility19QMediaPlayerControl11qt_metacastEPKc @ 334 NONAME
-	_ZN10QtMobility19QMediaPlayerControl12mediaChangedERKNS_13QMediaContentE @ 335 NONAME
-	_ZN10QtMobility19QMediaPlayerControl12mutedChangedEb @ 336 NONAME
-	_ZN10QtMobility19QMediaPlayerControl12stateChangedENS_12QMediaPlayer5StateE @ 337 NONAME
-	_ZN10QtMobility19QMediaPlayerControl13volumeChangedEi @ 338 NONAME
-	_ZN10QtMobility19QMediaPlayerControl15durationChangedEx @ 339 NONAME
-	_ZN10QtMobility19QMediaPlayerControl15positionChangedEx @ 340 NONAME
-	_ZN10QtMobility19QMediaPlayerControl15seekableChangedEb @ 341 NONAME
-	_ZN10QtMobility19QMediaPlayerControl16staticMetaObjectE @ 342 NONAME DATA 16
-	_ZN10QtMobility19QMediaPlayerControl18mediaStatusChangedENS_12QMediaPlayer11MediaStatusE @ 343 NONAME
-	_ZN10QtMobility19QMediaPlayerControl19bufferStatusChangedEi @ 344 NONAME
-	_ZN10QtMobility19QMediaPlayerControl19getStaticMetaObjectEv @ 345 NONAME
-	_ZN10QtMobility19QMediaPlayerControl19playbackRateChangedEf @ 346 NONAME
-	_ZN10QtMobility19QMediaPlayerControl21audioAvailableChangedEb @ 347 NONAME
-	_ZN10QtMobility19QMediaPlayerControl21videoAvailableChangedEb @ 348 NONAME
-	_ZN10QtMobility19QMediaPlayerControl30availablePlaybackRangesChangedERKNS_15QMediaTimeRangeE @ 349 NONAME
-	_ZN10QtMobility19QMediaPlayerControl5errorEiRK7QString @ 350 NONAME
-	_ZN10QtMobility19QMediaPlayerControlC2EP7QObject @ 351 NONAME
-	_ZN10QtMobility19QMediaPlayerControlD0Ev @ 352 NONAME
-	_ZN10QtMobility19QMediaPlayerControlD1Ev @ 353 NONAME
-	_ZN10QtMobility19QMediaPlayerControlD2Ev @ 354 NONAME
-	_ZN10QtMobility19QVideoDeviceControl11qt_metacallEN11QMetaObject4CallEiPPv @ 355 NONAME
-	_ZN10QtMobility19QVideoDeviceControl11qt_metacastEPKc @ 356 NONAME
-	_ZN10QtMobility19QVideoDeviceControl14devicesChangedEv @ 357 NONAME
-	_ZN10QtMobility19QVideoDeviceControl16staticMetaObjectE @ 358 NONAME DATA 16
-	_ZN10QtMobility19QVideoDeviceControl19getStaticMetaObjectEv @ 359 NONAME
-	_ZN10QtMobility19QVideoDeviceControl21selectedDeviceChangedERK7QString @ 360 NONAME
-	_ZN10QtMobility19QVideoDeviceControl21selectedDeviceChangedEi @ 361 NONAME
-	_ZN10QtMobility19QVideoDeviceControlC2EP7QObject @ 362 NONAME
-	_ZN10QtMobility19QVideoDeviceControlD0Ev @ 363 NONAME
-	_ZN10QtMobility19QVideoDeviceControlD1Ev @ 364 NONAME
-	_ZN10QtMobility19QVideoDeviceControlD2Ev @ 365 NONAME
-	_ZN10QtMobility19QVideoOutputControl11qt_metacallEN11QMetaObject4CallEiPPv @ 366 NONAME
-	_ZN10QtMobility19QVideoOutputControl11qt_metacastEPKc @ 367 NONAME
-	_ZN10QtMobility19QVideoOutputControl16staticMetaObjectE @ 368 NONAME DATA 16
-	_ZN10QtMobility19QVideoOutputControl19getStaticMetaObjectEv @ 369 NONAME
-	_ZN10QtMobility19QVideoOutputControl23availableOutputsChangedERK5QListINS0_6OutputEE @ 370 NONAME
-	_ZN10QtMobility19QVideoOutputControlC2EP7QObject @ 371 NONAME
-	_ZN10QtMobility19QVideoOutputControlD0Ev @ 372 NONAME
-	_ZN10QtMobility19QVideoOutputControlD1Ev @ 373 NONAME
-	_ZN10QtMobility19QVideoOutputControlD2Ev @ 374 NONAME
-	_ZN10QtMobility19QVideoWidgetControl10hueChangedEi @ 375 NONAME
-	_ZN10QtMobility19QVideoWidgetControl11qt_metacallEN11QMetaObject4CallEiPPv @ 376 NONAME
-	_ZN10QtMobility19QVideoWidgetControl11qt_metacastEPKc @ 377 NONAME
-	_ZN10QtMobility19QVideoWidgetControl15contrastChangedEi @ 378 NONAME
-	_ZN10QtMobility19QVideoWidgetControl16staticMetaObjectE @ 379 NONAME DATA 16
-	_ZN10QtMobility19QVideoWidgetControl17brightnessChangedEi @ 380 NONAME
-	_ZN10QtMobility19QVideoWidgetControl17fullScreenChangedEb @ 381 NONAME
-	_ZN10QtMobility19QVideoWidgetControl17saturationChangedEi @ 382 NONAME
-	_ZN10QtMobility19QVideoWidgetControl19getStaticMetaObjectEv @ 383 NONAME
-	_ZN10QtMobility19QVideoWidgetControlC2EP7QObject @ 384 NONAME
-	_ZN10QtMobility19QVideoWidgetControlD0Ev @ 385 NONAME
-	_ZN10QtMobility19QVideoWidgetControlD1Ev @ 386 NONAME
-	_ZN10QtMobility19QVideoWidgetControlD2Ev @ 387 NONAME
-	_ZN10QtMobility19QVideoWindowControl10hueChangedEi @ 388 NONAME
-	_ZN10QtMobility19QVideoWindowControl11qt_metacallEN11QMetaObject4CallEiPPv @ 389 NONAME
-	_ZN10QtMobility19QVideoWindowControl11qt_metacastEPKc @ 390 NONAME
-	_ZN10QtMobility19QVideoWindowControl15contrastChangedEi @ 391 NONAME
-	_ZN10QtMobility19QVideoWindowControl16staticMetaObjectE @ 392 NONAME DATA 16
-	_ZN10QtMobility19QVideoWindowControl17brightnessChangedEi @ 393 NONAME
-	_ZN10QtMobility19QVideoWindowControl17fullScreenChangedEb @ 394 NONAME
-	_ZN10QtMobility19QVideoWindowControl17nativeSizeChangedEv @ 395 NONAME
-	_ZN10QtMobility19QVideoWindowControl17saturationChangedEi @ 396 NONAME
-	_ZN10QtMobility19QVideoWindowControl19getStaticMetaObjectEv @ 397 NONAME
-	_ZN10QtMobility19QVideoWindowControlC2EP7QObject @ 398 NONAME
-	_ZN10QtMobility19QVideoWindowControlD0Ev @ 399 NONAME
-	_ZN10QtMobility19QVideoWindowControlD1Ev @ 400 NONAME
-	_ZN10QtMobility19QVideoWindowControlD2Ev @ 401 NONAME
-	_ZN10QtMobility20QAudioEncoderControl11qt_metacallEN11QMetaObject4CallEiPPv @ 402 NONAME
-	_ZN10QtMobility20QAudioEncoderControl11qt_metacastEPKc @ 403 NONAME
-	_ZN10QtMobility20QAudioEncoderControl16staticMetaObjectE @ 404 NONAME DATA 16
-	_ZN10QtMobility20QAudioEncoderControl19getStaticMetaObjectEv @ 405 NONAME
-	_ZN10QtMobility20QAudioEncoderControlC2EP7QObject @ 406 NONAME
-	_ZN10QtMobility20QAudioEncoderControlD0Ev @ 407 NONAME
-	_ZN10QtMobility20QAudioEncoderControlD1Ev @ 408 NONAME
-	_ZN10QtMobility20QAudioEncoderControlD2Ev @ 409 NONAME
-	_ZN10QtMobility20QImageEncoderControl11qt_metacallEN11QMetaObject4CallEiPPv @ 410 NONAME
-	_ZN10QtMobility20QImageEncoderControl11qt_metacastEPKc @ 411 NONAME
-	_ZN10QtMobility20QImageEncoderControl16staticMetaObjectE @ 412 NONAME DATA 16
-	_ZN10QtMobility20QImageEncoderControl19getStaticMetaObjectEv @ 413 NONAME
-	_ZN10QtMobility20QImageEncoderControlC2EP7QObject @ 414 NONAME
-	_ZN10QtMobility20QImageEncoderControlD0Ev @ 415 NONAME
-	_ZN10QtMobility20QImageEncoderControlD1Ev @ 416 NONAME
-	_ZN10QtMobility20QImageEncoderControlD2Ev @ 417 NONAME
-	_ZN10QtMobility20QMediaPlaylistReaderD0Ev @ 418 NONAME
-	_ZN10QtMobility20QMediaPlaylistReaderD1Ev @ 419 NONAME
-	_ZN10QtMobility20QMediaPlaylistReaderD2Ev @ 420 NONAME
-	_ZN10QtMobility20QMediaPlaylistWriterD0Ev @ 421 NONAME
-	_ZN10QtMobility20QMediaPlaylistWriterD1Ev @ 422 NONAME
-	_ZN10QtMobility20QMediaPlaylistWriterD2Ev @ 423 NONAME
-	_ZN10QtMobility20QMediaStreamsControl11qt_metacallEN11QMetaObject4CallEiPPv @ 424 NONAME
-	_ZN10QtMobility20QMediaStreamsControl11qt_metacastEPKc @ 425 NONAME
-	_ZN10QtMobility20QMediaStreamsControl14streamsChangedEv @ 426 NONAME
-	_ZN10QtMobility20QMediaStreamsControl16staticMetaObjectE @ 427 NONAME DATA 16
-	_ZN10QtMobility20QMediaStreamsControl19getStaticMetaObjectEv @ 428 NONAME
-	_ZN10QtMobility20QMediaStreamsControl20activeStreamsChangedEv @ 429 NONAME
-	_ZN10QtMobility20QMediaStreamsControlC2EP7QObject @ 430 NONAME
-	_ZN10QtMobility20QMediaStreamsControlD0Ev @ 431 NONAME
-	_ZN10QtMobility20QMediaStreamsControlD1Ev @ 432 NONAME
-	_ZN10QtMobility20QMediaStreamsControlD2Ev @ 433 NONAME
-	_ZN10QtMobility20QVideoEncoderControl11qt_metacallEN11QMetaObject4CallEiPPv @ 434 NONAME
-	_ZN10QtMobility20QVideoEncoderControl11qt_metacastEPKc @ 435 NONAME
-	_ZN10QtMobility20QVideoEncoderControl16staticMetaObjectE @ 436 NONAME DATA 16
-	_ZN10QtMobility20QVideoEncoderControl19getStaticMetaObjectEv @ 437 NONAME
-	_ZN10QtMobility20QVideoEncoderControlC2EP7QObject @ 438 NONAME
-	_ZN10QtMobility20QVideoEncoderControlD0Ev @ 439 NONAME
-	_ZN10QtMobility20QVideoEncoderControlD1Ev @ 440 NONAME
-	_ZN10QtMobility20QVideoEncoderControlD2Ev @ 441 NONAME
-	_ZN10QtMobility21QAudioEncoderSettings10setBitRateEi @ 442 NONAME
-	_ZN10QtMobility21QAudioEncoderSettings10setQualityENS_7QtMedia15EncodingQualityE @ 443 NONAME
-	_ZN10QtMobility21QAudioEncoderSettings13setSampleRateEi @ 444 NONAME
-	_ZN10QtMobility21QAudioEncoderSettings15setChannelCountEi @ 445 NONAME
-	_ZN10QtMobility21QAudioEncoderSettings15setEncodingModeENS_7QtMedia12EncodingModeE @ 446 NONAME
-	_ZN10QtMobility21QAudioEncoderSettings8setCodecERK7QString @ 447 NONAME
-	_ZN10QtMobility21QAudioEncoderSettingsC1ERKS0_ @ 448 NONAME
-	_ZN10QtMobility21QAudioEncoderSettingsC1Ev @ 449 NONAME
-	_ZN10QtMobility21QAudioEncoderSettingsC2ERKS0_ @ 450 NONAME
-	_ZN10QtMobility21QAudioEncoderSettingsC2Ev @ 451 NONAME
-	_ZN10QtMobility21QAudioEncoderSettingsD1Ev @ 452 NONAME
-	_ZN10QtMobility21QAudioEncoderSettingsD2Ev @ 453 NONAME
-	_ZN10QtMobility21QAudioEncoderSettingsaSERKS0_ @ 454 NONAME
-	_ZN10QtMobility21QImageEncoderSettings10setQualityENS_7QtMedia15EncodingQualityE @ 455 NONAME
-	_ZN10QtMobility21QImageEncoderSettings13setResolutionERK5QSize @ 456 NONAME
-	_ZN10QtMobility21QImageEncoderSettings13setResolutionEii @ 457 NONAME
-	_ZN10QtMobility21QImageEncoderSettings8setCodecERK7QString @ 458 NONAME
-	_ZN10QtMobility21QImageEncoderSettingsC1ERKS0_ @ 459 NONAME
-	_ZN10QtMobility21QImageEncoderSettingsC1Ev @ 460 NONAME
-	_ZN10QtMobility21QImageEncoderSettingsC2ERKS0_ @ 461 NONAME
-	_ZN10QtMobility21QImageEncoderSettingsC2Ev @ 462 NONAME
-	_ZN10QtMobility21QImageEncoderSettingsD1Ev @ 463 NONAME
-	_ZN10QtMobility21QImageEncoderSettingsD2Ev @ 464 NONAME
-	_ZN10QtMobility21QImageEncoderSettingsaSERKS0_ @ 465 NONAME
-	_ZN10QtMobility21QMediaPlaylistControl11qt_metacallEN11QMetaObject4CallEiPPv @ 466 NONAME
-	_ZN10QtMobility21QMediaPlaylistControl11qt_metacastEPKc @ 467 NONAME
-	_ZN10QtMobility21QMediaPlaylistControl16staticMetaObjectE @ 468 NONAME DATA 16
-	_ZN10QtMobility21QMediaPlaylistControl19currentIndexChangedEi @ 469 NONAME
-	_ZN10QtMobility21QMediaPlaylistControl19currentMediaChangedERKNS_13QMediaContentE @ 470 NONAME
-	_ZN10QtMobility21QMediaPlaylistControl19getStaticMetaObjectEv @ 471 NONAME
-	_ZN10QtMobility21QMediaPlaylistControl19playbackModeChangedENS_14QMediaPlaylist12PlaybackModeE @ 472 NONAME
-	_ZN10QtMobility21QMediaPlaylistControl23playlistProviderChangedEv @ 473 NONAME
-	_ZN10QtMobility21QMediaPlaylistControlC2EP7QObject @ 474 NONAME
-	_ZN10QtMobility21QMediaPlaylistControlD0Ev @ 475 NONAME
-	_ZN10QtMobility21QMediaPlaylistControlD1Ev @ 476 NONAME
-	_ZN10QtMobility21QMediaPlaylistControlD2Ev @ 477 NONAME
-	_ZN10QtMobility21QMediaRecorderControl11qt_metacallEN11QMetaObject4CallEiPPv @ 478 NONAME
-	_ZN10QtMobility21QMediaRecorderControl11qt_metacastEPKc @ 479 NONAME
-	_ZN10QtMobility21QMediaRecorderControl12stateChangedENS_14QMediaRecorder5StateE @ 480 NONAME
-	_ZN10QtMobility21QMediaRecorderControl15durationChangedEx @ 481 NONAME
-	_ZN10QtMobility21QMediaRecorderControl16staticMetaObjectE @ 482 NONAME DATA 16
-	_ZN10QtMobility21QMediaRecorderControl19getStaticMetaObjectEv @ 483 NONAME
-	_ZN10QtMobility21QMediaRecorderControl5errorEiRK7QString @ 484 NONAME
-	_ZN10QtMobility21QMediaRecorderControlC2EP7QObject @ 485 NONAME
-	_ZN10QtMobility21QMediaRecorderControlD0Ev @ 486 NONAME
-	_ZN10QtMobility21QMediaRecorderControlD1Ev @ 487 NONAME
-	_ZN10QtMobility21QMediaRecorderControlD2Ev @ 488 NONAME
-	_ZN10QtMobility21QMediaServiceProvider11qt_metacallEN11QMetaObject4CallEiPPv @ 489 NONAME
-	_ZN10QtMobility21QMediaServiceProvider11qt_metacastEPKc @ 490 NONAME
-	_ZN10QtMobility21QMediaServiceProvider16staticMetaObjectE @ 491 NONAME DATA 16
-	_ZN10QtMobility21QMediaServiceProvider17deviceDescriptionERK10QByteArrayS3_ @ 492 NONAME
-	_ZN10QtMobility21QMediaServiceProvider19getStaticMetaObjectEv @ 493 NONAME
-	_ZN10QtMobility21QMediaServiceProvider22defaultServiceProviderEv @ 494 NONAME
-	_ZN10QtMobility21QVideoEncoderSettings10setBitRateEi @ 495 NONAME
-	_ZN10QtMobility21QVideoEncoderSettings10setQualityENS_7QtMedia15EncodingQualityE @ 496 NONAME
-	_ZN10QtMobility21QVideoEncoderSettings12setFrameRateEf @ 497 NONAME
-	_ZN10QtMobility21QVideoEncoderSettings13setResolutionERK5QSize @ 498 NONAME
-	_ZN10QtMobility21QVideoEncoderSettings13setResolutionEii @ 499 NONAME
-	_ZN10QtMobility21QVideoEncoderSettings15setEncodingModeENS_7QtMedia12EncodingModeE @ 500 NONAME
-	_ZN10QtMobility21QVideoEncoderSettings8setCodecERK7QString @ 501 NONAME
-	_ZN10QtMobility21QVideoEncoderSettingsC1ERKS0_ @ 502 NONAME
-	_ZN10QtMobility21QVideoEncoderSettingsC1Ev @ 503 NONAME
-	_ZN10QtMobility21QVideoEncoderSettingsC2ERKS0_ @ 504 NONAME
-	_ZN10QtMobility21QVideoEncoderSettingsC2Ev @ 505 NONAME
-	_ZN10QtMobility21QVideoEncoderSettingsD1Ev @ 506 NONAME
-	_ZN10QtMobility21QVideoEncoderSettingsD2Ev @ 507 NONAME
-	_ZN10QtMobility21QVideoEncoderSettingsaSERKS0_ @ 508 NONAME
-	_ZN10QtMobility21QVideoRendererControl11qt_metacallEN11QMetaObject4CallEiPPv @ 509 NONAME
-	_ZN10QtMobility21QVideoRendererControl11qt_metacastEPKc @ 510 NONAME
-	_ZN10QtMobility21QVideoRendererControl16staticMetaObjectE @ 511 NONAME DATA 16
-	_ZN10QtMobility21QVideoRendererControl19getStaticMetaObjectEv @ 512 NONAME
-	_ZN10QtMobility21QVideoRendererControlC2EP7QObject @ 513 NONAME
-	_ZN10QtMobility21QVideoRendererControlD0Ev @ 514 NONAME
-	_ZN10QtMobility21QVideoRendererControlD1Ev @ 515 NONAME
-	_ZN10QtMobility21QVideoRendererControlD2Ev @ 516 NONAME
-	_ZN10QtMobility22QAudioEndpointSelector11qt_metacallEN11QMetaObject4CallEiPPv @ 517 NONAME
-	_ZN10QtMobility22QAudioEndpointSelector11qt_metacastEPKc @ 518 NONAME
-	_ZN10QtMobility22QAudioEndpointSelector16staticMetaObjectE @ 519 NONAME DATA 16
-	_ZN10QtMobility22QAudioEndpointSelector19getStaticMetaObjectEv @ 520 NONAME
-	_ZN10QtMobility22QAudioEndpointSelector21activeEndpointChangedERK7QString @ 521 NONAME
-	_ZN10QtMobility22QAudioEndpointSelector25availableEndpointsChangedEv @ 522 NONAME
-	_ZN10QtMobility22QAudioEndpointSelectorC2EP7QObject @ 523 NONAME
-	_ZN10QtMobility22QAudioEndpointSelectorD0Ev @ 524 NONAME
-	_ZN10QtMobility22QAudioEndpointSelectorD1Ev @ 525 NONAME
-	_ZN10QtMobility22QAudioEndpointSelectorD2Ev @ 526 NONAME
-	_ZN10QtMobility22QMediaContainerControl11qt_metacallEN11QMetaObject4CallEiPPv @ 527 NONAME
-	_ZN10QtMobility22QMediaContainerControl11qt_metacastEPKc @ 528 NONAME
-	_ZN10QtMobility22QMediaContainerControl16staticMetaObjectE @ 529 NONAME DATA 16
-	_ZN10QtMobility22QMediaContainerControl19getStaticMetaObjectEv @ 530 NONAME
-	_ZN10QtMobility22QMediaContainerControlC2EP7QObject @ 531 NONAME
-	_ZN10QtMobility22QMediaContainerControlD0Ev @ 532 NONAME
-	_ZN10QtMobility22QMediaContainerControlD1Ev @ 533 NONAME
-	_ZN10QtMobility22QMediaContainerControlD2Ev @ 534 NONAME
-	_ZN10QtMobility22QMediaPlaylistIOPlugin11qt_metacallEN11QMetaObject4CallEiPPv @ 535 NONAME
-	_ZN10QtMobility22QMediaPlaylistIOPlugin11qt_metacastEPKc @ 536 NONAME
-	_ZN10QtMobility22QMediaPlaylistIOPlugin16staticMetaObjectE @ 537 NONAME DATA 16
-	_ZN10QtMobility22QMediaPlaylistIOPlugin19getStaticMetaObjectEv @ 538 NONAME
-	_ZN10QtMobility22QMediaPlaylistIOPluginC2EP7QObject @ 539 NONAME
-	_ZN10QtMobility22QMediaPlaylistIOPluginD0Ev @ 540 NONAME
-	_ZN10QtMobility22QMediaPlaylistIOPluginD1Ev @ 541 NONAME
-	_ZN10QtMobility22QMediaPlaylistIOPluginD2Ev @ 542 NONAME
-	_ZN10QtMobility22QMediaPlaylistProvider10loadFailedENS_14QMediaPlaylist5ErrorERK7QString @ 543 NONAME
-	_ZN10QtMobility22QMediaPlaylistProvider11insertMediaEiRK5QListINS_13QMediaContentEE @ 544 NONAME
-	_ZN10QtMobility22QMediaPlaylistProvider11insertMediaEiRKNS_13QMediaContentE @ 545 NONAME
-	_ZN10QtMobility22QMediaPlaylistProvider11qt_metacallEN11QMetaObject4CallEiPPv @ 546 NONAME
-	_ZN10QtMobility22QMediaPlaylistProvider11qt_metacastEPKc @ 547 NONAME
-	_ZN10QtMobility22QMediaPlaylistProvider11removeMediaEi @ 548 NONAME
-	_ZN10QtMobility22QMediaPlaylistProvider11removeMediaEii @ 549 NONAME
-	_ZN10QtMobility22QMediaPlaylistProvider12mediaChangedEii @ 550 NONAME
-	_ZN10QtMobility22QMediaPlaylistProvider12mediaRemovedEii @ 551 NONAME
-	_ZN10QtMobility22QMediaPlaylistProvider13mediaInsertedEii @ 552 NONAME
-	_ZN10QtMobility22QMediaPlaylistProvider16staticMetaObjectE @ 553 NONAME DATA 16
-	_ZN10QtMobility22QMediaPlaylistProvider19getStaticMetaObjectEv @ 554 NONAME
-	_ZN10QtMobility22QMediaPlaylistProvider21mediaAboutToBeRemovedEii @ 555 NONAME
-	_ZN10QtMobility22QMediaPlaylistProvider22mediaAboutToBeInsertedEii @ 556 NONAME
-	_ZN10QtMobility22QMediaPlaylistProvider4loadEP9QIODevicePKc @ 557 NONAME
-	_ZN10QtMobility22QMediaPlaylistProvider4loadERK4QUrlPKc @ 558 NONAME
-	_ZN10QtMobility22QMediaPlaylistProvider4saveEP9QIODevicePKc @ 559 NONAME
-	_ZN10QtMobility22QMediaPlaylistProvider4saveERK4QUrlPKc @ 560 NONAME
-	_ZN10QtMobility22QMediaPlaylistProvider5clearEv @ 561 NONAME
-	_ZN10QtMobility22QMediaPlaylistProvider6loadedEv @ 562 NONAME
-	_ZN10QtMobility22QMediaPlaylistProvider7shuffleEv @ 563 NONAME
-	_ZN10QtMobility22QMediaPlaylistProvider8addMediaERK5QListINS_13QMediaContentEE @ 564 NONAME
-	_ZN10QtMobility22QMediaPlaylistProvider8addMediaERKNS_13QMediaContentE @ 565 NONAME
-	_ZN10QtMobility22QMediaPlaylistProviderC2EP7QObject @ 566 NONAME
-	_ZN10QtMobility22QMediaPlaylistProviderC2ERNS_29QMediaPlaylistProviderPrivateEP7QObject @ 567 NONAME
-	_ZN10QtMobility22QMediaPlaylistProviderD0Ev @ 568 NONAME
-	_ZN10QtMobility22QMediaPlaylistProviderD1Ev @ 569 NONAME
-	_ZN10QtMobility22QMediaPlaylistProviderD2Ev @ 570 NONAME
-	_ZN10QtMobility23QMediaPlaylistNavigator11qt_metacallEN11QMetaObject4CallEiPPv @ 571 NONAME
-	_ZN10QtMobility23QMediaPlaylistNavigator11qt_metacastEPKc @ 572 NONAME
-	_ZN10QtMobility23QMediaPlaylistNavigator11setPlaylistEPNS_22QMediaPlaylistProviderE @ 573 NONAME
-	_ZN10QtMobility23QMediaPlaylistNavigator15setPlaybackModeENS_14QMediaPlaylist12PlaybackModeE @ 574 NONAME
-	_ZN10QtMobility23QMediaPlaylistNavigator16staticMetaObjectE @ 575 NONAME DATA 16
-	_ZN10QtMobility23QMediaPlaylistNavigator19currentIndexChangedEi @ 576 NONAME
-	_ZN10QtMobility23QMediaPlaylistNavigator19getStaticMetaObjectEv @ 577 NONAME
-	_ZN10QtMobility23QMediaPlaylistNavigator19playbackModeChangedENS_14QMediaPlaylist12PlaybackModeE @ 578 NONAME
-	_ZN10QtMobility23QMediaPlaylistNavigator23surroundingItemsChangedEv @ 579 NONAME
-	_ZN10QtMobility23QMediaPlaylistNavigator4jumpEi @ 580 NONAME
-	_ZN10QtMobility23QMediaPlaylistNavigator4nextEv @ 581 NONAME
-	_ZN10QtMobility23QMediaPlaylistNavigator8previousEv @ 582 NONAME
-	_ZN10QtMobility23QMediaPlaylistNavigator9activatedERKNS_13QMediaContentE @ 583 NONAME
-	_ZN10QtMobility23QMediaPlaylistNavigatorC1EPNS_22QMediaPlaylistProviderEP7QObject @ 584 NONAME
-	_ZN10QtMobility23QMediaPlaylistNavigatorC2EPNS_22QMediaPlaylistProviderEP7QObject @ 585 NONAME
-	_ZN10QtMobility23QMediaPlaylistNavigatorD0Ev @ 586 NONAME
-	_ZN10QtMobility23QMediaPlaylistNavigatorD1Ev @ 587 NONAME
-	_ZN10QtMobility23QMediaPlaylistNavigatorD2Ev @ 588 NONAME
-	_ZN10QtMobility25QMediaServiceProviderHintC1E6QFlagsINS0_7FeatureEE @ 589 NONAME
-	_ZN10QtMobility25QMediaServiceProviderHintC1ERK10QByteArray @ 590 NONAME
-	_ZN10QtMobility25QMediaServiceProviderHintC1ERK7QStringRK11QStringList @ 591 NONAME
-	_ZN10QtMobility25QMediaServiceProviderHintC1ERKS0_ @ 592 NONAME
-	_ZN10QtMobility25QMediaServiceProviderHintC1Ev @ 593 NONAME
-	_ZN10QtMobility25QMediaServiceProviderHintC2E6QFlagsINS0_7FeatureEE @ 594 NONAME
-	_ZN10QtMobility25QMediaServiceProviderHintC2ERK10QByteArray @ 595 NONAME
-	_ZN10QtMobility25QMediaServiceProviderHintC2ERK7QStringRK11QStringList @ 596 NONAME
-	_ZN10QtMobility25QMediaServiceProviderHintC2ERKS0_ @ 597 NONAME
-	_ZN10QtMobility25QMediaServiceProviderHintC2Ev @ 598 NONAME
-	_ZN10QtMobility25QMediaServiceProviderHintD1Ev @ 599 NONAME
-	_ZN10QtMobility25QMediaServiceProviderHintD2Ev @ 600 NONAME
-	_ZN10QtMobility25QMediaServiceProviderHintaSERKS0_ @ 601 NONAME
-	_ZN10QtMobility27QLocalMediaPlaylistProvider11insertMediaEiRK5QListINS_13QMediaContentEE @ 602 NONAME
-	_ZN10QtMobility27QLocalMediaPlaylistProvider11insertMediaEiRKNS_13QMediaContentE @ 603 NONAME
-	_ZN10QtMobility27QLocalMediaPlaylistProvider11qt_metacallEN11QMetaObject4CallEiPPv @ 604 NONAME
-	_ZN10QtMobility27QLocalMediaPlaylistProvider11qt_metacastEPKc @ 605 NONAME
-	_ZN10QtMobility27QLocalMediaPlaylistProvider11removeMediaEi @ 606 NONAME
-	_ZN10QtMobility27QLocalMediaPlaylistProvider11removeMediaEii @ 607 NONAME
-	_ZN10QtMobility27QLocalMediaPlaylistProvider16staticMetaObjectE @ 608 NONAME DATA 16
-	_ZN10QtMobility27QLocalMediaPlaylistProvider19getStaticMetaObjectEv @ 609 NONAME
-	_ZN10QtMobility27QLocalMediaPlaylistProvider5clearEv @ 610 NONAME
-	_ZN10QtMobility27QLocalMediaPlaylistProvider7shuffleEv @ 611 NONAME
-	_ZN10QtMobility27QLocalMediaPlaylistProvider8addMediaERK5QListINS_13QMediaContentEE @ 612 NONAME
-	_ZN10QtMobility27QLocalMediaPlaylistProvider8addMediaERKNS_13QMediaContentE @ 613 NONAME
-	_ZN10QtMobility27QLocalMediaPlaylistProviderC1EP7QObject @ 614 NONAME
-	_ZN10QtMobility27QLocalMediaPlaylistProviderC2EP7QObject @ 615 NONAME
-	_ZN10QtMobility27QLocalMediaPlaylistProviderD0Ev @ 616 NONAME
-	_ZN10QtMobility27QLocalMediaPlaylistProviderD1Ev @ 617 NONAME
-	_ZN10QtMobility27QLocalMediaPlaylistProviderD2Ev @ 618 NONAME
-	_ZN10QtMobility27QMediaServiceProviderPlugin11qt_metacallEN11QMetaObject4CallEiPPv @ 619 NONAME
-	_ZN10QtMobility27QMediaServiceProviderPlugin11qt_metacastEPKc @ 620 NONAME
-	_ZN10QtMobility27QMediaServiceProviderPlugin16staticMetaObjectE @ 621 NONAME DATA 16
-	_ZN10QtMobility27QMediaServiceProviderPlugin19getStaticMetaObjectEv @ 622 NONAME
-	_ZN10QtMobilityeqERKNS_15QMediaTimeRangeES2_ @ 623 NONAME
-	_ZN10QtMobilityeqERKNS_18QMediaTimeIntervalES2_ @ 624 NONAME
-	_ZN10QtMobilitymiERKNS_15QMediaTimeRangeES2_ @ 625 NONAME
-	_ZN10QtMobilityneERKNS_15QMediaTimeRangeES2_ @ 626 NONAME
-	_ZN10QtMobilityneERKNS_18QMediaTimeIntervalES2_ @ 627 NONAME
-	_ZN10QtMobilityplERKNS_15QMediaTimeRangeES2_ @ 628 NONAME
-	_ZNK10QtMobility11QRadioTuner10metaObjectEv @ 629 NONAME
-	_ZNK10QtMobility11QRadioTuner10stereoModeEv @ 630 NONAME
-	_ZNK10QtMobility11QRadioTuner11errorStringEv @ 631 NONAME
-	_ZNK10QtMobility11QRadioTuner11isAvailableEv @ 632 NONAME
-	_ZNK10QtMobility11QRadioTuner11isSearchingEv @ 633 NONAME
-	_ZNK10QtMobility11QRadioTuner13frequencyStepENS0_4BandE @ 634 NONAME
-	_ZNK10QtMobility11QRadioTuner14frequencyRangeENS0_4BandE @ 635 NONAME
-	_ZNK10QtMobility11QRadioTuner14signalStrengthEv @ 636 NONAME
-	_ZNK10QtMobility11QRadioTuner15isBandSupportedENS0_4BandE @ 637 NONAME
-	_ZNK10QtMobility11QRadioTuner17availabilityErrorEv @ 638 NONAME
-	_ZNK10QtMobility11QRadioTuner4bandEv @ 639 NONAME
-	_ZNK10QtMobility11QRadioTuner5errorEv @ 640 NONAME
-	_ZNK10QtMobility11QRadioTuner5stateEv @ 641 NONAME
-	_ZNK10QtMobility11QRadioTuner6volumeEv @ 642 NONAME
-	_ZNK10QtMobility11QRadioTuner7isMutedEv @ 643 NONAME
-	_ZNK10QtMobility11QRadioTuner8isStereoEv @ 644 NONAME
-	_ZNK10QtMobility11QRadioTuner9frequencyEv @ 645 NONAME
-	_ZNK10QtMobility12QMediaObject10metaObjectEv @ 646 NONAME
-	_ZNK10QtMobility12QMediaObject11isAvailableEv @ 647 NONAME
-	_ZNK10QtMobility12QMediaObject14notifyIntervalEv @ 648 NONAME
-	_ZNK10QtMobility12QMediaObject16extendedMetaDataERK7QString @ 649 NONAME
-	_ZNK10QtMobility12QMediaObject17availabilityErrorEv @ 650 NONAME
-	_ZNK10QtMobility12QMediaObject17availableMetaDataEv @ 651 NONAME
-	_ZNK10QtMobility12QMediaObject18isMetaDataWritableEv @ 652 NONAME
-	_ZNK10QtMobility12QMediaObject19isMetaDataAvailableEv @ 653 NONAME
-	_ZNK10QtMobility12QMediaObject25availableExtendedMetaDataEv @ 654 NONAME
-	_ZNK10QtMobility12QMediaObject7serviceEv @ 655 NONAME
-	_ZNK10QtMobility12QMediaObject8metaDataENS_7QtMedia8MetaDataE @ 656 NONAME
-	_ZNK10QtMobility12QMediaPlayer10isSeekableEv @ 657 NONAME
-	_ZNK10QtMobility12QMediaPlayer10metaObjectEv @ 658 NONAME
-	_ZNK10QtMobility12QMediaPlayer11errorStringEv @ 659 NONAME
-	_ZNK10QtMobility12QMediaPlayer11mediaStatusEv @ 660 NONAME
-	_ZNK10QtMobility12QMediaPlayer11mediaStreamEv @ 661 NONAME
-	_ZNK10QtMobility12QMediaPlayer12bufferStatusEv @ 662 NONAME
-	_ZNK10QtMobility12QMediaPlayer12playbackRateEv @ 663 NONAME
-	_ZNK10QtMobility12QMediaPlayer16isAudioAvailableEv @ 664 NONAME
-	_ZNK10QtMobility12QMediaPlayer16isVideoAvailableEv @ 665 NONAME
-	_ZNK10QtMobility12QMediaPlayer5errorEv @ 666 NONAME
-	_ZNK10QtMobility12QMediaPlayer5mediaEv @ 667 NONAME
-	_ZNK10QtMobility12QMediaPlayer5stateEv @ 668 NONAME
-	_ZNK10QtMobility12QMediaPlayer6volumeEv @ 669 NONAME
-	_ZNK10QtMobility12QMediaPlayer7isMutedEv @ 670 NONAME
-	_ZNK10QtMobility12QMediaPlayer8durationEv @ 671 NONAME
-	_ZNK10QtMobility12QMediaPlayer8positionEv @ 672 NONAME
-	_ZNK10QtMobility12QVideoWidget10brightnessEv @ 673 NONAME
-	_ZNK10QtMobility12QVideoWidget10metaObjectEv @ 674 NONAME
-	_ZNK10QtMobility12QVideoWidget10saturationEv @ 675 NONAME
-	_ZNK10QtMobility12QVideoWidget11mediaObjectEv @ 676 NONAME
-	_ZNK10QtMobility12QVideoWidget15aspectRatioModeEv @ 677 NONAME
-	_ZNK10QtMobility12QVideoWidget3hueEv @ 678 NONAME
-	_ZNK10QtMobility12QVideoWidget8contrastEv @ 679 NONAME
-	_ZNK10QtMobility12QVideoWidget8sizeHintEv @ 680 NONAME
-	_ZNK10QtMobility13QMediaContent12canonicalUrlEv @ 681 NONAME
-	_ZNK10QtMobility13QMediaContent16canonicalRequestEv @ 682 NONAME
-	_ZNK10QtMobility13QMediaContent17canonicalResourceEv @ 683 NONAME
-	_ZNK10QtMobility13QMediaContent6isNullEv @ 684 NONAME
-	_ZNK10QtMobility13QMediaContent9resourcesEv @ 685 NONAME
-	_ZNK10QtMobility13QMediaContenteqERKS0_ @ 686 NONAME
-	_ZNK10QtMobility13QMediaContentneERKS0_ @ 687 NONAME
-	_ZNK10QtMobility13QMediaControl10metaObjectEv @ 688 NONAME
-	_ZNK10QtMobility13QMediaService10metaObjectEv @ 689 NONAME
-	_ZNK10QtMobility14QMediaPlaylist10isReadOnlyEv @ 690 NONAME
-	_ZNK10QtMobility14QMediaPlaylist10mediaCountEv @ 691 NONAME
-	_ZNK10QtMobility14QMediaPlaylist10metaObjectEv @ 692 NONAME
-	_ZNK10QtMobility14QMediaPlaylist11errorStringEv @ 693 NONAME
-	_ZNK10QtMobility14QMediaPlaylist11mediaObjectEv @ 694 NONAME
-	_ZNK10QtMobility14QMediaPlaylist12currentIndexEv @ 695 NONAME
-	_ZNK10QtMobility14QMediaPlaylist12currentMediaEv @ 696 NONAME
-	_ZNK10QtMobility14QMediaPlaylist12playbackModeEv @ 697 NONAME
-	_ZNK10QtMobility14QMediaPlaylist13previousIndexEi @ 698 NONAME
-	_ZNK10QtMobility14QMediaPlaylist5errorEv @ 699 NONAME
-	_ZNK10QtMobility14QMediaPlaylist5mediaEi @ 700 NONAME
-	_ZNK10QtMobility14QMediaPlaylist7isEmptyEv @ 701 NONAME
-	_ZNK10QtMobility14QMediaPlaylist9nextIndexEi @ 702 NONAME
-	_ZNK10QtMobility14QMediaRecorder10metaObjectEv @ 703 NONAME
-	_ZNK10QtMobility14QMediaRecorder11errorStringEv @ 704 NONAME
-	_ZNK10QtMobility14QMediaRecorder11isAvailableEv @ 705 NONAME
-	_ZNK10QtMobility14QMediaRecorder13audioSettingsEv @ 706 NONAME
-	_ZNK10QtMobility14QMediaRecorder13videoSettingsEv @ 707 NONAME
-	_ZNK10QtMobility14QMediaRecorder14outputLocationEv @ 708 NONAME
-	_ZNK10QtMobility14QMediaRecorder17availabilityErrorEv @ 709 NONAME
-	_ZNK10QtMobility14QMediaRecorder17containerMimeTypeEv @ 710 NONAME
-	_ZNK10QtMobility14QMediaRecorder19supportedContainersEv @ 711 NONAME
-	_ZNK10QtMobility14QMediaRecorder19supportedFrameRatesERKNS_21QVideoEncoderSettingsEPb @ 712 NONAME
-	_ZNK10QtMobility14QMediaRecorder20containerDescriptionERK7QString @ 713 NONAME
-	_ZNK10QtMobility14QMediaRecorder20supportedAudioCodecsEv @ 714 NONAME
-	_ZNK10QtMobility14QMediaRecorder20supportedResolutionsERKNS_21QVideoEncoderSettingsEPb @ 715 NONAME
-	_ZNK10QtMobility14QMediaRecorder20supportedVideoCodecsEv @ 716 NONAME
-	_ZNK10QtMobility14QMediaRecorder21audioCodecDescriptionERK7QString @ 717 NONAME
-	_ZNK10QtMobility14QMediaRecorder21videoCodecDescriptionERK7QString @ 718 NONAME
-	_ZNK10QtMobility14QMediaRecorder25supportedAudioSampleRatesERKNS_21QAudioEncoderSettingsEPb @ 719 NONAME
-	_ZNK10QtMobility14QMediaRecorder5errorEv @ 720 NONAME
-	_ZNK10QtMobility14QMediaRecorder5stateEv @ 721 NONAME
-	_ZNK10QtMobility14QMediaRecorder8durationEv @ 722 NONAME
-	_ZNK10QtMobility14QMediaResource10audioCodecEv @ 723 NONAME
-	_ZNK10QtMobility14QMediaResource10resolutionEv @ 724 NONAME
-	_ZNK10QtMobility14QMediaResource10sampleRateEv @ 725 NONAME
-	_ZNK10QtMobility14QMediaResource10videoCodecEv @ 726 NONAME
-	_ZNK10QtMobility14QMediaResource12audioBitRateEv @ 727 NONAME
-	_ZNK10QtMobility14QMediaResource12channelCountEv @ 728 NONAME
-	_ZNK10QtMobility14QMediaResource12videoBitRateEv @ 729 NONAME
-	_ZNK10QtMobility14QMediaResource3urlEv @ 730 NONAME
-	_ZNK10QtMobility14QMediaResource6isNullEv @ 731 NONAME
-	_ZNK10QtMobility14QMediaResource7requestEv @ 732 NONAME
-	_ZNK10QtMobility14QMediaResource8dataSizeEv @ 733 NONAME
-	_ZNK10QtMobility14QMediaResource8languageEv @ 734 NONAME
-	_ZNK10QtMobility14QMediaResource8mimeTypeEv @ 735 NONAME
-	_ZNK10QtMobility14QMediaResourceeqERKS0_ @ 736 NONAME
-	_ZNK10QtMobility14QMediaResourceneERKS0_ @ 737 NONAME
-	_ZNK10QtMobility15QMediaTimeRange10latestTimeEv @ 738 NONAME
-	_ZNK10QtMobility15QMediaTimeRange12earliestTimeEv @ 739 NONAME
-	_ZNK10QtMobility15QMediaTimeRange12isContinuousEv @ 740 NONAME
-	_ZNK10QtMobility15QMediaTimeRange7isEmptyEv @ 741 NONAME
-	_ZNK10QtMobility15QMediaTimeRange8containsEx @ 742 NONAME
-	_ZNK10QtMobility15QMediaTimeRange9intervalsEv @ 743 NONAME
-	_ZNK10QtMobility16QMetaDataControl10metaObjectEv @ 744 NONAME
-	_ZNK10QtMobility17QMediaImageViewer10metaObjectEv @ 745 NONAME
-	_ZNK10QtMobility17QMediaImageViewer11elapsedTimeEv @ 746 NONAME
-	_ZNK10QtMobility17QMediaImageViewer11mediaStatusEv @ 747 NONAME
-	_ZNK10QtMobility17QMediaImageViewer5mediaEv @ 748 NONAME
-	_ZNK10QtMobility17QMediaImageViewer5stateEv @ 749 NONAME
-	_ZNK10QtMobility17QMediaImageViewer7timeoutEv @ 750 NONAME
-	_ZNK10QtMobility18QGraphicsVideoItem10metaObjectEv @ 751 NONAME
-	_ZNK10QtMobility18QGraphicsVideoItem10nativeSizeEv @ 752 NONAME
-	_ZNK10QtMobility18QGraphicsVideoItem11mediaObjectEv @ 753 NONAME
-	_ZNK10QtMobility18QGraphicsVideoItem12boundingRectEv @ 754 NONAME
-	_ZNK10QtMobility18QGraphicsVideoItem15aspectRatioModeEv @ 755 NONAME
-	_ZNK10QtMobility18QGraphicsVideoItem4sizeEv @ 756 NONAME
-	_ZNK10QtMobility18QGraphicsVideoItem6offsetEv @ 757 NONAME
-	_ZNK10QtMobility18QMediaTimeInterval10normalizedEv @ 758 NONAME
-	_ZNK10QtMobility18QMediaTimeInterval10translatedEx @ 759 NONAME
-	_ZNK10QtMobility18QMediaTimeInterval3endEv @ 760 NONAME
-	_ZNK10QtMobility18QMediaTimeInterval5startEv @ 761 NONAME
-	_ZNK10QtMobility18QMediaTimeInterval8containsEx @ 762 NONAME
-	_ZNK10QtMobility18QMediaTimeInterval8isNormalEv @ 763 NONAME
-	_ZNK10QtMobility18QRadioTunerControl10metaObjectEv @ 764 NONAME
-	_ZNK10QtMobility19QAudioCaptureSource10metaObjectEv @ 765 NONAME
-	_ZNK10QtMobility19QAudioCaptureSource11audioInputsEv @ 766 NONAME
-	_ZNK10QtMobility19QAudioCaptureSource11isAvailableEv @ 767 NONAME
-	_ZNK10QtMobility19QAudioCaptureSource16activeAudioInputEv @ 768 NONAME
-	_ZNK10QtMobility19QAudioCaptureSource16audioDescriptionERK7QString @ 769 NONAME
-	_ZNK10QtMobility19QAudioCaptureSource17availabilityErrorEv @ 770 NONAME
-	_ZNK10QtMobility19QAudioCaptureSource17defaultAudioInputEv @ 771 NONAME
-	_ZNK10QtMobility19QMediaPlayerControl10metaObjectEv @ 772 NONAME
-	_ZNK10QtMobility19QVideoDeviceControl10metaObjectEv @ 773 NONAME
-	_ZNK10QtMobility19QVideoOutputControl10metaObjectEv @ 774 NONAME
-	_ZNK10QtMobility19QVideoWidgetControl10metaObjectEv @ 775 NONAME
-	_ZNK10QtMobility19QVideoWindowControl10metaObjectEv @ 776 NONAME
-	_ZNK10QtMobility20QAudioEncoderControl10metaObjectEv @ 777 NONAME
-	_ZNK10QtMobility20QImageEncoderControl10metaObjectEv @ 778 NONAME
-	_ZNK10QtMobility20QMediaStreamsControl10metaObjectEv @ 779 NONAME
-	_ZNK10QtMobility20QVideoEncoderControl10metaObjectEv @ 780 NONAME
-	_ZNK10QtMobility21QAudioEncoderSettings10sampleRateEv @ 781 NONAME
-	_ZNK10QtMobility21QAudioEncoderSettings12channelCountEv @ 782 NONAME
-	_ZNK10QtMobility21QAudioEncoderSettings12encodingModeEv @ 783 NONAME
-	_ZNK10QtMobility21QAudioEncoderSettings5codecEv @ 784 NONAME
-	_ZNK10QtMobility21QAudioEncoderSettings6isNullEv @ 785 NONAME
-	_ZNK10QtMobility21QAudioEncoderSettings7bitRateEv @ 786 NONAME
-	_ZNK10QtMobility21QAudioEncoderSettings7qualityEv @ 787 NONAME
-	_ZNK10QtMobility21QAudioEncoderSettingseqERKS0_ @ 788 NONAME
-	_ZNK10QtMobility21QAudioEncoderSettingsneERKS0_ @ 789 NONAME
-	_ZNK10QtMobility21QImageEncoderSettings10resolutionEv @ 790 NONAME
-	_ZNK10QtMobility21QImageEncoderSettings5codecEv @ 791 NONAME
-	_ZNK10QtMobility21QImageEncoderSettings6isNullEv @ 792 NONAME
-	_ZNK10QtMobility21QImageEncoderSettings7qualityEv @ 793 NONAME
-	_ZNK10QtMobility21QImageEncoderSettingseqERKS0_ @ 794 NONAME
-	_ZNK10QtMobility21QImageEncoderSettingsneERKS0_ @ 795 NONAME
-	_ZNK10QtMobility21QMediaPlaylistControl10metaObjectEv @ 796 NONAME
-	_ZNK10QtMobility21QMediaRecorderControl10metaObjectEv @ 797 NONAME
-	_ZNK10QtMobility21QMediaServiceProvider10hasSupportERK10QByteArrayRK7QStringRK11QStringListi @ 798 NONAME
-	_ZNK10QtMobility21QMediaServiceProvider10metaObjectEv @ 799 NONAME
-	_ZNK10QtMobility21QMediaServiceProvider18supportedMimeTypesERK10QByteArrayi @ 800 NONAME
-	_ZNK10QtMobility21QMediaServiceProvider7devicesERK10QByteArray @ 801 NONAME
-	_ZNK10QtMobility21QVideoEncoderSettings10resolutionEv @ 802 NONAME
-	_ZNK10QtMobility21QVideoEncoderSettings12encodingModeEv @ 803 NONAME
-	_ZNK10QtMobility21QVideoEncoderSettings5codecEv @ 804 NONAME
-	_ZNK10QtMobility21QVideoEncoderSettings6isNullEv @ 805 NONAME
-	_ZNK10QtMobility21QVideoEncoderSettings7bitRateEv @ 806 NONAME
-	_ZNK10QtMobility21QVideoEncoderSettings7qualityEv @ 807 NONAME
-	_ZNK10QtMobility21QVideoEncoderSettings9frameRateEv @ 808 NONAME
-	_ZNK10QtMobility21QVideoEncoderSettingseqERKS0_ @ 809 NONAME
-	_ZNK10QtMobility21QVideoEncoderSettingsneERKS0_ @ 810 NONAME
-	_ZNK10QtMobility21QVideoRendererControl10metaObjectEv @ 811 NONAME
-	_ZNK10QtMobility22QAudioEndpointSelector10metaObjectEv @ 812 NONAME
-	_ZNK10QtMobility22QMediaContainerControl10metaObjectEv @ 813 NONAME
-	_ZNK10QtMobility22QMediaPlaylistIOPlugin10metaObjectEv @ 814 NONAME
-	_ZNK10QtMobility22QMediaPlaylistProvider10isReadOnlyEv @ 815 NONAME
-	_ZNK10QtMobility22QMediaPlaylistProvider10metaObjectEv @ 816 NONAME
-	_ZNK10QtMobility23QMediaPlaylistNavigator10metaObjectEv @ 817 NONAME
-	_ZNK10QtMobility23QMediaPlaylistNavigator11currentItemEv @ 818 NONAME
-	_ZNK10QtMobility23QMediaPlaylistNavigator12currentIndexEv @ 819 NONAME
-	_ZNK10QtMobility23QMediaPlaylistNavigator12playbackModeEv @ 820 NONAME
-	_ZNK10QtMobility23QMediaPlaylistNavigator12previousItemEi @ 821 NONAME
-	_ZNK10QtMobility23QMediaPlaylistNavigator13previousIndexEi @ 822 NONAME
-	_ZNK10QtMobility23QMediaPlaylistNavigator6itemAtEi @ 823 NONAME
-	_ZNK10QtMobility23QMediaPlaylistNavigator8nextItemEi @ 824 NONAME
-	_ZNK10QtMobility23QMediaPlaylistNavigator8playlistEv @ 825 NONAME
-	_ZNK10QtMobility23QMediaPlaylistNavigator9nextIndexEi @ 826 NONAME
-	_ZNK10QtMobility25QMediaServiceProviderHint4typeEv @ 827 NONAME
-	_ZNK10QtMobility25QMediaServiceProviderHint6codecsEv @ 828 NONAME
-	_ZNK10QtMobility25QMediaServiceProviderHint6deviceEv @ 829 NONAME
-	_ZNK10QtMobility25QMediaServiceProviderHint6isNullEv @ 830 NONAME
-	_ZNK10QtMobility25QMediaServiceProviderHint8featuresEv @ 831 NONAME
-	_ZNK10QtMobility25QMediaServiceProviderHint8mimeTypeEv @ 832 NONAME
-	_ZNK10QtMobility25QMediaServiceProviderHinteqERKS0_ @ 833 NONAME
-	_ZNK10QtMobility25QMediaServiceProviderHintneERKS0_ @ 834 NONAME
-	_ZNK10QtMobility27QLocalMediaPlaylistProvider10isReadOnlyEv @ 835 NONAME
-	_ZNK10QtMobility27QLocalMediaPlaylistProvider10mediaCountEv @ 836 NONAME
-	_ZNK10QtMobility27QLocalMediaPlaylistProvider10metaObjectEv @ 837 NONAME
-	_ZNK10QtMobility27QLocalMediaPlaylistProvider5mediaEi @ 838 NONAME
-	_ZNK10QtMobility27QMediaServiceProviderPlugin10metaObjectEv @ 839 NONAME
-	_ZTIN10QtMobility11QRadioTunerE @ 840 NONAME
-	_ZTIN10QtMobility12QMediaObjectE @ 841 NONAME
-	_ZTIN10QtMobility12QMediaPlayerE @ 842 NONAME
-	_ZTIN10QtMobility12QVideoWidgetE @ 843 NONAME
-	_ZTIN10QtMobility13QMediaControlE @ 844 NONAME
-	_ZTIN10QtMobility13QMediaServiceE @ 845 NONAME
-	_ZTIN10QtMobility14QMediaPlaylistE @ 846 NONAME
-	_ZTIN10QtMobility14QMediaRecorderE @ 847 NONAME
-	_ZTIN10QtMobility16QMetaDataControlE @ 848 NONAME
-	_ZTIN10QtMobility17QMediaImageViewerE @ 849 NONAME
-	_ZTIN10QtMobility18QGraphicsVideoItemE @ 850 NONAME
-	_ZTIN10QtMobility18QRadioTunerControlE @ 851 NONAME
-	_ZTIN10QtMobility19QAudioCaptureSourceE @ 852 NONAME
-	_ZTIN10QtMobility19QMediaPlayerControlE @ 853 NONAME
-	_ZTIN10QtMobility19QVideoDeviceControlE @ 854 NONAME
-	_ZTIN10QtMobility19QVideoOutputControlE @ 855 NONAME
-	_ZTIN10QtMobility19QVideoWidgetControlE @ 856 NONAME
-	_ZTIN10QtMobility19QVideoWindowControlE @ 857 NONAME
-	_ZTIN10QtMobility20QAudioEncoderControlE @ 858 NONAME
-	_ZTIN10QtMobility20QImageEncoderControlE @ 859 NONAME
-	_ZTIN10QtMobility20QMediaPlaylistReaderE @ 860 NONAME
-	_ZTIN10QtMobility20QMediaPlaylistWriterE @ 861 NONAME
-	_ZTIN10QtMobility20QMediaStreamsControlE @ 862 NONAME
-	_ZTIN10QtMobility20QVideoEncoderControlE @ 863 NONAME
-	_ZTIN10QtMobility21QMediaPlaylistControlE @ 864 NONAME
-	_ZTIN10QtMobility21QMediaRecorderControlE @ 865 NONAME
-	_ZTIN10QtMobility21QMediaServiceProviderE @ 866 NONAME
-	_ZTIN10QtMobility21QVideoRendererControlE @ 867 NONAME
-	_ZTIN10QtMobility22QAudioEndpointSelectorE @ 868 NONAME
-	_ZTIN10QtMobility22QMediaContainerControlE @ 869 NONAME
-	_ZTIN10QtMobility22QMediaPlaylistIOPluginE @ 870 NONAME
-	_ZTIN10QtMobility22QMediaPlaylistProviderE @ 871 NONAME
-	_ZTIN10QtMobility23QMediaPlaylistNavigatorE @ 872 NONAME
-	_ZTIN10QtMobility25QMediaPlaylistIOInterfaceE @ 873 NONAME
-	_ZTIN10QtMobility27QLocalMediaPlaylistProviderE @ 874 NONAME
-	_ZTIN10QtMobility27QMediaServiceProviderPluginE @ 875 NONAME
-	_ZTIN10QtMobility37QMediaServiceProviderFactoryInterfaceE @ 876 NONAME
-	_ZTVN10QtMobility11QRadioTunerE @ 877 NONAME
-	_ZTVN10QtMobility12QMediaObjectE @ 878 NONAME
-	_ZTVN10QtMobility12QMediaPlayerE @ 879 NONAME
-	_ZTVN10QtMobility12QVideoWidgetE @ 880 NONAME
-	_ZTVN10QtMobility13QMediaControlE @ 881 NONAME
-	_ZTVN10QtMobility13QMediaServiceE @ 882 NONAME
-	_ZTVN10QtMobility14QMediaPlaylistE @ 883 NONAME
-	_ZTVN10QtMobility14QMediaRecorderE @ 884 NONAME
-	_ZTVN10QtMobility16QMetaDataControlE @ 885 NONAME
-	_ZTVN10QtMobility17QMediaImageViewerE @ 886 NONAME
-	_ZTVN10QtMobility18QGraphicsVideoItemE @ 887 NONAME
-	_ZTVN10QtMobility18QRadioTunerControlE @ 888 NONAME
-	_ZTVN10QtMobility19QAudioCaptureSourceE @ 889 NONAME
-	_ZTVN10QtMobility19QMediaPlayerControlE @ 890 NONAME
-	_ZTVN10QtMobility19QVideoDeviceControlE @ 891 NONAME
-	_ZTVN10QtMobility19QVideoOutputControlE @ 892 NONAME
-	_ZTVN10QtMobility19QVideoWidgetControlE @ 893 NONAME
-	_ZTVN10QtMobility19QVideoWindowControlE @ 894 NONAME
-	_ZTVN10QtMobility20QAudioEncoderControlE @ 895 NONAME
-	_ZTVN10QtMobility20QImageEncoderControlE @ 896 NONAME
-	_ZTVN10QtMobility20QMediaPlaylistReaderE @ 897 NONAME
-	_ZTVN10QtMobility20QMediaPlaylistWriterE @ 898 NONAME
-	_ZTVN10QtMobility20QMediaStreamsControlE @ 899 NONAME
-	_ZTVN10QtMobility20QVideoEncoderControlE @ 900 NONAME
-	_ZTVN10QtMobility21QMediaPlaylistControlE @ 901 NONAME
-	_ZTVN10QtMobility21QMediaRecorderControlE @ 902 NONAME
-	_ZTVN10QtMobility21QMediaServiceProviderE @ 903 NONAME
-	_ZTVN10QtMobility21QVideoRendererControlE @ 904 NONAME
-	_ZTVN10QtMobility22QAudioEndpointSelectorE @ 905 NONAME
-	_ZTVN10QtMobility22QMediaContainerControlE @ 906 NONAME
-	_ZTVN10QtMobility22QMediaPlaylistIOPluginE @ 907 NONAME
-	_ZTVN10QtMobility22QMediaPlaylistProviderE @ 908 NONAME
-	_ZTVN10QtMobility23QMediaPlaylistNavigatorE @ 909 NONAME
-	_ZTVN10QtMobility27QLocalMediaPlaylistProviderE @ 910 NONAME
-	_ZTVN10QtMobility27QMediaServiceProviderPluginE @ 911 NONAME
-	_ZThn8_N10QtMobility12QVideoWidgetD0Ev @ 912 NONAME
-	_ZThn8_N10QtMobility12QVideoWidgetD1Ev @ 913 NONAME
-	_ZThn8_N10QtMobility18QGraphicsVideoItem10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 914 NONAME
-	_ZThn8_N10QtMobility18QGraphicsVideoItem5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 915 NONAME
-	_ZThn8_N10QtMobility18QGraphicsVideoItemD0Ev @ 916 NONAME
-	_ZThn8_N10QtMobility18QGraphicsVideoItemD1Ev @ 917 NONAME
-	_ZThn8_N10QtMobility22QMediaPlaylistIOPluginD0Ev @ 918 NONAME
-	_ZThn8_N10QtMobility22QMediaPlaylistIOPluginD1Ev @ 919 NONAME
-	_ZThn8_NK10QtMobility18QGraphicsVideoItem12boundingRectEv @ 920 NONAME
+	_ZN11QRadioTuner11bandChangedENS_4BandE @ 1 NONAME
+	_ZN11QRadioTuner11qt_metacallEN11QMetaObject4CallEiPPv @ 2 NONAME
+	_ZN11QRadioTuner11qt_metacastEPKc @ 3 NONAME
+	_ZN11QRadioTuner12cancelSearchEv @ 4 NONAME
+	_ZN11QRadioTuner12mutedChangedEb @ 5 NONAME
+	_ZN11QRadioTuner12setFrequencyEi @ 6 NONAME
+	_ZN11QRadioTuner12stateChangedENS_5StateE @ 7 NONAME
+	_ZN11QRadioTuner13searchForwardEv @ 8 NONAME
+	_ZN11QRadioTuner13setStereoModeENS_10StereoModeE @ 9 NONAME
+	_ZN11QRadioTuner13volumeChangedEi @ 10 NONAME
+	_ZN11QRadioTuner14searchBackwardEv @ 11 NONAME
+	_ZN11QRadioTuner16frequencyChangedEi @ 12 NONAME
+	_ZN11QRadioTuner16searchingChangedEb @ 13 NONAME
+	_ZN11QRadioTuner16staticMetaObjectE @ 14 NONAME DATA 16
+	_ZN11QRadioTuner19getStaticMetaObjectEv @ 15 NONAME
+	_ZN11QRadioTuner19stereoStatusChangedEb @ 16 NONAME
+	_ZN11QRadioTuner21signalStrengthChangedEi @ 17 NONAME
+	_ZN11QRadioTuner4stopEv @ 18 NONAME
+	_ZN11QRadioTuner5errorENS_5ErrorE @ 19 NONAME
+	_ZN11QRadioTuner5startEv @ 20 NONAME
+	_ZN11QRadioTuner7setBandENS_4BandE @ 21 NONAME
+	_ZN11QRadioTuner8setMutedEb @ 22 NONAME
+	_ZN11QRadioTuner9setVolumeEi @ 23 NONAME
+	_ZN11QRadioTunerC1EP7QObjectP21QMediaServiceProvider @ 24 NONAME
+	_ZN11QRadioTunerC2EP7QObjectP21QMediaServiceProvider @ 25 NONAME
+	_ZN11QRadioTunerD0Ev @ 26 NONAME
+	_ZN11QRadioTunerD1Ev @ 27 NONAME
+	_ZN11QRadioTunerD2Ev @ 28 NONAME
+	_ZN12QMediaObject11qt_metacallEN11QMetaObject4CallEiPPv @ 29 NONAME
+	_ZN12QMediaObject11qt_metacastEPKc @ 30 NONAME
+	_ZN12QMediaObject11setMetaDataEN15QtMediaServices8MetaDataERK8QVariant @ 31 NONAME
+	_ZN12QMediaObject13setupMetaDataEv @ 32 NONAME
+	_ZN12QMediaObject15metaDataChangedEv @ 33 NONAME
+	_ZN12QMediaObject16addPropertyWatchERK10QByteArray @ 34 NONAME
+	_ZN12QMediaObject16staticMetaObjectE @ 35 NONAME DATA 16
+	_ZN12QMediaObject17setNotifyIntervalEi @ 36 NONAME
+	_ZN12QMediaObject19availabilityChangedEb @ 37 NONAME
+	_ZN12QMediaObject19getStaticMetaObjectEv @ 38 NONAME
+	_ZN12QMediaObject19removePropertyWatchERK10QByteArray @ 39 NONAME
+	_ZN12QMediaObject19setExtendedMetaDataERK7QStringRK8QVariant @ 40 NONAME
+	_ZN12QMediaObject21notifyIntervalChangedEi @ 41 NONAME
+	_ZN12QMediaObject23metaDataWritableChangedEb @ 42 NONAME
+	_ZN12QMediaObject24metaDataAvailableChangedEb @ 43 NONAME
+	_ZN12QMediaObject4bindEP7QObject @ 44 NONAME
+	_ZN12QMediaObject6unbindEP7QObject @ 45 NONAME
+	_ZN12QMediaObjectC1EP7QObjectP13QMediaService @ 46 NONAME
+	_ZN12QMediaObjectC1ER19QMediaObjectPrivateP7QObjectP13QMediaService @ 47 NONAME
+	_ZN12QMediaObjectC2EP7QObjectP13QMediaService @ 48 NONAME
+	_ZN12QMediaObjectC2ER19QMediaObjectPrivateP7QObjectP13QMediaService @ 49 NONAME
+	_ZN12QMediaObjectD0Ev @ 50 NONAME
+	_ZN12QMediaObjectD1Ev @ 51 NONAME
+	_ZN12QMediaObjectD2Ev @ 52 NONAME
+	_ZN12QMediaPlayer10hasSupportERK7QStringRK11QStringList6QFlagsINS_4FlagEE @ 53 NONAME
+	_ZN12QMediaPlayer11qt_metacallEN11QMetaObject4CallEiPPv @ 54 NONAME
+	_ZN12QMediaPlayer11qt_metacastEPKc @ 55 NONAME
+	_ZN12QMediaPlayer11setPositionEx @ 56 NONAME
+	_ZN12QMediaPlayer12mediaChangedERK13QMediaContent @ 57 NONAME
+	_ZN12QMediaPlayer12mutedChangedEb @ 58 NONAME
+	_ZN12QMediaPlayer12stateChangedENS_5StateE @ 59 NONAME
+	_ZN12QMediaPlayer13volumeChangedEi @ 60 NONAME
+	_ZN12QMediaPlayer15durationChangedEx @ 61 NONAME
+	_ZN12QMediaPlayer15positionChangedEx @ 62 NONAME
+	_ZN12QMediaPlayer15seekableChangedEb @ 63 NONAME
+	_ZN12QMediaPlayer15setPlaybackRateEf @ 64 NONAME
+	_ZN12QMediaPlayer16staticMetaObjectE @ 65 NONAME DATA 16
+	_ZN12QMediaPlayer18mediaStatusChangedENS_11MediaStatusE @ 66 NONAME
+	_ZN12QMediaPlayer18supportedMimeTypesE6QFlagsINS_4FlagEE @ 67 NONAME
+	_ZN12QMediaPlayer19bufferStatusChangedEi @ 68 NONAME
+	_ZN12QMediaPlayer19getStaticMetaObjectEv @ 69 NONAME
+	_ZN12QMediaPlayer19playbackRateChangedEf @ 70 NONAME
+	_ZN12QMediaPlayer21audioAvailableChangedEb @ 71 NONAME
+	_ZN12QMediaPlayer21videoAvailableChangedEb @ 72 NONAME
+	_ZN12QMediaPlayer4bindEP7QObject @ 73 NONAME
+	_ZN12QMediaPlayer4playEv @ 74 NONAME
+	_ZN12QMediaPlayer4stopEv @ 75 NONAME
+	_ZN12QMediaPlayer5errorENS_5ErrorE @ 76 NONAME
+	_ZN12QMediaPlayer5pauseEv @ 77 NONAME
+	_ZN12QMediaPlayer6unbindEP7QObject @ 78 NONAME
+	_ZN12QMediaPlayer8setMediaERK13QMediaContentP9QIODevice @ 79 NONAME
+	_ZN12QMediaPlayer8setMutedEb @ 80 NONAME
+	_ZN12QMediaPlayer9setVolumeEi @ 81 NONAME
+	_ZN12QMediaPlayerC1EP7QObject6QFlagsINS_4FlagEEP21QMediaServiceProvider @ 82 NONAME
+	_ZN12QMediaPlayerC2EP7QObject6QFlagsINS_4FlagEEP21QMediaServiceProvider @ 83 NONAME
+	_ZN12QMediaPlayerD0Ev @ 84 NONAME
+	_ZN12QMediaPlayerD1Ev @ 85 NONAME
+	_ZN12QMediaPlayerD2Ev @ 86 NONAME
+	_ZN12QVideoWidget10hueChangedEi @ 87 NONAME
+	_ZN12QVideoWidget10paintEventEP11QPaintEvent @ 88 NONAME
+	_ZN12QVideoWidget11qt_metacallEN11QMetaObject4CallEiPPv @ 89 NONAME
+	_ZN12QVideoWidget11qt_metacastEPKc @ 90 NONAME
+	_ZN12QVideoWidget11resizeEventEP12QResizeEvent @ 91 NONAME
+	_ZN12QVideoWidget11setContrastEi @ 92 NONAME
+	_ZN12QVideoWidget13setBrightnessEi @ 93 NONAME
+	_ZN12QVideoWidget13setFullScreenEb @ 94 NONAME
+	_ZN12QVideoWidget13setSaturationEi @ 95 NONAME
+	_ZN12QVideoWidget14setMediaObjectEP12QMediaObject @ 96 NONAME
+	_ZN12QVideoWidget15contrastChangedEi @ 97 NONAME
+	_ZN12QVideoWidget16staticMetaObjectE @ 98 NONAME DATA 16
+	_ZN12QVideoWidget17brightnessChangedEi @ 99 NONAME
+	_ZN12QVideoWidget17fullScreenChangedEb @ 100 NONAME
+	_ZN12QVideoWidget17saturationChangedEi @ 101 NONAME
+	_ZN12QVideoWidget18setAspectRatioModeEN2Qt15AspectRatioModeE @ 102 NONAME
+	_ZN12QVideoWidget19getStaticMetaObjectEv @ 103 NONAME
+	_ZN12QVideoWidget5eventEP6QEvent @ 104 NONAME
+	_ZN12QVideoWidget6setHueEi @ 105 NONAME
+	_ZN12QVideoWidget9hideEventEP10QHideEvent @ 106 NONAME
+	_ZN12QVideoWidget9moveEventEP10QMoveEvent @ 107 NONAME
+	_ZN12QVideoWidget9showEventEP10QShowEvent @ 108 NONAME
+	_ZN12QVideoWidgetC1EP7QWidget @ 109 NONAME
+	_ZN12QVideoWidgetC2EP7QWidget @ 110 NONAME
+	_ZN12QVideoWidgetD0Ev @ 111 NONAME
+	_ZN12QVideoWidgetD1Ev @ 112 NONAME
+	_ZN12QVideoWidgetD2Ev @ 113 NONAME
+	_ZN13QMediaContentC1ERK14QMediaResource @ 114 NONAME
+	_ZN13QMediaContentC1ERK15QNetworkRequest @ 115 NONAME
+	_ZN13QMediaContentC1ERK4QUrl @ 116 NONAME
+	_ZN13QMediaContentC1ERK5QListI14QMediaResourceE @ 117 NONAME
+	_ZN13QMediaContentC1ERKS_ @ 118 NONAME
+	_ZN13QMediaContentC1Ev @ 119 NONAME
+	_ZN13QMediaContentC2ERK14QMediaResource @ 120 NONAME
+	_ZN13QMediaContentC2ERK15QNetworkRequest @ 121 NONAME
+	_ZN13QMediaContentC2ERK4QUrl @ 122 NONAME
+	_ZN13QMediaContentC2ERK5QListI14QMediaResourceE @ 123 NONAME
+	_ZN13QMediaContentC2ERKS_ @ 124 NONAME
+	_ZN13QMediaContentC2Ev @ 125 NONAME
+	_ZN13QMediaContentD1Ev @ 126 NONAME
+	_ZN13QMediaContentD2Ev @ 127 NONAME
+	_ZN13QMediaContentaSERKS_ @ 128 NONAME
+	_ZN13QMediaControl11qt_metacallEN11QMetaObject4CallEiPPv @ 129 NONAME
+	_ZN13QMediaControl11qt_metacastEPKc @ 130 NONAME
+	_ZN13QMediaControl16staticMetaObjectE @ 131 NONAME DATA 16
+	_ZN13QMediaControl19getStaticMetaObjectEv @ 132 NONAME
+	_ZN13QMediaControlC1EP7QObject @ 133 NONAME
+	_ZN13QMediaControlC1ER20QMediaControlPrivateP7QObject @ 134 NONAME
+	_ZN13QMediaControlC2EP7QObject @ 135 NONAME
+	_ZN13QMediaControlC2ER20QMediaControlPrivateP7QObject @ 136 NONAME
+	_ZN13QMediaControlD0Ev @ 137 NONAME
+	_ZN13QMediaControlD1Ev @ 138 NONAME
+	_ZN13QMediaControlD2Ev @ 139 NONAME
+	_ZN13QMediaService11qt_metacallEN11QMetaObject4CallEiPPv @ 140 NONAME
+	_ZN13QMediaService11qt_metacastEPKc @ 141 NONAME
+	_ZN13QMediaService16staticMetaObjectE @ 142 NONAME DATA 16
+	_ZN13QMediaService19getStaticMetaObjectEv @ 143 NONAME
+	_ZN13QMediaServiceC2EP7QObject @ 144 NONAME
+	_ZN13QMediaServiceC2ER20QMediaServicePrivateP7QObject @ 145 NONAME
+	_ZN13QMediaServiceD0Ev @ 146 NONAME
+	_ZN13QMediaServiceD1Ev @ 147 NONAME
+	_ZN13QMediaServiceD2Ev @ 148 NONAME
+	_ZN14QMediaPlaylist10loadFailedEv @ 149 NONAME
+	_ZN14QMediaPlaylist11insertMediaEiRK13QMediaContent @ 150 NONAME
+	_ZN14QMediaPlaylist11insertMediaEiRK5QListI13QMediaContentE @ 151 NONAME
+	_ZN14QMediaPlaylist11qt_metacallEN11QMetaObject4CallEiPPv @ 152 NONAME
+	_ZN14QMediaPlaylist11qt_metacastEPKc @ 153 NONAME
+	_ZN14QMediaPlaylist11removeMediaEi @ 154 NONAME
+	_ZN14QMediaPlaylist11removeMediaEii @ 155 NONAME
+	_ZN14QMediaPlaylist12mediaChangedEii @ 156 NONAME
+	_ZN14QMediaPlaylist12mediaRemovedEii @ 157 NONAME
+	_ZN14QMediaPlaylist13mediaInsertedEii @ 158 NONAME
+	_ZN14QMediaPlaylist14setMediaObjectEP12QMediaObject @ 159 NONAME
+	_ZN14QMediaPlaylist15setCurrentIndexEi @ 160 NONAME
+	_ZN14QMediaPlaylist15setPlaybackModeENS_12PlaybackModeE @ 161 NONAME
+	_ZN14QMediaPlaylist16staticMetaObjectE @ 162 NONAME DATA 16
+	_ZN14QMediaPlaylist19currentIndexChangedEi @ 163 NONAME
+	_ZN14QMediaPlaylist19currentMediaChangedERK13QMediaContent @ 164 NONAME
+	_ZN14QMediaPlaylist19getStaticMetaObjectEv @ 165 NONAME
+	_ZN14QMediaPlaylist19playbackModeChangedENS_12PlaybackModeE @ 166 NONAME
+	_ZN14QMediaPlaylist21mediaAboutToBeRemovedEii @ 167 NONAME
+	_ZN14QMediaPlaylist22mediaAboutToBeInsertedEii @ 168 NONAME
+	_ZN14QMediaPlaylist4loadEP9QIODevicePKc @ 169 NONAME
+	_ZN14QMediaPlaylist4loadERK4QUrlPKc @ 170 NONAME
+	_ZN14QMediaPlaylist4nextEv @ 171 NONAME
+	_ZN14QMediaPlaylist4saveEP9QIODevicePKc @ 172 NONAME
+	_ZN14QMediaPlaylist4saveERK4QUrlPKc @ 173 NONAME
+	_ZN14QMediaPlaylist5clearEv @ 174 NONAME
+	_ZN14QMediaPlaylist6loadedEv @ 175 NONAME
+	_ZN14QMediaPlaylist7shuffleEv @ 176 NONAME
+	_ZN14QMediaPlaylist8addMediaERK13QMediaContent @ 177 NONAME
+	_ZN14QMediaPlaylist8addMediaERK5QListI13QMediaContentE @ 178 NONAME
+	_ZN14QMediaPlaylist8previousEv @ 179 NONAME
+	_ZN14QMediaPlaylistC1EP7QObject @ 180 NONAME
+	_ZN14QMediaPlaylistC2EP7QObject @ 181 NONAME
+	_ZN14QMediaPlaylistD0Ev @ 182 NONAME
+	_ZN14QMediaPlaylistD1Ev @ 183 NONAME
+	_ZN14QMediaPlaylistD2Ev @ 184 NONAME
+	_ZN14QMediaRecorder11qt_metacallEN11QMetaObject4CallEiPPv @ 185 NONAME
+	_ZN14QMediaRecorder11qt_metacastEPKc @ 186 NONAME
+	_ZN14QMediaRecorder12stateChangedENS_5StateE @ 187 NONAME
+	_ZN14QMediaRecorder15durationChangedEx @ 188 NONAME
+	_ZN14QMediaRecorder16staticMetaObjectE @ 189 NONAME DATA 16
+	_ZN14QMediaRecorder17setOutputLocationERK4QUrl @ 190 NONAME
+	_ZN14QMediaRecorder19getStaticMetaObjectEv @ 191 NONAME
+	_ZN14QMediaRecorder19setEncodingSettingsERK21QAudioEncoderSettingsRK21QVideoEncoderSettingsRK7QString @ 192 NONAME
+	_ZN14QMediaRecorder4stopEv @ 193 NONAME
+	_ZN14QMediaRecorder5errorENS_5ErrorE @ 194 NONAME
+	_ZN14QMediaRecorder5pauseEv @ 195 NONAME
+	_ZN14QMediaRecorder6recordEv @ 196 NONAME
+	_ZN14QMediaRecorderC1EP12QMediaObjectP7QObject @ 197 NONAME
+	_ZN14QMediaRecorderC2EP12QMediaObjectP7QObject @ 198 NONAME
+	_ZN14QMediaRecorderD0Ev @ 199 NONAME
+	_ZN14QMediaRecorderD1Ev @ 200 NONAME
+	_ZN14QMediaRecorderD2Ev @ 201 NONAME
+	_ZN14QMediaResource11setDataSizeEx @ 202 NONAME
+	_ZN14QMediaResource11setLanguageERK7QString @ 203 NONAME
+	_ZN14QMediaResource13setAudioCodecERK7QString @ 204 NONAME
+	_ZN14QMediaResource13setResolutionERK5QSize @ 205 NONAME
+	_ZN14QMediaResource13setResolutionEii @ 206 NONAME
+	_ZN14QMediaResource13setSampleRateEi @ 207 NONAME
+	_ZN14QMediaResource13setVideoCodecERK7QString @ 208 NONAME
+	_ZN14QMediaResource15setAudioBitRateEi @ 209 NONAME
+	_ZN14QMediaResource15setChannelCountEi @ 210 NONAME
+	_ZN14QMediaResource15setVideoBitRateEi @ 211 NONAME
+	_ZN14QMediaResourceC1ERK15QNetworkRequestRK7QString @ 212 NONAME
+	_ZN14QMediaResourceC1ERK4QUrlRK7QString @ 213 NONAME
+	_ZN14QMediaResourceC1ERKS_ @ 214 NONAME
+	_ZN14QMediaResourceC1Ev @ 215 NONAME
+	_ZN14QMediaResourceC2ERK15QNetworkRequestRK7QString @ 216 NONAME
+	_ZN14QMediaResourceC2ERK4QUrlRK7QString @ 217 NONAME
+	_ZN14QMediaResourceC2ERKS_ @ 218 NONAME
+	_ZN14QMediaResourceC2Ev @ 219 NONAME
+	_ZN14QMediaResourceD1Ev @ 220 NONAME
+	_ZN14QMediaResourceD2Ev @ 221 NONAME
+	_ZN14QMediaResourceaSERKS_ @ 222 NONAME
+	_ZN15QMediaTimeRange11addIntervalERK18QMediaTimeInterval @ 223 NONAME
+	_ZN15QMediaTimeRange11addIntervalExx @ 224 NONAME
+	_ZN15QMediaTimeRange12addTimeRangeERKS_ @ 225 NONAME
+	_ZN15QMediaTimeRange14removeIntervalERK18QMediaTimeInterval @ 226 NONAME
+	_ZN15QMediaTimeRange14removeIntervalExx @ 227 NONAME
+	_ZN15QMediaTimeRange15removeTimeRangeERKS_ @ 228 NONAME
+	_ZN15QMediaTimeRange5clearEv @ 229 NONAME
+	_ZN15QMediaTimeRangeC1ERK18QMediaTimeInterval @ 230 NONAME
+	_ZN15QMediaTimeRangeC1ERKS_ @ 231 NONAME
+	_ZN15QMediaTimeRangeC1Ev @ 232 NONAME
+	_ZN15QMediaTimeRangeC1Exx @ 233 NONAME
+	_ZN15QMediaTimeRangeC2ERK18QMediaTimeInterval @ 234 NONAME
+	_ZN15QMediaTimeRangeC2ERKS_ @ 235 NONAME
+	_ZN15QMediaTimeRangeC2Ev @ 236 NONAME
+	_ZN15QMediaTimeRangeC2Exx @ 237 NONAME
+	_ZN15QMediaTimeRangeD1Ev @ 238 NONAME
+	_ZN15QMediaTimeRangeD2Ev @ 239 NONAME
+	_ZN15QMediaTimeRangeaSERK18QMediaTimeInterval @ 240 NONAME
+	_ZN15QMediaTimeRangeaSERKS_ @ 241 NONAME
+	_ZN15QMediaTimeRangemIERK18QMediaTimeInterval @ 242 NONAME
+	_ZN15QMediaTimeRangemIERKS_ @ 243 NONAME
+	_ZN15QMediaTimeRangepLERK18QMediaTimeInterval @ 244 NONAME
+	_ZN15QMediaTimeRangepLERKS_ @ 245 NONAME
+	_ZN16QMetaDataControl11qt_metacallEN11QMetaObject4CallEiPPv @ 246 NONAME
+	_ZN16QMetaDataControl11qt_metacastEPKc @ 247 NONAME
+	_ZN16QMetaDataControl15metaDataChangedEv @ 248 NONAME
+	_ZN16QMetaDataControl15writableChangedEb @ 249 NONAME
+	_ZN16QMetaDataControl16staticMetaObjectE @ 250 NONAME DATA 16
+	_ZN16QMetaDataControl19getStaticMetaObjectEv @ 251 NONAME
+	_ZN16QMetaDataControl24metaDataAvailableChangedEb @ 252 NONAME
+	_ZN16QMetaDataControlC2EP7QObject @ 253 NONAME
+	_ZN16QMetaDataControlD0Ev @ 254 NONAME
+	_ZN16QMetaDataControlD1Ev @ 255 NONAME
+	_ZN16QMetaDataControlD2Ev @ 256 NONAME
+	_ZN17QMediaImageViewer10setTimeoutEi @ 257 NONAME
+	_ZN17QMediaImageViewer10timerEventEP11QTimerEvent @ 258 NONAME
+	_ZN17QMediaImageViewer11qt_metacallEN11QMetaObject4CallEiPPv @ 259 NONAME
+	_ZN17QMediaImageViewer11qt_metacastEPKc @ 260 NONAME
+	_ZN17QMediaImageViewer12mediaChangedERK13QMediaContent @ 261 NONAME
+	_ZN17QMediaImageViewer12stateChangedENS_5StateE @ 262 NONAME
+	_ZN17QMediaImageViewer16staticMetaObjectE @ 263 NONAME DATA 16
+	_ZN17QMediaImageViewer18elapsedTimeChangedEi @ 264 NONAME
+	_ZN17QMediaImageViewer18mediaStatusChangedENS_11MediaStatusE @ 265 NONAME
+	_ZN17QMediaImageViewer19getStaticMetaObjectEv @ 266 NONAME
+	_ZN17QMediaImageViewer4bindEP7QObject @ 267 NONAME
+	_ZN17QMediaImageViewer4playEv @ 268 NONAME
+	_ZN17QMediaImageViewer4stopEv @ 269 NONAME
+	_ZN17QMediaImageViewer5pauseEv @ 270 NONAME
+	_ZN17QMediaImageViewer6unbindEP7QObject @ 271 NONAME
+	_ZN17QMediaImageViewer8setMediaERK13QMediaContent @ 272 NONAME
+	_ZN17QMediaImageViewerC1EP7QObject @ 273 NONAME
+	_ZN17QMediaImageViewerC2EP7QObject @ 274 NONAME
+	_ZN17QMediaImageViewerD0Ev @ 275 NONAME
+	_ZN17QMediaImageViewerD1Ev @ 276 NONAME
+	_ZN17QMediaImageViewerD2Ev @ 277 NONAME
+	_ZN18QGraphicsVideoItem10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 278 NONAME
+	_ZN18QGraphicsVideoItem10timerEventEP11QTimerEvent @ 279 NONAME
+	_ZN18QGraphicsVideoItem11qt_metacallEN11QMetaObject4CallEiPPv @ 280 NONAME
+	_ZN18QGraphicsVideoItem11qt_metacastEPKc @ 281 NONAME
+	_ZN18QGraphicsVideoItem14setMediaObjectEP12QMediaObject @ 282 NONAME
+	_ZN18QGraphicsVideoItem16staticMetaObjectE @ 283 NONAME DATA 16
+	_ZN18QGraphicsVideoItem17nativeSizeChangedERK6QSizeF @ 284 NONAME
+	_ZN18QGraphicsVideoItem18setAspectRatioModeEN2Qt15AspectRatioModeE @ 285 NONAME
+	_ZN18QGraphicsVideoItem19getStaticMetaObjectEv @ 286 NONAME
+	_ZN18QGraphicsVideoItem5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 287 NONAME
+	_ZN18QGraphicsVideoItem7setSizeERK6QSizeF @ 288 NONAME
+	_ZN18QGraphicsVideoItem9setOffsetERK7QPointF @ 289 NONAME
+	_ZN18QGraphicsVideoItemC1EP13QGraphicsItem @ 290 NONAME
+	_ZN18QGraphicsVideoItemC2EP13QGraphicsItem @ 291 NONAME
+	_ZN18QGraphicsVideoItemD0Ev @ 292 NONAME
+	_ZN18QGraphicsVideoItemD1Ev @ 293 NONAME
+	_ZN18QGraphicsVideoItemD2Ev @ 294 NONAME
+	_ZN18QMediaTimeIntervalC1ERKS_ @ 295 NONAME
+	_ZN18QMediaTimeIntervalC1Ev @ 296 NONAME
+	_ZN18QMediaTimeIntervalC1Exx @ 297 NONAME
+	_ZN18QMediaTimeIntervalC2ERKS_ @ 298 NONAME
+	_ZN18QMediaTimeIntervalC2Ev @ 299 NONAME
+	_ZN18QMediaTimeIntervalC2Exx @ 300 NONAME
+	_ZN18QRadioTunerControl11bandChangedEN11QRadioTuner4BandE @ 301 NONAME
+	_ZN18QRadioTunerControl11qt_metacallEN11QMetaObject4CallEiPPv @ 302 NONAME
+	_ZN18QRadioTunerControl11qt_metacastEPKc @ 303 NONAME
+	_ZN18QRadioTunerControl12mutedChangedEb @ 304 NONAME
+	_ZN18QRadioTunerControl12stateChangedEN11QRadioTuner5StateE @ 305 NONAME
+	_ZN18QRadioTunerControl13volumeChangedEi @ 306 NONAME
+	_ZN18QRadioTunerControl16frequencyChangedEi @ 307 NONAME
+	_ZN18QRadioTunerControl16searchingChangedEb @ 308 NONAME
+	_ZN18QRadioTunerControl16staticMetaObjectE @ 309 NONAME DATA 16
+	_ZN18QRadioTunerControl19getStaticMetaObjectEv @ 310 NONAME
+	_ZN18QRadioTunerControl19stereoStatusChangedEb @ 311 NONAME
+	_ZN18QRadioTunerControl21signalStrengthChangedEi @ 312 NONAME
+	_ZN18QRadioTunerControl5errorEN11QRadioTuner5ErrorE @ 313 NONAME
+	_ZN18QRadioTunerControlC2EP7QObject @ 314 NONAME
+	_ZN18QRadioTunerControlD0Ev @ 315 NONAME
+	_ZN18QRadioTunerControlD1Ev @ 316 NONAME
+	_ZN18QRadioTunerControlD2Ev @ 317 NONAME
+	_ZN19QAudioCaptureSource11qt_metacallEN11QMetaObject4CallEiPPv @ 318 NONAME
+	_ZN19QAudioCaptureSource11qt_metacastEPKc @ 319 NONAME
+	_ZN19QAudioCaptureSource13setAudioInputERK7QString @ 320 NONAME
+	_ZN19QAudioCaptureSource13statusChangedEv @ 321 NONAME
+	_ZN19QAudioCaptureSource16staticMetaObjectE @ 322 NONAME DATA 16
+	_ZN19QAudioCaptureSource19getStaticMetaObjectEv @ 323 NONAME
+	_ZN19QAudioCaptureSource23activeAudioInputChangedERK7QString @ 324 NONAME
+	_ZN19QAudioCaptureSource27availableAudioInputsChangedEv @ 325 NONAME
+	_ZN19QAudioCaptureSourceC1EP12QMediaObjectP7QObject @ 326 NONAME
+	_ZN19QAudioCaptureSourceC1EP7QObjectP21QMediaServiceProvider @ 327 NONAME
+	_ZN19QAudioCaptureSourceC2EP12QMediaObjectP7QObject @ 328 NONAME
+	_ZN19QAudioCaptureSourceC2EP7QObjectP21QMediaServiceProvider @ 329 NONAME
+	_ZN19QAudioCaptureSourceD0Ev @ 330 NONAME
+	_ZN19QAudioCaptureSourceD1Ev @ 331 NONAME
+	_ZN19QAudioCaptureSourceD2Ev @ 332 NONAME
+	_ZN19QMediaPlayerControl11qt_metacallEN11QMetaObject4CallEiPPv @ 333 NONAME
+	_ZN19QMediaPlayerControl11qt_metacastEPKc @ 334 NONAME
+	_ZN19QMediaPlayerControl12mediaChangedERK13QMediaContent @ 335 NONAME
+	_ZN19QMediaPlayerControl12mutedChangedEb @ 336 NONAME
+	_ZN19QMediaPlayerControl12stateChangedEN12QMediaPlayer5StateE @ 337 NONAME
+	_ZN19QMediaPlayerControl13volumeChangedEi @ 338 NONAME
+	_ZN19QMediaPlayerControl15durationChangedEx @ 339 NONAME
+	_ZN19QMediaPlayerControl15positionChangedEx @ 340 NONAME
+	_ZN19QMediaPlayerControl15seekableChangedEb @ 341 NONAME
+	_ZN19QMediaPlayerControl16staticMetaObjectE @ 342 NONAME DATA 16
+	_ZN19QMediaPlayerControl18mediaStatusChangedEN12QMediaPlayer11MediaStatusE @ 343 NONAME
+	_ZN19QMediaPlayerControl19bufferStatusChangedEi @ 344 NONAME
+	_ZN19QMediaPlayerControl19getStaticMetaObjectEv @ 345 NONAME
+	_ZN19QMediaPlayerControl19playbackRateChangedEf @ 346 NONAME
+	_ZN19QMediaPlayerControl21audioAvailableChangedEb @ 347 NONAME
+	_ZN19QMediaPlayerControl21videoAvailableChangedEb @ 348 NONAME
+	_ZN19QMediaPlayerControl30availablePlaybackRangesChangedERK15QMediaTimeRange @ 349 NONAME
+	_ZN19QMediaPlayerControl5errorEiRK7QString @ 350 NONAME
+	_ZN19QMediaPlayerControlC2EP7QObject @ 351 NONAME
+	_ZN19QMediaPlayerControlD0Ev @ 352 NONAME
+	_ZN19QMediaPlayerControlD1Ev @ 353 NONAME
+	_ZN19QMediaPlayerControlD2Ev @ 354 NONAME
+	_ZN19QVideoDeviceControl11qt_metacallEN11QMetaObject4CallEiPPv @ 355 NONAME
+	_ZN19QVideoDeviceControl11qt_metacastEPKc @ 356 NONAME
+	_ZN19QVideoDeviceControl14devicesChangedEv @ 357 NONAME
+	_ZN19QVideoDeviceControl16staticMetaObjectE @ 358 NONAME DATA 16
+	_ZN19QVideoDeviceControl19getStaticMetaObjectEv @ 359 NONAME
+	_ZN19QVideoDeviceControl21selectedDeviceChangedERK7QString @ 360 NONAME
+	_ZN19QVideoDeviceControl21selectedDeviceChangedEi @ 361 NONAME
+	_ZN19QVideoDeviceControlC2EP7QObject @ 362 NONAME
+	_ZN19QVideoDeviceControlD0Ev @ 363 NONAME
+	_ZN19QVideoDeviceControlD1Ev @ 364 NONAME
+	_ZN19QVideoDeviceControlD2Ev @ 365 NONAME
+	_ZN19QVideoOutputControl11qt_metacallEN11QMetaObject4CallEiPPv @ 366 NONAME
+	_ZN19QVideoOutputControl11qt_metacastEPKc @ 367 NONAME
+	_ZN19QVideoOutputControl16staticMetaObjectE @ 368 NONAME DATA 16
+	_ZN19QVideoOutputControl19getStaticMetaObjectEv @ 369 NONAME
+	_ZN19QVideoOutputControl23availableOutputsChangedERK5QListINS_6OutputEE @ 370 NONAME
+	_ZN19QVideoOutputControlC2EP7QObject @ 371 NONAME
+	_ZN19QVideoOutputControlD0Ev @ 372 NONAME
+	_ZN19QVideoOutputControlD1Ev @ 373 NONAME
+	_ZN19QVideoOutputControlD2Ev @ 374 NONAME
+	_ZN19QVideoWidgetControl10hueChangedEi @ 375 NONAME
+	_ZN19QVideoWidgetControl11qt_metacallEN11QMetaObject4CallEiPPv @ 376 NONAME
+	_ZN19QVideoWidgetControl11qt_metacastEPKc @ 377 NONAME
+	_ZN19QVideoWidgetControl15contrastChangedEi @ 378 NONAME
+	_ZN19QVideoWidgetControl16staticMetaObjectE @ 379 NONAME DATA 16
+	_ZN19QVideoWidgetControl17brightnessChangedEi @ 380 NONAME
+	_ZN19QVideoWidgetControl17fullScreenChangedEb @ 381 NONAME
+	_ZN19QVideoWidgetControl17saturationChangedEi @ 382 NONAME
+	_ZN19QVideoWidgetControl19getStaticMetaObjectEv @ 383 NONAME
+	_ZN19QVideoWidgetControlC2EP7QObject @ 384 NONAME
+	_ZN19QVideoWidgetControlD0Ev @ 385 NONAME
+	_ZN19QVideoWidgetControlD1Ev @ 386 NONAME
+	_ZN19QVideoWidgetControlD2Ev @ 387 NONAME
+	_ZN19QVideoWindowControl10hueChangedEi @ 388 NONAME
+	_ZN19QVideoWindowControl11qt_metacallEN11QMetaObject4CallEiPPv @ 389 NONAME
+	_ZN19QVideoWindowControl11qt_metacastEPKc @ 390 NONAME
+	_ZN19QVideoWindowControl15contrastChangedEi @ 391 NONAME
+	_ZN19QVideoWindowControl16staticMetaObjectE @ 392 NONAME DATA 16
+	_ZN19QVideoWindowControl17brightnessChangedEi @ 393 NONAME
+	_ZN19QVideoWindowControl17fullScreenChangedEb @ 394 NONAME
+	_ZN19QVideoWindowControl17nativeSizeChangedEv @ 395 NONAME
+	_ZN19QVideoWindowControl17saturationChangedEi @ 396 NONAME
+	_ZN19QVideoWindowControl19getStaticMetaObjectEv @ 397 NONAME
+	_ZN19QVideoWindowControlC2EP7QObject @ 398 NONAME
+	_ZN19QVideoWindowControlD0Ev @ 399 NONAME
+	_ZN19QVideoWindowControlD1Ev @ 400 NONAME
+	_ZN19QVideoWindowControlD2Ev @ 401 NONAME
+	_ZN20QAudioEncoderControl11qt_metacallEN11QMetaObject4CallEiPPv @ 402 NONAME
+	_ZN20QAudioEncoderControl11qt_metacastEPKc @ 403 NONAME
+	_ZN20QAudioEncoderControl16staticMetaObjectE @ 404 NONAME DATA 16
+	_ZN20QAudioEncoderControl19getStaticMetaObjectEv @ 405 NONAME
+	_ZN20QAudioEncoderControlC2EP7QObject @ 406 NONAME
+	_ZN20QAudioEncoderControlD0Ev @ 407 NONAME
+	_ZN20QAudioEncoderControlD1Ev @ 408 NONAME
+	_ZN20QAudioEncoderControlD2Ev @ 409 NONAME
+	_ZN20QImageEncoderControl11qt_metacallEN11QMetaObject4CallEiPPv @ 410 NONAME
+	_ZN20QImageEncoderControl11qt_metacastEPKc @ 411 NONAME
+	_ZN20QImageEncoderControl16staticMetaObjectE @ 412 NONAME DATA 16
+	_ZN20QImageEncoderControl19getStaticMetaObjectEv @ 413 NONAME
+	_ZN20QImageEncoderControlC2EP7QObject @ 414 NONAME
+	_ZN20QImageEncoderControlD0Ev @ 415 NONAME
+	_ZN20QImageEncoderControlD1Ev @ 416 NONAME
+	_ZN20QImageEncoderControlD2Ev @ 417 NONAME
+	_ZN20QMediaPlaylistReaderD0Ev @ 418 NONAME
+	_ZN20QMediaPlaylistReaderD1Ev @ 419 NONAME
+	_ZN20QMediaPlaylistReaderD2Ev @ 420 NONAME
+	_ZN20QMediaPlaylistWriterD0Ev @ 421 NONAME
+	_ZN20QMediaPlaylistWriterD1Ev @ 422 NONAME
+	_ZN20QMediaPlaylistWriterD2Ev @ 423 NONAME
+	_ZN20QMediaStreamsControl11qt_metacallEN11QMetaObject4CallEiPPv @ 424 NONAME
+	_ZN20QMediaStreamsControl11qt_metacastEPKc @ 425 NONAME
+	_ZN20QMediaStreamsControl14streamsChangedEv @ 426 NONAME
+	_ZN20QMediaStreamsControl16staticMetaObjectE @ 427 NONAME DATA 16
+	_ZN20QMediaStreamsControl19getStaticMetaObjectEv @ 428 NONAME
+	_ZN20QMediaStreamsControl20activeStreamsChangedEv @ 429 NONAME
+	_ZN20QMediaStreamsControlC2EP7QObject @ 430 NONAME
+	_ZN20QMediaStreamsControlD0Ev @ 431 NONAME
+	_ZN20QMediaStreamsControlD1Ev @ 432 NONAME
+	_ZN20QMediaStreamsControlD2Ev @ 433 NONAME
+	_ZN20QVideoEncoderControl11qt_metacallEN11QMetaObject4CallEiPPv @ 434 NONAME
+	_ZN20QVideoEncoderControl11qt_metacastEPKc @ 435 NONAME
+	_ZN20QVideoEncoderControl16staticMetaObjectE @ 436 NONAME DATA 16
+	_ZN20QVideoEncoderControl19getStaticMetaObjectEv @ 437 NONAME
+	_ZN20QVideoEncoderControlC2EP7QObject @ 438 NONAME
+	_ZN20QVideoEncoderControlD0Ev @ 439 NONAME
+	_ZN20QVideoEncoderControlD1Ev @ 440 NONAME
+	_ZN20QVideoEncoderControlD2Ev @ 441 NONAME
+	_ZN21QAudioEncoderSettings10setBitRateEi @ 442 NONAME
+	_ZN21QAudioEncoderSettings10setQualityEN15QtMediaServices15EncodingQualityE @ 443 NONAME
+	_ZN21QAudioEncoderSettings13setSampleRateEi @ 444 NONAME
+	_ZN21QAudioEncoderSettings15setChannelCountEi @ 445 NONAME
+	_ZN21QAudioEncoderSettings15setEncodingModeEN15QtMediaServices12EncodingModeE @ 446 NONAME
+	_ZN21QAudioEncoderSettings8setCodecERK7QString @ 447 NONAME
+	_ZN21QAudioEncoderSettingsC1ERKS_ @ 448 NONAME
+	_ZN21QAudioEncoderSettingsC1Ev @ 449 NONAME
+	_ZN21QAudioEncoderSettingsC2ERKS_ @ 450 NONAME
+	_ZN21QAudioEncoderSettingsC2Ev @ 451 NONAME
+	_ZN21QAudioEncoderSettingsD1Ev @ 452 NONAME
+	_ZN21QAudioEncoderSettingsD2Ev @ 453 NONAME
+	_ZN21QAudioEncoderSettingsaSERKS_ @ 454 NONAME
+	_ZN21QImageEncoderSettings10setQualityEN15QtMediaServices15EncodingQualityE @ 455 NONAME
+	_ZN21QImageEncoderSettings13setResolutionERK5QSize @ 456 NONAME
+	_ZN21QImageEncoderSettings13setResolutionEii @ 457 NONAME
+	_ZN21QImageEncoderSettings8setCodecERK7QString @ 458 NONAME
+	_ZN21QImageEncoderSettingsC1ERKS_ @ 459 NONAME
+	_ZN21QImageEncoderSettingsC1Ev @ 460 NONAME
+	_ZN21QImageEncoderSettingsC2ERKS_ @ 461 NONAME
+	_ZN21QImageEncoderSettingsC2Ev @ 462 NONAME
+	_ZN21QImageEncoderSettingsD1Ev @ 463 NONAME
+	_ZN21QImageEncoderSettingsD2Ev @ 464 NONAME
+	_ZN21QImageEncoderSettingsaSERKS_ @ 465 NONAME
+	_ZN21QMediaPlaylistControl11qt_metacallEN11QMetaObject4CallEiPPv @ 466 NONAME
+	_ZN21QMediaPlaylistControl11qt_metacastEPKc @ 467 NONAME
+	_ZN21QMediaPlaylistControl16staticMetaObjectE @ 468 NONAME DATA 16
+	_ZN21QMediaPlaylistControl19currentIndexChangedEi @ 469 NONAME
+	_ZN21QMediaPlaylistControl19currentMediaChangedERK13QMediaContent @ 470 NONAME
+	_ZN21QMediaPlaylistControl19getStaticMetaObjectEv @ 471 NONAME
+	_ZN21QMediaPlaylistControl19playbackModeChangedEN14QMediaPlaylist12PlaybackModeE @ 472 NONAME
+	_ZN21QMediaPlaylistControl23playlistProviderChangedEv @ 473 NONAME
+	_ZN21QMediaPlaylistControlC2EP7QObject @ 474 NONAME
+	_ZN21QMediaPlaylistControlD0Ev @ 475 NONAME
+	_ZN21QMediaPlaylistControlD1Ev @ 476 NONAME
+	_ZN21QMediaPlaylistControlD2Ev @ 477 NONAME
+	_ZN21QMediaRecorderControl11qt_metacallEN11QMetaObject4CallEiPPv @ 478 NONAME
+	_ZN21QMediaRecorderControl11qt_metacastEPKc @ 479 NONAME
+	_ZN21QMediaRecorderControl12stateChangedEN14QMediaRecorder5StateE @ 480 NONAME
+	_ZN21QMediaRecorderControl15durationChangedEx @ 481 NONAME
+	_ZN21QMediaRecorderControl16staticMetaObjectE @ 482 NONAME DATA 16
+	_ZN21QMediaRecorderControl19getStaticMetaObjectEv @ 483 NONAME
+	_ZN21QMediaRecorderControl5errorEiRK7QString @ 484 NONAME
+	_ZN21QMediaRecorderControlC2EP7QObject @ 485 NONAME
+	_ZN21QMediaRecorderControlD0Ev @ 486 NONAME
+	_ZN21QMediaRecorderControlD1Ev @ 487 NONAME
+	_ZN21QMediaRecorderControlD2Ev @ 488 NONAME
+	_ZN21QMediaServiceProvider11qt_metacallEN11QMetaObject4CallEiPPv @ 489 NONAME
+	_ZN21QMediaServiceProvider11qt_metacastEPKc @ 490 NONAME
+	_ZN21QMediaServiceProvider16staticMetaObjectE @ 491 NONAME DATA 16
+	_ZN21QMediaServiceProvider17deviceDescriptionERK10QByteArrayS2_ @ 492 NONAME
+	_ZN21QMediaServiceProvider19getStaticMetaObjectEv @ 493 NONAME
+	_ZN21QMediaServiceProvider22defaultServiceProviderEv @ 494 NONAME
+	_ZN21QVideoEncoderSettings10setBitRateEi @ 495 NONAME
+	_ZN21QVideoEncoderSettings10setQualityEN15QtMediaServices15EncodingQualityE @ 496 NONAME
+	_ZN21QVideoEncoderSettings12setFrameRateEf @ 497 NONAME
+	_ZN21QVideoEncoderSettings13setResolutionERK5QSize @ 498 NONAME
+	_ZN21QVideoEncoderSettings13setResolutionEii @ 499 NONAME
+	_ZN21QVideoEncoderSettings15setEncodingModeEN15QtMediaServices12EncodingModeE @ 500 NONAME
+	_ZN21QVideoEncoderSettings8setCodecERK7QString @ 501 NONAME
+	_ZN21QVideoEncoderSettingsC1ERKS_ @ 502 NONAME
+	_ZN21QVideoEncoderSettingsC1Ev @ 503 NONAME
+	_ZN21QVideoEncoderSettingsC2ERKS_ @ 504 NONAME
+	_ZN21QVideoEncoderSettingsC2Ev @ 505 NONAME
+	_ZN21QVideoEncoderSettingsD1Ev @ 506 NONAME
+	_ZN21QVideoEncoderSettingsD2Ev @ 507 NONAME
+	_ZN21QVideoEncoderSettingsaSERKS_ @ 508 NONAME
+	_ZN21QVideoRendererControl11qt_metacallEN11QMetaObject4CallEiPPv @ 509 NONAME
+	_ZN21QVideoRendererControl11qt_metacastEPKc @ 510 NONAME
+	_ZN21QVideoRendererControl16staticMetaObjectE @ 511 NONAME DATA 16
+	_ZN21QVideoRendererControl19getStaticMetaObjectEv @ 512 NONAME
+	_ZN21QVideoRendererControlC2EP7QObject @ 513 NONAME
+	_ZN21QVideoRendererControlD0Ev @ 514 NONAME
+	_ZN21QVideoRendererControlD1Ev @ 515 NONAME
+	_ZN21QVideoRendererControlD2Ev @ 516 NONAME
+	_ZN22QAudioEndpointSelector11qt_metacallEN11QMetaObject4CallEiPPv @ 517 NONAME
+	_ZN22QAudioEndpointSelector11qt_metacastEPKc @ 518 NONAME
+	_ZN22QAudioEndpointSelector16staticMetaObjectE @ 519 NONAME DATA 16
+	_ZN22QAudioEndpointSelector19getStaticMetaObjectEv @ 520 NONAME
+	_ZN22QAudioEndpointSelector21activeEndpointChangedERK7QString @ 521 NONAME
+	_ZN22QAudioEndpointSelector25availableEndpointsChangedEv @ 522 NONAME
+	_ZN22QAudioEndpointSelectorC2EP7QObject @ 523 NONAME
+	_ZN22QAudioEndpointSelectorD0Ev @ 524 NONAME
+	_ZN22QAudioEndpointSelectorD1Ev @ 525 NONAME
+	_ZN22QAudioEndpointSelectorD2Ev @ 526 NONAME
+	_ZN22QMediaContainerControl11qt_metacallEN11QMetaObject4CallEiPPv @ 527 NONAME
+	_ZN22QMediaContainerControl11qt_metacastEPKc @ 528 NONAME
+	_ZN22QMediaContainerControl16staticMetaObjectE @ 529 NONAME DATA 16
+	_ZN22QMediaContainerControl19getStaticMetaObjectEv @ 530 NONAME
+	_ZN22QMediaContainerControlC2EP7QObject @ 531 NONAME
+	_ZN22QMediaContainerControlD0Ev @ 532 NONAME
+	_ZN22QMediaContainerControlD1Ev @ 533 NONAME
+	_ZN22QMediaContainerControlD2Ev @ 534 NONAME
+	_ZN22QMediaPlaylistIOPlugin11qt_metacallEN11QMetaObject4CallEiPPv @ 535 NONAME
+	_ZN22QMediaPlaylistIOPlugin11qt_metacastEPKc @ 536 NONAME
+	_ZN22QMediaPlaylistIOPlugin16staticMetaObjectE @ 537 NONAME DATA 16
+	_ZN22QMediaPlaylistIOPlugin19getStaticMetaObjectEv @ 538 NONAME
+	_ZN22QMediaPlaylistIOPluginC2EP7QObject @ 539 NONAME
+	_ZN22QMediaPlaylistIOPluginD0Ev @ 540 NONAME
+	_ZN22QMediaPlaylistIOPluginD1Ev @ 541 NONAME
+	_ZN22QMediaPlaylistIOPluginD2Ev @ 542 NONAME
+	_ZN22QMediaPlaylistProvider10loadFailedEN14QMediaPlaylist5ErrorERK7QString @ 543 NONAME
+	_ZN22QMediaPlaylistProvider11insertMediaEiRK13QMediaContent @ 544 NONAME
+	_ZN22QMediaPlaylistProvider11insertMediaEiRK5QListI13QMediaContentE @ 545 NONAME
+	_ZN22QMediaPlaylistProvider11qt_metacallEN11QMetaObject4CallEiPPv @ 546 NONAME
+	_ZN22QMediaPlaylistProvider11qt_metacastEPKc @ 547 NONAME
+	_ZN22QMediaPlaylistProvider11removeMediaEi @ 548 NONAME
+	_ZN22QMediaPlaylistProvider11removeMediaEii @ 549 NONAME
+	_ZN22QMediaPlaylistProvider12mediaChangedEii @ 550 NONAME
+	_ZN22QMediaPlaylistProvider12mediaRemovedEii @ 551 NONAME
+	_ZN22QMediaPlaylistProvider13mediaInsertedEii @ 552 NONAME
+	_ZN22QMediaPlaylistProvider16staticMetaObjectE @ 553 NONAME DATA 16
+	_ZN22QMediaPlaylistProvider19getStaticMetaObjectEv @ 554 NONAME
+	_ZN22QMediaPlaylistProvider21mediaAboutToBeRemovedEii @ 555 NONAME
+	_ZN22QMediaPlaylistProvider22mediaAboutToBeInsertedEii @ 556 NONAME
+	_ZN22QMediaPlaylistProvider4loadEP9QIODevicePKc @ 557 NONAME
+	_ZN22QMediaPlaylistProvider4loadERK4QUrlPKc @ 558 NONAME
+	_ZN22QMediaPlaylistProvider4saveEP9QIODevicePKc @ 559 NONAME
+	_ZN22QMediaPlaylistProvider4saveERK4QUrlPKc @ 560 NONAME
+	_ZN22QMediaPlaylistProvider5clearEv @ 561 NONAME
+	_ZN22QMediaPlaylistProvider6loadedEv @ 562 NONAME
+	_ZN22QMediaPlaylistProvider7shuffleEv @ 563 NONAME
+	_ZN22QMediaPlaylistProvider8addMediaERK13QMediaContent @ 564 NONAME
+	_ZN22QMediaPlaylistProvider8addMediaERK5QListI13QMediaContentE @ 565 NONAME
+	_ZN22QMediaPlaylistProviderC2EP7QObject @ 566 NONAME
+	_ZN22QMediaPlaylistProviderC2ER29QMediaPlaylistProviderPrivateP7QObject @ 567 NONAME
+	_ZN22QMediaPlaylistProviderD0Ev @ 568 NONAME
+	_ZN22QMediaPlaylistProviderD1Ev @ 569 NONAME
+	_ZN22QMediaPlaylistProviderD2Ev @ 570 NONAME
+	_ZN23QMediaPlaylistNavigator11qt_metacallEN11QMetaObject4CallEiPPv @ 571 NONAME
+	_ZN23QMediaPlaylistNavigator11qt_metacastEPKc @ 572 NONAME
+	_ZN23QMediaPlaylistNavigator11setPlaylistEP22QMediaPlaylistProvider @ 573 NONAME
+	_ZN23QMediaPlaylistNavigator15setPlaybackModeEN14QMediaPlaylist12PlaybackModeE @ 574 NONAME
+	_ZN23QMediaPlaylistNavigator16staticMetaObjectE @ 575 NONAME DATA 16
+	_ZN23QMediaPlaylistNavigator19currentIndexChangedEi @ 576 NONAME
+	_ZN23QMediaPlaylistNavigator19getStaticMetaObjectEv @ 577 NONAME
+	_ZN23QMediaPlaylistNavigator19playbackModeChangedEN14QMediaPlaylist12PlaybackModeE @ 578 NONAME
+	_ZN23QMediaPlaylistNavigator23surroundingItemsChangedEv @ 579 NONAME
+	_ZN23QMediaPlaylistNavigator4jumpEi @ 580 NONAME
+	_ZN23QMediaPlaylistNavigator4nextEv @ 581 NONAME
+	_ZN23QMediaPlaylistNavigator8previousEv @ 582 NONAME
+	_ZN23QMediaPlaylistNavigator9activatedERK13QMediaContent @ 583 NONAME
+	_ZN23QMediaPlaylistNavigatorC1EP22QMediaPlaylistProviderP7QObject @ 584 NONAME
+	_ZN23QMediaPlaylistNavigatorC2EP22QMediaPlaylistProviderP7QObject @ 585 NONAME
+	_ZN23QMediaPlaylistNavigatorD0Ev @ 586 NONAME
+	_ZN23QMediaPlaylistNavigatorD1Ev @ 587 NONAME
+	_ZN23QMediaPlaylistNavigatorD2Ev @ 588 NONAME
+	_ZN25QMediaServiceProviderHintC1E6QFlagsINS_7FeatureEE @ 589 NONAME
+	_ZN25QMediaServiceProviderHintC1ERK10QByteArray @ 590 NONAME
+	_ZN25QMediaServiceProviderHintC1ERK7QStringRK11QStringList @ 591 NONAME
+	_ZN25QMediaServiceProviderHintC1ERKS_ @ 592 NONAME
+	_ZN25QMediaServiceProviderHintC1Ev @ 593 NONAME
+	_ZN25QMediaServiceProviderHintC2E6QFlagsINS_7FeatureEE @ 594 NONAME
+	_ZN25QMediaServiceProviderHintC2ERK10QByteArray @ 595 NONAME
+	_ZN25QMediaServiceProviderHintC2ERK7QStringRK11QStringList @ 596 NONAME
+	_ZN25QMediaServiceProviderHintC2ERKS_ @ 597 NONAME
+	_ZN25QMediaServiceProviderHintC2Ev @ 598 NONAME
+	_ZN25QMediaServiceProviderHintD1Ev @ 599 NONAME
+	_ZN25QMediaServiceProviderHintD2Ev @ 600 NONAME
+	_ZN25QMediaServiceProviderHintaSERKS_ @ 601 NONAME
+	_ZN27QLocalMediaPlaylistProvider11insertMediaEiRK13QMediaContent @ 602 NONAME
+	_ZN27QLocalMediaPlaylistProvider11insertMediaEiRK5QListI13QMediaContentE @ 603 NONAME
+	_ZN27QLocalMediaPlaylistProvider11qt_metacallEN11QMetaObject4CallEiPPv @ 604 NONAME
+	_ZN27QLocalMediaPlaylistProvider11qt_metacastEPKc @ 605 NONAME
+	_ZN27QLocalMediaPlaylistProvider11removeMediaEi @ 606 NONAME
+	_ZN27QLocalMediaPlaylistProvider11removeMediaEii @ 607 NONAME
+	_ZN27QLocalMediaPlaylistProvider16staticMetaObjectE @ 608 NONAME DATA 16
+	_ZN27QLocalMediaPlaylistProvider19getStaticMetaObjectEv @ 609 NONAME
+	_ZN27QLocalMediaPlaylistProvider5clearEv @ 610 NONAME
+	_ZN27QLocalMediaPlaylistProvider7shuffleEv @ 611 NONAME
+	_ZN27QLocalMediaPlaylistProvider8addMediaERK13QMediaContent @ 612 NONAME
+	_ZN27QLocalMediaPlaylistProvider8addMediaERK5QListI13QMediaContentE @ 613 NONAME
+	_ZN27QLocalMediaPlaylistProviderC1EP7QObject @ 614 NONAME
+	_ZN27QLocalMediaPlaylistProviderC2EP7QObject @ 615 NONAME
+	_ZN27QLocalMediaPlaylistProviderD0Ev @ 616 NONAME
+	_ZN27QLocalMediaPlaylistProviderD1Ev @ 617 NONAME
+	_ZN27QLocalMediaPlaylistProviderD2Ev @ 618 NONAME
+	_ZN27QMediaServiceProviderPlugin11qt_metacallEN11QMetaObject4CallEiPPv @ 619 NONAME
+	_ZN27QMediaServiceProviderPlugin11qt_metacastEPKc @ 620 NONAME
+	_ZN27QMediaServiceProviderPlugin16staticMetaObjectE @ 621 NONAME DATA 16
+	_ZN27QMediaServiceProviderPlugin19getStaticMetaObjectEv @ 622 NONAME
+	_ZNK11QRadioTuner10metaObjectEv @ 623 NONAME
+	_ZNK11QRadioTuner10stereoModeEv @ 624 NONAME
+	_ZNK11QRadioTuner11errorStringEv @ 625 NONAME
+	_ZNK11QRadioTuner11isAvailableEv @ 626 NONAME
+	_ZNK11QRadioTuner11isSearchingEv @ 627 NONAME
+	_ZNK11QRadioTuner13frequencyStepENS_4BandE @ 628 NONAME
+	_ZNK11QRadioTuner14frequencyRangeENS_4BandE @ 629 NONAME
+	_ZNK11QRadioTuner14signalStrengthEv @ 630 NONAME
+	_ZNK11QRadioTuner15isBandSupportedENS_4BandE @ 631 NONAME
+	_ZNK11QRadioTuner17availabilityErrorEv @ 632 NONAME
+	_ZNK11QRadioTuner4bandEv @ 633 NONAME
+	_ZNK11QRadioTuner5errorEv @ 634 NONAME
+	_ZNK11QRadioTuner5stateEv @ 635 NONAME
+	_ZNK11QRadioTuner6volumeEv @ 636 NONAME
+	_ZNK11QRadioTuner7isMutedEv @ 637 NONAME
+	_ZNK11QRadioTuner8isStereoEv @ 638 NONAME
+	_ZNK11QRadioTuner9frequencyEv @ 639 NONAME
+	_ZNK12QMediaObject10metaObjectEv @ 640 NONAME
+	_ZNK12QMediaObject11isAvailableEv @ 641 NONAME
+	_ZNK12QMediaObject14notifyIntervalEv @ 642 NONAME
+	_ZNK12QMediaObject16extendedMetaDataERK7QString @ 643 NONAME
+	_ZNK12QMediaObject17availabilityErrorEv @ 644 NONAME
+	_ZNK12QMediaObject17availableMetaDataEv @ 645 NONAME
+	_ZNK12QMediaObject18isMetaDataWritableEv @ 646 NONAME
+	_ZNK12QMediaObject19isMetaDataAvailableEv @ 647 NONAME
+	_ZNK12QMediaObject25availableExtendedMetaDataEv @ 648 NONAME
+	_ZNK12QMediaObject7serviceEv @ 649 NONAME
+	_ZNK12QMediaObject8metaDataEN15QtMediaServices8MetaDataE @ 650 NONAME
+	_ZNK12QMediaPlayer10isSeekableEv @ 651 NONAME
+	_ZNK12QMediaPlayer10metaObjectEv @ 652 NONAME
+	_ZNK12QMediaPlayer11errorStringEv @ 653 NONAME
+	_ZNK12QMediaPlayer11mediaStatusEv @ 654 NONAME
+	_ZNK12QMediaPlayer11mediaStreamEv @ 655 NONAME
+	_ZNK12QMediaPlayer12bufferStatusEv @ 656 NONAME
+	_ZNK12QMediaPlayer12playbackRateEv @ 657 NONAME
+	_ZNK12QMediaPlayer16isAudioAvailableEv @ 658 NONAME
+	_ZNK12QMediaPlayer16isVideoAvailableEv @ 659 NONAME
+	_ZNK12QMediaPlayer5errorEv @ 660 NONAME
+	_ZNK12QMediaPlayer5mediaEv @ 661 NONAME
+	_ZNK12QMediaPlayer5stateEv @ 662 NONAME
+	_ZNK12QMediaPlayer6volumeEv @ 663 NONAME
+	_ZNK12QMediaPlayer7isMutedEv @ 664 NONAME
+	_ZNK12QMediaPlayer8durationEv @ 665 NONAME
+	_ZNK12QMediaPlayer8positionEv @ 666 NONAME
+	_ZNK12QVideoWidget10brightnessEv @ 667 NONAME
+	_ZNK12QVideoWidget10metaObjectEv @ 668 NONAME
+	_ZNK12QVideoWidget10saturationEv @ 669 NONAME
+	_ZNK12QVideoWidget11mediaObjectEv @ 670 NONAME
+	_ZNK12QVideoWidget15aspectRatioModeEv @ 671 NONAME
+	_ZNK12QVideoWidget3hueEv @ 672 NONAME
+	_ZNK12QVideoWidget8contrastEv @ 673 NONAME
+	_ZNK12QVideoWidget8sizeHintEv @ 674 NONAME
+	_ZNK13QMediaContent12canonicalUrlEv @ 675 NONAME
+	_ZNK13QMediaContent16canonicalRequestEv @ 676 NONAME
+	_ZNK13QMediaContent17canonicalResourceEv @ 677 NONAME
+	_ZNK13QMediaContent6isNullEv @ 678 NONAME
+	_ZNK13QMediaContent9resourcesEv @ 679 NONAME
+	_ZNK13QMediaContenteqERKS_ @ 680 NONAME
+	_ZNK13QMediaContentneERKS_ @ 681 NONAME
+	_ZNK13QMediaControl10metaObjectEv @ 682 NONAME
+	_ZNK13QMediaService10metaObjectEv @ 683 NONAME
+	_ZNK14QMediaPlaylist10isReadOnlyEv @ 684 NONAME
+	_ZNK14QMediaPlaylist10mediaCountEv @ 685 NONAME
+	_ZNK14QMediaPlaylist10metaObjectEv @ 686 NONAME
+	_ZNK14QMediaPlaylist11errorStringEv @ 687 NONAME
+	_ZNK14QMediaPlaylist11mediaObjectEv @ 688 NONAME
+	_ZNK14QMediaPlaylist12currentIndexEv @ 689 NONAME
+	_ZNK14QMediaPlaylist12currentMediaEv @ 690 NONAME
+	_ZNK14QMediaPlaylist12playbackModeEv @ 691 NONAME
+	_ZNK14QMediaPlaylist13previousIndexEi @ 692 NONAME
+	_ZNK14QMediaPlaylist5errorEv @ 693 NONAME
+	_ZNK14QMediaPlaylist5mediaEi @ 694 NONAME
+	_ZNK14QMediaPlaylist7isEmptyEv @ 695 NONAME
+	_ZNK14QMediaPlaylist9nextIndexEi @ 696 NONAME
+	_ZNK14QMediaRecorder10metaObjectEv @ 697 NONAME
+	_ZNK14QMediaRecorder11errorStringEv @ 698 NONAME
+	_ZNK14QMediaRecorder11isAvailableEv @ 699 NONAME
+	_ZNK14QMediaRecorder13audioSettingsEv @ 700 NONAME
+	_ZNK14QMediaRecorder13videoSettingsEv @ 701 NONAME
+	_ZNK14QMediaRecorder14outputLocationEv @ 702 NONAME
+	_ZNK14QMediaRecorder17availabilityErrorEv @ 703 NONAME
+	_ZNK14QMediaRecorder17containerMimeTypeEv @ 704 NONAME
+	_ZNK14QMediaRecorder19supportedContainersEv @ 705 NONAME
+	_ZNK14QMediaRecorder19supportedFrameRatesERK21QVideoEncoderSettingsPb @ 706 NONAME
+	_ZNK14QMediaRecorder20containerDescriptionERK7QString @ 707 NONAME
+	_ZNK14QMediaRecorder20supportedAudioCodecsEv @ 708 NONAME
+	_ZNK14QMediaRecorder20supportedResolutionsERK21QVideoEncoderSettingsPb @ 709 NONAME
+	_ZNK14QMediaRecorder20supportedVideoCodecsEv @ 710 NONAME
+	_ZNK14QMediaRecorder21audioCodecDescriptionERK7QString @ 711 NONAME
+	_ZNK14QMediaRecorder21videoCodecDescriptionERK7QString @ 712 NONAME
+	_ZNK14QMediaRecorder25supportedAudioSampleRatesERK21QAudioEncoderSettingsPb @ 713 NONAME
+	_ZNK14QMediaRecorder5errorEv @ 714 NONAME
+	_ZNK14QMediaRecorder5stateEv @ 715 NONAME
+	_ZNK14QMediaRecorder8durationEv @ 716 NONAME
+	_ZNK14QMediaResource10audioCodecEv @ 717 NONAME
+	_ZNK14QMediaResource10resolutionEv @ 718 NONAME
+	_ZNK14QMediaResource10sampleRateEv @ 719 NONAME
+	_ZNK14QMediaResource10videoCodecEv @ 720 NONAME
+	_ZNK14QMediaResource12audioBitRateEv @ 721 NONAME
+	_ZNK14QMediaResource12channelCountEv @ 722 NONAME
+	_ZNK14QMediaResource12videoBitRateEv @ 723 NONAME
+	_ZNK14QMediaResource3urlEv @ 724 NONAME
+	_ZNK14QMediaResource6isNullEv @ 725 NONAME
+	_ZNK14QMediaResource7requestEv @ 726 NONAME
+	_ZNK14QMediaResource8dataSizeEv @ 727 NONAME
+	_ZNK14QMediaResource8languageEv @ 728 NONAME
+	_ZNK14QMediaResource8mimeTypeEv @ 729 NONAME
+	_ZNK14QMediaResourceeqERKS_ @ 730 NONAME
+	_ZNK14QMediaResourceneERKS_ @ 731 NONAME
+	_ZNK15QMediaTimeRange10latestTimeEv @ 732 NONAME
+	_ZNK15QMediaTimeRange12earliestTimeEv @ 733 NONAME
+	_ZNK15QMediaTimeRange12isContinuousEv @ 734 NONAME
+	_ZNK15QMediaTimeRange7isEmptyEv @ 735 NONAME
+	_ZNK15QMediaTimeRange8containsEx @ 736 NONAME
+	_ZNK15QMediaTimeRange9intervalsEv @ 737 NONAME
+	_ZNK16QMetaDataControl10metaObjectEv @ 738 NONAME
+	_ZNK17QMediaImageViewer10metaObjectEv @ 739 NONAME
+	_ZNK17QMediaImageViewer11elapsedTimeEv @ 740 NONAME
+	_ZNK17QMediaImageViewer11mediaStatusEv @ 741 NONAME
+	_ZNK17QMediaImageViewer5mediaEv @ 742 NONAME
+	_ZNK17QMediaImageViewer5stateEv @ 743 NONAME
+	_ZNK17QMediaImageViewer7timeoutEv @ 744 NONAME
+	_ZNK18QGraphicsVideoItem10metaObjectEv @ 745 NONAME
+	_ZNK18QGraphicsVideoItem10nativeSizeEv @ 746 NONAME
+	_ZNK18QGraphicsVideoItem11mediaObjectEv @ 747 NONAME
+	_ZNK18QGraphicsVideoItem12boundingRectEv @ 748 NONAME
+	_ZNK18QGraphicsVideoItem15aspectRatioModeEv @ 749 NONAME
+	_ZNK18QGraphicsVideoItem4sizeEv @ 750 NONAME
+	_ZNK18QGraphicsVideoItem6offsetEv @ 751 NONAME
+	_ZNK18QMediaTimeInterval10normalizedEv @ 752 NONAME
+	_ZNK18QMediaTimeInterval10translatedEx @ 753 NONAME
+	_ZNK18QMediaTimeInterval3endEv @ 754 NONAME
+	_ZNK18QMediaTimeInterval5startEv @ 755 NONAME
+	_ZNK18QMediaTimeInterval8containsEx @ 756 NONAME
+	_ZNK18QMediaTimeInterval8isNormalEv @ 757 NONAME
+	_ZNK18QRadioTunerControl10metaObjectEv @ 758 NONAME
+	_ZNK19QAudioCaptureSource10metaObjectEv @ 759 NONAME
+	_ZNK19QAudioCaptureSource11audioInputsEv @ 760 NONAME
+	_ZNK19QAudioCaptureSource11isAvailableEv @ 761 NONAME
+	_ZNK19QAudioCaptureSource16activeAudioInputEv @ 762 NONAME
+	_ZNK19QAudioCaptureSource16audioDescriptionERK7QString @ 763 NONAME
+	_ZNK19QAudioCaptureSource17availabilityErrorEv @ 764 NONAME
+	_ZNK19QAudioCaptureSource17defaultAudioInputEv @ 765 NONAME
+	_ZNK19QMediaPlayerControl10metaObjectEv @ 766 NONAME
+	_ZNK19QVideoDeviceControl10metaObjectEv @ 767 NONAME
+	_ZNK19QVideoOutputControl10metaObjectEv @ 768 NONAME
+	_ZNK19QVideoWidgetControl10metaObjectEv @ 769 NONAME
+	_ZNK19QVideoWindowControl10metaObjectEv @ 770 NONAME
+	_ZNK20QAudioEncoderControl10metaObjectEv @ 771 NONAME
+	_ZNK20QImageEncoderControl10metaObjectEv @ 772 NONAME
+	_ZNK20QMediaStreamsControl10metaObjectEv @ 773 NONAME
+	_ZNK20QVideoEncoderControl10metaObjectEv @ 774 NONAME
+	_ZNK21QAudioEncoderSettings10sampleRateEv @ 775 NONAME
+	_ZNK21QAudioEncoderSettings12channelCountEv @ 776 NONAME
+	_ZNK21QAudioEncoderSettings12encodingModeEv @ 777 NONAME
+	_ZNK21QAudioEncoderSettings5codecEv @ 778 NONAME
+	_ZNK21QAudioEncoderSettings6isNullEv @ 779 NONAME
+	_ZNK21QAudioEncoderSettings7bitRateEv @ 780 NONAME
+	_ZNK21QAudioEncoderSettings7qualityEv @ 781 NONAME
+	_ZNK21QAudioEncoderSettingseqERKS_ @ 782 NONAME
+	_ZNK21QAudioEncoderSettingsneERKS_ @ 783 NONAME
+	_ZNK21QImageEncoderSettings10resolutionEv @ 784 NONAME
+	_ZNK21QImageEncoderSettings5codecEv @ 785 NONAME
+	_ZNK21QImageEncoderSettings6isNullEv @ 786 NONAME
+	_ZNK21QImageEncoderSettings7qualityEv @ 787 NONAME
+	_ZNK21QImageEncoderSettingseqERKS_ @ 788 NONAME
+	_ZNK21QImageEncoderSettingsneERKS_ @ 789 NONAME
+	_ZNK21QMediaPlaylistControl10metaObjectEv @ 790 NONAME
+	_ZNK21QMediaRecorderControl10metaObjectEv @ 791 NONAME
+	_ZNK21QMediaServiceProvider10hasSupportERK10QByteArrayRK7QStringRK11QStringListi @ 792 NONAME
+	_ZNK21QMediaServiceProvider10metaObjectEv @ 793 NONAME
+	_ZNK21QMediaServiceProvider18supportedMimeTypesERK10QByteArrayi @ 794 NONAME
+	_ZNK21QMediaServiceProvider7devicesERK10QByteArray @ 795 NONAME
+	_ZNK21QVideoEncoderSettings10resolutionEv @ 796 NONAME
+	_ZNK21QVideoEncoderSettings12encodingModeEv @ 797 NONAME
+	_ZNK21QVideoEncoderSettings5codecEv @ 798 NONAME
+	_ZNK21QVideoEncoderSettings6isNullEv @ 799 NONAME
+	_ZNK21QVideoEncoderSettings7bitRateEv @ 800 NONAME
+	_ZNK21QVideoEncoderSettings7qualityEv @ 801 NONAME
+	_ZNK21QVideoEncoderSettings9frameRateEv @ 802 NONAME
+	_ZNK21QVideoEncoderSettingseqERKS_ @ 803 NONAME
+	_ZNK21QVideoEncoderSettingsneERKS_ @ 804 NONAME
+	_ZNK21QVideoRendererControl10metaObjectEv @ 805 NONAME
+	_ZNK22QAudioEndpointSelector10metaObjectEv @ 806 NONAME
+	_ZNK22QMediaContainerControl10metaObjectEv @ 807 NONAME
+	_ZNK22QMediaPlaylistIOPlugin10metaObjectEv @ 808 NONAME
+	_ZNK22QMediaPlaylistProvider10isReadOnlyEv @ 809 NONAME
+	_ZNK22QMediaPlaylistProvider10metaObjectEv @ 810 NONAME
+	_ZNK23QMediaPlaylistNavigator10metaObjectEv @ 811 NONAME
+	_ZNK23QMediaPlaylistNavigator11currentItemEv @ 812 NONAME
+	_ZNK23QMediaPlaylistNavigator12currentIndexEv @ 813 NONAME
+	_ZNK23QMediaPlaylistNavigator12playbackModeEv @ 814 NONAME
+	_ZNK23QMediaPlaylistNavigator12previousItemEi @ 815 NONAME
+	_ZNK23QMediaPlaylistNavigator13previousIndexEi @ 816 NONAME
+	_ZNK23QMediaPlaylistNavigator6itemAtEi @ 817 NONAME
+	_ZNK23QMediaPlaylistNavigator8nextItemEi @ 818 NONAME
+	_ZNK23QMediaPlaylistNavigator8playlistEv @ 819 NONAME
+	_ZNK23QMediaPlaylistNavigator9nextIndexEi @ 820 NONAME
+	_ZNK25QMediaServiceProviderHint4typeEv @ 821 NONAME
+	_ZNK25QMediaServiceProviderHint6codecsEv @ 822 NONAME
+	_ZNK25QMediaServiceProviderHint6deviceEv @ 823 NONAME
+	_ZNK25QMediaServiceProviderHint6isNullEv @ 824 NONAME
+	_ZNK25QMediaServiceProviderHint8featuresEv @ 825 NONAME
+	_ZNK25QMediaServiceProviderHint8mimeTypeEv @ 826 NONAME
+	_ZNK25QMediaServiceProviderHinteqERKS_ @ 827 NONAME
+	_ZNK25QMediaServiceProviderHintneERKS_ @ 828 NONAME
+	_ZNK27QLocalMediaPlaylistProvider10isReadOnlyEv @ 829 NONAME
+	_ZNK27QLocalMediaPlaylistProvider10mediaCountEv @ 830 NONAME
+	_ZNK27QLocalMediaPlaylistProvider10metaObjectEv @ 831 NONAME
+	_ZNK27QLocalMediaPlaylistProvider5mediaEi @ 832 NONAME
+	_ZNK27QMediaServiceProviderPlugin10metaObjectEv @ 833 NONAME
+	_ZTI11QRadioTuner @ 834 NONAME
+	_ZTI12QMediaObject @ 835 NONAME
+	_ZTI12QMediaPlayer @ 836 NONAME
+	_ZTI12QVideoWidget @ 837 NONAME
+	_ZTI13QMediaControl @ 838 NONAME
+	_ZTI13QMediaService @ 839 NONAME
+	_ZTI14QMediaPlaylist @ 840 NONAME
+	_ZTI14QMediaRecorder @ 841 NONAME
+	_ZTI16QMetaDataControl @ 842 NONAME
+	_ZTI17QMediaImageViewer @ 843 NONAME
+	_ZTI18QGraphicsVideoItem @ 844 NONAME
+	_ZTI18QRadioTunerControl @ 845 NONAME
+	_ZTI19QAudioCaptureSource @ 846 NONAME
+	_ZTI19QMediaPlayerControl @ 847 NONAME
+	_ZTI19QVideoDeviceControl @ 848 NONAME
+	_ZTI19QVideoOutputControl @ 849 NONAME
+	_ZTI19QVideoWidgetControl @ 850 NONAME
+	_ZTI19QVideoWindowControl @ 851 NONAME
+	_ZTI20QAudioEncoderControl @ 852 NONAME
+	_ZTI20QImageEncoderControl @ 853 NONAME
+	_ZTI20QMediaPlaylistReader @ 854 NONAME
+	_ZTI20QMediaPlaylistWriter @ 855 NONAME
+	_ZTI20QMediaStreamsControl @ 856 NONAME
+	_ZTI20QVideoEncoderControl @ 857 NONAME
+	_ZTI21QMediaPlaylistControl @ 858 NONAME
+	_ZTI21QMediaRecorderControl @ 859 NONAME
+	_ZTI21QMediaServiceProvider @ 860 NONAME
+	_ZTI21QVideoRendererControl @ 861 NONAME
+	_ZTI22QAudioEndpointSelector @ 862 NONAME
+	_ZTI22QMediaContainerControl @ 863 NONAME
+	_ZTI22QMediaPlaylistIOPlugin @ 864 NONAME
+	_ZTI22QMediaPlaylistProvider @ 865 NONAME
+	_ZTI23QMediaPlaylistNavigator @ 866 NONAME
+	_ZTI25QMediaPlaylistIOInterface @ 867 NONAME
+	_ZTI27QLocalMediaPlaylistProvider @ 868 NONAME
+	_ZTI27QMediaServiceProviderPlugin @ 869 NONAME
+	_ZTI37QMediaServiceProviderFactoryInterface @ 870 NONAME
+	_ZTV11QRadioTuner @ 871 NONAME
+	_ZTV12QMediaObject @ 872 NONAME
+	_ZTV12QMediaPlayer @ 873 NONAME
+	_ZTV12QVideoWidget @ 874 NONAME
+	_ZTV13QMediaControl @ 875 NONAME
+	_ZTV13QMediaService @ 876 NONAME
+	_ZTV14QMediaPlaylist @ 877 NONAME
+	_ZTV14QMediaRecorder @ 878 NONAME
+	_ZTV16QMetaDataControl @ 879 NONAME
+	_ZTV17QMediaImageViewer @ 880 NONAME
+	_ZTV18QGraphicsVideoItem @ 881 NONAME
+	_ZTV18QRadioTunerControl @ 882 NONAME
+	_ZTV19QAudioCaptureSource @ 883 NONAME
+	_ZTV19QMediaPlayerControl @ 884 NONAME
+	_ZTV19QVideoDeviceControl @ 885 NONAME
+	_ZTV19QVideoOutputControl @ 886 NONAME
+	_ZTV19QVideoWidgetControl @ 887 NONAME
+	_ZTV19QVideoWindowControl @ 888 NONAME
+	_ZTV20QAudioEncoderControl @ 889 NONAME
+	_ZTV20QImageEncoderControl @ 890 NONAME
+	_ZTV20QMediaPlaylistReader @ 891 NONAME
+	_ZTV20QMediaPlaylistWriter @ 892 NONAME
+	_ZTV20QMediaStreamsControl @ 893 NONAME
+	_ZTV20QVideoEncoderControl @ 894 NONAME
+	_ZTV21QMediaPlaylistControl @ 895 NONAME
+	_ZTV21QMediaRecorderControl @ 896 NONAME
+	_ZTV21QMediaServiceProvider @ 897 NONAME
+	_ZTV21QVideoRendererControl @ 898 NONAME
+	_ZTV22QAudioEndpointSelector @ 899 NONAME
+	_ZTV22QMediaContainerControl @ 900 NONAME
+	_ZTV22QMediaPlaylistIOPlugin @ 901 NONAME
+	_ZTV22QMediaPlaylistProvider @ 902 NONAME
+	_ZTV23QMediaPlaylistNavigator @ 903 NONAME
+	_ZTV27QLocalMediaPlaylistProvider @ 904 NONAME
+	_ZTV27QMediaServiceProviderPlugin @ 905 NONAME
+	_ZThn8_N12QVideoWidgetD0Ev @ 906 NONAME
+	_ZThn8_N12QVideoWidgetD1Ev @ 907 NONAME
+	_ZThn8_N18QGraphicsVideoItem10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 908 NONAME
+	_ZThn8_N18QGraphicsVideoItem5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 909 NONAME
+	_ZThn8_N18QGraphicsVideoItemD0Ev @ 910 NONAME
+	_ZThn8_N18QGraphicsVideoItemD1Ev @ 911 NONAME
+	_ZThn8_N22QMediaPlaylistIOPluginD0Ev @ 912 NONAME
+	_ZThn8_N22QMediaPlaylistIOPluginD1Ev @ 913 NONAME
+	_ZThn8_NK18QGraphicsVideoItem12boundingRectEv @ 914 NONAME
+	_ZeqRK15QMediaTimeRangeS1_ @ 915 NONAME
+	_ZeqRK18QMediaTimeIntervalS1_ @ 916 NONAME
+	_ZmiRK15QMediaTimeRangeS1_ @ 917 NONAME
+	_ZneRK15QMediaTimeRangeS1_ @ 918 NONAME
+	_ZneRK18QMediaTimeIntervalS1_ @ 919 NONAME
+	_ZplRK15QMediaTimeRangeS1_ @ 920 NONAME

--- a/qtmobility/src/s60installs/eabi/QtSensorsu.def	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/s60installs/eabi/QtSensorsu.def	Fri May 14 16:41:33 2010 +0300
@@ -126,167 +126,162 @@
 	_ZN10QtMobility19QOrientationReadingD0Ev @ 125 NONAME
 	_ZN10QtMobility19QOrientationReadingD1Ev @ 126 NONAME
 	_ZN10QtMobility19QOrientationReadingD2Ev @ 127 NONAME
-	_ZN10QtMobility19QSensorPluginLoader4loadEv @ 128 NONAME
-	_ZN10QtMobility19QSensorPluginLoaderC1EPKcRK7QString @ 129 NONAME
-	_ZN10QtMobility19QSensorPluginLoaderC2EPKcRK7QString @ 130 NONAME
-	_ZN10QtMobility19QSensorPluginLoaderD1Ev @ 131 NONAME
-	_ZN10QtMobility19QSensorPluginLoaderD2Ev @ 132 NONAME
-	_ZN10QtMobility20QAmbientLightReading11qt_metacallEN11QMetaObject4CallEiPPv @ 133 NONAME
-	_ZN10QtMobility20QAmbientLightReading11qt_metacastEPKc @ 134 NONAME
-	_ZN10QtMobility20QAmbientLightReading13setLightLevelENS0_10LightLevelE @ 135 NONAME
-	_ZN10QtMobility20QAmbientLightReading14copyValuesFromEPNS_14QSensorReadingE @ 136 NONAME
-	_ZN10QtMobility20QAmbientLightReading16staticMetaObjectE @ 137 NONAME DATA 16
-	_ZN10QtMobility20QAmbientLightReading19getStaticMetaObjectEv @ 138 NONAME
-	_ZN10QtMobility20QAmbientLightReadingC1EP7QObject @ 139 NONAME
-	_ZN10QtMobility20QAmbientLightReadingC2EP7QObject @ 140 NONAME
-	_ZN10QtMobility20QAmbientLightReadingD0Ev @ 141 NONAME
-	_ZN10QtMobility20QAmbientLightReadingD1Ev @ 142 NONAME
-	_ZN10QtMobility20QAmbientLightReadingD2Ev @ 143 NONAME
-	_ZN10QtMobility20QMagnetometerReading11qt_metacallEN11QMetaObject4CallEiPPv @ 144 NONAME
-	_ZN10QtMobility20QMagnetometerReading11qt_metacastEPKc @ 145 NONAME
-	_ZN10QtMobility20QMagnetometerReading14copyValuesFromEPNS_14QSensorReadingE @ 146 NONAME
-	_ZN10QtMobility20QMagnetometerReading16staticMetaObjectE @ 147 NONAME DATA 16
-	_ZN10QtMobility20QMagnetometerReading19getStaticMetaObjectEv @ 148 NONAME
-	_ZN10QtMobility20QMagnetometerReading19setCalibrationLevelEf @ 149 NONAME
-	_ZN10QtMobility20QMagnetometerReading4setXEf @ 150 NONAME
-	_ZN10QtMobility20QMagnetometerReading4setYEf @ 151 NONAME
-	_ZN10QtMobility20QMagnetometerReading4setZEf @ 152 NONAME
-	_ZN10QtMobility20QMagnetometerReadingC1EP7QObject @ 153 NONAME
-	_ZN10QtMobility20QMagnetometerReadingC2EP7QObject @ 154 NONAME
-	_ZN10QtMobility20QMagnetometerReadingD0Ev @ 155 NONAME
-	_ZN10QtMobility20QMagnetometerReadingD1Ev @ 156 NONAME
-	_ZN10QtMobility20QMagnetometerReadingD2Ev @ 157 NONAME
-	_ZN10QtMobility21QAccelerometerReading11qt_metacallEN11QMetaObject4CallEiPPv @ 158 NONAME
-	_ZN10QtMobility21QAccelerometerReading11qt_metacastEPKc @ 159 NONAME
-	_ZN10QtMobility21QAccelerometerReading14copyValuesFromEPNS_14QSensorReadingE @ 160 NONAME
-	_ZN10QtMobility21QAccelerometerReading16staticMetaObjectE @ 161 NONAME DATA 16
-	_ZN10QtMobility21QAccelerometerReading19getStaticMetaObjectEv @ 162 NONAME
-	_ZN10QtMobility21QAccelerometerReading4setXEf @ 163 NONAME
-	_ZN10QtMobility21QAccelerometerReading4setYEf @ 164 NONAME
-	_ZN10QtMobility21QAccelerometerReading4setZEf @ 165 NONAME
-	_ZN10QtMobility21QAccelerometerReadingC1EP7QObject @ 166 NONAME
-	_ZN10QtMobility21QAccelerometerReadingC2EP7QObject @ 167 NONAME
-	_ZN10QtMobility21QAccelerometerReadingD0Ev @ 168 NONAME
-	_ZN10QtMobility21QAccelerometerReadingD1Ev @ 169 NONAME
-	_ZN10QtMobility21QAccelerometerReadingD2Ev @ 170 NONAME
-	_ZN10QtMobility7QSensor11busyChangedEv @ 171 NONAME
-	_ZN10QtMobility7QSensor11qt_metacallEN11QMetaObject4CallEiPPv @ 172 NONAME
-	_ZN10QtMobility7QSensor11qt_metacastEPKc @ 173 NONAME
-	_ZN10QtMobility7QSensor11sensorErrorEi @ 174 NONAME
-	_ZN10QtMobility7QSensor11sensorTypesEv @ 175 NONAME
-	_ZN10QtMobility7QSensor11setDataRateEi @ 176 NONAME
-	_ZN10QtMobility7QSensor12removeFilterEPNS_13QSensorFilterE @ 177 NONAME
-	_ZN10QtMobility7QSensor13setIdentifierERK10QByteArray @ 178 NONAME
-	_ZN10QtMobility7QSensor14readingChangedEv @ 179 NONAME
-	_ZN10QtMobility7QSensor14sensorsForTypeERK10QByteArray @ 180 NONAME
-	_ZN10QtMobility7QSensor14setOutputRangeEi @ 181 NONAME
-	_ZN10QtMobility7QSensor16connectToBackendEv @ 182 NONAME
-	_ZN10QtMobility7QSensor16staticMetaObjectE @ 183 NONAME DATA 16
-	_ZN10QtMobility7QSensor19getStaticMetaObjectEv @ 184 NONAME
-	_ZN10QtMobility7QSensor20defaultSensorForTypeERK10QByteArray @ 185 NONAME
-	_ZN10QtMobility7QSensor4stopEv @ 186 NONAME
-	_ZN10QtMobility7QSensor5startEv @ 187 NONAME
-	_ZN10QtMobility7QSensor9addFilterEPNS_13QSensorFilterE @ 188 NONAME
-	_ZN10QtMobility7QSensorC1ERK10QByteArrayP7QObject @ 189 NONAME
-	_ZN10QtMobility7QSensorC2ERK10QByteArrayP7QObject @ 190 NONAME
-	_ZN10QtMobility7QSensorD0Ev @ 191 NONAME
-	_ZN10QtMobility7QSensorD1Ev @ 192 NONAME
-	_ZN10QtMobility7QSensorD2Ev @ 193 NONAME
-	_ZN10QtMobility8QCompass11qt_metacallEN11QMetaObject4CallEiPPv @ 194 NONAME
-	_ZN10QtMobility8QCompass11qt_metacastEPKc @ 195 NONAME
-	_ZN10QtMobility8QCompass16staticMetaObjectE @ 196 NONAME DATA 16
-	_ZN10QtMobility8QCompass19getStaticMetaObjectEv @ 197 NONAME
-	_ZN10QtMobility8QCompass4typeE @ 198 NONAME DATA 4
-	_ZNK10QtMobility10QTapSensor10metaObjectEv @ 199 NONAME
-	_ZNK10QtMobility11QTapReading10metaObjectEv @ 200 NONAME
-	_ZNK10QtMobility11QTapReading11isDoubleTapEv @ 201 NONAME
-	_ZNK10QtMobility11QTapReading12tapDirectionEv @ 202 NONAME
-	_ZNK10QtMobility13QMagnetometer10metaObjectEv @ 203 NONAME
-	_ZNK10QtMobility14QAccelerometer10metaObjectEv @ 204 NONAME
-	_ZNK10QtMobility14QSensorBackend10metaObjectEv @ 205 NONAME
-	_ZNK10QtMobility14QSensorBackend7readingEv @ 206 NONAME
-	_ZNK10QtMobility14QSensorReading10metaObjectEv @ 207 NONAME
-	_ZNK10QtMobility14QSensorReading10valueCountEv @ 208 NONAME
-	_ZNK10QtMobility14QSensorReading5valueEi @ 209 NONAME
-	_ZNK10QtMobility14QSensorReading9timestampEv @ 210 NONAME
-	_ZNK10QtMobility15QCompassReading10metaObjectEv @ 211 NONAME
-	_ZNK10QtMobility15QCompassReading16calibrationLevelEv @ 212 NONAME
-	_ZNK10QtMobility15QCompassReading7azimuthEv @ 213 NONAME
-	_ZNK10QtMobility15QRotationSensor10metaObjectEv @ 214 NONAME
-	_ZNK10QtMobility16QProximitySensor10metaObjectEv @ 215 NONAME
-	_ZNK10QtMobility16QRotationReading10metaObjectEv @ 216 NONAME
-	_ZNK10QtMobility16QRotationReading1xEv @ 217 NONAME
-	_ZNK10QtMobility16QRotationReading1yEv @ 218 NONAME
-	_ZNK10QtMobility16QRotationReading1zEv @ 219 NONAME
-	_ZNK10QtMobility17QProximityReading10metaObjectEv @ 220 NONAME
-	_ZNK10QtMobility17QProximityReading5closeEv @ 221 NONAME
-	_ZNK10QtMobility18QOrientationSensor10metaObjectEv @ 222 NONAME
-	_ZNK10QtMobility19QAmbientLightSensor10metaObjectEv @ 223 NONAME
-	_ZNK10QtMobility19QOrientationReading10metaObjectEv @ 224 NONAME
-	_ZNK10QtMobility19QOrientationReading11orientationEv @ 225 NONAME
-	_ZNK10QtMobility20QAmbientLightReading10lightLevelEv @ 226 NONAME
-	_ZNK10QtMobility20QAmbientLightReading10metaObjectEv @ 227 NONAME
-	_ZNK10QtMobility20QMagnetometerReading10metaObjectEv @ 228 NONAME
-	_ZNK10QtMobility20QMagnetometerReading16calibrationLevelEv @ 229 NONAME
-	_ZNK10QtMobility20QMagnetometerReading1xEv @ 230 NONAME
-	_ZNK10QtMobility20QMagnetometerReading1yEv @ 231 NONAME
-	_ZNK10QtMobility20QMagnetometerReading1zEv @ 232 NONAME
-	_ZNK10QtMobility21QAccelerometerReading10metaObjectEv @ 233 NONAME
-	_ZNK10QtMobility21QAccelerometerReading1xEv @ 234 NONAME
-	_ZNK10QtMobility21QAccelerometerReading1yEv @ 235 NONAME
-	_ZNK10QtMobility21QAccelerometerReading1zEv @ 236 NONAME
-	_ZNK10QtMobility7QSensor10identifierEv @ 237 NONAME
-	_ZNK10QtMobility7QSensor10metaObjectEv @ 238 NONAME
-	_ZNK10QtMobility7QSensor11descriptionEv @ 239 NONAME
-	_ZNK10QtMobility7QSensor11outputRangeEv @ 240 NONAME
-	_ZNK10QtMobility7QSensor12outputRangesEv @ 241 NONAME
-	_ZNK10QtMobility7QSensor18availableDataRatesEv @ 242 NONAME
-	_ZNK10QtMobility7QSensor20isConnectedToBackendEv @ 243 NONAME
-	_ZNK10QtMobility7QSensor4typeEv @ 244 NONAME
-	_ZNK10QtMobility7QSensor5errorEv @ 245 NONAME
-	_ZNK10QtMobility7QSensor6isBusyEv @ 246 NONAME
-	_ZNK10QtMobility7QSensor7readingEv @ 247 NONAME
-	_ZNK10QtMobility7QSensor8dataRateEv @ 248 NONAME
-	_ZNK10QtMobility7QSensor8isActiveEv @ 249 NONAME
-	_ZNK10QtMobility8QCompass10metaObjectEv @ 250 NONAME
-	_ZTIN10QtMobility10QTapSensorE @ 251 NONAME
-	_ZTIN10QtMobility11QTapReadingE @ 252 NONAME
-	_ZTIN10QtMobility13QMagnetometerE @ 253 NONAME
-	_ZTIN10QtMobility13QSensorFilterE @ 254 NONAME
-	_ZTIN10QtMobility14QAccelerometerE @ 255 NONAME
-	_ZTIN10QtMobility14QSensorBackendE @ 256 NONAME
-	_ZTIN10QtMobility14QSensorReadingE @ 257 NONAME
-	_ZTIN10QtMobility15QCompassReadingE @ 258 NONAME
-	_ZTIN10QtMobility15QRotationSensorE @ 259 NONAME
-	_ZTIN10QtMobility16QProximitySensorE @ 260 NONAME
-	_ZTIN10QtMobility16QRotationReadingE @ 261 NONAME
-	_ZTIN10QtMobility17QProximityReadingE @ 262 NONAME
-	_ZTIN10QtMobility18QOrientationSensorE @ 263 NONAME
-	_ZTIN10QtMobility19QAmbientLightSensorE @ 264 NONAME
-	_ZTIN10QtMobility19QOrientationReadingE @ 265 NONAME
-	_ZTIN10QtMobility20QAmbientLightReadingE @ 266 NONAME
-	_ZTIN10QtMobility20QMagnetometerReadingE @ 267 NONAME
-	_ZTIN10QtMobility21QAccelerometerReadingE @ 268 NONAME
-	_ZTIN10QtMobility7QSensorE @ 269 NONAME
-	_ZTIN10QtMobility8QCompassE @ 270 NONAME
-	_ZTVN10QtMobility10QTapSensorE @ 271 NONAME
-	_ZTVN10QtMobility11QTapReadingE @ 272 NONAME
-	_ZTVN10QtMobility13QMagnetometerE @ 273 NONAME
-	_ZTVN10QtMobility13QSensorFilterE @ 274 NONAME
-	_ZTVN10QtMobility14QAccelerometerE @ 275 NONAME
-	_ZTVN10QtMobility14QSensorBackendE @ 276 NONAME
-	_ZTVN10QtMobility14QSensorReadingE @ 277 NONAME
-	_ZTVN10QtMobility15QCompassReadingE @ 278 NONAME
-	_ZTVN10QtMobility15QRotationSensorE @ 279 NONAME
-	_ZTVN10QtMobility16QProximitySensorE @ 280 NONAME
-	_ZTVN10QtMobility16QRotationReadingE @ 281 NONAME
-	_ZTVN10QtMobility17QProximityReadingE @ 282 NONAME
-	_ZTVN10QtMobility18QOrientationSensorE @ 283 NONAME
-	_ZTVN10QtMobility19QAmbientLightSensorE @ 284 NONAME
-	_ZTVN10QtMobility19QOrientationReadingE @ 285 NONAME
-	_ZTVN10QtMobility20QAmbientLightReadingE @ 286 NONAME
-	_ZTVN10QtMobility20QMagnetometerReadingE @ 287 NONAME
-	_ZTVN10QtMobility21QAccelerometerReadingE @ 288 NONAME
-	_ZTVN10QtMobility7QSensorE @ 289 NONAME
-	_ZTVN10QtMobility8QCompassE @ 290 NONAME
+	_ZN10QtMobility20QAmbientLightReading11qt_metacallEN11QMetaObject4CallEiPPv @ 128 NONAME
+	_ZN10QtMobility20QAmbientLightReading11qt_metacastEPKc @ 129 NONAME
+	_ZN10QtMobility20QAmbientLightReading13setLightLevelENS0_10LightLevelE @ 130 NONAME
+	_ZN10QtMobility20QAmbientLightReading14copyValuesFromEPNS_14QSensorReadingE @ 131 NONAME
+	_ZN10QtMobility20QAmbientLightReading16staticMetaObjectE @ 132 NONAME DATA 16
+	_ZN10QtMobility20QAmbientLightReading19getStaticMetaObjectEv @ 133 NONAME
+	_ZN10QtMobility20QAmbientLightReadingC1EP7QObject @ 134 NONAME
+	_ZN10QtMobility20QAmbientLightReadingC2EP7QObject @ 135 NONAME
+	_ZN10QtMobility20QAmbientLightReadingD0Ev @ 136 NONAME
+	_ZN10QtMobility20QAmbientLightReadingD1Ev @ 137 NONAME
+	_ZN10QtMobility20QAmbientLightReadingD2Ev @ 138 NONAME
+	_ZN10QtMobility20QMagnetometerReading11qt_metacallEN11QMetaObject4CallEiPPv @ 139 NONAME
+	_ZN10QtMobility20QMagnetometerReading11qt_metacastEPKc @ 140 NONAME
+	_ZN10QtMobility20QMagnetometerReading14copyValuesFromEPNS_14QSensorReadingE @ 141 NONAME
+	_ZN10QtMobility20QMagnetometerReading16staticMetaObjectE @ 142 NONAME DATA 16
+	_ZN10QtMobility20QMagnetometerReading19getStaticMetaObjectEv @ 143 NONAME
+	_ZN10QtMobility20QMagnetometerReading19setCalibrationLevelEf @ 144 NONAME
+	_ZN10QtMobility20QMagnetometerReading4setXEf @ 145 NONAME
+	_ZN10QtMobility20QMagnetometerReading4setYEf @ 146 NONAME
+	_ZN10QtMobility20QMagnetometerReading4setZEf @ 147 NONAME
+	_ZN10QtMobility20QMagnetometerReadingC1EP7QObject @ 148 NONAME
+	_ZN10QtMobility20QMagnetometerReadingC2EP7QObject @ 149 NONAME
+	_ZN10QtMobility20QMagnetometerReadingD0Ev @ 150 NONAME
+	_ZN10QtMobility20QMagnetometerReadingD1Ev @ 151 NONAME
+	_ZN10QtMobility20QMagnetometerReadingD2Ev @ 152 NONAME
+	_ZN10QtMobility21QAccelerometerReading11qt_metacallEN11QMetaObject4CallEiPPv @ 153 NONAME
+	_ZN10QtMobility21QAccelerometerReading11qt_metacastEPKc @ 154 NONAME
+	_ZN10QtMobility21QAccelerometerReading14copyValuesFromEPNS_14QSensorReadingE @ 155 NONAME
+	_ZN10QtMobility21QAccelerometerReading16staticMetaObjectE @ 156 NONAME DATA 16
+	_ZN10QtMobility21QAccelerometerReading19getStaticMetaObjectEv @ 157 NONAME
+	_ZN10QtMobility21QAccelerometerReading4setXEf @ 158 NONAME
+	_ZN10QtMobility21QAccelerometerReading4setYEf @ 159 NONAME
+	_ZN10QtMobility21QAccelerometerReading4setZEf @ 160 NONAME
+	_ZN10QtMobility21QAccelerometerReadingC1EP7QObject @ 161 NONAME
+	_ZN10QtMobility21QAccelerometerReadingC2EP7QObject @ 162 NONAME
+	_ZN10QtMobility21QAccelerometerReadingD0Ev @ 163 NONAME
+	_ZN10QtMobility21QAccelerometerReadingD1Ev @ 164 NONAME
+	_ZN10QtMobility21QAccelerometerReadingD2Ev @ 165 NONAME
+	_ZN10QtMobility7QSensor11busyChangedEv @ 166 NONAME
+	_ZN10QtMobility7QSensor11qt_metacallEN11QMetaObject4CallEiPPv @ 167 NONAME
+	_ZN10QtMobility7QSensor11qt_metacastEPKc @ 168 NONAME
+	_ZN10QtMobility7QSensor11sensorErrorEi @ 169 NONAME
+	_ZN10QtMobility7QSensor11sensorTypesEv @ 170 NONAME
+	_ZN10QtMobility7QSensor11setDataRateEi @ 171 NONAME
+	_ZN10QtMobility7QSensor12removeFilterEPNS_13QSensorFilterE @ 172 NONAME
+	_ZN10QtMobility7QSensor13setIdentifierERK10QByteArray @ 173 NONAME
+	_ZN10QtMobility7QSensor14readingChangedEv @ 174 NONAME
+	_ZN10QtMobility7QSensor14sensorsForTypeERK10QByteArray @ 175 NONAME
+	_ZN10QtMobility7QSensor14setOutputRangeEi @ 176 NONAME
+	_ZN10QtMobility7QSensor16connectToBackendEv @ 177 NONAME
+	_ZN10QtMobility7QSensor16staticMetaObjectE @ 178 NONAME DATA 16
+	_ZN10QtMobility7QSensor19getStaticMetaObjectEv @ 179 NONAME
+	_ZN10QtMobility7QSensor20defaultSensorForTypeERK10QByteArray @ 180 NONAME
+	_ZN10QtMobility7QSensor4stopEv @ 181 NONAME
+	_ZN10QtMobility7QSensor5startEv @ 182 NONAME
+	_ZN10QtMobility7QSensor9addFilterEPNS_13QSensorFilterE @ 183 NONAME
+	_ZN10QtMobility7QSensorC1ERK10QByteArrayP7QObject @ 184 NONAME
+	_ZN10QtMobility7QSensorC2ERK10QByteArrayP7QObject @ 185 NONAME
+	_ZN10QtMobility7QSensorD0Ev @ 186 NONAME
+	_ZN10QtMobility7QSensorD1Ev @ 187 NONAME
+	_ZN10QtMobility7QSensorD2Ev @ 188 NONAME
+	_ZN10QtMobility8QCompass11qt_metacallEN11QMetaObject4CallEiPPv @ 189 NONAME
+	_ZN10QtMobility8QCompass11qt_metacastEPKc @ 190 NONAME
+	_ZN10QtMobility8QCompass16staticMetaObjectE @ 191 NONAME DATA 16
+	_ZN10QtMobility8QCompass19getStaticMetaObjectEv @ 192 NONAME
+	_ZN10QtMobility8QCompass4typeE @ 193 NONAME DATA 4
+	_ZNK10QtMobility10QTapSensor10metaObjectEv @ 194 NONAME
+	_ZNK10QtMobility11QTapReading10metaObjectEv @ 195 NONAME
+	_ZNK10QtMobility11QTapReading11isDoubleTapEv @ 196 NONAME
+	_ZNK10QtMobility11QTapReading12tapDirectionEv @ 197 NONAME
+	_ZNK10QtMobility13QMagnetometer10metaObjectEv @ 198 NONAME
+	_ZNK10QtMobility14QAccelerometer10metaObjectEv @ 199 NONAME
+	_ZNK10QtMobility14QSensorBackend10metaObjectEv @ 200 NONAME
+	_ZNK10QtMobility14QSensorBackend7readingEv @ 201 NONAME
+	_ZNK10QtMobility14QSensorReading10metaObjectEv @ 202 NONAME
+	_ZNK10QtMobility14QSensorReading10valueCountEv @ 203 NONAME
+	_ZNK10QtMobility14QSensorReading5valueEi @ 204 NONAME
+	_ZNK10QtMobility14QSensorReading9timestampEv @ 205 NONAME
+	_ZNK10QtMobility15QCompassReading10metaObjectEv @ 206 NONAME
+	_ZNK10QtMobility15QCompassReading16calibrationLevelEv @ 207 NONAME
+	_ZNK10QtMobility15QCompassReading7azimuthEv @ 208 NONAME
+	_ZNK10QtMobility15QRotationSensor10metaObjectEv @ 209 NONAME
+	_ZNK10QtMobility16QProximitySensor10metaObjectEv @ 210 NONAME
+	_ZNK10QtMobility16QRotationReading10metaObjectEv @ 211 NONAME
+	_ZNK10QtMobility16QRotationReading1xEv @ 212 NONAME
+	_ZNK10QtMobility16QRotationReading1yEv @ 213 NONAME
+	_ZNK10QtMobility16QRotationReading1zEv @ 214 NONAME
+	_ZNK10QtMobility17QProximityReading10metaObjectEv @ 215 NONAME
+	_ZNK10QtMobility17QProximityReading5closeEv @ 216 NONAME
+	_ZNK10QtMobility18QOrientationSensor10metaObjectEv @ 217 NONAME
+	_ZNK10QtMobility19QAmbientLightSensor10metaObjectEv @ 218 NONAME
+	_ZNK10QtMobility19QOrientationReading10metaObjectEv @ 219 NONAME
+	_ZNK10QtMobility19QOrientationReading11orientationEv @ 220 NONAME
+	_ZNK10QtMobility20QAmbientLightReading10lightLevelEv @ 221 NONAME
+	_ZNK10QtMobility20QAmbientLightReading10metaObjectEv @ 222 NONAME
+	_ZNK10QtMobility20QMagnetometerReading10metaObjectEv @ 223 NONAME
+	_ZNK10QtMobility20QMagnetometerReading16calibrationLevelEv @ 224 NONAME
+	_ZNK10QtMobility20QMagnetometerReading1xEv @ 225 NONAME
+	_ZNK10QtMobility20QMagnetometerReading1yEv @ 226 NONAME
+	_ZNK10QtMobility20QMagnetometerReading1zEv @ 227 NONAME
+	_ZNK10QtMobility21QAccelerometerReading10metaObjectEv @ 228 NONAME
+	_ZNK10QtMobility21QAccelerometerReading1xEv @ 229 NONAME
+	_ZNK10QtMobility21QAccelerometerReading1yEv @ 230 NONAME
+	_ZNK10QtMobility21QAccelerometerReading1zEv @ 231 NONAME
+	_ZNK10QtMobility7QSensor10identifierEv @ 232 NONAME
+	_ZNK10QtMobility7QSensor10metaObjectEv @ 233 NONAME
+	_ZNK10QtMobility7QSensor11descriptionEv @ 234 NONAME
+	_ZNK10QtMobility7QSensor11outputRangeEv @ 235 NONAME
+	_ZNK10QtMobility7QSensor12outputRangesEv @ 236 NONAME
+	_ZNK10QtMobility7QSensor18availableDataRatesEv @ 237 NONAME
+	_ZNK10QtMobility7QSensor20isConnectedToBackendEv @ 238 NONAME
+	_ZNK10QtMobility7QSensor4typeEv @ 239 NONAME
+	_ZNK10QtMobility7QSensor5errorEv @ 240 NONAME
+	_ZNK10QtMobility7QSensor6isBusyEv @ 241 NONAME
+	_ZNK10QtMobility7QSensor7readingEv @ 242 NONAME
+	_ZNK10QtMobility7QSensor8dataRateEv @ 243 NONAME
+	_ZNK10QtMobility7QSensor8isActiveEv @ 244 NONAME
+	_ZNK10QtMobility8QCompass10metaObjectEv @ 245 NONAME
+	_ZTIN10QtMobility10QTapSensorE @ 246 NONAME
+	_ZTIN10QtMobility11QTapReadingE @ 247 NONAME
+	_ZTIN10QtMobility13QMagnetometerE @ 248 NONAME
+	_ZTIN10QtMobility13QSensorFilterE @ 249 NONAME
+	_ZTIN10QtMobility14QAccelerometerE @ 250 NONAME
+	_ZTIN10QtMobility14QSensorBackendE @ 251 NONAME
+	_ZTIN10QtMobility14QSensorReadingE @ 252 NONAME
+	_ZTIN10QtMobility15QCompassReadingE @ 253 NONAME
+	_ZTIN10QtMobility15QRotationSensorE @ 254 NONAME
+	_ZTIN10QtMobility16QProximitySensorE @ 255 NONAME
+	_ZTIN10QtMobility16QRotationReadingE @ 256 NONAME
+	_ZTIN10QtMobility17QProximityReadingE @ 257 NONAME
+	_ZTIN10QtMobility18QOrientationSensorE @ 258 NONAME
+	_ZTIN10QtMobility19QAmbientLightSensorE @ 259 NONAME
+	_ZTIN10QtMobility19QOrientationReadingE @ 260 NONAME
+	_ZTIN10QtMobility20QAmbientLightReadingE @ 261 NONAME
+	_ZTIN10QtMobility20QMagnetometerReadingE @ 262 NONAME
+	_ZTIN10QtMobility21QAccelerometerReadingE @ 263 NONAME
+	_ZTIN10QtMobility7QSensorE @ 264 NONAME
+	_ZTIN10QtMobility8QCompassE @ 265 NONAME
+	_ZTVN10QtMobility10QTapSensorE @ 266 NONAME
+	_ZTVN10QtMobility11QTapReadingE @ 267 NONAME
+	_ZTVN10QtMobility13QMagnetometerE @ 268 NONAME
+	_ZTVN10QtMobility13QSensorFilterE @ 269 NONAME
+	_ZTVN10QtMobility14QAccelerometerE @ 270 NONAME
+	_ZTVN10QtMobility14QSensorBackendE @ 271 NONAME
+	_ZTVN10QtMobility14QSensorReadingE @ 272 NONAME
+	_ZTVN10QtMobility15QCompassReadingE @ 273 NONAME
+	_ZTVN10QtMobility15QRotationSensorE @ 274 NONAME
+	_ZTVN10QtMobility16QProximitySensorE @ 275 NONAME
+	_ZTVN10QtMobility16QRotationReadingE @ 276 NONAME
+	_ZTVN10QtMobility17QProximityReadingE @ 277 NONAME
+	_ZTVN10QtMobility18QOrientationSensorE @ 278 NONAME
+	_ZTVN10QtMobility19QAmbientLightSensorE @ 279 NONAME
+	_ZTVN10QtMobility19QOrientationReadingE @ 280 NONAME
+	_ZTVN10QtMobility20QAmbientLightReadingE @ 281 NONAME
+	_ZTVN10QtMobility20QMagnetometerReadingE @ 282 NONAME
+	_ZTVN10QtMobility21QAccelerometerReadingE @ 283 NONAME
+	_ZTVN10QtMobility7QSensorE @ 284 NONAME
+	_ZTVN10QtMobility8QCompassE @ 285 NONAME

--- a/qtmobility/src/s60installs/eabi/SFWDatabaseManagerServeru.def	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-EXPORTS
-	_ZN10QtMobility14QServiceFilter12setInterfaceERK7QStringS3_NS0_16VersionMatchRuleE @ 1 NONAME
-	_ZN10QtMobility14QServiceFilter14setServiceNameERK7QString @ 2 NONAME
-	_ZN10QtMobility14QServiceFilter15setCapabilitiesENS0_19CapabilityMatchRuleERK11QStringList @ 3 NONAME
-	_ZN10QtMobility14QServiceFilter18setCustomAttributeERK7QStringS3_ @ 4 NONAME
-	_ZN10QtMobility14QServiceFilter20clearCustomAttributeERK7QString @ 5 NONAME
-	_ZN10QtMobility14QServiceFilterC1ERK7QStringS3_NS0_16VersionMatchRuleE @ 6 NONAME
-	_ZN10QtMobility14QServiceFilterC1ERKS0_ @ 7 NONAME
-	_ZN10QtMobility14QServiceFilterC1Ev @ 8 NONAME
-	_ZN10QtMobility14QServiceFilterC2ERK7QStringS3_NS0_16VersionMatchRuleE @ 9 NONAME
-	_ZN10QtMobility14QServiceFilterC2ERKS0_ @ 10 NONAME
-	_ZN10QtMobility14QServiceFilterC2Ev @ 11 NONAME
-	_ZN10QtMobility14QServiceFilterD1Ev @ 12 NONAME
-	_ZN10QtMobility14QServiceFilterD2Ev @ 13 NONAME
-	_ZN10QtMobility14QServiceFilteraSERKS0_ @ 14 NONAME
-	_ZN10QtMobility22CDatabaseManagerServer11PanicServerE30TDatabaseManagerSerververPanic @ 15 NONAME
-	_ZN10QtMobility22CDatabaseManagerServer16DecreaseSessionsEv @ 16 NONAME
-	_ZN10QtMobility22CDatabaseManagerServer16IncreaseSessionsEv @ 17 NONAME
-	_ZN10QtMobility22CDatabaseManagerServerC1Ev @ 18 NONAME
-	_ZN10QtMobility22CDatabaseManagerServerC2Ev @ 19 NONAME
-	_ZN10QtMobility23QServicePluginInterface14installServiceEv @ 20 NONAME
-	_ZN10QtMobility23QServicePluginInterface16uninstallServiceEv @ 21 NONAME
-	_ZN10QtMobility23QServicePluginInterfaceC2Ev @ 22 NONAME
-	_ZN10QtMobility23QServicePluginInterfaceD0Ev @ 23 NONAME
-	_ZN10QtMobility23QServicePluginInterfaceD1Ev @ 24 NONAME
-	_ZN10QtMobility23QServicePluginInterfaceD2Ev @ 25 NONAME
-	_ZN10QtMobility24QAbstractSecuritySession11qt_metacallEN11QMetaObject4CallEiPPv @ 26 NONAME
-	_ZN10QtMobility24QAbstractSecuritySession11qt_metacastEPKc @ 27 NONAME
-	_ZN10QtMobility24QAbstractSecuritySession16staticMetaObjectE @ 28 NONAME DATA 16
-	_ZN10QtMobility24QAbstractSecuritySession19getStaticMetaObjectEv @ 29 NONAME
-	_ZN10QtMobility24QAbstractSecuritySessionC2EP7QObject @ 30 NONAME
-	_ZN10QtMobility24QAbstractSecuritySessionD0Ev @ 31 NONAME
-	_ZN10QtMobility24QAbstractSecuritySessionD1Ev @ 32 NONAME
-	_ZN10QtMobility24QAbstractSecuritySessionD2Ev @ 33 NONAME
-	_ZN10QtMobility27QServiceInterfaceDescriptorC1ERKS0_ @ 34 NONAME
-	_ZN10QtMobility27QServiceInterfaceDescriptorC1Ev @ 35 NONAME
-	_ZN10QtMobility27QServiceInterfaceDescriptorC2ERKS0_ @ 36 NONAME
-	_ZN10QtMobility27QServiceInterfaceDescriptorC2Ev @ 37 NONAME
-	_ZN10QtMobility27QServiceInterfaceDescriptorD1Ev @ 38 NONAME
-	_ZN10QtMobility27QServiceInterfaceDescriptorD2Ev @ 39 NONAME
-	_ZN10QtMobility27QServiceInterfaceDescriptoraSERKS0_ @ 40 NONAME
-	_ZN10QtMobilitylsE6QDebugRKNS_27QServiceInterfaceDescriptorE @ 41 NONAME
-	_ZN10QtMobilitylsER11QDataStreamRKNS_14QServiceFilterE @ 42 NONAME
-	_ZN10QtMobilitylsER11QDataStreamRKNS_27QServiceInterfaceDescriptorE @ 43 NONAME
-	_ZN10QtMobilityrsER11QDataStreamRNS_14QServiceFilterE @ 44 NONAME
-	_ZN10QtMobilityrsER11QDataStreamRNS_27QServiceInterfaceDescriptorE @ 45 NONAME
-	_ZNK10QtMobility14QServiceFilter11serviceNameEv @ 46 NONAME
-	_ZNK10QtMobility14QServiceFilter12capabilitiesEv @ 47 NONAME
-	_ZNK10QtMobility14QServiceFilter12majorVersionEv @ 48 NONAME
-	_ZNK10QtMobility14QServiceFilter12minorVersionEv @ 49 NONAME
-	_ZNK10QtMobility14QServiceFilter13interfaceNameEv @ 50 NONAME
-	_ZNK10QtMobility14QServiceFilter15customAttributeERK7QString @ 51 NONAME
-	_ZNK10QtMobility14QServiceFilter16customAttributesEv @ 52 NONAME
-	_ZNK10QtMobility14QServiceFilter16versionMatchRuleEv @ 53 NONAME
-	_ZNK10QtMobility14QServiceFilter19capabilityMatchRuleEv @ 54 NONAME
-	_ZNK10QtMobility22CDatabaseManagerServer11NewSessionLERK8TVersionRK9RMessage2 @ 55 NONAME
-	_ZNK10QtMobility24QAbstractSecuritySession10metaObjectEv @ 56 NONAME
-	_ZNK10QtMobility27QServiceInterfaceDescriptor11serviceNameEv @ 57 NONAME
-	_ZNK10QtMobility27QServiceInterfaceDescriptor12majorVersionEv @ 58 NONAME
-	_ZNK10QtMobility27QServiceInterfaceDescriptor12minorVersionEv @ 59 NONAME
-	_ZNK10QtMobility27QServiceInterfaceDescriptor13interfaceNameEv @ 60 NONAME
-	_ZNK10QtMobility27QServiceInterfaceDescriptor15customAttributeERK7QString @ 61 NONAME
-	_ZNK10QtMobility27QServiceInterfaceDescriptor16customAttributesEv @ 62 NONAME
-	_ZNK10QtMobility27QServiceInterfaceDescriptor5scopeEv @ 63 NONAME
-	_ZNK10QtMobility27QServiceInterfaceDescriptor7isValidEv @ 64 NONAME
-	_ZNK10QtMobility27QServiceInterfaceDescriptor9attributeENS0_9AttributeE @ 65 NONAME
-	_ZNK10QtMobility27QServiceInterfaceDescriptoreqERKS0_ @ 66 NONAME
-	_ZTIN10QtMobility22CDatabaseManagerServerE @ 67 NONAME
-	_ZTIN10QtMobility23QServicePluginInterfaceE @ 68 NONAME
-	_ZTIN10QtMobility24QAbstractSecuritySessionE @ 69 NONAME
-	_ZTVN10QtMobility22CDatabaseManagerServerE @ 70 NONAME
-	_ZTVN10QtMobility23QServicePluginInterfaceE @ 71 NONAME
-	_ZTVN10QtMobility24QAbstractSecuritySessionE @ 72 NONAME
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/src/s60installs/eabi/qsfwdatabasemanagerserveru.def	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,74 @@
+EXPORTS
+	_ZN10QtMobility14QServiceFilter12setInterfaceERK7QStringS3_NS0_16VersionMatchRuleE @ 1 NONAME
+	_ZN10QtMobility14QServiceFilter14setServiceNameERK7QString @ 2 NONAME
+	_ZN10QtMobility14QServiceFilter15setCapabilitiesENS0_19CapabilityMatchRuleERK11QStringList @ 3 NONAME
+	_ZN10QtMobility14QServiceFilter18setCustomAttributeERK7QStringS3_ @ 4 NONAME
+	_ZN10QtMobility14QServiceFilter20clearCustomAttributeERK7QString @ 5 NONAME
+	_ZN10QtMobility14QServiceFilterC1ERK7QStringS3_NS0_16VersionMatchRuleE @ 6 NONAME
+	_ZN10QtMobility14QServiceFilterC1ERKS0_ @ 7 NONAME
+	_ZN10QtMobility14QServiceFilterC1Ev @ 8 NONAME
+	_ZN10QtMobility14QServiceFilterC2ERK7QStringS3_NS0_16VersionMatchRuleE @ 9 NONAME
+	_ZN10QtMobility14QServiceFilterC2ERKS0_ @ 10 NONAME
+	_ZN10QtMobility14QServiceFilterC2Ev @ 11 NONAME
+	_ZN10QtMobility14QServiceFilterD1Ev @ 12 NONAME
+	_ZN10QtMobility14QServiceFilterD2Ev @ 13 NONAME
+	_ZN10QtMobility14QServiceFilteraSERKS0_ @ 14 NONAME
+	_ZN10QtMobility22CDatabaseManagerServer11PanicServerE30TDatabaseManagerSerververPanic @ 15 NONAME
+	_ZN10QtMobility22CDatabaseManagerServer16DecreaseSessionsEv @ 16 NONAME
+	_ZN10QtMobility22CDatabaseManagerServer16IncreaseSessionsEv @ 17 NONAME
+	_ZN10QtMobility22CDatabaseManagerServerC1Ev @ 18 NONAME
+	_ZN10QtMobility22CDatabaseManagerServerC2Ev @ 19 NONAME
+	_ZN10QtMobility23QServicePluginInterface14installServiceEv @ 20 NONAME
+	_ZN10QtMobility23QServicePluginInterface16uninstallServiceEv @ 21 NONAME
+	_ZN10QtMobility23QServicePluginInterfaceC2Ev @ 22 NONAME
+	_ZN10QtMobility23QServicePluginInterfaceD0Ev @ 23 NONAME
+	_ZN10QtMobility23QServicePluginInterfaceD1Ev @ 24 NONAME
+	_ZN10QtMobility23QServicePluginInterfaceD2Ev @ 25 NONAME
+	_ZN10QtMobility24QAbstractSecuritySession11qt_metacallEN11QMetaObject4CallEiPPv @ 26 NONAME
+	_ZN10QtMobility24QAbstractSecuritySession11qt_metacastEPKc @ 27 NONAME
+	_ZN10QtMobility24QAbstractSecuritySession16staticMetaObjectE @ 28 NONAME DATA 16
+	_ZN10QtMobility24QAbstractSecuritySession19getStaticMetaObjectEv @ 29 NONAME
+	_ZN10QtMobility24QAbstractSecuritySessionC2EP7QObject @ 30 NONAME
+	_ZN10QtMobility24QAbstractSecuritySessionD0Ev @ 31 NONAME
+	_ZN10QtMobility24QAbstractSecuritySessionD1Ev @ 32 NONAME
+	_ZN10QtMobility24QAbstractSecuritySessionD2Ev @ 33 NONAME
+	_ZN10QtMobility27QServiceInterfaceDescriptorC1ERKS0_ @ 34 NONAME
+	_ZN10QtMobility27QServiceInterfaceDescriptorC1Ev @ 35 NONAME
+	_ZN10QtMobility27QServiceInterfaceDescriptorC2ERKS0_ @ 36 NONAME
+	_ZN10QtMobility27QServiceInterfaceDescriptorC2Ev @ 37 NONAME
+	_ZN10QtMobility27QServiceInterfaceDescriptorD1Ev @ 38 NONAME
+	_ZN10QtMobility27QServiceInterfaceDescriptorD2Ev @ 39 NONAME
+	_ZN10QtMobility27QServiceInterfaceDescriptoraSERKS0_ @ 40 NONAME
+	_ZN10QtMobilitylsE6QDebugRKNS_27QServiceInterfaceDescriptorE @ 41 NONAME
+	_ZN10QtMobilitylsER11QDataStreamRKNS_14QServiceFilterE @ 42 NONAME
+	_ZN10QtMobilitylsER11QDataStreamRKNS_27QServiceInterfaceDescriptorE @ 43 NONAME
+	_ZN10QtMobilityrsER11QDataStreamRNS_14QServiceFilterE @ 44 NONAME
+	_ZN10QtMobilityrsER11QDataStreamRNS_27QServiceInterfaceDescriptorE @ 45 NONAME
+	_ZNK10QtMobility14QServiceFilter11serviceNameEv @ 46 NONAME
+	_ZNK10QtMobility14QServiceFilter12capabilitiesEv @ 47 NONAME
+	_ZNK10QtMobility14QServiceFilter12majorVersionEv @ 48 NONAME
+	_ZNK10QtMobility14QServiceFilter12minorVersionEv @ 49 NONAME
+	_ZNK10QtMobility14QServiceFilter13interfaceNameEv @ 50 NONAME
+	_ZNK10QtMobility14QServiceFilter15customAttributeERK7QString @ 51 NONAME
+	_ZNK10QtMobility14QServiceFilter16customAttributesEv @ 52 NONAME
+	_ZNK10QtMobility14QServiceFilter16versionMatchRuleEv @ 53 NONAME
+	_ZNK10QtMobility14QServiceFilter19capabilityMatchRuleEv @ 54 NONAME
+	_ZNK10QtMobility22CDatabaseManagerServer11NewSessionLERK8TVersionRK9RMessage2 @ 55 NONAME
+	_ZNK10QtMobility24QAbstractSecuritySession10metaObjectEv @ 56 NONAME
+	_ZNK10QtMobility27QServiceInterfaceDescriptor11serviceNameEv @ 57 NONAME
+	_ZNK10QtMobility27QServiceInterfaceDescriptor12majorVersionEv @ 58 NONAME
+	_ZNK10QtMobility27QServiceInterfaceDescriptor12minorVersionEv @ 59 NONAME
+	_ZNK10QtMobility27QServiceInterfaceDescriptor13interfaceNameEv @ 60 NONAME
+	_ZNK10QtMobility27QServiceInterfaceDescriptor15customAttributeERK7QString @ 61 NONAME
+	_ZNK10QtMobility27QServiceInterfaceDescriptor16customAttributesEv @ 62 NONAME
+	_ZNK10QtMobility27QServiceInterfaceDescriptor5scopeEv @ 63 NONAME
+	_ZNK10QtMobility27QServiceInterfaceDescriptor7isValidEv @ 64 NONAME
+	_ZNK10QtMobility27QServiceInterfaceDescriptor9attributeENS0_9AttributeE @ 65 NONAME
+	_ZNK10QtMobility27QServiceInterfaceDescriptoreqERKS0_ @ 66 NONAME
+	_ZTIN10QtMobility22CDatabaseManagerServerE @ 67 NONAME
+	_ZTIN10QtMobility23QServicePluginInterfaceE @ 68 NONAME
+	_ZTIN10QtMobility24QAbstractSecuritySessionE @ 69 NONAME
+	_ZTVN10QtMobility22CDatabaseManagerServerE @ 70 NONAME
+	_ZTVN10QtMobility23QServicePluginInterfaceE @ 71 NONAME
+	_ZTVN10QtMobility24QAbstractSecuritySessionE @ 72 NONAME
+

--- a/qtmobility/src/s60installs/qtmobility.iby	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/s60installs/qtmobility.iby	Fri May 14 16:41:33 2010 +0300
@@ -31,9 +31,9 @@
 file=ABI_DIR\BUILD_DIR\qtbearer.dll                                                      SHARED_LIB_DIR\qtbearer.dll PAGED
 file=ABI_DIR\BUILD_DIR\qtlocation.dll                                                    SHARED_LIB_DIR\qtlocation.dll PAGED
 file=ABI_DIR\BUILD_DIR\qtpublishsubscribe.dll                                            SHARED_LIB_DIR\qtpublishsubscribe.dll PAGED
-file=ABI_DIR\BUILD_DIR\pspathmapperserver.exe                                            PROGRAMS_DIR\pspathmapperserver.exe PAGED
+file=ABI_DIR\BUILD_DIR\qpspathmapperserver.exe                                           PROGRAMS_DIR\qpspathmapperserver.exe PAGED
 file=ABI_DIR\BUILD_DIR\qtserviceframework.dll                                            SHARED_LIB_DIR\qtserviceframework.dll PAGED
-file=ABI_DIR\BUILD_DIR\sfwdatabasemanagerserver.exe                                      PROGRAMS_DIR\sfwdatabasemanagerserver.exe PAGED
+file=ABI_DIR\BUILD_DIR\qsfwdatabasemanagerserver.exe                                     PROGRAMS_DIR\qsfwdatabasemanagerserver.exe PAGED
 file=ABI_DIR\BUILD_DIR\qtsysteminfo.dll                                                  SHARED_LIB_DIR\qtsysteminfo.dll PAGED
 file=ABI_DIR\BUILD_DIR\qtmessaging.dll                                                   SHARED_LIB_DIR\qtmessaging.dll PAGED
 
@@ -44,12 +44,16 @@
 
 //Plugins
 /*
-file=ABI_DIR\BUILD_DIR\m3u.dll                                                           SHARED_LIB_DIR\m3u.dll PAGED
-data=\epoc32\data\z\resource\qt\plugins\playlistformats\m3u.qtplugin                     resource\qt\plugins\playlistformats\m3u.qtplugin
-file=ABI_DIR\BUILD_DIR\qtmobilitymultimediaengine.dll                                    SHARED_LIB_DIR\qtmobilitymultimediaengine.dll PAGED
-data=\epoc32\data\z\resource\qt\plugins\mediaservice\qtmobilitymultimediaengine.qtplugin resource\qt\plugins\mediaservice\qtmobilitymultimediaengine.qtplugin
-file=ABI_DIR\BUILD_DIR\sensors_sym.dll                                                   SHARED_LIB_DIR\sensors_sym.dll PAGED
-data=\epoc32\data\z\resource\qt\plugins\sensors\sensors_sym.qtplugin                     resource\qt\plugins\sensors\sensors_sym.qtplugin
+file=ABI_DIR\BUILD_DIR\qtmedia_m3u.dll                                                   SHARED_LIB_DIR\qtmedia_m3u.dll PAGED
+data=\epoc32\data\z\resource\qt\plugins\playlistformats\qtmedia_m3u.qtplugin             resource\qt\plugins\playlistformats\qtmedia_m3u.qtplugin
+file=ABI_DIR\BUILD_DIR\qtmedia_xarecordservice.dll                                       SHARED_LIB_DIR\qtmedia_xarecordservice.dll PAGED
+data=\epoc32\data\z\resource\qt\plugins\mediaservice\qtmedia_xarecordservice.qtplugin    resource\qt\plugins\mediaservice\qtmedia_xarecordservice.qtplugin
+file=ABI_DIR\BUILD_DIR\qtmedia_mmfengine.dll                                             SHARED_LIB_DIR\qtmedia_mmfengine.dll PAGED
+data=\epoc32\data\z\resource\qt\plugins\mediaservice\qtmedia_mmfengine.qtplugin          resource\qt\plugins\mediaservice\qtmedia_mmfengine.qtplugin
+file=ABI_DIR\BUILD_DIR\qtsensors_generic.dll                                             SHARED_LIB_DIR\qtsensors_generic.dll PAGED
+data=\epoc32\data\z\resource\qt\plugins\sensors\qtsensors_generic.qtplugin               resource\qt\plugins\sensors\qtsensors_generic.qtplugin
+file=ABI_DIR\BUILD_DIR\qtsensors_sym.dll                                                 SHARED_LIB_DIR\qtsensors_sym.dll PAGED
+data=\epoc32\data\z\resource\qt\plugins\sensors\qtsensors_sym.qtplugin                   resource\qt\plugins\sensors\qtsensors_sym.qtplugin
 */
 
 #endif // __QT_MOBILITY_IBY__

--- a/qtmobility/src/s60installs/s60installs.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/s60installs/s60installs.pro	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,7 @@
 
     contains(mobility_modules, serviceframework): qtmobilitydeployment.sources += \
         $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtServiceFramework.dll \
-        $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/SFWDatabaseManagerServer.exe
+        $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qsfwdatabasemanagerserver.exe
 
     contains(mobility_modules, location): qtmobilitydeployment.sources += \
         $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtLocation.dll
@@ -59,7 +59,7 @@
 
     contains(mobility_modules, publishsubscribe): qtmobilitydeployment.sources += \
         $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtPublishSubscribe.dll \
-        $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/PSPathMapperServer.exe
+        $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qpspathmapperserver.exe
 
     contains(mobility_modules, versit): qtmobilitydeployment.sources += \
         $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtVersit.dll
@@ -87,33 +87,33 @@
 
         contacts = \
             "IF package(0x1028315F)" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/mobapicontactspluginsymbian.dll\" - \"!:\\sys\\bin\\mobapicontactspluginsymbian.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbian.dll\" - \"!:\\sys\\bin\\qtcontacts_symbian.dll\"" \
             "ELSEIF package(0x102752AE)" \
-            "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/mobapicontactspluginsymbian.dll\" - \"!:\\sys\\bin\\mobapicontactspluginsymbian.dll\"" \
+            "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbian.dll\" - \"!:\\sys\\bin\\qtcontacts_symbian.dll\"" \
             "ELSEIF package(0x102032BE)" \
-            "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/mobapicontactspluginsymbian.dll\" - \"!:\\sys\\bin\\mobapicontactspluginsymbian.dll\"" \
+            "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbian.dll\" - \"!:\\sys\\bin\\qtcontacts_symbian.dll\"" \
             "ELSE" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/mobapicontactspluginsymbian.dll\" - \"!:\\sys\\bin\\mobapicontactspluginsymbian.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbian.dll\" - \"!:\\sys\\bin\\qtcontacts_symbian.dll\"" \
             "ENDIF"
 
         qtmobilitydeployment.pkg_postrules += contacts
 
         pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE/plugins/contacts/symbian/qmakepluginstubs/mobapicontactspluginsymbian.qtplugin\"  - \"!:\\resource\\qt\\plugins\\contacts\\mobapicontactspluginsymbian.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE/plugins/contacts/symbian/qmakepluginstubs/qtcontacts_symbian.qtplugin\"  - \"!:\\resource\\qt\\plugins\\contacts\\qtcontacts_symbian.qtplugin\""
 
         contains(symbiancntsim_enabled, yes) {
             pluginstubs += \
-                "\"$$QT_MOBILITY_BUILD_TREE/plugins/contacts/symbiansim/qmakepluginstubs/mobapicontactspluginsymbiansim.qtplugin\"  - \"!:\\resource\\qt\\plugins\\contacts\\mobapicontactspluginsymbiansim.qtplugin\""
+                "\"$$QT_MOBILITY_BUILD_TREE/plugins/contacts/symbiansim/qmakepluginstubs/qtcontacts_symbiansim.qtplugin\"  - \"!:\\resource\\qt\\plugins\\contacts\\qtcontacts_symbiansim.qtplugin\""
 
             symbiancntsim = \
                 "IF package(0x1028315F)" \
-                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/mobapicontactspluginsymbiansim.dll\" - \"!:\\sys\\bin\\mobapicontactspluginsymbiansim.dll\"" \
+                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbiansim.dll\" - \"!:\\sys\\bin\\qtcontacts_symbiansim.dll\"" \
                 "ELSEIF package(0x102752AE)" \
-                "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/mobapicontactspluginsymbiansim.dll\" - \"!:\\sys\\bin\\mobapicontactspluginsymbiansim.dll\"" \
+                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbiansim.dll\" - \"!:\\sys\\bin\\qtcontacts_symbiansim.dll\"" \
                 "ELSEIF package(0x102032BE)" \
-                "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/mobapicontactspluginsymbiansim.dll\" - \"!:\\sys\\bin\\mobapicontactspluginsymbiansim.dll\"" \
+                "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbiansim.dll\" - \"!:\\sys\\bin\\qtcontacts_symbiansim.dll\"" \
                 "ELSE" \
-                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/mobapicontactspluginsymbiansim.dll\" - \"!:\\sys\\bin\\mobapicontactspluginsymbiansim.dll\"" \
+                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbiansim.dll\" - \"!:\\sys\\bin\\qtcontacts_symbiansim.dll\"" \
                 "ENDIF"
 
             qtmobilitydeployment.pkg_postrules += symbiancntsim
@@ -125,78 +125,68 @@
 
         qtmobilitydeployment.sources += \
             $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtMedia.dll \
-            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/m3u.dll
+            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtmedia_m3u.dll
 
         multimedia = \
             "IF package(0x1028315F)" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtMobilityMmfEngine.dll\" - \"!:\\sys\\bin\\QtMobilityMmfEngine.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtmedia_mmfengine.dll\" - \"!:\\sys\\bin\\qtmedia_mmfengine.dll\"" \
             "ELSEIF package(0x102752AE)" \
-            "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/QtMobilityMmfEngine.dll\" - \"!:\\sys\\bin\\QtMobilityMmfEngine.dll\"" \
+            "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtmedia_mmfengine.dll\" - \"!:\\sys\\bin\\qtmedia_mmfengine.dll\"" \
             "ELSEIF package(0x102032BE)" \
-            "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/QtMobilityMmfEngine.dll\" - \"!:\\sys\\bin\\QtMobilityMmfEngine.dll\"" \
+            "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtmedia_mmfengine.dll\" - \"!:\\sys\\bin\\qtmedia_mmfengine.dll\"" \
             "ELSE" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtMobilityMmfEngine.dll\" - \"!:\\sys\\bin\\QtMobilityMmfEngine.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtmedia_mmfengine.dll\" - \"!:\\sys\\bin\\qtmedia_mmfengine.dll\"" \
             "ENDIF"
 
         qtmobilitydeployment.pkg_postrules += multimedia
 
         pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/mmf/qmakepluginstubs/QtMobilityMmfEngine.qtplugin\" - \"!:\\resource\\qt\\plugins\\mediaservice\\QtMobilityMmfEngine.qtplugin\"" \
-            "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/m3u/qmakepluginstubs/m3u.qtplugin\"     - \"!:\\resource\\qt\\plugins\\playlistformats\\m3u.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/mmf/qmakepluginstubs/qtmedia_mmfengine.qtplugin\" - \"!:\\resource\\qt\\plugins\\mediaservice\\qtmedia_mmfengine.qtplugin\"" \
+            "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/m3u/qmakepluginstubs/qtmedia_m3u.qtplugin\"     - \"!:\\resource\\qt\\plugins\\playlistformats\\qtmedia_m3u.qtplugin\""
     }
 
     contains(mobility_modules, sensors) {
 
-        qtmobilitydeployment.sources += $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtSensors.dll
+        qtmobilitydeployment.sources += \
+            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtSensors.dll
+
+        sensors = ""
 
-        equals($${EPOCROOT50}, $${EPOCROOT32}):equals($${EPOCROOT32}, $${EPOCROOT31}) {
-            contains(S60_VERSION, 3.1) {
-                sensors = \
-                    "IF package(0x102032BE)" \
-                    "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/sensor_s60sensorapi.dll\" - \"!:\\sys\\bin\\sensor_s60sensorapi.dll\"" \
-                    "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/sensors_generic.dll\" - \"!:\\sys\\bin\\sensors_generic.dll\"" \
-                    "ENDIF"
-           } else {
-                sensors = \
-                    "IF package(0x1028315F)" \
-                    "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/sensors_sym.dll\" - \"!:\\sys\\bin\\sensors_sym.dll\"" \
-                    "ELSEIF package(0x102752AE)" \
-                    "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/sensors_sym.dll\" - \"!:\\sys\\bin\\sensors_sym.dll\"" \
-                    "ELSE" \
-                    "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/sensors_sym.dll\" - \"!:\\sys\\bin\\sensors_sym.dll\"" \
-                    "ENDIF"
-            }
-        } else {
-            sensors = \
+        equals(sensors_s60_31_enabled,yes) {
+            sensors += \
+                "IF package(0x102032BE)" \
+                "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_s60sensorapi.dll\" - \"!:\\sys\\bin\\qtsensor_s60sensorapi.dll\"" \
+                "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_generic.dll\" - \"!:\\sys\\bin\\qtsensors_generic.dll\"" \
+                "ELSEIF package(0x102752AE)" \
+                "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_s60sensorapi.dll\" - \"!:\\sys\\bin\\sensors_sym.dll\"" \
+                "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_generic.dll\" - \"!:\\sys\\bin\\qtsensors_generic.dll\"" \
+                "ENDIF"
+        } else:equals(sensors_symbian_enabled,yes) {
+            sensors += \
                 "IF package(0x1028315F)" \
-                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/sensors_sym.dll\" - \"!:\\sys\\bin\\sensors_sym.dll\"" \
+                "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/sensors_sym.dll\" - \"!:\\sys\\bin\\sensors_sym.dll\"" \
+                "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_generic.dll\" - \"!:\\sys\\bin\\qtsensors_generic.dll\"" \
                 "ELSEIF package(0x102752AE)" \
                 "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/sensors_sym.dll\" - \"!:\\sys\\bin\\sensors_sym.dll\"" \
-                "ELSEIF package(0x102032BE)" \
-                "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/sensor_s60sensorapi.dll\" - \"!:\\sys\\bin\\sensor_s60sensorapi.dll\"" \
-                "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/sensors_generic.dll\" - \"!:\\sys\\bin\\sensors_generic.dll\"" \
+                "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_generic.dll\" - \"!:\\sys\\bin\\qtsensors_generic.dll\"" \
                 "ELSE" \
                 "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/sensors_sym.dll\" - \"!:\\sys\\bin\\sensors_sym.dll\"" \
+                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_generic.dll\" - \"!:\\sys\\bin\\qtsensors_generic.dll\"" \
                 "ENDIF"
         }
 
-        qtmobilitydeployment.pkg_postrules += sensors
+        !isEmpty(sensors):qtmobilitydeployment.pkg_postrules += sensors
 
-        equals($${EPOCROOT50}, $${EPOCROOT32}):equals($${EPOCROOT32}, $${EPOCROOT31}) {
-            contains(S60_VERSION, 3.1) {
-                pluginstubs += \
-                    "IF package(0x102032BE)" \
-                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/sensors/s60_sensor_api/qmakepluginstubs/sensor_s60sensorapi.qtplugin\" - \"!:\\resource\\qt\\plugins\\sensors\\sensor_s60sensorapi.qtplugin\"" \
-                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/sensors/generic/qmakepluginstubs/sensors_generic.qtplugin\" - \"!:\\resource\\qt\\plugins\\sensors\\sensors_generic.qtplugin\"" \
-                    "ENDIF"
-            }
-        } else {
+        equals(sensors_s60_31_enabled,yes) {
             pluginstubs += \
-                "IF package(0x102032BE)" \
-                "\"$$QT_MOBILITY_BUILD_TREE/plugins/sensors/s60_sensor_api/qmakepluginstubs/sensor_s60sensorapi.qtplugin\" - \"!:\\resource\\qt\\plugins\\sensors\\sensor_s60sensorapi.qtplugin\"" \
-                "\"$$QT_MOBILITY_BUILD_TREE/plugins/sensors/generic/qmakepluginstubs/sensors_generic.qtplugin\" - \"!:\\resource\\qt\\plugins\\sensors\\sensors_generic.qtplugin\"" \
-                "ENDIF"
+                "\"$$QT_MOBILITY_BUILD_TREE/plugins/sensors/s60_sensor_api/qmakepluginstubs/qtsensors_s60sensorapi.qtplugin\"  - \"!:\\resource\\qt\\plugins\\sensors\\qtsensors_s60sensorapi.qtplugin\""\
+                "\"$$QT_MOBILITY_BUILD_TREE/plugins/sensors/generic/qmakepluginstubs/qtsensors_generic.qtplugin\"  - \"!:\\resource\\qt\\plugins\\sensors\\qtsensors_generic.qtplugin\""
+        } else:equals(sensors_symbian_enabled,yes) {
+            pluginstubs += \
+                "\"$$QT_MOBILITY_BUILD_TREE/plugins/sensors/symbian/qmakepluginstubs/sensors_sym.qtplugin\"  - \"!:\\resource\\qt\\plugins\\sensors\\sensors_sym.qtplugin\""\
+                "\"$$QT_MOBILITY_BUILD_TREE/plugins/sensors/generic/qmakepluginstubs/qtsensors_generic.qtplugin\"  - \"!:\\resource\\qt\\plugins\\sensors\\qtsensors_generic.qtplugin\""
         }
+
     }
 
     qtmobilitydeployment.pkg_postrules += pluginstubs

--- a/qtmobility/src/sensors/qambientlightsensor.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/sensors/qambientlightsensor.cpp	Fri May 14 16:41:33 2010 +0300
@@ -67,7 +67,7 @@
 
     \value Undefined  The light level is unknown.
     \value Dark       It is dark.
-    \value Twilight   It is darkish.
+    \value Twilight   It is moderately dark.
     \value Light      It is light (eg. internal lights).
     \value Bright     It is bright (eg. shade).
     \value Sunny      It is very bright (eg. direct sunlight).

--- a/qtmobility/src/sensors/qcompass.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/sensors/qcompass.cpp	Fri May 14 16:41:33 2010 +0300
@@ -85,6 +85,8 @@
 
 /*!
     Sets the \a azimuth of the device.
+    
+    \sa {QCompassReading Units}
 */
 void QCompassReading::setAzimuth(qreal azimuth)
 {

--- a/qtmobility/src/sensors/qrotationsensor.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/sensors/qrotationsensor.cpp	Fri May 14 16:41:33 2010 +0300
@@ -56,29 +56,41 @@
 
     \section2 QRotationReading Units
 
-    The rotation reading contains 3 angles, measured in degrees that define the orientation
-    of the device in three-dimensional space. The three angles are applied to the device in the
-    following order.
+    The rotation reading contains 3 angles, measured in degrees that define
+    the orientation of the device in three-dimensional space. The rotations
+    should not be confused with relative rotations such as yaw and pitch.
+    These rotations are of the devices axes relative to the external
+    reference points that define the reference co-ordinate axes: X, Y and Z
+    in the diagram.
+    
+    The three angles are applied to the device in the following order.
 
     \list
-    \o Right-handed rotation z (-180, 180]. Starting from the x axis and incrementing towards the
-       y axis.
-    \o Right-handed rotation x (-90, 90]. Starting from the new (once-rotated) y axis and
-       incrementing towards the z axis.
-    \o Right-handed rotation y (-180, 180]. Starting from the new (twice-rotated) z axis and
-       incrementing towards the x axis.
+    \o Right-handed rotation z (-180, 180]. Starting from the x-axis and
+     incrementing in the direction of the y-axis.
+    \o Right-handed rotation x [-90, 90]. Starting from the new
+     (once-rotated) y-axis and incrementing towards the z-axis.
+    \o Right-handed rotation y (-180, 180]. Starting from the new
+     (twice-rotated) z-axis and incrementing towards the x-axis.
     \endlist
 
     \image Rotation_angles.png Visual representation of the rotation angles.
 
-    The 0 point for the z angle is defined as a fixed, external entity and is device-specific. While magnetic
-    north is typically used as this reference point it may not be. Do not attempt to compare values
-    for the z angle between devices or even on the same device if it has moved a significant distance.
-    If the device cannot detect a fixed, external entity the z angle will always be 0 and the
-    QRotationSensor::hasZ property will be set to false.
+    The 0 point for the z angle is defined as a fixed, external entity and
+    is device-specific. While magnetic North is typically used as this
+    reference point it may not be. Do not attempt to compare values
+    for the z angle between devices or even on the same device if it has
+    moved a significant distance.
+    
+    If the device cannot detect a fixed, external entity the z angle will
+    always be 0 and the QRotationSensor::hasZ property will be set to false.
 
-    The 0 point for the x and y angles are defined as when the x and y axes of the device are oriented
-    towards the horizon.
+    The 0 point for the x and y angles are defined as when the x and y axes
+    of the device are oriented towards the horizon.
+
+    Note that when x is 90 or -90, values for z and y achieve rotation around
+    the same axis (due to the order of operations). In this case the y
+    rotation will be 0.
 */
 
 /*!

--- a/qtmobility/src/sensors/qsensorbackend.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/sensors/qsensorbackend.cpp	Fri May 14 16:41:33 2010 +0300
@@ -235,16 +235,13 @@
         qWarning() << "ERROR: Cannot call QSensorBackend::setDataRates with 0";
         return;
     }
-    if (otherSensor->identifier().count() == 0) {
+    if (otherSensor->identifier().isEmpty()) {
         qWarning() << "ERROR: Cannot call QSensorBackend::setDataRates with an invalid sensor";
         return;
     }
     QSensorPrivate *d = m_sensor->d_func();
     d->availableDataRates = otherSensor->availableDataRates();
     d->dataRate = otherSensor->dataRate();
-    if (d->availableDataRates.count() == 0) {
-        qWarning() << otherSensor->identifier() << "backend does not support any data rates.";
-    }
 }
 
 /*!

--- a/qtmobility/src/sensors/qsensormanager.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/sensors/qsensormanager.cpp	Fri May 14 16:41:33 2010 +0300
@@ -192,10 +192,7 @@
     return 0;
 
 gotbackend:
-    if (sensor->availableDataRates().count() == 0) {
-        qWarning() << sensor->identifier() << "backend does not support any data rates. It cannot be used.";
-    }
-    if (sensor->dataRate() == 0) {
+    if (sensor->availableDataRates().count() != 0 && sensor->dataRate() == 0) {
         qWarning() << sensor->identifier() << "backend did not supply default data rate.";
     }
     return backend;

--- a/qtmobility/src/sensors/qsensorpluginloader.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/sensors/qsensorpluginloader.cpp	Fri May 14 16:41:33 2010 +0300
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 
+#include <src/global/qbuildcfg.h>
 #include "qsensorpluginloader_p.h"
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qdir.h>
@@ -70,6 +71,11 @@
         return;
 
     QStringList     paths = QCoreApplication::libraryPaths();
+    QString val = QLatin1String(qt_mobility_configure_prefix_path_str);
+    if(val.length() > 0){
+        val += QLatin1String("/plugins");
+        paths << val;
+    }
 
     Q_FOREACH (QString const &path, paths) {
         QString pluginPathName(path + m_location);

--- a/qtmobility/src/sensors/sensors.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/sensors/sensors.pro	Fri May 14 16:41:33 2010 +0300
@@ -5,7 +5,6 @@
 
 DEFINES += QT_BUILD_SENSORS_LIB QT_MAKEDLL
 symbian {
-    TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = ALL -TCB
     TARGET.UID3 = 0x2002BFC0
 
@@ -13,7 +12,7 @@
     # Main library
     SENSORS_DEPLOYMENT.sources = QtSensors.dll
     SENSORS_DEPLOYMENT.path = \sys\bin
-    DEPLOYMENT += CONTACTS_DEPLOYMENT
+    DEPLOYMENT += SENSORS_DEPLOYMENT
 }
 
 CONFIG += strict_flags

--- a/qtmobility/src/serviceframework/databasemanager_s60.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/serviceframework/databasemanager_s60.cpp	Fri May 14 16:41:33 2010 +0300
@@ -330,8 +330,8 @@
         iServerThread->wait(1);
 #else
         TRequestStatus status;
-        RProcess dbServer;
-        ret = dbServer.Create(KDatabaseManagerServerName, KNullDesC);
+        RProcess dbServer;	    
+        ret = dbServer.Create(KDatabaseManagerServerProcess, KNullDesC);
         if(ret != KErrNone)
             {
             return ret;
@@ -529,7 +529,7 @@
         __ASSERT_ALWAYS(dbManagerServer != NULL, CDatabaseManagerServer::PanicServer(ESrvCreateServer));
 
         TInt err = dbManagerServer->Start(KDatabaseManagerServerName);
-        if (err != KErrNone)
+        if (err != KErrNone && err != KErrAlreadyExists)
         {
             CDatabaseManagerServer::PanicServer(ESvrStartServer);
         }

--- a/qtmobility/src/serviceframework/serviceframework.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/serviceframework/serviceframework.pro	Fri May 14 16:41:33 2010 +0300
@@ -40,12 +40,12 @@
     
     libBlock = \
         "$${LITERAL_HASH}ifdef WINSCW" \
-        "LIBRARY SFWDatabaseManagerServer.lib" \
+        "LIBRARY qsfwdatabasemanagerserver.lib" \
         "$${LITERAL_HASH}endif"
 
     MMP_RULES += libBlock
 
-    QtServiceFrameworkDeployment.sources = QtServiceFramework.dll SFWDatabaseManagerServer.exe
+    QtServiceFrameworkDeployment.sources = QtServiceFramework.dll qsfwdatabasemanagerserver.exe
     QtServiceFrameworkDeployment.path = /sys/bin
 
     DEPLOYMENT += QtServiceFrameworkDeployment

--- a/qtmobility/src/serviceframework/symbian/clientservercommon.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/serviceframework/symbian/clientservercommon.h	Fri May 14 16:41:33 2010 +0300
@@ -43,7 +43,14 @@
 
 #include <e32base.h>
 
-_LIT(KDatabaseManagerServerName, "SFWDatabaseManagerServer");
+
+#ifdef __WINSCW__
+_LIT(KDatabaseManagerServerName, "qsfwdatabasemanagerserver");
+#else
+_LIT(KDatabaseManagerServerName, "!qsfwdatabasemanagerserver");
+#endif
+
+_LIT(KDatabaseManagerServerProcess, "qsfwdatabasemanagerserver");
 
 const TUint KServerMajorVersionNumber = 0;
 const TUint KServerMinorVersionNumber = 1;

--- a/qtmobility/src/serviceframework/symbian/databasemanagersession.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/serviceframework/symbian/databasemanagersession.cpp	Fri May 14 16:41:33 2010 +0300
@@ -559,12 +559,13 @@
     ServiceDatabase *db = iDb;
 #ifdef __WINS__
     // In emulator use commmon place for service database
-    // instead of server's private directory (on emulator server is in thread so it
-    // doesn't get its own private directory).
+    // instead of server's private directory (on emulator the server runs in the application's
+    // process - using private dir would mean that each application has its own storage, which others
+    // can't see.
     QDir dir(QDir::toNativeSeparators("C:\\Data\\temp\\QtServiceFW"));
 #else
     // On hardware, use this DB server's private directory (C:/Private/<UID3>)    
-    QDir dir(QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + "\\Nokia"));
+    QDir dir(QDir::toNativeSeparators(QCoreApplication::applicationDirPath()));
 #endif
     QString qtVersion(qVersion());
     qtVersion = qtVersion.left(qtVersion.size() -2); //strip off patch version

--- a/qtmobility/src/serviceframework/symbian/dll/databasemanagerserver_dll.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/serviceframework/symbian/dll/databasemanagerserver_dll.pro	Fri May 14 16:41:33 2010 +0300
@@ -1,5 +1,5 @@
 TEMPLATE = lib
-TARGET = SFWDatabaseManagerServer
+TARGET = qsfwdatabasemanagerserver
 QT = core sql
 
 TARGET.UID3 = 0x2002BFBE
@@ -40,4 +40,6 @@
             databasemanagersession.cpp \
             databasemanagersignalhandler.cpp
 
+# These capabilities cannot be reduced as long as QtServiceFramework.dll links against
+# this .dll
 TARGET.CAPABILITY = ALL -TCB

--- a/qtmobility/src/serviceframework/symbian/exe/databasemanagerserver_exe.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/serviceframework/symbian/exe/databasemanagerserver_exe.pro	Fri May 14 16:41:33 2010 +0300
@@ -1,5 +1,5 @@
 TEMPLATE = app
-TARGET = SFWDatabaseManagerServer
+TARGET = qsfwdatabasemanagerserver
 QT = core sql
 TARGET.UID3 = 0x2002AC7F
 
@@ -38,6 +38,6 @@
             databasemanagerserver.cpp \
             databasemanagersession.cpp \
             databasemanagersignalhandler.cpp
-            
-TARGET.CAPABILITY = ALL -TCB
 
+#ProtServ is needed so that the server can be in protected namespace (start with '!' -mark).
+TARGET.CAPABILITY = ProtServ

--- a/qtmobility/src/systeminfo/qsysteminfo.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo.cpp	Fri May 14 16:41:33 2010 +0300
@@ -647,20 +647,23 @@
 }
 
 /*!
-    Returns the display brightness of \a screen in %, 1 - 100 scale.
+    Returns the display brightness of the screen with index \a screenNumber in %, 1 - 100 scale.
 
     Depending on platform, displayBrightness may not be available due to
     differing hardware, software or driver implementation. In which case this
     will return 0.
 
+    \sa QDesktopWidget::screenCount()
 */
-int QSystemDisplayInfo::displayBrightness(int screen)
+int QSystemDisplayInfo::displayBrightness(int screenNumber)
 {
-    return displayInfoPrivate()->displayBrightness(screen);
+    return displayInfoPrivate()->displayBrightness(screenNumber);
 }
 
 /*!
-    Returns the color depth of the screen \a screenNumber, in bits per pixel.
+    Returns the color depth of the screen with the index \a screenNumber, in bits per pixel.
+
+    \sa QDesktopWidget::screenCount()
 */
 int QSystemDisplayInfo::colorDepth(int screenNumber)
 {

--- a/qtmobility/src/systeminfo/qsysteminfo.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo.h	Fri May 14 16:41:33 2010 +0300
@@ -245,9 +245,9 @@
     Q_PROPERTY(bool isDeviceLocked READ isDeviceLocked)
 
 
-    Q_ENUMS(BatteryLevel)
+    Q_ENUMS(BatteryStatus)
     Q_ENUMS(PowerState)
-    Q_ENUMS(InputMethod)
+    Q_FLAGS(InputMethod InputMethodFlags)
     Q_ENUMS(SimStatus)
     Q_ENUMS(Profile)
 
@@ -281,6 +281,7 @@
         MultiTouch = 0x0000010,
         Mouse = 0x0000020
     };
+
     Q_DECLARE_FLAGS(InputMethodFlags, InputMethod)
 
     QSystemDeviceInfo::InputMethodFlags inputMethodType();
@@ -327,6 +328,7 @@
     QSystemDeviceInfoPrivate *d;
 };
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(QSystemDeviceInfo::InputMethodFlags )
 
 class QSystemScreenSaverPrivate;
 class  Q_SYSINFO_EXPORT QSystemScreenSaver : public QObject

--- a/qtmobility/src/systeminfo/qsysteminfo_linux_common.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo_linux_common.cpp	Fri May 14 16:41:33 2010 +0300
@@ -987,7 +987,7 @@
     }
     mountEntries();
     struct statfs fs;
-    if(statfs(mountEntriesMap[driveVolume].toLatin1(), &fs ) == 0 ) {
+    if(statfs(driveVolume.toLatin1(), &fs ) == 0 ) {
                 long blockSize = fs.f_bsize;
                 long availBlocks = fs.f_bavail;
                 return (double)availBlocks * blockSize;
@@ -1002,7 +1002,7 @@
     }
     mountEntries();
     struct statfs fs;
-    if(statfs(mountEntriesMap[driveVolume].toLatin1(), &fs ) == 0 ) {
+    if(statfs(driveVolume.toLatin1(), &fs ) == 0 ) {
         const long blockSize = fs.f_bsize;
         const long totalBlocks = fs.f_blocks;
         return (double)totalBlocks * blockSize;
@@ -1020,7 +1020,7 @@
         if(!list.isEmpty()) {
             foreach(const QString vol, list) {
                 QHalDeviceInterface ifaceDevice(vol);
-                if(driveVolume == ifaceDevice.getPropertyString("block.device")) {
+                if(mountEntriesMap.value(driveVolume) == ifaceDevice.getPropertyString("block.device")) {
                     QHalDeviceInterface ifaceDeviceParent(ifaceDevice.getPropertyString("info.parent"), this);
 
                     if(ifaceDeviceParent.getPropertyBool("storage.removable")
@@ -1038,15 +1038,15 @@
         //no hal need to manually read sys file for block device
         QString dmFile;
 
-        if(driveVolume.contains("mapper")) {
+        if(mountEntriesMap.value(driveVolume).contains("mapper")) {
             struct stat stat_buf;
-            stat( driveVolume.toLatin1(), &stat_buf);
+            stat( mountEntriesMap.value(driveVolume).toLatin1(), &stat_buf);
 
             dmFile = QString("/sys/block/dm-%1/removable").arg(stat_buf.st_rdev & 0377);
 
         } else {
 
-            dmFile = driveVolume.section("/",2,3);
+            dmFile = mountEntriesMap.value(driveVolume).section("/",2,3);
             if (dmFile.left(3) == "mmc") { //assume this dev is removable sd/mmc card.
                 return QSystemStorageInfo::RemovableDrive;
             }
@@ -1114,8 +1114,8 @@
         } else {
             ok = true;
         }
-        if(ok && !mountEntriesMap.keys().contains(me->mnt_dir)) {
-            mountEntriesMap[me->mnt_fsname] = me->mnt_dir;
+        if(ok && !mountEntriesMap.keys().contains(me->mnt_fsname)) {
+            mountEntriesMap[me->mnt_dir] = me->mnt_fsname;
         }
 
         me = getmntent(mntfp);

--- a/qtmobility/src/systeminfo/qsysteminfo_maemo.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo_maemo.cpp	Fri May 14 16:41:33 2010 +0300
@@ -442,6 +442,7 @@
 void QSystemNetworkInfoPrivate::setupNetworkInfo()
 {
     currentCellNetworkStatus = QSystemNetworkInfo::UndefinedStatus;
+    currentBluetoothNetworkStatus = networkStatus(QSystemNetworkInfo::BluetoothMode);
     currentEthernetState = "down";
     currentEthernetSignalStrength = networkSignalStrength(QSystemNetworkInfo::EthernetMode);
     currentWlanSignalStrength = networkSignalStrength(QSystemNetworkInfo::WlanMode);
@@ -564,6 +565,20 @@
                               this, SLOT(usbCableAction())) ) {
         qWarning() << "unable to connect to usbCableAction (disconnect)";
     }
+    if(!systemDbusConnection.connect("org.freedesktop.Hal",
+                              "/org/freedesktop/Hal/Manager",
+                              "org.freedesktop.Hal.Manager",
+                              QLatin1String("DeviceAdded"),
+                              this, SLOT(bluetoothNetworkStatusCheck())) ) {
+        qWarning() << "unable to connect to bluetoothNetworkStatusCheck (1)";
+    }
+    if(!systemDbusConnection.connect("org.freedesktop.Hal",
+                              "/org/freedesktop/Hal/Manager",
+                              "org.freedesktop.Hal.Manager",
+                              QLatin1String("DeviceRemoved"),
+                              this, SLOT(bluetoothNetworkStatusCheck())) ) {
+        qWarning() << "unable to connect to bluetoothNetworkStatusCheck (2)";
+    }
 #endif
 }
 
@@ -690,6 +705,15 @@
     }
 }
 
+void QSystemNetworkInfoPrivate::bluetoothNetworkStatusCheck()
+{
+    if (currentBluetoothNetworkStatus != networkStatus(QSystemNetworkInfo::BluetoothMode)) {
+        currentBluetoothNetworkStatus = networkStatus(QSystemNetworkInfo::BluetoothMode);
+        emit networkStatusChanged(QSystemNetworkInfo::BluetoothMode, currentBluetoothNetworkStatus);
+    }
+}
+
+
 void QSystemNetworkInfoPrivate::setWlanSignalStrengthCheckEnabled(bool enabled)
 {
     if (enabled) {

--- a/qtmobility/src/systeminfo/qsysteminfo_maemo_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo_maemo_p.h	Fri May 14 16:41:33 2010 +0300
@@ -148,6 +148,7 @@
     void setupNetworkInfo();
 
 private Q_SLOTS:
+    void bluetoothNetworkStatusCheck();
     void cellNetworkSignalStrengthChanged(uchar,uchar);
     void icdStatusChanged(QString,QString,QString,QString);
     void networkModeChanged(int);
@@ -169,6 +170,7 @@
     };
 
     int cellSignalStrength;
+    QSystemNetworkInfo::NetworkStatus currentBluetoothNetworkStatus;
     int currentCellId;
     int currentCellNetworkStatus;
     int currentEthernetSignalStrength;

--- a/qtmobility/src/systeminfo/qsysteminfo_s60.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo_s60.cpp	Fri May 14 16:41:33 2010 +0300
@@ -584,28 +584,9 @@
         CWsScreenDevice *wsScreenDevice = new (ELeave)CWsScreenDevice(ws);
         CleanupStack::PushL(wsScreenDevice);
         User::LeaveIfError(wsScreenDevice->Construct(screen));
-        TDisplayMode mode = wsScreenDevice->DisplayMode();
-        switch (mode) {
-            case EGray2: depth = 1; break;
-            case EGray4: depth = 2; break;
-            case EGray16:
-            case EColor16: depth = 4; break;
-            case EGray256:
-            case EColor256: depth = 8; break;
-            case EColor4K: depth = 12; break;
-            case EColor64K: depth = 16; break;
-            case EColor16M:
-            case EColor16MA: depth = 24; break;
-            case EColor16MU: depth = 32; break;
-            case ENone:
-            case ERgb:
-            case EColorLast:
-            default: depth = 0;
-                break;
-        }
+        depth = TDisplayModeUtils::NumDisplayModeBitsPerPixel(wsScreenDevice->DisplayMode());
         CleanupStack::PopAndDestroy(2, &ws);
     )
-
     return depth;
 }
 
@@ -718,10 +699,12 @@
     m_bluetoothRepository(NULL), m_bluetoothNotifyHandler(NULL)
 {
     DeviceInfo::instance()->batteryInfo()->addObserver(this);
+    DeviceInfo::instance()->chargingStatus()->addObserver(this);
 }
 
 QSystemDeviceInfoPrivate::~QSystemDeviceInfoPrivate()
 {
+    DeviceInfo::instance()->chargingStatus()->removeObserver(this);
     DeviceInfo::instance()->batteryInfo()->removeObserver(this);
 
     if (m_proEngNotifyHandler) {
@@ -852,26 +835,19 @@
 
 QSystemDeviceInfo::PowerState QSystemDeviceInfoPrivate::currentPowerState()
 {
-    CTelephony::TBatteryStatus powerState = DeviceInfo::instance()->batteryInfo()->powerState();
-
-    switch (powerState) {
-        case CTelephony::EPoweredByBattery:
-            return QSystemDeviceInfo::BatteryPower;
-
-        case CTelephony::EBatteryConnectedButExternallyPowered:
-        {
-            if (DeviceInfo::instance()->batteryInfo()->batteryLevel() < 100) { //TODO: Use real indicator, EPSHWRMChargingStatus::EChargingStatusNotCharging?
-                return QSystemDeviceInfo::WallPowerChargingBattery;
-            }
-            return QSystemDeviceInfo::WallPower;
-        }
-        case CTelephony::ENoBatteryConnected:
-            return QSystemDeviceInfo::WallPower;
-
-        case CTelephony::EPowerFault:
-        case CTelephony::EPowerStatusUnknown:
-        default:
-            return QSystemDeviceInfo::UnknownPower;
+    switch (DeviceInfo::instance()->chargingStatus()->chargingStatus()) {
+    case EChargingStatusNotConnected:
+    case EChargingStatusNotCharging:
+    case EChargingStatusError:
+        return QSystemDeviceInfo::BatteryPower;
+    case EChargingStatusCharging:
+    case EChargingStatusChargingContinued:
+    case EChargingStatusAlmostComplete:
+        return QSystemDeviceInfo::WallPowerChargingBattery;
+    case EChargingStatusChargingComplete:
+        return QSystemDeviceInfo::WallPower;
+    default:
+        return QSystemDeviceInfo::UnknownPower;
     }
 }
 
@@ -965,7 +941,7 @@
     }
 }
 
-void QSystemDeviceInfoPrivate::powerStateChanged()
+void QSystemDeviceInfoPrivate::chargingStatusChanged()
 {
     emit powerStateChanged(currentPowerState());
 }

--- a/qtmobility/src/systeminfo/qsysteminfo_s60_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo_s60_p.h	Fri May 14 16:41:33 2010 +0300
@@ -62,6 +62,7 @@
 
 #include <f32file.h>
 #include "telephonyinfo_s60.h"
+#include "chargingstatus_s60.h"
 
 QT_BEGIN_HEADER
 
@@ -129,7 +130,6 @@
 
 protected:  //from MTelephonyInfoObserver
     void batteryLevelChanged(){};
-    void powerStateChanged(){};
 
     void countryCodeChanged();
     void networkCodeChanged();
@@ -189,7 +189,8 @@
 class QSystemDeviceInfoPrivate : public QObject,
     public MTelephonyInfoObserver,
     public MProEngProfileActivationObserver,
-    public MCenRepNotifyHandlerCallback
+    public MCenRepNotifyHandlerCallback,
+    public MChargingStatusObserver
 {
     Q_OBJECT
 
@@ -237,7 +238,6 @@
 
 protected:  //from MTelephonyInfoObserver
     void batteryLevelChanged();
-    void powerStateChanged();
     
     void countryCodeChanged(){};
     void networkCodeChanged(){};
@@ -247,6 +247,9 @@
     void cellNetworkSignalStrengthChanged(){};
     void cellNetworkStatusChanged(){};
 
+protected:  //from MChargingStatusObserver
+    void chargingStatusChanged();
+    
 private:    //data
     MProEngEngine *m_profileEngine;
     MProEngNotifyHandler* m_proEngNotifyHandler;
@@ -303,6 +306,14 @@
         return m_subscriberInfo;
     }
 
+    CChargingStatus *chargingStatus()
+    {
+        if (!m_chargingStatus) {
+            m_chargingStatus = new CChargingStatus;
+        }
+        return m_chargingStatus;
+    }
+
     CBatteryInfo *batteryInfo()
     {
         if (!m_batteryInfo) {
@@ -336,8 +347,8 @@
     }
 
 private:
-    DeviceInfo() : m_phoneInfo(NULL), m_subscriberInfo(NULL), m_batteryInfo(NULL),
-        m_cellNetworkInfo(NULL), m_cellNetworkRegistrationInfo(NULL),
+    DeviceInfo() : m_phoneInfo(NULL), m_subscriberInfo(NULL), m_chargingStatus(NULL),
+        m_batteryInfo(NULL), m_cellNetworkInfo(NULL), m_cellNetworkRegistrationInfo(NULL),
         m_cellSignalStrengthInfo(NULL)
     {
         m_telephony = CTelephony::NewL();
@@ -349,6 +360,7 @@
         delete m_cellNetworkRegistrationInfo;
         delete m_cellNetworkInfo;
         delete m_batteryInfo;
+        delete m_chargingStatus;
         delete m_subscriberInfo;
         delete m_phoneInfo;
         delete m_telephony;
@@ -359,6 +371,7 @@
     CTelephony *m_telephony;
     CPhoneInfo *m_phoneInfo;
     CSubscriberInfo *m_subscriberInfo;
+    CChargingStatus *m_chargingStatus;
     CBatteryInfo *m_batteryInfo;
     CCellNetworkInfo *m_cellNetworkInfo;
     CCellNetworkRegistrationInfo *m_cellNetworkRegistrationInfo;

--- a/qtmobility/src/systeminfo/qsysteminfo_win.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo_win.cpp	Fri May 14 16:41:33 2010 +0300
@@ -43,7 +43,6 @@
 #include <qt_windows.h>
 
 #include <QtCore/qmutex.h>
-#include <QtCore/private/qmutexpool_p.h>
 
 #include <QStringList>
 #include <QSize>
@@ -359,6 +358,8 @@
 
 QTM_BEGIN_NAMESPACE
 
+Q_GLOBAL_STATIC_WITH_ARGS(QMutex, dynamicLoadMutex, (QMutex::Recursive));
+
 static void resolveLibrary()
 {
 #if !defined( Q_OS_WINCE)
@@ -366,7 +367,7 @@
 
     if (!triedResolve) {
 #ifndef QT_NO_THREAD
-        QMutexLocker locker(QMutexPool::globalInstanceGet(&local_WlanOpenHandle));
+        QMutexLocker locker(dynamicLoadMutex());
 #endif
 
         if (!triedResolve) {

--- a/qtmobility/src/systeminfo/qwmihelper_win.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/systeminfo/qwmihelper_win.cpp	Fri May 14 16:41:33 2010 +0300
@@ -47,8 +47,6 @@
 #include <Wbemidl.h>
 #include <Oleauto.h>
 #include <QStringList>
-#include <QtCore/qmutex.h>
-#include <QtCore/private/qmutexpool_p.h>
 #include <QUuid>
 
 QTM_BEGIN_NAMESPACE

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/src/systeminfo/symbian/chargingstatus_s60.cpp	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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 "chargingstatus_s60.h"
+
+CChargingStatus::CChargingStatus() : CActive(EPriorityStandard),
+    m_currentStatus(EChargingStatusError)
+{
+    CActiveScheduler::Add(this);
+    TInt err = m_chargingProperty.Attach(KPSUidHWRMPowerState, KHWRMChargingStatus, EOwnerThread);
+    if (err == KErrNone) {
+        int status = EChargingStatusError;
+        m_chargingProperty.Get(status);
+        m_currentStatus = (EPSHWRMChargingStatus)status;
+        startMonitoring();
+    }
+}
+
+CChargingStatus::~CChargingStatus()
+{
+    Cancel();
+    m_chargingProperty.Close();
+}
+
+EPSHWRMChargingStatus CChargingStatus::chargingStatus() const
+{
+    return m_currentStatus;
+}
+
+void CChargingStatus::addObserver(MChargingStatusObserver *observer)
+{
+    m_observers.append(observer);
+}
+
+void CChargingStatus::removeObserver(MChargingStatusObserver *observer)
+{
+    m_observers.removeOne(observer);
+}
+
+void CChargingStatus::DoCancel()
+{
+    m_chargingProperty.Cancel();
+}
+
+void CChargingStatus::RunL()
+{
+    int status = EChargingStatusError;
+    m_chargingProperty.Get(status);
+    m_currentStatus = (EPSHWRMChargingStatus)status;
+    
+    foreach (MChargingStatusObserver *observer, m_observers)
+        observer->chargingStatusChanged();
+    
+    startMonitoring();
+}
+
+void CChargingStatus::startMonitoring()
+{
+    m_chargingProperty.Subscribe(iStatus);
+    SetActive();
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/src/systeminfo/symbian/chargingstatus_s60.h	Fri May 14 16:41:33 2010 +0300
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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$
+**
+****************************************************************************/
+
+#ifndef CHARGINGSTATUS_S60_H
+#define CHARGINGSTATUS_S60_H
+
+#include <e32base.h>
+#include <e32property.h>
+#include <hwrmpowerstatesdkpskeys.h>
+#include <QList>
+
+class MChargingStatusObserver
+{
+public:
+    virtual void chargingStatusChanged() = 0;
+};
+
+class CChargingStatus : public CActive
+{
+public:
+    CChargingStatus();
+    ~CChargingStatus();
+    EPSHWRMChargingStatus chargingStatus() const;
+
+    void addObserver(MChargingStatusObserver *observer);
+    void removeObserver(MChargingStatusObserver *observer);
+
+protected:  //from CActive
+    void DoCancel();
+    void RunL();
+
+private:
+    void startMonitoring();
+
+private:
+    RProperty m_chargingProperty;
+    EPSHWRMChargingStatus m_currentStatus;
+    QList<MChargingStatusObserver *> m_observers;
+};
+
+#endif //CHARGINGSTATUS_S60_H

--- a/qtmobility/src/systeminfo/symbian/telephonyinfo_s60.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/systeminfo/symbian/telephonyinfo_s60.cpp	Fri May 14 16:41:33 2010 +0300
@@ -134,29 +134,6 @@
     return m_imsi;
 }
 
-/*
-CIndicatorInfo::CIndicatorInfo(CTelephony &telephony) : CTelephonyInfo(telephony),
-    m_batteryInfoV1Pckg(m_batteryInfoV1)
-{
-}
-
-void CIndicatorInfo::DoCancel()
-{
-    m_telephony.CancelAsync(CTelephony::EGetIndicatorCancel);
-}
-
-bool CIndicatorInfo::isBatteryCharging() const
-{
-    m_telephony.GetIndicator(iStatus,iIndicatorV1Pckg);
-    makeRequest();
-
-    if (iIndicatorV1.iIndicator & CTelephony::KIndChargerConnected) {
-        chargeStatus = true;
-    }
-    return chargeStatus;
-}
-*/
-
 CBatteryInfo::CBatteryInfo(CTelephony &telephony) : CTelephonyInfo(telephony),
     m_initializing(true), m_batteryInfoV1Pckg(m_batteryInfoV1)
 {
@@ -166,9 +143,6 @@
     m_batteryLevel = m_batteryInfoV1.iChargeLevel;
     m_previousBatteryLevel = m_batteryLevel;
 
-    m_powerState = m_batteryInfoV1.iStatus;
-    m_previousPowerState = m_powerState;
-    
     m_initializing = false;
 
     startMonitoring();
@@ -180,18 +154,13 @@
         CTelephonyInfo::RunL();
     } else {
         m_batteryLevel = m_batteryInfoV1.iChargeLevel;
-        m_powerState = m_batteryInfoV1.iStatus;
 
         foreach (MTelephonyInfoObserver *observer, m_observers) {
             if (m_batteryLevel != m_previousBatteryLevel) {
                 observer->batteryLevelChanged();
             }
-            if (m_powerState != m_previousPowerState) {
-                observer->powerStateChanged();
-            }
         }
         m_previousBatteryLevel = m_batteryLevel;
-        m_previousPowerState = m_powerState;
         startMonitoring();
     }
 }
@@ -210,11 +179,6 @@
     return m_batteryLevel;
 }
 
-CTelephony::TBatteryStatus CBatteryInfo::powerState() const
-{
-    return m_powerState;
-}
-
 void CBatteryInfo::startMonitoring()
 {
     m_telephony.NotifyChange(iStatus, CTelephony::EBatteryInfoChange, m_batteryInfoV1Pckg);
@@ -237,9 +201,13 @@
     TBuf<CTelephony::KNetworkCountryCodeSize> countryCode = m_networkInfoV1.iCountryCode;
     m_countryCode = QString::fromUtf16(countryCode.Ptr(), countryCode.Length());
     m_previousCountryCode = m_countryCode;
-
-    TBuf<CTelephony::KNetworkLongNameSize> networkName = m_networkInfoV1.iLongName;
-    m_networkName = QString::fromUtf16(networkName.Ptr(), networkName.Length());
+    TBuf<CTelephony::KNetworkLongNameSize> longName = m_networkInfoV1.iLongName;
+    if (longName.Length() > 0) {
+        m_networkName = QString::fromUtf16(longName.Ptr(), longName.Length());
+    } else {
+        TBuf<CTelephony::KNetworkDisplayTagSize> displayTag = m_networkInfoV1.iDisplayTag;
+        m_networkName = QString::fromUtf16(displayTag.Ptr(), displayTag.Length());
+    }
     m_previousNetworkName = m_networkName;
 
     m_networkMode = m_networkInfoV1.iMode;
@@ -264,9 +232,13 @@
         TBuf<CTelephony::KNetworkCountryCodeSize> countryCode = m_networkInfoV1.iCountryCode;
             m_countryCode = QString::fromUtf16(countryCode.Ptr(), countryCode.Length());
 
-        TBuf<CTelephony::KNetworkLongNameSize> networkName = m_networkInfoV1.iLongName;
-            m_networkName = QString::fromUtf16(networkName.Ptr(),
-            networkName.Length());
+        TBuf<CTelephony::KNetworkLongNameSize> longName = m_networkInfoV1.iLongName;
+        if (longName.Length() > 0) {
+            m_networkName = QString::fromUtf16(longName.Ptr(), longName.Length());
+        } else {
+            TBuf<CTelephony::KNetworkDisplayTagSize> displayTag = m_networkInfoV1.iDisplayTag;
+            m_networkName = QString::fromUtf16(displayTag.Ptr(), displayTag.Length());
+        }
 
         m_networkMode = m_networkInfoV1.iMode;

--- a/qtmobility/src/systeminfo/symbian/telephonyinfo_s60.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/systeminfo/symbian/telephonyinfo_s60.h	Fri May 14 16:41:33 2010 +0300
@@ -53,7 +53,6 @@
 {
 public:
     virtual void batteryLevelChanged() = 0;
-    virtual void powerStateChanged() = 0;
 
     virtual void countryCodeChanged() = 0;
     virtual void networkCodeChanged() = 0;
@@ -125,24 +124,6 @@
     QString m_imsi;
 };
 
-/*
-class CIndicatorInfo : public CTelephonyInfo
-{
-public:
-    CIndicatorInfo(CTelephony &telephony);
-
-protected:
-    void DoCancel();
-
-public:
-    bool isBatteryCharging() const;
-
-private:
-    CTelephony::TBatteryInfoV1Pckg m_batteryInfoV1Pckg;
-    CTelephony::TBatteryInfoV1 m_batteryInfoV1;
-};
-*/
-
 class CBatteryInfo : public CTelephonyInfo
 {
 public:
@@ -155,7 +136,6 @@
 
 public:
     int batteryLevel() const;
-    CTelephony::TBatteryStatus powerState() const;
 
 private:
     bool m_initializing;
@@ -165,9 +145,6 @@
     
     int m_batteryLevel;
     int m_previousBatteryLevel;
-
-    CTelephony::TBatteryStatus m_powerState;
-    CTelephony::TBatteryStatus m_previousPowerState;
 };
 
 class CCellNetworkInfo : public CTelephonyInfo

--- a/qtmobility/src/systeminfo/systeminfo.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/systeminfo/systeminfo.pro	Fri May 14 16:41:33 2010 +0300
@@ -108,14 +108,19 @@
     }
 
     symbian:{
+        contains(S60_VERSION, 3.1){
+            DEFINES += SYMBIAN_3_1
+        }        
         INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
         DEPENDPATH += symbian
         
         SOURCES += qsysteminfo_s60.cpp \
-            telephonyinfo_s60.cpp
+            telephonyinfo_s60.cpp \
+            chargingstatus_s60.cpp
 
         HEADERS += qsysteminfo_s60_p.h \
-            telephonyinfo_s60.h
+            telephonyinfo_s60.h \
+            chargingstatus_s60.h
 
         LIBS += -lprofileengine \
             -letel3rdparty \
@@ -131,7 +136,8 @@
             -lws32 \
             -lcentralrepository \
             -lprofileengine \
-            -lbluetooth
+            -lbluetooth \
+            -lgdi
 
         TARGET.CAPABILITY = ALL -TCB
 #        TARGET.CAPABILITY = LocalServices NetworkServices ReadUserData UserEnvironment Location ReadDeviceData TrustedUI

--- a/qtmobility/src/versit/qversitreader_p.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/versit/qversitreader_p.cpp	Fri May 14 16:41:33 2010 +0300
@@ -234,9 +234,9 @@
                          QVersitProperty::CompoundType);
     mValueTypeMap.insert(qMakePair(QVersitDocument::VCard30Type, QString::fromAscii("ORG")),
                          QVersitProperty::CompoundType);
-    mValueTypeMap.insert(qMakePair(QVersitDocument::VCard21Type, QString::fromAscii("NICKNAMES")),
+    mValueTypeMap.insert(qMakePair(QVersitDocument::VCard21Type, QString::fromAscii("NICKNAME")),
                          QVersitProperty::ListType);
-    mValueTypeMap.insert(qMakePair(QVersitDocument::VCard30Type, QString::fromAscii("NICKNAMES")),
+    mValueTypeMap.insert(qMakePair(QVersitDocument::VCard30Type, QString::fromAscii("NICKNAME")),
                          QVersitProperty::ListType);
     mValueTypeMap.insert(qMakePair(QVersitDocument::VCard21Type, QString::fromAscii("CATEGORIES")),
                          QVersitProperty::ListType);

--- a/qtmobility/tests/auto/auto.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/auto.pro	Fri May 14 16:41:33 2010 +0300
@@ -69,7 +69,6 @@
 contains(mobility_modules,contacts) {
     #Contacts
     SUBDIRS +=  qcontact \
-            qcontactactions \
             qcontactasync \
             qcontactdetail \
             qcontactdetaildefinition \

--- a/qtmobility/tests/auto/databasemanager/databasemanager.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/databasemanager/databasemanager.pro	Fri May 14 16:41:33 2010 +0300
@@ -34,7 +34,7 @@
 
    libBlock = \
        "$${LITERAL_HASH}ifdef WINSCW" \
-       "LIBRARY SFWDatabaseManagerServer.lib" \
+       "LIBRARY qsfwdatabasemanagerserver.lib" \
        "$${LITERAL_HASH}endif"
 
     MMP_RULES += libBlock

--- a/qtmobility/tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,7 @@
 #include <qmediarecordercontrol.h>
 #include <qaudioendpointselector.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class MockAudioEncoderControl : public QAudioEncoderControl
 {
     Q_OBJECT

--- a/qtmobility/tests/auto/qcontact/tst_qcontact.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qcontact/tst_qcontact.cpp	Fri May 14 16:41:33 2010 +0300
@@ -43,7 +43,6 @@
 
 #include "qtcontacts.h"
 #include "qcontactid.h"
-#include "qcontactmanagerdataholder.h" //QContactManagerDataHolder
 #include <QSet>
 
 
@@ -51,12 +50,6 @@
 //TESTED_FILES=
 
 QTM_USE_NAMESPACE
-class HackEngine : public QContactManagerEngine
-{
-    public:
-        static void setRels(QContact* contact, const QList<QContactRelationship>& rels) {QContactManagerEngine::setContactRelationships(contact, rels);}
-};
-
 class tst_QContact: public QObject
 {
 Q_OBJECT
@@ -64,13 +57,9 @@
 public:
     tst_QContact();
     virtual ~tst_QContact();
-private:
-    QContactManagerDataHolder managerDataHolder;
 
 private slots:
     void details();
-    void actions();
-    void preferences();
     void relationships();
     void displayName();
     void type();
@@ -102,6 +91,10 @@
     QVERIFY(c.details<QContactPhoneNumber>().count() == 0);
     QVERIFY(c.detail(QContactPhoneNumber::DefinitionName).isEmpty());
     QVERIFY(c.detail<QContactPhoneNumber>().isEmpty());
+    QVERIFY(c.details(QContactPhoneNumber::DefinitionName.latin1()).count() == 0);
+    QVERIFY(c.detail(QContactPhoneNumber::DefinitionName.latin1()).isEmpty());
+    QVERIFY(c.details(QLatin1String(QContactPhoneNumber::DefinitionName)).count() == 0);
+    QVERIFY(c.detail(QLatin1String(QContactPhoneNumber::DefinitionName)).isEmpty());
 
     // Test retrieving the first detail (the display label)
     QList<QContactDetail> details = c.details(QString());
@@ -125,9 +118,23 @@
     QVERIFY(c.isEmpty() == false);
 
     QVERIFY(c.details().count() == 3);
+
     QVERIFY(c.details(QContactPhoneNumber::DefinitionName).count() == 1);
     QVERIFY(c.details(QContactPhoneNumber::DefinitionName, QContactPhoneNumber::FieldNumber, QString("12345678")).count() == 1);
     QVERIFY(c.details(QContactPhoneNumber::DefinitionName, QString(), QString("12345678")).count() == c.details(QContactPhoneNumber::DefinitionName).count());
+
+    QVERIFY(c.details(QLatin1String(QContactPhoneNumber::DefinitionName)).count() == 1);
+    QVERIFY(c.details(QLatin1String(QContactPhoneNumber::DefinitionName), QContactPhoneNumber::FieldNumber, QString("12345678")).count() == 1);
+    QVERIFY(c.details(QLatin1String(QContactPhoneNumber::DefinitionName), QString(), QString("12345678")).count() == c.details(QContactPhoneNumber::DefinitionName).count());
+
+    QVERIFY(c.details(QContactPhoneNumber::DefinitionName.latin1()).count() == 1);
+    QVERIFY(c.details(QContactPhoneNumber::DefinitionName.latin1(), QContactPhoneNumber::FieldNumber, QString("12345678")).count() == 1);
+    QVERIFY(c.details(QContactPhoneNumber::DefinitionName.latin1(), QString(), QString("12345678")).count() == c.details(QContactPhoneNumber::DefinitionName).count());
+
+    QVERIFY(c.details<QContactPhoneNumber>(QContactPhoneNumber::FieldNumber, QString("12345678")).count() == 1);
+    QVERIFY(c.details<QContactPhoneNumber>(QContactPhoneNumber::FieldNumber.latin1(), QString("12345678")).count() == 1);
+    QVERIFY(c.details<QContactPhoneNumber>(QLatin1String(QContactPhoneNumber::FieldNumber), QString("12345678")).count() == 1);
+
     QVERIFY(c.details<QContactPhoneNumber>().count() == 1);
     QVERIFY(!c.detail(QContactPhoneNumber::DefinitionName).isEmpty());
     QVERIFY(!c.detail<QContactPhoneNumber>().isEmpty());
@@ -199,15 +206,6 @@
     QCOMPARE(c.detail<QContactPhoneNumber>(), p);
     QVERIFY(c.removeDetail(&p2));
 
-    // now try removing a detail for which we've set a preference
-    QContactEmailAddress pref;
-    pref.setEmailAddress("test@test");
-    c.saveDetail(&pref);
-    c.setPreferredDetail("SendEmail", pref);
-    QVERIFY(c.isPreferredDetail(QString(), pref));
-    QVERIFY(c.removeDetail(&pref));
-    QVERIFY(!c.isPreferredDetail(QString(), pref));
-
     // Now try adding a detail to multiple contacts
 
     QContact c2;
@@ -363,193 +361,6 @@
     QCOMPARE(c.id(), oldId); // id shouldn't change.
 }
 
-void tst_QContact::actions()
-{
-    QContact c;  // empty contact.
-    QContact c2; // contact with email saved.
-    QContactEmailAddress e;
-    e.setEmailAddress("test@nokia.com");
-    c2.saveDetail(&e);
-
-
-    // XXX this is here to make the bulk
-    // of this test pass.  The first set
-    // of tests expect to not find plugins.
-    QString path = QApplication::applicationDirPath() + "/dummyplugin";
-    QApplication::addLibraryPath(path);
-    path = QApplication::applicationDirPath() + "/dummyplugin/plugins";
-    QApplication::addLibraryPath(path);
-    path = QApplication::applicationDirPath() + "/dummyplugin/plugins/contacts";
-    QApplication::addLibraryPath(path);
-
-    // Prior to plugin loading:
-    // first, the empty contact
-    QList<QContactActionDescriptor> availableActions = c.availableActions(QString());
-    QVERIFY(availableActions.isEmpty());
-    QContactDetail d = c.detailWithAction("SendEmail");
-    QVERIFY(d.isEmpty());
-    QList<QContactDetail> dets = c.detailsWithAction("SendEmail");
-    QVERIFY(dets.isEmpty());
-    // then, the email contact
-    availableActions = c2.availableActions(QString());
-    QEXPECT_FAIL("", "Plugins are only loaded once", Continue);
-    QVERIFY(availableActions.isEmpty());
-    d = c2.detailWithAction("SendEmail");
-    QEXPECT_FAIL("", "Plugins are only loaded once", Continue);
-    QVERIFY(d.isEmpty());
-    dets = c2.detailsWithAction("SendEmail");
-    QEXPECT_FAIL("", "Plugins are only loaded once", Continue);
-    QVERIFY(dets.isEmpty());
-
-    // set the correct path to look for plugins and load them
-//    QString path = QApplication::applicationDirPath() + "/dummyplugin/plugins/";
-//    QApplication::addLibraryPath(path);
-
-    // available actions - should be one there now.
-    // empty contact
-    availableActions = c.availableActions(QString());
-    QVERIFY(availableActions.isEmpty());
-    // contact with email
-    availableActions = c2.availableActions(QString());
-    QVERIFY(!availableActions.isEmpty()); // should contain SendEmail
-
-    // try various combinations of version and name
-    availableActions = c2.availableActions();
-    QVERIFY(!availableActions.isEmpty()); // should contain SendEmail
-    availableActions = c2.availableActions("Test");
-    QVERIFY(!availableActions.isEmpty()); // should contain SendEmail
-    availableActions = c2.availableActions("Test", 1);
-    QVERIFY(!availableActions.isEmpty()); // should contain SendEmail
-    availableActions = c2.availableActions("Test", 5);
-    QVERIFY(availableActions.isEmpty()); // should NOT contain SendEmail
-    availableActions = c2.availableActions(QString(), 1);
-    QVERIFY(!availableActions.isEmpty()); // should contain SendEmail
-
-    // detail with action:
-    // empty contact
-    d = c.detailWithAction("SendEmail");
-    QVERIFY(d.isEmpty());
-    d = c.detailWithAction("NonexistentAction");
-    QVERIFY(d.isEmpty());
-    d = c.detailWithAction(QString());
-    QVERIFY(d.isEmpty());
-    // contact with email
-    d = c2.detailWithAction("SendEmail");
-    QVERIFY(d == e);
-    d = c2.detailWithAction("NonexistentAction");
-    QVERIFY(d.isEmpty());
-    d = c2.detailWithAction(QString());
-    QVERIFY(d.isEmpty());
-
-    // details with action:
-    // empty contact
-    dets = c.detailsWithAction("SendEmail");
-    QVERIFY(dets.isEmpty());
-    dets = c.detailsWithAction("NonexistentAction");
-    QVERIFY(dets.isEmpty());
-    dets = c.detailsWithAction(QString());
-    QVERIFY(dets.isEmpty());
-    // contact with email
-    dets = c2.detailsWithAction("SendEmail");
-    QVERIFY(dets.contains(e));
-    dets = c2.detailsWithAction("NonexistentAction");
-    QVERIFY(dets.isEmpty());
-    dets = c2.detailsWithAction(QString());
-    QVERIFY(dets.isEmpty());
-
-    // remove the library path.
-    QApplication::removeLibraryPath(path);
-}
-
-void tst_QContact::preferences()
-{
-    QContact c;
-
-    // test first set
-    QContactDetail det("TestId");
-    det.setValue("test", QVariant("test1"));
-    c.saveDetail(&det);
-    QCOMPARE(c.isPreferredDetail("testAction", det), false);
-
-    QCOMPARE(c.setPreferredDetail("testAction", det), true);
-
-    QCOMPARE(c.isPreferredDetail("testAction", det), true);
-
-    QCOMPARE(c.isPreferredDetail(QString(), det), true);
-
-    QCOMPARE(c.preferredDetail("testAction"), det);
-
-    // test replacement
-    QContactDetail det2("TestId");
-    det2.setValue("test", QVariant("test2"));
-    c.saveDetail(&det2);
-    QCOMPARE(c.isPreferredDetail("testAction", det2), false);
-
-    QCOMPARE(c.setPreferredDetail("testAction", det2), true);
-
-    QCOMPARE(c.isPreferredDetail("testAction", det2), true);
-
-    QCOMPARE(c.isPreferredDetail("testAction", det), false);
-
-    QCOMPARE(c.preferredDetail("testAction"), det2);
-
-    // test for detail that is not part of the contact
-    QContactDetail det3("TestId");
-    det3.setValue("test", QVariant("test3"));
-    QCOMPARE(c.setPreferredDetail("testAction", det3), false);
-
-    QCOMPARE(c.preferredDetail("testAction"), det2); // shouldn't have changed.
-
-    // test invalid set
-    QCOMPARE(c.setPreferredDetail(QString(), det3), false);
-
-    QCOMPARE(c.setPreferredDetail(QString(), QContactDetail()), false);
-
-    QCOMPARE(c.setPreferredDetail("testAction", QContactDetail()), false);
-
-    QCOMPARE(c.preferredDetail("testAction"), det2); // shouldn't have changed.
-
-    // test invalid query
-    QContactDetail det4;
-    det4.setValue("test", QVariant("test4"));
-    c.saveDetail(&det4);
-    QCOMPARE(c.isPreferredDetail(QString(), QContactDetail()), false);
-
-    QCOMPARE(c.isPreferredDetail(QString(), det4), false); // valid detail, but no pref set.
-
-    QCOMPARE(c.isPreferredDetail("testAction", QContactDetail()), false);
-
-    // test retrieving preferred details
-    QContactDetail pd = c.preferredDetail(QString());
-    QVERIFY(pd.isEmpty());
-    pd = c.preferredDetail("testAction");
-    QVERIFY(pd == det2); // shouldn't have changed.
-
-    // test for preference for action that hasn't been added
-    QVERIFY(c.preferredDetail("NonexistentAction").isEmpty());
-
-    // Remove a non preferred detail
-    QContactDetail det2copy("TestId");
-    det2copy.setValue("test", QVariant("test2"));
-    QVERIFY(c.saveDetail(&det2copy));
-
-    QVERIFY(c.isPreferredDetail("testAction", det2) == true);
-    QVERIFY(c.isPreferredDetail("testAction", det2copy) == false);
-    QVERIFY(c.removeDetail(&det2copy));
-    QVERIFY(c.isPreferredDetail("testAction", det2) == true);
-    QVERIFY(c.isPreferredDetail("testAction", det2copy) == false);
-
-    // Add it again
-    QVERIFY(c.saveDetail(&det2copy));
-    QVERIFY(c.isPreferredDetail("testAction", det2) == true);
-    QVERIFY(c.isPreferredDetail("testAction", det2copy) == false);
-
-    // Remove the preferred detail (the copy should not become preferred)
-    QVERIFY(c.removeDetail(&det2));
-    QVERIFY(c.isPreferredDetail("testAction", det2) == false);
-    QVERIFY(c.isPreferredDetail("testAction", det2copy) == false);
-}
-
 void tst_QContact::relationships()
 {
     QContact c;
@@ -589,11 +400,20 @@
     QVERIFY(d.saveDetail(&name));
 
     /*
-     * The display label is not updated until you save the contact!
+     * The display label is not updated until you save the contact or call synthCDL
      */
-    QString synth = cm.synthesizedDisplayLabel(d);
     QVERIFY(d.displayLabel().isEmpty());
-    //QVERIFY(synth == name.customLabel()); // XXX Perhaps not guaranteed, depends on backend synth rules.
+
+    cm.synthesizeContactDisplayLabel(&d);
+    QVERIFY(d.displayLabel() == "Wesley");
+
+    name.setCustomLabel("Bosley");
+    d.saveDetail(&name);
+
+    QVERIFY(d.displayLabel() == "Wesley");
+
+    cm.synthesizeContactDisplayLabel(&d);
+    QVERIFY(d.displayLabel() == "Bosley");
 
     /* Remove the detail via removeDetail */
     QContactDisplayLabel old;
@@ -601,9 +421,6 @@
     QVERIFY(!d.removeDetail(&old)); // should fail.
     QVERIFY(d.isEmpty() == false);
     QVERIFY(d.details().count() == 3); // it should not be removed!
-
-    /* Make sure we go back to the old synth version */
-    QVERIFY(d.displayLabel().isEmpty());
 }
 
 void tst_QContact::type()
@@ -707,9 +524,8 @@
     QContact contact5; // preferred details and relationships shouldn't affect the hash
     contact5.setId(id);
     contact5.saveDetail(&detail1);
-    contact5.setPreferredDetail("action", detail1);
     QContactRelationship rel;
-    HackEngine::setRels(&contact5, QList<QContactRelationship>() << rel);
+    QContactManagerEngine::setContactRelationships(&contact5, QList<QContactRelationship>() << rel);
     QVERIFY(qHash(contact1) == qHash(contact2));
     QVERIFY(qHash(contact1) != qHash(contact3));
     QVERIFY(qHash(contact1) != qHash(contact4));

--- a/qtmobility/tests/auto/qcontactactions/qcontactactions.pro	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-TEMPLATE=subdirs
-SUBDIRS += sendemailaction \
-           unittest

--- a/qtmobility/tests/auto/qcontactactions/sendemailaction/sendemailaction.cpp	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 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$
-**
-****************************************************************************/
-
-#ifndef ACTIONFACTORYPLUGINTARGET
-#define ACTIONFACTORYPLUGINTARGET contacts_sendemailactionfactory
-#endif
-#ifndef ACTIONFACTORYPLUGINNAME
-#define ACTIONFACTORYPLUGINNAME SendEmailActionFactory
-#endif
-
-#include "sendemailaction_p.h"
-
-#include "qcontactemailaddress.h"
-#include "qcontactfilters.h"
-
-#include <QMessageBox>
-#include <QTimer>
-
-#define makestr(x) (#x)
-#define makename(x) makestr(x)
-
-QContactSendEmailActionFactory::QContactSendEmailActionFactory()
-{
-}
-
-QContactSendEmailActionFactory::~QContactSendEmailActionFactory()
-{
-}
-
-QString QContactSendEmailActionFactory::name() const
-{
-    return QString(makename(ACTIONFACTORYPLUGINNAME));
-}
-Q_EXPORT_PLUGIN2(ACTIONFACTORYPLUGINTARGET, QContactSendEmailActionFactory);
-
-QList<QContactActionDescriptor> QContactSendEmailActionFactory::actionDescriptors() const
-{
-    return QList<QContactActionDescriptor>() << QContactActionDescriptor("SendEmail", "Test", 1);
-}
-
-QContactAction* QContactSendEmailActionFactory::instance(const QContactActionDescriptor& descriptor) const
-{
-    if (descriptor.actionName() != QString("SendEmail") || descriptor.vendorName() != QString("Test") || descriptor.implementationVersion() != 1)
-        return 0;
-    return new QContactSendEmailAction;
-}
-
-QVariantMap QContactSendEmailActionFactory::actionMetadata(const QContactActionDescriptor& descriptor) const
-{
-    if (descriptor.actionName() != "SendEmail")
-        return QVariantMap();
-
-    QVariantMap ret;
-    ret.insert("Label", "Email Contact!");
-    return ret;
-}
-
-QContactSendEmailAction::QContactSendEmailAction() : QContactAction()
-{
-}
-
-QContactSendEmailAction::~QContactSendEmailAction()
-{
-}
-
-QContactActionDescriptor QContactSendEmailAction::actionDescriptor() const
-{
-    QContactActionDescriptor ret;
-    ret.setActionName("SendEmail");
-    ret.setVendorName("Test");
-    ret.setImplementationVersion(1);
-    return ret;
-}
-
-QVariantMap QContactSendEmailAction::metaData() const
-{
-    return QVariantMap();
-}
-
-QContactFilter QContactSendEmailAction::contactFilter(const QVariant& value) const
-{
-    QContactDetailFilter retn;
-    retn.setDetailDefinitionName(QContactEmailAddress::DefinitionName, QContactEmailAddress::FieldEmailAddress);
-    retn.setValue(value);
-    return retn;
-}
-
-bool QContactSendEmailAction::isDetailSupported(const QContactDetail &detail, const QContact &) const
-{
-    return (detail.definitionName() == QContactEmailAddress::DefinitionName);
-}
-
-QList<QContactDetail> QContactSendEmailAction::supportedDetails(const QContact& contact) const
-{
-    return contact.details(QContactEmailAddress::DefinitionName);
-}
-
-bool QContactSendEmailAction::invokeAction(const QContact& contact, const QContactDetail& detail, const QVariantMap& )
-{
-    Q_UNUSED(contact);
-    Q_UNUSED(detail);
-    QTimer::singleShot(1, this, SLOT(performAction()));
-    return true;
-}
-
-QVariantMap QContactSendEmailAction::results() const
-{
-    return QVariantMap();
-}
-
-void QContactSendEmailAction::performAction()
-{
-    QMessageBox::information(0, "SendEmail Action", "This example action exists as an example of how the action interface may be implemented; it does not offer the advertised functionality.");
-    emit stateChanged(QContactAction::FinishedState);
-}

--- a/qtmobility/tests/auto/qcontactactions/sendemailaction/sendemailaction.pro	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-TEMPLATE = lib
-CONFIG += plugin testplugin
-TARGET = $$qtLibraryTarget(contacts_sendemailactionfactory)
-PLUGIN_TYPE=contacts
-
-include(../../../../common.pri)
-
-INCLUDEPATH += ../../../../src/contacts \
-               ../../../../src/contacts/details \
-               ../../../../src/contacts/requests \
-               ../../../../src/contacts/filters
-
-INCLUDEPATH += ../../
-
-CONFIG += mobility
-MOBILITY = contacts
-
-DEFINES += ACTIONFACTORYPLUGINTARGET=contacts_sendemailactionfactory
-DEFINES += ACTIONFACTORYPLUGINNAME=SendEmailActionFactory
-
-HEADERS += sendemailaction_p.h
-SOURCES += sendemailaction.cpp
-
-include(../../contacts_plugins.pri)

--- a/qtmobility/tests/auto/qcontactactions/sendemailaction/sendemailaction_p.h	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 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$
-**
-****************************************************************************/
-
-#ifndef QCONTACTSENDEMAILACTION_P_H
-#define QCONTACTSENDEMAILACTION_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qcontactaction.h"
-#include "qcontactactionfactory.h"
-
-#include <QSharedData>
-#include <QString>
-#include <QVariantMap>
-
-QTM_USE_NAMESPACE
-
-class QContactSendEmailAction : public QContactAction
-{
-    Q_OBJECT
-
-public:
-    QContactSendEmailAction();
-    ~QContactSendEmailAction();
-
-    QContactActionDescriptor actionDescriptor() const;
-    QVariantMap metaData() const;
-
-    QContactFilter contactFilter(const QVariant& value) const;
-    bool isDetailSupported(const QContactDetail& detail, const QContact& contact = QContact()) const;
-    QList<QContactDetail> supportedDetails(const QContact& contact) const;
-    bool invokeAction(const QContact& contact, const QContactDetail& detail = QContactDetail(), const QVariantMap& params = QVariantMap());
-    QVariantMap results() const;
-    State state() const {return QContactAction::FinishedState;}
-
-private slots:
-    void performAction();
-};
-
-class Q_DECL_EXPORT QContactSendEmailActionFactory : public QContactActionFactory
-{
-    Q_OBJECT
-    Q_INTERFACES(QtMobility::QContactActionFactory)
-
-public:
-    QContactSendEmailActionFactory();
-    ~QContactSendEmailActionFactory();
-
-    QString name() const;
-    QList<QContactActionDescriptor> actionDescriptors() const;
-    QContactAction* instance(const QContactActionDescriptor& descriptor) const;
-    QVariantMap actionMetadata(const QContactActionDescriptor& descriptor) const;
-};
-
-#endif

--- a/qtmobility/tests/auto/qcontactactions/unittest/tst_qcontactactions.cpp	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,471 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 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$
-**
-****************************************************************************/
-
-#define QT_STATICPLUGIN
-#include <QtTest/QtTest>
-#include <QApplication>
-
-#include "qtcontacts.h"
-#include "qcontactmanagerdataholder.h" //QContactManagerDataHolder
-#include "qcontactaction.h"
-#include "qcontactactionfactory.h"
-#include "qcontactactiondescriptor.h"
-
-QTM_USE_NAMESPACE 
-
-class tst_QContactActions : public QObject
-{
-Q_OBJECT
-
-public:
-    tst_QContactActions();
-    virtual ~tst_QContactActions();
-private:
-    QContactManagerDataHolder managerDataHolder;
-
-public slots:
-    void init();
-    void cleanup();
-private slots:
-    void testSendEmail();
-    void testDescriptor();
-    void testDescriptorLessThan();
-    void testDescriptorHash();
-    void traits();
-};
-
-/* Test a static factory as well */
-class DummyStaticActionFactory : public QContactActionFactory
-{
-    Q_OBJECT
-    Q_INTERFACES(QtMobility::QContactActionFactory)
-
-public:
-    DummyStaticActionFactory() {}
-    ~DummyStaticActionFactory() {}
-
-    QString name() const
-    {
-        return QString("dummystaticactionfactory");
-    }
-
-    QList<QContactActionDescriptor> actionDescriptors() const
-    {
-        return QList<QContactActionDescriptor>();
-    }
-
-    QContactAction* instance(const QContactActionDescriptor&) const
-    {
-        return 0;
-    }
-
-    QVariantMap actionMetadata(const QContactActionDescriptor&) const
-    {
-        return QVariantMap();
-    }
-};
-
-/* Statically import it (and a duplicate copy of it, purely for testing purposes) */
-Q_EXPORT_PLUGIN2(contacts_testdummystaticactionfactory, DummyStaticActionFactory)
-Q_IMPORT_PLUGIN(contacts_testdummystaticactionfactory)
-Q_EXPORT_PLUGIN2(contacts_testdummystaticactionfactorycopy, DummyStaticActionFactory)
-Q_IMPORT_PLUGIN(contacts_testdummystaticactionfactorycopy)
-
-tst_QContactActions::tst_QContactActions()
-{
-    // set the correct path to look for plugins
-    QString path = QApplication::applicationDirPath() + "/dummyplugin/plugins";
-    QApplication::addLibraryPath(path);
-}
-
-tst_QContactActions::~tst_QContactActions()
-{
-    QString path = QApplication::applicationDirPath() + "/dummyplugin/plugins";
-    QApplication::removeLibraryPath(path);
-}
-
-void tst_QContactActions::init()
-{
-}
-
-void tst_QContactActions::cleanup()
-{
-}
-
-void tst_QContactActions::testSendEmail()
-{
-    QContact c;
-    QContactEmailAddress e;
-    e.setEmailAddress("test@nokia.com");
-    c.saveDetail(&e);
-
-    QVERIFY(QContactAction::availableActions().contains("SendEmail"));
-    QVERIFY(QContactAction::availableActions("Test").contains("SendEmail"));
-    QVERIFY(QContactAction::availableActions("Test", 1).contains("SendEmail"));
-    QVERIFY(QContactAction::availableActions(QString(), -200).contains("SendEmail"));
-
-    QList<QContactActionDescriptor> descrs = QContactAction::actionDescriptors();
-    bool foundSendEmail = false;
-    for (int i = 0; i < descrs.size(); i++) {
-        if (descrs.at(i).actionName() == QString("SendEmail")) {
-            foundSendEmail = true;
-            break;
-        }
-    }
-    QVERIFY(foundSendEmail);
-
-    descrs = QContactAction::actionDescriptors(QString(), "Test");
-    foundSendEmail = false;
-    for (int i = 0; i < descrs.size(); i++) {
-        QCOMPARE(descrs.at(i).vendorName(), QString("Test"));
-        if (descrs.at(i).actionName() == QString("SendEmail")) {
-            foundSendEmail = true;
-            break;
-        }
-    }
-    QVERIFY(foundSendEmail);
-
-    descrs = QContactAction::actionDescriptors(QString(), "Test", 1);
-    foundSendEmail = false;
-    for (int i = 0; i < descrs.size(); i++) {
-        QCOMPARE(descrs.at(i).vendorName(), QString("Test"));
-        QCOMPARE(descrs.at(i).implementationVersion(), 1);
-        if (descrs.at(i).actionName() == QString("SendEmail")
-                && descrs.at(i).vendorName() == QString("Test")
-                && descrs.at(i).implementationVersion() == 1) {
-            foundSendEmail = true;
-            break;
-        }
-    }
-    QVERIFY(foundSendEmail);
-
-    descrs = QContactAction::actionDescriptors(QString(), "Test", -200); // shouldn't find any with this impl.version.
-    foundSendEmail = false;
-    for (int i = 0; i < descrs.size(); i++) {
-        QCOMPARE(descrs.at(i).vendorName(), QString("Test"));
-        if (descrs.at(i).actionName() == QString("SendEmail")
-                && descrs.at(i).vendorName() == QString("Test")
-                && descrs.at(i).implementationVersion() == 1) {
-            foundSendEmail = true;
-            break;
-        }
-    }
-    QVERIFY(!foundSendEmail);
-
-    descrs = QContactAction::actionDescriptors(QString(), QString(), -200); // ignores implementation Version if empty vendor
-    foundSendEmail = false;
-    for (int i = 0; i < descrs.size(); i++) {
-        if (descrs.at(i).actionName() == QString("SendEmail")
-                && descrs.at(i).vendorName() == QString("Test")
-                && descrs.at(i).implementationVersion() == 1) {
-            foundSendEmail = true;
-            break;
-        }
-    }
-    QVERIFY(foundSendEmail);
-
-    descrs = QContactAction::actionDescriptors(QString(), "Nonexistent");
-    foundSendEmail = false;
-    for (int i = 0; i < descrs.size(); i++) {
-        QCOMPARE(descrs.at(i).vendorName(), QString("Nonexistent"));
-        if (descrs.at(i).actionName() == QString("SendEmail")
-                && descrs.at(i).vendorName() == QString("Test")
-                && descrs.at(i).implementationVersion() == 1) {
-            foundSendEmail = true;
-            break;
-        }
-    }
-    QVERIFY(!foundSendEmail);
-
-    descrs = QContactAction::actionDescriptors("SendEmail");
-    foundSendEmail = false;
-    for (int i = 0; i < descrs.size(); i++) {
-        QCOMPARE(descrs.at(i).actionName(), QString("SendEmail"));
-        if (descrs.at(i).actionName() == QString("SendEmail")
-                && descrs.at(i).vendorName() == QString("Test")
-                && descrs.at(i).implementationVersion() == 1) {
-            foundSendEmail = true;
-            break;
-        }
-    }
-    QVERIFY(foundSendEmail);
-
-    descrs = QContactAction::actionDescriptors("SendEmail", "Test");
-    foundSendEmail = false;
-    for (int i = 0; i < descrs.size(); i++) {
-        QCOMPARE(descrs.at(i).actionName(), QString("SendEmail"));
-        QCOMPARE(descrs.at(i).vendorName(), QString("Test"));
-        if (descrs.at(i).actionName() == QString("SendEmail")
-                && descrs.at(i).vendorName() == QString("Test")
-                && descrs.at(i).implementationVersion() == 1) {
-            foundSendEmail = true;
-            break;
-        }
-    }
-    QVERIFY(foundSendEmail);
-
-    descrs = QContactAction::actionDescriptors("SendEmail", "Test", 1);
-    foundSendEmail = false;
-    for (int i = 0; i < descrs.size(); i++) {
-        QCOMPARE(descrs.at(i).actionName(), QString("SendEmail"));
-        QCOMPARE(descrs.at(i).vendorName(), QString("Test"));
-        QCOMPARE(descrs.at(i).implementationVersion(), 1);
-        if (descrs.at(i).actionName() == QString("SendEmail")
-                && descrs.at(i).vendorName() == QString("Test")
-                && descrs.at(i).implementationVersion() == 1) {
-            foundSendEmail = true;
-            break;
-        }
-    }
-    QVERIFY(foundSendEmail);
-
-    descrs = QContactAction::actionDescriptors("SendEmail", "Test", -200); // shouldn't find any with this impl.version.
-    foundSendEmail = false;
-    for (int i = 0; i < descrs.size(); i++) {
-        QCOMPARE(descrs.at(i).actionName(), QString("SendEmail"));
-        QCOMPARE(descrs.at(i).vendorName(), QString("Test"));
-        if (descrs.at(i).actionName() == QString("SendEmail")
-                && descrs.at(i).vendorName() == QString("Test")
-                && descrs.at(i).implementationVersion() == 1) {
-            foundSendEmail = true;
-            break;
-        }
-    }
-    QVERIFY(!foundSendEmail);
-
-    descrs = QContactAction::actionDescriptors("SendEmail", QString(), -200); // ignores implementation Version if empty vendor
-    foundSendEmail = false;
-    for (int i = 0; i < descrs.size(); i++) {
-        QCOMPARE(descrs.at(i).actionName(), QString("SendEmail"));
-        if (descrs.at(i).actionName() == QString("SendEmail")
-                && descrs.at(i).vendorName() == QString("Test")
-                && descrs.at(i).implementationVersion() == 1) {
-            foundSendEmail = true;
-            break;
-        }
-    }
-    QVERIFY(foundSendEmail);
-
-    descrs = QContactAction::actionDescriptors("SendEmail", "Nonexistent");
-    foundSendEmail = false;
-    for (int i = 0; i < descrs.size(); i++) {
-        QCOMPARE(descrs.at(i).actionName(), QString("SendEmail"));
-        QCOMPARE(descrs.at(i).vendorName(), QString("Nonexistent"));
-        if (descrs.at(i).actionName() == QString("SendEmail")
-                && descrs.at(i).vendorName() == QString("Test")
-                && descrs.at(i).implementationVersion() == 1) {
-            foundSendEmail = true;
-            break;
-        }
-    }
-    QVERIFY(!foundSendEmail);
-
-    descrs = QContactAction::actionDescriptors();
-    QContactAction* sendEmail = 0;
-    for (int i = 0; i < descrs.size(); i++) {
-        if (descrs.at(i).actionName() == QString("SendEmail")
-                && descrs.at(i).vendorName() == QString("Test")
-                && descrs.at(i).implementationVersion() == 1) {
-            sendEmail = QContactAction::action(descrs.at(i));
-            break;
-        }
-    }
-    QVERIFY(sendEmail);
-
-    QVERIFY(!sendEmail->actionDescriptor().actionName().isEmpty());
-    //QVERIFY(!sendEmail->metadata().isNull());
-    QVERIFY(!sendEmail->actionDescriptor().vendorName().isEmpty());
-    QVERIFY(sendEmail->actionDescriptor().implementationVersion() != -1);
-    QVERIFY(sendEmail->actionDescriptor().implementationVersion() != 0);
-    //QVERIFY(!sendEmail->contactFilter().isEmpty());
-    QVERIFY(sendEmail->isDetailSupported(e));
-    QVERIFY(sendEmail->supportedDetails(c).contains(e));
-    //QVERIFY(sendEmail->performAction(c, e));
-    //QVERIFY(sendEmail->performAction(c));
-
-    delete sendEmail;
-}
-
-void tst_QContactActions::testDescriptor()
-{
-    // first, test retrieving an action when no factories are loaded
-    QContactAction* invalidAction = QContactAction::action(QContactActionDescriptor());
-    QVERIFY(invalidAction == 0); // should be null.
-
-    QContact c;
-    QContactEmailAddress e;
-    e.setEmailAddress("test@nokia.com");
-    c.saveDetail(&e);
-
-    QVERIFY(QContactAction::availableActions().contains("SendEmail"));
-    QVERIFY(QContactAction::availableActions("Test").contains("SendEmail"));
-    QVERIFY(QContactAction::availableActions("Test", 1).contains("SendEmail"));
-    QVERIFY(QContactAction::availableActions(QString(), -200).contains("SendEmail"));
-
-    QList<QContactActionDescriptor> descrs = QContactAction::actionDescriptors();
-    QContactAction* sendEmailAction = 0;
-    bool foundSendEmail = false;
-    for (int i = 0; i < descrs.size(); i++) {
-        if (descrs.at(i).actionName() == QString("SendEmail")) {
-            sendEmailAction = QContactAction::action(descrs.at(i));
-            foundSendEmail = true;
-            break;
-        }
-    }
-    QVERIFY(foundSendEmail);
-
-    // first, ensure that the descriptor identifies the correct action
-    QContactActionDescriptor sendEmailDescriptor;
-    sendEmailDescriptor.setActionName(sendEmailAction->actionDescriptor().actionName());
-    sendEmailDescriptor.setVendorName(sendEmailAction->actionDescriptor().vendorName());
-    sendEmailDescriptor.setImplementationVersion(sendEmailAction->actionDescriptor().implementationVersion());
-
-    // secondly, test operator= and operator==, and copy constructor
-    QContactActionDescriptor sendEmailDescriptor2 = sendEmailDescriptor;
-    QContactActionDescriptor sendEmailDescriptor3(sendEmailDescriptor2);
-    QContactActionDescriptor sendEmailDescriptor4 = sendEmailAction->actionDescriptor();
-    QContactActionDescriptor sendEmailDescriptor5 = QContactAction::actionDescriptors(sendEmailDescriptor.actionName(), sendEmailDescriptor.vendorName(), sendEmailDescriptor.implementationVersion()).at(0);
-    QContactActionDescriptor sendEmailDescriptor6(sendEmailDescriptor);
-    sendEmailDescriptor6 = sendEmailDescriptor5;
-    QVERIFY(sendEmailDescriptor2.actionName() == sendEmailDescriptor.actionName());
-    QVERIFY(sendEmailDescriptor2.vendorName() == sendEmailDescriptor.vendorName());
-    QVERIFY(sendEmailDescriptor2.implementationVersion() == sendEmailDescriptor.implementationVersion());
-    QVERIFY(sendEmailDescriptor == sendEmailDescriptor2);
-    QVERIFY(sendEmailDescriptor == sendEmailDescriptor3);
-    QVERIFY(sendEmailDescriptor == sendEmailDescriptor4);
-    QVERIFY(sendEmailDescriptor == sendEmailDescriptor5);
-    QVERIFY(sendEmailDescriptor == sendEmailDescriptor6);
-
-    QVERIFY(!sendEmailDescriptor2.isEmpty());
-    sendEmailDescriptor2.setActionName("");
-    QVERIFY(sendEmailDescriptor2 != sendEmailDescriptor);
-    QVERIFY(sendEmailDescriptor2.isEmpty()); // without an action name, cannot uniquely identify an action impl
-    sendEmailDescriptor2.setActionName(sendEmailDescriptor.actionName());
-
-    QVERIFY(!sendEmailDescriptor2.isEmpty());
-    sendEmailDescriptor2.setVendorName("");
-    QVERIFY(sendEmailDescriptor2 != sendEmailDescriptor);
-    QVERIFY(sendEmailDescriptor2.isEmpty()); // without a vendor name, cannot uniquely identify an action impl
-    sendEmailDescriptor2.setVendorName(sendEmailDescriptor.vendorName());
-
-    QVERIFY(!sendEmailDescriptor2.isEmpty());
-    sendEmailDescriptor2.setImplementationVersion(0);
-    QVERIFY(sendEmailDescriptor2 != sendEmailDescriptor);
-    QVERIFY(sendEmailDescriptor2.isEmpty()); // without a version, cannot uniquely identify an action impl
-    sendEmailDescriptor2.setImplementationVersion(sendEmailDescriptor.implementationVersion());
-
-    QVERIFY(sendEmailDescriptor2 == sendEmailDescriptor);
-
-    // ensure that the caller takes ownership of the action; ie, not singleton etc.
-    QContactAction *sendEmailAction2 = QContactAction::action(sendEmailAction->actionDescriptor());
-    QContactAction *sendEmailAction3 = QContactAction::action(sendEmailAction->actionDescriptor());
-    QVERIFY(sendEmailAction != sendEmailAction2);
-    QVERIFY(sendEmailAction != sendEmailAction3);
-    QVERIFY(sendEmailAction2 != sendEmailAction3);
-
-    delete sendEmailAction2;
-    delete sendEmailAction;
-
-    QVERIFY(sendEmailAction3->actionDescriptor() == sendEmailDescriptor);
-    delete sendEmailAction3;
-}
-
-void tst_QContactActions::testDescriptorLessThan()
-{
-    QContactActionDescriptor qcad1;
-    qcad1.setVendorName("a");
-    qcad1.setActionName("a");
-    qcad1.setImplementationVersion(1);
-
-    QContactActionDescriptor qcad2;
-    qcad2.setVendorName("a");
-    qcad2.setActionName("a");
-    qcad2.setImplementationVersion(2);
-
-    QContactActionDescriptor qcad3;
-    qcad3.setVendorName("a");
-    qcad3.setActionName("b");
-    qcad3.setImplementationVersion(1);
-
-    QContactActionDescriptor qcad4;
-    qcad4.setVendorName("b");
-    qcad4.setActionName("a");
-    qcad4.setImplementationVersion(1);
-
-    QVERIFY(qcad1 < qcad2);
-    QVERIFY(qcad2 < qcad3);
-    QVERIFY(qcad3 < qcad4);
-}
-
-void tst_QContactActions::testDescriptorHash()
-{
-    QContactActionDescriptor qcad1;
-    qcad1.setVendorName("a");
-    qcad1.setActionName("a");
-    qcad1.setImplementationVersion(1);
-
-    QContactActionDescriptor qcad2;
-    qcad2.setVendorName("a");
-    qcad2.setActionName("a");
-    qcad2.setImplementationVersion(1);
-
-    QContactActionDescriptor qcad3;
-    qcad3.setVendorName("a");
-    qcad3.setActionName("a");
-    qcad3.setImplementationVersion(2);
-
-    QVERIFY(qHash(qcad1) == qHash(qcad2));
-    QVERIFY(qHash(qcad1) != qHash(qcad3));
-}
-
-void tst_QContactActions::traits()
-{
-    QCOMPARE(sizeof(QContactActionDescriptor), sizeof(void *));
-    QTypeInfo<QTM_PREPEND_NAMESPACE(QContactActionDescriptor)> ti;
-    QVERIFY(ti.isComplex);
-    QVERIFY(!ti.isStatic);
-    QVERIFY(!ti.isLarge);
-    QVERIFY(!ti.isPointer);
-    QVERIFY(!ti.isDummy);
-}
-
-QTEST_MAIN(tst_QContactActions)
-#include "tst_qcontactactions.moc"

--- a/qtmobility/tests/auto/qcontactactions/unittest/unittest.pro	Mon May 03 13:18:40 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-QT += testlib
-TEMPLATE=app
-TARGET=tst_qcontactactions
-CONFIG+=testcase
-
-PLUGIN_SUBDIR=dummyplugin/plugins
-
-include(../../../../common.pri)
-
-INCLUDEPATH += ../../../../src/contacts \
-               ../../../../src/contacts/details \
-               ../../../../src/contacts/requests \
-               ../../../../src/contacts/filters
-
-INCLUDEPATH += ../../
-
-CONFIG += mobility
-MOBILITY = contacts
-SOURCES  += tst_qcontactactions.cpp
-
-# App local deployment
-symbian:QCONTACTACTION_PLUGINS_DEPLOY.sources = contacts_sendemailactionfactory.dll
-wince*:QCONTACTACTION_PLUGINS_DEPLOY.sources = $$OUTPUT_DIR/build/tests/bin/plugins/contacts/$$mobilityDeployFilename(contacts_sendemailactionfactory).dll
-
-QCONTACTACTION_PLUGINS_DEPLOY.path = ./plugins/contacts
-
-DEPLOYMENT += QCONTACTACTION_PLUGINS_DEPLOY
-
-symbian: {
-    TARGET.CAPABILITY = ReadUserData \
-                        WriteUserData \
-                        ReadDeviceData \
-                        WriteDeviceData \
-                        AllFiles \
-}

--- a/qtmobility/tests/auto/qcontactasync/maliciousplugin/maliciousplugin_p.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qcontactasync/maliciousplugin/maliciousplugin_p.h	Fri May 14 16:41:33 2010 +0300
@@ -197,7 +197,7 @@
 
 };
 
-class  Q_DECL_EXPORT MaliciousEngineFactory : public QObject, public QContactManagerEngineFactory
+class MaliciousEngineFactory : public QObject, public QContactManagerEngineFactory
 {
     Q_OBJECT
     Q_INTERFACES(QtMobility::QContactManagerEngineFactory)

--- a/qtmobility/tests/auto/qcontactasync/unittest/tst_qcontactasync.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qcontactasync/unittest/tst_qcontactasync.cpp	Fri May 14 16:41:33 2010 +0300
@@ -177,8 +177,8 @@
     virtual ~tst_QContactAsync();
 
 public slots:
-    void init();
-    void cleanup();
+    void initTestCase();
+    void cleanupTestCase();
 
 private:
     void addManagers(); // add standard managers to the data
@@ -229,7 +229,7 @@
 
     Qt::HANDLE m_mainThreadId;
     Qt::HANDLE m_resultsAvailableSlotThreadId;
-    QContactManagerDataHolder managerDataHolder;
+    QScopedPointer<QContactManagerDataHolder> managerDataHolder;
 };
 
 tst_QContactAsync::tst_QContactAsync()
@@ -239,21 +239,20 @@
     QApplication::addLibraryPath(path);
 
     qRegisterMetaType<QContactAbstractRequest::State>("QContactAbstractRequest::State");
-
 }
 
 tst_QContactAsync::~tst_QContactAsync()
 {
-    QString path = QApplication::applicationDirPath() + "/dummyplugin/plugins";
-    QApplication::removeLibraryPath(path);
 }
 
-void tst_QContactAsync::init()
+void tst_QContactAsync::initTestCase()
 {
+    managerDataHolder.reset(new QContactManagerDataHolder());
 }
 
-void tst_QContactAsync::cleanup()
+void tst_QContactAsync::cleanupTestCase()
 {
+    managerDataHolder.reset(0);
 }
 
 bool tst_QContactAsync::compareContactLists(QList<QContact> lista, QList<QContact> listb)
@@ -556,7 +555,7 @@
             cfr.setFetchHint(QContactFetchHint());
             bailoutCount -= 1;
             if (!bailoutCount) {
-                qWarning("Unable to test cancelling due to thread scheduling!");
+//                qWarning("Unable to test cancelling due to thread scheduling!");
                 bailoutCount = MAX_OPTIMISTIC_SCHEDULING_LIMIT;
                 break;
             }
@@ -588,7 +587,7 @@
             bailoutCount -= 1;
             spy.clear();
             if (!bailoutCount) {
-                qWarning("Unable to test cancelling due to thread scheduling!");
+                //qWarning("Unable to test cancelling due to thread scheduling!");
                 bailoutCount = MAX_OPTIMISTIC_SCHEDULING_LIMIT;
                 break;
             }
@@ -708,7 +707,7 @@
             bailoutCount -= 1;
             spy.clear();
             if (!bailoutCount) {
-                qWarning("Unable to test cancelling due to thread scheduling!");
+//                qWarning("Unable to test cancelling due to thread scheduling!");
                 bailoutCount = MAX_OPTIMISTIC_SCHEDULING_LIMIT;
                 break;
             }
@@ -739,7 +738,7 @@
             cfr.setSorting(sorting);
             bailoutCount -= 1;
             if (!bailoutCount) {
-                qWarning("Unable to test cancelling due to thread scheduling!");
+//                qWarning("Unable to test cancelling due to thread scheduling!");
                 bailoutCount = MAX_OPTIMISTIC_SCHEDULING_LIMIT;
                 break;
             }
@@ -769,6 +768,10 @@
     QVERIFY(!crr.cancel());
     QVERIFY(!crr.waitForFinished());
 
+    // specific contact set
+    crr.setContactId(QContactLocalId(3));
+    QVERIFY(crr.contactIds() == QList<QContactLocalId>() << QContactLocalId(3));
+
     // specific contact removal via detail filter
     int originalCount = cm->contactIds().size();
     QContactDetailFilter dfil;
@@ -840,7 +843,7 @@
             }
             bailoutCount -= 1;
             if (!bailoutCount) {
-                qWarning("Unable to test cancelling due to thread scheduling!");
+//                qWarning("Unable to test cancelling due to thread scheduling!");
                 bailoutCount = MAX_OPTIMISTIC_SCHEDULING_LIMIT;
                 break;
             }
@@ -852,7 +855,7 @@
         QVERIFY(crr.waitForFinished());
         QVERIFY(crr.isCanceled());
         QCOMPARE(cm->contactIds().size(), 1);
-        QCOMPARE(cm->contact(cm->contactIds().first()), temp);
+        QCOMPARE(cm->contactIds(), crr.contactIds());
         QVERIFY(spy.count() >= 1); // active + cancelled progress signals
         spy.clear();
         break;
@@ -872,7 +875,7 @@
             cm->saveContact(&temp);
             bailoutCount -= 1;
             if (!bailoutCount) {
-                qWarning("Unable to test cancelling due to thread scheduling!");
+//                qWarning("Unable to test cancelling due to thread scheduling!");
                 bailoutCount = MAX_OPTIMISTIC_SCHEDULING_LIMIT;
                 break;
             }
@@ -882,7 +885,7 @@
         crr.waitForFinished();
         QVERIFY(crr.isCanceled());
         QCOMPARE(cm->contactIds().size(), 1);
-        QCOMPARE(cm->contact(cm->contactIds().first()), temp);
+        QCOMPARE(cm->contactIds(), crr.contactIds());
         QVERIFY(spy.count() >= 1); // active + cancelled progress signals
         spy.clear();
         break;
@@ -920,7 +923,7 @@
     QVERIFY(!csr.waitForFinished());
     qRegisterMetaType<QContactSaveRequest*>("QContactSaveRequest*");
     QThreadSignalSpy spy(&csr, SIGNAL(stateChanged(QContactAbstractRequest::State)));
-    csr.setContacts(saveList);
+    csr.setContact(testContact);
     QCOMPARE(csr.contacts(), saveList);
     QVERIFY(!csr.cancel()); // not started
     QVERIFY(csr.start());
@@ -932,16 +935,20 @@
     QVERIFY(spy.count() >= 1); // active + finished progress signals
     spy.clear();
 
-    QList<QContact> expected;
-    expected << cm->contact(cm->contactIds().last());
-    QList<QContact> result = csr.contacts();
-    QCOMPARE(expected, result);
+    QList<QContact> expected = csr.contacts();
+    QCOMPARE(expected.size(), 1);
+    QList<QContact> result;
+    result << cm->contact(expected.first().id().localId());
+    //some backends add extra fields, so this doesn't work:
+    //QCOMPARE(result, expected);
+    // XXX: really, we should use isSuperset() from tst_QContactManager, but this will do for now:
+    QVERIFY(result.first().detail<QContactName>() == nameDetail);
     QCOMPARE(cm->contactIds().size(), originalCount + 1);
 
     // update a previously saved contact
     QContactPhoneNumber phn;
     phn.setNumber("12345678");
-    testContact = expected.first();
+    testContact = result.first();
     testContact.saveDetail(&phn);
     saveList.clear();
     saveList << testContact;
@@ -958,14 +965,15 @@
     QVERIFY(spy.count() >= 1); // active + finished progress signals
     spy.clear();
 
-    expected.clear();
-    expected << cm->contact(cm->contactIds().last());
-    result = csr.contacts();
-    QVERIFY(compareContactLists(expected, result));
+    expected = csr.contacts();
+    result.clear();
+    result << cm->contact(expected.first().id().localId());
+    //QVERIFY(compareContactLists(result, expected));
 
     //here we can't compare the whole contact details, testContact would be updated by async call because we just use QThreadSignalSpy to receive signals.
-    //QVERIFY(containsIgnoringTimestamps(expected, testContact));
-    QVERIFY(expected.at(0).detail<QContactPhoneNumber>().number() == phn.number());
+    //QVERIFY(containsIgnoringTimestamps(result, testContact));
+    // XXX: really, we should use isSuperset() from tst_QContactManager, but this will do for now:
+    QVERIFY(result.first().detail<QContactPhoneNumber>().number() == phn.number());
     
     QCOMPARE(cm->contactIds().size(), originalCount + 1);
 
@@ -996,7 +1004,7 @@
             csr.setContacts(saveList);
             bailoutCount -= 1;
             if (!bailoutCount) {
-                qWarning("Unable to test cancelling due to thread scheduling!");
+//                qWarning("Unable to test cancelling due to thread scheduling!");
                 bailoutCount = MAX_OPTIMISTIC_SCHEDULING_LIMIT;
                 break;
             }
@@ -1039,7 +1047,7 @@
             csr.setContacts(saveList);
             bailoutCount -= 1;
             if (!bailoutCount) {
-                qWarning("Unable to test cancelling due to thread scheduling!");
+//                qWarning("Unable to test cancelling due to thread scheduling!");
                 bailoutCount = MAX_OPTIMISTIC_SCHEDULING_LIMIT;
                 break;
             }
@@ -1069,6 +1077,7 @@
     QScopedPointer<QContactManager> cm(prepareModel(uri));
     QContactDetailDefinitionFetchRequest dfr;
     QVERIFY(dfr.type() == QContactAbstractRequest::DetailDefinitionFetchRequest);
+    QVERIFY(dfr.contactType() == QString(QLatin1String(QContactType::TypeContact))); // ensure ctor sets contact type correctly.
     dfr.setContactType(QContactType::TypeContact);
     QVERIFY(dfr.contactType() == QString(QLatin1String(QContactType::TypeContact)));
 
@@ -1106,7 +1115,8 @@
     // specific definition retrieval
     QStringList specific;
     specific << QContactUrl::DefinitionName;
-    dfr.setDefinitionNames(specific);
+    dfr.setDefinitionName(QContactUrl::DefinitionName);
+    QVERIFY(dfr.definitionNames() == specific);
     QVERIFY(!dfr.cancel()); // not started
     QVERIFY(dfr.start());
 
@@ -1137,7 +1147,7 @@
             dfr.setDefinitionNames(QStringList());
             bailoutCount -= 1;
             if (!bailoutCount) {
-                qWarning("Unable to test cancelling due to thread scheduling!");
+//                qWarning("Unable to test cancelling due to thread scheduling!");
                 bailoutCount = MAX_OPTIMISTIC_SCHEDULING_LIMIT;
                 break;
             }
@@ -1165,7 +1175,7 @@
             dfr.setDefinitionNames(QStringList());
             bailoutCount -= 1;
             if (!bailoutCount) {
-                qWarning("Unable to test cancelling due to thread scheduling!");
+//                qWarning("Unable to test cancelling due to thread scheduling!");
                 bailoutCount = MAX_OPTIMISTIC_SCHEDULING_LIMIT;
                 break;
             }
@@ -1192,7 +1202,9 @@
     }
     QContactDetailDefinitionRemoveRequest drr;
     QVERIFY(drr.type() == QContactAbstractRequest::DetailDefinitionRemoveRequest);
-    drr.setDefinitionNames(QContactType::TypeContact, QStringList());
+    QVERIFY(drr.contactType() == QString(QLatin1String(QContactType::TypeContact))); // ensure ctor sets contact type correctly.
+    drr.setContactType(QContactType::TypeContact);
+    drr.setDefinitionNames(QStringList());
     QVERIFY(drr.contactType() == QString(QLatin1String(QContactType::TypeContact)));
 
     // initial state - not started, no manager.
@@ -1206,7 +1218,7 @@
     int originalCount = cm->detailDefinitions().keys().size();
     QStringList removeIds;
     removeIds << cm->detailDefinitions().keys().first();
-    drr.setDefinitionNames(QContactType::TypeContact, removeIds);
+    drr.setDefinitionName(cm->detailDefinitions().keys().first());
     drr.setManager(cm.data());
     QCOMPARE(drr.manager(), cm.data());
     QVERIFY(!drr.isActive());
@@ -1231,7 +1243,7 @@
     QCOMPARE(cm->error(), QContactManager::DoesNotExistError);
 
     // remove (asynchronously) a nonexistent group - should fail.
-    drr.setDefinitionNames(QContactType::TypeContact, removeIds);
+    drr.setDefinitionNames(removeIds);
     QVERIFY(!drr.cancel()); // not started
     QVERIFY(drr.start());
 
@@ -1247,7 +1259,7 @@
 
     // remove with list containing one valid and one invalid id.
     removeIds << cm->detailDefinitions().keys().first();
-    drr.setDefinitionNames(QContactType::TypeContact, removeIds);
+    drr.setDefinitionNames(removeIds);
     QVERIFY(!drr.cancel()); // not started
     QVERIFY(drr.start());
 
@@ -1265,7 +1277,7 @@
 
     // remove with empty list - nothing should happen.
     removeIds.clear();
-    drr.setDefinitionNames(QContactType::TypeContact, removeIds);
+    drr.setDefinitionNames(removeIds);
     QVERIFY(!drr.cancel()); // not started
     QVERIFY(drr.start());
 
@@ -1283,7 +1295,7 @@
     // cancelling
     removeIds.clear();
     removeIds << cm->detailDefinitions().keys().first();
-    drr.setDefinitionNames(QContactType::TypeContact, removeIds);
+    drr.setDefinitionNames(removeIds);
 
     int bailoutCount = MAX_OPTIMISTIC_SCHEDULING_LIMIT; // attempt to cancel 40 times.  If it doesn't work due to threading, bail out.
     while (true) {
@@ -1294,12 +1306,12 @@
             // due to thread scheduling, async cancel might be attempted
             // after the request has already finished.. so loop and try again.
             drr.waitForFinished();
-            drr.setDefinitionNames(QContactType::TypeContact, removeIds);
+            drr.setDefinitionNames(removeIds);
 
             QCOMPARE(cm->detailDefinitions().keys().size(), originalCount - 3); // finished
             bailoutCount -= 1;
             if (!bailoutCount) {
-                qWarning("Unable to test cancelling due to thread scheduling!");
+//                qWarning("Unable to test cancelling due to thread scheduling!");
                 bailoutCount = MAX_OPTIMISTIC_SCHEDULING_LIMIT;
                 break;
             }
@@ -1327,10 +1339,10 @@
             // due to thread scheduling, async cancel might be attempted
             // after the request has already finished.. so loop and try again.
             drr.waitForFinished();
-            drr.setDefinitionNames(QContactType::TypeContact, removeIds);
+            drr.setDefinitionNames(removeIds);
             bailoutCount -= 1;
             if (!bailoutCount) {
-                qWarning("Unable to test cancelling due to thread scheduling!");
+//                qWarning("Unable to test cancelling due to thread scheduling!");
                 bailoutCount = MAX_OPTIMISTIC_SCHEDULING_LIMIT;
                 break;
             }
@@ -1361,6 +1373,7 @@
     
     QContactDetailDefinitionSaveRequest dsr;
     QVERIFY(dsr.type() == QContactAbstractRequest::DetailDefinitionSaveRequest);
+    QVERIFY(dsr.contactType() == QString(QLatin1String(QContactType::TypeContact))); // ensure ctor sets contact type correctly
     dsr.setContactType(QContactType::TypeContact);
     QVERIFY(dsr.contactType() == QString(QLatin1String(QContactType::TypeContact)));
 
@@ -1390,7 +1403,7 @@
     QVERIFY(!dsr.waitForFinished());
     qRegisterMetaType<QContactDetailDefinitionSaveRequest*>("QContactDetailDefinitionSaveRequest*");
     QThreadSignalSpy spy(&dsr, SIGNAL(stateChanged(QContactAbstractRequest::State)));
-    dsr.setDefinitions(saveList);
+    dsr.setDefinition(testDef);
     QCOMPARE(dsr.definitions(), saveList);
     QVERIFY(!dsr.cancel()); // not started
     QVERIFY(dsr.start());
@@ -1455,7 +1468,7 @@
             cm->removeDetailDefinition(testDef.name());
             bailoutCount -= 1;
             if (!bailoutCount) {
-                qWarning("Unable to test cancelling due to thread scheduling!");
+//                qWarning("Unable to test cancelling due to thread scheduling!");
                 bailoutCount = MAX_OPTIMISTIC_SCHEDULING_LIMIT;
                 break;
             }
@@ -1492,7 +1505,7 @@
             cm->removeDetailDefinition(testDef.name());
             bailoutCount -= 1;
             if (!bailoutCount) {
-                qWarning("Unable to test cancelling due to thread scheduling!");
+//                qWarning("Unable to test cancelling due to thread scheduling!");
                 bailoutCount = MAX_OPTIMISTIC_SCHEDULING_LIMIT;
                 break;
             }
@@ -1678,7 +1691,7 @@
             rfr.setRelationshipType(QString());
             bailoutCount -= 1;
             if (!bailoutCount) {
-                qWarning("Unable to test cancelling due to thread scheduling!");
+//                qWarning("Unable to test cancelling due to thread scheduling!");
                 bailoutCount = MAX_OPTIMISTIC_SCHEDULING_LIMIT;
                 break;
             }
@@ -1706,7 +1719,7 @@
             rfr.setRelationshipType(QString());
             bailoutCount -= 1;
             if (!bailoutCount) {
-                qWarning("Unable to test cancelling due to thread scheduling!");
+//                qWarning("Unable to test cancelling due to thread scheduling!");
                 bailoutCount = MAX_OPTIMISTIC_SCHEDULING_LIMIT;
                 break;
             }
@@ -1797,7 +1810,8 @@
     r.setRelationshipType(QContactRelationship::HasManager);
     relationships.clear();
     relationships.push_back(r);
-    rrr.setRelationships(relationships);
+    rrr.setRelationship(r);
+    QVERIFY(rrr.relationships() == relationships);
     rrr.setManager(cm.data());
     QVERIFY(!rrr.cancel()); // not started
     QVERIFY(rrr.start());
@@ -1831,7 +1845,7 @@
             rrr.setRelationships(relationships);
             bailoutCount -= 1;
             if (!bailoutCount) {
-                qWarning("Unable to test cancelling due to thread scheduling!");
+//                qWarning("Unable to test cancelling due to thread scheduling!");
                 bailoutCount = MAX_OPTIMISTIC_SCHEDULING_LIMIT;
                 break;
             }
@@ -1861,7 +1875,7 @@
             rrr.setRelationships(relationships);
             bailoutCount -= 1;
             if (!bailoutCount) {
-                qWarning("Unable to test cancelling due to thread scheduling!");
+//                qWarning("Unable to test cancelling due to thread scheduling!");
                 bailoutCount = MAX_OPTIMISTIC_SCHEDULING_LIMIT;
                 break;
             }
@@ -1930,7 +1944,7 @@
     QVERIFY(!rsr.waitForFinished());
     qRegisterMetaType<QContactRelationshipSaveRequest*>("QContactRelationshipSaveRequest*");
     QThreadSignalSpy spy(&rsr, SIGNAL(stateChanged(QContactAbstractRequest::State)));
-    rsr.setRelationships(saveList);
+    rsr.setRelationship(testRel);
     QCOMPARE(rsr.relationships(), saveList);
     QVERIFY(!rsr.cancel()); // not started
     QVERIFY(rsr.start());
@@ -1991,7 +2005,7 @@
             cm->removeRelationship(testRel); // probably shouldn't have been saved anyway (circular)
             bailoutCount -= 1;
             if (!bailoutCount) {
-                qWarning("Unable to test cancelling due to thread scheduling!");
+//                qWarning("Unable to test cancelling due to thread scheduling!");
                 bailoutCount = MAX_OPTIMISTIC_SCHEDULING_LIMIT;
                 break;
             }
@@ -2028,7 +2042,7 @@
             cm->removeRelationship(testRel); // probably shouldn't have been saved anyway (circular)
             bailoutCount -= 1;
             if (!bailoutCount) {
-                qWarning("Unable to test cancelling due to thread scheduling!");
+//                qWarning("Unable to test cancelling due to thread scheduling!");
                 bailoutCount = MAX_OPTIMISTIC_SCHEDULING_LIMIT;
                 break;
             }
@@ -2138,7 +2152,7 @@
     QVERIFY(dsr.cancel());
 
     QContactDetailDefinitionRemoveRequest drr;
-    drr.setDefinitionNames(QContactType::TypeContact, emptyDNList);
+    drr.setDefinitionNames(emptyDNList);
     drr.setManager(&mcm);
     QVERIFY(drr.start());
     QVERIFY(drr.cancel());

--- a/qtmobility/tests/auto/qcontactasync/unittest/unittest.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qcontactasync/unittest/unittest.pro	Fri May 14 16:41:33 2010 +0300
@@ -18,6 +18,7 @@
 MOBILITY = contacts
 
 SOURCES  += tst_qcontactasync.cpp
+HEADERS += ../../qcontactmanagerdataholder.h
 
 # App local deployment
 symbian:QCONTACTASYNC_PLUGINS_DEPLOY.sources = contacts_maliciousplugin.dll

--- a/qtmobility/tests/auto/qcontactdetail/tst_qcontactdetail.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qcontactdetail/tst_qcontactdetail.cpp	Fri May 14 16:41:33 2010 +0300
@@ -42,7 +42,6 @@
 #include <QtTest/QtTest>
 
 #include "qtcontacts.h"
-#include "qcontactmanagerdataholder.h" //QContactManagerDataHolder
 #include <QSet>
 
 //TESTED_CLASS=
@@ -56,8 +55,6 @@
 public:
     tst_QContactDetail();
     virtual ~tst_QContactDetail();
-private:
-    QContactManagerDataHolder managerDataHolder;
 
 public slots:
     void init();
@@ -71,6 +68,8 @@
     void values();
     void hash();
     void traits();
+    void keys();
+    void detailUris();
 };
 
 tst_QContactDetail::tst_QContactDetail()
@@ -90,11 +89,22 @@
 }
 
 /* Test class that doesn't do the right thing */
-class MaliciousDetail : public QContactDetail
+class NonMacroCustomDetail : public QContactDetail
 {
 public:
-    MaliciousDetail() : QContactDetail("malicious") {}
+    NonMacroCustomDetail() : QContactDetail("malicious") {}
     void doAssign(const QContactDetail& other) {assign(other, "malicious");}
+    NonMacroCustomDetail(const QContactDetail& other)
+        : QContactDetail(other, "malicious") {}
+};
+
+class NonMacroCustomDetail2 : public QContactDetail
+{
+public:
+    NonMacroCustomDetail2() : QContactDetail(QString("malicious")) {}
+    void doAssign(const QContactDetail& other) {assign(other, QString("malicious"));}
+    NonMacroCustomDetail2(const QContactDetail& other)
+        : QContactDetail(other, QString("malicious")) {}
 };
 
 void tst_QContactDetail::classHierarchy()
@@ -230,13 +240,55 @@
     QVERIFY(ref == p1);
 
     /* Random other test */
-    MaliciousDetail md;
+    NonMacroCustomDetail md;
+    QVERIFY(md.definitionName() == "malicious");
     QVERIFY(md.setValue("key", "value"));
     QVERIFY(!md.isEmpty());
-    md.doAssign(md);
+    md.doAssign(md); // self assignment
     QVERIFY(!md.isEmpty());
     QVERIFY(md.value("key") == "value");
 
+    QContactDetail mdv;
+    mdv = md;
+    QVERIFY(mdv.definitionName() == "malicious");
+    QVERIFY(mdv.value("key") == "value");
+
+    md = mdv;
+    QVERIFY(md.definitionName() == "malicious");
+    QVERIFY(md.value("key") == "value");
+
+    NonMacroCustomDetail2 md2;
+    QVERIFY(md2.setValue("key", "value"));
+    QVERIFY(md2.definitionName() == "malicious");
+    QVERIFY(md2.value("key") == "value");
+    md2.doAssign(md);
+    QVERIFY(md2 == md);
+    md2 = md;
+    QVERIFY(md.definitionName() == "malicious");
+    QVERIFY(md.value("key") == "value");
+
+    // Self assignment
+    md2.doAssign(md2);
+    QVERIFY(md2.definitionName() == "malicious");
+    QVERIFY(md2.value("key") == "value");
+
+    md.doAssign(md2);
+    QVERIFY(md == md2);
+
+    // Assigning something else
+    QContactPhoneNumber pn;
+    pn.setNumber("12345");
+    md2.doAssign(pn);
+    QVERIFY(md2.isEmpty());
+    QVERIFY(md2.definitionName() == "malicious");
+
+    NonMacroCustomDetail mdb(pn);
+    QVERIFY(mdb.isEmpty());
+    QVERIFY(mdb.definitionName() == "malicious");
+
+    NonMacroCustomDetail2 md2b(pn);
+    QVERIFY(md2b.isEmpty());
+    QVERIFY(md2b.definitionName() == "malicious");
 }
 
 void tst_QContactDetail::assignment()
@@ -256,6 +308,9 @@
     QVERIFY(e1 != p1); // assignment across types shouldn't work
     QVERIFY(e1.emailAddress() == QString()); // should reset the detail
     QCOMPARE(e1, QContactEmailAddress());
+
+    QContactManagerEngine::setDetailAccessConstraints(&p2, QContactDetail::Irremovable);
+    QVERIFY(p1 != p2);
 }
 
 void tst_QContactDetail::templates()
@@ -328,9 +383,14 @@
 
     p.setValue("stringdate", d.toString(Qt::ISODate));
     p.setValue("stringdatetime", dt.toString(Qt::ISODate));
-    p.setValue("stringint", "123");
+
+    // Test the setter that takes a QString
+    p.setValue(QLatin1String("stringint"), "123");
 
-    /* Presence test */
+    // and the setter that takes a QL1C
+    p.setValue(QContactPhoneNumber::FieldNumber, "1234");
+
+    /* Presence test (const char * version) */
     QVERIFY(p.hasValue("string"));
     QVERIFY(p.hasValue("date"));
     QVERIFY(p.hasValue("datetime"));
@@ -338,9 +398,25 @@
     QVERIFY(p.hasValue("stringdate"));
     QVERIFY(p.hasValue("stringdatetime"));
     QVERIFY(p.hasValue("stringint"));
+    QVERIFY(p.hasValue(QContactPhoneNumber::FieldNumber.latin1()));
     QVERIFY(!p.hasValue("non existent field"));
 
-    /* String accessors */
+    /* QLatin1Constant version */
+    QVERIFY(p.hasValue(QContactPhoneNumber::FieldNumber));
+    QVERIFY(!p.hasValue(QContactAddress::FieldCountry));
+
+    /* Again with QString version */
+    QVERIFY(p.hasValue(QLatin1String("string")));
+    QVERIFY(p.hasValue(QLatin1String("date")));
+    QVERIFY(p.hasValue(QLatin1String("datetime")));
+    QVERIFY(p.hasValue(QLatin1String("int")));
+    QVERIFY(p.hasValue(QLatin1String("stringdate")));
+    QVERIFY(p.hasValue(QLatin1String("stringdatetime")));
+    QVERIFY(p.hasValue(QLatin1String("stringint")));
+    QVERIFY(p.hasValue(QString(QLatin1String(QContactPhoneNumber::FieldNumber))));
+    QVERIFY(!p.hasValue(QLatin1String("non existent field")));
+
+    /* string accessors with const char* key */
     QCOMPARE(p.value("string"), QString("This is a string"));
     QCOMPARE(p.value("date"), d.toString(Qt::ISODate));
     QCOMPARE(p.value("datetime"), dt.toString(Qt::ISODate));
@@ -348,8 +424,22 @@
     QCOMPARE(p.value("stringdate"), d.toString(Qt::ISODate));
     QCOMPARE(p.value("stringdatetime"), dt.toString(Qt::ISODate));
     QCOMPARE(p.value("stringint"), QString("123"));
+    QCOMPARE(p.value(QContactPhoneNumber::FieldNumber.latin1()), QString("1234"));
 
-    /* Variant accessor */
+    /* string accessor with QL1C key */
+    QCOMPARE(p.value(QContactPhoneNumber::FieldNumber), QString("1234"));
+
+    /* string accessors with QString key */
+    QCOMPARE(p.value(QLatin1String("string")), QString("This is a string"));
+    QCOMPARE(p.value(QLatin1String("date")), d.toString(Qt::ISODate));
+    QCOMPARE(p.value(QLatin1String("datetime")), dt.toString(Qt::ISODate));
+    QCOMPARE(p.value(QLatin1String("int")), QString("6"));
+    QCOMPARE(p.value(QLatin1String("stringdate")), d.toString(Qt::ISODate));
+    QCOMPARE(p.value(QLatin1String("stringdatetime")), dt.toString(Qt::ISODate));
+    QCOMPARE(p.value(QLatin1String("stringint")), QString("123"));
+    QCOMPARE(p.value(QString(QLatin1String(QContactPhoneNumber::FieldNumber))), QString("1234"));
+
+    /* Variant accessor with const char * key */
     QCOMPARE(p.variantValue("string"), QVariant(QString("This is a string")));
     QCOMPARE(p.variantValue("date"), QVariant(d));
     QCOMPARE(p.variantValue("datetime"), QVariant(dt));
@@ -357,8 +447,22 @@
     QCOMPARE(p.variantValue("stringdate"), QVariant(d.toString(Qt::ISODate)));
     QCOMPARE(p.variantValue("stringdatetime"), QVariant(dt.toString(Qt::ISODate)));
     QCOMPARE(p.variantValue("stringint"), QVariant(QString("123")));
+    QCOMPARE(p.variantValue(QContactPhoneNumber::FieldNumber.latin1()), QVariant(QString("1234")));
 
-    /* Typed accessors, string first */
+    /* Variant accessor with QL1C key */
+    QCOMPARE(p.variantValue(QContactPhoneNumber::FieldNumber), QVariant(QString("1234")));
+
+    /* Variant accessor with QString key */
+    QCOMPARE(p.variantValue(QLatin1String("string")), QVariant(QString("This is a string")));
+    QCOMPARE(p.variantValue(QLatin1String("date")), QVariant(d));
+    QCOMPARE(p.variantValue(QLatin1String("datetime")), QVariant(dt));
+    QCOMPARE(p.variantValue(QLatin1String("int")), QVariant((int)6));
+    QCOMPARE(p.variantValue(QLatin1String("stringdate")), QVariant(d.toString(Qt::ISODate)));
+    QCOMPARE(p.variantValue(QLatin1String("stringdatetime")), QVariant(dt.toString(Qt::ISODate)));
+    QCOMPARE(p.variantValue(QLatin1String("stringint")), QVariant(QString("123")));
+    QCOMPARE(p.variantValue(QLatin1String(QContactPhoneNumber::FieldNumber)), QVariant(QString("1234")));
+
+    /* Typed accessors, string first, const char* key */
     QCOMPARE(p.value<QString>("string"), QString("This is a string"));
     QCOMPARE(p.value<QString>("date"), d.toString(Qt::ISODate));
     QCOMPARE(p.value<QString>("datetime"), dt.toString(Qt::ISODate));
@@ -366,12 +470,29 @@
     QCOMPARE(p.value<QString>("stringdate"), d.toString(Qt::ISODate));
     QCOMPARE(p.value<QString>("stringdatetime"), dt.toString(Qt::ISODate));
     QCOMPARE(p.value<QString>("stringint"), QString("123"));
+    QCOMPARE(p.value<QString>(QContactPhoneNumber::FieldNumber.latin1()), QString("1234"));
 
     /* Now individual original types */
     QCOMPARE(p.value<QDate>("date"), d);
     QCOMPARE(p.value<QDateTime>("datetime"), dt);
     QCOMPARE(p.value<int>("int"), 6);
 
+    /* now latin constant keys */
+    QCOMPARE(p.value<QString>(QContactPhoneNumber::FieldNumber), QString("1234"));
+
+    /* Typed accessors, string first, QString key */
+    QCOMPARE(p.value<QString>(QLatin1String("string")), QString("This is a string"));
+    QCOMPARE(p.value<QString>(QLatin1String("date")), d.toString(Qt::ISODate));
+    QCOMPARE(p.value<QString>(QLatin1String("datetime")), dt.toString(Qt::ISODate));
+    QCOMPARE(p.value<QString>(QLatin1String("int")), QString("6"));
+    QCOMPARE(p.value<QString>(QLatin1String("stringdate")), d.toString(Qt::ISODate));
+    QCOMPARE(p.value<QString>(QLatin1String("stringdatetime")), dt.toString(Qt::ISODate));
+    QCOMPARE(p.value<QString>(QLatin1String("stringint")), QString("123"));
+    QCOMPARE(p.value<QString>(QLatin1String(QContactPhoneNumber::FieldNumber)), QString("1234"));
+    QCOMPARE(p.value<QDate>(QLatin1String("date")), d);
+    QCOMPARE(p.value<QDateTime>(QLatin1String("datetime")), dt);
+    QCOMPARE(p.value<int>(QLatin1String("int")), 6);
+
     /* Now cross types that should fail */
     QDate id;
     QDateTime idt;
@@ -541,6 +662,16 @@
 
     /* Check removing a missing value */
     QVERIFY(!p.removeValue("does not exist"));
+    QVERIFY(!p.removeValue(QLatin1String("does not exist")));
+    QVERIFY(!p.removeValue(QContactAddress::FieldCountry));
+
+    p.setValue("stringint", "555");
+    p.setValue(QContactPhoneNumber::FieldNumber, "1234");
+
+    /* Check removing a real value */
+    QVERIFY(p.removeValue("string"));
+    QVERIFY(p.removeValue(QLatin1String("stringint")));
+    QVERIFY(p.removeValue(QContactPhoneNumber::FieldNumber));
 }
 
 void tst_QContactDetail::hash()
@@ -571,5 +702,41 @@
     QVERIFY(!ti.isDummy);
 }
 
+void tst_QContactDetail::keys()
+{
+    QContactDetail d;
+    QContactDetail d2;
+    QVERIFY(d.key() != d2.key());
+
+    d = d2;
+    QVERIFY(d.key() == d2.key());
+    d.resetKey();
+    QVERIFY(d.key() != d2.key());
+}
+
+void tst_QContactDetail::detailUris()
+{
+    QContactDetail d;
+    QVERIFY(d.detailUri().isEmpty());
+
+    d.setDetailUri("I'm a detail uri");
+    QVERIFY(d.detailUri() == "I'm a detail uri");
+
+    d.setDetailUri(QString());
+    QVERIFY(d.detailUri().isEmpty());
+
+    QVERIFY(d.linkedDetailUris().isEmpty());
+
+    d.setLinkedDetailUris("5555");
+    QVERIFY(d.linkedDetailUris().count() == 1);
+    QVERIFY(d.linkedDetailUris().count("5555") == 1);
+
+    QStringList sl;
+    sl << "6666" << "7777";
+    d.setLinkedDetailUris(sl);
+    QVERIFY(d.linkedDetailUris().count() == 2);
+    QVERIFY(d.linkedDetailUris() == sl);
+}
+
 QTEST_MAIN(tst_QContactDetail)
 #include "tst_qcontactdetail.moc"

--- a/qtmobility/tests/auto/qcontactdetaildefinition/tst_qcontactdetaildefinition.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qcontactdetaildefinition/tst_qcontactdetaildefinition.cpp	Fri May 14 16:41:33 2010 +0300
@@ -42,7 +42,6 @@
 #include <QtTest/QtTest>
 
 #include "qtcontacts.h"
-#include "qcontactmanagerdataholder.h" //QContactManagerDataHolder
 
 //TESTED_CLASS=
 //TESTED_FILES=
@@ -55,8 +54,6 @@
 public:
     tst_QContactDetailDefinition();
     virtual ~tst_QContactDetailDefinition();
-private:
-    QContactManagerDataHolder managerDataHolder;
 
 public slots:
     void init();

--- a/qtmobility/tests/auto/qcontactdetails/tst_qcontactdetails.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qcontactdetails/tst_qcontactdetails.cpp	Fri May 14 16:41:33 2010 +0300
@@ -42,7 +42,6 @@
 #include <QtTest/QtTest>
 
 #include "qtcontacts.h"
-#include "qcontactmanagerdataholder.h" //QContactManagerDataHolder
 
 //TESTED_CLASS=
 //TESTED_FILES=
@@ -56,9 +55,6 @@
     tst_QContactDetails();
     virtual ~tst_QContactDetails();
 
-private:
-    QContactManagerDataHolder managerDataHolder;
-
 public slots:
     void init();
     void cleanup();
@@ -323,13 +319,11 @@
 
     // test property add [== fail]
     QVERIFY(!c.saveDetail(&d2));
-    QVERIFY(d2.accessConstraints() & QContactDetail::ReadOnly);
     QCOMPARE(c.details(QContactDisplayLabel::DefinitionName).count(), 1);
 
     // test property update [== fail]
     d1 = c.detail<QContactDisplayLabel>();
     QVERIFY(!c.saveDetail(&d1));
-    QVERIFY(d1.accessConstraints() & QContactDetail::ReadOnly);
 
     // test property remove
     QVERIFY(!c.removeDetail(&d1)); // cannot remove display label
@@ -547,6 +541,27 @@
     QCOMPARE(n1.lastName(), QString("Gumboots"));
     QCOMPARE(n1.suffix(), QString("Esquire"));
 
+    // Values based (ql1c)
+    QCOMPARE(n1.value(QContactName::FieldPrefix), QString("Dr"));
+    QCOMPARE(n1.value(QContactName::FieldFirstName), QString("Freddy"));
+    QCOMPARE(n1.value(QContactName::FieldMiddleName), QString("William Preston"));
+    QCOMPARE(n1.value(QContactName::FieldLastName), QString("Gumboots"));
+    QCOMPARE(n1.value(QContactName::FieldSuffix), QString("Esquire"));
+
+    // Values based (const char *)
+    QCOMPARE(n1.value(QContactName::FieldPrefix.latin1()), QString("Dr"));
+    QCOMPARE(n1.value(QContactName::FieldFirstName.latin1()), QString("Freddy"));
+    QCOMPARE(n1.value(QContactName::FieldMiddleName.latin1()), QString("William Preston"));
+    QCOMPARE(n1.value(QContactName::FieldLastName.latin1()), QString("Gumboots"));
+    QCOMPARE(n1.value(QContactName::FieldSuffix.latin1()), QString("Esquire"));
+
+    // Values based (QLatin1String)
+    QCOMPARE(n1.value(QLatin1String(QContactName::FieldPrefix)), QString("Dr"));
+    QCOMPARE(n1.value(QLatin1String(QContactName::FieldFirstName)), QString("Freddy"));
+    QCOMPARE(n1.value(QLatin1String(QContactName::FieldMiddleName)), QString("William Preston"));
+    QCOMPARE(n1.value(QLatin1String(QContactName::FieldLastName)), QString("Gumboots"));
+    QCOMPARE(n1.value(QLatin1String(QContactName::FieldSuffix)), QString("Esquire"));
+
     // test property add
     QVERIFY(c.saveDetail(&n1));
     QCOMPARE(c.details(QContactName::DefinitionName).count(), 1);

--- a/qtmobility/tests/auto/qcontactfilter/tst_qcontactfilter.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qcontactfilter/tst_qcontactfilter.cpp	Fri May 14 16:41:33 2010 +0300
@@ -42,13 +42,13 @@
 #include <QMetaType>
 
 #include "qtcontacts.h"
-#include "qcontactmanagerdataholder.h" //QContactManagerDataHolder
 
 //TESTED_CLASS=
 //TESTED_FILES=
 
 QTM_USE_NAMESPACE
 
+Q_DECLARE_METATYPE(QContact)
 Q_DECLARE_METATYPE(QContactFilter)
 
 class tst_QContactFilter : public QObject
@@ -59,9 +59,6 @@
     tst_QContactFilter();
     virtual ~tst_QContactFilter();
 
-private:
-    QContactManagerDataHolder managerDataHolder;
-
 public slots:
     void init();
     void cleanup();
@@ -72,12 +69,13 @@
     void detailFilter();
     void detailRangeFilter();
     void changeLogFilter();
-    void actionFilter();
     void relationshipFilter();
     void boringFilters();
     void idListFilter();
     void canonicalizedFilter();
     void canonicalizedFilter_data();
+    void testFilter();
+    void testFilter_data();
 
     void traits();
 
@@ -353,86 +351,6 @@
     QVERIFY(bf3.filters().at(3) == df3);
 }
 
-void tst_QContactFilter::actionFilter()
-{
-    QContactActionFilter af;
-
-    /* Test initial conditions */
-    QVERIFY(af.type() == QContactFilter::ActionFilter);
-    QVERIFY(af.actionName().isEmpty());
-    QVERIFY(af.value().isNull());
-    QVERIFY(af.vendorName().isEmpty());
-    QVERIFY(af.implementationVersion() == -1);
-
-    af.setActionName("Action Name");
-    QVERIFY(af.actionName() == "Action Name");
-
-    af.setActionName(QString());
-    QVERIFY(af.actionName().isEmpty());
-
-    af.setValue(5);
-    QVERIFY(af.value() == 5);
-
-    af.setValue("This is a string");
-    QVERIFY(af.value() == "This is a string");
-
-    af.setVendor("Vendor");
-    QVERIFY(af.vendorName() == "Vendor");
-    QVERIFY(af.implementationVersion() == -1);
-
-    af.setVendor(QString());
-    QVERIFY(af.vendorName().isEmpty());
-    QVERIFY(af.implementationVersion() == -1);
-
-    af.setVendor(QString(), 10);
-    QVERIFY(af.vendorName().isEmpty());
-    QVERIFY(af.implementationVersion() == -1);
-
-    af.setVendor("Vendor", 10);
-    QVERIFY(af.vendorName() == "Vendor");
-    QVERIFY(af.implementationVersion() == 10);
-
-    af.setVendor("Vendor", -1);
-    QVERIFY(af.vendorName() == "Vendor");
-    QVERIFY(af.implementationVersion() == -1);
-
-    af.setVendor("Vendor", 10);
-    QVERIFY(af.vendorName() == "Vendor");
-    QVERIFY(af.implementationVersion() == 10);
-
-    af.setVendor("Vendor");
-    QVERIFY(af.vendorName() == "Vendor");
-    QVERIFY(af.implementationVersion() == -1);
-
-    // Make sure there isn't a shadow copy
-    af.setVendor("Vendor", 10);
-    af.setVendor(QString());
-    QVERIFY(af.implementationVersion() == -1);
-    af.setVendor("Vendor");
-    QVERIFY(af.implementationVersion() == -1);
-
-    /* Test op= */
-    QContactFilter f = af;
-    QVERIFY(f == af);
-
-    QContactActionFilter af2 = f;
-    QVERIFY(af2 == af);
-
-    /* Self assignment should do nothing */
-    af2 = af2;
-    QVERIFY(af2 == af);
-
-    QContactDetailFilter dfil;
-    QContactActionFilter af3(dfil);
-    QVERIFY(af3.type() == QContactFilter::ActionFilter);
-    QContactActionFilter af4(af);
-    QVERIFY(af4 == af);
-    af = dfil;
-    QVERIFY(af == af3);
-    af = af3;
-    af.setActionName("test"); // should force a detach
-}
-
 void tst_QContactFilter::changeLogFilter()
 {
     QContactChangeLogFilter cf;
@@ -1141,6 +1059,121 @@
     }
 }
 
+void tst_QContactFilter::testFilter()
+{
+    QFETCH(QContact, contact);
+    QFETCH(QContactFilter, filter);
+    QFETCH(bool, expected);
+
+    QCOMPARE(QContactManagerEngine::testFilter(filter, contact), expected);
+}
+
+void tst_QContactFilter::testFilter_data()
+{
+    QTest::addColumn<QContact>("contact");
+    QTest::addColumn<QContactFilter>("filter");
+    QTest::addColumn<bool>("expected");
+
+    {
+        QContact contact;
+        QContactName name;
+        name.setFirstName(QLatin1String("first"));
+        name.setMiddleName(QLatin1String("middle"));
+        name.setLastName(QLatin1String("last"));
+        name.setPrefix(QLatin1String("prefix"));
+        name.setSuffix(QLatin1String("suffix"));
+        contact.saveDetail(&name);
+
+        QTest::newRow("QContactName::match firstname")
+                << contact
+                << QContactName::match("first")
+                << true;
+        QTest::newRow("QContactName::match lastname")
+                << contact
+                << QContactName::match("last")
+                << true;
+        QTest::newRow("QContactName::match middlename")
+                << contact
+                << QContactName::match("middle")
+                << true;
+        QTest::newRow("QContactName::match prefix")
+                << contact
+                << QContactName::match("prefix")
+                << true;
+        QTest::newRow("QContactName::match suffix")
+                << contact
+                << QContactName::match("suffix")
+                << true;
+        QTest::newRow("QContactName::match first last")
+                << contact
+                << QContactName::match(QLatin1String("first"), QLatin1String("last"))
+                << true;
+        QTest::newRow("QContactName::match substring")
+                << contact
+                << QContactName::match(QLatin1String("irs"))
+                << true;
+        QTest::newRow("QContactName::match first last substring")
+                << contact
+                << QContactName::match(QLatin1String("irs"), QLatin1String("as"))
+                << true;
+        QTest::newRow("QContactName::match negative")
+                << contact
+                << QContactName::match("foo")
+                << false;
+    }
+
+    {
+        QContact contact;
+        QContactManagerEngine::setContactDisplayLabel(&contact, QLatin1String("foo"));
+        QTest::newRow("QContactDisplayLabel::match positive")
+                << contact
+                << QContactDisplayLabel::match("foo")
+                << true;
+        QTest::newRow("QContactDisplayLabel::match positive substring")
+                << contact
+                << QContactDisplayLabel::match("o")
+                << true;
+        QTest::newRow("QContactDisplayLabel::match negative")
+                << contact
+                << QContactDisplayLabel::match("bar")
+                << false;
+    }
+
+    {
+        QContact contact;
+        QContactPhoneNumber phone;
+        phone.setNumber("1234");
+        contact.saveDetail(&phone);
+        QTest::newRow("QContactPhoneNumber::match positive")
+                << contact
+                << QContactPhoneNumber::match("1234")
+                << true;
+        QTest::newRow("QContactPhoneNumber::match negative")
+                << contact
+                << QContactPhoneNumber::match("5678")
+                << false;
+    }
+
+    {
+        QContact contact;
+        QContactEmailAddress email;
+        email.setEmailAddress("foo");
+        contact.saveDetail(&email);
+        QTest::newRow("QContactEmailAddress::match positive")
+                << contact
+                << QContactEmailAddress::match("foo")
+                << true;
+        QTest::newRow("QContactEmailAddress::match positive substring")
+                << contact
+                << QContactEmailAddress::match("o")
+                << true;
+        QTest::newRow("QContactEmailAddress::match negative")
+                << contact
+                << QContactEmailAddress::match("bar")
+                << false;
+    }
+}
+
 void tst_QContactFilter::traits()
 {
     QCOMPARE(sizeof(QContactFilter), sizeof(void *));

--- a/qtmobility/tests/auto/qcontactmanager/qcontactmanager.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qcontactmanager/qcontactmanager.pro	Fri May 14 16:41:33 2010 +0300
@@ -14,6 +14,7 @@
 CONFIG += mobility
 MOBILITY = contacts
 SOURCES  += tst_qcontactmanager.cpp
+HEADERS += ../qcontactmanagerdataholder.h
 
 symbian: {
     TARGET.CAPABILITY = ReadUserData \

--- a/qtmobility/tests/auto/qcontactmanager/tst_qcontactmanager.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qcontactmanager/tst_qcontactmanager.cpp	Fri May 14 16:41:33 2010 +0300
@@ -108,6 +108,8 @@
     int foo;
 };
 Q_DECLARE_METATYPE(UnsupportedMetatype)
+Q_DECLARE_METATYPE(QContact)
+Q_DECLARE_METATYPE(QContactManager::Error)
 
 class tst_QContactManager : public QObject
 {
@@ -127,11 +129,11 @@
     QContact createContact(QContactDetailDefinition nameDef, QString firstName, QString lastName, QString phoneNumber);
     void saveContactName(QContact *contact, QContactDetailDefinition nameDef, QContactName *contactName, const QString &name) const;
 
-    QContactManagerDataHolder managerDataHolder;
+    QScopedPointer<QContactManagerDataHolder> managerDataHolder;
 
 public slots:
-    void init();
-    void cleanup();
+    void initTestCase();
+    void cleanupTestCase();
 private slots:
 
     void doDump();
@@ -143,6 +145,7 @@
     /* Special test with special data */
     void uriParsing();
     void nameSynthesis();
+    void compatibleContact();
 
     /* Tests that are run on all managers */
     void metadata();
@@ -167,10 +170,13 @@
     void invalidManager();
     void memoryManager();
     void changeSet();
-
-    /* data providers (mostly all engines) */
-    void uriParsing_data(); // Special data
-    void nameSynthesis_data(); // Special data
+    void fetchHint();
+
+    /* Special test with special data */
+    void uriParsing_data();
+    void nameSynthesis_data();
+    void compatibleContact_data();
+    /* Tests that are run on all managers */
     void metadata_data() {addManagers();}
     void nullIdOperations_data() {addManagers();}
     void add_data() {addManagers();}
@@ -195,8 +201,10 @@
 {
 }
 
-void tst_QContactManager::init()
+void tst_QContactManager::initTestCase()
 {
+    managerDataHolder.reset(new QContactManagerDataHolder());
+
     /* Make sure these other test plugins are NOT loaded by default */
     // These are now removed from the list of managers in addManagers()
     //QVERIFY(!QContactManager::availableManagers().contains("testdummy"));
@@ -204,8 +212,9 @@
     //QVERIFY(!QContactManager::availableManagers().contains("maliciousplugin"));
 }
 
-void tst_QContactManager::cleanup()
+void tst_QContactManager::cleanupTestCase()
 {
+    managerDataHolder.reset(0);
 }
 
 void tst_QContactManager::dumpContactDifferences(const QContact& ca, const QContact& cb)
@@ -293,6 +302,33 @@
         }
     }
 
+    // Second remove any superset matches (eg, backend adds a field)
+    aDetails = a.details();
+    bDetails = b.details();
+    foreach (QContactDetail d, aDetails) {
+        foreach (QContactDetail d2, bDetails) {
+            if (d.definitionName() == d2.definitionName()) {
+                bool canRemove = true;
+                QMap<QString, QVariant> d2map = d2.variantValues();
+                foreach (QString key, d2map.keys()) {
+                    if (d.value(key) != d2.value(key)) {
+                        // d can have _more_ keys than d2,
+                        // but not _less_; and it cannot
+                        // change the value.
+                        canRemove = false;
+                    }
+                }
+
+                if (canRemove) {
+                    // if we get to here, we can remove the details.
+                    a.removeDetail(&d);
+                    b.removeDetail(&d2);
+                    break;
+                }
+            }
+        }
+    }
+
     // check for contact type updates
     if (!a.type().isEmpty())
         if (!b.type().isEmpty())
@@ -311,7 +347,7 @@
 void tst_QContactManager::dumpContact(const QContact& contact)
 {
     QContactManager m;
-    qDebug() << "Contact: " << contact.id().localId() << "(" << m.synthesizedDisplayLabel(contact) << ")";
+    qDebug() << "Contact: " << contact.id().localId() << "(" << m.synthesizedContactDisplayLabel(contact) << ")";
     QList<QContactDetail> details = contact.details();
     foreach(QContactDetail d, details) {
         qDebug() << "  " << d.definitionName() << ":";
@@ -703,11 +739,11 @@
     QVERIFY(cm->saveContact(&alice));
     QVERIFY(cm->error() == QContactManager::NoError);
 
-    QVERIFY(alice.id() != QContactId());
+    QVERIFY(!alice.id().managerUri().isEmpty());
+    QVERIFY(alice.id().localId() != 0);
     QCOMPARE(cm->contactIds().count(), currCount+1);
 
     QContact added = cm->contact(alice.id().localId());
-    QVERIFY(added.id() != QContactId());
     QVERIFY(added.id() == alice.id());
     
     if (!isSuperset(added, alice)) {
@@ -748,6 +784,18 @@
         //    continue;
         //}
 
+        if (cm->managerName() == "maemo5") {
+            // The maemo5 backend only supports reading of Guid and QCOA
+            if (def.name() == QContactGuid::DefinitionName)
+                continue;
+            if (def.name() == QContactOnlineAccount::DefinitionName)
+                continue;
+        }
+
+        // This is probably read-only
+        if (def.name() == QContactTimestamp::DefinitionName)
+            continue;
+
         // otherwise, create a new detail of the given type and save it to the contact
         QContactDetail det(def.name());
         QMap<QString, QContactDetailFieldDefinition> fieldmap = def.fields();
@@ -756,6 +804,10 @@
             // get the field, and check to see that it's not constrained.
             QContactDetailFieldDefinition currentField = fieldmap.value(fieldKey);
             
+            // Don't test detail uris as these are manager specific
+            if (fieldKey == QContactDetail::FieldDetailUri)
+                continue;
+
             // Special case: phone number.
             if (def.name() == QContactPhoneNumber::DefinitionName &&
                 fieldKey == QContactPhoneNumber::FieldNumber) {
@@ -810,12 +862,13 @@
                 // if we get here, we don't know what sort of value can be saved...
             }
         }
-        megacontact.saveDetail(&det);
+        if (!det.isEmpty())
+            megacontact.saveDetail(&det);
     }
 
     QVERIFY(cm->saveContact(&megacontact)); // must be able to save since built from definitions.
     QContact retrievedMegacontact = cm->contact(megacontact.id().localId());
-    if (retrievedMegacontact != megacontact) {
+    if (!isSuperset(retrievedMegacontact, megacontact)) {
         dumpContactDifferences(megacontact, retrievedMegacontact);
         QEXPECT_FAIL("mgr='wince'", "Address Display Label mismatch", Continue);
         QCOMPARE(megacontact, retrievedMegacontact);
@@ -845,7 +898,7 @@
         
         // verify save
         QContact retrievedContactable = cm->contact(veryContactable.id().localId());
-        if (retrievedContactable != veryContactable) {
+        if (!isSuperset(retrievedContactable, veryContactable)) {
             dumpContactDifferences(veryContactable, retrievedContactable);
             QEXPECT_FAIL("mgr='wince'", "Number of phones supported mismatch", Continue);
             QCOMPARE(veryContactable, retrievedContactable);
@@ -1146,7 +1199,7 @@
     nf.setLastName("Lastname");
     foo.saveDetail(&nf);
 
-    QVERIFY(manager.synthesizedDisplayLabel(foo).isEmpty());
+    QVERIFY(manager.synthesizedContactDisplayLabel(foo).isEmpty());
     QVERIFY(manager.error() == QContactManager::NotSupportedError);
 
     QVERIFY(manager.saveContact(&foo) == false);
@@ -1594,7 +1647,119 @@
         c.saveDetail(&org2);
 
     // Finally!
-    QCOMPARE(cm.synthesizedDisplayLabel(c), expected);
+    QCOMPARE(cm.synthesizedContactDisplayLabel(c), expected);
+}
+
+void tst_QContactManager::compatibleContact_data()
+{
+    QTest::addColumn<QContact>("input");
+    QTest::addColumn<QContact>("expected");
+    QTest::addColumn<QContactManager::Error>("error");
+
+    QContact baseContact;
+    QContactName name;
+    name.setFirstName(QLatin1String("First"));
+    baseContact.saveDetail(&name);
+
+    {
+        QTest::newRow("already compatible") << baseContact << baseContact << QContactManager::NoError;
+    }
+
+    {
+        QContact contact(baseContact);
+        QContactDetail detail("UnknownDetail");
+        detail.setValue("Key", QLatin1String("Value"));
+        contact.saveDetail(&detail);
+        QTest::newRow("unknown detail") << contact << baseContact << QContactManager::NoError;
+    }
+
+    {
+        QContact contact(baseContact);
+        QContactType type1;
+        type1.setType(QContactType::TypeContact);
+        contact.saveDetail(&type1);
+        QContactType type2;
+        type2.setType(QContactType::TypeGroup);
+        contact.saveDetail(&type2);
+        QContact expected(baseContact);
+        expected.saveDetail(&type2);
+        QTest::newRow("duplicate unique field") << contact << expected << QContactManager::NoError;
+    }
+
+    {
+        QContact contact(baseContact);
+        QContactPhoneNumber phoneNumber;
+        phoneNumber.setValue("UnknownKey", "Value");
+        contact.saveDetail(&phoneNumber);
+        QTest::newRow("unknown field") << contact << baseContact << QContactManager::NoError;
+    }
+
+    {
+        QContact contact(baseContact);
+        QContactDisplayLabel displayLabel;
+        displayLabel.setValue(QContactDisplayLabel::FieldLabel, QStringList("Value"));
+        contact.saveDetail(&displayLabel);
+        QTest::newRow("wrong type") << contact << baseContact << QContactManager::NoError;
+    }
+
+    {
+        QContact contact(baseContact);
+        QContactPhoneNumber phoneNumber1;
+        phoneNumber1.setNumber(QLatin1String("1234"));
+        phoneNumber1.setSubTypes(QStringList()
+                                << QContactPhoneNumber::SubTypeMobile
+                                << QContactPhoneNumber::SubTypeVoice
+                                << QLatin1String("InvalidSubtype"));
+        contact.saveDetail(&phoneNumber1);
+        QContact expected(baseContact);
+        QContactPhoneNumber phoneNumber2;
+        phoneNumber2.setNumber(QLatin1String("1234"));
+        phoneNumber2.setSubTypes(QStringList()
+                                << QContactPhoneNumber::SubTypeMobile
+                                << QContactPhoneNumber::SubTypeVoice);
+        expected.saveDetail(&phoneNumber2);
+        QTest::newRow("bad value (list)") << contact << expected << QContactManager::NoError;
+    }
+
+    {
+        QContact contact(baseContact);
+        QContactPhoneNumber phoneNumber1;
+        phoneNumber1.setNumber(QLatin1String("1234"));
+        phoneNumber1.setSubTypes(QStringList(QLatin1String("InvalidSubtype")));
+        contact.saveDetail(&phoneNumber1);
+        QContact expected(baseContact);
+        QContactPhoneNumber phoneNumber2;
+        phoneNumber2.setNumber(QLatin1String("1234"));
+        expected.saveDetail(&phoneNumber2);
+        QTest::newRow("all bad value (list)") << contact << expected << QContactManager::NoError;
+    }
+
+    {
+        QContact contact(baseContact);
+        QContactGender gender;
+        gender.setGender(QLatin1String("UnknownGender"));
+        contact.saveDetail(&gender);
+        QTest::newRow("bad value (string)") << contact << baseContact << QContactManager::NoError;
+    }
+
+    {
+        QContact contact;
+        QContactGender gender;
+        gender.setGender(QLatin1String("UnknownGender"));
+        contact.saveDetail(&gender);
+        QTest::newRow("bad value (string)") << contact << QContact() << QContactManager::DoesNotExistError;
+    }
+}
+
+void tst_QContactManager::compatibleContact()
+{
+    QContactManager cm("memory");
+
+    QFETCH(QContact, input);
+    QFETCH(QContact, expected);
+    QFETCH(QContactManager::Error, error);
+    QCOMPARE(cm.compatibleContact(input), expected);
+    QCOMPARE(cm.error(), error);
 }
 
 void tst_QContactManager::contactValidation()
@@ -1700,12 +1865,9 @@
 
 void tst_QContactManager::signalEmission()
 {
+    QTest::qWait(500); // clear the signal queue
     QFETCH(QString, uri);
     QScopedPointer<QContactManager> m1(QContactManager::fromUri(uri));
-    QScopedPointer<QContactManager> m2(QContactManager::fromUri(uri));
-
-    QVERIFY(m1->hasFeature(QContactManager::Anonymous) ==
-        m2->hasFeature(QContactManager::Anonymous));
 
     qRegisterMetaType<QContactLocalId>("QContactLocalId");
     qRegisterMetaType<QList<QContactLocalId> >("QList<QContactLocalId>");
@@ -1714,8 +1876,8 @@
     QSignalSpy spyCR(m1.data(), SIGNAL(contactsRemoved(QList<QContactLocalId>)));
 
     QList<QVariant> args;
+    QList<QContactLocalId> arg;
     QContact c;
-    QContactLocalId temp;
     QList<QContact> batchAdd;
     QList<QContactLocalId> batchRemove;
     QList<QContactLocalId> sigids;
@@ -1729,12 +1891,14 @@
     QContactName nc;
     saveContactName(&c, nameDef, &nc, "John");
     QVERIFY(m1->saveContact(&c));
+    QContactLocalId cid = c.id().localId();
     addSigCount += 1;
     QTRY_COMPARE(spyCA.count(), addSigCount);
     args = spyCA.takeFirst();
     addSigCount -= 1;
-    QVERIFY(args.count() == 1);
-    temp = QContactLocalId(args.at(0).value<quint32>());
+    arg = args.first().value<QList<quint32> >();
+    QVERIFY(arg.count() == 1);
+    QCOMPARE(QContactLocalId(arg.at(0)), cid);
 
     // verify save modified emits signal changed
     saveContactName(&c, nameDef, &nc, "Citizen");
@@ -1743,8 +1907,9 @@
     QTRY_COMPARE(spyCM.count(), modSigCount);
     args = spyCM.takeFirst();
     modSigCount -= 1;
-    QVERIFY(args.count() == 1);
-    QCOMPARE(temp, QContactLocalId(args.at(0).value<quint32>()));
+    arg = args.first().value<QList<quint32> >();
+    QVERIFY(arg.count() == 1);
+    QCOMPARE(QContactLocalId(arg.at(0)), cid);
 
     // verify remove emits signal removed
     m1->removeContact(c.id().localId());
@@ -1752,8 +1917,9 @@
     QTRY_COMPARE(spyCR.count(), remSigCount);
     args = spyCR.takeFirst();
     remSigCount -= 1;
-    QVERIFY(args.count() == 1);
-    QCOMPARE(temp, QContactLocalId(args.at(0).value<quint32>()));
+    arg = args.first().value<QList<quint32> >();
+    QVERIFY(arg.count() == 1);
+    QCOMPARE(QContactLocalId(arg.at(0)), cid);
 
     // verify multiple adds works as advertised
     QContact c2, c3;
@@ -1845,6 +2011,11 @@
     QTRY_COMPARE(spyCA.count(), 0);
     QTRY_COMPARE(spyCM.count(), 0);
 
+    QScopedPointer<QContactManager> m2(QContactManager::fromUri(uri));
+
+    QVERIFY(m1->hasFeature(QContactManager::Anonymous) ==
+        m2->hasFeature(QContactManager::Anonymous));
+
     /* Now some cross manager testing */
     if (!m1->hasFeature(QContactManager::Anonymous)) {
         // verify that signals are emitted for modifications made to other managers (same id).
@@ -2126,10 +2297,17 @@
 
     QVERIFY(d.displayLabel().isEmpty());
 
-    QString synth = cm->synthesizedDisplayLabel(d);
+    QString synth = cm->synthesizedContactDisplayLabel(d);
+
+    // Make sure this doesn't crash
+    cm->synthesizeContactDisplayLabel(0);
+
+    // Make sure this gives the same results
+    cm->synthesizeContactDisplayLabel(&d);
+    QCOMPARE(d.displayLabel(), synth);
 
     /*
-     * The display label is not updated until you save the contact.
+     * The display label is not updated until you save the contact or call synthCDL
      */
     QVERIFY(cm->saveContact(&d));
     d = cm->contact(d.id().localId());
@@ -2185,16 +2363,8 @@
     c.saveDetail(&p3);
     c.saveDetail(&u);
 
-    // set a preference for dialing a particular saved phonenumber.
-    c.setPreferredDetail("Dial", p2);
-
     QVERIFY(cm->saveContact(&c));          // save the contact
     QContact loaded = cm->contact(c.id().localId()); // reload the contact
-
-    // test that the preference was saved correctly.
-    QContactDetail pref = loaded.preferredDetail("Dial");
-    QVERIFY(pref == p2);
-
     cm->removeContact(c.id().localId());
 }
 
@@ -2214,12 +2384,19 @@
     QVERIFY(changeSet.addedContacts().contains(id));
 
     changeSet.insertChangedContact(id);
-    changeSet.insertChangedContact(id);
+    changeSet.insertChangedContacts(QList<QContactLocalId>() << id);
     QVERIFY(changeSet.changedContacts().size() == 1); // set, should only be added once.
     QVERIFY(!changeSet.addedContacts().isEmpty());
     QVERIFY(!changeSet.changedContacts().isEmpty());
     QVERIFY(changeSet.removedContacts().isEmpty());
     QVERIFY(changeSet.changedContacts().contains(id));
+    changeSet.clearChangedContacts();
+    QVERIFY(changeSet.changedContacts().isEmpty());
+
+    changeSet.insertRemovedContacts(QList<QContactLocalId>() << id);
+    QVERIFY(changeSet.removedContacts().contains(id));
+    changeSet.clearRemovedContacts();
+    QVERIFY(changeSet.removedContacts().isEmpty());
 
     QVERIFY(changeSet.dataChanged() == false);
     QContactChangeSet changeSet2;
@@ -2227,6 +2404,11 @@
     QVERIFY(changeSet.addedContacts() == changeSet2.addedContacts());
     changeSet.emitSignals(0);
 
+    changeSet2.clearAddedContacts();
+    QVERIFY(changeSet2.addedContacts().isEmpty());
+    changeSet2.insertAddedContacts(changeSet.addedContacts().toList());
+    QVERIFY(changeSet.addedContacts() == changeSet2.addedContacts());
+
     changeSet2.clearAll();
     QVERIFY(changeSet.addedContacts() != changeSet2.addedContacts());
 
@@ -2241,6 +2423,14 @@
     changeSet.emitSignals(0);
 
     changeSet.addedRelationshipsContacts().insert(id);
+    changeSet.insertAddedRelationshipsContacts(QList<QContactLocalId>() << id);
+    QVERIFY(changeSet.addedRelationshipsContacts().contains(id));
+    changeSet.clearAddedRelationshipsContacts();
+    QVERIFY(changeSet.addedRelationshipsContacts().isEmpty());
+    changeSet.insertRemovedRelationshipsContacts(QList<QContactLocalId>() << id);
+    QVERIFY(changeSet.removedRelationshipsContacts().contains(id));
+    changeSet.clearRemovedRelationshipsContacts();
+    QVERIFY(changeSet.removedRelationshipsContacts().isEmpty());
     changeSet.emitSignals(0);
     changeSet.removedRelationshipsContacts().insert(id);
     changeSet.emitSignals(0);
@@ -2257,6 +2447,17 @@
     changeSet.emitSignals(0);
 }
 
+void tst_QContactManager::fetchHint()
+{
+    QContactFetchHint hint;
+    hint.setOptimizationHints(QContactFetchHint::NoBinaryBlobs);
+    QCOMPARE(hint.optimizationHints(), QContactFetchHint::NoBinaryBlobs);
+    QStringList rels;
+    rels << QString(QLatin1String(QContactRelationship::HasMember));
+    hint.setRelationshipTypesHint(rels);
+    QCOMPARE(hint.relationshipTypesHint(), rels);
+}
+
 void tst_QContactManager::selfContactId()
 {
     QFETCH(QString, uri);
@@ -2266,6 +2467,7 @@
     QContactLocalId selfContact = cm->selfContactId();
     if (!cm->hasFeature(QContactManager::SelfContact)) {
         // ensure that the error codes / return values are meaningful failures.
+        QEXPECT_FAIL("mgr='maemo5'", "maemo5 supports getting the self contact but not setting it.", Continue);
         QVERIFY(cm->error() == QContactManager::DoesNotExistError);
         QVERIFY(!cm->setSelfContactId(QContactLocalId(123)));
         QVERIFY(cm->error() == QContactManager::NotSupportedError);

--- a/qtmobility/tests/auto/qcontactmanagerdataholder.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qcontactmanagerdataholder.h	Fri May 14 16:41:33 2010 +0300
@@ -47,6 +47,7 @@
 #include <QMultiMap>
 #include <QList>
 #include <QString>
+#include <QDebug>
 
 #include "qcontactmanager.h"
 
@@ -70,20 +71,21 @@
     {
         QStringList managerNames = QContactManager::availableManagers();
 
-        foreach(QString mgr, managerNames) {
+        foreach(const QString& mgr, managerNames) {
+            // Don't bother with these
+            if (mgr == "memory" || mgr == "invalid" || mgr == "testdummy" || mgr == "maliciousplugin")
+                continue;
             QMap<QString, QString> params;
             QString mgrUri = QContactManager::buildUri(mgr, params);
             QContactManager* cm = QContactManager::fromUri(mgrUri);
             if (cm) {
-                QList<QContact> contacts;
-                foreach (const QContactLocalId id,  cm->contactIds()) {
-                    contacts.push_back(cm->contact(id));
-                }
+                qDebug() << "Saving contacts for" << mgrUri;
+                QList<QContact> contacts = cm->contacts();
                 savedContacts.insert(cm->managerName(),contacts);
-                QList<QContactLocalId> ids = cm->contactIds();
-                QMap<int, QContactManager::Error> errorMap;
-                cm->removeContacts(ids, &errorMap);
-                ids.clear();
+                QList<QContactLocalId> ids;
+                foreach(const QContact& contact, contacts)
+                    ids.append(contact.localId());
+                cm->removeContacts(ids, 0);
                 delete cm;
             }
         }
@@ -91,18 +93,13 @@
 
     ~QContactManagerDataHolder()
     {
-        QStringList managerNames = QContactManager::availableManagers();
-
-        foreach(QString mgr, managerNames) {
-            QMap<QString, QString> params;
-            QString mgrUri = QContactManager::buildUri(mgr, params);
+        foreach(const QString& mgrUri, savedContacts.keys()) {
             QContactManager* cm = QContactManager::fromUri(mgrUri);
             if (cm) {
-                QList<QContact> contacts = savedContacts.value(cm->managerName());
-                foreach(QContact c, contacts) {
-                    c.setId(QContactId());
-                    cm->saveContact(&c);
-                }
+                qDebug() << "Restoring contacts for" << mgrUri;
+                QList<QContact> contacts = savedContacts.value(mgrUri);
+                cm->saveContacts(&contacts, 0);
+                // XXX this doesn't restore relationships..
                 delete cm;
             }
         }

--- a/qtmobility/tests/auto/qcontactmanagerfiltering/qcontactmanagerfiltering.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qcontactmanagerfiltering/qcontactmanagerfiltering.pro	Fri May 14 16:41:33 2010 +0300
@@ -14,6 +14,7 @@
 CONFIG += mobility
 MOBILITY = contacts
 SOURCES  += tst_qcontactmanagerfiltering.cpp
+HEADERS += ../qcontactmanagerdataholder.h
 
 symbian: {
     TARGET.CAPABILITY = ReadUserData \

--- a/qtmobility/tests/auto/qcontactmanagerfiltering/tst_qcontactmanagerfiltering.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qcontactmanagerfiltering/tst_qcontactmanagerfiltering.cpp	Fri May 14 16:41:33 2010 +0300
@@ -59,13 +59,6 @@
 Q_DECLARE_METATYPE(QList<QContactLocalId>)
 
 /*
- * Global variables:
- * These are the definition and field names used by the actions for their matching.
- */
-QMap<QString, QPair<QString, QString> > defAndFieldNamesForTypeForActions;
-
-
-/*
  * We use this code to compare the output and expected lists of filtering
  * where no sort order is implied.
  * TODO: use this instead of QCOMPARE in the various filtering tests!
@@ -104,11 +97,15 @@
     QMultiMap<QContactManager*, QContactLocalId> contactsAddedToManagers;
     QMultiMap<QContactManager*, QString> detailDefinitionsAddedToManagers;
     QList<QContactManager*> managers;
-    QContactManagerDataHolder managerDataHolder;
+    QScopedPointer<QContactManagerDataHolder> managerDataHolder;
 
     QTestData& newMRow(const char *tag, QContactManager *cm);
 
 private slots:
+
+    void initTestCase();
+    void cleanupTestCase();
+
     void rangeFiltering(); // XXX should take all managers
     void rangeFiltering_data();
 
@@ -118,10 +115,6 @@
     void detailPhoneNumberFiltering();
     void detailPhoneNumberFiltering_data();
 
-    void actionPlugins();
-    void actionFiltering();
-    void actionFiltering_data();
-
     void detailVariantFiltering();
     void detailVariantFiltering_data();
 
@@ -155,6 +148,16 @@
 
 tst_QContactManagerFiltering::tst_QContactManagerFiltering()
 {
+}
+
+tst_QContactManagerFiltering::~tst_QContactManagerFiltering()
+{
+}
+
+void tst_QContactManagerFiltering::initTestCase()
+{
+    managerDataHolder.reset(new QContactManagerDataHolder());
+
     // firstly, build a list of the managers we wish to test.
     QStringList managerNames = QContactManager::availableManagers();
 
@@ -199,14 +202,12 @@
     qDebug() << "Finished preparing each manager for test!";
 }
 
-tst_QContactManagerFiltering::~tst_QContactManagerFiltering()
+void tst_QContactManagerFiltering::cleanupTestCase()
 {
     // first, remove any contacts that we've added to any managers.
     foreach (QContactManager* manager, managers) {
         QList<QContactLocalId> contactIds = contactsAddedToManagers.values(manager);
-        foreach (const QContactLocalId& cid, contactIds) {
-            manager->removeContact(cid);
-        }
+        manager->removeContacts(contactIds, 0);
     }
     contactsAddedToManagers.clear();
 
@@ -223,6 +224,9 @@
     qDeleteAll(managers);
     managers.clear();
     defAndFieldNamesForTypePerManager.clear();
+
+    // And restore old contacts
+    managerDataHolder.reset(0);
 }
 
 QString tst_QContactManagerFiltering::convertIds(QList<QContactLocalId> allIds, QList<QContactLocalId> ids)
@@ -310,30 +314,39 @@
         newMRow("Name == aaron, fixed, case sensitive", manager) << manager << name << firstname << QVariant("aaron") << (int)(Qt::MatchFixedString | Qt::MatchCaseSensitive) << es;
 
         // middle name
-        newMRow("MName == Arne", manager) << manager << name << middlename << QVariant("Arne") << (int)(Qt::MatchContains) << "a";
-		
-		// prefix
-        newMRow("Prefix == Sir", manager) << manager << name << prefixname << QVariant("Sir") << (int)(Qt::MatchContains) << "a";
-		
-		// prefix
-        newMRow("Suffix == Dr.", manager) << manager << name << suffixname << QVariant("Dr.") << (int)(Qt::MatchContains) << "a";
-		
-		// nickname
-        newMRow("Nickname detail exists", manager) << manager << nickname << es << QVariant() << 0 << "ab";
-        newMRow("Nickname == Aaron, contains", manager) << manager << nickname << nicknameField << QVariant("Aaron") << (int)(Qt::MatchContains) << "a";
+        if (manager->detailDefinitions().value(QContactName::DefinitionName).fields().contains(QContactName::FieldMiddleName))
+            newMRow("MName == Arne", manager) << manager << name << middlename << QVariant("Arne") << (int)(Qt::MatchContains) << "a";
+
+        // prefix
+        if (manager->detailDefinitions().value(QContactName::DefinitionName).fields().contains(QContactName::FieldPrefix))
+            newMRow("Prefix == Sir", manager) << manager << name << prefixname << QVariant("Sir") << (int)(Qt::MatchContains) << "a";
+
+        // suffix
+        if (manager->detailDefinitions().value(QContactName::DefinitionName).fields().contains(QContactName::FieldSuffix))
+            newMRow("Suffix == Dr.", manager) << manager << name << suffixname << QVariant("Dr.") << (int)(Qt::MatchContains) << "a";
+
+        // nickname
+        if (manager->detailDefinitions().contains(QContactNickname::DefinitionName)) {
+            newMRow("Nickname detail exists", manager) << manager << nickname << es << QVariant() << 0 << "ab";
+            newMRow("Nickname == Aaron, contains", manager) << manager << nickname << nicknameField << QVariant("Aaron") << (int)(Qt::MatchContains) << "a";
+        }
 
         // email
-        newMRow("Email == Aaron@Aaronson.com", manager) << manager << emailaddr << emailfield << QVariant("Aaron@Aaronson.com") << 0 << "a";
-        newMRow("Email == Aaron@Aaronsen.com", manager) << manager << emailaddr << emailfield << QVariant("Aaron@Aaronsen.com") << 0 << es;
+        if (manager->detailDefinitions().contains(QContactEmailAddress::DefinitionName)) {
+            newMRow("Email == Aaron@Aaronson.com", manager) << manager << emailaddr << emailfield << QVariant("Aaron@Aaronson.com") << 0 << "a";
+            newMRow("Email == Aaron@Aaronsen.com", manager) << manager << emailaddr << emailfield << QVariant("Aaron@Aaronsen.com") << 0 << es;
+        }
         
         // phone number
-        newMRow("Phone number detail exists", manager) << manager << phonenumber << es << QVariant("") << 0 << "ab";
-        newMRow("Phone number = 555-1212", manager) << manager << phonenumber << number << QVariant("555-1212") << (int) QContactFilter::MatchExactly << "a";
-        newMRow("Phone number = 34, contains", manager) << manager << phonenumber << number << QVariant("34") << (int) QContactFilter::MatchContains << "b";
-        newMRow("Phone number = 555, starts with", manager) << manager << phonenumber << number << QVariant("555") <<  (int) QContactFilter::MatchStartsWith << "ab";
-        newMRow("Phone number = 1212, ends with", manager) << manager << phonenumber << number << QVariant("1212") << (int) QContactFilter::MatchEndsWith << "a";
-        newMRow("Phone number = 555-1212, match phone number", manager) << manager << phonenumber << number << QVariant("555-1212") << (int) QContactFilter::MatchPhoneNumber << "a";
-        newMRow("Phone number = 555, keypad collation", manager) << manager << phonenumber << number << QVariant("555") << (int) (QContactFilter::MatchKeypadCollation | QContactFilter::MatchStartsWith) << "ab";
+        if (manager->detailDefinitions().contains(QContactPhoneNumber::DefinitionName)) {
+            newMRow("Phone number detail exists", manager) << manager << phonenumber << es << QVariant("") << 0 << "ab";
+            newMRow("Phone number = 5551212", manager) << manager << phonenumber << number << QVariant("5551212") << (int) QContactFilter::MatchExactly << "a";
+            newMRow("Phone number = 34, contains", manager) << manager << phonenumber << number << QVariant("34") << (int) QContactFilter::MatchContains << "b";
+            newMRow("Phone number = 555, starts with", manager) << manager << phonenumber << number << QVariant("555") <<  (int) QContactFilter::MatchStartsWith << "ab";
+            newMRow("Phone number = 1212, ends with", manager) << manager << phonenumber << number << QVariant("1212") << (int) QContactFilter::MatchEndsWith << "a";
+            newMRow("Phone number = 555-1212, match phone number", manager) << manager << phonenumber << number << QVariant("555-1212") << (int) QContactFilter::MatchPhoneNumber << "a"; // hyphens will be ignored by the match algorithm
+            newMRow("Phone number = 555, keypad collation", manager) << manager << phonenumber << number << QVariant("555") << (int) (QContactFilter::MatchKeypadCollation | QContactFilter::MatchStartsWith) << "ab";
+        }
         
         /* Converting other types to strings */
         QPair<QString, QString> defAndFieldNames = defAndFieldNamesForTypePerManager.value(manager).value("Integer");
@@ -407,6 +420,9 @@
         QTest::newRow("t9 bo") << manager << nameDef << nameField << QVariant(QString("26")) << (int)(QContactFilter::MatchKeypadCollation | QContactFilter::MatchStartsWith) << "bc"; // bob, boris
         QTest::newRow("t9 zzzz") << manager << nameDef << nameField << QVariant(QString("9999")) << (int)(QContactFilter::MatchKeypadCollation) << ""; // nobody.
 
+        if (!manager->detailDefinitions().contains(QContactPhoneNumber::DefinitionName))
+            continue; // don't test phone numbers with this manager: not supported.
+
         // now do phone number matching - first, aaron's phone number
         QTest::newRow("a phone hyphen") << manager << phoneDef << phoneField << QVariant(QString("555-1212")) << (int)(QContactFilter::MatchPhoneNumber) << "a";
         QTest::newRow("a phone plus") << manager << phoneDef << phoneField << QVariant(QString("+5551212")) << (int)(QContactFilter::MatchPhoneNumber) << "a";
@@ -420,7 +436,7 @@
         QTest::newRow("a phone plus brackets hyphen") << manager << phoneDef << phoneField << QVariant(QString("+5(55)1-212")) << (int)(QContactFilter::MatchPhoneNumber) << "a";
         QTest::newRow("a phone plus brackets hyphen spaces") << manager << phoneDef << phoneField << QVariant(QString("+5 (55) 1-212")) << (int)(QContactFilter::MatchPhoneNumber) << "a";
 
-        // XXX TODO: should we test for character to number conversions (eg, dial 1800-PESTCONTROL) etc
+        // XXX TODO: should we test for character to number conversions (eg, dial 1800-PESTCONTROL) etc ?
         //QTest::newRow("a phone characters") << manager << phoneDef << phoneField << QVariant(QString("jjj1a1a")) << (int)(QContactFilter::MatchPhoneNumber) << "a"; // 5551212
         //QTest::newRow("a phone characters") << manager << phoneDef << phoneField << QVariant(QString("jkl1b1a")) << (int)(QContactFilter::MatchPhoneNumber) << "a"; // 5551212
 
@@ -823,8 +839,8 @@
         newMRow("no min, cs, badcase, some results", manager) << manager << namedef << firstname << QVariant() << QVariant("BOB") << false << 0 << true << csflag << "a";
         newMRow("no min, cs, badcase, no results", manager) << manager << namedef << firstname << QVariant() << QVariant("AARDVARK") << false << 0 << true << csflag << es;
 
-        /* 'a' has phone number ("555-1212") */
-        QTest::newRow("range1") << manager << phonedef << phonenum << QVariant("555-1200") << QVariant("555-1220") << false << 0 << false << 0 << "a";
+        /* 'a' has phone number ("5551212") */
+        QTest::newRow("range1") << manager << phonedef << phonenum << QVariant("5551200") << QVariant("5551220") << false << 0 << false << 0 << "a";
 
         /* A(Aaron Aaronson), B(Bob Aaronsen), C(Boris Aaronsun), D(Dennis FitzMacyntire) */
         // string range matching - no matchflags set.
@@ -2010,6 +2026,7 @@
     QTest::addColumn<bool>("setbp");
     QTest::addColumn<int>("blankpolicyi");
     QTest::addColumn<QString>("expected");
+    QTest::addColumn<QString>("unstable");
 
     QString firstname = QContactName::FieldFirstName;
     QString lastname = QContactName::FieldLastName;
@@ -2023,19 +2040,19 @@
         QPair<QString, QString> integerDefAndFieldNames = defAndFieldNamesForTypePerManager.value(manager).value("Integer");
         QPair<QString, QString> stringDefAndFieldNames = defAndFieldNamesForTypePerManager.value(manager).value("String");
 
-        newMRow("first ascending", manager) << manager << namedef << firstname << (int)(Qt::AscendingOrder) << false << 0 << "abcdefg";
-        newMRow("first descending", manager) << manager << namedef << firstname << (int)(Qt::DescendingOrder) << false << 0 << "efgdcba";
-        newMRow("last ascending", manager) << manager << namedef << lastname << (int)(Qt::AscendingOrder) << false << 0 << "bacdefg";
-        newMRow("last descending", manager) << manager << namedef << lastname << (int)(Qt::DescendingOrder) << false << 0 << "gfedcab";
+        newMRow("first ascending", manager) << manager << namedef << firstname << (int)(Qt::AscendingOrder) << false << 0 << "abcdefg" << "efg";  // efg have the same first name
+        newMRow("first descending", manager) << manager << namedef << firstname << (int)(Qt::DescendingOrder) << false << 0 << "efgdcba" << "efg";// efg have the same first name
+        newMRow("last ascending", manager) << manager << namedef << lastname << (int)(Qt::AscendingOrder) << false << 0 << "bacdefg" << "";       // all have a well defined, sortable last name
+        newMRow("last descending", manager) << manager << namedef << lastname << (int)(Qt::DescendingOrder) << false << 0 << "gfedcab" << "";     // all have a well defined, sortable last name
         if (!integerDefAndFieldNames.first.isEmpty() && !integerDefAndFieldNames.second.isEmpty()) {
-            newMRow("integer ascending, blanks last", manager) << manager << integerDefAndFieldNames.first << integerDefAndFieldNames.second << (int)(Qt::AscendingOrder) << true << (int)(QContactSortOrder::BlanksLast) << "cabgfed";
-            newMRow("integer descending, blanks last", manager) << manager << integerDefAndFieldNames.first << integerDefAndFieldNames.second << (int)(Qt::DescendingOrder) << true << (int)(QContactSortOrder::BlanksLast) << "bacgfed";
-            newMRow("integer ascending, blanks first", manager) << manager << integerDefAndFieldNames.first << integerDefAndFieldNames.second << (int)(Qt::AscendingOrder) << true << (int)(QContactSortOrder::BlanksFirst) << "defgcab";
-            newMRow("integer descending, blanks first", manager) << manager << integerDefAndFieldNames.first << integerDefAndFieldNames.second << (int)(Qt::DescendingOrder) << true << (int)(QContactSortOrder::BlanksFirst) << "defgbac";
+            newMRow("integer ascending, blanks last", manager) << manager << integerDefAndFieldNames.first << integerDefAndFieldNames.second << (int)(Qt::AscendingOrder) << true << (int)(QContactSortOrder::BlanksLast) << "cabgfed" << "gfed"; // gfed have no integer
+            newMRow("integer descending, blanks last", manager) << manager << integerDefAndFieldNames.first << integerDefAndFieldNames.second << (int)(Qt::DescendingOrder) << true << (int)(QContactSortOrder::BlanksLast) << "bacgfed" << "gfed"; // gfed have no integer
+            newMRow("integer ascending, blanks first", manager) << manager << integerDefAndFieldNames.first << integerDefAndFieldNames.second << (int)(Qt::AscendingOrder) << true << (int)(QContactSortOrder::BlanksFirst) << "defgcab" << "gfed"; // gfed have no integer
+            newMRow("integer descending, blanks first", manager) << manager << integerDefAndFieldNames.first << integerDefAndFieldNames.second << (int)(Qt::DescendingOrder) << true << (int)(QContactSortOrder::BlanksFirst) << "defgbac" << "gfed"; // gfed have no integer
         }
         if (!stringDefAndFieldNames.first.isEmpty() && !stringDefAndFieldNames.second.isEmpty()) {
-            QTest::newRow("string ascending (null value), blanks first") << manager << stringDefAndFieldNames.first << stringDefAndFieldNames.second << (int)(Qt::AscendingOrder) << true << (int)(QContactSortOrder::BlanksFirst) << "fgeabcd";
-            QTest::newRow("string ascending (null value), blanks last") << manager << stringDefAndFieldNames.first << stringDefAndFieldNames.second << (int)(Qt::AscendingOrder) << true << (int)(QContactSortOrder::BlanksLast) << "eabcdgf";
+            QTest::newRow("string ascending (null value), blanks first") << manager << stringDefAndFieldNames.first << stringDefAndFieldNames.second << (int)(Qt::AscendingOrder) << true << (int)(QContactSortOrder::BlanksFirst) << "feabcdg" << "fe"; // f and e have blank string
+            QTest::newRow("string ascending (null value), blanks last") << manager << stringDefAndFieldNames.first << stringDefAndFieldNames.second << (int)(Qt::AscendingOrder) << true << (int)(QContactSortOrder::BlanksLast) << "abcdgef" << "ef";   // f and e have blank string
         }
     }
 }
@@ -2049,6 +2066,7 @@
     QFETCH(bool, setbp);
     QFETCH(int, blankpolicyi);
     QFETCH(QString, expected);
+    QFETCH(QString, unstable);
 
     Qt::SortOrder direction = (Qt::SortOrder)directioni;
     QContactSortOrder::BlankPolicy blankpolicy = (QContactSortOrder::BlankPolicy)blankpolicyi;
@@ -2067,17 +2085,38 @@
     QString output = convertIds(contacts, ids);
 
     // It's possible to get some contacts back in an arbitrary order (since we single sort)
-    // so we need to handle the case where e, f & g come back in any order [with first name]
-
-    // so we just make sure that e,f,g appear once in the output, and remove f,g from both strings
-    if (defname == QContactName::DefinitionName && fieldname == QContactName::FieldFirstName) {
-        QVERIFY(output.count('e') == 1);
-        QVERIFY(output.count('f') == 1);
-        QVERIFY(output.count('g') == 1);
-        output.remove('f');
-        output.remove('g');
-        expected.remove('f');
-        expected.remove('g');
+    if (unstable.length() > 1) {
+        // ensure that the maximum distance between unstable elements in the output is the size of the unstable string.
+        int firstIndex = -1;
+        int lastIndex = -1;
+
+        for (int i = 0; i < output.size(); i++) {
+            if (unstable.contains(output.at(i))) {
+                firstIndex = i;
+                break;
+            }
+        }
+
+        for (int i = output.size() - 1; i >= 0; i--) {
+            if (unstable.contains(output.at(i))) {
+                lastIndex = i;
+                break;
+            }
+        }
+
+        if (firstIndex == -1 || lastIndex == -1) {
+            bool containsAllUnstableElements = false;
+            QVERIFY(containsAllUnstableElements);
+        }
+
+        bool unstableElementsAreGrouped = ((lastIndex - firstIndex) == (unstable.length() - 1));
+        QVERIFY(unstableElementsAreGrouped);
+
+        // now remove all unstable elements from the output except one.
+        for (int i = 1; i < unstable.length(); i++) {
+            output.remove(unstable.at(i));
+            expected.remove(unstable.at(i));
+        }
     }
 
     QCOMPARE(output, expected);
@@ -2090,12 +2129,39 @@
 
     output = convertIds(contacts, ids);
 
-    if (defname == QContactName::DefinitionName && fieldname == QContactName::FieldFirstName) {
-        QVERIFY(output.count('e') == 1);
-        QVERIFY(output.count('f') == 1);
-        QVERIFY(output.count('g') == 1);
-        output.remove('f');
-        output.remove('g');
+    // It's possible to get some contacts back in an arbitrary order (since we single sort)
+    if (unstable.length() > 1) {
+        // ensure that the maximum distance between unstable elements in the output is the size of the unstable string.
+        int firstIndex = -1;
+        int lastIndex = -1;
+
+        for (int i = 0; i < output.size(); i++) {
+            if (unstable.contains(output.at(i))) {
+                firstIndex = i;
+                break;
+            }
+        }
+
+        for (int i = output.size() - 1; i >= 0; i--) {
+            if (unstable.contains(output.at(i))) {
+                lastIndex = i;
+                break;
+            }
+        }
+
+        if (firstIndex == -1 || lastIndex == -1) {
+            bool containsAllUnstableElements = false;
+            QVERIFY(containsAllUnstableElements);
+        }
+
+        bool unstableElementsAreGrouped = ((lastIndex - firstIndex) == (unstable.length() - 1));
+        QVERIFY(unstableElementsAreGrouped);
+
+        // now remove all unstable elements from the output except one.
+        for (int i = 1; i < unstable.length(); i++) {
+            output.remove(unstable.at(i));
+            expected.remove(unstable.at(i));
+        }
     }
 
     QCOMPARE(output, expected);
@@ -2163,21 +2229,22 @@
                            << true << namedef << lastname << (int)(Qt::AscendingOrder)
                            << "bacdefg" << false;
 
-        QTest::newRow("7") << manager
-                           << false << namedef << firstname << (int)(Qt::AscendingOrder)
-                           << false << namedef << lastname << (int)(Qt::AscendingOrder)
-                           << "abcdefg" << false; // XXX Isn't this totally unstable?
+        // This test is completely unstable; no sort criteria means dependent upon internal sort order of manager.
+        //QTest::newRow("7") << manager
+        //                   << false << namedef << firstname << (int)(Qt::AscendingOrder)
+        //                   << false << namedef << lastname << (int)(Qt::AscendingOrder)
+        //                   << "abcdefg" << false; // XXX Isn't this totally unstable?
 
         if (!stringDefAndFieldNames.first.isEmpty() && !stringDefAndFieldNames.second.isEmpty()) {
             QTest::newRow("8") << manager
                                << true << stringDefAndFieldNames.first << stringDefAndFieldNames.second << (int)(Qt::AscendingOrder)
                                << false << stringDefAndFieldNames.first << stringDefAndFieldNames.second << (int)(Qt::DescendingOrder)
-                               << "eabcdgf" << false;
+                               << "abcdgef" << false; // default policy = blanks last, and ef have no value (e is empty, f is null)
 
             QTest::newRow("8b") << manager
                                << true << stringDefAndFieldNames.first << stringDefAndFieldNames.second << (int)(Qt::AscendingOrder)
                                << false << es << es << (int)(Qt::DescendingOrder)
-                               << "eabcdgf" << false;
+                               << "abcdgef" << false; // default policy = blanks last, and ef have no value (e is empty, f is null)
         }
 
         QTest::newRow("9") << manager
@@ -2243,166 +2310,6 @@
     QCOMPARE(output, expected);
 }
 
-void tst_QContactManagerFiltering::actionPlugins()
-{
-    QStringList actions = QContactAction::availableActions();
-    QVERIFY(actions.contains("Boolean"));
-    QVERIFY(actions.contains("Number"));
-
-    /* Ignore the version if the vendor is not set */
-    actions = QContactAction::availableActions(QString(), 555);
-    QVERIFY(actions.contains("Boolean"));
-    QVERIFY(actions.contains("Number"));
-
-    actions = QContactAction::availableActions("NumberCo");
-    QVERIFY(actions.contains("Number"));
-    QVERIFY(!actions.contains("Boolean"));
-
-    actions = QContactAction::availableActions("IntegerCo");
-    QVERIFY(actions.contains("Number"));
-    QVERIFY(!actions.contains("Boolean"));
-
-    actions = QContactAction::availableActions("BooleanCo");
-    QVERIFY(!actions.contains("Number"));
-    QVERIFY(actions.contains("Boolean"));
-
-    actions = QContactAction::availableActions("IntegerCo", 5);
-    QVERIFY(actions.contains("Number"));
-    QVERIFY(!actions.contains("Boolean"));
-
-    actions = QContactAction::availableActions("IntegerCo", 3);
-    QVERIFY(!actions.contains("Number"));
-    QVERIFY(!actions.contains("Boolean"));
-
-    actions = QContactAction::availableActions("BooleanCo", 3);
-    QVERIFY(!actions.contains("Number"));
-    QVERIFY(actions.contains("Boolean"));
-
-    actions = QContactAction::availableActions("BooleanCo", 555);
-    QVERIFY(!actions.contains("Number"));
-    QVERIFY(!actions.contains("Boolean"));
-}
-
-void tst_QContactManagerFiltering::actionFiltering_data()
-{
-    QTest::addColumn<QContactManager *>("cm");
-    QTest::addColumn<QString>("actionName");
-    QTest::addColumn<QString>("vendorName");
-    QTest::addColumn<int>("version");
-    QTest::addColumn<QVariant>("value");
-    QTest::addColumn<QString>("expected");
-
-    QString es;
-    QVariant ev;
-
-
-    for (int i = 0; i < managers.size(); i++) {
-        QContactManager *manager = managers.at(i);
-        QPair<QString, QString> booleanDefAndFieldNames = defAndFieldNamesForTypePerManager.value(manager).value("Bool");
-        QPair<QString, QString> integerDefAndFieldNames = defAndFieldNamesForTypePerManager.value(manager).value("Integer");
-        QPair<QString, QString> dateDefAndFieldNames = defAndFieldNamesForTypePerManager.value(manager).value("Date");
-
-        newMRow("bad actionname", manager) << manager << "No such action" << es << -1 << ev << es;
-        newMRow("bad vendor", manager) << manager << es << "Vendor missing" << -1 << ev << es;
-
-        QString expected;
-        if ( (!integerDefAndFieldNames.first.isEmpty() && !integerDefAndFieldNames.second.isEmpty())
-             ||
-             (!booleanDefAndFieldNames.first.isEmpty() && !booleanDefAndFieldNames.second.isEmpty()) ){
-                 expected = "abcd";
-        } else if (!dateDefAndFieldNames.first.isEmpty() && !dateDefAndFieldNames.second.isEmpty()) {
-            expected = "abd";
-        } else {
-            /* contact a,b have phone number, so at least phone number action can match them */
-            expected = "ab";
-        }
-
-        QTest::newRow("empty (any action matches)") << manager << es << es << -1 << ev << expected;
-        /* versions are ignored if vendors are not specified */
-        newMRow("ignored version", manager) << manager << es << es << 793434 << ev << expected;
-
-        if (!integerDefAndFieldNames.first.isEmpty() && !integerDefAndFieldNames.second.isEmpty()) {
-            newMRow("Number", manager) << manager << "Number" << es << -1 << ev << "abcd";
-            QTest::newRow("Number (IntegerCo)") << manager << "Number" << "IntegerCo" << -1 << ev << "abc";
-            QTest::newRow("Number (NumberCo)") << manager << "Number" << "NumberCo" << -1 << ev << "abcd";
-            QTest::newRow("Number (BooleanCo)") << manager << "Number" << "BooleanCo" << -1 << ev << es;
-
-            QTest::newRow("Number (IntegerCo, good version)") << manager << "Number" << "IntegerCo" << 5 << ev << "abc";
-            QTest::newRow("Number (NumberCo, good version)") << manager << "Number" << "NumberCo" << 42 << ev << "abcd";
-
-            QTest::newRow("Number (IntegerCo, bad version)") << manager << "Number" << "IntegerCo" << 345345 << ev << es;
-            QTest::newRow("Number (NumberCo, bad version)") << manager << "Number" << "NumberCo" << 7547544 << ev << es;
-
-            /* versions are ignored if vendors are not specified */
-            QTest::newRow("Number (ignored version)") << manager << "Number" << es << 345345 << ev << "abcd";
-
-            /* Vendor specific */
-            newMRow("NumberCo", manager) << manager << es << "NumberCo" << -1 << ev << "abcd";
-            QTest::newRow("NumberCo (good version)") << manager << es << "NumberCo" << 42 << ev << "abcd";
-            QTest::newRow("NumberCo (bad version)") << manager << es << "NumberCo" << 41 << ev << es;
-
-            newMRow("IntegerCo", manager) << manager << es << "IntegerCo" << -1 << ev << "abc";
-            QTest::newRow("IntegerCo (good version)") << manager << es << "IntegerCo" << 5 << ev << "abc";
-            QTest::newRow("IntegerCo (bad version)") << manager << es << "IntegerCo" << 41 << ev << es;
-        }
-
-        if (!booleanDefAndFieldNames.first.isEmpty() && !booleanDefAndFieldNames.second.isEmpty()) {
-            /* Boolean testing */
-            newMRow("Boolean action", manager) << manager << "Boolean" << es << -1 << ev << "a";
-            newMRow("BooleanCo", manager) << manager << es << "BooleanCo" << -1 << ev << "a";
-            QTest::newRow("BooleanCo (good version)") << manager << es << "BooleanCo" << 3 << ev << "a";
-            QTest::newRow("BooleanCo (bad version)") << manager << es << "BooleanCo" << 3234243 << ev << es;
-        }
-
-        if (!integerDefAndFieldNames.first.isEmpty() && !integerDefAndFieldNames.second.isEmpty()) {
-            /* Value filtering */
-            QTest::newRow("Any action matching 20") << manager << es << es << -1 << QVariant(20) << "b";
-            QTest::newRow("Any action matching 4.0") << manager << es << es << -1 << QVariant(4.0) << "bc";
-            QTest::newRow("NumberCo with 20") << manager << es << "NumberCo" << -1 << QVariant(20) << "b";
-            QTest::newRow("NumberCo with 4.0") << manager << es << "NumberCo" << -1 << QVariant(4.0) << "bc";
-            QTest::newRow("IntegerCo with 20") << manager << es << "IntegerCo" << -1 << QVariant(20) << "b";
-            QTest::newRow("IntegerCo with 4.0") << manager << es << "IntegerCo" << -1 << QVariant(4.0) << es;
-        }
-
-        if (!booleanDefAndFieldNames.first.isEmpty() && !booleanDefAndFieldNames.second.isEmpty()) {
-            newMRow("Boolean action matching true", manager) << manager << es << "BooleanCo" << -1 << QVariant(true) << "a";
-            newMRow("Boolean action matching false", manager) << manager << es << "BooleanCo" << -1 << QVariant(false) << es;
-        }
-
-        /* Recursive filtering */
-        QTest::newRow("Recursive action 1") << manager << "IntersectionRecursive" << es << -1 << QVariant(false) << es;
-        QTest::newRow("Recursive action 2") << manager << "UnionRecursive" << es << -1 << QVariant(false) << es;
-        QTest::newRow("Recursive action 3") << manager << "PairRecursive" << es << -1 << QVariant(false) << es;
-        QTest::newRow("Recursive action 4") << manager << "AnotherPairRecursive" << es << -1 << QVariant(false) << es;
-        QTest::newRow("Recursive action 5") << manager << "Recursive" << es << -1 << QVariant(false) << es;
-    }
-}
-
-void tst_QContactManagerFiltering::actionFiltering()
-{
-    QFETCH(QContactManager*, cm);
-    QFETCH(QString, actionName);
-    QFETCH(QString, vendorName);
-    QFETCH(int, version);
-    QFETCH(QVariant, value);
-    QFETCH(QString, expected);
-
-    /* Load the definition and field names for the various variant types for the current manager */
-    defAndFieldNamesForTypeForActions = defAndFieldNamesForTypePerManager.value(cm);
-    if (!defAndFieldNamesForTypeForActions.isEmpty()) {
-        QContactActionFilter af;
-        af.setActionName(actionName);
-        af.setValue(value);
-        af.setVendor(vendorName, version);
-
-        QList<QContactLocalId> ids = cm->contactIds(af);
-        QList<QContactLocalId> contacts = contactsAddedToManagers.values(cm);
-
-        QString output = convertIds(contacts, ids);
-        QCOMPARE_UNSORTED(output, expected);
-    }
-}
-
 void tst_QContactManagerFiltering::idListFiltering_data()
 {
     QTest::addColumn<QContactManager *>("cm");
@@ -2512,7 +2419,7 @@
     QVERIFY(ids.count() == contacts.size());
     QString output = convertIds(contacts, ids);
     QString expected = convertIds(contacts, contacts); // :)
-    QCOMPARE(output, expected);
+    QCOMPARE_UNSORTED(output, expected);
 
     // Try unions/intersections of defaults
     ids = cm->contactIds(f | f);
@@ -2854,7 +2761,7 @@
     nick.setNickname("Sir Aaron");
     QContactEmailAddress emailAddr;
     emailAddr.setEmailAddress("Aaron@Aaronson.com");
-    number.setNumber("555-1212");
+    number.setNumber("5551212");
     string.setValue(definitionDetails.value("String").second, "Aaron Aaronson");
     integer.setValue(definitionDetails.value("Integer").second, 10);
     datetime.setValue(definitionDetails.value("DateTime").second, QDateTime(QDate(2009, 06, 29), QTime(16, 52, 23, 0)));
@@ -2886,7 +2793,7 @@
     name.setFirstName("Bob");
     name.setLastName("Aaronsen");
     nick.setNickname("Sir Bob");
-    number.setNumber("555-3456");
+    number.setNumber("5553456");
     string.setValue(definitionDetails.value("String").second, "Bob Aaronsen");
     integer.setValue(definitionDetails.value("Integer").second, 20);
     dubble.setValue(definitionDetails.value("Double").second, 4.0);
@@ -2996,6 +2903,9 @@
     n = QContactName();
     n.setFirstName("John");
     n.setLastName("Smithy");
+    string.setValue(definitionDetails.value("String").second, "zzz");
+    if (!definitionDetails.value("String").first.isEmpty() && !definitionDetails.value("String").second.isEmpty())
+        g.saveDetail(&string);
     g.saveDetail(&n);
     successfulSave = cm->saveContact(&e);
     Q_ASSERT(successfulSave);
@@ -3158,7 +3068,7 @@
 void tst_QContactManagerFiltering::dumpContact(const QContact& contact)
 {
     QContactManager m;
-    qDebug() << "Contact: " << contact.id().localId() << "(" << m.synthesizedDisplayLabel(contact) << ")";
+    qDebug() << "Contact: " << contact.id().localId() << "(" << m.synthesizedContactDisplayLabel(contact) << ")";
     QList<QContactDetail> details = contact.details();
     foreach(QContactDetail d, details) {
         qDebug() << "  " << d.definitionName() << ":";
@@ -3177,402 +3087,6 @@
     }
 }
 
-/* Static actions for testing matching */
-
-class DummyAction : public QContactAction
-{
-public:
-    QVariantMap metaData() const {return QVariantMap();}
-
-    bool invokeAction(const QContact&, const QContactDetail&, const QVariantMap&)
-    {
-        // Well, do something
-        emit stateChanged(QContactAction::FinishedState);
-        return true;
-    }
-
-    QVariantMap results() const
-    {
-        return QVariantMap();
-    }
-
-    State state() const {return QContactAction::FinishedState;}
-
-};
-
-class QIntegerAction : public DummyAction
-{
-    Q_OBJECT
-
-public:
-    QIntegerAction() {}
-    ~QIntegerAction() {}
-
-    QContactActionDescriptor actionDescriptor() const { return QContactActionDescriptor("Number", "IntegerCo", 5); }
-
-    QContactFilter contactFilter(const QVariant& value) const
-    {
-        QContactDetailFilter df;
-        QPair<QString, QString> defAndFieldName = defAndFieldNamesForTypeForActions.value("Integer");
-        df.setDetailDefinitionName(defAndFieldName.first, defAndFieldName.second);
-        df.setValue(value);
-        return df;
-    }
-    bool isDetailSupported(const QContactDetail &detail, const QContact &) const
-    {
-        return detail.definitionName() == defAndFieldNamesForTypeForActions.value("Integer").first
-                && !detail.variantValue(defAndFieldNamesForTypeForActions.value("Integer").second).isNull();
-    }
-    QList<QContactDetail> supportedDetails(const QContact& contact) const
-    {
-        return contact.details(defAndFieldNamesForTypeForActions.value("Integer").first);
-    }
-};
-
-/* Static actions for testing matching */
-class QPhoneNumberAction : public DummyAction
-{
-    Q_OBJECT
-
-public:
-    QPhoneNumberAction() {}
-    ~QPhoneNumberAction() {}
-
-    QContactActionDescriptor actionDescriptor() const { return QContactActionDescriptor("PhoneNumber", "PhoneNumberCo", 4); }
-
-    QContactFilter contactFilter(const QVariant& value) const
-    {
-        QContactDetailFilter df;
-        df.setDetailDefinitionName(QContactPhoneNumber::DefinitionName, QContactPhoneNumber::FieldNumber);
-        df.setValue(value);
-        return df;
-    }
-    bool isDetailSupported(const QContactDetail& detail, const QContact&) const
-    {
-        return detail.definitionName() == QContactPhoneNumber::DefinitionName
-                && !detail.variantValue(QContactPhoneNumber::FieldNumber).isNull();
-    }
-    QList<QContactDetail> supportedDetails(const QContact& contact) const
-    {
-        return contact.details(QContactPhoneNumber::DefinitionName);
-    }
-};
-
-/* Static actions for testing matching */
-class QDateAction : public DummyAction
-{
-    Q_OBJECT
-
-public:
-    QDateAction() {}
-    ~QDateAction() {}
-
-    QContactActionDescriptor actionDescriptor() const { return QContactActionDescriptor("Date", "DateCo", 9); }
-
-    QContactFilter contactFilter(const QVariant& value) const
-    {
-        QContactDetailFilter df;
-        QPair<QString, QString> defAndFieldName = defAndFieldNamesForTypeForActions.value("Date");
-        df.setDetailDefinitionName(defAndFieldName.first, defAndFieldName.second);
-        df.setValue(value);
-        return df;
-    }
-
-    bool isDetailSupported(const QContactDetail &detail, const QContact &) const
-    {
-        return detail.definitionName() == defAndFieldNamesForTypeForActions.value("Date").first
-                && !detail.variantValue(defAndFieldNamesForTypeForActions.value("Date").second).isNull();
-    }
-    QList<QContactDetail> supportedDetails(const QContact& contact) const
-    {
-        return contact.details(defAndFieldNamesForTypeForActions.value("Date").first);
-    }
-};
-
-class QNumberAction : public DummyAction
-{
-    Q_OBJECT
-
-public:
-    QNumberAction() {}
-    ~QNumberAction() {}
-
-    QContactActionDescriptor actionDescriptor() const { return QContactActionDescriptor("Number", "NumberCo", 42); }
-
-    QContactFilter contactFilter(const QVariant& value) const
-    {
-        QContactDetailFilter df;
-        QPair<QString, QString> defAndFieldName = defAndFieldNamesForTypeForActions.value("Double");
-        df.setDetailDefinitionName(defAndFieldName.first, defAndFieldName.second);
-        df.setValue(value);
-
-        QContactDetailFilter df2;
-        defAndFieldName = defAndFieldNamesForTypeForActions.value("Integer");
-        df2.setDetailDefinitionName(defAndFieldName.first, defAndFieldName.second);
-        df2.setValue(value);
-
-        /* We like either doubles or integers */
-        return df | df2;
-    }
-
-    bool isDetailSupported(const QContactDetail &detail, const QContact &) const
-    {
-        if (detail.definitionName() == defAndFieldNamesForTypeForActions.value("Double").first
-                && !detail.variantValue(defAndFieldNamesForTypeForActions.value("Double").second).isNull()) {
-            return true;
-        }
-
-        if (detail.definitionName() == defAndFieldNamesForTypeForActions.value("Integer").first
-                && !detail.variantValue(defAndFieldNamesForTypeForActions.value("Integer").second).isNull()) {
-            return true;
-        }
-
-        return false;
-    }
-    QList<QContactDetail> supportedDetails(const QContact& contact) const
-    {
-        QList<QContactDetail> retn = contact.details(defAndFieldNamesForTypeForActions.value("Integer").first);
-        retn.append(contact.details(defAndFieldNamesForTypeForActions.value("Double").first));
-        return retn;
-    }
-};
-
-class QBooleanAction : public DummyAction
-{
-    Q_OBJECT
-
-public:
-    QBooleanAction() {}
-    ~QBooleanAction() {}
-
-    QContactActionDescriptor actionDescriptor() const { return QContactActionDescriptor("Boolean", "BooleanCo", 3); }
-
-    QContactFilter contactFilter(const QVariant& value) const
-    {
-        if (value.isNull() || (value.type() == QVariant::Bool && value.toBool() == true)) {
-            /* This only likes bools that are true */
-            QContactDetailFilter df;
-            QPair<QString, QString> defAndFieldName = defAndFieldNamesForTypeForActions.value("Bool");
-            df.setDetailDefinitionName(defAndFieldName.first, defAndFieldName.second);
-            df.setValue(true);
-            return df;
-        } else {
-            return QContactInvalidFilter();
-        }
-    }
-    bool isDetailSupported(const QContactDetail &detail, const QContact &) const
-    {
-        return detail.definitionName() == defAndFieldNamesForTypeForActions.value("Bool").first
-                && (detail.value<bool>(defAndFieldNamesForTypeForActions.value("Bool").second) == true);
-    }
-    QList<QContactDetail> supportedDetails(const QContact& contact) const
-    {
-        return contact.details(defAndFieldNamesForTypeForActions.value("Bool").first);
-    }
-};
-
-class RecursiveAction : public DummyAction
-{
-    Q_OBJECT
-
-public:
-    RecursiveAction() {}
-    ~RecursiveAction() {}
-
-    QContactActionDescriptor actionDescriptor() const { return QContactActionDescriptor("Recursive", "RecursiveCo", 3); }
-
-    QContactFilter contactFilter(const QVariant& value) const
-    {
-        /* Return a filter that selects us again.. */
-        QContactActionFilter af;
-        af.setActionName("Recursive");
-        af.setVendor("RecursiveCo", 3);
-        af.setValue(value);
-        return af;
-    }
-    bool isDetailSupported(const QContactDetail&, const QContact&) const
-    {
-        return false;
-    }
-    QList<QContactDetail> supportedDetails(const QContact&) const
-    {
-        return QList<QContactDetail>();
-    }
-};
-
-class AnotherRecursiveAction : public RecursiveAction {
-    Q_OBJECT
-
-public:
-    int implementationVersion() const {return 4;}
-    QContactFilter contactFilter(const QVariant& value) const
-    {
-        Q_UNUSED(value);
-        /* Slightly looser filter */
-        QContactActionFilter af;
-        af.setActionName("Recursive");
-        return af;
-    }
-};
-
-/* A pair that reference each other */
-class PairRecursiveAction : public RecursiveAction {
-    Q_OBJECT
-
-public:
-    QContactActionDescriptor actionDescriptor() const
-    {
-        QContactActionDescriptor ret = RecursiveAction::actionDescriptor();
-        ret.setActionName("PairRecursive");
-        return ret;
-    }
-
-    QContactFilter contactFilter(const QVariant& value) const
-    {
-        Q_UNUSED(value);
-        /* Slightly looser filter */
-        QContactActionFilter af;
-        af.setActionName("AnotherPairRecursive");
-        return af;
-    }
-};
-
-class AnotherPairRecursiveAction : public RecursiveAction {
-    Q_OBJECT
-
-public:
-    QContactActionDescriptor actionDescriptor() const
-    {
-        QContactActionDescriptor ret = RecursiveAction::actionDescriptor();
-        ret.setActionName("AnotherPairRecursive");
-        return ret;
-    }
-
-    QContactFilter contactFilter(const QVariant& value) const
-    {
-        Q_UNUSED(value);
-        /* Slightly looser filter */
-        QContactActionFilter af;
-        af.setActionName("PairRecursive");
-        return af;
-    }
-};
-
-class IntersectionRecursiveAction : public RecursiveAction {
-    Q_OBJECT
-
-public:
-    QContactActionDescriptor actionDescriptor() const
-    {
-        QContactActionDescriptor ret = RecursiveAction::actionDescriptor();
-        ret.setActionName("IntersectionRecursive");
-        return ret;
-    }
-
-    QContactFilter contactFilter(const QVariant& value) const
-    {
-        Q_UNUSED(value);
-        /* Slightly looser filter */
-        QContactActionFilter af;
-        af.setActionName("PairRecursive");
-        return af & QContactFilter() & af;
-    }
-};
-
-class UnionRecursiveAction : public RecursiveAction {
-    Q_OBJECT
-
-public:
-    QContactActionDescriptor actionDescriptor() const
-    {
-        QContactActionDescriptor ret = RecursiveAction::actionDescriptor();
-        ret.setActionName("UnionRecursive");
-        return ret;
-    }
-
-    QContactFilter contactFilter(const QVariant& value) const
-    {
-        Q_UNUSED(value);
-        /* Slightly looser filter */
-        QContactActionFilter af;
-        af.setActionName("PairRecursive");
-        return af | QContactInvalidFilter() | af;
-    }
-};
-
-class FilterActionFactory : public QContactActionFactory
-{
-    Q_OBJECT
-    Q_INTERFACES(QtMobility::QContactActionFactory)
-
-public:
-    FilterActionFactory() {}
-    ~FilterActionFactory() {}
-
-    QString name() const
-    {
-        return QString("FilterActionFactory");
-    }
-
-    QList<QContactActionDescriptor> actionDescriptors() const
-    {
-        QList<QContactActionDescriptor> ret;
-
-        ret << QContactActionDescriptor("Number", "NumberCo", 42)
-                << QContactActionDescriptor("Number", "IntegerCo", 5)
-                << QContactActionDescriptor("Boolean", "BooleanCo", 3)
-                << QContactActionDescriptor("Date", "DateCo", 9)
-                << QContactActionDescriptor("PhoneNumber", "PhoneNumberCo", 4)
-                << QContactActionDescriptor("Recursive", "RecursiveCo", 3)
-                << QContactActionDescriptor("Recursive", "RecursiveCo", 4)
-                << QContactActionDescriptor("PairRecursive", "RecursiveCo", 3)
-                << QContactActionDescriptor("AnotherPairRecursive", "RecursiveCo", 3)
-                << QContactActionDescriptor("IntersectionRecursive", "RecursiveCo", 3)
-                << QContactActionDescriptor("UnionRecursive", "RecursiveCo", 3);
-
-        return ret;
-    }
-
-    QContactAction* instance(const QContactActionDescriptor& descriptor) const
-    {
-        if (descriptor.actionName() == "Number") {
-            if (descriptor.vendorName() == "IntegerCo")
-                return new QIntegerAction;
-            else
-                return new QNumberAction;
-        } else if (descriptor.actionName() == "Boolean") {
-            return new QBooleanAction;
-        } else if (descriptor.actionName() == "Date") {
-            return new QDateAction;
-        } else if (descriptor.actionName() == "PhoneNumber") {
-            return new QPhoneNumberAction;
-        } else if (descriptor.actionName() == "Recursive") {
-            if (descriptor.implementationVersion() == 3)
-                return new RecursiveAction;
-            else
-                return new AnotherRecursiveAction;
-        } else if (descriptor.actionName() == "PairRecursive") {
-            return new PairRecursiveAction;
-        } else if (descriptor.actionName() == "AnotherPairRecursive") {
-            return new AnotherPairRecursiveAction;
-        } else if (descriptor.actionName() == "IntersectionRecursive") {
-            return new IntersectionRecursiveAction;
-        } else {
-            return new UnionRecursiveAction;
-        }
-    }
-
-    QVariantMap actionMetadata(const QContactActionDescriptor& descriptor) const
-    {
-        Q_UNUSED(descriptor);
-        return QVariantMap();
-    }
-};
-
-/* Statically import it (and a duplicate copy of it, purely for testing purposes) */
-Q_EXPORT_PLUGIN2(contacts_testFilterActionFactory, FilterActionFactory)
-Q_IMPORT_PLUGIN(contacts_testFilterActionFactory)
-
 QTEST_MAIN(tst_QContactManagerFiltering)
 #include "tst_qcontactmanagerfiltering.moc"
 #include "qcontactmanager.h"

--- a/qtmobility/tests/auto/qcontactmanagerplugins/dummyplugin/dummyplugin.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qcontactmanagerplugins/dummyplugin/dummyplugin.cpp	Fri May 14 16:41:33 2010 +0300
@@ -222,7 +222,7 @@
 
 };
 
-class Q_DECL_EXPORT DummyEngineFactory : public QObject, public QContactManagerEngineFactory
+class DummyEngineFactory : public QObject, public QContactManagerEngineFactory
 {
     Q_OBJECT
     Q_INTERFACES(QtMobility::QContactManagerEngineFactory)

--- a/qtmobility/tests/auto/qcontactmanagerplugins/unittest/tst_qcontactmanagerplugins.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qcontactmanagerplugins/unittest/tst_qcontactmanagerplugins.cpp	Fri May 14 16:41:33 2010 +0300
@@ -48,7 +48,6 @@
 #include "qtcontacts.h"
 
 #include <QApplication>
-#include "qcontactmanagerdataholder.h"
 QTM_USE_NAMESPACE
 
 class tst_QContactManagerPlugins : public QObject
@@ -59,9 +58,6 @@
     tst_QContactManagerPlugins();
     virtual ~tst_QContactManagerPlugins();
 
-private:
-    QContactManagerDataHolder managerDataHolder;
-
 public slots:
     void init();
     void cleanup();

--- a/qtmobility/tests/auto/qcontactmemusage/tst_qcontactmemusage.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qcontactmemusage/tst_qcontactmemusage.cpp	Fri May 14 16:41:33 2010 +0300
@@ -43,7 +43,6 @@
 #include <QtTest/QtTest>
 
 #include "qtcontacts.h"
-#include "qcontactmanagerdataholder.h" //QContactManagerDataHolder
 
 //TESTED_CLASS=
 //TESTED_FILES=
@@ -146,9 +145,6 @@
     tst_QContactMemUsage();
     virtual ~tst_QContactMemUsage();
 
-private:
-    QContactManagerDataHolder managerDataHolder;
-
 public slots:
     void init();
     void cleanup();

--- a/qtmobility/tests/auto/qcontactrelationship/tst_qcontactrelationship.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qcontactrelationship/tst_qcontactrelationship.cpp	Fri May 14 16:41:33 2010 +0300
@@ -42,7 +42,6 @@
 #include <QtTest/QtTest>
 
 #include "qtcontacts.h"
-#include "qcontactmanagerdataholder.h" //QContactManagerDataHolder
 
 //TESTED_CLASS=
 //TESTED_FILES=
@@ -56,8 +55,6 @@
 public:
     tst_QContactRelationship();
     virtual ~tst_QContactRelationship();
-private:
-    QContactManagerDataHolder managerDataHolder;
 
 private slots:
     void operations();

--- a/qtmobility/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp	Fri May 14 16:41:33 2010 +0300
@@ -55,7 +55,7 @@
 #include <QtGui/qgraphicsscene.h>
 #include <QtGui/qgraphicsview.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class tst_QGraphicsVideoItem : public QObject
 {
     Q_OBJECT

--- a/qtmobility/tests/auto/qlatin1constant/tst_qlatin1constant.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qlatin1constant/tst_qlatin1constant.cpp	Fri May 14 16:41:33 2010 +0300
@@ -168,6 +168,9 @@
     QVERIFY(z == z2);
     QVERIFY(z2 == z);
 
+    QVERIFY(z != z3);
+    QVERIFY(z3 != z);
+
     // Now make sure that the length is taken into account
     QVERIFY(b != bb2);
     QVERIFY(bb2 != b);

--- a/qtmobility/tests/auto/qmediacontent/tst_qmediacontent.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qmediacontent/tst_qmediacontent.cpp	Fri May 14 16:41:33 2010 +0300
@@ -44,7 +44,7 @@
 
 #include <qmediacontent.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class tst_QMediaContent : public QObject
 {
     Q_OBJECT

--- a/qtmobility/tests/auto/qmediaimageviewer/tst_qmediaimageviewer.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qmediaimageviewer/tst_qmediaimageviewer.cpp	Fri May 14 16:41:33 2010 +0300
@@ -63,7 +63,7 @@
 # define TESTDATA_DIR "./tst_qmediaimageviewer_images"
 #endif
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class QtTestNetworkAccessManager;
 
 class tst_QMediaImageViewer : public QObject

--- a/qtmobility/tests/auto/qmediaobject/tst_qmediaobject.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qmediaobject/tst_qmediaobject.cpp	Fri May 14 16:41:33 2010 +0300
@@ -47,7 +47,7 @@
 #include <qmediaservice.h>
 #include <qmetadatacontrol.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class tst_QMediaObject : public QObject
 {
     Q_OBJECT
@@ -93,13 +93,13 @@
         if (m_available != available)
             emit metaDataAvailableChanged(m_available = available);
     }
-    QList<QtMedia::MetaData> availableMetaData() const { return m_data.keys(); }
+    QList<QtMediaServices::MetaData> availableMetaData() const { return m_data.keys(); }
 
     bool isWritable() const { return m_writable; }
     void setWritable(bool writable) { emit writableChanged(m_writable = writable); }
 
-    QVariant metaData(QtMedia::MetaData key) const { return m_data.value(key); }
-    void setMetaData(QtMedia::MetaData key, const QVariant &value) {
+    QVariant metaData(QtMediaServices::MetaData key) const { return m_data.value(key); }
+    void setMetaData(QtMediaServices::MetaData key, const QVariant &value) {
         m_data.insert(key, value); }
 
     QVariant extendedMetaData(const QString &key) const { return m_extendedData.value(key); }
@@ -117,7 +117,7 @@
 
     bool m_available;
     bool m_writable;
-    QMap<QtMedia::MetaData, QVariant> m_data;
+    QMap<QtMediaServices::MetaData, QVariant> m_data;
     QMap<QString, QVariant> m_extendedData;
 };
 
@@ -376,12 +376,12 @@
     QCOMPARE(object.isMetaDataAvailable(), false);
     QCOMPARE(object.isMetaDataWritable(), false);
 
-    object.setMetaData(QtMedia::Title, title);
+    object.setMetaData(QtMediaServices::Title, title);
     object.setExtendedMetaData(titleKey, title);
 
-    QCOMPARE(object.metaData(QtMedia::Title).toString(), QString());
+    QCOMPARE(object.metaData(QtMediaServices::Title).toString(), QString());
     QCOMPARE(object.extendedMetaData(titleKey).toString(), QString());
-    QCOMPARE(object.availableMetaData(), QList<QtMedia::MetaData>());
+    QCOMPARE(object.availableMetaData(), QList<QtMediaServices::MetaData>());
     QCOMPARE(object.availableExtendedMetaData(), QStringList());
     QCOMPARE(spy.count(), 0);
 }
@@ -470,18 +470,18 @@
     QtTestMediaObject object(&service);
     QVERIFY(object.availableMetaData().isEmpty());
 
-    service.metaData.m_data.insert(QtMedia::AlbumArtist, artist);
-    service.metaData.m_data.insert(QtMedia::Title, title);
-    service.metaData.m_data.insert(QtMedia::Genre, genre);
+    service.metaData.m_data.insert(QtMediaServices::AlbumArtist, artist);
+    service.metaData.m_data.insert(QtMediaServices::Title, title);
+    service.metaData.m_data.insert(QtMediaServices::Genre, genre);
 
-    QCOMPARE(object.metaData(QtMedia::AlbumArtist).toString(), artist);
-    QCOMPARE(object.metaData(QtMedia::Title).toString(), title);
+    QCOMPARE(object.metaData(QtMediaServices::AlbumArtist).toString(), artist);
+    QCOMPARE(object.metaData(QtMediaServices::Title).toString(), title);
 
-    QList<QtMedia::MetaData> metaDataKeys = object.availableMetaData();
+    QList<QtMediaServices::MetaData> metaDataKeys = object.availableMetaData();
     QCOMPARE(metaDataKeys.size(), 3);
-    QVERIFY(metaDataKeys.contains(QtMedia::AlbumArtist));
-    QVERIFY(metaDataKeys.contains(QtMedia::Title));
-    QVERIFY(metaDataKeys.contains(QtMedia::Genre));
+    QVERIFY(metaDataKeys.contains(QtMediaServices::AlbumArtist));
+    QVERIFY(metaDataKeys.contains(QtMediaServices::Title));
+    QVERIFY(metaDataKeys.contains(QtMediaServices::Genre));
 }
 
 void tst_QMediaObject::setMetaData_data()
@@ -501,9 +501,9 @@
 
     QtTestMediaObject object(&service);
 
-    object.setMetaData(QtMedia::Title, title);
-    QCOMPARE(object.metaData(QtMedia::Title).toString(), title);
-    QCOMPARE(service.metaData.m_data.value(QtMedia::Title).toString(), title);
+    object.setMetaData(QtMediaServices::Title, title);
+    QCOMPARE(object.metaData(QtMediaServices::Title).toString(), title);
+    QCOMPARE(service.metaData.m_data.value(QtMediaServices::Title).toString(), title);
 }
 
 void tst_QMediaObject::extendedMetaData()

--- a/qtmobility/tests/auto/qmediaplayer/tst_qmediaplayer.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qmediaplayer/tst_qmediaplayer.cpp	Fri May 14 16:41:33 2010 +0300
@@ -50,7 +50,7 @@
 #include <qmediastreamscontrol.h>
 
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class AutoConnection
 {
 public:
@@ -155,9 +155,9 @@
     StreamType streamType(int index) { return _streams.at(index).type; }
     void setStreamType(int index, StreamType type) { _streams[index].type = type; }
 
-    QVariant metaData(int index, QtMedia::MetaData key) {
+    QVariant metaData(int index, QtMediaServices::MetaData key) {
         return _streams.at(index).metaData.value(key); }
-    void setMetaData(int index, QtMedia::MetaData key, const QVariant &value) {
+    void setMetaData(int index, QtMediaServices::MetaData key, const QVariant &value) {
         _streams[index].metaData.insert(key, value); }
 
     bool isActive(int index) { return _streams.at(index).active; }
@@ -168,7 +168,7 @@
     {
         Stream() : type(UnknownStream), active(false) {}
         StreamType type;
-        QMap<QtMedia::MetaData, QVariant> metaData;
+        QMap<QtMediaServices::MetaData, QVariant> metaData;
         bool active;
     };
 
@@ -772,10 +772,6 @@
     QCOMPARE(player->mediaStatus(), QMediaPlayer::LoadingMedia);
     QCOMPARE(statusSpy.count(), 1);
 
-#ifdef QTM_NAMESPACE
-    //looks like the correct value is emited, but QSignalSpy doesn't work correctly with QtMobility namespace
-    QEXPECT_FAIL("", "QSignalSpy doesn't grab the correct value from signal because of QtMobility namespace", Continue);
-#endif
     QCOMPARE(qvariant_cast<QMediaPlayer::MediaStatus>(statusSpy.last().value(0)),
              QMediaPlayer::LoadingMedia);
 
@@ -783,10 +779,6 @@
     QCOMPARE(player->mediaStatus(), QMediaPlayer::LoadedMedia);
     QCOMPARE(statusSpy.count(), 2);
 
-#ifdef QTM_NAMESPACE
-    //looks like the correct value is emited, but QSignalSpy doesn't work correctly with QtMobility namespace
-    QEXPECT_FAIL("", "QSignalSpy doesn't grab the correct value from signal because of QtMobility namespace", Continue);
-#endif
     QCOMPARE(qvariant_cast<QMediaPlayer::MediaStatus>(statusSpy.last().value(0)),
              QMediaPlayer::LoadedMedia);
 
@@ -798,10 +790,6 @@
     QCOMPARE(player->mediaStatus(), QMediaPlayer::StalledMedia);
     QCOMPARE(statusSpy.count(), 3);
 
-#ifdef QTM_NAMESPACE
-    //looks like the correct value is emited, but QSignalSpy doesn't work correctly with QtMobility namespace
-    QEXPECT_FAIL("", "QSignalSpy doesn't grab the correct value from signal because of QtMobility namespace", Continue);
-#endif
     QCOMPARE(qvariant_cast<QMediaPlayer::MediaStatus>(statusSpy.last().value(0)),
              QMediaPlayer::StalledMedia);
 
@@ -815,10 +803,6 @@
     QCOMPARE(player->mediaStatus(), QMediaPlayer::BufferingMedia);
     QCOMPARE(statusSpy.count(), 4);
 
-#ifdef QTM_NAMESPACE
-    //looks like the correct value is emited, but QSignalSpy doesn't work correctly with QtMobility namespace
-    QEXPECT_FAIL("", "QSignalSpy doesn't grab the correct value from signal because of QtMobility namespace", Continue);
-#endif
     QCOMPARE(qvariant_cast<QMediaPlayer::MediaStatus>(statusSpy.last().value(0)),
              QMediaPlayer::BufferingMedia);
 
@@ -832,10 +816,6 @@
     QCOMPARE(player->mediaStatus(), QMediaPlayer::BufferedMedia);
     QCOMPARE(statusSpy.count(), 5);
 
-#ifdef QTM_NAMESPACE
-    //looks like the correct value is emited, but QSignalSpy doesn't work correctly with QtMobility namespace
-    QEXPECT_FAIL("", "QSignalSpy doesn't grab the correct value from signal because of QtMobility namespace", Continue);
-#endif
     QCOMPARE(qvariant_cast<QMediaPlayer::MediaStatus>(statusSpy.last().value(0)),
              QMediaPlayer::BufferedMedia);
 
@@ -847,10 +827,6 @@
     QCOMPARE(player->mediaStatus(), QMediaPlayer::EndOfMedia);
     QCOMPARE(statusSpy.count(), 6);
 
-#ifdef QTM_NAMESPACE
-    //looks like the correct value is emited, but QSignalSpy doesn't work correctly with QtMobility namespace
-    QEXPECT_FAIL("", "QSignalSpy doesn't grab the correct value from signal because of QtMobility namespace", Continue);
-#endif
     QCOMPARE(qvariant_cast<QMediaPlayer::MediaStatus>(statusSpy.last().value(0)),
              QMediaPlayer::EndOfMedia);
 }

--- a/qtmobility/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,7 @@
 
 #include "qm3uhandler.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class MockReadOnlyPlaylistProvider : public QMediaPlaylistProvider
 {
     Q_OBJECT

--- a/qtmobility/tests/auto/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp	Fri May 14 16:41:33 2010 +0300
@@ -44,7 +44,7 @@
 #include "qlocalmediaplaylistprovider.h"
 #include "qmediaplaylistnavigator.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class tst_QMediaPlaylistNavigator : public QObject
 {
     Q_OBJECT

--- a/qtmobility/tests/auto/qmediapluginloader/tst_qmediapluginloader.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qmediapluginloader/tst_qmediapluginloader.cpp	Fri May 14 16:41:33 2010 +0300
@@ -45,7 +45,7 @@
 #include <QtTest/QtTest>
 #include <QDebug>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class tst_QMediaPluginLoader : public QObject
 {

--- a/qtmobility/tests/auto/qmediarecorder/tst_qmediarecorder.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qmediarecorder/tst_qmediarecorder.cpp	Fri May 14 16:41:33 2010 +0300
@@ -53,7 +53,7 @@
 
 #include <QtMultimedia/qaudioformat.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class MockMediaContainerControl : public QMediaContainerControl
 {
     Q_OBJECT
@@ -435,8 +435,8 @@
 
 void tst_QMediaRecorder::initTestCase()
 {
-    qRegisterMetaType<QtMobility::QMediaRecorder::State>("QMediaRecorder::State");
-    qRegisterMetaType<QtMobility::QMediaRecorder::Error>("QMediaRecorder::Error");
+    qRegisterMetaType<QMediaRecorder::State>("QMediaRecorder::State");
+    qRegisterMetaType<QMediaRecorder::Error>("QMediaRecorder::Error");
 
     mock = new MockProvider(this);
     service = new MockService(this, mock);
@@ -521,7 +521,7 @@
 
     QAudioEncoderSettings audio;
     audio.setCodec(id);
-    audio.setQuality(QtMedia::LowQuality);
+    audio.setQuality(QtMediaServices::LowQuality);
 
     QVideoEncoderSettings video;
     video.setCodec(id);
@@ -565,10 +565,6 @@
     QCOMPARE(capture->errorString(), errorString);
     QCOMPARE(spy.count(), 1);
 
-#ifdef QTM_NAMESPACE
-    //looks like the correct value is emited, but QSignalSpy doesn't work correctly with QtMobility namespace
-    QEXPECT_FAIL("", "QSignalSpy doesn't grab the correct value from signal because of QtMobility namespace", Continue);
-#endif
     QCOMPARE(spy.last()[0].value<QMediaRecorder::Error>(), QMediaRecorder::FormatError);
 }
 
@@ -589,10 +585,6 @@
     QCOMPARE(capture->errorString(), QString());
     QTestEventLoop::instance().enterLoop(1);
     QCOMPARE(stateSignal.count(), 1);
-#ifdef QTM_NAMESPACE
-    //looks like the correct value is emited, but QSignalSpy doesn't work correctly with QtMobility namespace
-    QEXPECT_FAIL("", "QSignalSpy doesn't grab the correct value from signal because of QtMobility namespace", Continue);
-#endif
     QCOMPARE(stateSignal.last()[0].value<QMediaRecorder::State>(), QMediaRecorder::RecordingState);
     QVERIFY(progressSignal.count() > 0);
     capture->pause();
@@ -672,18 +664,18 @@
     QCOMPARE(audioSettings.codec(), QString("audio/pcm"));
     QCOMPARE(audioSettings.bitRate(), 128*1024);
     QCOMPARE(audioSettings.sampleRate(), -1);
-    QCOMPARE(audioSettings.quality(), QtMedia::NormalQuality);
+    QCOMPARE(audioSettings.quality(), QtMediaServices::NormalQuality);
     QCOMPARE(audioSettings.channelCount(), -1);
 
-    QCOMPARE(audioSettings.encodingMode(), QtMedia::ConstantQualityEncoding);
+    QCOMPARE(audioSettings.encodingMode(), QtMediaServices::ConstantQualityEncoding);
 
     QVideoEncoderSettings videoSettings = capture->videoSettings();
     QCOMPARE(videoSettings.codec(), QString());
     QCOMPARE(videoSettings.bitRate(), -1);
     QCOMPARE(videoSettings.resolution(), QSize());
     QCOMPARE(videoSettings.frameRate(), 0.0);
-    QCOMPARE(videoSettings.quality(), QtMedia::NormalQuality);
-    QCOMPARE(videoSettings.encodingMode(), QtMedia::ConstantQualityEncoding);
+    QCOMPARE(videoSettings.quality(), QtMediaServices::NormalQuality);
+    QCOMPARE(videoSettings.encodingMode(), QtMediaServices::ConstantQualityEncoding);
 
     QString format = capture->containerMimeType();
     QCOMPARE(format, QString());
@@ -691,15 +683,15 @@
     audioSettings.setCodec("audio/mpeg");
     audioSettings.setSampleRate(44100);
     audioSettings.setBitRate(256*1024);
-    audioSettings.setQuality(QtMedia::HighQuality);
-    audioSettings.setEncodingMode(QtMedia::AverageBitRateEncoding);
+    audioSettings.setQuality(QtMediaServices::HighQuality);
+    audioSettings.setEncodingMode(QtMediaServices::AverageBitRateEncoding);
 
     videoSettings.setCodec("video/3gpp");
     videoSettings.setBitRate(800);
     videoSettings.setFrameRate(24*1024);
     videoSettings.setResolution(QSize(800,600));
-    videoSettings.setQuality(QtMedia::HighQuality);
-    audioSettings.setEncodingMode(QtMedia::TwoPassEncoding);
+    videoSettings.setQuality(QtMediaServices::HighQuality);
+    audioSettings.setEncodingMode(QtMediaServices::TwoPassEncoding);
 
     format = QString("mov");
 
@@ -729,9 +721,9 @@
     QVERIFY(!settings.isNull());
 
     settings = QAudioEncoderSettings();
-    QCOMPARE(settings.quality(), QtMedia::NormalQuality);
-    settings.setQuality(QtMedia::HighQuality);
-    QCOMPARE(settings.quality(), QtMedia::HighQuality);
+    QCOMPARE(settings.quality(), QtMediaServices::NormalQuality);
+    settings.setQuality(QtMediaServices::HighQuality);
+    QCOMPARE(settings.quality(), QtMediaServices::HighQuality);
     QVERIFY(!settings.isNull());
 
     settings = QAudioEncoderSettings();
@@ -750,7 +742,7 @@
     QVERIFY(settings.isNull());
     QCOMPARE(settings.codec(), QString());
     QCOMPARE(settings.bitRate(), -1);
-    QCOMPARE(settings.quality(), QtMedia::NormalQuality);
+    QCOMPARE(settings.quality(), QtMediaServices::NormalQuality);
     QCOMPARE(settings.sampleRate(), -1);
 
     {
@@ -762,7 +754,7 @@
         QCOMPARE(settings2, settings1);
         QVERIFY(settings2.isNull());
 
-        settings1.setQuality(QtMedia::HighQuality);
+        settings1.setQuality(QtMediaServices::HighQuality);
 
         QVERIFY(settings2.isNull());
         QVERIFY(!settings1.isNull());
@@ -778,7 +770,7 @@
         QCOMPARE(settings2, settings1);
         QVERIFY(settings2.isNull());
 
-        settings1.setQuality(QtMedia::HighQuality);
+        settings1.setQuality(QtMediaServices::HighQuality);
 
         QVERIFY(settings2.isNull());
         QVERIFY(!settings1.isNull());
@@ -810,19 +802,19 @@
     QVERIFY(settings1 != settings2);
 
     settings1 = QAudioEncoderSettings();
-    settings1.setEncodingMode(QtMedia::ConstantBitRateEncoding);
+    settings1.setEncodingMode(QtMediaServices::ConstantBitRateEncoding);
     settings2 = QAudioEncoderSettings();
-    settings2.setEncodingMode(QtMedia::ConstantBitRateEncoding);
+    settings2.setEncodingMode(QtMediaServices::ConstantBitRateEncoding);
     QVERIFY(settings1 == settings2);
-    settings2.setEncodingMode(QtMedia::TwoPassEncoding);
+    settings2.setEncodingMode(QtMediaServices::TwoPassEncoding);
     QVERIFY(settings1 != settings2);
 
     settings1 = QAudioEncoderSettings();
-    settings1.setQuality(QtMedia::NormalQuality);
+    settings1.setQuality(QtMediaServices::NormalQuality);
     settings2 = QAudioEncoderSettings();
-    settings2.setQuality(QtMedia::NormalQuality);
+    settings2.setQuality(QtMediaServices::NormalQuality);
     QVERIFY(settings1 == settings2);
-    settings2.setQuality(QtMedia::LowQuality);
+    settings2.setQuality(QtMediaServices::LowQuality);
     QVERIFY(settings1 != settings2);
 
     settings1 = QAudioEncoderSettings();
@@ -853,9 +845,9 @@
     QVERIFY(!settings.isNull());
 
     settings = QVideoEncoderSettings();
-    QCOMPARE(settings.quality(), QtMedia::NormalQuality);
-    settings.setQuality(QtMedia::HighQuality);
-    QCOMPARE(settings.quality(), QtMedia::HighQuality);
+    QCOMPARE(settings.quality(), QtMediaServices::NormalQuality);
+    settings.setQuality(QtMediaServices::HighQuality);
+    QCOMPARE(settings.quality(), QtMediaServices::HighQuality);
     QVERIFY(!settings.isNull());
 
     settings = QVideoEncoderSettings();
@@ -878,7 +870,7 @@
     QVERIFY(settings.isNull());
     QCOMPARE(settings.codec(), QString());
     QCOMPARE(settings.bitRate(), -1);
-    QCOMPARE(settings.quality(), QtMedia::NormalQuality);
+    QCOMPARE(settings.quality(), QtMediaServices::NormalQuality);
     QCOMPARE(settings.frameRate(), qreal());
     QCOMPARE(settings.resolution(), QSize());
 
@@ -891,7 +883,7 @@
         QCOMPARE(settings2, settings1);
         QVERIFY(settings2.isNull());
 
-        settings1.setQuality(QtMedia::HighQuality);
+        settings1.setQuality(QtMediaServices::HighQuality);
 
         QVERIFY(settings2.isNull());
         QVERIFY(!settings1.isNull());
@@ -907,7 +899,7 @@
         QCOMPARE(settings2, settings1);
         QVERIFY(settings2.isNull());
 
-        settings1.setQuality(QtMedia::HighQuality);
+        settings1.setQuality(QtMediaServices::HighQuality);
 
         QVERIFY(settings2.isNull());
         QVERIFY(!settings1.isNull());
@@ -939,19 +931,19 @@
     QVERIFY(settings1 != settings2);
 
     settings1 = QVideoEncoderSettings();
-    settings1.setEncodingMode(QtMedia::ConstantBitRateEncoding);
+    settings1.setEncodingMode(QtMediaServices::ConstantBitRateEncoding);
     settings2 = QVideoEncoderSettings();
-    settings2.setEncodingMode(QtMedia::ConstantBitRateEncoding);
+    settings2.setEncodingMode(QtMediaServices::ConstantBitRateEncoding);
     QVERIFY(settings1 == settings2);
-    settings2.setEncodingMode(QtMedia::TwoPassEncoding);
+    settings2.setEncodingMode(QtMediaServices::TwoPassEncoding);
     QVERIFY(settings1 != settings2);
 
     settings1 = QVideoEncoderSettings();
-    settings1.setQuality(QtMedia::NormalQuality);
+    settings1.setQuality(QtMediaServices::NormalQuality);
     settings2 = QVideoEncoderSettings();
-    settings2.setQuality(QtMedia::NormalQuality);
+    settings2.setQuality(QtMediaServices::NormalQuality);
     QVERIFY(settings1 == settings2);
-    settings2.setQuality(QtMedia::LowQuality);
+    settings2.setQuality(QtMediaServices::LowQuality);
     QVERIFY(settings1 != settings2);
 
     settings1 = QVideoEncoderSettings();

--- a/qtmobility/tests/auto/qmediaresource/tst_qmediaresource.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qmediaresource/tst_qmediaresource.cpp	Fri May 14 16:41:33 2010 +0300
@@ -43,7 +43,7 @@
 
 #include "qmediaresource.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class tst_QMediaResource : public QObject
 {
     Q_OBJECT

--- a/qtmobility/tests/auto/qmediaservice/tst_qmediaservice.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qmediaservice/tst_qmediaservice.cpp	Fri May 14 16:41:33 2010 +0300
@@ -48,9 +48,10 @@
 #include <QtGui/qapplication.h>
 #include <QtGui/qstyle.h>
 
+QT_BEGIN_NAMESPACE
+
 class QtTestMediaService;
 
-QTM_USE_NAMESPACE
 class tst_QMediaService : public QObject
 {
     Q_OBJECT
@@ -67,43 +68,33 @@
     Q_OBJECT
 };
 
-QTM_BEGIN_NAMESPACE
-
 #define QtTestMediaControlA_iid "com.nokia.QtTestMediaControlA"
 Q_MEDIA_DECLARE_CONTROL(QtTestMediaControlA, QtTestMediaControlA_iid)
 
-QTM_END_NAMESPACE
-
 class QtTestMediaControlB : public QMediaControl
 {
     Q_OBJECT
 };
 
-QTM_BEGIN_NAMESPACE
 #define QtTestMediaControlB_iid "com.nokia.QtTestMediaControlB"
 Q_MEDIA_DECLARE_CONTROL(QtTestMediaControlB, QtTestMediaControlB_iid)
 
-QTM_END_NAMESPACE
 
 class QtTestMediaControlC : public QMediaControl
 {
     Q_OBJECT
 };
 
-QTM_BEGIN_NAMESPACE
 #define QtTestMediaControlC_iid "com.nokia.QtTestMediaControlC"
 Q_MEDIA_DECLARE_CONTROL(QtTestMediaControlC, QtTestMediaControlA_iid) // Yes A.
-QTM_END_NAMESPACE
 
 class QtTestMediaControlD : public QMediaControl
 {
     Q_OBJECT
 };
 
-QTM_BEGIN_NAMESPACE
 #define QtTestMediaControlD_iid "com.nokia.QtTestMediaControlD"
 Q_MEDIA_DECLARE_CONTROL(QtTestMediaControlD, QtTestMediaControlD_iid)
-QTM_END_NAMESPACE
 
 class QtTestMediaControlE : public QMediaControl
 {
@@ -214,6 +205,10 @@
     QVERIFY(!service.control<QtTestMediaControlD *>());  // No control of that type.
 }
 
+QT_END_NAMESPACE
+
+QT_USE_NAMESPACE
+
 QTEST_MAIN(tst_QMediaService)
 
 #include "tst_qmediaservice.moc"

--- a/qtmobility/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp	Fri May 14 16:41:33 2010 +0300
@@ -51,7 +51,7 @@
 #include <qmediaplayer.h>
 #include <qaudiocapturesource.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class MockMediaService : public QMediaService
 {
     Q_OBJECT
@@ -68,8 +68,8 @@
                            public QMediaServiceSupportedDevicesInterface
 {
     Q_OBJECT
-    Q_INTERFACES(QtMobility::QMediaServiceSupportedFormatsInterface)
-    Q_INTERFACES(QtMobility::QMediaServiceSupportedDevicesInterface)
+    Q_INTERFACES(QMediaServiceSupportedFormatsInterface)
+    Q_INTERFACES(QMediaServiceSupportedDevicesInterface)
 public:
     QStringList keys() const
     {
@@ -90,16 +90,16 @@
         delete service;
     }
 
-    QtMedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const
+    QtMediaServices::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const
     {        
         if (codecs.contains(QLatin1String("mpeg4")))
-            return QtMedia::NotSupported;
+            return QtMediaServices::NotSupported;
 
         if (mimeType == "audio/ogg") {            
-            return QtMedia::ProbablySupported;
+            return QtMediaServices::ProbablySupported;
         }
 
-        return QtMedia::MaybeSupported;
+        return QtMediaServices::MaybeSupported;
     }
 
     QStringList supportedMimeTypes() const
@@ -127,8 +127,8 @@
                             public QMediaServiceFeaturesInterface
 {
     Q_OBJECT
-    Q_INTERFACES(QtMobility::QMediaServiceSupportedFormatsInterface)
-    Q_INTERFACES(QtMobility::QMediaServiceFeaturesInterface)
+    Q_INTERFACES(QMediaServiceSupportedFormatsInterface)
+    Q_INTERFACES(QMediaServiceFeaturesInterface)
 public:
     QStringList keys() const
     {
@@ -148,14 +148,14 @@
         delete service;
     }
 
-    QtMedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const
+    QtMediaServices::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const
     {
         Q_UNUSED(codecs);
 
         if (mimeType == "audio/wav")
-            return QtMedia::PreferredService;
+            return QtMediaServices::PreferredService;
 
-        return QtMedia::NotSupported;
+        return QtMediaServices::NotSupported;
     }
 
     QStringList supportedMimeTypes() const
@@ -177,7 +177,7 @@
                             public QMediaServiceSupportedDevicesInterface
 {
     Q_OBJECT
-    Q_INTERFACES(QtMobility::QMediaServiceSupportedDevicesInterface)
+    Q_INTERFACES(QMediaServiceSupportedDevicesInterface)
 public:
     QStringList keys() const
     {
@@ -222,8 +222,8 @@
                             public QMediaServiceFeaturesInterface
 {
     Q_OBJECT
-    Q_INTERFACES(QtMobility::QMediaServiceSupportedFormatsInterface)
-    Q_INTERFACES(QtMobility::QMediaServiceFeaturesInterface)
+    Q_INTERFACES(QMediaServiceSupportedFormatsInterface)
+    Q_INTERFACES(QMediaServiceFeaturesInterface)
 public:
     QStringList keys() const
     {
@@ -243,15 +243,15 @@
         delete service;
     }
 
-    QtMedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const
+    QtMediaServices::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const
     {
         if (codecs.contains(QLatin1String("jpeg2000")))
-            return QtMedia::NotSupported;
+            return QtMediaServices::NotSupported;
 
         if (supportedMimeTypes().contains(mimeType))
-            return QtMedia::ProbablySupported;
+            return QtMediaServices::ProbablySupported;
 
-        return QtMedia::MaybeSupported;
+        return QtMediaServices::MaybeSupported;
     }
 
     QStringList supportedMimeTypes() const
@@ -338,7 +338,7 @@
 {
     MockMediaServiceProvider mockProvider;
     QCOMPARE(mockProvider.hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "video/ogv", QStringList()),
-             QtMedia::MaybeSupported);
+             QtMediaServices::MaybeSupported);
 
     QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider();
 
@@ -346,44 +346,44 @@
         QSKIP("No default provider", SkipSingle);
 
     QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "video/ogv", QStringList()),
-             QtMedia::MaybeSupported);
+             QtMediaServices::MaybeSupported);
 
     QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "audio/ogg", QStringList()),
-             QtMedia::ProbablySupported);
+             QtMediaServices::ProbablySupported);
 
     //while the service returns PreferredService, provider should return ProbablySupported
     QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "audio/wav", QStringList()),
-             QtMedia::ProbablySupported);
+             QtMediaServices::ProbablySupported);
 
     //even while all the plugins with "hasSupport" returned NotSupported,
     //MockServicePlugin3 has no "hasSupport" interface, so MaybeSupported
     QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "video/avi",
                                   QStringList() << "mpeg4"),
-             QtMedia::MaybeSupported);
+             QtMediaServices::MaybeSupported);
 
     QCOMPARE(provider->hasSupport(QByteArray("non existing service"), "video/ogv", QStringList()),
-             QtMedia::NotSupported);
+             QtMediaServices::NotSupported);
 
-    QCOMPARE(QMediaPlayer::hasSupport("video/ogv"), QtMedia::MaybeSupported);    
-    QCOMPARE(QMediaPlayer::hasSupport("audio/ogg"), QtMedia::ProbablySupported);
-    QCOMPARE(QMediaPlayer::hasSupport("audio/wav"), QtMedia::ProbablySupported);
+    QCOMPARE(QMediaPlayer::hasSupport("video/ogv"), QtMediaServices::MaybeSupported);    
+    QCOMPARE(QMediaPlayer::hasSupport("audio/ogg"), QtMediaServices::ProbablySupported);
+    QCOMPARE(QMediaPlayer::hasSupport("audio/wav"), QtMediaServices::ProbablySupported);
 
     //test low latency flag support
     QCOMPARE(QMediaPlayer::hasSupport("audio/wav", QStringList(), QMediaPlayer::LowLatency),
-             QtMedia::ProbablySupported);
+             QtMediaServices::ProbablySupported);
     //plugin1 probably supports audio/ogg, it checked because it doesn't provide features iface
     QCOMPARE(QMediaPlayer::hasSupport("audio/ogg", QStringList(), QMediaPlayer::LowLatency),
-             QtMedia::ProbablySupported);
+             QtMediaServices::ProbablySupported);
     //Plugin4 is not checked here, sine it's known not support low latency
     QCOMPARE(QMediaPlayer::hasSupport("video/quicktime", QStringList(), QMediaPlayer::LowLatency),
-             QtMedia::MaybeSupported);
+             QtMediaServices::MaybeSupported);
 
     //test streaming flag support
     QCOMPARE(QMediaPlayer::hasSupport("video/quicktime", QStringList(), QMediaPlayer::StreamPlayback),
-             QtMedia::ProbablySupported);
+             QtMediaServices::ProbablySupported);
     //Plugin2 is not checked here, sine it's known not support streaming
     QCOMPARE(QMediaPlayer::hasSupport("audio/wav", QStringList(), QMediaPlayer::StreamPlayback),
-             QtMedia::MaybeSupported);
+             QtMediaServices::MaybeSupported);
 
     //ensure the correct media player plugin is choosen for mime type
     QMediaPlayer simplePlayer(0, QMediaPlayer::LowLatency);

--- a/qtmobility/tests/auto/qmediatimerange/tst_qmediatimerange.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qmediatimerange/tst_qmediatimerange.cpp	Fri May 14 16:41:33 2010 +0300
@@ -44,7 +44,7 @@
 
 #include <qmediatimerange.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class tst_QMediaTimeRange: public QObject
 {

--- a/qtmobility/tests/auto/qmessageservice/tst_qmessageservice.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qmessageservice/tst_qmessageservice.cpp	Fri May 14 16:41:33 2010 +0300
@@ -1420,6 +1420,7 @@
     uint discriminator(messageSizes[1]);
 #endif
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("size less than")
         << QMessageFilter::bySize(discriminator, QMessageDataComparator::LessThan) 
 #if defined(Q_OS_WIN) && defined(_WIN32_WCE)
@@ -1469,6 +1470,7 @@
         << ( QMessageIdList() << messageIds[0] << messageIds[3] << messageIds[4] )
 #endif
         << "";
+#endif
 
 #if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("parentAccountId equality 1")

--- a/qtmobility/tests/auto/qmessagestore/tst_qmessagestore.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qmessagestore/tst_qmessagestore.cpp	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,12 @@
 #include "qtmessaging.h"
 #include "../support/support.h"
 
-#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) && defined(_WIN32_WCE))
+#if (defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
+# if defined(TESTDATA_DIR)
+#  undef TESTDATA_DIR
+# endif
+# define TESTDATA_DIR "/var/tmp"
+#elif (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) && defined(_WIN32_WCE))
 # if defined(TESTDATA_DIR)
 #  undef TESTDATA_DIR
 # endif
@@ -642,7 +647,7 @@
     QCOMPARE(message.parentAccountId(), testAccountId);
     QCOMPARE(message.parentFolderId(), testFolderId);
 #ifndef Q_OS_SYMBIAN // Created Messages are not stored in Standard Folders in Symbian & Maemo
-    QCOMPARE(message.standardFolder(), QMessage::DraftsFolder);
+    QCOMPARE(message.standardFolder(), QMessage::InboxFolder);
 #endif    
   
 #if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
@@ -793,6 +798,15 @@
     } else { // byFilter
         manager->removeMessages(QMessageFilter::byId(message.id()));
     }
+#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+    // Wait 1 second to make sure that there is
+    // enough time to get removed signal
+    {
+        QEventLoop eventLoop;
+        QTimer::singleShot(1000, &eventLoop, SLOT(quit()));
+        eventLoop.exec();
+    }
+#endif
     QCOMPARE(manager->error(), QMessageManager::NoError);
     QCOMPARE(manager->countMessages(), originalCount);

--- a/qtmobility/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp	Fri May 14 16:41:33 2010 +0300
@@ -788,12 +788,10 @@
         << ( QMessageFolderIdList() << folderIds[0] << folderIds[1] )
         << ( QMessageFolderIdList() << folderIds[2] << folderIds[3] );
 
-#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("id list inclusion empty")
         << QMessageFolderFilter::byId(QMessageFolderIdList(), QMessageDataComparator::Includes) 
         << QMessageFolderIdList()
         << folderIds;
-#endif
 
     QTest::newRow("id list exclusion 1")
         << QMessageFolderFilter::byId(QMessageFolderIdList() << folderIds[0], QMessageDataComparator::Excludes) 
@@ -810,12 +808,10 @@
         << ( QMessageFolderIdList() << folderIds[2] << folderIds[3] )
         << ( QMessageFolderIdList() << folderIds[0] << folderIds[1] );
 
-#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("id list exclusion empty")
         << QMessageFolderFilter::byId(QMessageFolderIdList(), QMessageDataComparator::Excludes) 
         << folderIds
         << QMessageFolderIdList();
-#endif
 
     QTest::newRow("id filter inclusion 1")
         << QMessageFolderFilter::byId(QMessageFolderFilter::byPath("My messages", QMessageDataComparator::Equal), QMessageDataComparator::Includes)
@@ -1109,7 +1105,6 @@
         << folderIds
         << QMessageFolderIdList();
 
-#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("parentAccountId filter inclusion 1")
         << QMessageFolderFilter::byParentAccountId(QMessageAccountFilter::byName("Alter Ego", QMessageDataComparator::Equal), QMessageDataComparator::Includes) 
         << ( QMessageFolderIdList() << folderIds[0] )
@@ -1159,7 +1154,6 @@
         << QMessageFolderFilter::byParentAccountId(QMessageAccountFilter::byName("NoneSuch"), QMessageDataComparator::Excludes) 
         << folderIds
         << QMessageFolderIdList();
-#endif
 
 #if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("parentFolderId equality 1")
@@ -1536,13 +1530,11 @@
         << ( 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) 
@@ -1562,13 +1554,11 @@
         << ( 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
 
     QTest::newRow("id filter inclusion empty")
         << QMessageFilter::byId(QMessageFilter(), QMessageDataComparator::Includes) 
@@ -2376,6 +2366,7 @@
     uint discriminator(messageSizes[1]);
 #endif
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("size less than")
         << QMessageFilter::bySize(discriminator, QMessageDataComparator::LessThan) 
 #if defined(Q_OS_WIN) && defined(_WIN32_WCE)
@@ -2425,8 +2416,8 @@
         << ( QMessageIdList() << messageIds[0] << messageIds[3] << messageIds[4] )
 #endif
         << "";
-
-#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
+#endif
+
     QTest::newRow("parentAccountId equality 1")
         << QMessageFilter::byParentAccountId(accountIds[0], QMessageDataComparator::Equal) 
         << ( QMessageIdList() << messageIds[1] << messageIds[2] << messageIds[3] << messageIds[4] )
@@ -2438,7 +2429,6 @@
         << ( QMessageIdList() << messageIds[0] )
         << ( QMessageIdList() << messageIds[1] << messageIds[2] << messageIds[3] << messageIds[4] )
         << "";
-#endif
 
     QTest::newRow("parentAccountId equality invalid")
         << QMessageFilter::byParentAccountId(QMessageAccountId(), QMessageDataComparator::Equal) 
@@ -2446,7 +2436,6 @@
         << 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] )
@@ -2458,7 +2447,6 @@
         << ( QMessageIdList() << messageIds[1] << messageIds[2] << messageIds[3] << messageIds[4] )
         << ( QMessageIdList() << messageIds[0] )
         << "";
-#endif
 
     QTest::newRow("parentAccountId inequality invalid")
         << QMessageFilter::byParentAccountId(QMessageAccountId(), QMessageDataComparator::NotEqual) 
@@ -2466,7 +2454,6 @@
         << 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] )
@@ -2526,11 +2513,10 @@
         << messageIds
         << QMessageIdList()
         << "";
-#endif
-
-#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
+
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
     QTest::newRow("standardFolder equality 1")
-        << QMessageFilter::byStandardFolder(QMessage::InboxFolder, QMessageDataComparator::Equal)
+        << QMessageFilter::byStandardFolder(QMessage::DraftsFolder, QMessageDataComparator::Equal)
 #if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
         << messageIds
         << ( QMessageIdList() )
@@ -2554,7 +2540,7 @@
         << "";
 
     QTest::newRow("standardFolder inequality 1")
-        << QMessageFilter::byStandardFolder(QMessage::InboxFolder, QMessageDataComparator::NotEqual) 
+        << QMessageFilter::byStandardFolder(QMessage::DraftsFolder, QMessageDataComparator::NotEqual) 
 #if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
         << ( QMessageIdList() )
         << messageIds
@@ -3015,6 +3001,7 @@
                                << ( QMessageIdList() << messageIds[4] ) );
 #endif
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("size ascending")
         << ( MessageSortList() << QMessageSortOrder::bySize(Qt::AscendingOrder) )
 #if (defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
@@ -3053,21 +3040,20 @@
                                << ( QMessageIdList() << messageIds[3] )
 #endif
                                << ( QMessageIdList() << messageIds[0] ) );
-#endif        
+#endif
+#endif
 
 #if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("status:HasAttachments ascending")
         << ( MessageSortList() << QMessageSortOrder::byStatus(QMessage::HasAttachments, Qt::AscendingOrder) )
         << ( MessageListList() << ( QMessageIdList() << messageIds[0] << messageIds[3] )
                                << ( QMessageIdList() << messageIds[1] << messageIds[2] << messageIds[4] ) );
-#endif
 
     QTest::newRow("status:HasAttachments descending")
         << ( MessageSortList() << QMessageSortOrder::byStatus(QMessage::HasAttachments, Qt::DescendingOrder) )
         << ( MessageListList() << ( QMessageIdList() << messageIds[1] << messageIds[2] << messageIds[4] )
                                << ( QMessageIdList() << messageIds[0] << messageIds[3] ) );
 
-#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     QTest::newRow("status:Read ascending")
         << ( MessageSortList() << QMessageSortOrder::byStatus(QMessage::Read, Qt::AscendingOrder) )
         << ( MessageListList() << ( QMessageIdList() << messageIds[1] << messageIds[2] )

--- a/qtmobility/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp	Fri May 14 16:41:33 2010 +0300
@@ -72,6 +72,8 @@
 
 private slots:
 
+    void robustnessBombing();
+
     void outOfProcessSession();
     void invalidSession();
 
@@ -229,6 +231,23 @@
 #endif
 }
 
+// Robustness test for calling interfaces in nonsense order / with nonsense parameters
+void tst_QNetworkSession::robustnessBombing() 
+{
+    QNetworkConfigurationManager mgr;
+    QNetworkSession testSession(mgr.defaultConfiguration());
+    // Should not reset even session is not opened
+    testSession.migrate();
+    testSession.accept();
+    testSession.ignore();
+    testSession.reject();
+    quint64 temp;
+    temp = testSession.bytesWritten();
+    temp = testSession.bytesReceived();
+    temp = testSession.activeTime();
+}
+
+
 void tst_QNetworkSession::invalidSession()
 {
     // 1. Verify that session created with invalid configuration remains in invalid state

--- a/qtmobility/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp	Fri May 14 16:41:33 2010 +0300
@@ -51,7 +51,7 @@
 #include <QtOpenGL/qglframebufferobject.h>
 #endif
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class tst_QPainterVideoSurface : public QObject
 {
     Q_OBJECT

--- a/qtmobility/tests/auto/qradioplayer/tst_qradioplayer.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qradioplayer/tst_qradioplayer.cpp	Fri May 14 16:41:33 2010 +0300
@@ -48,7 +48,7 @@
 #include <qradioplayercontrol.h>
 #include <qradioplayer.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class MockProvider : public QRadioPlayerControl
 {
     Q_OBJECT

--- a/qtmobility/tests/auto/qradiotuner/tst_qradiotuner.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qradiotuner/tst_qradiotuner.cpp	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,7 @@
 #include <qradiotunercontrol.h>
 #include <qradiotuner.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class MockControl : public QRadioTunerControl
 {
     Q_OBJECT
@@ -70,9 +70,9 @@
     {
         return true;
     }
-    QtMedia::AvailabilityError availabilityError() const
+    QtMediaServices::AvailabilityError availabilityError() const
     {
-        return QtMedia::NoError;
+        return QtMediaServices::NoError;
     }
 
     QRadioTuner::Band band() const
@@ -311,9 +311,6 @@
     QCOMPARE(radio->state(), QRadioTuner::StoppedState);
     QCOMPARE(stateSpy.count(), 1);
 
-#ifdef QTM_NAMESPACE
-    QEXPECT_FAIL("", "QSignalSpy doesn't grab the correct value from signal because of QtMobility namespace", Continue);
-#endif
     QCOMPARE(stateSpy.first()[0].value<QRadioTuner::State>(), QRadioTuner::StoppedState);
 
     delete radio;

--- a/qtmobility/tests/auto/qsensor/qsensor.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qsensor/qsensor.pro	Fri May 14 16:41:33 2010 +0300
@@ -24,3 +24,13 @@
     test_sensorimpl.cpp\
     test_sensorplugin.cpp
 
+VPATH += ../../../plugins/sensors/dummy
+INCLUDEPATH += ../../../plugins/sensors/dummy
+HEADERS += \
+    dummyaccelerometer.h\
+    dummycommon.h
+
+SOURCES += \
+    dummyaccelerometer.cpp\
+    dummycommon.cpp
+

--- a/qtmobility/tests/auto/qsensor/test_sensorimpl.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qsensor/test_sensorimpl.cpp	Fri May 14 16:41:33 2010 +0300
@@ -55,11 +55,13 @@
     QString doThis = sensor->property("doThis").toString();
     if (doThis == "rates(0)") {
         setDataRates(0);
+    } else if (doThis == "rates(nodef)") {
+        addDataRate(100,100);
     } else if (doThis == "rates") {
-        setDataRates(new QAccelerometer(this));
-        if (sensor->availableDataRates().count()) {
-            sensor->setDataRate(sensor->availableDataRates().first().first);
-        } else {
+        QAccelerometer *acc = new QAccelerometer(this);
+        acc->connectToBackend();
+        setDataRates(acc);
+        if (!sensor->availableDataRates().count()) {
             addDataRate(100, 100);
             sensor->setDataRate(100);
         }

--- a/qtmobility/tests/auto/qsensor/test_sensorplugin.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qsensor/test_sensorplugin.cpp	Fri May 14 16:41:33 2010 +0300
@@ -45,6 +45,7 @@
 #include <qsensormanager.h>
 #include <QFile>
 #include <QDebug>
+#include "dummyaccelerometer.h"
 
 QTM_USE_NAMESPACE
 
@@ -57,6 +58,7 @@
     {
         QSensorManager::registerBackend(TestSensor::type, testsensorimpl::id, this);
         QSensorManager::registerBackend(TestSensor::type, "test sensor 2", this);
+        QSensorManager::registerBackend(QAccelerometer::type, dummyaccelerometer::id, this);
     }
 
     QSensorBackend *createBackend(QSensor *sensor)
@@ -64,6 +66,9 @@
         if (sensor->identifier() == testsensorimpl::id) {
             return new testsensorimpl(sensor);
         }
+        if (sensor->identifier() == dummyaccelerometer::id) {
+            return new dummyaccelerometer(sensor);
+        }
 
         qWarning() << "Can't create backend" << sensor->identifier();
         return 0;

--- a/qtmobility/tests/auto/qsensor/tst_qsensor.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qsensor/tst_qsensor.cpp	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,7 @@
 
 QTM_USE_NAMESPACE
 
-class MyFilter : public TestSensorFilter
+        class MyFilter : public TestSensorFilter
 {
     bool filter(TestSensorReading *reading)
     {
@@ -86,9 +86,12 @@
     void testTypeRegistered()
     {
         QList<QByteArray> expected;
-        expected << TestSensor::type;
+        expected << "QAccelerometer" << TestSensor::type;
         QList<QByteArray> actual = QSensor::sensorTypes();
-        QCOMPARE(actual, expected);
+
+        for (int i = 0; i < expected.size(); ++i) {
+            QVERIFY2(actual.contains(expected.at(i)),expected.at(i)+" not present");
+        }
     }
 
     void testSensorRegistered()
@@ -246,8 +249,6 @@
         TestSensor sensor;
         sensor.setProperty("doThis", "rates(0)");
         QTest::ignoreMessage(QtWarningMsg, "ERROR: Cannot call QSensorBackend::setDataRates with 0 ");
-        QTest::ignoreMessage(QtWarningMsg, "\"test sensor impl\" backend does not support any data rates. It cannot be used. ");
-        QTest::ignoreMessage(QtWarningMsg, "\"test sensor impl\" backend did not supply default data rate. ");
         sensor.connectToBackend();
     }
 
@@ -260,6 +261,14 @@
         sensor.availableDataRates();
     }
 
+    void testMetaData4()
+    {
+        TestSensor sensor;
+        sensor.setProperty("doThis", "rates(nodef)");
+        QTest::ignoreMessage(QtWarningMsg, "\"test sensor impl\" backend did not supply default data rate. ");
+        sensor.connectToBackend();
+    }
+
     void testFilter()
     {
         TestSensor sensor;

--- a/qtmobility/tests/auto/qsfwtestutil.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qsfwtestutil.cpp	Fri May 14 16:41:33 2010 +0300
@@ -116,7 +116,6 @@
             QFile::Permissions perms = QFile::permissions(file.canonicalFilePath());
             perms = perms | QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner;
             QFile::setPermissions(file.canonicalFilePath(), perms);
-
             removeDirectory(file.canonicalFilePath());
         }
     }
@@ -128,12 +127,12 @@
 #include <f32file.h>
 void QSfwTestUtil::removeDatabases()
 {
-    TFindServer findServer(_L("SFWDatabaseManagerServer"));
+    TFindServer findServer(_L("!qsfwdatabasemanagerserver"));
     TFullName name;
     if (findServer.Next(name) == KErrNone)
     {
         RProcess dbServer;
-        if (dbServer.Open(_L("SFWDatabaseManagerServer")) == KErrNone)
+        if (dbServer.Open(_L("qsfwdatabasemanagerserver")) == KErrNone)
         {
             dbServer.Kill(KErrNone);
             dbServer.Close();    
@@ -145,7 +144,7 @@
     CleanupClosePushL(fs);
     CFileMan* fileMan=CFileMan::NewL(fs);
     CleanupStack::PushL(fileMan);
-    fileMan->RmDir(_L("c:\\private\\2002AC7F\\Nokia\\")); //Server's fixed UID3
+    fileMan->Delete(_L("c:\\private\\2002AC7F\\QtServiceFramework_4.6_system.db")); //Server's fixed UID3
     CleanupStack::PopAndDestroy(2, &fs);    
 }
 #endif

--- a/qtmobility/tests/auto/qversitreader/tst_qversitreader.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qversitreader/tst_qversitreader.cpp	Fri May 14 16:41:33 2010 +0300
@@ -238,6 +238,8 @@
     QCOMPARE(mReader->error(), QVersitReader::ParseError);
     QCOMPARE(mReader->results().count(),4);
 
+    qApp->processEvents(); // clean up before we start sniffing signals
+
     // Asynchronous reading
     mInputDevice->close();
     mInputDevice->setData(twoDocuments);
@@ -327,8 +329,8 @@
     vCard.append("N:foo\\;bar;foo\\,bar;foo\\:bar;foo\\\\bar;foo\\\\\\;bar\r\n");
     // missing structured value
     vCard.append("ADR:\r\n");
-    // "NICKNAMES:foo\;bar,foo\,bar,foo\:bar,foo\\bar,foo\\\,bar"
-    vCard.append("NICKNAMES:foo\\;bar,foo\\,bar,foo\\:bar,foo\\\\bar,foo\\\\\\,bar\r\n");
+    // "NICKNAME:foo\;bar,foo\,bar,foo\:bar,foo\\bar,foo\\\,bar"
+    vCard.append("NICKNAME:foo\\;bar,foo\\,bar,foo\\:bar,foo\\\\bar,foo\\\\\\,bar\r\n");
     // "CATEGORIES:foo\;bar,foo\,bar,foo\:bar,foo\\bar,foo\\\,bar"
     vCard.append("CATEGORIES:foo\\;bar,foo\\,bar,foo\\:bar,foo\\\\bar,foo\\\\\\,bar\r\n");
     vCard.append("ORG;CHARSET=UTF-8:");
@@ -391,7 +393,7 @@
     QVERIFY(components.at(0).isEmpty());
 
     property = mReaderPrivate->parseNextVersitProperty(type, lineReader);
-    QCOMPARE(property.name(),QString::fromAscii("NICKNAMES"));
+    QCOMPARE(property.name(),QString::fromAscii("NICKNAME"));
     QCOMPARE(property.valueType(), QVersitProperty::ListType);
     QCOMPARE(property.variantValue().type(), QVariant::StringList);
     components = property.value<QStringList>();
@@ -490,8 +492,8 @@
     vCard.append("NOTE:\\;\\,\\:\\\\\r\n");
     // "N:foo\;bar;foo\,bar;foo\:bar;foo\\bar;foo\\\;bar"
     vCard.append("N:foo\\;bar;foo\\,bar;foo\\:bar;foo\\\\bar;foo\\\\\\;bar\r\n");
-    // "NICKNAMES:foo\;bar,foo\,bar,foo\:bar,foo\\bar,foo\\\,bar"
-    vCard.append("NICKNAMES:foo\\;bar,foo\\,bar,foo\\:bar,foo\\\\bar,foo\\\\\\,bar\r\n");
+    // "NICKNAME:foo\;bar,foo\,bar,foo\:bar,foo\\bar,foo\\\,bar"
+    vCard.append("NICKNAME:foo\\;bar,foo\\,bar,foo\\:bar,foo\\\\bar,foo\\\\\\,bar\r\n");
     // "CATEGORIES:foo\;bar,foo\,bar,foo\:bar,foo\\bar,foo\\\,bar"
     vCard.append("CATEGORIES:foo\\;bar,foo\\,bar,foo\\:bar,foo\\\\bar,foo\\\\\\,bar\r\n");
     // "CATEGORIES:foobar\\,foobar\\\\,foo\\\\\,bar"
@@ -547,7 +549,7 @@
     QCOMPARE(components.at(4), QLatin1String("foo\\;bar"));
 
     property = mReaderPrivate->parseNextVersitProperty(type, lineReader);
-    QCOMPARE(property.name(),QString::fromAscii("NICKNAMES"));
+    QCOMPARE(property.name(),QString::fromAscii("NICKNAME"));
     QCOMPARE(property.valueType(), QVersitProperty::ListType);
     QCOMPARE(property.variantValue().type(), QVariant::StringList);
     components = property.value<QStringList>();
@@ -756,24 +758,60 @@
 
 void tst_QVersitReader::testDecodeQuotedPrintable()
 {
-    // Soft line breaks
-    QString encoded(QLatin1String("This=\r\n is =\r\none line."));
-    QString decoded(QLatin1String("This is one line."));
+    QFETCH(QString, encoded);
+
+    QFETCH(QString, decoded);
     mReaderPrivate->decodeQuotedPrintable(encoded);
     QCOMPARE(encoded, decoded);
+}
 
-    // Characters recommended to be encoded according to RFC 1521:
-    encoded = QLatin1String("To be decoded: =0A=0D=21=22=23=24=3D=40=5B=5C=5D=5E=60=7B=7C=7D=7E");
-    decoded = QLatin1String("To be decoded: \n\r!\"#$=@[\\]^`{|}~");
-    mReaderPrivate->decodeQuotedPrintable(encoded);
-    QCOMPARE(encoded, decoded);
+void tst_QVersitReader::testDecodeQuotedPrintable_data()
+{
+    QTest::addColumn<QString>("encoded");
+    QTest::addColumn<QString>("decoded");
+
+
+    QTest::newRow("Soft line breaks")
+            << QString::fromLatin1("This=\r\n is =\r\none line.")
+            << QString::fromLatin1("This is one line.");
+
+    QTest::newRow("Characters recommended to be encoded according to RFC 1521")
+            << QString::fromLatin1("To be decoded: =0A=0D=21=22=23=24=3D=40=5B=5C=5D=5E=60=7B=7C=7D=7E")
+            << QString::fromLatin1("To be decoded: \n\r!\"#$=@[\\]^`{|}~");
+
+    QTest::newRow("Characters recommended to be encoded according to RFC 1521(lower case)")
+            << QString::fromLatin1("To be decoded: =0a=0d=21=22=23=24=3d=40=5b=5c=5d=5e=60=7b=7c=7d=7e")
+            << QString::fromLatin1("To be decoded: \n\r!\"#$=@[\\]^`{|}~");
+
+    QTest::newRow("random characters encoded")
+            << QString::fromLatin1("=45=6E=63=6F=64=65=64 =64=61=74=61")
+            << QString::fromLatin1("Encoded data");
 
-    // Other random characters encoded.
-    // Some implementation may encode these too, as it is allowed.
-    encoded = QLatin1String("=45=6E=63=6F=64=65=64 =64=61=74=61");
-    decoded = QLatin1String("Encoded data");
-    mReaderPrivate->decodeQuotedPrintable(encoded);
-    QCOMPARE(encoded, decoded);
+    QTest::newRow("short string1")
+            << QString::fromLatin1("-=_")
+            << QString::fromLatin1("-=_");
+
+    QTest::newRow("short string2")
+            << QString::fromLatin1("=0")
+            << QString::fromLatin1("=0");
+
+    QTest::newRow("short string2")
+            << QString::fromLatin1("\r")
+            << QString::fromLatin1("\r");
+
+    QTest::newRow("short string2")
+            << QString::fromLatin1("\n")
+            << QString::fromLatin1("\n");
+
+    QTest::newRow("short string2")
+            << QString::fromLatin1("\n\r")
+            << QString::fromLatin1("\n\r");
+
+    QTest::newRow("White spaces")
+            << QString::fromLatin1("=09=20")
+            << QString::fromLatin1("\t ");
+
+
 }
 void tst_QVersitReader::testParamName()
 {

--- a/qtmobility/tests/auto/qversitreader/tst_qversitreader.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qversitreader/tst_qversitreader.h	Fri May 14 16:41:33 2010 +0300
@@ -93,6 +93,7 @@
     void testParseVersitDocument();
     void testParseVersitDocument_data();
     void testDecodeQuotedPrintable();
+    void testDecodeQuotedPrintable_data();
     void testParamName();
     void testParamValue();
     void testExtractPart();

--- a/qtmobility/tests/auto/qversitwriter/tst_qversitwriter.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qversitwriter/tst_qversitwriter.cpp	Fri May 14 16:41:33 2010 +0300
@@ -222,7 +222,9 @@
     mOutputDevice->seek(0);
     QByteArray result(mOutputDevice->readAll());
     QCOMPARE(result, vCard30);
-
+    
+    qApp->processEvents(); // clean up before we start sniffing signals
+    
     // Asynchronous writing
     mOutputDevice->reset();
     mSignalCatcher->mReceived.clear();

--- a/qtmobility/tests/auto/qvideowidget/tst_qvideowidget.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qvideowidget/tst_qvideowidget.cpp	Fri May 14 16:41:33 2010 +0300
@@ -57,7 +57,7 @@
 
 #include <QtGui/qapplication.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class tst_QVideoWidget : public QObject
 {
     Q_OBJECT

--- a/qtmobility/tests/auto/servicedatabase/servicedatabase.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/servicedatabase/servicedatabase.pro	Fri May 14 16:41:33 2010 +0300
@@ -32,7 +32,7 @@
                   ../../../src/serviceframework/symbian
     libBlock = \
         "$${LITERAL_HASH}ifdef WINSCW" \
-        "LIBRARY SFWDatabaseManagerServer.lib" \
+        "LIBRARY qsfwdatabasemanagerserver.lib" \
         "$${LITERAL_HASH}endif"
 
     # DEFINES+= QT_NODLL

--- a/qtmobility/tests/auto/support/support.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/support/support.h	Fri May 14 16:41:33 2010 +0300
@@ -64,6 +64,7 @@
     QMessageId addMessage(const Parameters &params);
 
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+
     bool mapiAvailable();
 #endif
 }

--- a/qtmobility/tests/auto/support/support.pri	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/support/support.pri	Fri May 14 16:41:33 2010 +0300
@@ -17,7 +17,6 @@
         else {
             LIBS += mapi32.lib Advapi32.lib
         }
-
     }
     maemo5 {
         QT += dbus

--- a/qtmobility/tests/auto/support/support_win.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/support/support_win.cpp	Fri May 14 16:41:33 2010 +0300
@@ -386,7 +386,7 @@
         encodedIdStream << recordKey;
     }
 
-    return QMessageAccountId(encodedId.toBase64());
+	return QMessageAccountId(QString("WIN_")+encodedId.toBase64());
 }
 
 QMessageFolderId folderIdFromProperties(const QByteArray &recordKey, const QByteArray &entryId, const QByteArray &storeKey)
@@ -407,7 +407,7 @@
 #endif
     }
 
-    return QMessageFolderId(encodedId.toBase64());
+	return QMessageFolderId(QString("WIN_") + encodedId.toBase64());
 }
 
 QByteArray objectProperty(IMAPIProp *object, ULONG tag)

--- a/qtmobility/tests/auto/symbian/qmediaobject_s60/tst_qmediaobject_s60.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/symbian/qmediaobject_s60/tst_qmediaobject_s60.cpp	Fri May 14 16:41:33 2010 +0300
@@ -48,7 +48,7 @@
 #include <qmetadatacontrol.h>
 #include <qmediaplayer.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class tst_QMediaObject : public QObject
 {
     Q_OBJECT
@@ -71,7 +71,7 @@
     void setExtendedMetaData();
 
 private:
-    QString metaDataKeyAsString(QtMedia::MetaData key) const;
+    QString metaDataKeyAsString(QtMediaServices::MetaData key) const;
 };
 
 void tst_QMediaObject::initTestCase_data()
@@ -302,10 +302,10 @@
     const QString title(QLatin1String("Title"));
 
     if (player.isMetaDataAvailable()) {
-        QEXPECT_FAIL("", "player.metaData(QtMedia::AlbumArtist) failed: ", Continue);
-        QCOMPARE(player.metaData(QtMedia::AlbumArtist).toString(), artist);
-        QEXPECT_FAIL("", "player.metaData(QtMedia::Title) failed: ", Continue);
-        QCOMPARE(player.metaData(QtMedia::Title).toString(), title);
+        QEXPECT_FAIL("", "player.metaData(QtMediaServices::AlbumArtist) failed: ", Continue);
+        QCOMPARE(player.metaData(QtMediaServices::AlbumArtist).toString(), artist);
+        QEXPECT_FAIL("", "player.metaData(QtMediaServices::Title) failed: ", Continue);
+        QCOMPARE(player.metaData(QtMediaServices::Title).toString(), title);
     }
 }
 
@@ -320,14 +320,14 @@
     QTest::qWait(700);    
 
     if (player.isMetaDataAvailable()) {
-        QList<QtMedia::MetaData> metaDataKeys = player.availableMetaData();
+        QList<QtMediaServices::MetaData> metaDataKeys = player.availableMetaData();
         QEXPECT_FAIL("", "metaDataKeys.count() failed: ", Continue);
         QVERIFY(metaDataKeys.count() > 0);
 //        qWarning() << "metaDataKeys.count: " << metaDataKeys.count();
-        QEXPECT_FAIL("", "metaDataKeys.contains(QtMedia::AlbumArtist) failed: ", Continue);
-        QVERIFY(metaDataKeys.contains(QtMedia::AlbumArtist));
-        QEXPECT_FAIL("", "metaDataKeys.contains(QtMedia::Title) failed: ", Continue);
-        QVERIFY(metaDataKeys.contains(QtMedia::Title));
+        QEXPECT_FAIL("", "metaDataKeys.contains(QtMediaServices::AlbumArtist) failed: ", Continue);
+        QVERIFY(metaDataKeys.contains(QtMediaServices::AlbumArtist));
+        QEXPECT_FAIL("", "metaDataKeys.contains(QtMediaServices::Title) failed: ", Continue);
+        QVERIFY(metaDataKeys.contains(QtMediaServices::Title));
     }
 }
 
@@ -342,8 +342,8 @@
 
     QString title("Titletest");
     if (player.isMetaDataWritable()) {
-        player.setMetaData(QtMedia::Title, title); 
-        QCOMPARE(player.metaData(QtMedia::Title).toString(), title);
+        player.setMetaData(QtMediaServices::Title, title); 
+        QCOMPARE(player.metaData(QtMediaServices::Title).toString(), title);
     }
 }
 
@@ -359,10 +359,10 @@
     const QString title(QLatin1String("Title"));
 
     if (player.isMetaDataAvailable()) {  
-        QEXPECT_FAIL("", "player.extendedMetaData(QtMedia::AlbumArtist) failed: ", Continue);
-        QCOMPARE(player.extendedMetaData(metaDataKeyAsString(QtMedia::AlbumArtist)).toString(), artist);
-        QEXPECT_FAIL("", "player.extendedMetaData(QtMedia::Title) failed: ", Continue);
-        QCOMPARE(player.extendedMetaData(metaDataKeyAsString(QtMedia::Title)).toString(), title);
+        QEXPECT_FAIL("", "player.extendedMetaData(QtMediaServices::AlbumArtist) failed: ", Continue);
+        QCOMPARE(player.extendedMetaData(metaDataKeyAsString(QtMediaServices::AlbumArtist)).toString(), artist);
+        QEXPECT_FAIL("", "player.extendedMetaData(QtMediaServices::Title) failed: ", Continue);
+        QCOMPARE(player.extendedMetaData(metaDataKeyAsString(QtMediaServices::Title)).toString(), title);
     }
 }
 
@@ -389,10 +389,10 @@
             qWarning() << "metaDataKeys " << i <<". " << metaDataKeys.at(i);
             i++;
             }*/
-        QEXPECT_FAIL("", "metaDataKeys.contains(QtMedia::AlbumArtist) failed: ", Continue);
-        QVERIFY(metaDataKeys.contains(metaDataKeyAsString(QtMedia::AlbumArtist)));
-        QEXPECT_FAIL("", "metaDataKeys.contains(QtMedia::AlbumArtist) failed: ", Continue);
-        QVERIFY(metaDataKeys.contains(metaDataKeyAsString(QtMedia::Title)));
+        QEXPECT_FAIL("", "metaDataKeys.contains(QtMediaServices::AlbumArtist) failed: ", Continue);
+        QVERIFY(metaDataKeys.contains(metaDataKeyAsString(QtMediaServices::AlbumArtist)));
+        QEXPECT_FAIL("", "metaDataKeys.contains(QtMediaServices::AlbumArtist) failed: ", Continue);
+        QVERIFY(metaDataKeys.contains(metaDataKeyAsString(QtMediaServices::Title)));
     }
 }
 
@@ -407,64 +407,64 @@
     const QString title(QLatin1String("Titletest"));
 
     if (player.isMetaDataWritable()) {
-        player.setExtendedMetaData(metaDataKeyAsString(QtMedia::Title), title);  
-        QCOMPARE(player.metaData(QtMedia::Title).toString(), title);
+        player.setExtendedMetaData(metaDataKeyAsString(QtMediaServices::Title), title);  
+        QCOMPARE(player.metaData(QtMediaServices::Title).toString(), title);
     }
 }
 
-QString tst_QMediaObject::metaDataKeyAsString(QtMedia::MetaData key) const
+QString tst_QMediaObject::metaDataKeyAsString(QtMediaServices::MetaData key) const
 {
     switch(key) {
-        case QtMedia::Title: return "title";
-        case QtMedia::AlbumArtist: return "artist";
-        case QtMedia::Comment: return "comment";
-        case QtMedia::Genre: return "genre";
-        case QtMedia::Year: return "year";
-        case QtMedia::Copyright: return "copyright";
-        case QtMedia::AlbumTitle: return "album";
-        case QtMedia::Composer: return "composer";
-        case QtMedia::TrackNumber: return "albumtrack";
-        case QtMedia::AudioBitRate: return "audiobitrate";
-        case QtMedia::VideoBitRate: return "videobitrate";
-        case QtMedia::Duration: return "duration";
-        case QtMedia::MediaType: return "contenttype";
-        case QtMedia::SubTitle: // TODO: Find the matching metadata keys
-        case QtMedia::Description:
-        case QtMedia::Category:
-        case QtMedia::Date:
-        case QtMedia::UserRating:
-        case QtMedia::Keywords:
-        case QtMedia::Language:
-        case QtMedia::Publisher:
-        case QtMedia::ParentalRating:
-        case QtMedia::RatingOrganisation:
-        case QtMedia::Size:
-        case QtMedia::AudioCodec:
-        case QtMedia::AverageLevel:
-        case QtMedia::ChannelCount:
-        case QtMedia::PeakValue:
-        case QtMedia::SampleRate:
-        case QtMedia::Author:
-        case QtMedia::ContributingArtist:
-        case QtMedia::Conductor:
-        case QtMedia::Lyrics:
-        case QtMedia::Mood:
-        case QtMedia::TrackCount:
-        case QtMedia::CoverArtUrlSmall:
-        case QtMedia::CoverArtUrlLarge:
-        case QtMedia::Resolution:
-        case QtMedia::PixelAspectRatio:
-        case QtMedia::VideoFrameRate:
-        case QtMedia::VideoCodec:
-        case QtMedia::PosterUrl:
-        case QtMedia::ChapterNumber:
-        case QtMedia::Director:
-        case QtMedia::LeadPerformer:
-        case QtMedia::Writer:
-        case QtMedia::CameraManufacturer:
-        case QtMedia::CameraModel:
-        case QtMedia::Event:
-        case QtMedia::Subject:
+        case QtMediaServices::Title: return "title";
+        case QtMediaServices::AlbumArtist: return "artist";
+        case QtMediaServices::Comment: return "comment";
+        case QtMediaServices::Genre: return "genre";
+        case QtMediaServices::Year: return "year";
+        case QtMediaServices::Copyright: return "copyright";
+        case QtMediaServices::AlbumTitle: return "album";
+        case QtMediaServices::Composer: return "composer";
+        case QtMediaServices::TrackNumber: return "albumtrack";
+        case QtMediaServices::AudioBitRate: return "audiobitrate";
+        case QtMediaServices::VideoBitRate: return "videobitrate";
+        case QtMediaServices::Duration: return "duration";
+        case QtMediaServices::MediaType: return "contenttype";
+        case QtMediaServices::SubTitle: // TODO: Find the matching metadata keys
+        case QtMediaServices::Description:
+        case QtMediaServices::Category:
+        case QtMediaServices::Date:
+        case QtMediaServices::UserRating:
+        case QtMediaServices::Keywords:
+        case QtMediaServices::Language:
+        case QtMediaServices::Publisher:
+        case QtMediaServices::ParentalRating:
+        case QtMediaServices::RatingOrganisation:
+        case QtMediaServices::Size:
+        case QtMediaServices::AudioCodec:
+        case QtMediaServices::AverageLevel:
+        case QtMediaServices::ChannelCount:
+        case QtMediaServices::PeakValue:
+        case QtMediaServices::SampleRate:
+        case QtMediaServices::Author:
+        case QtMediaServices::ContributingArtist:
+        case QtMediaServices::Conductor:
+        case QtMediaServices::Lyrics:
+        case QtMediaServices::Mood:
+        case QtMediaServices::TrackCount:
+        case QtMediaServices::CoverArtUrlSmall:
+        case QtMediaServices::CoverArtUrlLarge:
+        case QtMediaServices::Resolution:
+        case QtMediaServices::PixelAspectRatio:
+        case QtMediaServices::VideoFrameRate:
+        case QtMediaServices::VideoCodec:
+        case QtMediaServices::PosterUrl:
+        case QtMediaServices::ChapterNumber:
+        case QtMediaServices::Director:
+        case QtMediaServices::LeadPerformer:
+        case QtMediaServices::Writer:
+        case QtMediaServices::CameraManufacturer:
+        case QtMediaServices::CameraModel:
+        case QtMediaServices::Event:
+        case QtMediaServices::Subject:
         default:
             break;
     }

--- a/qtmobility/tests/auto/symbian/qmediaplayer_s60/tst_qmediaplayer_s60.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/symbian/qmediaplayer_s60/tst_qmediaplayer_s60.cpp	Fri May 14 16:41:33 2010 +0300
@@ -51,7 +51,7 @@
 #include <QMediaStreamsControl>
 #include <QVideoWidget>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 #define WAIT_FOR_CONDITION(a,e)            \
     for (int _i = 0; _i < 500; _i += 1) {  \

--- a/qtmobility/tests/auto/symbian/qmediaplaylist_s60/tst_qmediaplaylist_s60.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/symbian/qmediaplaylist_s60/tst_qmediaplaylist_s60.cpp	Fri May 14 16:41:33 2010 +0300
@@ -49,7 +49,7 @@
 
 #include "qm3uhandler.h"
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class MockReadOnlyPlaylistProvider : public QMediaPlaylistProvider
 {
     Q_OBJECT

--- a/qtmobility/tests/auto/symbian/qmediarecorder_s60/tst_qmediarecorder_s60.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/symbian/qmediarecorder_s60/tst_qmediarecorder_s60.cpp	Fri May 14 16:41:33 2010 +0300
@@ -66,7 +66,7 @@
     }                                           \
     QVERIFY(a)
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 class tst_QMediaRecorder: public QObject
 {
     Q_OBJECT
@@ -78,12 +78,14 @@
 private slots:
     void testAudioSink();
     void testAudioRecord();
+    void testAudioRecordWithAMR();
     void testAudioEndPointSelector();
     void testAudioEncoderControl();
     void testMediaFormatsControl();
-//    void testDefaultAudioEncodingSettings();
+    void testDefaultAudioEncodingSettings();
 
-private:
+private:   
+    QUrl recordPathAudio(QDir outputDir);
 
     QAudioEncoderControl *audioEncoder;
     QAudioEndpointSelector *audioEndpoint;
@@ -93,8 +95,8 @@
 
 void tst_QMediaRecorder::initTestCase()
 {
-    qRegisterMetaType<QtMobility::QMediaRecorder::State>("QMediaRecorder::State");
-    qRegisterMetaType<QtMobility::QMediaRecorder::Error>("QMediaRecorder::Error");
+    qRegisterMetaType<QMediaRecorder::State>("QMediaRecorder::State");
+    qRegisterMetaType<QMediaRecorder::Error>("QMediaRecorder::Error");
 
     captureSource = new QAudioCaptureSource;
     audiocapture = new QMediaRecorder(captureSource);
@@ -109,6 +111,22 @@
     delete captureSource;
 }
 
+QUrl tst_QMediaRecorder::recordPathAudio(QDir outputDir)
+{
+    int lastImage = 0;  
+    int fileCount = 0;
+    foreach( QString fileName, outputDir.entryList(QStringList() << "testclip_*.amr") ) {
+        int imgNumber = fileName.mid(5, fileName.size()-9).toInt();
+        lastImage = qMax(lastImage, imgNumber);
+        if (outputDir.exists(fileName))             
+            fileCount+=1;        
+    }    
+    lastImage+=fileCount;
+
+    QUrl location(QDir::toNativeSeparators(outputDir.canonicalPath()+QString("/testclip_%1.amr").arg(lastImage+1,4,10,QLatin1Char('0'))));
+    return location;
+}
+
 void tst_QMediaRecorder::testAudioSink()
 {
     audiocapture->setOutputLocation(QUrl("test.tmp"));
@@ -118,13 +136,58 @@
 
 void tst_QMediaRecorder::testAudioRecord()
 {
+    QSignalSpy stateSignal(audiocapture,SIGNAL(stateChanged(QMediaRecorder::State)));    
+    QCOMPARE(audiocapture->state(), QMediaRecorder::StoppedState);     
+    QTest::qWait(500);  // wait for recorder to initialize itself 
+    audiocapture->setOutputLocation(recordPathAudio(QDir::rootPath()));        
+    audiocapture->record();
+    QTRY_COMPARE(stateSignal.count(), 1); // wait for callbacks to complete in symbian API
+    QCOMPARE(audiocapture->state(), QMediaRecorder::RecordingState);
+    QCOMPARE(audiocapture->error(), QMediaRecorder::NoError);
+    QCOMPARE(audiocapture->errorString(), QString());
+    QCOMPARE(stateSignal.count(), 1);    
+    audiocapture->pause();
+    QTRY_COMPARE(stateSignal.count(), 2); // wait for callbacks to complete in symbian API    
+    QCOMPARE(audiocapture->state(), QMediaRecorder::PausedState);
+    QCOMPARE(stateSignal.count(), 2);
+    audiocapture->stop();
+    QTRY_COMPARE(stateSignal.count(), 3); // wait for callbacks to complete in symbian API
+    QCOMPARE(audiocapture->state(), QMediaRecorder::StoppedState);
+    QCOMPARE(stateSignal.count(), 3);        
+}
+
+void tst_QMediaRecorder::testAudioRecordWithAMR()
+{
+    QSignalSpy stateSignal(audiocapture,SIGNAL(stateChanged(QMediaRecorder::State)));    
+    QCOMPARE(audiocapture->state(), QMediaRecorder::StoppedState);        
+    audiocapture->setOutputLocation(recordPathAudio(QDir::rootPath()));
+    QAudioEncoderSettings audioSettings;
+    QVideoEncoderSettings videoSettings;
+    audioSettings.setCodec("AMR");
+    QString format = audiocapture->containerMimeType();
+    format = QString("audio/amr");    
+    audiocapture->setEncodingSettings(audioSettings,videoSettings,format);
+    audiocapture->record();
+    QTRY_COMPARE(stateSignal.count(), 1); // wait for callbacks to complete in symbian API
+    QCOMPARE(audiocapture->state(), QMediaRecorder::RecordingState);
+    QCOMPARE(audiocapture->error(), QMediaRecorder::NoError);
+    QCOMPARE(audiocapture->errorString(), QString());
+    QCOMPARE(stateSignal.count(), 1);    
+    audiocapture->pause();
+    QTRY_COMPARE(stateSignal.count(), 2); // wait for callbacks to complete in symbian API    
+    QCOMPARE(audiocapture->state(), QMediaRecorder::PausedState);
+    QCOMPARE(stateSignal.count(), 2);
+    audiocapture->stop();
+    QTRY_COMPARE(stateSignal.count(), 3); // wait for callbacks to complete in symbian API
+    QCOMPARE(audiocapture->state(), QMediaRecorder::StoppedState);
+    QCOMPARE(stateSignal.count(), 3);        
 }
 
 void tst_QMediaRecorder::testAudioEndPointSelector()
 {
     QSignalSpy audioSignal(audioEndpoint,SIGNAL(activeEndpointChanged(QString)));
     QVERIFY(audioEndpoint->availableEndpoints().count() == 1);
-    QVERIFY(audioEndpoint->defaultEndpoint().compare("MMF") == 0);
+    QVERIFY(audioEndpoint->defaultEndpoint().compare("") == 0);    
     audioEndpoint->setActiveEndpoint("device2");
     QVERIFY(audioEndpoint->activeEndpoint().compare("device2") == 0);
     QVERIFY(audioSignal.count() == 1);
@@ -133,41 +196,35 @@
 
 void tst_QMediaRecorder::testAudioEncoderControl()
 {
-    QStringList codecs = audiocapture->supportedAudioCodecs();
-    QVERIFY(codecs.count() == 1);
-    QVERIFY(audiocapture->audioCodecDescription("audio/wav") == "WAV Write Format");
-    QStringList options = audioEncoder->supportedEncodingOptions("audio/wav");
-    QCOMPARE(options.count(), 0);
-    QVERIFY(audioEncoder->encodingOption("audio/wav","bitrate").toInt() == -1);
-    audioEncoder->setEncodingOption("audio/wav", "bitrate", QString("vbr"));
-    QCOMPARE(audioEncoder->encodingOption("audio/wav","bitrate").toInt(), -1);
-    QCOMPARE(audiocapture->supportedAudioSampleRates(), QList<int>() << 44100);
+    QStringList codecs = audiocapture->supportedAudioCodecs();    
+    QVERIFY(codecs.count() == 2);    
+    QVERIFY(audiocapture->audioCodecDescription("PCM") == "Pulse code modulation");
+    QStringList options = audioEncoder->supportedEncodingOptions("PCM");
+    QCOMPARE(options.count(), 3);
+    QCOMPARE(audiocapture->supportedAudioSampleRates().count(), 12);
+    audioEncoder->setEncodingOption("PCM", "channels", QVariant(2));
+    QCOMPARE(audioEncoder->encodingOption("PCM","channels").toInt(), 2);
+    audioEncoder->setEncodingOption("PCM", "quality", QVariant(int(QtMediaServices::NormalQuality)));
+    QCOMPARE(audioEncoder->encodingOption("PCM","quality").toInt(), int(QtMediaServices::NormalQuality));    
+    audioEncoder->setEncodingOption("PCM", "samplerate", QVariant(44100));
+    QCOMPARE(audioEncoder->encodingOption("PCM","samplerate").toInt(), 44100);    
 }
 
 void tst_QMediaRecorder::testMediaFormatsControl()
 {
     //audioocontainer types
-    QCOMPARE(audiocapture->supportedContainers(), QStringList() << "audio/wav" << "audio/pcm");
-    QCOMPARE(audiocapture->containerDescription("audio/pcm"), QString("WAV file format"));
-    QCOMPARE(audiocapture->containerDescription("audio/x-wav"), QString("RAW file format"));
+    QCOMPARE(audiocapture->supportedContainers(), QStringList() << "audio/wav" << "audio/amr");   
+    QCOMPARE(audiocapture->containerDescription("audio/wav"), QString("WAV Write Format"));    
+    QCOMPARE(audiocapture->containerDescription("audio/amr"), QString("AMR Write Format"));
 }
 
-/*
 void tst_QMediaRecorder::testDefaultAudioEncodingSettings()
 {
     QAudioEncoderSettings audioSettings = audiocapture->audioSettings();
     QCOMPARE(audioSettings.codec(), QString("AMR"));
     QString format = audiocapture->containerMimeType();
     QCOMPARE(format, QString("audio/amr"));
-/*    QCOMPARE(audioSettings.bitRate(), 128*1024);
-    QCOMPARE(audioSettings.sampleRate(), -1);
-    QCOMPARE(audioSettings.quality(), QtMedia::NormalQuality);
-    QCOMPARE(audioSettings.channelCount(), -1);
-
-    QCOMPARE(audioSettings.encodingMode(), QtMedia::ConstantQualityEncoding);
-
-}*/
-
+}
 
 QTEST_MAIN(tst_QMediaRecorder)

--- a/qtmobility/tests/auto/symbian/qradiotuner_s60/tst_qradiotuner_s60.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/symbian/qradiotuner_s60/tst_qradiotuner_s60.cpp	Fri May 14 16:41:33 2010 +0300
@@ -51,7 +51,7 @@
 
 #include <QMessageBox>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
 class tst_QRadioTuner: public QObject
 {
@@ -103,9 +103,6 @@
     QCOMPARE(radio->state(), QRadioTuner::StoppedState);
     QCOMPARE(stateSpy.count(), 1);
 
-#ifdef QTM_NAMESPACE
-    QEXPECT_FAIL("", "QSignalSpy doesn't grab the correct value from signal because of QtMobility namespace", Continue);
-#endif
     QCOMPARE(stateSpy.first()[0].value<QRadioTuner::State>(), QRadioTuner::StoppedState);
 
     delete radio;

--- a/qtmobility/tests/benchmarks/benchmarks.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/benchmarks/benchmarks.pro	Fri May 14 16:41:33 2010 +0300
@@ -5,9 +5,9 @@
 contains(mobility_modules,serviceframework): SUBDIRS += sampleserviceplugin  serviceframework
 contains(mobility_modules,contacts): SUBDIRS += contacts
 contains(mobility_modules,systeminfo): SUBDIRS += qsysteminfo
-#contains(mobility_modules,messaging) {
-#    contains(qmf_enabled,yes)|wince*|win32|symbian|maemo5 {
-#        !win32-g++: SUBDIRS += messaging
-#    }
-#}
+contains(mobility_modules,messaging) {
+    contains(qmf_enabled,yes)|symbian {
+        !win32-g++: SUBDIRS += messaging
+    }
+}

--- a/qtmobility/tests/benchmarks/contacts/tst_bm_contacts.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/benchmarks/contacts/tst_bm_contacts.cpp	Fri May 14 16:41:33 2010 +0300
@@ -327,11 +327,9 @@
     filter->SetContactFilterTypeALL(EFalse);
     filter->SetContactFilterTypeCard(ETrue);
     
-    CContactIdArray *iContacts = 0x0;
-    
     QBENCHMARK {
       contactsDb->FilterDatabaseL(*filter);
-      iContacts = CContactIdArray::NewLC(filter->iIds);
+      CContactIdArray *iContacts = CContactIdArray::NewLC(filter->iIds);
     }
     
     CleanupStack::PopAndDestroy(3); //iContacts, filter, contactsDb    
@@ -399,7 +397,7 @@
     int id = id_list.takeFirst();
     id_list.append(id);
     
-    CContactItem *item;
+    CContactItem *item = 0;
     TInt r;
         
     QBENCHMARK {
@@ -502,16 +500,16 @@
     
     TInt r;
     
-    CContactItem *item1;
-    CContactItem *item2;
-    CContactItem *item3;
-    CContactItem *item4;
-    CContactItem *item5;
-    CContactItem *item6;
-    CContactItem *item7;
-    CContactItem *item8;
-    CContactItem *item9;
-    CContactItem *item10;        
+    CContactItem *item1 = 0;
+    CContactItem *item2 = 0;
+    CContactItem *item3 = 0;
+    CContactItem *item4 = 0;
+    CContactItem *item5 = 0;
+    CContactItem *item6 = 0;
+    CContactItem *item7 = 0;
+    CContactItem *item8 = 0;
+    CContactItem *item9 = 0;
+    CContactItem *item10 = 0;
         
     QBENCHMARK {
       TRAP(r, item1 = contactDb->ReadContactL(id));

--- a/qtmobility/tests/benchmarks/messaging/messaging.pro	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/benchmarks/messaging/messaging.pro	Fri May 14 16:41:33 2010 +0300
@@ -19,9 +19,10 @@
 
 symbian {
     TARGET.CAPABILITY = All -TCB
-    LIBS += -lmsgs -lmsgs_autoshutdown -limcm -lsmcm -lgsmu -letext -lbafl
+    LIBS += -lmsgs -limcm -lsmcm -lgsmu -letext -lbafl
     INCLUDEPATH += $$(EPOCROOT)epoc32/include/app
     INCLUDEPATH += $$(EPOCROOT)epoc32/include/platform/app
+    INCLUDEPATH += $$(EPOCROOT)epoc32/include/applications
 }
 
 maemo {

--- a/qtmobility/tests/benchmarks/messaging/tst_messaging.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/benchmarks/messaging/tst_messaging.cpp	Fri May 14 16:41:33 2010 +0300
@@ -60,6 +60,11 @@
 #include <MSVFIND.H>  
 #include <IMPCMTM.H>
 #include <mmsclient.h>
+#include <etelmm.h>
+#include <msvapi.h>
+#include <IAPPrefs.h>
+#include <SMTCMTM.H>
+#include <SMUTHDR.H>
 #endif
 
 #include <qdebug.h>
@@ -79,126 +84,468 @@
   
   void getFolders(RArray<TMsvId> &folders);
   
+  int countMessages();
+  void deleteAllMessages();
+  void createMailAccountL();
+  void printAccounts();
+  void deleteAccounts();
+  void deleteAllFolders();
+  TInt createFolder(TPtrC name);
+  
   TMsvId makeSMS(TMsvId folder);
   TMsvId makeIMAP4(TMsvId folder);
   
   CMsvSession *iSession;
   CClientMtmRegistry *iMtmRegistry;
   CSmsClientMtm *iSmsMtm;
-  CImap4ClientMtm *iImap4Mtm;  
+  CImap4ClientMtm *iImap4Mtm;
+  CSmtpClientMtm *iSmtpMtm;
   CMmsClientMtm *iMmsMtm;
- 
+   
   RArray<TMsvId> iFolders;
   RArray<TMsvId> iNewMsgs;
+  TMsvId iMsvImapService;
+  TMsvId iMsvSmtpService;
 
 };
 
-TMsvId OsNative::makeSMS(TMsvId folder){
-  TBuf<10> aAddress(_L("Nokia"));
-  TBuf<20> aDescription(_L("Important Message"));
-
-  _LIT(KTxt1,"Hi phone owner, how r u?");
-
-  TBuf<150> iMessage;     
-  iMessage.Copy(KTxt1);
+TMsvId OsNative::makeSMS(TMsvId folder){    
+    TBuf<10> aAddress(_L("Nokia"));
+    TBuf<20> aDescription(_L("Important Message"));
+ 
+    _LIT(KTxt1,"Hi phone owner, how r u?");
+ 
+    TBuf<150> iMessage; 
+    iMessage.Copy(KTxt1);
+  
+    iSmsMtm->SwitchCurrentEntryL(folder); //inbox
+// Clean phones without a SIM doesn't have a default service
+//    TMsvId serviceId;
+//    TRAPD(err, serviceId = iSmsMtm->DefaultServiceL());
+//    if(err) {
+//      qDebug() << "No default service";
+//      return 0;
+//    }
+      
+    
+    TRAPD(err1, iSmsMtm->SwitchCurrentEntryL( folder ));
+    if(err1){
+        qDebug() << "Failed to create SMS1: " << err1;
+        return 0;
+    }
 
-//      m_native->iSmsMtm->SwitchCurrentEntryL(KMsvGlobalInBoxIndexEntryId); //inbox KMsvDraftEntryId
-  iSmsMtm->SwitchCurrentEntryL(folder);
-
-  iSmsMtm->CreateMessageL(KUidMsgTypeSMS.iUid);
-
-  CSmsHeader& iHeader = iSmsMtm->SmsHeader();
-  iHeader.SetFromAddressL(aAddress);
-
+    TRAPD(err, iSmsMtm->CreateMessageL( iSmsMtm->ServiceId() )); 
+    
+    //TRAPD(err, iSmsMtm->CreateMessageL(KMsvLocalServiceIndexEntryId));
+    if(err){
+        qDebug() << "Failed to create SMS: " << err;
+        return 0;
+    }
+    
+    CSmsHeader& iHeader = iSmsMtm->SmsHeader();
+    TRAP(err, iHeader.SetFromAddressL(aAddress));
+    if(err)
+      qDebug() << "Failed to set from address: " << err;    
+ 
+    CRichText& body = iSmsMtm->Body();
+    body.Reset();
+    TRAP(err, body.InsertL(0, iMessage));
+    if(err)
+      qDebug() << "Failed to add body: " << err;
+ 
+    TMsvEntry entry = iSmsMtm->Entry().Entry();
+    entry.SetInPreparation(EFalse);
+    entry.SetVisible(ETrue);
+    entry.iDate.HomeTime();
+    entry.iDescription.Set(aDescription);
+    entry.iDetails.Set(aAddress);
+    entry.SetUnread(ETrue);
+ 
+    TRAP(err,
+        iSmsMtm->Entry().ChangeL(entry);
+        iSmsMtm->SaveMessageL();
+        );
+    if(err)
+      qDebug() << "Failed to save changes: " << err;
+    
+   return entry.Id();
+}
 
-  CRichText& body = iSmsMtm->Body();
-  body.Reset();
-  body.InsertL(0, iMessage);
+void OsNative::printAccounts(){
+  RArray<TPopAccount> aPop;
+  RArray<TImapAccount> aImap;
+  RArray<TSmtpAccount> aSmtp;
+  CEmailAccounts* account = CEmailAccounts::NewLC();
+  TRAPD(err, 
+      account->GetPopAccountsL(aPop);
+      account->GetImapAccountsL(aImap);
+      account->GetSmtpAccountsL(aSmtp);
+      );
+  if(err){
+    qDebug()<< "Can't get all accounts";
+  }
+  
+  for(int i = 0; i < aPop.Count(); i++){
+    QString name  = QString::fromUtf16(aPop[i].iPopAccountName.Ptr(), aPop[i].iPopAccountName.Length());
+    qDebug() << "Pop account: " << name << hex << " SMTP: " << aPop[i].iSmtpService;
+//    account->DeletePopAccountL(aPop[i]);
+  }
+  for(int i = 0; i < aImap.Count(); i++){
+    QString name  = QString::fromUtf16(aImap[i].iImapAccountName.Ptr(), aImap[i].iImapAccountName.Length());
+    qDebug() << "Imap account: " << name << hex << " SMTP: " << aImap[i].iSmtpService;
+//    account->DeleteImapAccountL(aImap[i]);
+  }
+  for(int i = 0; i < aSmtp.Count(); i++){
+    QString name  = QString::fromUtf16(aSmtp[i].iSmtpAccountName.Ptr(), aSmtp[i].iSmtpAccountName.Length());
+    qDebug() << "SMTP account: " << name << hex << " Related: " << aSmtp[i].iRelatedService;
+//    account->DeleteSmtpAccountL(aSmtp[i]);
+  }
+  aPop.Close();
+  aSmtp.Close();
+  aImap.Close();
+  CleanupStack::PopAndDestroy(account);
+}
 
-  TMsvEntry entry = iSmsMtm->Entry().Entry();
-  entry.SetInPreparation(EFalse);
-  entry.SetVisible(ETrue);
-  entry.iDate.HomeTime();
-  entry.iDescription.Set(aDescription);
-  entry.iDetails.Set(aAddress);
-  entry.SetUnread(EFalse);
+void OsNative::deleteAccounts(){
+  RArray<TPopAccount> aPop;
+  RArray<TImapAccount> aImap;
+  RArray<TSmtpAccount> aSmtp;
+  CEmailAccounts* account = CEmailAccounts::NewLC();
+  TRAPD(err, 
+      account->GetPopAccountsL(aPop);
+      account->GetImapAccountsL(aImap);
+      account->GetSmtpAccountsL(aSmtp);
+      );
+  if(err){
+    qDebug()<< "Can't get all accounts";
+  }
+  
+  for(int i = 0; i < aPop.Count(); i++){
+    QString name  = QString::fromUtf16(aPop[i].iPopAccountName.Ptr(), aPop[i].iPopAccountName.Size());
+    if(name.startsWith("BMTestAccount"))
+      account->DeletePopAccountL(aPop[i]);
+  }
+  for(int i = 0; i < aImap.Count(); i++){
+    QString name  = QString::fromUtf16(aImap[i].iImapAccountName.Ptr(), aImap[i].iImapAccountName.Size());
+    if(name.startsWith("BMTestAccount"))
+      account->DeleteImapAccountL(aImap[i]);
 
-
-  iSmsMtm->Entry().ChangeL(entry);
-  iSmsMtm->SaveMessageL();
-  
-  return entry.Id();
+  }
+  for(int i = 0; i < aSmtp.Count(); i++){
+    QString name  = QString::fromUtf16(aSmtp[i].iSmtpAccountName.Ptr(), aSmtp[i].iSmtpAccountName.Size());
+    if(name.startsWith("BMTestAccount"))
+      account->DeleteSmtpAccountL(aSmtp[i]);
+  }
+  aPop.Close();
+  aSmtp.Close();
+  aImap.Close();
+  CleanupStack::PopAndDestroy(account);
 }
 
 TMsvId OsNative::makeIMAP4(TMsvId folder){
-  TBuf<20> aSubject(_L("Test Subject"));
-  TBuf<20> aFrom(_L("Nokia@foo.com"));
-  TBuf<20> aTo(_L("Boo@bar.com"));
-  TBuf<20> aDescription(_L("Test Message"));
+
+  // create a new object to access an existing entry
+  CMsvEntry* msvEntry = CMsvEntry::NewL(*iSession, KMsvGlobalInBoxIndexEntryId, TMsvSelectionOrdering());
+  CleanupStack::PushL(msvEntry); // 1
+              
+  msvEntry->SetEntryL(folder);
+  
+  // mtm takes ownership of entry context     
+  CleanupStack::Pop(msvEntry); // 0
+  iSmtpMtm->SetCurrentEntryL(msvEntry);
+  
+  // create a new message
+  TMsvId defaultServiceId(0);
+  defaultServiceId = iSmtpMtm->DefaultServiceL();
+  CMsvEntry *pE = iSession->GetEntryL(defaultServiceId);
+  CleanupStack::PushL(pE);  
+  QString name = QString::fromUtf16(pE->Entry().iDetails.Ptr(), pE->Entry().iDetails.Length());
+  CleanupStack::PopAndDestroy(pE);
+  iSmtpMtm->CreateMessageL(defaultServiceId);
+  
+  // set subject
+  iSmtpMtm->SetSubjectL( _L("Test Message") );
+  // set body
+  iSmtpMtm->Body().Reset();
+  iSmtpMtm->Body().InsertL(0, _L("This is the text body")); 
+
+  // get the entry of the message
+  TMsvEntry messageEntry = iSmtpMtm->Entry().Entry();
+//      AddSenderToMtmAddresseeL(*iSmtpMtm, parameters, ETrue );
+//      SetSenderToEntryDetails(messageEntry, parameters, ETrue);
+  messageEntry.iMtm = KUidMsgTypeIMAP4;  // or any other than KUidMsgTypeSMTP to display 'from' field instead of 'to' field 
 
-  _LIT(KTo, "Boo@bar.com");
-  _LIT(KTxt1,"Test autogenerated message by benchmark/tst_messaging for performance testing");
+  // set the description field same as the message subject
+  messageEntry.iDescription.Set( _L("test") );  
+  messageEntry.iDetails.Set( _L("test subject") );
+
+  // save the changes done above
+  iSmtpMtm->Entry().ChangeL(messageEntry);
+  // get an access to the message store
+  CMsvStore* store = msvEntry->EditStoreL();
+  CleanupStack::PushL(store); // 1
+  
+  // save the attachments
 
-  TBuf<150> iMessage;     
-  iMessage.Copy(KTxt1);
-
-//      m_native->iSmsMtm->SwitchCurrentEntryL(KMsvGlobalInBoxIndexEntryId); //inbox KMsvDraftEntryId
-  iImap4Mtm->SwitchCurrentEntryL(folder); 
+  // save the changes made to the message store
+  store->CommitL();
+  CleanupStack::PopAndDestroy(store); // 0 
+  // save the message      
+  iSmtpMtm->SaveMessageL();
+  // final fine tuning
+  TMsvEmailEntry temailEntry = static_cast<TMsvEmailEntry>(messageEntry);
+  temailEntry.SetMessageFolderType(EFolderTypeUnknown);
+  temailEntry.SetDisconnectedOperation(ENoDisconnectedOperations);
+  temailEntry.SetEncrypted(EFalse);
+  temailEntry.SetSigned(EFalse);
+  temailEntry.SetVCard(EFalse);
+  temailEntry.SetVCalendar(EFalse);
+  temailEntry.SetReceipt(EFalse);
+  temailEntry.SetMHTMLEmail(EFalse);
+  temailEntry.SetBodyTextComplete(ETrue);
+  
+  temailEntry.SetAttachment(EFalse);
+      
+  temailEntry.iDate.HomeTime();
+  temailEntry.SetVisible(ETrue);
+  temailEntry.SetInPreparation(EFalse);
+  temailEntry.SetUnread(ETrue);
+  temailEntry.SetNew(ETrue);
 
-  // Set the context to the folder in which message has to be created
-  CMsvEntry* entry = CMsvEntry::NewL(*iSession,folder,TMsvSelectionOrdering());
-  CleanupStack::PushL(entry);
-  entry->SetEntryL(folder);
+  temailEntry.SetComplete(ETrue);
+  temailEntry.iServiceId = iMsvSmtpService;
+  temailEntry.iRelatedId = 0;
+  
+  iSmtpMtm->Entry().ChangeL(temailEntry);
+
+  // reset email headers
+  CImHeader* header = CImHeader::NewLC(); // 1
+  CMsvStore* msvStore = msvEntry->EditStoreL();
+  CleanupStack::PushL(msvStore); // 2
+  header->RestoreL(*msvStore);
+  header->SetSubjectL( _L("test email") );
+  header->SetFromL( _L("blah@blah.com") );
+  header->SetReceiptAddressL( _L("Foo@bar.com") );
+  header->StoreL( *msvStore );
+  msvStore->CommitL();
+  CleanupStack::PopAndDestroy(2); // msvStore, header // 0
+  
+  // id has been generated, store it for being able to delete
+  // only entries created with Creator
+  TMsvId id = messageEntry.Id();
+  return id;
+}
+
+
+void OsNative::deleteAllFolders() {
+
+    RArray<TMsvId> aFolders;
+    
+    TRAP_IGNORE(getFolders(aFolders));   
+    
+    TMsvSelectionOrdering sort;
+    sort.SetSorting(EMsvSortByNone);
+    sort.SetShowInvisibleEntries(ETrue);
 
-  CMsvOperationActiveSchedulerWait* waiter=CMsvOperationActiveSchedulerWait::NewLC();  
-  //CleanupStack::PushL(waiter);
+    for(int i = 0; i < aFolders.Count(); i++) {
+        CMsvEntry* inboxContext = CMsvEntry::NewL(*iSession, aFolders[i], sort);                
+        CleanupStack::PushL(inboxContext);
+    
+        // Get all entries in the folder
+        CMsvEntrySelection* entries = inboxContext->ChildrenL();
+        CleanupStack::PushL(entries);
+        QString desc = QString::fromUtf16(inboxContext->Entry().iDetails.Ptr(), inboxContext->Entry().iDetails.Length());
+        
+        for (TInt j = 0; j < entries->Count(); j++) {
+            CMsvEntry* pEntry = CMsvEntry::NewL(*iSession, entries->At(j), sort);
+            CleanupStack::PushL(pEntry);
+            QString desc2 = QString::fromUtf16(pEntry->Entry().iDetails.Ptr(), pEntry->Entry().iDetails.Length());
 
-  TMsvEmailTypeList msvEmailTypeList = 0;
-  TMsvPartList partList = (KMsvMessagePartBody | KMsvMessagePartAttachments);
+            const TMsvEntry &entry = pEntry->Entry();            
+            if((desc != "My folders" || desc2 == "Templates")) {
+              CleanupStack::PopAndDestroy(pEntry);
+              continue;
+            }
+                        
+            CleanupStack::PopAndDestroy(pEntry);
+            
+            TMsvId id = entries->At(j);
+            qDebug() << "Deleting: " << desc << "/" << desc2;
+            TRAPD(ierr, iSession->RemoveEntry(id)); // works
+            if(ierr){
+                qDebug() << "Failed to delete: " << ierr << " " << hex << entries->At(j);
+            }            
+        }        
+        CleanupStack::PopAndDestroy(2, inboxContext);
+    }
+}
 
-  CImEmailOperation* emailOperation = CImEmailOperation::CreateNewL(waiter->iStatus, *iSession,KMsvGlobalOutBoxIndexEntryId, partList, msvEmailTypeList, KUidMsgTypeSMTP);
-  CleanupStack::PushL(emailOperation);
-  waiter->Start();
+void OsNative::createMailAccountL() {
+  CImIAPPreferences* outgoingIAPSet = CImIAPPreferences::NewLC(); // 1
+  CImIAPPreferences* incomingIAPSet = CImIAPPreferences::NewLC(); // 2
+  CEmailAccounts* account = CEmailAccounts::NewLC(); // 3
+
+  CImImap4Settings* imap4Set = new(ELeave) CImImap4Settings;
+  CleanupStack::PushL(imap4Set); // 4
+  CImSmtpSettings* smtpSet = new(ELeave) CImSmtpSettings;
+  CleanupStack::PushL(smtpSet); // 5
 
-  TMsvId temp;
-  TPckgC<TMsvId> paramPack(temp);
-  const TDesC8& progBuf = emailOperation->ProgressL();
-  paramPack.Set(progBuf);
-  TMsvId newMessageId;
-  newMessageId = paramPack();
+  account->PopulateDefaultSmtpSettingsL(*smtpSet, *outgoingIAPSet);
+  account->PopulateDefaultImapSettingsL(*imap4Set, *outgoingIAPSet);
+  
+ imap4Set->SetDisconnectedUserMode(ETrue);
+ imap4Set->SetSynchronise(EUseLocal);
+ imap4Set->SetSubscribe(EUpdateNeither);
+ imap4Set->SetAutoSendOnConnect(EFalse);
+ imap4Set->SetGetMailOptions(EGetImap4EmailBodyText);
+ imap4Set->SetUpdatingSeenFlags(ETrue);
+ imap4Set->SetServerAddressL(_L("test.sdfsdf.wer.sadazsdsddf.com"));
+
+ TImapAccount imapAccountId = account->CreateImapAccountL(_L("BMTestAccount"), *imap4Set, *incomingIAPSet, EFalse);
+ TSmtpAccount smtpAccountId = account->CreateSmtpAccountL(imapAccountId, *smtpSet, *outgoingIAPSet, EFalse);
+ account->SetDefaultSmtpAccountL(smtpAccountId);
+
+ iMsvImapService = imapAccountId.iImapService;
+ iMsvSmtpService = smtpAccountId.iSmtpAccountId;
+ 
+ // Fails with NotSupported 
+ //iImap4Mtm->ChangeDefaultServiceL(iMsvImapService);
+ // Failed with invalid arg
+ // iSmtpMtm->ChangeDefaultServiceL(iMsvSmtpService);
+ CleanupStack::PopAndDestroy(5);
+ 
+}
+
+int OsNative::countMessages() {
+
+    RArray<TMsvId> aFolders;
+    int total = 0;
+
+    TRAPD(err, getFolders(aFolders));
+    if(err){
+        qDebug() << "getFodlers faield: " << err;
+        return 0;
+    }
 
-  entry->SetEntryL(newMessageId);
+    for(int i = 0; i < aFolders.Count(); i++){
+        TMsvSelectionOrdering sort;
+        sort.SetSorting(EMsvSortByNone);
+        sort.SetShowInvisibleEntries(ETrue);
+        CMsvEntry* inboxContext = CMsvEntry::NewL(*iSession, 
+                aFolders[i], sort);                
+        CleanupStack::PushL(inboxContext); // 1
+    
+        // Get all entries in the Inbox
+        CMsvEntrySelection* entries = inboxContext->ChildrenL();
+        CleanupStack::PushL(entries); // 2
+        for (TInt i = 0; i < entries->Count(); i++) {              
+    
+            TMsvId entryID = entries->At(i);
+        
+            const TUid mtm = inboxContext->ChildDataL(entryID).iMtm;
+            if (mtm == KUidMsgTypeSMS) {
+                total++;
+            }
+            else if ((mtm == KUidMsgTypeIMAP4) || (mtm == KUidMsgTypeSMTP)) {
+                total++;                
+            }
+            else {
+            }           
+        }
+        CleanupStack::PopAndDestroy(2, inboxContext);
+    }
+    return total;
+}
 
-  CMsvStore* store = entry->EditStoreL();
-  CleanupStack::PushL(store);
-  CImHeader* emailEntry = CImHeader::NewLC();
-  emailEntry->RestoreL(*store);
-  emailEntry->SetFromL((TDesC8&)aFrom);
-  emailEntry->SetSubjectL((TDesC&)aDescription);
-  emailEntry->ToRecipients().AppendL(KTo);
+void OsNative::deleteAllMessages() {
+
+    RArray<TMsvId> aFolders;    
+
+    TRAPD(err, getFolders(aFolders));
+    if(err){
+        qDebug() << "getFodlers faield: " << err;
+        return;
+    }
 
-  // Paragraph format layer for the rich text object 
-  CParaFormatLayer* paraFormatLayer = CParaFormatLayer::NewL();
-  CleanupStack::PushL(paraFormatLayer);
-  // Character format layer for the rich text object
-  CCharFormatLayer* charFormatLayer = CCharFormatLayer::NewL(); 
-  CleanupStack::PushL(charFormatLayer);
+    for(int i = 0; i < aFolders.Count(); i++){
+        TMsvSelectionOrdering sort;
+        CMsvEntry* inboxContext = CMsvEntry::NewL(*iSession, aFolders[i], sort);                
+        CleanupStack::PushL(inboxContext); // 1
+    
+        // Get all entries in the Inbox
+        CMsvEntrySelection* entries = inboxContext->ChildrenL();
+        CleanupStack::PushL(entries); // 2
+        for (TInt i = 0; i < entries->Count(); i++) {              
+    
+            TMsvId entryID = entries->At(i);        
+            const TUid mtm = inboxContext->ChildDataL(entryID).iMtm;
+            
+            if ((mtm == KUidMsgTypeSMS) || (mtm == KUidMsgTypeIMAP4) || (mtm == KUidMsgTypeSMTP)) {
+                iSession->RemoveEntry(entryID);                
+            }
+        }
+        CleanupStack::PopAndDestroy(2, inboxContext);
+    }
+}
 
-  CRichText* bodyText = CRichText::NewL(paraFormatLayer, charFormatLayer, CEditableText::EFlatStorage, 256);
-  CleanupStack::PushL(bodyText);
+
+#define KMsvMyFoldersEntryIdValue 0x1008
+const TMsvId KMsvMyFoldersEntryId=KMsvMyFoldersEntryIdValue;
 
-  // Insert the contents of a buffer into the document at specified position
-  bodyText->InsertL(0, KTxt1);
-  store->StoreBodyTextL(*bodyText);
-  emailEntry->StoreL(*store);
-  // Store the changes permanently
-  store->CommitL();
+TInt OsNative::createFolder(TPtrC name){
+    TMsvId msvServId;                                                                       
+    CMsvEntry *entry1 = NULL;                                                                
+    CMsvEntry * rootEntry = NULL;                                                           
+    CMsvEntry *entryRootService = NULL;                                                     
+     
+    TInt newFldrID = 0;                                                                     
+     
+    //Get the entry (whatever is passed in)                                                    
+    entry1 = iSession->GetEntryL(KMsvMyFoldersEntryIdValue);   
+    CleanupStack::PushL(entry1);                                                             
+     
+    if (entry1)                                                                              
+    {                          
+        msvServId = entry1->OwningService();                                                    
+     
+        entryRootService = iSession->GetEntryL(msvServId);                            
+        CleanupStack::PushL(entryRootService);                                                 
+     
+        rootEntry = iSession->GetEntryL(msvServId);                                   
+        CleanupStack::PushL(rootEntry);                                                        
+     
+        rootEntry->SetEntryL(KMsvMyFoldersEntryIdValue); // set to parent
+     
+        TMsvEntry newServiceEntry;                                                             
 
-  CleanupStack::PopAndDestroy(8,entry); // bodyText,charFormatLayer,paraFormatLayer,emailEntry,store, emailOperationg,waiter,entry
- 
-  return entry->EntryId();
+        newServiceEntry.iDate.HomeTime();
+        newServiceEntry.iSize = 0;
+        newServiceEntry.iType = KUidMsvFolderEntry;                                            
+        newServiceEntry.iMtm = KUidMsvLocalServiceMtm;
+//        newServiceEntry.iServiceId = iSmsMtm->ServiceId();
+//        newServiceEntry.iServiceId = KMsvLocalServiceIndexEntryId;
+        newServiceEntry.iServiceId = iMsvImapService;
+        newServiceEntry.iDetails.Set(name);                                             
+        newServiceEntry.iDescription.Set(KNullDesC);
+        newServiceEntry.SetVisible(ETrue);        
+
+        TRAPD(err, rootEntry->CreateL(newServiceEntry));
+        if(err){
+            QString n = QString::fromUtf16(name.Ptr(), name.Size());
+            qDebug() << "Failed to create folder "<< n << ": " << err;
+            User::Panic(_L("Fail"), err);            
+        }
+//        qDebug() << "iError: " << newServiceEntry.iError << " complete: " << newServiceEntry.Complete() << " prot: " << newServiceEntry.DeleteProtected();
+//        newFldrID = newServiceEntry.Id();                                                      
+        CleanupStack::PopAndDestroy();                                                         
+        CleanupStack::PopAndDestroy();                                                         
+    }
+    CleanupStack::PopAndDestroy(entry1);
+    
+    return newFldrID;
 }
 
+
 #else
     class OsNative {
       
@@ -258,7 +605,7 @@
 private slots:
     void initTestCase();
     void cleanupTestCase();
-    
+                
     void tst_createTime_data();
     void tst_createTime();
 
@@ -279,7 +626,7 @@
 
     void tst_addMessage_data();
     void tst_addMessage();
-            
+
     void tst_removeMessage_data();
     void tst_removeMessage();
     
@@ -323,20 +670,6 @@
     QFAIL("Platform not supported");
 #endif
 
-    m_mgr = new QMessageManager();
-    
-    QMessageAccountIdList list;
-    list = m_mgr->queryAccounts();
-    while(!list.empty()) {      
-      QMessageAccount act = m_mgr->account(list.takeFirst());
-      qDebug() << "Account: " << act.name();
-#if defined(Q_OS_SYMBIAN)      
-      if(act.name() == "Personal"){
-        m_act = act;
-        break;
-      }     
-#endif      
-    }
 
 //    QMessageFolderIdList flist = m_mgr->queryFolders();
 //    while(!flist.empty()) {      
@@ -358,18 +691,90 @@
     m_native->iSmsMtm = STATIC_CAST(CSmsClientMtm*, m_native->iMtmRegistry->NewMtmL(KUidMsgTypeSMS));
     m_native->iImap4Mtm = STATIC_CAST(CImap4ClientMtm*, m_native->iMtmRegistry->NewMtmL(KUidMsgTypeIMAP4));
     m_native->iMmsMtm = STATIC_CAST(CMmsClientMtm*, m_native->iMtmRegistry->NewMtmL(KUidMsgTypeMultimedia));
+    m_native->iSmtpMtm = STATIC_CAST(CSmtpClientMtm*,(m_native->iMtmRegistry->NewMtmL(KUidMsgTypeSMTP)));  
+
+    qDebug() << "Print accounts";
+    m_native->printAccounts();
+    qDebug() << "Delete accounts";
+    m_native->deleteAccounts();
+    qDebug() << "Delete all folders and messages";
+    m_native->deleteAllFolders();
+    m_native->deleteAllMessages();
+    qDebug() << "Create accounts";
+    TRAPD(err, m_native->createMailAccountL());
+    if(err)
+      qDebug() << "Account create failed: " << err;
+    qDebug() << "Oustanding ops: " << m_native->iSession->OutstandingOperationsL();
+    m_native->printAccounts();
+    qDebug() << "Create 3 folders";
+    m_native->createFolder(_L("Test1"));    
+    m_native->createFolder(_L("Test2"));
+    m_native->createFolder(_L("Test3"));
     
+// Created messages with QMF, our symbian messages aren't very good    
+//    qDebug() << "Create 15 emails";
+//    for(int count = 0; count < 15; count++){
+//      TRAP(err, TMsvId id = m_native->makeIMAP4(KMsvGlobalInBoxIndexEntryId);
+//      m_native->iNewMsgs.Append(id));
+//      if(err){
+//        qDebug() << "Error: " << err;
+//      }
+//    }
+    
+   
+// Can't create SMS messages on a phone with no msg center
+//    qDebug() << "Create 15 SMS: " << m_native->iNewMsgs.Count();
+//    TRAPD(err, 
+//    for(int count = 0; count < 15; count++){
+//        TMsvId id = m_native->makeSMS(KMsvDraftEntryId); 
+//        m_native->iNewMsgs.Append(id);
+//    }
+//    );    
+    qDebug() << "Initial state is set: " << m_native->iNewMsgs.Count();
+    RArray<TMsvId> folders;
+    m_native->getFolders(folders);
+    qDebug() << "Number of folders: " << folders.Count();
+    folders.Close();    
+    qDebug() << "Number of messages: " << m_native->countMessages();    
+#else
+// this doesn't really create testable messages on symbian
+    for(int i = 0; i < 30; i++)
+      createMessage();
 #endif
 
-    for(int i = 0; i < 20; i++)
+    m_mgr = new QMessageManager();
+    
+    QMessageAccountIdList list;
+    list = m_mgr->queryAccounts();
+    while(!list.empty()) {      
+      QMessageAccount act = m_mgr->account(list.takeFirst());
+      qDebug() << "Account: " << act.name();
+#if defined(Q_OS_SYMBIAN)           
+      if(act.name() == "BMTestAccount"){
+        qDebug() << "Using this account";
+        m_act = act;        
+        break;
+      }     
+#endif      
+    }
+
+    
+    for(int i = 0; i < 30; i++)
       createMessage();
-    
 }
 
 void tst_messaging::cleanupTestCase()
 {
   
+  clearMessages();
+  
 #if defined(Q_OS_SYMBIAN)
+  qDebug() << "Delete: Oustanding ops: " << m_native->iSession->OutstandingOperationsL() << " outstanding messages: " << m_native->countMessages();
+  m_native->deleteAccounts();
+  m_native->deleteAllFolders();
+  m_native->deleteAllMessages();
+  m_native->iSession->RemoveEntry(m_native->iMsvImapService);
+  m_native->iSession->RemoveEntry(m_native->iMsvSmtpService);
   delete m_native->iMmsMtm;
   delete m_native->iImap4Mtm;
   delete m_native->iSmsMtm;
@@ -377,8 +782,7 @@
   delete m_native->iSession;
   delete m_native;
 #endif
-  
-  clearMessages();
+    
   delete m_mgr;
 
 
@@ -416,6 +820,7 @@
       __UHEAP_MARK;
       
       if(m_native){
+        delete m_native->iSmtpMtm;
         delete m_native->iMmsMtm;
         delete m_native->iImap4Mtm;
         delete m_native->iSmsMtm;
@@ -432,6 +837,7 @@
         m_native->iSmsMtm = STATIC_CAST(CSmsClientMtm*, m_native->iMtmRegistry->NewMtmL(KUidMsgTypeSMS));
         m_native->iImap4Mtm = STATIC_CAST(CImap4ClientMtm*, m_native->iMtmRegistry->NewMtmL(KUidMsgTypeIMAP4));
         m_native->iMmsMtm = STATIC_CAST(CMmsClientMtm*, m_native->iMtmRegistry->NewMtmL(KUidMsgTypeMultimedia));
+        m_native->iSmtpMtm = STATIC_CAST(CSmtpClientMtm*, m_native->iMtmRegistry->NewMtmL(KUidMsgTypeSMTP));
       }
       
       __UHEAP_MARKEND;
@@ -609,127 +1015,23 @@
         
       }
       else if(base == tst_messaging::Folders){
-        
-        __UHEAP_MARK;
-        
-        CEmailAccounts *email = CEmailAccounts::NewLC();
-        RArray<TPopAccount> aPop;
-        RArray<TImapAccount> aImap;
-        RArray<TSmtpAccount> aSmtp;
-                
-        email->GetPopAccountsL(aPop);
-        email->GetImapAccountsL(aImap);
-        email->GetSmtpAccountsL(aSmtp);
-                
-
-        RArray<TMsvId> aService;
-        
-//        qDebug() << "Pop Service: " << aPop.Count();
-//        qDebug() << "Imap Service: " << aImap.Count();
-//        qDebug() << "Smtp Service: " << aSmtp.Count();
-        
-        for(int i = 0; i < aPop.Count(); i++){
-          aService.Append(aPop[i].iPopService);
-        }
-        for(int i = 0; i < aImap.Count(); i++){
-          aService.Append(aImap[i].iImapService);
-        }
-        for(int i = 0; i < aSmtp.Count(); i++){
-          aService.Append(aSmtp[i].iSmtpService);
-        }
-        
-             
-        if(aService.Count() == 0)
-          QFAIL("No folders avaailable to query");
-        
-//        qDebug() << "Total services: " << aService.Count();
-        
-        int total;
-
-        
-        CMsvEntry* pEntry = NULL;        
-        TRAPD(err, pEntry = m_native->iSession->GetEntryL(aService[0]));        
-        if(err)
-          QFAIL("Can't create entry object");
-        CleanupStack::PushL(pEntry);
-
-        
-        QBENCHMARK {
-          total = 0;
-          for(int i = 0; i < aService.Count(); i++){
-            
-            TMsvId msvid = aService[i];
-            
-            TRAP(err, pEntry->SetEntryL(msvid)); // faster to call set, saves .2ms out of 2.7ms.
-            if(err){
-              qDebug() << "Failed: " << err;
-              continue;
-            }
-
-            
-            const TMsvEntry& entry = pEntry->Entry();
-                        
-            if (entry.iMtm == KUidMsgTypeSMS || entry.iMtm == KUidMsgTypeMultimedia || entry.iMtm == KUidMsgTypeSMTP) {
-              total += 4;
-#define KDocumentsEntryIdValue    0x1008
-              pEntry->SetEntryL(KDocumentsEntryIdValue);
-            }
-            
-            if (entry.iMtm == KUidMsgTypePOP3) {
-                total+=1;
-                continue;
-            }
-            
-            CMsvEntryFilter* pFilter = CMsvEntryFilter::NewLC();
-            pFilter->SetService(msvid);
-            pFilter->SetType(KUidMsvFolderEntry);
-
-            CMsvEntrySelection* pSelection = new(ELeave) CMsvEntrySelection;
-            CleanupStack::PushL(pSelection);
-
-            m_native->iSession->GetChildIdsL(pEntry->Entry().Id(), *pFilter, *pSelection);
-            if (pSelection->Count() > 0) {
-              for(TInt i = 0; i < pSelection->Count(); i++) {
-//                ids.append(createQMessageFolderId(folderServiceEntryId, pSelection->At(i)));
-//                qDebug() << "serviceId: " << msvid << " Got one: " <<  "selected: " << pSelection->At(i);
-                total++;
-                m_native->iFolders.Append(pSelection->At(i));
-              }              
-            }
-            else {               
-//              QString details = QString::fromUtf16(entry.iDetails.Ptr(),entry.iDetails.Length());
-//              QString desc = QString::fromUtf16(entry.iDescription.Ptr(),entry.iDescription.Length());
-//              qDebug() << "Nothing returned for: " << msvid << "entry: " << details << " - " << desc;
-            }
-            CleanupStack::PopAndDestroy(pSelection);
-            CleanupStack::PopAndDestroy(pFilter);
-
+          RArray<TMsvId> aFolders;
+          QBENCHMARK {
+              m_native->getFolders(aFolders);
+              aFolders.Close();              
           }
-        }
-        
-//        qDebug() << "Number of Folders: " << total;
-        
-        aPop.Close();
-        aImap.Close();
-        aSmtp.Close();
-        aService.Close();
-        
-        CleanupStack::PopAndDestroy(pEntry);        
-        CleanupStack::PopAndDestroy(email);
-        
-        __UHEAP_MARKEND;
-        
       }
       else if(base == tst_messaging::Messages) {
         
         RArray<TMsvId> aFolders;
         
-        aFolders.Append(KMsvGlobalInBoxIndexEntryId);
-        aFolders.Append(KMsvGlobalOutBoxIndexEntryId);
-        aFolders.Append(KMsvDraftEntryId);
-        aFolders.Append(KMsvSentEntryId);
-        for(int i = 0; i < m_native->iFolders.Count(); i++)
-          aFolders.Append(m_native->iFolders[i]);
+//        aFolders.Append(KMsvGlobalInBoxIndexEntryId);
+//        aFolders.Append(KMsvGlobalOutBoxIndexEntryId);
+//        aFolders.Append(KMsvDraftEntryId);
+//        aFolders.Append(KMsvSentEntryId);
+//        for(int i = 0; i < m_native->iFolders.Count(); i++)
+//          aFolders.Append(m_native->iFolders[i]);
+        m_native->getFolders(aFolders);
 
         // Access the Inbox
         QBENCHMARK {
@@ -777,7 +1079,6 @@
     QTest::newRow("Native-Folders") << tst_messaging::Native << tst_messaging::Folders;
     QTest::newRow("Qt-Messages") << tst_messaging::QMessaging << tst_messaging::Messages;
     QTest::newRow("Native-Messages") << tst_messaging::Native << tst_messaging::Messages;
-  //qDebug() << "End fetch_data";
 }
 
 void tst_messaging::tst_fetch()
@@ -834,24 +1135,26 @@
         __UHEAP_MARK;
         // Access the Inbox
         QBENCHMARK {
-
           TMsvSelectionOrdering sort;
           sort.SetSorting(EMsvSortByDateReverse);
           sort.SetShowInvisibleEntries(ETrue);
 
           CMsvEntry* inboxContext = CMsvEntry::NewL(*m_native->iSession, 
-              KMsvGlobalInBoxIndexEntryId, sort);                
+                  KMsvDraftEntryIdValue /*KMsvGlobalInBoxIndexEntryId*/, sort);                
           CleanupStack::PushL(inboxContext);
 
           // Get all entries in the Inbox
           CMsvEntrySelection* entries = inboxContext->ChildrenL();
           CleanupStack::PushL(entries);
 
+          if(entries->Count() == 0){
+              CleanupStack::PopAndDestroy(2, inboxContext);
+              QSKIP("No messages on device to list", SkipAll);              
+          }
           TMsvId entryID = entries->At(0);
           const TUid mtm = inboxContext->ChildDataL(entryID).iMtm;
 
           if (mtm == KUidMsgTypeSMS) {
-
             m_native->iSmsMtm->SwitchCurrentEntryL(entryID);
             TRAPD(err, m_native->iSmsMtm->LoadMessageL());
             if(err){
@@ -861,7 +1164,6 @@
             CSmsHeader& header = m_native->iSmsMtm->SmsHeader();
           }
           else if (mtm == KUidMsgTypeMultimedia) {
-
             // TODO None of these have a data store...skip until it can be fixed
             QFAIL("MMS message handeling is broken, change setup to use non-MMS type");
           }
@@ -869,12 +1171,16 @@
             m_native->iImap4Mtm->SwitchCurrentEntryL(entryID);
             m_native->iImap4Mtm->LoadMessageL();            
           }
+          else if (mtm == KUidMsgTypeSMTP){
+            m_native->iSmtpMtm->SwitchCurrentEntryL(entryID);
+            m_native->iSmtpMtm->LoadMessageL();
+          }
           else {
-            qDebug() << "Got Type: " << mtm.iUid;
+            qDebug() << "Got Type: " << hex << mtm.iUid;
           }
           CleanupStack::PopAndDestroy(2, inboxContext);
         }
-        __UHEAP_MARKEND;        
+        __UHEAP_MARKEND;
       }
 
 #endif
@@ -927,18 +1233,14 @@
         QMessageIdList list;
         QMessage msg;
         list = m_mgr->queryMessages();
+        if(list.count() == 0)
+          QFAIL("No messages to fetch");
+
         qDebug() << "Total fetched messages: " << list.count(); 
         QBENCHMARK {
           while(!list.empty())
             msg = m_mgr->message(list.takeFirst());
-        }
-// TODO this selects messages in built "My Folders" which the test for symbian native doesn't.  Fix me.        
-//        list = m_mgr->queryMessages();
-//        while(!list.empty()) {
-//          msg = m_mgr->message(list.takeFirst());
-//          qDebug() << "From: " << msg.from().recipient() << " subject: " << msg.subject();
-//        }        
-        
+        }        
       }
       //qDebug() << "Got cnt: " << cnt;      
     }
@@ -1012,13 +1314,13 @@
 //                }
                 skipped++;
               }
-              else if (mtm == KUidMsgTypeIMAP4) {                 
+              else if (mtm == KUidMsgTypeIMAP4 || mtm == KUidMsgTypeSMTP) {                 
                  CMsvEntry* pEntry = NULL;        
                  pEntry = m_native->iSession->GetEntryL(entryID);
 
                  CImEmailMessage *pMsg = CImEmailMessage::NewLC(*pEntry);                 
 
-                 CMsvStore *store;                 
+                 CMsvStore *store = 0x0;
                  TRAPD(err, store = pEntry->ReadStoreL());
                  if(err){
 //                   TPtrC sub;
@@ -1044,25 +1346,20 @@
                  //header buffer contains the "header" of the mail.
                  TBuf<50> from = header->From();
 
-//                 TODO: Find out why we don't select messages from the system My Folder store.
-//                 QString qsubject = QString::fromUtf16(subject.Ptr(),subject.Length());
-//                 QString qfrom = QString::fromUtf16(from.Ptr(),from.Length());
-//                 qDebug() << "From: " << qfrom << " subject: " << qsubject;
-
                  CleanupStack::PopAndDestroy(header);
                  CleanupStack::PopAndDestroy(store);
                  CleanupStack::PopAndDestroy(pMsg);
-                 
+                                  
                  total++;
-               }
+               }              
               else {
 //                qDebug() << "Got Type: " << mtm.iUid;
-              }
+              }              
             }
             CleanupStack::PopAndDestroy(2, inboxContext);           
           }          
         }
-        qDebug() << "Total messages fetched: " << total << " skipped: " << skipped;
+//        qDebug() << "Total messages fetched: " << total << " skipped: " << skipped;
         __UHEAP_MARKEND;
       }            
 #endif
@@ -1085,7 +1382,8 @@
   QTest::newRow("Qt-Status") << tst_messaging::QMessaging << tst_messaging::Status;
   QTest::newRow("Qt-Priority") << tst_messaging::QMessaging << tst_messaging::Priority;
   QTest::newRow("Qt-Size") << tst_messaging::QMessaging << tst_messaging::Size;
-  QTest::newRow("Qt-AllId") << tst_messaging::QMessaging << tst_messaging::AllId;
+  // XXX Test is broken, User::Panic(47) on symbian
+//  QTest::newRow("Qt-AllId") << tst_messaging::QMessaging << tst_messaging::AllId;
   QTest::newRow("Qt-AllSender") << tst_messaging::QMessaging << tst_messaging::AllSender;
   
   QTest::newRow("Native-Id") << tst_messaging::Native << tst_messaging::Id;
@@ -1095,7 +1393,7 @@
   QTest::newRow("Native-TimeStamp") << tst_messaging::Native << tst_messaging::TimeStamp;
   QTest::newRow("Native-Status") << tst_messaging::Native << tst_messaging::Status;
   QTest::newRow("Native-Priority") << tst_messaging::Native << tst_messaging::Priority;
-  QTest::newRow("Native-Size") << tst_messaging::Native << tst_messaging::Size;
+  QTest::newRow("Native-Size") << tst_messaging::Native << tst_messaging::Size;  
   QTest::newRow("Native-AllId") << tst_messaging::Native << tst_messaging::AllId;
   QTest::newRow("Native-AllSender") << tst_messaging::Native << tst_messaging::AllSender;
   
@@ -1115,13 +1413,12 @@
     // let's assume we want equal tests for all the filters.
     // So let's try and filter out 1 message from each filter request.    
     if(filter == tst_messaging::Id){
+      id = msg_list.takeFirst();
         mf = QMessageFilter::byId(id);
         msg_list.push_back(id);        
     }
     else if(filter == tst_messaging::Type){      
         QMessage *msg = messageTemplate();
-        // XXX this segfault
-        //msg->setType(QMessage::Sms);
         
         msgId = addMessage(msg);       
         mf = QMessageFilter::byType(QMessage::Sms);
@@ -1179,8 +1476,9 @@
 
         mf = QMessageFilter::bySize(5000, QMessageDataComparator::GreaterThan);
     }
-    else if(filter == tst_messaging::AllId){      
-      mf = QMessageFilter::byId(msg_list);       
+    else if(filter == tst_messaging::AllId){
+//      mf = QMessageFilter::byId(msg_list.mid(0, 2)); works, mid(0,15) fails...
+      mf = QMessageFilter::byId(msg_list);
     }
     else if(filter == tst_messaging::AllSender){
       id = msg_list.takeFirst();      
@@ -1198,11 +1496,9 @@
     else {
         QMessageIdList list;
         QMessageSortOrder sortOrder(QMessageSortOrder::byReceptionTimeStamp(Qt::DescendingOrder));
-   
         QBENCHMARK {          
             list = m_mgr->queryMessages(mf, sortOrder, 100);
         }
- 
         if(list.count() != 1 && filter != tst_messaging::AllId && filter != tst_messaging::AllSender)
             qDebug() << "Wanted 1 message got: " << list.count();
     }
@@ -1222,12 +1518,16 @@
         sort.SetShowInvisibleEntries(ETrue);
           
         CMsvEntry* inboxContext = CMsvEntry::NewL(*m_native->iSession, 
-            KMsvGlobalInBoxIndexEntryId, sort);                
-        CleanupStack::PushL(inboxContext);
+                KMsvDraftEntryIdValue /*KMsvGlobalInBoxIndexEntryId*/, sort);                
+        CleanupStack::PushL(inboxContext); // 1
 
         // Get all entries in the Inbox
         CMsvEntrySelection* entries = inboxContext->ChildrenL();
-        CleanupStack::PushL(entries);
+        CleanupStack::PushL(entries); // 2
+        if(entries->Count() == 0){
+            CleanupStack::PopAndDestroy(2, inboxContext);
+            QSKIP("No messages on device to list", SkipAll);                        
+        }
         
         TMsvId entryID = entries->At(0);
 
@@ -1341,7 +1641,7 @@
         const CMsvFindResultSelection &res = finder->GetFindResult();
         
         for(int i = 0; i < res.Count(); i++){          
-          CMsvEntry *pEntry;
+          CMsvEntry *pEntry = 0x0;
           TRAPD(err, pEntry = m_native->iSession->GetEntryL(res.At(i).iId));
           if(err){
             qDebug() << "Failed to fetch: " << i << " - " << res.At(i).iId;
@@ -1374,7 +1674,7 @@
         const CMsvFindResultSelection &res = finder->GetFindResult();
         
         for(int i = 0; i < res.Count(); i++){          
-          CMsvEntry *pEntry;
+          CMsvEntry *pEntry = 0x0;
           TRAPD(err, pEntry = m_native->iSession->GetEntryL(res.At(i).iId));
           if(err){
             qDebug() << "Failed to fetch: " << i << " - " << res.At(i).iId;
@@ -1461,14 +1761,24 @@
 void tst_messaging::clearMessages()
 {
   QMessageId id;
+  int num = 0;
+  qDebug() << "Start QtMessaging removal";
   while(!msg_list.empty())
-    m_mgr->removeMessage(msg_list.takeFirst());
+    m_mgr->removeMessage(msg_list.takeFirst()), num++;
+  qDebug() << "Start Native removal";
+#ifdef Q_OS_SYMBIAN
+  while(m_native->iNewMsgs.Count())
+    m_native->iSession->RemoveEntry(m_native->iNewMsgs[0]), m_native->iNewMsgs.Remove(0), num++;
+#endif
+
+  qDebug() << "Cleanup Removed: " << num;
 }
 
 QMessage *tst_messaging::messageTemplate()
 {
   QMessage *msg = new QMessage;
   
+  msg->setType(QMessage::Email);
   msg->setDate(QDateTime::currentDateTime());
   msg->setSubject("test");
   QMessageAddress addr;
@@ -1478,20 +1788,15 @@
   addr.setAddressee("from@bar.com");
   addr.setType(QMessageAddress::Email);
   msg->setFrom(addr);
-
-// XXX one or more of these cause problems 
-//  msg->setType(QMessage::Email);
-//  msg->setStatus(QMessage::Read);
-  
-//  msg->setBody("I have a body!");
-//  msg->setParentAccountId(m_fol.parentAccountId());
   
   return msg;
 }
 
 QMessageId tst_messaging::addMessage(QMessage *msg)
 {
-  m_mgr->addMessage(msg);  
+  if(!m_mgr->addMessage(msg))
+    qDebug() << "Failed to add message: " << m_mgr->error();  
+
   msg_list.append(msg->id());
 
   //qDebug() << "id: " << msg->id().toString();
@@ -1519,7 +1824,8 @@
     QTest::addColumn<tst_messaging::types>("type");
     
     QTest::newRow("Qt-Email") << tst_messaging::QMessaging << tst_messaging::Email;
-    QTest::newRow("Native-SMS") << tst_messaging::Native << tst_messaging::Sms; 
+// XXX SMS broken. On clean devices there is no SMSMC to create messages for.    
+//    QTest::newRow("Native-SMS") << tst_messaging::Native << tst_messaging::Sms; 
     QTest::newRow("Native-Email") << tst_messaging::Native << tst_messaging::Email;
    
 }
@@ -1540,14 +1846,21 @@
       if(type == tst_messaging::Sms){
         TMsvId id;
         QBENCHMARK {
-          id = m_native->makeSMS(KMsvDraftEntryIdValue);
+          TRAPD(err, id = m_native->makeSMS(KMsvGlobalInBoxIndexEntryId));
+          if(err){
+              qDebug() << "Failed to create sms: " << err;
+          }
         }
         m_native->iNewMsgs.Append(id);
       }
       else if(type == tst_messaging::Email){
         TMsvId id;
         QBENCHMARK {
-          m_native->makeIMAP4(KMsvDraftEntryIdValue);
+          TRAPD(err, id = m_native->makeIMAP4(KMsvGlobalInBoxIndexEntryId));
+          if(err){
+              qDebug() << "Failed to create sms: " << err;
+          }
+
         }
         m_native->iNewMsgs.Append(id);
       }
@@ -1571,15 +1884,15 @@
   QFETCH(tst_messaging::platform, platform);
 
   if(platform == tst_messaging::QMessaging){
-#ifdef Q_OS_SYMBIAN
-      TMsvId id;
-      id = m_native->makeIMAP4(KMsvDraftEntryIdValue);
-      QString str;
-      str.setNum(id);
-      QMessageId qmid = str;    
-#else
+//#ifdef Q_OS_SYMBIAN
+//      TMsvId id;
+//      id = m_native->makeIMAP4(KMsvDraftEntryIdValue);
+//      QString str;
+//      str.setNum(id);
+//      QMessageId qmid = str;    
+//#else
       QMessageId qmid = msg_list.takeFirst();
-#endif
+//#endif
 
    QBENCHMARK_ONCE {
           m_mgr->removeMessage(qmid);
@@ -1626,12 +1939,12 @@
     // make sure there's enough messages to delete
     while(m_native->iNewMsgs.Count() < 30) {
       TMsvId id;
-      id = m_native->makeSMS(KMsvDraftEntryIdValue);      
+      id = m_native->makeIMAP4(KMsvDraftEntryIdValue);      
       m_native->iNewMsgs.Append(id);
     }
     
     QBENCHMARK {      
-      CMsvEntry *pEntry;
+      CMsvEntry *pEntry = 0x0;
       TRAPD(err, pEntry = CMsvEntry::NewL(*m_native->iSession, KMsvRootIndexEntryId, TMsvSelectionOrdering()));
       if(err){
         qDebug() << "Failed to init CMsvEntryL " << err;
@@ -1673,12 +1986,16 @@
   folders.Append(KMsvSentEntryId);
   folders.Append(KMsvDeletedEntryFolderEntryId);
   folders.Append(KDocumentsEntryIdValue);
+  folders.Append(KMsvMyFoldersEntryId);
 
   email->GetPopAccountsL(aPop);
   email->GetImapAccountsL(aImap);
   email->GetSmtpAccountsL(aSmtp);
 
   RArray<TMsvId> aService;
+  
+//  aService.Append(KMsvLocalServiceIndexEntryId);
+//  aService.Append(KMsvRootIndexEntryId);
 
   for(int i = 0; i < aPop.Count(); i++){
     aService.Append(aPop[i].iPopService);
@@ -1694,48 +2011,49 @@
   if(email->DefaultSmtpAccountL(sacc))
     aService.Append(sacc.iSmtpService);
 
-  if(aService.Count() == 0)
-    QFAIL("No folders avaailable to query");
-
-  CMsvEntry* pEntry = NULL;        
-  pEntry = iSession->GetEntryL(aService[0]);        
-  CleanupStack::PushL(pEntry);
-
-  for(int i = 0; i < aService.Count(); i++){
-      TMsvId msvid = aService[i];
-
-      pEntry->SetEntryL(msvid); // faster to call set, saves .2ms out of 2.7ms.
-
-      const TMsvEntry& entry = pEntry->Entry();
- 
-      CMsvEntryFilter* pFilter = CMsvEntryFilter::NewLC();
-      pFilter->SetService(msvid);
-      pFilter->SetType(KUidMsvFolderEntry);
+  if(aService.Count() > 0) {
+      CMsvEntry* pEntry = NULL;
+      
+      TRAPD(err, pEntry = iSession->GetEntryL(aService[0]));
+      if(!err) {
+          CleanupStack::PushL(pEntry);
+          for(int i = 0; i < aService.Count(); i++){
+              TMsvId msvid = aService[i];
+              
+              TRAP(err, pEntry->SetEntryL(msvid)); // faster to call set, saves .2ms out of 2.7ms.
+              if(err)
+                  continue;
+        
+              const TMsvEntry& entry = pEntry->Entry();
+              CMsvEntryFilter* pFilter = CMsvEntryFilter::NewLC();
+              pFilter->SetService(msvid);
+              pFilter->SetType(KUidMsvFolderEntry);
+              CMsvEntrySelection* pSelection = new(ELeave) CMsvEntrySelection;
+              CleanupStack::PushL(pSelection);
 
-      CMsvEntrySelection* pSelection = new(ELeave) CMsvEntrySelection;
-      CleanupStack::PushL(pSelection);
-      
-      if (entry.iMtm == KUidMsgTypeSMS || entry.iMtm == KUidMsgTypeMultimedia || entry.iMtm == KUidMsgTypeSMTP) 
-        pEntry->SetEntryL(KDocumentsEntryIdValue);          
-      
-      //iSession->GetChildIdsL(pEntry->Entry().Id(), *pFilter, *pSelection);
-      iSession->GetChildIdsL(pEntry->Entry().Id(), *pFilter, *pSelection);
-     
-      for(TInt i = 0; i < pSelection->Count(); i++) {
-        folders.Append(pSelection->At(i));
-      }              
-      
-      CleanupStack::PopAndDestroy(pSelection);
-      CleanupStack::PopAndDestroy(pFilter);
-
-    }
-
+              if (entry.iMtm == KUidMsgTypeSMS || entry.iMtm == KUidMsgTypeMultimedia || entry.iMtm == KUidMsgTypeSMTP) 
+                pEntry->SetEntryL(KDocumentsEntryIdValue);          
+              
+              iSession->GetChildIdsL(msvid, *pFilter, *pSelection);
+              for(TInt i = 0; i < pSelection->Count(); i++) {
+                folders.Append(pSelection->At(i));
+                pEntry->SetEntryL(pSelection->At(i));
+                if(pEntry->Entry().iMtm == KUidMsvFolderEntry){
+                    aService.Append(pSelection->At(i));
+                }            
+              }              
+              CleanupStack::PopAndDestroy(pSelection);
+              CleanupStack::PopAndDestroy(pFilter);
+        
+            }
+          CleanupStack::PopAndDestroy(pEntry);
+        }
+  }
     aPop.Close();
     aImap.Close();
     aSmtp.Close();
     aService.Close();
-
-    CleanupStack::PopAndDestroy(pEntry);        
+        
     CleanupStack::PopAndDestroy(email);
   __UHEAP_MARKEND;
 }

--- a/qtmobility/tests/benchmarks/qsysteminfo/tst_qsysteminfo.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/benchmarks/qsysteminfo/tst_qsysteminfo.cpp	Fri May 14 16:41:33 2010 +0300
@@ -45,6 +45,8 @@
 QTM_USE_NAMESPACE
 Q_DECLARE_METATYPE(QSystemInfo::Version);
 Q_DECLARE_METATYPE(QSystemInfo::Feature);
+Q_DECLARE_METATYPE(QSystemNetworkInfo::NetworkStatus);
+Q_DECLARE_METATYPE(QSystemNetworkInfo::NetworkMode)
 
 class tst_QSystemInfo : public QObject
 {
@@ -63,7 +65,25 @@
 
     void tst_hasFeatures_data();
     void tst_hasFeatures();
+    
+    void tst_networkinfo_mode_data();
+    void tst_networkinfo_mode();
+    
+    void tst_networkinfo_misc_data();
+    void tst_networkinfo_misc();
+    
+    void tst_screeninfo_data();
+    void tst_screeninfo();
+    
+    void tst_storageinfo_data();
+    void tst_storageinfo();
 
+    void tst_deviceinfo_data();
+    void tst_deviceinfo();
+
+    void tst_screensaver_data();
+    void tst_screensaver();
+    
 };
 
 void tst_QSystemInfo::initTestCase()
@@ -109,10 +129,11 @@
 
 void tst_QSystemInfo::tst_versions()
 {
-    QBENCHMARK {
-        QFETCH(QSystemInfo::Version, version);
-        QFETCH(QString, parameter);
-        QSystemInfo si;
+  QFETCH(QSystemInfo::Version, version);
+  QFETCH(QString, parameter);
+  QSystemInfo si;
+    
+    QBENCHMARK { 
         QString vers = si.version(version, parameter);
     }
 }
@@ -138,14 +159,251 @@
 
 void tst_QSystemInfo::tst_hasFeatures()
 {
-    QBENCHMARK {
-        QFETCH(QSystemInfo::Feature, feature);
-        QSystemInfo si;        
+  QFETCH(QSystemInfo::Feature, feature);
+  QSystemInfo si;
+  
+    QBENCHMARK {        
         si.hasFeatureSupported(feature);
 
     }
 }
 
+void tst_QSystemInfo::tst_networkinfo_misc_data() {
+  QTest::addColumn<QString>("feature");
+  QTest::addColumn<int>("property");
+  
+  QSystemNetworkInfo obj;
+  const QMetaObject* metaObject = obj.metaObject();
+  QStringList methods;
+  for(int i = metaObject->propertyOffset(); i < metaObject->propertyCount(); ++i) {
+    QString name = QString::fromLatin1(metaObject->property(i).name());
+    QTest::newRow(name.toAscii()) << name << i;    
+  }
+}
+
+void tst_QSystemInfo::tst_networkinfo_misc() {
+  QFETCH(QString, feature);
+  QFETCH(int, property);  
+  
+  QSystemNetworkInfo obj;
+  const QMetaObject* metaObject = obj.metaObject();
+  QMetaProperty mprop = metaObject->property(property);
+  
+  if(mprop.isReadable()){
+    QBENCHMARK {
+      mprop.read(&obj);
+    }
+  }  
+  else {
+    QString s("Failed to find readable property: " + QString::fromLatin1(mprop.name()));
+    QFAIL(s.toAscii());
+  }
+}
+
+
+void tst_QSystemInfo::tst_networkinfo_mode_data()
+
+{
+  QTest::addColumn<QString>("feature");
+  QTest::addColumn<QString>("name");
+  QTest::addColumn<QSystemNetworkInfo::NetworkMode>("mode");
+  
+  
+  QList<QPair<QString, QSystemNetworkInfo::NetworkMode> > modes;
+   
+  modes += qMakePair(QString("GsmMode"), QSystemNetworkInfo::GsmMode);
+  modes += qMakePair(QString("CdmaMode"), QSystemNetworkInfo::CdmaMode);
+  modes += qMakePair(QString("WcdmaMode"), QSystemNetworkInfo::WcdmaMode);
+  modes += qMakePair(QString("WlanMode"), QSystemNetworkInfo::WlanMode);
+  modes += qMakePair(QString("EthernetMode"), QSystemNetworkInfo::EthernetMode);
+  modes += qMakePair(QString("BluetoothMode"), QSystemNetworkInfo::BluetoothMode);
+  modes += qMakePair(QString("WimaxMode"), QSystemNetworkInfo::WimaxMode);
+  
+  QPair<QString, QSystemNetworkInfo::NetworkMode> mode;
+  foreach(mode, modes){    
+    QTest::newRow(QString("networkStatus-" + mode.first).toAscii()) << "networkStatus" << mode.first << mode.second;  
+    QTest::newRow(QString("networkSignalStrength-" + mode.first).toAscii()) << "networkSignalStrength" << mode.first << mode.second;
+    QTest::newRow(QString("macAddress-" + mode.first).toAscii()) << "macAddress" << mode.first << mode.second;
+    QTest::newRow(QString("networkName-" + mode.first).toAscii()) << "networkName" << mode.first << mode.second;
+    QTest::newRow(QString("interfaceForMode-" + mode.first).toAscii()) << "interfaceForMode" << mode.first << mode.second;
+  }
+}
+
+void tst_QSystemInfo::tst_networkinfo_mode()
+{
+  QFETCH(QString, feature);
+  QFETCH(QString, name);
+  QFETCH(QSystemNetworkInfo::NetworkMode, mode);
+  
+  QSystemNetworkInfo ni;
+  
+  if(feature == "networkStatus"){
+    QSystemNetworkInfo::NetworkStatus s = QSystemNetworkInfo::UndefinedStatus;
+    QBENCHMARK {
+      s = ni.networkStatus(mode);
+    }
+    //qDebug() << "Status: " << s;
+  }
+  else if(feature == "networkSignalStrength") {
+    QBENCHMARK {
+      ni.networkSignalStrength(mode);
+    }
+  }
+  else if(feature == "macAddress"){
+    QBENCHMARK {
+      ni.macAddress(mode);
+    }
+  }
+  else if(feature == "networkName"){
+    QBENCHMARK {
+      ni.networkName(mode);
+    }
+  }
+  else if(feature == "interfaceForMode") {
+    QBENCHMARK {
+      ni.interfaceForMode(mode);
+    }
+  }
+}
+
+void tst_QSystemInfo::tst_screeninfo_data(){ 
+  QTest::addColumn<QString>("feature");
+  
+  QTest::newRow("construction") << "construction";
+  QTest::newRow("displayBrightness") << "displayBrightness";
+  QTest::newRow("colorDepth") << "colorDepth";
+    
+}
+
+void tst_QSystemInfo::tst_screeninfo(){
+  QFETCH(QString, feature);   
+
+  if(feature == "construction"){
+    QBENCHMARK {
+      QSystemDeviceInfo di2;
+    }
+  }
+  else if(feature == "displayBrightness"){
+    QBENCHMARK {
+      QSystemDisplayInfo::displayBrightness(0);// what screen shoiuld we pick?
+    }
+  }
+  else if(feature == "colorDepth"){
+    QBENCHMARK {
+      QSystemDisplayInfo::colorDepth(0);
+    }
+  }
+  else {    
+    QFAIL("Unkown feature");
+  }  
+}
+
+void tst_QSystemInfo::tst_storageinfo_data(){
+  QTest::addColumn<QString>("feature");
+  QTest::addColumn<QString>("drive");
+  
+  QString d;
+  QStringList drives = QSystemStorageInfo::logicalDrives();
+  
+  QString f;
+  QStringList features;
+  
+  features += "totalDiskSpace";
+  features += "availableDiskSpace";
+  features += "typeForDrive";
+  
+  foreach(d, drives){
+    foreach(f, features){
+      QString s = f + "_" + d;
+      QTest::newRow(s.toAscii()) << f << d;
+    }
+  }
+}
+
+void tst_QSystemInfo::tst_storageinfo(){
+  QFETCH(QString, feature);
+  QFETCH(QString, drive);
+  
+  QSystemStorageInfo si;
+  
+  if(feature == "totalDiskSpace"){
+   QBENCHMARK {
+     si.totalDiskSpace(drive);
+   }
+  }
+  else if(feature == "availableDiskSpace"){
+    QBENCHMARK {
+      si.availableDiskSpace(drive);
+    }
+    
+  }
+  else if(feature == "typeForDrive"){
+    QBENCHMARK {
+      si.typeForDrive(drive);
+    }
+  }
+  else {
+    QFAIL("Unkown feature");
+  }
+}
+
+void tst_QSystemInfo::tst_deviceinfo_data() {
+  QTest::addColumn<QString>("feature");
+  QTest::addColumn<int>("property");
+  
+  QSystemDeviceInfo obj;
+  const QMetaObject* metaObject = obj.metaObject();
+  QStringList methods;
+  for(int i = metaObject->propertyOffset(); i < metaObject->propertyCount(); ++i) {
+    QString name = QString::fromLatin1(metaObject->property(i).name());
+    QTest::newRow(name.toAscii()) << name << i;       
+  }
+}
+
+void tst_QSystemInfo::tst_deviceinfo() {
+  QFETCH(QString, feature);
+  QFETCH(int, property);
+  
+  QSystemDeviceInfo obj;
+  const QMetaObject* metaObject = obj.metaObject();
+  QMetaProperty mprop = metaObject->property(property);
+  
+  if(mprop.isReadable()){
+    QBENCHMARK {
+      mprop.read(&obj);
+    }
+  }  
+}
+
+void tst_QSystemInfo::tst_screensaver_data() {
+  QTest::addColumn<QString>("feature");
+  QTest::addColumn<int>("property");
+  
+  QSystemScreenSaver obj;
+  const QMetaObject* metaObject = obj.metaObject();
+  QStringList methods;
+  for(int i = metaObject->propertyOffset(); i < metaObject->propertyCount(); ++i) {
+    QString name = QString::fromLatin1(metaObject->property(i).name());
+    QTest::newRow(name.toAscii()) << name << i;       
+  }
+}
+
+void tst_QSystemInfo::tst_screensaver() {
+  QFETCH(QString, feature);
+  QFETCH(int, property);
+  
+  QSystemScreenSaver obj;
+  const QMetaObject* metaObject = obj.metaObject();
+  QMetaProperty mprop = metaObject->property(property);
+  
+  if(mprop.isReadable()){
+    QBENCHMARK {
+      mprop.read(&obj);
+    }
+  }  
+}
+
 
 QTEST_MAIN(tst_QSystemInfo)
 #include "tst_qsysteminfo.moc"
+

author	Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
	Fri, 14 May 2010 16:41:33 +0300
changeset 5	453da2cfceef
parent 4	90517678cc4f
child 8	71781823f776
child 9	5561c345355e