summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix tooltip position for real inside QQuickWidgets5.3Kevin Funk2014-09-301-2/+3
| | | | | | | | | | If the QQuickWidget was embedded in a complex layout, tooltip positions would be off. Tooltip positions need to be moved by the offset of the actual render window. Task-number: QTBUG-39878 Change-Id: I5f923b1d1a0956aa67afa7c05d4bfec2788682a6 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Merge remote-tracking branch 'origin/5.3.2' into 5.3J-P Nurmi2014-09-167-24/+26
|\ | | | | | | Change-Id: I91d1886e6081e39a1b5ea17b6c44d73b539889b1
| * Fix menu popups positioning with window containersv5.3.25.3.2Laszlo Agocs2014-09-103-15/+16
| | | | | | | | | | | | | | Task-number: QTBUG-40883 Change-Id: I5c46c049b5890259d65f325adb59e15ebf29f84a Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Fix wrong menu popup window parentingLaszlo Agocs2014-09-091-0/+2
| | | | | | | | | | | | | | | | | | | | When embedded into a widget-based UI in a window container, extra care is needed to find the correct top-level because the QQuickWindow is not it. Task-number: QTBUG-40883 Change-Id: I8d5a91f23c405e14b0994f08aa74581742f6482b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Fix menu/combobox popup positioningJ-P Nurmi2014-09-051-5/+4
| | | | | | | | | | | | | | Task-number: QTBUG-41113 Change-Id: Ic55657d42b44950356b176334d826b0a8d16e3cd Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| * Revert "TextField/Area: soft dependency to inputMethodHints"J-P Nurmi2014-09-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | This broke the input method hints handling altogether. We will fix this properly in QtQuickTextInput and QQuickTextEdit instead. Nobody has even complained about QT_NO_IM, it was a hypothetical problem brought up in code reviews. This reverts commit c185d6cd67653b34f04a7999a84634de1f1063b0. Change-Id: Ib81adba1ee899dd2a384bd83eea82d629eacb333 Reviewed-by: Samuel Nevala <samuel.nevala@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| * Dialogs: correct C++ warningsShawn Rutledge2014-09-032-2/+2
| | | | | | | | | | | | | | | | Initialization order, and mistaken use of comparison instead of assignment. Change-Id: Ic9fbcac1085d84294386311f967209a6b33f2297 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | TableView: fix tab navigationJ-P Nurmi2014-09-102-1/+27
| | | | | | | | | | | | Task-number: QTBUG-41202 Change-Id: I13c420dd1443c152053ac331da7bfe5a9fbc9603 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | tst_tableview: cleanup test items to avoid side effects in later testsJ-P Nurmi2014-09-101-0/+5
| | | | | | | | | | Change-Id: I2027a4576529accb623045d4ce63c76af723c5e9 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Doc: .*Style attachment correctionDavid Fries2014-09-0516-16/+16
| | | | | | | | | | | | | | The .*Style is attached to the control not the other way around. Change-Id: Ia9158463d86881997e917c26427cb62beb8e5edc Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Bump versionFrederik Gladhorn2014-08-291-1/+1
|/ | | | Change-Id: I8c96a7ae4ade4be6e230a8e542d68644d4c945d1
* Dialogs must know when they are closed by the operating systemShawn Rutledge2014-08-252-1/+6
| | | | | | | | | | The dialog cannot be opened again if it does not know that it was closed. So whenever there is a native window, the visibleChanged signal must be connected. Task-number: QTBUG-40855 Change-Id: I0726b7568937a19deba067d43ce72b0579f7c4c5 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Dialog: initialize enabled and clicked buttonsShawn Rutledge2014-08-242-0/+10
| | | | | | | | | | | When the dialog becomes visible, no button has been clicked yet: we are waiting for the user to do that. Failure to initialize m_clickedButton made the logic in accept() and reject() unreliable: accept() does not imply OK unless we are sure the user did not click any other button, and the same with reject() implying Cancel. Change-Id: I340c18bd0fca6cc9a7274c1063882de425444326 Reviewed-by: Liang Qi <liang.qi@digia.com>
* 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>
* Dialog: do not emit signals twice when a button is clickedShawn Rutledge2014-08-232-33/+0
| | | | | | | | | | buttonClicked() is public API, whereas click(button, role) is called when a button is clicked. So there is no need to have buttonClicked() connect to anything internally. Task-number: QTBUG-40613 Change-Id: I25872d532ba77b4d708a2c25b31b6064fd5da599 Reviewed-by: Liang Qi <liang.qi@digia.com>
* QtQuick.Dialogs FileDialog: default mode is ExistingFileShawn Rutledge2014-08-141-0/+1
| | | | | | | | | | Previously did not sync the mode with the state of the selectExisting property on construction. (cherry-picked from qtdeclarative/fa5db4201945565bd2c5ff42ab233f497666003f) Task-number: QTBUG-35877 Change-Id: Ifb630fb51c463025ec2f6a1932714f354552c234 Reviewed-by: Liang Qi <liang.qi@digia.com>
* QtQuick.Dialogs FontDialog: fix a binding loop issueLiang Qi2014-08-051-1/+2
| | | | | Change-Id: Ie57b3900bd5a17fa4a05af945eeea98d2b12ffbd Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Fix tooltip position when used with QQuickWidgetLaszlo Agocs2014-07-301-2/+7
| | | | | | Task-number: QTBUG-39878 Change-Id: I1df4e7b7b17a11234e2569d6502aa9618a590acd Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Doc: Updated the Calendar example documentationVenu2014-07-302-3/+78
| | | | | | | | | | Added more information about what the example does and how Also updated the screenshot of the example. Task-number: QTBUG-37203 Change-Id: I20f9e5ed864b2a1f030736ad45c495118c19bf55 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Make the default style "Base" when built without widgets supportJ-P Nurmi2014-07-291-1/+1
| | | | | | | | It is possible to have qtwidgets installed but qtquickcontrols built without a dependency to qtwidgets. Change-Id: Ic6f640e352984d38d9020011078fe061ff46acac Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* QQuickPopupWindow: Use actual item size as content sizeGabriel de Dietrich2014-07-292-5/+3
| | | | | | | | | Using the children rect size was a mistake, particularly when using Instantator in a Menu. Task-number: QTBUG-40221 Change-Id: I6efe9aad617a7b0adbea0bb96bf843c5c1779131 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* QtQuick.Dialogs: check for inheriting from QApplicationShawn Rutledge2014-07-281-1/+1
| | | | | | | | | | Widget-based dialogs are allowed if the application is a QApplication, but subclassing is OK too. (cherry-picked from qtdeclarative 76952046ceccf2cd176a3452bc908cac769f90d9) Task-number: QTBUG-35769 Change-Id: I0b74c870488c157913a68e1a30744cd46ae82cee Reviewed-by: Liang Qi <liang.qi@digia.com>
* 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>
* Centralize determination of "no desktop" configurationsJ-P Nurmi2014-07-1814-13/+14
| | | | | | Change-Id: I030012f48668db4f01737ef92fdb7e6e0426e025 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
* Do not embed the Desktop style into resources on irrelevant platformsJ-P Nurmi2014-07-181-25/+27
| | | | | | | | | | The Desktop style is not built on these touch/mobile platforms, or when QtWidgets is not enabled, so it's pointless to embed these QML files. Change-Id: Iac11473b3a9791745a107e0f7ac1cd34a91a9a5d Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Improve implicit size of Calendar on high DPI devices.Mitch Curtis2014-07-172-7/+12
| | | | | | Task-number: QTBUG-39473 Change-Id: Ibfb1c040efd9744ba6c8bc56affcdf90a807b046 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* MenuStyle: fix default text rendering typeJ-P Nurmi2014-07-171-0/+3
| | | | | | | | It's missing Text.NativeRendering which makes it look awful. We use native rendering everywhere by default, even in MenuBarStyle. Change-Id: I2f032fad87a0a2700e13d0f55152bb6293d20d9a Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* SpinBox: don't force active focus when tapping the buttons on touchJ-P Nurmi2014-07-141-2/+2
| | | | | | | | | | This improves the usability of SpinBox on touch devices. The input panel is no longer immediately shown when tapping the buttons, but only when tapping the editor area. Change-Id: I09a2218419490cb33da3b0733c9a42f871edc965 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
* Fixed incorrect cursor when moving column in TableViewPiotr Wycisk2014-07-111-1/+2
| | | | | | | | Task-number: QTBUG-37288 TableView: The resize column cursor should not appear when moving a column Change-Id: Ibd3ef44eeb645e8a9c17a58a3fcf2ef06624d3ad Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Doc: Updated the example documentationVenu2014-07-111-3/+31
| | | | | | Task-number: QTBUG-37203 Change-Id: I8a3d48ea8163787cd7f41d43ea201be067d310f0 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Dialog: Add missing docsShawn Rutledge2014-07-093-12/+223
| | | | | | | Also fixed a qWarning and updated example import statement. Change-Id: I873b52e297bbefe66c6c131573804eee98c40a2f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix editable ComboBox mouse cursorJ-P Nurmi2014-07-091-1/+9
| | | | | Change-Id: I6866686b09348f486c6629917d271b640b1b734e Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Doc: Update image for ApplicationWindowCaroline Chao2014-07-081-0/+0
| | | | | Change-Id: I95f497ed0e5d084d2941a1523165c3e37df415e2 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix SpinBox mouse cursorJ-P Nurmi2014-07-081-1/+10
| | | | | Change-Id: I0b0fe9c7b7ddd9ba01035fd2ca70c7b11433ec90 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Mention that ApplicationWindow is not visible by default.Mitch Curtis2014-07-071-0/+4
| | | | | Change-Id: I8291df95b1aade62b91f000c64d5cd810de252ac Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Allow QT_QUICK_CONTROLS_STYLE pointing to resourcesJ-P Nurmi2014-07-031-1/+3
| | | | | | Change-Id: I4cf6e040c8ac5bc2e8ba1838f22cb5b1cd776f85 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* TextField/Area: soft dependency to inputMethodHintsJ-P Nurmi2014-07-022-2/+2
| | | | | | | | Don't use an alias to a property that might not exist (when QT_NO_IM), but just bind to it and fallback to Qt.ImhNone if it's undefined. Change-Id: I0e8de86acb534dfe620b829c2bff09db119ef08d Reviewed-by: Liang Qi <liang.qi@digia.com>
* Use the correct parent window for menu popupsLaszlo Agocs2014-07-013-10/+16
| | | | | | | | | The previous fix applied only to the non-platform menu case and was broken on OS X at least, when having a combobox in a QQuickWidget. Task-number: QTBUG-39908 Change-Id: I5dde103c2fe33d52a312cc80b36b47b13e72a188 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Revise unstable and slow GridLayout auto testJ-P Nurmi2014-06-301-82/+86
| | | | | | | | - add missing destroy()'s - use tryCompare() instead of waitForRendering() Change-Id: I6dfbb9c55d3cb199d8351b83d67a6ef45890143b Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Doc: Add a link to Tab in TabView documentationCaroline Chao2014-06-281-0/+2
| | | | | | Task-number: QTBUG-39671 Change-Id: I5a9ddf064c9095c89906ac75665d67d7a51ce615 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Added images and missing snippetsVenu2014-06-2752-112/+348
| | | | | | Task-number: QTBUG-33799 Change-Id: I582518a73276d47cf63cf31411b5176a90acab6f Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Merge remote-tracking branch 'origin/5.3.1' into 5.3Frederik Gladhorn2014-06-251-0/+77
|\ | | | | | | Change-Id: I433651eb5ccc66d74fa2dcf508e5fde44e4ed5db
| * 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>
* | Cleanup whitespaceJ-P Nurmi2014-06-2413-13/+13
| | | | | | | | | | Change-Id: I9e84ce56e853a18205aa180cef1ee8ff4f2f678c Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Remove QtWidgets dependency for WinRTJ-P Nurmi2014-06-2413-13/+13
| | | | | | | | | | Change-Id: Ifacceae8690d2ab4dfaed0d5439b9e29804c1943 Reviewed-by: Andrew Knight <andrew.knight@digia.com>
* | Remove Widgets dependency for QNXAndreas Holzammer2014-06-2413-13/+13
| | | | | | | | | | | | | | | | | | 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>
* | ComboBox: open the popup on release on touch devicesJ-P Nurmi2014-06-231-2/+13
| | | | | | | | | | | | | | | | | | This is the common behavior on touch devices, and avoids such problems as opening the popup while trying to flick a ScrollView that contains a ComboBox. Change-Id: I9207bc2c00524fe4cd5a673f4fe505f6db825838 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Slider: fix behavior inside a flickable on touchJ-P Nurmi2014-06-231-4/+8
| | | | | | | | | | | | | | | | | | | | Do not move the handle immediately on press, but delay it until the drag is over the threshold. This makes Slider behave inside a flickable in a sensible way ie. the handle is not prematurely moved when flicking Change-Id: Ie02762717156e75be9db757330a95a3f50451f1a Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Singleton SystemPaletteJ-P Nurmi2014-06-2326-55/+111
| | | | | | | | | | | | | | | | | | | | Each SystemPalette instance installs an event filter on the application object. Avoid this by sharing a single SystemPalette instance. Change-Id: Ica9f8979b33e511c1238add3d689f380d0daa93c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Kill unnecessary SystemPalette instancesJ-P Nurmi2014-06-2014-74/+5
| | | | | | | | | | | | | | | | | | | | | | | | Each SystemPalette instance installs an event filter on the application object, so we should try to avoid these as much as possible. Style already creates an instance that switches between Active and Disabled states based on control's enabled state and is suitable for most use cases. Change-Id: Icdbc793f639a3217ece6b2ded281e2a8beacb742 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>