Change activeqt repo to qtactiveqt

13 files changed, 77 insertions, 77 deletions

diff --git a/afterlive/activeqt/0001-Add-module.prf-and-install-MODULE_PRI-for-each-modul.patch b/afterlive/qtactiveqt/0001-Add-module.prf-and-install-MODULE_PRI-for-each-modul.patch
index 54b854e..73ba6be 100644
--- a/afterlive/activeqt/0001-Add-module.prf-and-install-MODULE_PRI-for-each-modul.patch
+++ b/afterlive/qtactiveqt/0001-Add-module.prf-and-install-MODULE_PRI-for-each-modul.patch
@@ -13,7 +13,7 @@ diff --git a/src/src.pro b/src/src.pro
 index 9026c51..faa866d 100644
 --- a/src/src.pro
 +++ b/src/src.pro
-@@ -4,3 +4,6 @@ subdir_activeqt.subdir = $$IN_PWD/activeqt
+@@ -4,3 +4,6 @@ subdir_activeqt.subdir = $$IN_PWD/qtactiveqt
  subdir_activeqt.target = sub_activeqt
  
  SUBDIRS += subdir_activeqt
diff --git a/modularize b/modularize
index 41b19cf..8ce13ec 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 = ('qtbase', 'qtsvg', 'qtdeclarative', 'qt3support', 'activeqt',
+our @repos = ('qtbase', 'qtsvg', 'qtdeclarative', 'qt3support', 'qtactiveqt',
               'qtscript', 'phonon', 'qtmultimedia', 'qttools', 'qtxmlpatterns',
               'qttranslations', 'qtdoc', 'qlalr', 'qtrepotools', 'qtwebkit-examples-and-demos',
               'qtqa'
diff --git a/patches/0062-Added-needed-profile-files-for-ActiveQt.patch b/patches/0062-Added-needed-profile-files-for-ActiveQt.patch
index 85b6296..2a70bb8 100644
--- a/patches/0062-Added-needed-profile-files-for-ActiveQt.patch
+++ b/patches/0062-Added-needed-profile-files-for-ActiveQt.patch
@@ -4,21 +4,21 @@ Date: Thu, 27 Jan 2011 09:30:40 +0100
 Subject: [PATCH] Added needed profile files for ActiveQt.
 
 ---
- activeqt/activeqt.pro            |   18 ++++++++++++++++++
- activeqt/modules/qt_activeqt.pri |   15 +++++++++++++++
- activeqt/src/src.pro             |    6 ++++++
- activeqt/sync.profile            |   13 +++++++++++++
+ qtactiveqt/qtactiveqt.pro          |   18 ++++++++++++++++++
+ qtactiveqt/modules/qt_activeqt.pri |   15 +++++++++++++++
+ qtactiveqt/src/src.pro             |    6 ++++++
+ qtactiveqt/sync.profile            |   13 +++++++++++++
  4 files changed, 52 insertions(+), 0 deletions(-)
- create mode 100644 activeqt/activeqt.pro
- create mode 100644 activeqt/modules/qt_activeqt.pri
- create mode 100644 activeqt/src/src.pro
- create mode 100644 activeqt/sync.profile
+ create mode 100644 qtactiveqt/qtactiveqt.pro
+ create mode 100644 qtactiveqt/modules/qt_activeqt.pri
+ create mode 100644 qtactiveqt/src/src.pro
+ create mode 100644 qtactiveqt/sync.profile
 
-diff --git a/activeqt/activeqt.pro b/activeqt/activeqt.pro
+diff --git a/qtactiveqt/qtactiveqt.pro b/qtactiveqt/qtactiveqt.pro
 new file mode 100644
 index 0000000..db56e0e
 --- /dev/null
-+++ b/activeqt/activeqt.pro
++++ b/qtactiveqt/qtactiveqt.pro
 @@ -0,0 +1,18 @@
 +TEMPLATE = subdirs
 +
@@ -38,11 +38,11 @@ index 0000000..db56e0e
 +SUBDIRS = activeqt_src \
 +          activeqt_tools \
 +          activeqt_examples
-diff --git a/activeqt/modules/qt_activeqt.pri b/activeqt/modules/qt_activeqt.pri
+diff --git a/qtactiveqt/modules/qt_activeqt.pri b/qtactiveqt/modules/qt_activeqt.pri
 new file mode 100644
 index 0000000..fe6a421
 --- /dev/null
-+++ b/activeqt/modules/qt_activeqt.pri
++++ b/qtactiveqt/modules/qt_activeqt.pri
 @@ -0,0 +1,15 @@
 +QT_DECLARATIVE_VERSION = $$QT_VERSION
 +QT_DECLARATIVE_MAJOR_VERSION = $$QT_MAJOR_VERSION
@@ -59,11 +59,11 @@ index 0000000..fe6a421
 +QT.activeqt.DEFINES = QT_ACTIVEQT_LIB
 +
 +QT_CONFIG += activeqt
-diff --git a/activeqt/src/src.pro b/activeqt/src/src.pro
+diff --git a/qtactiveqt/src/src.pro b/qtactiveqt/src/src.pro
 new file mode 100644
 index 0000000..9026c51
 --- /dev/null
-+++ b/activeqt/src/src.pro
++++ b/qtactiveqt/src/src.pro
 @@ -0,0 +1,6 @@
 +TEMPLATE = subdirs
 +
@@ -71,11 +71,11 @@ index 0000000..9026c51
 +subdir_activeqt.target = sub_activeqt
 +
 +SUBDIRS += subdir_activeqt
-diff --git a/activeqt/sync.profile b/activeqt/sync.profile
+diff --git a/qtactiveqt/sync.profile b/qtactiveqt/sync.profile
 new file mode 100644
 index 0000000..22c222d
 --- /dev/null
-+++ b/activeqt/sync.profile
++++ b/qtactiveqt/sync.profile
 @@ -0,0 +1,13 @@
 +%modules = ( # path to module name map
 +    "ActiveQt" => "$basedir/src/activeqt",
diff --git a/patches/0063-Changed-various-path-references-in-ActiveQt-to-match.patch b/patches/0063-Changed-various-path-references-in-ActiveQt-to-match.patch
index 189a487..93751f8 100644
--- a/patches/0063-Changed-various-path-references-in-ActiveQt-to-match.patch
+++ b/patches/0063-Changed-various-path-references-in-ActiveQt-to-match.patch
@@ -4,15 +4,15 @@ Date: Thu, 27 Jan 2011 09:34:10 +0100
 Subject: [PATCH] Changed various path references in ActiveQt to match modularization.
 
 ---
- activeqt/src/activeqt/container/container.pro |    6 ++++--
- activeqt/src/activeqt/control/control.pro     |    6 ++++--
- activeqt/tools/testcon/testcon.pro            |    4 ++--
+ qtactiveqt/src/activeqt/container/container.pro |    6 ++++--
+ qtactiveqt/src/activeqt/control/control.pro     |    6 ++++--
+ qtactiveqt/tools/testcon/testcon.pro            |    4 ++--
  3 files changed, 10 insertions(+), 6 deletions(-)
 
-diff --git a/activeqt/src/activeqt/container/container.pro b/activeqt/src/activeqt/container/container.pro
+diff --git a/qtactiveqt/src/activeqt/container/container.pro b/qtactiveqt/src/activeqt/container/container.pro
 index 4c9b3a8..57845b0 100644
---- a/activeqt/src/activeqt/container/container.pro
-+++ b/activeqt/src/activeqt/container/container.pro
+--- a/qtactiveqt/src/activeqt/container/container.pro
++++ b/qtactiveqt/src/activeqt/container/container.pro
 @@ -4,7 +4,7 @@ TARGET   = ActiveQt
  CONFIG += qt_install_headers
  SYNCQT.HEADER_FILES = qaxbase.h qaxobject.h qaxscript.h qaxselect.h qaxwidget.h
@@ -34,10 +34,10 @@ index 4c9b3a8..57845b0 100644
  
  LIBS    += -lole32 -loleaut32
  !wince*:LIBS    += -luser32 -lgdi32 -ladvapi32
-diff --git a/activeqt/src/activeqt/control/control.pro b/activeqt/src/activeqt/control/control.pro
+diff --git a/qtactiveqt/src/activeqt/control/control.pro b/qtactiveqt/src/activeqt/control/control.pro
 index 361ca29..3f7af07 100644
---- a/activeqt/src/activeqt/control/control.pro
-+++ b/activeqt/src/activeqt/control/control.pro
+--- a/qtactiveqt/src/activeqt/control/control.pro
++++ b/qtactiveqt/src/activeqt/control/control.pro
 @@ -4,7 +4,7 @@ TARGET   = ActiveQt
  CONFIG += qt_install_headers
  SYNCQT.HEADER_FILES = qaxaggregated.h qaxbindable.h qaxfactory.h
@@ -59,10 +59,10 @@ index 361ca29..3f7af07 100644
  
  DEFINES	+= QAX_SERVER
  win32-g++*:DEFINES += QT_NEEDS_QMAIN
-diff --git a/activeqt/tools/testcon/testcon.pro b/activeqt/tools/testcon/testcon.pro
+diff --git a/qtactiveqt/tools/testcon/testcon.pro b/qtactiveqt/tools/testcon/testcon.pro
 index 89f8067..07df464 100644
---- a/activeqt/tools/testcon/testcon.pro
-+++ b/activeqt/tools/testcon/testcon.pro
+--- a/qtactiveqt/tools/testcon/testcon.pro
++++ b/qtactiveqt/tools/testcon/testcon.pro
 @@ -14,8 +14,8 @@ FORMS	 = mainwindow.ui invokemethod.ui changeproperties.ui ambientproperties.ui
  RC_FILE	 = testcon.rc
  
diff --git a/patches/0064-Changed-references-to-ActiveQt-resources.patch b/patches/0064-Changed-references-to-ActiveQt-resources.patch
index 6bf413e..881ddde 100644
--- a/patches/0064-Changed-references-to-ActiveQt-resources.patch
+++ b/patches/0064-Changed-references-to-ActiveQt-resources.patch
@@ -4,18 +4,18 @@ Date: Thu, 27 Jan 2011 09:46:25 +0100
 Subject: [PATCH] Changed references to ActiveQt resources.
 
 ---
- activeqt/examples/activeqt/hierarchy/hierarchy.pro |    4 ++--
- activeqt/examples/activeqt/menus/menus.pro         |    2 +-
- activeqt/examples/activeqt/multiple/multiple.pro   |    2 +-
- activeqt/examples/activeqt/opengl/opengl.pro       |    2 +-
- activeqt/examples/activeqt/simple/simple.pro       |    2 +-
- activeqt/examples/activeqt/wrapper/wrapper.pro     |    2 +-
+ qtactiveqt/examples/activeqt/hierarchy/hierarchy.pro |    4 ++--
+ qtactiveqt/examples/activeqt/menus/menus.pro         |    2 +-
+ qtactiveqt/examples/activeqt/multiple/multiple.pro   |    2 +-
+ qtactiveqt/examples/activeqt/opengl/opengl.pro       |    2 +-
+ qtactiveqt/examples/activeqt/simple/simple.pro       |    2 +-
+ qtactiveqt/examples/activeqt/wrapper/wrapper.pro     |    2 +-
  6 files changed, 7 insertions(+), 7 deletions(-)
 
-diff --git a/activeqt/examples/activeqt/hierarchy/hierarchy.pro b/activeqt/examples/activeqt/hierarchy/hierarchy.pro
+diff --git a/qtactiveqt/examples/activeqt/hierarchy/hierarchy.pro b/qtactiveqt/examples/activeqt/hierarchy/hierarchy.pro
 index abe5f1b..732bbde 100644
---- a/activeqt/examples/activeqt/hierarchy/hierarchy.pro
-+++ b/activeqt/examples/activeqt/hierarchy/hierarchy.pro
+--- a/qtactiveqt/examples/activeqt/hierarchy/hierarchy.pro
++++ b/qtactiveqt/examples/activeqt/hierarchy/hierarchy.pro
 @@ -6,8 +6,8 @@ contains(CONFIG, static):DEFINES += QT_NODLL
  
  SOURCES	 = objects.cpp main.cpp
@@ -27,10 +27,10 @@ index abe5f1b..732bbde 100644
  
  # install
  target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/hierarchy
-diff --git a/activeqt/examples/activeqt/menus/menus.pro b/activeqt/examples/activeqt/menus/menus.pro
+diff --git a/qtactiveqt/examples/activeqt/menus/menus.pro b/qtactiveqt/examples/activeqt/menus/menus.pro
 index c962b6b..fc61e8a 100644
---- a/activeqt/examples/activeqt/menus/menus.pro
-+++ b/activeqt/examples/activeqt/menus/menus.pro
+--- a/qtactiveqt/examples/activeqt/menus/menus.pro
++++ b/qtactiveqt/examples/activeqt/menus/menus.pro
 @@ -5,7 +5,7 @@ CONFIG	+= qt warn_off qaxserver
  
  SOURCES	 = main.cpp menus.cpp
@@ -40,10 +40,10 @@ index c962b6b..fc61e8a 100644
  
  # install
  target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/menus
-diff --git a/activeqt/examples/activeqt/multiple/multiple.pro b/activeqt/examples/activeqt/multiple/multiple.pro
+diff --git a/qtactiveqt/examples/activeqt/multiple/multiple.pro b/qtactiveqt/examples/activeqt/multiple/multiple.pro
 index 7b86950..058e966 100644
---- a/activeqt/examples/activeqt/multiple/multiple.pro
-+++ b/activeqt/examples/activeqt/multiple/multiple.pro
+--- a/qtactiveqt/examples/activeqt/multiple/multiple.pro
++++ b/qtactiveqt/examples/activeqt/multiple/multiple.pro
 @@ -7,7 +7,7 @@ contains(CONFIG, static):DEFINES += QT_NODLL
  SOURCES	 = main.cpp
  HEADERS	 = ax1.h ax2.h
@@ -53,10 +53,10 @@ index 7b86950..058e966 100644
  
  # install
  target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/multiple
-diff --git a/activeqt/examples/activeqt/opengl/opengl.pro b/activeqt/examples/activeqt/opengl/opengl.pro
+diff --git a/qtactiveqt/examples/activeqt/opengl/opengl.pro b/qtactiveqt/examples/activeqt/opengl/opengl.pro
 index 8eb81be..f570dbe 100644
---- a/activeqt/examples/activeqt/opengl/opengl.pro
-+++ b/activeqt/examples/activeqt/opengl/opengl.pro
+--- a/qtactiveqt/examples/activeqt/opengl/opengl.pro
++++ b/qtactiveqt/examples/activeqt/opengl/opengl.pro
 @@ -10,7 +10,7 @@ HEADERS	 = glbox.h \
  SOURCES	 = glbox.cpp \
  	   globjwin.cpp \
@@ -66,10 +66,10 @@ index 8eb81be..f570dbe 100644
  
  # install
  target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/opengl
-diff --git a/activeqt/examples/activeqt/simple/simple.pro b/activeqt/examples/activeqt/simple/simple.pro
+diff --git a/qtactiveqt/examples/activeqt/simple/simple.pro b/qtactiveqt/examples/activeqt/simple/simple.pro
 index d0f2019..4742370 100644
---- a/activeqt/examples/activeqt/simple/simple.pro
-+++ b/activeqt/examples/activeqt/simple/simple.pro
+--- a/qtactiveqt/examples/activeqt/simple/simple.pro
++++ b/qtactiveqt/examples/activeqt/simple/simple.pro
 @@ -4,7 +4,7 @@ TARGET	 = simpleax
  CONFIG	+= qt warn_off qaxserver
  
@@ -79,10 +79,10 @@ index d0f2019..4742370 100644
  
  # install
  target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/simple
-diff --git a/activeqt/examples/activeqt/wrapper/wrapper.pro b/activeqt/examples/activeqt/wrapper/wrapper.pro
+diff --git a/qtactiveqt/examples/activeqt/wrapper/wrapper.pro b/qtactiveqt/examples/activeqt/wrapper/wrapper.pro
 index 4eb6baf..d5443dc 100644
---- a/activeqt/examples/activeqt/wrapper/wrapper.pro
-+++ b/activeqt/examples/activeqt/wrapper/wrapper.pro
+--- a/qtactiveqt/examples/activeqt/wrapper/wrapper.pro
++++ b/qtactiveqt/examples/activeqt/wrapper/wrapper.pro
 @@ -6,7 +6,7 @@ contains(CONFIG, static):DEFINES += QT_NODLL
  
  SOURCES	 = main.cpp
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 c41872c..c778bbb 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
@@ -4,7 +4,7 @@ Date: Thu, 17 Mar 2011 10:57:48 +0100
 Subject: [PATCH] Added QT.<module>.imports support to module profiles.
 
 ---
- activeqt/modules/qt_activeqt.pri         |    1 +
+ qtactiveqt/modules/qt_activeqt.pri       |    1 +
  phonon/modules/qt_phonon.pri             |    1 +
  qt3support/modules/qt_qt3support.pri     |    1 +
  qtbase/bin/syncqt                      |    1 +
@@ -30,10 +30,10 @@ Subject: [PATCH] Added QT.<module>.imports support to module profiles.
  qtxmlpatterns/modules/qt_xmlpatterns.pri |    1 +
  24 files changed, 24 insertions(+), 0 deletions(-)
 
-diff --git a/activeqt/modules/qt_activeqt.pri b/activeqt/modules/qt_activeqt.pri
+diff --git a/qtactiveqt/modules/qt_activeqt.pri b/qtactiveqt/modules/qt_activeqt.pri
 index fe6a421..c10d06d 100644
---- a/activeqt/modules/qt_activeqt.pri
-+++ b/activeqt/modules/qt_activeqt.pri
+--- a/qtactiveqt/modules/qt_activeqt.pri
++++ b/qtactiveqt/modules/qt_activeqt.pri
 @@ -9,6 +9,7 @@ QT.activeqt.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/ActiveQ
  QT.activeqt.private_includes = $$QT_MODULE_INCLUDE_BASE/ActiveQt/private
  QT.activeqt.sources = $$QT_MODULE_BASE/src/activeqt
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 317cfd6..6ac6978 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
@@ -4,7 +4,7 @@ Date: Tue, 22 Mar 2011 13:20:53 +0100
 Subject: [PATCH] Introduced the QT.<module>.plugins variable to module profiles.
 
 ---
- activeqt/modules/qt_activeqt.pri                   |    1 +
+ qtactiveqt/modules/qt_activeqt.pri                 |    1 +
  phonon/modules/qt_phonon.pri                       |    1 +
  phonon/src/plugins/phonon/mmf/mmf.pro              |    2 +-
  qt3support/modules/qt_qt3support.pri               |    1 +
@@ -96,10 +96,10 @@ Subject: [PATCH] Introduced the QT.<module>.plugins variable to module profiles.
  qtxmlpatterns/modules/qt_xmlpatterns.pri           |    1 +
  90 files changed, 91 insertions(+), 65 deletions(-)
 
-diff --git a/activeqt/modules/qt_activeqt.pri b/activeqt/modules/qt_activeqt.pri
+diff --git a/qtactiveqt/modules/qt_activeqt.pri b/qtactiveqt/modules/qt_activeqt.pri
 index c10d06d..e2f8132 100644
---- a/activeqt/modules/qt_activeqt.pri
-+++ b/activeqt/modules/qt_activeqt.pri
+--- a/qtactiveqt/modules/qt_activeqt.pri
++++ b/qtactiveqt/modules/qt_activeqt.pri
 @@ -9,6 +9,7 @@ QT.activeqt.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/ActiveQ
  QT.activeqt.private_includes = $$QT_MODULE_INCLUDE_BASE/ActiveQt/private
  QT.activeqt.sources = $$QT_MODULE_BASE/src/activeqt
diff --git a/qt5/qt.pro b/qt5/qt.pro
index 415939c..6a18ca0 100644
--- a/qt5/qt.pro
+++ b/qt5/qt.pro
@@ -57,7 +57,7 @@ module_qtdoc.subdir = $$IN_PWD/qtdoc
 module_qtdoc.target = module-qtdoc
 module_qtdoc.depends = module_qtdeclarative module_qttools #for the demos and QtHelp
 
-module_activeqt.subdir = $$IN_PWD/activeqt
+module_activeqt.subdir = $$IN_PWD/qtactiveqt
 module_activeqt.target = module-activeqt
 module_activeqt.depends = module_qtbase
 
diff --git a/scripts/080_activeqt b/scripts/080_qtactiveqt
index 9e2e269..97a951e 100644
--- a/scripts/080_activeqt
+++ b/scripts/080_qtactiveqt
@@ -17,9 +17,9 @@
 #                                    it if it does not exist.
 #--------------------------------------------------------------------------------------------------
 
-ensureDir("activeqt/src");
-run("git mv src/activeqt activeqt/src/activeqt");
-run("git mv tools/activeqt activeqt/tools");
-run("git mv activeqt/tools/activeqt.pro activeqt/tools/tools.pro");
+ensureDir("qtactiveqt/src");
+run("git mv src/activeqt qtactiveqt/src/activeqt");
+run("git mv tools/activeqt qtactiveqt/tools");
+run("git mv qtactiveqt/tools/activeqt.pro qtactiveqt/tools/tools.pro");
 
 return 1;
diff --git a/scripts/200_examples b/scripts/200_examples
index 1807e6a..129ba90 100644
--- a/scripts/200_examples
+++ b/scripts/200_examples
@@ -92,9 +92,9 @@ if ($isMaster) {
     run("git mv examples/xmlpatterns qtxmlpatterns/examples");
 }
 
-ensureDir("activeqt/examples");
-run("git mv examples/activeqt activeqt/examples");
-createSubdirProfile("activeqt/examples");
+ensureDir("qtactiveqt/examples");
+run("git mv examples/activeqt qtactiveqt/examples");
+createSubdirProfile("qtactiveqt/examples");
 
 # Then the rest that we haven't handled.
 my @examples = findFiles("examples", ".*", 1);
@@ -141,7 +141,7 @@ createSubdirProfile("qt3support/examples");
 foreach (@repos) {
     my $module = $_;
     #printf("Module %s\n", $module);
-    next if ($_ eq "activeqt" || $_ eq "phonon");
+    next if ($_ eq "qtactiveqt" || $_ eq "phonon");
 
     my @pros = findFiles("$module/examples/", "\\.pr[io]", 1);
     if ($OStype == WINDOWS) {
diff --git a/scripts/220_demos b/scripts/220_demos
index c3096f9..4142b78 100644
--- a/scripts/220_demos
+++ b/scripts/220_demos
@@ -85,7 +85,7 @@ createSubdirProfile("qtsvg/demos");
 foreach (@repos) {
     my $module = $_;
     #printf("Module %s\n", $module);
-    #next if ($_ eq "activeqt" || $_ eq "phonon");
+    #next if ($_ eq "qtactiveqt" || $_ eq "phonon");
 
     my @pros = findFiles("$module/demos/", "\\.pr[io]", 1);
     if ($OStype == WINDOWS) {
diff --git a/scripts/250_docs b/scripts/250_docs
index 65f1e30..8b8abe9 100644
--- a/scripts/250_docs
+++ b/scripts/250_docs
@@ -19,7 +19,7 @@
 
 ensureDir("qtdeclarative/doc/src");
 ensureDir("qtbase/doc/src");
-ensureDir("activeqt/doc/src");
+ensureDir("qtactiveqt/doc/src");
 ensureDir("qtscript/doc/src");
 ensureDir("qt3support/doc/src");
 ensureDir("qtxmlpatterns/doc/src");
@@ -28,7 +28,7 @@ ensureDir("qtxmlpatterns/doc/src/snippets");
 
 run("git mv doc/src/declarative             qtdeclarative/doc/src/");
 run("git mv doc/src/files-and-resources     qtbase/doc/src/");
-run("git mv doc/src/frameworks-technologies/activeqt* activeqt/doc/src/");
+run("git mv doc/src/frameworks-technologies/activeqt* qtactiveqt/doc/src/");
 # run("git mv doc/src/frameworks-technologies qtbase/doc/src/");
 # run("git mv doc/src/internationalization    qtbase/doc/src/");
 run("git mv doc/src/network-programming     qtbase/doc/src/");
@@ -45,7 +45,7 @@ run("git mv doc/src/snippets/patternist     qtxmlpatterns/doc/src/snippets/");
 
 #TODO:  to be completed
 
-run("git mv doc/src/examples/activeqt      activeqt/doc/src/examples");
+run("git mv doc/src/examples/activeqt      qtactiveqt/doc/src/examples");
 
 my @processed;
 
@@ -122,7 +122,7 @@ processModule("qtsvg");
 processModule("qtxmlpatterns");
 processModule("qtscript");
 processModule("qtdeclarative");
-processModule("activeqt");
+processModule("qtactiveqt");
 processModule("qt3support");
 processModule("phonon");
 
diff --git a/scripts/950_pulse_dep_tree b/scripts/950_pulse_dep_tree
index 497da7a..22e1a85 100644
--- a/scripts/950_pulse_dep_tree
+++ b/scripts/950_pulse_dep_tree
@@ -48,7 +48,7 @@ my %dep_to_sync_profile_map = (
     "QtWebKit-tests" => "qtwebkit/Source/sync.profile",
     "QtDeclarative" => "qtdeclarative/sync.profile",
     "QtMultimedia" => "qtmultimedia/sync.profile",
-    "ActiveQt" => "activeqt/sync.profile",
+    "ActiveQt" => "qtactiveqt/sync.profile",
 );
 # Reverse map as well, with key = string, value = (@modules).
 my %sync_profile_to_dep_map;