diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-07-25 19:37:57 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-07-30 10:31:53 +0200 |
| commit | 26bbc40db925d7823d9cf9db80a4093eba613ad8 (patch) | |
| tree | 371ba421d0f403970fa430656f029a318c29c026 /qmake/library/qmakeevaluator.h | |
| parent | 1c23e51dbd11b50fe32c10b2415cd1f2401a591e (diff) | |
add priority sorting to $$resolve_depends()
all else being equal, items with a higher numerical priority will appear
first in the result.
Change-Id: I4ee37ff404a53c4152a1e4fc2fc3c23ef525234d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake/library/qmakeevaluator.h')
| -rw-r--r-- | qmake/library/qmakeevaluator.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qmake/library/qmakeevaluator.h b/qmake/library/qmakeevaluator.h index f322a48011..8b2fc3ef06 100644 --- a/qmake/library/qmakeevaluator.h +++ b/qmake/library/qmakeevaluator.h @@ -51,6 +51,7 @@ #include <qlist.h> #include <qlinkedlist.h> +#include <qmap.h> #include <qset.h> #include <qstack.h> #include <qstring.h> @@ -238,8 +239,9 @@ public: void populateDeps( const ProStringList &deps, const ProString &prefix, const ProStringList &suffixes, - QHash<ProKey, QSet<ProKey> > &dependencies, - ProValueMap &dependees, ProStringList &rootSet) const; + const ProString &priosfx, + QHash<ProKey, QSet<ProKey> > &dependencies, ProValueMap &dependees, + QMultiMap<int, ProString> &rootSet) const; VisitReturn writeFile(const QString &ctx, const QString &fn, QIODevice::OpenMode mode, const QString &contents); |