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: (23 commits)
  Fix Loader crash.
  Compile in namespace
  Deprecate inline Script {} blocks
  Update metaobjectbuilder version test.
  Set role names for QFileSystemModel and QDirModel
  Removed wrong parenthesis around property NOTIFY declaration
  Remove dead performance measurement code from QML
  Fix warning mentioned in the comments of QTBUG-9182.
  Fix test.
  Ensure positioner animations are triggered correctly
  Fix qdeclarativeqt::createQmlObject autotest
  Add MiddleButton = MidButton to MouseButtons enum.
  Fix qdeclarativetextedit::delegateLoading autotest
  Fix Behavior documentation due to easing changes.
  Fix crash when calling createObject on a component with errors.
  Initialize variable.
  Produce an error when trying to create objects in a PropertyChanges.
  Fix Flipable crash.
  Reduce amount of qmldir parsing
  Fix local type lookup
  ...

1 files changed, 7 insertions, 0 deletions

diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc
index ab75f8d..53de32c 100644
--- a/doc/src/declarative/modules.qdoc
+++ b/doc/src/declarative/modules.qdoc
@@ -143,6 +143,13 @@ since the \e first name-version match is used.
 
 Installed files do not need to import the module of which they are a part, as they can refer
 to the other QML files in the module as relative (local) files.
+If the module is imported from a remote location, those files must nevertheless be listed in
+the \c qmldir file. Internal files can be marked with the \c internal keyword, to ensure
+they are not visible outside the module:
+
+\code
+internal <TypeName> <File>
+\endcode
 
 Installed and remote files \e must be referred to by version information described above,
 local files \e may have it.