summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changelog for 5.3.1v5.3.15.3.1Caroline Chao2014-06-181-0/+77
| | | | | | Change-Id: I5b3fb1c9e6b91bcf58b72f6e380c3cd580674f3c Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Merge remote-tracking branch 'origin/stable' into 5.3Sergio Ahumada2014-06-146-14/+96
|\ | | | | | | Change-Id: I44e51646f79c71b9ade6cbedd9e22bcae00833c8
| * Doc: Updated layouts docs with images and snippetsstableVenu2014-06-134-9/+77
| | | | | | | | | | | | | | | | | | | | | | | | The images and the corresponding snippets should help the reader understand the Quick Layouts better. Task-number: QTBUG-33799 Change-Id: I0a4831f33d99de87fcd7cb68a36844885509bb06 Sanity-Review: Qt Sanity Bot <qt_sanitybot@qt-project.org> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * Menu: Don't open disabled submenusGabriel de Dietrich2014-06-122-5/+19
| | | | | | | | | | | | Task-number: QTBUG-39384 Change-Id: I5310c6efb0a7045f6f89c6347551a0043d8e0ca6 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Fix CalendarStyle::control as read-onlyJ-P Nurmi2014-06-111-1/+1
| | | | | | | | | | | | | | | | This should never be set by the user, and marking it explicitly as read-only makes it also appear read-only in the docs. Change-Id: I9b66a62d2989446396e4c3ceb81d2ee8575d7a03 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | CalendarStyle: add styleData.index for dayOfWeekDelegateJ-P Nurmi2014-06-111-0/+4
| | | | | | | | | | | | | | | | | | The first/last day could be styled in a different way compared to the days in the middle. Expose the index for convenience and consistency with weekNumberDelegate. Change-Id: Ia0cdf5d121f81c243345ea65a8ee355342b4f220 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | CalendarStyle: document available styleData propertiesJ-P Nurmi2014-06-111-0/+29
| | | | | | | | | | Change-Id: I0eb2a3ef443fe0827cb6b5d1d4bfa44543025906 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into 5.3" into ↵Sergio Ahumada2014-06-114-13/+35
|\ \ | | | | | | | | | refs/staging/5.3
| * \ Merge remote-tracking branch 'origin/stable' into 5.3Sergio Ahumada2014-06-114-13/+35
| |\ \ | | |/ | | | | | | Change-Id: Ib60d7e00639f5a73bf4eed48e44dab880cdc748b
| | * TableView: Allow resizing and scrolling single-column tablesGabriel de Dietrich2014-06-062-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | Also makes sure the resize handle is visible in desktop style. Task-number: QTBUG-39393 Change-Id: I44410c65e76b0a3221ea5fce713c1f1b69079947 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| | * Menu: Properly relay enabled state to QPA menu objectGabriel de Dietrich2014-06-062-3/+19
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-39384 Change-Id: I1b71912b4f35ea0aa9e06667a5c0ecedec30f980 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| | * TableView: Make sure we get the content width with hidden headerGabriel de Dietrich2014-06-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The key is to get a headerRowDelegate of non-null dimensions. Task-number: QTBUG-39393 Change-Id: I5ceadb07ebfc84142bbbfe98c5d61780e0314cf5 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| | * TableView: Reset dragged header position if not movedGabriel de Dietrich2014-06-051-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | The user expects the "ghost" header to be aligned with the actual column header when he starts dragging it. Change-Id: Ifccf633403a72fe8448132fe6c349a85acba28d7 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | | CalendarStyle: do not hard code the width of weekNumberDelegateJ-P Nurmi2014-06-111-15/+16
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-39482 Change-Id: Ia46f79e5969b9d0a1262bca871a7f389d0df9688 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | | CalendarStyle: do not hard code the height of dayOfWeekDelegateJ-P Nurmi2014-06-112-5/+7
|/ / | | | | | | | | | | Task-number: QTBUG-39482 Change-Id: I7b610a098402f5ec684fc0d7f9b47c4b9981e733 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Make Base ToolButtonStyle honor icon size.Mitch Curtis2014-06-101-2/+2
| | | | | | | | | | Change-Id: Iba7cd88bd3d69ad254f312f57845d10c6170af63 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Calendar: respect style provided sizeJ-P Nurmi2014-06-102-5/+6
| | | | | | | | | | | | Task-number: QTBUG-39473 Change-Id: Ic0f874a6015b13b4833c6e1d6441c54d9533e2da Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Calendar: fix dayOfWeekDelegate positioningJ-P Nurmi2014-06-101-0/+1
|/ | | | | | | The grid line width needs to be taken into account Change-Id: I13ecf5e32d1ae3fa967bbd01ae104686ee371411 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* TableViewColumn: Process all the rows in resizeToContents()Gabriel de Dietrich2014-06-041-1/+1
| | | | | | | | ... including the first row. Task-number: QTBUG-39337 Change-Id: I55bf61168840e9a7a5b31d7be2182b6974371a4a Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* TextField::font: fix the default value handlingJ-P Nurmi2014-06-041-1/+1
| | | | | | | | | Assigning undefined to font is not possible, so use TextSingleton::font as a fallback instead of undefined. Change-Id: If148f7773ca784c0a1eb78f952dfad073fa9b1e3 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Fix TextArea's fontJ-P Nurmi2014-06-041-6/+1
| | | | | | | | | | | | Using a Binding element overrides TextArea::font with a value from TextAreaStyle::font, whereas the style is only supposed to provide the default value. Use TextSingleton's font to avoid the original binding loop. Task-number: QTBUG-39328 Change-Id: I90113ef03dd31b2a060dfe12361708f99b35eb53 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Make SliderStyle example use implicitWidth and implicitHeight.Mitch Curtis2014-06-031-2/+2
| | | | | | | This is what we encourage, so it should be consistent. Change-Id: I0b9bcaebf45aec599a71a351c924883d432c0af0 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* FileDialog: handle back and esc keys to reject the dialogAndy Shaw2014-06-031-0/+12
| | | | | | | | | | When the dialog was open then pressing the Android back button would cause it to quit the application as it just went straight through. Task-number: QTBUG-39204 Change-Id: I69e5f39ab90a5c280ae4dbd1a498fb6f3d4dcf1e Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Dialogs: don't allow click passthrough when a dialog is showingShawn Rutledge2014-06-021-3/+2
| | | | | | | | | | On Android and other non-windowing platforms, clicking outside the dialog dismisses it if it is non-modal, but if it is modal we still need to capture the click even though it will not dismiss the dialog. Task-number: QTBUG-39339 Change-Id: I18e892d1ca9c7ed4bea44c462a84b48ca44915d0 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* TableView: cleanup unused Text left overJ-P Nurmi2014-05-211-2/+0
| | | | | | | | It has gone unnoticed for a long time ever since 47ef1a5f. As far as I can see, it never was actually used for anything... Change-Id: I28045ca8ba3ecec6869aed1eeebcaab7c2866e93 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Merge remote-tracking branch 'origin/release' into stableIikka Eklund2014-05-203-51/+2
|\ | | | | | | Change-Id: Ibe2ec06eabd5a60a5f9a98008eba6079fac048bd
| * Dialogs: avoid setting invalid geometryv5.3.0release5.3.0Shawn Rutledge2014-05-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | QRect::setX() and setY() can change the width and height, even to a negative value, which will make the dialog's intended geometry invalid. The intention was that QQuickAbstractDialog::setX() and setY() should move the window, so it should be done with QRect::moveLeft and moveTop. Task-number: QTBUG-38898 Change-Id: I59104395ed39b09f6b7a99eb177820edb5e46cf6 Reviewed-by: Liang Qi <liang.qi@digia.com>
| * Remove redundant button clicked handler in QQuickMessageBoxBerthold Krevert2014-05-142-49/+0
| | | | | | | | | | | | | | | | | | | | | | Change c286b4fccb2d83fcc01b21913b95c5e4f21f2982 added the QQuickAbstractMessageDialog::click() handler, which made the QQuickMessageDialog::clicked() handler redundant. (cherry-picked from qtdeclarative/a5669568904b37b1d6b297e7190d18306e198604) Change-Id: Ifd770a3c67b35fd9a4929fc55b9e5298c36fb960 Task-number: QTBUG-35933 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Fixed QML binding loop warning.Jason Erb2014-05-151-1/+6
| | | | | | | | | | Change-Id: I1339949afa6aeb659baf7186cbcb7a714d9826a3 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | TextFieldStyle: more fool-proof size calculationJ-P Nurmi2014-05-151-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that such style gets a sensible default size: TextField { text: "Hello" style: TextFieldStyle { font.pixelSize: 30 background: Rectangle { color:"lightgray" } } } Change-Id: I370d8ad324cda09c9b085191ab452c4f8994d1d9 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | TableView: fix the position of "filled" rowsJ-P Nurmi2014-05-151-1/+1
| | | | | | | | | | | | | | | | | | On desktop the content cannot be scrolled when there are empty filled rows, but on touch the content can be still flicked so the empty filled rows must move together with the content. Change-Id: I82e27d26a332d54c051e5d7bf9e1e0ab8e205f76 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Scroll the parent mouse areas when reaching the bounds of a ScrollViewAndy Shaw2014-05-142-1/+40
| | | | | | | | | | Change-Id: I18da235e81fa7547b78b623257226dd4a745b518 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Don't allow navigation to previous/next month when dragging mouse.Mitch Curtis2014-05-132-8/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When dragging the mouse over the calendar and a date from a previous month is hit, it will change the visible month to that month. This becomes worse when dragging the mouse between in the start/end of the calendar, because there are usually several days shown from the previous month, and the calendar quickly goes back several months. [ChangeLog][Calendar] Calendar no longer selects dates in the next/previous month when dragging the mouse. Task-number: QTBUG-38848 Change-Id: I0b9bc727a05397a8e4f1280e16c91e39e160bf4a Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | 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>
* | Fix CalendarStyle's layouting and grid cell calculation.Mitch Curtis2014-05-133-249/+348
| | | | | | | | | | | | | | | | | | | | | | | | - Wrap all panel items within a container, so that the frame width checks happen in only one place, and the other items don't need to care about it. - Move the logic involving grid line width into CalendarUtils, so that the style code can be for styling and not maths. Task-number: QTBUG-38847 Change-Id: I99a1f131b9cd608f3f7a7627d51a75780a6cbac2 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Use RotationAnimator in the BusyIndicatorStyle example snippetJ-P Nurmi2014-05-121-1/+1
| | | | | | | | | | | | | | | | | | Using NumberAnimation is a bad example, because it won't actually animate when the app is busy. Change-Id: I877a7226c5985f446f6ed6c6f6e709f2296b39ca Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Fix TableViewStyle::rowDelegate docsJ-P Nurmi2014-05-121-1/+1
| | | | | | | | | | | | Change-Id: I27b0347192def2ebfd761401a037f36d7207b2f5 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Doc: modified wrong default valueNico Vertriest2014-05-081-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-38772 Change-Id: I8e9c0c6e510e264f1bd262961056489c75fddf83 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | TabBar: fix a typoJ-P Nurmi2014-05-071-1/+1
| | | | | | | | | | | | Task-number: QTBUG-38819 Change-Id: I2ca82e5f5aa64f515225f7da262adb4d9b239802 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Fix typo and add missing period to GridLayout documentation.Mitch Curtis2014-05-071-2/+2
| | | | | | | | | | Change-Id: I200601a11935c3054c4b876fb9bf2e29ecf48c2d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Fix the update of TabView.currentIndex when inserting/removing tabsJocelyn Turcotte2014-05-072-2/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update currentIndex when adding or inserting tabs. - Make sure that we update the current index before updating the array to avoid a state of currentIndex > count -1 when removing the last tab, where a property binding on TabView.count could try fetching a tab past the array limit through TabView.getTab. - Only decrease currentIndex when removedIndex <= currentIndex to keep the current tab active when possible. Activate the next tab instead of the previous one when the current tab is removed to make it more instinctive to remove multiple tabs successively. - Keep the current behavior of leaving currentIndex to 0 when removing the last tab. Change-Id: I030b86a03ce73f1177b1f04857abbdc2f7ec5835 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Handle invalid indexes for TabView.getTabJocelyn Turcotte2014-05-071-1/+2
| | | | | | | | | | | | | | | | Return undefined if ListModel.get returned undefined instead of throwing an exception. Change-Id: I38cbd21472e8c409390e8269e5fa0a800106392e Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | TableView: fix styleData.row to be a bindingJ-P Nurmi2014-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | Must be a binding to keep the index up-to-date when moving rows. Task-number: QTBUG-38789 Change-Id: Ibd2fe34d7afccc523d563351bd3366c7c7c66635 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2014-05-062-2/+4
|\ \ | |/ | | | | Change-Id: Ic5c4ea467890e1033e33161a6cf7f83cf5adb01c
| * FileDialog: update icon whenever the filename changesv5.3.0-rc1Shawn Rutledge2014-05-051-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | view.model.get(styleData.row, "fileIsDir") is unreliable for some reason, but each filename usually changes when we go into a different directory. Maybe it could still fail if you navigate from a directory containing a directory, to another directory which has a file with exactly the same name in the same position. Since most files have extensions, this is unlikely... Task-number: QTBUG-38683 Change-Id: If080c4f1a7a01b20f6c468fcb06653e3c2314a1a Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * Menu: Fix QPA related crash on exitGabriel de Dietrich2014-05-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | In QPA world, menus are always referenced by a menu item. (This is the menu item either on the menu bar or in the parent menu.) So, the same way that we set the menu item's menu in the menu's constructor, we must clear it. Specially since qtbase commit 8605f44097a986e10c2ddaf4b4eae0b2331d98d1 which checks for the menu reference in the menu item's destructor. Change-Id: Id196fc7c2082dbff1d9006cbd82b7237532c4e3c Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2014-05-035-6/+329
|\ \ | | | | | | | | | refs/staging/stable
| * \ Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-015-6/+329
| |\ \ | | |/ | | | | | | Change-Id: I7d6be51a5601fb90ed5e102b63173ccc01b39f36
| | * Add Window declaration to plugins.qmltypesFawzi Mohamed2014-04-301-0/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QmlDesigner needs to know that Application window is derived from QQuickWindow. Task-number: QTBUG-38663 Change-Id: I4a90dc6a0d69ad5688431c86014cbdb36259caab Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Yuchen Deng <loaden@gmail.com>
| | * Add changelog for 5.3.0Jens Bache-Wiig2014-04-251-0/+107
| | | | | | | | | | | | | | | | | | | | | Change-Id: I99fadbd5dff0a4ec5e6abd5b8a6b5b19cbfcace7 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
View Lorry Controller Status