QtPim: Fix compilation on Windows.

- Fix usage of QStringLiteral (use for literals only)
- Do not use QStringLiteral for global static constants (for which
  MSVC fails with 'unrecoverable scope error'
- Remove -rpath from test profiles, as qtbase/libs is added by
  default.

Change-Id: Ic94c1fb11b06fb523f4dea95ddb0a0a7dbdbb91c
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
Reviewed-by: Cristiano di Flora <cristiano.di-flora@nokia.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/versit/qversitcontactimporter_p.cpp b/src/versit/qversitcontactimporter_p.cpp
index e32361442..a912c892d 100644
--- a/src/versit/qversitcontactimporter_p.cpp
+++ b/src/versit/qversitcontactimporter_p.cpp
@@ -91,7 +91,7 @@ QVersitContactImporterPrivate::QVersitContactImporterPrivate(const QStringList&
         sizeof(versitContactDetailMappings)/sizeof(VersitDetailMapping);
     for (int i=0; i < versitPropertyCount; i++) {
         QString versitPropertyName =
-            QStringLiteral(versitContactDetailMappings[i].versitPropertyName);
+            QLatin1Literal(versitContactDetailMappings[i].versitPropertyName);
         QPair<QString,QString> contactDetail;
         contactDetail.first =
             versitContactDetailMappings[i].detailDefinitionName;
@@ -104,7 +104,7 @@ QVersitContactImporterPrivate::QVersitContactImporterPrivate(const QStringList&
     int contextCount = sizeof(versitContextMappings)/sizeof(VersitMapping);
     for (int i=0; i < contextCount; i++) {
         mContextMappings.insert(
-            QStringLiteral(versitContextMappings[i].versitString),
+            QLatin1String(versitContextMappings[i].versitString),
             versitContextMappings[i].contactString);
     }
 
@@ -112,7 +112,7 @@ QVersitContactImporterPrivate::QVersitContactImporterPrivate(const QStringList&
     int subTypeCount = sizeof(versitSubTypeMappings)/sizeof(VersitMapping);
     for (int i=0; i < subTypeCount; i++) {
         mSubTypeMappings.insert(
-            QStringLiteral(versitSubTypeMappings[i].versitString),
+            QLatin1String(versitSubTypeMappings[i].versitString),
             versitSubTypeMappings[i].contactString);
     }