From 0c0500717e3bb329ceeef764fd6b962af10488cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCri=20Valdmann?= Date: Wed, 15 Jul 2020 11:56:00 +0200 Subject: Fix almost all deprecation warnings Replace QString::fromUtf16({const ushort * -> const char16_t}) QMap::{unite -> insert} Q{Hover,DragEnter,DragMove,Drop}Event::{posF() -> position()} Q{Hover,DragEnter,DragMove,Drop}Event::{pos() -> position().toPoint()} Q{DragEnter,Drop}Event::{mouseButtons -> buttons} Q{DragEnter,Drop}Event::{keyboardModifiers -> modifiers} QMouseEvent::{localPos -> position} QMouseEvent::{windowPos -> scenePosition} QMouseEvent::{screenPos -> globalPosition} These should all be just renames without any change in behavior (save for some floating point conversions). The one remaining issue concerns the deprecation of binary JSON in qtbase, which is recommended to be replaced with CBOR. Change-Id: I8f3b533242fe9a58c08c2b09ff5d0bdbbfa6dd17 Reviewed-by: Allan Sandfeld Jensen --- src/tools/qwebengine_convert_dict/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/tools/qwebengine_convert_dict') diff --git a/src/tools/qwebengine_convert_dict/main.cpp b/src/tools/qwebengine_convert_dict/main.cpp index 37b6e0171..14d175c00 100644 --- a/src/tools/qwebengine_convert_dict/main.cpp +++ b/src/tools/qwebengine_convert_dict/main.cpp @@ -51,9 +51,9 @@ inline base::FilePath toFilePath(const QString &str) inline QString toQt(const base::string16 &string) { #if defined(OS_WIN) - return QString::fromStdWString(string.data()); + return QString::fromStdWString(string); #else - return QString::fromUtf16(string.data()); + return QString::fromUtf16(reinterpret_cast(string.data()), string.size()); #endif } -- cgit v1.2.3