Changeset 651 for trunk/src/gui/styles/qs60style_simulated.cpp

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/styles/qs60style_simulated.cpp (modified) (3 diffs)

trunk/src/gui/styles/qs60style_simulated.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -343 +343 @@
 }
 
-QFont QS60StylePrivate::s60Font_specific(QS60StyleEnums::FontCategories fontCategory, int pointSize)
+bool QS60StylePrivate::isSingleClickUi()
+{
+    return false;
+}
+
+QFont QS60StylePrivate::s60Font_specific(
+        QS60StyleEnums::FontCategories fontCategory,
+        int pointSize, bool resolveFontSize)
 {
     QFont result;
-    result.setPointSize(pointSize);
+    if (resolveFontSize)
+        result.setPointSize(pointSize);
     switch (fontCategory) {
         case QS60StyleEnums::FC_Primary:
@@ -360 +368 @@
     }
     return result;
+}
+
+int QS60StylePrivate::currentAnimationFrame(QS60StyleEnums::SkinParts part)
+{
+    return 0;
 }