diff options
Diffstat (limited to 'src/declarative/qml/qmlengine.cpp')
| -rw-r--r-- | src/declarative/qml/qmlengine.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index 63f45b4..5cbd02b 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -39,11 +39,7 @@ ** ****************************************************************************/ -// XXX ;) -#define private public #include <QMetaProperty> -#undef private - #include <private/qmlengine_p.h> #include <private/qmlcontext_p.h> @@ -308,7 +304,7 @@ bool QmlEnginePrivate::fetchCache(QmlBasicScriptNodeCache &cache, const QString cache.object = obj; cache.type = QmlBasicScriptNodeCache::Core; - cache.core = prop.property().idx + prop.property().mobj->propertyOffset(); + cache.core = prop.property().propertyIndex(); cache.coreType = prop.propertyType(); return true; @@ -465,7 +461,7 @@ QmlContext *QmlEngine::activeContext() /*! Sets the mappings from namespace URIs to URL to \a map. - \sa nameSpacePaths + \sa nameSpacePaths() */ void QmlEngine::setNameSpacePaths(const QMap<QString,QString>& map) { @@ -476,7 +472,7 @@ void QmlEngine::setNameSpacePaths(const QMap<QString,QString>& map) /*! Adds mappings (given by \a map) from namespace URIs to URL. - \sa nameSpacePaths + \sa nameSpacePaths() */ void QmlEngine::addNameSpacePaths(const QMap<QString,QString>& map) { @@ -487,7 +483,7 @@ void QmlEngine::addNameSpacePaths(const QMap<QString,QString>& map) /*! Adds a mapping from namespace URI \a ns to URL \a path. - \sa nameSpacePaths + \sa nameSpacePaths() */ void QmlEngine::addNameSpacePath(const QString& ns, const QString& path) { @@ -525,7 +521,7 @@ void QmlEngine::addNameSpacePath(const QString& ns, const QString& path) In the above case, "xyz://abc/def/Bar.qml" would then map to "file:///opt/jkl/def/Bar.qml". - \sa componentUrl + \sa componentUrl() */ QMap<QString,QString> QmlEngine::nameSpacePaths() const { @@ -537,7 +533,7 @@ QMap<QString,QString> QmlEngine::nameSpacePaths() const Returns the URL for the component source \a src, as mapped by the nameSpacePaths(), resolved relative to \a baseUrl. - \sa nameSpacePaths + \sa nameSpacePaths() */ QUrl QmlEngine::componentUrl(const QUrl& src, const QUrl& baseUrl) const { |