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

Make Meego target work.

Browse Source 
- Package installation and running untested yet.
- User currently needs to adapt %files section in spec file manually.
  We expect this task to be automated by the build script in the future
  (see http://bugs.meego.com/show_bug.cgi?id=13148).
This commit is contained in:
Christian Kandeler
2011-01-31 17:46:19 +01:00
parent a9231c3044
commit 14cb9f91ad
29 changed files with 492 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
View File

@@ -58,7 +58,8 @@ static const QLatin1String binQmake("/bin/qmake" EXEC_SUFFIX);
bool MaemoGlobal::isMaemoTargetId(const QString &id)
{
return id == QLatin1String(Constants::MAEMO5_DEVICE_TARGET_ID)
|| id == QLatin1String(Constants::HARMATTAN_DEVICE_TARGET_ID);
|| id == QLatin1String(Constants::HARMATTAN_DEVICE_TARGET_ID)
|| id == QLatin1String(Constants::MEEGO_DEVICE_TARGET_ID);
}
bool MaemoGlobal::isValidMaemo5QtVersion(const QtVersion *version)
@@ -71,6 +72,11 @@ bool MaemoGlobal::isValidHarmattanQtVersion(const QtVersion *version)
return isValidMaemoQtVersion(version, Maemo6);
}
bool MaemoGlobal::isValidMeegoQtVersion(const Qt4ProjectManager::QtVersion *version)
{
return isValidMaemoQtVersion(version, Meego);
}
bool MaemoGlobal::isValidMaemoQtVersion(const QtVersion *qtVersion,
MaemoVersion maemoVersion)
{
@@ -188,9 +194,26 @@ MaemoGlobal::MaemoVersion MaemoGlobal::version(const QtVersion *qtVersion)
return Maemo5;
if (name.startsWith(QLatin1String("harmattan")))
return Maemo6;
if (name.startsWith(QLatin1String("meego")))
return Meego;
return static_cast<MaemoVersion>(-1);
}
QString MaemoGlobal::architecture(const QtVersion *qtVersion)
{
QProcess proc;
const QStringList args = QStringList() << QLatin1String("-t")
<< targetName(qtVersion) << QLatin1String("uname")
<< QLatin1String("-m");
if (!callMad(proc, args, qtVersion))
return QString();
if (!proc.waitForFinished())
return QString();
QString arch = QString::fromUtf8(proc.readAllStandardOutput());
arch.chop(1); // Newline
return arch;
}
bool MaemoGlobal::removeRecursively(const QString &filePath, QString &error)
{
error.clear();