From 82639859d2fa69c8d7c464a29a8f9cd5d284bb9d Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@nokia.com>
Date: Wed, 6 Jan 2010 13:46:15 +0100
Subject: Allow Bauhaus to reset hasPixelSize

We want to reset the pixelSize to a pointSize value.

Task-number: BAUHAUS-244
Reviewed-by: Kai Koehne
---
 src/declarative/qml/qmlvaluetype.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/declarative/qml/qmlvaluetype.cpp b/src/declarative/qml/qmlvaluetype.cpp
index 6d08cd1..058fd6e 100644
--- a/src/declarative/qml/qmlvaluetype.cpp
+++ b/src/declarative/qml/qmlvaluetype.cpp
@@ -583,7 +583,9 @@ void QmlFontValueType::setPointSize(qreal size)
         qWarning() << "Both point size and pixel size set. Using pixel size.";
         return;
     }
-    font.setPointSizeF(size);
+
+    if (size >= 0.0)
+        font.setPointSizeF(size);
 }
 
 int QmlFontValueType::pixelSize() const
@@ -593,8 +595,12 @@ int QmlFontValueType::pixelSize() const
 
 void QmlFontValueType::setPixelSize(int size)
 {
-    font.setPixelSize(size);
-    hasPixelSize = true;
+    if (size >=0) {
+        font.setPixelSize(size);
+        hasPixelSize = true;
+    } else {
+        hasPixelSize = false;
+    }
 }
 
 QmlFontValueType::Capitalization QmlFontValueType::capitalization() const
-- 
cgit v0.12