From baafc89dfc226c7d72c30dabd101980eef18655b Mon Sep 17 00:00:00 2001
From: Aurindam Jana <aurindam.jana@nokia.com>
Date: Wed, 12 Oct 2011 19:29:34 +0200
Subject: [PATCH] Debugger: Fix build break on Windows

Removed inclusion of parser.pri from qml.pri and added QML_PARSER_EXPORT
to QmlJSGrammar.

Task-number: QTCREATORBUG-6292
Change-Id: I6a1fb3e038a6c154c4c3b368d7c7e6eda9975698
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
---
 src/libs/qmljs/parser/gen-parser.sh    | 2 ++
 src/libs/qmljs/parser/qmljsgrammar_p.h | 3 ++-
 src/plugins/debugger/qml/qml.pri       | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/libs/qmljs/parser/gen-parser.sh b/src/libs/qmljs/parser/gen-parser.sh
index b36bdaa333..62c17bfef2 100755
--- a/src/libs/qmljs/parser/gen-parser.sh
+++ b/src/libs/qmljs/parser/gen-parser.sh
@@ -12,6 +12,8 @@ done
 
 # export QmlDirParser
 perl -p -0777 -i -e 's/QT_BEGIN_NAMESPACE\n\nclass QmlError;\nclass QmlDirParser/#include "qmljsglobal_p.h"\n\nQT_BEGIN_NAMESPACE\n\nclass QmlError;\nclass QML_PARSER_EXPORT QmlDirParser/' qmldirparser_p.h
+# export QmlJSGrammar
+perl -p -0777 -i -e 's/#include <QtCore\/qglobal.h>\n\nQT_BEGIN_NAMESPACE\n\nclass QmlJSGrammar\n/#include "qmljsglobal_p.h"\n#include <QtCore\/qglobal.h>\n\nQT_BEGIN_NAMESPACE\n\nclass QML_PARSER_EXPORT QmlJSGrammar\n/' qmljsgrammar_p.h
 # replace qmlglobal_p.h include with needed declaration
 perl -p -0777 -i -e 's/#include \<qmlglobal_p.h\>/bool Qml_isFileCaseCorrect(const QString &) { return true; }/' qmldirparser.cpp
 
diff --git a/src/libs/qmljs/parser/qmljsgrammar_p.h b/src/libs/qmljs/parser/qmljsgrammar_p.h
index cd0d5e19ef..72e086ce13 100644
--- a/src/libs/qmljs/parser/qmljsgrammar_p.h
+++ b/src/libs/qmljs/parser/qmljsgrammar_p.h
@@ -45,11 +45,12 @@
 #ifndef QMLJSGRAMMAR_P_H
 #define QMLJSGRAMMAR_P_H
 
+#include "qmljsglobal_p.h"
 #include <QtCore/qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
-class QmlJSGrammar
+class QML_PARSER_EXPORT QmlJSGrammar
 {
 public:
   enum VariousConstants {
diff --git a/src/plugins/debugger/qml/qml.pri b/src/plugins/debugger/qml/qml.pri
index 3533187ffb..c70ce3ea11 100644
--- a/src/plugins/debugger/qml/qml.pri
+++ b/src/plugins/debugger/qml/qml.pri
@@ -1,5 +1,4 @@
 include($$PWD/../../../libs/qmljsdebugclient/qmljsdebugclient.pri)
-include($$PWD/../../../libs/qmljs/parser/parser.pri)
 include($$PWD/../../../shared/json/json.pri)
 DEFINES += JSON_INCLUDE_PRI
 
-- 
2.11.0