summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-02-05 18:48:20 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-22 18:22:38 +0100
commit4e92039103b35e1f7a609198235e2cae6ea78789 (patch)
tree7fa8509ea6daa6da3e1c92fa198116da1d24711a
parent0a23321599c73357c6f724f204b480ba7311e51a (diff)
nuke qlalr submodule
it was merged back into qtbase. Change-Id: Ia5e6252ac13b0f821807c825eea611d484c1dd7b Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
-rw-r--r--.gitmodules3
-rwxr-xr-xinit-repository1
m---------qlalr0
-rw-r--r--qt.pro1
4 files changed, 0 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules
index f1b10395..0d6fb1aa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,9 +28,6 @@
[submodule "qtdoc"]
path = qtdoc
url = ../qtdoc.git
-[submodule "qlalr"]
- path = qlalr
- url = ../qlalr.git
[submodule "qtrepotools"]
path = qtrepotools
url = ../qtrepotools.git
diff --git a/init-repository b/init-repository
index 8ad799ad..20b53d42 100755
--- a/init-repository
+++ b/init-repository
@@ -200,7 +200,6 @@ my %PROTOCOLS = (
my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
qt3d
qt5
- qlalr
qtactiveqt
qtandroidextras
qtbase
diff --git a/qlalr b/qlalr
deleted file mode 160000
-Subproject a803a5c2142cd93a33ab5d3e549d794b1096bf0
diff --git a/qt.pro b/qt.pro
index d0edc030..0711e3e3 100644
--- a/qt.pro
+++ b/qt.pro
@@ -61,7 +61,6 @@ addModule(qtbase)
addModule(qtandroidextras, qtbase)
addModule(qtmacextras, qtbase)
addModule(qtx11extras, qtbase)
-addModule(qlalr, qtbase)
addModule(qtsvg, qtbase)
addModule(qtxmlpatterns, qtbase)
addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)