From 660c4ced86ecf87b2bb6ce7719e132238c1ad0ab Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 12 Apr 2017 17:12:59 +0200 Subject: [PATCH] QbsProjectManager: Fix collecting unreferenced build system files We cannot use std::set_difference on a QSet, because those are not sorted. Change-Id: I6238a2bd06bcc6e5dba64572f0c3b0caaa57a7eb Reviewed-by: Jake Petroules --- src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp b/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp index 1f5947bd99a..db80627f68f 100644 --- a/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp +++ b/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp @@ -178,10 +178,10 @@ QStringList unreferencedBuildSystemFiles(const qbs::Project &p) return result; const std::set &available = p.buildSystemFiles(); - const QSet &referenced = referencedBuildSystemFiles(p.projectData()); + QList referenced = referencedBuildSystemFiles(p.projectData()).toList(); + Utils::sort(referenced); std::set_difference(available.begin(), available.end(), referenced.begin(), referenced.end(), std::back_inserter(result)); - return result; }