aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Rename Qt Labs Controls to Qt Quick Controls 2 - doc updateVenugopal Shivashankar2016-03-2924-66/+70
| | | | | | | | | | | | - Change \title, \page, and \l instances that used "qtlabs" instead of "qtquick". - Renamed the qdocconf file and changed the qch parameters in it to use "Qt Quick Controls 2". - Added "2" as output suffix for the html filenames. Change-Id: Ia2fdd1c835229e5216f42a2fdfa5f7e11965e21d Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* QQuickColorImageProvider: optimize string usageAnton Kudryavtsev2016-03-291-3/+3
| | | | | | | | | Don't allocate memory to extract name: use QStringRef. Replace QStringLiteral with QL1S to use QStringBuilder. Extract color only when it's needed. Change-Id: Ic02315e95defcffecce0128fb175b1d4a08db817 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* QQuickUniversalFocusRectangle: optimize string usageAnton Kudryavtsev2016-03-291-2/+4
| | | | | | | | | | Replace QString::arg() chain with multi-arg overloaded function. It's faster because of args are replaced in one pass. While touching the code, also cache width and height of bound. Change-Id: Id8d19143f426ed1998713204dc9c8d4b51e58db5 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* QQuickUniversalFocusRectangle: proper construction of vectorAnton Kudryavtsev2016-03-291-1/+1
| | | | | | | | | ... with known size and known value by according ctor. Don't use appending for this case. Change-Id: Ib2bf9703bb03bdfa628d1ae78c6d0353e991b3e4 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* QQuickStyleSelector: optimize string usageAnton Kudryavtsev2016-03-291-12/+12
| | | | | | | De-duplicate calls and cache results. Change-Id: Ia3424ac5149b947530e724b07adbff95cb54faf7 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Themes: cache result of QFont::family()Anton Kudryavtsev2016-03-282-8/+10
| | | | | Change-Id: I5318a61dbb699e2f251d218e614c1a2ff02d53a7 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Default style RadioButton: deduplicate bindingAnton Kudryavtsev2016-03-261-1/+1
| | | | | | | | Don't evaluate condition twice. Just use result of parent.border.color Change-Id: Ib0c31fd5eba9d12cb95143c77e40514637028f8a Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add support for specifying theme, accent & primary via envJ-P Nurmi2016-03-245-54/+117
| | | | | | | | Environment values take presedence over the default values requested in qtquickcontrols.conf, the same way than style name. Change-Id: I4641317bdce320c33a89f3614f3c782883c9c843 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Docs: add examples how to sync active states for ScrollBar & IndicatorJ-P Nurmi2016-03-234-0/+106
| | | | | Change-Id: I353f9c8b0dec4eef71d27300645a1dc3cbca82cd Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Fix borders for top & bottom drawersJ-P Nurmi2016-03-232-2/+2
| | | | | Change-Id: Ifeb927d7d3edde0b01b4ed666b6a19354171e605 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Inherit QQuickDrawer from QQuickPopupJ-P Nurmi2016-03-2311-318/+396
| | | | | | Change-Id: Icf71270e63aedd93ba975ab9743de68c3a54e849 Task-number: QTBUG-51007 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update Default style RadioButton to match new design specsMitch Curtis2016-03-231-4/+4
| | | | | | Change-Id: I35df7eef5ea47dc45d94a5c2c52e436c364a3fe4 Task-number: QTBUG-50993 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update Default style Switch to match new design specsMitch Curtis2016-03-231-6/+6
| | | | | | Change-Id: I3f566f138b3e26e75ad3e7ab36078ee04e5d627c Task-number: QTBUG-50993 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update Default style CheckBox to match new design specsMitch Curtis2016-03-236-4/+9
| | | | | | Change-Id: Ic828f82d38da4a16dc3d308cb67d94a11582768c Task-number: QTBUG-50993 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update Default style Button to match new design specsMitch Curtis2016-03-231-4/+7
| | | | | | Change-Id: Id95e48ee694cb205bf2f16acbc90b1cb54e6d596 Task-number: QTBUG-50993 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* tst_drawer: blacklist test_swipeVelocity on OSXJ-P Nurmi2016-03-232-2/+3
| | | | | | | | This way the tests are run at least on other platforms. Task-number: QTBUG-52003 Change-Id: Ibb5809aa56dc998d67e464d8d76cb51954d1581e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Support ApplicationWindow attached property for items inside PopupJ-P Nurmi2016-03-232-1/+17
| | | | | | Change-Id: Ie8fb9fcf415670102d9364f85120bc315a8a067e Task-number: QTBUG-51991 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename Qt Labs Controls to Qt Quick Controls 2 - doc filenamesVenugopal Shivashankar2016-03-2220-0/+0
| | | | | | | | Except the .qdocconf all .qdoc files are renamed to use "qtquickcontrols2" instead of "qtlabscontrols". Change-Id: I317a4e81ea4e78b63a0d4d849d7352f496824cb3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 19:13:00 +0000