From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 26 Jun 2012 15:59:46 +0000 (+0200)
Subject: Merge branch 'buildsystem'
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=4189a0d294999246f5a9680d348a1d160d4f591c;p=konrad%2Fqtdeclarative.git

Merge branch 'buildsystem'

Change-Id: I230e776290761be7c811c3aec4d915367012fc99
---

4189a0d294999246f5a9680d348a1d160d4f591c
diff --cc src/qml/qml.pro
index f4b2a23,311ee3c..5c16502
--- a/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