diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2022-12-22 12:55:00 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2022-12-22 14:08:46 +0100 |
| commit | f2956ece11f96d4a7fe9a7e82eee07c286452e89 (patch) | |
| tree | ecd709d374e21a2bbedc874fafe31a57acf485bc /src/libs/qmljs/qmljsmodelmanagerinterface.cpp | |
| parent | be89f99ecc631431c15df970112f909eb38114d2 (diff) | |
| parent | d5cf9ffd375e23dde4c4e51f4de7590dbbe64bf3 (diff) | |
| download | qt-creator-f2956ece11f96d4a7fe9a7e82eee07c286452e89.tar.gz | |
Merge remote-tracking branch 'origin/qds/dev'
Conflicts: src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
src/plugins/updateinfo/updateinfoplugin.cpp
src/tools/qml2puppet/CMakeLists.txt
src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
Change-Id: I6b65ce2d603453fcebc2291574d55db80853f247
Diffstat (limited to 'src/libs/qmljs/qmljsmodelmanagerinterface.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljsmodelmanagerinterface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp index 23e74f819b..8075e6821e 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp @@ -63,7 +63,7 @@ static const char *qtQuickUISuffix = "ui.qml"; static void maybeAddPath(ViewerContext &context, const Utils::FilePath &path) { - if (!path.isEmpty() && !(context.paths.count(path) > 0)) + if (!path.isEmpty() && (context.paths.count(path) <= 0)) context.paths.insert(path); } |