diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2021-11-04 17:07:59 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2021-11-10 10:21:43 -0800 |
commit | b0dc6abfb214667e6359a0b55006fb31baf709a7 (patch) | |
tree | cf0e7566f4b52887c464c0d12cd1e56f753acdd1 /src/gui/kernel/qguiapplication.cpp | |
parent | 893990a67e28e57523fcb979060206c958d25059 (diff) |
QGuiApplication: properly decode path command-line arguments
Using QFile::decodeName, not QString::fromLocal8Bit.
Pick-to: 6.2
Change-Id: Ice04365c72984d07a64dfffd16b47dcbfee23341
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/gui/kernel/qguiapplication.cpp')
-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 b63ed75f65..c9fbc301af 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -1445,7 +1445,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; @@ -1462,7 +1462,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]; |