summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* changes-5.6.0v5.6.05.6.0J-P Nurmi2016-02-251-0/+98
| | | | | | Change-Id: I82932e39147884c95326906501890746d35417a3 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Revert "Adjust popup position by offset of the view in the toplevel window"v5.6.0-rc1J-P Nurmi2016-02-101-1/+0
| | | | | | | | | | | | | | | This reverts commit c717082c098bbfc96848457436ca83db7b83e4c8, which was applied to fix popup position mapping for window containers. However, that change lead to a release blocker by breaking the very same use case with QQuickWidget, which is used by Qt Creator and is considered the modern alternative to those problematic window containers. Change-Id: I72c6d4985668a8dc1d4e1cf6e98f7597bc7c1d8f Task-number: QTBUG-49097 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
* FileDialog: move shortcuts properties up to QQuickAbstractFileDialogShawn Rutledge2016-02-024-105/+94
| | | | | | | | | | | QQuickQFileDialog does not inherit QQuickFileDialog, so the documented shortcuts property was not defined if your platform happens to use the QFileDialog implementation. As long as we are moving the public property, it's easiest to move everything related to shortcuts. Task-number: QTBUG-50673 Change-Id: Ic2baf4a3c83ca12edf11d7d011aaa78a389e0fde Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
* FileDialog: create FolderListModel asynchronously when first openedShawn Rutledge2016-02-021-11/+33
| | | | | | | | | | | | This is only for the QML dialog implementation. The incubator should be able to do this without any UI freeze, however there can still be a delay when opening the dialog. It's better to delay at that time instead of during application startup. Task-number: QTBUG-46477 Change-Id: I31bada236ecbcfeb98ab98c511c65f95f1a1f83c Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
* Merge 5.6 into 5.6.0Oswald Buddenhagen2016-02-023-12/+47
|\ | | | | | | Change-Id: I6496fe156e0aaac40c0459188bc0ee7c1f24167a
| * Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Liang Qi2016-01-272-0/+8
| |\
| | * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-252-0/+8
| | |\ | | | | | | | | | | | | Change-Id: I434c0d9c03200ff9ad0abc336c87ea52ea5abd67
| * | | Extend manual test viewinqwidget.Friedemann Kleint2016-01-273-12/+47
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Show both QQuickView/createWindowContainer and QQuickWidget. Make it work with shadow-builds by passing the full path of the source via define. Task-number: QTBUG-49097 Change-Id: Idbad3a28ae4f803fea57e94c5750224fa5aa1e1e Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into 5.6.0Liang Qi2016-01-304-1/+15
|\ \ \ | |/ / |/| | | | | Change-Id: Ideb3ff546c83f52df6fa6a61fa7f91c628c43021
| * | Fixed key event propagation with submenusFilippo Cucchetto2016-01-292-1/+7
| |/ | | | | | | | | | | | | | | | | When a menu receive a Key_Right event and its subMenu popupwindow is already visible, the event should be discarded. In this way the event can forwarded up to the menubar for moving to the next root menu. Change-Id: Ifeb402f66fdac9fcf3a541456b929d11d36ad00d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Fixed keyboard navigation in submenusFilippo Cucchetto2016-01-242-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug was due to a couple of factors interacting: 1) the QQuickMenu::__popupVisible property is not in sync with the popupWindow::visible property. In fact, the QQuickMenu::__popupVisible becomes true before the PopupWindow::Show() method is called. 2) In the Menu.qml file, the menu content item is created through the user of Loader, whose active property becomes true when the QQuickMenu::__popupVisible property is true. So the result is that the MenuContentItem is created before the QQuickPopupWindow is effectively visible. 3) Given point (2), the MenuContentItem requests focus on creation (since it has focus: true). However, given (1), the QQuickPopupWindow is neither visible nor active. This patch addresses this problem by forcing activeFocus to the menuContentItem only when the popupWindow gets focus. Task-number: QTBUG-41951 Change-Id: I095700726aab4ac45a62cd37b33a069e294df30e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Android: fix Dialog window decorations' dismiss-on-click behaviorVladimir Moolle2016-01-222-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the case when a modal dialog is instantiated in a visible state, which often means, the window decoration component has not been loaded yet. Previously, this led to dismissOnOuterClick property in DefaultWindowDecoration keeping its initial value of "true" and thus allowing dismissing the dialog via an outside click *the first time the dialog was hidden* (next times, the property would get updated and the behavior would be correct). Task-number: QTBUG-47369 Change-Id: I24c7c8a1eb785203a3b3f1d889b7e22480ea952f Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | QQuickStyleItem: replace if-else chain with switchAnton Kudryavtsev2016-01-191-7/+14
| | | | | | | | | | Change-Id: Ife49b85c31c32e7da900ce6a06dea46f831529a6 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | QQuickStyleItem: wrap const char * in QStringLiteralAnton Kudryavtsev2016-01-191-45/+46
| | | | | | | | | | | | | | It's improve string creation. Change-Id: I0bb58e3f45f0f927c943798829455f1205fee747 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | QQuickStyleItem: wrap const char * in QLatin1StringAnton Kudryavtsev2016-01-191-102/+102
| | | | | | | | | | | | | | It's improve string comprasion. Change-Id: I32d0195a513a3b982f5e96add39bd83cf2a3117a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Controls: replace QStringLiteral with QLatin1StringAnton Kudryavtsev2016-01-192-3/+3
| | | | | | | | | | | | | | ... in string comparisons. It's more effective. Change-Id: Ibba6d78bbea4308d9a84da08ba4688ea93d58c6c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Fix dragging of TableView headers with invisible header columnsJoni Poikelin2016-01-181-1/+1
| | | | | | | | | | | | Task-number: QTBUG-50416 Change-Id: Ic7aa92ed5dd3e6f47cb3986fe3965487b7edd48a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Fix regression with TableView header dragging when view is scrolledJoni Poikelin2016-01-181-2/+2
| | | | | | | | | | | | Task-number: QTBUG-50432 Change-Id: Ieadc69219faa44d5c4e501c71a9b73013d5791b3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Dialogs: do not use an intermediate call of QMap::keys() to get countAnton Kudryavtsev2016-01-152-2/+2
| | | | | | | | | | Change-Id: I169fda727c91d54dc7eb7577cae46cff61b2ee10 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Check for __style existence before accessing itMarco Martin2016-01-123-7/+7
| | | | | | | | | | | | | | | | | | | | | | Since __style is loaded by a Loader, very early in initialization, it may still be null. so check for its existence before accessing it. When it will be fully loaded the property binding will cause a reevaluation with the proper values. This fixes __wheelScrollLines never being loaded from the style. Change-Id: I5967265a4d31e1be2c972daa79b9389fecc25933 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-073-4/+4
|\ \ | |/ | | | | Change-Id: Id9c8ce5b56ecd279daaebef2923ea90d4bfc0447
| * Doc: fix wrong description of doubleClicked() signal in TreeViewNikita Krupenko2016-01-011-2/+2
| | | | | | | | | | Change-Id: I2183a869aef2c949dc1528e7b97e08c7b035c315 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Doc: fix a typo in TableViewNikita Krupenko2015-12-311-1/+1
| | | | | | | | | | Change-Id: Id7908e45b04358387bf0e3ffd418ea6842ff889d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Dialog: calculate buttons width when there is < 2 right buttonsNikita Krupenko2015-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Dialog wrapper calculate button box width only when there is at least 2 right buttons, which produce wrong button positions in other cases. This change made Dialog to handle all cases. [ChangeLog][Dialog] Properly handle width of button box when it has less than two right buttons Task-number: QTBUG-49380 Change-Id: Id033803e8b3c15cb465bf942eebc30ca77d58ad6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | calendar example: don't derive from unused QSqlQueryModel base classMitch Curtis2016-01-072-4/+2
| | | | | | | | | | Change-Id: I4727e33fd8578b7032984d358d37cd7103949580 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Layouts: Remove redundant definition of QQuickItemAlessandro Portale2016-01-061-154/+0
| | | | | | | | | | | | | | Seems to create a race condition in Qt Creator's code model Change-Id: Id685e14614db3c881114b1fea6083569b02e4307 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* | Example: Update the textArea to reflect the color changeVenugopal Shivashankar2016-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | The DocumentHandler.textColor property is set to colorDialog.color in the onAccepted handler. The safest way is to bind the two properties instead of depending on the onAccepted handler. Task-number: QTBUG-36593 Change-Id: I589ab3b3f8e8189199740d896ebae3717d5022b3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Doc: Update QtQuick.Layouts import version to 1.3Topi Reinio2016-01-041-2/+2
| | | | | | | | | | | | Task-number: QTBUG-50000 Change-Id: I50fdce82e7a1e987c9216bba52e55e5e995b2f77 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Nicely centered spinner graphicsAlessandro Portale2016-01-043-0/+0
| | | | | | | | | | | | | | | | | | | | | | The current spinner circles are not exactly centered in the image rectangle. That causes the spinners to wobble slightly. The new .pngs were optimized via optipng -o 7 -strip "all" Change-Id: Ifdfefd19f9a482cb690c81ce67f97f163f4dc5da Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Import tst_objectcount benchmark from qtquickcontrols2J-P Nurmi2015-12-233-0/+178
| | | | | | | | | | Change-Id: Id898b5e3d5182ee6dcb09758298d4cb0fed3bea8 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Add plugins.qmltypes for QtQuick.Dialogs.PrivateKai Koehne2015-12-171-0/+325
| | | | | | | | | | | | | | | | | | | | Otherwise Qt Creator will try to run qmlplugindump for the import on every use. Change-Id: I1e459e1b0eab9e439cc68f8c7961b7f3f75a83f7 Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Suffix QQuickMenu, QQuickMenuBar & QQuickMenuItem with 1J-P Nurmi2015-12-1611-150/+150
| | | | | | | | | | | | | | | | This avoids clashes between Qt Quick Controls and Qt Labs Controls. Change-Id: Ia1d367c271a3c80259d4f59be891c211ec061e01 Task-number: QTBUG-49794 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Check if any menu item is selected when mouse is releasedSiteshwar Vashisht2015-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Sometimes I get below error while accessing history menu item in quicknanobrowser : qtbase/qml/QtQuick/Controls/Private/ColumnMenuContent.qml:204: TypeError: Cannot read property '__menuItem' of null Added a check to fix this error Task-number: QTBUG-49968 Change-Id: I934da87fd5f95e40b20dfead81bae68b1415836f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Moved menuBar function from QQuickMenuPopupWindow to QQuickmenuv5.6.0-beta1Filippo Cucchetto2015-12-074-18/+18
| | | | | | | | | | Change-Id: I6628ac2b8b07634afc1062488a12788a4e3f66c0 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Fixed missing close of the ComboBox when clicking on itFilippo Cucchetto2015-12-072-5/+23
| | | | | | | | | | | | | | | | | | | | The mouse event that dismissed a popup window should not dispatched to the visual item. Otherwise the menu open again. Task-number: QTBUG-44532 Change-Id: Id8aca1634e4f1795e546230953bff49518589714 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | iOS: let platform plugin populate edit menusRichard Moe Gustavsen2015-11-291-42/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When showing an edit menu on iOS, UIKit will always populate the menu with some default system menu items. This means that if controls e.g adds a menu item "cut" to the menu, it might appear twize since UIKit might add one as well. To avoid this, we filter away menu items added by Qt if we see that the shortcut assigned corresponds to one of the UIKit items. As such, we rely on the menu items in the edit menu to have shortcuts assigned. But this strategy turns out to have a flaw. A specific shortcut can only map to one control inside a window. So if a control creates a shortcut "copy", no-one else inside that window can do the same. So if you have several line edits, all with their own edit menu, you will end up with many menu items using the same shortcuts. And this will cause warnings and problems when Qt later tries to find a shortcut to trigger. Since it turns out the using shortcuts internally for our own controls is a bad idea in the first place (it steals away the possibility for the application to use them for something else), and since we're anyway moving into the direction of doing text editing directly from the platform plugin, this change will start by giving full control over the contents of the edit menu to the ios plugin. This will remove usage of shortcuts, and therefore fix the related problems in the same go. Change-Id: Ib8a6f54d444e756fee7328e06a4b83e778cb1022 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Markus Goetz (Woboq GmbH) <markus@woboq.com>
* | QQuickMenuPopupWindow: Guard m_logicalParentWindow by QPointer.Friedemann Kleint2015-11-271-1/+1
| | | | | | | | | | | | | | | | Fixes a crash in the menubar test. Task-number: QTBUG-49354 Change-Id: I628af74780ed9a47813a3e6fb951ad1dd8e7829a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Menubar popups should handle only release events of a previous press eventFilippo Cucchetto2015-11-263-4/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When a popup is brought up by a press event for a menu inside the menubar it should not handle the relative next release event if it falls outside the popup. Before forwarding the release event we first check if a previous press event was seen, if not we simply discard the event. Task-number: QTBUG-47295 Task-number: QTBUG-45117 Change-Id: I632fab0a3abfdfc9872f85f99f9d7f50d41526cc Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Fix tst_treeviewJ-P Nurmi2015-11-241-2/+2
| | | | | | | | | | Change-Id: I662eea96b72043d06fe94707e77a9ead5a951e3d Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Update plugins.qmltypesKai Koehne2015-11-195-660/+2807
| | | | | | | | | | | | | | Change-Id: Iae6420d4e0f0f1ef374cce4ab91101e3b04af6bf Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Fix proxy menu crashJ-P Nurmi2015-11-174-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | Mobile-centric ApplicationWindowStyle implementations (Flat & Android) use a proxy menu to morph menubar items into a single menu button. The items are owned by the menubar and must not be deleted by the proxy menu. Otherwise, depending on the destruction order, the items would get deleted twice. Change-Id: I92d0c45fc3274574fd1edf34d8d3d081990f2727 Task-number: QTBUG-48927 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Skip controls tests when touch screen is present.Friedemann Kleint2015-11-173-0/+30
| | | | | | | | | | | | | | Task-number: QTBUG-49359 Task-number: QTBUG-49360 Change-Id: I96ec6d46de189ec396ef26c0d059c65360da4ec0 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Skip PieMenu tests when touch screen is present.Friedemann Kleint2015-11-171-0/+11
| | | | | | | | | | | | Task-number: QTBUG-49353 Change-Id: I285f058f7df9cceb9d9c52bd822cd3ad772627fc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-11-172-5/+12
|\ \ | |/ | | | | Change-Id: Ic1a33d305dc57a42f020389277d95aad1a6da407
| * Fix addTab()/insertTab() documentationMitch Curtis2015-11-091-4/+11
| | | | | | | | | | | | Change-Id: I106b1e042434b168333283aa792b67727b8f40b3 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Doc: fix a typo and etc in SplitViewLiang Qi2015-11-041-1/+1
| | | | | | | | | | | | Task-number: QTBUG-48991 Change-Id: I2b2ca8270b6c25769d3b3214f052050c25f7f15b Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | qquickmenu: don't dismiss a native menu from __dismissAndDestroyRichard Moe Gustavsen2015-11-121-0/+3
| | | | | | | | | | | | | | Task-number: QTBUG-49365 Change-Id: I34509ce9d961f0afb5c2f935af6dc4e574c39a77 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | Fix display of text handlersAleix Pol2015-11-061-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | The mappedPos property used has a different coordinates system. We need to adapt to it before comparing values. Otherwise it depends on the editor position whether the handles will be shown. Change-Id: I497ce497b02931e05194bea0de9ece10b29a316d Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Marco Martin <mart@kde.org> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Extras: fix DropShadow usage.Mitch Curtis2015-11-055-22/+22
| | | | | | | | | | | | | | | | | | | | It's now recommended to use the samples property instead of radius. The radius property is calculated for us based on the samples. Task-number: QTBUG-47749 Change-Id: Ic29c91a1ca9961c74a6ad727ff7c9c671bf55929 Reviewed-by: Gunnar Sletta <gunnar@sletta.org> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Fix CircularGauge's tickmark labels all being set 0Mitch Curtis2015-11-042-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We were relying on model.get() to somehow reevaluate after we'd updated properties of model items, which somehow worked until 4876ea6a18ccdfd72014582aa5d50ab9f6b6ec9e. The correct approach is to do the same thing as we do for styleData.index: rely on the model properties that are exposed to the delegate, which do get updated. Change-Id: I529ab7dcc142187fc185b11658dc5e1496b6d6db Task-number: QTBUG-48839 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
View Lorry Controller Status