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:
  Check QML files for license headers too.
  Make compile: include script module for test
  Move copies of toLocalFileOrQrc() to QDeclarativeEnginePrivate
  Allow resource files to be loaded in WorkerScript
  Fix TextEdit alignment.
  Component::createObject() don't attempt to set parent of null object
  Factor out initialization effects from declarative benchmarks.
  Remove license headers from test data.
  Fix FolderListModel parentFolder property's file drive handling
  Add license headers for .qml files.
  Ensure QML Global Qt object functions appear in the documentation index
  doc
  Also show file/line numbers on XML query errors.
  Print warnings for xml query syntax errors
  Clean up
  Add XmlListModel::get()

0 files changed, 0 insertions, 0 deletions