Move the parser folder from src/qml/qml to src/qml

Change-Id: I5e5684f5b98b00f791ade99c4cb6bc2ed880ad6a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

21 files changed, 2 insertions, 2 deletions

diff --git a/src/qml/qml/parser/parser.pri b/src/qml/parser/parser.pri
index e5b8ae2749..e5b8ae2749 100644
--- a/src/qml/qml/parser/parser.pri
+++ b/src/qml/parser/parser.pri
diff --git a/src/qml/qml/parser/qqmljs.g b/src/qml/parser/qqmljs.g
index 5d279ef1a2..5d279ef1a2 100644
--- a/src/qml/qml/parser/qqmljs.g
+++ b/src/qml/parser/qqmljs.g
diff --git a/src/qml/qml/parser/qqmljsast.cpp b/src/qml/parser/qqmljsast.cpp
index ea0df4a537..ea0df4a537 100644
--- a/src/qml/qml/parser/qqmljsast.cpp
+++ b/src/qml/parser/qqmljsast.cpp
diff --git a/src/qml/qml/parser/qqmljsast_p.h b/src/qml/parser/qqmljsast_p.h
index 01a872f1e8..01a872f1e8 100644
--- a/src/qml/qml/parser/qqmljsast_p.h
+++ b/src/qml/parser/qqmljsast_p.h
diff --git a/src/qml/qml/parser/qqmljsastfwd_p.h b/src/qml/parser/qqmljsastfwd_p.h
index fe5572c4b2..fe5572c4b2 100644
--- a/src/qml/qml/parser/qqmljsastfwd_p.h
+++ b/src/qml/parser/qqmljsastfwd_p.h
diff --git a/src/qml/qml/parser/qqmljsastvisitor.cpp b/src/qml/parser/qqmljsastvisitor.cpp
index be2a082f43..be2a082f43 100644
--- a/src/qml/qml/parser/qqmljsastvisitor.cpp
+++ b/src/qml/parser/qqmljsastvisitor.cpp
diff --git a/src/qml/qml/parser/qqmljsastvisitor_p.h b/src/qml/parser/qqmljsastvisitor_p.h
index ef022f617c..ef022f617c 100644
--- a/src/qml/qml/parser/qqmljsastvisitor_p.h
+++ b/src/qml/parser/qqmljsastvisitor_p.h
diff --git a/src/qml/qml/parser/qqmljsengine_p.cpp b/src/qml/parser/qqmljsengine_p.cpp
index 7dc3b6f6cb..7dc3b6f6cb 100644
--- a/src/qml/qml/parser/qqmljsengine_p.cpp
+++ b/src/qml/parser/qqmljsengine_p.cpp
diff --git a/src/qml/qml/parser/qqmljsengine_p.h b/src/qml/parser/qqmljsengine_p.h
index 4f58e7f8ea..4f58e7f8ea 100644
--- a/src/qml/qml/parser/qqmljsengine_p.h
+++ b/src/qml/parser/qqmljsengine_p.h
diff --git a/src/qml/qml/parser/qqmljsglobal_p.h b/src/qml/parser/qqmljsglobal_p.h
index c53e12ea56..c53e12ea56 100644
--- a/src/qml/qml/parser/qqmljsglobal_p.h
+++ b/src/qml/parser/qqmljsglobal_p.h
diff --git a/src/qml/qml/parser/qqmljsgrammar.cpp b/src/qml/parser/qqmljsgrammar.cpp
index 4a5672a796..4a5672a796 100644
--- a/src/qml/qml/parser/qqmljsgrammar.cpp
+++ b/src/qml/parser/qqmljsgrammar.cpp
diff --git a/src/qml/qml/parser/qqmljsgrammar_p.h b/src/qml/parser/qqmljsgrammar_p.h
index 9ef4695d69..9ef4695d69 100644
--- a/src/qml/qml/parser/qqmljsgrammar_p.h
+++ b/src/qml/parser/qqmljsgrammar_p.h
diff --git a/src/qml/qml/parser/qqmljskeywords_p.h b/src/qml/parser/qqmljskeywords_p.h
index 7fcf001303..7fcf001303 100644
--- a/src/qml/qml/parser/qqmljskeywords_p.h
+++ b/src/qml/parser/qqmljskeywords_p.h
diff --git a/src/qml/qml/parser/qqmljslexer.cpp b/src/qml/parser/qqmljslexer.cpp
index 5d9ca1036f..5d9ca1036f 100644
--- a/src/qml/qml/parser/qqmljslexer.cpp
+++ b/src/qml/parser/qqmljslexer.cpp
diff --git a/src/qml/qml/parser/qqmljslexer_p.h b/src/qml/parser/qqmljslexer_p.h
index 23af61d650..23af61d650 100644
--- a/src/qml/qml/parser/qqmljslexer_p.h
+++ b/src/qml/parser/qqmljslexer_p.h
diff --git a/src/qml/qml/parser/qqmljsmemorypool_p.h b/src/qml/parser/qqmljsmemorypool_p.h
index 820ae8ed71..820ae8ed71 100644
--- a/src/qml/qml/parser/qqmljsmemorypool_p.h
+++ b/src/qml/parser/qqmljsmemorypool_p.h
diff --git a/src/qml/qml/parser/qqmljsparser.cpp b/src/qml/parser/qqmljsparser.cpp
index 46b5c041d4..46b5c041d4 100644
--- a/src/qml/qml/parser/qqmljsparser.cpp
+++ b/src/qml/parser/qqmljsparser.cpp
diff --git a/src/qml/qml/parser/qqmljsparser_p.h b/src/qml/parser/qqmljsparser_p.h
index 1b13690547..1b13690547 100644
--- a/src/qml/qml/parser/qqmljsparser_p.h
+++ b/src/qml/parser/qqmljsparser_p.h
diff --git a/src/qml/qml.pro b/src/qml/qml.pro
index fe294aa323..6d26d9cb38 100644
--- a/src/qml/qml.pro
+++ b/src/qml/qml.pro
@@ -21,6 +21,7 @@ HEADERS += qtqmlglobal.h \
 
 #modules
 include(util/util.pri)
+include(parser/parser.pri)
 include(compiler/compiler.pri)
 include(jsapi/jsapi.pri)
 include(jsruntime/jsruntime.pri)
diff --git a/src/qml/qml/qml.pri b/src/qml/qml/qml.pri
index 4601f8ca00..dae76ede32 100644
--- a/src/qml/qml/qml.pri
+++ b/src/qml/qml/qml.pri
@@ -132,6 +132,5 @@ HEADERS += \
     $$PWD/qqmlvaluetypewrapper_p.h \
     $$PWD/qqmltypewrapper_p.h
 
-include(parser/parser.pri)
 include(ftw/ftw.pri)
 include(v8/v8.pri)
diff --git a/src/qmldevtools/qmldevtools.pro b/src/qmldevtools/qmldevtools.pro
index 10e1ce0275..963fb1be5a 100644
--- a/src/qmldevtools/qmldevtools.pro
+++ b/src/qmldevtools/qmldevtools.pro
@@ -12,4 +12,4 @@ MODULE_PRIVATE_INCLUDES = \
 
 load(qt_module)
 
-include(../qml/qml/parser/parser.pri)
+include(../qml/parser/parser.pri)