diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-05-22 07:44:45 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-05-22 07:46:17 +0200 |
| commit | 508b95899d4764d879a01b3990e44ce849cd9abc (patch) | |
| tree | 3dbb215480c98ee75b5aacc5e3d691e04d8ce8c8 /src/corelib/io | |
| parent | f2891be00808c82f5069661d60d8727fe28774b7 (diff) | |
| parent | 5d2939344eb8fbd3c2115f52a7a8d47365bdf820 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ia36e93771066d8abcf8123dbe2362c5c9d9260fc
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qsettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 321525ca18..63a0266948 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -1752,7 +1752,7 @@ bool QConfFileSettingsPrivate::readIniLine(const QByteArray &data, int &dataPos, if (i == lineStart + 1) { char ch; - while (i < dataLen && ((ch = data.at(i) != '\n') && ch != '\r')) + while (i < dataLen && (((ch = data.at(i)) != '\n') && ch != '\r')) ++i; lineStart = i; } else if (!inQuotes) { |