From 1aa9affcf1cd177b91e0a92a18e937f8ae892af2 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 11 Jul 2011 17:17:18 +0200
Subject: 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>
---
 qmake/project.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'qmake/project.h')

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:
-- 
cgit v1.2.3