diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-14 03:01:20 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-14 03:01:20 +0200 |
| commit | a3926bb9f1eb6884f718edc4d9c9a5cffd03b0c3 (patch) | |
| tree | f50d07fd51ec5c43b2ae1193fae02faf346e2dc5 /src/script/api/qscriptengine.h | |
| parent | fb7fdcbdff7a92d7770b648fa2989327cc103edb (diff) | |
| parent | c2657d346455a5a7821fbfbe3b1107d7cf9b0949 (diff) | |
| download | qtscript-a3926bb9f1eb6884f718edc4d9c9a5cffd03b0c3.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I7b010b4d38e9141c083c4e79b4dd0d30c170e07f
Diffstat (limited to 'src/script/api/qscriptengine.h')
| -rw-r--r-- | src/script/api/qscriptengine.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/script/api/qscriptengine.h b/src/script/api/qscriptengine.h index c7bda46..04f678d 100644 --- a/src/script/api/qscriptengine.h +++ b/src/script/api/qscriptengine.h @@ -378,11 +378,8 @@ int qScriptRegisterMetaType( QScriptEngine *eng, QScriptValue (*toScriptValue)(QScriptEngine *, const T &t), void (*fromScriptValue)(const QScriptValue &, T &t), - const QScriptValue &prototype = QScriptValue() -#ifndef qdoc - , T * /* dummy */ = 0 -#endif -) + const QScriptValue &prototype = QScriptValue(), + T * /* dummy */ = 0) { const int id = qRegisterMetaType<T>(); // make sure it's registered @@ -420,11 +417,8 @@ void qScriptValueToSequence(const QScriptValue &value, Container &cont) template<typename T> int qScriptRegisterSequenceMetaType( QScriptEngine *engine, - const QScriptValue &prototype = QScriptValue() -#ifndef qdoc - , T * /* dummy */ = 0 -#endif -) + const QScriptValue &prototype = QScriptValue(), + T * /* dummy */ = 0) { return qScriptRegisterMetaType<T>(engine, qScriptValueFromSequence, qScriptValueToSequence, prototype); |