diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,7 @@
 # Enable static build
 option(ATTICA_STATIC_BUILD "Build a static library" Off)
 add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
+add_definitions(-DQT_NO_FOREACH)
 add_subdirectory(src)
 
 # Enable unit testing
diff --git a/src/provider.cpp b/src/provider.cpp
--- a/src/provider.cpp
+++ b/src/provider.cpp
@@ -477,12 +477,14 @@
     postParameters.insert(QLatin1String("explanation"), newAchievement.explanation());
     postParameters.insert(QLatin1String("points"), QString::number(newAchievement.points()));
     postParameters.insert(QLatin1String("image"), newAchievement.image().toLocalFile());
-    foreach (const QString &dependency, newAchievement.dependencies()) {
+    const auto dependenciesList = newAchievement.dependencies();
+    for (const QString &dependency : dependenciesList) {
         postParameters.insert(QString::fromLatin1("dependencies[%1]").arg(QString::number(i++)), dependency);
     }
 
     postParameters.insert(QLatin1String("type"), Achievement::achievementTypeToString(newAchievement.type()));
-    foreach (const QString &option, newAchievement.options()) {
+    const auto optionsList = newAchievement.options();
+    for (const QString &option : optionsList) {
         postParameters.insert(QString::fromLatin1("options[%1]").arg(QString::number(j++)), option);
     }
 
@@ -510,12 +512,14 @@
     postParameters.insert(QLatin1String("explanation"), achievement.explanation());
     postParameters.insert(QLatin1String("points"), QString::number(achievement.points()));
     postParameters.insert(QLatin1String("image"), achievement.image().toLocalFile());
-    foreach (const QString &dependency, achievement.dependencies()) {
+    const auto dependenciesList = achievement.dependencies();
+    for (const QString &dependency : dependenciesList) {
         postParameters.insert(QString::fromLatin1("dependencies[%1]").arg(QString::number(i++)), dependency);
     }
 
     postParameters.insert(QLatin1String("type"), Achievement::achievementTypeToString(achievement.type()));
-    foreach (const QString &option, achievement.options()) {
+    const auto optionsList = achievement.options();
+    for (const QString &option : optionsList) {
         postParameters.insert(QString::fromLatin1("options[%1]").arg(QString::number(j++)), option);
     }
 
@@ -1100,13 +1104,13 @@
     q.addQueryItem(QStringLiteral("categories"), categoryIds.join(QLatin1String("x")));
 
     QStringList distributionIds;
-    foreach (const Distribution &distribution, distributions) {
+    for (const Distribution &distribution : distributions) {
         distributionIds.append(QString(distribution.id()));
     }
     q.addQueryItem(QStringLiteral("distribution"), distributionIds.join(QLatin1String(",")));
 
     QStringList licenseIds;
-    foreach (const License &license, licenses) {
+    for (const License &license : licenses) {
         licenseIds.append(QString(license.id()));
     }
     q.addQueryItem(QStringLiteral("license"), licenseIds.join(QLatin1String(",")));
diff --git a/src/providermanager.cpp b/src/providermanager.cpp
--- a/src/providermanager.cpp
+++ b/src/providermanager.cpp
@@ -103,7 +103,8 @@
 
 void ProviderManager::slotLoadDefaultProvidersInternal()
 {
-    foreach (const QUrl &url, d->m_internals->getDefaultProviderFiles()) {
+    const auto providerFiles  = d->m_internals->getDefaultProviderFiles();
+    for (const QUrl &url : providerFiles) {
         addProviderFile(url);
     }
     if (d->m_downloads.isEmpty()) {
diff --git a/tests/projecttest/projecttest.cpp b/tests/projecttest/projecttest.cpp
--- a/tests/projecttest/projecttest.cpp
+++ b/tests/projecttest/projecttest.cpp
@@ -183,9 +183,9 @@
     project.setVersion(m_editor->version->text());
     project.setLicense(m_editor->license->text());
     project.setUrl(m_editor->url->text());
-    QStringList _d = m_editor->developers->text().split(QLatin1Char(','));
+    const QStringList _d = m_editor->developers->text().split(QLatin1Char(','));
     QStringList devs;
-    foreach (const QString &dev, _d) {
+    for (const QString &dev : _d) {
         devs << dev.trimmed();
     }
     project.setDevelopers(devs);
@@ -293,7 +293,8 @@
         qDebug() << "Yay, no errors ...";
         QStringList projectIds;
 
-        foreach (const Project &p, listJob->itemList()) {
+        const auto itemList = listJob->itemList();
+        for (const Project &p : itemList) {
             m_projects[p.id()] = p;
             qDebug() << "New project:" << p.id() << p.name();
             output.append(QString(QLatin1String("<br />%1 (%2)")).arg(p.name(), p.id()));
@@ -325,7 +326,8 @@
         Attica::ListJob<BuildService> *listJob = static_cast<Attica::ListJob<BuildService> *>(j);
         qDebug() << "Yay, no errors ...";
 
-        foreach (const BuildService &bs, listJob->itemList()) {
+        const auto itemList = listJob->itemList();
+        for (const BuildService &bs : itemList) {
             m_buildServices[bs.id()] = bs;
             qDebug() << "New OBS:" << bs.id() << bs.name() << bs.url();
             output.append(QString(QLatin1String("<br />%1 (%2) at %3")).arg(bs.name(), bs.id(), bs.url()));
@@ -361,7 +363,8 @@
         Attica::ListJob<BuildServiceJob> *listJob = static_cast<Attica::ListJob<BuildServiceJob> *>(j);
         qDebug() << "Yay, no errors. Items found:" << listJob->itemList().count();
 
-        foreach (const BuildServiceJob &bsj, listJob->itemList()) {
+        const auto itemList = listJob->itemList();
+        for (const BuildServiceJob &bsj : itemList) {
             m_buildServiceJobs[bsj.id()] = bsj;
             qDebug() << "New BuildServiceJob:" << bsj.id() << bsj.name() << bsj.target();
             output.append(QString(QLatin1String("<br />%1 (%2) for %3")).arg(bsj.name(), bsj.id(), bsj.target()));
@@ -387,8 +390,8 @@
     Q_UNUSED(previous)
     qDebug() << "current item changed to " << current->data(Qt::UserRole).toString();
     m_editor->targets->clear();
-    QList<Target> targetlist = m_buildServices[current->data(Qt::UserRole).toString()].targets();
-    foreach (const Target &t, targetlist) {
+    const QList<Target> targetlist = m_buildServices[current->data(Qt::UserRole).toString()].targets();
+    for (const Target &t : targetlist) {
         //m_editor->targets->insertItems(0, m_buildServices[current->data(Qt::UserRole).toString()].targets());
         m_editor->targets->insertItem(0, t.name, t.id);
         // FIXME: target id.