Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: Id20053d261b4fbbcc0ac8ba49dd3ef2253fa4b95

configure

@@ -4198,6 +4198,9 @@ if [ "$CFG_NEON" = "auto" ]; then
         *neon*)
             CFG_NEON=yes
             ;;
+        *)
+            CFG_NEON=no
+            ;;
     esac
 fi
 

src/corelib/json/qjsonarray.cpp

@@ -709,6 +709,11 @@ bool QJsonArray::operator!=(const QJsonArray &other) const
     \internal
 */
 
+/*! \typedef QJsonArray::iterator::pointer
+
+    \internal
+*/
+
 /*! \fn QJsonArray::iterator::iterator()
 
     Constructs an uninitialized iterator.
@@ -953,6 +958,11 @@ bool QJsonArray::operator!=(const QJsonArray &other) const
     \internal
 */
 
+/*! \typedef QJsonArray::const_iterator::pointer
+
+    \internal
+*/
+
 /*! \fn QJsonArray::const_iterator::const_iterator(const const_iterator &other)
 
     Constructs a copy of \a other.

src/corelib/kernel/qcoreapplication.cpp

@@ -2580,13 +2580,15 @@ void QCoreApplication::removeNativeEventFilter(QAbstractNativeEventFilter *filte
 
     \sa QAbstractEventDispatcher::hasPendingEvents()
 */
+#if QT_DEPRECATED_SINCE(5, 3)
 bool QCoreApplication::hasPendingEvents()
 {
     QAbstractEventDispatcher *eventDispatcher = QAbstractEventDispatcher::instance();
     if (eventDispatcher)
         return eventDispatcher->hasPendingEvents();
     return false;
 }
+#endif
 
 /*!
     Returns a pointer to the event dispatcher object for the main thread. If no

src/corelib/tools/qbytearray.cpp

@@ -3644,7 +3644,7 @@ QByteArray QByteArray::toBase64(Base64Options options) const
     const char padchar = '=';
     int padlen = 0;
 
-    QByteArray tmp((d->size * 4) / 3 + 3, Qt::Uninitialized);
+    QByteArray tmp((d->size + 2) / 3 * 4, Qt::Uninitialized);
 
     int i = 0;
     char *out = tmp.data();
@@ -3682,8 +3682,9 @@ QByteArray QByteArray::toBase64(Base64Options options) const
             *out++ = alphabet[m];
         }
     }
-
-    tmp.truncate(out - tmp.data());
+    Q_ASSERT((options & OmitTrailingEquals) || (out == tmp.size() + tmp.data()));
+    if (options & OmitTrailingEquals)
+        tmp.truncate(out - tmp.data());
     return tmp;
 }
 

src/corelib/tools/qstring.cpp

@@ -1723,9 +1723,9 @@ void QString::expand(int i)
 
 /*! \fn void QString::clear()
 
-    Clears the contents of the string and makes it empty.
+    Clears the contents of the string and makes it null.
 
-    \sa resize(), isEmpty()
+    \sa resize(), isNull()
 */
 
 /*! \fn QString &QString::operator=(const QString &other)

src/gui/kernel/qevent.cpp

@@ -207,7 +207,9 @@ QMouseEvent::QMouseEvent(Type type, const QPointF &localPos, Qt::MouseButton but
                          Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers)
     : QInputEvent(type, modifiers), l(localPos), w(localPos), b(button), mouseState(buttons), caps(0)
 {
+#ifndef QT_NO_CURSOR
     s = QCursor::pos();
+#endif
 }
 
 
@@ -1594,7 +1596,9 @@ QContextMenuEvent::~QContextMenuEvent()
 QContextMenuEvent::QContextMenuEvent(Reason reason, const QPoint &pos)
     : QInputEvent(ContextMenu), p(pos), reas(reason)
 {
+#ifndef QT_NO_CURSOR
     gp = QCursor::pos();
+#endif
 }
 
 /*!

src/gui/kernel/qguiapplication.cpp

@@ -869,7 +869,7 @@ QWindowList QGuiApplication::topLevelWindows()
 /*!
     Returns the primary (or default) screen of the application.
 
-    This will be the screen where QWindows are shown, unless otherwise specified.
+    This will be the screen where QWindows are initially shown, unless otherwise specified.
 */
 QScreen *QGuiApplication::primaryScreen()
 {
@@ -3386,15 +3386,21 @@ void QGuiApplicationPrivate::_q_updateFocusObject(QObject *object)
 {
     Q_Q(QGuiApplication);
 
+    QPlatformInputContext *inputContext = platformIntegration()->inputContext();
     bool enabled = false;
-    if (object) {
-        QInputMethodQueryEvent query(Qt::ImEnabled);
+    if (object && inputContext) {
+        QInputMethodQueryEvent query(Qt::ImEnabled | Qt::ImHints);
         QGuiApplication::sendEvent(object, &query);
         enabled = query.value(Qt::ImEnabled).toBool();
+        if (enabled) {
+            static const bool supportsHiddenText = inputContext->hasCapability(QPlatformInputContext::HiddenTextCapability);
+            const Qt::InputMethodHints hints = static_cast<Qt::InputMethodHints>(query.value(Qt::ImHints).toInt());
+            if ((hints & Qt::ImhHiddenText) && !supportsHiddenText)
+                enabled = false;
+        }
     }
 
     QPlatformInputContextPrivate::setInputMethodAccepted(enabled);
-    QPlatformInputContext *inputContext = platformIntegration()->inputContext();
     if (inputContext)
         inputContext->setFocusObject(object);
     emit q->focusObjectChanged(object);

src/gui/kernel/qplatforminputcontext.cpp

@@ -91,6 +91,17 @@ bool QPlatformInputContext::isValid() const
     return false;
 }
 
+/*!
+    Returns whether the implementation supports \a capability.
+    \internal
+    \since 5.4
+ */
+bool QPlatformInputContext::hasCapability(Capability capability) const
+{
+    Q_UNUSED(capability)
+    return true;
+}
+
 /*!
     Method to be called when input method needs to be reset. Called by QInputMethod::reset().
     No further QInputMethodEvents should be sent as response.

src/gui/kernel/qplatforminputcontext.h

@@ -55,10 +55,15 @@ class Q_GUI_EXPORT QPlatformInputContext : public QObject
     Q_DECLARE_PRIVATE(QPlatformInputContext)
 
 public:
+    enum Capability {
+        HiddenTextCapability = 0x1
+    };
+
     QPlatformInputContext();
     virtual ~QPlatformInputContext();
 
     virtual bool isValid() const;
+    virtual bool hasCapability(Capability capability) const;
 
     virtual void reset();
     virtual void commit();

src/gui/kernel/qplatformwindow.cpp

@@ -526,12 +526,14 @@ static inline const QScreen *effectiveScreen(const QWindow *window)
     if (!screen)
         return QGuiApplication::primaryScreen();
     const QList<QScreen *> siblings = screen->virtualSiblings();
+#ifndef QT_NO_CURSOR
     if (siblings.size() > 1) {
         const QPoint referencePoint = window->transientParent() ? window->transientParent()->geometry().center() : QCursor::pos();
         foreach (const QScreen *sibling, siblings)
             if (sibling->geometry().contains(referencePoint))
                 return sibling;
     }
+#endif
     return screen;
 }
 

src/gui/kernel/qshapedpixmapdndwindow.cpp

@@ -88,12 +88,14 @@ void QShapedPixmapWindow::setHotspot(const QPoint &hotspot)
 
 void QShapedPixmapWindow::updateGeometry()
 {
+#ifndef QT_NO_CURSOR
     QRect rect(QCursor::pos() - m_hotSpot, m_pixmap.size());
     if (m_pixmap.isNull())
         m_backingStore->resize(QSize(1,1));
     else if (m_backingStore->size() != m_pixmap.size())
         m_backingStore->resize(m_pixmap.size());
     setGeometry(rect);
+#endif
 }
 
 void QShapedPixmapWindow::exposeEvent(QExposeEvent *)

src/gui/kernel/qsurfaceformat.cpp

@@ -308,6 +308,7 @@ void QSurfaceFormat::setSamples(int numSamples)
     }
 }
 
+#if QT_DEPRECATED_SINCE(5, 2)
 /*!
     \obsolete
     \overload
@@ -343,6 +344,7 @@ bool QSurfaceFormat::testOption(QSurfaceFormat::FormatOptions opt) const
 {
     return d->opts & opt;
 }
+#endif // QT_DEPRECATED_SINCE(5, 2)
 
 /*!
     \since 5.3

src/gui/kernel/qsurfaceformat.h

@@ -119,8 +119,10 @@ class Q_GUI_EXPORT QSurfaceFormat
     bool stereo() const;
     void setStereo(bool enable);
 
+#if QT_DEPRECATED_SINCE(5, 2)
     QT_DEPRECATED void setOption(QSurfaceFormat::FormatOptions opt);
     QT_DEPRECATED bool testOption(QSurfaceFormat::FormatOptions opt) const;
+#endif
 
     void setOptions(QSurfaceFormat::FormatOptions options);
     void setOption(FormatOption option, bool on = true);

src/gui/kernel/qwindow.cpp

@@ -416,6 +416,15 @@ void QWindowPrivate::clearFocusObject()
 {
 }
 
+// Allows for manipulating the suggested geometry before a resize/move
+// event in derived classes for platforms that support it, for example to
+// implement heightForWidth().
+QRectF QWindowPrivate::closestAcceptableGeometry(const QRectF &rect) const
+{
+    Q_UNUSED(rect)
+    return QRectF();
+}
+
 /*!
     Sets the \a surfaceType of the window.
 

src/gui/kernel/qwindow_p.h

@@ -136,6 +136,7 @@ class Q_GUI_EXPORT QWindowPrivate : public QObjectPrivate
     void emitScreenChangedRecursion(QScreen *newScreen);
 
     virtual void clearFocusObject();
+    virtual QRectF closestAcceptableGeometry(const QRectF &rect) const;
 
     bool isPopup() const { return (windowFlags & Qt::WindowType_Mask) == Qt::Popup; }
 

src/gui/opengl/qopengltexture.cpp

@@ -2965,6 +2965,7 @@ void QOpenGLTexture::setData(PixelFormat sourceFormat, PixelType sourceType,
     d->setData(0, 0, QOpenGLTexture::CubeMapPositiveX, sourceFormat, sourceType, data, options);
 }
 
+#if QT_DEPRECATED_SINCE(5, 3)
 /*!
     \obsolete
     \overload
@@ -3022,6 +3023,7 @@ void QOpenGLTexture::setData(PixelFormat sourceFormat, PixelType sourceType,
     Q_ASSERT(d->textureId);
     d->setData(0, 0, QOpenGLTexture::CubeMapPositiveX, sourceFormat, sourceType, data, options);
 }
+#endif
 
 /*!
     This overload of setData() will allocate storage for you.
@@ -3110,6 +3112,7 @@ void QOpenGLTexture::setCompressedData(int dataSize, const void *data,
     d->setCompressedData(0, 0, QOpenGLTexture::CubeMapPositiveX, dataSize, data, options);
 }
 
+#if QT_DEPRECATED_SINCE(5, 3)
 /*!
     \obsolete
     \overload
@@ -3163,6 +3166,7 @@ void QOpenGLTexture::setCompressedData(int dataSize, void *data,
     Q_ASSERT(d->textureId);
     d->setCompressedData(0, 0, QOpenGLTexture::CubeMapPositiveX, dataSize, data, options);
 }
+#endif
 
 /*!
     Returns \c true if your OpenGL implementation and version supports the texture

src/gui/opengl/qopengltexture.h

@@ -404,6 +404,7 @@ class Q_GUI_EXPORT QOpenGLTexture
 
     // Pixel transfer
     // ### Qt 6: remove the non-const void * overloads
+#if QT_DEPRECATED_SINCE(5, 3)
     QT_DEPRECATED void setData(int mipLevel, int layer, CubeMapFace cubeFace,
                                PixelFormat sourceFormat, PixelType sourceType,
                                void *data, const QOpenGLPixelTransferOptions * const options = 0);
@@ -415,6 +416,7 @@ class Q_GUI_EXPORT QOpenGLTexture
                                void *data, const QOpenGLPixelTransferOptions * const options = 0);
     QT_DEPRECATED void setData(PixelFormat sourceFormat, PixelType sourceType,
                                void *data, const QOpenGLPixelTransferOptions * const options = 0);
+#endif // QT_DEPRECATED_SINCE(5, 3)
 
     void setData(int mipLevel, int layer, CubeMapFace cubeFace,
                  PixelFormat sourceFormat, PixelType sourceType,
@@ -430,6 +432,7 @@ class Q_GUI_EXPORT QOpenGLTexture
 
     // Compressed data upload
     // ### Qt 6: remove the non-const void * overloads
+#if QT_DEPRECATED_SINCE(5, 3)
     QT_DEPRECATED void setCompressedData(int mipLevel, int layer, CubeMapFace cubeFace,
                                          int dataSize, void *data,
                                          const QOpenGLPixelTransferOptions * const options = 0);
@@ -440,6 +443,7 @@ class Q_GUI_EXPORT QOpenGLTexture
                                          const QOpenGLPixelTransferOptions * const options = 0);
     QT_DEPRECATED void setCompressedData(int dataSize, void *data,
                                          const QOpenGLPixelTransferOptions * const options = 0);
+#endif // QT_DEPRECATED_SINCE(5, 3)
 
     void setCompressedData(int mipLevel, int layer, CubeMapFace cubeFace,
                            int dataSize, const void *data,

src/gui/painting/qpaintbuffer.cpp

@@ -39,7 +39,6 @@
 #include <private/qimage_p.h>
 #include <qstatictext.h>
 #include <private/qstatictext_p.h>
-#include <private/qrawfont_p.h>
 
 #include <QDebug>
 
@@ -1744,14 +1743,8 @@ void QPainterReplayer::process(const QPaintBufferCommand &cmd)
 
             painter->setFont(font);
 
-            QRawFont rawFont;
-            QRawFontPrivate *rawFontD = QRawFontPrivate::get(rawFont);
-            QFontPrivate *fontD = QFontPrivate::get(font);
-            rawFontD->fontEngine = fontD->engineForScript(QChar::Script_Common);
-            rawFontD->fontEngine->ref.ref();
-
             QGlyphRun glyphs;
-            glyphs.setRawFont(rawFont);
+            glyphs.setRawFont(QRawFont::fromFont(font, QFontDatabase::Any));
             glyphs.setGlyphIndexes(glyphIndexes);
             glyphs.setPositions(positions);
 

src/gui/painting/qpainter.cpp

@@ -6358,7 +6358,7 @@ void QPainterPrivate::drawTextItem(const QPointF &p, const QTextItem &_ti, QText
         return;
 
     const QPainter::RenderHints oldRenderHints = state->renderHints;
-    if (!state->renderHints & QPainter::Antialiasing && state->matrix.type() >= QTransform::TxScale) {
+    if (!(state->renderHints & QPainter::Antialiasing) && state->matrix.type() >= QTransform::TxScale) {
         // draw antialias decoration (underline/overline/strikeout) with
         // transformed text
 
@@ -6428,7 +6428,10 @@ void QPainterPrivate::drawTextItem(const QPointF &p, const QTextItem &_ti, QText
             if (rtl)
                 x -= ti2.width.toReal();
 
-            engine->drawTextItem(QPointF(x, y), ti2);
+            if (extended)
+                extended->drawTextItem(QPointF(x, y), ti2);
+            else
+                engine->drawTextItem(QPointF(x, y), ti2);
 
             if (!rtl)
                 x += ti2.width.toReal();

src/gui/text/qdistancefield.cpp

@@ -752,7 +752,7 @@ bool qt_fontHasNarrowOutlines(const QRawFont &f)
         return false;
 
     QVector<quint32> glyphIndices = font.glyphIndexesForString(QLatin1String("O"));
-    if (glyphIndices.size() < 1)
+    if (glyphIndices.isEmpty() || glyphIndices[0] == 0)
         return false;
 
     return imageHasNarrowOutlines(font.alphaMapForGlyph(glyphIndices.at(0),

src/gui/text/qfont.cpp

@@ -1950,6 +1950,7 @@ static void set_extended_font_bits(quint8 bits, QFontPrivate *f)
 }
 #endif
 
+#if QT_DEPRECATED_SINCE(5, 3)
 /*!
     \fn QString QFont::rawName() const
     \deprecated
@@ -1986,6 +1987,7 @@ QString QFont::rawName() const
 void QFont::setRawName(const QString &)
 {
 }
+#endif
 
 /*!
     Returns the font's key, a textual representation of a font. It is

src/gui/text/qfontdatabase.cpp

@@ -2482,11 +2482,12 @@ bool QFontDatabase::removeAllApplicationFonts()
 
     \sa {Thread-Support in Qt Modules#Painting In Threads}{Painting In Threads}
 */
-// QT_DEPRECATED_SINCE(5, 2)
+#if QT_DEPRECATED_SINCE(5, 2)
 bool QFontDatabase::supportsThreadedFontRendering()
 {
     return true;
 }
+#endif
 
 /*!
     \internal