aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quickcontrols2
Commit message (Collapse)AuthorAgeFilesLines
* Chat Tutorial: update the install pathJ-P Nurmi2016-04-215-5/+5
| | | | | Change-Id: Ib4bd465d6c5d2f81f7dcce2f3eb547fe1cdc2360 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename qtquickcontrols.conf to qtquickcontrols2.confJ-P Nurmi2016-04-215-3/+3
| | | | | | | | Use the 2-suffix consistently everywhere to avoid any potential confusion with the old controls. Change-Id: I83aa212a15ed78b8694fb7d3db80fc8430aea969 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-04-2091-85/+3552
| | | | Change-Id: Ia8879787703c32db44119b25be10adc83adc40bb
* Flatten and rename example install path and directory structureMitch Curtis2016-04-1951-0/+2347
Change-Id: Ib04e79d72c37fa4507517da2d3b1c28ccd73eaed Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>