feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Fix parser generation scripts to adjust export of QmlDirParser.

Browse Source 
Change-Id: I721d8ce4fdd4ca09bf2ee68a8e54aa7351664e3a
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
This commit is contained in:
Christian Kamm
2012-08-01 07:48:37 +02:00
parent e2a50ef71d
commit cf2540c9a4
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/qmljs/parser/gen-parser.sh
View File

@@ -11,7 +11,7 @@ for i in $QTDIR/src/qml/qml/qqml{error.{h,cpp},dirparser{_p.h,.cpp}}; do
done done
# export QmlDirParser # 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 perl -p -0777 -i -e 's/QT_BEGIN_NAMESPACE\n\nclass QmlError;\nclass QmlEngine;\nclass Q_AUTOTEST_EXPORT QmlDirParser/#include "qmljsglobal_p.h"\n\nQT_BEGIN_NAMESPACE\n\nclass QmlError;\nclass QmlEngine;\nclass QML_PARSER_EXPORT QmlDirParser/' qmldirparser_p.h
# export QmlJSGrammar # 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 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
# remove qmlglobal_p.h include # remove qmlglobal_p.h include

4
src/libs/qmljs/parser/qmldirparser_p.h
View File

@@ -47,11 +47,13 @@
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include "qmljsglobal_p.h"
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QmlError; class QmlError;
class QmlEngine; class QmlEngine;
class Q_AUTOTEST_EXPORT QmlDirParser class QML_PARSER_EXPORT QmlDirParser
{ {
Q_DISABLE_COPY(QmlDirParser) Q_DISABLE_COPY(QmlDirParser)