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

Conflicts:
	examples/quick/textureprovider/etcprovider.h
	src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp
	src/qml/doc/qtqml.qdocconf
	src/quick/doc/qtquick.qdocconf
	tests/auto/quick/qquickflickable/tst_qquickflickable.cpp

Change-Id: I5027b0ee024e00b9525bd45516b7f401ff7d4ae4

diff --cc examples/quick/textureprovider/etcprovider.h
index 4215ea2,4cc669f..08418f8
--- 1/examples/quick/textureprovider/etcprovider.h
--- 2/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.h
+++ b/examples/quick/textureprovider/etcprovider.h
@@@ -39,42 -39,45 +39,43 @@@
  **
  ****************************************************************************/
  
 -#ifndef QMLOSTPLUGIN_H
 -#define QMLOSTPLUGIN_H
 +#ifndef ETCPROVIDER_H
 +#define ETCPROVIDER_H
  
 -#include <QtWidgets/QStylePlugin>
 -#include <QtQml/private/qqmldebugserverconnection_p.h>
 +#include <qopengl.h>
 +#include <QQuickImageProvider>
 +#include <QtQuick/QSGTexture>
  
 -QT_BEGIN_NAMESPACE
 +class EtcProvider : public QQuickImageProvider
 +{
 +public:
 +    EtcProvider()
 +        : QQuickImageProvider(QQuickImageProvider::Texture)
 +    {}
  
 -class QQmlDebugServer;
 -class QmlOstPluginPrivate;
 +    QQuickTextureFactory *requestTexture(const QString &id, QSize *size, const QSize &requestedSize);
 +};
  
 -class QmlOstPlugin : public QObject, public QQmlDebugServerConnection
 +class EtcTexture : public QSGTexture
  {
      Q_OBJECT
+     Q_PLUGIN_METADATA(IID "org.qt-project.Qml.QmlOstPlugin")
 -    Q_DECLARE_PRIVATE(QmlOstPlugin)
 -    Q_DISABLE_COPY(QmlOstPlugin)
 -    Q_INTERFACES(QQmlDebugServerConnection)
 -
 -
  public:
 -    QmlOstPlugin();
 -    ~QmlOstPlugin();
 +    EtcTexture();
 +    ~EtcTexture();
  
 -    void setServer(QQmlDebugServer *server);
 -    void setPort(int port, bool bock, const QString &hostaddress);
 +    void bind();
  
 -    bool isConnected() const;
 -    void send(const QByteArray &message);
 -    void disconnect();
 -    bool waitForMessage();
 +    QSize textureSize() const { return m_size; }
 +    int textureId() const { return m_texture_id; }
  
 -private Q_SLOTS:
 -    void readyRead();
 +    bool hasAlphaChannel() const { return false; }
 +    bool hasMipmaps() const { return false; }
  
 -private:
 -    QmlOstPluginPrivate *d_ptr;
 +    QByteArray m_data;
 +    QSize m_size;
 +    QSize m_paddedSize;
 +    GLuint m_texture_id;
  };
  
 -QT_END_NAMESPACE
 -
 -#endif // QMLOSTPLUGIN_H
 +#endif // ETCPROVIDER_H

diff --cc src/qml/doc/qtqml.qdocconf
Simple merge

diff --cc src/quick/items/context2d/qquickcontext2d.cpp
Simple merge

diff --cc src/quick/items/qquickitem.cpp
Simple merge

diff --cc src/quick/items/qquickwindow.cpp
Simple merge

diff --cc tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
index 5226434,784988b..9645aaa
--- 1/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
--- 2/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
+++ b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
@@@ -997,9 -997,9 +997,9 @@@ void tst_qquickflickable::pressWhileFli
  
      // flick then press while it is still moving
      // flicking == false, moving == true;
 -    flick(window, QPoint(20,190), QPoint(20, 50), 200);
 +    flick(window.data(), QPoint(20,190), QPoint(20, 50), 200);
      QVERIFY(flickable->verticalVelocity() > 0.0);
-     QVERIFY(flickable->isFlicking());
+     QTRY_VERIFY(flickable->isFlicking());
      QVERIFY(flickable->isFlickingVertically());
      QVERIFY(!flickable->isFlickingHorizontally());
      QVERIFY(flickable->isMoving());

diff --cc tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
Simple merge