From 233081aadb67b5e197ec9640bc97eb32b7bd5016 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Tue, 30 Nov 2010 17:53:08 +0100
Subject: [PATCH] Maemo: Move .pro file scope generation to a dedicated
 function.

---
 .../qt-maemo/maemodeployablelistmodel.cpp               | 17 +++++++++--------
 .../qt-maemo/maemodeployablelistmodel.h                 |  1 +
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
index d89aa21cbb..4a8f88f720 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
@@ -332,15 +332,8 @@ bool MaemoDeployableListModel::addLinesToProFile(const QStringList &lines)
         qWarning("Error opening .pro file for writing.");
         return false;
     }
-    QString proFileScope;
-    const MaemoToolChain *const tc = maemoToolchain();
-    QTC_ASSERT(tc, return false);
-    if (tc->version() == MaemoToolChain::Maemo5)
-        proFileScope = QLatin1String("maemo5");
-    else
-        proFileScope = QLatin1String("unix:!symbian:!maemo5");
     const QLatin1String separator("\n    ");
-    const QString proFileString = QString(QLatin1Char('\n') + proFileScope
+    const QString proFileString = QString(QLatin1Char('\n') + proFileScope()
         + QLatin1String(" {") + separator + lines.join(separator)
         + QLatin1String("\n}\n"));
     const QByteArray &proFileByteArray = proFileString.toLocal8Bit();
@@ -369,5 +362,13 @@ const MaemoToolChain *MaemoDeployableListModel::maemoToolchain() const
     return tc;
 }
 
+QString MaemoDeployableListModel::proFileScope() const
+{
+    const MaemoToolChain *const tc = maemoToolchain();
+    QTC_ASSERT(tc, return QString());
+    return QLatin1String(tc->version() == MaemoToolChain::Maemo5
+        ? "maemo5" : "unix:!symbian:!maemo5");
+}
+
 } // namespace Qt4ProjectManager
 } // namespace Internal
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.h b/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.h
index c7e36e7ac5..31d4d71270 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.h
@@ -94,6 +94,7 @@ private:
     bool buildModel();
     bool addLinesToProFile(const QStringList &lines);
     const MaemoToolChain *maemoToolchain() const;
+    QString proFileScope() const;
 
     const Qt4ProjectType m_projectType;
     const QString m_proFilePath;
-- 
2.11.0