diff options
author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-10-26 10:41:56 (GMT) |
---|---|---|
committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-10-26 10:41:56 (GMT) |
commit | 968f7c0e65a293a7d7b9a87601e853894d9794ed (patch) | |
tree | 3a86b71dd69cf4b759bb20b62c18cfeb02a28ef0 /src/script/bridge/qscriptclassobject.cpp | |
parent | 3481db791c3b48e28f1a9531b247adf6562edb71 (diff) | |
parent | e2ef97128c006ac2a5c99c67bb54eebaa3b45720 (diff) | |
download | Qt-968f7c0e65a293a7d7b9a87601e853894d9794ed.zip Qt-968f7c0e65a293a7d7b9a87601e853894d9794ed.tar.gz Qt-968f7c0e65a293a7d7b9a87601e853894d9794ed.tar.bz2 |
Merge branch '4.6' into 4.6-platform
Diffstat (limited to 'src/script/bridge/qscriptclassobject.cpp')
-rw-r--r-- | src/script/bridge/qscriptclassobject.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/script/bridge/qscriptclassobject.cpp b/src/script/bridge/qscriptclassobject.cpp index 0d88532..1dde98b 100644 --- a/src/script/bridge/qscriptclassobject.cpp +++ b/src/script/bridge/qscriptclassobject.cpp @@ -70,17 +70,6 @@ ClassObjectDelegate::~ClassObjectDelegate() { } -QScriptClass *ClassObjectDelegate::scriptClass() const -{ - return m_scriptClass; -} - -void ClassObjectDelegate::setScriptClass(QScriptClass *scriptClass) -{ - Q_ASSERT(scriptClass != 0); - m_scriptClass = scriptClass; -} - QScriptObjectDelegate::Type ClassObjectDelegate::type() const { return ClassObject; |