Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (174 commits)
  Fixed spelling.
  Fixed many spelling errors.
  Fix warning introduced by last commit on hiding of the 'd' member
  Fix access to uninitialised memory in case of new throwing
  Remove accidentially committed .qmlproject.user file, ignore this filetype
  Corrected build fail for autotests
  QComboBox popup is shown in incorrect location with bottom CBA
  Fix Flipable docs
  Fall back to Qt for loading images with DICAPS_COLORKEY.
  Implement QWidget::metric PdmNumColors for QWS
  Adding ::scroll capabilities to live pixmaps.
  Major refactoring: creating a new QPixmapData subclass for live textures.
  QS60Style: The QComboBox/QSpinBox text color is not according to theme
  Using TLS to store QThreadData on Symbian
  In meego, support Format_RGB32 too for eglShared images.
  Remove unnecessary rounding
  Functions that are externally defined to QtOpenGL needs to be imported.
  Make sure d->ranges does not have invalid ranges before processing it.
  Added include for missing file for Symbian3
  Support for clipboard between Qt and Symbian applications
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/doc/src/snippets/sqldatabase/sqldatabase.cpp b/doc/src/snippets/sqldatabase/sqldatabase.cpp
index abe2a67..a027a84 100644
--- a/doc/src/snippets/sqldatabase/sqldatabase.cpp
+++ b/doc/src/snippets/sqldatabase/sqldatabase.cpp
@@ -280,7 +280,7 @@ QVariant MyModel::data(const QModelIndex &item, int role) const
 void QSqlTableModel_snippets()
 {
 //! [24]
-    QSqlTableModel *model = new QSqlTableModel;
+    QSqlTableModel *model = new QSqlTableModel(parentObject, database);
     model->setTable("employee");
     model->setEditStrategy(QSqlTableModel::OnManualSubmit);
     model->select();