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

Change-Id: I9953c1ca16862184c2373027e946c482ce8e6f0e

5 files changed, 62 insertions, 12 deletions

diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index ebacd8a0c6..aa83cf2bcc 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -569,6 +569,23 @@ static QString getRelocatablePrefix()
 #error "The chosen platform / config does not support querying for a dynamic prefix."
 #endif
 
+#if defined(Q_OS_LINUX) && !defined(QT_STATIC) && defined(__GLIBC__)
+    // QTBUG-78948: libQt5Core.so may be located in subdirectories below libdir.
+    // See "Hardware capabilities" in the ld.so documentation and the Qt 5.3.0
+    // changelog regarding SSE2 support.
+    const QString libdir = QString::fromLatin1(
+        qt_configure_strs + qt_configure_str_offsets[QLibraryInfo::LibrariesPath - 1]);
+    QDir prefixDir(prefixPath);
+    while (!prefixDir.exists(libdir)) {
+        prefixDir.cdUp();
+        prefixPath = prefixDir.absolutePath();
+        if (prefixDir.isRoot()) {
+            prefixPath.clear();
+            break;
+        }
+    }
+#endif
+
     Q_ASSERT_X(!prefixPath.isEmpty(), "getRelocatablePrefix",
                                       "Failed to find the Qt prefix path.");
     return prefixPath;
diff --git a/src/corelib/io/qstandardpaths.cpp b/src/corelib/io/qstandardpaths.cpp
index f56fef7f8e..3b5f2f97da 100644
--- a/src/corelib/io/qstandardpaths.cpp
+++ b/src/corelib/io/qstandardpaths.cpp
@@ -232,7 +232,7 @@ QT_BEGIN_NAMESPACE
     \row \li DocumentsLocation
          \li "~/Documents"
     \row \li FontsLocation
-         \li "~/.fonts"
+         \li "~/.fonts", "~/.local/share/fonts", "/usr/local/share/fonts", "/usr/share/fonts"
     \row \li ApplicationsLocation
          \li "~/.local/share/applications", "/usr/local/share/applications", "/usr/share/applications"
     \row \li MusicLocation
diff --git a/src/corelib/io/qstandardpaths_unix.cpp b/src/corelib/io/qstandardpaths_unix.cpp
index 6425890e3f..c35d7adc9f 100644
--- a/src/corelib/io/qstandardpaths_unix.cpp
+++ b/src/corelib/io/qstandardpaths_unix.cpp
@@ -339,6 +339,9 @@ QStringList QStandardPaths::standardLocations(StandardLocation type)
         break;
     case FontsLocation:
         dirs += QDir::homePath() + QLatin1String("/.fonts");
+        dirs += xdgDataDirs();
+        for (int i = 1; i < dirs.count(); ++i)
+            dirs[i].append(QLatin1String("/fonts"));
         break;
     default:
         break;
diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp
index 6ed0efe77d..95a7255a04 100644
--- a/src/corelib/time/qdatetime.cpp
+++ b/src/corelib/time/qdatetime.cpp
@@ -3861,6 +3861,9 @@ int QDateTime::offsetFromUtc() const
 
 QString QDateTime::timeZoneAbbreviation() const
 {
+    if (!isValid())
+        return QString();
+
     switch (getSpec(d)) {
     case Qt::UTC:
         return QLatin1String("UTC");
@@ -3895,6 +3898,9 @@ QString QDateTime::timeZoneAbbreviation() const
 
 bool QDateTime::isDaylightTime() const
 {
+    if (!isValid())
+        return false;
+
     switch (getSpec(d)) {
     case Qt::UTC:
     case Qt::OffsetFromUTC:
@@ -4761,17 +4767,24 @@ QDateTime QDateTime::toTimeZone(const QTimeZone &timeZone) const
     Returns \c true if this datetime is equal to the \a other datetime;
     otherwise returns \c false.
 
+    Since 5.14, all invalid datetimes are equal to one another and differ from
+    all other datetimes.
+
     \sa operator!=()
 */
 
 bool QDateTime::operator==(const QDateTime &other) const
 {
-    if (getSpec(d) == Qt::LocalTime
-        && getStatus(d) == getStatus(other.d)) {
+    if (!isValid())
+        return !other.isValid();
+    if (!other.isValid())
+        return false;
+
+    if (getSpec(d) == Qt::LocalTime && getStatus(d) == getStatus(other.d))
         return getMSecs(d) == getMSecs(other.d);
-    }
+
     // Convert to UTC and compare
-    return (toMSecsSinceEpoch() == other.toMSecsSinceEpoch());
+    return toMSecsSinceEpoch() == other.toMSecsSinceEpoch();
 }
 
 /*!
@@ -4780,8 +4793,9 @@ bool QDateTime::operator==(const QDateTime &other) const
     Returns \c true if this datetime is different from the \a other
     datetime; otherwise returns \c false.
 
-    Two datetimes are different if either the date, the time, or the
-    time zone components are different.
+    Two datetimes are different if either the date, the time, or the time zone
+    components are different. Since 5.14, any invalid datetime is less than all
+    valid datetimes.
 
     \sa operator==()
 */
@@ -4793,12 +4807,16 @@ bool QDateTime::operator==(const QDateTime &other) const
 
 bool QDateTime::operator<(const QDateTime &other) const
 {
-    if (getSpec(d) == Qt::LocalTime
-        && getStatus(d) == getStatus(other.d)) {
+    if (!isValid())
+        return other.isValid();
+    if (!other.isValid())
+        return false;
+
+    if (getSpec(d) == Qt::LocalTime && getStatus(d) == getStatus(other.d))
         return getMSecs(d) < getMSecs(other.d);
-    }
+
     // Convert to UTC and compare
-    return (toMSecsSinceEpoch() < other.toMSecsSinceEpoch());
+    return toMSecsSinceEpoch() < other.toMSecsSinceEpoch();
 }
 
 /*!
@@ -5849,7 +5867,7 @@ uint qHash(const QDateTime &key, uint seed)
     // QDate/QTime/spec/offset because QDateTime::operator== converts both arguments
     // to the same timezone. If we don't, qHash would return different hashes for
     // two QDateTimes that are equivalent once converted to the same timezone.
-    return qHash(key.toMSecsSinceEpoch(), seed);
+    return key.isValid() ? qHash(key.toMSecsSinceEpoch(), seed) : seed;
 }
 
 /*! \fn uint qHash(const QDate &key, uint seed = 0)
diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp
index 2ae63fe135..52c8d13fe3 100644
--- a/src/corelib/tools/qeasingcurve.cpp
+++ b/src/corelib/tools/qeasingcurve.cpp
@@ -583,6 +583,13 @@ struct BezierEase : public QEasingCurveFunction
             qWarning("QEasingCurve: Invalid bezier curve");
             return x;
         }
+
+        // The bezier computation is not always precise on the endpoints, so handle explicitly
+        if (!(x > 0))
+            return 0;
+        if (!(x < 1))
+            return 1;
+
         SingleCubicBezier *singleCubicBezier = 0;
         getBezierSegment(singleCubicBezier, x);
 
@@ -998,6 +1005,11 @@ struct BackEase : public QEasingCurveFunction
 
     qreal value(qreal t) override
     {
+        // The *Back() functions are not always precise on the endpoints, so handle explicitly
+        if (!(t > 0))
+            return 0;
+        if (!(t < 1))
+            return 1;
         qreal o = (_o < 0) ? qreal(1.70158) : _o;
         switch(_t) {
         case QEasingCurve::InBack: