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>

18 files changed, 27 insertions, 27 deletions

diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro
index 18bb86e8..73fe8dcb 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 CONFIG += plugin
 SOURCES = plugin.cpp
-QT = core quick1
+QT = core declarative
 DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType.2.1
 
 include(../qmldir_copier.pri)
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp
index cdbd2d2c..dbd209ba 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QStringList>
-#include <QtQuick1/qdeclarativeextensionplugin.h>
-#include <QtQuick1/qdeclarative.h>
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
 #include <QDebug>
 
 class MyPluginType : public QObject
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro
index b541feec..ee453f63 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 CONFIG += plugin
 SOURCES = plugin.cpp
-QT = core quick1
+QT = core declarative
 DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType.2
 
 include(../qmldir_copier.pri)
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp
index 4ed053b2..8d06d49f 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QStringList>
-#include <QtQuick1/qdeclarativeextensionplugin.h>
-#include <QtQuick1/qdeclarative.h>
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
 #include <QDebug>
 
 class MyPluginType : public QObject
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp
index 801f056a..c6ca8777 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QStringList>
-#include <QtQuick1/qdeclarativeextensionplugin.h>
-#include <QtQuick1/qdeclarative.h>
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
 #include <QDebug>
 
 class MyPluginType : public QObject
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro
index b4b04f3f..15e71ee8 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin/plugin.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 CONFIG += plugin
 SOURCES = plugin.cpp
-QT = core quick1
+QT = core declarative
 DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType
 
 include(../qmldir_copier.pri)
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp
index 4d41b145..f62e89e3 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QStringList>
-#include <QtQuick1/qdeclarativeextensionplugin.h>
-#include <QtQuick1/qdeclarative.h>
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
 #include <QDebug>
 
 class BarPluginType : public QObject
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro
index ff373856..9e5d8a1f 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 CONFIG += plugin
 SOURCES = plugin.cpp
-QT = core quick1
+QT = core declarative
 DESTDIR = ../imports/com/nokia/AutoTestQmlMixedPluginType
 
 include(../qmldir_copier.pri)
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp
index 206386f7..c51d73e1 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QStringList>
-#include <QtQuick1/qdeclarativeextensionplugin.h>
-#include <QtQuick1/qdeclarative.h>
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
 #include <QDebug>
 
 class FloorPluginType : public QObject
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro
index 60d20baa..a688df46 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 CONFIG += plugin
 SOURCES = plugin.cpp
-QT = core quick1
+QT = core declarative
 DESTDIR = ../imports/com/nokia/AutoTestQmlVersionPluginType
 
 include(../qmldir_copier.pri)
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp
index 1c00bc0e..ab7fab26 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QStringList>
-#include <QtQuick1/qdeclarativeextensionplugin.h>
-#include <QtQuick1/qdeclarative.h>
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
 #include <QDebug>
 
 class MyPlugin : public QDeclarativeExtensionPlugin
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro
index d0b71171..57e22835 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 CONFIG += plugin
 SOURCES = plugin.cpp
-QT = core quick1
+QT = core declarative
 DESTDIR = ../imports/com/nokia/AutoTestPluginWithQmlFile
 
 include(../qmldir_copier.pri)
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp
index f405ad2e..8c48d085 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/plugin.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QStringList>
-#include <QtQuick1/qdeclarativeextensionplugin.h>
-#include <QtQuick1/qdeclarative.h>
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
 #include <QDebug>
 
 class MyPluginType : public QObject
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro
index 9be54cc8..202d4903 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWrongCase/pluginWrongCase.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 CONFIG += plugin
 SOURCES = plugin.cpp
-QT = core quick1
+QT = core declarative
 TARGET = Plugin
 DESTDIR = ../imports/com/nokia/WrongCase
 
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/plugin.cpp
index 3c4dba7c..3f7d9f56 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/plugin.cpp
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/plugin.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 #include <QStringList>
-#include <QtQuick1/qdeclarativeextensionplugin.h>
-#include <QtQuick1/qdeclarative.h>
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
 #include <QDebug>
 
 // Note: this plugin is unused!
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/pureQml.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/pureQml.pro
index 021e8cc7..f5400602 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/pureQml.pro
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/pureQml/pureQml.pro
@@ -1,7 +1,7 @@
 TEMPLATE = lib
 CONFIG += plugin
 SOURCES = plugin.cpp
-QT = core quick1
+QT = core declarative
 DESTDIR = ../imports/com/nokia/PureQmlModule
 
 include(../qmldir_copier.pri)
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
index 8c91b29c..b357eea6 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
@@ -41,8 +41,8 @@
 #include <qtest.h>
 #include <qdeclarativedatatest.h>
 #include <qdir.h>
-#include <QtQuick1/qdeclarativeengine.h>
-#include <QtQuick1/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
 #include <QDebug>
 #include <QtCore/qlibraryinfo.h>
 
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro
index aa0355c0..ef95c170 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 TARGET = tst_qdeclarativemoduleplugin
 
-QT += quick1 network testlib
+QT += declarative network testlib
 CONFIG -= app_bundle
 
 HEADERS = ../shared/testhttpserver.h