diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-07-25 19:37:57 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-12-18 14:43:10 +0000 |
| commit | d5929aa8c3d61441d08362ce97c0dba0103254ce (patch) | |
| tree | 96a55cca62339b0f61a799bdd41b463ad06b7440 /src/linguist/shared/qmakeevaluator.h | |
| parent | 0f03391546b64981e28b5f1ca2625599d00ae717 (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>
(cherry picked from qtbase/26bbc40db925d7823d9cf9db80a4093eba613ad8)
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/linguist/shared/qmakeevaluator.h')
| -rw-r--r-- | src/linguist/shared/qmakeevaluator.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/linguist/shared/qmakeevaluator.h b/src/linguist/shared/qmakeevaluator.h index 9bd7cfa3a..fd6acd42d 100644 --- a/src/linguist/shared/qmakeevaluator.h +++ b/src/linguist/shared/qmakeevaluator.h @@ -43,6 +43,7 @@ #include <qlist.h> #include <qlinkedlist.h> +#include <qmap.h> #include <qset.h> #include <qstack.h> #include <qstring.h> @@ -234,8 +235,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); |