5 files changed, 23 insertions, 19 deletions

diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
index ecf8a89b9..01d011fb1 100644
--- a/src/lib/corelib/language/projectresolver.cpp
+++ b/src/lib/corelib/language/projectresolver.cpp
@@ -61,9 +61,9 @@
 #include <tools/setupprojectparameters.h>
 
 #include <QtCore/qdir.h>
-#include <QtCore/qqueue.h>
 
 #include <algorithm>
+#include <queue>
 
 namespace qbs {
 namespace Internal {
@@ -455,17 +455,18 @@ void ProjectResolver::resolveModules(const Item *item, ProjectContext *projectCo
 {
     // Breadth first search needed here, because the product might set properties on the cpp module,
     // whose children must be evaluated in that context then.
-    QQueue<Item::Module> modules;
+    std::queue<Item::Module> modules;
     for (const Item::Module &m : item->modules())
-        modules.enqueue(m);
+        modules.push(m);
     Set<QualifiedId> seen;
-    while (!modules.isEmpty()) {
-        const Item::Module m = modules.takeFirst();
+    while (!modules.empty()) {
+        const Item::Module m = modules.front();
+        modules.pop();
         if (!seen.insert(m.name).second)
             continue;
         resolveModule(m.name, m.item, m.isProduct, projectContext);
         for (const Item::Module &childModule : m.item->modules())
-            modules.enqueue(childModule);
+            modules.push(childModule);
     }
     std::sort(m_productContext->product->modules.begin(), m_productContext->product->modules.end(),
               [](const ResolvedModuleConstPtr &m1, const ResolvedModuleConstPtr &m2) {
diff --git a/src/lib/corelib/tools/buildgraphlocker.cpp b/src/lib/corelib/tools/buildgraphlocker.cpp
index eec88bcfe..fa614761d 100644
--- a/src/lib/corelib/tools/buildgraphlocker.cpp
+++ b/src/lib/corelib/tools/buildgraphlocker.cpp
@@ -135,7 +135,7 @@ void BuildGraphLocker::rememberCreatedDirectories(const QString &buildDir)
 {
     QString parentDir = buildDir;
     while (!QFileInfo::exists(parentDir)) {
-        m_createdParentDirs.enqueue(parentDir);
+        m_createdParentDirs.push(parentDir);
         parentDir = QDir::cleanPath(parentDir + QLatin1String("/.."));
     }
 }
@@ -143,8 +143,9 @@ void BuildGraphLocker::rememberCreatedDirectories(const QString &buildDir)
 void BuildGraphLocker::removeEmptyCreatedDirectories()
 {
     QDir root = QDir::root();
-    while (!m_createdParentDirs.isEmpty()) {
-        const QString parentDir = m_createdParentDirs.dequeue();
+    while (!m_createdParentDirs.empty()) {
+        const QString parentDir = m_createdParentDirs.front();
+        m_createdParentDirs.pop();
         QDirIterator it(parentDir, QDir::AllEntries | QDir::NoDotAndDotDot | QDir::System,
                         QDirIterator::Subdirectories);
         if (it.hasNext())
diff --git a/src/lib/corelib/tools/buildgraphlocker.h b/src/lib/corelib/tools/buildgraphlocker.h
index 390ccfa98..b73ff7237 100644
--- a/src/lib/corelib/tools/buildgraphlocker.h
+++ b/src/lib/corelib/tools/buildgraphlocker.h
@@ -43,9 +43,10 @@
 #include <logging/logger.h>
 
 #include <QtCore/qlockfile.h>
-#include <QtCore/qqueue.h>
 #include <QtCore/qstring.h>
 
+#include <queue>
+
 namespace qbs {
 namespace Internal {
 
@@ -64,7 +65,7 @@ private:
 
     QLockFile m_lockFile;
     Logger m_logger;
-    QQueue<QString> m_createdParentDirs;
+    std::queue<QString> m_createdParentDirs;
 };
 
 } // namespace Internal
diff --git a/tests/fuzzy-test/fuzzytester.cpp b/tests/fuzzy-test/fuzzytester.cpp
index c1b6f1dd3..16e05ae36 100644
--- a/tests/fuzzy-test/fuzzytester.cpp
+++ b/tests/fuzzy-test/fuzzytester.cpp
@@ -200,18 +200,19 @@ bool FuzzyTester::runQbs(const QString &buildDir, const QString &command, QStrin
     QStringList commandLine = QStringList(command) << "-d" << buildDir;
     if (m_log) {
         commandLine << "-vv";
-        const int maxLoggedCommits = 2;
-        Q_ASSERT(m_commitsWithLogFiles.count() <= maxLoggedCommits + 1);
-        if (m_commitsWithLogFiles.count() == maxLoggedCommits + 1) {
+        const size_t maxLoggedCommits = 2;
+        Q_ASSERT(m_commitsWithLogFiles.size() <= maxLoggedCommits + 1);
+        if (m_commitsWithLogFiles.size() == maxLoggedCommits + 1) {
             static const QStringList allActivities = QStringList() << resolveIncrementalActivity()
                     << buildIncrementalActivity() << buildFromScratchActivity();
-            const QString oldCommit = m_commitsWithLogFiles.dequeue();
+            const QString oldCommit = m_commitsWithLogFiles.front();
+            m_commitsWithLogFiles.pop();
             foreach (const QString &a, allActivities)
                 QFile::remove(logFilePath(oldCommit, a));
         }
         qbs.setStandardErrorFile(logFilePath(m_currentCommit, m_currentActivity));
-        if (m_commitsWithLogFiles.isEmpty() || m_commitsWithLogFiles.last() != m_currentCommit)
-            m_commitsWithLogFiles.enqueue(m_currentCommit);
+        if (m_commitsWithLogFiles.empty() || m_commitsWithLogFiles.back() != m_currentCommit)
+            m_commitsWithLogFiles.push(m_currentCommit);
     } else {
         commandLine << "-qq";
     }
diff --git a/tests/fuzzy-test/fuzzytester.h b/tests/fuzzy-test/fuzzytester.h
index 03a0b5fec..846e7d14f 100644
--- a/tests/fuzzy-test/fuzzytester.h
+++ b/tests/fuzzy-test/fuzzytester.h
@@ -28,10 +28,10 @@
 #ifndef QBS_FUZZYTESTER_H
 #define QBS_FUZZYTESTER_H
 
-#include <QtCore/qqueue.h>
 #include <QtCore/qstringlist.h>
 
 #include <exception>
+#include <queue>
 
 class TestError {
 public:
@@ -76,7 +76,7 @@ private:
     QString m_headCommit;
     QString m_currentCommit;
     QString m_currentActivity;
-    QQueue<QString> m_commitsWithLogFiles;
+    std::queue<QString> m_commitsWithLogFiles;
     QStringList m_unbuildableCommits;
     QStringList m_buildableCommits;
 };