QML + Mobile wizard: Share deployment rules.

Reviewed-by: Alessandro Portale

4 files changed, 32 insertions, 12 deletions

diff --git a/src/plugins/qt4projectmanager/wizards/mobileapp.cpp b/src/plugins/qt4projectmanager/wizards/mobileapp.cpp
index 887fa9b2f2..5fc04d867f 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/mobileapp.cpp
@@ -41,6 +41,8 @@ namespace Internal {
 
 const QString mainWindowBaseName(QLatin1String("mainwindow"));
 
+const QString deploymentPriFileName(QLatin1String("deployment.pri"));
+const QString deploymentPriOrigRelFilePath(QLatin1String("../shared/") + deploymentPriFileName);
 const QString mainWindowCppFileName(mainWindowBaseName + QLatin1String(".cpp"));
 const QString mainWindowHFileName(mainWindowBaseName + QLatin1String(".h"));
 const QString mainWindowUiFileName(mainWindowBaseName + QLatin1String(".ui"));
@@ -172,8 +174,8 @@ QString MobileApp::path(Path path) const
         case AppPro:                        return pathBase + m_projectName + QLatin1String(".pro");
         case AppProOrigin:                  return originsRootMobileApp + QLatin1String("app.pro");
         case AppProPath:                    return pathBase;
-        case AppPri:                        return pathBase + m_projectName + QLatin1String(".pri");
-        case AppPriOrigin:                  return originsRootMobileApp + QLatin1String("app.pri");
+        case DeploymentPri:                 return pathBase + deploymentPriFileName;
+        case DeploymentPriOrigin:           return originsRootMobileApp + deploymentPriOrigRelFilePath;
         case Desktop:                       return pathBase + m_projectName + QLatin1String(".desktop");
         case DesktopOrigin:                 return originsRootShared + QLatin1String("app.desktop");
         case MainWindowCpp:                 return pathBase + mainWindowCppFileName;
@@ -283,8 +285,8 @@ QByteArray MobileApp::generateProFile(const QString *errorMessage) const
         out << line << endl;
     };
 
-    return proFileContent.replace("include(app.pri)", "include("
-        + m_projectName.toLocal8Bit() + ".pri)");
+    return proFileContent.replace(deploymentPriOrigRelFilePath.toAscii(),
+        deploymentPriFileName.toAscii());
 }
 
 QByteArray MobileApp::generateDesktopFile(const QString *errorMessage) const
@@ -322,7 +324,7 @@ Core::GeneratedFiles MobileApp::generateFiles(QString *errorMessage) const
     files.append(file(generateFile(MobileAppGeneratedFileInfo::SymbianSvgIconFile, errorMessage), path(SymbianSvgIcon)));
     files.append(file(generateFile(MobileAppGeneratedFileInfo::MaemoPngIconFile, errorMessage), path(MaemoPngIcon)));
     files.append(file(generateFile(MobileAppGeneratedFileInfo::DesktopFile, errorMessage), path(Desktop)));
-    files.append(file(generateFile(MobileAppGeneratedFileInfo::AppPriFile, errorMessage), path(AppPri)));
+    files.append(file(generateFile(MobileAppGeneratedFileInfo::DeploymentPriFile, errorMessage), path(DeploymentPri)));
     files.append(file(generateFile(MobileAppGeneratedFileInfo::MainWindowCppFile, errorMessage), path(MainWindowCpp)));
     files.append(file(generateFile(MobileAppGeneratedFileInfo::MainWindowHFile, errorMessage), path(MainWindowH)));
     files.append(file(generateFile(MobileAppGeneratedFileInfo::MainWindowUiFile, errorMessage), path(MainWindowUi)));
@@ -369,8 +371,8 @@ QByteArray MobileApp::generateFile(MobileAppGeneratedFileInfo::File file,
             data = generateProFile(errorMessage);
             comment = proFileComment;
             break;
-        case MobileAppGeneratedFileInfo::AppPriFile:
-            data = readBlob(path(AppPriOrigin));
+        case MobileAppGeneratedFileInfo::DeploymentPriFile:
+            data = readBlob(path(DeploymentPriOrigin));
             comment = proFileComment;
             versionAndChecksum = true;
             break;
diff --git a/src/plugins/qt4projectmanager/wizards/mobileapp.h b/src/plugins/qt4projectmanager/wizards/mobileapp.h
index 1094f48406..b6c47c97d6 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileapp.h
+++ b/src/plugins/qt4projectmanager/wizards/mobileapp.h
@@ -44,7 +44,7 @@ struct MobileAppGeneratedFileInfo
     enum File {
         MainCppFile,
         AppProFile,
-        AppPriFile,
+        DeploymentPriFile,
         MainWindowCppFile,
         MainWindowHFile,
         MainWindowUiFile,
@@ -83,8 +83,8 @@ public:
         AppProPath,
         Desktop,
         DesktopOrigin,
-        AppPri,
-        AppPriOrigin,
+        DeploymentPri,
+        DeploymentPriOrigin,
         MainWindowCpp,
         MainWindowCppOrigin,
         MainWindowH,
diff --git a/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp b/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp
index e7b98dbea9..ab191e4807 100644
--- a/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp
@@ -48,6 +48,8 @@ const QString appViewerBaseName(QLatin1String("qmlapplicationviewer"));
 const QString appViewerPriFileName(appViewerBaseName + QLatin1String(".pri"));
 const QString appViewerCppFileName(appViewerBaseName + QLatin1String(".cpp"));
 const QString appViewerHFileName(appViewerBaseName + QLatin1String(".h"));
+const QString deploymentPriFileName(QLatin1String("deployment.pri"));
+const QString deploymentPriOrigRelFilePath(QLatin1String("../shared/") + deploymentPriFileName);
 const QString appViewerOriginsSubDir(appViewerBaseName + QLatin1Char('/'));
 const QString fileChecksum(QLatin1String("checksum"));
 const QString fileStubVersion(QLatin1String("version"));
@@ -298,6 +300,8 @@ QString QmlStandaloneApp::path(Path path) const
         case DesktopOrigin:                 return originsRootShared + QLatin1String("app.desktop");
         case AppViewerPri:                  return pathBase + appViewerTargetSubDir + appViewerPriFileName;
         case AppViewerPriOrigin:            return originsRootQmlApp + appViewerOriginsSubDir + appViewerPriFileName;
+        case DeploymentPri:                 return pathBase + deploymentPriFileName;
+        case DeploymentPriOrigin:           return originsRootQmlApp + deploymentPriOrigRelFilePath;
         case AppViewerCpp:                  return pathBase + appViewerTargetSubDir + appViewerCppFileName;
         case AppViewerCppOrigin:            return originsRootQmlApp + appViewerOriginsSubDir + appViewerCppFileName;
         case AppViewerH:                    return pathBase + appViewerTargetSubDir + appViewerHFileName;
@@ -442,6 +446,9 @@ QByteArray QmlStandaloneApp::generateProFile(const QString *errorMessage) const
         out << line << endl;
     };
 
+    proFileContent.replace(deploymentPriOrigRelFilePath.toAscii(),
+        deploymentPriFileName.toAscii());
+
     return proFileContent;
 }
 
@@ -567,6 +574,7 @@ Core::GeneratedFiles QmlStandaloneApp::generateFiles(QString *errorMessage) cons
     files.append(file(generateFile(QmlAppGeneratedFileInfo::DesktopFile, errorMessage), path(Desktop)));
 
     files.append(file(generateFile(QmlAppGeneratedFileInfo::AppViewerPriFile, errorMessage), path(AppViewerPri)));
+    files.append(file(generateFile(QmlAppGeneratedFileInfo::DeploymentPriFile, errorMessage), path(DeploymentPri)));
     files.append(file(generateFile(QmlAppGeneratedFileInfo::AppViewerCppFile, errorMessage), path(AppViewerCpp)));
     files.append(file(generateFile(QmlAppGeneratedFileInfo::AppViewerHFile, errorMessage), path(AppViewerH)));
 
@@ -630,6 +638,11 @@ QByteArray QmlStandaloneApp::generateFile(QmlAppGeneratedFileInfo::File file,
             comment = proFileComment;
             versionAndChecksum = true;
             break;
+        case QmlAppGeneratedFileInfo::DeploymentPriFile:
+            data = readBlob(path(DeploymentPriOrigin));
+            comment = proFileComment;
+            versionAndChecksum = true;
+            break;
         case QmlAppGeneratedFileInfo::AppViewerCppFile:
             data = readBlob(path(AppViewerCppOrigin));
             versionAndChecksum = true;
@@ -657,7 +670,7 @@ QByteArray QmlStandaloneApp::generateFile(QmlAppGeneratedFileInfo::File file,
 
 int QmlStandaloneApp::stubVersion()
 {
-    return 4;
+    return 5;
 }
 
 static QList<QmlAppGeneratedFileInfo> updateableFiles(const QString &mainProFile)
@@ -669,7 +682,9 @@ static QList<QmlAppGeneratedFileInfo> updateableFiles(const QString &mainProFile
     } files[] = {
         {QmlAppGeneratedFileInfo::AppViewerPriFile, appViewerPriFileName},
         {QmlAppGeneratedFileInfo::AppViewerHFile, appViewerHFileName},
-        {QmlAppGeneratedFileInfo::AppViewerCppFile, appViewerCppFileName}
+        {QmlAppGeneratedFileInfo::AppViewerCppFile, appViewerCppFileName},
+        {QmlAppGeneratedFileInfo::DeploymentPriFile,
+             QLatin1String("../") + deploymentPriFileName}
     };
     const QFileInfo mainProFileInfo(mainProFile);
     const int size = sizeof(files) / sizeof(files[0]);
diff --git a/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.h b/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.h
index 03deb386c2..d0f74209c5 100644
--- a/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.h
+++ b/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.h
@@ -83,6 +83,7 @@ struct QmlAppGeneratedFileInfo
         MainCppFile,
         AppProFile,
         AppViewerPriFile,
+        DeploymentPriFile,
         AppViewerCppFile,
         AppViewerHFile,
         SymbianSvgIconFile,
@@ -125,6 +126,8 @@ public:
         DesktopOrigin,
         AppViewerPri,
         AppViewerPriOrigin,
+        DeploymentPri,
+        DeploymentPriOrigin,
         AppViewerCpp,
         AppViewerCppOrigin,
         AppViewerH,