aboutsummaryrefslogtreecommitdiffstats
path: root/src/controls/qquickstyleattached_p.h
Commit message (Collapse)AuthorAgeFilesLines
* Rename Qt Labs Controls to Qt Quick Controls 2 - build systemMitch Curtis2016-03-181-2/+2
| | | | | | | | | The imports will be done later, as we don't want to change them until the module is releasable (which requires things like selection handles, etc.). Change-Id: I2140cff7058fc3b696e92ca8c0e5e06dca9a7c9c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-03-181-2/+0
| | | | | | | | | | | Conflicts: src/controls/qquickstyle.cpp src/controls/qquickstyleattached_p.h src/imports/controls/material/qquickmaterialstyle.cpp src/templates/qquickcontrol.cpp src/templates/qquickpopup.cpp Change-Id: I17c3c4d1040b89838f0903e0a17069b835895199
* Turn libQtLabsControls to a public C++ libraryJ-P Nurmi2016-03-161-1/+2
| | | | | | Change-Id: Ia4365ff05d59920143d6288b47c383a202eba772 Task-number: QTBUG-50787 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename QQuickStyle to QQuickStyleAttachedJ-P Nurmi2016-03-161-0/+93
Make room for a public QQuickStyle class for configuring the style. Task-number: QTBUG-50787 Change-Id: I2a43436dd1815e3acd7e896a5847e41db42af5c4 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>