summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2010-04-16 03:41:35 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2010-04-16 03:42:53 (GMT)
commit9c3acf1d307257df02a9ba0b6de6077881bb687b (patch)
tree08aa5f8c1213f0f04d99a512e8a89513e2ac4100 /src
parentab93420dfd9ebcde01e1aecc0729133803014719 (diff)
downloadQt-9c3acf1d307257df02a9ba0b6de6077881bb687b.zip
Qt-9c3acf1d307257df02a9ba0b6de6077881bb687b.tar.gz
Qt-9c3acf1d307257df02a9ba0b6de6077881bb687b.tar.bz2
Do not set a font pixel size of 0.
Diffstat (limited to 'src')
-rw-r--r--src/declarative/qml/qdeclarativevaluetype.cpp6
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);