diff options
| author | miniak <milan.burda@gmail.com> | 2010-08-03 16:33:12 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-03 16:35:28 (GMT) |
| commit | 26f43dcc70a0bcc8aec96a0ca6f648c543b97b10 (patch) | |
| tree | a387f04203570a75e347abd78cf765e9903c9e36 /src/script | |
| parent | 02e5a6c9abe9562ce2b2057c0b89f65d371c5b40 (diff) | |
| download | Qt-26f43dcc70a0bcc8aec96a0ca6f648c543b97b10.zip Qt-26f43dcc70a0bcc8aec96a0ca6f648c543b97b10.tar.gz Qt-26f43dcc70a0bcc8aec96a0ca6f648c543b97b10.tar.bz2 | |
It is no longer necessary to check for QT_NO_MEMBER_TEMPLATES
Merge-request: 756
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/api/qscriptengine.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/script/api/qscriptengine.h b/src/script/api/qscriptengine.h index 1fe65db..6add6ed 100644 --- a/src/script/api/qscriptengine.h +++ b/src/script/api/qscriptengine.h @@ -65,13 +65,11 @@ inline QScriptValue qscriptQMetaObjectConstructor(QScriptContext *, QScriptEngin class QRegExp; #endif -#ifndef QT_NO_MEMBER_TEMPLATES template <typename T> inline QScriptValue qScriptValueFromValue(QScriptEngine *, const T &); template <typename T> inline T qScriptValueToValue(const QScriptValue &); -#endif class QScriptSyntaxCheckResultPrivate; class Q_SCRIPT_EXPORT QScriptSyntaxCheckResult @@ -196,9 +194,7 @@ public: QScriptValue newQMetaObject(const QMetaObject *metaObject, const QScriptValue &ctor = QScriptValue()); -# ifndef QT_NO_MEMBER_TEMPLATES template <class T> QScriptValue scriptValueFromQMetaObject(); -# endif // QT_NO_MEMBER_TEMPLATES #endif // QT_NO_QOBJECT @@ -213,7 +209,6 @@ public: -#ifndef QT_NO_MEMBER_TEMPLATES template <typename T> inline QScriptValue toScriptValue(const T &value) { @@ -224,7 +219,6 @@ public: { return qScriptValueToValue<T>(value); } -#endif // QT_NO_MEMBER_TEMPLATES void installTranslatorFunctions(const QScriptValue &object = QScriptValue()); @@ -311,12 +305,10 @@ template<> inline QScriptValue qscriptQMetaObjectConstructor<T>(QScriptContext * return o; \ } -# ifndef QT_NO_MEMBER_TEMPLATES template <class T> QScriptValue QScriptEngine::scriptValueFromQMetaObject() { return qScriptValueFromQMetaObject<T>(this); } -# endif // QT_NO_MEMBER_TEMPLATES #endif // QT_NO_QOBJECT |