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

Change-Id: I03cb83e49d476283280ebb5963a513d109d224c8

9 files changed, 102 insertions, 18 deletions

diff --git a/src/declarative/debugger/qdeclarativedebugserver.cpp b/src/declarative/debugger/qdeclarativedebugserver.cpp
index 652a805c..a65c50b7 100644
--- a/src/declarative/debugger/qdeclarativedebugserver.cpp
+++ b/src/declarative/debugger/qdeclarativedebugserver.cpp
@@ -126,7 +126,7 @@ QDeclarativeDebugServerConnection *QDeclarativeDebugServerPrivate::loadConnectio
     QStringList pluginCandidates;
     const QStringList paths = QCoreApplication::libraryPaths();
     foreach (const QString &libPath, paths) {
-        const QDir dir(libPath + QLatin1String("/qmltooling"));
+        const QDir dir(libPath + QLatin1String("/qml1tooling"));
         if (dir.exists()) {
             QStringList plugins(dir.entryList(QDir::Files));
             foreach (const QString &pluginPath, plugins) {
diff --git a/src/declarative/debugger/qdeclarativeinspectorservice.cpp b/src/declarative/debugger/qdeclarativeinspectorservice.cpp
index 44d4e877..c817c39e 100644
--- a/src/declarative/debugger/qdeclarativeinspectorservice.cpp
+++ b/src/declarative/debugger/qdeclarativeinspectorservice.cpp
@@ -124,7 +124,7 @@ QDeclarativeInspectorInterface *QDeclarativeInspectorService::loadInspectorPlugi
     QStringList pluginCandidates;
     const QStringList paths = QCoreApplication::libraryPaths();
     foreach (const QString &libPath, paths) {
-        const QDir dir(libPath + QLatin1String("/qmltooling"));
+        const QDir dir(libPath + QLatin1String("/qml1tooling"));
         if (dir.exists())
             foreach (const QString &pluginPath, dir.entryList(QDir::Files))
                 pluginCandidates << dir.absoluteFilePath(pluginPath);
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index c5741c2b..7a8a32f1 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -4,6 +4,10 @@ qtHaveModule(xmlpatterns): QT_PRIVATE = xmlpatterns
 else: DEFINES += QT_NO_XMLPATTERNS
 
 MODULE=declarative
+
+ANDROID_BUNDLED_FILES = \
+    imports
+
 load(qt_module)
 
 DEFINES   += QT_NO_URL_CAST_FROM_STRING
diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h
index dd08105e..95cef935 100644
--- a/src/declarative/qml/qdeclarative.h
+++ b/src/declarative/qml/qdeclarative.h
@@ -404,11 +404,18 @@ inline int qmlRegisterType(const QUrl &url, const char *uri, int versionMajor, i
 
 class QDeclarativeContext;
 class QDeclarativeEngine;
-Q_DECLARATIVE_EXPORT void qmlExecuteDeferred(QObject *);
-Q_DECLARATIVE_EXPORT QDeclarativeContext *qmlContext(const QObject *);
-Q_DECLARATIVE_EXPORT QDeclarativeEngine *qmlEngine(const QObject *);
-Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true);
-Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *, const QMetaObject *, bool create);
+
+namespace QtDeclarative {
+    // declared in namespace to avoid symbol conflicts with QtQml
+    Q_DECLARATIVE_EXPORT void qmlExecuteDeferred(QObject *);
+    Q_DECLARATIVE_EXPORT QDeclarativeContext *qmlContext(const QObject *);
+    Q_DECLARATIVE_EXPORT QDeclarativeEngine *qmlEngine(const QObject *);
+    Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *,
+                                                                  bool create = true);
+    Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *,
+                                                              const QMetaObject *, bool create);
+}
+using namespace QtDeclarative;
 
 template<typename T>
 QObject *qmlAttachedPropertiesObject(const QObject *obj, bool create = true)
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 691fb713..fe33cc3d 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -1020,6 +1020,8 @@ QDeclarativeEngine::ObjectOwnership QDeclarativeEngine::objectOwnership(QObject
         return ddata->indestructible?CppOwnership:JavaScriptOwnership;
 }
 
+namespace QtDeclarative {
+
 void qmlExecuteDeferred(QObject *object)
 {
     QDeclarativeData *data = QDeclarativeData::get(object);
@@ -1088,9 +1090,45 @@ QObject *qmlAttachedPropertiesObject(int *idCache, const QObject *object,
     if (*idCache == -1 || !object)
         return 0;
 
-    return qmlAttachedPropertiesObjectById(*idCache, object, create);
+    return QtDeclarative::qmlAttachedPropertiesObjectById(*idCache, object, create);
+}
+
+} // namespace QtDeclarative
+
+#if QT_DEPRECATED_SINCE(5, 1)
+
+// Also define symbols outside namespace to keep binary compatibility with 5.0
+
+Q_DECLARATIVE_EXPORT void qmlExecuteDeferred(QObject *obj)
+{
+    QtDeclarative::qmlExecuteDeferred(obj);
+}
+
+Q_DECLARATIVE_EXPORT QDeclarativeContext *qmlContext(const QObject *obj)
+{
+    return QtDeclarative::qmlContext(obj);
+}
+
+Q_DECLARATIVE_EXPORT QDeclarativeEngine *qmlEngine(const QObject *obj)
+{
+    return QtDeclarative::qmlEngine(obj);
+}
+
+Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObjectById(int id, const QObject * obj,
+                                                              bool create)
+{
+    return QtDeclarative::qmlAttachedPropertiesObjectById(id, obj, create);
 }
 
+Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObject(int *idCache, const QObject *object,
+                                                          const QMetaObject *attachedMetaObject,
+                                                          bool create)
+{
+    return QtDeclarative::qmlAttachedPropertiesObject(idCache, object, attachedMetaObject, create);
+}
+
+#endif // QT_DEPRECATED_SINCE(5, 1)
+
 QDeclarativeDebuggingEnabler::QDeclarativeDebuggingEnabler()
 {
 #ifndef QDECLARATIVE_NO_DEBUG_PROTOCOL
diff --git a/src/declarative/qml/qdeclarativeinfo.cpp b/src/declarative/qml/qdeclarativeinfo.cpp
index 30c89d8e..960cc352 100644
--- a/src/declarative/qml/qdeclarativeinfo.cpp
+++ b/src/declarative/qml/qdeclarativeinfo.cpp
@@ -152,6 +152,8 @@ QDeclarativeInfo::~QDeclarativeInfo()
     }
 }
 
+namespace QtDeclarative {
+
 QDeclarativeInfo qmlInfo(const QObject *me)
 {
     QDeclarativeInfoPrivate *d = new QDeclarativeInfoPrivate;
@@ -175,5 +177,29 @@ QDeclarativeInfo qmlInfo(const QObject *me, const QList<QDeclarativeError> &erro
     return QDeclarativeInfo(d);
 }
 
+} // namespace QtDeclarative
+
+#if QT_DEPRECATED_SINCE(5, 1)
+
+// Also define symbols outside namespace to keep binary compatibility with 5.0
+
+Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me)
+{
+    return QtDeclarative::qmlInfo(me);
+}
+
+Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me,
+                                              const QDeclarativeError &error)
+{
+    return QtDeclarative::qmlInfo(me, error);
+}
+
+Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me,
+                                              const QList<QDeclarativeError> &errors)
+{
+    return QtDeclarative::qmlInfo(me, errors);
+}
+
+#endif // QT_DEPRECATED_SINCE(5, 1)
 
 QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeinfo.h b/src/declarative/qml/qdeclarativeinfo.h
index 7b23a341..2db5d960 100644
--- a/src/declarative/qml/qdeclarativeinfo.h
+++ b/src/declarative/qml/qdeclarativeinfo.h
@@ -50,6 +50,18 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
+class QDeclarativeInfo;
+
+namespace QtDeclarative {
+    // declared in namespace to avoid symbol conflicts with QtQml
+    Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me);
+    Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me,
+                                                  const QDeclarativeError &error);
+    Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me,
+                                                  const QList<QDeclarativeError> &errors);
+}
+using namespace QtDeclarative;
+
 class QDeclarativeInfoPrivate;
 class Q_DECLARATIVE_EXPORT QDeclarativeInfo : public QDebug
 {
@@ -83,18 +95,15 @@ public:
 #endif
 
 private:
-    friend Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me);
-    friend Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error);
-    friend Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList<QDeclarativeError> &errors);
-
+    friend Q_DECLARATIVE_EXPORT QDeclarativeInfo QtDeclarative::qmlInfo(const QObject *me);
+    friend Q_DECLARATIVE_EXPORT QDeclarativeInfo QtDeclarative::qmlInfo(const QObject *me,
+                                                                        const QDeclarativeError &error);
+    friend Q_DECLARATIVE_EXPORT QDeclarativeInfo QtDeclarative::qmlInfo(const QObject *me,
+                                                                        const QList<QDeclarativeError> &errors);
     QDeclarativeInfo(QDeclarativeInfoPrivate *);
     QDeclarativeInfoPrivate *d;
 };
 
-Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me);
-Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error);
-Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList<QDeclarativeError> &errors);
-
 QT_END_NAMESPACE
 
 #endif // QDECLARATIVEINFO_H
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
index 9aca1d87..09b993b5 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
+++ b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
@@ -1,7 +1,7 @@
 TARGET = qmldbg_inspector
 QT       += declarative declarative-private gui widgets core-private
 
-PLUGIN_TYPE = qmltooling
+PLUGIN_TYPE = qml1tooling
 PLUGIN_CLASS_NAME = QtQuick1Plugin
 load(qt_plugin)
 
diff --git a/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro
index ca21b389..20ced897 100644
--- a/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro
+++ b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro
@@ -1,7 +1,7 @@
 TARGET = qmldbg_tcp_qtdeclarative
 QT       += declarative declarative-private network
 
-PLUGIN_TYPE = qmltooling
+PLUGIN_TYPE = qml1tooling
 PLUGIN_CLASS_NAME = QTcpServerConnection
 load(qt_plugin)