diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-07-11 17:17:18 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-11 18:58:41 +0200 |
| commit | 1aa9affcf1cd177b91e0a92a18e937f8ae892af2 (patch) | |
| tree | fcb4ec81c424325d82a928c3add314e7ac0c0af7 /qmake/project.h | |
| parent | fc42ffa15af3bc70a93b9def27282a046c00f809 (diff) | |
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>
Diffstat (limited to 'qmake/project.h')
| -rw-r--r-- | qmake/project.h | 3 |
1 files changed, 2 insertions, 1 deletions
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: |