diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,6 +80,7 @@
         kdoctools_install(po)
     endif()
 endif()
+add_definitions(-DQT_NO_FOREACH)
 add_subdirectory(src)
 
 if (KF5DocTools_FOUND)
diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
--- a/src/kdeinit/kinit.cpp
+++ b/src/kdeinit/kinit.cpp
@@ -556,7 +556,7 @@
                     tmp_env_count++) {
                 unset_envs.append(environ[ tmp_env_count ]);
             }
-            foreach (const QByteArray &tmp, unset_envs) {
+            for (const QByteArray &tmp : qAsConst(unset_envs)) {
                 int pos = tmp.indexOf('=');
                 if (pos >= 0) {
                     unsetenv(tmp.left(pos).constData());
diff --git a/src/kdeinit/kinit_mac.mm b/src/kdeinit/kinit_mac.mm
--- a/src/kdeinit/kinit_mac.mm
+++ b/src/kdeinit/kinit_mac.mm
@@ -228,7 +228,7 @@
                     tmp_env_count++) {
                 unset_envs.append(environ[ tmp_env_count ]);
             }
-            foreach (const QByteArray &tmp, unset_envs) {
+            for (const QByteArray &tmp : qAsConst(unset_envs)) {
                 int pos = tmp.indexOf('=');
                 if (pos >= 0) {
                     unsetenv(tmp.left(pos).constData());
diff --git a/src/kdeinit/kinit_win.cpp b/src/kdeinit/kinit_win.cpp
--- a/src/kdeinit/kinit_win.cpp
+++ b/src/kdeinit/kinit_win.cpp
@@ -298,7 +298,7 @@
 
 ProcessList::~ProcessList()
 {
-    foreach (const ProcessListEntry *ple, m_processes) {
+    for (const ProcessListEntry *ple : qAsConst(m_processes)) {
         delete ple;
     }
 }
@@ -344,7 +344,7 @@
 ProcessListEntry *ProcessList::find(const QString &name)
 {
     ProcessListEntry *ple;
-    foreach (ple, m_processes) {
+    for (ple : qAsConst(m_processes)) {
         if (ple->pid < 0) {
             qDebug() << "negative pid!";
             continue;
@@ -438,7 +438,8 @@
 {
     QString installPrefix = QStringLiteral(CMAKE_INSTALL_PREFIX);
 
-    foreach (const ProcessListEntry *ple, processList.list()) {
+    const auto list = processList.list();
+    for (const ProcessListEntry *ple : lst) {
         if (!ple->path.isEmpty() && ple->path.toLower().startsWith(installPrefix.toLower())) {
             fprintf(stderr, "path: %s name: %s pid: %u\n", ple->path.toLatin1().data(), ple->name.toLatin1().data(), ple->pid);
         }
@@ -449,7 +450,8 @@
 {
     QString installPrefix = QStringLiteral(CMAKE_INSTALL_PREFIX);
 
-    foreach (const ProcessListEntry *ple, processList.list()) {
+    const auto list = processList.list();
+    for (const ProcessListEntry *ple : lst) {
         if (!ple->path.isEmpty() && ple->path.toLower().startsWith(installPrefix.toLower())) {
             if (verbose) {
                 fprintf(stderr, "terminating path: %s name: %s pid: %u\n", ple->path.toLatin1().data(), ple->name.toLatin1().data(), ple->pid);
@@ -464,7 +466,7 @@
     QDBusConnection connection = QDBusConnection::sessionBus();
     QDBusConnectionInterface *bus = connection.interface();
     const QStringList services = bus->registeredServiceNames();
-    foreach (const QString &service, services) {
+    for (const QString &service : services) {
         if (service.startsWith(QLatin1String("org.freedesktop.DBus")) || service.startsWith(QLatin1Char(':'))) {
             continue;
         }
@@ -477,7 +479,7 @@
     QDBusConnection connection = QDBusConnection::sessionBus();
     QDBusConnectionInterface *bus = connection.interface();
     const QStringList services = bus->registeredServiceNames();
-    foreach (const QString &service, services) {
+    for (const QString &service : services) {
         if (service.startsWith(QLatin1String("org.freedesktop.DBus")) || service.startsWith(QLatin1Char(':'))) {
             continue;
         }
@@ -668,7 +670,7 @@
         QProcess *proc;
         int can_exit = 1;
         do {
-            foreach (proc, startedProcesses) {
+            for (proc : qAsConst(startedProcesses)) {
                 if (proc->state() != QProcess::NotRunning) {
                     can_exit = 0;
                 }
diff --git a/src/klauncher/autostart.cpp b/src/klauncher/autostart.cpp
--- a/src/klauncher/autostart.cpp
+++ b/src/klauncher/autostart.cpp
@@ -79,10 +79,10 @@
 
     // Make unique list of relative paths
     QStringList files;
-    QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericConfigLocation, QStringLiteral("autostart"), QStandardPaths::LocateDirectory);
-    Q_FOREACH (const QString &dir, dirs) {
+    const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericConfigLocation, QStringLiteral("autostart"), QStandardPaths::LocateDirectory);
+    for (const QString &dir : dirs) {
         const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.desktop"));
-        Q_FOREACH (const QString &file, fileNames) {
+        for (const QString &file : fileNames) {
             if (!files.contains(file)) {
                 files.append(file);
             }
diff --git a/src/klauncher/klauncher.cpp b/src/klauncher/klauncher.cpp
--- a/src/klauncher/klauncher.cpp
+++ b/src/klauncher/klauncher.cpp
@@ -320,7 +320,7 @@
 KLauncher::processDied(pid_t pid, long exitStatus)
 {
     qCDebug(KLAUNCHER) << pid << "exitStatus=" << exitStatus;
-    foreach (KLaunchRequest *request, requestList) {
+    for (KLaunchRequest *request : qAsConst(requestList)) {
         qCDebug(KLAUNCHER) << "  had pending request" << request->pid;
         if (request->pid == pid) {
             if ((request->dbus_startup_type == KService::DBusUnique)
@@ -383,7 +383,7 @@
     }
 
     qCDebug(KLAUNCHER) << "new app" << appId;
-    foreach (KLaunchRequest *request, requestList) {
+    for (KLaunchRequest *request : qAsConst(requestList)) {
         if (request->status != KLaunchRequest::Launching) {
             continue;
         }
@@ -487,16 +487,16 @@
     request->process = process;
 
     QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
-    foreach (const QString &env, request->envs) {
+    for (const QString &env : qAsConst(request->envs)) {
         const int pos = env.indexOf(QLatin1Char('='));
         const QString envVariable = env.left(pos);
         const QString envValue = env.mid(pos + 1);
         environment.insert(envVariable, envValue);
     }
     process->setProcessEnvironment(environment);
 
     QStringList args;
-    foreach (const QString &arg, request->arg_list) {
+    for (const QString &arg : qAsConst(request->arg_list)) {
         args << arg;
     }
 
@@ -532,11 +532,11 @@
     appendLong(requestData, request->arg_list.count() + 1);
     requestData.append(request->name.toLocal8Bit());
     requestData.append('\0');
-    foreach (const QString &arg, request->arg_list) {
+    for (const QString &arg : qAsConst(request->arg_list)) {
         requestData.append(arg.toLocal8Bit()).append('\0');
     }
     appendLong(requestData, request->envs.count());
-    foreach (const QString &env, request->envs) {
+    for (const QString &env : qAsConst(request->envs)) {
         requestData.append(env.toLocal8Bit()).append('\0');
     }
     appendLong(requestData, 0); // avoid_loops, always false here
@@ -776,7 +776,7 @@
     KStartupInfoId id;
     id.initId(startup_id);
     QByteArray dpy_str;
-    foreach (const QString &env, envs) {
+    for (const QString &env : envs) {
         if (env.startsWith(QLatin1String("DISPLAY="))) {
             dpy_str = env.mid(8).toLocal8Bit();
         }
@@ -820,7 +820,7 @@
     }
     if (!startup_id.isEmpty() && startup_id != "0" && mIsX11) {
         QString dpy_str;
-        foreach (const QString &env, envs) {
+        for (const QString &env : envs) {
             if (env.startsWith(QLatin1String("DISPLAY="))) {
                 dpy_str = env.mid(8);
             }
@@ -905,7 +905,7 @@
 {
     KIO::DesktopExecParser parser(*service, urls);
     const QStringList params = parser.resultingArguments();
-    Q_FOREACH (const QString &arg, params) {
+    for (const QString &arg : params) {
         request->arg_list.append(arg);
     }
 
@@ -927,7 +927,7 @@
 {
     const QUrl url(urlStr);
     IdleSlave *slave = nullptr;
-    foreach (IdleSlave *p, mSlaveList) {
+    for (IdleSlave *p : qAsConst(mSlaveList)) {
         if (p->onHold(url)) {
             slave = p;
             break;
@@ -948,22 +948,22 @@
                         QString &error)
 {
     IdleSlave *slave = nullptr;
-    foreach (IdleSlave *p, mSlaveList) {
+    for (IdleSlave *p : qAsConst(mSlaveList)) {
         if (p->match(protocol, host, true)) {
             slave = p;
             break;
         }
     }
     if (!slave) {
-        foreach (IdleSlave *p, mSlaveList) {
+        for (IdleSlave *p : qAsConst(mSlaveList)) {
             if (p->match(protocol, host, false)) {
                 slave = p;
                 break;
             }
         }
     }
     if (!slave) {
-        foreach (IdleSlave *p, mSlaveList) {
+        for (IdleSlave *p : qAsConst(mSlaveList)) {
             if (p->match(protocol, QString(), false)) {
                 slave = p;
                 break;
@@ -1065,7 +1065,7 @@
 bool KLauncher::checkForHeldSlave(const QString &urlStr)
 {
     QUrl url(urlStr);
-    Q_FOREACH (const IdleSlave *p, mSlaveList) {
+    for (const IdleSlave *p : qAsConst(mSlaveList)) {
         if (p->onHold(url)) {
             return true;
         }
@@ -1077,7 +1077,7 @@
 KLauncher::waitForSlave(int pid)
 {
     Q_ASSERT(calledFromDBus());
-    foreach (IdleSlave *slave, mSlaveList) {
+    for (IdleSlave *slave : qAsConst(mSlaveList)) {
         if (slave->pid() == static_cast<pid_t>(pid)) {
             return;    // Already here.
         }
@@ -1137,7 +1137,7 @@
 {
     bool keepOneFileSlave = true;
     QDateTime now = QDateTime::currentDateTime();
-    foreach (IdleSlave *slave, mSlaveList) {
+    for (IdleSlave *slave : qAsConst(mSlaveList)) {
         if ((slave->protocol() == QLatin1String("file")) && (keepOneFileSlave)) {
             keepOneFileSlave = false;
         } else if (slave->age(now) > SLAVE_MAX_IDLE) {
@@ -1150,7 +1150,7 @@
 void KLauncher::reparseConfiguration()
 {
     KProtocolManager::reparseConfiguration();
-    foreach (IdleSlave *slave, mSlaveList) {
+    for (IdleSlave *slave : qAsConst(mSlaveList)) {
         slave->reparseConfiguration();
     }
 }
@@ -1172,7 +1172,7 @@
     QProcess *p = static_cast<QProcess *>(sender());
     qCDebug(KLAUNCHER) << "process finished exitcode=" << exitCode << "exitStatus=" << exitStatus;
 
-    foreach (KLaunchRequest *request, requestList) {
+    for (KLaunchRequest *request : qAsConst(requestList)) {
         if (request->process == p) {
             qCDebug(KLAUNCHER) << "found KProcess, request done";
             if (exitCode == 0  && exitStatus == QProcess::NormalExit) {
diff --git a/src/kwrapper/kwrapper_win.cpp b/src/kwrapper/kwrapper_win.cpp
--- a/src/kwrapper/kwrapper_win.cpp
+++ b/src/kwrapper/kwrapper_win.cpp
@@ -91,7 +91,8 @@
         - all to client path environment
         - pathes not ending with lib to application search path
     */
-    foreach (const QString &a, path.split(QLatin1Char(';'))) {
+    const auto lst = path.split(QLatin1Char(';'));
+    for (const QString &a : lst) {
         if (!envPath.contains(a)) {
             envPath << a;
         }
@@ -143,7 +144,7 @@
         kdedirsCacheList << rootPath + QStringLiteral("/kdedirs.cache");
 
         bool found = false;
-        foreach (const QString &kdedirsCachePath, kdedirsCacheList) {
+        for (const QString &kdedirsCachePath : qAsConst(kdedirsCacheList)) {
             QFile f(kdedirsCachePath);
             if (f.exists()) {
                 f.open(QIODevice::ReadOnly);
@@ -172,7 +173,7 @@
         qDebug() << "found KDEDIRS\n\t" << kdedirs.join(QStringLiteral("\n\t"));
     }
 
-    foreach (const QString &a, kdedirs) {
+    for (const QString &a : qAsConst(kdedirs)) {
         if (!envPath.contains(a + QStringLiteral("/bin"))) {
             envPath << a + QStringLiteral("/bin");
         }
@@ -192,7 +193,7 @@
     }
 
     bool found = false;
-    foreach (const QString &a, searchPath) {
+    for (const QString &a : qAsConst(searchPath)) {
         if (verbose) {
             qDebug() << "\t" << a;
         }