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/jsextensions | |
| parent | ffbc37129d6a2623ddc731520baba0f4d3b6f3b1 (diff) | |
| parent | 66131652f178cd1605b8a2c0ba7023392e13ad5a (diff) | |
Merge 1.12 into master
Change-Id: I0ce6c28f9117f945c9fec0654bd06daf3d13ace0
Diffstat (limited to 'src/lib/corelib/jsextensions')
| -rw-r--r-- | src/lib/corelib/jsextensions/moduleproperties.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/corelib/jsextensions/moduleproperties.cpp b/src/lib/corelib/jsextensions/moduleproperties.cpp index d80a4bc5f..7607b3dc2 100644 --- a/src/lib/corelib/jsextensions/moduleproperties.cpp +++ b/src/lib/corelib/jsextensions/moduleproperties.cpp @@ -51,6 +51,7 @@ #include <tools/error.h> #include <tools/qbsassert.h> #include <tools/qttools.h> +#include <tools/stlutils.h> #include <tools/stringconstants.h> #include <QtScript/qscriptclass.h> @@ -249,7 +250,7 @@ void ModuleProperties::init(QScriptValue artifactObject, const Artifact *artifac {StringConstants::nameProperty(), product->name}, {StringConstants::sourceDirectoryProperty(), product->sourceDirectory}, {StringConstants::targetNameProperty(), product->targetName}, - {StringConstants::typeProperty(), product->fileTags.toStringList()} + {StringConstants::typeProperty(), sorted(product->fileTags.toStringList())} }; QScriptEngine * const engine = artifactObject.engine(); artifactObject.setProperty(StringConstants::productVar(), |