diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-27 01:55:42 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-27 01:56:46 (GMT) |
| commit | 04a2350db6ef1fffa3c81c747b4474e92d1af70d (patch) | |
| tree | 588ad47e0bce498d5055e0d88c1c4de5fe7e93ca /src | |
| parent | ddc7fcee9c3602bcbb79a6b8538315a633fa3db4 (diff) | |
| download | Qt-04a2350db6ef1fffa3c81c747b4474e92d1af70d.zip Qt-04a2350db6ef1fffa3c81c747b4474e92d1af70d.tar.gz Qt-04a2350db6ef1fffa3c81c747b4474e92d1af70d.tar.bz2 | |
Correctly inherit extension properties
Correct a typo that breaks extension properties in some cases.
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qdeclarativemetatype.cpp | 2 | ||||
| -rw-r--r-- | src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp index d9ea8dc..5fcb7ee 100644 --- a/src/declarative/qml/qdeclarativemetatype.cpp +++ b/src/declarative/qml/qdeclarativemetatype.cpp @@ -247,7 +247,7 @@ static void clone(QMetaObjectBuilder &builder, const QMetaObject *mo, QMetaProperty property = mo->property(ii); int otherIndex = ignoreEnd->indexOfProperty(property.name()); - if (otherIndex >= ignoreStart->classInfoOffset() + ignoreStart->classInfoCount()) { + if (otherIndex >= ignoreStart->propertyOffset() + ignoreStart->propertyCount()) { builder.addProperty(QByteArray("__qml_ignore__") + property.name(), QByteArray("void")); // Skip } else { diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h index 04731b1..75c2bb1 100644 --- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h +++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE class QGL2PaintEngineExPrivate; -class QGLTextureGlyphCache : public QObject, public QTextureGlyphCache +class Q_OPENGL_EXPORT QGLTextureGlyphCache : public QObject, public QTextureGlyphCache { Q_OBJECT public: |