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

Maemo: Move OsVersion type from MaemoGlobal to MaemoDeviceConfig.

Browse Source 
Also move freePorts() method from AbstractMaemoDeployStep
to MaemoGlobal.
This commit is contained in:
Christian Kandeler
2011-04-21 14:39:57 +02:00
parent 5294db3d16
commit 0ee99ff2b3
19 changed files with 136 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -248,7 +248,7 @@ bool MaemoDeployableListModel::addDesktopFile()
const QtVersion * const version = qtVersion();
QTC_ASSERT(version, return false);
QString remoteDir = QLatin1String("/usr/share/applications");
if (MaemoGlobal::version(version) == MaemoGlobal::Maemo5)
if (MaemoGlobal::version(version) == MaemoDeviceConfig::Maemo5)
remoteDir += QLatin1String("/hildon");
const QLatin1String filesLine("desktopfile.files = $${TARGET}.desktop");
const QString pathLine = QLatin1String("desktopfile.path = ") + remoteDir;
@@ -330,7 +330,7 @@ QString MaemoDeployableListModel::proFileScope() const
{
const QtVersion *const qv = qtVersion();
QTC_ASSERT(qv, return QString());
return QLatin1String(MaemoGlobal::version(qv) == MaemoGlobal::Maemo5
return QLatin1String(MaemoGlobal::version(qv) == MaemoDeviceConfig::Maemo5
? "maemo5" : "unix:!symbian:!maemo5");
}