diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2021-11-04 17:07:59 -0700 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-11-10 21:30:28 +0000 |
| commit | 212edad39f5f26ea402cdb27032408bfd926904a (patch) | |
| tree | 3a693175157365a0dafb193565edfdccfe5b7e12 /src | |
| parent | 878a1ca7fbca9c2f994751ed9747fa465a62ea4e (diff) | |
QGuiApplication: properly decode path command-line arguments
Using QFile::decodeName, not QString::fromLocal8Bit.
Change-Id: Ice04365c72984d07a64dfffd16b47dcbfee23341
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit b0dc6abfb214667e6359a0b55006fb31baf709a7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index cf9b63af45..cfe1e48e04 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -1443,7 +1443,7 @@ void QGuiApplicationPrivate::createPlatformIntegration() ++arg; if (strcmp(arg, "-platformpluginpath") == 0) { if (++i < argc) - platformPluginPath = QString::fromLocal8Bit(argv[i]); + platformPluginPath = QFile::decodeName(argv[i]); } else if (strcmp(arg, "-platform") == 0) { if (++i < argc) { platformExplicitlySelected = true; @@ -1460,7 +1460,7 @@ void QGuiApplicationPrivate::createPlatformIntegration() firstWindowTitle = QString::fromLocal8Bit(argv[i]); } else if (strcmp(arg, "-qwindowicon") == 0 || (xcbIsDefault && strcmp(arg, "-icon") == 0)) { if (++i < argc) { - icon = QString::fromLocal8Bit(argv[i]); + icon = QFile::decodeName(argv[i]); } } else { argv[j++] = argv[i]; |