diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-16 03:49:45 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-16 03:49:45 (GMT) |
| commit | 6a519b590c5e030b8f179d34448f5b45ca22c13d (patch) | |
| tree | fe9a6748d41b52222ba8db48c934e3aa97ba09c2 /src/declarative | |
| parent | 5595ad768309b27c2c20376105f8715082b616bf (diff) | |
| parent | 9c3acf1d307257df02a9ba0b6de6077881bb687b (diff) | |
| download | Qt-6a519b590c5e030b8f179d34448f5b45ca22c13d.zip Qt-6a519b590c5e030b8f179d34448f5b45ca22c13d.tar.gz Qt-6a519b590c5e030b8f179d34448f5b45ca22c13d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qdeclarativevaluetype.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp index 352a6c0..c5f6d6a 100644 --- a/src/declarative/qml/qdeclarativevaluetype.cpp +++ b/src/declarative/qml/qdeclarativevaluetype.cpp @@ -55,13 +55,13 @@ int qmlRegisterValueTypeEnums(const char *qmlName) QByteArray pointerName(name + '*'); QDeclarativePrivate::RegisterType type = { - 0, + 0, qRegisterMetaType<T *>(pointerName.constData()), 0, 0, 0, "Qt", 4, 6, qmlName, &T::staticMetaObject, - 0, 0, + 0, 0, 0, 0, 0, @@ -712,7 +712,7 @@ int QDeclarativeFontValueType::pixelSize() const void QDeclarativeFontValueType::setPixelSize(int size) { - if (size >=0) { + if (size >0) { if (pointSizeSet) qWarning() << "Both point size and pixel size set. Using pixel size."; font.setPixelSize(size); |