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: (72 commits)
  Doc: Enabled the context menu in the spreadsheet demo.
  Updated URLs.
  Doc: Applied suggestion for an improvement to the foreach documentation.
  Doc: Added a note about the lack of standard file copy/paste on X11.
  Doc: Fixed the row number for a widget in two parts of the tutorial.
  Doc: Fixed typos.
  Reduce compiling time of QScriptValue autotest suite on Windows.
  Optimize QScriptValue autotest generator.
  Set database write behavior to synchronous=OFF and increase page cache.
  doc: Fixed some qdoc errors.
  Setting ImhHiddenText for NoEcho line edits is not 100% correct, but still way better than fully visible text.
  Allow building documentation without all of Qt
  Added a documentation for the new enum value in gesture api.
  Remove the OBJECTS_DIR variable assignment from some projets in Qt.
  Fix compile
  qmake/MinGw: Link statically for Qt Creator to be able to detect it.
  Enable two fast path for blend_tiled_rgb565
  Avoid QString reallocation for smallcaps fonts in Itemizer::generate()
  Make QLabel::text a reloadable property
  remove non wifi interfaces from being handled.
  ...

3 files changed, 4 insertions, 3 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 2fdd720..63c97e0 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -154,7 +154,6 @@ void QDeclarativeFlickablePrivate::init()
 */
 qreal QDeclarativeFlickablePrivate::overShootDistance(qreal velocity, qreal size)
 {
-    Q_Q(QDeclarativeFlickable);
     if (maxVelocity <= 0)
         return 0.0;
 
diff --git a/src/declarative/util/qdeclarativetimeline_p_p.h b/src/declarative/util/qdeclarativetimeline_p_p.h
index c08c07c..598c897 100644
--- a/src/declarative/util/qdeclarativetimeline_p_p.h
+++ b/src/declarative/util/qdeclarativetimeline_p_p.h
@@ -160,7 +160,7 @@ public:
     QDeclarativeTimeLineObject *callbackObject() const;
 
 private:
-    friend class QDeclarativeTimeLinePrivate; 
+    friend struct QDeclarativeTimeLinePrivate;
     Callback d0;
     void *d1;
     QDeclarativeTimeLineObject *d2;
diff --git a/src/declarative/util/qdeclarativeview.h b/src/declarative/util/qdeclarativeview.h
index 03d8db3..107f3f9 100644
--- a/src/declarative/util/qdeclarativeview.h
+++ b/src/declarative/util/qdeclarativeview.h
@@ -43,6 +43,7 @@
 #define QDECLARATIVEVIEW_H
 
 #include <QtCore/qdatetime.h>
+#include <QtCore/qurl.h>
 #include <QtGui/qgraphicssceneevent.h>
 #include <QtGui/qgraphicsview.h>
 #include <QtGui/qwidget.h>
@@ -64,7 +65,8 @@ class Q_DECLARATIVE_EXPORT QDeclarativeView : public QGraphicsView
     Q_OBJECT
     Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
-
+    Q_PROPERTY(QUrl source READ source WRITE setSource DESIGNABLE true)
+    Q_ENUMS(ResizeMode Status)
 public:
     explicit QDeclarativeView(QWidget *parent = 0);
     QDeclarativeView(const QUrl &source, QWidget *parent = 0);