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

 Conflicts:
	src/imports/imports.pro
	src/src.pro

Change-Id: Icdc39b6169d15b2102acd0e4d550a8d91e4b0744

33 files changed, 337 insertions, 209 deletions

diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index e9a93a0e83..ad33312891 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -20,9 +20,7 @@ qtHaveModule(quick) {
         window \
         tableview
 
-    qtConfig(testlib): \
-        SUBDIRS += testlib
-
+    qtHaveModule(testlib): SUBDIRS += testlib
     qtConfig(systemsemaphore): SUBDIRS += sharedimage
     qtConfig(quick-particles): \
         SUBDIRS += particles
diff --git a/src/plugins/qmltooling/packetprotocol/packetprotocol.pro b/src/plugins/qmltooling/packetprotocol/packetprotocol.pro
index 990d3169ad..a188b87a81 100644
--- a/src/plugins/qmltooling/packetprotocol/packetprotocol.pro
+++ b/src/plugins/qmltooling/packetprotocol/packetprotocol.pro
@@ -1,11 +1,11 @@
 TARGET = QtPacketProtocol
-QT     = core-private qml-private
+QT     = core-private
 CONFIG += static internal_module
 
 HEADERS = \
     qpacketprotocol_p.h \
     qpacket_p.h \
-    qqmldebugpacket_p.h
+    qversionedpacket_p.h
 
 SOURCES = \
     qpacketprotocol.cpp \
diff --git a/src/plugins/qmltooling/packetprotocol/qqmldebugpacket_p.h b/src/plugins/qmltooling/packetprotocol/qversionedpacket_p.h
index 9a0f8cd82d..635072adbc 100644
--- a/src/plugins/qmltooling/packetprotocol/qqmldebugpacket_p.h
+++ b/src/plugins/qmltooling/packetprotocol/qversionedpacket_p.h
@@ -37,14 +37,11 @@
 **
 ****************************************************************************/
 
-#ifndef QQMLDEBUGPACKET_P_H
-#define QQMLDEBUGPACKET_P_H
+#ifndef QVERSIONEDPACKET_P_H
+#define QVERSIONEDPACKET_P_H
 
 #include "qpacket_p.h"
 
-#include <QtCore/qbuffer.h>
-#include <QtQml/private/qqmldebugconnector_p.h>
-
 //
 //  W A R N I N G
 //  -------------
@@ -58,14 +55,15 @@
 
 QT_BEGIN_NAMESPACE
 
-// QPacket with a fixed data stream version, centrally set by QQmlDebugServer
-class QQmlDebugPacket : public QPacket
+// QPacket with a fixed data stream version, centrally set by some Connector
+template<class Connector>
+class QVersionedPacket : public QPacket
 {
 public:
-    QQmlDebugPacket() : QPacket(QQmlDebugConnector::dataStreamVersion()) {}
-    QQmlDebugPacket(const QByteArray &ba) : QPacket(QQmlDebugConnector::dataStreamVersion(), ba) {}
+    QVersionedPacket(const QByteArray &ba) : QPacket(Connector::dataStreamVersion(), ba) {}
+    QVersionedPacket() : QPacket(Connector::dataStreamVersion()) {}
 };
 
 QT_END_NAMESPACE
 
-#endif // QQMLDEBUGPACKET_P_H
+#endif // QVERSIONEDPACKET_P_H
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp
index 236109d041..d008b86a78 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp
@@ -56,10 +56,13 @@
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qfileinfo.h>
 #include <private/qmetaobject_p.h>
-#include <private/qqmldebugpacket_p.h>
+#include <private/qqmldebugconnector_p.h>
+#include <private/qversionedpacket_p.h>
 
 QT_BEGIN_NAMESPACE
 
+using QQmlDebugPacket = QVersionedPacket<QQmlDebugConnector>;
+
 QQmlEngineDebugServiceImpl::QQmlEngineDebugServiceImpl(QObject *parent) :
     QQmlEngineDebugService(2, parent), m_watch(new QQmlWatcher(this)), m_statesDelegate(nullptr)
 {
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
index 61209e08cb..32de8e9027 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
@@ -45,7 +45,7 @@
 #include <private/qv4function_p.h>
 #include <private/qqmldebugconnector_p.h>
 #include <private/qv8engine_p.h>
-#include <private/qqmldebugpacket_p.h>
+#include <private/qversionedpacket_p.h>
 
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
@@ -70,6 +70,8 @@ QT_BEGIN_NAMESPACE
 class V8CommandHandler;
 class UnknownV8CommandHandler;
 
+using QQmlDebugPacket = QVersionedPacket<QQmlDebugConnector>;
+
 int QV4DebugServiceImpl::sequence = 0;
 
 class V8CommandHandler
diff --git a/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp
index 7ce83daed6..bac4e01df1 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp
@@ -44,7 +44,8 @@
 #include <private/qqmldebugserviceinterfaces_p.h>
 #include <private/qabstractanimation_p.h>
 #include <private/qqmlcomponent_p.h>
-#include <private/qqmldebugpacket_p.h>
+#include <private/qqmldebugconnector_p.h>
+#include <private/qversionedpacket_p.h>
 
 #include <QtGui/qwindow.h>
 
@@ -63,6 +64,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using QQmlDebugPacket = QVersionedPacket<QQmlDebugConnector>;
+
 const char REQUEST[] = "request";
 const char RESPONSE[] = "response";
 const char EVENT[] = "event";
diff --git a/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.cpp b/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.cpp
index 2bf9210b37..4f6cb9364d 100644
--- a/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_messages/qdebugmessageservice.cpp
@@ -40,10 +40,12 @@
 #include "qdebugmessageservice.h"
 
 #include <private/qqmldebugconnector_p.h>
-#include <private/qqmldebugpacket_p.h>
+#include <private/qversionedpacket_p.h>
 
 QT_BEGIN_NAMESPACE
 
+using QQmlDebugPacket = QVersionedPacket<QQmlDebugConnector>;
+
 void DebugMessageHandler(QtMsgType type, const QMessageLogContext &ctxt,
                          const QString &buf)
 {
diff --git a/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp b/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp
index 93ac875e2d..bf73440a39 100644
--- a/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp
+++ b/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp
@@ -40,7 +40,7 @@
 #include "qqmlnativedebugconnector.h"
 
 #include <private/qhooks_p.h>
-#include <private/qqmldebugpacket_p.h>
+#include <private/qversionedpacket_p.h>
 
 #include <QtQml/qjsengine.h>
 #include <QtCore/qdebug.h>
diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
index 6db82e9f52..92492d9305 100644
--- a/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
@@ -49,7 +49,7 @@
 #include <private/qv4objectiterator_p.h>
 #include <private/qv4identifier_p.h>
 #include <private/qv4runtime_p.h>
-#include <private/qqmldebugpacket_p.h>
+#include <private/qversionedpacket_p.h>
 #include <private/qqmldebugserviceinterfaces_p.h>
 
 #include <QtQml/qjsengine.h>
@@ -65,6 +65,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using QQmlDebugPacket = QVersionedPacket<QQmlDebugConnector>;
+
 class BreakPoint
 {
 public:
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.cpp
index 4eedb4bd51..f76add448f 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.cpp
@@ -38,11 +38,14 @@
 ****************************************************************************/
 
 #include "qqmlenginecontrolservice.h"
-#include <private/qqmldebugpacket_p.h>
+#include <private/qqmldebugconnector_p.h>
+#include <private/qversionedpacket_p.h>
 #include <QJSEngine>
 
 QT_BEGIN_NAMESPACE
 
+using QQmlDebugPacket = QVersionedPacket<QQmlDebugConnector>;
+
 QQmlEngineControlServiceImpl::QQmlEngineControlServiceImpl(QObject *parent) :
     QQmlEngineControlService(1, parent)
 {
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp
index 551c06ecdd..a688e98b3f 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp
@@ -38,8 +38,8 @@
 ****************************************************************************/
 
 #include "qqmlprofileradapter.h"
+#include "qqmlprofilerservice.h"
 
-#include <private/qqmldebugpacket_p.h>
 #include <private/qqmldebugserviceinterfaces_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
index 22c515adf9..462401a093 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
@@ -43,7 +43,6 @@
 #include "qqmlprofilerservicefactory.h"
 
 #include <private/qjsengine_p.h>
-#include <private/qqmldebugpacket_p.h>
 #include <private/qqmldebugpluginmanager_p.h>
 
 #include <QtCore/qurl.h>
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h
index ce0101f4d4..3791ab29ae 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h
@@ -56,6 +56,8 @@
 #include <private/qqmlprofilerdefinitions_p.h>
 #include <private/qqmlabstractprofileradapter_p.h>
 #include <private/qqmlboundsignal_p.h>
+#include <private/qqmldebugconnector_p.h>
+#include <private/qversionedpacket_p.h>
 
 #include <QtCore/qelapsedtimer.h>
 #include <QtCore/qmetaobject.h>
@@ -70,6 +72,7 @@
 QT_BEGIN_NAMESPACE
 
 class QUrl;
+using QQmlDebugPacket = QVersionedPacket<QQmlDebugConnector>;
 
 class QQmlProfilerServiceImpl :
         public QQmlConfigurableDebugService<QQmlProfilerService>,
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.h b/src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.h
index 49eaa8d2f6..c4ca38d9b0 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.h
+++ b/src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.h
@@ -51,9 +51,10 @@
 // We mean it.
 //
 
+#include "qqmlprofilerservice.h"
+
 #include <private/qv4profiling_p.h>
 #include <private/qqmlabstractprofileradapter_p.h>
-#include <private/qqmldebugpacket_p.h>
 
 #include <QStack>
 #include <QList>
diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.cpp b/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.cpp
index 0879e22239..79a1c82411 100644
--- a/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.cpp
+++ b/src/plugins/qmltooling/qmldbg_quickprofiler/qquickprofileradapter.cpp
@@ -40,12 +40,15 @@
 #include "qquickprofileradapter.h"
 
 #include <QCoreApplication>
-#include <private/qqmldebugpacket_p.h>
+#include <private/qqmldebugconnector_p.h>
+#include <private/qversionedpacket_p.h>
 #include <private/qqmldebugserviceinterfaces_p.h>
 #include <private/qquickprofiler_p.h>
 
 QT_BEGIN_NAMESPACE
 
+using QQmlDebugPacket = QVersionedPacket<QQmlDebugConnector>;
+
 QQuickProfilerAdapter::QQuickProfilerAdapter(QObject *parent) :
     QQmlAbstractProfilerAdapter(parent), next(0)
 {
diff --git a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
index 27b310a0ae..8293e88038 100644
--- a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
+++ b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
@@ -47,7 +47,7 @@
 #include <private/qqmldebugpluginmanager_p.h>
 #include <private/qqmldebugserviceinterfaces_p.h>
 #include <private/qpacketprotocol_p.h>
-#include <private/qqmldebugpacket_p.h>
+#include <private/qversionedpacket_p.h>
 
 #include <QtCore/QAtomicInt>
 #include <QtCore/QDir>
@@ -83,6 +83,7 @@ QT_BEGIN_NAMESPACE
 Q_QML_DEBUG_PLUGIN_LOADER(QQmlDebugServerConnection)
 
 const int protocolVersion = 1;
+using QQmlDebugPacket = QVersionedPacket<QQmlDebugConnector>;
 
 class QQmlDebugServerImpl;
 class QQmlDebugServerThread : public QThread
diff --git a/src/qml/debugger/qqmlprofilerdefinitions_p.h b/src/qml/debugger/qqmlprofilerdefinitions_p.h
index f84a2c44e2..7b972c5d0d 100644
--- a/src/qml/debugger/qqmlprofilerdefinitions_p.h
+++ b/src/qml/debugger/qqmlprofilerdefinitions_p.h
@@ -96,11 +96,6 @@ struct QQmlProfilerDefinitions {
         MaximumRangeType
     };
 
-    enum BindingType {
-        QmlBinding,
-        MaximumBindingType
-    };
-
     enum PixmapEventType {
         PixmapSizeKnown,
         PixmapReferenceCountChanged,
@@ -129,8 +124,6 @@ struct QQmlProfilerDefinitions {
         NumGUIThreadFrameTypes = MaximumSceneGraphFrameType - NumRenderThreadFrameTypes
     };
 
-    typedef QV4::Profiling::MemoryType MemoryType;
-
     enum ProfileFeature {
         ProfileJavaScript,
         ProfileMemory,
@@ -162,26 +155,6 @@ struct QQmlProfilerDefinitions {
 
         MaximumInputEventType
     };
-
-    static ProfileFeature featureFromRangeType(RangeType range)
-    {
-        switch (range) {
-            case Painting:
-                return ProfilePainting;
-            case Compiling:
-                return ProfileCompiling;
-            case Creating:
-                return ProfileCreating;
-            case Binding:
-                return ProfileBinding;
-            case HandlingSignal:
-                return ProfileHandlingSignal;
-            case Javascript:
-                return ProfileJavaScript;
-            default:
-                return MaximumProfileFeature;
-        }
-    }
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmldebug/qmldebug.pro b/src/qmldebug/qmldebug.pro
index 2539414d8f..2c1b71797d 100644
--- a/src/qmldebug/qmldebug.pro
+++ b/src/qmldebug/qmldebug.pro
@@ -1,5 +1,5 @@
 TARGET    =  QtQmlDebug
-QT        =  core-private network packetprotocol-private qml-private
+QT        =  core-private network packetprotocol-private
 CONFIG    += static internal_module
 
 load(qt_module)
@@ -28,4 +28,5 @@ HEADERS += \
     qqmlprofilereventlocation_p.h \
     qqmlprofilereventreceiver_p.h \
     qqmlprofilereventtype_p.h \
-    qqmlprofilertypedevent_p.h
+    qqmlprofilertypedevent_p.h \
+    qqmlprofilerclientdefinitions_p.h
diff --git a/src/qmldebug/qqmlenginecontrolclient.cpp b/src/qmldebug/qqmlenginecontrolclient.cpp
index 8d62fafb94..cdc724ef2f 100644
--- a/src/qmldebug/qqmlenginecontrolclient.cpp
+++ b/src/qmldebug/qqmlenginecontrolclient.cpp
@@ -41,7 +41,6 @@
 #include "qqmlenginecontrolclient_p_p.h"
 #include "qqmldebugconnection_p.h"
 
-#include <private/qqmldebugserviceinterfaces_p.h>
 #include <private/qpacket_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -142,7 +141,7 @@ void QQmlEngineControlClient::messageReceived(const QByteArray &data)
 }
 
 QQmlEngineControlClientPrivate::QQmlEngineControlClientPrivate(QQmlDebugConnection *connection) :
-    QQmlDebugClientPrivate(QQmlEngineControlService::s_key, connection)
+    QQmlDebugClientPrivate(QLatin1String("EngineControl"), connection)
 {
 }
 
diff --git a/src/qmldebug/qqmlprofilerclient.cpp b/src/qmldebug/qqmlprofilerclient.cpp
index 0f3cbb49ee..73db2ad94d 100644
--- a/src/qmldebug/qqmlprofilerclient.cpp
+++ b/src/qmldebug/qqmlprofilerclient.cpp
@@ -39,7 +39,6 @@
 
 #include "qqmlprofilerclient_p_p.h"
 #include "qqmldebugconnection_p.h"
-#include <private/qqmldebugserviceinterfaces_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qmldebug/qqmlprofilerclient_p.h b/src/qmldebug/qqmlprofilerclient_p.h
index 0c867525d2..89c117a8b5 100644
--- a/src/qmldebug/qqmlprofilerclient_p.h
+++ b/src/qmldebug/qqmlprofilerclient_p.h
@@ -43,8 +43,8 @@
 #include "qqmldebugclient_p.h"
 #include "qqmlprofilereventlocation_p.h"
 #include "qqmlprofilereventreceiver_p.h"
+#include "qqmlprofilerclientdefinitions_p.h"
 
-#include <private/qqmlprofilerdefinitions_p.h>
 #include <private/qpacket_p.h>
 
 //
@@ -61,7 +61,7 @@
 QT_BEGIN_NAMESPACE
 
 class QQmlProfilerClientPrivate;
-class QQmlProfilerClient : public QQmlDebugClient, public QQmlProfilerDefinitions
+class QQmlProfilerClient : public QQmlDebugClient
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQmlProfilerClient)
diff --git a/src/qmldebug/qqmlprofilerclient_p_p.h b/src/qmldebug/qqmlprofilerclient_p_p.h
index 99fe47301b..df73209858 100644
--- a/src/qmldebug/qqmlprofilerclient_p_p.h
+++ b/src/qmldebug/qqmlprofilerclient_p_p.h
@@ -45,10 +45,10 @@
 #include "qqmlenginecontrolclient_p.h"
 #include "qqmlprofilerclient_p.h"
 #include "qqmlprofilertypedevent_p.h"
-
-#include <private/qqmlprofilerdefinitions_p.h>
+#include "qqmlprofilerclientdefinitions_p.h"
 
 #include <QtCore/qqueue.h>
+#include <QtCore/qstack.h>
 
 //
 //  W A R N I N G
@@ -63,7 +63,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQmlProfilerClientPrivate : public QQmlDebugClientPrivate, public QQmlProfilerDefinitions {
+class QQmlProfilerClientPrivate : public QQmlDebugClientPrivate {
     Q_DECLARE_PUBLIC(QQmlProfilerClient)
 public:
     QQmlProfilerClientPrivate(QQmlDebugConnection *connection,
diff --git a/src/qmldebug/qqmlprofilerclientdefinitions_p.h b/src/qmldebug/qqmlprofilerclientdefinitions_p.h
new file mode 100644
index 0000000000..c8524574f6
--- /dev/null
+++ b/src/qmldebug/qqmlprofilerclientdefinitions_p.h
@@ -0,0 +1,152 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQMLPROFILERCLIENTDEFINITIONS_P_H
+#define QQMLPROFILERCLIENTDEFINITIONS_P_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+enum Message {
+    Event,
+    RangeStart,
+    RangeData,
+    RangeLocation,
+    RangeEnd,
+    Complete, // end of transmission
+    PixmapCacheEvent,
+    SceneGraphFrame,
+    MemoryAllocation,
+    DebugMessage,
+
+    MaximumMessage
+};
+
+enum EventType {
+    FramePaint,
+    Mouse,
+    Key,
+    AnimationFrame,
+    EndTrace,
+    StartTrace,
+
+    MaximumEventType
+};
+
+enum RangeType {
+    Painting,
+    Compiling,
+    Creating,
+    Binding,            //running a binding
+    HandlingSignal,     //running a signal handler
+    Javascript,
+
+    MaximumRangeType
+};
+
+enum PixmapEventType {
+    PixmapSizeKnown,
+    PixmapReferenceCountChanged,
+    PixmapCacheCountChanged,
+    PixmapLoadingStarted,
+    PixmapLoadingFinished,
+    PixmapLoadingError,
+
+    MaximumPixmapEventType
+};
+
+enum SceneGraphFrameType {
+    SceneGraphRendererFrame,        // Render Thread
+    SceneGraphAdaptationLayerFrame, // Render Thread
+    SceneGraphContextFrame,         // Render Thread
+    SceneGraphRenderLoopFrame,      // Render Thread
+    SceneGraphTexturePrepare,       // Render Thread
+    SceneGraphTextureDeletion,      // Render Thread
+    SceneGraphPolishAndSync,        // GUI Thread
+    SceneGraphWindowsRenderShow,    // Unused
+    SceneGraphWindowsAnimations,    // GUI Thread
+    SceneGraphPolishFrame,          // GUI Thread
+
+    MaximumSceneGraphFrameType,
+    NumRenderThreadFrameTypes = SceneGraphPolishAndSync,
+    NumGUIThreadFrameTypes = MaximumSceneGraphFrameType - NumRenderThreadFrameTypes
+};
+
+enum MemoryType {
+    HeapPage,
+    LargeItem,
+    SmallItem
+};
+
+enum ProfileFeature {
+    ProfileJavaScript,
+    ProfileMemory,
+    ProfilePixmapCache,
+    ProfileSceneGraph,
+    ProfileAnimations,
+    ProfilePainting,
+    ProfileCompiling,
+    ProfileCreating,
+    ProfileBinding,
+    ProfileHandlingSignal,
+    ProfileInputEvents,
+    ProfileDebugMessages,
+
+    MaximumProfileFeature
+};
+
+enum InputEventType {
+    InputKeyPress,
+    InputKeyRelease,
+    InputKeyUnknown,
+
+    InputMousePress,
+    InputMouseRelease,
+    InputMouseMove,
+    InputMouseDoubleClick,
+    InputMouseWheel,
+    InputMouseUnknown,
+
+    MaximumInputEventType
+};
+
+QT_END_NAMESPACE
+
+#endif // QQMLPROFILERCLIENTDEFINITIONS_P_H
diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h
index 49a0c9e347..1e205d8dbb 100644
--- a/src/qmldebug/qqmlprofilerevent_p.h
+++ b/src/qmldebug/qqmlprofilerevent_p.h
@@ -40,7 +40,7 @@
 #ifndef QQMLPROFILEREVENT_P_H
 #define QQMLPROFILEREVENT_P_H
 
-#include <private/qqmlprofilerdefinitions_p.h>
+#include "qqmlprofilerclientdefinitions_p.h"
 
 #include <QtCore/qstring.h>
 #include <QtCore/qbytearray.h>
@@ -63,7 +63,7 @@
 
 QT_BEGIN_NAMESPACE
 
-struct QQmlProfilerEvent : public QQmlProfilerDefinitions {
+struct QQmlProfilerEvent {
     QQmlProfilerEvent() :
         m_timestamp(-1), m_typeIndex(-1), m_dataType(Inline8Bit), m_dataLength(0)
     {}
diff --git a/src/qmldebug/qqmlprofilereventtype.cpp b/src/qmldebug/qqmlprofilereventtype.cpp
index b0aad3fc5b..c92e914d74 100644
--- a/src/qmldebug/qqmlprofilereventtype.cpp
+++ b/src/qmldebug/qqmlprofilereventtype.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "qqmlprofilereventtype_p.h"
+#include "qqmlprofilerclientdefinitions_p.h"
 
 #include <QtCore/qdatastream.h>
 
@@ -49,8 +50,8 @@ QDataStream &operator>>(QDataStream &stream, QQmlProfilerEventType &type)
     quint8 rangeType;
     stream >> type.m_displayName >> type.m_data >> type.m_location >> message >> rangeType
            >> type.m_detailType;
-    type.m_message = static_cast<QQmlProfilerDefinitions::Message>(message);
-    type.m_rangeType = static_cast<QQmlProfilerDefinitions::RangeType>(rangeType);
+    type.m_message = static_cast<Message>(message);
+    type.m_rangeType = static_cast<RangeType>(rangeType);
     return stream;
 }
 
@@ -61,7 +62,7 @@ QDataStream &operator<<(QDataStream &stream, const QQmlProfilerEventType &type)
                   << type.m_detailType;
 }
 
-QQmlProfilerDefinitions::ProfileFeature QQmlProfilerEventType::feature() const
+ProfileFeature QQmlProfilerEventType::feature() const
 {
     switch (m_message) {
     case Event: {
@@ -84,7 +85,24 @@ QQmlProfilerDefinitions::ProfileFeature QQmlProfilerEventType::feature() const
     case DebugMessage:
         return ProfileDebugMessages;
     default:
-        return featureFromRangeType(m_rangeType);
+        break;
+    }
+
+    switch (m_rangeType) {
+        case Painting:
+            return ProfilePainting;
+        case Compiling:
+            return ProfileCompiling;
+        case Creating:
+            return ProfileCreating;
+        case Binding:
+            return ProfileBinding;
+        case HandlingSignal:
+            return ProfileHandlingSignal;
+        case Javascript:
+            return ProfileJavaScript;
+        default:
+            return MaximumProfileFeature;
     }
 }
 
diff --git a/src/qmldebug/qqmlprofilereventtype_p.h b/src/qmldebug/qqmlprofilereventtype_p.h
index 7bd67f9ca8..7189df53ef 100644
--- a/src/qmldebug/qqmlprofilereventtype_p.h
+++ b/src/qmldebug/qqmlprofilereventtype_p.h
@@ -41,8 +41,7 @@
 #define QQMLPROFILEREVENTTYPE_P_H
 
 #include "qqmlprofilereventlocation_p.h"
-
-#include <private/qqmlprofilerdefinitions_p.h>
+#include "qqmlprofilerclientdefinitions_p.h"
 
 #include <QtCore/qstring.h>
 #include <QtCore/qmetatype.h>
@@ -61,7 +60,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQmlProfilerEventType : public QQmlProfilerDefinitions {
+class QQmlProfilerEventType {
 public:
     QQmlProfilerEventType(Message message = MaximumMessage, RangeType rangeType = MaximumRangeType,
                           int detailType = -1,
diff --git a/src/qmldebug/qqmlprofilertypedevent.cpp b/src/qmldebug/qqmlprofilertypedevent.cpp
index 9b00481e17..31a36bd052 100644
--- a/src/qmldebug/qqmlprofilertypedevent.cpp
+++ b/src/qmldebug/qqmlprofilertypedevent.cpp
@@ -38,6 +38,8 @@
 ****************************************************************************/
 
 #include "qqmlprofilertypedevent_p.h"
+#include "qqmlprofilerclientdefinitions_p.h"
+
 #include <QtCore/qvarlengtharray.h>
 
 QT_BEGIN_NAMESPACE
@@ -50,15 +52,15 @@ QDataStream &operator>>(QDataStream &stream, QQmlProfilerTypedEvent &event)
 
     stream >> time >> messageType;
 
-    if (messageType < 0 || messageType > QQmlProfilerDefinitions::MaximumMessage)
-        messageType = QQmlProfilerDefinitions::MaximumMessage;
+    if (messageType < 0 || messageType > MaximumMessage)
+        messageType = MaximumMessage;
 
-    QQmlProfilerDefinitions::RangeType rangeType = QQmlProfilerDefinitions::MaximumRangeType;
+    RangeType rangeType = MaximumRangeType;
     if (!stream.atEnd()) {
         stream >> subtype;
-        rangeType = static_cast<QQmlProfilerDefinitions::RangeType>(subtype);
-        if (rangeType < 0 || rangeType > QQmlProfilerDefinitions::MaximumRangeType)
-            rangeType = QQmlProfilerDefinitions::MaximumRangeType;
+        rangeType = static_cast<RangeType>(subtype);
+        if (rangeType < 0 || rangeType > MaximumRangeType)
+            rangeType = MaximumRangeType;
     } else {
         subtype = -1;
     }
@@ -68,13 +70,13 @@ QDataStream &operator>>(QDataStream &stream, QQmlProfilerTypedEvent &event)
     event.serverTypeId = 0;
 
     switch (messageType) {
-    case QQmlProfilerDefinitions::Event: {
+    case Event: {
         event.type = QQmlProfilerEventType(
-                    static_cast<QQmlProfilerDefinitions::Message>(messageType),
-                    QQmlProfilerDefinitions::MaximumRangeType, subtype);
+                    static_cast<Message>(messageType),
+                    MaximumRangeType, subtype);
         switch (subtype) {
-        case QQmlProfilerDefinitions::StartTrace:
-        case QQmlProfilerDefinitions::EndTrace: {
+        case StartTrace:
+        case EndTrace: {
             QVarLengthArray<qint32> engineIds;
             while (!stream.atEnd()) {
                 qint32 id;
@@ -84,7 +86,7 @@ QDataStream &operator>>(QDataStream &stream, QQmlProfilerTypedEvent &event)
             event.event.setNumbers<QVarLengthArray<qint32>, qint32>(engineIds);
             break;
         }
-        case QQmlProfilerDefinitions::AnimationFrame: {
+        case AnimationFrame: {
             qint32 frameRate, animationCount;
             qint32 threadId;
             stream >> frameRate >> animationCount;
@@ -96,11 +98,9 @@ QDataStream &operator>>(QDataStream &stream, QQmlProfilerTypedEvent &event)
             event.event.setNumbers<qint32>({frameRate, animationCount, threadId});
             break;
         }
-        case QQmlProfilerDefinitions::Mouse:
-        case QQmlProfilerDefinitions::Key:
-            int inputType = (subtype == QQmlProfilerDefinitions::Key
-                             ? QQmlProfilerDefinitions::InputKeyUnknown
-                             : QQmlProfilerDefinitions::InputMouseUnknown);
+        case Mouse:
+        case Key:
+            int inputType = (subtype == Key ? InputKeyUnknown : InputMouseUnknown);
             if (!stream.atEnd())
                 stream >> inputType;
             qint32 a = -1;
@@ -116,13 +116,13 @@ QDataStream &operator>>(QDataStream &stream, QQmlProfilerTypedEvent &event)
 
         break;
     }
-    case QQmlProfilerDefinitions::Complete: {
+    case Complete: {
         event.type = QQmlProfilerEventType(
-                    static_cast<QQmlProfilerDefinitions::Message>(messageType),
-                    QQmlProfilerDefinitions::MaximumRangeType, subtype);
+                    static_cast<Message>(messageType),
+                    MaximumRangeType, subtype);
         break;
     }
-    case QQmlProfilerDefinitions::SceneGraphFrame: {
+    case SceneGraphFrame: {
         QVarLengthArray<qint64> params;
         qint64 param;
 
@@ -132,41 +132,40 @@ QDataStream &operator>>(QDataStream &stream, QQmlProfilerTypedEvent &event)
         }
 
         event.type = QQmlProfilerEventType(
-                    static_cast<QQmlProfilerDefinitions::Message>(messageType),
-                    QQmlProfilerDefinitions::MaximumRangeType, subtype);
+                    static_cast<Message>(messageType),
+                    MaximumRangeType, subtype);
         event.event.setNumbers<QVarLengthArray<qint64>, qint64>(params);
         break;
     }
-    case QQmlProfilerDefinitions::PixmapCacheEvent: {
+    case PixmapCacheEvent: {
         qint32 width = 0, height = 0, refcount = 0;
         QString filename;
         stream >> filename;
-        if (subtype == QQmlProfilerDefinitions::PixmapReferenceCountChanged
-                || subtype == QQmlProfilerDefinitions::PixmapCacheCountChanged) {
+        if (subtype == PixmapReferenceCountChanged || subtype == PixmapCacheCountChanged) {
             stream >> refcount;
-        } else if (subtype == QQmlProfilerDefinitions::PixmapSizeKnown) {
+        } else if (subtype == PixmapSizeKnown) {
             stream >> width >> height;
             refcount = 1;
         }
 
         event.type = QQmlProfilerEventType(
-                    static_cast<QQmlProfilerDefinitions::Message>(messageType),
-                    QQmlProfilerDefinitions::MaximumRangeType, subtype,
+                    static_cast<Message>(messageType),
+                    MaximumRangeType, subtype,
                     QQmlProfilerEventLocation(filename, 0, 0));
         event.event.setNumbers<qint32>({width, height, refcount});
         break;
     }
-    case QQmlProfilerDefinitions::MemoryAllocation: {
+    case MemoryAllocation: {
         qint64 delta;
         stream >> delta;
 
         event.type = QQmlProfilerEventType(
-                    static_cast<QQmlProfilerDefinitions::Message>(messageType),
-                    QQmlProfilerDefinitions::MaximumRangeType, subtype);
+                    static_cast<Message>(messageType),
+                    MaximumRangeType, subtype);
         event.event.setNumbers<qint64>({delta});
         break;
     }
-    case QQmlProfilerDefinitions::RangeStart: {
+    case RangeStart: {
         if (!stream.atEnd()) {
             qint64 typeId;
             stream >> typeId;
@@ -175,22 +174,22 @@ QDataStream &operator>>(QDataStream &stream, QQmlProfilerTypedEvent &event)
             // otherwise it's the old binding type of 4 bytes
         }
 
-        event.type = QQmlProfilerEventType(QQmlProfilerDefinitions::MaximumMessage, rangeType, -1);
-        event.event.setRangeStage(QQmlProfilerDefinitions::RangeStart);
+        event.type = QQmlProfilerEventType(MaximumMessage, rangeType, -1);
+        event.event.setRangeStage(RangeStart);
         break;
     }
-    case QQmlProfilerDefinitions::RangeData: {
+    case RangeData: {
         QString data;
         stream >> data;
 
-        event.type = QQmlProfilerEventType(QQmlProfilerDefinitions::MaximumMessage, rangeType, -1,
+        event.type = QQmlProfilerEventType(MaximumMessage, rangeType, -1,
                                            QQmlProfilerEventLocation(), data);
-        event.event.setRangeStage(QQmlProfilerDefinitions::RangeData);
+        event.event.setRangeStage(RangeData);
         if (!stream.atEnd())
             stream >> event.serverTypeId;
         break;
     }
-    case QQmlProfilerDefinitions::RangeLocation: {
+    case RangeLocation: {
         QString filename;
         qint32 line = 0;
         qint32 column = 0;
@@ -202,21 +201,21 @@ QDataStream &operator>>(QDataStream &stream, QQmlProfilerTypedEvent &event)
                 stream >> event.serverTypeId;
         }
 
-        event.type = QQmlProfilerEventType(QQmlProfilerDefinitions::MaximumMessage, rangeType, -1,
+        event.type = QQmlProfilerEventType(MaximumMessage, rangeType, -1,
                                            QQmlProfilerEventLocation(filename, line, column));
-        event.event.setRangeStage(QQmlProfilerDefinitions::RangeLocation);
+        event.event.setRangeStage(RangeLocation);
         break;
     }
-    case QQmlProfilerDefinitions::RangeEnd: {
-        event.type = QQmlProfilerEventType(QQmlProfilerDefinitions::MaximumMessage, rangeType, -1);
-        event.event.setRangeStage(QQmlProfilerDefinitions::RangeEnd);
+    case RangeEnd: {
+        event.type = QQmlProfilerEventType(MaximumMessage, rangeType, -1);
+        event.event.setRangeStage(RangeEnd);
         break;
     }
     default:
         event.event.setNumbers<char>({});
         event.type = QQmlProfilerEventType(
-                    static_cast<QQmlProfilerDefinitions::Message>(messageType),
-                    QQmlProfilerDefinitions::MaximumRangeType, subtype);
+                    static_cast<Message>(messageType),
+                    MaximumRangeType, subtype);
         break;
     }
 
diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp
index 33becd71ec..60f7efae12 100644
--- a/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@ -538,8 +538,13 @@ FxViewItem *QQuickListViewPrivate::snapItemAt(qreal pos)
         qreal itemTop = item->position();
         if (highlight && itemTop >= pos && item->endPosition() <= pos + highlight->size())
             return item;
-        if (itemTop+item->size()/2 >= pos && itemTop-prevItemSize/2 < pos)
+
+        // Middle of item and spacing (i.e. the middle of the distance between this item and the next
+        qreal halfwayToNextItem = itemTop + (item->size()+spacing) / 2;
+        qreal halfwayToPrevItem = itemTop - (prevItemSize+spacing) / 2;
+        if (halfwayToNextItem >= pos && halfwayToPrevItem < pos)
             snapItem = item;
+
         prevItemSize = item->size();
     }
     return snapItem;
diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
index ba71551302..afe3380494 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
@@ -775,9 +775,7 @@ Renderer::Renderer(QSGDefaultRenderContext *ctx)
     , m_currentClip(nullptr)
     , m_currentClipType(NoClip)
     , m_vertexUploadPool(256)
-#ifdef QSG_SEPARATE_INDEX_BUFFER
     , m_indexUploadPool(64)
-#endif
     , m_vao(nullptr)
     , m_visualizeMode(VisualizeNothing)
 {
@@ -834,12 +832,11 @@ static void qsg_wipeBuffer(Buffer *buffer, QOpenGLFunctions *funcs)
     free(buffer->data);
 }
 
-static void qsg_wipeBatch(Batch *batch, QOpenGLFunctions *funcs)
+static void qsg_wipeBatch(Batch *batch, QOpenGLFunctions *funcs, bool separateIndexBuffer)
 {
     qsg_wipeBuffer(&batch->vbo, funcs);
-#ifdef QSG_SEPARATE_INDEX_BUFFER
-    qsg_wipeBuffer(&batch->ibo, funcs);
-#endif
+    if (separateIndexBuffer)
+        qsg_wipeBuffer(&batch->ibo, funcs);
     delete batch;
 }
 
@@ -847,9 +844,13 @@ Renderer::~Renderer()
 {
     if (QOpenGLContext::currentContext()) {
         // Clean up batches and buffers
-        for (int i=0; i<m_opaqueBatches.size(); ++i) qsg_wipeBatch(m_opaqueBatches.at(i), this);
-        for (int i=0; i<m_alphaBatches.size(); ++i) qsg_wipeBatch(m_alphaBatches.at(i), this);
-        for (int i=0; i<m_batchPool.size(); ++i) qsg_wipeBatch(m_batchPool.at(i), this);
+        const bool separateIndexBuffer = m_context->separateIndexBuffer();
+        for (int i = 0; i < m_opaqueBatches.size(); ++i)
+            qsg_wipeBatch(m_opaqueBatches.at(i), this, separateIndexBuffer);
+        for (int i = 0; i < m_alphaBatches.size(); ++i)
+            qsg_wipeBatch(m_alphaBatches.at(i), this, separateIndexBuffer);
+        for (int i = 0; i < m_batchPool.size(); ++i)
+            qsg_wipeBatch(m_batchPool.at(i), this, separateIndexBuffer);
     }
 
     for (Node *n : qAsConst(m_nodes))
@@ -889,13 +890,8 @@ void Renderer::map(Buffer *buffer, int byteSize, bool isIndexBuf)
     if (!m_context->hasBrokenIndexBufferObjects() && m_visualizeMode == VisualizeNothing) {
         // Common case, use a shared memory pool for uploading vertex data to avoid
         // excessive reevaluation
-        QDataBuffer<char> &pool =
-#ifdef QSG_SEPARATE_INDEX_BUFFER
-                isIndexBuf ? m_indexUploadPool : m_vertexUploadPool;
-#else
-                m_vertexUploadPool;
-        Q_UNUSED(isIndexBuf);
-#endif
+        QDataBuffer<char> &pool = m_context->separateIndexBuffer() && isIndexBuf
+                ? m_indexUploadPool : m_vertexUploadPool;
         if (byteSize > pool.size())
             pool.resize(byteSize);
         buffer->data = pool.data();
@@ -1864,11 +1860,11 @@ void Renderer::uploadBatch(Batch *b)
             ibufferSize = unmergedIndexSize;
         }
 
-#ifdef QSG_SEPARATE_INDEX_BUFFER
-        map(&b->ibo, ibufferSize, true);
-#else
-        bufferSize += ibufferSize;
-#endif
+        const bool separateIndexBuffer = m_context->separateIndexBuffer();
+        if (separateIndexBuffer)
+            map(&b->ibo, ibufferSize, true);
+        else
+            bufferSize += ibufferSize;
         map(&b->vbo, bufferSize);
 
         if (Q_UNLIKELY(debug_upload())) qDebug() << " - batch" << b << " first:" << b->first << " root:"
@@ -1878,22 +1874,17 @@ void Renderer::uploadBatch(Batch *b)
         if (b->merged) {
             char *vertexData = b->vbo.data;
             char *zData = vertexData + b->vertexCount * g->sizeOfVertex();
-#ifdef QSG_SEPARATE_INDEX_BUFFER
-            char *indexData = b->ibo.data;
-#else
-            char *indexData = zData + (m_useDepthBuffer ? b->vertexCount * sizeof(float) : 0);
-#endif
+            char *indexData = separateIndexBuffer
+                    ? b->ibo.data
+                    : zData + (int(m_useDepthBuffer) * b->vertexCount * sizeof(float));
 
             quint16 iOffset = 0;
             e = b->first;
             int verticesInSet = 0;
             int indicesInSet = 0;
             b->drawSets.reset();
-#ifdef QSG_SEPARATE_INDEX_BUFFER
-            int drawSetIndices = 0;
-#else
-            int drawSetIndices = indexData - vertexData;
-#endif
+            int drawSetIndices = separateIndexBuffer ? 0 : indexData - vertexData;
+            const auto indexBase = separateIndexBuffer ? b->ibo.data : b->vbo.data;
             b->drawSets << DrawSet(0, zData - vertexData, drawSetIndices);
             while (e) {
                 verticesInSet  += e->node->geometry()->vertexCount();
@@ -1903,11 +1894,7 @@ void Renderer::uploadBatch(Batch *b)
                         b->drawSets.last().indices += 1 * sizeof(quint16);
                         b->drawSets.last().indexCount -= 2;
                     }
-#ifdef QSG_SEPARATE_INDEX_BUFFER
-                    drawSetIndices = indexData - b->ibo.data;
-#else
-                    drawSetIndices = indexData - b->vbo.data;
-#endif
+                    drawSetIndices = indexData - indexBase;
                     b->drawSets << DrawSet(vertexData - b->vbo.data,
                                            zData - b->vbo.data,
                                            drawSetIndices);
@@ -1927,11 +1914,8 @@ void Renderer::uploadBatch(Batch *b)
             }
         } else {
             char *vboData = b->vbo.data;
-#ifdef QSG_SEPARATE_INDEX_BUFFER
-            char *iboData = b->ibo.data;
-#else
-            char *iboData = vboData + b->vertexCount * g->sizeOfVertex();
-#endif
+            char *iboData = separateIndexBuffer ? b->ibo.data
+                                                : vboData + b->vertexCount * g->sizeOfVertex();
             Element *e = b->first;
             while (e) {
                 QSGGeometry *g = e->node->geometry();
@@ -1979,12 +1963,9 @@ void Renderer::uploadBatch(Batch *b)
             }
 
             if (!b->drawSets.isEmpty()) {
-                const quint16 *id =
-# ifdef QSG_SEPARATE_INDEX_BUFFER
-                    (const quint16 *) (b->ibo.data);
-# else
-                    (const quint16 *) (b->vbo.data + b->drawSets.at(0).indices);
-# endif
+                const quint16 *id = (const quint16 *)(separateIndexBuffer
+                                                      ? b->ibo.data
+                                                      : b->vbo.data + b->drawSets.at(0).indices);
                 {
                     QDebug iDump = qDebug();
                     iDump << "  -- Index Data, count:" << b->indexCount;
@@ -2004,9 +1985,8 @@ void Renderer::uploadBatch(Batch *b)
 #endif // QT_NO_DEBUG_OUTPUT
 
         unmap(&b->vbo);
-#ifdef QSG_SEPARATE_INDEX_BUFFER
-        unmap(&b->ibo, true);
-#endif
+        if (separateIndexBuffer)
+            unmap(&b->ibo, true);
 
         if (Q_UNLIKELY(debug_upload())) qDebug() << "  --- vertex/index buffers unmapped, batch upload completed...";
 
@@ -2299,11 +2279,7 @@ void Renderer::renderMergedBatch(const Batch *batch)
     glBindBuffer(GL_ARRAY_BUFFER, batch->vbo.id);
 
     char *indexBase = nullptr;
-#ifdef QSG_SEPARATE_INDEX_BUFFER
-    const Buffer *indexBuf = &batch->ibo;
-#else
-    const Buffer *indexBuf = &batch->vbo;
-#endif
+    const Buffer *indexBuf = m_context->separateIndexBuffer() ? &batch->ibo : &batch->vbo;
     if (m_context->hasBrokenIndexBufferObjects()) {
         indexBase = indexBuf->data;
         glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
@@ -2395,11 +2371,8 @@ void Renderer::renderUnmergedBatch(const Batch *batch)
 
     glBindBuffer(GL_ARRAY_BUFFER, batch->vbo.id);
     char *indexBase = nullptr;
-#ifdef QSG_SEPARATE_INDEX_BUFFER
-    const Buffer *indexBuf = &batch->ibo;
-#else
-    const Buffer *indexBuf = &batch->vbo;
-#endif
+    const auto separateIndexBuffer = m_context->separateIndexBuffer();
+    const Buffer *indexBuf = separateIndexBuffer ? &batch->ibo : &batch->vbo;
     if (batch->indexCount) {
         if (m_context->hasBrokenIndexBufferObjects()) {
             indexBase = indexBuf->data;
@@ -2428,11 +2401,9 @@ void Renderer::renderUnmergedBatch(const Batch *batch)
     }
 
     int vOffset = 0;
-#ifdef QSG_SEPARATE_INDEX_BUFFER
     char *iOffset = indexBase;
-#else
-    char *iOffset = indexBase + batch->vertexCount * gn->geometry()->sizeOfVertex();
-#endif
+    if (!separateIndexBuffer)
+        iOffset += batch->vertexCount * gn->geometry()->sizeOfVertex();
 
     QMatrix4x4 rootMatrix = batch->root ? qsg_matrixForRoot(batch->root) : QMatrix4x4();
 
@@ -2735,17 +2706,13 @@ void Renderer::render()
     if (Q_UNLIKELY(debug_render())) timeSorting = timer.restart();
 
     int largestVBO = 0;
-#ifdef QSG_SEPARATE_INDEX_BUFFER
     int largestIBO = 0;
-#endif
 
     if (Q_UNLIKELY(debug_upload())) qDebug("Uploading Opaque Batches:");
     for (int i=0; i<m_opaqueBatches.size(); ++i) {
         Batch *b = m_opaqueBatches.at(i);
         largestVBO = qMax(b->vbo.size, largestVBO);
-#ifdef QSG_SEPARATE_INDEX_BUFFER
         largestIBO = qMax(b->ibo.size, largestIBO);
-#endif
         uploadBatch(b);
     }
     if (Q_UNLIKELY(debug_render())) timeUploadOpaque = timer.restart();
@@ -2756,18 +2723,14 @@ void Renderer::render()
         Batch *b = m_alphaBatches.at(i);
         uploadBatch(b);
         largestVBO = qMax(b->vbo.size, largestVBO);
-#ifdef QSG_SEPARATE_INDEX_BUFFER
         largestIBO = qMax(b->ibo.size, largestIBO);
-#endif
     }
     if (Q_UNLIKELY(debug_render())) timeUploadAlpha = timer.restart();
 
     if (largestVBO * 2 < m_vertexUploadPool.size())
         m_vertexUploadPool.resize(largestVBO * 2);
-#ifdef QSG_SEPARATE_INDEX_BUFFER
-    if (largestIBO * 2 < m_indexUploadPool.size())
+    if (m_context->separateIndexBuffer() && largestIBO * 2 < m_indexUploadPool.size())
         m_indexUploadPool.resize(largestIBO * 2);
-#endif
 
     renderBatches();
 
@@ -2978,14 +2941,12 @@ void Renderer::visualizeBatch(Batch *b)
 
     if (b->merged) {
         shader->setUniformValue(shader->matrix, matrix);
+        const auto &dataStart = m_context->separateIndexBuffer() ? b->ibo.data : b->vbo.data;
         for (int ds=0; ds<b->drawSets.size(); ++ds) {
             const DrawSet &set = b->drawSets.at(ds);
             glVertexAttribPointer(a.position, 2, a.type, false, g->sizeOfVertex(), (void *) (qintptr) (set.vertices));
-#ifdef QSG_SEPARATE_INDEX_BUFFER
-            glDrawElements(g->drawingMode(), set.indexCount, GL_UNSIGNED_SHORT, (void *) (qintptr) (b->ibo.data + set.indices));
-#else
-            glDrawElements(g->drawingMode(), set.indexCount, GL_UNSIGNED_SHORT, (void *) (qintptr) (b->vbo.data + set.indices));
-#endif
+            glDrawElements(g->drawingMode(), set.indexCount, GL_UNSIGNED_SHORT,
+                           (void *)(qintptr)(dataStart + set.indices));
         }
     } else {
         Element *e = b->first;
diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
index 918f3ce82c..12b48c1451 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
@@ -433,9 +433,7 @@ struct Batch
     mutable uint uploadedThisFrame : 1; // solely for debugging purposes
 
     Buffer vbo;
-#ifdef QSG_SEPARATE_INDEX_BUFFER
     Buffer ibo;
-#endif
 
     QDataBuffer<DrawSet> drawSets;
 };
@@ -738,9 +736,7 @@ private:
     ClipType m_currentClipType;
 
     QDataBuffer<char> m_vertexUploadPool;
-#ifdef QSG_SEPARATE_INDEX_BUFFER
     QDataBuffer<char> m_indexUploadPool;
-#endif
     // For minimal OpenGL core profile support
     QOpenGLVertexArrayObject *m_vao;
 
@@ -760,10 +756,8 @@ Batch *Renderer::newBatch()
         m_batchPool.resize(size - 1);
     } else {
         b = new Batch();
-        memset(&b->vbo, 0, sizeof(Buffer));
-#ifdef QSG_SEPARATE_INDEX_BUFFER
-        memset(&b->ibo, 0, sizeof(Buffer));
-#endif
+        Q_ASSERT(offsetof(Batch, ibo) == sizeof(Buffer) + offsetof(Batch, vbo));
+        memset(&b->vbo, 0, sizeof(Buffer) * 2); // Clear VBO & IBO
     }
     b->init();
     return b;
diff --git a/src/quick/scenegraph/qsgdefaultrendercontext.cpp b/src/quick/scenegraph/qsgdefaultrendercontext.cpp
index 7882496062..22e97a2dc9 100644
--- a/src/quick/scenegraph/qsgdefaultrendercontext.cpp
+++ b/src/quick/scenegraph/qsgdefaultrendercontext.cpp
@@ -39,6 +39,7 @@
 
 #include "qsgdefaultrendercontext_p.h"
 
+#include <QtGui/QGuiApplication>
 #include <QtGui/QOpenGLFramebufferObject>
 
 #include <QtQuick/private/qsgbatchrenderer_p.h>
@@ -317,6 +318,17 @@ QSGDefaultRenderContext *QSGDefaultRenderContext::from(QOpenGLContext *context)
     return qobject_cast<QSGDefaultRenderContext *>(context->property(QSG_RENDERCONTEXT_PROPERTY).value<QObject *>());
 }
 
+bool QSGDefaultRenderContext::separateIndexBuffer() const
+{
+    // WebGL: A given WebGLBuffer object may only be bound to one of
+    // the ARRAY_BUFFER or ELEMENT_ARRAY_BUFFER target in its
+    // lifetime. An attempt to bind a buffer object to the other
+    // target will generate an INVALID_OPERATION error, and the
+    // current binding will remain untouched.
+    static const bool isWebGL = qGuiApp->platformName().compare(QLatin1String("webgl")) == 0;
+    return isWebGL;
+}
+
 QSGDistanceFieldGlyphCache *QSGDefaultRenderContext::distanceFieldGlyphCache(const QRawFont &font)
 {
     QString key = fontKey(font);
diff --git a/src/quick/scenegraph/qsgdefaultrendercontext_p.h b/src/quick/scenegraph/qsgdefaultrendercontext_p.h
index eb62586a94..57aa4b4c90 100644
--- a/src/quick/scenegraph/qsgdefaultrendercontext_p.h
+++ b/src/quick/scenegraph/qsgdefaultrendercontext_p.h
@@ -95,6 +95,7 @@ public:
 
     bool hasBrokenIndexBufferObjects() const { return m_brokenIBOs; }
     int maxTextureSize() const override { return m_maxTextureSize; }
+    bool separateIndexBuffer() const;
 
 protected:
     static QString fontKey(const QRawFont &font);
@@ -106,8 +107,6 @@ protected:
     bool m_serializedRender;
     bool m_attachToGLContext;
     QSGAtlasTexture::Manager *m_atlasManager;
-
-
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick/scenegraph/scenegraph.pri b/src/quick/scenegraph/scenegraph.pri
index 4fa3e7b6bf..4f98638487 100644
--- a/src/quick/scenegraph/scenegraph.pri
+++ b/src/quick/scenegraph/scenegraph.pri
@@ -1,4 +1,3 @@
-# DEFINES += QSG_SEPARATE_INDEX_BUFFER
 # DEFINES += QSG_DISTANCEFIELD_CACHE_DEBUG
 
 # Core API