Move exports conflicting with QtQml into namespace

Move exported qml* symbols that conflict with QtQml into an - automatically
imported - namespace. This ensures apps can link against both
QtDeclarative and QtQml.

To keep the BC promise the old symbols are still exported.

Task-number: QTBUG-29584
Change-Id: Icf4e586fee51d2bd82125398e2bb96d6dd355cc5
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

1 files changed, 17 insertions, 8 deletions

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