From 1c417ef0cbcd94a175d9b01995d000b357d9047f Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 5 May 2020 23:52:05 +0200 Subject: [PATCH] QSettings: prepare for QChar::unicode() return type change The return type will change from ushort to char16_t, and while for the vast majority of the users, this will be a non-breaking change, this code here would fail. Fix by using an auto variable, as it should have been from the onset. Change-Id: I8e3a0f3b38d83434665ee50aa8946b0edbcf133a Reviewed-by: Thiago Macieira --- src/corelib/io/qsettings_win.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/io/qsettings_win.cpp b/src/corelib/io/qsettings_win.cpp index 6eb318006e..7a4c1b5f02 100644 --- a/src/corelib/io/qsettings_win.cpp +++ b/src/corelib/io/qsettings_win.cpp @@ -102,7 +102,7 @@ static QString escapedKey(QString uKey) QChar *data = uKey.data(); int l = uKey.length(); for (int i = 0; i < l; ++i) { - ushort &ucs = data[i].unicode(); + auto &ucs = data[i].unicode(); if (ucs == '\\') ucs = '/'; else if (ucs == '/')