diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,7 @@
     ki18n_install(po)
 endif()
 add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
-
+add_definitions(-DQT_NO_FOREACH)
 add_subdirectory( src )
 add_subdirectory(templates)
 
diff --git a/src/partmanager.cpp b/src/partmanager.cpp
--- a/src/partmanager.cpp
+++ b/src/partmanager.cpp
@@ -131,12 +131,12 @@
 
 PartManager::~PartManager()
 {
-    foreach (const QWidget *w, d->m_managedTopLevelWidgets) {
+    for (const QWidget *w : qAsConst(d->m_managedTopLevelWidgets)) {
         disconnect(w, &QWidget::destroyed,
                    this, &PartManager::slotManagedTopLevelWidgetDestroyed);
     }
 
-    foreach (Part *it, d->m_parts) {
+    for (Part *it : qAsConst(d->m_parts)) {
         it->setManager(nullptr);
     }
 
diff --git a/src/plugin.cpp b/src/plugin.cpp
--- a/src/plugin.cpp
+++ b/src/plugin.cpp
@@ -92,8 +92,9 @@
     QMap<QString, QStringList> sortedPlugins;
 
     const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
-    Q_FOREACH (const QString &dir, dirs) {
-        Q_FOREACH (const QString &file, QDir(dir).entryList(QStringList(QStringLiteral("*.rc")))) {
+    for (const QString &dir : dirs) {
+        const auto rcfiles = QDir(dir).entryList(QStringList(QStringLiteral("*.rc")));
+        for (const QString &file : rcfiles) {
             const QFileInfo fInfo(dir + QLatin1Char('/') + file);
             QMap<QString, QStringList>::Iterator mapIt = sortedPlugins.find(fInfo.fileName());
             if (mapIt == sortedPlugins.end()) {