summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-03-11 00:19:53 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-03-11 00:19:53 (GMT)
commitdd7230279bf22fe34f04aa7d216b6d2fb60db720 (patch)
treeb1dd7b7ca9995f142f7afc8be0ba56838db121dc
parent5c4e609c4505fc0fb1564d8daea06e68df5d8f13 (diff)
downloadQt-dd7230279bf22fe34f04aa7d216b6d2fb60db720.zip
Qt-dd7230279bf22fe34f04aa7d216b6d2fb60db720.tar.gz
Qt-dd7230279bf22fe34f04aa7d216b6d2fb60db720.tar.bz2
Remove more accidentally submitted code
-rw-r--r--src/declarative/qml/qdeclarativepropertycache.cpp4
-rw-r--r--src/declarative/qml/qdeclarativepropertycache_p.h1
2 files changed, 0 insertions, 5 deletions
diff --git a/src/declarative/qml/qdeclarativepropertycache.cpp b/src/declarative/qml/qdeclarativepropertycache.cpp
index cbb67e1..fea59e5 100644
--- a/src/declarative/qml/qdeclarativepropertycache.cpp
+++ b/src/declarative/qml/qdeclarativepropertycache.cpp
@@ -420,8 +420,4 @@ QDeclarativePropertyCache::Data *QDeclarativePropertyCache::property(QDeclarativ
return rv;
}
-QDeclarativePropertyCache::Data QDeclarativePropertyCache::property(const QMetaObject *, const char *)
-{
-}
-
QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativepropertycache_p.h b/src/declarative/qml/qdeclarativepropertycache_p.h
index 79ddf8d..bfbeff4 100644
--- a/src/declarative/qml/qdeclarativepropertycache_p.h
+++ b/src/declarative/qml/qdeclarativepropertycache_p.h
@@ -137,7 +137,6 @@ public:
inline QDeclarativeEngine *qmlEngine() const;
static Data *property(QDeclarativeEngine *, QObject *, const QScriptDeclarativeClass::Identifier &, Data &);
static Data *property(QDeclarativeEngine *, QObject *, const QString &, Data &);
- static Data property(const QMetaObject *, const char *);
protected:
virtual void clear();