From 79fed8757e26f946745eec9d8bba8b91aeb1a742 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Mon, 15 Oct 2012 15:58:44 +0200
Subject: Rename the QtQuick1 module back to QtDeclarative

Matches the name that this code used to have in Qt 4.

- Adapt library, change import path to 'QtDeclarative'.
- Update the tests and examples to match the new library name.
- Rename qtquick1global{_p}.h to qtdeclarativeglobal.h.
- Change exports back to Q_DECLARATIVE_[PRIVATE_]EXPORT, like
  it was in Qt 4 and matching the library name again. This also
  changes the include guards in qtdeclarativeglobal{,_p}.h.
- Fix occurrence of quick_debug in tools/qml/qml.pro.

Change-Id: Ibb1fb2e503f90943a2125e4ac3cc4eca3369ca3f
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 src/declarative/qml/qdeclarative.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/declarative/qml/qdeclarative.h')

diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h
index 5b3cc5b3..64bec11d 100644
--- a/src/declarative/qml/qdeclarative.h
+++ b/src/declarative/qml/qdeclarative.h
@@ -42,11 +42,11 @@
 #ifndef QDECLARATIVE_H
 #define QDECLARATIVE_H
 
-#include <QtQuick1/qdeclarativeprivate.h>
-#include <QtQuick1/qdeclarativeparserstatus.h>
-#include <QtQuick1/qdeclarativepropertyvaluesource.h>
-#include <QtQuick1/qdeclarativepropertyvalueinterceptor.h>
-#include <QtQuick1/qdeclarativelist.h>
+#include <QtDeclarative/qdeclarativeprivate.h>
+#include <QtDeclarative/qdeclarativeparserstatus.h>
+#include <QtDeclarative/qdeclarativepropertyvaluesource.h>
+#include <QtDeclarative/qdeclarativepropertyvalueinterceptor.h>
+#include <QtDeclarative/qdeclarativelist.h>
 
 #include <QtCore/qbytearray.h>
 #include <QtCore/qmetaobject.h>
@@ -392,11 +392,11 @@ int qmlRegisterCustomType(const char *uri, int versionMajor, int versionMinor,
 
 class QDeclarativeContext;
 class QDeclarativeEngine;
-Q_QUICK1_EXPORT void qmlExecuteDeferred(QObject *);
-Q_QUICK1_EXPORT QDeclarativeContext *qmlContext(const QObject *);
-Q_QUICK1_EXPORT QDeclarativeEngine *qmlEngine(const QObject *);
-Q_QUICK1_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true);
-Q_QUICK1_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *, const QMetaObject *, bool create);
+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);
 
 template<typename T>
 QObject *qmlAttachedPropertiesObject(const QObject *obj, bool create = true)
-- 
cgit v1.2.3