diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-10 08:33:34 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-10 08:33:34 (GMT) |
| commit | e5913012f44843bd8f7a6cc28de5de87f134aa65 (patch) | |
| tree | 9acb7897440aec8eec7e926cb160c59a8fed78d2 /src/script | |
| parent | 761b2fec23a17ea523cbd78beb2731526ea19891 (diff) | |
| parent | 7aa2d76dfc4a107f38c5cb0aac00a0b31d0fbbb6 (diff) | |
| download | Qt-e5913012f44843bd8f7a6cc28de5de87f134aa65.zip Qt-e5913012f44843bd8f7a6cc28de5de87f134aa65.tar.gz Qt-e5913012f44843bd8f7a6cc28de5de87f134aa65.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Conflicts:
src/script/api/qscriptable.cpp
src/script/api/qscriptable_p.h
src/script/qscriptclassdata.cpp
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/api/qscriptable.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/script/api/qscriptable.cpp b/src/script/api/qscriptable.cpp index cbe29c5..4f1d4b9 100644 --- a/src/script/api/qscriptable.cpp +++ b/src/script/api/qscriptable.cpp @@ -39,8 +39,6 @@ ** ****************************************************************************/ -#ifndef QT_NO_QOBJECT - #include "qscriptable.h" #include "qscriptable_p.h" #include "qscriptengine.h" @@ -183,6 +181,4 @@ QScriptValue QScriptable::argument(int index) const return QScriptValue(); } -#endif // QT_NO_QOBJECT - QT_END_NAMESPACE |