Merge branch 'buildsystem'

Change-Id: I230e776290761be7c811c3aec4d915367012fc99

diff --cc src/qml/qml.pro
index f4b2a23,311ee3c..5c16502
--- 1/src/qml/qml.pro
--- 2/src/qml/qml.pro
+++ b/src/qml/qml.pro
@@@ -21,10 -14,9 +14,11 @@@ exists("qqml_enable_gcov") 
      LIBS += -lgcov
  }
  
+ MODULE_DEFINES = QQmlImageProvider=QQuickImageProvider
  load(qt_module_config)
  
 +QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf
 +
  # private dependencies
  QT += v8-private
  

diff --cc src/quick/quick.pro
Simple merge