From 933e74473a23c0090eaaae9c6122a0e0d192df15 Mon Sep 17 00:00:00 2001
From: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Date: Tue, 22 Sep 2009 16:24:07 -0300
Subject: QGraphicsAnchorLayout: add autotests for QSizePolicy::ExpandFlag

Add autotests that use the ExpandFlag via QSizePolicy::Expanding
policy. Those tests cover the simple cases and behaviours with
sequential and parallel anchor setups.

Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
---
 .../tst_qgraphicsanchorlayout.cpp                  | 214 +++++++++++++++++++++
 1 file changed, 214 insertions(+)

diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index 9f13aca..e898edb 100644
--- a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -69,6 +69,9 @@ private slots:
     void delete_anchor();
     void conflicts();
     void sizePolicy();
+    void expandingSequence();
+    void expandingSequenceFairDistribution();
+    void expandingParallel();
 };
 
 class RectWidget : public QGraphicsWidget
@@ -586,6 +589,20 @@ void tst_QGraphicsAnchorLayout::snake()
     QCOMPARE(b->geometry(), QRectF(90.0, 100.0, 10.0, 100.0));
     QCOMPARE(c->geometry(), QRectF(90.0, 200.0, 100.0, 100.0));
     QCOMPARE(p.size(), layoutMaximumSize);
+
+    QVERIFY(layoutHasConflict(l) == false);
+
+    // Test QSizePolicy::ExpandFlag, it shouldn't change the extreme
+    // points of the layout...
+    b->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+
+    QSizeF newLayoutMinimumSize = l->effectiveSizeHint(Qt::MinimumSize);
+    QSizeF newLayoutMaximumSize = l->effectiveSizeHint(Qt::MaximumSize);
+    QSizeF newLayoutPreferredSize = l->effectiveSizeHint(Qt::PreferredSize);
+
+    QCOMPARE(layoutMinimumSize, newLayoutMinimumSize);
+    QCOMPARE(layoutMaximumSize, newLayoutMaximumSize);
+    QCOMPARE(layoutPreferredSize, newLayoutPreferredSize);
 }
 
 void tst_QGraphicsAnchorLayout::snakeOppositeDirections()
@@ -1308,5 +1325,202 @@ void tst_QGraphicsAnchorLayout::conflicts()
     delete p;
 }
 
+void tst_QGraphicsAnchorLayout::expandingSequence()
+{
+    QSizeF min(10, 10);
+    QSizeF pref(50, 10);
+    QSizeF max(100, 10);
+
+    QGraphicsWidget *a = createItem(min, pref, max, "a");
+    QGraphicsWidget *b = createItem(min, pref, max, "b");
+
+    b->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    l->setContentsMargins(0, 0, 0, 0);
+
+    // horizontal
+    setAnchor(l, l, Qt::AnchorLeft, a, Qt::AnchorLeft, 0);
+    setAnchor(l, a, Qt::AnchorRight, b, Qt::AnchorLeft, 0);
+    setAnchor(l, b, Qt::AnchorRight, l, Qt::AnchorRight, 0);
+
+    // vertical
+    l->addAnchors(l, a, Qt::Vertical);
+    l->addAnchors(l, b, Qt::Vertical);
+
+    QCOMPARE(l->count(), 2);
+
+    QGraphicsWidget p;
+    p.setLayout(l);
+
+    QSizeF layoutMinimumSize = l->effectiveSizeHint(Qt::MinimumSize);
+    QCOMPARE(layoutMinimumSize.width(), qreal(20));
+
+    QSizeF layoutExpandedSize(pref.width() + max.width(), layoutMinimumSize.height());
+    p.resize(layoutExpandedSize);
+
+    QEXPECT_FAIL("", "Support for QSizePolicy::ExpandFlag not yet available", Abort);
+    QCOMPARE(a->geometry().size(), pref);
+    QCOMPARE(b->geometry().size(), max);
+
+    QSizeF layoutMaximumSize = l->effectiveSizeHint(Qt::MaximumSize);
+    QCOMPARE(layoutMaximumSize.width(), qreal(200));
+}
+
+void tst_QGraphicsAnchorLayout::expandingSequenceFairDistribution()
+{
+    QSizeF min(10, 10);
+    QSizeF pref(50, 10);
+    QSizeF max(100, 10);
+
+    QGraphicsWidget *a = createItem(min, pref, max, "a");
+    QGraphicsWidget *b = createItem(min, pref, max, "b");
+    QGraphicsWidget *c = createItem(min, pref, max, "c");
+    QGraphicsWidget *d = createItem(min, pref, max, "d");
+
+    b->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    d->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    l->setContentsMargins(0, 0, 0, 0);
+
+    // horizontal
+    setAnchor(l, l, Qt::AnchorLeft, a, Qt::AnchorLeft, 0);
+    setAnchor(l, a, Qt::AnchorRight, b, Qt::AnchorLeft, 0);
+    setAnchor(l, b, Qt::AnchorRight, c, Qt::AnchorLeft, 0);
+    setAnchor(l, c, Qt::AnchorRight, d, Qt::AnchorLeft, 0);
+    setAnchor(l, d, Qt::AnchorRight, l, Qt::AnchorRight, 0);
+
+    // vertical
+    l->addAnchors(l, a, Qt::Vertical);
+    l->addAnchors(l, b, Qt::Vertical);
+    l->addAnchors(l, c, Qt::Vertical);
+    l->addAnchors(l, d, Qt::Vertical);
+
+    QCOMPARE(l->count(), 4);
+
+    QGraphicsWidget p;
+    p.setLayout(l);
+
+    QSizeF layoutMinimumSize = l->effectiveSizeHint(Qt::MinimumSize);
+    QCOMPARE(layoutMinimumSize.width(), qreal(40));
+
+    QSizeF layoutPartialExpandedSize((2 * pref.width()) + (2 * (pref.width() + 10)),
+                                     layoutMinimumSize.height());
+    p.resize(layoutPartialExpandedSize);
+
+    QEXPECT_FAIL("", "Support for QSizePolicy::ExpandFlag not yet available", Abort);
+    QCOMPARE(a->geometry().size(), pref);
+    QCOMPARE(b->geometry().size(), pref + QSizeF(10, 0));
+    QCOMPARE(c->geometry().size(), pref);
+    QCOMPARE(d->geometry().size(), pref + QSizeF(10, 0));
+
+    QSizeF layoutExpandedSize((2 * pref.width()) + (2 * max.width()),
+                              layoutMinimumSize.height());
+    p.resize(layoutExpandedSize);
+
+    QCOMPARE(a->geometry().size(), pref);
+    QCOMPARE(b->geometry().size(), max);
+    QCOMPARE(c->geometry().size(), pref);
+    QCOMPARE(d->geometry().size(), max);
+
+    QSizeF layoutMaximumSize = l->effectiveSizeHint(Qt::MaximumSize);
+    QCOMPARE(layoutMaximumSize.width(), qreal(400));
+
+    // Now we change D to have more "room for growth" from its preferred size
+    // to its maximum size. We expect a proportional fair distribution. Note that
+    // this seems to not conform with what QGraphicsLinearLayout does.
+    d->setMaximumSize(QSizeF(150, 10));
+
+    QSizeF newLayoutExpandedSize((2 * pref.width()) + (max.width() + 150),
+                              layoutMinimumSize.height());
+    p.resize(newLayoutExpandedSize);
+
+    QCOMPARE(a->geometry().size(), pref);
+    QCOMPARE(b->geometry().size(), max);
+    QCOMPARE(c->geometry().size(), pref);
+    QCOMPARE(d->geometry().size(), QSizeF(150, 10));
+
+    QSizeF newLayoutPartialExpandedSize((4 * pref.width()) + 75,
+                                        layoutMinimumSize.height());
+
+    QCOMPARE(a->geometry().size(), pref);
+    QCOMPARE(b->geometry().size(), pref + QSizeF(25, 0));
+    QCOMPARE(c->geometry().size(), pref);
+    QCOMPARE(d->geometry().size(), pref + QSizeF(50, 0));
+}
+
+void tst_QGraphicsAnchorLayout::expandingParallel()
+{
+    QSizeF min(10, 10);
+    QSizeF pref(50, 10);
+    QSizeF max(100, 50);
+
+    QGraphicsWidget *a = createItem(min, pref, max, "a");
+    QGraphicsWidget *b = createItem(min, pref, max, "b");
+    QGraphicsWidget *c = createItem(min, pref, max, "c");
+
+    b->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    l->setContentsMargins(0, 0, 0, 0);
+
+    // horizontal
+    setAnchor(l, l, Qt::AnchorLeft, a, Qt::AnchorLeft, 0);
+    setAnchor(l, l, Qt::AnchorLeft, b, Qt::AnchorLeft, 0);
+
+    setAnchor(l, a, Qt::AnchorRight, c, Qt::AnchorLeft, 0);
+    setAnchor(l, b, Qt::AnchorRight, c, Qt::AnchorLeft, 0);
+
+    setAnchor(l, c, Qt::AnchorRight, l, Qt::AnchorRight, 0);
+
+    // vertical
+    l->addAnchors(l, c, Qt::Vertical);
+    setAnchor(l, l, Qt::AnchorTop, a, Qt::AnchorTop, 0);
+    setAnchor(l, a, Qt::AnchorBottom, c, Qt::AnchorVerticalCenter, 0);
+    setAnchor(l, b, Qt::AnchorTop, c, Qt::AnchorVerticalCenter, 0);
+    setAnchor(l, b, Qt::AnchorBottom, l, Qt::AnchorBottom, 0);
+
+    QCOMPARE(l->count(), 3);
+
+    QGraphicsWidget p;
+    p.setLayout(l);
+
+    QSizeF layoutMinimumSize = l->effectiveSizeHint(Qt::MinimumSize);
+    QCOMPARE(layoutMinimumSize.width(), qreal(20));
+
+    QSizeF layoutExpandedSize(pref.width() + max.width(), layoutMinimumSize.height());
+    p.resize(layoutExpandedSize);
+
+    QEXPECT_FAIL("", "Support for QSizePolicy::ExpandFlag not yet available", Abort);
+    QCOMPARE(a->geometry().size(), max);
+    QCOMPARE(b->geometry().size(), max);
+    QCOMPARE(c->geometry().size(), pref);
+
+    QSizeF layoutMaximumSize = l->effectiveSizeHint(Qt::MaximumSize);
+    QCOMPARE(layoutMaximumSize.width(), qreal(200));
+
+    //
+    // Change the parallel connection to a paralell connection of b with a center...
+    //
+    QGraphicsAnchor *anchor = l->anchor(b, Qt::AnchorRight, c, Qt::AnchorLeft);
+    delete anchor;
+    setAnchor(l, b, Qt::AnchorRight, a, Qt::AnchorHorizontalCenter, 0);
+    a->setMaximumSize(max + QSizeF(100, 0));
+
+    QSizeF newLayoutMinimumSize = l->effectiveSizeHint(Qt::MinimumSize);
+    QCOMPARE(newLayoutMinimumSize.width(), qreal(30));
+
+    QSizeF newLayoutExpandedSize(pref.width() + max.width(), layoutMinimumSize.height());
+    p.resize(newLayoutExpandedSize);
+
+    QCOMPARE(a->geometry().size(), max);
+    QCOMPARE(b->geometry().size(), max);
+    QCOMPARE(c->geometry().size(), pref);
+
+    QSizeF newLayoutMaximumSize = l->effectiveSizeHint(Qt::MaximumSize);
+    QCOMPARE(newLayoutMaximumSize.width(), qreal(300));
+}
+
 QTEST_MAIN(tst_QGraphicsAnchorLayout)
 #include "tst_qgraphicsanchorlayout.moc"
-- 
cgit v0.12


From bfc1a75616e1c96a018349084fae844d7efbc177 Mon Sep 17 00:00:00 2001
From: "Eduardo M. Fleury" <eduardo.fleury@openbossa.org>
Date: Tue, 22 Sep 2009 14:20:10 -0300
Subject: QGraphicsAnchorLayout: Add data structures for Expanding size policy

Adding required members for the upcoming support of the
QSizePolicy::Expand flag.

In this state, running with simplification will probably not work.

Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
---
 src/gui/graphicsview/qgraphicsanchorlayout_p.cpp | 44 +++++++++++++++++++-----
 src/gui/graphicsview/qgraphicsanchorlayout_p.h   | 20 ++++++++---
 2 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
index f75118b..fc3bc8a 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -94,7 +94,9 @@ qreal QGraphicsAnchorPrivate::spacing() const
 
 void AnchorData::refreshSizeHints(qreal effectiveSpacing)
 {
-    if (!isLayoutAnchor && from->m_item == to->m_item) {
+    isExpanding = 0;
+
+    if (!isLayoutAnchor && (from->m_item == to->m_item)) {
         QGraphicsLayoutItem *item = from->m_item;
 
         const QGraphicsAnchorLayoutPrivate::Orientation orient = QGraphicsAnchorLayoutPrivate::edgeOrientation(from->m_edge);
@@ -138,6 +140,9 @@ void AnchorData::refreshSizeHints(qreal effectiveSpacing)
         if (policy & QSizePolicy::IgnoreFlag)
             prefSize = minSize;
 
+        if (policy & QSizePolicy::ExpandFlag)
+            isExpanding = 1;
+
         bool hasCenter = (from->m_edge == centerEdge || to->m_edge == centerEdge);
 
         if (hasCenter) {
@@ -155,6 +160,7 @@ void AnchorData::refreshSizeHints(qreal effectiveSpacing)
         // recalculate and override the values we set here.
         sizeAtMinimum = prefSize;
         sizeAtPreferred = prefSize;
+        sizeAtExpanding = prefSize;
         sizeAtMaximum = prefSize;
 
     } else if (!hasSize) {
@@ -165,6 +171,7 @@ void AnchorData::refreshSizeHints(qreal effectiveSpacing)
 
         sizeAtMinimum = prefSize;
         sizeAtPreferred = prefSize;
+        sizeAtExpanding = prefSize;
         sizeAtMaximum = prefSize;
     }
 }
@@ -357,6 +364,12 @@ QGraphicsAnchorLayoutPrivate::QGraphicsAnchorLayoutPrivate()
     : calculateGraphCacheDirty(1)
 {
     for (int i = 0; i < NOrientations; ++i) {
+        for (int j = 0; j < 3; ++j) {
+            sizeHints[i][j] = -1;
+        }
+        sizeAtExpanding[i] = -1;
+        interpolationProgress[i] = -1;
+
         spacings[i] = -1;
         graphSimplified[i] = false;
         graphHasConflicts[i] = false;
@@ -1649,6 +1662,10 @@ void QGraphicsAnchorLayoutPrivate::calculateGraphs(
             sizeHints[orientation][Qt::PreferredSize] = pref;
             sizeHints[orientation][Qt::MaximumSize] = max;
 
+            // XXX implement Expanding simplex
+            for (int i = 0; i < trunkVariables.count(); ++i)
+                trunkVariables.at(i)->sizeAtExpanding = trunkVariables.at(i)->sizeAtPreferred;
+            sizeAtExpanding[orientation] = pref;
         }
     } else {
 #if 0
@@ -1664,6 +1681,7 @@ void QGraphicsAnchorLayoutPrivate::calculateGraphs(
         AnchorData *ad = trunkPath.positives.toList()[0];
         ad->sizeAtMinimum = ad->minSize;
         ad->sizeAtPreferred = ad->prefSize;
+        ad->sizeAtExpanding = ad->prefSize;
         ad->sizeAtMaximum = ad->maxSize;
 
         // Propagate
@@ -1672,6 +1690,7 @@ void QGraphicsAnchorLayoutPrivate::calculateGraphs(
         sizeHints[orientation][Qt::MinimumSize] = ad->sizeAtMinimum;
         sizeHints[orientation][Qt::PreferredSize] = ad->sizeAtPreferred;
         sizeHints[orientation][Qt::MaximumSize] = ad->sizeAtMaximum;
+        sizeAtExpanding[orientation] = ad->sizeAtPreferred;
     }
 
     // Delete the constraints, we won't use them anymore.
@@ -1701,6 +1720,7 @@ void QGraphicsAnchorLayoutPrivate::calculateGraphs(
                 AnchorData *ad = partVariables[j];
                 Q_ASSERT(ad);
                 ad->sizeAtMinimum = ad->sizeAtPreferred;
+                ad->sizeAtExpanding = ad->sizeAtPreferred;
                 ad->sizeAtMaximum = ad->sizeAtPreferred;
                 ad->updateChildrenSizes();
             }
@@ -2058,9 +2078,13 @@ void QGraphicsAnchorLayoutPrivate::setupEdgesInterpolation(
         interpolationInterval[orientation] = MinToPreferred;
         lower = sizeHints[orientation][Qt::MinimumSize];
         upper = sizeHints[orientation][Qt::PreferredSize];
-    } else {
-        interpolationInterval[orientation] = PreferredToMax;
+    } else if (current < sizeAtExpanding[orientation]) {
+        interpolationInterval[orientation] = PreferredToExpanding;
         lower = sizeHints[orientation][Qt::PreferredSize];
+        upper = sizeAtExpanding[orientation];
+    } else {
+        interpolationInterval[orientation] = ExpandingToMax;
+        lower = sizeAtExpanding[orientation];
         upper = sizeHints[orientation][Qt::MaximumSize];
     }
 
@@ -2075,11 +2099,12 @@ void QGraphicsAnchorLayoutPrivate::setupEdgesInterpolation(
   \internal
 
   Calculate the current Edge size based on the current Layout size and the
-  size the edge is supposed to have when:
+  size the edge is supposed to have when the layout is at its:
 
-   - the layout is at its minimum size.
-   - the layout is at its preferred size.
-   - the layout is at its maximum size.
+   - minimum size,
+   - preferred size,
+   - size when all expanding anchors are expanded,
+   - maximum size.
 
    These three key values are calculated in advance using linear
    programming (more expensive) or the simplification algorithm, then
@@ -2099,8 +2124,11 @@ void QGraphicsAnchorLayoutPrivate::interpolateEdge(AnchorVertex *base,
     if (interpolationInterval[orientation] == MinToPreferred) {
         lower = edge->sizeAtMinimum;
         upper = edge->sizeAtPreferred;
-    } else {
+    } else if (interpolationInterval[orientation] == PreferredToExpanding) {
         lower = edge->sizeAtPreferred;
+        upper = edge->sizeAtExpanding;
+    } else {
+        lower = edge->sizeAtExpanding;
         upper = edge->sizeAtMaximum;
     }
 
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.h b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
index c86bfa3..4c6c2aa 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.h
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
@@ -153,7 +153,8 @@ struct AnchorData : public QSimplexVariable {
         : QSimplexVariable(), from(0), to(0),
           minSize(minimumSize), prefSize(preferredSize),
           maxSize(maximumSize), sizeAtMinimum(preferredSize),
-          sizeAtPreferred(preferredSize), sizeAtMaximum(preferredSize),
+          sizeAtPreferred(preferredSize), sizeAtExpanding(preferredSize),
+          sizeAtMaximum(preferredSize),
           graphicsAnchor(0),
           skipInPreferred(0), type(Normal), hasSize(true),
           isLayoutAnchor(false) {}
@@ -161,7 +162,8 @@ struct AnchorData : public QSimplexVariable {
     AnchorData(qreal size)
         : QSimplexVariable(), from(0), to(0),
           minSize(size), prefSize(size), maxSize(size),
-          sizeAtMinimum(size), sizeAtPreferred(size), sizeAtMaximum(size),
+          sizeAtMinimum(size), sizeAtPreferred(size), sizeAtExpanding(size),
+          sizeAtMaximum(size),
           graphicsAnchor(0),
           skipInPreferred(0), type(Normal), hasSize(true),
           isLayoutAnchor(false) {}
@@ -169,7 +171,8 @@ struct AnchorData : public QSimplexVariable {
     AnchorData()
         : QSimplexVariable(), from(0), to(0),
           minSize(0), prefSize(0), maxSize(0),
-          sizeAtMinimum(0), sizeAtPreferred(0), sizeAtMaximum(0),
+          sizeAtMinimum(0), sizeAtPreferred(0), sizeAtExpanding(0),
+          sizeAtMaximum(0),
           graphicsAnchor(0),
           skipInPreferred(0), type(Normal), hasSize(false),
           isLayoutAnchor(false) {}
@@ -192,6 +195,7 @@ struct AnchorData : public QSimplexVariable {
         maxSize = size;
         sizeAtMinimum = size;
         sizeAtPreferred = size;
+        sizeAtExpanding = size;
         sizeAtMaximum = size;
         hasSize = true;
     }
@@ -218,6 +222,7 @@ struct AnchorData : public QSimplexVariable {
     // calculated by the Simplex solver based on the current layout setup.
     qreal sizeAtMinimum;
     qreal sizeAtPreferred;
+    qreal sizeAtExpanding;
     qreal sizeAtMaximum;
     QGraphicsAnchor *graphicsAnchor;
 
@@ -225,12 +230,15 @@ struct AnchorData : public QSimplexVariable {
     uint type : 2;            // either Normal, Sequential or Parallel
     uint hasSize : 1;         // if false, get size from style.
     uint isLayoutAnchor : 1;  // if this anchor is connected to a layout 'edge'
+    uint isExpanding : 1;     // if true, expands before other anchors
+
 protected:
     AnchorData(Type type, qreal size = 0)
         : QSimplexVariable(), from(0), to(0),
           minSize(size), prefSize(size),
           maxSize(size), sizeAtMinimum(size),
-          sizeAtPreferred(size), sizeAtMaximum(size),
+          sizeAtPreferred(size), sizeAtExpanding(size),
+          sizeAtMaximum(size),
           graphicsAnchor(0),
           skipInPreferred(0), type(type), hasSize(true),
           isLayoutAnchor(false) {}
@@ -355,7 +363,8 @@ public:
     // Interval represents which interpolation interval are we operating in.
     enum Interval {
         MinToPreferred = 0,
-        PreferredToMax
+        PreferredToExpanding,
+        ExpandingToMax
     };
 
     // Several structures internal to the layout are duplicated to handle
@@ -496,6 +505,7 @@ public:
     qreal spacings[NOrientations];
     // Size hints from simplex engine
     qreal sizeHints[2][3];
+    qreal sizeAtExpanding[2];
 
     // Items
     QVector<QGraphicsLayoutItem *> items;
-- 
cgit v0.12


From 1728f846d9fb53a699782005d6478c0f23f9b82e Mon Sep 17 00:00:00 2001
From: "Eduardo M. Fleury" <eduardo.fleury@openbossa.org>
Date: Wed, 23 Sep 2009 16:02:35 -0300
Subject: QGraphicsAnchorLayout: Enabling Simplex support for Expanding size
 policy

To support the expanding size policy we had to change the way the setup
process work. Previously we used to calculate three key-frames using
the simplex solver:

 - sizeAtMinimum: the value an anchor should be in when the layout is
                  at its minimum size. Calculated using simplex solver
	          to minimize the layout size.
 - sizeAtPreferred: the value an anchor should be in when the layout is
                    at its preferred size. Calculated using simplex solver
	            to minimize the deviation from the items preferred
	            sizes.
 - sizeAtMaximum: the value an anchor should be in when the layout is
	          at its maximum size. Calculated using simplex solver
                  to maximize the layout size.

That worked fine but didn't diferentiate standard items from the
"expanding" ones. In other words, all items would grow from their
sizeAtPreferred to their sizeAtMaximum at the same rate.

To support the idea of "expanding" items, ie. items that should grow
faster than the others, we added a fourth state, between preferred
and maximum.

Now we have the following interpolation order:

 sizeAtMinimum -> sizeAtPreferred -> sizeAtExpanding -> sizeAtMaximum.

The definition of the "expanding" state is that all "expanding" items
should have grown all the way to their "sizeAtMaximum" values whereas
non expanding items should have kept their preferred sizes. The only
exception is that non-expanding items are allowed to grow if that is
necessary to allow the "expanding" items to reach their sizeAtMaximum.

So, the visual result is that if the layout is resized from its
preferred size to its maximum size, the expanding items will grow
first and then, in a second phase, the other items will grow.

This commit adds QGALPrivate::solveExpanding() and calls it from
calculateGraphs().

Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
---
 src/gui/graphicsview/qgraphicsanchorlayout_p.cpp | 98 +++++++++++++++++++++---
 src/gui/graphicsview/qgraphicsanchorlayout_p.h   |  1 +
 2 files changed, 88 insertions(+), 11 deletions(-)

diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
index fc3bc8a..93ccf83 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -1635,11 +1635,18 @@ void QGraphicsAnchorLayoutPrivate::calculateGraphs(
         qreal min, max;
         feasible = solveMinMax(trunkConstraints, trunkPath, &min, &max);
 
-        // Solve for preferred. The objective function is calculated from the constraints
-        // and variables internally.
-        feasible &= solvePreferred(trunkConstraints);
-
         if (feasible) {
+            // Solve for preferred. The objective function is calculated from the constraints
+            // and variables internally.
+            solvePreferred(trunkConstraints);
+
+            // remove sizeHintConstraints from trunkConstraints
+            trunkConstraints = parts[0];
+
+            // Solve for expanding. The objective function and the constraints from items
+            // are calculated internally.
+            solveExpanding(trunkConstraints);
+
             // Propagate the new sizes down the simplified graph, ie. tell the
             // group anchors to set their children anchors sizes.
 
@@ -1649,23 +1656,23 @@ void QGraphicsAnchorLayoutPrivate::calculateGraphs(
             for (int i = 0; i < trunkVariables.count(); ++i)
                 trunkVariables.at(i)->updateChildrenSizes();
 
-            // Calculate and set the preferred size for the layout from the edge sizes that
-            // were calculated above.
+            // Calculate and set the preferred and expanding sizes for the layout,
+            // from the edge sizes that were calculated above.
             qreal pref(0.0);
+            qreal expanding(0.0);
             foreach (const AnchorData *ad, trunkPath.positives) {
                 pref += ad->sizeAtPreferred;
+                expanding += ad->sizeAtExpanding;
             }
             foreach (const AnchorData *ad, trunkPath.negatives) {
                 pref -= ad->sizeAtPreferred;
+                expanding -= ad->sizeAtExpanding;
             }
+
             sizeHints[orientation][Qt::MinimumSize] = min;
             sizeHints[orientation][Qt::PreferredSize] = pref;
             sizeHints[orientation][Qt::MaximumSize] = max;
-
-            // XXX implement Expanding simplex
-            for (int i = 0; i < trunkVariables.count(); ++i)
-                trunkVariables.at(i)->sizeAtExpanding = trunkVariables.at(i)->sizeAtPreferred;
-            sizeAtExpanding[orientation] = pref;
+            sizeAtExpanding[orientation] = expanding;
         }
     } else {
 #if 0
@@ -2315,6 +2322,75 @@ bool QGraphicsAnchorLayoutPrivate::solvePreferred(QList<QSimplexConstraint *> co
     return feasible;
 }
 
+void QGraphicsAnchorLayoutPrivate::solveExpanding(QList<QSimplexConstraint *> constraints)
+{
+    QList<AnchorData *> variables = getVariables(constraints);
+    QList<QSimplexConstraint *> itemConstraints;
+    QSimplexConstraint *objective = new QSimplexConstraint;
+
+    // Use all items that belong to trunk to:
+    //  - add solveExpanding-specific item constraints
+    //  - create the objective function
+    for (int i = 0; i < variables.size(); ++i) {
+        AnchorData *ad = variables[i];
+        if (ad->isExpanding) {
+            // Add constraint to lock expanding anchor in its sizeAtMaximum
+            QSimplexConstraint *itemC = new QSimplexConstraint;
+            itemC->ratio = QSimplexConstraint::Equal;
+            itemC->variables.insert(ad, 1.0);
+            itemC->constant = ad->sizeAtMaximum;
+            itemConstraints << itemC;
+        } else {
+            // Add constraints to lock anchor between their sizeAtPreferred and sizeAtMaximum
+            QSimplexConstraint *itemC = new QSimplexConstraint;
+            itemC->ratio = QSimplexConstraint::MoreOrEqual;
+            itemC->variables.insert(ad, 1.0);
+            itemC->constant = qMin(ad->sizeAtPreferred, ad->sizeAtMaximum);
+            itemConstraints << itemC;
+
+            itemC = new QSimplexConstraint;
+            itemC->ratio = QSimplexConstraint::LessOrEqual;
+            itemC->variables.insert(ad, 1.0);
+            itemC->constant = qMax(ad->sizeAtPreferred, ad->sizeAtMaximum);
+            itemConstraints << itemC;
+
+            // Add anchor to objective function
+            if (ad->sizeAtPreferred < ad->sizeAtMaximum) {
+                // Try to shrink this variable towards its sizeAtPreferred value
+                objective->variables.insert(ad, 1.0);
+            } else {
+                // Try to grow this variable towards its sizeAtPreferred value
+                objective->variables.insert(ad, -1.0);
+            }
+        }
+    }
+
+    // Solve
+    if (objective->variables.size() == variables.size()) {
+        // If no anchors are expanding, we don't need to run the simplex
+        // Set all variables to their preferred size
+        for (int i = 0; i < variables.size(); ++i) {
+            variables[i]->sizeAtExpanding = variables[i]->sizeAtPreferred;
+        }
+    } else {
+        // Run simplex
+        QSimplex simplex;
+        bool feasible = simplex.setConstraints(constraints + itemConstraints);
+        Q_ASSERT(feasible);
+
+        simplex.setObjective(objective);
+        simplex.solveMin();
+
+        // Collect results
+        for (int i = 0; i < variables.size(); ++i) {
+            variables[i]->sizeAtExpanding = variables[i]->result;
+        }
+    }
+
+    delete objective;
+    qDeleteAll(itemConstraints);
+}
+
 /*!
     \internal
     Returns true if there are no arrangement that satisfies all constraints.
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.h b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
index 4c6c2aa..47df786 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.h
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
@@ -495,6 +495,7 @@ public:
     bool solveMinMax(QList<QSimplexConstraint *> constraints,
                      GraphPath path, qreal *min, qreal *max);
     bool solvePreferred(QList<QSimplexConstraint *> constraints);
+    void solveExpanding(QList<QSimplexConstraint *> constraints);
     bool hasConflicts() const;
 
 #ifdef QT_DEBUG
-- 
cgit v0.12


From e210bea72ef65f99babb4c6f5bd442184c671d3b Mon Sep 17 00:00:00 2001
From: "Eduardo M. Fleury" <eduardo.fleury@openbossa.org>
Date: Thu, 24 Sep 2009 11:16:16 -0300
Subject: QGraphicsAnchorLayout Tests: Enable expanding tests

Removing QEXPECT_FAIL and making minor corrections on expected
values.

Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
---
 .../qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index e898edb..4ad48c7 100644
--- a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -1359,7 +1359,6 @@ void tst_QGraphicsAnchorLayout::expandingSequence()
     QSizeF layoutExpandedSize(pref.width() + max.width(), layoutMinimumSize.height());
     p.resize(layoutExpandedSize);
 
-    QEXPECT_FAIL("", "Support for QSizePolicy::ExpandFlag not yet available", Abort);
     QCOMPARE(a->geometry().size(), pref);
     QCOMPARE(b->geometry().size(), max);
 
@@ -1409,7 +1408,6 @@ void tst_QGraphicsAnchorLayout::expandingSequenceFairDistribution()
                                      layoutMinimumSize.height());
     p.resize(layoutPartialExpandedSize);
 
-    QEXPECT_FAIL("", "Support for QSizePolicy::ExpandFlag not yet available", Abort);
     QCOMPARE(a->geometry().size(), pref);
     QCOMPARE(b->geometry().size(), pref + QSizeF(10, 0));
     QCOMPARE(c->geometry().size(), pref);
@@ -1443,6 +1441,7 @@ void tst_QGraphicsAnchorLayout::expandingSequenceFairDistribution()
 
     QSizeF newLayoutPartialExpandedSize((4 * pref.width()) + 75,
                                         layoutMinimumSize.height());
+    p.resize(newLayoutPartialExpandedSize);
 
     QCOMPARE(a->geometry().size(), pref);
     QCOMPARE(b->geometry().size(), pref + QSizeF(25, 0));
@@ -1454,11 +1453,12 @@ void tst_QGraphicsAnchorLayout::expandingParallel()
 {
     QSizeF min(10, 10);
     QSizeF pref(50, 10);
-    QSizeF max(100, 50);
+    QSizeF max(100, 10);
+    QSizeF max2(100, 50);
 
     QGraphicsWidget *a = createItem(min, pref, max, "a");
     QGraphicsWidget *b = createItem(min, pref, max, "b");
-    QGraphicsWidget *c = createItem(min, pref, max, "c");
+    QGraphicsWidget *c = createItem(min, pref, max2, "c");
 
     b->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
 
@@ -1492,10 +1492,9 @@ void tst_QGraphicsAnchorLayout::expandingParallel()
     QSizeF layoutExpandedSize(pref.width() + max.width(), layoutMinimumSize.height());
     p.resize(layoutExpandedSize);
 
-    QEXPECT_FAIL("", "Support for QSizePolicy::ExpandFlag not yet available", Abort);
     QCOMPARE(a->geometry().size(), max);
     QCOMPARE(b->geometry().size(), max);
-    QCOMPARE(c->geometry().size(), pref);
+    QCOMPARE(c->geometry().size(), QSizeF(pref.width(), 20));
 
     QSizeF layoutMaximumSize = l->effectiveSizeHint(Qt::MaximumSize);
     QCOMPARE(layoutMaximumSize.width(), qreal(200));
@@ -1511,12 +1510,12 @@ void tst_QGraphicsAnchorLayout::expandingParallel()
     QSizeF newLayoutMinimumSize = l->effectiveSizeHint(Qt::MinimumSize);
     QCOMPARE(newLayoutMinimumSize.width(), qreal(30));
 
-    QSizeF newLayoutExpandedSize(pref.width() + max.width(), layoutMinimumSize.height());
+    QSizeF newLayoutExpandedSize = layoutExpandedSize + QSizeF(100, 0);
     p.resize(newLayoutExpandedSize);
 
-    QCOMPARE(a->geometry().size(), max);
+    QCOMPARE(a->geometry().size(), max + QSizeF(100, 0));
     QCOMPARE(b->geometry().size(), max);
-    QCOMPARE(c->geometry().size(), pref);
+    QCOMPARE(c->geometry().size(), QSizeF(pref.width(), 20));
 
     QSizeF newLayoutMaximumSize = l->effectiveSizeHint(Qt::MaximumSize);
     QCOMPARE(newLayoutMaximumSize.width(), qreal(300));
-- 
cgit v0.12


From 5dd77be3acfb53b44d7d6b0015af0c33124ab84a Mon Sep 17 00:00:00 2001
From: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Date: Thu, 24 Sep 2009 17:09:16 -0300
Subject: QGraphicsAnchorLayout: cleaning up AnchorData

Use just one constructor for AnchorData and tweak the struct when
necessary. Also use the function refreshSizeHints() for Normal anchors
to get the item information instead of passing to the constructor.

This has the advantage that we don't need to replicate the code for
checking and updating the size hint and size policies. Note that the
code before only considered the size policies after the first
refreshSizeHints() -- which we know will be called after the
simplification, so the assumption seems to be correct, but we don't
depend on that anymore..

Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
---
 src/gui/graphicsview/qgraphicsanchorlayout_p.cpp | 89 ++++++++++++------------
 src/gui/graphicsview/qgraphicsanchorlayout_p.h   | 53 ++++----------
 2 files changed, 59 insertions(+), 83 deletions(-)

diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
index 93ccf83..dc8d211 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -94,8 +94,6 @@ qreal QGraphicsAnchorPrivate::spacing() const
 
 void AnchorData::refreshSizeHints(qreal effectiveSpacing)
 {
-    isExpanding = 0;
-
     if (!isLayoutAnchor && (from->m_item == to->m_item)) {
         QGraphicsLayoutItem *item = from->m_item;
 
@@ -140,9 +138,6 @@ void AnchorData::refreshSizeHints(qreal effectiveSpacing)
         if (policy & QSizePolicy::IgnoreFlag)
             prefSize = minSize;
 
-        if (policy & QSizePolicy::ExpandFlag)
-            isExpanding = 1;
-
         bool hasCenter = (from->m_edge == centerEdge || to->m_edge == centerEdge);
 
         if (hasCenter) {
@@ -151,6 +146,14 @@ void AnchorData::refreshSizeHints(qreal effectiveSpacing)
             maxSize /= 2;
         }
 
+        if (policy & QSizePolicy::ExpandFlag) {
+            isExpanding = 1;
+            expSize = maxSize;
+        } else {
+            isExpanding = 0;
+            expSize = prefSize;
+        }
+
         // Set the anchor effective sizes to preferred.
         //
         // Note: The idea here is that all items should remain at their
@@ -167,8 +170,11 @@ void AnchorData::refreshSizeHints(qreal effectiveSpacing)
         // Anchor has no size defined, use given default information
         minSize = effectiveSpacing;
         prefSize = effectiveSpacing;
+        expSize = effectiveSpacing;
         maxSize = effectiveSpacing;
 
+        isExpanding = 0;
+
         sizeAtMinimum = prefSize;
         sizeAtPreferred = prefSize;
         sizeAtExpanding = prefSize;
@@ -830,9 +836,10 @@ void QGraphicsAnchorLayoutPrivate::createLayoutEdges()
     QGraphicsLayoutItem *layout = q;
 
     // Horizontal
-    AnchorData *data = new AnchorData(0, 0, QWIDGETSIZE_MAX);
+    AnchorData *data = new AnchorData;
     addAnchor_helper(layout, Qt::AnchorLeft, layout,
-              Qt::AnchorRight, data);
+                     Qt::AnchorRight, data);
+    data->maxSize = QWIDGETSIZE_MAX;
     data->skipInPreferred = 1;
 
     // Set the Layout Left edge as the root of the horizontal graph.
@@ -840,9 +847,10 @@ void QGraphicsAnchorLayoutPrivate::createLayoutEdges()
     graph[Horizontal].setRootVertex(v);
 
     // Vertical
-    data = new AnchorData(0, 0, QWIDGETSIZE_MAX);
+    data = new AnchorData;
     addAnchor_helper(layout, Qt::AnchorTop, layout,
-              Qt::AnchorBottom, data);
+                     Qt::AnchorBottom, data);
+    data->maxSize = QWIDGETSIZE_MAX;
     data->skipInPreferred = 1;
 
     // Set the Layout Top edge as the root of the vertical graph.
@@ -869,19 +877,15 @@ void QGraphicsAnchorLayoutPrivate::createItemEdges(QGraphicsLayoutItem *item)
 
     items.append(item);
 
-    QSizeF minSize = item->effectiveSizeHint(Qt::MinimumSize);
-    QSizeF prefSize = item->effectiveSizeHint(Qt::PreferredSize);
-    QSizeF maxSize = item->effectiveSizeHint(Qt::MaximumSize);
-
-    // Horizontal
-    AnchorData *data = new AnchorData(minSize.width(), prefSize.width(), maxSize.width());
-    addAnchor_helper(item, Qt::AnchorLeft, item,
-              Qt::AnchorRight, data);
+    // Create horizontal and vertical internal anchors for the item and
+    // refresh its size hint / policy values.
+    AnchorData *data = new AnchorData;
+    addAnchor_helper(item, Qt::AnchorLeft, item, Qt::AnchorRight, data);
+    data->refreshSizeHints(0); // 0 = effectiveSpacing, will not be used
 
-    // Vertical
-    data = new AnchorData(minSize.height(), prefSize.height(), maxSize.height());
-    addAnchor_helper(item, Qt::AnchorTop, item,
-              Qt::AnchorBottom, data);
+    data = new AnchorData;
+    addAnchor_helper(item, Qt::AnchorTop, item, Qt::AnchorBottom, data);
+    data->refreshSizeHints(0); // 0 = effectiveSpacing, will not be used
 }
 
 /*!
@@ -934,20 +938,17 @@ void QGraphicsAnchorLayoutPrivate::createCenterAnchors(
     Q_ASSERT(first && last);
 
     // Create new anchors
-    AnchorData *oldData = graph[orientation].edgeData(first, last);
-
-    qreal minimumSize = oldData->minSize / 2;
-    qreal preferredSize = oldData->prefSize / 2;
-    qreal maximumSize = oldData->maxSize / 2;
-
     QSimplexConstraint *c = new QSimplexConstraint;
-    AnchorData *data = new AnchorData(minimumSize, preferredSize, maximumSize);
+
+    AnchorData *data = new AnchorData;
     c->variables.insert(data, 1.0);
     addAnchor_helper(item, firstEdge, item, centerEdge, data);
+    data->refreshSizeHints(0);
 
-    data = new AnchorData(minimumSize, preferredSize, maximumSize);
+    data = new AnchorData;
     c->variables.insert(data, -1.0);
     addAnchor_helper(item, centerEdge, item, lastEdge, data);
+    data->refreshSizeHints(0);
 
     itemCenterConstraints[orientation].append(c);
 
@@ -1008,14 +1009,9 @@ void QGraphicsAnchorLayoutPrivate::removeCenterAnchors(
 
     if (substitute) {
         // Create the new anchor that should substitute the left-center-right anchors.
-        AnchorData *oldData = g.edgeData(first, center);
-
-        qreal minimumSize = oldData->minSize * 2;
-        qreal preferredSize = oldData->prefSize * 2;
-        qreal maximumSize = oldData->maxSize * 2;
-
-        AnchorData *data = new AnchorData(minimumSize, preferredSize, maximumSize);
+        AnchorData *data = new AnchorData;
         addAnchor_helper(item, firstEdge, item, lastEdge, data);
+        data->refreshSizeHints(0);
 
         // Remove old anchors
         removeAnchor_helper(first, center);
@@ -1133,7 +1129,7 @@ QGraphicsAnchor *QGraphicsAnchorLayoutPrivate::addAnchor(QGraphicsLayoutItem *fi
     // Use heuristics to find out what the user meant with this anchor.
     correctEdgeDirection(firstItem, firstEdge, secondItem, secondEdge);
 
-    AnchorData *data;
+    AnchorData *data = new AnchorData;
     if (!spacing) {
         // If firstItem or secondItem is the layout itself, the spacing will default to 0.
         // Otherwise, the following matrix is used (questionmark means that the spacing
@@ -1143,22 +1139,25 @@ QGraphicsAnchor *QGraphicsAnchorLayoutPrivate::addAnchor(QGraphicsLayoutItem *fi
         //  Left    0       0       ?
         //  HCenter 0       0       0
         //  Right   ?       0       0
-        if (firstItem != q
-            && secondItem != q
-            && pickEdge(firstEdge, Horizontal) != Qt::AnchorHorizontalCenter
-            && oppositeEdge(firstEdge) == secondEdge) {
-            data = new AnchorData;      // ask the style later
+        if (firstItem == q
+            || secondItem == q
+            || pickEdge(firstEdge, Horizontal) == Qt::AnchorHorizontalCenter
+            || oppositeEdge(firstEdge) != secondEdge) {
+            data->setFixedSize(0);
         } else {
-            data = new AnchorData(0);   // spacing should be 0
+            data->unsetSize();
         }
         addAnchor_helper(firstItem, firstEdge, secondItem, secondEdge, data);
+
     } else if (*spacing >= 0) {
-        data = new AnchorData(*spacing);
+        data->setFixedSize(*spacing);
         addAnchor_helper(firstItem, firstEdge, secondItem, secondEdge, data);
+
     } else {
-        data = new AnchorData(-*spacing);
+        data->setFixedSize(-*spacing);
         addAnchor_helper(secondItem, secondEdge, firstItem, firstEdge, data);
     }
+
     return acquireGraphicsAnchor(data);
 }
 
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.h b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
index 47df786..047be39 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.h
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
@@ -149,33 +149,15 @@ struct AnchorData : public QSimplexVariable {
         Sequential,
         Parallel
     };
-    AnchorData(qreal minimumSize, qreal preferredSize, qreal maximumSize)
-        : QSimplexVariable(), from(0), to(0),
-          minSize(minimumSize), prefSize(preferredSize),
-          maxSize(maximumSize), sizeAtMinimum(preferredSize),
-          sizeAtPreferred(preferredSize), sizeAtExpanding(preferredSize),
-          sizeAtMaximum(preferredSize),
-          graphicsAnchor(0),
-          skipInPreferred(0), type(Normal), hasSize(true),
-          isLayoutAnchor(false) {}
-
-    AnchorData(qreal size)
-        : QSimplexVariable(), from(0), to(0),
-          minSize(size), prefSize(size), maxSize(size),
-          sizeAtMinimum(size), sizeAtPreferred(size), sizeAtExpanding(size),
-          sizeAtMaximum(size),
-          graphicsAnchor(0),
-          skipInPreferred(0), type(Normal), hasSize(true),
-          isLayoutAnchor(false) {}
 
     AnchorData()
         : QSimplexVariable(), from(0), to(0),
-          minSize(0), prefSize(0), maxSize(0),
-          sizeAtMinimum(0), sizeAtPreferred(0), sizeAtExpanding(0),
-          sizeAtMaximum(0),
-          graphicsAnchor(0),
-          skipInPreferred(0), type(Normal), hasSize(false),
-          isLayoutAnchor(false) {}
+          minSize(0), prefSize(0), expSize(0), maxSize(0),
+          sizeAtMinimum(0), sizeAtPreferred(0),
+          sizeAtExpanding(0), sizeAtMaximum(0),
+          graphicsAnchor(0), skipInPreferred(0),
+          type(Normal), hasSize(true), isLayoutAnchor(false),
+          isExpanding(false) {}
 
     virtual void updateChildrenSizes() {}
     virtual void refreshSizeHints(qreal effectiveSpacing);
@@ -192,6 +174,7 @@ struct AnchorData : public QSimplexVariable {
     {
         minSize = size;
         prefSize = size;
+        expSize = size;
         maxSize = size;
         sizeAtMinimum = size;
         sizeAtPreferred = size;
@@ -215,6 +198,7 @@ struct AnchorData : public QSimplexVariable {
     // size.
     qreal minSize;
     qreal prefSize;
+    qreal expSize;
     qreal maxSize;
 
     // These attributes define which sizes should that anchor be in when the
@@ -231,17 +215,6 @@ struct AnchorData : public QSimplexVariable {
     uint hasSize : 1;         // if false, get size from style.
     uint isLayoutAnchor : 1;  // if this anchor is connected to a layout 'edge'
     uint isExpanding : 1;     // if true, expands before other anchors
-
-protected:
-    AnchorData(Type type, qreal size = 0)
-        : QSimplexVariable(), from(0), to(0),
-          minSize(size), prefSize(size),
-          maxSize(size), sizeAtMinimum(size),
-          sizeAtPreferred(size), sizeAtExpanding(size),
-          sizeAtMaximum(size),
-          graphicsAnchor(0),
-          skipInPreferred(0), type(type), hasSize(true),
-          isLayoutAnchor(false) {}
 };
 
 #ifdef QT_DEBUG
@@ -253,8 +226,10 @@ inline QString AnchorData::toString() const
 
 struct SequentialAnchorData : public AnchorData
 {
-    SequentialAnchorData() : AnchorData(AnchorData::Sequential)
+    SequentialAnchorData() : AnchorData()
     {
+        type = AnchorData::Sequential;
+        hasSize = true;
 #ifdef QT_DEBUG
         name = QLatin1String("SequentialAnchorData");
 #endif
@@ -278,9 +253,11 @@ struct SequentialAnchorData : public AnchorData
 struct ParallelAnchorData : public AnchorData
 {
     ParallelAnchorData(AnchorData *first, AnchorData *second)
-        : AnchorData(AnchorData::Parallel),
-        firstEdge(first), secondEdge(second)
+        : AnchorData(), firstEdge(first), secondEdge(second)
     {
+        type = AnchorData::Parallel;
+        hasSize = true;
+
         // ### Those asserts force that both child anchors have the same direction,
         // but can't we simplify a pair of anchors in opposite directions?
         Q_ASSERT(first->from == second->from);
-- 
cgit v0.12


From bcd08ab82b5df13f7687a504f868cb8b6ff8b75e Mon Sep 17 00:00:00 2001
From: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Date: Fri, 25 Sep 2009 16:13:18 -0300
Subject: QGraphicsAnchorLayout: avoid code duplication when initializing
 complex anchors

Now we can use refreshSizeHints_helper() to initialize complex
anchors (parallel and sequential). This avoids duplication of
code in the function simplifySequentialChunk().

This commit also 'disable' ExpandFlag temporarily, stabilizing the
tests for the simplification. The next commit should re-enable it
implementing the necessary code for simplification as well.

Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
---
 src/gui/graphicsview/qgraphicsanchorlayout_p.cpp | 102 +++++++++++------------
 src/gui/graphicsview/qgraphicsanchorlayout_p.h   |   4 +
 2 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
index dc8d211..dd46722 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -146,13 +146,15 @@ void AnchorData::refreshSizeHints(qreal effectiveSpacing)
             maxSize /= 2;
         }
 
-        if (policy & QSizePolicy::ExpandFlag) {
-            isExpanding = 1;
-            expSize = maxSize;
-        } else {
-            isExpanding = 0;
-            expSize = prefSize;
-        }
+        // ###
+        expSize = prefSize;
+        // if (policy & QSizePolicy::ExpandFlag) {
+        //     isExpanding = 1;
+        //     expSize = maxSize;
+        // } else {
+        //     isExpanding = 0;
+        //     expSize = prefSize;
+        // }
 
         // Set the anchor effective sizes to preferred.
         //
@@ -187,6 +189,7 @@ void ParallelAnchorData::updateChildrenSizes()
     firstEdge->sizeAtMinimum = secondEdge->sizeAtMinimum = sizeAtMinimum;
     firstEdge->sizeAtPreferred = secondEdge->sizeAtPreferred = sizeAtPreferred;
     firstEdge->sizeAtMaximum = secondEdge->sizeAtMaximum = sizeAtMaximum;
+    firstEdge->sizeAtExpanding = secondEdge->sizeAtExpanding = sizeAtPreferred;
 
     firstEdge->updateChildrenSizes();
     secondEdge->updateChildrenSizes();
@@ -194,9 +197,16 @@ void ParallelAnchorData::updateChildrenSizes()
 
 void ParallelAnchorData::refreshSizeHints(qreal effectiveSpacing)
 {
-    // First refresh children information
-    firstEdge->refreshSizeHints(effectiveSpacing);
-    secondEdge->refreshSizeHints(effectiveSpacing);
+    refreshSizeHints_helper(effectiveSpacing);
+}
+
+void ParallelAnchorData::refreshSizeHints_helper(qreal effectiveSpacing,
+                                                 bool refreshChildren)
+{
+    if (refreshChildren) {
+        firstEdge->refreshSizeHints(effectiveSpacing);
+        secondEdge->refreshSizeHints(effectiveSpacing);
+    }
 
     // ### should we warn if the parallel connection is invalid?
     // e.g. 1-2-3 with 10-20-30, the minimum of the latter is
@@ -208,9 +218,13 @@ void ParallelAnchorData::refreshSizeHints(qreal effectiveSpacing)
     prefSize = qMax(firstEdge->prefSize, secondEdge->prefSize);
     prefSize = qMin(prefSize, maxSize);
 
+    // ###
+    expSize = prefSize;
+
     // See comment in AnchorData::refreshSizeHints() about sizeAt* values
     sizeAtMinimum = prefSize;
     sizeAtPreferred = prefSize;
+    sizeAtExpanding = prefSize;
     sizeAtMaximum = prefSize;
 }
 
@@ -277,30 +291,46 @@ void SequentialAnchorData::updateChildrenSizes()
         bandSize = maxFactor > 0 ? e->maxSize - e->prefSize : e->prefSize - e->minSize;
         e->sizeAtMaximum = e->prefSize + bandSize * maxFactor;
 
+        // ###
+        e->sizeAtExpanding = e->sizeAtPreferred;
+
         e->updateChildrenSizes();
     }
 }
 
 void SequentialAnchorData::refreshSizeHints(qreal effectiveSpacing)
 {
+    refreshSizeHints_helper(effectiveSpacing);
+}
+
+void SequentialAnchorData::refreshSizeHints_helper(qreal effectiveSpacing,
+                                                   bool refreshChildren)
+{
     minSize = 0;
     prefSize = 0;
+    expSize = 0;
     maxSize = 0;
 
     for (int i = 0; i < m_edges.count(); ++i) {
         AnchorData *edge = m_edges.at(i);
 
-        // First refresh children information
-        edge->refreshSizeHints(effectiveSpacing);
+        // If it's the case refresh children information first
+        if (refreshChildren)
+            edge->refreshSizeHints(effectiveSpacing);
 
         minSize += edge->minSize;
         prefSize += edge->prefSize;
+        expSize += edge->expSize;
         maxSize += edge->maxSize;
     }
 
+    // ###
+    expSize = prefSize;
+
     // See comment in AnchorData::refreshSizeHints() about sizeAt* values
     sizeAtMinimum = prefSize;
     sizeAtPreferred = prefSize;
+    sizeAtExpanding = prefSize;
     sizeAtMaximum = prefSize;
 }
 
@@ -441,39 +471,21 @@ static bool simplifySequentialChunk(Graph<AnchorVertex, AnchorData> *graph,
     qDebug("simplifying [%s] to [%s - %s]", qPrintable(strPath), qPrintable(before->toString()), qPrintable(after->toString()));
 #endif
 
-    qreal min = 0;
-    qreal pref = 0;
-    qreal max = 0;
-
     SequentialAnchorData *sequence = new SequentialAnchorData;
     AnchorVertex *prev = before;
     AnchorData *data;
     for (i = 0; i <= vertices.count(); ++i) {
         AnchorVertex *next = (i < vertices.count()) ? vertices.at(i) : after;
         data = graph->takeEdge(prev, next);
-        min += data->minSize;
-        pref += data->prefSize;
-        max = checkAdd(max, data->maxSize);
         sequence->m_edges.append(data);
         prev = next;
     }
-
-    // insert new
-    sequence->minSize = min;
-    sequence->prefSize = pref;
-    sequence->maxSize = max;
-
-    // Unless these values are overhidden by the simplex solver later-on,
-    // anchors will keep their own preferred size.
-    sequence->sizeAtMinimum = pref;
-    sequence->sizeAtPreferred = pref;
-    sequence->sizeAtMaximum = pref;
-
     sequence->setVertices(vertices);
-
     sequence->from = before;
     sequence->to = after;
 
+    sequence->refreshSizeHints_helper(0, false);
+
     // data here is the last edge in the sequence
     // ### this seems to be here for supporting reverse order sequences,
     // but doesnt seem to be used right now
@@ -488,25 +500,11 @@ static bool simplifySequentialChunk(Graph<AnchorVertex, AnchorData> *graph,
 
     AnchorData *newAnchor = sequence;
     if (AnchorData *oldAnchor = graph->takeEdge(before, after)) {
-        newAnchor = new ParallelAnchorData(oldAnchor, sequence);
-
-        newAnchor->isLayoutAnchor = (oldAnchor->isLayoutAnchor
+        ParallelAnchorData *parallel = new ParallelAnchorData(oldAnchor, sequence);
+        parallel->isLayoutAnchor = (oldAnchor->isLayoutAnchor
                                      || sequence->isLayoutAnchor);
-
-        min = qMax(oldAnchor->minSize, sequence->minSize);
-        max = qMin(oldAnchor->maxSize, sequence->maxSize);
-
-        pref = qMax(oldAnchor->prefSize, sequence->prefSize);
-        pref = qMin(pref, max);
-
-        newAnchor->minSize = min;
-        newAnchor->prefSize = pref;
-        newAnchor->maxSize = max;
-
-        // Same as above, by default, keep preferred size.
-        newAnchor->sizeAtMinimum = pref;
-        newAnchor->sizeAtPreferred = pref;
-        newAnchor->sizeAtMaximum = pref;
+        parallel->refreshSizeHints_helper(0, false);
+        newAnchor = parallel;
     }
     graph->createEdge(before, after, newAnchor);
 
@@ -1687,7 +1685,7 @@ void QGraphicsAnchorLayoutPrivate::calculateGraphs(
         AnchorData *ad = trunkPath.positives.toList()[0];
         ad->sizeAtMinimum = ad->minSize;
         ad->sizeAtPreferred = ad->prefSize;
-        ad->sizeAtExpanding = ad->prefSize;
+        ad->sizeAtExpanding = ad->expSize;
         ad->sizeAtMaximum = ad->maxSize;
 
         // Propagate
@@ -1696,7 +1694,7 @@ void QGraphicsAnchorLayoutPrivate::calculateGraphs(
         sizeHints[orientation][Qt::MinimumSize] = ad->sizeAtMinimum;
         sizeHints[orientation][Qt::PreferredSize] = ad->sizeAtPreferred;
         sizeHints[orientation][Qt::MaximumSize] = ad->sizeAtMaximum;
-        sizeAtExpanding[orientation] = ad->sizeAtPreferred;
+        sizeAtExpanding[orientation] = ad->sizeAtExpanding;
     }
 
     // Delete the constraints, we won't use them anymore.
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.h b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
index 047be39..8f67b2c 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.h
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
@@ -238,6 +238,8 @@ struct SequentialAnchorData : public AnchorData
     virtual void updateChildrenSizes();
     virtual void refreshSizeHints(qreal effectiveSpacing);
 
+    void refreshSizeHints_helper(qreal effectiveSpacing, bool refreshChildren = true);
+
     void setVertices(const QVector<AnchorVertex*> &vertices)
     {
         m_children = vertices;
@@ -272,6 +274,8 @@ struct ParallelAnchorData : public AnchorData
     virtual void updateChildrenSizes();
     virtual void refreshSizeHints(qreal effectiveSpacing);
 
+    void refreshSizeHints_helper(qreal effectiveSpacing, bool refreshChildren = true);
+
     AnchorData* firstEdge;
     AnchorData* secondEdge;
 };
-- 
cgit v0.12


From ad69bb73754534f61658a83e85dadb75e603c90a Mon Sep 17 00:00:00 2001
From: "Eduardo M. Fleury" <eduardo.fleury@openbossa.org>
Date: Fri, 25 Sep 2009 19:02:21 -0300
Subject: QGraphicsAnchorLayout: Update solveExpanding to handle simplified
 graphs

The previous implementation of solveExpanding would assume that anchors
were either completely expanding (would grow to their sizeAtMaximum) or
non-expanding (would try to remain at their sizeAtPreferred).

What happens however is that with simplification enabled, we may have
anchors that are "partially" expanding. An example is a sequential
anchor that groups together two leaf anchors where only one of them
is expanding.

In this case, the expected size of that group anchor would be the sum
of the max size of the expanding child plus the preferred size of the
non-expanding child.

To handle the above case we added the "expSize" variable. It holds
the expected value at Expanding for each anchor. Based on this, and
the already calculated values of sizeAtMaximum and sizeAtPreferred,
the solver calculates the actual sizeAtExpanding for them.

Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
---
 src/gui/graphicsview/qgraphicsanchorlayout_p.cpp | 84 ++++++++++++++++++++----
 1 file changed, 72 insertions(+), 12 deletions(-)

diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
index dd46722..cf1429c 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -2319,40 +2319,97 @@ bool QGraphicsAnchorLayoutPrivate::solvePreferred(QList<QSimplexConstraint *> co
     return feasible;
 }
 
+/*! Calculate the "expanding" keyframe
+
+  This new keyframe sits between the already existing sizeAtPreferred and
+  sizeAtMaximum keyframes. Its goal is to modify the interpolation between
+  the latter as to respect the "expanding" size policy of some anchors.
+
+  Previously all items would be subject to a linear interpolation between
+  sizeAtPreferred and sizeAtMaximum values. This will change now, the
+  expanding anchors will change their size before the others. To calculate
+  this keyframe we use the following logic:
+
+  1) Ask each anchor for their desired expanding size (ad->expSize), this
+  value depends on the anchor expanding property in the following way:
+
+  - Expanding anchors want to grow towards their maximum size
+  - Non-expanding anchors want to remain at their preferred size.
+  - Composite anchors want to grow towards somewhere between their
+  preferred sizes. (*)
+
+  2) Clamp their desired values to the value they assume in the neighbour
+  keyframes (sizeAtPreferred and sizeAtExpanding)
+
+  3) Run simplex with a setup that ensures the following:
+
+    a. Anchors will change their value from their sizeAtPreferred towards
+       their sizeAtMaximum as much as required to ensure that ALL anchors
+       reach their respective "desired" expanding sizes.
+
+    b. No anchors will change their value beyond what is NEEDED to satisfy
+       the requirement above.
+
+  The final result is that, at the "expanding" keyframe expanding anchors
+  will grow and take with them all anchors that are parallel to them.
+  However, non-expanding anchors will remain at their preferred size unless
+  they are forced to grow by a parallel expanding anchor.
+
+  Note: For anchors where the sizeAtPreferred is bigger than sizeAtPreferred,
+        the visual effect when the layout grows from its preferred size is
+        the following: Expanding anchors will keep their size while non
+        expanding ones will shrink. Only after non-expanding anchors have
+        shrinked all the way, the expanding anchors will start to shrink too.
+*/
 void QGraphicsAnchorLayoutPrivate::solveExpanding(QList<QSimplexConstraint *> constraints)
 {
     QList<AnchorData *> variables = getVariables(constraints);
     QList<QSimplexConstraint *> itemConstraints;
     QSimplexConstraint *objective = new QSimplexConstraint;
+    bool hasExpanding = false;
 
-    // Use all items that belong to trunk to:
-    //  - add solveExpanding-specific item constraints
-    //  - create the objective function
+    // Construct the simplex constraints and objective
     for (int i = 0; i < variables.size(); ++i) {
+        // For each anchor
         AnchorData *ad = variables[i];
-        if (ad->isExpanding) {
-            // Add constraint to lock expanding anchor in its sizeAtMaximum
+
+        // Clamp the desired expanding size
+        qreal upperBoundary = qMax(ad->sizeAtPreferred, ad->sizeAtMaximum);
+        qreal lowerBoundary = qMin(ad->sizeAtPreferred, ad->sizeAtMaximum);
+        qreal boundedExpSize = qBound(lowerBoundary, ad->expSize, upperBoundary);
+
+        // Expanding anchors are those that want to move from their preferred size
+        if (boundedExpSize != ad->sizeAtPreferred)
+            hasExpanding = true;
+
+        // Lock anchor between boundedExpSize and sizeAtMaximum (ensure 3.a)
+        if (boundedExpSize == ad->sizeAtMaximum) {
+            // The interval has only one possible value, we can use an "Equal"
+            // constraint and don't need to add this variable to the objective.
             QSimplexConstraint *itemC = new QSimplexConstraint;
             itemC->ratio = QSimplexConstraint::Equal;
             itemC->variables.insert(ad, 1.0);
-            itemC->constant = ad->sizeAtMaximum;
+            itemC->constant = boundedExpSize;
             itemConstraints << itemC;
         } else {
-            // Add constraints to lock anchor between their sizeAtPreferred and sizeAtMaximum
+            // Add MoreOrEqual and LessOrEqual constraints.
             QSimplexConstraint *itemC = new QSimplexConstraint;
             itemC->ratio = QSimplexConstraint::MoreOrEqual;
             itemC->variables.insert(ad, 1.0);
-            itemC->constant = qMin(ad->sizeAtPreferred, ad->sizeAtMaximum);
+            itemC->constant = qMin(boundedExpSize, ad->sizeAtMaximum);
             itemConstraints << itemC;
 
             itemC = new QSimplexConstraint;
             itemC->ratio = QSimplexConstraint::LessOrEqual;
             itemC->variables.insert(ad, 1.0);
-            itemC->constant = qMax(ad->sizeAtPreferred, ad->sizeAtMaximum);
+            itemC->constant = qMax(boundedExpSize, ad->sizeAtMaximum);
             itemConstraints << itemC;
 
-            // Add anchor to objective function
-            if (ad->sizeAtPreferred < ad->sizeAtMaximum) {
+            // Create objective to avoid the anchos from moving away from
+            // the preferred size more than the needed amount. (ensure 3.b)
+            // The objective function is the distance between sizeAtPreferred
+            // and sizeAtExpanding, it will be minimized.
+            if (ad->sizeAtExpanding < ad->sizeAtMaximum) {
                 // Try to shrink this variable towards its sizeAtPreferred value
                 objective->variables.insert(ad, 1.0);
             } else {
@@ -2363,7 +2420,7 @@ void QGraphicsAnchorLayoutPrivate::solveExpanding(QList<QSimplexConstraint *> co
     }
 
     // Solve
-    if (objective->variables.size() == variables.size()) {
+    if (hasExpanding == false) {
         // If no anchors are expanding, we don't need to run the simplex
         // Set all variables to their preferred size
         for (int i = 0; i < variables.size(); ++i) {
@@ -2372,9 +2429,12 @@ void QGraphicsAnchorLayoutPrivate::solveExpanding(QList<QSimplexConstraint *> co
     } else {
         // Run simplex
         QSimplex simplex;
+
+        // Satisfy expanding (3.a)
         bool feasible = simplex.setConstraints(constraints + itemConstraints);
         Q_ASSERT(feasible);
 
+        // Reduce damage (3.b)
         simplex.setObjective(objective);
         simplex.solveMin();
 
-- 
cgit v0.12


From ba66cc0bde91e1143ac0a34f249f98e4573a5737 Mon Sep 17 00:00:00 2001
From: "Eduardo M. Fleury" <eduardo.fleury@openbossa.org>
Date: Mon, 28 Sep 2009 11:49:42 -0300
Subject: QSimplex: Remove overly conservative assertion

This assertion started failing after the addition of expanding
state. After some investigation we felt that the assertion itself
was too strong and would fail in some valid cases.

The new assertion is formally right as it tests whether the
simplex solver was able to satisfy the simplex constraints,
_exactly_ what it is expected to do.

Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
---
 src/gui/graphicsview/qsimplex_p.cpp | 24 ++++++------------------
 src/gui/graphicsview/qsimplex_p.h   | 26 +++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/gui/graphicsview/qsimplex_p.cpp b/src/gui/graphicsview/qsimplex_p.cpp
index 00fc204..95003d2 100644
--- a/src/gui/graphicsview/qsimplex_p.cpp
+++ b/src/gui/graphicsview/qsimplex_p.cpp
@@ -285,24 +285,6 @@ bool QSimplex::setConstraints(const QList<QSimplexConstraint *> newConstraints)
     // anymore.
     clearColumns(firstArtificial, columns - 2);
 
-    #ifdef QT_DEBUG
-    // Ensure that at the end of the simplex each row should either:
-    //  - Have a positive value on the column associated to its variable, or
-    //  - Have zero values in all columns.
-    //
-    // This avoids a regression where restrictions would be lost
-    // due to randomness in the pivotRowForColumn method.
-    for (int i = 1; i < rows; ++i) {
-        int variableIndex = valueAt(i, 0);
-        if (valueAt(i, variableIndex) > 0)
-            continue;
-
-        for (int j = 1; j < columns; ++j) {
-            Q_ASSERT(valueAt(i, j) == 0);
-        }
-    }
-    #endif
-
     return true;
 }
 
@@ -537,6 +519,12 @@ qreal QSimplex::solver(solverFactor factor)
     solveMaxHelper();
     collectResults();
 
+    #ifdef QT_DEBUG
+    for (int i = 0; i < constraints.size(); ++i) {
+        Q_ASSERT(constraints[i]->isSatisfied());
+    }
+    #endif
+
     return factor * valueAt(0, columns - 1);
 }
 
diff --git a/src/gui/graphicsview/qsimplex_p.h b/src/gui/graphicsview/qsimplex_p.h
index 54b080d..b517cb9 100644
--- a/src/gui/graphicsview/qsimplex_p.h
+++ b/src/gui/graphicsview/qsimplex_p.h
@@ -94,8 +94,32 @@ struct QSimplexConstraint
 
     QPair<QSimplexVariable *, qreal> helper;
     QSimplexVariable * artificial;
-};
 
+    #ifdef QT_DEBUG
+    bool isSatisfied() {
+        qreal leftHandSide(0);
+
+        QHash<QSimplexVariable *, qreal>::const_iterator iter;
+        for (iter = variables.constBegin(); iter != variables.constEnd(); ++iter) {
+            leftHandSide += iter.value() * iter.key()->result;
+        }
+
+        Q_ASSERT(constant > 0 || qFuzzyCompare(1, 1 + constant));
+
+        if (qFuzzyCompare(1000 + leftHandSide, 1000 + constant))
+            return true;
+
+        switch (ratio) {
+        case LessOrEqual:
+            return leftHandSide < constant;
+        case MoreOrEqual:
+            return leftHandSide > constant;
+        default:
+            return false;
+        }
+    }
+    #endif
+};
 
 class QSimplex
 {
-- 
cgit v0.12


From 0536b996759ef367e784310f472089eec583213f Mon Sep 17 00:00:00 2001
From: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Date: Fri, 25 Sep 2009 19:35:25 -0300
Subject: QGraphicsAnchorLayout: Add support for expanding SizePolicy with
 simplification

Updating "refreshSizeHints" and "updateChildrenSizes" methods for standard,
parallel and sequential anchors, in order to support the expanding SizePolicy
flag.

This adds the logic required to calculate equivalent expected/nominal expanding
size (AnchorData::expSize) as well as the logic to propagate the effective
size when in the expanding state (AnchorData::sizeAtExpected).

Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
---
 src/gui/graphicsview/qgraphicsanchorlayout_p.cpp | 59 ++++++++++++++----------
 src/gui/graphicsview/qgraphicsanchorlayout_p.h   |  4 +-
 2 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
index cf1429c..20ff03b 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -146,15 +146,11 @@ void AnchorData::refreshSizeHints(qreal effectiveSpacing)
             maxSize /= 2;
         }
 
-        // ###
-        expSize = prefSize;
-        // if (policy & QSizePolicy::ExpandFlag) {
-        //     isExpanding = 1;
-        //     expSize = maxSize;
-        // } else {
-        //     isExpanding = 0;
-        //     expSize = prefSize;
-        // }
+        if (policy & QSizePolicy::ExpandFlag) {
+            expSize = maxSize;
+        } else {
+            expSize = prefSize;
+        }
 
         // Set the anchor effective sizes to preferred.
         //
@@ -175,8 +171,6 @@ void AnchorData::refreshSizeHints(qreal effectiveSpacing)
         expSize = effectiveSpacing;
         maxSize = effectiveSpacing;
 
-        isExpanding = 0;
-
         sizeAtMinimum = prefSize;
         sizeAtPreferred = prefSize;
         sizeAtExpanding = prefSize;
@@ -188,8 +182,8 @@ void ParallelAnchorData::updateChildrenSizes()
 {
     firstEdge->sizeAtMinimum = secondEdge->sizeAtMinimum = sizeAtMinimum;
     firstEdge->sizeAtPreferred = secondEdge->sizeAtPreferred = sizeAtPreferred;
+    firstEdge->sizeAtExpanding = secondEdge->sizeAtExpanding = sizeAtExpanding;
     firstEdge->sizeAtMaximum = secondEdge->sizeAtMaximum = sizeAtMaximum;
-    firstEdge->sizeAtExpanding = secondEdge->sizeAtExpanding = sizeAtPreferred;
 
     firstEdge->updateChildrenSizes();
     secondEdge->updateChildrenSizes();
@@ -215,11 +209,11 @@ void ParallelAnchorData::refreshSizeHints_helper(qreal effectiveSpacing,
     minSize = qMax(firstEdge->minSize, secondEdge->minSize);
     maxSize = qMin(firstEdge->maxSize, secondEdge->maxSize);
 
-    prefSize = qMax(firstEdge->prefSize, secondEdge->prefSize);
-    prefSize = qMin(prefSize, maxSize);
+    expSize = qMax(firstEdge->expSize, secondEdge->expSize);
+    expSize = qMin(expSize, maxSize);
 
-    // ###
-    expSize = prefSize;
+    prefSize = qMax(firstEdge->prefSize, secondEdge->prefSize);
+    prefSize = qMin(prefSize, expSize);
 
     // See comment in AnchorData::refreshSizeHints() about sizeAt* values
     sizeAtMinimum = prefSize;
@@ -260,6 +254,21 @@ static qreal getFactor(qreal value, qreal min, qreal pref, qreal max)
     }
 }
 
+static qreal getExpandingFactor(const qreal &expSize, const qreal &sizeAtPreferred,
+                                const qreal &sizeAtExpanding, const qreal &sizeAtMaximum)
+{
+    const qreal lower = qMin(sizeAtPreferred, sizeAtMaximum);
+    const qreal upper = qMax(sizeAtPreferred, sizeAtMaximum);
+    const qreal boundedExpSize = qBound(lower, expSize, upper);
+
+    const qreal bandSize = sizeAtMaximum - boundedExpSize;
+    if (bandSize == 0) {
+        return 0;
+    } else {
+        return (sizeAtExpanding - boundedExpSize) / bandSize;
+    }
+}
+
 void SequentialAnchorData::updateChildrenSizes()
 {
     // ### REMOVE ME
@@ -269,15 +278,18 @@ void SequentialAnchorData::updateChildrenSizes()
     Q_ASSERT(sizeAtMinimum < maxSize || qFuzzyCompare(sizeAtMinimum, maxSize));
     Q_ASSERT(sizeAtPreferred > minSize || qFuzzyCompare(sizeAtPreferred, minSize));
     Q_ASSERT(sizeAtPreferred < maxSize || qFuzzyCompare(sizeAtPreferred, maxSize));
+    Q_ASSERT(sizeAtExpanding > minSize || qFuzzyCompare(sizeAtExpanding, minSize));
+    Q_ASSERT(sizeAtExpanding < maxSize || qFuzzyCompare(sizeAtExpanding, maxSize));
     Q_ASSERT(sizeAtMaximum > minSize || qFuzzyCompare(sizeAtMaximum, minSize));
     Q_ASSERT(sizeAtMaximum < maxSize || qFuzzyCompare(sizeAtMaximum, maxSize));
 
     // Band here refers if the value is in the Minimum To Preferred
     // band (the lower band) or the Preferred To Maximum (the upper band).
 
-    qreal minFactor = getFactor(sizeAtMinimum, minSize, prefSize, maxSize);
-    qreal prefFactor = getFactor(sizeAtPreferred, minSize, prefSize, maxSize);
-    qreal maxFactor = getFactor(sizeAtMaximum, minSize, prefSize, maxSize);
+    const qreal minFactor = getFactor(sizeAtMinimum, minSize, prefSize, maxSize);
+    const qreal prefFactor = getFactor(sizeAtPreferred, minSize, prefSize, maxSize);
+    const qreal maxFactor = getFactor(sizeAtMaximum, minSize, prefSize, maxSize);
+    const qreal expFactor = getExpandingFactor(expSize, sizeAtPreferred, sizeAtExpanding, sizeAtMaximum);
 
     for (int i = 0; i < m_edges.count(); ++i) {
         AnchorData *e = m_edges.at(i);
@@ -291,8 +303,10 @@ void SequentialAnchorData::updateChildrenSizes()
         bandSize = maxFactor > 0 ? e->maxSize - e->prefSize : e->prefSize - e->minSize;
         e->sizeAtMaximum = e->prefSize + bandSize * maxFactor;
 
-        // ###
-        e->sizeAtExpanding = e->sizeAtPreferred;
+        const qreal lower = qMin(e->sizeAtPreferred, e->sizeAtMaximum);
+        const qreal upper = qMax(e->sizeAtPreferred, e->sizeAtMaximum);
+        const qreal edgeBoundedExpSize = qBound(lower, e->expSize, upper);
+        e->sizeAtExpanding = edgeBoundedExpSize + expFactor * (e->sizeAtMaximum - edgeBoundedExpSize);
 
         e->updateChildrenSizes();
     }
@@ -324,9 +338,6 @@ void SequentialAnchorData::refreshSizeHints_helper(qreal effectiveSpacing,
         maxSize += edge->maxSize;
     }
 
-    // ###
-    expSize = prefSize;
-
     // See comment in AnchorData::refreshSizeHints() about sizeAt* values
     sizeAtMinimum = prefSize;
     sizeAtPreferred = prefSize;
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.h b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
index 8f67b2c..aac4f96 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.h
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
@@ -156,8 +156,7 @@ struct AnchorData : public QSimplexVariable {
           sizeAtMinimum(0), sizeAtPreferred(0),
           sizeAtExpanding(0), sizeAtMaximum(0),
           graphicsAnchor(0), skipInPreferred(0),
-          type(Normal), hasSize(true), isLayoutAnchor(false),
-          isExpanding(false) {}
+          type(Normal), hasSize(true), isLayoutAnchor(false) {}
 
     virtual void updateChildrenSizes() {}
     virtual void refreshSizeHints(qreal effectiveSpacing);
@@ -214,7 +213,6 @@ struct AnchorData : public QSimplexVariable {
     uint type : 2;            // either Normal, Sequential or Parallel
     uint hasSize : 1;         // if false, get size from style.
     uint isLayoutAnchor : 1;  // if this anchor is connected to a layout 'edge'
-    uint isExpanding : 1;     // if true, expands before other anchors
 };
 
 #ifdef QT_DEBUG
-- 
cgit v0.12


From 89ea5d0cc0b00a1d4e8f3e700b86f168cf4437ed Mon Sep 17 00:00:00 2001
From: "Eduardo M. Fleury" <eduardo.fleury@openbossa.org>
Date: Wed, 30 Sep 2009 12:25:34 -0300
Subject: QGraphicsAnchorLayout: Fix creation of internal layout anchors

Since the AnchorData cleanup commit (c974aca8) all anchor initialization
is being done by refreshSizeHints. However that method was not able
to properly initialize the internal layout anchors.

This commit refactors that method both to add the functionality and
improve readability.

Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
---
 src/gui/graphicsview/qgraphicsanchorlayout_p.cpp   | 145 ++++++++++++---------
 .../tst_qgraphicsanchorlayout.cpp                  |   2 +-
 2 files changed, 84 insertions(+), 63 deletions(-)

diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
index 20ff03b..8139b2b 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -92,90 +92,111 @@ qreal QGraphicsAnchorPrivate::spacing() const
 }
 
 
+static void sizeHintsFromItem(QGraphicsLayoutItem *item,
+                             const QGraphicsAnchorLayoutPrivate::Orientation orient,
+                             qreal *minSize, qreal *prefSize,
+                             qreal *expSize, qreal *maxSize)
+{
+    QSizePolicy::Policy policy;
+    qreal minSizeHint;
+    qreal prefSizeHint;
+    qreal maxSizeHint;
+
+    if (orient == QGraphicsAnchorLayoutPrivate::Horizontal) {
+        policy = item->sizePolicy().horizontalPolicy();
+        minSizeHint = item->effectiveSizeHint(Qt::MinimumSize).width();
+        prefSizeHint = item->effectiveSizeHint(Qt::PreferredSize).width();
+        maxSizeHint = item->effectiveSizeHint(Qt::MaximumSize).width();
+    } else {
+        policy = item->sizePolicy().verticalPolicy();
+        minSizeHint = item->effectiveSizeHint(Qt::MinimumSize).height();
+        prefSizeHint = item->effectiveSizeHint(Qt::PreferredSize).height();
+        maxSizeHint = item->effectiveSizeHint(Qt::MaximumSize).height();
+    }
+
+    // minSize, prefSize and maxSize are initialized
+    // with item's preferred Size: this is QSizePolicy::Fixed.
+    //
+    // Then we check each flag to find the resultant QSizePolicy,
+    // according to the following table:
+    //
+    //      constant               value
+    // QSizePolicy::Fixed            0
+    // QSizePolicy::Minimum       GrowFlag
+    // QSizePolicy::Maximum       ShrinkFlag
+    // QSizePolicy::Preferred     GrowFlag | ShrinkFlag
+    // QSizePolicy::Ignored       GrowFlag | ShrinkFlag | IgnoreFlag
+
+    if (policy & QSizePolicy::ShrinkFlag)
+        *minSize = minSizeHint;
+    else
+        *minSize = prefSizeHint;
+
+    if (policy & QSizePolicy::GrowFlag)
+        *maxSize = maxSizeHint;
+    else
+        *maxSize = prefSizeHint;
+
+    // Note that these two initializations are affected by the previous flags
+    if (policy & QSizePolicy::IgnoreFlag)
+        *prefSize = *maxSize;
+    else
+        *prefSize = prefSizeHint;
+
+    if (policy & QSizePolicy::ExpandFlag)
+        *expSize = *maxSize;
+    else
+        *expSize = *prefSize;
+}
+
 void AnchorData::refreshSizeHints(qreal effectiveSpacing)
 {
-    if (!isLayoutAnchor && (from->m_item == to->m_item)) {
-        QGraphicsLayoutItem *item = from->m_item;
+    const bool isInternalAnchor = from->m_item == to->m_item;
 
-        const QGraphicsAnchorLayoutPrivate::Orientation orient = QGraphicsAnchorLayoutPrivate::edgeOrientation(from->m_edge);
-        const Qt::AnchorPoint centerEdge = QGraphicsAnchorLayoutPrivate::pickEdge(Qt::AnchorHorizontalCenter, orient);
+    if (isInternalAnchor) {
+        const QGraphicsAnchorLayoutPrivate::Orientation orient =
+            QGraphicsAnchorLayoutPrivate::edgeOrientation(from->m_edge);
 
-        QSizePolicy::Policy policy;
-        qreal minSizeHint, prefSizeHint, maxSizeHint;
-        if (orient == QGraphicsAnchorLayoutPrivate::Horizontal) {
-            policy = item->sizePolicy().horizontalPolicy();
-            minSizeHint = item->effectiveSizeHint(Qt::MinimumSize).width();
-            prefSizeHint = item->effectiveSizeHint(Qt::PreferredSize).width();
-            maxSizeHint = item->effectiveSizeHint(Qt::MaximumSize).width();
+        if (isLayoutAnchor) {
+            minSize = 0;
+            prefSize = 0;
+            expSize = 0;
+            maxSize = QWIDGETSIZE_MAX;
         } else {
-            policy = item->sizePolicy().verticalPolicy();
-            minSizeHint = item->effectiveSizeHint(Qt::MinimumSize).height();
-            prefSizeHint = item->effectiveSizeHint(Qt::PreferredSize).height();
-            maxSizeHint = item->effectiveSizeHint(Qt::MaximumSize).height();
+            QGraphicsLayoutItem *item = from->m_item;
+            sizeHintsFromItem(item, orient, &minSize, &prefSize, &expSize, &maxSize);
         }
-        // minSize, prefSize and maxSize are initialized
-        // with item's preferred Size: this is QSizePolicy::Fixed.
-        //
-        // Then we check each flag to find the resultant QSizePolicy,
-        // according to the following table:
-        //
-        //      constant               value
-        // QSizePolicy::Fixed            0
-        // QSizePolicy::Minimum       GrowFlag
-        // QSizePolicy::Maximum       ShrinkFlag
-        // QSizePolicy::Preferred     GrowFlag | ShrinkFlag
-        // QSizePolicy::Ignored       GrowFlag | ShrinkFlag | IgnoreFlag
-        prefSize = prefSizeHint;
-        minSize = prefSize;
-        maxSize = prefSize;
-
-        if (policy & QSizePolicy::GrowFlag)
-            maxSize = maxSizeHint;
-
-        if (policy & QSizePolicy::ShrinkFlag)
-            minSize = minSizeHint;
-
-        if (policy & QSizePolicy::IgnoreFlag)
-            prefSize = minSize;
 
+        const Qt::AnchorPoint centerEdge =
+            QGraphicsAnchorLayoutPrivate::pickEdge(Qt::AnchorHorizontalCenter, orient);
         bool hasCenter = (from->m_edge == centerEdge || to->m_edge == centerEdge);
 
         if (hasCenter) {
             minSize /= 2;
             prefSize /= 2;
+            expSize /= 2;
             maxSize /= 2;
         }
 
-        if (policy & QSizePolicy::ExpandFlag) {
-            expSize = maxSize;
-        } else {
-            expSize = prefSize;
-        }
-
-        // Set the anchor effective sizes to preferred.
-        //
-        // Note: The idea here is that all items should remain at their
-        // preferred size unless where that's impossible.  In cases where
-        // the item is subject to restrictions (anchored to the layout
-        // edges, for instance), the simplex solver will be run to
-        // recalculate and override the values we set here.
-        sizeAtMinimum = prefSize;
-        sizeAtPreferred = prefSize;
-        sizeAtExpanding = prefSize;
-        sizeAtMaximum = prefSize;
-
     } else if (!hasSize) {
         // Anchor has no size defined, use given default information
         minSize = effectiveSpacing;
         prefSize = effectiveSpacing;
         expSize = effectiveSpacing;
         maxSize = effectiveSpacing;
-
-        sizeAtMinimum = prefSize;
-        sizeAtPreferred = prefSize;
-        sizeAtExpanding = prefSize;
-        sizeAtMaximum = prefSize;
     }
+
+    // Set the anchor effective sizes to preferred.
+    //
+    // Note: The idea here is that all items should remain at their
+    // preferred size unless where that's impossible.  In cases where
+    // the item is subject to restrictions (anchored to the layout
+    // edges, for instance), the simplex solver will be run to
+    // recalculate and override the values we set here.
+    sizeAtMinimum = prefSize;
+    sizeAtPreferred = prefSize;
+    sizeAtExpanding = prefSize;
+    sizeAtMaximum = prefSize;
 }
 
 void ParallelAnchorData::updateChildrenSizes()
diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index 4ad48c7..91e5bb3 100644
--- a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -1271,7 +1271,7 @@ void tst_QGraphicsAnchorLayout::sizePolicy()
     w1->adjustSize();
 
     QCOMPARE(l->effectiveSizeHint(Qt::MinimumSize), QSizeF(0, 0));
-    QCOMPARE(l->effectiveSizeHint(Qt::PreferredSize), QSizeF(0, 0));
+    QCOMPARE(l->effectiveSizeHint(Qt::PreferredSize), QSizeF(100, 100));
     QCOMPARE(l->effectiveSizeHint(Qt::MaximumSize), QSizeF(100, 100));
 
     delete p;
-- 
cgit v0.12


From 0d1e86fdfb7958a1affb93c7760c22fca9a0fcb2 Mon Sep 17 00:00:00 2001
From: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
Date: Fri, 25 Sep 2009 18:53:15 -0300
Subject: QGraphicsAnchorLayout: Adding a Float Conflict test case

Now we don't support floating items and so we should consider
that the layout has a conflict when handling this situation.

Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
---
 .../tst_qgraphicsanchorlayout.cpp                  | 69 ++++++++++++++++++++++
 .../tst_qgraphicsanchorlayout1.cpp                 |  4 +-
 2 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index 91e5bb3..b076631 100644
--- a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -72,6 +72,7 @@ private slots:
     void expandingSequence();
     void expandingSequenceFairDistribution();
     void expandingParallel();
+    void floatConflict();
 };
 
 class RectWidget : public QGraphicsWidget
@@ -158,7 +159,17 @@ void tst_QGraphicsAnchorLayout::simple()
 
     QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
     l->setContentsMargins(0, 0, 0, 0);
+
+    // Horizontal
+    l->addAnchor(w1, Qt::AnchorLeft, l, Qt::AnchorLeft);
     l->addAnchor(w1, Qt::AnchorRight, w2, Qt::AnchorLeft);
+    l->addAnchor(w2, Qt::AnchorRight, l, Qt::AnchorRight);
+
+    // Vertical
+    l->addAnchor(w1, Qt::AnchorTop, l, Qt::AnchorTop);
+    l->addAnchor(w2, Qt::AnchorTop, l, Qt::AnchorTop);
+    l->addAnchor(w1, Qt::AnchorBottom, l, Qt::AnchorBottom);
+    l->addAnchor(w2, Qt::AnchorBottom, l, Qt::AnchorBottom);
 
     QGraphicsWidget p;
     p.setLayout(l);
@@ -1152,12 +1163,22 @@ void tst_QGraphicsAnchorLayout::delete_anchor()
     QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
     l->setSpacing(0);
     l->setContentsMargins(0, 0, 0, 0);
+
+    // Horizontal
     l->addAnchor(l, Qt::AnchorLeft, w1, Qt::AnchorLeft);
     l->addAnchor(w1, Qt::AnchorRight, w2, Qt::AnchorLeft);
     l->addAnchor(w2, Qt::AnchorRight, l, Qt::AnchorRight);
     l->addAnchor(w1, Qt::AnchorRight, w3, Qt::AnchorLeft);
     l->addAnchor(w3, Qt::AnchorRight, l, Qt::AnchorRight);
 
+    // Vertical
+    l->addAnchor(w1, Qt::AnchorTop, l, Qt::AnchorTop);
+    l->addAnchor(w1, Qt::AnchorBottom, l, Qt::AnchorBottom);
+    l->addAnchor(w2, Qt::AnchorTop, l, Qt::AnchorTop);
+    l->addAnchor(w2, Qt::AnchorBottom, l, Qt::AnchorBottom);
+    l->addAnchor(w3, Qt::AnchorTop, l, Qt::AnchorTop);
+    l->addAnchor(w3, Qt::AnchorBottom, l, Qt::AnchorBottom);
+
     QGraphicsAnchor *anchor = l->anchor(w3, Qt::AnchorRight, l, Qt::AnchorRight);
     anchor->setSpacing(10);
 
@@ -1521,5 +1542,53 @@ void tst_QGraphicsAnchorLayout::expandingParallel()
     QCOMPARE(newLayoutMaximumSize.width(), qreal(300));
 }
 
+void tst_QGraphicsAnchorLayout::floatConflict()
+{
+    QGraphicsWidget *a = createItem(QSizeF(80,10), QSizeF(90,10), QSizeF(100,10), "a");
+    QGraphicsWidget *b = createItem(QSizeF(80,10), QSizeF(90,10), QSizeF(100,10), "b");
+
+    QGraphicsAnchorLayout *l;
+    QGraphicsWidget *p = new QGraphicsWidget(0, Qt::Window);
+
+    l = new QGraphicsAnchorLayout;
+    l->setContentsMargins(0, 0, 0, 0);
+
+    p->setLayout(l);
+
+    // horizontal
+    // with this anchor we have two floating items
+    setAnchor(l, a, Qt::AnchorRight, b, Qt::AnchorLeft);
+
+    // Just checking if the layout is handling well the removal of floating items
+    delete l->anchor(a, Qt::AnchorRight, b, Qt::AnchorLeft);
+    QCOMPARE(l->count(), 0);
+    QCOMPARE(layoutHasConflict(l), false);
+
+    // setting back the same anchor
+    setAnchor(l, a, Qt::AnchorRight, b, Qt::AnchorLeft);
+
+    // We don't support floating items but they should be counted as if they are in the layout
+    QCOMPARE(l->count(), 2);
+    // Although, we have an invalid situation
+    QCOMPARE(layoutHasConflict(l), true);
+
+    // Semi-floats are supported
+    setAnchor(l, a, Qt::AnchorLeft, l, Qt::AnchorLeft);
+    QCOMPARE(l->count(), 2);
+
+    // Vertically the layout has floating items. Therefore, we have a conflict
+    QCOMPARE(layoutHasConflict(l), true);
+
+    // No more floating items
+    setAnchor(l, b, Qt::AnchorRight, l, Qt::AnchorRight);
+    setAnchor(l, a, Qt::AnchorTop, l, Qt::AnchorTop);
+    setAnchor(l, a, Qt::AnchorBottom, l, Qt::AnchorBottom);
+    setAnchor(l, b, Qt::AnchorTop, l, Qt::AnchorTop);
+    setAnchor(l, b, Qt::AnchorBottom, l, Qt::AnchorBottom);
+    QCOMPARE(layoutHasConflict(l), false);
+
+    delete p;
+}
+
 QTEST_MAIN(tst_QGraphicsAnchorLayout)
 #include "tst_qgraphicsanchorlayout.moc"
diff --git a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp b/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
index a521b78..caf078e 100644
--- a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
+++ b/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
@@ -530,16 +530,18 @@ void tst_QGraphicsAnchorLayout1::testIsValid()
     TestWidget *widget1 = new TestWidget();
     TestWidget *widget2 = new TestWidget();
 
+    // Vertically the layout has floating items. Therefore, we have a conflict
     layout->setAnchor(layout, Qt::AnchorLeft, widget1, Qt::AnchorLeft, 0.1);
     layout->setAnchor(layout, Qt::AnchorRight, widget1, Qt::AnchorRight, -0.1);
 
+    // Horizontally the layout has floating items. Therefore, we have a conflict
     layout->setAnchor(layout, Qt::AnchorTop, widget2, Qt::AnchorTop, 0.1);
     layout->setAnchor(layout, Qt::AnchorBottom, widget2, Qt::AnchorBottom, -0.1);
 
     widget->setLayout(layout);
 
     widget->setGeometry(QRectF(0,0,100,100));
-    QCOMPARE(layout->isValid(), true);
+    QCOMPARE(layout->isValid(), false);
     delete widget;
     }
 }
-- 
cgit v0.12


From 18da388497b5f3cbc77298a70bc83f037f06c013 Mon Sep 17 00:00:00 2001
From: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
Date: Tue, 29 Sep 2009 14:02:27 -0300
Subject: QGraphicsAnchorLayoutPrivate: Handling floating items as an invalid
 layout situation

We make use of the anchor visited on findPaths() to keep track of how many items are visited when
walking on the graph. We can use this information of how many items are reachable (non-float) in order to check
if we have floating items (not reachable from any graph vertex). If so, we have a situation not supported by now.

Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
---
 src/gui/graphicsview/qgraphicsanchorlayout_p.cpp | 51 +++++++++++++++++++++++-
 src/gui/graphicsview/qgraphicsanchorlayout_p.h   |  3 ++
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
index 8139b2b..e760642 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -1841,6 +1841,11 @@ void QGraphicsAnchorLayoutPrivate::findPaths(Orientation orientation)
             queue.enqueue(qMakePair(pair.second, v));
         }
     }
+
+    // We will walk through every reachable items (non-float) and mark them
+    // by keeping their references on m_nonFloatItems. With this we can easily
+    // identify non-float and float items.
+    identifyNonFloatItems(visited, orientation);
 }
 
 /*!
@@ -1999,6 +2004,46 @@ QGraphicsAnchorLayoutPrivate::getGraphParts(Orientation orientation)
 }
 
 /*!
+ \internal
+
+  Use all visited Anchors on findPaths() so we can identify non-float Items.
+*/
+void QGraphicsAnchorLayoutPrivate::identifyNonFloatItems(QSet<AnchorData *> visited, Orientation orientation)
+{
+    m_nonFloatItems[orientation].clear();
+
+    foreach (const AnchorData *ad, visited)
+        identifyNonFloatItems_helper(ad, orientation);
+}
+
+/*!
+ \internal
+
+  Given an anchor, if it is an internal anchor and Normal we must mark it's item as non-float.
+  If the anchor is Sequential or Parallel, we must iterate on its children recursively until we reach
+  internal anchors (items).
+*/
+void QGraphicsAnchorLayoutPrivate::identifyNonFloatItems_helper(const AnchorData *ad, Orientation orientation)
+{
+    Q_Q(QGraphicsAnchorLayout);
+
+    switch(ad->type) {
+    case AnchorData::Normal:
+        if (ad->from->m_item == ad->to->m_item && ad->to->m_item != q)
+            m_nonFloatItems[orientation].insert(ad->to->m_item);
+        break;
+    case AnchorData::Sequential:
+        foreach (const AnchorData *d, static_cast<const SequentialAnchorData *>(ad)->m_edges)
+            identifyNonFloatItems_helper(d, orientation);
+        break;
+    case AnchorData::Parallel:
+        identifyNonFloatItems_helper(static_cast<const ParallelAnchorData *>(ad)->firstEdge, orientation);
+        identifyNonFloatItems_helper(static_cast<const ParallelAnchorData *>(ad)->secondEdge, orientation);
+        break;
+    }
+}
+
+/*!
   \internal
 
   Use the current vertices distance to calculate and set the geometry of
@@ -2491,7 +2536,11 @@ bool QGraphicsAnchorLayoutPrivate::hasConflicts() const
 {
     QGraphicsAnchorLayoutPrivate *that = const_cast<QGraphicsAnchorLayoutPrivate*>(this);
     that->calculateGraphs();
-    return graphHasConflicts[0] || graphHasConflicts[1];
+
+    bool floatConflict = (m_nonFloatItems[0].size() < items.size())
+                         || (m_nonFloatItems[1].size() < items.size());
+
+    return graphHasConflicts[0] || graphHasConflicts[1] || floatConflict;
 }
 
 #ifdef QT_DEBUG
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.h b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
index aac4f96..1a74d85 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.h
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
@@ -445,6 +445,8 @@ public:
     void constraintsFromPaths(Orientation orientation);
     QList<QSimplexConstraint *> constraintsFromSizeHints(const QList<AnchorData *> &anchors);
     QList<QList<QSimplexConstraint *> > getGraphParts(Orientation orientation);
+    void identifyNonFloatItems(QSet<AnchorData *> visited, Orientation orientation);
+    void identifyNonFloatItems_helper(const AnchorData *ad, Orientation orientation);
 
     inline AnchorVertex *internalVertex(const QPair<QGraphicsLayoutItem*, Qt::AnchorPoint> &itemEdge) const
     {
@@ -511,6 +513,7 @@ public:
     // ###
     bool graphSimplified[2];
     bool graphHasConflicts[2];
+    QSet<QGraphicsLayoutItem *> m_nonFloatItems[2];
 
     uint calculateGraphCacheDirty : 1;
 };
-- 
cgit v0.12


From 6367a702b13a440557d4e0a405ae6d34ef0b778f Mon Sep 17 00:00:00 2001
From: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
Date: Tue, 29 Sep 2009 15:22:26 -0300
Subject: QGraphicsAnchorLayoutPrivate: Fixing initial geometry values for new
 layout items

Now every item starts with its geometry on ((0,0), preferredSize()).
By doing this we guarantee that every item will have a known initial value, which
can be specially useful on float cases for instance.

Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
---
 src/gui/graphicsview/qgraphicsanchorlayout_p.cpp | 37 ++++++++++++++++--------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
index e760642..87f5aa0 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -2068,22 +2068,35 @@ void QGraphicsAnchorLayoutPrivate::setItemsGeometries(const QRectF &geom)
     right = geom.right() - right;
 
     foreach (QGraphicsLayoutItem *item, items) {
-        firstH = internalVertex(item, Qt::AnchorLeft);
-        secondH = internalVertex(item, Qt::AnchorRight);
-        firstV = internalVertex(item, Qt::AnchorTop);
-        secondV = internalVertex(item, Qt::AnchorBottom);
-
         QRectF newGeom;
-        newGeom.setTop(top + firstV->distance);
-        newGeom.setBottom(top + secondV->distance);
+        QSizeF itemPreferredSize = item->effectiveSizeHint(Qt::PreferredSize);
+        if (m_nonFloatItems[Horizontal].contains(item)) {
+            firstH = internalVertex(item, Qt::AnchorLeft);
+            secondH = internalVertex(item, Qt::AnchorRight);
+
+            if (visualDir == Qt::LeftToRight) {
+                newGeom.setLeft(left + firstH->distance);
+                newGeom.setRight(left + secondH->distance);
+            } else {
+                newGeom.setLeft(right - secondH->distance);
+                newGeom.setRight(right - firstH->distance);
+            }
+        } else {
+            newGeom.setLeft(0);
+            newGeom.setRight(itemPreferredSize.width());
+        }
+
+        if (m_nonFloatItems[Vertical].contains(item)) {
+            firstV = internalVertex(item, Qt::AnchorTop);
+            secondV = internalVertex(item, Qt::AnchorBottom);
 
-        if (visualDir == Qt::LeftToRight) {
-            newGeom.setLeft(left + firstH->distance);
-            newGeom.setRight(left + secondH->distance);
+            newGeom.setTop(top + firstV->distance);
+            newGeom.setBottom(top + secondV->distance);
         } else {
-            newGeom.setLeft(right - secondH->distance);
-            newGeom.setRight(right - firstH->distance);
+            newGeom.setTop(0);
+            newGeom.setBottom(itemPreferredSize.height());
         }
+
         item->setGeometry(newGeom);
     }
 }
-- 
cgit v0.12


From 709cc9140407280aa5c871d4650c123002dfdd19 Mon Sep 17 00:00:00 2001
From: "Eduardo M. Fleury" <eduardo.fleury@openbossa.org>
Date: Thu, 1 Oct 2009 15:04:20 -0300
Subject: QGraphicsAnchorLayout: Enable "float" Orbit test

Now supported after float patches.

Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
---
 tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp b/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
index caf078e..148b2c8 100644
--- a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
+++ b/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
@@ -1415,9 +1415,6 @@ void tst_QGraphicsAnchorLayout1::testMixedSpacing_data()
         QTest::newRow("One widget, unsolvable") << QSizeF(10, 10) << theData << theResult;
     }
 
-    // ### BUG. We are not handling "floating" elements properly. Ie. elements that
-    //     have no anchors in a given orientation.
-    if (0)
     // Two widgets, one has fixed size
     {
         BasicLayoutTestDataList theData;
-- 
cgit v0.12


From e8a3b49d6d42b213fd4fd55837f6180935a8a603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <sroedal@trolltech.com>
Date: Fri, 25 Sep 2009 17:12:42 +0200
Subject: Fixed missing stencil buffer clear when scissor testing is disabled.

---
 src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 7cd5aa4..242d02d 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1645,7 +1645,9 @@ void QGL2PaintEngineExPrivate::updateDepthScissorTest()
     else
         glDisable(GL_DEPTH_TEST);
 
-#ifndef QT_GL_NO_SCISSOR_TEST
+#ifdef QT_GL_NO_SCISSOR_TEST
+    currentScissorBounds = QRect(0, 0, width, height);
+#else
     QRect bounds = q->state()->rectangleClip;
     if (!q->state()->clipEnabled) {
         if (use_system_clip)
-- 
cgit v0.12


From 6372c2865ab6924127b78f968bdd41f8d3f9c637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <sroedal@trolltech.com>
Date: Fri, 25 Sep 2009 17:02:53 +0200
Subject: Moved maxDepth out of state object and got rid of unused state
 members.

---
 .../gl2paintengineex/qpaintengineex_opengl2.cpp       | 19 ++++++++-----------
 .../gl2paintengineex/qpaintengineex_opengl2_p.h       |  4 +---
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 242d02d..197c7a9 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1796,21 +1796,21 @@ void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
     case Qt::IntersectClip:
         state()->rectangleClip = state()->rectangleClip.intersected(pathRect);
         d->updateDepthScissorTest();
-        ++state()->maxDepth;
-        d->writeClip(path, state()->maxDepth);
-        state()->currentDepth = state()->maxDepth - 1;
+        ++d->maxDepth;
+        d->writeClip(path, d->maxDepth);
+        state()->currentDepth = d->maxDepth - 1;
         state()->depthTestEnabled = true;
         break;
     case Qt::UniteClip: {
 #ifndef QT_GL_NO_SCISSOR_TEST
         if (state()->rectangleClip.isValid()) {
-            ++state()->maxDepth;
+            d->maxDepth;
 
             QPainterPath path;
             path.addRect(state()->rectangleClip);
 
             // flush the existing clip rectangle to the depth buffer
-            d->writeClip(qtVectorPathForPath(state()->matrix.inverted().map(path)), state()->maxDepth);
+            d->writeClip(qtVectorPathForPath(state()->matrix.inverted().map(path)), d->maxDepth);
         }
 
         QRect oldRectangleClip = state()->rectangleClip;
@@ -1831,9 +1831,9 @@ void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
 #endif
         glDepthFunc(GL_ALWAYS);
         // now write the clip path
-        d->writeClip(path, state()->maxDepth);
+        d->writeClip(path, d->maxDepth);
         state()->canRestoreClip = false;
-        state()->currentDepth = state()->maxDepth - 1;
+        state()->currentDepth = d->maxDepth - 1;
         state()->depthTestEnabled = true;
         break;
         }
@@ -1874,7 +1874,7 @@ void QGL2PaintEngineExPrivate::systemStateChanged()
     q->state()->needsDepthBufferClear = true;
 
     q->state()->currentDepth = 1;
-    q->state()->maxDepth = 4;
+    maxDepth = 4;
 
     q->state()->rectangleClip = use_system_clip ? systemClip.boundingRect() : QRect(0, 0, width, height);
     updateDepthScissorTest();
@@ -1945,7 +1945,6 @@ void QGL2PaintEngineEx::setState(QPainterState *new_state)
         d->updateDepthScissorTest();
         glDepthMask(false);
         glDepthFunc(GL_LESS);
-        s->maxDepth = old_state->maxDepth;
     } else {
         d->regenerateDepthClip();
     }
@@ -1981,7 +1980,6 @@ QOpenGL2PaintEngineState::QOpenGL2PaintEngineState(QOpenGL2PaintEngineState &oth
     depthTestEnabled = other.depthTestEnabled;
     scissorTestEnabled = other.scissorTestEnabled;
     currentDepth = other.currentDepth;
-    maxDepth = other.maxDepth;
     canRestoreClip = other.canRestoreClip;
     rectangleClip = other.rectangleClip;
 }
@@ -1991,7 +1989,6 @@ QOpenGL2PaintEngineState::QOpenGL2PaintEngineState()
     needsDepthBufferClear = true;
     depthTestEnabled = false;
     currentDepth = 1;
-    maxDepth = 4;
     canRestoreClip = true;
 }
 
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index 12123f3..189d5be 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -83,16 +83,13 @@ public:
     ~QOpenGL2PaintEngineState();
 
     bool needsDepthBufferClear;
-    qreal depthBufferClearValue;
 
     bool depthTestEnabled;
     bool scissorTestEnabled;
-    uint maxDepth;
     uint currentDepth;
 
     bool canRestoreClip;
     QRect rectangleClip;
-    bool hasRectangleClip;
 };
 
 class Q_OPENGL_EXPORT QGL2PaintEngineEx : public QPaintEngineEx
@@ -226,6 +223,7 @@ public:
 
     QRegion dirtyStencilRegion;
     QRect currentScissorBounds;
+    uint maxDepth;
 
     const QBrush*    currentBrush; // May not be the state's brush!
 
-- 
cgit v0.12


From af8ff76bf25b6b4d01d89bea42baab65ed7e09ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <sroedal@trolltech.com>
Date: Fri, 25 Sep 2009 17:22:48 +0200
Subject: Refactored GL 2 engine UniteClip to always increase max depth.

---
 src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 197c7a9..17b4808 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1802,10 +1802,8 @@ void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
         state()->depthTestEnabled = true;
         break;
     case Qt::UniteClip: {
-#ifndef QT_GL_NO_SCISSOR_TEST
+        ++d->maxDepth;
         if (state()->rectangleClip.isValid()) {
-            d->maxDepth;
-
             QPainterPath path;
             path.addRect(state()->rectangleClip);
 
@@ -1813,6 +1811,7 @@ void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
             d->writeClip(qtVectorPathForPath(state()->matrix.inverted().map(path)), d->maxDepth);
         }
 
+#ifndef QT_GL_NO_SCISSOR_TEST
         QRect oldRectangleClip = state()->rectangleClip;
 
         state()->rectangleClip = state()->rectangleClip.united(pathRect);
-- 
cgit v0.12


From aaf695a3fad8d84f3d9483a573732350445d453a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <sroedal@trolltech.com>
Date: Fri, 25 Sep 2009 17:20:50 +0200
Subject: Made GL 2 paint engine waste less bits in clipping algorithm.

---
 src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 17b4808..c0959ae 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1710,7 +1710,7 @@ void QGL2PaintEngineExPrivate::writeClip(const QVectorPath &path, uint depth)
         updateMatrix();
     if (q->state()->needsDepthBufferClear) {
         glDepthMask(true);
-        glClearDepth(rawDepth(2));
+        glClearDepth(rawDepth(1));
         glClear(GL_DEPTH_BUFFER_BIT);
         q->state()->needsDepthBufferClear = false;
         glDepthMask(false);
@@ -1872,8 +1872,8 @@ void QGL2PaintEngineExPrivate::systemStateChanged()
     q->state()->depthTestEnabled = false;
     q->state()->needsDepthBufferClear = true;
 
-    q->state()->currentDepth = 1;
-    maxDepth = 4;
+    q->state()->currentDepth = 0;
+    maxDepth = 1;
 
     q->state()->rectangleClip = use_system_clip ? systemClip.boundingRect() : QRect(0, 0, width, height);
     updateDepthScissorTest();
@@ -1901,7 +1901,7 @@ void QGL2PaintEngineExPrivate::systemStateChanged()
         path.addRegion(systemClip);
 
         glDepthFunc(GL_ALWAYS);
-        writeClip(qtVectorPathForPath(q->state()->matrix.inverted().map(path)), 2);
+        writeClip(qtVectorPathForPath(q->state()->matrix.inverted().map(path)), 1);
         glDepthFunc(GL_LESS);
 
         glEnable(GL_DEPTH_TEST);
@@ -1987,7 +1987,6 @@ QOpenGL2PaintEngineState::QOpenGL2PaintEngineState()
 {
     needsDepthBufferClear = true;
     depthTestEnabled = false;
-    currentDepth = 1;
     canRestoreClip = true;
 }
 
-- 
cgit v0.12


From 2f268b40b290c4513d2d06b75ad681b5550eeaa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <sroedal@trolltech.com>
Date: Fri, 25 Sep 2009 17:30:56 +0200
Subject: Switched to using GL_LEQUAL instead of GL_LESS in GL 2 engine.

---
 .../gl2paintengineex/qpaintengineex_opengl2.cpp     | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index c0959ae..602754c 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -774,6 +774,7 @@ void QGL2PaintEngineExPrivate::resetGLState()
     glDisable(GL_DEPTH_TEST);
     glDisable(GL_SCISSOR_TEST);
     glDepthMask(true);
+    glDepthFunc(GL_LESS);
     glClearDepth(1);
 }
 
@@ -1565,7 +1566,7 @@ bool QGL2PaintEngineEx::begin(QPaintDevice *pdev)
     if (!d->inRenderText) {
         glDisable(GL_DEPTH_TEST);
         glDisable(GL_SCISSOR_TEST);
-        glDepthFunc(GL_LESS);
+        glDepthFunc(GL_LEQUAL);
         glDepthMask(false);
     }
 
@@ -1631,7 +1632,7 @@ void QGL2PaintEngineEx::ensureActive()
         d->transferMode(BrushDrawingMode);
         glViewport(0, 0, d->width, d->height);
         glDepthMask(false);
-        glDepthFunc(GL_LESS);
+        glDepthFunc(GL_LEQUAL);
         d->needsSync = false;
         setState(state());
     }
@@ -1693,7 +1694,7 @@ void QGL2PaintEngineEx::clipEnabledChanged()
         d->regenerateDepthClip();
     } else {
         if (d->use_system_clip) {
-            state()->currentDepth = 0;
+            state()->currentDepth = 1;
         } else {
             state()->depthTestEnabled = false;
         }
@@ -1785,7 +1786,7 @@ void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
     case Qt::NoClip:
         if (d->use_system_clip) {
             state()->depthTestEnabled = true;
-            state()->currentDepth = 0;
+            state()->currentDepth = 1;
         } else {
             state()->depthTestEnabled = false;
         }
@@ -1798,7 +1799,7 @@ void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
         d->updateDepthScissorTest();
         ++d->maxDepth;
         d->writeClip(path, d->maxDepth);
-        state()->currentDepth = d->maxDepth - 1;
+        state()->currentDepth = d->maxDepth;
         state()->depthTestEnabled = true;
         break;
     case Qt::UniteClip: {
@@ -1832,7 +1833,7 @@ void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
         // now write the clip path
         d->writeClip(path, d->maxDepth);
         state()->canRestoreClip = false;
-        state()->currentDepth = d->maxDepth - 1;
+        state()->currentDepth = d->maxDepth;
         state()->depthTestEnabled = true;
         break;
         }
@@ -1840,7 +1841,7 @@ void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
         break;
     }
 
-    glDepthFunc(GL_LESS);
+    glDepthFunc(GL_LEQUAL);
     if (state()->depthTestEnabled) {
         glEnable(GL_DEPTH_TEST);
         d->simpleShaderDepthUniformDirty = true;
@@ -1872,7 +1873,7 @@ void QGL2PaintEngineExPrivate::systemStateChanged()
     q->state()->depthTestEnabled = false;
     q->state()->needsDepthBufferClear = true;
 
-    q->state()->currentDepth = 0;
+    q->state()->currentDepth = 1;
     maxDepth = 1;
 
     q->state()->rectangleClip = use_system_clip ? systemClip.boundingRect() : QRect(0, 0, width, height);
@@ -1902,7 +1903,7 @@ void QGL2PaintEngineExPrivate::systemStateChanged()
 
         glDepthFunc(GL_ALWAYS);
         writeClip(qtVectorPathForPath(q->state()->matrix.inverted().map(path)), 1);
-        glDepthFunc(GL_LESS);
+        glDepthFunc(GL_LEQUAL);
 
         glEnable(GL_DEPTH_TEST);
         q->state()->depthTestEnabled = true;
@@ -1943,7 +1944,7 @@ void QGL2PaintEngineEx::setState(QPainterState *new_state)
     if (old_state && old_state != s && old_state->canRestoreClip) {
         d->updateDepthScissorTest();
         glDepthMask(false);
-        glDepthFunc(GL_LESS);
+        glDepthFunc(GL_LEQUAL);
     } else {
         d->regenerateDepthClip();
     }
-- 
cgit v0.12


From e8c73ac916ce5cb0492c1d1ba817e59b8df34158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <sroedal@trolltech.com>
Date: Fri, 25 Sep 2009 17:36:46 +0200
Subject: Renamed GL 2 engine variables to be clip buffer agnostic.

---
 .../gl2paintengineex/qpaintengineex_opengl2.cpp    | 90 +++++++++++-----------
 .../gl2paintengineex/qpaintengineex_opengl2_p.h    | 14 ++--
 2 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 602754c..7eb9afc 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -276,7 +276,7 @@ void QGLTextureGlyphCache::resizeTextureData(int width, int height)
     glBindFramebuffer(GL_FRAMEBUFFER_EXT, ctx->d_ptr->current_fbo);
 
     glViewport(0, 0, pex->width, pex->height);
-    pex->updateDepthScissorTest();
+    pex->updateClipScissorTest();
 
 #ifndef QT_OPENGL_ES_2
     if (pex->inRenderText)
@@ -404,7 +404,7 @@ void QGL2PaintEngineExPrivate::useSimpleShader()
     }
 
     if (simpleShaderDepthUniformDirty) {
-        shaderManager->simpleProgram()->setUniformValue("depth", normalizedDeviceDepth(q->state()->currentDepth));
+        shaderManager->simpleProgram()->setUniformValue("depth", normalizedDeviceDepth(q->state()->currentClip));
         simpleShaderDepthUniformDirty = false;
     }
 }
@@ -1018,7 +1018,7 @@ bool QGL2PaintEngineExPrivate::prepareForDraw(bool srcPixelsAreOpaque)
     }
 
     if (depthUniformDirty) {
-        shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::Depth), normalizedDeviceDepth(q->state()->currentDepth));
+        shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::Depth), normalizedDeviceDepth(q->state()->currentClip));
         depthUniformDirty = false;
     }
 
@@ -1638,10 +1638,10 @@ void QGL2PaintEngineEx::ensureActive()
     }
 }
 
-void QGL2PaintEngineExPrivate::updateDepthScissorTest()
+void QGL2PaintEngineExPrivate::updateClipScissorTest()
 {
     Q_Q(QGL2PaintEngineEx);
-    if (q->state()->depthTestEnabled)
+    if (q->state()->clipTestEnabled)
         glEnable(GL_DEPTH_TEST);
     else
         glDisable(GL_DEPTH_TEST);
@@ -1691,29 +1691,29 @@ void QGL2PaintEngineEx::clipEnabledChanged()
     d->depthUniformDirty = true;
 
     if (painter()->hasClipping()) {
-        d->regenerateDepthClip();
+        d->regenerateClip();
     } else {
         if (d->use_system_clip) {
-            state()->currentDepth = 1;
+            state()->currentClip = 1;
         } else {
-            state()->depthTestEnabled = false;
+            state()->clipTestEnabled = false;
         }
 
-        d->updateDepthScissorTest();
+        d->updateClipScissorTest();
     }
 }
 
-void QGL2PaintEngineExPrivate::writeClip(const QVectorPath &path, uint depth)
+void QGL2PaintEngineExPrivate::writeClip(const QVectorPath &path, uint value)
 {
     transferMode(BrushDrawingMode);
 
     if (matrixDirty)
         updateMatrix();
-    if (q->state()->needsDepthBufferClear) {
+    if (q->state()->needsClipBufferClear) {
         glDepthMask(true);
         glClearDepth(rawDepth(1));
         glClear(GL_DEPTH_BUFFER_BIT);
-        q->state()->needsDepthBufferClear = false;
+        q->state()->needsClipBufferClear = false;
         glDepthMask(false);
     }
 
@@ -1733,7 +1733,7 @@ void QGL2PaintEngineExPrivate::writeClip(const QVectorPath &path, uint depth)
     glColorMask(false, false, false, false);
     glDepthMask(true);
 
-    shaderManager->simpleProgram()->setUniformValue("depth", normalizedDeviceDepth(depth));
+    shaderManager->simpleProgram()->setUniformValue("depth", normalizedDeviceDepth(value));
     simpleShaderDepthUniformDirty = true;
 
     glEnable(GL_DEPTH_TEST);
@@ -1774,7 +1774,7 @@ void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
 
         if (state()->matrix.type() <= QTransform::TxScale) {
             state()->rectangleClip = state()->rectangleClip.intersected(state()->matrix.mapRect(rect).toRect());
-            d->updateDepthScissorTest();
+            d->updateClipScissorTest();
             return;
         }
     }
@@ -1785,38 +1785,38 @@ void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
     switch (op) {
     case Qt::NoClip:
         if (d->use_system_clip) {
-            state()->depthTestEnabled = true;
-            state()->currentDepth = 1;
+            state()->clipTestEnabled = true;
+            state()->currentClip = 1;
         } else {
-            state()->depthTestEnabled = false;
+            state()->clipTestEnabled = false;
         }
         state()->rectangleClip = QRect(0, 0, d->width, d->height);
         state()->canRestoreClip = false;
-        d->updateDepthScissorTest();
+        d->updateClipScissorTest();
         break;
     case Qt::IntersectClip:
         state()->rectangleClip = state()->rectangleClip.intersected(pathRect);
-        d->updateDepthScissorTest();
-        ++d->maxDepth;
-        d->writeClip(path, d->maxDepth);
-        state()->currentDepth = d->maxDepth;
-        state()->depthTestEnabled = true;
+        d->updateClipScissorTest();
+        ++d->maxClip;
+        d->writeClip(path, d->maxClip);
+        state()->currentClip = d->maxClip;
+        state()->clipTestEnabled = true;
         break;
     case Qt::UniteClip: {
-        ++d->maxDepth;
+        ++d->maxClip;
         if (state()->rectangleClip.isValid()) {
             QPainterPath path;
             path.addRect(state()->rectangleClip);
 
             // flush the existing clip rectangle to the depth buffer
-            d->writeClip(qtVectorPathForPath(state()->matrix.inverted().map(path)), d->maxDepth);
+            d->writeClip(qtVectorPathForPath(state()->matrix.inverted().map(path)), d->maxClip);
         }
 
 #ifndef QT_GL_NO_SCISSOR_TEST
         QRect oldRectangleClip = state()->rectangleClip;
 
         state()->rectangleClip = state()->rectangleClip.united(pathRect);
-        d->updateDepthScissorTest();
+        d->updateClipScissorTest();
 
         QRegion extendRegion = QRegion(state()->rectangleClip) - oldRectangleClip;
 
@@ -1831,10 +1831,10 @@ void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
 #endif
         glDepthFunc(GL_ALWAYS);
         // now write the clip path
-        d->writeClip(path, d->maxDepth);
+        d->writeClip(path, d->maxClip);
         state()->canRestoreClip = false;
-        state()->currentDepth = d->maxDepth;
-        state()->depthTestEnabled = true;
+        state()->currentClip = d->maxClip;
+        state()->clipTestEnabled = true;
         break;
         }
     default:
@@ -1842,14 +1842,14 @@ void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
     }
 
     glDepthFunc(GL_LEQUAL);
-    if (state()->depthTestEnabled) {
+    if (state()->clipTestEnabled) {
         glEnable(GL_DEPTH_TEST);
         d->simpleShaderDepthUniformDirty = true;
         d->depthUniformDirty = true;
     }
 }
 
-void QGL2PaintEngineExPrivate::regenerateDepthClip()
+void QGL2PaintEngineExPrivate::regenerateClip()
 {
     systemStateChanged();
     replayClipOperations();
@@ -1870,14 +1870,14 @@ void QGL2PaintEngineExPrivate::systemStateChanged()
         }
     }
 
-    q->state()->depthTestEnabled = false;
-    q->state()->needsDepthBufferClear = true;
+    q->state()->clipTestEnabled = false;
+    q->state()->needsClipBufferClear = true;
 
-    q->state()->currentDepth = 1;
-    maxDepth = 1;
+    q->state()->currentClip = 1;
+    maxClip = 1;
 
     q->state()->rectangleClip = use_system_clip ? systemClip.boundingRect() : QRect(0, 0, width, height);
-    updateDepthScissorTest();
+    updateClipScissorTest();
 
     if (use_system_clip) {
 #ifndef QT_GL_NO_SCISSOR_TEST
@@ -1891,7 +1891,7 @@ void QGL2PaintEngineExPrivate::systemStateChanged()
             return;
         }
 #endif
-        q->state()->needsDepthBufferClear = false;
+        q->state()->needsClipBufferClear = false;
 
         glDepthMask(true);
 
@@ -1906,7 +1906,7 @@ void QGL2PaintEngineExPrivate::systemStateChanged()
         glDepthFunc(GL_LEQUAL);
 
         glEnable(GL_DEPTH_TEST);
-        q->state()->depthTestEnabled = true;
+        q->state()->clipTestEnabled = true;
 
         simpleShaderDepthUniformDirty = true;
         depthUniformDirty = true;
@@ -1942,11 +1942,11 @@ void QGL2PaintEngineEx::setState(QPainterState *new_state)
     d->shaderManager->setDirty();
 
     if (old_state && old_state != s && old_state->canRestoreClip) {
-        d->updateDepthScissorTest();
+        d->updateClipScissorTest();
         glDepthMask(false);
         glDepthFunc(GL_LEQUAL);
     } else {
-        d->regenerateDepthClip();
+        d->regenerateClip();
     }
 }
 
@@ -1976,18 +1976,18 @@ void QGL2PaintEngineEx::setRenderTextActive(bool active)
 QOpenGL2PaintEngineState::QOpenGL2PaintEngineState(QOpenGL2PaintEngineState &other)
     : QPainterState(other)
 {
-    needsDepthBufferClear = other.needsDepthBufferClear;
-    depthTestEnabled = other.depthTestEnabled;
+    needsClipBufferClear = other.needsClipBufferClear;
+    clipTestEnabled = other.clipTestEnabled;
     scissorTestEnabled = other.scissorTestEnabled;
-    currentDepth = other.currentDepth;
+    currentClip = other.currentClip;
     canRestoreClip = other.canRestoreClip;
     rectangleClip = other.rectangleClip;
 }
 
 QOpenGL2PaintEngineState::QOpenGL2PaintEngineState()
 {
-    needsDepthBufferClear = true;
-    depthTestEnabled = false;
+    needsClipBufferClear = true;
+    clipTestEnabled = false;
     canRestoreClip = true;
 }
 
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index 189d5be..fc61905 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -82,11 +82,11 @@ public:
     QOpenGL2PaintEngineState();
     ~QOpenGL2PaintEngineState();
 
-    bool needsDepthBufferClear;
+    bool needsClipBufferClear;
 
-    bool depthTestEnabled;
+    bool clipTestEnabled;
     bool scissorTestEnabled;
-    uint currentDepth;
+    uint currentClip;
 
     bool canRestoreClip;
     QRect rectangleClip;
@@ -223,7 +223,7 @@ public:
 
     QRegion dirtyStencilRegion;
     QRect currentScissorBounds;
-    uint maxDepth;
+    uint maxClip;
 
     const QBrush*    currentBrush; // May not be the state's brush!
 
@@ -240,10 +240,10 @@ public:
 
     QGLEngineShaderManager* shaderManager;
 
-    void writeClip(const QVectorPath &path, uint depth);
-    void updateDepthScissorTest();
+    void writeClip(const QVectorPath &path, uint value);
+    void updateClipScissorTest();
     void setScissor(const QRect &rect);
-    void regenerateDepthClip();
+    void regenerateClip();
     void systemStateChanged();
     uint use_system_clip : 1;
 
-- 
cgit v0.12


From a815840a7f2272b128de4a52497626c49373c8c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <sroedal@trolltech.com>
Date: Mon, 28 Sep 2009 10:24:09 +0200
Subject: Got rid of some redundant state changes regarding GL depth state.

---
 .../gl2paintengineex/qpaintengineex_opengl2.cpp    | 23 +++++++++-------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 7eb9afc..b7f9e2c 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1566,8 +1566,6 @@ bool QGL2PaintEngineEx::begin(QPaintDevice *pdev)
     if (!d->inRenderText) {
         glDisable(GL_DEPTH_TEST);
         glDisable(GL_SCISSOR_TEST);
-        glDepthFunc(GL_LEQUAL);
-        glDepthMask(false);
     }
 
 #if !defined(QT_OPENGL_ES_2)
@@ -1631,8 +1629,6 @@ void QGL2PaintEngineEx::ensureActive()
     if (d->needsSync) {
         d->transferMode(BrushDrawingMode);
         glViewport(0, 0, d->width, d->height);
-        glDepthMask(false);
-        glDepthFunc(GL_LEQUAL);
         d->needsSync = false;
         setState(state());
     }
@@ -1714,18 +1710,23 @@ void QGL2PaintEngineExPrivate::writeClip(const QVectorPath &path, uint value)
         glClearDepth(rawDepth(1));
         glClear(GL_DEPTH_BUFFER_BIT);
         q->state()->needsClipBufferClear = false;
-        glDepthMask(false);
     }
 
+    glDepthMask(false);
+
     if (path.isEmpty())
         return;
 
     glDisable(GL_BLEND);
-    glDepthMask(false);
 
     vertexCoordinateArray.clear();
     vertexCoordinateArray.addPath(path, inverseScale);
 
+    if (q->state()->clipTestEnabled)
+        glDepthFunc(GL_LEQUAL);
+    else
+        glDepthFunc(GL_ALWAYS);
+
     glDepthMask(GL_FALSE);
     fillStencilWithVertexArray(vertexCoordinateArray, path.hasWindingFill());
 
@@ -1746,6 +1747,7 @@ void QGL2PaintEngineExPrivate::writeClip(const QVectorPath &path, uint value)
     composite(vertexCoordinateArray.boundingRect());
     glDisable(GL_STENCIL_TEST);
 
+    glDepthFunc(GL_LEQUAL);
     glStencilMask(0);
 
     glColorMask(true, true, true, true);
@@ -1812,6 +1814,7 @@ void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
             d->writeClip(qtVectorPathForPath(state()->matrix.inverted().map(path)), d->maxClip);
         }
 
+        state()->clipTestEnabled = false;
 #ifndef QT_GL_NO_SCISSOR_TEST
         QRect oldRectangleClip = state()->rectangleClip;
 
@@ -1820,7 +1823,6 @@ void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
 
         QRegion extendRegion = QRegion(state()->rectangleClip) - oldRectangleClip;
 
-        glDepthFunc(GL_ALWAYS);
         if (!extendRegion.isEmpty()) {
             QPainterPath extendPath;
             extendPath.addRegion(extendRegion);
@@ -1829,7 +1831,6 @@ void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
             d->writeClip(qtVectorPathForPath(state()->matrix.inverted().map(extendPath)), 0);
         }
 #endif
-        glDepthFunc(GL_ALWAYS);
         // now write the clip path
         d->writeClip(path, d->maxClip);
         state()->canRestoreClip = false;
@@ -1841,9 +1842,7 @@ void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
         break;
     }
 
-    glDepthFunc(GL_LEQUAL);
     if (state()->clipTestEnabled) {
-        glEnable(GL_DEPTH_TEST);
         d->simpleShaderDepthUniformDirty = true;
         d->depthUniformDirty = true;
     }
@@ -1901,11 +1900,8 @@ void QGL2PaintEngineExPrivate::systemStateChanged()
         QPainterPath path;
         path.addRegion(systemClip);
 
-        glDepthFunc(GL_ALWAYS);
         writeClip(qtVectorPathForPath(q->state()->matrix.inverted().map(path)), 1);
-        glDepthFunc(GL_LEQUAL);
 
-        glEnable(GL_DEPTH_TEST);
         q->state()->clipTestEnabled = true;
 
         simpleShaderDepthUniformDirty = true;
@@ -1943,7 +1939,6 @@ void QGL2PaintEngineEx::setState(QPainterState *new_state)
 
     if (old_state && old_state != s && old_state->canRestoreClip) {
         d->updateClipScissorTest();
-        glDepthMask(false);
         glDepthFunc(GL_LEQUAL);
     } else {
         d->regenerateClip();
-- 
cgit v0.12


From 6d17e09c274803d324e8a8db579aaafaefaab33f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <sroedal@trolltech.com>
Date: Mon, 28 Sep 2009 10:31:46 +0200
Subject: Moved GL 2 clip clearing code into a common function.

---
 .../gl2paintengineex/qpaintengineex_opengl2.cpp    | 28 +++++++++++-----------
 .../gl2paintengineex/qpaintengineex_opengl2_p.h    |  1 +
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index b7f9e2c..13f0079 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1699,25 +1699,30 @@ void QGL2PaintEngineEx::clipEnabledChanged()
     }
 }
 
+void QGL2PaintEngineExPrivate::clearClip(uint value)
+{
+    glDepthMask(true);
+    glClearDepth(rawDepth(value));
+    glClear(GL_DEPTH_BUFFER_BIT);
+    glDepthMask(false);
+
+    q->state()->needsClipBufferClear = false;
+}
+
 void QGL2PaintEngineExPrivate::writeClip(const QVectorPath &path, uint value)
 {
     transferMode(BrushDrawingMode);
 
     if (matrixDirty)
         updateMatrix();
-    if (q->state()->needsClipBufferClear) {
-        glDepthMask(true);
-        glClearDepth(rawDepth(1));
-        glClear(GL_DEPTH_BUFFER_BIT);
-        q->state()->needsClipBufferClear = false;
-    }
-
-    glDepthMask(false);
+    if (q->state()->needsClipBufferClear)
+        clearClip(1);
 
     if (path.isEmpty())
         return;
 
     glDisable(GL_BLEND);
+    glDepthMask(false);
 
     vertexCoordinateArray.clear();
     vertexCoordinateArray.addPath(path, inverseScale);
@@ -1890,12 +1895,7 @@ void QGL2PaintEngineExPrivate::systemStateChanged()
             return;
         }
 #endif
-        q->state()->needsClipBufferClear = false;
-
-        glDepthMask(true);
-
-        glClearDepth(0);
-        glClear(GL_DEPTH_BUFFER_BIT);
+        clearClip(0);
 
         QPainterPath path;
         path.addRegion(systemClip);
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index fc61905..dd5f4fc 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -240,6 +240,7 @@ public:
 
     QGLEngineShaderManager* shaderManager;
 
+    void clearClip(uint value);
     void writeClip(const QVectorPath &path, uint value);
     void updateClipScissorTest();
     void setScissor(const QRect &rect);
-- 
cgit v0.12


From 6b623c04060d274c048c0d4c6dbc5a90d1c31604 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <sroedal@trolltech.com>
Date: Tue, 6 Oct 2009 15:38:54 +0200
Subject: Switched to using stencil instead of depth buffer for clipping.

Based on Aaron Kennedy's patch. All tests are green, but when enabling
scissoring UniteClip seems to be broken atm.
---
 .../gl2paintengineex/qpaintengineex_opengl2.cpp    | 277 +++++++++++++--------
 .../gl2paintengineex/qpaintengineex_opengl2_p.h    |  17 +-
 2 files changed, 173 insertions(+), 121 deletions(-)

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 13f0079..0af8e71 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -87,6 +87,7 @@ QT_BEGIN_NAMESPACE
 
 //#define QT_GL_NO_SCISSOR_TEST
 
+static const GLuint GL_STENCIL_HIGH_BIT         = 0x80;
 static const GLuint QT_BRUSH_TEXTURE_UNIT       = 0;
 static const GLuint QT_IMAGE_TEXTURE_UNIT       = 0; //Can be the same as brush texture unit
 static const GLuint QT_MASK_TEXTURE_UNIT        = 1;
@@ -227,6 +228,7 @@ void QGLTextureGlyphCache::resizeTextureData(int width, int height)
         glPushAttrib(GL_ENABLE_BIT | GL_VIEWPORT_BIT | GL_SCISSOR_BIT);
 #endif
 
+    glDisable(GL_STENCIL_TEST);
     glDisable(GL_DEPTH_TEST);
     glDisable(GL_SCISSOR_TEST);
     glDisable(GL_BLEND);
@@ -402,11 +404,6 @@ void QGL2PaintEngineExPrivate::useSimpleShader()
         shaderManager->simpleProgram()->setUniformValue("pmvMatrix", pmvMatrix);
         simpleShaderMatrixUniformDirty = false;
     }
-
-    if (simpleShaderDepthUniformDirty) {
-        shaderManager->simpleProgram()->setUniformValue("depth", normalizedDeviceDepth(q->state()->currentClip));
-        simpleShaderDepthUniformDirty = false;
-    }
 }
 
 void QGL2PaintEngineExPrivate::updateBrushTexture()
@@ -771,6 +768,7 @@ void QGL2PaintEngineExPrivate::resetGLState()
 {
     glDisable(GL_BLEND);
     glActiveTexture(GL_TEXTURE0);
+    glDisable(GL_STENCIL_TEST);
     glDisable(GL_DEPTH_TEST);
     glDisable(GL_SCISSOR_TEST);
     glDepthMask(true);
@@ -895,10 +893,10 @@ void QGL2PaintEngineExPrivate::fill(const QVectorPath& path)
         fillStencilWithVertexArray(vertexCoordinateArray, path.hasWindingFill());
 
         // Stencil the brush onto the dest buffer
-        glStencilFunc(GL_NOTEQUAL, 0, 0xFFFF); // Pass if stencil buff value != 0
-        glStencilOp(GL_REPLACE, GL_REPLACE, GL_REPLACE);
+        glStencilFunc(GL_EQUAL, GL_STENCIL_HIGH_BIT, GL_STENCIL_HIGH_BIT); // Pass if stencil buff value != 0
+        glStencilOp(GL_KEEP, GL_ZERO, GL_ZERO);
+        glStencilMask(GL_STENCIL_HIGH_BIT);
 
-        glEnable(GL_STENCIL_TEST);
         prepareForDraw(currentBrush->isOpaque());
 
 #ifndef QT_OPENGL_ES_2
@@ -906,58 +904,137 @@ void QGL2PaintEngineExPrivate::fill(const QVectorPath& path)
             shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::Depth), zValueForRenderText());
 #endif
         composite(vertexCoordinateArray.boundingRect());
-        glDisable(GL_STENCIL_TEST);
-
         glStencilMask(0);
+
+        updateClipScissorTest();
     }
 }
 
 
 void QGL2PaintEngineExPrivate::fillStencilWithVertexArray(QGL2PEXVertexArray& vertexArray, bool useWindingFill)
 {
+#ifndef QT_OPENGL_ES_2
+    if (inRenderText) {
+        glPushAttrib(GL_ENABLE_BIT);
+        glDisable(GL_DEPTH_TEST);
+    }
+#endif
+
 //     qDebug("QGL2PaintEngineExPrivate::fillStencilWithVertexArray()");
-    glStencilMask(0xFFFF); // Enable stencil writes
+    glStencilMask(0xffff); // Enable stencil writes
 
     if (dirtyStencilRegion.intersects(currentScissorBounds)) {
-        // Clear the stencil buffer to zeros
-        glDisable(GL_STENCIL_TEST);
+        QVector<QRect> clearRegion = dirtyStencilRegion.intersected(currentScissorBounds).rects();
         glClearStencil(0); // Clear to zero
-        glClear(GL_STENCIL_BUFFER_BIT);
+        for (int i = 0; i < clearRegion.size(); ++i) {
+#ifndef QT_GL_NO_SCISSOR_TEST
+            setScissor(clearRegion.at(i));
+#endif
+            glClear(GL_STENCIL_BUFFER_BIT);
+        }
+
         dirtyStencilRegion -= currentScissorBounds;
+
+#ifndef QT_GL_NO_SCISSOR_TEST
+        updateClipScissorTest();
+#endif
     }
 
     glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); // Disable color writes
-    glStencilFunc(GL_ALWAYS, 0, 0xFFFF); // Always pass the stencil test
+    useSimpleShader();
+    glEnable(GL_STENCIL_TEST); // For some reason, this has to happen _after_ the simple shader is use()'d
 
-    // Setup the stencil op:
     if (useWindingFill) {
-        glStencilOpSeparate(GL_FRONT, GL_KEEP, GL_KEEP, GL_INCR_WRAP); // Inc. for front-facing triangle
-        glStencilOpSeparate(GL_BACK, GL_KEEP, GL_KEEP, GL_DECR_WRAP); //Dec. for back-facing "holes"
-    } else
-        glStencilOp(GL_KEEP, GL_KEEP, GL_INVERT); // Simply invert the stencil bit
+        if (q->state()->clipTestEnabled) {
+            glStencilFunc(GL_LEQUAL, GL_STENCIL_HIGH_BIT | q->state()->currentClip, ~GL_STENCIL_HIGH_BIT);
+            glStencilOp(GL_KEEP, GL_REPLACE, GL_REPLACE);
+            composite(vertexArray.boundingRect());
 
-    // No point in using a fancy gradient shader for writing into the stencil buffer!
-    useSimpleShader();
-
-    glEnable(GL_STENCIL_TEST); // For some reason, this has to happen _after_ the simple shader is use()'d
-    glDisable(GL_BLEND);
+            glStencilFunc(GL_EQUAL, GL_STENCIL_HIGH_BIT, GL_STENCIL_HIGH_BIT);
+        } else {
+            glStencilFunc(GL_ALWAYS, 0, 0xffff);
+            glStencilOp(GL_ZERO, GL_ZERO, GL_ZERO);
+            composite(vertexArray.boundingRect());
+        }
 
-#ifndef QT_OPENGL_ES_2
-    if (inRenderText) {
-        glPushAttrib(GL_ENABLE_BIT);
-        glDisable(GL_DEPTH_TEST);
+        // Inc. for front-facing triangle
+        glStencilOpSeparate(GL_FRONT, GL_KEEP, GL_INCR_WRAP, GL_INCR_WRAP);
+        //Dec. for back-facing "holes"
+        glStencilOpSeparate(GL_BACK, GL_KEEP, GL_DECR_WRAP, GL_DECR_WRAP);
+        glStencilMask(~GL_STENCIL_HIGH_BIT);
+        drawVertexArrays(vertexArray, GL_TRIANGLE_FAN);
+
+        if (q->state()->clipTestEnabled) {
+            // clear high bit of stencil outside of path
+            glStencilFunc(GL_EQUAL, GL_STENCIL_HIGH_BIT | q->state()->currentClip, ~GL_STENCIL_HIGH_BIT);
+            glStencilOp(GL_KEEP, GL_INVERT, GL_INVERT);
+            glStencilMask(GL_STENCIL_HIGH_BIT);
+            composite(vertexArray.boundingRect());
+            // reset lower bits of stencil inside path to current clip
+            glStencilFunc(GL_EQUAL, GL_STENCIL_HIGH_BIT | q->state()->currentClip, GL_STENCIL_HIGH_BIT);
+            glStencilOp(GL_KEEP, GL_REPLACE, GL_REPLACE);
+            glStencilMask(~GL_STENCIL_HIGH_BIT);
+            composite(vertexArray.boundingRect());
+        } else {
+            // set high bit of stencil inside path
+            glStencilFunc(GL_NOTEQUAL, 0, 0xffff);
+            glStencilOp(GL_KEEP, GL_INVERT, GL_INVERT);
+            glStencilMask(GL_STENCIL_HIGH_BIT);
+            composite(vertexArray.boundingRect());
+        }
+    } else {
+        glStencilMask(GL_STENCIL_HIGH_BIT);
+        glStencilOp(GL_KEEP, GL_KEEP, GL_INVERT); // Simply invert the stencil bit
+        drawVertexArrays(vertexArray, GL_TRIANGLE_FAN);
     }
-#endif
 
-    // Draw the vertecies into the stencil buffer:
-    drawVertexArrays(vertexArray, GL_TRIANGLE_FAN);
+    // Enable color writes & disable stencil writes
+    glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
 
 #ifndef QT_OPENGL_ES_2
     if (inRenderText)
         glPopAttrib();
 #endif
 
-    // Enable color writes & disable stencil writes
+}
+
+/*
+    If the maximum value in the stencil buffer is GL_STENCIL_HIGH_BIT - 1,
+    restore the stencil buffer to a pristine state.  The current clip region
+    is set to 1, and the rest to 0.
+*/
+void QGL2PaintEngineExPrivate::resetClipIfNeeded()
+{
+    if (maxClip != (GL_STENCIL_HIGH_BIT - 1))
+        return;
+
+    Q_Q(QGL2PaintEngineEx);
+
+    useSimpleShader();
+    glEnable(GL_STENCIL_TEST);
+    glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+
+    QRectF bounds = q->state()->matrix.inverted().mapRect(QRectF(0, 0, width, height));
+    QGLRect rect(bounds.left(), bounds.top(), bounds.right(), bounds.bottom());
+
+    // Set high bit on clip region
+    glStencilFunc(GL_LEQUAL, q->state()->currentClip, 0xffff);
+    glStencilOp(GL_KEEP, GL_INVERT, GL_INVERT);
+    glStencilMask(GL_STENCIL_HIGH_BIT);
+    composite(rect);
+
+    // Reset clipping to 1 and everything else to zero
+    glStencilFunc(GL_NOTEQUAL, 0x01, GL_STENCIL_HIGH_BIT);
+    glStencilOp(GL_ZERO, GL_REPLACE, GL_REPLACE);
+    glStencilMask(0xFFFF);
+    composite(rect);
+
+    q->state()->currentClip = 1;
+    q->state()->canRestoreClip = false;
+
+    maxClip = 1;
+
+    glStencilMask(0x0);
     glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
 }
 
@@ -1005,7 +1082,6 @@ bool QGL2PaintEngineExPrivate::prepareForDraw(bool srcPixelsAreOpaque)
         // The shader program has changed so mark all uniforms as dirty:
         brushUniformsDirty = true;
         shaderMatrixUniformDirty = true;
-        depthUniformDirty = true;
         opacityUniformDirty = true;
     }
 
@@ -1017,11 +1093,6 @@ bool QGL2PaintEngineExPrivate::prepareForDraw(bool srcPixelsAreOpaque)
         shaderMatrixUniformDirty = false;
     }
 
-    if (depthUniformDirty) {
-        shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::Depth), normalizedDeviceDepth(q->state()->currentClip));
-        depthUniformDirty = false;
-    }
-
     if (opacityMode == QGLEngineShaderManager::UniformOpacity && opacityUniformDirty) {
         shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::GlobalOpacity), (GLfloat)q->state()->opacity);
         opacityUniformDirty = false;
@@ -1542,8 +1613,6 @@ bool QGL2PaintEngineEx::begin(QPaintDevice *pdev)
     d->brushUniformsDirty = true;
     d->matrixDirty = true;
     d->compositionModeDirty = true;
-    d->simpleShaderDepthUniformDirty = true;
-    d->depthUniformDirty = true;
     d->opacityUniformDirty = true;
     d->needsSync = true;
     d->use_system_clip = !systemClip().isEmpty();
@@ -1564,6 +1633,7 @@ bool QGL2PaintEngineEx::begin(QPaintDevice *pdev)
     d->shaderManager = new QGLEngineShaderManager(d->ctx);
 
     if (!d->inRenderText) {
+        glDisable(GL_STENCIL_TEST);
         glDisable(GL_DEPTH_TEST);
         glDisable(GL_SCISSOR_TEST);
     }
@@ -1637,10 +1707,13 @@ void QGL2PaintEngineEx::ensureActive()
 void QGL2PaintEngineExPrivate::updateClipScissorTest()
 {
     Q_Q(QGL2PaintEngineEx);
-    if (q->state()->clipTestEnabled)
-        glEnable(GL_DEPTH_TEST);
-    else
-        glDisable(GL_DEPTH_TEST);
+    if (q->state()->clipTestEnabled) {
+        glEnable(GL_STENCIL_TEST);
+        glStencilFunc(GL_LEQUAL, q->state()->currentClip, ~GL_STENCIL_HIGH_BIT);
+    } else {
+        glDisable(GL_STENCIL_TEST);
+        glStencilFunc(GL_ALWAYS, 0, 0xffff);
+    }
 
 #ifdef QT_GL_NO_SCISSOR_TEST
     currentScissorBounds = QRect(0, 0, width, height);
@@ -1683,28 +1756,20 @@ void QGL2PaintEngineEx::clipEnabledChanged()
 {
     Q_D(QGL2PaintEngineEx);
 
-    d->simpleShaderDepthUniformDirty = true;
-    d->depthUniformDirty = true;
-
-    if (painter()->hasClipping()) {
+    if (painter()->hasClipping())
         d->regenerateClip();
-    } else {
-        if (d->use_system_clip) {
-            state()->currentClip = 1;
-        } else {
-            state()->clipTestEnabled = false;
-        }
-
-        d->updateClipScissorTest();
-    }
+    else
+        d->systemStateChanged();
 }
 
 void QGL2PaintEngineExPrivate::clearClip(uint value)
 {
-    glDepthMask(true);
-    glClearDepth(rawDepth(value));
-    glClear(GL_DEPTH_BUFFER_BIT);
-    glDepthMask(false);
+    dirtyStencilRegion -= currentScissorBounds;
+
+    glStencilMask(0xffff);
+    glClearStencil(value);
+    glClear(GL_STENCIL_BUFFER_BIT);
+    glStencilMask(0x0);
 
     q->state()->needsClipBufferClear = false;
 }
@@ -1715,48 +1780,57 @@ void QGL2PaintEngineExPrivate::writeClip(const QVectorPath &path, uint value)
 
     if (matrixDirty)
         updateMatrix();
+
+    const bool singlePass = !path.hasWindingFill()
+        && (((q->state()->currentClip == maxClip - 1) && q->state()->clipTestEnabled)
+            || q->state()->needsClipBufferClear);
+    const uint referenceClipValue = q->state()->needsClipBufferClear ? 1 : q->state()->currentClip;
+
     if (q->state()->needsClipBufferClear)
         clearClip(1);
 
-    if (path.isEmpty())
+    if (path.isEmpty()) {
+        glEnable(GL_STENCIL_TEST);
+        glStencilFunc(GL_LEQUAL, value, ~GL_STENCIL_HIGH_BIT);
         return;
+    }
 
-    glDisable(GL_BLEND);
-    glDepthMask(false);
+    if (q->state()->clipTestEnabled)
+        glStencilFunc(GL_LEQUAL, q->state()->currentClip, ~GL_STENCIL_HIGH_BIT);
+    else
+        glStencilFunc(GL_ALWAYS, 0, 0xffff);
 
     vertexCoordinateArray.clear();
     vertexCoordinateArray.addPath(path, inverseScale);
 
-    if (q->state()->clipTestEnabled)
-        glDepthFunc(GL_LEQUAL);
-    else
-        glDepthFunc(GL_ALWAYS);
-
-    glDepthMask(GL_FALSE);
-    fillStencilWithVertexArray(vertexCoordinateArray, path.hasWindingFill());
+    if (!singlePass)
+        fillStencilWithVertexArray(vertexCoordinateArray, path.hasWindingFill());
 
-    // Stencil the clip onto the clip buffer
     glColorMask(false, false, false, false);
-    glDepthMask(true);
+    glEnable(GL_STENCIL_TEST);
+    useSimpleShader();
 
-    shaderManager->simpleProgram()->setUniformValue("depth", normalizedDeviceDepth(value));
-    simpleShaderDepthUniformDirty = true;
+    if (singlePass) {
+        // Under these conditions we can set the new stencil value in a single
+        // pass, by using the current value and the "new value" as the toggles
 
-    glEnable(GL_DEPTH_TEST);
-    glDepthFunc(GL_ALWAYS);
+        glStencilFunc(GL_LEQUAL, referenceClipValue, ~GL_STENCIL_HIGH_BIT);
+        glStencilOp(GL_KEEP, GL_INVERT, GL_INVERT);
+        glStencilMask(value ^ referenceClipValue);
 
-    glStencilFunc(GL_NOTEQUAL, 0, 0xFFFF); // Pass if stencil buff value != 0
-    glStencilOp(GL_REPLACE, GL_REPLACE, GL_REPLACE);
+        drawVertexArrays(vertexCoordinateArray, GL_TRIANGLE_FAN);
+    } else {
+        glStencilFunc(GL_NOTEQUAL, value, GL_STENCIL_HIGH_BIT);
+        glStencilOp(GL_KEEP, GL_REPLACE, GL_REPLACE);
+        glStencilMask(0xffff);
 
-    glEnable(GL_STENCIL_TEST);
-    composite(vertexCoordinateArray.boundingRect());
-    glDisable(GL_STENCIL_TEST);
+        composite(vertexCoordinateArray.boundingRect());
+    }
 
-    glDepthFunc(GL_LEQUAL);
+    glStencilFunc(GL_LEQUAL, value, ~GL_STENCIL_HIGH_BIT);
     glStencilMask(0);
 
     glColorMask(true, true, true, true);
-    glDepthMask(false);
 }
 
 void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
@@ -1804,12 +1878,14 @@ void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
     case Qt::IntersectClip:
         state()->rectangleClip = state()->rectangleClip.intersected(pathRect);
         d->updateClipScissorTest();
+        d->resetClipIfNeeded();
         ++d->maxClip;
         d->writeClip(path, d->maxClip);
         state()->currentClip = d->maxClip;
         state()->clipTestEnabled = true;
         break;
     case Qt::UniteClip: {
+        d->resetClipIfNeeded();
         ++d->maxClip;
         if (state()->rectangleClip.isValid()) {
             QPainterPath path;
@@ -1846,11 +1922,6 @@ void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
     default:
         break;
     }
-
-    if (state()->clipTestEnabled) {
-        d->simpleShaderDepthUniformDirty = true;
-        d->depthUniformDirty = true;
-    }
 }
 
 void QGL2PaintEngineExPrivate::regenerateClip()
@@ -1883,29 +1954,25 @@ void QGL2PaintEngineExPrivate::systemStateChanged()
     q->state()->rectangleClip = use_system_clip ? systemClip.boundingRect() : QRect(0, 0, width, height);
     updateClipScissorTest();
 
-    if (use_system_clip) {
+    if (systemClip.numRects() == 1) {
+        if (systemClip.boundingRect() == QRect(0, 0, width, height))
+            use_system_clip = false;
 #ifndef QT_GL_NO_SCISSOR_TEST
-        if (systemClip.numRects() == 1) {
-            if (q->state()->rectangleClip == QRect(0, 0, width, height)) {
-                use_system_clip = false;
-            } else {
-                simpleShaderDepthUniformDirty = true;
-                depthUniformDirty = true;
-            }
-            return;
-        }
+        // scissoring takes care of the system clip
+        return;
 #endif
+    }
+
+    if (use_system_clip) {
         clearClip(0);
 
         QPainterPath path;
         path.addRegion(systemClip);
 
+        q->state()->currentClip = 0;
         writeClip(qtVectorPathForPath(q->state()->matrix.inverted().map(path)), 1);
-
+        q->state()->currentClip = 1;
         q->state()->clipTestEnabled = true;
-
-        simpleShaderDepthUniformDirty = true;
-        depthUniformDirty = true;
     }
 }
 
@@ -1929,8 +1996,6 @@ void QGL2PaintEngineEx::setState(QPainterState *new_state)
 
     d->matrixDirty = true;
     d->compositionModeDirty = true;
-    d->simpleShaderDepthUniformDirty = true;
-    d->depthUniformDirty = true;
     d->simpleShaderMatrixUniformDirty = true;
     d->shaderMatrixUniformDirty = true;
     d->opacityUniformDirty = true;
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index dd5f4fc..bfc6a3f 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -217,8 +217,6 @@ public:
     bool brushUniformsDirty;
     bool simpleShaderMatrixUniformDirty;
     bool shaderMatrixUniformDirty;
-    bool depthUniformDirty;
-    bool simpleShaderDepthUniformDirty;
     bool opacityUniformDirty;
 
     QRegion dirtyStencilRegion;
@@ -242,25 +240,14 @@ public:
 
     void clearClip(uint value);
     void writeClip(const QVectorPath &path, uint value);
+    void resetClipIfNeeded();
+
     void updateClipScissorTest();
     void setScissor(const QRect &rect);
     void regenerateClip();
     void systemStateChanged();
     uint use_system_clip : 1;
 
-    static inline GLfloat rawDepth(uint depth)
-    {
-        // assume at least 16 bits in the depth buffer, and
-        // use 2^15 depth levels to be safe with regard to
-        // rounding issues etc
-        return depth * (1.0f / GLfloat((1 << 15) - 1));
-    }
-
-    static inline GLfloat normalizedDeviceDepth(uint depth)
-    {
-        return 2.0f * rawDepth(depth) - 1.0f;
-    }
-
     uint location(QGLEngineShaderManager::Uniform uniform)
     {
         return shaderManager->getUniformLocation(uniform);
-- 
cgit v0.12


From d846af0de2ee2b3b76f81f2c0fd3ccceb645b511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <sroedal@trolltech.com>
Date: Mon, 28 Sep 2009 18:37:15 +0200
Subject: Added convex polygon optimization to
 QGL2PaintEngineExPrivate::fill().

---
 src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 0af8e71..70d1ae9 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -876,16 +876,15 @@ void QGL2PaintEngineExPrivate::fill(const QVectorPath& path)
     if (path.shape() == QVectorPath::RectangleHint) {
         QGLRect rect(points[0].x(), points[0].y(), points[2].x(), points[2].y());
         prepareForDraw(currentBrush->isOpaque());
-
         composite(rect);
-    }
-    else if (path.shape() == QVectorPath::EllipseHint) {
+    } else if (path.shape() == QVectorPath::EllipseHint
+             || path.shape() == QVectorPath::ConvexPolygonHint)
+    {
         vertexCoordinateArray.clear();
         vertexCoordinateArray.addPath(path, inverseScale);
         prepareForDraw(currentBrush->isOpaque());
         drawVertexArrays(vertexCoordinateArray, GL_TRIANGLE_FAN);
-    }
-    else {
+    } else {
         // The path is too complicated & needs the stencil technique
         vertexCoordinateArray.clear();
         vertexCoordinateArray.addPath(path, inverseScale);
-- 
cgit v0.12


From 9dbcdc00239abbaf899f04fc5ecc2bdb885ad08d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <sroedal@trolltech.com>
Date: Tue, 29 Sep 2009 09:03:19 +0200
Subject: Made depth tested renderText() work after stencil clipping change.

Also we should force Raster_A8 glyph format in renderText().
---
 src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 70d1ae9..ab38c24 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -912,13 +912,6 @@ void QGL2PaintEngineExPrivate::fill(const QVectorPath& path)
 
 void QGL2PaintEngineExPrivate::fillStencilWithVertexArray(QGL2PEXVertexArray& vertexArray, bool useWindingFill)
 {
-#ifndef QT_OPENGL_ES_2
-    if (inRenderText) {
-        glPushAttrib(GL_ENABLE_BIT);
-        glDisable(GL_DEPTH_TEST);
-    }
-#endif
-
 //     qDebug("QGL2PaintEngineExPrivate::fillStencilWithVertexArray()");
     glStencilMask(0xffff); // Enable stencil writes
 
@@ -943,6 +936,13 @@ void QGL2PaintEngineExPrivate::fillStencilWithVertexArray(QGL2PEXVertexArray& ve
     useSimpleShader();
     glEnable(GL_STENCIL_TEST); // For some reason, this has to happen _after_ the simple shader is use()'d
 
+#ifndef QT_OPENGL_ES_2
+    if (inRenderText) {
+        glPushAttrib(GL_ENABLE_BIT);
+        glDisable(GL_DEPTH_TEST);
+    }
+#endif
+
     if (useWindingFill) {
         if (q->state()->clipTestEnabled) {
             glStencilFunc(GL_LEQUAL, GL_STENCIL_HIGH_BIT | q->state()->currentClip, ~GL_STENCIL_HIGH_BIT);
@@ -1331,6 +1331,9 @@ void QGL2PaintEngineEx::drawTextItem(const QPointF &p, const QTextItem &textItem
                                             ? QFontEngineGlyphCache::Type(ti.fontEngine->glyphFormat)
                                             : d->glyphCacheType;
 
+    if (d->inRenderText)
+        glyphType = QFontEngineGlyphCache::Raster_A8;
+
     if (glyphType == QFontEngineGlyphCache::Raster_RGBMask
         && state()->composition_mode != QPainter::CompositionMode_Source
         && state()->composition_mode != QPainter::CompositionMode_SourceOver)
-- 
cgit v0.12


From 96b047f0f27674ee402ab3624dbb906346ac1847 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Tue, 6 Oct 2009 16:46:43 +0200
Subject: QScriptContext::parentContext: don't skip unessecary frames

Calling QScriptValue::call doesn't create a fake frame.
We can detect a real fake frame as it does not have a callee.

Task-number: QT-2270
Reviewed-by: Kent Hansen
---
 src/script/api/qscriptengine.cpp                 | 2 +-
 tests/auto/qscriptcontext/tst_qscriptcontext.cpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 863ac30..b1f36be 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -993,7 +993,7 @@ void QScriptEnginePrivate::setDefaultPrototype(int metaTypeId, JSC::JSValue prot
 
 QScriptContext *QScriptEnginePrivate::contextForFrame(JSC::ExecState *frame)
 {
-    if (frame && frame->callerFrame()->hasHostCallFrameFlag()
+    if (frame && frame->callerFrame()->hasHostCallFrameFlag() && !frame->callee()
         && frame->callerFrame()->removeHostCallFrameFlag() == QScript::scriptEngineFromExec(frame)->globalExec()) {
         //skip the "fake" context created in Interpreter::execute.
         frame = frame->callerFrame()->removeHostCallFrameFlag();
diff --git a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
index 89f8a5cf..a0af214 100644
--- a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
+++ b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
@@ -1235,7 +1235,6 @@ void tst_QScriptContext::parentContextCallee_QT2270()
     QScriptValue fun = engine.evaluate("(function() { return getParentContextCallee(); })");
     QVERIFY(fun.isFunction());
     QScriptValue callee = fun.call();
-    QEXPECT_FAIL("", "QT-2270: Incorrect parentContext() returned for native call", Abort);
     QVERIFY(callee.equals(fun));
 }
 
-- 
cgit v0.12


From 27c2df52128e32c785239dbc9322a4b7beb0078c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <sroedal@trolltech.com>
Date: Tue, 29 Sep 2009 11:00:57 +0200
Subject: Changed GL 2 engine render text implementation to use glDepthRange().

This frees all the current dependencies on the depth uniform.
---
 .../gl2paintengineex/qpaintengineex_opengl2.cpp    | 41 ++++++++++++++--------
 .../gl2paintengineex/qpaintengineex_opengl2_p.h    |  5 ++-
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index ab38c24..859ffe1 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -898,11 +898,14 @@ void QGL2PaintEngineExPrivate::fill(const QVectorPath& path)
 
         prepareForDraw(currentBrush->isOpaque());
 
-#ifndef QT_OPENGL_ES_2
         if (inRenderText)
-            shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::Depth), zValueForRenderText());
-#endif
+            prepareDepthRangeForRenderText();
+
         composite(vertexCoordinateArray.boundingRect());
+
+        if (inRenderText)
+            restoreDepthRangeForRenderText();
+
         glStencilMask(0);
 
         updateClipScissorTest();
@@ -1138,7 +1141,7 @@ void QGL2PaintEngineExPrivate::drawVertexArrays(QGL2PEXVertexArray& vertexArray,
     glDisableVertexAttribArray(QT_VERTEX_COORDS_ATTR);
 }
 
-float QGL2PaintEngineExPrivate::zValueForRenderText() const
+void QGL2PaintEngineExPrivate::prepareDepthRangeForRenderText()
 {
 #ifndef QT_OPENGL_ES_2
     // Get the z translation value from the model view matrix and
@@ -1146,9 +1149,19 @@ float QGL2PaintEngineExPrivate::zValueForRenderText() const
     // and z-far = 1, which is used in QGLWidget::renderText()
     GLdouble model[4][4];
     glGetDoublev(GL_MODELVIEW_MATRIX, &model[0][0]);
-    return -2 * model[3][2] - 1;
-#else
-    return 0;
+    float deviceZ = -2 * model[3][2] - 1;
+
+    glGetFloatv(GL_DEPTH_RANGE, depthRange);
+    float windowZ = depthRange[0] + (deviceZ + 1) * 0.5 * (depthRange[1] - depthRange[0]);
+
+    glDepthRange(windowZ, windowZ);
+#endif
+}
+
+void QGL2PaintEngineExPrivate::restoreDepthRangeForRenderText()
+{
+#ifndef QT_OPENGL_ES_2
+    glDepthRange(depthRange[0], depthRange[1]);
 #endif
 }
 
@@ -1406,6 +1419,9 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(const QPointF &p, QFontEngineGly
     QBrush pensBrush = q->state()->pen.brush();
     setBrush(&pensBrush);
 
+    if (inRenderText)
+        prepareDepthRangeForRenderText();
+
     if (glyphType == QFontEngineGlyphCache::Raster_RGBMask) {
 
         // Subpixel antialiasing without gamma correction
@@ -1458,10 +1474,6 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(const QPointF &p, QFontEngineGly
             glBindTexture(GL_TEXTURE_2D, cache->texture());
             updateTextureFilter(GL_TEXTURE_2D, GL_REPEAT, false);
 
-#ifndef QT_OPENGL_ES_2
-            if (inRenderText)
-                shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::Depth), zValueForRenderText());
-#endif
             shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::MaskTexture), QT_MASK_TEXTURE_UNIT);
             glDrawArrays(GL_TRIANGLES, 0, 6 * glyphs.size());
 
@@ -1492,12 +1504,11 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(const QPointF &p, QFontEngineGly
     glBindTexture(GL_TEXTURE_2D, cache->texture());
     updateTextureFilter(GL_TEXTURE_2D, GL_REPEAT, false);
 
-#ifndef QT_OPENGL_ES_2
-    if (inRenderText)
-        shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::Depth), zValueForRenderText());
-#endif
     shaderManager->currentProgram()->setUniformValue(location(QGLEngineShaderManager::MaskTexture), QT_MASK_TEXTURE_UNIT);
     glDrawArrays(GL_TRIANGLES, 0, 6 * glyphs.size());
+
+    if (inRenderText)
+        restoreDepthRangeForRenderText();
 }
 
 void QGL2PaintEngineEx::drawPixmaps(const QDrawPixmaps::Data *drawingData, int dataCount, const QPixmap &pixmap, QDrawPixmaps::DrawingHints hints)
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index bfc6a3f..662911f 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -197,7 +197,8 @@ public:
 
     inline void useSimpleShader();
 
-    float zValueForRenderText() const;
+    void prepareDepthRangeForRenderText();
+    void restoreDepthRangeForRenderText();
 
     static QGLEngineShaderManager* shaderManagerForEngine(QGL2PaintEngineEx *engine) { return engine->d_func()->shaderManager; }
 
@@ -258,6 +259,8 @@ public:
     bool needsSync;
     bool inRenderText;
 
+    GLfloat depthRange[2];
+
     float textureInvertedY;
 
     QScopedPointer<QPixmapFilter> convolutionFilter;
-- 
cgit v0.12


From 092c773b95b1f126d36ab7c918fb098ddad6cae3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <sroedal@trolltech.com>
Date: Tue, 29 Sep 2009 09:42:02 +0200
Subject: Optimized restore() in GL 2 paint engine.

Keep track of what state actually changed so we don't have to set all
the uniforms as dirty etc.

Reviewed-by: Trond
---
 .../gl2paintengineex/qpaintengineex_opengl2.cpp    | 50 ++++++++++++++++------
 .../gl2paintengineex/qpaintengineex_opengl2_p.h    | 15 ++++---
 2 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 859ffe1..5875124 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1224,6 +1224,7 @@ void QGL2PaintEngineEx::opacityChanged()
 {
 //    qDebug("QGL2PaintEngineEx::opacityChanged()");
     Q_D(QGL2PaintEngineEx);
+    state()->opacityChanged = true;
 
     Q_ASSERT(d->shaderManager);
     d->brushUniformsDirty = true;
@@ -1234,11 +1235,14 @@ void QGL2PaintEngineEx::compositionModeChanged()
 {
 //     qDebug("QGL2PaintEngineEx::compositionModeChanged()");
     Q_D(QGL2PaintEngineEx);
+    state()->compositionModeChanged = true;
     d->compositionModeDirty = true;
 }
 
 void QGL2PaintEngineEx::renderHintsChanged()
 {
+    state()->renderHintsChanged = true;
+
 #if !defined(QT_OPENGL_ES_2)
     if ((state()->renderHints & QPainter::Antialiasing)
         || (state()->renderHints & QPainter::HighQualityAntialiasing))
@@ -1257,6 +1261,7 @@ void QGL2PaintEngineEx::transformChanged()
 {
     Q_D(QGL2PaintEngineEx);
     d->matrixDirty = true;
+    state()->matrixChanged = true;
 }
 
 
@@ -1713,6 +1718,7 @@ void QGL2PaintEngineEx::ensureActive()
         d->transferMode(BrushDrawingMode);
         glViewport(0, 0, d->width, d->height);
         d->needsSync = false;
+        d->shaderManager->setDirty();
         setState(state());
     }
 }
@@ -1769,6 +1775,8 @@ void QGL2PaintEngineEx::clipEnabledChanged()
 {
     Q_D(QGL2PaintEngineEx);
 
+    state()->clipChanged = true;
+
     if (painter()->hasClipping())
         d->regenerateClip();
     else
@@ -1851,6 +1859,8 @@ void QGL2PaintEngineEx::clip(const QVectorPath &path, Qt::ClipOperation op)
 //     qDebug("QGL2PaintEngineEx::clip()");
     Q_D(QGL2PaintEngineEx);
 
+    state()->clipChanged = true;
+
     ensureActive();
 
     if (op == Qt::ReplaceClip) {
@@ -1947,6 +1957,8 @@ void QGL2PaintEngineExPrivate::systemStateChanged()
 {
     Q_Q(QGL2PaintEngineEx);
 
+    q->state()->clipChanged = true;
+
     if (systemClip.isEmpty()) {
         use_system_clip = false;
     } else {
@@ -2005,21 +2017,28 @@ void QGL2PaintEngineEx::setState(QPainterState *new_state)
         return;
     }
 
-    renderHintsChanged();
+    if (old_state == s || s->renderHintsChanged)
+        renderHintsChanged();
 
-    d->matrixDirty = true;
-    d->compositionModeDirty = true;
-    d->simpleShaderMatrixUniformDirty = true;
-    d->shaderMatrixUniformDirty = true;
-    d->opacityUniformDirty = true;
+    if (old_state == s || s->matrixChanged) {
+        d->matrixDirty = true;
+        d->simpleShaderMatrixUniformDirty = true;
+        d->shaderMatrixUniformDirty = true;
+    }
 
-    d->shaderManager->setDirty();
+    if (old_state == s || s->compositionModeChanged)
+        d->compositionModeDirty = true;
 
-    if (old_state && old_state != s && old_state->canRestoreClip) {
-        d->updateClipScissorTest();
-        glDepthFunc(GL_LEQUAL);
-    } else {
-        d->regenerateClip();
+    if (old_state == s || s->opacityChanged)
+        d->opacityUniformDirty = true;
+
+    if (old_state == s || s->clipChanged) {
+        if (old_state && old_state != s && old_state->canRestoreClip) {
+            d->updateClipScissorTest();
+            glDepthFunc(GL_LEQUAL);
+        } else {
+            d->regenerateClip();
+        }
     }
 }
 
@@ -2036,6 +2055,12 @@ QPainterState *QGL2PaintEngineEx::createState(QPainterState *orig) const
     else
         s = new QOpenGL2PaintEngineState(*static_cast<QOpenGL2PaintEngineState *>(orig));
 
+    s->matrixChanged = false;
+    s->compositionModeChanged = false;
+    s->opacityChanged = false;
+    s->renderHintsChanged = false;
+    s->clipChanged = false;
+
     d->last_created_state = s;
     return s;
 }
@@ -2051,7 +2076,6 @@ QOpenGL2PaintEngineState::QOpenGL2PaintEngineState(QOpenGL2PaintEngineState &oth
 {
     needsClipBufferClear = other.needsClipBufferClear;
     clipTestEnabled = other.clipTestEnabled;
-    scissorTestEnabled = other.scissorTestEnabled;
     currentClip = other.currentClip;
     canRestoreClip = other.canRestoreClip;
     rectangleClip = other.rectangleClip;
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index 662911f..28c972e 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -82,13 +82,16 @@ public:
     QOpenGL2PaintEngineState();
     ~QOpenGL2PaintEngineState();
 
-    bool needsClipBufferClear;
+    uint needsClipBufferClear : 1;
+    uint clipTestEnabled : 1;
+    uint canRestoreClip : 1;
+    uint matrixChanged : 1;
+    uint compositionModeChanged : 1;
+    uint opacityChanged : 1;
+    uint renderHintsChanged : 1;
+    uint clipChanged : 1;
+    uint currentClip : 8;
 
-    bool clipTestEnabled;
-    bool scissorTestEnabled;
-    uint currentClip;
-
-    bool canRestoreClip;
     QRect rectangleClip;
 };
 
-- 
cgit v0.12


From 28cdb974cce58111a19e8691f4dd929a5c9f74ea Mon Sep 17 00:00:00 2001
From: Shane Kearns <shane.kearns@sosco.com>
Date: Tue, 6 Oct 2009 18:05:17 +0200
Subject: Prevent OK key being processed twice in file dialog (keypad
 navigation)

All key events were being explicitly ignored by the file dialog when key
navigation is enabled, and it doesn't have edit focus.
When a file is opened by pressing the OK key, there is no edit focus
after returning from accept() and the OK key can propagate outside the
modal dialog.
This causes the parent widget to receive and act upon the OK key as well
which makes problems - e.g. in QTBUG-4724, recursive menu activation

Task-number: QTBUG-4724
Reviewed-by: Alessandro Portale
---
 src/gui/dialogs/qfiledialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index eb5fed0..eab842f 100644
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -3149,7 +3149,7 @@ void QFileDialogListView::keyPressEvent(QKeyEvent *e)
         QListView::keyPressEvent(e);
     }
 #ifdef QT_KEYPAD_NAVIGATION
-    if ((QApplication::navigationMode() == Qt::NavigationModeKeypadTabOrder
+    else if ((QApplication::navigationMode() == Qt::NavigationModeKeypadTabOrder
          || QApplication::navigationMode() == Qt::NavigationModeKeypadDirectional)
          && !hasEditFocus()) {
          e->ignore();
-- 
cgit v0.12


From ffeb69003a9c676064cdf7ec099a02c2fbcf2ad3 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Tue, 6 Oct 2009 20:46:39 +0200
Subject: API review: change function name to setUseSystemConfiguration.

Requested-By: Volker Hilsheimer
---
 src/network/kernel/qnetworkproxy.cpp | 4 ++--
 src/network/kernel/qnetworkproxy.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index 7f40134..2d5c74f 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -1166,12 +1166,12 @@ QNetworkProxyFactory::~QNetworkProxyFactory()
     sets an application-wide proxy factory. For this reason, this method
     is mutually exclusive with setApplicationProxyFactory: calling
     setApplicationProxyFactory overrides the use of the system-wide proxy,
-    and calling setUseSystemConfigurationEnabled overrides any
+    and calling setUseSystemConfiguration overrides any
     application proxy or proxy factory that was previously set.
 
     \since 4.6
 */
-void QNetworkProxyFactory::setUseSystemConfigurationEnabled(bool enable)
+void QNetworkProxyFactory::setUseSystemConfiguration(bool enable)
 {
     if (enable) {
         setApplicationProxyFactory(new QSystemConfigurationProxyFactory);
diff --git a/src/network/kernel/qnetworkproxy.h b/src/network/kernel/qnetworkproxy.h
index 6357c64..68bd6fd 100644
--- a/src/network/kernel/qnetworkproxy.h
+++ b/src/network/kernel/qnetworkproxy.h
@@ -171,7 +171,7 @@ public:
 
     virtual QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery &query = QNetworkProxyQuery()) = 0;
 
-    static void setUseSystemConfigurationEnabled(bool enable);
+    static void setUseSystemConfiguration(bool enable);
     static void setApplicationProxyFactory(QNetworkProxyFactory *factory);
     static QList<QNetworkProxy> proxyForQuery(const QNetworkProxyQuery &query);
     static QList<QNetworkProxy> systemProxyForQuery(const QNetworkProxyQuery &query = QNetworkProxyQuery());
-- 
cgit v0.12


From 9cf618492d1c89b489bf7e52e45c9577f9d52c1c Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Tue, 6 Oct 2009 20:47:52 +0200
Subject: Autotest: use port 12346 instead of 1, to ensure that it's not a
 firewall issue

Also check if we're not timing out instead of being able to fail.
---
 tests/auto/networkselftest/tst_networkselftest.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/auto/networkselftest/tst_networkselftest.cpp b/tests/auto/networkselftest/tst_networkselftest.cpp
index c6a3119..e927a7a 100644
--- a/tests/auto/networkselftest/tst_networkselftest.cpp
+++ b/tests/auto/networkselftest/tst_networkselftest.cpp
@@ -335,10 +335,15 @@ void tst_NetworkSelfTest::dnsResolution()
 
 void tst_NetworkSelfTest::serverReachability()
 {
-    // check that we get a proper error connecting to port 1
+    // check that we get a proper error connecting to port 12346
     QTcpSocket socket;
-    socket.connectToHost(QtNetworkSettings::serverName(), 1);
+    socket.connectToHost(QtNetworkSettings::serverName(), 12346);
+
+    QTime timer;
+    timer.start();
     socket.waitForConnected(10000);
+    QVERIFY2(timer.elapsed() < 9900, "Connection to closed port timed out instead of refusing, something is wrong");
+
     QVERIFY2(socket.state() == QAbstractSocket::UnconnectedState, "Socket connected unexpectedly!");
     QVERIFY2(socket.error() == QAbstractSocket::ConnectionRefusedError,
              QString("Could not reach server: %1").arg(socket.errorString()).toLocal8Bit());
-- 
cgit v0.12


From d47b7e6d0adcd675ba9da11818b3fa9acc3caff5 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Tue, 6 Oct 2009 20:51:18 +0200
Subject: Autotest: add a few more tests, with IP address and actual hostname

---
 tests/auto/networkselftest/tst_networkselftest.cpp | 78 ++++++++++++++++++++--
 1 file changed, 74 insertions(+), 4 deletions(-)

diff --git a/tests/auto/networkselftest/tst_networkselftest.cpp b/tests/auto/networkselftest/tst_networkselftest.cpp
index e927a7a..5a82f28 100644
--- a/tests/auto/networkselftest/tst_networkselftest.cpp
+++ b/tests/auto/networkselftest/tst_networkselftest.cpp
@@ -46,6 +46,10 @@
 class tst_NetworkSelfTest: public QObject
 {
     Q_OBJECT
+    QHostAddress cachedIpAddress;
+public:
+    QHostAddress serverIpAddress();
+
 private slots:
     void hostTest();
     void dnsResolution_data();
@@ -303,6 +307,16 @@ static void netChat(int port, const QList<Chat> &chat)
     }
 }
 
+QHostAddress tst_NetworkSelfTest::serverIpAddress()
+{
+    if (cachedIpAddress.protocol() == QAbstractSocket::UnknownNetworkLayerProtocol) {
+        // need resolving
+        QHostInfo resolved = QHostInfo::fromName(QtNetworkSettings::serverName());
+        cachedIpAddress = resolved.addresses().first();
+    }
+    return cachedIpAddress;
+}
+
 void tst_NetworkSelfTest::hostTest()
 {
     // this is a localhost self-test
@@ -331,6 +345,9 @@ void tst_NetworkSelfTest::dnsResolution()
     QHostInfo resolved = QHostInfo::fromName(hostName);
     QVERIFY2(resolved.error() == QHostInfo::NoError,
              QString("Failed to resolve hostname %1: %2").arg(hostName, resolved.errorString()).toLocal8Bit());
+    QVERIFY2(resolved.addresses().size() > 0, "Got 0 addresses for server IP");
+
+    cachedIpAddress = resolved.addresses().first();
 }
 
 void tst_NetworkSelfTest::serverReachability()
@@ -469,7 +486,18 @@ void tst_NetworkSelfTest::httpsServer()
 void tst_NetworkSelfTest::httpProxy()
 {
     netChat(3128, QList<Chat>()
-            // proxy GET
+            // proxy GET by IP
+            << Chat::send("GET http://" + serverIpAddress().toString().toLatin1() + "/ HTTP/1.0\r\n"
+                          "Host: " + QtNetworkSettings::serverName().toLatin1() + "\r\n"
+                          "Proxy-connection: close\r\n"
+                          "\r\n")
+            << Chat::expect("HTTP/1.")
+            << Chat::discardUntil(" ")
+            << Chat::expect("200 ")
+            << Chat::DiscardUntilDisconnect
+
+            // proxy GET by hostname
+            << Chat::Reconnect
             << Chat::send("GET http://" + QtNetworkSettings::serverName().toLatin1() + "/ HTTP/1.0\r\n"
                           "Host: " + QtNetworkSettings::serverName().toLatin1() + "\r\n"
                           "Proxy-connection: close\r\n"
@@ -479,7 +507,17 @@ void tst_NetworkSelfTest::httpProxy()
             << Chat::expect("200 ")
             << Chat::DiscardUntilDisconnect
 
-            // proxy CONNECT
+            // proxy CONNECT by IP
+            << Chat::Reconnect
+            << Chat::send("CONNECT " + serverIpAddress().toString().toLatin1() + ":21 HTTP/1.0\r\n"
+                          "\r\n")
+            << Chat::expect("HTTP/1.")
+            << Chat::discardUntil(" ")
+            << Chat::expect("200 ")
+            << Chat::discardUntil("\r\n\r\n")
+            << ftpChat()
+
+            // proxy CONNECT by hostname
             << Chat::Reconnect
             << Chat::send("CONNECT " + QtNetworkSettings::serverName().toLatin1() + ":21 HTTP/1.0\r\n"
                           "\r\n")
@@ -487,7 +525,8 @@ void tst_NetworkSelfTest::httpProxy()
             << Chat::discardUntil(" ")
             << Chat::expect("200 ")
             << Chat::discardUntil("\r\n\r\n")
-            << ftpChat());
+            << ftpChat()
+            );
 }
 
 void tst_NetworkSelfTest::httpProxyBasicAuth()
@@ -540,11 +579,22 @@ static const char handshakeAuthPassword[] = "\5\1\2\1\12qsockstest\10password";
 static const char handshakeOkPasswdAuth[] = "\5\2\1\0";
 static const char handshakeAuthNotOk[] = "\5\377";
 static const char connect1[] = "\5\1\0\1\177\0\0\1\0\25"; // Connect IPv4 127.0.0.1 port 21
+static const char connect1a[] = "\5\1\0\1"; // just "Connect to IPv4"
+static const char connect1b[] = "\0\25"; // just "port 21"
 static const char connect2[] = "\5\1\0\3\11localhost\0\25"; // Connect hostname localhost 21
+static const char connect2a[] = "\5\1\0\3"; // just "Connect to hostname"
 static const char connected[] = "\5\0\0";
 
+#define QBA(x) (QByteArray::fromRawData(x, -1 + sizeof(x)))
+
 void tst_NetworkSelfTest::socks5Proxy()
 {
+    union {
+        char buf[4];
+        quint32 data;
+    } ip4Address;
+    ip4Address.data = qToBigEndian(serverIpAddress().toIPv4Address());
+
     netChat(1080, QList<Chat>()
             // IP address connection
             << Chat::send(QByteArray(handshakeNoAuth, -1 + sizeof handshakeNoAuth))
@@ -555,7 +605,17 @@ void tst_NetworkSelfTest::socks5Proxy()
             << Chat::skipBytes(6) // the server's local address and port
             << ftpChat()
 
-            // hostname connection
+            // connect by IP
+            << Chat::Reconnect
+            << Chat::send(QByteArray(handshakeNoAuth, -1 + sizeof handshakeNoAuth))
+            << Chat::expect(QByteArray(handshakeOkNoAuth, -1 + sizeof handshakeOkNoAuth))
+            << Chat::send(QBA(connect1a) + QByteArray::fromRawData(ip4Address.buf, 4) + QBA(connect1b))
+            << Chat::expect(QByteArray(connected, -1 + sizeof connected))
+            << Chat::expect("\1") // IPv4 address following
+            << Chat::skipBytes(6) // the server's local address and port
+            << ftpChat()
+
+            // connect to "localhost" by hostname
             << Chat::Reconnect
             << Chat::send(QByteArray(handshakeNoAuth, -1 + sizeof handshakeNoAuth))
             << Chat::expect(QByteArray(handshakeOkNoAuth, -1 + sizeof handshakeOkNoAuth))
@@ -564,6 +624,16 @@ void tst_NetworkSelfTest::socks5Proxy()
             << Chat::expect("\1") // IPv4 address following
             << Chat::skipBytes(6) // the server's local address and port
             << ftpChat()
+
+            // connect to server by its official name
+            << Chat::Reconnect
+            << Chat::send(QByteArray(handshakeNoAuth, -1 + sizeof handshakeNoAuth))
+            << Chat::expect(QByteArray(handshakeOkNoAuth, -1 + sizeof handshakeOkNoAuth))
+            << Chat::send(QBA(connect2a) + char(QtNetworkSettings::serverName().size()) + QtNetworkSettings::serverName().toLatin1() + QBA(connect1b))
+            << Chat::expect(QByteArray(connected, -1 + sizeof connected))
+            << Chat::expect("\1") // IPv4 address following
+            << Chat::skipBytes(6) // the server's local address and port
+            << ftpChat()
             );
 }
 
-- 
cgit v0.12


From 2d2b4e8a77a30449d8b4ebc88979b3aff45a8222 Mon Sep 17 00:00:00 2001
From: Iain <qt-info@nokia.com>
Date: Tue, 6 Oct 2009 21:34:10 +0200
Subject: Update EABI DEF files for Symbian OS

Reviewed-by: TrustMe
---
 src/s60installs/eabi/QtCoreu.def    |  60 ++++++++++++---------
 src/s60installs/eabi/QtGuiu.def     | 105 +++++++++++++++++++++++++++++++++---
 src/s60installs/eabi/QtNetworku.def |   4 +-
 src/s60installs/eabi/QtScriptu.def  |  26 ++++++---
 src/s60installs/eabi/QtSqlu.def     |   2 +-
 5 files changed, 157 insertions(+), 40 deletions(-)

diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def
index d795a62..dda89fd 100644
--- a/src/s60installs/eabi/QtCoreu.def
+++ b/src/s60installs/eabi/QtCoreu.def
@@ -3206,11 +3206,11 @@ EXPORTS
 	_ZN12QEasingCurveD1Ev @ 3205 NONAME
 	_ZN12QEasingCurveD2Ev @ 3206 NONAME
 	_ZN12QEasingCurveaSERKS_ @ 3207 NONAME
-	_ZN12QSignalEventC1EP7QObjectiRK5QListI8QVariantE @ 3208 NONAME
-	_ZN12QSignalEventC2EP7QObjectiRK5QListI8QVariantE @ 3209 NONAME
-	_ZN12QSignalEventD0Ev @ 3210 NONAME
-	_ZN12QSignalEventD1Ev @ 3211 NONAME
-	_ZN12QSignalEventD2Ev @ 3212 NONAME
+	_ZN12QSignalEventC1EP7QObjectiRK5QListI8QVariantE @ 3208 NONAME ABSENT
+	_ZN12QSignalEventC2EP7QObjectiRK5QListI8QVariantE @ 3209 NONAME ABSENT
+	_ZN12QSignalEventD0Ev @ 3210 NONAME ABSENT
+	_ZN12QSignalEventD1Ev @ 3211 NONAME ABSENT
+	_ZN12QSignalEventD2Ev @ 3212 NONAME ABSENT
 	_ZN13QHistoryState11qt_metacallEN11QMetaObject4CallEiPPv @ 3213 NONAME
 	_ZN13QHistoryState11qt_metacastEPKc @ 3214 NONAME
 	_ZN13QHistoryState14setHistoryTypeENS_11HistoryTypeE @ 3215 NONAME
@@ -3234,7 +3234,7 @@ EXPORTS
 	_ZN13QStateMachine12endMicrostepEP6QEvent @ 3233 NONAME
 	_ZN13QStateMachine14beginMicrostepEP6QEvent @ 3234 NONAME
 	_ZN13QStateMachine16staticMetaObjectE @ 3235 NONAME DATA 16
-	_ZN13QStateMachine17postInternalEventEP6QEvent @ 3236 NONAME
+	_ZN13QStateMachine17postInternalEventEP6QEvent @ 3236 NONAME ABSENT
 	_ZN13QStateMachine19addDefaultAnimationEP18QAbstractAnimation @ 3237 NONAME
 	_ZN13QStateMachine20endSelectTransitionsEP6QEvent @ 3238 NONAME
 	_ZN13QStateMachine20setAnimationsEnabledEb @ 3239 NONAME
@@ -3249,7 +3249,7 @@ EXPORTS
 	_ZN13QStateMachine7startedEv @ 3248 NONAME
 	_ZN13QStateMachine7stoppedEv @ 3249 NONAME
 	_ZN13QStateMachine8addStateEP14QAbstractState @ 3250 NONAME
-	_ZN13QStateMachine9postEventEP6QEventi @ 3251 NONAME
+	_ZN13QStateMachine9postEventEP6QEventi @ 3251 NONAME ABSENT
 	_ZN13QStateMachineC1EP7QObject @ 3252 NONAME
 	_ZN13QStateMachineC1ER20QStateMachinePrivateP7QObject @ 3253 NONAME
 	_ZN13QStateMachineC2EP7QObject @ 3254 NONAME
@@ -3265,11 +3265,11 @@ EXPORTS
 	_ZN13QStatePrivateD1Ev @ 3264 NONAME
 	_ZN13QStatePrivateD2Ev @ 3265 NONAME
 	_ZN13QUnifiedTimer8instanceEv @ 3266 NONAME
-	_ZN13QWrappedEventC1EP7QObjectP6QEvent @ 3267 NONAME
-	_ZN13QWrappedEventC2EP7QObjectP6QEvent @ 3268 NONAME
-	_ZN13QWrappedEventD0Ev @ 3269 NONAME
-	_ZN13QWrappedEventD1Ev @ 3270 NONAME
-	_ZN13QWrappedEventD2Ev @ 3271 NONAME
+	_ZN13QWrappedEventC1EP7QObjectP6QEvent @ 3267 NONAME ABSENT
+	_ZN13QWrappedEventC2EP7QObjectP6QEvent @ 3268 NONAME ABSENT
+	_ZN13QWrappedEventD0Ev @ 3269 NONAME ABSENT
+	_ZN13QWrappedEventD1Ev @ 3270 NONAME ABSENT
+	_ZN13QWrappedEventD2Ev @ 3271 NONAME ABSENT
 	_ZN14QAbstractState11qt_metacallEN11QMetaObject4CallEiPPv @ 3272 NONAME
 	_ZN14QAbstractState11qt_metacastEPKc @ 3273 NONAME
 	_ZN14QAbstractState16staticMetaObjectE @ 3274 NONAME DATA 16
@@ -3299,7 +3299,7 @@ EXPORTS
 	_ZN15QPauseAnimation11qt_metacastEPKc @ 3298 NONAME
 	_ZN15QPauseAnimation11setDurationEi @ 3299 NONAME
 	_ZN15QPauseAnimation16staticMetaObjectE @ 3300 NONAME DATA 16
-	_ZN15QPauseAnimation17updateCurrentTimeEi @ 3301 NONAME ABSENT
+	_ZN15QPauseAnimation17updateCurrentTimeEi @ 3301 NONAME
 	_ZN15QPauseAnimation5eventEP6QEvent @ 3302 NONAME
 	_ZN15QPauseAnimationC1EP7QObject @ 3303 NONAME
 	_ZN15QPauseAnimationC1EiP7QObject @ 3304 NONAME
@@ -3361,7 +3361,7 @@ EXPORTS
 	_ZN17QVariantAnimation13setStartValueERK8QVariant @ 3360 NONAME
 	_ZN17QVariantAnimation14setEasingCurveERK12QEasingCurve @ 3361 NONAME
 	_ZN17QVariantAnimation16staticMetaObjectE @ 3362 NONAME DATA 16
-	_ZN17QVariantAnimation17updateCurrentTimeEi @ 3363 NONAME ABSENT
+	_ZN17QVariantAnimation17updateCurrentTimeEi @ 3363 NONAME
 	_ZN17QVariantAnimation20registerInterpolatorEPF8QVariantPKvS2_fEi @ 3364 NONAME
 	_ZN17QVariantAnimation5eventEP6QEvent @ 3365 NONAME
 	_ZN17QVariantAnimationC2EP7QObject @ 3366 NONAME
@@ -3430,7 +3430,7 @@ EXPORTS
 	_ZN20QStateMachinePrivate14isDescendantOfEPK14QAbstractStateS2_ @ 3429 NONAME
 	_ZN20QStateMachinePrivate15applyPropertiesERK5QListIP19QAbstractTransitionERKS0_IP14QAbstractStateESA_ @ 3430 NONAME
 	_ZN20QStateMachinePrivate15properAncestorsEPK14QAbstractStatePK6QState @ 3431 NONAME
-	_ZN20QStateMachinePrivate15scheduleProcessEv @ 3432 NONAME
+	_ZN20QStateMachinePrivate15scheduleProcessEv @ 3432 NONAME ABSENT
 	_ZN20QStateMachinePrivate16addStatesToEnterEP14QAbstractStateP6QStateR4QSetIS1_ES6_ @ 3433 NONAME
 	_ZN20QStateMachinePrivate16removeStartStateEv @ 3434 NONAME
 	_ZN20QStateMachinePrivate17stateExitLessThanEP14QAbstractStateS1_ @ 3435 NONAME
@@ -3470,7 +3470,7 @@ EXPORTS
 	_ZN23QParallelAnimationGroup11updateStateEN18QAbstractAnimation5StateES1_ @ 3469 NONAME
 	_ZN23QParallelAnimationGroup15updateDirectionEN18QAbstractAnimation9DirectionE @ 3470 NONAME
 	_ZN23QParallelAnimationGroup16staticMetaObjectE @ 3471 NONAME DATA 16
-	_ZN23QParallelAnimationGroup17updateCurrentTimeEi @ 3472 NONAME ABSENT
+	_ZN23QParallelAnimationGroup17updateCurrentTimeEi @ 3472 NONAME
 	_ZN23QParallelAnimationGroup5eventEP6QEvent @ 3473 NONAME
 	_ZN23QParallelAnimationGroupC1EP7QObject @ 3474 NONAME
 	_ZN23QParallelAnimationGroupC1ER30QParallelAnimationGroupPrivateP7QObject @ 3475 NONAME
@@ -3498,7 +3498,7 @@ EXPORTS
 	_ZN25QSequentialAnimationGroup13insertPauseAtEii @ 3497 NONAME
 	_ZN25QSequentialAnimationGroup15updateDirectionEN18QAbstractAnimation9DirectionE @ 3498 NONAME
 	_ZN25QSequentialAnimationGroup16staticMetaObjectE @ 3499 NONAME DATA 16
-	_ZN25QSequentialAnimationGroup17updateCurrentTimeEi @ 3500 NONAME ABSENT
+	_ZN25QSequentialAnimationGroup17updateCurrentTimeEi @ 3500 NONAME
 	_ZN25QSequentialAnimationGroup23currentAnimationChangedEP18QAbstractAnimation @ 3501 NONAME
 	_ZN25QSequentialAnimationGroup5eventEP6QEvent @ 3502 NONAME
 	_ZN25QSequentialAnimationGroup8addPauseEi @ 3503 NONAME
@@ -3648,11 +3648,11 @@ EXPORTS
 	_ZNK8QVariant7toFloatEPb @ 3647 NONAME
 	_ZNK9QTimeLine11easingCurveEv @ 3648 NONAME
 	_ZTI11QFinalState @ 3649 NONAME
-	_ZTI12QSignalEvent @ 3650 NONAME
+	_ZTI12QSignalEvent @ 3650 NONAME ABSENT
 	_ZTI13QHistoryState @ 3651 NONAME
 	_ZTI13QStateMachine @ 3652 NONAME
 	_ZTI13QStatePrivate @ 3653 NONAME
-	_ZTI13QWrappedEvent @ 3654 NONAME
+	_ZTI13QWrappedEvent @ 3654 NONAME ABSENT
 	_ZTI14QAbstractState @ 3655 NONAME
 	_ZTI15QAnimationGroup @ 3656 NONAME
 	_ZTI15QPauseAnimation @ 3657 NONAME
@@ -3671,11 +3671,11 @@ EXPORTS
 	_ZTI26QAbstractTransitionPrivate @ 3670 NONAME
 	_ZTI6QState @ 3671 NONAME
 	_ZTV11QFinalState @ 3672 NONAME
-	_ZTV12QSignalEvent @ 3673 NONAME
+	_ZTV12QSignalEvent @ 3673 NONAME ABSENT
 	_ZTV13QHistoryState @ 3674 NONAME
 	_ZTV13QStateMachine @ 3675 NONAME
 	_ZTV13QStatePrivate @ 3676 NONAME
-	_ZTV13QWrappedEvent @ 3677 NONAME
+	_ZTV13QWrappedEvent @ 3677 NONAME ABSENT
 	_ZTV14QAbstractState @ 3678 NONAME
 	_ZTV15QAnimationGroup @ 3679 NONAME
 	_ZTV15QPauseAnimation @ 3680 NONAME
@@ -3820,8 +3820,18 @@ EXPORTS
 	_ZTV37QNonContiguousByteDeviceByteArrayImpl @ 3819 NONAME ABSENT ; #<VT>#
 	_ZTV38QNonContiguousByteDeviceRingBufferImpl @ 3820 NONAME ABSENT ; #<VT>#
 	_Zls6QDebugRK8QMargins @ 3821 NONAME
-	_ZN15QPauseAnimation17updateCurrentTimeEv @ 3822 NONAME
-	_ZN17QVariantAnimation17updateCurrentTimeEv @ 3823 NONAME
-	_ZN23QParallelAnimationGroup17updateCurrentTimeEv @ 3824 NONAME
-	_ZN25QSequentialAnimationGroup17updateCurrentTimeEv @ 3825 NONAME
+	_ZN15QPauseAnimation17updateCurrentTimeEv @ 3822 NONAME ABSENT
+	_ZN17QVariantAnimation17updateCurrentTimeEv @ 3823 NONAME ABSENT
+	_ZN23QParallelAnimationGroup17updateCurrentTimeEv @ 3824 NONAME ABSENT
+	_ZN25QSequentialAnimationGroup17updateCurrentTimeEv @ 3825 NONAME ABSENT
+	_ZN11QDataStream25setFloatingPointPrecisionENS_22FloatingPointPrecisionE @ 3826 NONAME
+	_ZN13QStateMachine16postDelayedEventEP6QEventi @ 3827 NONAME
+	_ZN13QStateMachine18cancelDelayedEventEi @ 3828 NONAME
+	_ZN13QStateMachine9postEventEP6QEventNS_13EventPriorityE @ 3829 NONAME
+	_ZN20QStateMachinePrivate13processEventsENS_19EventProcessingModeE @ 3830 NONAME
+	_ZN20QStateMachinePrivate19handleFilteredEventEP7QObjectP6QEvent @ 3831 NONAME
+	_ZN20QStateMachinePrivate22cancelAllDelayedEventsEv @ 3832 NONAME
+	_ZN4QUrl13fromUserInputERK7QString @ 3833 NONAME
+	_ZNK11QDataStream22floatingPointPrecisionEv @ 3834 NONAME
+	qt_sine_table @ 3835 NONAME DATA 1024
 
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index aad8b68..581d3bc 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -11631,7 +11631,7 @@ EXPORTS
 	qt_pixmap_cleanup_hook @ 11630 NONAME DATA 4
 	qt_pixmap_cleanup_hook_64 @ 11631 NONAME DATA 4
 	qt_tab_all_widgets @ 11632 NONAME DATA 1
-	_Z17qDrawBorderPixmapP8QPainterRK5QRectRK8QMarginsRK7QPixmapS3_S6_RK10QTileRules @ 11633 NONAME
+	_Z17qDrawBorderPixmapP8QPainterRK5QRectRK8QMarginsRK7QPixmapS3_S6_RK10QTileRules @ 11633 NONAME ABSENT
 	_Z17qHasPixmapTextureRK6QBrush @ 11634 NONAME
 	_Z22qt_setQtEnableTestFontb @ 11635 NONAME
 	_Z25qt_translateRawTouchEventP7QWidgetN11QTouchEvent10DeviceTypeERK5QListINS1_10TouchPointEE @ 11636 NONAME
@@ -11824,7 +11824,7 @@ EXPORTS
 	_ZN14QPaintEngineExC2Ev @ 11823 NONAME
 	_ZN14QWidgetPrivate10allWidgetsE @ 11824 NONAME DATA 4
 	_ZN14QWidgetPrivate13setWSGeometryEbRK5QRect @ 11825 NONAME
-	_ZN14QWidgetPrivate33handleSymbianDeferredFocusChangedEv @ 11826 NONAME
+	_ZN14QWidgetPrivate33handleSymbianDeferredFocusChangedEv @ 11826 NONAME ABSENT
 	_ZN15QDockAreaLayout13separatorMoveERK5QListIiERK6QPointS6_ @ 11827 NONAME
 	_ZN15QDockAreaLayout4infoERK5QListIiE @ 11828 NONAME
 	_ZN15QDockAreaLayout4itemERK5QListIiE @ 11829 NONAME
@@ -12984,9 +12984,9 @@ EXPORTS
 	_ZN16QS60MainDocumentD0Ev @ 12983 NONAME
 	_ZN16QS60MainDocumentD1Ev @ 12984 NONAME
 	_ZN16QS60MainDocumentD2Ev @ 12985 NONAME
-	_ZN17QPixmapBlurFilter11setBlurHintENS_8BlurHintE @ 12986 NONAME
-	_ZN19QGraphicsBlurEffect11setBlurHintENS_8BlurHintE @ 12987 NONAME
-	_ZN19QGraphicsBlurEffect15blurHintChangedENS_8BlurHintE @ 12988 NONAME
+	_ZN17QPixmapBlurFilter11setBlurHintENS_8BlurHintE @ 12986 NONAME ABSENT
+	_ZN19QGraphicsBlurEffect11setBlurHintENS_8BlurHintE @ 12987 NONAME ABSENT
+	_ZN19QGraphicsBlurEffect15blurHintChangedENS_8BlurHintE @ 12988 NONAME ABSENT
 	_ZN19QS60MainApplication15CreateDocumentLEv @ 12989 NONAME
 	_ZN19QS60MainApplicationC1Ev @ 12990 NONAME
 	_ZN19QS60MainApplicationC2Ev @ 12991 NONAME
@@ -13001,7 +13001,7 @@ EXPORTS
 	_ZNK19QGraphicsBlurEffect8blurHintEv @ 13000 NONAME
 	_ZNK19QS60MainApplication16ResourceFileNameEv @ 13001 NONAME
 	_ZNK19QS60MainApplication9AppDllUidEv @ 13002 NONAME
-	_ZNK21QGraphicsAnchorLayout12hasConflictsEv @ 13003 NONAME
+	_ZNK21QGraphicsAnchorLayout12hasConflictsEv @ 13003 NONAME ABSENT
 	_ZNK7QPixmap17toSymbianRSgImageEv @ 13004 NONAME
 	_ZTI15QSoftKeyManager @ 13005 NONAME
 	_ZTV15QSoftKeyManager @ 13006 NONAME
@@ -13009,4 +13009,97 @@ EXPORTS
 	_ZThn24_N13QS60MainAppUi15DynInitMenuBarLEiP11CEikMenuBar @ 13008 NONAME
 	_ZThn24_N13QS60MainAppUi16DynInitMenuPaneLEiP12CEikMenuPane @ 13009 NONAME
 	_ZThn88_N13QS60MainAppUi26HandleStatusPaneSizeChangeEv @ 13010 NONAME
+	_Z12qDrawPixmapsP8QPainterPKN12QDrawPixmaps4DataEiRK7QPixmap6QFlagsINS1_11DrawingHintEE @ 13011 NONAME
+	_Z17qDrawBorderPixmapP8QPainterRK5QRectRK8QMarginsRK7QPixmapS3_S6_RK10QTileRules6QFlagsIN17QDrawBorderPixmap11DrawingHintEE @ 13012 NONAME
+	_ZN10QImageData6createEPhiiiN6QImage6FormatEb @ 13013 NONAME
+	_ZN10QImageData6createERK5QSizeN6QImage6FormatEi @ 13014 NONAME
+	_ZN10QImageDataC1Ev @ 13015 NONAME
+	_ZN10QImageDataC2Ev @ 13016 NONAME
+	_ZN10QImageDataD1Ev @ 13017 NONAME
+	_ZN10QImageDataD2Ev @ 13018 NONAME
+	_ZN13QGraphicsItem11stackBeforeEPKS_ @ 13019 NONAME
+	_ZN13QGraphicsItem16setPanelModalityENS_13PanelModalityE @ 13020 NONAME
+	_ZN14QPaintEngineEx11drawPixmapsEPKN12QDrawPixmaps4DataEiRK7QPixmap6QFlagsINS0_11DrawingHintEE @ 13021 NONAME
+	_ZN14QWidgetPrivate21activateSymbianWindowEv @ 13022 NONAME
+	_ZN17QAbstractItemView20setDefaultDropActionEN2Qt10DropActionE @ 13023 NONAME
+	_ZN17QPixmapBlurFilter11setBlurHintEN2Qt10RenderHintE @ 13024 NONAME
+	_ZN19QApplicationPrivate16load_testabilityE @ 13025 NONAME DATA 1
+	_ZN19QGraphicsBlurEffect11setBlurHintEN2Qt10RenderHintE @ 13026 NONAME
+	_ZN19QGraphicsBlurEffect15blurHintChangedEN2Qt10RenderHintE @ 13027 NONAME
+	_ZN20QGraphicsBloomEffect11qt_metacallEN11QMetaObject4CallEiPPv @ 13028 NONAME
+	_ZN20QGraphicsBloomEffect11qt_metacastEPKc @ 13029 NONAME
+	_ZN20QGraphicsBloomEffect11setBlurHintEN2Qt10RenderHintE @ 13030 NONAME
+	_ZN20QGraphicsBloomEffect11setStrengthEf @ 13031 NONAME
+	_ZN20QGraphicsBloomEffect13setBlurRadiusEi @ 13032 NONAME
+	_ZN20QGraphicsBloomEffect13setBrightnessEi @ 13033 NONAME
+	_ZN20QGraphicsBloomEffect15blurHintChangedEN2Qt10RenderHintE @ 13034 NONAME
+	_ZN20QGraphicsBloomEffect15strengthChangedEf @ 13035 NONAME
+	_ZN20QGraphicsBloomEffect16staticMetaObjectE @ 13036 NONAME DATA 16
+	_ZN20QGraphicsBloomEffect17blurRadiusChangedEi @ 13037 NONAME
+	_ZN20QGraphicsBloomEffect17brightnessChangedEi @ 13038 NONAME
+	_ZN20QGraphicsBloomEffect19getStaticMetaObjectEv @ 13039 NONAME
+	_ZN20QGraphicsBloomEffect4drawEP8QPainterP21QGraphicsEffectSource @ 13040 NONAME
+	_ZN20QGraphicsBloomEffectC1EP7QObject @ 13041 NONAME
+	_ZN20QGraphicsBloomEffectC2EP7QObject @ 13042 NONAME
+	_ZN20QGraphicsBloomEffectD0Ev @ 13043 NONAME
+	_ZN20QGraphicsBloomEffectD1Ev @ 13044 NONAME
+	_ZN20QGraphicsBloomEffectD2Ev @ 13045 NONAME
+	_ZN20QGraphicsItemPrivate28ensureSequentialSiblingIndexEv @ 13046 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate11solveMinMaxE5QListIP18QSimplexConstraintE9GraphPathPfS5_ @ 13047 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate12oppositeEdgeEN2Qt11AnchorPointE @ 13048 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate12removeAnchorEP12AnchorVertexS1_ @ 13049 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate12removeVertexEP19QGraphicsLayoutItemN2Qt11AnchorPointE @ 13050 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate13getGraphPartsENS_11OrientationE @ 13051 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate13removeAnchorsEP19QGraphicsLayoutItem @ 13052 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate13setAnchorSizeEP10AnchorDataPKf @ 13053 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate13simplifyGraphENS_11OrientationE @ 13054 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate14solvePreferredE5QListIP18QSimplexConstraintE @ 13055 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate15calculateGraphsENS_11OrientationE @ 13056 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate15calculateGraphsEv @ 13057 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate15createItemEdgesEP19QGraphicsLayoutItem @ 13058 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate15edgeOrientationEN2Qt11AnchorPointE @ 13059 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate15interpolateEdgeEP12AnchorVertexP10AnchorDataNS_11OrientationE @ 13060 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate16addAnchor_helperEP19QGraphicsLayoutItemN2Qt11AnchorPointES1_S3_P10AnchorData @ 13061 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate17addInternalVertexEP19QGraphicsLayoutItemN2Qt11AnchorPointE @ 13062 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate17createLayoutEdgesEv @ 13063 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate17deleteLayoutEdgesEv @ 13064 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate18setItemsGeometriesERK6QRectF @ 13065 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate19createCenterAnchorsEP19QGraphicsLayoutItemN2Qt11AnchorPointE @ 13066 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate19removeAnchor_helperEP12AnchorVertexS1_ @ 13067 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate19removeCenterAnchorsEP19QGraphicsLayoutItemN2Qt11AnchorPointEb @ 13068 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate20constraintsFromPathsENS_11OrientationE @ 13069 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate20correctEdgeDirectionERP19QGraphicsLayoutItemRN2Qt11AnchorPointES2_S5_ @ 13070 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate20removeInternalVertexEP19QGraphicsLayoutItemN2Qt11AnchorPointE @ 13071 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate22restoreSimplifiedGraphENS_11OrientationE @ 13072 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate22simplifyGraphIterationENS_11OrientationE @ 13073 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate23removeCenterConstraintsEP19QGraphicsLayoutItemNS_11OrientationE @ 13074 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate23setupEdgesInterpolationENS_11OrientationE @ 13075 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate24calculateVertexPositionsENS_11OrientationE @ 13076 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate24constraintsFromSizeHintsERK5QListIP10AnchorDataE @ 13077 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate24interpolateParallelEdgesEP12AnchorVertexP18ParallelAnchorDataNS_11OrientationE @ 13078 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate26interpolateSequentialEdgesEP12AnchorVertexP20SequentialAnchorDataNS_11OrientationE @ 13079 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate27setAnchorSizeHintsFromItemsENS_11OrientationE @ 13080 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate9addAnchorEP19QGraphicsLayoutItemN2Qt11AnchorPointES1_S3_Pf @ 13081 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate9findPathsENS_11OrientationE @ 13082 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivate9getAnchorEP19QGraphicsLayoutItemN2Qt11AnchorPointES1_S3_ @ 13083 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivateC1Ev @ 13084 NONAME
+	_ZN28QGraphicsAnchorLayoutPrivateC2Ev @ 13085 NONAME
+	_ZNK10QImageData19checkForAlphaPixelsEv @ 13086 NONAME
+	_ZNK10QImageData9doImageIOEPK6QImageP12QImageWriteri @ 13087 NONAME
+	_ZNK13QGraphicsItem13panelModalityEv @ 13088 NONAME
+	_ZNK13QGraphicsItem21isBlockedByModalPanelEPPS_ @ 13089 NONAME
+	_ZNK17QAbstractItemView17defaultDropActionEv @ 13090 NONAME
+	_ZNK20QGraphicsBloomEffect10blurRadiusEv @ 13091 NONAME
+	_ZNK20QGraphicsBloomEffect10brightnessEv @ 13092 NONAME
+	_ZNK20QGraphicsBloomEffect10metaObjectEv @ 13093 NONAME
+	_ZNK20QGraphicsBloomEffect15boundingRectForERK6QRectF @ 13094 NONAME
+	_ZNK20QGraphicsBloomEffect8blurHintEv @ 13095 NONAME
+	_ZNK20QGraphicsBloomEffect8strengthEv @ 13096 NONAME
+	_ZNK28QGraphicsAnchorLayoutPrivate10anchorSizeEPK10AnchorDataPfS3_S3_ @ 13097 NONAME
+	_ZNK28QGraphicsAnchorLayoutPrivate12hasConflictsEv @ 13098 NONAME
+	_ZNK28QGraphicsAnchorLayoutPrivate16effectiveSpacingENS_11OrientationE @ 13099 NONAME
+	_ZTI20QGraphicsBloomEffect @ 13100 NONAME
+	_ZTI28QGraphicsAnchorLayoutPrivate @ 13101 NONAME
+	_ZTV20QGraphicsBloomEffect @ 13102 NONAME
+	_ZTV28QGraphicsAnchorLayoutPrivate @ 13103 NONAME
 
diff --git a/src/s60installs/eabi/QtNetworku.def b/src/s60installs/eabi/QtNetworku.def
index 5188872..ab4562c 100644
--- a/src/s60installs/eabi/QtNetworku.def
+++ b/src/s60installs/eabi/QtNetworku.def
@@ -1353,7 +1353,7 @@ EXPORTS
 	_ZN10QSslSocket22connectToHostEncryptedERK7QStringtS2_6QFlagsIN9QIODevice12OpenModeFlagEE @ 1352 NONAME
 	_ZN13QNetworkReply15ignoreSslErrorsERK5QListI9QSslErrorE @ 1353 NONAME
 	_ZN15QAbstractSocket12socketOptionENS_12SocketOptionE @ 1354 NONAME
-	_ZN15QAbstractSocket15setSocketOptionENS_12SocketOptionE8QVariant @ 1355 NONAME
+	_ZN15QAbstractSocket15setSocketOptionENS_12SocketOptionERK8QVariant @ 1355 NONAME
 	_ZN17QHttpNetworkReply15ignoreSslErrorsERK5QListI9QSslErrorE @ 1356 NONAME
 	_ZN17QHttpNetworkReply16dataSendProgressExx @ 1357 NONAME
 	_ZN17QHttpNetworkReply7readAnyEv @ 1358 NONAME
@@ -1379,7 +1379,7 @@ EXPORTS
 	_ZN19QHttpNetworkRequest20setPipeliningAllowedEb @ 1378 NONAME
 	_ZN19QNativeSocketEngine19getStaticMetaObjectEv @ 1379 NONAME
 	_ZN19QSocks5SocketEngine19getStaticMetaObjectEv @ 1380 NONAME
-	_ZN20QNetworkProxyFactory32setUseSystemConfigurationEnabledEb @ 1381 NONAME
+	_ZN20QNetworkProxyFactory25setUseSystemConfigurationEb @ 1381 NONAME
 	_ZN21QAbstractNetworkCache19getStaticMetaObjectEv @ 1382 NONAME
 	_ZN21QAbstractSocketEngine19getStaticMetaObjectEv @ 1383 NONAME
 	_ZN21QNetworkAccessManager19getStaticMetaObjectEv @ 1384 NONAME
diff --git a/src/s60installs/eabi/QtScriptu.def b/src/s60installs/eabi/QtScriptu.def
index 40d3577..cca0a2a 100644
--- a/src/s60installs/eabi/QtScriptu.def
+++ b/src/s60installs/eabi/QtScriptu.def
@@ -1,6 +1,6 @@
 EXPORTS
 	_Z14qScriptConnectP7QObjectPKcRK12QScriptValueS5_ @ 1 NONAME
-	_Z14qt_scriptToXmlRK7QStringi @ 2 NONAME
+	_Z14qt_scriptToXmlRK7QStringi @ 2 NONAME ABSENT
 	_Z17qScriptDisconnectP7QObjectPKcRK12QScriptValueS5_ @ 3 NONAME
 	_ZN11QScriptableC1Ev @ 4 NONAME
 	_ZN11QScriptableC2Ev @ 5 NONAME
@@ -189,11 +189,11 @@ EXPORTS
 	_ZN24QScriptSyntaxCheckResultD1Ev @ 188 NONAME
 	_ZN24QScriptSyntaxCheckResultD2Ev @ 189 NONAME
 	_ZN24QScriptSyntaxCheckResultaSERKS_ @ 190 NONAME
-	_ZN25QScriptEngineAgentPrivateC1Ev @ 191 NONAME
-	_ZN25QScriptEngineAgentPrivateC2Ev @ 192 NONAME
-	_ZN25QScriptEngineAgentPrivateD0Ev @ 193 NONAME
-	_ZN25QScriptEngineAgentPrivateD1Ev @ 194 NONAME
-	_ZN25QScriptEngineAgentPrivateD2Ev @ 195 NONAME
+	_ZN25QScriptEngineAgentPrivateC1Ev @ 191 NONAME ABSENT
+	_ZN25QScriptEngineAgentPrivateC2Ev @ 192 NONAME ABSENT
+	_ZN25QScriptEngineAgentPrivateD0Ev @ 193 NONAME ABSENT
+	_ZN25QScriptEngineAgentPrivateD1Ev @ 194 NONAME ABSENT
+	_ZN25QScriptEngineAgentPrivateD2Ev @ 195 NONAME ABSENT
 	_ZN28QScriptClassPropertyIteratorC2ERK12QScriptValue @ 196 NONAME
 	_ZN28QScriptClassPropertyIteratorC2ERK12QScriptValueR35QScriptClassPropertyIteratorPrivate @ 197 NONAME
 	_ZN28QScriptClassPropertyIteratorD0Ev @ 198 NONAME
@@ -586,4 +586,18 @@ EXPORTS
 	_ZThn8_N22QScriptExtensionPluginD1Ev @ 585 NONAME
 	_ZlsR11QDataStreamRK18QScriptContextInfo @ 586 NONAME
 	_ZrsR11QDataStreamR18QScriptContextInfo @ 587 NONAME
+	_Z22qt_script_isJITEnabledv @ 588 NONAME
+	_ZN12QScriptValueC1EP19QScriptValuePrivate @ 589 NONAME
+	_ZN12QScriptValueC2EP19QScriptValuePrivate @ 590 NONAME
+	_ZN13QScriptEngine19getStaticMetaObjectEv @ 591 NONAME
+	_ZN22QScriptExtensionPlugin19getStaticMetaObjectEv @ 592 NONAME
+	_ZN25QScriptEngineAgentPrivate11atStatementERKN5QTJSC17DebuggerCallFrameEiii @ 593 NONAME
+	_ZN25QScriptEngineAgentPrivate11returnEventERKN5QTJSC17DebuggerCallFrameEii @ 594 NONAME
+	_ZN25QScriptEngineAgentPrivate12evaluateStopERKN5QTJSC7JSValueEi @ 595 NONAME
+	_ZN25QScriptEngineAgentPrivate12functionExitERKN5QTJSC7JSValueEi @ 596 NONAME
+	_ZN25QScriptEngineAgentPrivate14exceptionCatchERKN5QTJSC17DebuggerCallFrameEi @ 597 NONAME
+	_ZN25QScriptEngineAgentPrivate14exceptionThrowERKN5QTJSC17DebuggerCallFrameEib @ 598 NONAME
+	_ZN25QScriptEngineAgentPrivate18didReachBreakpointERKN5QTJSC17DebuggerCallFrameEiii @ 599 NONAME
+	_ZN25QScriptEngineAgentPrivate6attachEv @ 600 NONAME
+	_ZN25QScriptEngineAgentPrivate6detachEv @ 601 NONAME
 
diff --git a/src/s60installs/eabi/QtSqlu.def b/src/s60installs/eabi/QtSqlu.def
index 99f0d00..4d4791a 100644
--- a/src/s60installs/eabi/QtSqlu.def
+++ b/src/s60installs/eabi/QtSqlu.def
@@ -236,7 +236,7 @@ EXPORTS
 	_ZN9QSqlFieldC1ERKS_ @ 235 NONAME
 	_ZN9QSqlFieldC1Ev @ 236 NONAME ABSENT
 	_ZN9QSqlFieldC2ERK7QString @ 237 NONAME ABSENT
-	_ZN9QSqlFieldC2ERK7QStringN8QVariant4TypeE @ 238 NONAME ABSENT
+	_ZN9QSqlFieldC2ERK7QStringN8QVariant4TypeE @ 238 NONAME
 	_ZN9QSqlFieldC2ERKS_ @ 239 NONAME
 	_ZN9QSqlFieldC2Ev @ 240 NONAME ABSENT
 	_ZN9QSqlFieldD1Ev @ 241 NONAME
-- 
cgit v0.12


From 3865912d4a6c31a4981e1831e2af8d59f3eb4ac0 Mon Sep 17 00:00:00 2001
From: Kurt Korbatits <kurt.korbatits@nokia.com>
Date: Wed, 7 Oct 2009 08:40:14 +1000
Subject: Fixed thread lockup in win32 backend for QAudioOutput. -Was not
 closing the WaveOut on cleanup, fixed. -Was emitting signal in critical
 section, fixed.

Reviewed-by:Bill King
---
 src/multimedia/audio/qaudiooutput_win32_p.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/multimedia/audio/qaudiooutput_win32_p.cpp b/src/multimedia/audio/qaudiooutput_win32_p.cpp
index ef4bf0e..2c4a1c2 100644
--- a/src/multimedia/audio/qaudiooutput_win32_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_win32_p.cpp
@@ -189,7 +189,6 @@ void QAudioOutputPrivate::stop()
 {
     if(deviceState == QAudio::StopState)
         return;
-    deviceState = QAudio::StopState;
     close();
     if(!pullMode && audioSource) {
         delete audioSource;
@@ -465,13 +464,15 @@ bool QAudioOutputPrivate::deviceReady()
         } else if(l == 0) {
             bytesAvailable = bytesFree();
 
+            int check = 0;
             EnterCriticalSection(&waveOutCriticalSection);
-            if(waveFreeBlockCount == buffer_size/period_size) {
+            check = waveFreeBlockCount;
+            LeaveCriticalSection(&waveOutCriticalSection);
+            if(check == buffer_size/period_size) {
                 errorState = QAudio::UnderrunError;
                 deviceState = QAudio::IdleState;
                 emit stateChanged(deviceState);
             }
-            LeaveCriticalSection(&waveOutCriticalSection);
 
         } else if(l < 0) {
             bytesAvailable = bytesFree();
-- 
cgit v0.12


From 8b7e766aa42739df8998ec9c1e94087b965ac87b Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Wed, 7 Oct 2009 15:18:50 +1000
Subject: Fix build error introduced in change ffeb6900.

Change ffeb6900 renamed a function but didn't rename all the calls.

Reviewed-by: Trust Me
---
 examples/webkit/fancybrowser/mainwindow.cpp | 2 +-
 examples/webkit/googlechat/main.cpp         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/webkit/fancybrowser/mainwindow.cpp b/examples/webkit/fancybrowser/mainwindow.cpp
index 2adfa20..a3293b8 100644
--- a/examples/webkit/fancybrowser/mainwindow.cpp
+++ b/examples/webkit/fancybrowser/mainwindow.cpp
@@ -56,7 +56,7 @@ MainWindow::MainWindow()
     file.close();
 //! [1]
 
-    QNetworkProxyFactory::setUseSystemConfigurationEnabled(true);
+    QNetworkProxyFactory::setUseSystemConfiguration(true);
 
 //! [2]
     view = new QWebView(this);
diff --git a/examples/webkit/googlechat/main.cpp b/examples/webkit/googlechat/main.cpp
index fd08114..6b5e11f 100644
--- a/examples/webkit/googlechat/main.cpp
+++ b/examples/webkit/googlechat/main.cpp
@@ -47,7 +47,7 @@ int main(int argc, char * argv[])
 {
     QApplication app(argc, argv);
 
-    QNetworkProxyFactory::setUseSystemConfigurationEnabled(true);
+    QNetworkProxyFactory::setUseSystemConfiguration(true);
 
     GoogleChat *chat = new GoogleChat;
     chat->show();
-- 
cgit v0.12


From 087b624c616bc1b3dbe850a74d0737fffc08bec2 Mon Sep 17 00:00:00 2001
From: Kent Hansen <khansen@trolltech.com>
Date: Wed, 7 Oct 2009 09:55:11 +0200
Subject: implement qHash function for QScriptString

Reviewed-by: Olivier Goffart
---
 src/script/api/qscriptstring.cpp               |  8 ++++++++
 src/script/api/qscriptstring.h                 |  2 ++
 src/script/api/qscriptstring_p.h               |  7 +++++++
 tests/auto/qscriptstring/tst_qscriptstring.cpp | 17 +++++++++++++++++
 4 files changed, 34 insertions(+)

diff --git a/src/script/api/qscriptstring.cpp b/src/script/api/qscriptstring.cpp
index 65bd818..c2362da 100644
--- a/src/script/api/qscriptstring.cpp
+++ b/src/script/api/qscriptstring.cpp
@@ -195,4 +195,12 @@ QScriptString::operator QString() const
     return toString();
 }
 
+uint qHash(const QScriptString &key)
+{
+    QScriptStringPrivate *d = QScriptStringPrivate::get(key);
+    if (!d)
+        return 0;
+    return qHash(d->identifier.ustring().rep());
+}
+
 QT_END_NAMESPACE
diff --git a/src/script/api/qscriptstring.h b/src/script/api/qscriptstring.h
index e0a808e..40d156c 100644
--- a/src/script/api/qscriptstring.h
+++ b/src/script/api/qscriptstring.h
@@ -76,6 +76,8 @@ private:
     Q_DECLARE_PRIVATE(QScriptString)
 };
 
+Q_SCRIPT_EXPORT uint qHash(const QScriptString &key);
+
 QT_END_NAMESPACE
 
 QT_END_HEADER
diff --git a/src/script/api/qscriptstring_p.h b/src/script/api/qscriptstring_p.h
index 25ce702..d3bb47d 100644
--- a/src/script/api/qscriptstring_p.h
+++ b/src/script/api/qscriptstring_p.h
@@ -73,6 +73,8 @@ public:
     inline ~QScriptStringPrivate();
     static inline void init(QScriptString &q, QScriptStringPrivate *d);
 
+    static inline QScriptStringPrivate *get(const QScriptString &q);
+
     inline void detachFromEngine();
 
     QBasicAtomicInt ref;
@@ -101,6 +103,11 @@ inline void QScriptStringPrivate::init(QScriptString &q, QScriptStringPrivate *d
     q.d_ptr = d;
 }
 
+inline QScriptStringPrivate *QScriptStringPrivate::get(const QScriptString &q)
+{
+    return const_cast<QScriptStringPrivate*>(q.d_func());
+}
+
 inline void QScriptStringPrivate::detachFromEngine()
 {
     engine = 0;
diff --git a/tests/auto/qscriptstring/tst_qscriptstring.cpp b/tests/auto/qscriptstring/tst_qscriptstring.cpp
index 0968b61..e1a4bc1 100644
--- a/tests/auto/qscriptstring/tst_qscriptstring.cpp
+++ b/tests/auto/qscriptstring/tst_qscriptstring.cpp
@@ -58,6 +58,7 @@ public:
 
 private slots:
     void test();
+    void hash();
 };
 
 tst_QScriptString::tst_QScriptString()
@@ -138,5 +139,21 @@ void tst_QScriptString::test()
     }
 }
 
+void tst_QScriptString::hash()
+{
+    QScriptEngine engine;
+    QHash<QScriptString, int> stringToInt;
+    QScriptString foo = engine.toStringHandle("foo");
+    QScriptString bar = engine.toStringHandle("bar");
+    QVERIFY(!stringToInt.contains(foo));
+    for (int i = 0; i < 1000000; ++i)
+        stringToInt.insert(foo, 123);
+    QCOMPARE(stringToInt.value(foo), 123);
+    QVERIFY(!stringToInt.contains(bar));
+    stringToInt.insert(bar, 456);
+    QCOMPARE(stringToInt.value(bar), 456);
+    QCOMPARE(stringToInt.value(foo), 123);
+}
+
 QTEST_MAIN(tst_QScriptString)
 #include "tst_qscriptstring.moc"
-- 
cgit v0.12


From c14455b78904f25e724cd928652c49f9583c6aa0 Mon Sep 17 00:00:00 2001
From: ninerider <qt-info@nokia.com>
Date: Wed, 7 Oct 2009 10:50:36 +0200
Subject: Whe STL is not enabled, most of the test threads failed to start.

A second worker function that was not defined in the descendant classes
was used in these cases. The missing worker functions have been
supplied and some tests skipped that depend on iterator ranges.

Reviewed-by: Joerg
---
 .../tst_qtconcurrentiteratekernel.cpp              | 27 +++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp b/tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
index a5748ae..3b1e18f 100644
--- a/tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
+++ b/tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
@@ -66,6 +66,7 @@ struct TestIterator
 };
 
 #include <qiterator.h>
+#ifndef QT_NO_STL
 namespace std {
 template <>
 struct iterator_traits<TestIterator>
@@ -79,6 +80,7 @@ int distance(TestIterator &a, TestIterator &b)
 }
 
 }
+#endif
 
 
 #include <qtconcurrentiteratekernel.h>
@@ -112,7 +114,7 @@ class PrintFor : public IterateKernel<TestIterator, void>
 {
 public:
     PrintFor(TestIterator begin, TestIterator end) : IterateKernel<TestIterator, void>(begin, end) {iterations = 0; }
-    inline bool runIterations(TestIterator/*beginIterator*/, int begin, int end, void *)
+    bool runIterations(TestIterator/*beginIterator*/, int begin, int end, void *)
     {
         iterations.fetchAndAddRelaxed(end - begin);
 #ifdef PRINT
@@ -120,6 +122,11 @@ public:
 #endif
         return false;
     }
+    bool runIteration(TestIterator it, int index , void *result)
+    { 
+        return runIterations(it, index, index + 1, result);
+    }
+
 };
 
 class SleepPrintFor : public IterateKernel<TestIterator, void>
@@ -135,6 +142,10 @@ public:
 #endif
         return false;
     }
+    bool runIteration(TestIterator it, int index , void *result)
+    { 
+        return runIterations(it, index, index + 1, result);
+    }
 };
 
 
@@ -165,6 +176,10 @@ public:
         counter.fetchAndAddRelaxed(end - begin);
         return false;
     }
+    bool runIteration(TestIterator it, int index , void *result)
+    { 
+        return runIterations(it, index, index + 1, result);
+    }
 };
 
 void tst_iteratekernel::stresstest()
@@ -215,6 +230,10 @@ public:
 
         return false;
     }
+    bool runIteration(TestIterator it, int index , void *result)
+    { 
+        return runIterations(it, index, index + 1, result);
+    }
 
     bool shouldThrottleThread()
     {
@@ -254,6 +273,9 @@ public:
 
 void tst_iteratekernel::blockSize()
 {
+#ifdef QT_NO_STL
+    QSKIP("Missing stl iterators prevent correct block size calculation", SkipAll);
+#endif
     const int expectedMinimumBlockSize = 1024 / QThread::idealThreadCount();
     BlockSizeRecorder(0, 10000).startBlocking();
     if (peakBlockSize < expectedMinimumBlockSize)
@@ -276,6 +298,9 @@ public:
 
 void tst_iteratekernel::multipleResults()
 {
+#ifdef QT_NO_STL
+    QSKIP("Missing stl iterators prevent correct summation", SkipAll);
+#endif
     QFuture<int> f = startThreadEngine(new MultipleResultsFor(0, 10)).startAsynchronously();
     QCOMPARE(f.results().count() , 10);
     QCOMPARE(f.resultAt(0), 0);
-- 
cgit v0.12


From d6d0b2ef5223b4a40e8907104eb1d9e827507a42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= <jan-arve.saether@nokia.com>
Date: Wed, 7 Oct 2009 10:51:26 +0200
Subject: Cosmetic fixes to the previous patches.

There is only one change in the actual code here, and it simply removes
an unnecessary initialization of hasSize in the ctors of the composite
anchors.
---
 src/gui/graphicsview/qgraphicsanchorlayout_p.cpp | 68 +++++++++++++-----------
 src/gui/graphicsview/qgraphicsanchorlayout_p.h   |  2 -
 src/gui/graphicsview/qsimplex_p.cpp              |  4 +-
 src/gui/graphicsview/qsimplex_p.h                |  4 +-
 4 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
index 87f5aa0..34071cc 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -2409,47 +2409,51 @@ bool QGraphicsAnchorLayoutPrivate::solvePreferred(QList<QSimplexConstraint *> co
     return feasible;
 }
 
-/*! Calculate the "expanding" keyframe
+/*!
+    \internal
+    Calculate the "expanding" keyframe
 
-  This new keyframe sits between the already existing sizeAtPreferred and
-  sizeAtMaximum keyframes. Its goal is to modify the interpolation between
-  the latter as to respect the "expanding" size policy of some anchors.
+    This new keyframe sits between the already existing sizeAtPreferred and
+    sizeAtMaximum keyframes. Its goal is to modify the interpolation between
+    the latter as to respect the "expanding" size policy of some anchors.
 
-  Previously all items would be subject to a linear interpolation between
-  sizeAtPreferred and sizeAtMaximum values. This will change now, the
-  expanding anchors will change their size before the others. To calculate
-  this keyframe we use the following logic:
+    Previously all items would be subject to a linear interpolation between
+    sizeAtPreferred and sizeAtMaximum values. This will change now, the
+    expanding anchors will change their size before the others. To calculate
+    this keyframe we use the following logic:
 
-  1) Ask each anchor for their desired expanding size (ad->expSize), this
-  value depends on the anchor expanding property in the following way:
+    1) Ask each anchor for their desired expanding size (ad->expSize), this
+    value depends on the anchor expanding property in the following way:
 
-  - Expanding anchors want to grow towards their maximum size
-  - Non-expanding anchors want to remain at their preferred size.
-  - Composite anchors want to grow towards somewhere between their
-  preferred sizes. (*)
+    - Expanding normal anchors want to grow towards their maximum size
+    - Non-expanding normal anchors want to remain at their preferred size.
+    - Sequential anchors wants to grow towards a size that is calculated by:
+        summarizing it's child anchors, where it will use preferred size for non-expanding anchors
+        and maximum size for expanding anchors.
+    - Parallel anchors want to grow towards the smallest maximum size of all the expanding anchors.
 
-  2) Clamp their desired values to the value they assume in the neighbour
-  keyframes (sizeAtPreferred and sizeAtExpanding)
+    2) Clamp their desired values to the value they assume in the neighbour
+    keyframes (sizeAtPreferred and sizeAtExpanding)
 
-  3) Run simplex with a setup that ensures the following:
+    3) Run simplex with a setup that ensures the following:
 
-    a. Anchors will change their value from their sizeAtPreferred towards
-       their sizeAtMaximum as much as required to ensure that ALL anchors
-       reach their respective "desired" expanding sizes.
+      a. Anchors will change their value from their sizeAtPreferred towards
+         their sizeAtMaximum as much as required to ensure that ALL anchors
+         reach their respective "desired" expanding sizes.
 
-    b. No anchors will change their value beyond what is NEEDED to satisfy
-       the requirement above.
+      b. No anchors will change their value beyond what is NEEDED to satisfy
+         the requirement above.
 
-  The final result is that, at the "expanding" keyframe expanding anchors
-  will grow and take with them all anchors that are parallel to them.
-  However, non-expanding anchors will remain at their preferred size unless
-  they are forced to grow by a parallel expanding anchor.
+    The final result is that, at the "expanding" keyframe expanding anchors
+    will grow and take with them all anchors that are parallel to them.
+    However, non-expanding anchors will remain at their preferred size unless
+    they are forced to grow by a parallel expanding anchor.
 
-  Note: For anchors where the sizeAtPreferred is bigger than sizeAtPreferred,
-        the visual effect when the layout grows from its preferred size is
-        the following: Expanding anchors will keep their size while non
-        expanding ones will shrink. Only after non-expanding anchors have
-        shrinked all the way, the expanding anchors will start to shrink too.
+    Note: For anchors where the sizeAtPreferred is bigger than sizeAtMaximum,
+          the visual effect when the layout grows from its preferred size is
+          the following: Expanding anchors will keep their size while non
+          expanding ones will shrink. Only after non-expanding anchors have
+          shrinked all the way, the expanding anchors will start to shrink too.
 */
 void QGraphicsAnchorLayoutPrivate::solveExpanding(QList<QSimplexConstraint *> constraints)
 {
@@ -2495,7 +2499,7 @@ void QGraphicsAnchorLayoutPrivate::solveExpanding(QList<QSimplexConstraint *> co
             itemC->constant = qMax(boundedExpSize, ad->sizeAtMaximum);
             itemConstraints << itemC;
 
-            // Create objective to avoid the anchos from moving away from
+            // Create objective to avoid the anchors from moving away from
             // the preferred size more than the needed amount. (ensure 3.b)
             // The objective function is the distance between sizeAtPreferred
             // and sizeAtExpanding, it will be minimized.
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.h b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
index 1a74d85..24b25de 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.h
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
@@ -227,7 +227,6 @@ struct SequentialAnchorData : public AnchorData
     SequentialAnchorData() : AnchorData()
     {
         type = AnchorData::Sequential;
-        hasSize = true;
 #ifdef QT_DEBUG
         name = QLatin1String("SequentialAnchorData");
 #endif
@@ -256,7 +255,6 @@ struct ParallelAnchorData : public AnchorData
         : AnchorData(), firstEdge(first), secondEdge(second)
     {
         type = AnchorData::Parallel;
-        hasSize = true;
 
         // ### Those asserts force that both child anchors have the same direction,
         // but can't we simplify a pair of anchors in opposite directions?
diff --git a/src/gui/graphicsview/qsimplex_p.cpp b/src/gui/graphicsview/qsimplex_p.cpp
index 95003d2..b8f8fb4 100644
--- a/src/gui/graphicsview/qsimplex_p.cpp
+++ b/src/gui/graphicsview/qsimplex_p.cpp
@@ -519,11 +519,11 @@ qreal QSimplex::solver(solverFactor factor)
     solveMaxHelper();
     collectResults();
 
-    #ifdef QT_DEBUG
+#ifdef QT_DEBUG
     for (int i = 0; i < constraints.size(); ++i) {
         Q_ASSERT(constraints[i]->isSatisfied());
     }
-    #endif
+#endif
 
     return factor * valueAt(0, columns - 1);
 }
diff --git a/src/gui/graphicsview/qsimplex_p.h b/src/gui/graphicsview/qsimplex_p.h
index b517cb9..51991a9 100644
--- a/src/gui/graphicsview/qsimplex_p.h
+++ b/src/gui/graphicsview/qsimplex_p.h
@@ -95,7 +95,7 @@ struct QSimplexConstraint
     QPair<QSimplexVariable *, qreal> helper;
     QSimplexVariable * artificial;
 
-    #ifdef QT_DEBUG
+#ifdef QT_DEBUG
     bool isSatisfied() {
         qreal leftHandSide(0);
 
@@ -118,7 +118,7 @@ struct QSimplexConstraint
             return false;
         }
     }
-    #endif
+#endif
 };
 
 class QSimplex
-- 
cgit v0.12


From 3715e8ff3cc61dd869ec2ae484d6323f97c0a80a Mon Sep 17 00:00:00 2001
From: ninerider <qt-info@nokia.com>
Date: Wed, 7 Oct 2009 10:55:02 +0200
Subject: A test requiring an enter/leave signal to be emitted is skipped.

Enter leave signals are not yet supported on Windows Mobile.

Reviewed-by: Joerg
---
 tests/auto/qabstractitemview/tst_qabstractitemview.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/qabstractitemview/tst_qabstractitemview.cpp
index 4e385d5..d6911d2 100644
--- a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp
+++ b/tests/auto/qabstractitemview/tst_qabstractitemview.cpp
@@ -1225,6 +1225,9 @@ void tst_QAbstractItemView::task250754_fontChange()
 
 void tst_QAbstractItemView::task200665_itemEntered()
 {
+#ifdef Q_OS_WINCE_WM
+    QSKIP("On Windows Mobile the mouse tracking is unavailable at the moment", SkipAll);
+#endif
     //we test that view will emit entered
     //when the scrollbar move but not the mouse itself
     QStandardItemModel model(1000,1);
-- 
cgit v0.12


From ee383b89f16a9a75a934076255bddbef5a075fa3 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Wed, 19 Aug 2009 15:50:45 +0200
Subject: Integrate the GuiPlatformPlugin interface

This is an internal interface for plugins that can be provided by
the platform to give platform-specific features by platforms built on
top of Qt.

We can easlily integrate Qt on Windows, Mac, Gnome, ... without any
plugin because we can link to their respective library (dynamically
if we don't want to depend on it).  On Gnome, we can dynamically
resolve Gtk+ symbols.
This is however not possible for KDE or other platform built on top
of Qt: we can't link against their library because they depend on us
and we can't dynamically resolve the symbols because they are
mangled (C++)

So this plugin provides hooks inside Qt to be able to do things
like native File or Color dialog, native icons, accurate reading of
the config file, and so on.

This is currently private API.

Task-number: QT-406
Reviewed-by: Jens Bache-Wiig
Reviewed-by: Oswald Buddenhagen
---
 examples/dialogs/standarddialogs/dialog.cpp |   5 -
 src/gui/dialogs/qcolordialog.cpp            |  21 ++-
 src/gui/dialogs/qcolordialog_p.h            |   1 +
 src/gui/dialogs/qfiledialog_p.h             |  24 +--
 src/gui/image/qicon.cpp                     |  11 +-
 src/gui/kernel/kernel.pri                   |   6 +-
 src/gui/kernel/qapplication.cpp             |  38 +----
 src/gui/kernel/qapplication_p.h             |   1 -
 src/gui/kernel/qapplication_x11.cpp         |  42 +----
 src/gui/kernel/qguiplatformplugin.cpp       | 231 ++++++++++++++++++++++++++++
 src/gui/kernel/qguiplatformplugin_p.h       | 122 +++++++++++++++
 src/gui/kernel/qkde.cpp                     |  33 +++-
 src/gui/kernel/qkde_p.h                     |   9 +-
 src/gui/styles/qcommonstyle.cpp             |  54 +------
 src/gui/styles/qcommonstyle_p.h             |   1 -
 15 files changed, 441 insertions(+), 158 deletions(-)
 create mode 100644 src/gui/kernel/qguiplatformplugin.cpp
 create mode 100644 src/gui/kernel/qguiplatformplugin_p.h

diff --git a/examples/dialogs/standarddialogs/dialog.cpp b/examples/dialogs/standarddialogs/dialog.cpp
index c29d2dd..6e06190 100644
--- a/examples/dialogs/standarddialogs/dialog.cpp
+++ b/examples/dialogs/standarddialogs/dialog.cpp
@@ -150,11 +150,6 @@ Dialog::Dialog(QWidget *parent)
     native = new QCheckBox(this);
     native->setText("Use native file dialog.");
     native->setChecked(true);
-#ifndef Q_WS_WIN
-#ifndef Q_OS_MAC
-    native->hide();
-#endif
-#endif
     QGridLayout *layout = new QGridLayout;
     layout->setColumnStretch(1, 1);
     layout->setColumnMinimumWidth(1, 250);
diff --git a/src/gui/dialogs/qcolordialog.cpp b/src/gui/dialogs/qcolordialog.cpp
index a7df999..44a82ef 100644
--- a/src/gui/dialogs/qcolordialog.cpp
+++ b/src/gui/dialogs/qcolordialog.cpp
@@ -62,6 +62,7 @@
 #include "qmime.h"
 #include "qspinbox.h"
 #include "qdialogbuttonbox.h"
+#include "private/qguiplatformplugin_p.h"
 
 #ifdef Q_WS_S60
 #include "private/qt_s60_p.h"
@@ -1454,6 +1455,8 @@ void QColorDialogPrivate::init(const QColor &initial)
     q->setSizeGripEnabled(false);
     q->setWindowTitle(QColorDialog::tr("Select Color"));
 
+    nativeDialogInUse = false;
+
     nextCust = 0;
     QVBoxLayout *mainLay = new QVBoxLayout(q);
     // there's nothing in this dialog that benefits from sizing up
@@ -1719,6 +1722,8 @@ void QColorDialog::setCurrentColor(const QColor &color)
     d->setCurrentQColor(color);
     d->setCocoaPanelColor(color);
 #endif
+    if (d->nativeDialogInUse)
+        qt_guiPlatformPlugin()->colorDialogSetCurrentColor(this, color);
 }
 
 QColor QColorDialog::currentColor() const
@@ -1871,6 +1876,17 @@ void QColorDialog::setVisible(bool visible)
             setAttribute(Qt::WA_DontShowOnScreen, false);
         }
     }
+#else
+
+    if (!(d->opts & DontUseNativeDialog) && qt_guiPlatformPlugin()->colorDialogSetVisible(this, visible)) {
+        d->nativeDialogInUse = true;
+        // Set WA_DontShowOnScreen so that QDialog::setVisible(visible) below
+        // updates the state correctly, but skips showing the non-native version:
+        setAttribute(Qt::WA_DontShowOnScreen);
+    } else {
+        d->nativeDialogInUse = false;
+        setAttribute(Qt::WA_DontShowOnScreen, false);
+    }
 #endif
 
     QDialog::setVisible(visible);
@@ -1970,8 +1986,8 @@ QRgb QColorDialog::getRgba(QRgb initial, bool *ok, QWidget *parent)
 
 QColorDialog::~QColorDialog()
 {
-#if defined(Q_WS_MAC)
     Q_D(QColorDialog);
+#if defined(Q_WS_MAC)
     if (d->delegate) {
         d->releaseCocoaColorPanelDelegate();
         QColorDialogPrivate::sharedColorPanelAvailable = true;
@@ -1985,6 +2001,9 @@ QColorDialog::~QColorDialog()
             settings.setValue(QLatin1String("Qt/customColors/") + QString::number(i), cusrgb[i]);
     }
 #endif
+    if (d->nativeDialogInUse)
+        qt_guiPlatformPlugin()->colorDialogDelete(this);
+
 }
 
 
diff --git a/src/gui/dialogs/qcolordialog_p.h b/src/gui/dialogs/qcolordialog_p.h
index c7cabfb..81df503 100644
--- a/src/gui/dialogs/qcolordialog_p.h
+++ b/src/gui/dialogs/qcolordialog_p.h
@@ -114,6 +114,7 @@ public:
     QColorDialog::ColorDialogOptions opts;
     QPointer<QObject> receiverToDisconnectOnClose;
     QByteArray memberToDisconnectOnClose;
+    bool nativeDialogInUse;
 
 #ifdef Q_WS_MAC
     void openCocoaColorPanel(const QColor &initial,
diff --git a/src/gui/dialogs/qfiledialog_p.h b/src/gui/dialogs/qfiledialog_p.h
index 54fc0e0..44289d9 100644
--- a/src/gui/dialogs/qfiledialog_p.h
+++ b/src/gui/dialogs/qfiledialog_p.h
@@ -76,6 +76,8 @@
 #include <qdebug.h>
 #include "qsidebar_p.h"
 #include "qfscompleter_p.h"
+#include "../kernel/qguiplatformplugin_p.h"
+
 
 #if defined (Q_OS_UNIX)
 #include <unistd.h>
@@ -405,17 +407,17 @@ inline QString QFileDialogPrivate::rootPath() const {
 
 #ifndef Q_WS_MAC
     // Dummies for platforms that don't use native dialogs:
-    inline void QFileDialogPrivate::deleteNativeDialog_sys() {}
-    inline bool QFileDialogPrivate::setVisible_sys(bool) { return false; }
-    inline QDialog::DialogCode QFileDialogPrivate::dialogResultCode_sys(){ return QDialog::Rejected; }
-    inline void QFileDialogPrivate::setDirectory_sys(const QString &) {}
-    inline QString QFileDialogPrivate::directory_sys() const { return QString(); }
-    inline void QFileDialogPrivate::selectFile_sys(const QString &) {}
-    inline QStringList QFileDialogPrivate::selectedFiles_sys() const { return QStringList(); }
-    inline void QFileDialogPrivate::setFilter_sys() {}
-    inline void QFileDialogPrivate::setNameFilters_sys(const QStringList &) {}
-    inline void QFileDialogPrivate::selectNameFilter_sys(const QString &) {}
-    inline QString QFileDialogPrivate::selectedNameFilter_sys() const { return QString(); }
+    inline void QFileDialogPrivate::deleteNativeDialog_sys() { qt_guiPlatformPlugin()->fileDialogDelete(q_func()); }
+    inline bool QFileDialogPrivate::setVisible_sys(bool visible) { return qt_guiPlatformPlugin()->fileDialogSetVisible(q_func(), visible); }
+    inline QDialog::DialogCode QFileDialogPrivate::dialogResultCode_sys(){ return qt_guiPlatformPlugin()->fileDialogResultCode(q_func()); }
+    inline void QFileDialogPrivate::setDirectory_sys(const QString &directory) { qt_guiPlatformPlugin()->fileDialogSetDirectory(q_func(), directory); }
+    inline QString QFileDialogPrivate::directory_sys() const { return qt_guiPlatformPlugin()->fileDialogDirectory(q_func()); }
+    inline void QFileDialogPrivate::selectFile_sys(const QString &filename) { qt_guiPlatformPlugin()->fileDialogSelectFile(q_func(), filename); }
+    inline QStringList QFileDialogPrivate::selectedFiles_sys() const { return qt_guiPlatformPlugin()->fileDialogSelectedFiles(q_func()); }
+    inline void QFileDialogPrivate::setFilter_sys() { qt_guiPlatformPlugin()->fileDialogSetFilter(q_func()); }
+    inline void QFileDialogPrivate::setNameFilters_sys(const QStringList &filters) { qt_guiPlatformPlugin()->fileDialogSetNameFilters(q_func(), filters); }
+    inline void QFileDialogPrivate::selectNameFilter_sys(const QString &filter) { qt_guiPlatformPlugin()->fileDialogSelectNameFilter(q_func(), filter); }
+    inline QString QFileDialogPrivate::selectedNameFilter_sys() const { return qt_guiPlatformPlugin()->fileDialogSelectedNameFilter(q_func()); }
 #endif
 
 QT_END_NAMESPACE
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index fce4508..3448459 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -54,6 +54,7 @@
 #include "qvariant.h"
 #include "qcache.h"
 #include "qdebug.h"
+#include "private/qguiplatformplugin_p.h"
 
 #ifdef Q_WS_MAC
 #include <private/qt_mac_p.h>
@@ -966,13 +967,9 @@ QIcon QIcon::fromTheme(const QString &name, const QIcon &fallback)
 
     QIcon icon;
 
-#ifdef Q_WS_X11
-    if (X11->desktopEnvironment == DE_KDE) {
-        icon = QKde::kdeIcon(name);
-        if (!icon.isNull())
-            return icon;
-    }
-#endif
+    icon = qt_guiPlatformPlugin()->loadIcon(name);
+    if (!icon.isNull())
+        return icon;
 
     if (iconCache.contains(name)) {
         icon = *iconCache.object(name);
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index 7cde384..760d73c 100644
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -47,7 +47,8 @@ HEADERS += \
 	kernel/qgesture_p.h \
 	kernel/qstandardgestures.h \
         kernel/qstandardgestures_p.h \
-        kernel/qsoftkeymanager_p.h
+        kernel/qsoftkeymanager_p.h \
+        kernel/qguiplatformplugin_p.h
 
 SOURCES += \
 	kernel/qaction.cpp \
@@ -79,7 +80,8 @@ SOURCES += \
 	kernel/qkeymapper.cpp \
 	kernel/qgesture.cpp \
         kernel/qstandardgestures.cpp \
-        kernel/qsoftkeymanager.cpp
+        kernel/qsoftkeymanager.cpp \
+        kernel/qguiplatformplugin.cpp
 
 win32 {
 	DEFINES += QT_NO_DIRECTDRAW
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 044fedd..43addb6 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -84,6 +84,8 @@
 #include "qinputcontextfactory.h"
 #endif
 
+#include "qguiplatformplugin_p.h"
+
 #include <qthread.h>
 #include <private/qthread_p.h>
 
@@ -788,6 +790,9 @@ void QApplicationPrivate::construct(
             qCritical("Library qttestability load failed!");
         }
     }
+
+    //make sure the plugin is loaded
+    qt_guiPlatformPlugin();
 #endif
 }
 
@@ -1955,38 +1960,7 @@ void QApplicationPrivate::setSystemFont(const QFont &font)
 */
 QString QApplicationPrivate::desktopStyleKey()
 {
-QString desktopstyle;
-#if defined(Q_WS_WIN) && defined(Q_WS_WINCE)
-    if (qt_wince_is_smartphone() || qt_wince_is_pocket_pc())
-        desktopstyle = QLatin1String("WindowsMobile");
-     else
-        desktopstyle = QLatin1String("WindowsCE");
-
-#elif defined(Q_WS_WIN)
-            if ((QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA
-                && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based))
-                desktopstyle = QLatin1String("WindowsVista");
-                else if ((QSysInfo::WindowsVersion >= QSysInfo::WV_XP
-                && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based))
-                desktopstyle = QLatin1String("WindowsXP");
-            else
-                desktopstyle = QLatin1String("Windows");                // default styles for Windows
-#elif defined(Q_WS_X11) && defined(Q_OS_SOLARIS)
-            desktopstyle = QLatin1String("CDE");                        // default style for X11 on Solaris
-#elif defined(Q_WS_S60)
-            desktopstyle = QLatin1String("S60");                        // default style for Symbian with S60
-#elif defined(Q_OS_SYMBIAN)
-            desktopstyle = QLatin1String("Windows");                    // default style for Symbian without S60
-#elif defined(Q_WS_X11) && defined(Q_OS_IRIX)
-            desktopstyle = QLatin1String("SGI");                        // default style for X11 on IRIX
-#elif defined(Q_WS_QWS)
-            desktopstyle = QLatin1String("Plastique");                  // default style for X11 and small devices
-#elif defined(Q_WS_X11)
-            desktopstyle = QApplicationPrivate::x11_desktop_style();     // default runtime dependant style for X11
-#elif defined(Q_WS_MAC)
-                desktopstyle = QLatin1String("Macintosh");              // default style for all Mac's
-#endif
-    return desktopstyle;
+    return qt_guiPlatformPlugin()->styleName();
 }
 
 /*!
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index 6036196..95b6d28 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -305,7 +305,6 @@ public:
 
 #if defined(Q_WS_X11)
 #ifndef QT_NO_SETTINGS
-    static QString x11_desktop_style();
     static bool x11_apply_settings();
 #endif
     static void reset_instance_pointer();
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index e46a370..bf95684 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -85,6 +85,7 @@
 #include "qtimer.h"
 #include "qlibrary.h"
 #include <private/qgraphicssystemfactory_p.h>
+#include "qguiplatformplugin_p.h"
 #include "qkde_p.h"
 
 #if !defined (QT_NO_TABLET)
@@ -919,7 +920,7 @@ bool QApplicationPrivate::x11_apply_settings()
     QString stylename = settings.value(QLatin1String("style")).toString();
 
     if (stylename.isEmpty() && QApplicationPrivate::styleOverride.isNull() && X11->use_xrender) {
-        stylename = x11_desktop_style();
+        stylename = qt_guiPlatformPlugin()->styleName();
     }
 
     static QString currentStyleName = stylename;
@@ -1313,8 +1314,7 @@ static void qt_set_x11_resources(const char* font = 0, const char* fg = 0,
             pal.setColor(QPalette::Disabled, QPalette::Highlight, Qt::darkBlue);
         }
 
-        if (kdeColors)
-            pal = QKde::kdePalette().resolve(pal);
+        pal = qt_guiPlatformPlugin()->palette().resolve(pal);
         QApplicationPrivate::setSystemPalette(pal);
         QColor::setAllowX11ColorNames(allowX11ColorNames);
     }
@@ -2560,42 +2560,6 @@ void qt_init(QApplicationPrivate *priv, int,
 #endif
 }
 
-
-    // run-time search for default style
-/*!
-    \internal
-*/
-QString QApplicationPrivate::x11_desktop_style()
-{
-    QString stylename;
-    switch(X11->desktopEnvironment) {
-    case DE_KDE:
-        stylename = QKde::kdeStyle();
-        break;
-    case DE_GNOME: {
-        QStringList availableStyles = QStyleFactory::keys();
-        // Set QGtkStyle for GNOME if available
-        QString gtkStyleKey = QString::fromLatin1("GTK+");
-        if (availableStyles.contains(gtkStyleKey)) {
-            stylename = gtkStyleKey;
-            break;
-        }
-        if (X11->use_xrender)
-            stylename = QLatin1String("cleanlooks");
-        else
-            stylename = QLatin1String("windows");
-        break;
-        }
-    case DE_CDE:
-        stylename = QLatin1String("cde");
-        break;
-    default:
-        // Don't do anything
-        break;
-    }
-    return stylename;
-}
-
 void QApplicationPrivate::initializeWidgetPaletteHash()
 {
 }
diff --git a/src/gui/kernel/qguiplatformplugin.cpp b/src/gui/kernel/qguiplatformplugin.cpp
new file mode 100644
index 0000000..cf15aa2
--- /dev/null
+++ b/src/gui/kernel/qguiplatformplugin.cpp
@@ -0,0 +1,231 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qguiplatformplugin_p.h"
+#include <qdebug.h>
+#include "private/qfactoryloader_p.h"
+#include "qstylefactory.h"
+#include "qapplication.h"
+#include "qplatformdefs.h"
+
+#ifdef Q_WS_WINCE
+#include "qguifunctions_wince.h"
+extern bool qt_wince_is_smartphone(); //qguifunctions_wince.cpp
+extern bool qt_wince_is_mobile();     //qguifunctions_wince.cpp
+extern bool qt_wince_is_pocket_pc();  //qguifunctions_wince.cpp
+#endif
+
+
+#if defined(Q_WS_X11)
+#include "qkde_p.h"
+#include "qt_x11_p.h"
+#endif
+
+
+QT_BEGIN_NAMESPACE
+
+
+/*! \internal
+    Return (an construct if necesseray) the Gui Platform plugin.
+
+    The plugin key to be loaded is inside the QT_PLATFORM_PLUGIN environment variable.
+    If it is not set, it will be the DESKTOP_SESSION on X11.
+
+    If no plugin can be loaded, the default one is returned.
+ */
+QGuiPlatformPlugin *qt_guiPlatformPlugin()
+{
+    static QGuiPlatformPlugin *plugin;
+    if (!plugin)
+    {
+#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
+
+        QString key = QString::fromLocal8Bit(qgetenv("QT_PLATFORM_PLUGIN"));
+#ifdef Q_WS_X11
+        if (key.isEmpty()) {
+            switch(X11->desktopEnvironment) {
+            case DE_KDE:
+                key = QString::fromLatin1("kde");
+                break;
+            default:
+                key = QString::fromLocal8Bit(qgetenv("DESKTOP_SESSION"));
+                break;
+            }
+        }
+#endif
+
+        if (!key.isEmpty() && QApplication::desktopSettingsAware()) {
+            QFactoryLoader loader(QGuiPlatformPluginInterface_iid, QLatin1String("/gui_platform"));
+            plugin = qobject_cast<QGuiPlatformPlugin *>(loader.instance(key));
+        }
+#endif // QT_NO_LIBRARY
+
+        if(!plugin) {
+            static QGuiPlatformPlugin def;
+            plugin = &def;
+        }
+    }
+    return plugin;
+}
+
+
+/* \class QPlatformPlugin
+    QGuiPlatformPlugin can be used to integrate Qt applications in a platform built on top of Qt.
+    The application developer should not know or use the plugin, it is only used by Qt internaly.
+
+    But full platform that are built on top of Qt may provide a plugin so 3rd party Qt application
+    running in the platform are integrated.
+ */
+
+/*
+    The constructor can be used to install hooks in Qt
+ */
+QGuiPlatformPlugin::QGuiPlatformPlugin(QObject *parent) : QObject(parent) {}
+QGuiPlatformPlugin::~QGuiPlatformPlugin() {}
+
+
+/* return the string key to be used by default the application */
+QString QGuiPlatformPlugin::styleName()
+{
+#if defined(Q_WS_WIN) && defined(Q_WS_WINCE)
+    if (qt_wince_is_smartphone() || qt_wince_is_pocket_pc())
+        return QLatin1String("WindowsMobile");
+    else
+        return QLatin1String("WindowsCE");
+#elif defined(Q_WS_WIN)
+    if ((QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA
+        && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based))
+        return QLatin1String("WindowsVista");
+    else if ((QSysInfo::WindowsVersion >= QSysInfo::WV_XP
+        && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based))
+        return QLatin1String("WindowsXP");
+    else
+        return QLatin1String("Windows");                // default styles for Windows
+#elif defined(Q_WS_X11) && defined(Q_OS_SOLARIS)
+    return QLatin1String("CDE");                        // default style for X11 on Solaris
+#elif defined(Q_WS_S60)
+    return QLatin1String("S60");                        // default style for Symbian with S60
+#elif defined(Q_OS_SYMBIAN)
+    return QLatin1String("Windows");                    // default style for Symbian without S60
+#elif defined(Q_WS_X11) && defined(Q_OS_IRIX)
+    return QLatin1String("SGI");                        // default style for X11 on IRIX
+#elif defined(Q_WS_QWS)
+    return QLatin1String("Plastique");                  // default style for X11 and small devices
+#elif defined(Q_WS_MAC)
+    return QLatin1String("Macintosh");              // default style for all Mac's
+#elif defined(Q_WS_X11)
+    QString stylename;
+    switch(X11->desktopEnvironment) {
+    case DE_KDE:
+        stylename = QKde::kdeStyle();
+        break;
+    case DE_GNOME: {
+        QStringList availableStyles = QStyleFactory::keys();
+        // Set QGtkStyle for GNOME if available
+        QString gtkStyleKey = QString::fromLatin1("GTK+");
+        if (availableStyles.contains(gtkStyleKey)) {
+            stylename = gtkStyleKey;
+            break;
+        }
+        if (X11->use_xrender)
+            stylename = QLatin1String("cleanlooks");
+        else
+            stylename = QLatin1String("windows");
+        break;
+    }
+    case DE_CDE:
+        stylename = QLatin1String("cde");
+        break;
+    default:
+        // Don't do anything
+        break;
+    }
+    return stylename;
+#endif
+}
+
+/* return an aditional default palette  (only work on X11) */
+QPalette QGuiPlatformPlugin::palette()
+{
+#ifdef Q_WS_X11
+    if (QApplication::desktopSettingsAware() && X11->desktopEnvironment == DE_KDE)
+        return QKde::kdePalette();
+#endif
+
+    return QPalette();
+}
+
+/* backend for QIcon::fromTheme. A null icon means it uses the default backend */
+QIcon QGuiPlatformPlugin::loadIcon(const QString &name)
+{
+    return QIcon();
+}
+
+/* Like QStyle::styleHint */
+int QGuiPlatformPlugin::platformHint(PlatformHint hint)
+{
+    int ret = 0;
+    switch(hint)
+    {
+        case PH_ToolButtonStyle:
+            ret = Qt::ToolButtonIconOnly;
+#ifdef Q_WS_X11
+            if (X11->desktopEnvironment == DE_KDE && X11->desktopVersion >= 4
+                && QApplication::desktopSettingsAware()) {
+                ret = QKde::kdeToolButtonStyle();
+            }
+#endif
+            break;
+        case PH_ToolBarIconSize:
+#ifdef Q_WS_X11
+            if (X11->desktopEnvironment == DE_KDE && X11->desktopVersion >= 4
+                && QApplication::desktopSettingsAware()) {
+                ret = QKde::kdeToolBarIconSize();
+            }
+#endif
+            //by default keep ret = 0 so QCommonStyle will use the style default
+            break;
+    }
+    return ret;
+}
+
+
+QT_END_NAMESPACE
diff --git a/src/gui/kernel/qguiplatformplugin_p.h b/src/gui/kernel/qguiplatformplugin_p.h
new file mode 100644
index 0000000..57ea8af
--- /dev/null
+++ b/src/gui/kernel/qguiplatformplugin_p.h
@@ -0,0 +1,122 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QGUIPLATFORM_P_H
+#define QGUIPLATFORM_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qplugin.h>
+#include <QtCore/qfactoryinterface.h>
+#include <QtGui/qdialog.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Gui)
+
+class QStyle;
+class QPalette;
+class QIcon;
+class QFileDialog;
+class QColorDialog;
+
+struct Q_GUI_EXPORT QGuiPlatformPluginInterface  : public QFactoryInterface
+{
+};
+
+#define QGuiPlatformPluginInterface_iid "com.nokia.qt.QGuiPlatformPluginInterface"
+
+Q_DECLARE_INTERFACE(QGuiPlatformPluginInterface, QGuiPlatformPluginInterface_iid)
+
+class Q_GUI_EXPORT QGuiPlatformPlugin : public QObject, public QGuiPlatformPluginInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(QGuiPlatformPluginInterface:QFactoryInterface)
+    public:
+        explicit QGuiPlatformPlugin(QObject *parent = 0);
+        ~QGuiPlatformPlugin();
+
+        virtual QStringList keys() const {  return QStringList() << QLatin1String("default");  };
+
+        virtual QString styleName();
+        virtual QPalette palette();
+        virtual QIcon loadIcon(const QString &name);
+        enum PlatformHint { PH_ToolButtonStyle, PH_ToolBarIconSize };
+        virtual int platformHint(PlatformHint hint);
+
+
+        virtual void fileDialogDelete(QFileDialog *) {}
+        virtual bool fileDialogSetVisible(QFileDialog *, bool) { return false; }
+        virtual QDialog::DialogCode fileDialogResultCode(QFileDialog *) { return QDialog::Rejected; }
+        virtual void fileDialogSetDirectory(QFileDialog *, const QString &) {}
+        virtual QString fileDialogDirectory(const QFileDialog *) const { return QString(); }
+        virtual void fileDialogSelectFile(QFileDialog *, const QString &) {}
+        virtual QStringList fileDialogSelectedFiles(const QFileDialog *) const { return QStringList(); }
+        virtual void fileDialogSetFilter(QFileDialog *) {}
+        virtual void fileDialogSetNameFilters(QFileDialog *, const QStringList &) {}
+        virtual void fileDialogSelectNameFilter(QFileDialog *, const QString &) {}
+        virtual QString fileDialogSelectedNameFilter(const QFileDialog *) const { return QString(); }
+
+        virtual void colorDialogDelete(QColorDialog *) {}
+        virtual bool colorDialogSetVisible(QColorDialog *, bool) { return false; }
+        virtual void colorDialogSetCurrentColor(QColorDialog *, const QColor &) {}
+};
+
+//internal
+QGuiPlatformPlugin *qt_guiPlatformPlugin();
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+
+#endif // QGUIPLATFORMPLUGIN_H
diff --git a/src/gui/kernel/qkde.cpp b/src/gui/kernel/qkde.cpp
index 6c8909f..edc53ac 100644
--- a/src/gui/kernel/qkde.cpp
+++ b/src/gui/kernel/qkde.cpp
@@ -141,14 +141,33 @@ QString QKde::kdeStyle()
         return QLatin1String("windows");
 }
 
-/*!\internal
-  placeholder to load icon from kde.
-  to be implemented
- */
-QIcon QKde::kdeIcon(const QString &name)
+
+int QKde::kdeToolButtonStyle()
+{
+    QSettings settings(QKde::kdeHome() + QLatin1String("/share/config/kdeglobals"),
+                        QSettings::IniFormat);
+    settings.beginGroup(QLatin1String("Toolbar style"));
+    QString toolbarStyle = settings.value(QLatin1String("ToolButtonStyle"), QLatin1String("TextBesideIcon")).toString();
+    if (toolbarStyle == QLatin1String("TextBesideIcon"))
+        return Qt::ToolButtonTextBesideIcon;
+    else if (toolbarStyle == QLatin1String("TextOnly"))
+        return Qt::ToolButtonTextOnly;
+    else if (toolbarStyle == QLatin1String("TextUnderIcon"))
+        return Qt::ToolButtonTextUnderIcon;
+
+    return Qt::ToolButtonTextBesideIcon;
+}
+
+int QKde::kdeToolBarIconSize()
 {
-    //###todo
-    return QIcon();
+    static int iconSize = -1;
+    if (iconSize == -1) {
+        QSettings settings(QKde::kdeHome() + QLatin1String("/share/config/kdeglobals"),
+                            QSettings::IniFormat);
+                            settings.beginGroup(QLatin1String("ToolbarIcons"));
+        iconSize = settings.value(QLatin1String("Size")).toInt();
+    }
+    return iconSize;
 }
 
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qkde_p.h b/src/gui/kernel/qkde_p.h
index 4063f0e..c22a145 100644
--- a/src/gui/kernel/qkde_p.h
+++ b/src/gui/kernel/qkde_p.h
@@ -61,12 +61,17 @@
 
 QT_BEGIN_NAMESPACE
 
-// This namespace contains helper function to help KDE integration
+/*!\internal
+   This namespace contains helper function to help KDE integration
+   They are only used if we detect the use of KDE and the KDE platform plugin is not found (old KDE version)
+   Or if the detected KDE version is KDE3
+*/
 namespace QKde {
     QString kdeHome();
     QString kdeStyle();
     QPalette kdePalette();
-    QIcon kdeIcon(const QString &name);
+    int kdeToolButtonStyle();
+    int kdeToolBarIconSize();
 }
 
 
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp
index df4f866..612258a 100644
--- a/src/gui/styles/qcommonstyle.cpp
+++ b/src/gui/styles/qcommonstyle.cpp
@@ -63,7 +63,6 @@
 #include <qtoolbar.h>
 #include <qtoolbutton.h>
 #include <qrubberband.h>
-#include <../kernel/qkde_p.h>
 #include <private/qcommonstylepixmaps_p.h>
 #include <private/qmath_p.h>
 #include <private/qstylehelper_p.h>
@@ -75,6 +74,7 @@
 #include <qdir.h>
 #include <qsettings.h>
 #include <qpixmapcache.h>
+#include <private/qguiplatformplugin_p.h>
 
 #include <limits.h>
 
@@ -837,35 +837,6 @@ static void drawArrow(const QStyle *style, const QStyleOptionToolButton *toolbut
 }
 #endif // QT_NO_TOOLBUTTON
 
-
-#ifdef Q_WS_X11 // These functions are used to parse the X11 freedesktop icon spec
-
-/*!internal
-
-Checks if you are running KDE and looks up the toolbar
-from the KDE configuration file
-
-*/
-int QCommonStylePrivate::lookupToolButtonStyle() const
-{
-    int result = Qt::ToolButtonIconOnly;
-    if (X11->desktopEnvironment == DE_KDE && X11->desktopVersion >= 4) {
-        QSettings settings(QKde::kdeHome() +
-                           QLatin1String("/share/config/kdeglobals"), QSettings::IniFormat);
-        settings.beginGroup(QLatin1String("Toolbar style"));
-        QString toolbarStyle = settings.value(QLatin1String("ToolButtonStyle"), QLatin1String("TextBesideIcon")).toString();
-        if (toolbarStyle == QLatin1String("TextBesideIcon"))
-            result = Qt::ToolButtonTextBesideIcon;
-        else if (toolbarStyle == QLatin1String("TextOnly"))
-            result = Qt::ToolButtonTextOnly;
-        else if (toolbarStyle == QLatin1String("TextUnderIcon"))
-            result = Qt::ToolButtonTextUnderIcon;
-    }
-    return result;
-}
-
-#endif //Q_WS_X11
-
 #ifndef QT_NO_ITEMVIEWS
 
 QSize QCommonStylePrivate::viewItemSize(const QStyleOptionViewItemV4 *option, int role) const
@@ -4688,19 +4659,8 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
         break;
 
     case PM_ToolBarIconSize:
-#ifdef Q_WS_X11
-        if (X11->desktopVersion >= 4) {
-            static int iconSize = 0;
-            if (!iconSize) {
-                QSettings settings(QKde::kdeHome() +
-                                   QLatin1String("/share/config/kdeglobals"), 
-                                   QSettings::IniFormat);
-                settings.beginGroup(QLatin1String("ToolbarIcons"));
-                iconSize = settings.value(QLatin1String("Size"), QLatin1String("22")).toInt();
-            }
-            ret = iconSize;
-        } else
-#endif
+        ret = qt_guiPlatformPlugin()->platformHint(QGuiPlatformPlugin::PH_ToolBarIconSize);
+        if (!ret)
             ret = proxy()->pixelMetric(PM_SmallIconSize, opt, widget);
         break;
 
@@ -5192,13 +5152,7 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget
         ret = true;
         break;
     case SH_ToolButtonStyle:
-        ret = Qt::ToolButtonIconOnly;
-#ifdef Q_WS_X11
-        {
-            static int buttonStyle = d_func()->lookupToolButtonStyle();
-            return buttonStyle;
-        }
-#endif
+        ret = qt_guiPlatformPlugin()->platformHint(QGuiPlatformPlugin::PH_ToolButtonStyle);
         break;
     case SH_RequestSoftwareInputPanel:
         ret = RSIP_OnMouseClickAndAlreadyFocused;
diff --git a/src/gui/styles/qcommonstyle_p.h b/src/gui/styles/qcommonstyle_p.h
index 7162392..a905601 100644
--- a/src/gui/styles/qcommonstyle_p.h
+++ b/src/gui/styles/qcommonstyle_p.h
@@ -122,7 +122,6 @@ public:
     }
 #endif
     mutable QIcon tabBarcloseButtonIcon;
-    int lookupToolButtonStyle() const;
 #ifndef QT_NO_TABBAR
     void tabLayout(const QStyleOptionTabV3 *opt, const QWidget *widget, QRect *textRect, QRect *pixmapRect) const;
 #endif
-- 
cgit v0.12


From ed9fb96a626c284cebd4fcd9a2e00f32e202099a Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Wed, 7 Oct 2009 11:20:23 +0200
Subject: Fix compilation with -pedantic

Merge-request: 1716
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
---
 src/gui/effects/qgraphicseffect.cpp                  | 2 +-
 src/gui/kernel/qsoftkeymanager_p.h                   | 2 +-
 src/gui/text/qfontengine.cpp                         | 2 +-
 src/opengl/gl2paintengineex/qglcustomshaderstage_p.h | 2 +-
 src/opengl/util/fragmentprograms_p.h                 | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gui/effects/qgraphicseffect.cpp b/src/gui/effects/qgraphicseffect.cpp
index e971fd8..ee01fdc 100644
--- a/src/gui/effects/qgraphicseffect.cpp
+++ b/src/gui/effects/qgraphicseffect.cpp
@@ -566,7 +566,7 @@ QGraphicsColorizeEffect::~QGraphicsColorizeEffect()
     \brief the color of the effect.
 
     By default, the color is light blue (QColor(0, 0, 192)).
-*/;
+*/
 QColor QGraphicsColorizeEffect::color() const
 {
     Q_D(const QGraphicsColorizeEffect);
diff --git a/src/gui/kernel/qsoftkeymanager_p.h b/src/gui/kernel/qsoftkeymanager_p.h
index c4bb84d..b455445 100644
--- a/src/gui/kernel/qsoftkeymanager_p.h
+++ b/src/gui/kernel/qsoftkeymanager_p.h
@@ -74,7 +74,7 @@ public:
         SelectSoftKey,
         DoneSoftKey,
         MenuSoftKey,
-        CancelSoftKey,
+        CancelSoftKey
     };
 
     static void updateSoftKeys();
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index e5a88fc..21b9cca 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -1160,7 +1160,7 @@ Q_GLOBAL_STATIC_WITH_INITIALIZER(QVector<QRgb>, qt_grayPalette, {
     QRgb *it = x->data();
     for (int i = 0; i < x->size(); ++i, ++it)
         *it = 0xff000000 | i | (i<<8) | (i<<16);
-});
+})
 
 const QVector<QRgb> &QFontEngine::grayPalette()
 {
diff --git a/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h b/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h
index 25f5c2f..f8c13c5 100644
--- a/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h
+++ b/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h
@@ -64,7 +64,7 @@ QT_MODULE(OpenGL)
 class QGLCustomShaderStagePrivate;
 class Q_OPENGL_EXPORT QGLCustomShaderStage
 {
-    Q_DECLARE_PRIVATE(QGLCustomShaderStage);
+    Q_DECLARE_PRIVATE(QGLCustomShaderStage)
 public:
     QGLCustomShaderStage();
     virtual ~QGLCustomShaderStage();
diff --git a/src/opengl/util/fragmentprograms_p.h b/src/opengl/util/fragmentprograms_p.h
index 18da5c8..340023c 100644
--- a/src/opengl/util/fragmentprograms_p.h
+++ b/src/opengl/util/fragmentprograms_p.h
@@ -71,7 +71,7 @@ enum FragmentVariable {
     VAR_FMP2_M_RADIUS2,
     VAR_FMP,
     VAR_INV_MATRIX_M0,
-    VAR_ANGLE,
+    VAR_ANGLE
 };
 
 enum FragmentBrushType {
@@ -80,7 +80,7 @@ enum FragmentBrushType {
     FRAGMENT_PROGRAM_BRUSH_CONICAL,
     FRAGMENT_PROGRAM_BRUSH_LINEAR,
     FRAGMENT_PROGRAM_BRUSH_TEXTURE,
-    FRAGMENT_PROGRAM_BRUSH_PATTERN,
+    FRAGMENT_PROGRAM_BRUSH_PATTERN
 };
 
 enum FragmentCompositionModeType {
@@ -109,12 +109,12 @@ enum FragmentCompositionModeType {
     COMPOSITION_MODES_DIFFERENCE_NOMASK,
     COMPOSITION_MODES_EXCLUSION_NOMASK,
     COMPOSITION_MODE_BLEND_MODE_MASK,
-    COMPOSITION_MODE_BLEND_MODE_NOMASK,
+    COMPOSITION_MODE_BLEND_MODE_NOMASK
 };
 
 enum FragmentMaskType {
     FRAGMENT_PROGRAM_MASK_TRAPEZOID_AA,
-    FRAGMENT_PROGRAM_MASK_ELLIPSE_AA,
+    FRAGMENT_PROGRAM_MASK_ELLIPSE_AA
 };
 
 static const unsigned int num_fragment_variables = 19;
-- 
cgit v0.12


From dde11ce47c2d83bae685f3ff032ee9e6e372058f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= <jan-arve.saether@nokia.com>
Date: Wed, 7 Oct 2009 11:30:30 +0200
Subject: Make some lines in the autotest more readable.

---
 .../qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index b076631..286ea2d 100644
--- a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -161,15 +161,13 @@ void tst_QGraphicsAnchorLayout::simple()
     l->setContentsMargins(0, 0, 0, 0);
 
     // Horizontal
-    l->addAnchor(w1, Qt::AnchorLeft, l, Qt::AnchorLeft);
+    l->addAnchor(l, Qt::AnchorLeft, w1, Qt::AnchorLeft);
     l->addAnchor(w1, Qt::AnchorRight, w2, Qt::AnchorLeft);
     l->addAnchor(w2, Qt::AnchorRight, l, Qt::AnchorRight);
 
     // Vertical
-    l->addAnchor(w1, Qt::AnchorTop, l, Qt::AnchorTop);
-    l->addAnchor(w2, Qt::AnchorTop, l, Qt::AnchorTop);
-    l->addAnchor(w1, Qt::AnchorBottom, l, Qt::AnchorBottom);
-    l->addAnchor(w2, Qt::AnchorBottom, l, Qt::AnchorBottom);
+    l->addAnchors(l, w1, Qt::Vertical);
+    l->addAnchors(l, w2, Qt::Vertical);
 
     QGraphicsWidget p;
     p.setLayout(l);
@@ -1172,12 +1170,9 @@ void tst_QGraphicsAnchorLayout::delete_anchor()
     l->addAnchor(w3, Qt::AnchorRight, l, Qt::AnchorRight);
 
     // Vertical
-    l->addAnchor(w1, Qt::AnchorTop, l, Qt::AnchorTop);
-    l->addAnchor(w1, Qt::AnchorBottom, l, Qt::AnchorBottom);
-    l->addAnchor(w2, Qt::AnchorTop, l, Qt::AnchorTop);
-    l->addAnchor(w2, Qt::AnchorBottom, l, Qt::AnchorBottom);
-    l->addAnchor(w3, Qt::AnchorTop, l, Qt::AnchorTop);
-    l->addAnchor(w3, Qt::AnchorBottom, l, Qt::AnchorBottom);
+    l->addAnchors(l, w1, Qt::Vertical);
+    l->addAnchors(l, w2, Qt::Vertical);
+    l->addAnchors(l, w3, Qt::Vertical);
 
     QGraphicsAnchor *anchor = l->anchor(w3, Qt::AnchorRight, l, Qt::AnchorRight);
     anchor->setSpacing(10);
-- 
cgit v0.12


From fb3e09c620b519eed57488cb229d42ebb793f387 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Wed, 7 Oct 2009 11:55:58 +0200
Subject: Use the recursive mutex functions for D-Bus only.

At least in D-Bus 1.2.16, there's a deadlock caused by locking an
already-locked mutex. When Qt is linked to libdbus-1 instead of
dynamically loading it, it maintains legacy compatibility by only
providing the non-recursive mutexes, which triggers this deadlock.

The recursive functions have been present since 0.93, so I guess the
non-recursive variants aren't tested.

Report: https://bugzilla.novell.com/show_bug.cgi?id=482749#c30
---
 configure                |  2 +-
 dist/changes-4.6.0       |  5 ++++-
 src/dbus/qdbusthread.cpp | 32 +++++---------------------------
 3 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/configure b/configure
index ea50b37..1a7a8ef 100755
--- a/configure
+++ b/configure
@@ -617,7 +617,7 @@ fi
 unset QTDIR
 
 # the minimum version of libdbus-1 that we require:
-MIN_DBUS_1_VERSION=0.62
+MIN_DBUS_1_VERSION=0.93
 
 # initalize internal variables
 CFG_CONFIGURE_EXIT_ON_ERROR=yes
diff --git a/dist/changes-4.6.0 b/dist/changes-4.6.0
index 2e7e699..cd9f130 100644
--- a/dist/changes-4.6.0
+++ b/dist/changes-4.6.0
@@ -19,6 +19,9 @@ information about a particular change.
 *                           General                                        *
 ****************************************************************************
 
+ - QtDBus
+   * The minimum required version of the D-Bus reference library is
+     now 0.93.
 
 
 ****************************************************************************
@@ -133,4 +136,4 @@ information about a particular change.
    for all floating point numbers, and this can be changed using the new 
    function setFloatingPointPrecision(). Set Qt_4_5 as the version of the 
    QDataStream to get the behavior of previous versions.
-   
\ No newline at end of file
+   
diff --git a/src/dbus/qdbusthread.cpp b/src/dbus/qdbusthread.cpp
index 6e180b1..7bc107a 100644
--- a/src/dbus/qdbusthread.cpp
+++ b/src/dbus/qdbusthread.cpp
@@ -47,33 +47,24 @@
 
 QT_USE_NAMESPACE
 
-static DBusMutex* mutex_new()
-{
-    return reinterpret_cast<DBusMutex *>(new QMutex(QMutex::NonRecursive));
-}
-
-#if 0
 static DBusMutex* recursive_mutex_new()
 {
     return reinterpret_cast<DBusMutex *>(new QMutex(QMutex::Recursive));
 }
-#endif
 
 static void mutex_free(DBusMutex *mutex)
 {
     delete reinterpret_cast<QMutex *>(mutex);
 }
 
-static dbus_bool_t mutex_lock(DBusMutex *mutex)
+static void mutex_lock(DBusMutex *mutex)
 {
     reinterpret_cast<QMutex *>(mutex)->lock();
-    return true;
 }
 
-static dbus_bool_t mutex_unlock(DBusMutex *mutex)
+static void mutex_unlock(DBusMutex *mutex)
 {
     reinterpret_cast<QMutex *>(mutex)->unlock();
-    return true;
 }
 
 static DBusCondVar* condvar_new()
@@ -110,42 +101,29 @@ QT_BEGIN_NAMESPACE
 
 bool qDBusInitThreads()
 {
-    // ### Disable the recursive mutex functions.
+    // Use only the non-recursive mutex functions
     static DBusThreadFunctions fcn = {
-        DBUS_THREAD_FUNCTIONS_MUTEX_NEW_MASK |
-        DBUS_THREAD_FUNCTIONS_MUTEX_FREE_MASK |
-        DBUS_THREAD_FUNCTIONS_MUTEX_LOCK_MASK |
-        DBUS_THREAD_FUNCTIONS_MUTEX_UNLOCK_MASK |
         DBUS_THREAD_FUNCTIONS_CONDVAR_NEW_MASK |
         DBUS_THREAD_FUNCTIONS_CONDVAR_FREE_MASK |
         DBUS_THREAD_FUNCTIONS_CONDVAR_WAIT_MASK |
         DBUS_THREAD_FUNCTIONS_CONDVAR_WAIT_TIMEOUT_MASK |
         DBUS_THREAD_FUNCTIONS_CONDVAR_WAKE_ONE_MASK |
-        DBUS_THREAD_FUNCTIONS_CONDVAR_WAKE_ALL_MASK,
-#if 0
+        DBUS_THREAD_FUNCTIONS_CONDVAR_WAKE_ALL_MASK |
         DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_NEW_MASK |
         DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_FREE_MASK |
         DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_LOCK_MASK |
         DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_UNLOCK_MASK,
-#endif
-        mutex_new,
-        mutex_free,
-        mutex_lock,
-        mutex_unlock,
+        0, 0, 0, 0, // non-recursive mutex functions
         condvar_new,
         condvar_free,
         condvar_wait,
         condvar_wait_timeout,
         condvar_wake_one,
         condvar_wake_all,
-#if 0
         recursive_mutex_new,
         mutex_free,
         mutex_lock,
         mutex_unlock,
-#else
-        0, 0, 0, 0,
-#endif
         0, 0, 0, 0
     };
 
-- 
cgit v0.12


From bb13e2d43c664359aa61fc39c31f75a5c3fb4f5e Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Wed, 7 Oct 2009 12:04:44 +0200
Subject: Use dbus_threads_init_default instead of QMutex wrappers

The minimum version for the recursive mutexes is D-Bus 0.93. That's
also the same version that introduced the default thread functions. So
we don't need to provide ours anymore, just use the default.
---
 src/dbus/dbus.pro            |   1 -
 src/dbus/qdbus_symbols_p.h   |   3 +
 src/dbus/qdbusintegrator.cpp |   2 +-
 src/dbus/qdbusthread.cpp     | 149 -------------------------------------------
 4 files changed, 4 insertions(+), 151 deletions(-)
 delete mode 100644 src/dbus/qdbusthread.cpp

diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro
index dcd8418..57c6a58 100644
--- a/src/dbus/dbus.pro
+++ b/src/dbus/dbus.pro
@@ -61,7 +61,6 @@ SOURCES += qdbusconnection.cpp  \
 	qdbusutil.cpp		\
 	qdbusintrospection.cpp	\
 	qdbusabstractadaptor.cpp \
-	qdbusthread.cpp \
 	qdbusinternalfilters.cpp \
 	qdbusmetaobject.cpp	\
 	qdbusxmlgenerator.cpp	\
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
index bc90328..69c6ee4 100644
--- a/src/dbus/qdbus_symbols_p.h
+++ b/src/dbus/qdbus_symbols_p.h
@@ -357,6 +357,9 @@ DEFINEFUNC(dbus_bool_t     , dbus_type_is_basic, (int            typecode),
 DEFINEFUNC(dbus_bool_t     , dbus_type_is_fixed, (int            typecode),
            (typecode), return)
 
+/* dbus-thread.h */
+DEFINEFUNC(dbus_bool_t     , dbus_threads_init_default, (), (), return)
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 6ff50ac..8143cba 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -920,7 +920,7 @@ QDBusConnectionPrivate::QDBusConnectionPrivate(QObject *p)
       watchAndTimeoutLock(QMutex::Recursive),
       rootNode(QString(QLatin1Char('/')))
 {
-    static const bool threads = qDBusInitThreads();
+    static const bool threads = q_dbus_threads_init_default();
     static const int debugging = ::isDebugging = qgetenv("QDBUS_DEBUG").toInt();
     Q_UNUSED(threads)
 
diff --git a/src/dbus/qdbusthread.cpp b/src/dbus/qdbusthread.cpp
deleted file mode 100644
index 7bc107a..0000000
--- a/src/dbus/qdbusthread.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDBus module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtCore/qmutex.h>
-#include <QtCore/qwaitcondition.h>
-
-#include <stdlib.h>
-#include <qdbus_symbols_p.h>
-
-QT_USE_NAMESPACE
-
-static DBusMutex* recursive_mutex_new()
-{
-    return reinterpret_cast<DBusMutex *>(new QMutex(QMutex::Recursive));
-}
-
-static void mutex_free(DBusMutex *mutex)
-{
-    delete reinterpret_cast<QMutex *>(mutex);
-}
-
-static void mutex_lock(DBusMutex *mutex)
-{
-    reinterpret_cast<QMutex *>(mutex)->lock();
-}
-
-static void mutex_unlock(DBusMutex *mutex)
-{
-    reinterpret_cast<QMutex *>(mutex)->unlock();
-}
-
-static DBusCondVar* condvar_new()
-{
-    return reinterpret_cast<DBusCondVar *>(new QWaitCondition);
-}
-
-static void condvar_free(DBusCondVar *cond)
-{
-    delete reinterpret_cast<QWaitCondition *>(cond);
-}
-
-static void condvar_wait(DBusCondVar *cond, DBusMutex *mutex)
-{
-    reinterpret_cast<QWaitCondition *>(cond)->wait(reinterpret_cast<QMutex *>(mutex));
-}
-
-static dbus_bool_t condvar_wait_timeout(DBusCondVar *cond, DBusMutex *mutex, int msec)
-{
-    return reinterpret_cast<QWaitCondition *>(cond)->wait(reinterpret_cast<QMutex *>(mutex), msec);
-}
-
-static void condvar_wake_one(DBusCondVar *cond)
-{
-    reinterpret_cast<QWaitCondition *>(cond)->wakeOne();
-}
-
-static void condvar_wake_all(DBusCondVar *cond)
-{
-    reinterpret_cast<QWaitCondition *>(cond)->wakeAll();
-}
-
-QT_BEGIN_NAMESPACE
-
-bool qDBusInitThreads()
-{
-    // Use only the non-recursive mutex functions
-    static DBusThreadFunctions fcn = {
-        DBUS_THREAD_FUNCTIONS_CONDVAR_NEW_MASK |
-        DBUS_THREAD_FUNCTIONS_CONDVAR_FREE_MASK |
-        DBUS_THREAD_FUNCTIONS_CONDVAR_WAIT_MASK |
-        DBUS_THREAD_FUNCTIONS_CONDVAR_WAIT_TIMEOUT_MASK |
-        DBUS_THREAD_FUNCTIONS_CONDVAR_WAKE_ONE_MASK |
-        DBUS_THREAD_FUNCTIONS_CONDVAR_WAKE_ALL_MASK |
-        DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_NEW_MASK |
-        DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_FREE_MASK |
-        DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_LOCK_MASK |
-        DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_UNLOCK_MASK,
-        0, 0, 0, 0, // non-recursive mutex functions
-        condvar_new,
-        condvar_free,
-        condvar_wait,
-        condvar_wait_timeout,
-        condvar_wake_one,
-        condvar_wake_all,
-        recursive_mutex_new,
-        mutex_free,
-        mutex_lock,
-        mutex_unlock,
-        0, 0, 0, 0
-    };
-
-#if !defined QT_LINKED_LIBDBUS
-    void (*threads_init_default)() = (void (*)())qdbus_resolve_conditionally("dbus_threads_init_default");
-    void (*threads_init)(DBusThreadFunctions *) = (void (*)(DBusThreadFunctions*))qdbus_resolve_conditionally("dbus_threads_init");
-
-    if (threads_init_default)
-        threads_init_default();
-    else if (threads_init)
-        threads_init(&fcn);
-    else
-        return false;
-
-    return true;
-#else
-    dbus_threads_init(&fcn);
-
-    return true;
-#endif
-}
-
-QT_END_NAMESPACE
-- 
cgit v0.12


From fd89f9255d7965421a39a9089bb1d983264aff6f Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Wed, 7 Oct 2009 12:10:52 +0200
Subject: QUrl autotest additions Add autotest which actually passes, the
 problem (in kurltest) was the underscore in the hostname. Rename ok_hostname
 to bad_hostname in the error test, for clarity.

Merge-request: 1710
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
---
 tests/auto/qurl/tst_qurl.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp
index 8856792..026c30e 100644
--- a/tests/auto/qurl/tst_qurl.cpp
+++ b/tests/auto/qurl/tst_qurl.cpp
@@ -2624,6 +2624,13 @@ void tst_QUrl::tolerantParser()
         //QCOMPARE(tsdgeosQUrl.toEncoded(), tsdgeosExpected); // unusable output from qtestlib...
         QCOMPARE(QString(tsdgeosQUrl.toEncoded()), QString(tsdgeosExpected));
     }
+
+    {
+        QUrl url;
+        url.setUrl("http://strange<username>@hostname/", QUrl::TolerantMode);
+        QVERIFY(url.isValid());
+        QCOMPARE(QString(url.toEncoded()), QString("http://strange%3Cusername%3E@hostname/"));
+    }
 }
 
 void tst_QUrl::correctEncodedMistakes_data()
@@ -3594,9 +3601,9 @@ void tst_QUrl::setAuthority()
 
 void tst_QUrl::errorString()
 {
-    QUrl u = QUrl::fromEncoded("http://strange<username>@ok_hostname/", QUrl::StrictMode);
+    QUrl u = QUrl::fromEncoded("http://strange<username>@bad_hostname/", QUrl::StrictMode);
     QVERIFY(!u.isValid());
-    QString errorString = "Invalid URL \"http://strange<username>@ok_hostname/\": "
+    QString errorString = "Invalid URL \"http://strange<username>@bad_hostname/\": "
                           "error at position 14: expected end of URL, but found '<'";
     QCOMPARE(u.errorString(), errorString);
 
-- 
cgit v0.12


From 8bcf844d95cdf9f69bbf02da49d8d3282eb40cfb Mon Sep 17 00:00:00 2001
From: Kent Hansen <khansen@trolltech.com>
Date: Wed, 7 Oct 2009 12:17:25 +0200
Subject: Get rid of some superfluous checks in QScriptString::operator==()

Reviewed-by: Olivier Goffart
---
 src/script/api/qscriptstring.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/script/api/qscriptstring.cpp b/src/script/api/qscriptstring.cpp
index c2362da..2fb157f 100644
--- a/src/script/api/qscriptstring.cpp
+++ b/src/script/api/qscriptstring.cpp
@@ -150,14 +150,8 @@ bool QScriptString::isValid() const
 bool QScriptString::operator==(const QScriptString &other) const
 {
     Q_D(const QScriptString);
-    if (d == other.d_func())
-        return true;
     if (!d || !other.d_func())
         return d == other.d_func();
-    if (d->engine != other.d_func()->engine)
-        return false;
-    if (!d->engine)
-        return true;
     return d->identifier == other.d_func()->identifier;
 }
 
-- 
cgit v0.12


From 350410f19fd589986e51eba8f018abd92eddc287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= <joao@abecasis.name>
Date: Wed, 7 Oct 2009 09:39:14 +0200
Subject: Skipping ActiveQt examples removes a couple of warnings and errors

Reviewed-by: Thiago Macieira
---
 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index 1a7a8ef..323224c 100755
--- a/configure
+++ b/configure
@@ -7612,6 +7612,7 @@ for file in .projects .projects.3; do
         case $a in
         *winmain/winmain.pro) continue ;;
         *s60main/s60main.pro) continue ;;
+        *examples/activeqt/*) continue ;;
         */qmake/qmake.pro) continue ;;
         *tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*) SPEC=$QMAKESPEC ;;
         *) SPEC=$XQMAKESPEC ;;
-- 
cgit v0.12


From 41a47906475f3970bd662c3d24e7e642ea65a191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= <joao@abecasis.name>
Date: Wed, 7 Oct 2009 09:44:18 +0200
Subject: Fixing some GCC warnings

Reviewed-by: Markus Goetz
---
 demos/browser/webview.cpp                      | 2 ++
 demos/sub-attaq/graphicsscene.cpp              | 2 +-
 examples/richtext/textobject/svgtextobject.cpp | 4 ++--
 src/corelib/thread/qthread_unix.cpp            | 1 +
 src/dbus/qdbusintegrator.cpp                   | 1 +
 src/gui/painting/qpaintengineex.cpp            | 2 +-
 src/opengl/qpixmapdata_gl.cpp                  | 2 +-
 src/xmlpatterns/data/qvaluefactory.cpp         | 2 +-
 src/xmlpatterns/functions/qsequencefns_p.h     | 1 -
 src/xmlpatterns/schema/qxsdschemaparser.cpp    | 1 +
 10 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/demos/browser/webview.cpp b/demos/browser/webview.cpp
index e1d9b12..754fedc 100644
--- a/demos/browser/webview.cpp
+++ b/demos/browser/webview.cpp
@@ -151,6 +151,8 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply)
     QFile file(QLatin1String(":/notfound.html"));
     bool isOpened = file.open(QIODevice::ReadOnly);
     Q_ASSERT(isOpened);
+    Q_UNUSED(isOpened)
+
     QString title = tr("Error loading page: %1").arg(reply->url().toString());
     QString html = QString(QLatin1String(file.readAll()))
                         .arg(title)
diff --git a/demos/sub-attaq/graphicsscene.cpp b/demos/sub-attaq/graphicsscene.cpp
index 812eadf..e29095e 100644
--- a/demos/sub-attaq/graphicsscene.cpp
+++ b/demos/sub-attaq/graphicsscene.cpp
@@ -129,7 +129,7 @@ void GraphicsScene::setupScene(QAction *newAction, QAction *quitAction)
 {
     static const int nLetters = 10;
     static struct {
-        char *pix;
+        char const *pix;
         qreal initX, initY;
         qreal destX, destY;
     } logoData[nLetters] = {
diff --git a/examples/richtext/textobject/svgtextobject.cpp b/examples/richtext/textobject/svgtextobject.cpp
index f5810b6..cf0b0ba 100644
--- a/examples/richtext/textobject/svgtextobject.cpp
+++ b/examples/richtext/textobject/svgtextobject.cpp
@@ -46,7 +46,7 @@
 #include "window.h"
 
 //![0]
-QSizeF SvgTextObject::intrinsicSize(QTextDocument *doc, int posInDocument,
+QSizeF SvgTextObject::intrinsicSize(QTextDocument * /*doc*/, int /*posInDocument*/,
                                     const QTextFormat &format)
 {
     QImage bufferedImage = qVariantValue<QImage>(format.property(Window::SvgData));
@@ -61,7 +61,7 @@ QSizeF SvgTextObject::intrinsicSize(QTextDocument *doc, int posInDocument,
 
 //![1]
 void SvgTextObject::drawObject(QPainter *painter, const QRectF &rect,
-                               QTextDocument *doc, int posInDocument,
+                               QTextDocument * /*doc*/, int /*posInDocument*/,
                                const QTextFormat &format)
 {
     QImage bufferedImage = qVariantValue<QImage>(format.property(Window::SvgData));
diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp
index c590553..21b5e65 100644
--- a/src/corelib/thread/qthread_unix.cpp
+++ b/src/corelib/thread/qthread_unix.cpp
@@ -624,6 +624,7 @@ void QThread::setTerminationEnabled(bool enabled)
     Q_ASSERT_X(thr != 0, "QThread::setTerminationEnabled()",
                "Current thread was not started with QThread.");
 #ifndef Q_OS_SYMBIAN
+    Q_UNUSED(thr)
     pthread_setcancelstate(enabled ? PTHREAD_CANCEL_ENABLE : PTHREAD_CANCEL_DISABLE, NULL);
     if (enabled)
         pthread_testcancel();
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 8143cba..fb2dd77 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -923,6 +923,7 @@ QDBusConnectionPrivate::QDBusConnectionPrivate(QObject *p)
     static const bool threads = q_dbus_threads_init_default();
     static const int debugging = ::isDebugging = qgetenv("QDBUS_DEBUG").toInt();
     Q_UNUSED(threads)
+    Q_UNUSED(debugging)
 
 #ifdef QDBUS_THREAD_DEBUG
     if (debugging > 1)
diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp
index d712669..195be0a 100644
--- a/src/gui/painting/qpaintengineex.cpp
+++ b/src/gui/painting/qpaintengineex.cpp
@@ -932,7 +932,7 @@ void QPaintEngineEx::drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, con
     fill(path, brush);
 }
 
-void QPaintEngineEx::drawPixmaps(const QDrawPixmaps::Data *drawingData, int dataCount, const QPixmap &pixmap, QDrawPixmaps::DrawingHints hints)
+void QPaintEngineEx::drawPixmaps(const QDrawPixmaps::Data *drawingData, int dataCount, const QPixmap &pixmap, QDrawPixmaps::DrawingHints /*hints*/)
 {
     qreal oldOpacity = state()->opacity;
     QTransform oldTransform = state()->matrix;
diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp
index ae4bed0..cbb310b 100644
--- a/src/opengl/qpixmapdata_gl.cpp
+++ b/src/opengl/qpixmapdata_gl.cpp
@@ -318,7 +318,7 @@ void QGLPixmapData::ensureCreated() const
 }
 
 void QGLPixmapData::fromImage(const QImage &image,
-                              Qt::ImageConversionFlags flags)
+                              Qt::ImageConversionFlags /*flags*/)
 {
     if (image.size() == QSize(w, h))
         setSerialNumber(++qt_gl_pixmap_serial);
diff --git a/src/xmlpatterns/data/qvaluefactory.cpp b/src/xmlpatterns/data/qvaluefactory.cpp
index bac53b2..8f7e5a3 100644
--- a/src/xmlpatterns/data/qvaluefactory.cpp
+++ b/src/xmlpatterns/data/qvaluefactory.cpp
@@ -66,7 +66,7 @@ public:
     }
 
     AtomicValue::Ptr operator()(const AtomicValue::Ptr &lexicalValue,
-                                const SchemaType::Ptr &type,
+                                const SchemaType::Ptr & /*type*/,
                                 const ReportContext::Ptr &context)
     {
         prepareCasting(context, BuiltinTypes::xsString);
diff --git a/src/xmlpatterns/functions/qsequencefns_p.h b/src/xmlpatterns/functions/qsequencefns_p.h
index e406b95..fa799d3 100644
--- a/src/xmlpatterns/functions/qsequencefns_p.h
+++ b/src/xmlpatterns/functions/qsequencefns_p.h
@@ -149,7 +149,6 @@ namespace QPatternist
             // RVCT doesn't like using template parameter in trinary operator when the trinary operator result is
             // passed directly into another constructor. 
             Q_ASSERT(Id == IDExistsFN || Id == IDEmptyFN);
-            
 
             const Expression::Ptr me(FunctionCall::compress(context));
 
diff --git a/src/xmlpatterns/schema/qxsdschemaparser.cpp b/src/xmlpatterns/schema/qxsdschemaparser.cpp
index 8f7b6af..41c6b82 100644
--- a/src/xmlpatterns/schema/qxsdschemaparser.cpp
+++ b/src/xmlpatterns/schema/qxsdschemaparser.cpp
@@ -123,6 +123,7 @@ class ElementNamespaceHandler
             : m_parser(parser)
         {
             Q_ASSERT(m_parser->isStartElement() && (XsdSchemaToken::toToken(m_parser->name()) == tag) && (XsdSchemaToken::toToken(m_parser->namespaceUri()) == XsdSchemaToken::XML_NS_SCHEMA_URI));
+            Q_UNUSED(tag)
             m_parser->m_namespaceSupport.pushContext();
             m_parser->m_namespaceSupport.setPrefixes(m_parser->namespaceDeclarations());
         }
-- 
cgit v0.12


From ba5109e94d35a8c58fc4a4f412a3368bfa8851cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= <joao@abecasis.name>
Date: Wed, 7 Oct 2009 09:45:21 +0200
Subject: Fixing more GCC warnings

Reviewed-by: Marius Storm-Olsen
---
 src/corelib/global/qglobal.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 5720505..df17546 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1615,11 +1615,11 @@ Q_CORE_EXPORT_INLINE QDebug qCritical();
 inline QNoDebug qDebug();
 #endif
 
-#define QT_NO_QDEBUG_MACRO if(1) {} else qDebug
+#define QT_NO_QDEBUG_MACRO while (false) qDebug
 #ifdef QT_NO_DEBUG_OUTPUT
 #  define qDebug QT_NO_QDEBUG_MACRO
 #endif
-#define QT_NO_QWARNING_MACRO if(1) {} else qWarning
+#define QT_NO_QWARNING_MACRO while (false) qWarning
 #ifdef QT_NO_WARNING_OUTPUT
 #  define qWarning QT_NO_QWARNING_MACRO
 #endif
-- 
cgit v0.12


From f250aa63d2f4fd7d7a40977552253bc68c21df29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= <joao@abecasis.name>
Date: Wed, 7 Oct 2009 09:46:06 +0200
Subject: Only a character but could still be interrupted by a signal

Reviewed-by: Brad
---
 src/corelib/kernel/qeventdispatcher_unix.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp
index 5a0afb8..5d206ed 100644
--- a/src/corelib/kernel/qeventdispatcher_unix.cpp
+++ b/src/corelib/kernel/qeventdispatcher_unix.cpp
@@ -939,7 +939,7 @@ void QEventDispatcherUNIX::wakeUp()
     Q_D(QEventDispatcherUNIX);
     if (d->wakeUps.testAndSetAcquire(0, 1)) {
         char c = 0;
-        ::write( d->thread_pipe[1], &c, 1 );
+        qt_safe_write( d->thread_pipe[1], &c, 1 );
     }
 }
 
-- 
cgit v0.12


From fbe25541d84ec719633d97f200c4217b324a0f68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= <joao@abecasis.name>
Date: Wed, 7 Oct 2009 09:49:46 +0200
Subject: The ::reads and ::writes were generating warnings

The ::closes were changed just for fun.

Reviewed-by: Thiago Macieira
---
 src/qt3support/other/q3process_unix.cpp | 91 +++++++++++++++++----------------
 1 file changed, 46 insertions(+), 45 deletions(-)

diff --git a/src/qt3support/other/q3process_unix.cpp b/src/qt3support/other/q3process_unix.cpp
index d42468b..955b65f 100644
--- a/src/qt3support/other/q3process_unix.cpp
+++ b/src/qt3support/other/q3process_unix.cpp
@@ -60,6 +60,7 @@
 #include "qregexp.h"
 #include "private/q3membuf_p.h"
 #include "private/qobject_p.h"
+#include "private/qcore_unix_p.h"
 
 #include <stdlib.h>
 #include <errno.h>
@@ -160,11 +161,11 @@ public:
 	    process->d->proc = 0;
 	}
 	if( socketStdin )
-	    ::close( socketStdin );
+	    qt_safe_close( socketStdin );
 	if( socketStdout )
-	    ::close( socketStdout );
+	    qt_safe_close( socketStdout );
 	if( socketStderr )
-	    ::close( socketStderr );
+	    qt_safe_close( socketStderr );
     }
 
     pid_t pid;
@@ -213,7 +214,7 @@ static void q3process_cleanup()
 }
 
 #ifdef Q_OS_QNX6
-#define BAILOUT close(tmpSocket);close(socketFD[1]);return -1;
+#define BAILOUT qt_safe_close(tmpSocket);qt_safe_close(socketFD[1]);return -1;
 int qnx6SocketPairReplacement (int socketFD[2]) {
     int tmpSocket;
     tmpSocket = socket (AF_INET, SOCK_STREAM, 0);
@@ -252,7 +253,7 @@ int qnx6SocketPairReplacement (int socketFD[2]) {
     if(socketFD[0] == -1) { BAILOUT };
 
     // We're done
-    close(tmpSocket);
+    qt_safe_close(tmpSocket);
 
     // Restore original flags , ie return to blocking
     fcntl(socketFD[1], F_SETFL, originalFlags);
@@ -319,9 +320,9 @@ Q3ProcessManager::~Q3ProcessManager()
     delete procList;
 
     if ( sigchldFd[0] != 0 )
-	::close( sigchldFd[0] );
+	qt_safe_close( sigchldFd[0] );
     if ( sigchldFd[1] != 0 )
-	::close( sigchldFd[1] );
+	qt_safe_close( sigchldFd[1] );
 
     // restore SIGCHLD handler
 #if defined(QT_Q3PROCESS_DEBUG)
@@ -384,7 +385,7 @@ void Q3ProcessManager::sigchldHnd( int fd )
     }
 
     char tmp;
-    ::read( fd, &tmp, sizeof(tmp) );
+    qt_safe_read( fd, &tmp, sizeof(tmp) );
 #if defined(QT_Q3PROCESS_DEBUG)
     qDebug( "Q3ProcessManager::sigchldHnd()" );
 #endif
@@ -434,13 +435,13 @@ void Q3ProcessManager::sigchldHnd( int fd )
 		// close filedescriptors if open, and disable the
 		// socket notifiers
 		if ( proc->socketStdout ) {
-		    ::close( proc->socketStdout );
+		    qt_safe_close( proc->socketStdout );
 		    proc->socketStdout = 0;
 		    if (process->d->notifierStdout)
 			process->d->notifierStdout->setEnabled(false);
 		}
 		if ( proc->socketStderr ) {
-		    ::close( proc->socketStderr );
+		    qt_safe_close( proc->socketStderr );
 		    proc->socketStderr = 0;
 		    if (process->d->notifierStderr)
 			process->d->notifierStderr->setEnabled(false);
@@ -509,7 +510,7 @@ Q3ProcessPrivate::~Q3ProcessPrivate()
 
     if ( proc != 0 ) {
 	if ( proc->socketStdin != 0 ) {
-	    ::close( proc->socketStdin );
+	    qt_safe_close( proc->socketStdin );
 	    proc->socketStdin = 0;
 	}
 	proc->process = 0;
@@ -532,15 +533,15 @@ void Q3ProcessPrivate::closeOpenSocketsForChild()
 {
     if ( procManager != 0 ) {
 	if ( procManager->sigchldFd[0] != 0 )
-	    ::close( procManager->sigchldFd[0] );
+	    qt_safe_close( procManager->sigchldFd[0] );
 	if ( procManager->sigchldFd[1] != 0 )
-	    ::close( procManager->sigchldFd[1] );
+	    qt_safe_close( procManager->sigchldFd[1] );
 
 	// close also the sockets from other Q3Process instances
 	for ( QProc *p=procManager->procList->first(); p!=0; p=procManager->procList->next() ) {
-	    ::close( p->socketStdin );
-	    ::close( p->socketStdout );
-	    ::close( p->socketStderr );
+	    qt_safe_close( p->socketStdin );
+	    qt_safe_close( p->socketStdout );
+	    qt_safe_close( p->socketStderr );
 	}
     }
 }
@@ -569,7 +570,7 @@ static QT_SIGNAL_RETTYPE qt_C_sigchldHnd(QT_SIGNAL_ARGS)
 	return;
 
     char a = 1;
-    ::write( Q3ProcessPrivate::procManager->sigchldFd[0], &a, sizeof(a) );
+    qt_safe_write( Q3ProcessPrivate::procManager->sigchldFd[0], &a, sizeof(a) );
 }
 
 
@@ -682,8 +683,8 @@ bool Q3Process::start( QStringList *env )
     if ( (comms & Stderr) && qnx6SocketPairReplacement(sStderr) == -1 ) {
 #endif
 	if ( comms & Stdin ) {
-	    ::close( sStdin[0] );
-	    ::close( sStdin[1] );
+	    qt_safe_close( sStdin[0] );
+	    qt_safe_close( sStdin[1] );
 	}
 	return false;
     }
@@ -693,12 +694,12 @@ bool Q3Process::start( QStringList *env )
     if ( (comms & Stdout) && qnx6SocketPairReplacement(sStdout) == -1 ) {
 #endif
 	if ( comms & Stdin ) {
-	    ::close( sStdin[0] );
-	    ::close( sStdin[1] );
+	    qt_safe_close( sStdin[0] );
+	    qt_safe_close( sStdin[1] );
 	}
 	if ( comms & Stderr ) {
-	    ::close( sStderr[0] );
-	    ::close( sStderr[1] );
+	    qt_safe_close( sStderr[0] );
+	    qt_safe_close( sStderr[1] );
 	}
 	return false;
     }
@@ -758,15 +759,15 @@ bool Q3Process::start( QStringList *env )
 	// child
 	d->closeOpenSocketsForChild();
 	if ( comms & Stdin ) {
-	    ::close( sStdin[1] );
+	    qt_safe_close( sStdin[1] );
 	    ::dup2( sStdin[0], STDIN_FILENO );
 	}
 	if ( comms & Stdout ) {
-	    ::close( sStdout[0] );
+	    qt_safe_close( sStdout[0] );
 	    ::dup2( sStdout[1], STDOUT_FILENO );
 	}
 	if ( comms & Stderr ) {
-	    ::close( sStderr[0] );
+	    qt_safe_close( sStderr[0] );
 	    ::dup2( sStderr[1], STDERR_FILENO );
 	}
 	if ( comms & DupStderr ) {
@@ -776,7 +777,7 @@ bool Q3Process::start( QStringList *env )
 	::chdir( workingDir.absPath().latin1() );
 #endif
 	if ( fd[0] )
-	    ::close( fd[0] );
+	    qt_safe_close( fd[0] );
 	if ( fd[1] )
 	    ::fcntl( fd[1], F_SETFD, FD_CLOEXEC ); // close on exec shows success
 
@@ -850,8 +851,8 @@ bool Q3Process::start( QStringList *env )
 	}
 	if ( fd[1] ) {
 	    char buf = 0;
-	    ::write( fd[1], &buf, 1 );
-	    ::close( fd[1] );
+	    qt_safe_write( fd[1], &buf, 1 );
+	    qt_safe_close( fd[1] );
 	}
 	::_exit( -1 );
     } else if ( pid == -1 ) {
@@ -861,7 +862,7 @@ bool Q3Process::start( QStringList *env )
 
     // test if exec was successful
     if ( fd[1] )
-	::close( fd[1] );
+	qt_safe_close( fd[1] );
     if ( fd[0] ) {
 	char buf;
 	for ( ;; ) {
@@ -882,13 +883,13 @@ bool Q3Process::start( QStringList *env )
 	    }
 	    break;
 	}
-	::close( fd[0] );
+	qt_safe_close( fd[0] );
     }
 
     d->newProc( pid, this );
 
     if ( comms & Stdin ) {
-	::close( sStdin[0] );
+	qt_safe_close( sStdin[0] );
 	d->proc->socketStdin = sStdin[1];
 
 	// Select non-blocking mode
@@ -904,7 +905,7 @@ bool Q3Process::start( QStringList *env )
 	}
     }
     if ( comms & Stdout ) {
-	::close( sStdout[1] );
+	qt_safe_close( sStdout[1] );
 	d->proc->socketStdout = sStdout[0];
 	d->notifierStdout = new QSocketNotifier( sStdout[0], QSocketNotifier::Read );
 	connect( d->notifierStdout, SIGNAL(activated(int)),
@@ -913,7 +914,7 @@ bool Q3Process::start( QStringList *env )
 	    d->notifierStdout->setEnabled( true );
     }
     if ( comms & Stderr ) {
-	::close( sStderr[1] );
+	qt_safe_close( sStderr[1] );
 	d->proc->socketStderr = sStderr[0];
 	d->notifierStderr = new QSocketNotifier( sStderr[0], QSocketNotifier::Read );
 	connect( d->notifierStderr, SIGNAL(activated(int)),
@@ -934,19 +935,19 @@ error:
     if ( d->procManager )
 	d->procManager->cleanup();
     if ( comms & Stdin ) {
-	::close( sStdin[1] );
-	::close( sStdin[0] );
+	qt_safe_close( sStdin[1] );
+	qt_safe_close( sStdin[0] );
     }
     if ( comms & Stdout ) {
-	::close( sStdout[0] );
-	::close( sStdout[1] );
+	qt_safe_close( sStdout[0] );
+	qt_safe_close( sStdout[1] );
     }
     if ( comms & Stderr ) {
-	::close( sStderr[0] );
-	::close( sStderr[1] );
+	qt_safe_close( sStderr[0] );
+	qt_safe_close( sStderr[1] );
     }
-    ::close( fd[0] );
-    ::close( fd[1] );
+    qt_safe_close( fd[0] );
+    qt_safe_close( fd[1] );
     delete[] arglistQ;
     delete[] arglist;
     return false;
@@ -1049,7 +1050,7 @@ void Q3Process::closeStdin()
 	d->notifierStdin->setEnabled(false);
 	qDeleteInEventHandler(d->notifierStdin);
 	d->notifierStdin = 0;
-	if ( ::close( d->proc->socketStdin ) != 0 ) {
+	if ( qt_safe_close( d->proc->socketStdin ) != 0 ) {
 	    qWarning( "Could not close stdin of child process" );
 	}
 #if defined(QT_Q3PROCESS_DEBUG)
@@ -1115,7 +1116,7 @@ void Q3Process::socketRead( int fd )
 	    d->notifierStdout->setEnabled( false );
 	    qDeleteInEventHandler(d->notifierStdout);
 	    d->notifierStdout = 0;
-	    ::close( d->proc->socketStdout );
+	    qt_safe_close( d->proc->socketStdout );
 	    d->proc->socketStdout = 0;
 	    return;
 	} else if ( fd == d->proc->socketStderr ) {
@@ -1125,7 +1126,7 @@ void Q3Process::socketRead( int fd )
 	    d->notifierStderr->setEnabled( false );
 	    qDeleteInEventHandler(d->notifierStderr);
 	    d->notifierStderr = 0;
-	    ::close( d->proc->socketStderr );
+	    qt_safe_close( d->proc->socketStderr );
 	    d->proc->socketStderr = 0;
 	    return;
 	}
-- 
cgit v0.12


From 81e0167b13abf81bf630281ac940a2b73509ed5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= <joao@abecasis.name>
Date: Wed, 7 Oct 2009 09:53:32 +0200
Subject: The plugindialog was moved to tools/designer/src/lib/shared

Reviewed-by: Friedemann Kleint
---
 tools/designer/translations/translations.pro | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tools/designer/translations/translations.pro b/tools/designer/translations/translations.pro
index a37918c..2323882 100644
--- a/tools/designer/translations/translations.pro
+++ b/tools/designer/translations/translations.pro
@@ -82,7 +82,6 @@ SOURCES += $$APP_DIR/appfontdialog.cpp \
            $$APP_DIR/main.cpp \
            $$APP_DIR/mainwindow.cpp \
            $$APP_DIR/newform.cpp \
-           $$APP_DIR/plugindialog.cpp \
            $$APP_DIR/preferencesdialog.cpp \
            $$APP_DIR/qdesigner_actions.cpp \
            $$APP_DIR/qdesigner_appearanceoptions.cpp \
@@ -100,7 +99,6 @@ HEADERS+=  $$APP_DIR/appfontdialog.h \
            $$APP_DIR/designer_enums.h \
            $$APP_DIR/mainwindow.h \
            $$APP_DIR/newform.h \
-           $$APP_DIR/plugindialog.h \
            $$APP_DIR/preferencesdialog.h \
            $$APP_DIR/qdesigner_actions.h \
            $$APP_DIR/qdesigner_appearanceoptions.h \
@@ -114,8 +112,7 @@ HEADERS+=  $$APP_DIR/appfontdialog.h \
            $$APP_DIR/saveformastemplate.h \
            $$APP_DIR/versiondialog.h
 
-FORMS +=   $$APP_DIR/plugindialog.ui \
-           $$APP_DIR/preferencesdialog.ui \
+FORMS +=   $$APP_DIR/preferencesdialog.ui \
            $$APP_DIR/qdesigner_appearanceoptions.ui \
            $$APP_DIR/saveformastemplate.ui
 
-- 
cgit v0.12


From e9e37393a4c1cfc43b5dca94a832d73cd009d73e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= <joao@abecasis.name>
Date: Wed, 7 Oct 2009 10:05:51 +0200
Subject: Removing errors from the configure step...

Reviewed-by: Thiago Macieira
---
 tools/assistant/translations/qt_help.pro          | 4 +---
 tools/assistant/translations/translations_adp.pro | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/tools/assistant/translations/qt_help.pro b/tools/assistant/translations/qt_help.pro
index 69570d3..0133ea4 100644
--- a/tools/assistant/translations/qt_help.pro
+++ b/tools/assistant/translations/qt_help.pro
@@ -42,11 +42,9 @@ HEADERS += ../lib/qhelpcollectionhandler_p.h \
 TR_DIR = $$PWD/../../../translations
 TRANSLATIONS = \
     $$TR_DIR/qt_help_da.ts \
-    $$TR_DIR/qt_help_de.ts
+    $$TR_DIR/qt_help_de.ts \
     $$TR_DIR/qt_help_ja.ts \
     $$TR_DIR/qt_help_pl.ts \
     $$TR_DIR/qt_help_ru.ts \
     $$TR_DIR/qt_help_zh_CN.ts \
     $$TR_DIR/qt_help_zh_TW.ts
-
-error("This is a dummy profile to be used for translations ONLY.")
diff --git a/tools/assistant/translations/translations_adp.pro b/tools/assistant/translations/translations_adp.pro
index 852bdeb..f8da2e3 100644
--- a/tools/assistant/translations/translations_adp.pro
+++ b/tools/assistant/translations/translations_adp.pro
@@ -39,5 +39,3 @@ TRANSLATIONS = \
     $$TR_DIR/assistant_adp_ru.ts \
     $$TR_DIR/assistant_adp_zh_CN.ts \
     $$TR_DIR/assistant_adp_zh_TW.ts
-
-error("This is a dummy profile to be used for translations ONLY.")
-- 
cgit v0.12


From 038f3eef0f5a0d3012a1529fd4b768bbb9b8fb3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= <joao@abecasis.name>
Date: Wed, 7 Oct 2009 11:58:04 +0200
Subject: Fixing warnings on GCC... (I)

... by establishing a default behaviour for the switch statements that
follow.

Reviewed-by: Kim
---
 src/gui/painting/qdrawutil.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/painting/qdrawutil.cpp b/src/gui/painting/qdrawutil.cpp
index c20d8d8..1182b9a 100644
--- a/src/gui/painting/qdrawutil.cpp
+++ b/src/gui/painting/qdrawutil.cpp
@@ -1147,8 +1147,8 @@ void qDrawBorderPixmap(QPainter *painter, const QRect &targetRect, const QMargin
     yTarget[rows - 1] = targetCenterBottom;
     yTarget[rows] = targetRect.top() + targetRect.height();
 
-    qreal dx;
-    qreal dy;
+    qreal dx = targetCenterWidth;
+    qreal dy = targetCenterHeight;
 
     switch (rules.horizontal) {
     case Qt::StretchTile:
-- 
cgit v0.12


From 3f371e2afc9b680b5747a94df57d29afe01204f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= <joao@abecasis.name>
Date: Wed, 7 Oct 2009 11:59:32 +0200
Subject: Fixing warnings on GCC... (II)

... by establishing a default behaviour for the switch statements that
follow.

Reviewed-by: ck
---
 tools/assistant/lib/qhelpsearchquerywidget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/assistant/lib/qhelpsearchquerywidget.cpp b/tools/assistant/lib/qhelpsearchquerywidget.cpp
index 9ac4a7d..361e9ac 100644
--- a/tools/assistant/lib/qhelpsearchquerywidget.cpp
+++ b/tools/assistant/lib/qhelpsearchquerywidget.cpp
@@ -229,7 +229,7 @@ private:
         const QList<QHelpSearchQuery> &query =
                 queryHist->queries.at(queryHist->curQuery);
         foreach (const QHelpSearchQuery &queryPart, query) {
-            QLineEdit *lineEdit;
+            QLineEdit *lineEdit = 0;
             switch (queryPart.fieldName) {
             case QHelpSearchQuery::DEFAULT:
                 lineEdit = defaultQuery;
-- 
cgit v0.12


From d8e68a95c43d0eef4ac0ebc31c7dd0e6c487e3b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= <joao@abecasis.name>
Date: Wed, 7 Oct 2009 12:00:50 +0200
Subject: Fixing warnings on GCC... (III)

... by establishing a default behaviour for the switch statements that
follow.

Reviewed-by: Thierry Bastian
---
 src/gui/kernel/qsoftkeymanager.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp
index 265f971..cd3ad22 100644
--- a/src/gui/kernel/qsoftkeymanager.cpp
+++ b/src/gui/kernel/qsoftkeymanager.cpp
@@ -112,7 +112,7 @@ QAction *QSoftKeyManager::createAction(StandardSoftKey standardKey, QWidget *act
 {
     const char* text = standardSoftKeyText(standardKey);
     QAction *action = new QAction(QSoftKeyManager::tr(text), actionWidget);
-    QAction::SoftKeyRole softKeyRole;
+    QAction::SoftKeyRole softKeyRole = QAction::NoSoftKey;
     switch (standardKey) {
     case OkSoftKey:
     case SelectSoftKey:
@@ -121,7 +121,6 @@ QAction *QSoftKeyManager::createAction(StandardSoftKey standardKey, QWidget *act
         softKeyRole = QAction::PositiveSoftKey;
         break;
     case CancelSoftKey:
-    default:
         softKeyRole = QAction::NegativeSoftKey;
         break;
     }
-- 
cgit v0.12


From 95ec7681b70933ce61ef198ed60a375b7393a395 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= <joao@abecasis.name>
Date: Wed, 7 Oct 2009 10:04:33 +0200
Subject: Check the result of scanf

Fixes a warning with GCC.

Reviewed-by: Markus Goetz
---
 tools/porting/src/filewriter.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/tools/porting/src/filewriter.cpp b/tools/porting/src/filewriter.cpp
index ee8debb..99bd6e7 100644
--- a/tools/porting/src/filewriter.cpp
+++ b/tools/porting/src/filewriter.cpp
@@ -44,6 +44,7 @@
 #include <QFileInfo>
 #include <QDir>
 #include <ctype.h>
+#include <errno.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -106,11 +107,18 @@ FileWriter::WriteResult FileWriter::writeFile(QString filePath, QByteArray conte
             char answer = 0;
             while (answer != 'y' && answer != 'n' && answer != 'a') {
 #if defined(Q_OS_WIN) && defined(_MSC_VER) && _MSC_VER >= 1400
-                scanf_s("%c", &answer);
+                int result = scanf_s("%c", &answer);
 #else
-                scanf("%c", &answer);
+                int result = scanf("%c", &answer);
 #endif
-                answer = tolower(answer);
+                if (1 == result)
+                    answer = tolower(answer);
+                else if (EOF == result) {
+                    if (EINTR == errno || EILSEQ == errno)
+                        continue;
+
+                    answer = 'n';
+                }
             }
 
             if(answer == 'n')
-- 
cgit v0.12


From 9c23f571341811b07606db79dd4a4d44ff98acc1 Mon Sep 17 00:00:00 2001
From: Janne Koskinen <janne.p.koskinen@digia.com>
Date: Tue, 6 Oct 2009 15:27:30 +0000
Subject: 2009-10-06 Janne Koskinen <janne.p.koskinen@digia.com>

Reviewed by Simon Hausmann.

        [Qt] don't enable input methods on Symbian by default.
        https://bugs.webkit.org/show_bug.cgi?id=30117

        If input methods are enabled Symbian FEP will be launched on every
        pointer event making webpage navigation impossible with QWebView.

        * Api/qwebview.cpp:
        (QWebView::QWebView):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49188 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp |  2 +-
 src/3rdparty/webkit/WebKit/qt/ChangeLog        | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
index 3c5f89f..882f3d7 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
@@ -198,7 +198,7 @@ QWebView::QWebView(QWidget *parent)
 {
     d = new QWebViewPrivate(this);
 
-#if !defined(Q_WS_QWS)
+#if !defined(Q_WS_QWS) && !defined(Q_OS_SYMBIAN)
     setAttribute(Qt::WA_InputMethodEnabled);
 #endif
 
diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog
index fd2768c..99ddaa5 100644
--- a/src/3rdparty/webkit/WebKit/qt/ChangeLog
+++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-06  Janne Koskinen  <janne.p.koskinen@digia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] don't enable input methods on Symbian by default.
+        https://bugs.webkit.org/show_bug.cgi?id=30117
+
+        If input methods are enabled Symbian FEP will be launched on every
+        pointer event making webpage navigation impossible with QWebView.
+
+        * Api/qwebview.cpp:
+        (QWebView::QWebView):
+
 2009-10-01  Simon Hausmann  <simon.hausmann@nokia.com>
 
         Reviewed by Tor Arne Vestbø.
-- 
cgit v0.12


From d73ea9d00fec200b2dd6de5e4c8f298caffa4aca Mon Sep 17 00:00:00 2001
From: Janne Koskinen <janne.p.koskinen@digia.com>
Date: Wed, 7 Oct 2009 10:58:16 +0000
Subject: 2009-10-07 Janne Koskinen <janne.p.koskinen@digia.com>

Reviewed by Simon Hausmann.

        [Qt] Symbian SBSv2 .data segment adress fix
        https://bugs.webkit.org/show_bug.cgi?id=30157

        RO-section in qtwebkit.dll exceeds allocated space in SBSv2. Move RW-section
        base address to start from 0x800000 instead of the toolchain default 0x400000

        * WebCore.pro:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49239 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 src/3rdparty/webkit/WebCore/ChangeLog   | 12 ++++++++++++
 src/3rdparty/webkit/WebCore/WebCore.pro |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog
index aacc3dc..4f7dd4f 100644
--- a/src/3rdparty/webkit/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-07  Janne Koskinen  <janne.p.koskinen@digia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Symbian SBSv2 .data segment adress fix
+        https://bugs.webkit.org/show_bug.cgi?id=30157
+
+        RO-section in qtwebkit.dll exceeds allocated space in SBSv2. Move RW-section
+        base address to start from 0x800000 instead of the toolchain default 0x400000
+
+        * WebCore.pro:
+
 2009-09-29  Dave Hyatt  <hyatt@apple.com>
 
         Reviewed by Jon Honeycutt.
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index bc22b7a..1c39bb8 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -13,6 +13,9 @@ symbian: {
 
     TARGET.UID3 = 0x200267C2
 }
+# RO-section in qtwebkit.dll exceeds allocated space in SBSv2. Move RW-section
+# base address to start from 0x800000 instead of the toolchain default 0x400000.
+symbian-sbsv2: MMP_RULES += "LINKEROPTION  armcc --rw-base 0x800000"
 
 include($$PWD/../WebKit.pri)
 
-- 
cgit v0.12


From 342fcb287b09d016d482e25482ddd1b36e2983a3 Mon Sep 17 00:00:00 2001
From: Shane Kearns <shane.kearns@sosco.com>
Date: Wed, 7 Oct 2009 12:58:57 +0200
Subject: Fix linker error with Symbian/ARM RVCT ABIv2 toolchain

Not exporting the whole class prevents the capabilities example from
linking, because the vtable is not exported.
Changing from member exports to exporting the class also fixes the GCC
3.4.x compiler error.

Task-number: QTBUG-4593
Reviewed-by: Thiago
---
 src/3rdparty/phonon/phonon/objectdescriptionmodel.h | 16 ++++------------
 src/s60installs/eabi/phononu.def                    | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/3rdparty/phonon/phonon/objectdescriptionmodel.h b/src/3rdparty/phonon/phonon/objectdescriptionmodel.h
index ba3cb42..9af2615 100644
--- a/src/3rdparty/phonon/phonon/objectdescriptionmodel.h
+++ b/src/3rdparty/phonon/phonon/objectdescriptionmodel.h
@@ -175,26 +175,18 @@ namespace Phonon
      * \author Matthias Kretz <kretz@kde.org>
      */
     template<ObjectDescriptionType type>
-    class ObjectDescriptionModel : public QAbstractListModel
+    class PHONON_EXPORT ObjectDescriptionModel : public QAbstractListModel
     {
         public:
             Q_OBJECT_CHECK
 
-/* MinGW 3.4.x gives an ICE when trying to instantiate one of the
-   ObjectDescriptionModel<foo> classes because it can't handle
-   half exported classes correct. gcc 4.3.x has a fix for this but
-   we currently there's no official gcc 4.3 on windows available.
-   Because of this we need this little hack
- */
-#if !defined(Q_CC_MINGW) || __MINGW32_MAJOR_VERSION >= 4
             /** \internal */
-            static PHONON_EXPORT const QMetaObject staticMetaObject;
+            static const QMetaObject staticMetaObject;
             /** \internal */
-            PHONON_EXPORT const QMetaObject *metaObject() const;
+            const QMetaObject *metaObject() const;
             /** \internal */
-            PHONON_EXPORT void *qt_metacast(const char *_clname);
+            void *qt_metacast(const char *_clname);
             //int qt_metacall(QMetaObject::Call _c, int _id, void **_a);
-#endif
 
             /**
              * Returns the number of rows in the model. This value corresponds
diff --git a/src/s60installs/eabi/phononu.def b/src/s60installs/eabi/phononu.def
index d407ba4..d70942c 100644
--- a/src/s60installs/eabi/phononu.def
+++ b/src/s60installs/eabi/phononu.def
@@ -495,11 +495,11 @@ EXPORTS
 	_ZTIN6Phonon19AbstractVideoOutputE @ 494 NONAME
 	_ZTIN6Phonon19BackendCapabilities8NotifierE @ 495 NONAME ABSENT
 	_ZTIN6Phonon22MediaControllerPrivateE @ 496 NONAME ABSENT
-	_ZTIN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE0EEE @ 497 NONAME ABSENT
-	_ZTIN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE1EEE @ 498 NONAME ABSENT
-	_ZTIN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE2EEE @ 499 NONAME ABSENT
-	_ZTIN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE3EEE @ 500 NONAME ABSENT
-	_ZTIN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE4EEE @ 501 NONAME ABSENT
+	_ZTIN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE0EEE @ 497 NONAME
+	_ZTIN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE1EEE @ 498 NONAME
+	_ZTIN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE2EEE @ 499 NONAME
+	_ZTIN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE3EEE @ 500 NONAME
+	_ZTIN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE4EEE @ 501 NONAME
 	_ZTIN6Phonon24VolumeFaderEffectPrivateE @ 502 NONAME ABSENT
 	_ZTIN6Phonon26AbstractAudioOutputPrivateE @ 503 NONAME ABSENT
 	_ZTIN6Phonon26AbstractMediaStreamPrivateE @ 504 NONAME
@@ -532,11 +532,11 @@ EXPORTS
 	_ZTVN6Phonon19AbstractVideoOutputE @ 531 NONAME
 	_ZTVN6Phonon19BackendCapabilities8NotifierE @ 532 NONAME ABSENT
 	_ZTVN6Phonon22MediaControllerPrivateE @ 533 NONAME ABSENT
-	_ZTVN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE0EEE @ 534 NONAME ABSENT
-	_ZTVN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE1EEE @ 535 NONAME ABSENT
-	_ZTVN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE2EEE @ 536 NONAME ABSENT
-	_ZTVN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE3EEE @ 537 NONAME ABSENT
-	_ZTVN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE4EEE @ 538 NONAME ABSENT
+	_ZTVN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE0EEE @ 534 NONAME
+	_ZTVN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE1EEE @ 535 NONAME
+	_ZTVN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE2EEE @ 536 NONAME
+	_ZTVN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE3EEE @ 537 NONAME
+	_ZTVN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE4EEE @ 538 NONAME
 	_ZTVN6Phonon24VolumeFaderEffectPrivateE @ 539 NONAME ABSENT
 	_ZTVN6Phonon26AbstractAudioOutputPrivateE @ 540 NONAME ABSENT
 	_ZTVN6Phonon26AbstractMediaStreamPrivateE @ 541 NONAME
-- 
cgit v0.12


From 136f866f405a60ddbc48e4c666a0fec484f24717 Mon Sep 17 00:00:00 2001
From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Date: Wed, 7 Oct 2009 13:25:32 +0200
Subject: Revert "There's no need to include qstringmatcher.h in qstringlist.h"

Source-incompatible change

This reverts commit 8714892977269591bb9b348c6eb549a7f2c45cbc.

Rev-by: Trustme
---
 src/corelib/tools/qstringlist.cpp | 1 -
 src/corelib/tools/qstringlist.h   | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp
index f5b2a59..ce39b47 100644
--- a/src/corelib/tools/qstringlist.cpp
+++ b/src/corelib/tools/qstringlist.cpp
@@ -41,7 +41,6 @@
 
 #include <qstringlist.h>
 #include <qset.h>
-#include <qstringmatcher.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/tools/qstringlist.h
index c959209..2a2a1d7 100644
--- a/src/corelib/tools/qstringlist.h
+++ b/src/corelib/tools/qstringlist.h
@@ -47,6 +47,7 @@
 #include <QtCore/qlist.h>
 #include <QtCore/qregexp.h>
 #include <QtCore/qstring.h>
+#include <QtCore/qstringmatcher.h>
 #ifdef QT_INCLUDE_COMPAT
 #include <Qt3Support/q3valuelist.h>
 #endif
-- 
cgit v0.12


From 2c579ce42d89ad4cb8c03231b41ae496f24fad4b Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Tue, 6 Oct 2009 09:12:58 +0200
Subject: Prevented deployment of QtScript when not compiling that module.

RevBy:    Miikka Heikkinen
---
 src/s60installs/s60installs.pro | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index 3aef05e..7233e8a 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -19,7 +19,6 @@ symbian: {
         QtXml.dll \
         QtGui.dll \
         QtNetwork.dll \
-        QtScript.dll \
         QtTest.dll \
         QtSql.dll
 
@@ -94,6 +93,10 @@ symbian: {
        qtlibraries.sources += Phonon.dll
     }
 
+    contains(QT_CONFIG, script): {
+        qtlibraries.sources += QtScript.dll
+    }
+
     contains(QT_CONFIG, webkit): {
         qtlibraries.sources += QtWebKit.dll
     }
-- 
cgit v0.12


From 330dc1e5895a8950615a9bbf26154f5387b023b1 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Tue, 6 Oct 2009 17:05:50 +0200
Subject: Fixed a crash bug on S60 SDK 3.1.

The crash was caused by the image data not being locked before being
accessed.

Also avoided an unnecessary detach copy by making the image variable
a reference.

RevBy:    Jani Hautakangas
Task:     QTBUG-4705
AutoTest: QWidget passed
---
 src/gui/painting/qwindowsurface_s60.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gui/painting/qwindowsurface_s60.cpp b/src/gui/painting/qwindowsurface_s60.cpp
index 664ad48..dc4e43b 100644
--- a/src/gui/painting/qwindowsurface_s60.cpp
+++ b/src/gui/painting/qwindowsurface_s60.cpp
@@ -85,7 +85,9 @@ QS60WindowSurface::~QS60WindowSurface()
 void QS60WindowSurface::beginPaint(const QRegion &rgn)
 {
     if (!qt_widget_private(window())->isOpaque) {
-        QImage image = static_cast<QS60PixmapData *>(d_ptr->device.data_ptr().data())->image;
+        QS60PixmapData *pixmapData = static_cast<QS60PixmapData *>(d_ptr->device.data_ptr().data());
+        pixmapData->beginDataAccess();
+        QImage &image = pixmapData->image;
         QRgb *data = reinterpret_cast<QRgb *>(image.bits());
         const int row_stride = image.bytesPerLine() / 4;
 
@@ -103,6 +105,7 @@ void QS60WindowSurface::beginPaint(const QRegion &rgn)
                 row += row_stride;
             }
         }
+        pixmapData->endDataAccess();
     }
 }
 
-- 
cgit v0.12


From 5ce632d3a8354f118225911103628e602559124e Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Wed, 7 Oct 2009 11:32:30 +0200
Subject: Fixed deployment when using cetest.

Cetest (and other programs that upload dlls manually without using a
package) need to deploy some plugins for specific tests. If those
tests are deployed in a normal package however, the installation will
fail because the plugins are already included in the Qt installation.
Fixed that by putting the deployment inside a scope that cetest will
define.

RevBy:    Miikka Heikkinen
---
 tests/auto/qicoimageformat/qicoimageformat.pro                |  9 ++++++---
 tests/auto/qicon/qicon.pro                                    |  9 ++++++---
 tests/auto/qimage/qimage.pro                                  |  9 ++++++---
 tests/auto/qimagereader/qimagereader.pro                      | 10 +++++++---
 tests/auto/qimagewriter/qimagewriter.pro                      |  9 ++++++---
 tests/auto/qitemmodel/qitemmodel.pro                          | 10 ++++++----
 tests/auto/qmovie/qmovie.pro                                  | 10 ++++++----
 tests/auto/qsql/qsql.pro                                      | 10 ++++++----
 tests/auto/qsqldatabase/qsqldatabase.pro                      | 10 ++++++----
 tests/auto/qsqldriver/qsqldriver.pro                          | 10 ++++++----
 tests/auto/qsqlerror/qsqlerror.pro                            | 10 ++++++----
 tests/auto/qsqlfield/qsqlfield.pro                            | 10 ++++++----
 tests/auto/qsqlquery/qsqlquery.pro                            | 10 ++++++----
 tests/auto/qsqlquerymodel/qsqlquerymodel.pro                  | 10 ++++++----
 tests/auto/qsqlrecord/qsqlrecord.pro                          | 11 +++++++----
 .../qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro     | 10 ++++++----
 tests/auto/qsqltablemodel/qsqltablemodel.pro                  | 10 ++++++----
 tests/auto/qsqlthread/qsqlthread.pro                          | 10 ++++++----
 tests/auto/qtextstream/test/test.pro                          |  8 +++++---
 19 files changed, 115 insertions(+), 70 deletions(-)

diff --git a/tests/auto/qicoimageformat/qicoimageformat.pro b/tests/auto/qicoimageformat/qicoimageformat.pro
index c0aa4b5..b9c8622 100644
--- a/tests/auto/qicoimageformat/qicoimageformat.pro
+++ b/tests/auto/qicoimageformat/qicoimageformat.pro
@@ -15,9 +15,12 @@ wince*: {
 } else:symbian* {
    addFiles.sources = icons
    addFiles.path = .
-   addPlugins.sources = qico.dll
-   addPlugins.path = imageformats
-   DEPLOYMENT += addFiles addPlugins
+   DEPLOYMENT += addFiles
+   qt_not_deployed {
+      addPlugins.sources = qico.dll
+      addPlugins.path = imageformats
+      DEPLOYMENT += addPlugins
+   }
    TARGET.UID3 = 0xE0340004
    DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x",""))
 } else {
diff --git a/tests/auto/qicon/qicon.pro b/tests/auto/qicon/qicon.pro
index 8ae252f..68b888d 100644
--- a/tests/auto/qicon/qicon.pro
+++ b/tests/auto/qicon/qicon.pro
@@ -18,9 +18,12 @@ wince* {
    QT += xml svg
    addFiles.sources =  *.png tst_qicon.cpp *.svg *.svgz
    addFiles.path = .
-   plugins.sources = qsvgicon.dll
-   plugins.path = iconengines
-   DEPLOYMENT += addFiles plugins
+   DEPLOYMENT += addFiles
+   qt_not_deployed {
+      plugins.sources = qsvgicon.dll
+      plugins.path = iconengines
+      DEPLOYMENT += plugins
+   }
 } else {
    DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
diff --git a/tests/auto/qimage/qimage.pro b/tests/auto/qimage/qimage.pro
index 69d6f0f..3e0bd69 100644
--- a/tests/auto/qimage/qimage.pro
+++ b/tests/auto/qimage/qimage.pro
@@ -10,9 +10,12 @@ wince*: {
    TARGET.EPOCHEAPSIZE = 0x200000 0x800000
    addImages.sources = images/*
    addImages.path = images
-   imagePlugins.sources = qjpeg.dll qgif.dll qmng.dll qtiff.dll qico.dll
-   imagePlugins.path = imageformats
-   DEPLOYMENT += addImages imagePlugins
+   DEPLOYMENT += addImages
+   qt_not_deployed {
+      imagePlugins.sources = qjpeg.dll qgif.dll qmng.dll qtiff.dll qico.dll
+      imagePlugins.path = imageformats
+      DEPLOYMENT += imagePlugins
+   }
 } else {
    contains(QT_CONFIG, qt3support): QT += qt3support
    DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/qimagereader/qimagereader.pro b/tests/auto/qimagereader/qimagereader.pro
index 31a9b0f..5b061b0 100644
--- a/tests/auto/qimagereader/qimagereader.pro
+++ b/tests/auto/qimagereader/qimagereader.pro
@@ -30,8 +30,12 @@ symbian*: {
     images.sources = images
     images.path = .
 
-    imagePlugins.sources = qjpeg.dll qgif.dll qmng.dll
-    imagePlugins.path = imageformats
+    DEPLOYMENT += images
 
-    DEPLOYMENT += images imagePlugins
+    qt_not_deployed {
+        imagePlugins.sources = qjpeg.dll qgif.dll qmng.dll
+        imagePlugins.path = imageformats
+
+        DEPLOYMENT += imagePlugins
+    }
 }
diff --git a/tests/auto/qimagewriter/qimagewriter.pro b/tests/auto/qimagewriter/qimagewriter.pro
index 5a2c908..8da2942 100644
--- a/tests/auto/qimagewriter/qimagewriter.pro
+++ b/tests/auto/qimagewriter/qimagewriter.pro
@@ -13,9 +13,12 @@ wince*: {
 } else:symbian* {
    addFiles.sources = images\*.*
    addFiles.path = images
-   imagePlugins.sources = qjpeg.dll qtiff.dll
-   imagePlugins.path = imageformats
-   DEPLOYMENT += addFiles imagePlugins
+   DEPLOYMENT += addFiles
+   qt_not_deployed {
+      imagePlugins.sources = qjpeg.dll qtiff.dll
+      imagePlugins.path = imageformats
+      DEPLOYMENT += imagePlugins
+   }
 } else {
    DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
diff --git a/tests/auto/qitemmodel/qitemmodel.pro b/tests/auto/qitemmodel/qitemmodel.pro
index eb62b24..2d0bdea 100644
--- a/tests/auto/qitemmodel/qitemmodel.pro
+++ b/tests/auto/qitemmodel/qitemmodel.pro
@@ -16,9 +16,11 @@ QT += sql
 
 symbian {
     TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb"
-    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
-        sqlite.path = /sys/bin
-        sqlite.sources = sqlite3.dll 
-        DEPLOYMENT += sqlite
+    qt_not_deployed {
+        contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+            sqlite.path = /sys/bin
+            sqlite.sources = sqlite3.dll
+            DEPLOYMENT += sqlite
+        }
     }
 }
diff --git a/tests/auto/qmovie/qmovie.pro b/tests/auto/qmovie/qmovie.pro
index 15f0c83..30e5901 100644
--- a/tests/auto/qmovie/qmovie.pro
+++ b/tests/auto/qmovie/qmovie.pro
@@ -18,7 +18,9 @@ symbian*: {
    addFiles.path = animations
    DEPLOYMENT += addFiles
 
-   imagePlugins.sources = qjpeg.dll qgif.dll qmng.dll
-   imagePlugins.path = imageformats
-   DEPLOYMENT += imagePlugins
-}
\ No newline at end of file
+   qt_not_deployed {
+      imagePlugins.sources = qjpeg.dll qgif.dll qmng.dll
+      imagePlugins.path = imageformats
+      DEPLOYMENT += imagePlugins
+   }
+}
diff --git a/tests/auto/qsql/qsql.pro b/tests/auto/qsql/qsql.pro
index 167a38d..0ec581d 100644
--- a/tests/auto/qsql/qsql.pro
+++ b/tests/auto/qsql/qsql.pro
@@ -10,9 +10,11 @@ wince*: {
 }
 
 symbian {
-    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
-        sqlite.path = /sys/bin
-        sqlite.sources = sqlite3.dll
-        DEPLOYMENT += sqlite
+    qt_not_deployed {
+        contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+            sqlite.path = /sys/bin
+            sqlite.sources = sqlite3.dll
+            DEPLOYMENT += sqlite
+        }
     }
 }
diff --git a/tests/auto/qsqldatabase/qsqldatabase.pro b/tests/auto/qsqldatabase/qsqldatabase.pro
index 964c8c9..6381219 100644
--- a/tests/auto/qsqldatabase/qsqldatabase.pro
+++ b/tests/auto/qsqldatabase/qsqldatabase.pro
@@ -23,10 +23,12 @@ symbian {
 	TARGET.EPOCHEAPSIZE=5000 5000000
 	TARGET.EPOCSTACKSIZE=50000
 
-    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
-        sqlite.path = /sys/bin
-        sqlite.sources = sqlite3.dll
-        DEPLOYMENT += sqlite
+    qt_not_deployed {
+        contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+            sqlite.path = /sys/bin
+            sqlite.sources = sqlite3.dll
+            DEPLOYMENT += sqlite
+        }
     }
 }
 
diff --git a/tests/auto/qsqldriver/qsqldriver.pro b/tests/auto/qsqldriver/qsqldriver.pro
index 7f289a6..d04ca83 100644
--- a/tests/auto/qsqldriver/qsqldriver.pro
+++ b/tests/auto/qsqldriver/qsqldriver.pro
@@ -17,9 +17,11 @@ wince*: {
 }
 
 symbian {
-    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
-        sqlite.path = /sys/bin
-        sqlite.sources = sqlite3.dll
-        DEPLOYMENT += sqlite
+    qt_not_deployed {
+        contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+            sqlite.path = /sys/bin
+            sqlite.sources = sqlite3.dll
+            DEPLOYMENT += sqlite
+        }
     }
 }
diff --git a/tests/auto/qsqlerror/qsqlerror.pro b/tests/auto/qsqlerror/qsqlerror.pro
index 2eb7934..456f585 100644
--- a/tests/auto/qsqlerror/qsqlerror.pro
+++ b/tests/auto/qsqlerror/qsqlerror.pro
@@ -8,9 +8,11 @@ QT = core sql
 SOURCES += tst_qsqlerror.cpp
 
 symbian {
-    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
-        sqlite.path = /sys/bin
-        sqlite.sources = sqlite3.dll
-        DEPLOYMENT += sqlite
+    qt_not_deployed {
+        contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+            sqlite.path = /sys/bin
+            sqlite.sources = sqlite3.dll
+            DEPLOYMENT += sqlite
+        }
     }
 }
diff --git a/tests/auto/qsqlfield/qsqlfield.pro b/tests/auto/qsqlfield/qsqlfield.pro
index 6e5b461..7339854 100644
--- a/tests/auto/qsqlfield/qsqlfield.pro
+++ b/tests/auto/qsqlfield/qsqlfield.pro
@@ -4,10 +4,12 @@ SOURCES  += tst_qsqlfield.cpp
 QT += sql
 
 symbian {
-    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
-        sqlite.path = /sys/bin
-        sqlite.sources = sqlite3.dll
-        DEPLOYMENT += sqlite
+    qt_not_deployed {
+        contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+            sqlite.path = /sys/bin
+            sqlite.sources = sqlite3.dll
+            DEPLOYMENT += sqlite
+        }
     }
 }
 
diff --git a/tests/auto/qsqlquery/qsqlquery.pro b/tests/auto/qsqlquery/qsqlquery.pro
index 494ca4c..97646ed 100644
--- a/tests/auto/qsqlquery/qsqlquery.pro
+++ b/tests/auto/qsqlquery/qsqlquery.pro
@@ -15,9 +15,11 @@ wince*: {
 }
 
 symbian {
-    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
-        sqlite.path = /sys/bin
-        sqlite.sources = sqlite3.dll
-        DEPLOYMENT += sqlite
+    qt_not_deployed {
+        contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+            sqlite.path = /sys/bin
+            sqlite.sources = sqlite3.dll
+            DEPLOYMENT += sqlite
+        }
     }
 }
diff --git a/tests/auto/qsqlquerymodel/qsqlquerymodel.pro b/tests/auto/qsqlquerymodel/qsqlquerymodel.pro
index cd8586c..cda8cab 100644
--- a/tests/auto/qsqlquerymodel/qsqlquerymodel.pro
+++ b/tests/auto/qsqlquerymodel/qsqlquerymodel.pro
@@ -7,10 +7,12 @@ wince*: {
    DEPLOYMENT_PLUGIN += qsqlite
 	LIBS += -lws2
 }else:symbian {
-    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
-        sqlite.path = /sys/bin
-        sqlite.sources = sqlite3.dll
-        DEPLOYMENT += sqlite
+    qt_not_deployed {
+        contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+            sqlite.path = /sys/bin
+            sqlite.sources = sqlite3.dll
+            DEPLOYMENT += sqlite
+        }
     }
 } else {
    win32:LIBS += -lws2_32
diff --git a/tests/auto/qsqlrecord/qsqlrecord.pro b/tests/auto/qsqlrecord/qsqlrecord.pro
index 67e8ab9..7a72075 100644
--- a/tests/auto/qsqlrecord/qsqlrecord.pro
+++ b/tests/auto/qsqlrecord/qsqlrecord.pro
@@ -2,10 +2,13 @@ load(qttest_p4)
 SOURCES  += tst_qsqlrecord.cpp
 
 symbian {
-contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
-    sqlite.path = /sys/bin
-    sqlite.sources = sqlite3.dll
-    DEPLOYMENT += sqlite
+    qt_not_deployed {
+        contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+            sqlite.path = /sys/bin
+            sqlite.sources = sqlite3.dll
+            DEPLOYMENT += sqlite
+        }
+    }
 }
 
 TARGET.EPOCSTACKSIZE=50000
diff --git a/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro b/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
index 2fddd03..ee4f2f0 100644
--- a/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
+++ b/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
@@ -9,10 +9,12 @@ wince*: {
    DEPLOYMENT += plugFiles
    LIBS += -lws2
 }else:symbian {
-    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
-        sqlite.path = /sys/bin
-        sqlite.sources = sqlite3.dll
-        DEPLOYMENT += sqlite
+    qt_not_deployed {
+        contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+            sqlite.path = /sys/bin
+            sqlite.sources = sqlite3.dll
+            DEPLOYMENT += sqlite
+        }
     }
 } else {
    win32-g++ {
diff --git a/tests/auto/qsqltablemodel/qsqltablemodel.pro b/tests/auto/qsqltablemodel/qsqltablemodel.pro
index a046fb1..9a23237 100644
--- a/tests/auto/qsqltablemodel/qsqltablemodel.pro
+++ b/tests/auto/qsqltablemodel/qsqltablemodel.pro
@@ -9,10 +9,12 @@ wince*: {
    DEPLOYMENT += plugFiles
    LIBS += -lws2
 }else:symbian {
-    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
-        sqlite.path = /sys/bin
-        sqlite.sources = sqlite3.dll
-        DEPLOYMENT += sqlite
+    qt_not_deployed {
+        contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+            sqlite.path = /sys/bin
+            sqlite.sources = sqlite3.dll
+            DEPLOYMENT += sqlite
+        }
     }
 }else {
    win32:LIBS += -lws2_32
diff --git a/tests/auto/qsqlthread/qsqlthread.pro b/tests/auto/qsqlthread/qsqlthread.pro
index 2708f1a..5522232 100644
--- a/tests/auto/qsqlthread/qsqlthread.pro
+++ b/tests/auto/qsqlthread/qsqlthread.pro
@@ -10,10 +10,12 @@ wince*: {
    DEPLOYMENT += plugFiles
    LIBS += -lws2
 }else:symbian {
-    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
-        sqlite.path = /sys/bin
-        sqlite.sources = sqlite3.dll
-        DEPLOYMENT += sqlite
+    qt_not_deployed {
+        contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+            sqlite.path = /sys/bin
+            sqlite.sources = sqlite3.dll
+            DEPLOYMENT += sqlite
+        }
     }
 }else {
    win32:LIBS += -lws2_32
diff --git a/tests/auto/qtextstream/test/test.pro b/tests/auto/qtextstream/test/test.pro
index 9f117d5..c70c27b 100644
--- a/tests/auto/qtextstream/test/test.pro
+++ b/tests/auto/qtextstream/test/test.pro
@@ -30,9 +30,11 @@ wince*: {
 }else:symbian {
     load(data_caging_paths)
     # Symbian can't define SRCDIR meaningfully here
-    codecs_plugins.sources = qcncodecs.dll qjpcodecs.dll qtwcodecs.dll qkrcodecs.dll
-    codecs_plugins.path = $$QT_PLUGINS_BASE_DIR/codecs
-    DEPLOYMENT += codecs_plugins
+    qt_not_deployed {
+        codecs_plugins.sources = qcncodecs.dll qjpcodecs.dll qtwcodecs.dll qkrcodecs.dll
+        codecs_plugins.path = $$QT_PLUGINS_BASE_DIR/codecs
+        DEPLOYMENT += codecs_plugins
+    }
 }else {
     DEFINES += SRCDIR=\\\"$$PWD/../\\\"
 }
-- 
cgit v0.12


From 0418d438d1c1acfe2c95ee748c1e7c84a0ee8837 Mon Sep 17 00:00:00 2001
From: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Date: Wed, 7 Oct 2009 12:16:04 +0200
Subject: Fixed initialization of the system locale on Symbian.

Made it thread-safe and actually make sure that we don't initialize the
data several times.

Reviewed-by: axis
---
 src/corelib/tools/qlocale_symbian.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/corelib/tools/qlocale_symbian.cpp b/src/corelib/tools/qlocale_symbian.cpp
index 931fbb4..1660e95 100644
--- a/src/corelib/tools/qlocale_symbian.cpp
+++ b/src/corelib/tools/qlocale_symbian.cpp
@@ -43,6 +43,7 @@
 #include <QLocale>
 #include <QTime>
 #include <QVariant>
+#include <QThread>
 
 #include <e32std.h>
 #include "private/qcore_symbian_p.h"
@@ -773,8 +774,8 @@ static QLocale::MeasurementSystem symbianMeasurementSystem()
 QLocale QSystemLocale::fallbackLocale() const
 {
     // load system data before query calls
-    static bool initDone = false;
-    if (!initDone) {
+    static QBasicAtomicInt initDone = Q_BASIC_ATOMIC_INITIALIZER(0);
+    if (initDone.testAndSetRelaxed(0, 1)) {
         _s60Locale.LoadSystemSettings();
 
         // Initialize platform version dependent function pointers
@@ -794,7 +795,12 @@ QLocale QSystemLocale::fallbackLocale() const
             ptrGetLongDateFormatSpec = &defaultFormatSpec;
         if (!ptrGetShortDateFormatSpec)
             ptrGetShortDateFormatSpec = &defaultFormatSpec;
+        bool ret = initDone.testAndSetRelease(1, 2);
+        Q_ASSERT(ret);
+        Q_UNUSED(ret);
     }
+    while(initDone != 2)
+        QThread::yieldCurrentThread();
 
     TLanguage lang = User::Language();
     QString locale = QLatin1String(qt_symbianLocaleName(lang));
-- 
cgit v0.12


From 1e6d00443428cc9c714ba7e3cf323b3e2684db79 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@nokia.com>
Date: Wed, 7 Oct 2009 13:52:57 +0200
Subject: tests/auto/qscriptengine/qscriptengine.pro Windows CE fix

Reviewed-by: TrustMe
---
 tests/auto/qscriptengine/qscriptengine.pro | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/auto/qscriptengine/qscriptengine.pro b/tests/auto/qscriptengine/qscriptengine.pro
index d4c0f4c..dd058a4 100644
--- a/tests/auto/qscriptengine/qscriptengine.pro
+++ b/tests/auto/qscriptengine/qscriptengine.pro
@@ -1,7 +1,12 @@
 load(qttest_p4)
 QT = core gui script
 SOURCES += tst_qscriptengine.cpp 
-!symbian:DEFINES += SRCDIR=\\\"$$PWD\\\"
+
+wince* {
+    DEFINES += SRCDIR=\\\"./\\\"
+} else:!symbian {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 wince*|symbian*: {
    addFiles.sources = script
-- 
cgit v0.12


From 16c4afe4592587a4bc48ae2170da748e0d149a64 Mon Sep 17 00:00:00 2001
From: Shane Kearns <shane.kearns@sosco.com>
Date: Wed, 7 Oct 2009 13:51:12 +0200
Subject: Fix compile error on Symbian platform

Missing header file, resulting in compiler error about returning
an incomplete type.

Reviewed-by: Trust Me
---
 src/gui/kernel/qguiplatformplugin.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/kernel/qguiplatformplugin.cpp b/src/gui/kernel/qguiplatformplugin.cpp
index cf15aa2..c48b8f6 100644
--- a/src/gui/kernel/qguiplatformplugin.cpp
+++ b/src/gui/kernel/qguiplatformplugin.cpp
@@ -45,6 +45,7 @@
 #include "qstylefactory.h"
 #include "qapplication.h"
 #include "qplatformdefs.h"
+#include "qicon.h"
 
 #ifdef Q_WS_WINCE
 #include "qguifunctions_wince.h"
-- 
cgit v0.12


From 722d351de797135273a05ff0f4c63315bf37592d Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jbache@trolltech.com>
Date: Wed, 16 Sep 2009 13:59:20 +0200
Subject: Fix QDesktopServices::storageLocation() when registry keys are
 missing

We should not use the registry key when looking up the storage
location as this is not really supported by Microsoft and not
allways accessible. Instead we now use SHGetSpecialFolderPath.
Note that we avoid SHGetKnownFolderPath as it is not available
on all CE platforms though it is the reccommended function by
Microsoft.

Task-number: QTBUG-3241
Reviewed-by: prasanth
---
 src/gui/util/qdesktopservices_win.cpp | 66 +++++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 22 deletions(-)

diff --git a/src/gui/util/qdesktopservices_win.cpp b/src/gui/util/qdesktopservices_win.cpp
index 9ae3a15..bf29870 100644
--- a/src/gui/util/qdesktopservices_win.cpp
+++ b/src/gui/util/qdesktopservices_win.cpp
@@ -41,6 +41,7 @@
 
 #include <qsettings.h>
 #include <qdir.h>
+#include <qlibrary.h>
 #include <qurl.h>
 #include <qstringlist.h>
 #include <qprocess.h>
@@ -168,50 +169,72 @@ static bool launchWebBrowser(const QUrl &url)
 
 QString QDesktopServices::storageLocation(StandardLocation type)
 {
-#if !defined(QT_NO_SETTINGS)	
-    QSettings settings(QSettings::UserScope, QLatin1String("Microsoft"), QLatin1String("Windows"));
-    settings.beginGroup(QLatin1String("CurrentVersion/Explorer/Shell Folders"));
+    QString result;
+
+#ifndef Q_OS_WINCE
+        QLibrary library(QLatin1String("shell32"));
+#else
+        QLibrary library(QLatin1String("coredll"));
+#endif // Q_OS_WINCE
+    typedef BOOL (WINAPI*GetSpecialFolderPath)(HWND, LPWSTR, int, BOOL);
+    static GetSpecialFolderPath SHGetSpecialFolderPath =
+            (GetSpecialFolderPath)library.resolve("SHGetSpecialFolderPathW");
+    if (!SHGetSpecialFolderPath)
+        return QString();
+
+    wchar_t path[MAX_PATH];
+
     switch (type) {
-    case CacheLocation:
-        // Although Microsoft has a Cache key it is a pointer to IE's cache, not a cache
-        // location for everyone.  Most applications seem to be using a
-        // cache directory located in their AppData directory
-        return storageLocation(DataLocation) + QLatin1String("\\cache");
     case DataLocation:
-        if (!settings.contains(QLatin1String("Local AppData")))
-            break;
-        return settings.value(QLatin1String("Local AppData")).toString()
-            + QLatin1String("\\") + QCoreApplication::organizationName()
-            + QLatin1String("\\") + QCoreApplication::applicationName();
+        if (SHGetSpecialFolderPath(0, path, CSIDL_LOCAL_APPDATA, FALSE))
+            result = QString::fromWCharArray(path);
+        if (!QCoreApplication::organizationName().isEmpty())
+            result = result + QLatin1String("\\") + QCoreApplication::organizationName();
+        if (!QCoreApplication::applicationName().isEmpty())
+            result = result + QLatin1String("\\") + QCoreApplication::applicationName();
         break;
+
     case DesktopLocation:
-        return settings.value(QLatin1String("Desktop")).toString();
+        if (SHGetSpecialFolderPath(0, path, CSIDL_DESKTOPDIRECTORY, FALSE))
+            result = QString::fromWCharArray(path);
         break;
 
     case DocumentsLocation:
-        return settings.value(QLatin1String("Personal")).toString();
+        if (SHGetSpecialFolderPath(0, path, CSIDL_PERSONAL, FALSE))
+            result = QString::fromWCharArray(path);
         break;
 
     case FontsLocation:
-        return settings.value(QLatin1String("Fonts")).toString();
+        if (SHGetSpecialFolderPath(0, path, CSIDL_FONTS, FALSE))
+            result = QString::fromWCharArray(path);
         break;
 
     case ApplicationsLocation:
-        return settings.value(QLatin1String("Programs")).toString();
+        if (SHGetSpecialFolderPath(0, path, CSIDL_PROGRAMS, FALSE))
+            result = QString::fromWCharArray(path);
         break;
 
     case MusicLocation:
-        return settings.value(QLatin1String("My Music")).toString();
+        if (SHGetSpecialFolderPath(0, path, CSIDL_MYMUSIC, FALSE))
+            result = QString::fromWCharArray(path);
         break;
 
     case MoviesLocation:
-        return settings.value(QLatin1String("My Video")).toString();
+        if (SHGetSpecialFolderPath(0, path, CSIDL_MYVIDEO, FALSE))
+            result = QString::fromWCharArray(path);
         break;
 
     case PicturesLocation:
-        return settings.value(QLatin1String("My Pictures")).toString();
+        if (SHGetSpecialFolderPath(0, path, CSIDL_MYPICTURES, FALSE))
+            result = QString::fromWCharArray(path);
         break;
 
+    case CacheLocation:
+        // Although Microsoft has a Cache key it is a pointer to IE's cache, not a cache
+        // location for everyone.  Most applications seem to be using a
+        // cache directory located in their AppData directory
+        return storageLocation(DataLocation) + QLatin1String("\\cache");
+
     case QDesktopServices::HomeLocation:
         return QDir::homePath(); break;
 
@@ -221,8 +244,7 @@ QString QDesktopServices::storageLocation(StandardLocation type)
     default:
         break;
     }
-#endif
-    return QString();
+    return result;
 }
 
 QString QDesktopServices::displayName(StandardLocation type)
-- 
cgit v0.12


From 75b41faff44a1488d88eca6e910d4b617cb42221 Mon Sep 17 00:00:00 2001
From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Date: Wed, 7 Oct 2009 13:28:25 +0200
Subject: Avoid adding a debug library to the glue projects, when
 debug_and_release

The VCPROJ/SLN generator generates dependencies on the glue project,
so the glue must use the correct library for the dependencies to be
correct. The qtAddLibrary() would add the project 'default' to the
glue, which could end up adding a debug lib to the glue, so the
dependency checker wouldn't find the proper project.

We therefore force qtAddLibrary to only add d/_debug if we're not
using debug_and_release, or not in the glue part

Reviewed-by: Rohan McGovern
---
 mkspecs/features/qt_functions.prf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 243a829..6322233 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -50,7 +50,7 @@ defineTest(qtAddLibrary) {
         INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE
     }
     isEmpty(LINKAGE) {
-       CONFIG(debug, debug|release) {
+       if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
            win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d
            mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug
        }
-- 
cgit v0.12