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: (42 commits)
  Remove more accidentally submitted code
  Comment out unused method.
  Document - and use - the qmlRegisterXXX template functions
  when loading debug import plugins on Mac, try with _debug.dylib suffix
  fix inclusion of qt_targets.pri in qimportbase.pri
  Use TARGETPATH instead of hardcoding locations
  Fix location in which webkit import is stored in builddir
  Oooops --- revert wrong commit
  Doc
  Remove accidentally submitted code
  Ensure currentIndex NOTIFY is emitted when currentIndex changes due to model change.
  Unify binding optimizer and QtScript binding signal management logic
  Schedule view relayout after itemsInserted/Removed()
  Use no-version-specified to mean any version (used to work, fixed again,
  URL redirection for font loader
  URL redirection for AnimatedImage
  Technically, Location can be relative (never is though...)
  URL redirection for normal images.
  URL redirection for components resources.
  URL redirects for border image.
  ...

3 files changed, 15 insertions, 16 deletions

diff --git a/demos/declarative/flickr/common/qmldir b/demos/declarative/flickr/common/qmldir
index 0c94f60..adc2479 100644
--- a/demos/declarative/flickr/common/qmldir
+++ b/demos/declarative/flickr/common/qmldir
@@ -1,10 +1,10 @@
-ImageDetails 0.0 ImageDetails.qml
-LikeOMeter 0.0 LikeOMeter.qml
-Loading 0.0 Loading.qml
-MediaButton 0.0 MediaButton.qml
-MediaLineEdit 0.0 MediaLineEdit.qml
-Progress 0.0 Progress.qml
-RssModel 0.0 RssModel.qml
-ScrollBar 0.0 ScrollBar.qml
-Slider 0.0 Slider.qml
-Star 0.0 Star.qml
+ImageDetails ImageDetails.qml
+LikeOMeter LikeOMeter.qml
+Loading Loading.qml
+MediaButton MediaButton.qml
+MediaLineEdit MediaLineEdit.qml
+Progress Progress.qml
+RssModel RssModel.qml
+ScrollBar ScrollBar.qml
+Slider Slider.qml
+Star Star.qml
diff --git a/demos/declarative/minehunt/minehunt.cpp b/demos/declarative/minehunt/minehunt.cpp
index 89845ef..2e1b5b3 100644
--- a/demos/declarative/minehunt/minehunt.cpp
+++ b/demos/declarative/minehunt/minehunt.cpp
@@ -292,9 +292,8 @@ class MinehuntExtensionPlugin : public QDeclarativeExtensionPlugin
 
     public:
     void registerTypes(const char *uri) {
-        Q_UNUSED(uri);
-        QML_REGISTER_TYPE(SameGameCore, 0, 1, Tile, Tile);
-        QML_REGISTER_TYPE(SameGameCore, 0, 1, Game, MinehuntGame);
+        qmlRegisterType<Tile>(uri, 0, 1, "Tile");
+        qmlRegisterType<MinehuntGame>(uri, 0, 1, "Game");
     }
 
     void initializeEngine(QDeclarativeEngine *engine, const char *uri) {
diff --git a/demos/declarative/samegame/SamegameCore/qmldir b/demos/declarative/samegame/SamegameCore/qmldir
index a8f8a98..e17b1f5 100644
--- a/demos/declarative/samegame/SamegameCore/qmldir
+++ b/demos/declarative/samegame/SamegameCore/qmldir
@@ -1,3 +1,3 @@
-BoomBlock 0.0 BoomBlock.qml
-Button 0.0 Button.qml
-Dialog 0.0 Dialog.qml
+BoomBlock BoomBlock.qml
+Button Button.qml
+Dialog Dialog.qml