4 files changed, 11 insertions, 12 deletions
diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp
index 5901a60803..6b7b0b2a09 100644
--- a/src/libs/utils/fileutils.cpp
+++ b/src/libs/utils/fileutils.cpp
@@ -35,7 +35,7 @@
 #include <QDebug>
 #include <QDateTime>
 #include <QOperatingSystemVersion>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QTimer>
 #include <QUrl>
 #include <qplatformdefs.h>
@@ -325,10 +325,10 @@ QString FilePath::shortNativePath() const
 QString FileUtils::fileSystemFriendlyName(const QString &name)
 {
     QString result = name;
-    result.replace(QRegExp(QLatin1String("\\W")), QLatin1String("_"));
-    result.replace(QRegExp(QLatin1String("_+")), QLatin1String("_")); // compact _
-    result.remove(QRegExp(QLatin1String("^_*"))); // remove leading _
-    result.remove(QRegExp(QLatin1String("_+$"))); // remove trailing _
+    result.replace(QRegularExpression(QLatin1String("\\W")), QLatin1String("_"));
+    result.replace(QRegularExpression(QLatin1String("_+")), QLatin1String("_")); // compact _
+    result.remove(QRegularExpression(QLatin1String("^_*"))); // remove leading _
+    result.remove(QRegularExpression(QLatin1String("_+$"))); // remove trailing _
     if (result.isEmpty())
         result = QLatin1String("unknown");
     return result;
@@ -336,8 +336,8 @@ QString FileUtils::fileSystemFriendlyName(const QString &name)
 
 int FileUtils::indexOfQmakeUnfriendly(const QString &name, int startpos)
 {
-    static QRegExp checkRegExp(QLatin1String("[^a-zA-Z0-9_.-]"));
-    return checkRegExp.indexIn(name, startpos);
+    static const QRegularExpression checkRegExp(QLatin1String("[^a-zA-Z0-9_.-]"));
+    return checkRegExp.match(name, startpos).capturedStart();
 }
 
 QString FileUtils::qmakeFriendlyName(const QString &name)
diff --git a/src/libs/utils/namevaluesdialog.cpp b/src/libs/utils/namevaluesdialog.cpp
index 2b78dc7661..54c7a4577e 100644
--- a/src/libs/utils/namevaluesdialog.cpp
+++ b/src/libs/utils/namevaluesdialog.cpp
@@ -31,6 +31,7 @@
 #include <QDialogButtonBox>
 #include <QLabel>
 #include <QPlainTextEdit>
+#include <QSet>
 #include <QVBoxLayout>
 
 namespace Utils {
diff --git a/src/libs/utils/savedaction.cpp b/src/libs/utils/savedaction.cpp
index 87a785f6db..beec2d3308 100644
--- a/src/libs/utils/savedaction.cpp
+++ b/src/libs/utils/savedaction.cpp
@@ -29,12 +29,12 @@
 #include <utils/pathchooser.h>
 #include <utils/pathlisteditor.h>
 
-#include <QDebug>
-#include <QSettings>
-
+#include <QActionGroup>
 #include <QCheckBox>
+#include <QDebug>
 #include <QGroupBox>
 #include <QLineEdit>
+#include <QSettings>
 #include <QSpinBox>
 #include <QTextEdit>
 
diff --git a/src/libs/utils/variant.h b/src/libs/utils/variant.h
index 371b9312d3..baf0c27816 100644
--- a/src/libs/utils/variant.h
+++ b/src/libs/utils/variant.h
@@ -29,9 +29,7 @@
     See std(::experimental)::variant.
 */
 
-// TODO: replace by #include <(experimental/)variant> depending on compiler and C++ version
 #if __cplusplus >= 201703L
-#error Please delete variant.hpp and the #else section below, then remove this error
 #include <variant>
 
 namespace Utils {