summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeengine.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-04-07 04:25:54 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-04-07 04:26:46 (GMT)
commitec50ac021ba0908bfaeb5fbf1838ffb59ad829d5 (patch)
tree1a6365c8b7487e4f5cf7e489aba8005797005e3c /src/declarative/qml/qdeclarativeengine.cpp
parentb3beb6ded506f1701b68642d981c63295bc6c6a2 (diff)
downloadQt-ec50ac021ba0908bfaeb5fbf1838ffb59ad829d5.zip
Qt-ec50ac021ba0908bfaeb5fbf1838ffb59ad829d5.tar.gz
Qt-ec50ac021ba0908bfaeb5fbf1838ffb59ad829d5.tar.bz2
Cleanup (remove QDeclarativeScriptClass)
QDeclarativeScriptClass only existed to make compiling against 4.6 and 4.7 easier.
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine.cpp')
-rw-r--r--src/declarative/qml/qdeclarativeengine.cpp14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index f7d1df3..e8b6913 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -61,7 +61,6 @@
#include "private/qdeclarativeglobal_p.h"
#include "private/qdeclarativeworkerscript_p.h"
#include "private/qdeclarativecomponent_p.h"
-#include "private/qdeclarativescriptclass_p.h"
#include "qdeclarativenetworkaccessmanagerfactory.h"
#include "qdeclarativeimageprovider.h"
#include "private/qdeclarativedirparser_p.h"
@@ -1365,19 +1364,6 @@ QVariant QDeclarativeEnginePrivate::scriptValueToVariant(const QScriptValue &val
}
}
-QDeclarativeScriptClass::QDeclarativeScriptClass(QScriptEngine *engine)
-: QScriptDeclarativeClass(engine)
-{
-}
-
-QVariant QDeclarativeScriptClass::toVariant(QDeclarativeEngine *engine, const QScriptValue &val)
-{
- QDeclarativeEnginePrivate *ep =
- static_cast<QDeclarativeEnginePrivate *>(QObjectPrivate::get(engine));
-
- return ep->scriptValueToVariant(val);
-}
-
// XXX this beyonds in QUrl::toLocalFile()
// WARNING, there is a copy of this function in qdeclarativecompositetypemanager.cpp
static QString toLocalFileOrQrc(const QUrl& url)