mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
Remove submodules which are not part of Qt 5.0.
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>
This commit is contained in:
committed by
The Qt Project
parent
a1f4d9db15
commit
41c3f2cb5f
27
.gitmodules
vendored
27
.gitmodules
vendored
@@ -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
|
||||
|
||||
1
qlalr
1
qlalr
Submodule qlalr deleted from d7064c2c7d
73
qt.pro
73
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
|
||||
|
||||
1
qt3d
1
qt3d
Submodule qt3d deleted from 6b8ee028ac
Submodule qtconnectivity deleted from fee6b50154
Submodule qtfeedback deleted from 0d85e95a06
Submodule qtlocation deleted from fd330db9e5
1
qtpim
1
qtpim
Submodule qtpim deleted from 099111a9fb
Submodule qtsensors deleted from b550c4980c
Submodule qtsystems deleted from 620592b4bc
Submodule qtwayland deleted from 7334963a79
Reference in New Issue
Block a user