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

Merge remote branch 'origin/2.2'

Browse Source 
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h
This commit is contained in:
con
2011-04-01 09:53:09 +02:00
parent 12fd1dbb70 eb03bd1a93
commit 1c2da511b9
140 changed files with 1139 additions and 2743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/plugins/qt4projectmanager/qtversionmanager.cpp
View File

@@ -176,8 +176,8 @@ QtVersionManager::QtVersionManager()
version->setSystemRoot(s->value("S60SDKDirectory").toString());
version->setSbsV2Directory(s->value(QLatin1String("SBSv2Directory")).toString());
// Update from 2.1 or earlier:
QString mingwDir = s->value(QLatin1String("MingwDirectory")).toString();
// Update from pre-2.2:
const QString mingwDir = s->value(QLatin1String("MingwDirectory")).toString();
if (!mingwDir.isEmpty()) {
QFileInfo fi(mingwDir + QLatin1String("/bin/g++.exe"));
if (fi.exists() && fi.isExecutable()) {
@@ -189,30 +189,12 @@ QtVersionManager::QtVersionManager()
}
}
}
QString mwcDir = s->value(QLatin1String("MwcDirectory")).toString();
if (!mwcDir.isEmpty()) {
QFileInfo fi(mwcDir + QLatin1String("/x86Build/Symbian_Tools/Command_Line_Tools/mwwinrc.exe"));
if (fi.exists() && fi.isExecutable()) {
WinscwToolChain *tc = createToolChain<WinscwToolChain>(Constants::WINSCW_TOOLCHAIN_ID);
if (tc) {
tc->setCompilerPath(fi.absoluteFilePath());
tc->setDisplayName(tr("WINSCW from %1").arg(version->displayName()));
ProjectExplorer::ToolChainManager::instance()->registerToolChain(tc);
}
}
}
QString gcceDir = s->value(QLatin1String("GcceDirectory")).toString();
if (!gcceDir.isEmpty()) {
QFileInfo fi(gcceDir + QLatin1String("/bin/arm-none-symbianelf-g++.exe"));
if (fi.exists() && fi.isExecutable()) {
GcceToolChain *tc = createToolChain<GcceToolChain>(Constants::GCCE_TOOLCHAIN_ID);
if (tc) {
tc->setCompilerPath(fi.absoluteFilePath());
tc->setDisplayName(tr("GCCE from %1").arg(version->displayName()));
ProjectExplorer::ToolChainManager::instance()->registerToolChain(tc);
}
}
}
const QString mwcDir = s->value(QLatin1String("MwcDirectory")).toString();
if (!mwcDir.isEmpty())
m_pendingMwcUpdates.append(mwcDir);
const QString gcceDir = s->value(QLatin1String("GcceDirectory")).toString();
if (!gcceDir.isEmpty())
m_pendingGcceUpdates.append(gcceDir);
m_versions.insert(version->uniqueId(), version);
}
@@ -413,6 +395,20 @@ bool QtVersionManager::isValidId(int id) const
return m_versions.contains(id);
}
QString QtVersionManager::popPendingMwcUpdate()
{
if (m_pendingMwcUpdates.isEmpty())
return QString();
return m_pendingMwcUpdates.takeFirst();
}
QString QtVersionManager::popPendingGcceUpdate()
{
if (m_pendingGcceUpdates.isEmpty())
return QString();
return m_pendingGcceUpdates.takeFirst();
}
QtVersion *QtVersionManager::version(int id) const
{
QMap<int, QtVersion *>::const_iterator it = m_versions.find(id);
@@ -751,6 +747,12 @@ bool QtVersion::supportsShadowBuilds() const
// We can not support shadow building with the ABLD system
return false;
}
#ifdef Q_OS_WIN
if (targets.contains(Constants::MEEGO_DEVICE_TARGET_ID)
|| targets.contains(Constants::MAEMO5_DEVICE_TARGET_ID)
|| targets.contains(Constants::HARMATTAN_DEVICE_TARGET_ID))
return false;
#endif
return true;
}