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

Quieten warning when Qt version is not found

Browse Source
This commit is contained in:
Tobias Hunger
2011-03-07 17:54:57 +01:00
parent 9a8a32b2e4
commit de4b2244f1
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1495,6 +1495,7 @@ void QtVersion::updateAbiAndMkspec() const
QString ce_sdk = evaluator.values("CE_SDK").join(QLatin1String(" ")); QString ce_sdk = evaluator.values("CE_SDK").join(QLatin1String(" "));
QString ce_arch = evaluator.value("CE_ARCH"); QString ce_arch = evaluator.value("CE_ARCH");
const QString coreLibrary = qtCorePath();
// Evaluate all the information we have: // Evaluate all the information we have:
if (!ce_sdk.isEmpty() && !ce_arch.isEmpty()) { if (!ce_sdk.isEmpty() && !ce_arch.isEmpty()) {
@@ -1533,7 +1534,7 @@ void QtVersion::updateAbiAndMkspec() const
} else if (qmakeCXX.contains("g++") } else if (qmakeCXX.contains("g++")
|| qmakeCXX == "cl" || qmakeCXX == "icl" // intel cl || qmakeCXX == "cl" || qmakeCXX == "icl" // intel cl
|| qmakeCXX == QLatin1String("icpc")) { || qmakeCXX == QLatin1String("icpc")) {
m_abis = ProjectExplorer::Abi::abisOfBinary(qtCorePath()); m_abis = ProjectExplorer::Abi::abisOfBinary(coreLibrary);
#if defined (Q_OS_WIN) #if defined (Q_OS_WIN)
if (makefileGenerator == "MINGW") { if (makefileGenerator == "MINGW") {
QList<ProjectExplorer::Abi> tmp = m_abis; QList<ProjectExplorer::Abi> tmp = m_abis;
@@ -1546,12 +1547,12 @@ void QtVersion::updateAbiAndMkspec() const
m_targetIds.insert(QLatin1String(Constants::DESKTOP_TARGET_ID)); m_targetIds.insert(QLatin1String(Constants::DESKTOP_TARGET_ID));
} }
if (m_abis.isEmpty()) { if (m_abis.isEmpty() && !coreLibrary.isEmpty()) {
qWarning("Warning: Could not find ABI for '%s' ('%s', %s) /%s " qWarning("Warning: Could not find ABI for '%s' ('%s', %s)/%s by looking at %s:"
"Qt Creator does not know about the system includes, " "Qt Creator does not know about the system includes, "
"nor the system defines.", "nor the system defines.",
qPrintable(m_mkspecFullPath), qPrintable(displayName()), qPrintable(m_mkspecFullPath), qPrintable(displayName()),
qPrintable(qmakeCommand()), qPrintable(qmakeCXX)); qPrintable(qmakeCommand()), qPrintable(qmakeCXX), qPrintable(coreLibrary));
} }
QStringList configValues = evaluator.values("CONFIG"); QStringList configValues = evaluator.values("CONFIG");