Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (572 commits)
  Fix tst_Q3ProgressBar::setProgress, again
  Disable tst_Q3ComboBox::task231724_clear on Mac
  Fix tst_Q3ProgressBar::setProgress()
  Revert "Fix double painting when adding an item into a linear layout"
  Add missing license headers
  Revert "Fixed a crash in QListView"
  Symbol table is very limited in numeric input mode
  Fix build of Qt/DirectFB without graphics view support.
  Add new QSysInfo::symbianVersion() enums
  QDesktopServices::openUrl() doesn't handle URL encodings correctly
  Build fix for transition effect support on S60 5.0.
  Make EGL surface transparency working on Symbian.
  QmlDebug: Fix license headers in new ost plugin
  Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79
  Resolve unqualified attached properties correctly
  Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian.
  QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'
  QDeclarativeDebug: Don't crash when connection is closed
  Benchmark for layout hierarchies
  Manual test for layout flickering
  ...

1 files changed, 166 insertions, 0 deletions

diff --git a/doc/src/snippets/code/doc_src_layout.cpp b/doc/src/snippets/code/doc_src_layout.cpp
new file mode 100644
index 0000000..47db36b
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_layout.cpp
@@ -0,0 +1,166 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+#ifndef CARD_H
+#define CARD_H
+
+#include <QtGui>
+#include <QList>
+
+class CardLayout : public QLayout
+{
+public:
+    CardLayout(QWidget *parent, int dist): QLayout(parent, 0, dist) {}
+    CardLayout(QLayout *parent, int dist): QLayout(parent, dist) {}
+    CardLayout(int dist): QLayout(dist) {}
+    ~CardLayout();
+
+    void addItem(QLayoutItem *item);
+    QSize sizeHint() const;
+    QSize minimumSize() const;
+	QLayoutItem *count() const;
+    QLayoutItem *itemAt(int) const;
+    QLayoutItem *takeAt(int);
+    void setGeometry(const QRect &rect);
+
+private:
+    QList<QLayoutItem*> list;
+};
+#endif
+//! [0]
+
+
+//! [1]
+//#include "card.h"
+//! [1]
+
+//! [2]
+QLayoutItem *CardLayout::count() const
+{
+	// QList::size() returns the number of QLayoutItems in the list
+    return list.size();
+}
+//! [2]
+
+//! [3]
+QLayoutItem *CardLayout::itemAt(int idx) const
+{
+    // QList::value() performs index checking, and returns 0 if we are
+    // outside the valid range
+    return list.value(idx);
+}
+
+QLayoutItem *CardLayout::takeAt(int idx)
+{
+    // QList::take does not do index checking
+    return idx >= 0 && idx < list.size() ? list.takeAt(idx) : 0;
+}
+//! [3]
+
+
+//! [4]
+void CardLayout::addItem(QLayoutItem *item)
+{
+    list.append(item);
+}
+//! [4]
+
+
+//! [5]
+CardLayout::~CardLayout()
+{
+     QLayoutItem *item;
+     while ((item = takeAt(0)))
+         delete item;
+}
+//! [5]
+
+
+//! [6]
+void CardLayout::setGeometry(const QRect &r)
+{
+    QLayout::setGeometry(r);
+
+    if (list.size() == 0)
+        return;
+
+    int w = r.width() - (list.count() - 1) * spacing();
+    int h = r.height() - (list.count() - 1) * spacing();
+    int i = 0;
+    while (i < list.size()) {
+        QLayoutItem *o = list.at(i);
+        QRect geom(r.x() + i * spacing(), r.y() + i * spacing(), w, h);
+        o->setGeometry(geom);
+        ++i;
+    }
+}
+//! [6]
+
+
+//! [7]
+QSize CardLayout::sizeHint() const
+{
+    QSize s(0,0);
+    int n = list.count();
+    if (n > 0)
+        s = QSize(100,70); //start with a nice default size
+    int i = 0;
+    while (i < n) {
+        QLayoutItem *o = list.at(i);
+        s = s.expandedTo(o->sizeHint());
+        ++i;
+    }
+    return s + n*QSize(spacing(), spacing());
+}
+
+QSize CardLayout::minimumSize() const
+{
+    QSize s(0,0);
+    int n = list.count();
+    int i = 0;
+    while (i < n) {
+        QLayoutItem *o = list.at(i);
+        s = s.expandedTo(o->minimumSize());
+        ++i;
+    }
+    return s + n*QSize(spacing(), spacing());
+}
+//! [7]