MeeGo: Adapt package name to changed OVI store requirements.

Fremantle needed the application version as x_y_z, for Harmattan it must
be x.y.z, otherwise the package will not be accepted by the store.
Obviously.

Task-Number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=276021

Change-Id: I93b8fd7f1c95b9ef26df97f817e3b8b610c4e932
Reviewed-on: http://codereview.qt.nokia.com/2697
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>

2 files changed, 8 insertions, 4 deletions

diff --git a/src/plugins/remotelinux/maemopackagecreationstep.cpp b/src/plugins/remotelinux/maemopackagecreationstep.cpp
index ecd834876f..20d088a04f 100644
--- a/src/plugins/remotelinux/maemopackagecreationstep.cpp
+++ b/src/plugins/remotelinux/maemopackagecreationstep.cpp
@@ -300,10 +300,14 @@ void AbstractMaemoPackageCreationStep::preparePackagingProcess(QProcess *proc,
     proc->setWorkingDirectory(workingDir);
 }
 
-QString AbstractMaemoPackageCreationStep::replaceDots(const QString &name)
+QString AbstractMaemoPackageCreationStep::replaceDots(const QString &name) const
 {
-    QString adaptedName = name;
-    return adaptedName.replace(QLatin1Char('.'), QLatin1Char('_'));
+    // Idiotic OVI store requirement for N900 (but not allowed for N9 ...).
+    if (qobject_cast<Qt4Maemo5Target *>(target())) {
+        QString adaptedName = name;
+        return adaptedName.replace(QLatin1Char('.'), QLatin1Char('_'));
+    }
+    return name;
 }
 
 MaemoDebianPackageCreationStep::MaemoDebianPackageCreationStep(BuildStepList *bsl)
diff --git a/src/plugins/remotelinux/maemopackagecreationstep.h b/src/plugins/remotelinux/maemopackagecreationstep.h
index b6b44295c6..d019fdefd1 100644
--- a/src/plugins/remotelinux/maemopackagecreationstep.h
+++ b/src/plugins/remotelinux/maemopackagecreationstep.h
@@ -91,7 +91,7 @@ protected:
     void raiseError(const QString &shortMsg,
         const QString &detailedMsg = QString());
     bool callPackagingCommand(QProcess *proc, const QStringList &arguments);
-    static QString replaceDots(const QString &name);
+    QString replaceDots(const QString &name) const;
     QString buildDirectory() const;
 
 private slots: