From 22ec92a201beb9ec4bb6a7e21fcfdc8cd9b884f9 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 1 Nov 2017 17:36:58 +0100 Subject: [PATCH] QSettings/QConfFile: Fix reading on NTFS symbolic links The code checked on QFileInfo::size() whether the file had any content. The check failed for NTFS symbolic links since QFileInfo::size() returns 0 for them. Workaround by using QFile::size() instead. Task-number: QTBUG-64121 Change-Id: I303414b5a560d1ed8fbc53d969e53f9e2899ae5c Reviewed-by: Oswald Buddenhagen Reviewed-by: Thiago Macieira --- src/corelib/io/qsettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index d0cbc82c56..bbc66120b5 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -1451,7 +1451,7 @@ void QConfFileSettingsPrivate::syncConfFile(QConfFile *confFile) Files that we can't read (because of permissions or because they don't exist) are treated as empty files. */ - if (file.isReadable() && fileInfo.size() != 0) { + if (file.isReadable() && file.size() != 0) { bool ok = false; #ifdef Q_OS_MAC if (format == QSettings::NativeFormat) {