aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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-037-62/+41
| | | | | | | | | 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-231-2/+2
| | | | | | | | - 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-233-3/+5
| | | | | | | | 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>
* Theme: fix int->realJ-P Nurmi2015-05-223-33/+33
| | | | | Change-Id: I9833aee821e4c7d436e0c999dbeefe3e12b34875 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Expose read-only bool Control::mirrored property for convenienceJ-P Nurmi2015-05-2210-38/+31
| | | | | Change-Id: Icbb39aa1c3ac6f4b00adbc59c09a6c79e99bafd3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Promote layoutDirection & effectiveLayoutDirection to ControlJ-P Nurmi2015-05-2210-145/+50
| | | | | Change-Id: I44df09c17d6d20cfd929af4e331e15f48b19587e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix writable ScrollBar/Indicator position & size propertiesJ-P Nurmi2015-05-222-4/+4
| | | | | | | | | The setters were already exposed as slots, but the properties should be writable to let apps implement eg. "infinite" scrolling using pure declarative bindings. Change-Id: I6c827803559b6d0f1bb97b90345874173ef107e4 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Remove window flags from AbstractApplicationWindow.Friedemann Kleint2015-05-221-1/+0
| | | | | | | | | | | | The default window flags (Qt::Window) should be mapped to the default decoration. The old value Qt.Window | Qt.WindowFullscreenButtonHint caused a small border on Windows. Platforms that support Qt.WindowFullscreenButtonHint should add it to the default decoration. Change-Id: I1fb30073e350d038bcc50433f9c30e384a19fff1 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* QQuickButton: Add canceled signalGabriel de Dietrich2015-04-292-9/+31
| | | | | | | | | | | | | | We now support the following pattern: 1. Press the mouse button => emit pressed 2. Move the mouse cursor outside the button => pressed = false 3. Release the mouse button => emit canceled Note that getting the mouse grabbed away by another item, at any stage, will also emit the canceled signal. Change-Id: I97e485327370ea47943dfef75553000cee449a01 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Button docsJ-P Nurmi2015-04-289-9/+84
| | | | | Change-Id: I387ecb0cac328e99645b92371687cfc3678b5c71 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Extras: add documentation skeleton.Mitch Curtis2015-04-285-0/+183
| | | | | Change-Id: I31da59c893681455ab276c6ef3bf8a44bfa27f29 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
* Button: provide a default size for the label delegateJ-P Nurmi2015-04-284-6/+48
| | | | | | | | | | | If the label delegate has no explicit size defined, make it follow the size of the button minus padding. This should be a convenient default behavior that satisfies the most users, and saves a few of QML bindings. Makes also the upcoming "the default delegate implementation looks like this" -snippet nice and short. ;) Change-Id: I574439c1e52c2904746be7d830f9536d4cfd9083 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Set BusyIndicator::running to true by defaultFrederik Gladhorn2015-04-271-1/+1
| | | | | | | | This way it works out of the box and can be used with visible true/false etc. It's also in line with what qtquickcontrols (1) do. Change-Id: Ib82b0a60a7a78b6646452704f4ffb96fbd16923c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add QQuickControl::paddingChange()J-P Nurmi2015-04-272-4/+19
| | | | | | | | | Some controls will resize delegates inside the padding. In this case reacting to geometryChange() is not enough, they must handle paddingChange() as well. Change-Id: I424454732a31db6d5a99ee1423f75cf753c80259 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* ExclusiveGroup: don't crash when passing nullJ-P Nurmi2015-04-251-0/+6
| | | | | Change-Id: I4d6f555faac81e56c32c6baf0a9ede14849a5855 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add basic ApplicationWindow docsFrederik Gladhorn2015-04-241-6/+23
| | | | | Change-Id: I943d7df19c50e1e02b38c0b8e337d9d6a5aa7fdb Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix module exports (windows build)Frederik Gladhorn2015-04-243-3/+3
| | | | | | | | After renaming the module to get the doc build working, the exports are wrong. Change-Id: If92c06c0ce1c59a86d99d1f3d1b73ed6beeed297 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
* Use Theme.disabledColor to get sensible looks in disabled stateJ-P Nurmi2015-04-2312-43/+33
| | | | | Change-Id: I28831c979f8fa040fc3388eec6f2256930a3d91d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add Theme::disabledColorJ-P Nurmi2015-04-235-0/+53
| | | | | Change-Id: I8bfc5a89aa75addd4cb1a5c0d5b58ea8b2bcf67c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename qquickcalendar2 & qquickextras2 to be consistentJ-P Nurmi2015-04-234-4/+4
| | | | | Change-Id: I2abeb51c1c202a69626b6e4ae16c161b44a856f7 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Fix buid issue: qtquickcontrols-private => qtquickcontrols2-privateCaroline Chao2015-04-235-5/+5
| | | | | | | The module name has been change to qtquickcontrols2. Change-Id: I023fca6086251e151752ef6f18fe8bf6ffcaf1e1 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* QQuickStackView: fix buildJ-P Nurmi2015-04-231-1/+1
| | | | | | | error: no member named 'asString' in 'QV4::Value' Change-Id: If0bb37c59d1533f501677022485fe925a468be7f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename module to qtquickcontrols2Frederik Gladhorn2015-04-211-1/+1
| | | | | | | | | This allows to co-install the documentation since it ends up in doc/qtquickcontrols2, otherwise it overrides the qtquickcontrols (1) docs. Change-Id: Ie328d2db75c4023ea0db5106029b8fa14fbaf6e1 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* QQuickAbstractStackView: fix buildLiang Qi2015-04-171-1/+1
| | | | | | | error: no member named 'asArrayObject' in 'QV4::Value' Change-Id: I462cab09129916cd6d2834755751dcb3811a9df7 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Pimplify QQuickExclusiveAttachedJ-P Nurmi2015-04-152-9/+21
| | | | | Change-Id: I47a70f189e0573b9128a4f2953ae9f6df8f7921f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix Slider trackJ-P Nurmi2015-04-151-4/+3
| | | | | | | | | Avoid an id that conflicts with a property name. The id would take presedence in implicitWidth/Height bindings => wrong implicit size with a custom track. Change-Id: Ieb18844c27400ee0826e8e915b549364140c5d14 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add missing QQuickButton::pressed() & released() signalsJ-P Nurmi2015-04-152-3/+27
| | | | | Change-Id: I5942457258e1c666a0d67dbc5a9a5611d4ed5967 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix QQuickContainer::contentItemChange()J-P Nurmi2015-04-151-1/+1
| | | | | | | New item is the first, old item the second argument. Change-Id: I9e4255d1046b3f02d15633b0979eb56ca79e4dbb Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add a missing include to fix shadow buildLiang Qi2015-04-141-0/+1
| | | | | Change-Id: Ica038e064fef3e513bc95f147ed9f23c54de385b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix vertical SliderJ-P Nurmi2015-04-142-5/+6
| | | | | Change-Id: Idaa1416bdc09ad2ff469f7ddebcf8212bdeb1b2c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* TabBar: remove a signal handlerJ-P Nurmi2015-04-131-4/+1
| | | | | Change-Id: Ide1da96f028d665a3b660960787be94f71b67820 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Remove "abstract" prefix from the C++ classesJ-P Nurmi2015-04-1069-1253/+1253
| | | | | | | | | | The QML type registration is still using Abstract-prefix to avoid conflicts, until QTBUG-43581 & QTBUG-43582 have been resolved so that the public types can be used for accessing attached properties and enums. Change-Id: I469712461f706a83c226e4017282ca1d6914c670 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add QQuickAbstractContainer::contentItemChange()J-P Nurmi2015-04-102-0/+9
| | | | | Change-Id: I81c45567995abbbd5c9650b78435d00baa63a32f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Implement StackView in C++J-P Nurmi2015-04-0911-1379/+1117
| | | | | Change-Id: Ia5387aa16325453c676a2542f80c827d4c069ca9 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename Style to ThemeJ-P Nurmi2015-04-0833-443/+443
| | | | | Change-Id: I0186cd36f0b42ca015b70a09af27f8a3517d4a60 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Remove SpinBoxJ-P Nurmi2015-03-307-568/+0
| | | | | | | | | | SpinBox is a desktop centric control. It won't be provided in Qt Quick Controls 2.0, but maybe later when desktop support is re-considered. Qt Quick Controls 2.0 will focus on embedded and mobile. SpinBox is still available in 1.x Change-Id: I272b030734bad58de7e5b26c522189e0c520fca5 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* QQuickAbstractStackView: fix buildJ-P Nurmi2015-03-281-1/+1
| | | | | | | error: invalid conversion from 'const QV4::QObjectWrapper*' to 'QV4::QObjectWrapper*' Change-Id: I31561ae56faa190ec545c5d400cc807c0862b88e Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Specify link color & use StyledTextJ-P Nurmi2015-03-281-0/+1
| | | | | Change-Id: If6d087b4bb66bf4d293a8bcccf3ab01fa9266152 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Remove SplitViewJ-P Nurmi2015-03-237-752/+3
| | | | | | | | | | SplitView is a very centric control. It won't be provided in Qt Quick Controls 2.0, but maybe later when desktop support is re-considered. Qt Quick Controls 2.0 will focus on embedded and mobile. SplitView is still available in 1.x Change-Id: I3bc1c7a525d4e1e75153205ca806dc4dcee7e601 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* QQuickAbstractLabel: inherit QQuickTextJ-P Nurmi2015-03-185-3/+197
| | | | | Change-Id: I98679c8f3dffde96531c41c8219b60050d1e33dd Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Fix QQuickItemPrivate::(width|height)Valid usageJ-P Nurmi2015-03-137-14/+43
| | | | | Change-Id: I7c04a800210abbdbbb01b399964be7c42cf7f9c5 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* QQuickStyle: fix build on Linux / GCC 4.9J-P Nurmi2015-03-112-2/+2
| | | | | Change-Id: Ic42631cdcb207df98fe0337398580c686605a8f6 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Implement Style as an attached propertyJ-P Nurmi2015-03-1149-947/+1404
| | | | | Change-Id: I006ee566647e31d1a14919d164d7dd68539aae10 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Add missing includesFrederik Gladhorn2015-03-061-0/+2
| | | | | Change-Id: I3459e45aa8afb6c3b7fc900f0b34b0c8ff771f10 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* import QtQuick 2.6J-P Nurmi2015-03-0627-27/+27
| | | | | Change-Id: I2a8a1c6884e65383f0938763497a419d2f0fcbd6 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>