Commit Graph

3 Commits

Author SHA1 Message Date
J-P Nurmi 1ef2c051ec import Qt.labs.controls 1.0 => QtQuick.Controls 2.0
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>
2016-04-21 15:48:05 +00:00
J-P Nurmi 0cf1038aa7 Chat Tutorial: update the install path
Change-Id: Ib4bd465d6c5d2f81f7dcce2f3eb547fe1cdc2360
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-04-21 05:43:27 +00:00
J-P Nurmi e8cd9c0458 Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ia8879787703c32db44119b25be10adc83adc40bb
2016-04-20 16:23:33 +02:00