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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Link to example files from tutorial pages
  Add tutorial for writing QML extensions
  no export in plugin
  Add doc pages for qml examples.
  Replace usage of print() with console.log().
  Remove out-of-date performance doc.
  Fix hidden menu on embedded.
  Location of binary is not on installed-content import path.
  Doc fixes.
  Return null if creation fails.
  Basic Component doc.
  Collection of small doc improvements
  compile

2 files changed, 2 insertions, 3 deletions

diff --git a/src/imports/gestures/plugin.cpp b/src/imports/gestures/plugin.cpp
index 9f5d923..b8a9751 100644
--- a/src/imports/gestures/plugin.cpp
+++ b/src/imports/gestures/plugin.cpp
@@ -53,8 +53,7 @@ public:
     virtual void registerTypes(const char *uri)
     {
         Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.labs.gestures"));
-        qmlRegisterCustomType<QDeclarativeGestureArea>(uri,1,0, "GestureArea", "QDeclarativeGestureArea",
-                                                   new QDeclarativeGestureAreaParser);
+        qmlRegisterCustomType<QDeclarativeGestureArea>(uri,1,0, "GestureArea", new QDeclarativeGestureAreaParser);
     }
 };
 
diff --git a/src/imports/gestures/qdeclarativegesturearea_p.h b/src/imports/gestures/qdeclarativegesturearea_p.h
index 8e2c066..0195511 100644
--- a/src/imports/gestures/qdeclarativegesturearea_p.h
+++ b/src/imports/gestures/qdeclarativegesturearea_p.h
@@ -59,7 +59,7 @@ QT_MODULE(Declarative)
 class QDeclarativeBoundSignal;
 class QDeclarativeContext;
 class QDeclarativeGestureAreaPrivate;
-class Q_DECLARATIVE_EXPORT QDeclarativeGestureArea : public QDeclarativeItem
+class QDeclarativeGestureArea : public QDeclarativeItem
 {
     Q_OBJECT