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: (34 commits)
  Modified descriptions of QBasicTimer class and isActive() function.
  Translation work for 4.7
  Some more french translations.
  Some french translations
  doc: Re-introduced next/previous page links in the footer.
  Doc: Fixing validation bugs
  Removed duplicate case for const variable snippet.
  doc: Fixed some qdoc errors.
  doc: Fixed some qdoc errors.
  doc: Fixed some qdoc errors.
  doc: Fixed some S60 qdoc errors.
  doc: Fixed some missing images.
  Adding Getting Started files. Auto test passes.
  Changed width of the document. Part of the fix for QTBUG-12180
  Revert "Doc: Adding GS QML example files"
  Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.
  Remove useless QString::clear() from QSharedData example snippet.
  Move note on connectToBus() not actually being able to reconnect to
  Adding a description for the Spectrum Analyzer demo. For QTBUG-12180
  qdoc: added application flags in doc.pri and fixed QTBUG-12388
  ...

2 files changed, 1 insertions, 6 deletions

diff --git a/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp b/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp
index 088e043..0bd5fdf 100644
--- a/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp
+++ b/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp
@@ -87,14 +87,9 @@ void myFunction(bool useSubClass)
     // is equivalent to:
     const QScopedPointer<QWidget> p(new QWidget());
 
-    QWidget *const p = new QWidget();
-    // is equivalent to:
-    const QScopedPointer<QWidget> p(new QWidget());
-
     const QWidget *p = new QWidget();
     // is equivalent to:
     QScopedPointer<const QWidget> p(new QWidget());
-
 //! [2]
 
 //! [3]
diff --git a/doc/src/snippets/sharedemployee/employee.h b/doc/src/snippets/sharedemployee/employee.h
index 18b47e0..2c9ba6f 100644
--- a/doc/src/snippets/sharedemployee/employee.h
+++ b/doc/src/snippets/sharedemployee/employee.h
@@ -48,7 +48,7 @@
 class EmployeeData : public QSharedData
 {
   public:
-    EmployeeData() : id(-1) { name.clear(); }
+    EmployeeData() : id(-1) { }
     EmployeeData(const EmployeeData &other)
         : QSharedData(other), id(other.id), name(other.name) { }
     ~EmployeeData() { }