Remove submodules which are not part of Qt 5.0.
authorStephen Kelly <stephen.kelly@kdab.com>
Mon, 29 Oct 2012 15:05:29 +0000 (16:05 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 30 Oct 2012 15:21:34 +0000 (16:21 +0100)
Task-number: QTBUG-27736
Change-Id: I737515d2cfe687448a03b67ce9f2c14d108f2a1d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
.gitmodules
qlalr [deleted submodule]
qt.pro
qt3d [deleted submodule]
qtconnectivity [deleted submodule]
qtfeedback [deleted submodule]
qtlocation [deleted submodule]
qtpim [deleted submodule]
qtsensors [deleted submodule]
qtsystems [deleted submodule]
qtwayland [deleted submodule]

index ba2aa2e..13ae4fe 100644 (file)
@@ -28,9 +28,6 @@
 [submodule "qtdoc"]
        path = qtdoc
        url = git://gitorious.org/qt/qtdoc.git
-[submodule "qlalr"]
-       path = qlalr
-       url = git://gitorious.org/qt/qlalr.git
 [submodule "qtrepotools"]
        path = qtrepotools
        url = git://gitorious.org/qt/qtrepotools.git
 [submodule "qtwebkit"]
        path = qtwebkit
        url = git://gitorious.org/qtwebkit/qt5-module.git
-[submodule "qtlocation"]
-       path = qtlocation
-       url = git://gitorious.org/qt/qtlocation.git
-[submodule "qtsensors"]
-       path = qtsensors
-       url = git://gitorious.org/qt/qtsensors.git
-[submodule "qtsystems"]
-       path = qtsystems
-       url = git://gitorious.org/qt/qtsystems.git
-[submodule "qtfeedback"]
-       path = qtfeedback
-       url = git://gitorious.org/qt/qtfeedback.git
-[submodule "qtpim"]
-       path = qtpim
-       url = git://gitorious.org/qt/qtpim.git
-[submodule "qtconnectivity"]
-       path = qtconnectivity
-       url = git://gitorious.org/qt/qtconnectivity.git
-[submodule "qtwayland"]
-       path = qtwayland
-       url = git://gitorious.org/qt/qtwayland.git
-[submodule "qt3d"]
-       path = qt3d
-       url = git://gitorious.org/qt/qt3d.git
 [submodule "qtjsbackend"]
        path = qtjsbackend
        url = git://gitorious.org/qt/qtjsbackend.git
diff --git a/qlalr b/qlalr
deleted file mode 160000 (submodule)
index d7064c2..0000000
--- a/qlalr
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d7064c2c7dfb36646811d2aefd097a8de9419894
diff --git a/qt.pro b/qt.pro
index 21a0cec..626ac21 100644 (file)
--- a/qt.pro
+++ b/qt.pro
@@ -51,52 +51,14 @@ module_qtactiveqt.subdir = qtactiveqt
 module_qtactiveqt.target = module-qtactiveqt
 module_qtactiveqt.depends = module_qtbase
 
-module_qlalr.subdir = qlalr
-module_qlalr.target = module-qlalr
-module_qlalr.depends = module_qtbase
-
 module_qtqa.subdir = qtqa
 module_qtqa.target = module-qtqa
 module_qtqa.depends = module_qtbase
 
-module_qtlocation.subdir = qtlocation
-module_qtlocation.target = module-qtlocation
-module_qtlocation.depends = module_qtbase
-
-module_qtsensors.subdir = qtsensors
-module_qtsensors.target = module-qtsensors
-module_qtsensors.depends = module_qtbase
-
-module_qtsystems.subdir = qtsystems
-module_qtsystems.target = module-qtsystems
-module_qtsystems.depends = module_qtbase
-
 module_qtmultimedia.subdir = qtmultimedia
 module_qtmultimedia.target = module-qtmultimedia
 module_qtmultimedia.depends = module_qtbase
 
-module_qtfeedback.subdir = qtfeedback
-module_qtfeedback.target = module-qtfeedback
-module_qtfeedback.depends = module_qtbase module_qtdeclarative
-
-module_qt3d.subdir = qt3d
-module_qt3d.target = module-qt3d
-module_qt3d.depends = module_qtbase module_qtdeclarative
-
-module_qtpim.subdir = qtpim
-module_qtpim.target = module-qtpim
-module_qtpim.depends = module_qtdeclarative
-
-module_qtconnectivity.subdir = qtconnectivity
-module_qtconnectivity.target = module-qtconnectivity
-module_qtconnectivity.depends = module_qtsystems
-
-module_qtwayland.subdir = qtwayland
-module_qtwayland.target = module-qtwayland
-module_qtwayland.depends = module_qtbase
-# not yet enabled by default
-module_qtwayland.CONFIG = no_default_target no_default_install
-
 module_qtimageformats.subdir = qtimageformats
 module_qtimageformats.target = module-qtimageformats
 module_qtimageformats.depends = module_qtbase
@@ -133,41 +95,10 @@ exists(qtdeclarative/qtdeclarative.pro) {
     SUBDIRS += module_qtdeclarative
     # These modules do not require qtdeclarative, but can use it if it is available
     module_qttools.depends += module_qtdeclarative
-    module_qtsensors.depends += module_qtdeclarative
-    module_qtsystems.depends += module_qtdeclarative
     module_qtmultimedia.depends += module_qtdeclarative
-    module_qtwayland.depends += module_qtdeclarative
-}
-exists(qt3d/qt3d.pro) {
-    SUBDIRS += module_qt3d
-    # These modules do not require qt3d, but can use it if it is available
-    module_qtlocation.depends += module_qtdeclarative module_qt3d
 }
 exists(qtscript/qtscript.pro): SUBDIRS += module_qtscript
-exists(qtlocation/qtlocation.pro) {
-    SUBDIRS += module_qtlocation
-    # These modules do not require qtlocation, but can use it if it is available
-    module_qtwebkit.depends += module_qtlocation
-}
-exists(qtsensors/qtsensors.pro) {
-    SUBDIRS += module_qtsensors
-    # These modules do not require qtsensors, but can use it if it is available
-    module_qtwebkit.depends += module_qtsensors
-}
-exists(qtsystems/qtsystems.pro) {
-    SUBDIRS += module_qtsystems
-    # These modules do not require qtsystems, but can use it if it is available
-    module_qtlocation.depends += module_qtsystems
-}
-exists(qtmultimedia/qtmultimedia.pro) {
-    SUBDIRS += module_qtmultimedia
-    # These modules do not require qtmultimedia, but can use it if it is available
-    module_qtfeedback.depends += module_qtmultimedia
-    module_qtlocation.depends += module_qtmultimedia
-}
-exists(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback
-exists(qtpim/qtpim.pro): SUBDIRS += module_qtpim
-exists(qtconnectivity/qtconnectivity.pro): SUBDIRS += module_qtconnectivity
+exists(qtmultimedia/qtmultimedia.pro): SUBDIRS += module_qtmultimedia
 exists(qtactiveqt/qtactiveqt.pro) {
     SUBDIRS += module_qtactiveqt
     module_qttools.depends += module_qtactiveqt
@@ -189,10 +120,8 @@ exists(qttools/qttools.pro) {
     module_qtquick1.depends += module_qttools
 }
 exists(qtquick1/qtquick1.pro): SUBDIRS += module_qtquick1
-!win32:!mac:exists(qtwayland/qtwayland.pro): SUBDIRS += module_qtwayland
 exists(qtimageformats/qtimageformats.pro): SUBDIRS += module_qtimageformats
 exists(qtgraphicaleffects/qtgraphicaleffects.pro): SUBDIRS += module_qtgraphicaleffects
 exists(qttranslations/qttranslations.pro): SUBDIRS += module_qttranslations
 exists(qtdoc/qtdoc.pro): SUBDIRS += module_qtdoc
 exists(qtqa/qtqa.pro): SUBDIRS += module_qtqa
-exists(qlalr/qlalr.pro): SUBDIRS += module_qlalr
diff --git a/qt3d b/qt3d
deleted file mode 160000 (submodule)
index 6b8ee02..0000000
--- a/qt3d
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6b8ee028ac0daae74f5521b9e5562f94b5e8e169
diff --git a/qtconnectivity b/qtconnectivity
deleted file mode 160000 (submodule)
index fee6b50..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fee6b50154d583422e6505a60a7d44d726785ab0
diff --git a/qtfeedback b/qtfeedback
deleted file mode 160000 (submodule)
index 0d85e95..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0d85e95a06ac6b5abbbf6715ae66c1e7109d6392
diff --git a/qtlocation b/qtlocation
deleted file mode 160000 (submodule)
index fd330db..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fd330db9e5631438f86e0fae52aea5454519d196
diff --git a/qtpim b/qtpim
deleted file mode 160000 (submodule)
index 099111a..0000000
--- a/qtpim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 099111a9fbaf31e954ca91a18d47272590f60ea1
diff --git a/qtsensors b/qtsensors
deleted file mode 160000 (submodule)
index b550c49..0000000
--- a/qtsensors
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b550c4980cf874ce84419a86c933c32504b9b19d
diff --git a/qtsystems b/qtsystems
deleted file mode 160000 (submodule)
index 620592b..0000000
--- a/qtsystems
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 620592b4bc2fb4f92cfbd6f09eeafb31b30cb941
diff --git a/qtwayland b/qtwayland
deleted file mode 160000 (submodule)
index 7334963..0000000
--- a/qtwayland
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7334963a7911f5e8cfc18d6a21876bb9c16f1ab8