summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview
diff options
context:
space:
mode:
authorJan-Arve Sæther <jan-arve.saether@nokia.com>2010-08-13 08:58:22 (GMT)
committerJan-Arve Sæther <jan-arve.saether@nokia.com>2010-09-02 12:38:01 (GMT)
commitac3939fa0a57adce6495c36f4f8b7d43d13483cd (patch)
tree125754cb063c03599c6ed0625ee956fdd4dd4b0a /src/gui/graphicsview
parentce01dab25d4713c0a48f8604ed82ef43efc4f04d (diff)
downloadQt-ac3939fa0a57adce6495c36f4f8b7d43d13483cd.zip
Qt-ac3939fa0a57adce6495c36f4f8b7d43d13483cd.tar.gz
Qt-ac3939fa0a57adce6495c36f4f8b7d43d13483cd.tar.bz2
Enable the width-for-height codepath and add autotest for WFH.
Task-number: Side-effect of QTBUG-3570
Diffstat (limited to 'src/gui/graphicsview')
-rw-r--r--src/gui/graphicsview/qgraphicslayoutitem.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gui/graphicsview/qgraphicslayoutitem.cpp b/src/gui/graphicsview/qgraphicslayoutitem.cpp
index bfe734a..23f9923 100644
--- a/src/gui/graphicsview/qgraphicslayoutitem.cpp
+++ b/src/gui/graphicsview/qgraphicslayoutitem.cpp
@@ -285,10 +285,6 @@ bool QGraphicsLayoutItemPrivate::hasHeightForWidth() const
bool QGraphicsLayoutItemPrivate::hasWidthForHeight() const
{
- // enable this code when we add QSizePolicy::hasWidthForHeight() (For 4.8)
-#if 1
- return false;
-#else
Q_Q(const QGraphicsLayoutItem);
if (isLayout) {
const QGraphicsLayout *l = static_cast<const QGraphicsLayout *>(q);
@@ -305,7 +301,6 @@ bool QGraphicsLayoutItemPrivate::hasWidthForHeight() const
}
}
return q->sizePolicy().hasWidthForHeight();
-#endif
}
/*!