Merge branch 'buildsystem'
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tue, 26 Jun 2012 15:59:46 +0000 (17:59 +0200)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tue, 26 Jun 2012 15:59:46 +0000 (17:59 +0200)
commit4189a0d294999246f5a9680d348a1d160d4f591c
treef0ca75c7dcee691b5ff98f55991dcdf635d19f4c
parentbdefc3a2a8f8d91a48f822e2281670d8a6b9efbc
parent489651ef7f0e17e210e8a85f8fa95617d14ca7cf
Merge branch 'buildsystem'

Change-Id: I230e776290761be7c811c3aec4d915367012fc99
src/qml/qml.pro
src/quick/quick.pro