Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  typo for windows ce exclusion rule
  Updated .gitignore with the new name of the qmlviewer
  Fixed the close button of the find widget in Assistant
  Doc: brief Qt Quick introduction on "What's New" page.
  Interview Demo: Fix warning about pixmap leak on X11.
  Perform latin1 conversion directly on JSC::UString
  Avoid conversion between JavaScriptCore String type and QString
  Doc: Rephrase documentation for QColor::isValidColor and add \since 4.7.
  Use QList::reserve() in QDataStream>>QList
  Added static method isValidColor to QColor.
  compile fix with namespaces
  build fix for WinCE
  qDetectCPUFeatures: compile fix with namespaces
  compile fix for WinCE
  Mac: using Qt to write plugins disables quit for 3rd party application
  doc: Fixed building documentation
  Updated syncqt to use relative include paths on cygwin as well.

2 files changed, 3 insertions, 1 deletions

diff --git a/demos/interview/model.cpp b/demos/interview/model.cpp
index 3f9548a..840bc60 100644
--- a/demos/interview/model.cpp
+++ b/demos/interview/model.cpp
@@ -45,6 +45,7 @@
 
 Model::Model(int rows, int columns, QObject *parent)
     : QAbstractItemModel(parent),
+      services(QPixmap(":/images/services.png")),
       rc(rows), cc(columns),
       tree(new QVector<Node>(rows, Node(0)))
 {
@@ -105,7 +106,6 @@ QVariant Model::data(const QModelIndex &index, int role) const
 
 QVariant Model::headerData(int section, Qt::Orientation orientation, int role) const
 {
-    static QIcon services(QPixmap(":/images/services.png"));
     if (role == Qt::DisplayRole)
         return QString::number(section);
     if (role == Qt::DecorationRole)
diff --git a/demos/interview/model.h b/demos/interview/model.h
index bad83a8..c7c15f7 100644
--- a/demos/interview/model.h
+++ b/demos/interview/model.h
@@ -44,6 +44,7 @@
 
 #include <QAbstractItemModel>
 #include <QFileIconProvider>
+#include <QIcon>
 #include <QVector>
 
 class Model : public QAbstractItemModel
@@ -80,6 +81,7 @@ private:
     Node *parent(Node *child) const;
     int row(Node *node) const;
 
+    QIcon services;
     int rc, cc;
     QVector<Node> *tree;
     QFileIconProvider iconProvider;