summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge v5.1.0 releasebaserock/morphRichard Dale2013-07-04143-1647/+3336
|\
| * Adapt to Qt.platform.os rename ("mac" -> "osx")v5.1.0-rc2v5.1.0J-P Nurmi2013-06-246-10/+10
| | | | | | | | | | | | Change-Id: I089a01bee10b92f85dcdd338c695a3b796b0ecd1 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
| * Doc: Small fix for SplitViewCaroline Chao2013-06-241-2/+0
| | | | | | | | | | | | | | | | | | SplitView items must set width/height and not Layout.preferredWidth/Layout.preferredHeight. Change-Id: Ice888d51c63cbdaf6e0e235c0c7569c4a8794b7d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Doc: Fix QCH filter attributes for Qt Quick Controls/StylesTopi Reinio2013-06-182-2/+2
| | | | | | | | | | | | | | | | | | | | Fix typos in filter attibutes, preventing filtering from working in Assistant. Task-number: QTBUG-31796 Change-Id: I21c91b43881cd73ae7df4203922085e7c9f93e8f Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Fix QCH documentation structure for Qt Quick LayoutsTopi Reinio2013-06-171-2/+1
| | | | | | | | | | | | | | | | | | | | | | Remove 'type = manual' definition from the .qdocconf to prevent links on the module page from being added as subtopics. Also, fix the QML Types topic to point to the correct index page. Task-number: QTBUG-31778 Change-Id: I3df99e0fafff4bf807b952ad4bf976e2a481221d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * Revert "Add qml/js files in resource files"Caroline Chao2013-06-1438-298/+84
| | | | | | | | | | | | | | | | | | | | | | | | We need to investigate more this solution. Deployment issue for Qt Quick Controls will be a known limitation in 5.1.0. This reverts commit 41e13d3746c8b7b5cd550091c63fd8ab066422cf. Change-Id: I501be7494bdbdfbb799d31c612d0c20e7f87ffc7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
| * Doc: Fixed Qt Quick Layouts listing in qch files.Jerome Pasion2013-06-141-1/+1
| | | | | | | | | | | | | | -should be lowercase in selectors variable Change-Id: Iab46d0d339a4a4ffe47fac2f7b9c6d6064e4d2aa Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Add qml/js files in resource filesCaroline Chao2013-06-1338-84/+298
| | | | | | | | | | | | | | | | | | | | | | To make deployment of Qt Quick Controls based applications easier. Task-number: QTBUG-31565 Change-Id: I0b8af2864ef0dc9121eed3189ced64712bdb3d20 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Move doc from the index to the overview pagev5.1.0-rc1Caroline Chao2013-06-128-90/+101
| | | | | | | | | | | | | | | | | | | | Cleanup the links. And doc fix in TableViewStyle.qml Change-Id: Id61fcff49af79f35f68696900142bb200ae18042 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
| * Fix TableView::positionViewAtRow()J-P Nurmi2013-06-112-1/+34
| | | | | | | | | | | | | | Task-number: QTBUG-31631 Change-Id: Iaf5bd5c895f0fd94c7ffec19b571786ee9352782 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| * Updated activation signals in TableViewJens Bache-Wiig2013-06-103-22/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added row property to activated() - Added clicked(row) signal - Added doubleClicked(row) signal - We also fixed the behavior so that we do not emit activated if the user clicks outside of the available rows. - We fixed a problem where key events would not be seen outside of the control Change-Id: I13feba26e900daf85be7be88216f1a0a4a446c57 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * Add overview documentation for Qt Quick LayoutsJan Arve Saether2013-06-105-0/+229
| | | | | | | | | | | | Change-Id: I79df2abca1de42496f75fc08a779203a406ce155 Reviewed-by: Nico Vertriest <nico.vertriest@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Don't let tabs grab focus on pressJens Bache-Wiig2013-06-102-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | Tab buttons should never take focus when pressed, but only pass on focus to their child items. Tab focus should only get focus when they are tabbed into. Autotest is updated. Change-Id: I0edad4d893be7ed7066d3a3631ca340e9bf8cb53 Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Text example: Update example.htmlCaroline Chao2013-06-074-37/+37
| | | | | | | | | | | | | | | | | | | | Remove references to QTextEdit and adapt it to match TextArea instead. Update the Qt logo. Change-Id: I6939bf7418fbad883e1d967bea3688d9ccfd4885 Reviewed-by: Hanne Linaae <hanne.linaae@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * Simplify example code by using QmlApplicationEngineJens Bache-Wiig2013-06-072-21/+4
| | | | | | | | | | | | | | | | | | | | | | | | Since QmlApplicationEngine does all the nasty bits including setting the incubation controller, we should use it in all of our examples. Task-number: QTBUG-31203 Change-Id: Ie4f2313b66ef1a460aa50559f5c0a6125d0c69f1 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * Doc: check language and compliance with Writing GuidelinesNico Vertriest2013-06-061-125/+127
| | | | | | | | | | | | | | | | Task-number: QTBUG-30318 Change-Id: I6117c41344f1a5015a1fa2d4a59950306a719313 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Examples: several fixes for textLiang Qi2013-06-063-50/+166
| | | | | | | | | | | | | | | | | | | | | | | | * Cut/Copy/Paste works * The initial status for b/i/u and alignment works * Font size and family works * Text color works Task-number: QTBUG-31482 Change-Id: I299931dede9defbb1d3eb927f867e77d20ded5ae Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Improve the Styles page and add missing SliderStyle propertyJens Bache-Wiig2013-06-0610-36/+159
| | | | | | | | | | | | | | | | | | | | - I noticed we incorrectly exposed sliderPosition. - This adds some more custom style examples for the gallery and makes the second column actually different from the first. Change-Id: I73f0d613f51f6e75aaf734fd4e4c9fdb890e3e42 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| * Fixed a bug where a rearrange was not always doneJan Arve Saether2013-06-063-2/+56
| | | | | | | | | | | | | | | | | | This happened only when the size of the layout didn't change. Task-number: QTBUG-31570 Change-Id: Ia090c0062fa8fc3eb6f648592529ee8fcd025593 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * Fix missing headerview gap when not showing frame in TableViewJens Bache-Wiig2013-06-061-1/+1
| | | | | | | | | | | | | | Tested on all three platforms and looks better. Change-Id: I8a68dfc7fe97a05c4313ac10de2f93dabec5a964 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Replace backgroundColor with backgroundVisibleJens Bache-Wiig2013-06-062-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | This exposes backgroundVisible to TableView and replaces backgroundColor in TextArea. We think the backgroundVisible is more flexible and allows us to find a more appropriate solution to support palette in the future. Change-Id: Icfcd512c29cf030059c4ce2d32feb402d1a33662 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * Expose hovered to our controls and document it consistentlyJens Bache-Wiig2013-06-0620-111/+81
| | | | | | | | | | | | | | | | | | The current solution is messy and we only expose it partially to some of our styles. I think we should simply expose this to all. Change-Id: Ia546d5657ea416df99c9d9d92cc714b7f1c928fe Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
| * Doc: Small fixesCaroline Chao2013-06-062-2/+2
| | | | | | | | | | | | Change-Id: I163f69c14ecbc07a66b1bac7c5a53b22405c895e Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * Prevent possible division by zeroJens Bache-Wiig2013-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | This might cause problems on certain platforms. While hard to reproduce it seems safer to add the check. Note that we do not get the alternating pattern if there is nothing set on the model, but this was already the case. Change-Id: I984df9cfef30b4de0e72e8ccf14cc65bddbf04ef Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Improve qtquick controls pageJens Bache-Wiig2013-06-041-8/+46
| | | | | | | | | | | | | | | | | | | | | | Added more information for "Getting Started" - Cleaned up some language - Remove desktop specific - Mention widget dependency - Use QmlApplicationEngine in example Change-Id: I0e5d4bef124ce4571c1b6fe780ee78b8231cbb32 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Fix warning in Slider when stepSize is setJens Bache-Wiig2013-06-042-8/+19
| | | | | | | | | | | | | | | | | | Also adding a new test for stepSize Task-number: QTBUG-31441 Change-Id: Ib8d9cc2188b5f73b6b0ac866ade1a7edb1d662b7 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| * TextArea: allow declaring child elements inlineJ-P Nurmi2013-06-041-0/+3
| | | | | | | | | | | | Change-Id: I7da8e3664d6bd3ee9a8c4f22d4a5b686d1c5b5a9 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Fixed some bugs in how effective size hints were calculatedJan Arve Saether2013-06-043-35/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not bound explicit preferred size with implicit sizes. This means that if Layout.preferredWidth was *explicitly* set to 50, and Layout.maximumWidth had the implicit value 20, the effective maximum width would be expanded to 50 in order to not disregard the explicitly set preferred width. (covered by the tag "expandMaxToExplicitPref" in test_sizeHint) Note that this doesn't break any autotests, but the row layout autotest was slightly changed to be able to add the new test cases. This should make the behavior match the behavior of QGraphicsGridLayout and QGraphicsLinearLayout Change-Id: Ia23c8ef909827f14349906c003c72bb83689ef9a Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Gallery: remove reference to colorDialogCaroline Chao2013-06-041-1/+0
| | | | | | | | | | Change-Id: I0433e350634b4a2bea6161f53e7c7363654e2cf6 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Buttons: Allow overriding of visual properties when 'action' is setGabriel de Dietrich2013-06-039-41/+63
| | | | | | | | | | | | | | | | | | | | Those properties are, text, tooltip, iconName, and iconSource. Also, properly capitalized gallery's tooltips. Change-Id: I1995a85565edd7aaa420279821d7c1a31ef18253 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Improve default size for several controlsJens Bache-Wiig2013-06-034-8/+7
| | | | | | | | | | | | | | | | | | | | We should set this to some decent default value that doesn't look wrong. Note that the width and height definition in TextArea could cause conflicts when used in layouts. Change-Id: I815ff96c02f9a9a76c07d57181f3a24291c83c52 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Fix incorrect size hint for ToolBar and StatusBarJens Bache-Wiig2013-06-032-2/+10
| | | | | | | | | | | | | | | | | | | | We only cared about reserving space for the height but while trying to actually get the minimumSize for a window based on the toolbar content I realized that we really need to calculate the width as well. Change-Id: I7b55b66a2475a2355d30614095f173a39f47f2f1 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| * Doc: Fixes warningsCaroline Chao2013-06-038-29/+28
| | | | | | | | | | | | | | | | | | | | | | Fixes issues including: - Misspelled links - Links to signal with arguments - \table in SplitView.qml - Links to current file Change-Id: I2cbadf661a641f19ed55f6854922b2b69966bc9c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Add doc structure for StylesCaroline Chao2013-06-0322-23/+155
| | | | | | | | | | | | | | | | | | | | And: - Add an index page for the Styles - Add missing documentation for some properties (Component) - Fix unexpected curly brackets in a couple of code snippets Change-Id: Ib7265d1cd011a81012eb4b7f69738b84fba5b531 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Remove unnecessary bottom margin for TabView on macJens Bache-Wiig2013-06-031-1/+1
| | | | | | | | | | | | | | | | This extra padding at the bottom is not needed and only serves to make the borders uneven on mac. Change-Id: Ibb3f8a3ba1f37ce1e9c6674a53cfb13e257fb97f Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| * TableView: Expand to single column and prevent multiple useJens Bache-Wiig2013-05-313-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | This fix ensures that we can only add a TableViewColumn exactly once. It also automatically expands the column with to the viewport when only one column is in use. In addition I have disabled dragging when columnCount == 1 as it was pointless. Change-Id: Ief6011c3e58166907836bf55b0fa6643698192d2 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| * ToolBar: Get proper pressed state on MacGabriel de Dietrich2013-05-311-2/+2
| | | | | | | | | | | | | | | | Depends on https://codereview.qt-project.org/57500 Change-Id: I131fa8e25322a10a10878e5f603084e951d101ad Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * TabViewStyle: expose styleData.availableWidthJ-P Nurmi2013-05-312-2/+2
| | | | | | | | | | Change-Id: Ib209ec7311c64f172718c8baa7d7f63f6f79a3a8 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Cleaning up some examples and removing clutterJens Bache-Wiig2013-05-3110-290/+325
| | | | | | | | | | | | | | | | We want to use more layouts in our examples as it is the recommended way to create tool bars etc. Change-Id: Ib3b1e8e907cc5277d522557a19d2c294a7d251b1 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * Fix missing margins and incorrect size for ToolBar and StatusBarJens Bache-Wiig2013-05-317-51/+191
| | | | | | | | | | | | | | | | | | | | | | Using the implicitHeight of an item makes ToolBar and StatusBar a lot more useable with layouts. In addition we enable the padding property from the style, allowing its content to be positioned in a more convenient way. This is similar to how we already do it for GroupBox. Change-Id: Ia2aa1bcb9ae109718fd752401400222adec242ac Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Styles docs: fix the styleData -tablesJ-P Nurmi2013-05-316-34/+47
| | | | | | | | | | Change-Id: I75fb45d3f6b7b93f5758bd1664f9ff674a492772 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Several improvements to documentationJan Arve Saether2013-05-313-44/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * List all applicable attached properties for each layout * Move the stuff that describes min,pref and max sizes from GridLayout to the Layout docs. * Document that all layouts \inherits Item. (Even if they don't directly inherit, this is consistent with how the positioners are documented) * Add some links to Row, Column and Grid where appropriate * Use \qmlattachedproperty instead of \qmlproperty for the attached properties. (Again, consistent with how the Positioners attached properties are documented) * Change POSITIVE_INFINITE to the correct POSITIVE_INFINITY Change-Id: Ia9272faa479b48a97300b031402c0380ca113d7b Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Make Stack attached properties more visibleCaroline Chao2013-05-312-9/+17
| | | | | | | | | | | | | | | | | | And use \qmlattachedproperty instead of \qmlproperty for properties in the Stack. Change-Id: I1ffbd84ce91fd5a9040c082a8bcb403589becf91 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Do not crash when deleting a layoutJan Arve Saether2013-05-303-10/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | onItemVisibleChanged() was in some cases called after the dtor of QQuickGridLayoutBase was called. After having called the dtor of QQuickGridLayoutBase it would continue to call the dtors of its base classes until it entered the dtor of QQuickItem. In QQuickItem it would call setParentItem(0) on all its child items. This caused the item to become visible again, thus it would emit visibleChanged() and finally invoke QQuickGridLayoutBase::onItemVisibleChanged() which lead to the crash (while trying to call the virtual invalidate()) The fix is to do an early return if we know that the layout is in the destruction phase. isReady() will return only true *after* the component is completed, and before the component is destructing. Task-number: QTBUG-31276 Change-Id: I191e348278e3d052c109bffb92a1ccd9326859bd Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Remove remaining references to PageStackJ-P Nurmi2013-05-308-35/+35
| | | | | | | | | | | | Change-Id: I59a9846c83340d0752659ef22cbb19a4be6a4129 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Docs: fix missing/leftover docs, types, tags...J-P Nurmi2013-05-306-28/+41
| | | | | | | | | | | | Task-number: QTBUG-31262 Change-Id: I6bf48604b9392a2a9c63c344363188a4693a8547 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Make styleHints a variant mapJens Bache-Wiig2013-05-309-71/+71
| | | | | | | | | | | | | | | | | | | | The styleHints are not really flexible enough as a stringlist as we want to be able to pass actual properties. Since we already have a properties member of the style we should move all of our internal properties to that. Change-Id: Id7a66ade243461f54c41b9ec89144668aaf19483 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Removed reference to nonexistent file PageSlideTransition.qml.Mitch Curtis2013-05-301-1/+0
| | | | | | | | | | Change-Id: I2b4a4369496d85829fb2de14078042c0a76f2aba Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Rename PaddedStyle to AbstractStyleJ-P Nurmi2013-05-3021-43/+85
| | | | | | | | | | | | | | | | | | | | | | Make Style inherit AbstractStyle, so it becomes the base class of all styles. AbstractStyle also now has a default "data" property so it's possible to conveniently declare helper content inside styles. Change-Id: Id84f3762cfae506e65021322619d7fb77b137994 Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Rename::tabAt(index) to getTab(index)J-P Nurmi2013-05-293-25/+25
| | | | | | | | | | | | | | The fooAt() type methods are reserved for coordinate based queries. Change-Id: Iea91bdd29df4fa53cc1c7a07880f466ef2325725 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
View Lorry Controller Status