diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-03-02 21:05:37 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-03-03 16:59:03 +0000 |
| commit | 68c9f81a3d1c9b48b9ca82946588a171dc3515d9 (patch) | |
| tree | 4d9c20b43be2ff0b222b5dbd740790e24746f267 /src | |
| parent | ea8147d3b1aa38da583affd7f9d988e66bdc7807 (diff) | |
| download | qbs-68c9f81a3d1c9b48b9ca82946588a171dc3515d9.tar.gz | |
qt6: do not use QString::fromUtf16(ushort*) overload
This amends 05b74ff72.
Change-Id: I18b8006d246355a49b669b097b1e14d776f0cbac
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/scanner/qt/qtscanner.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/scanner/qt/qtscanner.cpp b/src/plugins/scanner/qt/qtscanner.cpp index 73f1e7816..310de33fc 100644 --- a/src/plugins/scanner/qt/qtscanner.cpp +++ b/src/plugins/scanner/qt/qtscanner.cpp @@ -100,7 +100,7 @@ static void *openScannerQrc(const unsigned short *filePath, const char *fileTags std::unique_ptr<OpaqQrc> opaque(new OpaqQrc); #ifdef Q_OS_UNIX - QString filePathS = QString::fromUtf16(filePath); + QString filePathS = QString::fromUtf16(reinterpret_cast<const char16_t *>(filePath)); opaque->fd = open(qPrintable(filePathS), O_RDONLY); if (opaque->fd == -1) { opaque->fd = 0; @@ -118,7 +118,7 @@ static void *openScannerQrc(const unsigned short *filePath, const char *fileTags if (map == nullptr) return nullptr; #else - opaque->file = new QFile(QString::fromUtf16(filePath)); + opaque->file = new QFile(QString::fromUtf16(reinterpret_cast<const char16_t *>(filePath))); if (!opaque->file->open(QFile::ReadOnly)) return nullptr; |