1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove QMAKE_MKSPECS property from qmake -query's view

Browse Source 
it's a dynamic property which is something between meaningless and
misleading when used outside a project file.
also, experience from creator shows that people would consistently
abuse it (not handling it as the list it is).

Change-Id: Id52cd40da5c38c0c74535d0701fdae53dfa39cad
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-08-21 14:36:20 +02:00 committed by Qt by Nokia
parent 56d5c909af
commit 19e3441b7c
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/project.cpp
View File

@ -3683,7 +3683,9 @@ QMakeProject::doVariableReplaceExpand(const QString &str, QHash<QString, QString
if(var_type == ENVIRON) { if(var_type == ENVIRON) {
replacement = split_value_list(QString::fromLocal8Bit(qgetenv(var.toLatin1().constData()))); replacement = split_value_list(QString::fromLocal8Bit(qgetenv(var.toLatin1().constData())));
} else if(var_type == PROPERTY) { } else if(var_type == PROPERTY) {
if(prop) if (var == "QMAKE_MKSPECS")
replacement = split_value_list(qmake_mkspec_paths().join(Option::dirlist_sep));
else if (prop)
replacement = split_value_list(prop->value(var)); replacement = split_value_list(prop->value(var));
} else if(var_type == FUNCTION) { } else if(var_type == FUNCTION) {
replacement = doProjectExpand(var, args, place); replacement = doProjectExpand(var, args, place);

5
qmake/property.cpp
View File

@ -49,8 +49,6 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QStringList qmake_mkspec_paths(); //project.cpp
static const struct { static const struct {
const char *name; const char *name;
QLibraryInfo::LibraryLocation loc; QLibraryInfo::LibraryLocation loc;
@ -109,8 +107,6 @@ QMakeProperty::value(const QString &v)
QString val = m_values.value(v); QString val = m_values.value(v);
if (!val.isNull()) if (!val.isNull())
return val; return val;
else if(v == "QMAKE_MKSPECS")
return qmake_mkspec_paths().join(Option::dirlist_sep);
else if(v == "QMAKE_VERSION") else if(v == "QMAKE_VERSION")
return qmake_version(); return qmake_version();
#ifdef QT_VERSION_STR #ifdef QT_VERSION_STR
@ -165,7 +161,6 @@ QMakeProperty::exec()
QStringList specialProps; QStringList specialProps;
for (int i = 0; i < sizeof(propList)/sizeof(propList[0]); i++) for (int i = 0; i < sizeof(propList)/sizeof(propList[0]); i++)
specialProps.append(QString::fromLatin1(propList[i].name)); specialProps.append(QString::fromLatin1(propList[i].name));
specialProps.append("QMAKE_MKSPECS");
specialProps.append("QMAKE_VERSION"); specialProps.append("QMAKE_VERSION");
#ifdef QT_VERSION_STR #ifdef QT_VERSION_STR
specialProps.append("QT_VERSION"); specialProps.append("QT_VERSION");