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

Conflicts:
	src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
	src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp
	src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
	src/qml/qml/qqmlimport.cpp
	src/quick/items/context2d/qquickcontext2dtexture_p.h
	tools/qmleasing/splineeditor.h

Change-Id: I8f6630fcac243824350986c8e9f4bd6483bf20b5

1 files changed, 3 insertions, 2 deletions

diff --git a/src/quick/qtquick2.cpp b/src/quick/qtquick2.cpp
index 4028c63da5..c6b89fabd3 100644
--- a/src/quick/qtquick2.cpp
+++ b/src/quick/qtquick2.cpp
@@ -130,6 +130,7 @@ void QQmlQtQuick2DebugStatesDelegate::updateBinding(QQmlContext *context,
                                                             const QString &fileName, int line, int column,
                                                             bool *inBaseState)
 {
+    Q_UNUSED(column);
     typedef QPointer<QQuickState> QuickStatePointer;
     QObject *object = property.object();
     QString propertyName = property.name();
@@ -144,7 +145,7 @@ void QQmlQtQuick2DebugStatesDelegate::updateBinding(QQmlContext *context,
                     newBinding = QQmlBinding::create(&QQmlPropertyPrivate::get(property)->core,
                                                      expression.toString(), object,
                                                      QQmlContextData::get(context), fileName,
-                                                     line, column);
+                                                     line);
                     newBinding->setTarget(property);
                 }
 
@@ -196,7 +197,7 @@ void QQmlQtQuick2Module::defineModule()
 
     QQuickValueTypes::registerValueTypes();
 
-#ifndef QT_NO_ACCESSIBILITY
+#if QT_CONFIG(accessibility)
     QAccessible::installFactory(&qQuickAccessibleFactory);
 #endif