diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,7 +81,7 @@
    PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ActivitiesStatsConfigVersion.cmake"
    SOVERSION 1
    )
-
+add_definitions(-DQT_NO_FOREACH)
 add_subdirectory (src)
 if(BUILD_TESTING)
   add_subdirectory (autotests)
diff --git a/autotests/ResultSetQuickCheckTest.cpp b/autotests/ResultSetQuickCheckTest.cpp
--- a/autotests/ResultSetQuickCheckTest.cpp
+++ b/autotests/ResultSetQuickCheckTest.cpp
@@ -331,7 +331,7 @@
 
 void ResultSetQuickCheckTest::generateResourceInfos()
 {
-    foreach (const QString &resource, resourcesList) {
+    for (const QString &resource : qAsConst(resourcesList)) {
         // We want every n-th or so to be without the title
         if (qrand() % 3) continue;
 
@@ -363,7 +363,7 @@
 
 void ResultSetQuickCheckTest::generateResourceLinks()
 {
-    foreach (const QString &resource, resourcesList) {
+    for (const QString &resource : qAsConst(resourcesList)) {
         // We don't want all the resources to be linked
         // to something
         if (qrand() % 2) continue;
@@ -419,7 +419,7 @@
     qDebug() << "Inserting" << resourceScoreCaches.size() << "items into ResourceScoreCache";
     int i = 0;
 
-    foreach (const auto &rsc, resourceScoreCaches) {
+    for (const auto &rsc : qAsConst(resourceScoreCaches)) {
         std::cerr << '.';
 
         if (++i % 10 == 0) std::cerr << i;
@@ -458,7 +458,7 @@
     qDebug() << "Inserting" << resourceInfos.size() << "items into ResourceInfo";
     i = 0;
 
-    foreach (const auto &ri, resourceInfos) {
+    for (const auto &ri : qAsConst(resourceInfos)) {
         std::cerr << '.';
 
         if (++i % 10 == 0) std::cerr << i;
@@ -490,7 +490,7 @@
     qDebug() << "Inserting" << resourceLinks.size() << "items into ResourceLink";
     i = 0;
 
-    foreach (const auto &rl, resourceLinks) {
+    for (const auto &rl : qAsConst(resourceLinks)) {
         std::cerr << '.';
 
         if (++i % 10 == 0) std::cerr << i;
@@ -596,7 +596,7 @@
     using boost::sort;
     using boost::adaptors::filtered;
 
-    foreach (const auto &agent, agentsList) {
+    for (const auto &agent : qAsConst(agentsList)) {
         auto memItems = ResourceScoreCache::groupByResource(
                 resourceScoreCaches
                 | filtered(ResourceScoreCache::initiatingAgent() == agent)
@@ -634,7 +634,7 @@
     using boost::sort;
     using boost::adaptors::filtered;
 
-    foreach (const auto &agent, agentsList) {
+    for (const auto &agent : qAsConst(agentsList)) {
         auto memItems = ResourceLink::groupByResource(
                 resourceLinks
                 | filtered(ResourceLink::initiatingAgent() == agent)
diff --git a/autotests/common/test.cpp b/autotests/common/test.cpp
--- a/autotests/common/test.cpp
+++ b/autotests/common/test.cpp
@@ -32,10 +32,10 @@
 
 bool Test::inEmptySession()
 {
-    QStringList services =
+    const QStringList services =
         QDBusConnection::sessionBus().interface()->registeredServiceNames();
 
-    foreach (const QString & service, services) {
+    for (const QString & service : services) {
         bool kdeServiceAndNotKAMD =
             service.startsWith(QStringLiteral("org.kde")) &&
             service != KAMD_DBUS_SERVICE;
diff --git a/src/resultmodel.cpp b/src/resultmodel.cpp
--- a/src/resultmodel.cpp
+++ b/src/resultmodel.cpp
@@ -137,7 +137,7 @@
             // not others
             QStringList linkedItems;
 
-            foreach (const ResultSet::Result &item, m_items) {
+            for (const ResultSet::Result &item : qAsConst(m_items)) {
                 if (item.linkStatus() == ResultSet::Result::NotLinked) break;
                 linkedItems << item.resource();
             }
@@ -1041,8 +1041,10 @@
 
 void ResultModel::forgetResource(const QString &resource)
 {
-    foreach (const QString &activity, d->query.activities()) {
-        foreach (const QString &agent, d->query.agents()) {
+    const auto lstActivities = d->query.activities();
+    for (const QString &activity : lstActivities) {
+        const auto lstAgents = d->query.agents();
+        for (const QString &agent : lstAgents) {
             Stats::forgetResource(
                     activity,
                     agent == CURRENT_AGENT_TAG ?
@@ -1055,9 +1057,10 @@
 void ResultModel::forgetResource(int row)
 {
     if (row >= d->cache.size()) return;
-
-    foreach (const QString &activity, d->query.activities()) {
-        foreach (const QString &agent, d->query.agents()) {
+    const auto lstActivities = d->query.activities();
+    for (const QString &activity : lstActivities) {
+        const auto lstAgents = d->query.agents();
+        for (const QString &agent : lstAgents) {
             Stats::forgetResource(
                     activity,
                     agent == CURRENT_AGENT_TAG ?
diff --git a/tests/model/window.cpp b/tests/model/window.cpp
--- a/tests/model/window.cpp
+++ b/tests/model/window.cpp
@@ -140,7 +140,8 @@
         ui->comboActivity->addItem(activity);
     }
 
-    foreach (const auto &arg, QCoreApplication::arguments()) {
+    const auto argumentsList = QCoreApplication::arguments();
+    for (const auto &arg : argumentsList) {
         if (arg == QLatin1String("--used")) {
             ui->radioSelectUsedResources->setChecked(true);