diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-08-03 10:48:10 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-08-03 12:43:00 +0200 |
| commit | 51b63d5e805814c1ec88e4a874cd7eabd58eb20a (patch) | |
| tree | 600a94fe14b9741dc58492df5300265fe284118c /src/lib/corelib/buildgraph/transformer.cpp | |
| parent | ffbc37129d6a2623ddc731520baba0f4d3b6f3b1 (diff) | |
| parent | 66131652f178cd1605b8a2c0ba7023392e13ad5a (diff) | |
Merge 1.12 into master
Change-Id: I0ce6c28f9117f945c9fec0654bd06daf3d13ace0
Diffstat (limited to 'src/lib/corelib/buildgraph/transformer.cpp')
| -rw-r--r-- | src/lib/corelib/buildgraph/transformer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/corelib/buildgraph/transformer.cpp b/src/lib/corelib/buildgraph/transformer.cpp index baf104df5..df371e1fe 100644 --- a/src/lib/corelib/buildgraph/transformer.cpp +++ b/src/lib/corelib/buildgraph/transformer.cpp @@ -49,6 +49,7 @@ #include <tools/scripttools.h> #include <tools/qbsassert.h> #include <tools/stringconstants.h> +#include <tools/stlutils.h> #include <QtCore/qdir.h> @@ -117,7 +118,7 @@ QScriptValue Transformer::translateFileConfig(ScriptEngine *scriptEngine, const setArtifactProperty(obj, StringConstants::completeBaseNameProperty(), js_completeBaseName, artifact); setArtifactProperty(obj, QStringLiteral("baseDir"), js_baseDir, artifact); - const QStringList fileTags = artifact->fileTags().toStringList(); + const QStringList fileTags = sorted(artifact->fileTags().toStringList()); scriptEngine->setObservedProperty(obj, StringConstants::fileTagsProperty(), scriptEngine->toScriptValue(fileTags)); scriptEngine->observer()->addArtifactId(obj.objectId()); |