Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/network/access/qftp.cpp
	src/widgets/itemviews/qheaderview.cpp
	src/widgets/itemviews/qlistview.cpp
	tests/auto/network/access/qftp/tst_qftp.cpp

Change-Id: I9f928f25d45d8944dd60bb583f649fc1615bc5d9

1 files changed, 6 insertions, 5 deletions

diff --git a/src/corelib/tools/qdatetimeparser.cpp b/src/corelib/tools/qdatetimeparser.cpp
index bbcd64d34f..73ecd4c47e 100644
--- a/src/corelib/tools/qdatetimeparser.cpp
+++ b/src/corelib/tools/qdatetimeparser.cpp
@@ -606,19 +606,20 @@ int QDateTimeParser::sectionMaxSize(Section s, int count) const
         // fall through
 #endif
     case MonthSection:
-        if (count <= 2)
-            return 2;
-
 #ifdef QT_NO_TEXTDATE
         return 2;
 #else
+        if (count <= 2)
+            return 2;
+
         {
             int ret = 0;
             const QLocale l = locale();
+            const QLocale::FormatType format = count == 4 ? QLocale::LongFormat : QLocale::ShortFormat;
             for (int i=1; i<=mcount; ++i) {
                 const QString str = (s == MonthSection
-                                     ? l.monthName(i, count == 4 ? QLocale::LongFormat : QLocale::ShortFormat)
-                                     : l.dayName(i, count == 4 ? QLocale::LongFormat : QLocale::ShortFormat));
+                                     ? l.monthName(i, format)
+                                     : l.dayName(i, format));
                 ret = qMax(str.size(), ret);
             }
             return ret;