summaryrefslogtreecommitdiff
path: root/src/script/api
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-06-07 14:52:56 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-09 15:07:29 +0200
commit973f54fc75e8dd3ddc132942be55f9d5fabde19c (patch)
tree5c260b03a8a7e8b6d050814d26064b886f6bb4e2 /src/script/api
parent68458376c0db2f786b2c9ab3b8dfd21695a5645e (diff)
downloadqtscript-973f54fc75e8dd3ddc132942be55f9d5fabde19c.tar.gz
Add qtscriptglobal.h for the qtscript.git module EXPORT macros
No library other than the core libraries should depend on their export macros being in qglobal.h. Change-Id: I6ded70813f6296ca5aa1d7d3cdb38503a5538424 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/script/api')
-rw-r--r--src/script/api/api.pri3
-rw-r--r--src/script/api/qscriptable.h1
-rw-r--r--src/script/api/qscriptcontextinfo.h1
-rw-r--r--src/script/api/qscriptengineagent.h1
-rw-r--r--src/script/api/qscriptextensioninterface.h1
-rw-r--r--src/script/api/qscriptprogram.h1
-rw-r--r--src/script/api/qscriptstring.h1
-rw-r--r--src/script/api/qscriptvalue.h1
-rw-r--r--src/script/api/qtscriptglobal.h70
9 files changed, 79 insertions, 1 deletions
diff --git a/src/script/api/api.pri b/src/script/api/api.pri
index aebadd5..89afadb 100644
--- a/src/script/api/api.pri
+++ b/src/script/api/api.pri
@@ -32,4 +32,5 @@ HEADERS += \
$$PWD/qscriptvalue_p.h \
$$PWD/qscriptvalueiterator.h \
$$PWD/qscriptable.h \
- $$PWD/qscriptable_p.h
+ $$PWD/qscriptable_p.h \
+ $$PWD/qtscriptglobal.h
diff --git a/src/script/api/qscriptable.h b/src/script/api/qscriptable.h
index 065e7fb..70a9a4b 100644
--- a/src/script/api/qscriptable.h
+++ b/src/script/api/qscriptable.h
@@ -27,6 +27,7 @@
#include <QtCore/qobjectdefs.h>
#include <QtCore/qscopedpointer.h>
+#include <QtScript/qtscriptglobal.h>
QT_BEGIN_HEADER
diff --git a/src/script/api/qscriptcontextinfo.h b/src/script/api/qscriptcontextinfo.h
index 05c2e75..7050fcc 100644
--- a/src/script/api/qscriptcontextinfo.h
+++ b/src/script/api/qscriptcontextinfo.h
@@ -29,6 +29,7 @@
#include <QtCore/qlist.h>
#include <QtCore/qstringlist.h>
#include <QtCore/qsharedpointer.h>
+#include <QtScript/qtscriptglobal.h>
QT_BEGIN_HEADER
diff --git a/src/script/api/qscriptengineagent.h b/src/script/api/qscriptengineagent.h
index ab885c4..a15a3e1 100644
--- a/src/script/api/qscriptengineagent.h
+++ b/src/script/api/qscriptengineagent.h
@@ -28,6 +28,7 @@
#include <QtCore/qvariant.h>
#include <QtCore/qscopedpointer.h>
+#include <QtScript/qtscriptglobal.h>
QT_BEGIN_HEADER
diff --git a/src/script/api/qscriptextensioninterface.h b/src/script/api/qscriptextensioninterface.h
index 6430485..4dd2eb7 100644
--- a/src/script/api/qscriptextensioninterface.h
+++ b/src/script/api/qscriptextensioninterface.h
@@ -27,6 +27,7 @@
#include <QtCore/qfactoryinterface.h>
#include <QtCore/qobject.h>
+#include <QtScript/qtscriptglobal.h>
QT_BEGIN_HEADER
diff --git a/src/script/api/qscriptprogram.h b/src/script/api/qscriptprogram.h
index 9baba32..e6ddc91 100644
--- a/src/script/api/qscriptprogram.h
+++ b/src/script/api/qscriptprogram.h
@@ -27,6 +27,7 @@
#include <QtCore/qsharedpointer.h>
#include <QtCore/qstring.h>
+#include <QtScript/qtscriptglobal.h>
QT_BEGIN_HEADER
diff --git a/src/script/api/qscriptstring.h b/src/script/api/qscriptstring.h
index 49f79fe..06e2c0b 100644
--- a/src/script/api/qscriptstring.h
+++ b/src/script/api/qscriptstring.h
@@ -27,6 +27,7 @@
#include <QtCore/qstring.h>
#include <QtCore/qsharedpointer.h>
+#include <QtScript/qtscriptglobal.h>
QT_BEGIN_HEADER
diff --git a/src/script/api/qscriptvalue.h b/src/script/api/qscriptvalue.h
index 2923c41..dae715b 100644
--- a/src/script/api/qscriptvalue.h
+++ b/src/script/api/qscriptvalue.h
@@ -28,6 +28,7 @@
#include <QtCore/qlist.h>
#include <QtCore/qsharedpointer.h>
+#include <QtScript/qtscriptglobal.h>
QT_BEGIN_HEADER
diff --git a/src/script/api/qtscriptglobal.h b/src/script/api/qtscriptglobal.h
new file mode 100644
index 0000000..600bd1f
--- /dev/null
+++ b/src/script/api/qtscriptglobal.h
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Intel Corporation.
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTSCRIPTGLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+#ifndef QT_STATIC
+# if defined(QT_BUILD_SCRIPT_LIB)
+# define Q_SCRIPT_EXPORT Q_DECL_EXPORT
+# else
+# define Q_SCRIPT_EXPORT Q_DECL_IMPORT
+# endif
+# if defined(QT_BUILD_SCRIPTTOOLS_LIB)
+# define Q_SCRIPTTOOLS_EXPORT Q_DECL_EXPORT
+# else
+# define Q_SCRIPTTOOLS_EXPORT Q_DECL_IMPORT
+# endif
+#else
+# define Q_SCRIPT_EXPORT
+# define Q_SCRIPTTOOLS_EXPORT
+#endif
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif