From 79fed8757e26f946745eec9d8bba8b91aeb1a742 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint 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 Reviewed-by: Friedemann Kleint Reviewed-by: Lars Knoll --- src/declarative/qml/qdeclarativebinding_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/declarative/qml/qdeclarativebinding_p.h') diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h index 88ac5ae0..ef64e536 100644 --- a/src/declarative/qml/qdeclarativebinding_p.h +++ b/src/declarative/qml/qdeclarativebinding_p.h @@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeAbstractBinding +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeAbstractBinding { public: typedef QWeakPointer Pointer; @@ -143,7 +143,7 @@ private: class QDeclarativeContext; class QDeclarativeBindingPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeBinding : public QDeclarativeExpression, public QDeclarativeAbstractBinding +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeBinding : public QDeclarativeExpression, public QDeclarativeAbstractBinding { Q_OBJECT public: -- cgit v1.2.3