summaryrefslogtreecommitdiff
path: root/src/plugins/modeleditor
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@qt.io>2019-07-12 15:53:56 +0200
committerTim Jenssen <tim.jenssen@qt.io>2019-07-12 15:53:56 +0200
commit333b33edbe9805e00772c68c7a7f47c8394b786b (patch)
treebcf4f598ce58b3b99ae103e6f2d4ef12c790b84b /src/plugins/modeleditor
parentf7520b7d991c34b3d8e3d1d726dc0b606f32c835 (diff)
parent51cd2885ef56d43b8f421046fab6e5f85f8e6484 (diff)
downloadqt-creator-333b33edbe9805e00772c68c7a7f47c8394b786b.tar.gz
Merge remote-tracking branch 'origin/4.10'
Change-Id: Iaf27911e4e9fb762c1a24c84c458462bafe95728
Diffstat (limited to 'src/plugins/modeleditor')
-rw-r--r--src/plugins/modeleditor/packageviewcontroller.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/modeleditor/packageviewcontroller.cpp b/src/plugins/modeleditor/packageviewcontroller.cpp
index 37c665d4f0..8b45a2443c 100644
--- a/src/plugins/modeleditor/packageviewcontroller.cpp
+++ b/src/plugins/modeleditor/packageviewcontroller.cpp
@@ -31,6 +31,8 @@
#include "qmt/model/mdependency.h"
#include "qmt/model_controller/modelcontroller.h"
+#include <utils/algorithm.h>
+
#include <QSet>
namespace ModelEditor {
@@ -151,7 +153,7 @@ void PackageViewController::createAncestorDependencies(qmt::MObject *object1, qm
bool PackageViewController::haveMatchingStereotypes(const qmt::MObject *object1,
const qmt::MObject *object2)
{
- return !(object1->stereotypes().toSet() & object2->stereotypes().toSet()).isEmpty();
+ return !(Utils::toSet(object1->stereotypes()) & Utils::toSet(object2->stereotypes())).isEmpty();
}