From 8f3c5467fe6ab1dad9fef070cca9993ba9279e02 Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Tue, 3 Aug 2010 17:20:34 +0200
Subject: [PATCH] Maemo: Add packaging template files to project.
Reviewed-by: kh1
---
.../qt-maemo/maemotemplatesmanager.cpp | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp
index b7d9d9da153..02c4a3cab0b 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp
@@ -36,6 +36,8 @@
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/session.h>
#include <projectexplorer/target.h>
+#include <qt4projectmanager/qt4nodes.h>
+#include <qt4projectmanager/qt4project.h>
#include <qt4projectmanager/qt4projectmanagerconstants.h>
#include <qt4projectmanager/qt4target.h>
@@ -141,11 +143,17 @@ void MaemoTemplatesManager::createTemplatesIfNecessary(ProjectExplorer::Target *
}
QDir debianDir(packagingTemplatesDir + QLatin1String("/debian"));
- const QStringList &files
- = debianDir.entryList(QStringList() << QLatin1String("*.??"),
- QDir::Files);
- foreach (const QString &fileName, files)
- debianDir.remove(fileName);
+ const QStringList &files = debianDir.entryList(QDir::Files);
+ QStringList filesToAddToProject;
+ foreach (const QString &fileName, files) {
+ if (fileName.endsWith(QLatin1String(".ex"), Qt::CaseInsensitive)) {
+ debianDir.remove(fileName);
+ } else
+ filesToAddToProject << debianDir.absolutePath()
+ + QLatin1Char('/') + fileName;
+ }
+ qobject_cast<Qt4Project *>(m_activeProject)->rootProjectNode()
+ ->addFiles(UnknownFileType, filesToAddToProject);
const QString rulesFilePath
= packagingTemplatesDir + QLatin1String("/debian/rules");
--
GitLab