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

fix detection of Simulator Qt

Browse Source 
backport of ndk/commits/113d4c56180b8f59cb03d738f76dab46dd7fafe0
This commit is contained in:
hjk
2010-08-27 14:57:36 +02:00
parent 8cee882d41
commit 0aa1286749
1 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1451,35 +1451,15 @@ void QtVersion::updateToolChainAndMkspec() const
else if (value == "build_all") else if (value == "build_all")
m_defaultConfigIsDebugAndRelease = true; m_defaultConfigIsDebugAndRelease = true;
} }
// Is this actually a simulator Qt?
if (configValues.contains(QLatin1String("simulator"))) {
m_targetIds.clear();
m_targetIds.insert(QLatin1String(Constants::QT_SIMULATOR_TARGET_ID));
}
delete reader; delete reader;
ProFileCacheManager::instance()->decRefCount(); ProFileCacheManager::instance()->decRefCount();
m_toolChainUpToDate = true; m_toolChainUpToDate = true;
// Check qconfig.h for QT_SIMULATOR define on desktop builds and switch the
// Qt version to Qt simulator target:
if (m_targetIds.contains(Constants::DESKTOP_TARGET_ID)) {
QString path(headerInstallPath());
path.append(QLatin1String("/Qt/qconfig.h"));
QFile qconfig(path);
if (!qconfig.exists())
return;
qconfig.open(QIODevice::ReadOnly);
QTextStream stream(&qconfig);
QString line;
bool isSimulator = false;
while (!(line = stream.readLine()).isNull()) {
if (line.startsWith(QLatin1String("#define QT_SIMULATOR"))) {
isSimulator = true;
break;
}
}
qconfig.close();
if (isSimulator) {
m_targetIds.remove(QLatin1String(Constants::DESKTOP_TARGET_ID));
m_targetIds.insert(QLatin1String(Constants::QT_SIMULATOR_TARGET_ID));
}
}
} }
QString QtVersion::mwcDirectory() const QString QtVersion::mwcDirectory() const