remove QMAKE_MKSPECS property from qmake -query's view

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>

diff --git a/qmake/project.cpp b/qmake/project.cpp
index 7a80cc6..a97d4ac 100644 (file)
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -3683,7 +3683,9 @@ QMakeProject::doVariableReplaceExpand(const QString &str, QHash<QString, QString
                 if(var_type == ENVIRON) {
                     replacement = split_value_list(QString::fromLocal8Bit(qgetenv(var.toLatin1().constData())));
                 } 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));
                 } else if(var_type == FUNCTION) {
                     replacement = doProjectExpand(var, args, place);

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