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

prefer /get variants of qmake properties

Browse Source 
we care for the current value, not the installed one. this only matters
for developers of qt, but that's sufficiently many, i'd think. :)
it wouldn't be nice to "litter" all variable references with the "/get"
suffix, so do it centrally (even if that's a tad slower).

Change-Id: I620f3da9185e7d2dd7bd4744f28d59d561b79132
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-07-06 14:21:18 +02:00
parent dc84ac3c0a
commit 5e2be6ac5e
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -504,14 +504,21 @@ QString BaseQtVersion::toHtml(bool verbose) const
if (!vInfo.isEmpty()) { if (!vInfo.isEmpty()) {
const QHash<QString,QString>::const_iterator vcend = vInfo.constEnd(); const QHash<QString,QString>::const_iterator vcend = vInfo.constEnd();
for (QHash<QString,QString>::const_iterator it = vInfo.constBegin(); it != vcend; ++it) { for (QHash<QString,QString>::const_iterator it = vInfo.constBegin(); it != vcend; ++it) {
const QString &variableName = it.key(); QString variableName = it.key();
const QString &value = it.value(); const QString &value = it.value();
if (variableName != QLatin1String("QMAKE_MKSPECS") if (variableName != QLatin1String("QMAKE_MKSPECS")
&& !variableName.endsWith(QLatin1String("/raw")) && !variableName.endsWith(QLatin1String("/get"))) { && !variableName.endsWith(QLatin1String("/raw"))) {
const bool isPath = !value.isEmpty() && bool isPath = false;
(variableName.contains(QLatin1String("HOST")) if (variableName.contains(QLatin1String("_HOST_"))
|| variableName.contains(QLatin1String("INSTALL"))); || variableName.contains(QLatin1String("_INSTALL_"))) {
if (!variableName.endsWith(QLatin1String("/get")))
continue;
variableName.chop(4);
isPath = true;
}
str << "<tr><td><pre>" << variableName << "</pre></td><td>"; str << "<tr><td><pre>" << variableName << "</pre></td><td>";
if (value.isEmpty())
isPath = false;
if (isPath) { if (isPath) {
str << "<a href=\"" << QUrl::fromLocalFile(value).toString() str << "<a href=\"" << QUrl::fromLocalFile(value).toString()
<< "\">" << QDir::toNativeSeparators(value) << "</a>"; << "\">" << QDir::toNativeSeparators(value) << "</a>";
@@ -895,6 +902,9 @@ QHash<QString,QString> BaseQtVersion::versionInfo() const
QString BaseQtVersion::qmakeProperty(const QHash<QString,QString> &versionInfo, const QByteArray &name) QString BaseQtVersion::qmakeProperty(const QHash<QString,QString> &versionInfo, const QByteArray &name)
{ {
QString val = versionInfo.value(QString::fromLatin1(name + "/get"));
if (!val.isNull())
return val;
return versionInfo.value(QString::fromLatin1(name)); return versionInfo.value(QString::fromLatin1(name));
} }