diff options
| -rw-r--r-- | src/script/api/api.pri | 3 | ||||
| -rw-r--r-- | src/script/api/qscriptable.h | 1 | ||||
| -rw-r--r-- | src/script/api/qscriptcontextinfo.h | 1 | ||||
| -rw-r--r-- | src/script/api/qscriptengineagent.h | 1 | ||||
| -rw-r--r-- | src/script/api/qscriptextensioninterface.h | 1 | ||||
| -rw-r--r-- | src/script/api/qscriptprogram.h | 1 | ||||
| -rw-r--r-- | src/script/api/qscriptstring.h | 1 | ||||
| -rw-r--r-- | src/script/api/qscriptvalue.h | 1 | ||||
| -rw-r--r-- | src/script/api/qtscriptglobal.h | 70 | ||||
| -rw-r--r-- | src/scripttools/debugging/qscriptenginedebugger.h | 1 |
10 files changed, 80 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 diff --git a/src/scripttools/debugging/qscriptenginedebugger.h b/src/scripttools/debugging/qscriptenginedebugger.h index 38a94f2..13de748 100644 --- a/src/scripttools/debugging/qscriptenginedebugger.h +++ b/src/scripttools/debugging/qscriptenginedebugger.h @@ -43,6 +43,7 @@ #define QSCRIPTENGINEDEBUGGER_H #include <QtCore/qobject.h> +#include <QtScript/qtscriptglobal.h> QT_BEGIN_HEADER |