diff options
author | Martin Jones <martin.jones@nokia.com> | 2010-08-23 00:33:52 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2010-08-23 00:33:52 (GMT) |
commit | 6a3945d3ca3185c00597dcaefb93617620973ff5 (patch) | |
tree | 0534630f29a2d513621adf33c6fb25085fcab220 /src/declarative/util/qdeclarativefontloader_p.h | |
parent | 1690ad91cc9e686e688aa7832a16cbf2c9336948 (diff) | |
parent | 67e90b8a5701ef5b0653f012e74debc91e1b3b49 (diff) | |
download | Qt-6a3945d3ca3185c00597dcaefb93617620973ff5.zip Qt-6a3945d3ca3185c00597dcaefb93617620973ff5.tar.gz Qt-6a3945d3ca3185c00597dcaefb93617620973ff5.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/util/qdeclarativefontloader_p.h')
-rw-r--r-- | src/declarative/util/qdeclarativefontloader_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativefontloader_p.h b/src/declarative/util/qdeclarativefontloader_p.h index 6947547..a5fbb8f 100644 --- a/src/declarative/util/qdeclarativefontloader_p.h +++ b/src/declarative/util/qdeclarativefontloader_p.h @@ -60,7 +60,7 @@ class Q_AUTOTEST_EXPORT QDeclarativeFontLoader : public QObject Q_DECLARE_PRIVATE(QDeclarativeFontLoader) Q_ENUMS(Status) - Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) + Q_PROPERTY(QUrl source READ source WRITE setSource) Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) Q_PROPERTY(Status status READ status NOTIFY statusChanged) |