Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animations

Conflicts:
	src/corelib/kernel/kernel.pri
	src/corelib/kernel/qvariant_p.h
	src/corelib/tools/tools.pri
	src/gui/graphicsview/qgraphicsitem.cpp
	src/gui/graphicsview/qgraphicsitem.h
	src/gui/graphicsview/qgraphicswidget.h
	src/gui/gui.pro

6 files changed, 65 insertions, 20 deletions

diff --git a/doc/src/snippets/code/doc_src_layout.qdoc b/doc/src/snippets/code/doc_src_layout.qdoc
index 48e10e9..60f36b0 100644
--- a/doc/src/snippets/code/doc_src_layout.qdoc
+++ b/doc/src/snippets/code/doc_src_layout.qdoc
@@ -2,23 +2,21 @@
 #ifndef CARD_H
 #define CARD_H
 
-#include <QLayout>
+#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(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);
@@ -31,11 +29,18 @@ private:
 
 
 //! [1]
-#include "card.h"
+//#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
@@ -48,26 +53,28 @@ QLayoutItem *CardLayout::takeAt(int idx)
     // QList::take does not do index checking
     return idx >= 0 && idx < list.size() ? list.takeAt(idx) : 0;
 }
-//! [2]
+//! [3]
 
 
-//! [3]
+//! [4]
 void CardLayout::addItem(QLayoutItem *item)
 {
     list.append(item);
 }
-//! [3]
+//! [4]
 
 
-//! [4]
+//! [5]
 CardLayout::~CardLayout()
 {
-    deleteAllItems();
+     QLayoutItem *item;
+     while ((item = takeAt(0)))
+         delete item;
 }
-//! [4]
+//! [5]
 
 
-//! [5]
+//! [6]
 void CardLayout::setGeometry(const QRect &r)
 {
     QLayout::setGeometry(r);
@@ -85,10 +92,10 @@ void CardLayout::setGeometry(const QRect &r)
         ++i;
     }
 }
-//! [5]
+//! [6]
 
 
-//! [6]
+//! [7]
 QSize CardLayout::sizeHint() const
 {
     QSize s(0,0);
@@ -116,4 +123,4 @@ QSize CardLayout::minimumSize() const
     }
     return s + n*QSize(spacing(), spacing());
 }
-//! [6]
+//! [7]
diff --git a/doc/src/snippets/code/doc_src_stylesheet.qdoc b/doc/src/snippets/code/doc_src_stylesheet.qdoc
index 60622d3..a62148f 100644
--- a/doc/src/snippets/code/doc_src_stylesheet.qdoc
+++ b/doc/src/snippets/code/doc_src_stylesheet.qdoc
@@ -1538,6 +1538,11 @@ QSplitter::handle:horizontal {
 QSplitter::handle:vertical {
     height: 2px;
 }
+
+QSplitter::handle:pressed {
+    url(images/splitter_pressed.png);
+}
+
 //! [142]
 
 
diff --git a/doc/src/snippets/code/src_gui_image_qpixmap.cpp b/doc/src/snippets/code/src_gui_image_qpixmap.cpp
index f86eeae..822b466 100644
--- a/doc/src/snippets/code/src_gui_image_qpixmap.cpp
+++ b/doc/src/snippets/code/src_gui_image_qpixmap.cpp
@@ -10,3 +10,9 @@ static const char * const start_xpm[]={
 QPixmap myPixmap;
 myPixmap->setMask(myPixmap->createHeuristicMask());
 //! [1]
+
+//! [2]
+QPixmap pixmap("background.png");
+QRegion exposed;
+pixmap.scroll(10, 10, pixmap.rect(), &exposed);
+//! [2]
diff --git a/doc/src/snippets/code/src_gui_image_qpixmapcache.cpp b/doc/src/snippets/code/src_gui_image_qpixmapcache.cpp
index c4b6353..2a04f64 100644
--- a/doc/src/snippets/code/src_gui_image_qpixmapcache.cpp
+++ b/doc/src/snippets/code/src_gui_image_qpixmapcache.cpp
@@ -13,7 +13,7 @@ painter->drawPixmap(0, 0, p);
 
 //! [1]
 QPixmap pm;
-if (!QPixmapCache::find("my_big_image", pm)) {
+if (!QPixmapCache::find("my_big_image", &pm)) {
     pm.load("bigimage.png");
     QPixmapCache::insert("my_big_image", pm);
 }
diff --git a/doc/src/snippets/qprocess-environment/main.cpp b/doc/src/snippets/qprocess-environment/main.cpp
index bce3578..148518b 100644
--- a/doc/src/snippets/qprocess-environment/main.cpp
+++ b/doc/src/snippets/qprocess-environment/main.cpp
@@ -43,6 +43,7 @@
 
 void startProcess()
 {
+    {
 //! [0]
 QProcess process;
 QStringList env = QProcess::systemEnvironment();
@@ -51,6 +52,18 @@ env.replaceInStrings(QRegExp("^PATH=(.*)", Qt::CaseInsensitive), "PATH=\\1;C:\\B
 process.setEnvironment(env);
 process.start("myapp");
 //! [0]
+    }
+
+    {
+//! [1]
+QProcess process;
+QHash<QString, QString> env = QProcess::systemEnvironmentHash();
+env.insert("TMPDIR", "C:\\MyApp\\temp"); // Add an environment variable
+env["PATH"] += ";C:\\Bin";
+process.setEnvironment(env);
+process.start("myapp");
+//! [0]
+    }
 }
 
 int main(int argc, char *argv[])
diff --git a/doc/src/snippets/widgets-tutorial/template.cpp b/doc/src/snippets/widgets-tutorial/template.cpp
new file mode 100644
index 0000000..5958676
--- /dev/null
+++ b/doc/src/snippets/widgets-tutorial/template.cpp
@@ -0,0 +1,14 @@
+#include <QtGui>
+
+// Include header files for application components.
+// ...
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    // Set up and show widgets.
+    // ...
+
+    return app.exec();
+}