From 7b276878b1fcf49d6da5f113b2dbda84ba495320 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Mon, 23 Aug 2010 16:40:46 +0200
Subject: [PATCH] Maemo: If we create a desktop file, we should also deploy it.
Reviewed-by: kh1
---
.../qt-maemo/maemotemplatesmanager.cpp | 32 +++++++++++++++----
1 file changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp
index ab74db8e1e9..bdb0608444a 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp
@@ -292,7 +292,7 @@ bool MaemoTemplatesManager::updateDesktopFile(const Qt4Target *target,
"Version=1.0\nType=Application\nTerminal=false\nName=\nExec=\n"
"Icon=\nX-Window-Icon=\nX-HildonDesk-ShowInToolbar=true\n"
"X-Osso-Type=application/x-executable\n");
- QByteArray contents
+ QByteArray desktopFileContents
= existsAlready ? desktopFile.readAll() : desktopTemplate;
QString executable;
@@ -310,18 +310,18 @@ bool MaemoTemplatesManager::updateDesktopFile(const Qt4Target *target,
qWarning("Strange: Project file node not managed by MaemoDeployables.");
} else {
int execNewLinePos, execValuePos;
- findLine("Exec=", contents, execNewLinePos, execValuePos);
- contents.replace(execValuePos, execNewLinePos - execValuePos,
+ findLine("Exec=", desktopFileContents, execNewLinePos, execValuePos);
+ desktopFileContents.replace(execValuePos, execNewLinePos - execValuePos,
executable.toUtf8());
}
int nameNewLinePos, nameValuePos;
- findLine("Name=", contents, nameNewLinePos, nameValuePos);
+ findLine("Name=", desktopFileContents, nameNewLinePos, nameValuePos);
if (nameNewLinePos == nameValuePos)
- contents.insert(nameValuePos, appName.toUtf8());
+ desktopFileContents.insert(nameValuePos, appName.toUtf8());
desktopFile.resize(0);
- desktopFile.write(contents);
+ desktopFile.write(desktopFileContents);
desktopFile.close();
if (desktopFile.error() != QFile::NoError) {
qWarning("Could not write '%s': %s", qPrintable(desktopFilePath),
@@ -331,9 +331,27 @@ bool MaemoTemplatesManager::updateDesktopFile(const Qt4Target *target,
if (!existsAlready) {
proFileNode->addFiles(UnknownFileType,
QStringList() << desktopFilePath);
+ QFile proFile(proFileNode->path());
+ if (!proFile.open(QIODevice::ReadWrite)) {
+ qWarning("Failed to open '%s': %s", qPrintable(proFileNode->path()),
+ qPrintable(proFile.errorString()));
+ return false;
+ }
+ QByteArray proFileContents = proFile.readAll();
+ proFileContents += "\nmaemo5|maemp6{\n"
+ " desktopfile.files = $${TARGET}.desktop\n"
+ " desktopfile.path = /usr/share/applications/hildon\n"
+ " INSTALLS += desktopfile\n}\n";
+ proFile.resize(0);
+ proFile.write(proFileContents);
+ proFile.close();
+ if (proFile.error() != QFile::NoError) {
+ qWarning("Could not write '%s': %s", qPrintable(proFileNode->path()),
+ qPrintable(proFile.errorString()));
+ return false;
+ }
}
return true;
-
}
void MaemoTemplatesManager::handleProjectToBeRemoved(ProjectExplorer::Project *project)
--
GitLab