fix misnomer: $$resolve_depends() => $$sort_depends()

... and re-add a real $$resolve_depends(), just in case.

Change-Id: I489d6056546340ce95280fe7fd571e30c14470e7
Reviewed-on: http://codereview.qt.nokia.com/1455
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>

3 files changed, 16 insertions, 12 deletions

diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 65deed3fec..2bc184516f 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -130,7 +130,7 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {
 QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT
 
 # Topological ordering of modules based on their QT.<module>.depends variable
-QT = $$resolve_depends(QT, "QT.")
+QT = $$sort_depends(QT, "QT.")
 
 QT_DEPENDS=
 
diff --git a/qmake/project.cpp b/qmake/project.cpp
index feff736480..4a3d7b5737 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -81,7 +81,7 @@ enum ExpandFunc { E_MEMBER=1, E_FIRST, E_LAST, E_CAT, E_FROMFILE, E_EVAL, E_LIST
                   E_SPRINTF, E_JOIN, E_SPLIT, E_BASENAME, E_DIRNAME, E_SECTION,
                   E_FIND, E_SYSTEM, E_UNIQUE, E_QUOTE, E_ESCAPE_EXPAND,
                   E_UPPER, E_LOWER, E_FILES, E_PROMPT, E_RE_ESCAPE, E_REPLACE,
-                  E_SIZE, E_GENERATE_UID, E_RESOLVE_DEPENDS };
+                  E_SIZE, E_GENERATE_UID, E_SORT_DEPENDS, E_RESOLVE_DEPENDS };
 QMap<QString, ExpandFunc> qmake_expandFunctions()
 {
     static QMap<QString, ExpandFunc> *qmake_expand_functions = 0;
@@ -114,6 +114,7 @@ QMap<QString, ExpandFunc> qmake_expandFunctions()
         qmake_expand_functions->insert("replace", E_REPLACE);
         qmake_expand_functions->insert("size", E_SIZE);
         qmake_expand_functions->insert("generate_uid", E_GENERATE_UID);
+        qmake_expand_functions->insert("sort_depends", E_SORT_DEPENDS);
         qmake_expand_functions->insert("resolve_depends", E_RESOLVE_DEPENDS);
     }
     return *qmake_expand_functions;
@@ -1803,32 +1804,32 @@ extern QString generate_test_uid(const QString& target);
 
 
 void calculateDeps(QStringList &sortedList, const QString &item, const QString &prefix,
-                   QStringList &org, QMap<QString, QStringList> &place)
+                   QStringList &org, bool resolve, QMap<QString, QStringList> &place)
 {
     if (sortedList.contains(item))
         return;
 
     foreach(QString dep, place.value(prefix + item + ".depends")) {
-        calculateDeps(sortedList, dep, prefix, org, place);
-        if (org.isEmpty())
+        calculateDeps(sortedList, dep, prefix, org, resolve, place);
+        if (!resolve && org.isEmpty())
             break;
     }
 
-    if (org.contains(item)) {
+    if (resolve || org.contains(item)) {
         sortedList.prepend(item);
         org.removeAll(item);
     }
 }
 
 QStringList
-QMakeProject::resolveDepends(const QStringList &deps, const QString &prefix,
+QMakeProject::resolveDepends(const QStringList &deps, const QString &prefix, bool resolve,
                              QMap<QString, QStringList> &place)
 {
     QStringList sortedList;
     QStringList org = deps;
     foreach(QString item, deps) {
-        calculateDeps(sortedList, item, prefix, org, place);
-        if (org.isEmpty())
+        calculateDeps(sortedList, item, prefix, org, resolve, place);
+        if (!resolve && org.isEmpty())
             break;
     }
     return sortedList;
@@ -2280,13 +2281,15 @@ QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list,
             ret += generate_test_uid(args.first());
         }
         break;
+    case E_SORT_DEPENDS:
     case E_RESOLVE_DEPENDS: {
         if(args.count() < 1 || args.count() > 2) {
-            fprintf(stderr, "%s:%d: resolve_depends(var, prefix) requires one or two arguments.\n",
-                    parser.file.toLatin1().constData(), parser.line_no);
+            fprintf(stderr, "%s:%d: %s(var, prefix) requires one or two arguments.\n",
+                    parser.file.toLatin1().constData(), parser.line_no, func.toLatin1().constData());
         } else {
             ret += resolveDepends(values(args[0], place),
                                   (args.count() != 2 ? QString() : args[1]),
+                                  (func_t == E_RESOLVE_DEPENDS),
                                   place);
         }
         break; }
diff --git a/qmake/project.h b/qmake/project.h
index ec5e8930a4..5581d1fc00 100644
--- a/qmake/project.h
+++ b/qmake/project.h
@@ -107,7 +107,8 @@ class QMakeProject
     QStringList doVariableReplaceExpand(const QString &str, QMap<QString, QStringList> &place, bool *ok=0);
     void init(QMakeProperty *, const QMap<QString, QStringList> *);
     QStringList &values(const QString &v, QMap<QString, QStringList> &place);
-    QStringList resolveDepends(const QStringList &deps, const QString &prefix, QMap<QString, QStringList> &place);
+    QStringList resolveDepends(const QStringList &deps, const QString &prefix, bool resolve,
+                               QMap<QString, QStringList> &place);
     void validateModes();
 
 public: