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

QmlJS: Merge new parser from Qt 5.

Browse Source 
Change-Id: I986df52b7ddb31e3bae1148eda881acc1829b102
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
This commit is contained in:
Christian Kamm
2011-12-07 11:16:26 +01:00
parent 72c06cb6fd
commit 67dd062a31
19 changed files with 1469 additions and 1416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/qmljs/parser/qmljsglobal_p.h
View File

@@ -49,7 +49,12 @@
#else // !QT_CREATOR
# define QT_QML_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
# define QT_QML_END_NAMESPACE QT_END_NAMESPACE
# define QML_PARSER_EXPORT Q_AUTOTEST_EXPORT
# if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB)
// QmlDevTools is a static library
# define QML_PARSER_EXPORT
# else
# define QML_PARSER_EXPORT Q_AUTOTEST_EXPORT
# endif
#endif // QT_CREATOR
#endif // QMLJSGLOBAL_P_H