diff options
| -rw-r--r-- | .gitmodules | 27 | ||||
| m--------- | qlalr | 0 | ||||
| -rw-r--r-- | qt.pro | 73 | ||||
| m--------- | qt3d | 0 | ||||
| m--------- | qtconnectivity | 0 | ||||
| m--------- | qtfeedback | 0 | ||||
| m--------- | qtlocation | 0 | ||||
| m--------- | qtpim | 0 | ||||
| m--------- | qtsensors | 0 | ||||
| m--------- | qtsystems | 0 | ||||
| m--------- | qtwayland | 0 |
11 files changed, 1 insertions, 99 deletions
diff --git a/.gitmodules b/.gitmodules index ba2aa2e0..13ae4fe2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 @@ -43,30 +40,6 @@ [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 -Subproject d7064c2c7dfb36646811d2aefd097a8de941989 @@ -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 -Subproject 6b8ee028ac0daae74f5521b9e5562f94b5e8e16 diff --git a/qtconnectivity b/qtconnectivity deleted file mode 160000 -Subproject fee6b50154d583422e6505a60a7d44d726785ab diff --git a/qtfeedback b/qtfeedback deleted file mode 160000 -Subproject 0d85e95a06ac6b5abbbf6715ae66c1e7109d639 diff --git a/qtlocation b/qtlocation deleted file mode 160000 -Subproject fd330db9e5631438f86e0fae52aea5454519d19 diff --git a/qtpim b/qtpim deleted file mode 160000 -Subproject 099111a9fbaf31e954ca91a18d47272590f60ea diff --git a/qtsensors b/qtsensors deleted file mode 160000 -Subproject b550c4980cf874ce84419a86c933c32504b9b19 diff --git a/qtsystems b/qtsystems deleted file mode 160000 -Subproject 620592b4bc2fb4f92cfbd6f09eeafb31b30cb94 diff --git a/qtwayland b/qtwayland deleted file mode 160000 -Subproject 7334963a7911f5e8cfc18d6a21876bb9c16f1ab |