diff options
| author | aavit <qt-info@nokia.com> | 2010-02-20 21:02:27 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-02-20 21:02:27 (GMT) |
| commit | b3fb3713bd0118e0357bc95cf665c4e8bb6f978f (patch) | |
| tree | c4d1f0b4513692717bc99fb638f18061dc318b51 /src/declarative/qml/qmlcomponent.cpp | |
| parent | 4e8e1dcc9d4c003f160268d095fc1b20e6995da2 (diff) | |
| parent | ce276c42d95f8a7e83da371f33d9da32986a30eb (diff) | |
| download | Qt-b3fb3713bd0118e0357bc95cf665c4e8bb6f978f.zip Qt-b3fb3713bd0118e0357bc95cf665c4e8bb6f978f.tar.gz Qt-b3fb3713bd0118e0357bc95cf665c4e8bb6f978f.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'src/declarative/qml/qmlcomponent.cpp')
| -rw-r--r-- | src/declarative/qml/qmlcomponent.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp index f15c364..87ecb8a 100644 --- a/src/declarative/qml/qmlcomponent.cpp +++ b/src/declarative/qml/qmlcomponent.cpp @@ -539,7 +539,6 @@ QObject *QmlComponent::create(QmlContext *context) QObject *QmlComponentPrivate::create(QmlContext *context, const QBitField &bindings) { - QObject *create(QmlContext *context, const QBitField &); if (!context) context = engine->rootContext(); |