From eee8cb50dcb464955e3f758f96e0aca94e84cbb5 Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Fri, 23 Sep 2011 10:08:30 +0200
Subject: Say hello to QtQmlDevTools library

QtQmlDevTools is a private helper library. It provides QML/JS
file parsing for tools that live outside of the qtdeclarative
repository, such as lupdate.

This allows us to remove qttools's dependency on the
qtdeclarative sources.

To use the library:

QT += qmldevtools-private

 #include <private/qdeclarativejsparser_p.h>

Change-Id: Ia43751b9be3d9fe05da03e65c6aca1cd9e3fdbbc
Reviewed-on: http://codereview.qt-project.org/6116
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
---
 src/declarative/qml/parser/qdeclarativejsglobal_p.h |  7 ++++++-
 src/qmldevtools/qmldevtools.pro                     | 20 ++++++++++++++++++++
 src/src.pro                                         |  1 +
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 src/qmldevtools/qmldevtools.pro

(limited to 'src')

diff --git a/src/declarative/qml/parser/qdeclarativejsglobal_p.h b/src/declarative/qml/parser/qdeclarativejsglobal_p.h
index 83b5b95a2f..83ee2d8d27 100644
--- a/src/declarative/qml/parser/qdeclarativejsglobal_p.h
+++ b/src/declarative/qml/parser/qdeclarativejsglobal_p.h
@@ -58,7 +58,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 // QDECLARATIVEJSGLOBAL_P_H
diff --git a/src/qmldevtools/qmldevtools.pro b/src/qmldevtools/qmldevtools.pro
new file mode 100644
index 0000000000..3aac5e5a9c
--- /dev/null
+++ b/src/qmldevtools/qmldevtools.pro
@@ -0,0 +1,20 @@
+load(qt_module)
+TARGET     = QtQmlDevTools
+QT         = core
+TEMPLATE   = lib
+DESTDIR    = $$QMAKE_LIBDIR_QT
+
+CONFIG += module
+CONFIG += staticlib
+
+MODULE_PRI = ../../modules/qt_qmldevtools.pri
+
+DEFINES += QT_BUILD_QMLDEVTOOLS_LIB
+
+load(qt_module_config)
+
+HEADERS += qtqmldevtoolsversion.h
+
+unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore
+
+include($$QT.declarative.sources/qml/parser/parser.pri)
diff --git a/src/src.pro b/src/src.pro
index 6fbfc243de..3f71db2472 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -5,4 +5,5 @@ SUBDIRS += declarative qtquick1 plugins
 contains(QT_CONFIG, qmltest): SUBDIRS += qmltest
 
 SUBDIRS += imports
+SUBDIRS += qmldevtools
 
-- 
cgit v1.2.3