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>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index 7c3d38f1..be3978aa 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -1,9 +1,9 @@
-TARGET     = QtQuick1
+TARGET     = QtDeclarative
 QT         = core-private gui-private widgets-private script-private
 !isEmpty(QT.xmlpatterns.name): QT_PRIVATE = xmlpatterns
 else: DEFINES += QT_NO_XMLPATTERNS
 
-MODULE=quick1
+MODULE=declarative
 load(qt_module)
 
 DEFINES   += QT_NO_URL_CAST_FROM_STRING
@@ -23,8 +23,8 @@ include(graphicsitems/graphicsitems.pri)
 include(debugger/debugger.pri)
 
 HEADERS += \
-    qtquick1global.h \
-    qtquick1global_p.h
+    qtdeclarativeglobal.h \
+    qtdeclarativeglobal_p.h
 
 linux-g++-maemo:DEFINES += QDECLARATIVEVIEW_NOBACKGROUND