From 99fde91e08cd20410c8161e79295a029abbff53f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= <jan-arve.saether@nokia.com>
Date: Mon, 2 Aug 2010 08:39:20 +0200
Subject: Add hasWidthForHeight in order to support WFH in QGraphicsLayout.

Task-number: Consequence of QT-3570
Reviewed-by: Paul
---
 src/gui/kernel/qsizepolicy.h    | 21 +++++++++++++--------
 src/gui/kernel/qsizepolicy.qdoc | 24 +++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/gui/kernel/qsizepolicy.h b/src/gui/kernel/qsizepolicy.h
index ff7b9ee..26cc1e1 100644
--- a/src/gui/kernel/qsizepolicy.h
+++ b/src/gui/kernel/qsizepolicy.h
@@ -62,12 +62,12 @@ private:
         HSize = 4,
         HMask = 0x0f,
         VMask = HMask << HSize,
-		CTShift = 9,
-		CTSize = 5,
-                WFHShift = CTShift + CTSize,
-		CTMask = ((0x1 << CTSize) - 1) << CTShift,
-		UnusedShift = CTShift + CTSize,
-		UnusedSize = 2
+        CTShift = 9,
+        CTSize = 5,
+        CTMask = ((0x1 << CTSize) - 1) << CTShift,
+        WFHShift = CTShift + CTSize,
+        UnusedShift = WFHShift + 1,
+        UnusedSize = 1
     };
 
 public:
@@ -134,6 +134,8 @@ public:
 
     void setHeightForWidth(bool b) { data = b ? (data | (1 << 2*HSize)) : (data & ~(1 << 2*HSize));  }
     bool hasHeightForWidth() const { return data & (1 << 2*HSize); }
+    void setWidthForHeight(bool b) { data = b ? (data | (1 << (WFHShift))) : (data & ~(1 << (WFHShift)));  }
+    bool hasWidthForHeight() const { return data & (1 << (WFHShift)); }
 
     bool operator==(const QSizePolicy& s) const { return data == s.data; }
     bool operator!=(const QSizePolicy& s) const { return data != s.data; }
@@ -200,15 +202,18 @@ private:
     QSizePolicy(int i) : data(i) { }
 
     quint32 data;
-/*  use bit flags instead, keep it here for improved readability for now
+/*  Qt5: Use bit flags instead, keep it here for improved readability for now.
+    We can maybe change it for Qt4, but we'd have to be careful, since the behaviour
+    is implementation defined. It usually varies between little- and big-endian compilers, but
+    it might also not vary.
     quint32 horzPolicy : 4;
     quint32 vertPolicy : 4;
     quint32 hfw : 1;
     quint32 ctype : 5;
     quint32 wfh : 1;
     quint32 padding : 1;   // we cannot use the highest bit
-    quint32 horStretch : 8;
     quint32 verStretch : 8;
+    quint32 horStretch : 8;
 */
 
 };
diff --git a/src/gui/kernel/qsizepolicy.qdoc b/src/gui/kernel/qsizepolicy.qdoc
index 7cd05c5..f6a350c 100644
--- a/src/gui/kernel/qsizepolicy.qdoc
+++ b/src/gui/kernel/qsizepolicy.qdoc
@@ -249,7 +249,7 @@
     Sets the flag determining whether the widget's preferred height
     depends on its width, to \a dependent.
 
-    \sa hasHeightForWidth()
+    \sa hasHeightForWidth(), setWidthForHeight()
 */
 
 /*!
@@ -262,6 +262,28 @@
 */
 
 /*!
+    \fn void QSizePolicy::setWidthForHeight(bool dependent)
+
+    Sets the flag determining whether the widget's width
+    depends on its height, to \a dependent.
+
+    This is only supported for QGraphicsLayout's subclasses.
+    It is not possible to have a layout with both height-for-width
+    and width-for-height constraints at the same time.
+
+    \sa hasWidthForHeight(), setHeightForWidth()
+*/
+
+/*!
+    \fn bool QSizePolicy::hasWidthForHeight() const
+
+    Returns true if the widget's width depends on its
+    height; otherwise returns false.
+
+    \sa setWidthForHeight()
+*/
+
+/*!
     \fn bool QSizePolicy::operator==(const QSizePolicy &other) const
 
     Returns true if this policy is equal to \a other; otherwise
-- 
cgit v0.12