From e6fb36389e7f69e852c10c79d0af72f85ade300b Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Tue, 24 Oct 2017 18:59:55 +0200 Subject: QDateTimeParser: Remove unused variable Change-Id: Iaa6460d4eb96632f3cb03bc29b57934c53cbf88e Reviewed-by: Jesus Fernandez Reviewed-by: Edward Welbourne --- src/corelib/tools/qdatetimeparser.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/corelib/tools') diff --git a/src/corelib/tools/qdatetimeparser.cpp b/src/corelib/tools/qdatetimeparser.cpp index 978b663444..dd277f7753 100644 --- a/src/corelib/tools/qdatetimeparser.cpp +++ b/src/corelib/tools/qdatetimeparser.cpp @@ -1090,7 +1090,6 @@ QDateTimeParser::scanString(const QDateTime &defaultValue, int dayofweek = defaultDate.dayOfWeek(); Qt::TimeSpec tspec = defaultValue.timeSpec(); int zoneOffset = 0; // In seconds; local - UTC - QString zoneName; QTimeZone timeZone; switch (tspec) { case Qt::OffsetFromUTC: // timeZone is ignored -- cgit v1.2.3 From d674d227f7ab22aed206d3a7f5c96e5e8dfa48f2 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 6 Apr 2017 13:20:18 -0700 Subject: qGlobalQHashSeed: initialize the seed before returning it If you had never used QHash before, this function returned -1. That's not useful if you're trying to implement your own QHash that uses Qt's global seed. Change-Id: Ib0e40a7a3ebc44329f23fffd14b2e875b970a55c Reviewed-by: Lars Knoll --- src/corelib/tools/qhash.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/corelib/tools') diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp index 4cc9ec8ec8..1662e944cf 100644 --- a/src/corelib/tools/qhash.cpp +++ b/src/corelib/tools/qhash.cpp @@ -361,6 +361,7 @@ static void qt_initialize_qhash_seed() */ int qGlobalQHashSeed() { + qt_initialize_qhash_seed(); return qt_qhash_seed.load(); } -- cgit v1.2.3 From dfdd99fc123ee80e162f0c14b4687fa00a328215 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 25 Sep 2017 12:09:08 +0200 Subject: Doc: Be more specific on full stop in QVersionNumber So far we just write ... '.'. , which looks weird. Change-Id: Iac6fc781c80976994ea0a182b55958baa39a7e52 Reviewed-by: Leena Miettinen --- src/corelib/tools/qversionnumber.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/tools') diff --git a/src/corelib/tools/qversionnumber.cpp b/src/corelib/tools/qversionnumber.cpp index 97e5da8b3c..d2667ddea9 100644 --- a/src/corelib/tools/qversionnumber.cpp +++ b/src/corelib/tools/qversionnumber.cpp @@ -388,7 +388,7 @@ QVersionNumber QVersionNumber::commonPrefix(const QVersionNumber &v1, /*! \fn QString QVersionNumber::toString() const - Returns a string with all of the segments delimited by a '.'. + Returns a string with all of the segments delimited by a period (\c{.}). \sa majorVersion(), minorVersion(), microVersion(), segments() */ @@ -411,7 +411,7 @@ QString QVersionNumber::toString() const int *suffixIndex) Constructs a QVersionNumber from a specially formatted \a string of - non-negative decimal numbers delimited by '.'. + non-negative decimal numbers delimited by a period (\c{.}). Once the numerical segments have been parsed, the remainder of the string is considered to be the suffix string. The start index of that string will be -- cgit v1.2.3