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.
  ...

1 files changed, 13 insertions, 0 deletions

diff --git a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro
new file mode 100644
index 0000000..b8abe87
--- /dev/null
+++ b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro
@@ -0,0 +1,13 @@
+TEMPLATE    = lib
+TARGET      = qdeclarativeview
+CONFIG     += qt warn_on plugin designer
+QT         += declarative
+
+include(../plugins.pri)
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+SOURCES += qdeclarativeview_plugin.cpp
+HEADERS += qdeclarativeview_plugin.h