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

Maemo: Qemu: Bugfix + MADDE workaround.

Browse Source 
Reviewed-by: kh1
This commit is contained in:
ck
2010-07-21 17:00:40 +02:00
parent 163d727c59
commit b1c9784e74
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp
View File

@@ -359,13 +359,19 @@ void QemuRuntimeManager::startRuntime()
m_qemuProcess->setProcessEnvironment(env); m_qemuProcess->setProcessEnvironment(env);
m_qemuProcess->setWorkingDirectory(rt.m_root); m_qemuProcess->setWorkingDirectory(rt.m_root);
const QString app = root + (QFileInfo(rt.m_bin).isRelative() // This is complex because of extreme MADDE weirdness.
const bool pathIsRelative = QFileInfo(rt.m_bin).isRelative();
const QString app =
#ifdef Q_OS_WIN
root % (pathIsRelative
? QLatin1String("madlib/") % rt.m_bin // Fremantle. ? QLatin1String("madlib/") % rt.m_bin // Fremantle.
: rt.m_bin) // Haramattan. : rt.m_bin) // Haramattan.
#ifdef Q_OS_WIN % QLatin1String(".exe");
% QLatin1String(".exe") #else
pathIsRelative
? root % QLatin1String("madlib/") % rt.m_bin // Fremantle.
: rt.m_bin; // Haramattan.
#endif #endif
; // keep
m_qemuProcess->start(app % QLatin1Char(' ') % rt.m_args, m_qemuProcess->start(app % QLatin1Char(' ') % rt.m_args,
QIODevice::ReadWrite); QIODevice::ReadWrite);
@@ -512,12 +518,18 @@ bool QemuRuntimeManager::targetUsesRuntimeConfig(Target *target)
MaemoRunConfiguration *mrc = MaemoRunConfiguration *mrc =
qobject_cast<MaemoRunConfiguration *> (target->activeRunConfiguration()); qobject_cast<MaemoRunConfiguration *> (target->activeRunConfiguration());
if (mrc) { if (!mrc)
const MaemoDeviceConfig &config = mrc->deviceConfig(); return false;
if (config.isValid() && config.type == MaemoDeviceConfig::Simulator) Qt4BuildConfiguration *bc
return true; = qobject_cast<Qt4BuildConfiguration *>(target->activeBuildConfiguration());
} if (!bc)
return false; return false;
QtVersion *version = bc->qtVersion();
if (!version || !m_runtimes.contains(version->uniqueId()))
return false;
const MaemoDeviceConfig &config = mrc->deviceConfig();
return config.isValid() && config.type == MaemoDeviceConfig::Simulator;
} }
QString QemuRuntimeManager::maddeRoot(const QString &qmake) const QString QemuRuntimeManager::maddeRoot(const QString &qmake) const