path: root/.export
diff options
authorKalle Viironen <>2014-04-15 15:10:27 +0300
committerKalle Viironen <>2014-04-15 15:10:38 +0300
commitd757a8ee2d86c3f4b694f8fdff5defa7b0dbab75 (patch)
tree27b30b37643ebfe4615d7eb645b72cd42a4316cb /.export
parent80c1335ec02c038329603486315d06d7bddc1326 (diff)
parent63d998641077d9074281f402ae7becb41c037a2c (diff)
Merge branch 'stable' into releaseQtEE_v2.1.0
* stable: (21 commits) Revert "Show PieMenu in enterprise controls list view." Show PieMenu in enterprise controls list view. Fix PieMenu not showing in enterprise-gallery launcher demo. Update enterprise controls demos to version 1.1 Revert "Add input field for decimal numbers" Doc: Update documentation version to 2.1.0 [launchersettings] Fix UI scaling [about-b2qt] Use Screen element for setting width/height Change default font for demos to support arabic numbers [launchersettings] Small fixes in wifi settings section sensorexplorer: Use identifier field when description is empty Make sensors demo not rely on measurement errors Doc: Update screenshot for the textinput demo Remove incorrect assingment of QUrl to bool qt5-everywhere: update working radio playlist Show launchersettings and sensors demos in QtCreator Doc: Switch to use the global Qt template for example docs Updated preview_l.jpg for textinput demo Rearrange the order of demos in the launcher Merge updates from upstream into keyboard example ... Change-Id: I83f65cb50cf53609d9bb131c94c3d020882a2ccd
Diffstat (limited to '.export')
0 files changed, 0 insertions, 0 deletions