40 files changed, 14 insertions, 9 deletions
diff --git a/src/src.pro b/src/src.pro
index a782d585d5..121188bd5a 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -14,6 +14,11 @@ src_tools_rcc.target = sub-rcc
 src_tools_rcc.depends = src_tools_bootstrap
 src_tools_rcc.CONFIG = host_build
 
+src_tools_qlalr.subdir = tools/qlalr
+src_tools_qlalr.target = sub-qlalr
+force_bootstrap: src_tools_qlalr.depends = src_tools_bootstrap
+else: src_tools_qlalr.depends = src_corelib
+
 src_tools_uic.subdir = tools/uic
 src_tools_uic.target = sub-uic
 src_tools_uic.CONFIG = host_build
@@ -110,8 +115,8 @@ src_plugins.depends = src_sql src_xml src_network
 src_android.subdir = $$PWD/android
 
 # this order is important
-SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_corelib
-TOOLS = src_tools_moc src_tools_rcc
+SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_corelib src_tools_qlalr
+TOOLS = src_tools_moc src_tools_rcc src_tools_qlalr
 win32:SUBDIRS += src_winmain
 SUBDIRS += src_network src_sql src_xml src_testlib
 contains(QT_CONFIG, dbus) {
@@ -153,7 +158,7 @@ nacl: SUBDIRS -= src_network src_testlib
 android:!android-no-sdk: SUBDIRS += src_android
 
 TR_EXCLUDE = \
-    src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic \
+    src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_tools_qlalr \
     src_tools_bootstrap_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
 
 sub-tools.depends = $$TOOLS
diff --git a/util/qlalr/compress.cpp b/src/tools/qlalr/compress.cpp
index 4ae0716047..4ae0716047 100644
--- a/util/qlalr/compress.cpp
+++ b/src/tools/qlalr/compress.cpp
diff --git a/util/qlalr/compress.h b/src/tools/qlalr/compress.h
index 72f1d1db83..72f1d1db83 100644
--- a/util/qlalr/compress.h
+++ b/src/tools/qlalr/compress.h
diff --git a/util/qlalr/cppgenerator.cpp b/src/tools/qlalr/cppgenerator.cpp
index d48c059397..d48c059397 100644
--- a/util/qlalr/cppgenerator.cpp
+++ b/src/tools/qlalr/cppgenerator.cpp
diff --git a/util/qlalr/cppgenerator.h b/src/tools/qlalr/cppgenerator.h
index 3ee5dc91e3..3ee5dc91e3 100644
--- a/util/qlalr/cppgenerator.h
+++ b/src/tools/qlalr/cppgenerator.h
diff --git a/util/qlalr/doc/qlalr.qdocconf b/src/tools/qlalr/doc/qlalr.qdocconf
index 434393a727..434393a727 100644
--- a/util/qlalr/doc/qlalr.qdocconf
+++ b/src/tools/qlalr/doc/qlalr.qdocconf
diff --git a/util/qlalr/doc/src/classic.css b/src/tools/qlalr/doc/src/classic.css
index afc66d548a..afc66d548a 100644
--- a/util/qlalr/doc/src/classic.css
+++ b/src/tools/qlalr/doc/src/classic.css
diff --git a/util/qlalr/doc/src/images/qt-logo.png b/src/tools/qlalr/doc/src/images/qt-logo.png
index 2dc67161c1..2dc67161c1 100644
--- a/util/qlalr/doc/src/images/qt-logo.png
+++ b/src/tools/qlalr/doc/src/images/qt-logo.png
diff --git a/util/qlalr/doc/src/qlalr.qdoc b/src/tools/qlalr/doc/src/qlalr.qdoc
index 36cf27b3d9..36cf27b3d9 100644
--- a/util/qlalr/doc/src/qlalr.qdoc
+++ b/src/tools/qlalr/doc/src/qlalr.qdoc
diff --git a/util/qlalr/dotgraph.cpp b/src/tools/qlalr/dotgraph.cpp
index 60ec82ae84..60ec82ae84 100644
--- a/util/qlalr/dotgraph.cpp
+++ b/src/tools/qlalr/dotgraph.cpp
diff --git a/util/qlalr/dotgraph.h b/src/tools/qlalr/dotgraph.h
index 1d21db060a..1d21db060a 100644
--- a/util/qlalr/dotgraph.h
+++ b/src/tools/qlalr/dotgraph.h
diff --git a/util/qlalr/examples/dummy-xml/dummy-xml.pro b/src/tools/qlalr/examples/dummy-xml/dummy-xml.pro
index e54512d6c9..e54512d6c9 100644
--- a/util/qlalr/examples/dummy-xml/dummy-xml.pro
+++ b/src/tools/qlalr/examples/dummy-xml/dummy-xml.pro
diff --git a/util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp b/src/tools/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp
index 3d2a09c845..3d2a09c845 100644
--- a/util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp
+++ b/src/tools/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp
diff --git a/util/qlalr/examples/dummy-xml/xml.g b/src/tools/qlalr/examples/dummy-xml/xml.g
index a5d6b6e978..a5d6b6e978 100644
--- a/util/qlalr/examples/dummy-xml/xml.g
+++ b/src/tools/qlalr/examples/dummy-xml/xml.g
diff --git a/util/qlalr/examples/glsl/build.sh b/src/tools/qlalr/examples/glsl/build.sh
index 122431ba4e..122431ba4e 100644
--- a/util/qlalr/examples/glsl/build.sh
+++ b/src/tools/qlalr/examples/glsl/build.sh
diff --git a/util/qlalr/examples/glsl/glsl b/src/tools/qlalr/examples/glsl/glsl
index c19018f985..c19018f985 100755
--- a/util/qlalr/examples/glsl/glsl
+++ b/src/tools/qlalr/examples/glsl/glsl
diff --git a/util/qlalr/examples/glsl/glsl-lex.l b/src/tools/qlalr/examples/glsl/glsl-lex.l
index 16ff333b79..16ff333b79 100644
--- a/util/qlalr/examples/glsl/glsl-lex.l
+++ b/src/tools/qlalr/examples/glsl/glsl-lex.l
diff --git a/util/qlalr/examples/glsl/glsl.g b/src/tools/qlalr/examples/glsl/glsl.g
index 64b1b0b1e5..64b1b0b1e5 100644
--- a/util/qlalr/examples/glsl/glsl.g
+++ b/src/tools/qlalr/examples/glsl/glsl.g
diff --git a/util/qlalr/examples/glsl/glsl.pro b/src/tools/qlalr/examples/glsl/glsl.pro
index 8ac775f21d..8ac775f21d 100644
--- a/util/qlalr/examples/glsl/glsl.pro
+++ b/src/tools/qlalr/examples/glsl/glsl.pro
diff --git a/util/qlalr/examples/lambda/COMPILE b/src/tools/qlalr/examples/lambda/COMPILE
index 3226ec95fa..3226ec95fa 100644
--- a/util/qlalr/examples/lambda/COMPILE
+++ b/src/tools/qlalr/examples/lambda/COMPILE
diff --git a/util/qlalr/examples/lambda/lambda.g b/src/tools/qlalr/examples/lambda/lambda.g
index 2d9ddd8ed4..2d9ddd8ed4 100644
--- a/util/qlalr/examples/lambda/lambda.g
+++ b/src/tools/qlalr/examples/lambda/lambda.g
diff --git a/util/qlalr/examples/lambda/lambda.pro b/src/tools/qlalr/examples/lambda/lambda.pro
index dfe4824027..dfe4824027 100644
--- a/util/qlalr/examples/lambda/lambda.pro
+++ b/src/tools/qlalr/examples/lambda/lambda.pro
diff --git a/util/qlalr/examples/lambda/main.cpp b/src/tools/qlalr/examples/lambda/main.cpp
index 6c45d48e69..6c45d48e69 100644
--- a/util/qlalr/examples/lambda/main.cpp
+++ b/src/tools/qlalr/examples/lambda/main.cpp
diff --git a/util/qlalr/examples/qparser/COMPILE b/src/tools/qlalr/examples/qparser/COMPILE
index 4aad300a9f..4aad300a9f 100644
--- a/util/qlalr/examples/qparser/COMPILE
+++ b/src/tools/qlalr/examples/qparser/COMPILE
diff --git a/util/qlalr/examples/qparser/calc.g b/src/tools/qlalr/examples/qparser/calc.g
index 394b89c964..394b89c964 100644
--- a/util/qlalr/examples/qparser/calc.g
+++ b/src/tools/qlalr/examples/qparser/calc.g
diff --git a/util/qlalr/examples/qparser/calc.l b/src/tools/qlalr/examples/qparser/calc.l
index eb666f1f7e..eb666f1f7e 100644
--- a/util/qlalr/examples/qparser/calc.l
+++ b/src/tools/qlalr/examples/qparser/calc.l
diff --git a/util/qlalr/examples/qparser/qparser.cpp b/src/tools/qlalr/examples/qparser/qparser.cpp
index d749467fe8..d749467fe8 100644
--- a/util/qlalr/examples/qparser/qparser.cpp
+++ b/src/tools/qlalr/examples/qparser/qparser.cpp
diff --git a/util/qlalr/examples/qparser/qparser.h b/src/tools/qlalr/examples/qparser/qparser.h
index a5678d0c33..a5678d0c33 100644
--- a/util/qlalr/examples/qparser/qparser.h
+++ b/src/tools/qlalr/examples/qparser/qparser.h
diff --git a/util/qlalr/examples/qparser/qparser.pro b/src/tools/qlalr/examples/qparser/qparser.pro
index 938e336939..938e336939 100644
--- a/util/qlalr/examples/qparser/qparser.pro
+++ b/src/tools/qlalr/examples/qparser/qparser.pro
diff --git a/util/qlalr/grammar.cpp b/src/tools/qlalr/grammar.cpp
index f1c32adb2d..f1c32adb2d 100644
--- a/util/qlalr/grammar.cpp
+++ b/src/tools/qlalr/grammar.cpp
diff --git a/util/qlalr/grammar_p.h b/src/tools/qlalr/grammar_p.h
index e2f294ea00..e2f294ea00 100644
--- a/util/qlalr/grammar_p.h
+++ b/src/tools/qlalr/grammar_p.h
diff --git a/util/qlalr/lalr.cpp b/src/tools/qlalr/lalr.cpp
index c68076477f..c68076477f 100644
--- a/util/qlalr/lalr.cpp
+++ b/src/tools/qlalr/lalr.cpp
diff --git a/util/qlalr/lalr.g b/src/tools/qlalr/lalr.g
index e060eea6f1..e060eea6f1 100644
--- a/util/qlalr/lalr.g
+++ b/src/tools/qlalr/lalr.g
diff --git a/util/qlalr/lalr.h b/src/tools/qlalr/lalr.h
index 85c5b51e38..85c5b51e38 100644
--- a/util/qlalr/lalr.h
+++ b/src/tools/qlalr/lalr.h
diff --git a/util/qlalr/main.cpp b/src/tools/qlalr/main.cpp
index 1e4f030122..1e4f030122 100644
--- a/util/qlalr/main.cpp
+++ b/src/tools/qlalr/main.cpp
diff --git a/util/qlalr/parsetable.cpp b/src/tools/qlalr/parsetable.cpp
index 6877af7a00..6877af7a00 100644
--- a/util/qlalr/parsetable.cpp
+++ b/src/tools/qlalr/parsetable.cpp
diff --git a/util/qlalr/parsetable.h b/src/tools/qlalr/parsetable.h
index d0fe78be81..d0fe78be81 100644
--- a/util/qlalr/parsetable.h
+++ b/src/tools/qlalr/parsetable.h
diff --git a/util/qlalr/qlalr.pro b/src/tools/qlalr/qlalr.pro
index 4ebeb91e64..08cf6a1591 100644
--- a/util/qlalr/qlalr.pro
+++ b/src/tools/qlalr/qlalr.pro
@@ -1,9 +1,4 @@
-
-TEMPLATE = app
-QT = core
-CONFIG += console
-TARGET = qlalr
-mac:CONFIG -= app_bundle
+option(host_build)
 
 SOURCES += \
     compress.cpp \
@@ -23,3 +18,8 @@ HEADERS += \
     parsetable.h \
     recognizer.h \
     grammar_p.h
+
+OTHER_FILES += \
+    lalr.g
+
+load(qt_tool)
diff --git a/util/qlalr/recognizer.cpp b/src/tools/qlalr/recognizer.cpp
index 6808f3f66b..6808f3f66b 100644
--- a/util/qlalr/recognizer.cpp
+++ b/src/tools/qlalr/recognizer.cpp
diff --git a/util/qlalr/recognizer.h b/src/tools/qlalr/recognizer.h
index 8eb089eb8d..8eb089eb8d 100644
--- a/util/qlalr/recognizer.h
+++ b/src/tools/qlalr/recognizer.h