From 79fed8757e26f946745eec9d8bba8b91aeb1a742 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
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 <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 tests/auto/declarative/qdeclarativedebugjs/app/app.pro            | 2 +-
 tests/auto/declarative/qdeclarativedebugjs/app/main.cpp           | 2 +-
 .../declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp   | 8 ++++----
 .../declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'tests/auto/declarative/qdeclarativedebugjs')

diff --git a/tests/auto/declarative/qdeclarativedebugjs/app/app.pro b/tests/auto/declarative/qdeclarativedebugjs/app/app.pro
index 157328d9..82336dc0 100644
--- a/tests/auto/declarative/qdeclarativedebugjs/app/app.pro
+++ b/tests/auto/declarative/qdeclarativedebugjs/app/app.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 
-QT += quick1 quick1-private gui widgets
+QT += declarative declarative-private gui widgets
 CONFIG += declarative_debug
 
 CONFIG += console
diff --git a/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp b/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp
index d462b811..40d7bc13 100644
--- a/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp
+++ b/tests/auto/declarative/qdeclarativedebugjs/app/main.cpp
@@ -44,7 +44,7 @@
 #include <QDeclarativeComponent>
 #include <QDeclarativeEngine>
 #include <QStringList>
-#include <QtQuick1/private/qdeclarativedebugservice_p.h>
+#include <QtDeclarative/private/qdeclarativedebugservice_p.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp
index 7325be4f..6c1197bc 100644
--- a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp
+++ b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp
@@ -41,10 +41,10 @@
 
 #include <qtest.h>
 #include <qdeclarativedatatest.h>
-#include <QtQuick1/QDeclarativeEngine>
-#include <QtQuick1/private/qdeclarativedebugclient_p.h>
-#include <QtQuick1/private/qdeclarativedebugservice_p.h>
-#include <QtQuick1/private/qjsdebuggeragent_p.h>
+#include <QtDeclarative/QDeclarativeEngine>
+#include <QtDeclarative/private/qdeclarativedebugclient_p.h>
+#include <QtDeclarative/private/qdeclarativedebugservice_p.h>
+#include <QtDeclarative/private/qjsdebuggeragent_p.h>
 #include <QtCore/QFileInfo>
 #include <QtCore/QDir>
 #include <QtCore/QProcess>
diff --git a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro
index 6f8a8577..4f972747 100644
--- a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro
+++ b/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.pro
@@ -3,7 +3,7 @@ testcase.timeout = 600 # this test is slow
 TARGET = tst_qdeclarativedebugjs
 
 QT += testlib
-contains(QT_CONFIG,quick1): QT += quick1 quick1-private network script core-private gui-private widgets-private
+contains(QT_CONFIG,declarative): QT += declarative declarative-private network script core-private gui-private widgets-private
 macx:CONFIG -= app_bundle
 
 HEADERS += ../shared/debugutil_p.h
-- 
cgit v1.2.3