summaryrefslogtreecommitdiff
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix undefined __syspal referenceAlex Blasche2014-09-181-1/+5
| | | | | | | | There is no such reference AFAICT. Use SystemPalette instead. Task-number: QTBUG-41390 Change-Id: I09becb9a39e20137a5092942c4d9cb09ef133abb Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* FileDialog: add sidebarVisible property and buttonShawn Rutledge2014-09-041-0/+7
| | | | | | | | | | | | | | | The sidebar takes up too much space on some devices, so now it is possible for the application author to hide it by default. The user can also toggle it with a button similar to that used for the Qt Creator sidebar, and this state is stored as a setting; however if the application sets sidebarVisible: false, that overrides the setting. [ChangeLog][QtQuick.Dialogs] FileDialog: added sidebarVisible property and button Task-number: QTBUG-39231 Change-Id: Ie8b379da02f4b12764732b2c01b79039722778ab Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-08-281-1/+23
|\ | | | | | | Change-Id: I4aa5c960a03616d95f9e1d10b4c8ba222997a24d
| * Dialogs: buttonless fully-filled dialog exampleShawn Rutledge2014-08-241-1/+23
| | | | | | | | | | | | | | | | | | | | The default property "contentItem" is normally the parent of the added content, but you can set the content directly into the property to avoid having any buttons or margins. Task-number: QTBUG-38056 Change-Id: Ie0e96969b3e35f079b29a9f3f57eaaf16236d4c1 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Update license headers and add new license filesAntti Kokko2014-08-251-19/+11
| | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I470909ba0980db33ab551790d619c59a35978590 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | Migrate to QSurfaceFormat::setDefaultFormat()Laszlo Agocs2014-08-082-4/+4
| | | | | | | | | | | | | | | | setDefaultFormat() is being moved form QQuickWindow to QSurfaceFormat. Change-Id: Id76c2c332c837e2e988a2e8f4da2975065938e32 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-291-99/+97
|\ \ | |/ | | | | Change-Id: Iac8c62211c34b36394812d9afedd362a62ba6cef
| * Updated the example so that it adapts to the orientation changeVenu2014-07-251-99/+97
| | | | | | | | | | | | | | | | | | | | The example was using a Row type to present the visual items, which is changed to Flow type now, so that the items are rearranged based on the orientation change on a Mobile device. Task-number: QTBUG-37203 Change-Id: I990f77a87c409b623a7fe4495d74206a1ca2e1c7 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devJ-P Nurmi2014-07-198-8/+13
|\ \ | |/ | | | | Change-Id: Icc15fe685e94dd043979b6b9c6a624f18f2d1e4c
| * Centralize determination of "no desktop" configurationsJ-P Nurmi2014-07-187-7/+7
| | | | | | | | | | | | Change-Id: I030012f48668db4f01737ef92fdb7e6e0426e025 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
| * Improve implicit size of Calendar on high DPI devices.Mitch Curtis2014-07-171-1/+6
| | | | | | | | | | | | Task-number: QTBUG-39473 Change-Id: Ibfb1c040efd9744ba6c8bc56affcdf90a807b046 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devJ-P Nurmi2014-07-171-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: src/controls/Styles/Base/MenuStyle.qml Change-Id: I95c8b4f348260b958f158ae28c0984d54af973a8
| * Dialog: Add missing docsShawn Rutledge2014-07-091-1/+1
| | | | | | | | | | | | | | Also fixed a qWarning and updated example import statement. Change-Id: I873b52e297bbefe66c6c131573804eee98c40a2f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devJ-P Nurmi2014-06-257-7/+7
|\ \ | |/ | | | | | | | | | | | | Conflicts: .qmake.conf src/controls/Styles/Desktop/SpinBoxStyle.qml Change-Id: Ia501c1388a2af9f273ec2742abbfc766717ad9e6
| * Cleanup whitespaceJ-P Nurmi2014-06-247-7/+7
| | | | | | | | | | Change-Id: I9e84ce56e853a18205aa180cef1ee8ff4f2f678c Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| * Remove QtWidgets dependency for WinRTJ-P Nurmi2014-06-247-7/+7
| | | | | | | | | | Change-Id: Ifacceae8690d2ab4dfaed0d5439b9e29804c1943 Reviewed-by: Andrew Knight <andrew.knight@digia.com>
| * Remove Widgets dependency for QNXAndreas Holzammer2014-06-247-7/+7
| | | | | | | | | | | | | | | | | | Changes.txt says that with Qt 5.2.0 dependency for Widgets have been removed for touch based platforms. But QNX is also a touch based platform and its missing. Change-Id: I140842d4501422537175ac5acb07beebe994f0eb Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Revise and align ToolBar & StatusBar size calculationJ-P Nurmi2014-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | Instead of preferring the layout size, and only using the panel size as a fallback, take the maximum of the two. This way styles can provide a default size that will be respected. Furthermore, replace unnecessary function calls with declarative property bindings. Change-Id: Iabc59c694ac8c8302cea72f53c9177462d7f146c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Example: Remove Panel.qml from gallery.pro as the file does not existCaroline Chao2014-05-191-1/+0
| | | | | | | | | | Change-Id: Ife2b4de2cbc5cd08a97b87e014bb2e288326e08c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devJ-P Nurmi2014-05-141-5/+12
|\ \ | |/ | | | | | | | | | | | | Conflicts: .qmake.conf src/controls/Private/TabBar.qml Change-Id: Id176e44fe8e402c1c2c021ecb63c8c5c75736d47
| * Fix selection handling in texteditor exampleBerthold Krevert2014-05-131-5/+12
| | | | | | | | | | | | | | Task-number: QTBUG-31784 Change-Id: I7122abbfd346edd85f17c54dfde37db93a1ba0fc Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-04-1126-46/+46
|\ \ | |/ | | | | | | | | | | Conflicts: src/controls/ApplicationWindow.qml Change-Id: I2ab8efb4e04006724410da0f6ed03bd2672c5eb6
| * Fix the editable delegate in tableview exampleJens Bache-Wiig2014-04-091-2/+2
| | | | | | | | | | | | | | | | | | | | We re-interpreted what "model" means in TableView to align it with what it means for ListView. Unfortunately the example still assume that "model" refers to the views acual model object and not to the current item data as it did for listview. Change-Id: I3457954a622be38500672edb1c0a910d18760947 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Bump QtQuick.Controls import version to 1.2J-P Nurmi2014-04-0722-22/+22
| | | | | | | | | | Change-Id: Idc0b93cbfc2fe23e8be3bcaece672d06555a81f6 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Import QtQuick 2.2J-P Nurmi2014-04-0722-22/+22
| | | | | | | | | | Change-Id: Ifc9719ec6fbbd80b866c01eebc471d0ed121bd16 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Shawn Rutledge2014-03-255-23/+69
|\ \ | |/ | | | | refs/staging/dev
| * Styling improvements for CalendarJens Bache-Wiig2014-03-123-21/+41
| | | | | | | | | | | | | | | | | | Also - added the property Calendar::frameVisible. - moved the gridVisible property to CalendarStyle Change-Id: I57da65af130098ac5d0b858c9f964e52e3ba6922 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| * Fix some typosSergio Ahumada2014-03-031-1/+1
| | | | | | | | | | Change-Id: Ic2e2060b57b0d74e96d6aad0ceff4679d986a26c Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| * CustomDialogs example: add an example using CalendarShawn Rutledge2014-02-251-1/+27
| | | | | | | | | | | | | | | | Also the spinbox exmample will accept when the user presses enter. Change-Id: I47765899acfbc435e2409f7a30e54e8f041b6e73 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Fix shaders for OpenGL core profilesLaszlo Agocs2014-03-242-0/+16
|/ | | | | | | | | | | | Add also a --coreprofile command-line parameter to the gallery and systemdialogs examples to allow testing Quick Controls with an OpenGL 3.2+ core profile. This depends on the new features introduced to qtdeclarative in I75a47182 and I41b513e9. Change-Id: I408263a108a71df221943915849a4c3e18e0d3e4 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Calendar example: sql module requiredCaroline Chao2014-02-211-1/+4
| | | | | | Change-Id: I75eb50a053f429135d1d49d1769b85a247c30311 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Calendar example: add needed QTPLUGIN for static buildsCaroline Chao2014-02-211-0/+2
| | | | | | Change-Id: Ieea1b38f5213f54c8e7de5fc572dcf2de6dfed18 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Dialogs: add new CustomDialogs example to the qrc resourcesShawn Rutledge2014-02-201-0/+1
| | | | | | | Forgot to do this in change ccb088a6beaff01419ec9325dbd19040f279b6ea Change-Id: I00a2dc81a3f99937dbbab1d9dda1a393588124f2 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2014-02-171-10/+6
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-121-10/+6
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/layouts/qquicklinearlayout.cpp Change-Id: Ib24dab43c37fc0f3f6a85398766f102a1ac833c3
| | * Touch example: Fix back navigationCaroline Chao2014-02-031-10/+6
| | | | | | | | | | | | | | | | | | | | | The Key event needs to be in a item that has focus. Change-Id: I6f7293ac74b477e37c200dbb7ee8629d4f769d05 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | | FontDialog: new version of DefaultFontDialog.qmlLiang Qi2014-02-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Controls and Layouts in new DefaultFontDialog.qml. Use a TextInput for sample text, and the dialog supports tab key navigation. [ChangeLog][QtQuickDialogs][FontDialog] The FontDialog fallback QML implementation now uses QtQuick.Controls and QtQuick.Layouts. Change-Id: I133368b14c958c7231dc0ed9a4777b0712eb3670 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | | QtQuick.Dialogs: added Dialog: wrapper for arbitrary contentShawn Rutledge2014-02-153-1/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It provides only a button box, so the application developer can supply the rest of the dialog contents. This is useful for various kinds of dialogs that prompt the user for input. [ChangeLog][QtQuickDialogs][Dialog] Dialog is a new wrapper component for dialogs with standard buttons and custom content items. Change-Id: I0434bed5f504820dc0a668cb993a94980f99852a Reviewed-by: Liang Qi <liang.qi@digia.com>
* | | Add Calendar to Qt Quick Controls.Mitch Curtis2014-02-1410-0/+594
|/ / | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29948 [ChangeLog][QtQuickControls] Calendar was added. Calendar allows selection of dates from a grid of days, similar to QCalendarWidget. Change-Id: I279130e704bc0dfd8dfe114ec9b6b49e111faf96 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Accessible slider should not have value as nameFrederik Gladhorn2014-02-071-0/+1
| | | | | | | | | | | | | | | | The value is provided though the value interface which works already. Having the value as name as well leads to the value being read twice. Change-Id: I97483567c120aa149b52ba35f430aa5c63ad08b7 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | Add currentFont property to FontDialog.Liang Qi2014-02-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFontDialog has this property. This patch effectively means that the font property will be set when the dialog closes, instead of whenever the current font in the dialog changes, so pressing cancel will revert the font to what it was before the dialog was opened. Align with e73d503b84be12e7bf28491356b459ca309e7c95 in qtdelarative, the similar change for color dialog. [ChangeLog][QtQuickControls][FontDialog] Added currentFont property. Task-number: QTBUG-36574 Change-Id: I4140966543a677d8e654dbaac170a2fe8d3579a1 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-061-3/+3
|\ \ | |/ | | | | Change-Id: I1c758e93a570b3b522c64b9d2f6e482a6cf0d48a
| * Make Label accessibleFrederik Gladhorn2014-01-031-3/+3
| | | | | | | | | | Change-Id: If364332017669732fa429efe90c26000b01b0580 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | move QtQuick.Dialogs from qtdeclarative to qtquickcontrolsShawn Rutledge2014-01-0312-0/+989
|/ | | | | | | | | | This will enable using Controls in the QML dialog implementations. For now, Controls are used only as drop-in replacements for the Button, Checkbox, and TextField which were custom implementations in the qtdeclarative module before. Change-Id: Ic79e9e8e5715a72ce51f4c724bfdfd33653300f2 Reviewed-by: Liang Qi <liang.qi@digia.com>
* gallery: run particles only when visibleJ-P Nurmi2013-12-051-1/+1
| | | | | | Change-Id: I7c0f5565161719905e973d3fd1a75b3c9d8a4007 Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-12-031-1/+1
|\ | | | | | | Change-Id: I1b4f7508ead5631abb70b4cdf29d6efa05f33b5b
| * Fix typo in tableview example.Mitch Curtis2013-11-301-1/+1
| | | | | | | | | | | | | | Sortindicator => Sort indicator Change-Id: Id9897268bb21e9ba0dc14de2c4cc9e7f9f9a66d4 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Revise main() in examplesJ-P Nurmi2013-11-2820-56/+69
|/ | | | | | | | | | | | Replace the inconvenient QT_QUICK_CONTROLS_EXAMPLE_MAIN macro with a simpler macro that merely defines the actual application type. This way it's easier to do tweaks to main() when for example testing a different application font size. Moreover, browsing the example code becomes more convenient (especially online). Task-number: QTBUG-35083 Change-Id: I8203816a9112bf29b4661baa86bf4a196554db05 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* TextEditor example: use the MessageDialog for the About boxShawn Rutledge2013-11-151-30/+6
| | | | | | Change-Id: I0813b7d392dfe7143d438b4057c5d787d223ad5e Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Gallery example: add an About boxShawn Rutledge2013-11-134-0/+62
| | | | | Change-Id: Ie683c9d6dca577193f6a5a2cee40916b263719d6 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
View Lorry Controller Status