summaryrefslogtreecommitdiffstats
path: root/src/widgets/configure.cmake
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-05-18 14:26:39 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-05-19 10:16:23 +0200
commit19b6ae6637bde73ec508b6d1d29f3233e2c4e2d4 (patch)
tree1136013f9c4e7ca7083de83e2b9164f351bdfb14 /src/widgets/configure.cmake
parent941039356df56dfbf5a4b4f828a577ca8b8fb025 (diff)
Fix relocated Qt to be found when its path has non-ASCII characters
The path returned by dladdr seems to be encoded with the current locale encoding which means that if it contains unicode characters, the fromLatin1() call mangles the path, and QFile::exists reports that the path does not exist. To preserve non-ASCII characters use fromLocal8Bit() instead. This should fix the runtime issue of finding the Qt prefix when the Qt library path has non-ASCII characters. Amends 2f52afda8e77429c00029f94e887ed37dfb4e584. Amends 4ac872639ed0dd3ae6627e05bdda821f7d128500. Fixes: QTBUG-84272 Task-number: QTBUG-15234 Pick-to: 5.14 5.15 Change-Id: I37019ed219cf2cf7d9663cb1e16acdb97b3bdf09 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/widgets/configure.cmake')
0 files changed, 0 insertions, 0 deletions