aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Introduce ToolTipJ-P Nurmi2016-03-2233-2/+1501
| | | | | | Change-Id: I917f7e83219788fc63389773eb07ee39757bed7f Task-number: QTBUG-51003 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* tst_swipedelegate: blacklist test_swipeVelocity on OSXJ-P Nurmi2016-03-222-2/+3
| | | | | | | | This way the tests are run at least on other platforms. Change-Id: Ibceb60e8069e74a93ee2e5de5c24711e01a91cba Task-number: QTBUG-52003 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Update .gitignoreJ-P Nurmi2016-03-221-1/+1
| | | | | Change-Id: Ib209b03133309069d7bef5df77acf7b50e0e9698 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7J-P Nurmi2016-03-225-10/+88
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-03-225-10/+88
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/templates/qquickpopup.cpp Change-Id: Idb43ff6aff692d01e9bc03450a474bf18a7e41fa
| | * Fix QQuickPopupPositionerJ-P Nurmi2016-03-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tst_tooltip revealed a bug that QQuickPopupPositioner wasn't cleaning up its ancestor listeners properly. When QQuickPopup was destructed, it left a listener on the window root item. When the root item got later destructed, it tried to call a listener (the popup) that was already deleted. Change-Id: If041458da24be927f0bad19b9549dcabd1931977 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| | * Popup: fix marginsJ-P Nurmi2016-03-215-7/+85
| | | | | | | | | | | | | | | | | | Change-Id: I09f974a00a5a2a8f14645ff5d9bfbd6bad03d324 Task-number: QTBUG-51990 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | | Doc: moved Gallery files to examples/controls/galleryNico Vertriest2016-03-225-35/+61
|/ / | | | | | | | | Change-Id: I5e15631a51fe01e2ff7ecc6ea4b464b3522b7882 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Doc: moved chat tutorial to examples folderNico Vertriest2016-03-2220-0/+0
| | | | | | | | | | | | Change-Id: I152f29bfe9a202e9c0723e7aa2ebc8fa3c18e2d6 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Drawer: respect swipe velocityMitch Curtis2016-03-222-9/+48
| | | | | | | | | | | | | | | | A fast enough swipe should open/close the drawer, even if it doesn't cross the position threshold. Change-Id: Iede4ec669f7d42d197e8a42623714c977b0c8a03 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Fix build with '-qreal float'J-P Nurmi2016-03-222-3/+3
| | | | | | | | | | | | Change-Id: I190fe5408db582cdb393cf611ea0e661ed009d45 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru>
* | Remove RangeSlider::track in favor of Control::backgroundJ-P Nurmi2016-03-2110-103/+23
| | | | | | | | | | | | | | In the series of minimalizing the delegate APIs. Change-Id: I11e519f5226bf44d18b42fd31276c5528b18ec46 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Remove Slider::track in favor of Control::backgroundJ-P Nurmi2016-03-2111-98/+21
| | | | | | | | | | | | | | In the series of minimalizing the delegate APIs. Change-Id: I664f4227ff55876be2594c8855dacc7c92eddc94 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | ProgressBar: use contentItem instead of indicatorJ-P Nurmi2016-03-2113-76/+38
| | | | | | | | | | Change-Id: I8bd21b32b6f3d333c119d77b629b46fe411c06eb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Fix QQuickPopup::setVisible()J-P Nurmi2016-03-212-4/+21
| | | | | | | | | | | | | | | | | | | | Make sure to store the visibility flag even if the component is not yet completed. This way QQuickPopup::componentComplete() will run the enter transition as it was supposed. Change-Id: I1e4536e2fdb575b80174ae445626af43bdc45ed6 Task-number: QTBUG-51989 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Popup: make ApplicationWindow attached properties availableJ-P Nurmi2016-03-214-2/+23
| | | | | | | | | | | | Change-Id: Idde9fb49c222abc1ceabd15256695fd1961a9f76 Task-number: QTBUG-51991 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Change the default value of QQuickPopup::closePolicyJ-P Nurmi2016-03-213-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Popup::ClosePolicy was introduced, I thought that it would be better to not set OnPressOutside by default, because not all popups necessarily want to close on press outside. However, I've realized that every time I do Button { onClicked: popup.open() Popup { } } ...there's literally no interactive way to close the popup (popups don't take focus by default, so Esc doesn't work). Provided that a top-level QWidget with the Qt::Popup flag set also closes automatically on press outside, it probably makes more sense for us to follow the same pattern so that poor new users don't have to lookup the docs just to figure out how to make a popup close. :) In this case it's less troublesome to specify a different default value in those special scenarios/subclasses where closing on press outside is not desired (eg. the upcoming Popup-based Drawer). Change-Id: Iaeab4c548d63728df12232d8b65d469f0a2d80f5 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | ScrollBar: add increase(), decrease() and stepSizeJ-P Nurmi2016-03-215-1/+125
| | | | | | | | | | Change-Id: I052b650fee7ae94cc826446d285d653a41bd1e75 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | ScrollBar: use contentItem instead of handleJ-P Nurmi2016-03-2110-75/+46
| | | | | | | | | | | | | | | | Thanks to virtual resizeContent() we can finally use contentItem like everywhere else, and cleanup the special handle item. Change-Id: I9e52ec3ff327d19cda3d85d2e2d9b73d80442bbc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | ScrollIndicator: use contentItem instead of indicatorJ-P Nurmi2016-03-2110-73/+48
| | | | | | | | | | | | | | | | Thanks to virtual resizeContent() we can finally use contentItem like everywhere else, and cleanup the special indicator item. Change-Id: Ia2bd62684d49a05c199e490750a31c13d2c22182 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Universal: eliminate the extra Rectangle from ProgressBar indicatorJ-P Nurmi2016-03-213-27/+66
| | | | | | | | | | | | | | | | | | Make ProgressStrip capable of presenting non-indeterminate state the same way the Default and Material styles do. This makes the next step, which is to transition to contentItem, easier. Change-Id: I1a7e48cfba963f11764675b6e9a38ff2898b1212 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | tst_popup: add missing window->requestActivate() callsJ-P Nurmi2016-03-211-0/+3
| | | | | | | | | | | | | | | | | | The tests are waiting for the window to become active, but not actually requesting it to be activated. Change-Id: I9f8cd6a09b0d89bba8f9adb9b5efa5bb59d7c185 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | tst_control: fix font testsJ-P Nurmi2016-03-211-20/+0
| | | | | | | | | | | | | | | | | | We cannot assume that TextField and TextArea have the same default font than Control. This is no longer true for the Material style, which sets specific fonts for the editor controls since 63ed622. Change-Id: Ida26160b690fa0b4784c30f9e3b5a6211e9d743c Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | gallery.pro: add pages/*.qml to OTHER_FILESJ-P Nurmi2016-03-211-1/+2
| | | | | | | | | | | | | | So they show up in the QML tree in Qt Creator. Change-Id: I58d7e3c37a3d20451b48bcee7aaced3fb3461d9a Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Add QQuickVelocityCalculatorMitch Curtis2016-03-215-6/+278
| | | | | | | | | | | | | | | | This can be used by classes like QQuickDrawer and QQuickSwipeDelegate to handle calculation of flick velocity. Change-Id: I783c5fccad8509a8ea0ad4559f3f8b0c47b7a9a2 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Use fonts from theme for editable controlsNikita Krupenko2016-03-197-3/+28
| | | | | | | | | | | | | | Also set proper fonts for editable controls in Material theme. Change-Id: I78b8f8597a653af593787e569d6ba5ee7bf182a9 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Rename Qt Labs Controls to Qt Quick Controls 2 - style pluginsJ-P Nurmi2016-03-198-28/+28
| | | | | | | | | | | | | | | | | | 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: Ic43c53ee743c40e168722643dacffb966c066a10 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Rename Qt Labs Controls to Qt Quick Controls 2 - config fileJ-P Nurmi2016-03-1911-8/+8
| | | | | | | | | | Change-Id: I39bf55cc4e07788722fa2a3962a3476495b83dc9 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Rename Qt Labs Controls to Qt Quick Controls 2 - tst_gifsJ-P Nurmi2016-03-1912-11/+11
| | | | | | | | | | Change-Id: Ic7c4565d10f0a7074a063c73147a5b0b70352128 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Move QQuickSwitch::positionAt() to QQuickSwitchPrivateJ-P Nurmi2016-03-192-11/+11
| | | | | | | | | | | | | | | | Hide it from the semi-public API for now, so we don't need to commit to it until we know if it's really needed. Change-Id: Ic9b8deaa5d39bffb6f4649a64306687aea8db3fa Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Move QQuickScrollBar::positionAt() to QQuickScrollBarPrivateJ-P Nurmi2016-03-192-14/+16
| | | | | | | | | | | | | | | | Hide it from the semi-public API for now, so we don't need to commit to it until we know if it's really needed. Change-Id: Ic53cf2b34f293afcfc7c827db660ba6d5c678f0f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Cleanup whitespaceJ-P Nurmi2016-03-192-1/+1
| | | | | | | | | | Change-Id: I97ac45fe3b3205f4f5073cb0c59215ba6c010a13 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Clarify ComboBox::increase() and decrease() docsJ-P Nurmi2016-03-191-3/+8
| | | | | | | | | | Change-Id: I1057412b72c0912c41f23553681f0b32a32d4711 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Reorganize controls.pro vs. controls.pri listsJ-P Nurmi2016-03-192-7/+9
| | | | | | | | | | | | | | | | | | The same way other plugins do it. The main plugin file and the build system flags are specified in the .pro file, and the list of classes and types provided by the plugin are specified in the .pri file. Change-Id: I60c8aeca36c4a177f613ce88f34bfaf5d69b7543 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Rename QQuickPressAndHoldHelper to QQuickPressHandlerJ-P Nurmi2016-03-197-55/+55
| | | | | | | | | | | | | | | | | | | | The editors need also pressed() and released() signals. The actual signals will be added in a follow-up commit. This just renames the class to something that is not exclusively tied to press-and-hold. Task-number: QTBUG-51009 Change-Id: Ib6c7ec9f213c0c9deb08bb450206661ec34aaa82 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | tst_Snippets: add missing "qtquick*.qml" filterJ-P Nurmi2016-03-181-1/+1
| | | | | | | | | | | | | | | | Most doc example snippet files were renamed in ca8f57f, the test needs to be updated accordingly. Change-Id: I633ace53b7aaf8853b6eae5c8c60a90c2ae38dc2 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Cleanup QQuickProxyStyleJ-P Nurmi2016-03-189-74/+35
| | | | | | | | | | | | | | | | | | | | | | Install and remove the proxy theme automatically to eliminate the need for TestTheme do it in tst_applicationwindow. Furthermore, fix some Qt coding conventions, align header guards, remove unneeded empty destructor, and add missing explicit keywords for one-parameter constructors and cleanup somemeaningless ones in paremeterless ctors. Change-Id: Ib95dad003e35e468e941f3a0d2be5b21323fcccd Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Cleanup QQuickStyleSelectorJ-P Nurmi2016-03-183-128/+86
| | | | | | | | | | | | | | | | | | Remove some unneeded cruft that originates from QFileSelector and what we don't need in this specialized selector. Also, fix the header guards and include directives to use the same convention than all other classes. Change-Id: I728beba1156c0934bd0dd171038fc7560a556708 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Add Popup::localeJ-P Nurmi2016-03-186-33/+122
| | | | | | | | | | | | Change-Id: I1f07318f3e018debd74e41bc0a1443c45def7bf3 Task-number: QTBUG-50984 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Add Popup::fontJ-P Nurmi2016-03-186-48/+176
| | | | | | | | | | | | Change-Id: I66feeb597e9f4a6176d6462640b3e26823a3d761 Task-number: QTBUG-50984 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Document the order of priority for various methods of setting a styleMitch Curtis2016-03-181-0/+4
| | | | | | | | | | Change-Id: I44e22d049ea09eab38b9e85221a328fe904006d8 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Gallery: remove hard-coded Universal style from qtlabscontrols.confMitch Curtis2016-03-181-3/+0
| | | | | | | | | | | | | | This conflicts with the runtime settings menu in the app. Change-Id: If48205cada7eb9bedce3021160f4e6fb189138df Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Correct generated resource namesMitch Curtis2016-03-182-2/+2
| | | | | | | | | | | | | | | | a0d44a16535cc6e751045185e40bbd6c6edaf87a changed them when it shouldn't have. Change-Id: Ifadf02254a32618aa1490cb64278109a1098ff96 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Rename Qt Labs Controls to Qt Quick Controls 2 - doc asset filenamesMitch Curtis2016-03-18332-189/+189
| | | | | | | | | | | | | | | | | | This renames all documentation assets (snippets, images), but leaves .qdoc files and the .qdocconf file in an attempt to avoid conflicts with controls 1. Change-Id: I08692233e8d645de8d9746fe74edc14d31bb744e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Rename Qt Labs Controls to Qt Quick Controls 2 - build systemMitch Curtis2016-03-18103-265/+266
| | | | | | | | | | | | | | | | | | 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>
* | Chat Tutorial: fix install targetsMitch Curtis2016-03-1811-82/+13
| | | | | | | | | | | | Change-Id: I6651ecffcc76953c06bc70e81b38c72aa1da9b02 Task-number: QTBUG-51918 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | tst_combobox: remove the extra ApplicationWindow instanceJ-P Nurmi2016-03-181-102/+46
| | | | | | | | | | | | | | | | These tests dealing with multiple windows were just causing failures and major headache in the CI... Change-Id: I6d200c87d7efade1e2484c0ef57f95888f196ba6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7J-P Nurmi2016-03-1813-147/+270
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-03-1813-147/+270
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * QQuickOverlay: fix background visibility for multiple modal popupsJ-P Nurmi2016-03-172-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea of the "modalPopups > 1" check was to avoid calling QQmlProperty::write(), but it missed the fact that one modal popup might be still closing while a new modal popup is already opened. Thus, there's temporarily 2 modal popups visible, and we must transition the overlay background according to the state of the last shown modal popup. Change-Id: If25d83ccaa5adc29a9bc8d660f41fb66f90fb167 Task-number: QTBUG-51916 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 14:58:38 +0000