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>

12 files changed, 24 insertions, 24 deletions

diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro
index 526417ed..32ecac61 100644
--- a/src/imports/folderlistmodel/folderlistmodel.pro
+++ b/src/imports/folderlistmodel/folderlistmodel.pro
@@ -1,15 +1,15 @@
 TARGET  = qmlfolderlistmodelplugin
-TARGETPATH = QtQuick1/Qt/labs/folderlistmodel
+TARGETPATH = QtDeclarative/Qt/labs/folderlistmodel
 include(../qimportbase.pri)
 
-QT += widgets quick1 script
+QT += widgets declarative script
 
 SOURCES += qdeclarativefolderlistmodel.cpp plugin.cpp
 HEADERS += qdeclarativefolderlistmodel.h
 
 OTHER_FILES += folderlistmodel.json
 
-DESTDIR = $$QT.quick1.imports/$$TARGETPATH
+DESTDIR = $$QT.declarative.imports/$$TARGETPATH
 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
 qmldir.files += $$PWD/qmldir
diff --git a/src/imports/folderlistmodel/plugin.cpp b/src/imports/folderlistmodel/plugin.cpp
index dab7e479..76ec6a65 100644
--- a/src/imports/folderlistmodel/plugin.cpp
+++ b/src/imports/folderlistmodel/plugin.cpp
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 
-#include <QtQuick1/qdeclarativeextensionplugin.h>
-#include <QtQuick1/qdeclarative.h>
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
 
 #include "qdeclarativefolderlistmodel.h"
 
diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro
index 9bc82bf5..918f7a9a 100644
--- a/src/imports/gestures/gestures.pro
+++ b/src/imports/gestures/gestures.pro
@@ -1,15 +1,15 @@
 TARGET  = qmlgesturesplugin
-TARGETPATH = QtQuick1/Qt/labs/gestures
+TARGETPATH = QtDeclarative/Qt/labs/gestures
 include(../qimportbase.pri)
 
-QT += quick1 quick1-private widgets widgets-private gui gui-private core-private script-private
+QT += declarative declarative-private widgets widgets-private gui gui-private core-private script-private
 
 SOURCES += qdeclarativegesturearea.cpp plugin.cpp
 HEADERS += qdeclarativegesturearea_p.h
 
 OTHER_FILES += gestures.json
 
-DESTDIR = $$QT.quick1.imports/$$TARGETPATH
+DESTDIR = $$QT.declarative.imports/$$TARGETPATH
 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
 qmldir.files += $$PWD/qmldir
diff --git a/src/imports/gestures/plugin.cpp b/src/imports/gestures/plugin.cpp
index 2d34f2d0..5c938fe0 100644
--- a/src/imports/gestures/plugin.cpp
+++ b/src/imports/gestures/plugin.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <QtQuick1/qdeclarativeextensionplugin.h>
-#include <QtQuick1/qdeclarative.h>
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
 
 #include "qdeclarativegesturearea_p.h"
 
diff --git a/src/imports/particles/particles.cpp b/src/imports/particles/particles.cpp
index 0f5ee3a6..15f1ca4f 100644
--- a/src/imports/particles/particles.cpp
+++ b/src/imports/particles/particles.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <QtQuick1/qdeclarativeextensionplugin.h>
-#include <QtQuick1/qdeclarative.h>
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
 
 #include "qdeclarativeparticles_p.h"
 
diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro
index b4ce049d..029d6595 100644
--- a/src/imports/particles/particles.pro
+++ b/src/imports/particles/particles.pro
@@ -1,8 +1,8 @@
 TARGET  = qmlparticlesplugin
-TARGETPATH = QtQuick1/Qt/labs/particles
+TARGETPATH = QtDeclarative/Qt/labs/particles
 include(../qimportbase.pri)
 
-QT += quick1 quick1-private core-private gui-private widgets-private
+QT += declarative declarative-private core-private gui-private widgets-private
 
 SOURCES += \
     qdeclarativeparticles.cpp \
@@ -13,7 +13,7 @@ HEADERS += \
 
 OTHER_FILES += particles.json
 
-DESTDIR = $$QT.quick1.imports/$$TARGETPATH
+DESTDIR = $$QT.declarative.imports/$$TARGETPATH
 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
 qmldir.files += $$PWD/qmldir
diff --git a/src/imports/particles/qdeclarativeparticles_p.h b/src/imports/particles/qdeclarativeparticles_p.h
index 69f646c2..fc58ad92 100644
--- a/src/imports/particles/qdeclarativeparticles_p.h
+++ b/src/imports/particles/qdeclarativeparticles_p.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVEPARTICLES_H
 #define QDECLARATIVEPARTICLES_H
 
-#include <QtQuick1/qdeclarativeitem.h>
+#include <QtDeclarative/qdeclarativeitem.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/imports/qimportbase.pri b/src/imports/qimportbase.pri
index 81c737af..b1ecbea4 100644
--- a/src/imports/qimportbase.pri
+++ b/src/imports/qimportbase.pri
@@ -12,7 +12,7 @@ isEmpty(TARGET) {
 
 QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
 copy2build.input = QMLDIRFILE
-copy2build.output = $$QT.quick1.imports/$$TARGETPATH/qmldir
+copy2build.output = $$QT.declarative.imports/$$TARGETPATH/qmldir
 !contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS
 copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
 copy2build.name = COPY ${QMAKE_FILE_IN}
diff --git a/src/imports/shaders/qmlshadersplugin_plugin.cpp b/src/imports/shaders/qmlshadersplugin_plugin.cpp
index 7004550d..eb234bd5 100644
--- a/src/imports/shaders/qmlshadersplugin_plugin.cpp
+++ b/src/imports/shaders/qmlshadersplugin_plugin.cpp
@@ -43,7 +43,7 @@
 #include "shadereffectitem.h"
 #include "shadereffectsource.h"
 
-#include <QtQuick1/qdeclarative.h>
+#include <QtDeclarative/qdeclarative.h>
 
 void qmlshaderspluginPlugin::registerTypes(const char *uri)
 {
diff --git a/src/imports/shaders/qmlshadersplugin_plugin.h b/src/imports/shaders/qmlshadersplugin_plugin.h
index 3b7998a9..ae980e4f 100644
--- a/src/imports/shaders/qmlshadersplugin_plugin.h
+++ b/src/imports/shaders/qmlshadersplugin_plugin.h
@@ -42,7 +42,7 @@
 #ifndef QMLSHADERSPLUGIN_PLUGIN_H
 #define QMLSHADERSPLUGIN_PLUGIN_H
 
-#include <QtQuick1/QDeclarativeExtensionPlugin>
+#include <QtDeclarative/QDeclarativeExtensionPlugin>
 
 class qmlshaderspluginPlugin : public QDeclarativeExtensionPlugin
 {
diff --git a/src/imports/shaders/shaders.pro b/src/imports/shaders/shaders.pro
index ae9cb8b1..16e8e536 100644
--- a/src/imports/shaders/shaders.pro
+++ b/src/imports/shaders/shaders.pro
@@ -1,8 +1,8 @@
 TARGET = qmlshadersplugin
-TARGETPATH = QtQuick1/Qt/labs/shaders
+TARGETPATH = QtDeclarative/Qt/labs/shaders
 include(../qimportbase.pri)
 
-QT += quick1 widgets opengl
+QT += declarative widgets opengl
 
 SOURCES += \
     qmlshadersplugin_plugin.cpp \
@@ -23,7 +23,7 @@ HEADERS += \
 
 OTHER_FILES += shaders.json
 
-DESTDIR = $$QT.quick1.imports/$$TARGETPATH
+DESTDIR = $$QT.declarative.imports/$$TARGETPATH
 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
 qmldir.files += $$PWD/qmldir
diff --git a/src/imports/webview/webview.pro b/src/imports/webview/webview.pro
index 9ed375db..e46d9efe 100644
--- a/src/imports/webview/webview.pro
+++ b/src/imports/webview/webview.pro
@@ -2,14 +2,14 @@ TARGET  = qmlwebkitplugin
 TARGETPATH = QtQuick1/QtWebKit
 include(../qimportbase.pri)
 
-QT += quick1 quick1-private widgets widgets-private gui gui-private core-private script-private webkit
+QT += declarative declarative-private widgets widgets-private gui gui-private core-private script-private webkit
 
 SOURCES += qdeclarativewebview.cpp plugin.cpp
 HEADERS += qdeclarativewebview_p.h
 
 OTHER_FILES += plugin.json
 
-DESTDIR = $$QT.quick1.imports/$$TARGETPATH
+DESTDIR = $$QT.declarative.imports/$$TARGETPATH
 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
 qmldir.files += $$PWD/qmldir