Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | import Qt.labs.controls 1.0 => QtQuick.Controls 2.0 | J-P Nurmi | 2016-04-21 | 1 | -1/+1 |
| | | | | | | | | | Docs, resources, .metainfo and plugins.qmltypes will be updated in follow up commits. Change-Id: I4438c5bfb8802bff0fa15c56431cfd288f179861 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> | ||||
* | Merge remote-tracking branch 'origin/5.6' into 5.7 | J-P Nurmi | 2016-04-20 | 1 | -0/+56 |
Change-Id: Ia8879787703c32db44119b25be10adc83adc40bb |