aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Rename Control::availableWidth/Height to contentWidth/Height"J-P Nurmi2015-06-1817-72/+70
| | | | | | | | | | | TextField and TextArea have different semantics for contentWidth and contentHeight. In addition, it looks like we need to restore contentWidth and contentHeight for Frame & GroupBox. This reverts commit 6941b934bdf5f3c7b65f682c8dfc5c6562292351. Change-Id: Ia115025a67b472ac67fbbc915b80312e4b4a7431 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Frame: inherit Control instead of ContainerJ-P Nurmi2015-06-183-7/+7
| | | | | Change-Id: I4360dcec1e9c5db32e6cadc87bd12db3b79a10df Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* StackView: inherit Control instead of ContainerJ-P Nurmi2015-06-183-8/+8
| | | | | Change-Id: I0bdaa7f4a7af659f75c15879914b104ca5843d22 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Docs: TextFieldJ-P Nurmi2015-06-168-0/+69
| | | | | Change-Id: I892ca73cdc1d96d924b369b30d822b3dd7611c94 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* TextField & TextArea: fix placeholderJ-P Nurmi2015-06-162-4/+4
| | | | | Change-Id: Ie59899d0f88a940a434b5ac9148ac453066169fd Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* TextArea: sync background resizing with ControlJ-P Nurmi2015-06-161-11/+21
| | | | | Change-Id: Iedb86604b9dc545a09f22c713f70970cc11ca6f9 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* TextField: sync background resizing with ControlJ-P Nurmi2015-06-161-11/+21
| | | | | Change-Id: Iabf6e88fc929215af6e82fdd1493678b73a65dcd Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* TabBar: implement contentData & contentChildrenJ-P Nurmi2015-06-154-35/+659
| | | | | Change-Id: I61d077758c83027cbfc1b99d32cb68efc0829ffd Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Demote some containers to plain controlsJ-P Nurmi2015-06-158-21/+21
| | | | | | | These don't need the upcoming container API for managing child items. Change-Id: I012db45277f0d4931c8c14fc74f46f9784430ea4 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Promote contentItem from Container to ControlJ-P Nurmi2015-06-156-82/+55
| | | | | Change-Id: I843e8afbee9f321112defeff99f885eadc748e75 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename Control::availableWidth/Height to contentWidth/HeightJ-P Nurmi2015-06-1518-70/+72
| | | | | Change-Id: Ia39a52e7e8d968b05fd7a2d64ab3b3030a9f528e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Remove obsolete Container::contentWidth & contentHeightJ-P Nurmi2015-06-153-50/+1
| | | | | Change-Id: Ia0ed99904e2bcdcf15820da9ad8a7e1f07fc7e1e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* GroupBox/Frame/ToolBar: use positioners as content itemJ-P Nurmi2015-06-157-109/+68
| | | | | Change-Id: I8f883dd0fd06172032dd78ff60437c906c2fe8dd Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Remove contentWidth/Height usage where applicableJ-P Nurmi2015-06-146-30/+24
| | | | | Change-Id: If8213f3416511c4881e5a7cd8904e4624ddd06bb Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Let QQuickGroupBox inherit QQuickFrameJ-P Nurmi2015-06-147-38/+127
| | | | | Change-Id: If1d8f3c5ca35b47031adb308a313deb5c1f38bca Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Pass new & old padding to QQuickControl::paddingChange()J-P Nurmi2015-06-144-17/+24
| | | | | | | | | Consistent with geometryChange() and useful for controls that want to resize delegate items in a specific dimension (ie. either the width or height follows the delegate size). Change-Id: Id143b2ef1e7b266ac32d9f3129f88d0fadb036d0 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Auto test anchors & attached objectsJ-P Nurmi2015-06-144-20/+107
| | | | | | | | | | | | | | | | | | | Rename the former tst_declarative to tst_sanity and extend it with tests to prevent: a) use of anchors, and b) multiple attached object instances of the same type. Anchors are not allowed for two reasons: - performance (QQuickAnchors is a QObject), and - to let users relayout delegates (x/y/width/height bindings can be overridden, anchors not so easily) Multiple attached object instances (eg. Theme) can easily happen by accident. "Theme.fooColor" can be used in the control root, but in all delegate items, "control.Theme.fooColor" must be used instead. Change-Id: I4045d5bd717fa21db79d1c3bd618fc450e292fa4 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename QQuickTheme -> QQuickThemeAttachedJ-P Nurmi2015-06-143-222/+222
| | | | | | | Follow the QtQuick conventions & make tst_sanity easier. Change-Id: Ic722383ca09de2bd53ee81177297ecafdf6a9cf7 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* tst_declarative: add qtquick.calendarJ-P Nurmi2015-06-141-0/+1
| | | | | Change-Id: Id0d3489c0c047c837bf2aab5bafcd75f9db3b966 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* TabButton: don't create two Theme objectsJ-P Nurmi2015-06-141-1/+1
| | | | | | | | All delegate items should use/share the same Theme object that is attached to the control's root item. Change-Id: I7b02416ddd9d9f75a02c2d9735d6e58dd51ce14f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Move the drawer example under extrasJ-P Nurmi2015-06-1110-3/+6
| | | | | Change-Id: I61827e005c9c7a047e181c8f23baac9a09a865ee Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Slider: add from & to propertiesJ-P Nurmi2015-06-113-24/+191
| | | | | Change-Id: Iee61e89d8519e7e3d27f1bf1c35af210f48bc7c9 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Auto test 100% declarative QML layerJ-P Nurmi2015-06-114-0/+210
| | | | | | | | | | Not allowed: - .js files - signal handlers - function declarations Change-Id: I31247f154b96718ca95835120c9e7326e3c97968 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Tabs example: use TabBar & SwipeViewJ-P Nurmi2015-06-111-13/+20
| | | | | Change-Id: I4733dac4e6947874eaff9d3f0ef6918e5207e892 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Import the new TabBar implementationJ-P Nurmi2015-06-113-27/+208
| | | | | Change-Id: I2c646c07f8310c27f3f03f3cdb27f748c5e6198c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Remove the old TabView implementationJ-P Nurmi2015-06-119-468/+2
| | | | | Change-Id: I8d8aa96f2f37f458577a5a3ec681e3c9174d0918 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add SwipeViewJ-P Nurmi2015-06-117-3/+432
| | | | | | | | | Based on the old TabView prototype, easy to use together with TabBar. The side-swiping feature will be removed from TabView to keep it simple and light-weight. Change-Id: I214b88688b98897962d335fe00008d222e0656a8 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* ProgressBar: add from, to & position propertiesJ-P Nurmi2015-06-104-14/+179
| | | | | Change-Id: I1bf29fab227f1f2642994f9167c9a6957abcbb65 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Docs: ProgressBarJ-P Nurmi2015-06-107-6/+55
| | | | | Change-Id: I82e524281c64580f9a910b700f0efbf53a4dabe7 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Docs: SliderJ-P Nurmi2015-06-109-12/+104
| | | | | Change-Id: I9499ab27a74996f43db70ec3ddc49e04b39d2da6 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Docs: ToggleButtonJ-P Nurmi2015-06-1010-1/+55
| | | | | Change-Id: Id4db1808a42ee29c030f095f8c87542de1702ce0 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Docs: SwitchJ-P Nurmi2015-06-1010-3/+72
| | | | | Change-Id: I1cdac365b12b7c7fb88c10f8a1de9d68ec1b44d8 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Docs: Customizing Qt Quick ControlsJ-P Nurmi2015-06-104-81/+107
| | | | | Change-Id: I747e030096a068e20043cdff9dd62775ca77feb6 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Container: resize the content automaticallyJ-P Nurmi2015-06-0913-43/+33
| | | | | Change-Id: If7964b64b6f78fc77e1095d69658e27bcb89a6f8 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* RadioButton docsJ-P Nurmi2015-06-099-1/+65
| | | | | Change-Id: I158dac84c09172b7c27b227f673653feafb956af Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* CheckBox docsJ-P Nurmi2015-06-0910-4/+65
| | | | | Change-Id: I7476a94fcae656ca11424681363228cfa2b99c6f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Tweak Button docsJ-P Nurmi2015-06-091-17/+11
| | | | | Change-Id: I23ee64fea97718a4688b03887eb2a62ccb464193 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Control docsJ-P Nurmi2015-06-091-12/+72
| | | | | Change-Id: I33a82ce789c649825a7999d8a01c4bc5f42be7cf Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Use Control::availableWidth and availableHeightJ-P Nurmi2015-06-0921-44/+44
| | | | | | | | | The same "w - lp - rp" and "h - tp - bp" patterns were repeated all over the codebase. This is why availableWidth and availableHeight were introduced. Change-Id: I8124e8668b553a409a25aa18d775f1bf0494398d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* tst_objectcount: warmup with Buttons & exclude the test QQmlComponentJ-P Nurmi2015-06-064-12/+7
| | | | | | | This ensures that singletons are excluded from the numbers. Change-Id: I14422b7b15d57273dd11717892ebd11eba650902 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Improve tst_objectcountJ-P Nurmi2015-06-064-5/+22
| | | | | | | | | Add support for VERBOSE=1 to get detailed object list, and improve the warmup by importing both controls and loading an image to avoid plugin loaders and image format plugins showing up in the numbers. Change-Id: I26cfdc6d71fe36b45b706164f696bbb7f055f078 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update .gitignoreJ-P Nurmi2015-06-061-0/+2
| | | | | Change-Id: I71df0935e69690775a58e868694632be9fbd7f78 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add Q_UNUSED() in addition to Q_ASSERT()J-P Nurmi2015-06-062-0/+2
| | | | | Change-Id: Id6509da9434e77349be068a84beb31e1f9edd124 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Control::availableWidth & availableHeightJ-P Nurmi2015-06-038-62/+134
| | | | | | | | | The recently introduced contentWidth/Height was ambiguous. It had even different semantics than in Containers, TextXxx & Flickable etc. Thus, replace with availableWidth/Height. Change-Id: Iaeef25ec82b395c602724d222ca73666460ffd29 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Improve Control::background automatic resizingJ-P Nurmi2015-05-232-2/+48
| | | | | | | | - width follows only if x and width are both not specified - height follows only if y and height are both not specified Change-Id: Ib881daa9da339baac53f7f9d4de6e5bdad7723e2 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix Control::mirroredChanged() emissionJ-P Nurmi2015-05-234-3/+40
| | | | | | | | It was emitted only when LayoutMirroring.enabled changed, but it also needs to be emitted when layoutDirection changes... Change-Id: I9424fdf232c11669780c9abace5c162a0df69dbe Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* QQuickContainer: omit automatic content size notifiersJ-P Nurmi2015-05-232-0/+14
| | | | | Change-Id: Iaeb851371810283cc272d755f32ffdafaff16118 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* QQuickControlPrivate::resizeBackground()J-P Nurmi2015-05-232-11/+21
| | | | | Change-Id: Id686a132fc9e7933c86e5314056f28fc50f6c61f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Button: revert automatic label layoutingJ-P Nurmi2015-05-234-55/+7
| | | | | | | | | | It got ugly and hackish, and broke for QQuickButton subclasses. Instead, use simple and pretty bindings (thanks to newly introduced contentWidth and contentHeight) to give the label a default size and position. Change-Id: I4cd705e86a12e8c9ffa0b7a768b1878bba797036 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add read-only Control::contentWidth and contentHeightJ-P Nurmi2015-05-236-20/+58
| | | | | | | This is the control width and height without padding. Change-Id: Iebee2a0d3fd6b5475fef1dad507c72efba12d903 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>