2 Commits

Author	SHA1	Message	Date
Eike Ziller	851f255b9d	Merge remote-tracking branch 'origin/3.0' ... Conflicts: src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp src/plugins/qmlprofiler/qmlprofilertraceview.cpp Change-Id: I778a0c2d0f1b4f799caaa2c2cc5daf94ec7ca352	2014-01-15 14:04:41 +01:00
jkobus	d3b8da6cf8	Add qtquick 2.1, 2.2 and qtquickcontrols 1.1 ... Change-Id: If68e0c62781b235c2f0e573afe6d0e28709f28f3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>	2013-12-05 10:04:31 +01:00