diff options
| author | Tim Jenssen <[email protected]> | 2022-12-14 15:29:20 +0100 |
|---|---|---|
| committer | Tim Jenssen <[email protected]> | 2022-12-14 14:30:09 +0000 |
| commit | 7f234ed768075dc14ea3b74f4531349851182aa5 (patch) | |
| tree | 25545aaae506361bfb3704583038977e28c7de62 /src/libs/qmljs/qmljsmodelmanagerinterface.cpp | |
| parent | a3fe24d1920806e2307b754d42959ba3d891c5cc (diff) | |
| parent | 249c3561cbccb978889b738f2d0ce8e41a1ac371 (diff) | |
Merge remote-tracking branch 'origin/qds/dev'
Conflicts:
src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp
src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturesmodel.cpp
Change-Id: Ieda6242b845387100022b08251283891fb0fbda7
Diffstat (limited to 'src/libs/qmljs/qmljsmodelmanagerinterface.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljsmodelmanagerinterface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp index 9ba1d43fcf7..23e74f819bd 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp @@ -63,8 +63,8 @@ static const char *qtQuickUISuffix = "ui.qml"; static void maybeAddPath(ViewerContext &context, const Utils::FilePath &path) { - if (!path.isEmpty() && !context.paths.contains(path)) - context.paths.append(path); + if (!path.isEmpty() && !(context.paths.count(path) > 0)) + context.paths.insert(path); } static QList<Utils::FilePath> environmentImportPaths() |