Don't allow \ in installpath on Unix

Also now only show the actual matching character,
not the whole RegExp.

Task-number: QTIFW-512
Change-Id: I179b994b5ee5d7f19b9724d13b2c192a6af01448
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

1 files changed, 10 insertions, 5 deletions

diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index 065e2e1a9..9b2868e9d 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -1807,16 +1807,21 @@ QString TargetDirectoryPage::targetDirWarning() const
 
     // remove e.g. "c:"
     dir = dir.mid(2);
-#endif
 
-    QString ambiguousChars = QLatin1String("[~<>|?*!@#$%^&:,; ]");
+    QString ambiguousChars = QStringLiteral("[~<>|?*!@#$%^&:,; ]");
+#else // Q_OS_WIN
+    QString ambiguousChars = QStringLiteral("[~<>|?*!@#$%^&:,; \\\\]");
+#endif // Q_OS_WIN
+
     if (packageManagerCore()->settings().allowSpaceInPath())
         ambiguousChars.remove(QLatin1Char(' '));
 
+    static QRegularExpression ambCharRegEx(ambiguousChars);
     // check if there are not allowed characters in the target path
-    if (dir.contains(QRegExp(ambiguousChars))) {
-        return tr("The installation path must not contain %1, "
-            "please specify a valid folder.").arg(ambiguousChars);
+    QRegularExpressionMatch match = ambCharRegEx.match(dir);
+    if (match.hasMatch()) {
+        return tr("The installation path must not contain '%1', "
+            "please specify a valid folder.").arg(match.captured(0));
     }
 
     dir = targetDir();