Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"

9 files changed, 58 insertions, 19 deletions

diff --git a/src/corelib/text/qcollator_icu.cpp b/src/corelib/text/qcollator_icu.cpp
index 8acda45070..0dca1ee9c9 100644
--- a/src/corelib/text/qcollator_icu.cpp
+++ b/src/corelib/text/qcollator_icu.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Copyright (C) 2013 Aleix Pol Gonzalez <aleixpol@kde.org>
 ** Contact: https://www.qt.io/licensing/
 **
@@ -109,6 +109,11 @@ void QCollatorPrivate::cleanup()
 
 int QCollator::compare(QStringView s1, QStringView s2) const
 {
+    if (!s1.size())
+        return s2.size() ? -1 : 0;
+    if (!s2.size())
+        return +1;
+
     if (d->dirty)
         d->init();
 
diff --git a/src/corelib/text/qcollator_macx.cpp b/src/corelib/text/qcollator_macx.cpp
index 071d7c048f..cb8e073d4a 100644
--- a/src/corelib/text/qcollator_macx.cpp
+++ b/src/corelib/text/qcollator_macx.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Aleix Pol Gonzalez <aleixpol@kde.org>
+** Copyright (C) 2020 Aleix Pol Gonzalez <aleixpol@kde.org>
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -94,6 +94,11 @@ void QCollatorPrivate::cleanup()
 
 int QCollator::compare(QStringView s1, QStringView s2) const
 {
+    if (!s1.size())
+        return s2.size() ? -1 : 0;
+    if (!s2.size())
+        return +1;
+
     if (d->dirty)
         d->init();
     if (!d->collator)
diff --git a/src/corelib/text/qcollator_posix.cpp b/src/corelib/text/qcollator_posix.cpp
index 9cbc539ebe..ffcd214cfb 100644
--- a/src/corelib/text/qcollator_posix.cpp
+++ b/src/corelib/text/qcollator_posix.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Aleix Pol Gonzalez <aleixpol@kde.org>
+** Copyright (C) 2020 Aleix Pol Gonzalez <aleixpol@kde.org>
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -75,6 +75,11 @@ static void stringToWCharArray(QVarLengthArray<wchar_t> &ret, QStringView string
 
 int QCollator::compare(QStringView s1, QStringView s2) const
 {
+    if (!s1.size())
+        return s2.size() ? -1 : 0;
+    if (!s2.size())
+        return +1;
+
     if (d->isC())
         return s1.compare(s2, caseSensitivity());
     if (d->dirty)
diff --git a/src/corelib/text/qcollator_win.cpp b/src/corelib/text/qcollator_win.cpp
index 9d81de882f..54f57f1d24 100644
--- a/src/corelib/text/qcollator_win.cpp
+++ b/src/corelib/text/qcollator_win.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Aleix Pol Gonzalez <aleixpol@kde.org>
+** Copyright (C) 2020 Aleix Pol Gonzalez <aleixpol@kde.org>
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -89,6 +89,11 @@ void QCollatorPrivate::cleanup()
 
 int QCollator::compare(QStringView s1, QStringView s2) const
 {
+    if (!s1.size())
+        return s2.size() ? -1 : 0;
+    if (!s2.size())
+        return +1;
+
     if (d->isC())
         return s1.compare(s2, d->caseSensitivity);
 
diff --git a/src/corelib/time/qdatetimeparser.cpp b/src/corelib/time/qdatetimeparser.cpp
index c9ebc3fab3..790c20004a 100644
--- a/src/corelib/time/qdatetimeparser.cpp
+++ b/src/corelib/time/qdatetimeparser.cpp
@@ -219,7 +219,8 @@ int QDateTimeParser::absoluteMax(int s, const QDateTime &cur) const
     const SectionNode &sn = sectionNode(s);
     switch (sn.type) {
 #if QT_CONFIG(timezone)
-    case TimeZoneSection: return QTimeZone::MaxUtcOffsetSecs;
+    case TimeZoneSection:
+        return QTimeZone::MaxUtcOffsetSecs;
 #endif
     case Hour24Section:
     case Hour12Section:
@@ -227,20 +228,25 @@ int QDateTimeParser::absoluteMax(int s, const QDateTime &cur) const
         // We want it to be 23 for the stepBy case.
         return 23;
     case MinuteSection:
-    case SecondSection: return 59;
-    case MSecSection: return 999;
+    case SecondSection:
+        return 59;
+    case MSecSection:
+        return 999;
     case YearSection2Digits:
     case YearSection:
         // sectionMaxSize will prevent people from typing in a larger number in
         // count == 2 sections; stepBy() will work on real years anyway.
         return 9999;
-    case MonthSection: return calendar.maximumMonthsInYear();
+    case MonthSection:
+        return calendar.maximumMonthsInYear();
     case DaySection:
     case DayOfWeekSectionShort:
     case DayOfWeekSectionLong:
         return cur.isValid() ? cur.date().daysInMonth(calendar) : calendar.maximumDaysInMonth();
-    case AmPmSection: return 1;
-    default: break;
+    case AmPmSection:
+        return 1;
+    default:
+        break;
     }
     qWarning("QDateTimeParser::absoluteMax() Internal error (%ls)",
              qUtf16Printable(sn.name()));
@@ -620,7 +626,8 @@ int QDateTimeParser::sectionMaxSize(Section s, int count) const
     switch (s) {
     case FirstSection:
     case NoSection:
-    case LastSection: return 0;
+    case LastSection:
+        return 0;
 
     case AmPmSection: {
         const int lowerMax = qMax(getAmPmText(AmText, LowerCase).size(),
@@ -634,7 +641,9 @@ int QDateTimeParser::sectionMaxSize(Section s, int count) const
     case Hour12Section:
     case MinuteSection:
     case SecondSection:
-    case DaySection: return 2;
+    case DaySection:
+        return 2;
+
     case DayOfWeekSectionShort:
     case DayOfWeekSectionLong:
 #if !QT_CONFIG(textdate)
@@ -663,11 +672,15 @@ int QDateTimeParser::sectionMaxSize(Section s, int count) const
             return ret;
         }
 #endif
-    case MSecSection: return 3;
-    case YearSection: return 4;
-    case YearSection2Digits: return 2;
+    case MSecSection:
+        return 3;
+    case YearSection:
+        return 4;
+    case YearSection2Digits:
+        return 2;
+    case TimeZoneSection:
         // Arbitrarily many tokens (each up to 14 bytes) joined with / separators:
-    case TimeZoneSection: return std::numeric_limits<int>::max();
+        return std::numeric_limits<int>::max();
 
     case CalendarPopupSection:
     case Internal:
diff --git a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp
index 625473964d..ca16efe34f 100644
--- a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp
+++ b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp
@@ -110,6 +110,8 @@ public:
 
     static AssetItem::Type fileType(const QString &filePath)
     {
+        if (filePath.isEmpty())
+            return AssetItem::Type::Folder;
         const QStringList paths = filePath.split(QLatin1Char('/'));
         QString fullPath;
         AssetItem::Type res = AssetItem::Type::Invalid;
@@ -399,7 +401,8 @@ public:
 private:
     AAsset *m_assetFile = nullptr;
     AAssetManager *m_assetManager = nullptr;
-    QString m_fileName;
+    // initialize with a name that can't be used as a file name
+    QString m_fileName = QLatin1String(".");
     bool m_isFolder = false;
 };
 
diff --git a/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp b/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp
index 4fb271a75c..7585b7eb95 100644
--- a/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp
+++ b/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp
@@ -104,6 +104,7 @@ void QAndroidPlatformFileDialogHelper::exec()
 
 void QAndroidPlatformFileDialogHelper::hide()
 {
+    QtAndroidPrivate::unregisterActivityResultListener(this);
 }
 
 QString QAndroidPlatformFileDialogHelper::selectedNameFilter() const
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 5290abf9f6..58ed210d3b 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -1174,7 +1174,7 @@ void WriteInitialization::writeProperties(const QString &varName,
             m_output << m_indent << "if (" << varName << "->objectName().isEmpty())\n";
             break;
         case Language::Python:
-           m_output << m_indent << "if " << varName << ".objectName():\n";
+           m_output << m_indent << "if not " << varName << ".objectName():\n";
            break;
         }
     }
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index f45f1bdc31..fdad879209 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -2350,7 +2350,9 @@ QWidget *QWidget::find(WId id)
 */
 WId QWidget::winId() const
 {
-    if (!testAttribute(Qt::WA_WState_Created) || !internalWinId()) {
+    if (!data->in_destructor
+        && (!testAttribute(Qt::WA_WState_Created) || !internalWinId()))
+    {
 #ifdef ALIEN_DEBUG
         qDebug() << "QWidget::winId: creating native window for" << this;
 #endif