Replace qtquick with qtdeclarative

27 files changed, 202 insertions, 202 deletions

diff --git a/files/qtdeclarative.pro b/files/qtdeclarative.pro
new file mode 100644
index 0000000..acffb01
--- /dev/null
+++ b/files/qtdeclarative.pro
@@ -0,0 +1,28 @@
+TEMPLATE = subdirs
+
+module_qtdeclarative_src.subdir = src
+module_qtdeclarative_src.target = module-qtdeclarative-src
+
+module_qtdeclarative_tools.subdir = tools
+module_qtdeclarative_tools.target = module-qtdeclarative-tools
+module_qtdeclarative_tools.depends = module_qtdeclarative_src
+
+module_qtdeclarative_demos.subdir = demos
+module_qtdeclarative_demos.target = module-qtdeclarative-demos
+module_qtdeclarative_demos.depends = module_qtdeclarative_src
+
+module_qtdeclarative_examples.subdir = examples/declarative
+module_qtdeclarative_examples.target = module-qtdeclarative-examples
+module_qtdeclarative_examples.depends = module_qtdeclarative_src
+
+module_qtdeclarative_tests.subdir = tests
+module_qtdeclarative_tests.target = module-qtdeclarative-tests
+module_qtdeclarative_tests.depends = module_qtdeclarative_src
+module_qtdeclarative_tests.CONFIG = no_default_target no_default_install
+
+
+SUBDIRS += module_qtdeclarative_src \
+           module_qtdeclarative_tools \
+           module_qtdeclarative_demos \
+           module_qtdeclarative_examples \
+           module_qtdeclarative_tests \
diff --git a/files/qtquick.pro b/files/qtquick.pro
deleted file mode 100644
index fc418d9..0000000
--- a/files/qtquick.pro
+++ /dev/null
@@ -1,28 +0,0 @@
-TEMPLATE = subdirs
-
-module_qtquick_src.subdir = src
-module_qtquick_src.target = module-qtquick-src
-
-module_qtquick_tools.subdir = tools
-module_qtquick_tools.target = module-qtquick-tools
-module_qtquick_tools.depends = module_qtquick_src
-
-module_qtquick_demos.subdir = demos
-module_qtquick_demos.target = module-qtquick-demos
-module_qtquick_demos.depends = module_qtquick_src
-
-module_qtquick_examples.subdir = examples/declarative
-module_qtquick_examples.target = module-qtquick-examples
-module_qtquick_examples.depends = module_qtquick_src
-
-module_qtquick_tests.subdir = tests
-module_qtquick_tests.target = module-qtquick-tests
-module_qtquick_tests.depends = module_qtquick_src
-module_qtquick_tests.CONFIG = no_default_target no_default_install
-
-
-SUBDIRS += module_qtquick_src \
-           module_qtquick_tools \
-           module_qtquick_demos \
-           module_qtquick_examples \
-           module_qtquick_tests \
diff --git a/modularize b/modularize
index 0612b6a..26661f8 100755
--- a/modularize
+++ b/modularize
@@ -44,7 +44,7 @@ push(@INC, "$basepath/scripts");
 my $good_47_sha1 = '770d5468a87c84cc435eefaa2a234f8c3b87f8c2';
 my $good_master_sha1 = '4da2ba2e788bb63a155e1d10ae559d4366eed875';
 
-our @repos = ('qtkernel', 'qtsvg', 'qtquick', 'qt3support', 'activeqt',
+our @repos = ('qtkernel', 'qtsvg', 'qtdeclarative', 'qt3support', 'activeqt',
               'qtscript', 'phonon', 'qtmultimedia', 'qttools', 'qtxmlpatterns',
               'qttranslations', 'qtdoc', 'qlalr', 'devtools', 'qtwebkit-examples-and-demos',
               'qtqa'
@@ -528,7 +528,7 @@ chdir($qtdir);
 
 fsCopy("$basepath/files/qtsvg.pro", "qtsvg/");
 fsCopy("$basepath/files/qttools.pro", "qttools/");
-fsCopy("$basepath/files/qtquick.pro", "qtquick/");
+fsCopy("$basepath/files/qtdeclarative.pro", "qtdeclarative/");
 fsCopy("$basepath/files/qtscript.pro", "qtscript/");
 fsCopy("$basepath/files/qt3support.pro", "qt3support/");
 fsCopy("$basepath/files/qtmultimedia.pro", "qtmultimedia/");
diff --git a/patches/0019-Make-declarative-compile.patch b/patches/0019-Make-declarative-compile.patch
index 1b62218..8b0f49b 100644
--- a/patches/0019-Make-declarative-compile.patch
+++ b/patches/0019-Make-declarative-compile.patch
@@ -4,20 +4,20 @@ Date: Thu, 25 Nov 2010 15:20:01 +0100
 Subject: [PATCH] Make declarative compile.
 
 ---
- qtquick/modules/qt_declarative.pri      |    9 +++++++++
- qtquick/src/declarative/declarative.pro |    6 ++++--
- qtquick/sync.profile                    |   15 +++++++++++++++
+ qtdeclarative/modules/qt_declarative.pri      |    9 +++++++++
+ qtdeclarative/src/declarative/declarative.pro |    6 ++++--
+ qtdeclarative/sync.profile                    |   15 +++++++++++++++
  qtscript/modules/qt_script.pri          |    2 +-
  qtscript/modules/qt_scripttools.pri     |    2 +-
  5 files changed, 30 insertions(+), 4 deletions(-)
- create mode 100644 qtquick/modules/qt_declarative.pri
- create mode 100644 qtquick/sync.profile
+ create mode 100644 qtdeclarative/modules/qt_declarative.pri
+ create mode 100644 qtdeclarative/sync.profile
 
-diff --git a/qtquick/modules/qt_declarative.pri b/qtquick/modules/qt_declarative.pri
+diff --git a/qtdeclarative/modules/qt_declarative.pri b/qtdeclarative/modules/qt_declarative.pri
 new file mode 100644
 index 0000000..5fb8c25
 --- /dev/null
-+++ b/qtquick/modules/qt_declarative.pri
++++ b/qtdeclarative/modules/qt_declarative.pri
 @@ -0,0 +1,9 @@
 +QT_DECLARATIVE_VERSION = $$QT_VERSION
 +QT_DECLARATIVE_MAJOR_VERSION = $$QT_MAJOR_VERSION
@@ -28,10 +28,10 @@ index 0000000..5fb8c25
 +QT.declarative.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDeclarative
 +QT.declarative.libs = $$QT_MODULE_LIB_BASE
 +QT.declarative.depends = gui script network
-diff --git a/qtquick/src/declarative/declarative.pro b/qtquick/src/declarative/declarative.pro
+diff --git a/qtdeclarative/src/declarative/declarative.pro b/qtdeclarative/src/declarative/declarative.pro
 index b74b18c..fdbb070 100644
---- a/qtquick/src/declarative/declarative.pro
-+++ b/qtquick/src/declarative/declarative.pro
+--- a/qtdeclarative/src/declarative/declarative.pro
++++ b/qtdeclarative/src/declarative/declarative.pro
 @@ -1,3 +1,5 @@
 +load(qt_module)
 +
@@ -54,11 +54,11 @@ index b74b18c..fdbb070 100644
 -INCLUDEPATH += ../3rdparty/harfbuzz/src
 +INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
  
-diff --git a/qtquick/sync.profile b/qtquick/sync.profile
+diff --git a/qtdeclarative/sync.profile b/qtdeclarative/sync.profile
 new file mode 100644
 index 0000000..77da8d8
 --- /dev/null
-+++ b/qtquick/sync.profile
++++ b/qtdeclarative/sync.profile
 @@ -0,0 +1,15 @@
 +%modules = ( # path to module name map
 +    "QtDeclarative" => "$basedir/src/declarative",
diff --git a/patches/0024-Add-the-source-path-to-the-modules-.pri-file.patch b/patches/0024-Add-the-source-path-to-the-modules-.pri-file.patch
index 20d6af0..e8dace1 100644
--- a/patches/0024-Add-the-source-path-to-the-modules-.pri-file.patch
+++ b/patches/0024-Add-the-source-path-to-the-modules-.pri-file.patch
@@ -16,7 +16,7 @@ Subject: [PATCH] Add the source path to the modules .pri file
  qtkernel/src/modules/qt_svg.pri          |    1 +
  qtkernel/src/modules/qt_testlib.pri      |    1 +
  qtkernel/src/modules/qt_xml.pri          |    1 +
- qtquick/modules/qt_declarative.pri       |    1 +
+ qtdeclarative/modules/qt_declarative.pri       |    1 +
  qtscript/modules/qt_script.pri           |    1 +
  qtscript/modules/qt_scripttools.pri      |    1 +
  qttools/modules/qt_help.pri              |    1 +
@@ -161,10 +161,10 @@ index 06fc5fc..4932ae5 100644
 +QT.xml.sources = $$QT_MODULE_BASE/src/xml
  QT.xml.libs = $$QT_MODULE_LIB_BASE
  QT.xml.depends = core
-diff --git a/qtquick/modules/qt_declarative.pri b/qtquick/modules/qt_declarative.pri
+diff --git a/qtdeclarative/modules/qt_declarative.pri b/qtdeclarative/modules/qt_declarative.pri
 index 5fb8c25..1ddd14a 100644
---- a/qtquick/modules/qt_declarative.pri
-+++ b/qtquick/modules/qt_declarative.pri
+--- a/qtdeclarative/modules/qt_declarative.pri
++++ b/qtdeclarative/modules/qt_declarative.pri
 @@ -5,5 +5,6 @@ QT_DECLARATIVE_PATCH_VERSION = $$QT_PATCH_VERSION
  
  QT.declarative.name = QtDeclarative
diff --git a/patches/0026-Add-the-private_includes-path-to-the-modules-.pri-fi.patch b/patches/0026-Add-the-private_includes-path-to-the-modules-.pri-fi.patch
index d9457cb..007281b 100644
--- a/patches/0026-Add-the-private_includes-path-to-the-modules-.pri-fi.patch
+++ b/patches/0026-Add-the-private_includes-path-to-the-modules-.pri-fi.patch
@@ -15,7 +15,7 @@ Subject: [PATCH] Add the private_includes path to the modules .pri file
  qtkernel/src/modules/qt_svg.pri          |    1 +
  qtkernel/src/modules/qt_testlib.pri      |    1 +
  qtkernel/src/modules/qt_xml.pri          |    1 +
- qtquick/modules/qt_declarative.pri       |    1 +
+ qtdeclarative/modules/qt_declarative.pri       |    1 +
  qtscript/modules/qt_script.pri           |    1 +
  qtscript/modules/qt_scripttools.pri      |    1 +
  qttools/modules/qt_designer.pri          |    1 +
@@ -156,10 +156,10 @@ index 4932ae5..8c47bfc 100644
  QT.xml.sources = $$QT_MODULE_BASE/src/xml
  QT.xml.libs = $$QT_MODULE_LIB_BASE
  QT.xml.depends = core
-diff --git a/qtquick/modules/qt_declarative.pri b/qtquick/modules/qt_declarative.pri
+diff --git a/qtdeclarative/modules/qt_declarative.pri b/qtdeclarative/modules/qt_declarative.pri
 index 1ddd14a..c27a87e 100644
---- a/qtquick/modules/qt_declarative.pri
-+++ b/qtquick/modules/qt_declarative.pri
+--- a/qtdeclarative/modules/qt_declarative.pri
++++ b/qtdeclarative/modules/qt_declarative.pri
 @@ -5,6 +5,7 @@ QT_DECLARATIVE_PATCH_VERSION = $$QT_PATCH_VERSION
  
  QT.declarative.name = QtDeclarative
diff --git a/patches/0031-Extended-module-profiles.patch b/patches/0031-Extended-module-profiles.patch
index 8631651..701f141 100644
--- a/patches/0031-Extended-module-profiles.patch
+++ b/patches/0031-Extended-module-profiles.patch
@@ -16,7 +16,7 @@ Each module now sets the QT_CONFIG variable itself.
  qtkernel/src/modules/qt_sql.pri          |    1 +
  qtkernel/src/modules/qt_testlib.pri      |    1 +
  qtkernel/src/modules/qt_xml.pri          |    1 +
- qtquick/modules/qt_declarative.pri       |    3 ++
+ qtdeclarative/modules/qt_declarative.pri       |    3 ++
  qtscript/modules/qt_script.pri           |    3 ++
  qtscript/modules/qt_scripttools.pri      |    3 ++
  qtsvg/modules/qt_svg.pri                 |    1 +
@@ -236,10 +236,10 @@ index 8c47bfc..c0c630c 100644
  QT.xml.libs = $$QT_MODULE_LIB_BASE
  QT.xml.depends = core
 +QT.xml.DEFINES = QT_XML_LIB
-diff --git a/qtquick/modules/qt_declarative.pri b/qtquick/modules/qt_declarative.pri
+diff --git a/qtdeclarative/modules/qt_declarative.pri b/qtdeclarative/modules/qt_declarative.pri
 index c27a87e..6071af6 100644
---- a/qtquick/modules/qt_declarative.pri
-+++ b/qtquick/modules/qt_declarative.pri
+--- a/qtdeclarative/modules/qt_declarative.pri
++++ b/qtdeclarative/modules/qt_declarative.pri
 @@ -9,3 +9,6 @@ QT.declarative.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDeclarative/private
  QT.declarative.sources = $$QT_MODULE_BASE/src/declarative
  QT.declarative.libs = $$QT_MODULE_LIB_BASE
diff --git a/patches/0037-Make-each-module-refer-to-its-own-bin.patch b/patches/0037-Make-each-module-refer-to-its-own-bin.patch
index a4eacc9..0046cf5 100644
--- a/patches/0037-Make-each-module-refer-to-its-own-bin.patch
+++ b/patches/0037-Make-each-module-refer-to-its-own-bin.patch
@@ -21,7 +21,7 @@ pri file, so others can use their applications
  qtkernel/src/modules/qt_sql.pri            |    1 +
  qtkernel/src/modules/qt_testlib.pri        |    1 +
  qtkernel/src/modules/qt_xml.pri            |    1 +
- qtquick/modules/qt_declarative.pri         |    1 +
+ qtdeclarative/modules/qt_declarative.pri         |    1 +
  qtscript/modules/qt_script.pri             |    1 +
  qtscript/modules/qt_scripttools.pri        |    1 +
  qtsvg/modules/qt_svg.pri                   |    1 +
@@ -195,10 +195,10 @@ index c0c630c..c967cd7 100644
  QT.xml.includes = $$QT_MODULE_INCLUDE_BASE/QtXml
  QT.xml.private_includes = $$QT_MODULE_INCLUDE_BASE/QtXml/private
  QT.xml.sources = $$QT_MODULE_BASE/src/xml
-diff --git a/qtquick/modules/qt_declarative.pri b/qtquick/modules/qt_declarative.pri
+diff --git a/qtdeclarative/modules/qt_declarative.pri b/qtdeclarative/modules/qt_declarative.pri
 index 97119d6..3964a956 100644
---- a/qtquick/modules/qt_declarative.pri
-+++ b/qtquick/modules/qt_declarative.pri
+--- a/qtdeclarative/modules/qt_declarative.pri
++++ b/qtdeclarative/modules/qt_declarative.pri
 @@ -4,6 +4,7 @@ QT_DECLARATIVE_MINOR_VERSION = $$QT_MINOR_VERSION
  QT_DECLARATIVE_PATCH_VERSION = $$QT_PATCH_VERSION
  
diff --git a/patches/0041-Make-auto-test-build.patch b/patches/0041-Make-auto-test-build.patch
index c04f6a7..ee54cc8 100644
--- a/patches/0041-Make-auto-test-build.patch
+++ b/patches/0041-Make-auto-test-build.patch
@@ -99,10 +99,10 @@ index c677249..02e8b5b 100644
 -contains(QT_CONFIG, declarative):           SUBDIRS += declarative.pro
 -!symbian                                    SUBDIRS += help.pro
 -
-diff --git a/qtquick/tests/auto/declarative/examples/examples.pro b/qtquick/tests/auto/declarative/examples/examples.pro
+diff --git a/qtdeclarative/tests/auto/declarative/examples/examples.pro b/qtdeclarative/tests/auto/declarative/examples/examples.pro
 index dafc146..fa632f0 100644
---- a/qtquick/tests/auto/declarative/examples/examples.pro
-+++ b/qtquick/tests/auto/declarative/examples/examples.pro
+--- a/qtdeclarative/tests/auto/declarative/examples/examples.pro
++++ b/qtdeclarative/tests/auto/declarative/examples/examples.pro
 @@ -4,7 +4,7 @@ macx:CONFIG -= app_bundle
  
  SOURCES += tst_examples.cpp 
@@ -112,10 +112,10 @@ index dafc146..fa632f0 100644
  
  include(../symbianlibs.pri)
  
-diff --git a/qtquick/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro b/qtquick/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
+diff --git a/qtdeclarative/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro b/qtdeclarative/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
 index 0d335a5..bce758a 100644
---- a/qtquick/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
-+++ b/qtquick/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
+--- a/qtdeclarative/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
++++ b/qtdeclarative/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
 @@ -1,6 +1,6 @@
  load(qttest_p4)
  contains(QT_CONFIG,declarative): QT += declarative
@@ -124,10 +124,10 @@ index 0d335a5..bce758a 100644
  macx:CONFIG -= app_bundle
  
  SOURCES += tst_qdeclarativesqldatabase.cpp
-diff --git a/qtquick/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro b/qtquick/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro
+diff --git a/qtdeclarative/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro b/qtdeclarative/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro
 index 8d4b410..46a3dae 100644
---- a/qtquick/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro
-+++ b/qtquick/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro
+--- a/qtdeclarative/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro
++++ b/qtdeclarative/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro
 @@ -2,7 +2,7 @@ load(qttest_p4)
  contains(QT_CONFIG,declarative): QT += declarative gui
  macx:CONFIG -= app_bundle
diff --git a/patches/0043-compile-qtquick-import.patch b/patches/0043-compile-qtdeclarative-import.patch
index 15f521a..4a9a610 100644
--- a/patches/0043-compile-qtquick-import.patch
+++ b/patches/0043-compile-qtdeclarative-import.patch
@@ -1,16 +1,16 @@
 From 5f3b10279c2c4068c16036e70624c60e666b1171 Mon Sep 17 00:00:00 2001
 From: Olivier Goffart <olivier.goffart@nokia.com>
 Date: Tue, 11 Jan 2011 11:09:56 +0100
-Subject: [PATCH] compile qtquick/import
+Subject: [PATCH] compile qtdeclarative/import
 
 ---
- qtquick/src/imports/qimportbase.pri |    6 ++++--
+ qtdeclarative/src/imports/qimportbase.pri |    6 ++++--
  1 files changed, 4 insertions(+), 2 deletions(-)
 
-diff --git a/qtquick/src/imports/qimportbase.pri b/qtquick/src/imports/qimportbase.pri
+diff --git a/qtdeclarative/src/imports/qimportbase.pri b/qtdeclarative/src/imports/qimportbase.pri
 index 0f70030..b0d2181 100644
---- a/qtquick/src/imports/qimportbase.pri
-+++ b/qtquick/src/imports/qimportbase.pri
+--- a/qtdeclarative/src/imports/qimportbase.pri
++++ b/qtdeclarative/src/imports/qimportbase.pri
 @@ -1,4 +1,6 @@
 -symbian:include(../plugins/qpluginbase.pri)
 +load(qt_module)
diff --git a/patches/0086-Added-QT.-module-.imports-support-to-module-profiles.patch b/patches/0086-Added-QT.-module-.imports-support-to-module-profiles.patch
index db77b4b..7683f2d 100644
--- a/patches/0086-Added-QT.-module-.imports-support-to-module-profiles.patch
+++ b/patches/0086-Added-QT.-module-.imports-support-to-module-profiles.patch
@@ -20,7 +20,7 @@ Subject: [PATCH] Added QT.<module>.imports support to module profiles.
  qtkernel/src/modules/qt_uitools.pri      |    1 +
  qtkernel/src/modules/qt_xml.pri          |    1 +
  qtmultimedia/modules/qt_multimedia.pri   |    1 +
- qtquick/modules/qt_declarative.pri       |    1 +
+ qtdeclarative/modules/qt_declarative.pri       |    1 +
  qtscript/modules/qt_script.pri           |    1 +
  qtscript/modules/qt_scripttools.pri      |    1 +
  qtsvg/modules/qt_svg.pri                 |    1 +
@@ -215,10 +215,10 @@ index b060bf2..a81df0e 100644
 +QT.multimedia.imports = $$QT_MODULE_IMPORT_BASE
  QT.multimedia.depends = core gui
  QT.multimedia.DEFINES = QT_MULTIMEDIA_LIB
-diff --git a/qtquick/modules/qt_declarative.pri b/qtquick/modules/qt_declarative.pri
+diff --git a/qtdeclarative/modules/qt_declarative.pri b/qtdeclarative/modules/qt_declarative.pri
 index a24745b..01c525d 100644
---- a/qtquick/modules/qt_declarative.pri
-+++ b/qtquick/modules/qt_declarative.pri
+--- a/qtdeclarative/modules/qt_declarative.pri
++++ b/qtdeclarative/modules/qt_declarative.pri
 @@ -9,6 +9,7 @@ QT.declarative.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDe
  QT.declarative.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDeclarative/private
  QT.declarative.sources = $$QT_MODULE_BASE/src/declarative
diff --git a/patches/0087-Switched-to-using-QT.declaratice.imports-variable.patch b/patches/0087-Switched-to-using-QT.declaratice.imports-variable.patch
index e74c442..c2b4590 100644
--- a/patches/0087-Switched-to-using-QT.declaratice.imports-variable.patch
+++ b/patches/0087-Switched-to-using-QT.declaratice.imports-variable.patch
@@ -5,15 +5,15 @@ Subject: [PATCH] Switched to using QT.declaratice.imports variable.
 
 ---
  .../imports/folderlistmodel/folderlistmodel.pro    |    2 +-
- qtquick/src/imports/gestures/gestures.pro          |    2 +-
- qtquick/src/imports/particles/particles.pro        |    2 +-
- qtquick/src/imports/qimportbase.pri                |    2 +-
+ qtdeclarative/src/imports/gestures/gestures.pro          |    2 +-
+ qtdeclarative/src/imports/particles/particles.pro        |    2 +-
+ qtdeclarative/src/imports/qimportbase.pri                |    2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/qtquick/src/imports/folderlistmodel/folderlistmodel.pro b/qtquick/src/imports/folderlistmodel/folderlistmodel.pro
+diff --git a/qtdeclarative/src/imports/folderlistmodel/folderlistmodel.pro b/qtdeclarative/src/imports/folderlistmodel/folderlistmodel.pro
 index 44764a9..e55a5b2 100644
---- a/qtquick/src/imports/folderlistmodel/folderlistmodel.pro
-+++ b/qtquick/src/imports/folderlistmodel/folderlistmodel.pro
+--- a/qtdeclarative/src/imports/folderlistmodel/folderlistmodel.pro
++++ b/qtdeclarative/src/imports/folderlistmodel/folderlistmodel.pro
 @@ -7,7 +7,7 @@ QT += declarative script
  SOURCES += qdeclarativefolderlistmodel.cpp plugin.cpp
  HEADERS += qdeclarativefolderlistmodel.h
@@ -23,10 +23,10 @@ index 44764a9..e55a5b2 100644
  target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
  
  qmldir.files += $$PWD/qmldir
-diff --git a/qtquick/src/imports/gestures/gestures.pro b/qtquick/src/imports/gestures/gestures.pro
+diff --git a/qtdeclarative/src/imports/gestures/gestures.pro b/qtdeclarative/src/imports/gestures/gestures.pro
 index ad872ba..8ebf9a0 100644
---- a/qtquick/src/imports/gestures/gestures.pro
-+++ b/qtquick/src/imports/gestures/gestures.pro
+--- a/qtdeclarative/src/imports/gestures/gestures.pro
++++ b/qtdeclarative/src/imports/gestures/gestures.pro
 @@ -7,7 +7,7 @@ QT += declarative
  SOURCES += qdeclarativegesturearea.cpp plugin.cpp
  HEADERS += qdeclarativegesturearea_p.h
@@ -36,10 +36,10 @@ index ad872ba..8ebf9a0 100644
  target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
  
  qmldir.files += $$PWD/qmldir
-diff --git a/qtquick/src/imports/particles/particles.pro b/qtquick/src/imports/particles/particles.pro
+diff --git a/qtdeclarative/src/imports/particles/particles.pro b/qtdeclarative/src/imports/particles/particles.pro
 index 90b50e4..ba570f7 100644
---- a/qtquick/src/imports/particles/particles.pro
-+++ b/qtquick/src/imports/particles/particles.pro
+--- a/qtdeclarative/src/imports/particles/particles.pro
++++ b/qtdeclarative/src/imports/particles/particles.pro
 @@ -11,7 +11,7 @@ SOURCES += \
  HEADERS += \
      qdeclarativeparticles_p.h
@@ -49,10 +49,10 @@ index 90b50e4..ba570f7 100644
  target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
  
  qmldir.files += $$PWD/qmldir
-diff --git a/qtquick/src/imports/qimportbase.pri b/qtquick/src/imports/qimportbase.pri
+diff --git a/qtdeclarative/src/imports/qimportbase.pri b/qtdeclarative/src/imports/qimportbase.pri
 index b0d2181..8647f05 100644
---- a/qtquick/src/imports/qimportbase.pri
-+++ b/qtquick/src/imports/qimportbase.pri
+--- a/qtdeclarative/src/imports/qimportbase.pri
++++ b/qtdeclarative/src/imports/qimportbase.pri
 @@ -15,7 +15,7 @@ isEmpty(TARGET) {
  
  QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
diff --git a/patches/0095-Fixed-parserstress-test.patch b/patches/0095-Fixed-parserstress-test.patch
index 0391ca1..6148f17 100644
--- a/patches/0095-Fixed-parserstress-test.patch
+++ b/patches/0095-Fixed-parserstress-test.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] Fixed parserstress test.
  .../declarative/parserstress/tst_parserstress.cpp  |   22 +++++++------------
  2 files changed, 19 insertions(+), 20 deletions(-)
 
-diff --git a/qtquick/tests/auto/declarative/parserstress/parserstress.pro b/qtquick/tests/auto/declarative/parserstress/parserstress.pro
+diff --git a/qtdeclarative/tests/auto/declarative/parserstress/parserstress.pro b/qtdeclarative/tests/auto/declarative/parserstress/parserstress.pro
 index 6ef2432..cbc5e18 100644
---- a/qtquick/tests/auto/declarative/parserstress/parserstress.pro
-+++ b/qtquick/tests/auto/declarative/parserstress/parserstress.pro
+--- a/qtdeclarative/tests/auto/declarative/parserstress/parserstress.pro
++++ b/qtdeclarative/tests/auto/declarative/parserstress/parserstress.pro
 @@ -4,12 +4,17 @@ macx:CONFIG -= app_bundle
  
  SOURCES += tst_parserstress.cpp
@@ -36,10 +36,10 @@ index 6ef2432..cbc5e18 100644
  }
  
  CONFIG += parallel_test
-diff --git a/qtquick/tests/auto/declarative/parserstress/tst_parserstress.cpp b/qtquick/tests/auto/declarative/parserstress/tst_parserstress.cpp
+diff --git a/qtdeclarative/tests/auto/declarative/parserstress/tst_parserstress.cpp b/qtdeclarative/tests/auto/declarative/parserstress/tst_parserstress.cpp
 index c0a01df..19ff25a 100644
---- a/qtquick/tests/auto/declarative/parserstress/tst_parserstress.cpp
-+++ b/qtquick/tests/auto/declarative/parserstress/tst_parserstress.cpp
+--- a/qtdeclarative/tests/auto/declarative/parserstress/tst_parserstress.cpp
++++ b/qtdeclarative/tests/auto/declarative/parserstress/tst_parserstress.cpp
 @@ -46,11 +46,6 @@
  #include <QDir>
  #include <QFile>
diff --git a/patches/0098-Introduced-the-QT.-module-.plugins-variable-to-modul.patch b/patches/0098-Introduced-the-QT.-module-.plugins-variable-to-modul.patch
index 875edbe..f4b1f11 100644
--- a/patches/0098-Introduced-the-QT.-module-.plugins-variable-to-modul.patch
+++ b/patches/0098-Introduced-the-QT.-module-.plugins-variable-to-modul.patch
@@ -78,7 +78,7 @@ Subject: [PATCH] Introduced the QT.<module>.plugins variable to module profiles.
  qtkernel/src/plugins/s60/s60pluginbase.pri         |    2 +-
  qtkernel/src/plugins/sqldrivers/qsqldriverbase.pri |    2 +-
  qtmultimedia/modules/qt_multimedia.pri             |    1 +
- qtquick/modules/qt_declarative.pri                 |    1 +
+ qtdeclarative/modules/qt_declarative.pri                 |    1 +
  .../src/plugins/qmltooling/tcpserver/tcpserver.pro |    2 +-
  qtscript/modules/qt_script.pri                     |    1 +
  qtscript/modules/qt_scripttools.pri                |    1 +
@@ -1026,10 +1026,10 @@ index a81df0e..469e5c8 100644
  QT.multimedia.imports = $$QT_MODULE_IMPORT_BASE
  QT.multimedia.depends = core gui
  QT.multimedia.DEFINES = QT_MULTIMEDIA_LIB
-diff --git a/qtquick/modules/qt_declarative.pri b/qtquick/modules/qt_declarative.pri
+diff --git a/qtdeclarative/modules/qt_declarative.pri b/qtdeclarative/modules/qt_declarative.pri
 index 01c525d..d4dfecd 100644
---- a/qtquick/modules/qt_declarative.pri
-+++ b/qtquick/modules/qt_declarative.pri
+--- a/qtdeclarative/modules/qt_declarative.pri
++++ b/qtdeclarative/modules/qt_declarative.pri
 @@ -9,6 +9,7 @@ QT.declarative.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDe
  QT.declarative.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDeclarative/private
  QT.declarative.sources = $$QT_MODULE_BASE/src/declarative
@@ -1038,10 +1038,10 @@ index 01c525d..d4dfecd 100644
  QT.declarative.imports = $$QT_MODULE_IMPORT_BASE
  QT.declarative.depends = gui script network
  QT.declarative.DEFINES = QT_DECLARATIVE_LIB
-diff --git a/qtquick/src/plugins/qmltooling/tcpserver/tcpserver.pro b/qtquick/src/plugins/qmltooling/tcpserver/tcpserver.pro
+diff --git a/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro b/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro
 index f4f2666..0a89b9e 100644
---- a/qtquick/src/plugins/qmltooling/tcpserver/tcpserver.pro
-+++ b/qtquick/src/plugins/qmltooling/tcpserver/tcpserver.pro
+--- a/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro
++++ b/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro
 @@ -3,7 +3,7 @@ QT       += declarative network
  
  include(../../qpluginbase.pri)
diff --git a/patches/0099-Changed-the-path-for-qpluginbase.pri.patch b/patches/0099-Changed-the-path-for-qpluginbase.pri.patch
index 35e02a4..2365fe2 100644
--- a/patches/0099-Changed-the-path-for-qpluginbase.pri.patch
+++ b/patches/0099-Changed-the-path-for-qpluginbase.pri.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Changed the path for qpluginbase.pri
  .../src/plugins/qmltooling/tcpserver/tcpserver.pro |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
-diff --git a/qtquick/src/plugins/qmltooling/tcpserver/tcpserver.pro b/qtquick/src/plugins/qmltooling/tcpserver/tcpserver.pro
+diff --git a/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro b/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro
 index 0a89b9e..3789084 100644
---- a/qtquick/src/plugins/qmltooling/tcpserver/tcpserver.pro
-+++ b/qtquick/src/plugins/qmltooling/tcpserver/tcpserver.pro
+--- a/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro
++++ b/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro
 @@ -1,7 +1,7 @@
  TARGET = tcpserver
  QT       += declarative network
diff --git a/patches/0100-Modularized-tst_bic-and-add-some-helper-functions-fo.patch b/patches/0100-Modularized-tst_bic-and-add-some-helper-functions-fo.patch
index 183ac2c..9550162 100644
--- a/patches/0100-Modularized-tst_bic-and-add-some-helper-functions-fo.patch
+++ b/patches/0100-Modularized-tst_bic-and-add-some-helper-functions-fo.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] Modularized tst_bic and add some helper functions for global te
  qtqa/tests/auto/bic/bic.pro           |    1 +
  qtqa/tests/auto/bic/tst_bic.cpp       |   66 ++++++-------
  qtqa/tests/shared/global.h            |  174 +++++++++++++++++++++++++++++++++
- qtquick/tests/global/global.cfg       |    5 +
+ qtdeclarative/tests/global/global.cfg       |    5 +
  qtscript/tests/global/global.cfg      |    6 +
  qtsvg/tests/global/global.cfg         |    5 +
  qttools/tests/global/global.cfg       |    7 ++
@@ -22,7 +22,7 @@ Subject: [PATCH] Modularized tst_bic and add some helper functions for global te
  create mode 100644 qtkernel/tests/global/global.cfg
  create mode 100644 qtmultimedia/tests/global/global.cfg
  create mode 100644 qtqa/tests/shared/global.h
- create mode 100644 qtquick/tests/global/global.cfg
+ create mode 100644 qtdeclarative/tests/global/global.cfg
  create mode 100644 qtscript/tests/global/global.cfg
  create mode 100644 qtsvg/tests/global/global.cfg
  create mode 100644 qttools/tests/global/global.cfg
@@ -391,11 +391,11 @@ index 0000000..ae33bcc
 +}
 +
 +#endif // QT_TESTS_SHARED_GLOBAL_H_INCLUDED
-diff --git a/qtquick/tests/global/global.cfg b/qtquick/tests/global/global.cfg
+diff --git a/qtdeclarative/tests/global/global.cfg b/qtdeclarative/tests/global/global.cfg
 new file mode 100644
 index 0000000..80e064a
 --- /dev/null
-+++ b/qtquick/tests/global/global.cfg
++++ b/qtdeclarative/tests/global/global.cfg
 @@ -0,0 +1,5 @@
 +<config>
 +<modules>
diff --git a/patches/0102-Modularized-tst_compilerwarnings.patch b/patches/0102-Modularized-tst_compilerwarnings.patch
index 0dc3339..620455c 100644
--- a/patches/0102-Modularized-tst_compilerwarnings.patch
+++ b/patches/0102-Modularized-tst_compilerwarnings.patch
@@ -22,7 +22,7 @@ Subject: [PATCH] Modularized tst_compilerwarnings
  copy {qtqa/tests/auto/compilerwarnings => qtkernel/tests/auto/compilerwarnings/data}/test_cpp.txt (96%)
  copy {qtqa/tests/auto/compilerwarnings => qtmultimedia/tests/auto/compilerwarnings/data}/test_cpp.txt (81%)
  delete mode 100644 qtqa/tests/auto/compilerwarnings/compilerwarnings.qrc
- copy {qtqa/tests/auto/compilerwarnings => qtquick/tests/auto/compilerwarnings/data}/test_cpp.txt (83%)
+ copy {qtqa/tests/auto/compilerwarnings => qtdeclarative/tests/auto/compilerwarnings/data}/test_cpp.txt (83%)
  copy {qtqa/tests/auto/compilerwarnings => qtscript/tests/auto/compilerwarnings/data}/test_cpp.txt (81%)
  copy {qtqa/tests/auto/compilerwarnings => qtsvg/tests/auto/compilerwarnings/data}/test_cpp.txt (81%)
  copy {qtqa/tests/auto/compilerwarnings => qttools/tests/auto/compilerwarnings/data}/test_cpp.txt (82%)
@@ -364,13 +364,13 @@ index b518e20..d33ad6e 100644
           << "-c"
           << "-woff" << "3303" // const qualifier on return
           << "-o" << tmpFile
-diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/qtquick/tests/auto/compilerwarnings/data/test_cpp.txt
+diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/qtdeclarative/tests/auto/compilerwarnings/data/test_cpp.txt
 similarity index 83%
 copy from qtqa/tests/auto/compilerwarnings/test_cpp.txt
-copy to qtquick/tests/auto/compilerwarnings/data/test_cpp.txt
+copy to qtdeclarative/tests/auto/compilerwarnings/data/test_cpp.txt
 index d27e972..a3d65db 100644
 --- a/qtqa/tests/auto/compilerwarnings/test_cpp.txt
-+++ b/qtquick/tests/auto/compilerwarnings/data/test_cpp.txt
++++ b/qtdeclarative/tests/auto/compilerwarnings/data/test_cpp.txt
 @@ -39,27 +39,9 @@
  **
  ****************************************************************************/
diff --git a/patches/0105-Add-tst_headersclean-for-each-module.patch b/patches/0105-Add-tst_headersclean-for-each-module.patch
index f0d2be2..ffe2acd 100644
--- a/patches/0105-Add-tst_headersclean-for-each-module.patch
+++ b/patches/0105-Add-tst_headersclean-for-each-module.patch
@@ -19,10 +19,10 @@ Subject: [PATCH] Add tst_headersclean for each module
  .../tests/auto/headersclean/headersclean.pro       |    4 +
  .../tests/auto/headersclean/tst_headersclean.cpp   |   62 +++++++++++++++
  .../auto.pro => qtmultimedia/tests/auto/host.pro   |    3 +-
- qtquick/tests/auto/auto.pro                        |    2 +-
- qtquick/tests/auto/headersclean/headersclean.pro   |    5 +
+ qtdeclarative/tests/auto/auto.pro                        |    2 +-
+ qtdeclarative/tests/auto/headersclean/headersclean.pro   |    5 +
  .../tests/auto/headersclean/tst_headersclean.cpp   |   62 +++++++++++++++
- qtquick/tests/auto/{auto.pro => host.pro}          |    3 +-
+ qtdeclarative/tests/auto/{auto.pro => host.pro}          |    3 +-
  qtscript/tests/auto/auto.pro                       |    2 +-
  qtscript/tests/auto/headersclean/headersclean.pro  |    6 ++
  .../tests/auto/headersclean/tst_headersclean.cpp   |   63 ++++++++++++++++
@@ -42,30 +42,30 @@ Subject: [PATCH] Add tst_headersclean for each module
  35 files changed, 640 insertions(+), 21 deletions(-)
  create mode 100644 phonon/tests/auto/headersclean/headersclean.pro
  create mode 100644 phonon/tests/auto/headersclean/tst_headersclean.cpp
- copy qtquick/tests/auto/auto.pro => phonon/tests/auto/host.pro (50%)
+ copy qtdeclarative/tests/auto/auto.pro => phonon/tests/auto/host.pro (50%)
  create mode 100644 qt3support/tests/auto/headersclean/headersclean.pro
  create mode 100644 qt3support/tests/auto/headersclean/tst_headersclean.cpp
- copy qtquick/tests/auto/auto.pro => qt3support/tests/auto/host.pro (50%)
+ copy qtdeclarative/tests/auto/auto.pro => qt3support/tests/auto/host.pro (50%)
  create mode 100644 qtkernel/tests/auto/headersclean/headersclean.pro
  create mode 100644 qtkernel/tests/auto/headersclean/tst_headersclean.cpp
  create mode 100644 qtmultimedia/tests/auto/headersclean/headersclean.pro
  create mode 100644 qtmultimedia/tests/auto/headersclean/tst_headersclean.cpp
- copy qtquick/tests/auto/auto.pro => qtmultimedia/tests/auto/host.pro (50%)
- create mode 100644 qtquick/tests/auto/headersclean/headersclean.pro
- create mode 100644 qtquick/tests/auto/headersclean/tst_headersclean.cpp
- copy qtquick/tests/auto/{auto.pro => host.pro} (50%)
+ copy qtdeclarative/tests/auto/auto.pro => qtmultimedia/tests/auto/host.pro (50%)
+ create mode 100644 qtdeclarative/tests/auto/headersclean/headersclean.pro
+ create mode 100644 qtdeclarative/tests/auto/headersclean/tst_headersclean.cpp
+ copy qtdeclarative/tests/auto/{auto.pro => host.pro} (50%)
  create mode 100644 qtscript/tests/auto/headersclean/headersclean.pro
  create mode 100644 qtscript/tests/auto/headersclean/tst_headersclean.cpp
- copy qtquick/tests/auto/auto.pro => qtscript/tests/auto/host.pro (50%)
+ copy qtdeclarative/tests/auto/auto.pro => qtscript/tests/auto/host.pro (50%)
  create mode 100644 qtsvg/tests/auto/headersclean/headersclean.pro
  create mode 100644 qtsvg/tests/auto/headersclean/tst_headersclean.cpp
- copy qtquick/tests/auto/auto.pro => qtsvg/tests/auto/host.pro (50%)
+ copy qtdeclarative/tests/auto/auto.pro => qtsvg/tests/auto/host.pro (50%)
  create mode 100644 qttools/tests/auto/headersclean/headersclean.pro
  create mode 100644 qttools/tests/auto/headersclean/tst_headersclean.cpp
- copy qtquick/tests/auto/auto.pro => qttools/tests/auto/host.pro (50%)
+ copy qtdeclarative/tests/auto/auto.pro => qttools/tests/auto/host.pro (50%)
  create mode 100644 qtxmlpatterns/tests/auto/headersclean/headersclean.pro
  create mode 100644 qtxmlpatterns/tests/auto/headersclean/tst_headersclean.cpp
- copy qtquick/tests/auto/auto.pro => qtxmlpatterns/tests/auto/host.pro (50%)
+ copy qtdeclarative/tests/auto/auto.pro => qtxmlpatterns/tests/auto/host.pro (50%)
 
 diff --git a/phonon/tests/auto/auto.pro b/phonon/tests/auto/auto.pro
 index ef6bdf4..ba475cb 100644
@@ -155,12 +155,12 @@ index 0000000..cca8928
 +
 +QTEST_MAIN(tst_HeadersClean)
 +#include "tst_headersclean.moc"
-diff --git a/qtquick/tests/auto/auto.pro b/phonon/tests/auto/host.pro
+diff --git a/qtdeclarative/tests/auto/auto.pro b/phonon/tests/auto/host.pro
 similarity index 50%
-copy from qtquick/tests/auto/auto.pro
+copy from qtdeclarative/tests/auto/auto.pro
 copy to phonon/tests/auto/host.pro
 index f2173f0..5156cd1 100644
---- a/qtquick/tests/auto/auto.pro
+--- a/qtdeclarative/tests/auto/auto.pro
 +++ b/phonon/tests/auto/host.pro
 @@ -1,4 +1,4 @@
  TEMPLATE=subdirs
@@ -259,12 +259,12 @@ index 0000000..c114740
 +QTEST_MAIN(tst_HeadersClean)
 +#include "tst_headersclean.moc"
 \ No newline at end of file
-diff --git a/qtquick/tests/auto/auto.pro b/qt3support/tests/auto/host.pro
+diff --git a/qtdeclarative/tests/auto/auto.pro b/qt3support/tests/auto/host.pro
 similarity index 50%
-copy from qtquick/tests/auto/auto.pro
+copy from qtdeclarative/tests/auto/auto.pro
 copy to qt3support/tests/auto/host.pro
 index f2173f0..5156cd1 100644
---- a/qtquick/tests/auto/auto.pro
+--- a/qtdeclarative/tests/auto/auto.pro
 +++ b/qt3support/tests/auto/host.pro
 @@ -1,4 +1,4 @@
  TEMPLATE=subdirs
@@ -473,12 +473,12 @@ index 0000000..5a61a86
 +
 +QTEST_MAIN(tst_HeadersClean)
 +#include "tst_headersclean.moc"
-diff --git a/qtquick/tests/auto/auto.pro b/qtmultimedia/tests/auto/host.pro
+diff --git a/qtdeclarative/tests/auto/auto.pro b/qtmultimedia/tests/auto/host.pro
 similarity index 50%
-copy from qtquick/tests/auto/auto.pro
+copy from qtdeclarative/tests/auto/auto.pro
 copy to qtmultimedia/tests/auto/host.pro
 index f2173f0..5156cd1 100644
---- a/qtquick/tests/auto/auto.pro
+--- a/qtdeclarative/tests/auto/auto.pro
 +++ b/qtmultimedia/tests/auto/host.pro
 @@ -1,4 +1,4 @@
  TEMPLATE=subdirs
@@ -487,32 +487,32 @@ index f2173f0..5156cd1 100644
 -
 +           headersclean \
 +
-diff --git a/qtquick/tests/auto/auto.pro b/qtquick/tests/auto/auto.pro
+diff --git a/qtdeclarative/tests/auto/auto.pro b/qtdeclarative/tests/auto/auto.pro
 index f2173f0..e2eae5e 100644
---- a/qtquick/tests/auto/auto.pro
-+++ b/qtquick/tests/auto/auto.pro
+--- a/qtdeclarative/tests/auto/auto.pro
++++ b/qtdeclarative/tests/auto/auto.pro
 @@ -1,4 +1,5 @@
  TEMPLATE=subdirs
  SUBDIRS=\
      declarative \
  
 +!cross_compile:                             SUBDIRS += host.pro
-diff --git a/qtquick/tests/auto/headersclean/headersclean.pro b/qtquick/tests/auto/headersclean/headersclean.pro
+diff --git a/qtdeclarative/tests/auto/headersclean/headersclean.pro b/qtdeclarative/tests/auto/headersclean/headersclean.pro
 new file mode 100644
 index 0000000..54ea66a
 --- /dev/null
-+++ b/qtquick/tests/auto/headersclean/headersclean.pro
++++ b/qtdeclarative/tests/auto/headersclean/headersclean.pro
 @@ -0,0 +1,5 @@
 +load(qttest_p4)
 +SOURCES  += tst_headersclean.cpp
 +QT = core
 +
 +contains(QT_CONFIG,declarative): QT += declarative
-diff --git a/qtquick/tests/auto/headersclean/tst_headersclean.cpp b/qtquick/tests/auto/headersclean/tst_headersclean.cpp
+diff --git a/qtdeclarative/tests/auto/headersclean/tst_headersclean.cpp b/qtdeclarative/tests/auto/headersclean/tst_headersclean.cpp
 new file mode 100644
 index 0000000..68bc9d7
 --- /dev/null
-+++ b/qtquick/tests/auto/headersclean/tst_headersclean.cpp
++++ b/qtdeclarative/tests/auto/headersclean/tst_headersclean.cpp
 @@ -0,0 +1,62 @@
 +/****************************************************************************
 +**
@@ -576,13 +576,13 @@ index 0000000..68bc9d7
 +
 +QTEST_MAIN(tst_HeadersClean)
 +#include "tst_headersclean.moc"
-diff --git a/qtquick/tests/auto/auto.pro b/qtquick/tests/auto/host.pro
+diff --git a/qtdeclarative/tests/auto/auto.pro b/qtdeclarative/tests/auto/host.pro
 similarity index 50%
-copy from qtquick/tests/auto/auto.pro
-copy to qtquick/tests/auto/host.pro
+copy from qtdeclarative/tests/auto/auto.pro
+copy to qtdeclarative/tests/auto/host.pro
 index f2173f0..5156cd1 100644
---- a/qtquick/tests/auto/auto.pro
-+++ b/qtquick/tests/auto/host.pro
+--- a/qtdeclarative/tests/auto/auto.pro
++++ b/qtdeclarative/tests/auto/host.pro
 @@ -1,4 +1,4 @@
  TEMPLATE=subdirs
  SUBDIRS=\
@@ -681,12 +681,12 @@ index 0000000..a8e64b4
 +
 +QTEST_MAIN(tst_HeadersClean)
 +#include "tst_headersclean.moc"
-diff --git a/qtquick/tests/auto/auto.pro b/qtscript/tests/auto/host.pro
+diff --git a/qtdeclarative/tests/auto/auto.pro b/qtscript/tests/auto/host.pro
 similarity index 50%
-copy from qtquick/tests/auto/auto.pro
+copy from qtdeclarative/tests/auto/auto.pro
 copy to qtscript/tests/auto/host.pro
 index f2173f0..5156cd1 100644
---- a/qtquick/tests/auto/auto.pro
+--- a/qtdeclarative/tests/auto/auto.pro
 +++ b/qtscript/tests/auto/host.pro
 @@ -1,4 +1,4 @@
  TEMPLATE=subdirs
@@ -784,12 +784,12 @@ index 0000000..ef12064
 +
 +QTEST_MAIN(tst_HeadersClean)
 +#include "tst_headersclean.moc"
-diff --git a/qtquick/tests/auto/auto.pro b/qtsvg/tests/auto/host.pro
+diff --git a/qtdeclarative/tests/auto/auto.pro b/qtsvg/tests/auto/host.pro
 similarity index 50%
-copy from qtquick/tests/auto/auto.pro
+copy from qtdeclarative/tests/auto/auto.pro
 copy to qtsvg/tests/auto/host.pro
 index f2173f0..5156cd1 100644
---- a/qtquick/tests/auto/auto.pro
+--- a/qtdeclarative/tests/auto/auto.pro
 +++ b/qtsvg/tests/auto/host.pro
 @@ -1,4 +1,4 @@
  TEMPLATE=subdirs
@@ -886,12 +886,12 @@ index 0000000..77ca939
 +
 +QTEST_MAIN(tst_HeadersClean)
 +#include "tst_headersclean.moc"
-diff --git a/qtquick/tests/auto/auto.pro b/qttools/tests/auto/host.pro
+diff --git a/qtdeclarative/tests/auto/auto.pro b/qttools/tests/auto/host.pro
 similarity index 50%
-copy from qtquick/tests/auto/auto.pro
+copy from qtdeclarative/tests/auto/auto.pro
 copy to qttools/tests/auto/host.pro
 index f2173f0..5156cd1 100644
---- a/qtquick/tests/auto/auto.pro
+--- a/qtdeclarative/tests/auto/auto.pro
 +++ b/qttools/tests/auto/host.pro
 @@ -1,4 +1,4 @@
  TEMPLATE=subdirs
@@ -989,12 +989,12 @@ index 0000000..0a21174
 +
 +QTEST_MAIN(tst_HeadersClean)
 +#include "tst_headersclean.moc"
-diff --git a/qtquick/tests/auto/auto.pro b/qtxmlpatterns/tests/auto/host.pro
+diff --git a/qtdeclarative/tests/auto/auto.pro b/qtxmlpatterns/tests/auto/host.pro
 similarity index 50%
-copy from qtquick/tests/auto/auto.pro
+copy from qtdeclarative/tests/auto/auto.pro
 copy to qtxmlpatterns/tests/auto/host.pro
 index f2173f0..5156cd1 100644
---- a/qtquick/tests/auto/auto.pro
+--- a/qtdeclarative/tests/auto/auto.pro
 +++ b/qtxmlpatterns/tests/auto/host.pro
 @@ -1,4 +1,4 @@
  TEMPLATE=subdirs
diff --git a/pulse-build-script b/pulse-build-script
index 6525918..04e59a6 100755
--- a/pulse-build-script
+++ b/pulse-build-script
@@ -88,7 +88,7 @@ sub runAutotests {
     # Please don't change this value, otherwise you will send the results to Testr
     #$ENV{"PULSE_TESTS_TESTR"} = "0";
 
-    my @autotests = ("phonon", "qt3support", "qtkernel", "qtmultimedia", "qtquick", "qtscript", "qtsvg", "qttools", "qtxmlpatterns");
+    my @autotests = ("phonon", "qt3support", "qtkernel", "qtmultimedia", "qtdeclarative", "qtscript", "qtsvg", "qttools", "qtxmlpatterns");
 
     chdir($basepath) or die("Could not chdir to qt");
     system_v("git clone qtgitreadonly:qa-dungeon/mainline.git $basepath/_qadungeon") and die("Could not clone qa-dungeon");
diff --git a/qt-bundle/qt.pro b/qt-bundle/qt.pro
index 10baf7b..f5f4ac4 100644
--- a/qt-bundle/qt.pro
+++ b/qt-bundle/qt.pro
@@ -23,9 +23,9 @@ module_qtscript.subdir = $$IN_PWD/qtscript
 module_qtscript.target = module-qtscript
 module_qtscript.depends = module_qtkernel
 
-module_qtquick.subdir = $$IN_PWD/qtquick
-module_qtquick.target = module-qtquick
-module_qtquick.depends = module_qtkernel module_qtscript module_qtsvg module_qtxmlpatterns
+module_qtdeclarative.subdir = $$IN_PWD/qtdeclarative
+module_qtdeclarative.target = module-qtdeclarative
+module_qtdeclarative.depends = module_qtkernel module_qtscript module_qtsvg module_qtxmlpatterns
 
 module_qt3support.subdir = $$IN_PWD/qt3support
 module_qt3support.target = module-qt3support
@@ -33,7 +33,7 @@ module_qt3support.depends = module_qtkernel
 
 module_qtwebkit.file = qtwebkit.pri
 module_qtwebkit.makefile = Makefile.qtwebkit
-module_qtwebkit.depends = module_qtkernel module_qtscript module_qtquick module_phonon
+module_qtwebkit.depends = module_qtkernel module_qtscript module_qtdeclarative module_phonon
 # The qtwebkit subdir does not follow the "module-*" scheme, so make our own target that does.
 module_qtwebkit_target.target = module-qtwebkit
 module_qtwebkit_target.commands =
@@ -46,7 +46,7 @@ qtwebkit_examples_and_demos.depends = module_qtwebkit
 
 module_qttools.subdir = $$IN_PWD/qttools
 module_qttools.target = module-qttools
-module_qttools.depends = module_qtkernel module_qtscript module_qtquick module_qt3support module_qtwebkit
+module_qttools.depends = module_qtkernel module_qtscript module_qtdeclarative module_qt3support module_qtwebkit
 win32:module_qttools.depends += module_activeqt
 
 module_qttranslations.subdir = $$IN_PWD/qttranslations
@@ -55,7 +55,7 @@ module_qttranslations.depends = module_qttools
 
 module_qtdoc.subdir = $$IN_PWD/qtdoc
 module_qtdoc.target = module-qtdoc
-module_qtdoc.depends = module_qtquick module_qttools #for the demos and QtHelp
+module_qtdoc.depends = module_qtdeclarative module_qttools #for the demos and QtHelp
 
 module_activeqt.subdir = $$IN_PWD/activeqt
 module_activeqt.target = module-activeqt
@@ -68,7 +68,7 @@ SUBDIRS       = \
                 module_phonon \
                 module_qtxmlpatterns \
                 module_qtscript \
-                module_qtquick \
+                module_qtdeclarative \
                 module_qt3support \
                 module_qtwebkit \
                 module_qtmultimedia \
diff --git a/scripts/040_declarative b/scripts/040_declarative
index abbed0d..8d103d2 100644
--- a/scripts/040_declarative
+++ b/scripts/040_declarative
@@ -17,19 +17,19 @@
 #                                    it if it does not exist.
 #--------------------------------------------------------------------------------------------------
 
-ensureDir("qtquick/src");
-run("git mv src/declarative qtquick/src/declarative");
-run("git mv src/imports qtquick/src/imports");
-run("git mv imports qtquick/imports");
-ensureDir("qtquick/tools");
-run("git mv tools/qml qtquick/tools/qmlviewer");
-run("git mv qtquick/tools/qmlviewer/qml.pro qtquick/tools/qmlviewer/qmlviewer.pro");
-ensureDir("qtquick/src/plugins");
-run("git mv src/plugins/qmltooling qtquick/src/plugins");
+ensureDir("qtdeclarative/src");
+run("git mv src/declarative qtdeclarative/src/declarative");
+run("git mv src/imports qtdeclarative/src/imports");
+run("git mv imports qtdeclarative/imports");
+ensureDir("qtdeclarative/tools");
+run("git mv tools/qml qtdeclarative/tools/qmlviewer");
+run("git mv qtdeclarative/tools/qmlviewer/qml.pro qtdeclarative/tools/qmlviewer/qmlviewer.pro");
+ensureDir("qtdeclarative/src/plugins");
+run("git mv src/plugins/qmltooling qtdeclarative/src/plugins");
 
-createSubdirProfile("qtquick/src/plugins");
-createSubdirProfile("qtquick/src/", 1);
-createSubdirProfile("qtquick/tools/");
+createSubdirProfile("qtdeclarative/src/plugins");
+createSubdirProfile("qtdeclarative/src/", 1);
+createSubdirProfile("qtdeclarative/tools/");
 
 
 return 1;
diff --git a/scripts/200_examples b/scripts/200_examples
index 5376183..1736472 100644
--- a/scripts/200_examples
+++ b/scripts/200_examples
@@ -131,7 +131,7 @@ createSubdirProfile("qtsvg/examples/opengl");
 createSubdirProfile("qtsvg/examples");
 createSubdirProfile("qtscript/examples");
 createSubdirProfile("qtxmlpatterns/examples");
-createSubdirProfile("qtquick/examples");
+createSubdirProfile("qtdeclarative/examples");
 createSubdirProfile("phonon/examples");
 createSubdirProfile("qtmultimedia/examples");
 createSubdirProfile("qtwebkit-examples-and-demos/examples");
diff --git a/scripts/220_demos b/scripts/220_demos
index 5aa20b6..065cff3 100644
--- a/scripts/220_demos
+++ b/scripts/220_demos
@@ -24,8 +24,8 @@ use File::Basename;
 my $debugDemosScript = 0;
 
 # First the exceptions.
-ensureDir("qtquick/demos");
-run("git mv demos/declarative qtquick/demos");
+ensureDir("qtdeclarative/demos");
+run("git mv demos/declarative qtdeclarative/demos");
 
 ensureDir("qtmultimedia/demos");
 run("git mv demos/spectrum qtmultimedia/demos");
@@ -70,8 +70,8 @@ fsRm("demos/.gitignore");
 fsRmdirWithParents("demos/embedded");
 
 # Create profiles
-createSubdirProfile("qtquick/demos");
-createSubdirProfile("qtquick/demos/embedded");
+createSubdirProfile("qtdeclarative/demos");
+createSubdirProfile("qtdeclarative/demos/embedded");
 createSubdirProfile("qtmultimedia/demos");
 createSubdirProfile("qtdoc/demos");
 createSubdirProfile("qtwebkit-examples-and-demos/demos/embedded");
diff --git a/scripts/250_docs b/scripts/250_docs
index 3c86e4a..f29af8f 100644
--- a/scripts/250_docs
+++ b/scripts/250_docs
@@ -17,7 +17,7 @@
 #                                    it if it does not exist.
 #--------------------------------------------------------------------------------------------------
 
-ensureDir("qtquick/doc/src");
+ensureDir("qtdeclarative/doc/src");
 ensureDir("qtkernel/doc/src");
 ensureDir("activeqt/doc/src");
 ensureDir("qtscript/doc/src");
@@ -26,7 +26,7 @@ ensureDir("qtxmlpatterns/doc/src");
 ensureDir("qtxmlpatterns/doc/src/snippets");
  
 
-run("git mv doc/src/declarative             qtquick/doc/src/");
+run("git mv doc/src/declarative             qtdeclarative/doc/src/");
 run("git mv doc/src/files-and-resources     qtkernel/doc/src/");
 run("git mv doc/src/frameworks-technologies/activeqt* activeqt/doc/src/");
 # run("git mv doc/src/frameworks-technologies qtkernel/doc/src/");
@@ -121,7 +121,7 @@ processModule("qtkernel");
 processModule("qtsvg");
 processModule("qtxmlpatterns");
 processModule("qtscript");
-processModule("qtquick");
+processModule("qtdeclarative");
 processModule("activeqt");
 processModule("qt3support");
 processModule("phonon");
diff --git a/scripts/300_autotests b/scripts/300_autotests
index cacd4f8..67a5740 100644
--- a/scripts/300_autotests
+++ b/scripts/300_autotests
@@ -24,7 +24,7 @@ use File::Basename;
 my $debugScript = 0;
 
 # Move the data files of bic from global to modules
-our @bicRepos =  ('qtkernel' , 'qtsvg', 'qtquick', 'qt3support', 'qtscript', 'phonon', 'qtmultimedia', 'qttools', 'qtxmlpatterns');
+our @bicRepos =  ('qtkernel' , 'qtsvg', 'qtdeclarative', 'qt3support', 'qtscript', 'phonon', 'qtmultimedia', 'qttools', 'qtxmlpatterns');
 foreach (@bicRepos) {
     my $module = $_;
     ensureDir("$module/tests/auto/bic/data");
@@ -48,7 +48,7 @@ run("git mv tests/auto/bic/data/QtDBus* qtkernel/tests/auto/bic/data");
 
 run("git mv tests/auto/bic/data/QtSvg* qtsvg/tests/auto/bic/data");
 
-run("git mv tests/auto/bic/data/QtDeclarative* qtquick/tests/auto/bic/data");
+run("git mv tests/auto/bic/data/QtDeclarative* qtdeclarative/tests/auto/bic/data");
 
 run("git mv tests/auto/bic/data/Qt3Support* qt3support/tests/auto/bic/data");
 
@@ -140,9 +140,9 @@ processProfile("multimedia.pro", "qtmultimedia");
 processProfile("webkit.pro", "");
 processProfile("help.pro", "qttools");
 
-ensureDir("qtquick/tests/auto");
-run("git mv tests/auto/declarative qtquick/tests/auto/");
-run("git mv tests/auto/declarative.pro qtquick/tests/auto/auto.pro");
+ensureDir("qtdeclarative/tests/auto");
+run("git mv tests/auto/declarative qtdeclarative/tests/auto/");
+run("git mv tests/auto/declarative.pro qtdeclarative/tests/auto/auto.pro");
 
 #they are in other.pro, but on the same line
 run("git mv tests/auto/qzip qtkernel/tests/auto/");
@@ -151,10 +151,10 @@ run("git mv tests/auto/uic3 qt3support/tests/auto/");
 
 
 #  benchmarks
-ensureDir("qtquick/tests/benchmarks");
+ensureDir("qtdeclarative/tests/benchmarks");
 ensureDir("qtsvg/tests/benchmarks");
 ensureDir("qtscript/tests/benchmarks");
-run("git mv tests/benchmarks/declarative qtquick/tests/benchmarks");
+run("git mv tests/benchmarks/declarative qtdeclarative/tests/benchmarks");
 run("git mv tests/benchmarks/svg qtsvg/tests/benchmarks");
 run("git mv tests/benchmarks/script qtscript/tests/benchmarks");
 run("git mv tests/benchmarks qtkernel/tests/");
@@ -164,13 +164,13 @@ run("git mv tests/benchmarks qtkernel/tests/");
 run("git mv tests/shared qtkernel/tests");
 run("git mv tests/auto/*.h qtkernel/tests/auto");
 
-ensureDir("qtquick/tests/shared");
-fsCopy("qtkernel/tests/shared/util.h", "qtquick/tests/shared/");
+ensureDir("qtdeclarative/tests/shared");
+fsCopy("qtkernel/tests/shared/util.h", "qtdeclarative/tests/shared/");
 ensureDir("qt3support/tests/shared");
 fsCopy("qtkernel/tests/shared/util.h", "qt3support/tests/shared/");
 ensureDir("qtscript/tests/shared");
 fsCopy("qtkernel/tests/shared/util.h", "qtscript/tests/shared/");
-run("git add qtquick/tests/shared/util.h qt3support/tests/shared/util.h qtscript/tests/shared/util.h");
+run("git add qtdeclarative/tests/shared/util.h qt3support/tests/shared/util.h qtscript/tests/shared/util.h");
 
 
 fsCopy("qtkernel/tests/auto/network-settings.h", "qt3support/tests/auto/");
@@ -204,7 +204,7 @@ run("echo !cross_compile:SUBDIRS += uic3 >> qt3support/tests/auto/auto.pro");
 run("echo SUBDIRS += linguist >> qttools/tests/auto/auto.pro");
 
 run("git mv tests/tests.pro qtkernel/tests/");
-createSubdirProfile("qtquick/tests");
+createSubdirProfile("qtdeclarative/tests");
 createSubdirProfile("qt3support/tests");
 createSubdirProfile("qtsvg/tests");
 createSubdirProfile("qtscript/tests");
diff --git a/scripts/950_pulse_dep_tree b/scripts/950_pulse_dep_tree
index 49dc80b..f2a2c79 100644
--- a/scripts/950_pulse_dep_tree
+++ b/scripts/950_pulse_dep_tree
@@ -46,7 +46,7 @@ my %dep_to_sync_profile_map = (
     "Qt3Support" => "qt3support/sync.profile",
     "QtWebKit" => "qtwebkit/Source/sync.profile",
     "QtWebKit-tests" => "qtwebkit/Source/sync.profile",
-    "QtDeclarative" => "qtquick/sync.profile",
+    "QtDeclarative" => "qtdeclarative/sync.profile",
     "QtMultimedia" => "qtmultimedia/sync.profile",
     "ActiveQt" => "activeqt/sync.profile",
 );
diff --git a/scripts/non-module-helpers b/scripts/non-module-helpers
index 30ba456..dfacf3c 100644
--- a/scripts/non-module-helpers
+++ b/scripts/non-module-helpers
@@ -3,7 +3,7 @@
 # -------------------------------------------------------------------------
 
 my %module2DirectoryMapping = (
-    declarative => "qtquick",
+    declarative => "qtdeclarative",
     opengl => "qtkernel",
     openvg => "qtkernel",
     dbus => "qtkernel",