1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowsservices.cpp b/src/plugins/platforms/windows/qwindowsservices.cpp
index 2c84204d2b..89f93fd161 100644
--- a/src/plugins/platforms/windows/qwindowsservices.cpp
+++ b/src/plugins/platforms/windows/qwindowsservices.cpp
@@ -1,7 +1,6 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#define QT_NO_URL_CAST_FROM_STRING
 #include "qwindowsservices.h"
 #include <QtCore/qt_windows.h>
 
@@ -155,10 +154,15 @@ static inline bool launchMail(const QUrl &url)
         qWarning("Cannot launch '%ls': There is no mail program installed.", qUtf16Printable(url.toString()));
         return false;
     }
+    // Fix mail launch if no param is expected in this command.
+    if (command.indexOf("%1"_L1) < 0) {
+        qWarning() << "The mail command lacks the '%1' parameter.";
+        return false;
+    }
     //Make sure the path for the process is in quotes
     const QChar doubleQuote = u'"';
     if (!command.startsWith(doubleQuote)) {
-        const int exeIndex = command.indexOf(QStringLiteral(".exe "), 0, Qt::CaseInsensitive);
+        const int exeIndex = command.indexOf(".exe "_L1, 0, Qt::CaseInsensitive);
         if (exeIndex != -1) {
             command.insert(exeIndex + 4, doubleQuote);
             command.prepend(doubleQuote);