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>

15 files changed, 26 insertions, 26 deletions

diff --git a/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp b/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp
index 0d6bfee3..df6a1be4 100644
--- a/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -54,9 +54,9 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
-#include <QtQuick1/QDeclarativeComponent>
-#include <QtQuick1/QDeclarativeEngine>
-#include <QtQuick1/QDeclarativeContext>
+#include <QtDeclarative/QDeclarativeComponent>
+#include <QtDeclarative/QDeclarativeEngine>
+#include <QtDeclarative/QDeclarativeContext>
 
 #if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
 
diff --git a/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.h b/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.h
index 9d767440..9c1d84a4 100644
--- a/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.h
+++ b/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/qmlapplicationviewer.h
@@ -52,7 +52,7 @@
 #ifndef QMLAPPLICATIONVIEWER_H
 #define QMLAPPLICATIONVIEWER_H
 
-#include <QtQuick1/QDeclarativeView>
+#include <QtDeclarative/QDeclarativeView>
 
 class QmlApplicationViewer : public QDeclarativeView
 {
diff --git a/src/plugins/qdeclarativeview/qdeclarativeview.pro b/src/plugins/qdeclarativeview/qdeclarativeview.pro
index 6b63dfb2..2f8009cb 100644
--- a/src/plugins/qdeclarativeview/qdeclarativeview.pro
+++ b/src/plugins/qdeclarativeview/qdeclarativeview.pro
@@ -1,7 +1,7 @@
 TEMPLATE    = lib
 TARGET      = qdeclarativeview
 CONFIG     += qt warn_on plugin designer
-QT         += quick1 widgets designer
+QT         += declarative widgets designer
 
 DESTDIR = $$QT.designer.plugins/designer
 contains(TEMPLATE, ".*lib"):TARGET = $$qtLibraryTarget($$TARGET)
diff --git a/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp b/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp
index e3eaca64..2b61a9cb 100644
--- a/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp
+++ b/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp
@@ -45,7 +45,7 @@
 #include <QtDesigner/QExtensionManager>
 
 #include <QtCore/qplugin.h>
-#include <QtQuick1/QDeclarativeView>
+#include <QtDeclarative/QDeclarativeView>
 
 static const char toolTipC[] = "QtDeclarative view widget";
 
@@ -79,7 +79,7 @@ QString QDeclarativeViewPlugin::whatsThis() const
 
 QString QDeclarativeViewPlugin::includeFile() const
 {
-    return QStringLiteral("QtQuick1/QDeclarativeView");
+    return QStringLiteral("QtDeclarative/QDeclarativeView");
 }
 
 QIcon QDeclarativeViewPlugin::icon() const
diff --git a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp
index 1386ac4a..9d0cee64 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp
@@ -44,10 +44,10 @@
 #include "abstracttool.h"
 #include "qdeclarativeinspectorprotocol.h"
 
-#include <QtQuick1/QDeclarativeEngine>
-#include <QtQuick1/QDeclarativeComponent>
+#include <QtDeclarative/QDeclarativeEngine>
+#include <QtDeclarative/QDeclarativeComponent>
 #include <QtCore/private/qabstractanimation_p.h>
-#include <QtQuick1/private/qdeclarativeinspectorservice_p.h>
+#include <QtDeclarative/private/qdeclarativeinspectorservice_p.h>
 
 #include <QtGui/QMouseEvent>
 
diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp
index c40e8536..ab1acf0c 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp
@@ -52,8 +52,8 @@
 #include <QtWidgets/QAction>
 #include <QtWidgets/QGraphicsObject>
 
-#include <QtQuick1/QDeclarativeItem>
-#include <QtQuick1/QDeclarativeEngine>
+#include <QtDeclarative/QDeclarativeItem>
+#include <QtDeclarative/QDeclarativeEngine>
 
 #include <QtCore/QDebug>
 
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp
index 31fc1753..b6b6c0ae 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp
@@ -48,7 +48,7 @@
 #include "editor/livelayeritem.h"
 #include "editor/boundingrecthighlighter.h"
 
-#include <QtQuick1/QDeclarativeItem>
+#include <QtDeclarative/QDeclarativeItem>
 #include <QtGui/QMouseEvent>
 
 namespace QmlJSDebugger {
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h
index 4ad457e9..1ac012fb 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h
+++ b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h
@@ -47,7 +47,7 @@
 #include "abstractviewinspector.h"
 
 #include <QtCore/QScopedPointer>
-#include <QtQuick1/QDeclarativeView>
+#include <QtDeclarative/QDeclarativeView>
 
 namespace QmlJSDebugger {
 namespace QtQuick1 {
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h
index 8316c5f1..a0cbdf1f 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h
+++ b/src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h
@@ -45,11 +45,11 @@
 #include "qdeclarativeviewinspector.h"
 
 #include <QtCore/QScopedPointer>
-#include <QtQuick1/QDeclarativeView>
+#include <QtDeclarative/QDeclarativeView>
 #include <QtCore/QPointer>
 #include <QtCore/QPointF>
 
-#include <QtQuick1/private/qdeclarativeinspectorservice_p.h>
+#include <QtDeclarative/private/qdeclarativeinspectorservice_p.h>
 
 namespace QmlJSDebugger {
 namespace QtQuick1 {
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
index 9e62390e..46ba748b 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
+++ b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
@@ -1,9 +1,9 @@
 TARGET = qmldbg_inspector
-QT       += quick1 quick1-private gui widgets core-private
+QT       += declarative declarative-private gui widgets core-private
 
 load(qt_plugin)
 
-DESTDIR  = $$QT.quick1.plugins/qmltooling
+DESTDIR  = $$QT.declarative.plugins/qmltooling
 
 INCLUDEPATH *= $$PWD
 
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmlinspectorconstants.h b/src/plugins/qmltooling/qmldbg_inspector/qmlinspectorconstants.h
index 02e4f904..f65e70a7 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qmlinspectorconstants.h
+++ b/src/plugins/qmltooling/qmldbg_inspector/qmlinspectorconstants.h
@@ -42,7 +42,7 @@
 #ifndef QMLINSPECTORCONSTANTS_H
 #define QMLINSPECTORCONSTANTS_H
 
-#include <QtQuick1/private/qdeclarativeglobal_p.h>
+#include <QtDeclarative/private/qdeclarativeglobal_p.h>
 
 namespace QmlJSDebugger {
 namespace Constants {
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.cpp b/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.cpp
index bb81aa4f..edd91d2f 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.cpp
@@ -43,8 +43,8 @@
 #include "qdeclarativeviewinspector.h"
 
 #include <QtCore/qplugin.h>
-#include <QtQuick1/private/qdeclarativeinspectorservice_p.h>
-#include <QtQuick1/qdeclarativeview.h>
+#include <QtDeclarative/private/qdeclarativeinspectorservice_p.h>
+#include <QtDeclarative/qdeclarativeview.h>
 
 namespace QmlJSDebugger {
 namespace QtQuick1 {
diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.h b/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.h
index 2e751af2..69d1d628 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.h
+++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1plugin.h
@@ -43,7 +43,7 @@
 #define QDECLARATIVEINSPECTORPLUGIN_H
 
 #include <QtCore/QPointer>
-#include <QtQuick1/private/qdeclarativeinspectorinterface_p.h>
+#include <QtDeclarative/private/qdeclarativeinspectorinterface_p.h>
 
 namespace QmlJSDebugger {
 
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 a479cf93..b6857be6 100644
--- a/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro
+++ b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro
@@ -1,9 +1,9 @@
-TARGET = qmldbg_tcp_qtquick1
-QT       += quick1 quick1-private network
+TARGET = qmldbg_tcp_qtdeclarative
+QT       += declarative declarative-private network
 
 load(qt_plugin)
 
-DESTDIR  = $$QT.quick1.plugins/qmltooling
+DESTDIR  = $$QT.declarative.plugins/qmltooling
 
 SOURCES += \
     qtcpserverconnection.cpp
diff --git a/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qtcpserverconnection.h b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qtcpserverconnection.h
index 14480714..b5798e4e 100644
--- a/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qtcpserverconnection.h
+++ b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qtcpserverconnection.h
@@ -42,7 +42,7 @@
 #ifndef QTCPSERVERCONNECTION_H
 #define QTCPSERVERCONNECTION_H
 
-#include <QtQuick1/private/qdeclarativedebugserverconnection_p.h>
+#include <QtDeclarative/private/qdeclarativedebugserverconnection_p.h>
 
 QT_BEGIN_NAMESPACE