Merge remote-tracking branch 'origin/4.5'

Change-Id: I86852d289c22210a0439e8e297819dc7276a96de
2017-11-29 09:56:22 +01:00
parent 4007828820 78ef474c71
commit e2baa116ca
17 changed files with 52 additions and 14 deletions
--- a/src/libs/qmljs/qmljsimportdependencies.cpp
+++ b/src/libs/qmljs/qmljsimportdependencies.cpp
@@ -72,7 +72,7 @@ int ImportMatchStrength::compareMatch(const ImportMatchStrength &o) const
        int v2 = o.m_match.at(i);
        if (v1 < v2)
            return -1;
-        if (v2 > v1)
+        if (v1 > v2)
            return 1;
    }
    if (len1 < len2)