Replace all uses of QSet with Internal::Set

Change-Id: I0ba0a39b4f7d8c7c76b869584317b53b85cffc81
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

2 files changed, 7 insertions, 3 deletions

diff --git a/src/lib/corelib/logging/logger.cpp b/src/lib/corelib/logging/logger.cpp
index a11c2181d..277e40427 100644
--- a/src/lib/corelib/logging/logger.cpp
+++ b/src/lib/corelib/logging/logger.cpp
@@ -43,13 +43,15 @@
 
 #include "logger.h"
 
+#include <tools/set.h>
+
 #include <QtCore/qbytearray.h>
 #include <QtCore/qelapsedtimer.h>
-#include <QtCore/qset.h>
 #include <QtCore/qvariant.h>
 
 #include <cstdarg>
 #include <mutex>
+#include <set>
 #include <stdio.h>
 
 namespace qbs {
@@ -143,7 +145,7 @@ LogWriter operator<<(LogWriter w, const QStringList &strList)
     return w;
 }
 
-LogWriter operator<<(LogWriter w, const QSet<QString> &strSet)
+LogWriter operator<<(LogWriter w, const Internal::Set<QString> &strSet)
 {
     bool firstLoop = true;
     w.write('(');
diff --git a/src/lib/corelib/logging/logger.h b/src/lib/corelib/logging/logger.h
index be0c1de3d..aee59dde4 100644
--- a/src/lib/corelib/logging/logger.h
+++ b/src/lib/corelib/logging/logger.h
@@ -55,6 +55,8 @@ QT_END_NAMESPACE
 namespace qbs {
 namespace Internal {
 
+template<typename T> class Set;
+
 // Note that while these classes are not part of the API, we export some stuff for use by
 // our command line tools for the sake of a uniform logging approach.
 
@@ -99,7 +101,7 @@ QBS_EXPORT LogWriter operator<<(LogWriter w, const char *str);
 QBS_EXPORT LogWriter operator<<(LogWriter w, const QByteArray &byteArray);
 QBS_EXPORT LogWriter operator<<(LogWriter w, const QString &str);
 QBS_EXPORT LogWriter operator<<(LogWriter w, const QStringList &strList);
-QBS_EXPORT LogWriter operator<<(LogWriter w, const QSet<QString> &strSet);
+QBS_EXPORT LogWriter operator<<(LogWriter w, const Internal::Set<QString> &strSet);
 QBS_EXPORT LogWriter operator<<(LogWriter w, const QVariant &variant);
 QBS_EXPORT LogWriter operator<<(LogWriter w, int n);
 QBS_EXPORT LogWriter operator<<(LogWriter w, qint64 n);