feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Maemo: Get rid of maemo6 reference, fix deploy paths.

Browse Source
This commit is contained in:
Christian Kandeler
2010-09-09 10:36:59 +02:00
parent 292cec359f
commit ff7ef5edda
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
View File

@@ -59,20 +59,27 @@ bool MaemoDeployableListModel::buildModel()
const MaemoProFileWrapper::InstallsList &installs = m_proFileWrapper->installs(); const MaemoProFileWrapper::InstallsList &installs = m_proFileWrapper->installs();
if (installs.targetPath.isEmpty()) { if (installs.targetPath.isEmpty()) {
const QString remoteDir = m_proFileNode->projectType() == LibraryTemplate const QString remoteDirSuffix
? QLatin1String("/opt/lib") = QLatin1String(m_proFileNode->projectType() == LibraryTemplate
: QLatin1String("/opt/bin"); ? "/lib" : "/bin");
const QString remoteDirMaemo5
= QLatin1String("/opt/usr") + remoteDirSuffix;
const QString remoteDirMaemo6
= QLatin1String("/usr/local") + remoteDirSuffix;
m_deployables.prepend(MaemoDeployable(localExecutableFilePath(), m_deployables.prepend(MaemoDeployable(localExecutableFilePath(),
remoteDir)); remoteDirMaemo5));
QFile projectFile(m_proFileNode->path()); QFile projectFile(m_proFileNode->path());
if (!projectFile.open(QIODevice::WriteOnly | QIODevice::Append)) { if (!projectFile.open(QIODevice::WriteOnly | QIODevice::Append)) {
qWarning("Error updating .pro file."); qWarning("Error updating .pro file.");
return false; return false;
} }
QString installsString QString proFileTemplate = QLatin1String("\nunix:!symbian {\n"
= QLatin1String("\nmaemo5|maemo6 {\n target.path = ") " maemo5 {\n target.path = maemo5path\n } else {\n"
+ remoteDir + QLatin1String("\n INSTALLS += target\n}\n"); " target.path = maemo6path\n }\n"
if (!projectFile.write(installsString.toLocal8Bit())) { " INSTALLS += target\n}");
proFileTemplate.replace(QLatin1String("maemo5path"), remoteDirMaemo5);
proFileTemplate.replace(QLatin1String("maemo6path"), remoteDirMaemo6);
if (!projectFile.write(proFileTemplate.toLocal8Bit())) {
qWarning("Error updating .pro file."); qWarning("Error updating .pro file.");
return false; return false;
} }

7
src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp
View File

@@ -363,9 +363,12 @@ bool MaemoTemplatesManager::updateDesktopFile(const Qt4Target *target,
return false; return false;
} }
QByteArray proFileContents = proFile.readAll(); QByteArray proFileContents = proFile.readAll();
proFileContents += "\nmaemo5|maemp6{\n" proFileContents += "\nunix:!symbian {\n"
" desktopfile.files = $${TARGET}.desktop\n" " desktopfile.files = $${TARGET}.desktop\n"
" desktopfile.path = /usr/share/applications/hildon\n" " maemo5 {\n"
" desktopfile.path = /usr/share/applications/hildon\n"
" } else {\n"
" desktopfile.path = /usr/share/applications\n }\n"
" INSTALLS += desktopfile\n}\n"; " INSTALLS += desktopfile\n}\n";
proFile.resize(0); proFile.resize(0);
proFile.write(proFileContents); proFile.write(proFileContents);