aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* nicer gitignoreOswald Buddenhagen2012-07-102-5/+1
| | | | | Change-Id: I6e7afb77c98060c2968aa2fd7ede2435117205e3 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* remove dead filesOswald Buddenhagen2012-07-102-2/+0
| | | | | | | | apparently these qml1 plugins moved out even before the patch adding these files landed ... Change-Id: Ie1cdd558787fedc9abe57ee8f2324f873b983cab Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix warnings about multiple rules for install_targets.Friedemann Kleint2012-07-101-7/+0
| | | | | | | | | | | - Remove the accessility scope from the profile since the parent plugins.pro already does that - Remove the target lines since they are also in ../shared/qaccessiblebase.pri. Change-Id: I6d95bf43b4dd9de8627713df2eecac5cd526cd79 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Don't cache visual data model v8 handles.Andrew den Exter2012-07-103-34/+9
| | | | | | | | | | The external resource is reference counted and resused irregardless of whether the handles are cached, and the reduction in the number of handles allocated needs to be comes at the cost of keeping persistent handle which have a negative impact on garbage collection. Change-Id: I92996faab08a0ff76d21e56dbdafdd7522882d2c Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Add option to use native rasterizer for SceneGraph textEskil Abrahamsen Blomfeldt2012-07-1014-15/+220
| | | | | | | | | | For old-style (desktop components) apps using QML 2 on regular density displays, distance field text will look out of place. We introduce an option to use the native rasterizer instead if you would rather have native look and feel than scalable text items. Change-Id: Idb38e3c89f2deab9ae1963357c6c5fb235ddeab8 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Stabilize Loader test.Michael Brasser2012-07-101-2/+4
| | | | | | | | Wait for Loader to load its item, rather than using a fixed timeout value. Change-Id: I97ee56d0d7161c9c71a5524f108b0f56d92cc3f3 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Remove unwanted whitespace from test URLsMatthew Vogt2012-07-101-2/+6
| | | | | Change-Id: Ia39c7bc458f46a8a32c1e54a8963b1f89dbbf271 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Fix warning about assigned/unused variable.Friedemann Kleint2012-07-101-4/+0
| | | | | Change-Id: I0c9a7c4bf52e5a1a81d5ac85fc594ad197e3b811 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Use qWaitForWindowActive() where it is required.Friedemann Kleint2012-07-098-22/+24
| | | | | | | | | | | Prepare a change in qtbase in which the implementation of qWaitForWindowShown() will be changed to qWaitForWindowExposed() instead of qWaitForWindowActive(). Try to stabilize further tests by introduing wait functions instead of calls to qApp->processEvents(). Change-Id: I9825885430d78be1610a3fe20023fad24aaacba9 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Speed up Text construction with RichTextAndrew den Exter2012-07-091-0/+1
| | | | | | | | | | | | Setting the page size to empty can short cut some unnecessary layouts triggered by QTextDocument/QTextDocumentLayout prior to the Text item requiring a layout. This rougly halves the construction time a Text item with RichText. Task-number: QTBUG-19728 Change-Id: I03e6d293d8e5ac40046aef41171ca5009b718546 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Speed up TextEdit construction time.Andrew den Exter2012-07-096-69/+52
| | | | | | | | | | | | Defer setting content on the QTextDocument until componentComplete() to avoid unnecessary layouts and move one time setup for the text document from setContent to the constructor. Reduces the construction time of a TextEdit with RichText textFormat by about a third. Change-Id: Idde0772063bf769cde984efddd68589c55a7431a Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Do not permit excessive recursion in component creationMatthew Vogt2012-07-096-2/+98
| | | | | | | | | | Limit recursion during component creation to prevent infinite recursion resulting in a crash. Recursion results from invoking createObject() in the Component.onCompleted handler. Task-number: QTBUG-25439 Change-Id: Ica2ba099d82b5747c938501af04e67f7ace8402e Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Use V4 binding for non-final properties where possibleMatthew Vogt2012-07-0927-74/+391
| | | | | | | | | When a property referenced in a binding is not marked as final, do not automatically abort optimization. Instead generate both V4 and V8 binidngs, and only fall back to the V8 binding if necessary at run time. Change-Id: I1bcc7e2b495935c5d519a9a223f640c1972cdb4e Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Reduce the number of unnecessary layouts on geometry changes.Andrew den Exter2012-07-095-139/+505
| | | | | | | | | | | | | | | | | Improve checks for geometry changes that don't affect layout, i.e width increasing when the previous layout didn't wrap or elide. Set implicit sizes just once during layout rather than setting the implicit width during and the implicit height after to limit the when an implicit size change can change geometry. And if there are multiple layouts of the same text/font combination re-use cached layout data as much as possible by guarding against unnecessary property changes on the layout, and not creating a new layout for calculating the implicit size of truncated text. Change-Id: Ia05e52e9170e1f5d3364896ab119e00d8a318299 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Expand test case for qrc:/ URLsMatthew Vogt2012-07-068-7/+70
| | | | | Change-Id: Ibf8a04efbcb9d39938201f65c1fc0f236243a287 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Allow all explicit margins to override margins.Andrew den Exter2012-07-066-22/+218
| | | | | | Task-number: QTBUG-24515 Change-Id: Ibfc657dec9fd0c8e71cf3686a04ea7b00ad72c11 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Remove Qt::WindowFlags from QQuickView constructorAlan Alpert2012-07-062-18/+12
| | | | | | | | It's no longer in the constructor of QWindow. Those who wish to set it can use the setWindowFlags function. Change-Id: I8df57ed1ced8128723d790caaaaaaaaaaaaa787d Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Clarify jumpTo docsAlan Alpert2012-07-061-2/+2
| | | | | | Task-number: QTBUG-24769 Change-Id: Ib58a47deea2706f7fd683106380d1618d8b1d2cc Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Update Age affector doc referencesAlan Alpert2012-07-062-1/+4
| | | | | | Task-number: QTBUG-26240 Change-Id: Ib58a47deea2706f7fd683106380d1618d8b1d2cd Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Use enumeration in preference to enum when referring to QML API.Andrew den Exter2012-07-068-11/+11
| | | | | | Task-number: QTBUG-24666 Change-Id: I5197d4b4d1a1b53cae2033bd86ce26ba55d08384 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Use qFloor instead of qRound for glyph coordinatesJiang Jiang2012-07-051-2/+3
| | | | | | | | Like we did in raster paint engine to make sure glyphs are positioned correctly. Change-Id: I1327b8727bd2b5085dfb2edc11b4d049403a2fb5 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Use unique port numbers for http servers in auto tests.Andrew den Exter2012-07-058-25/+30
| | | | | | | Prevents conflicts when tests are run in parallel. Change-Id: Ic1652d963da291c7c41b31e2621874824fa575cb Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
* Fix QQuickApplication::activate test.Andrew den Exter2012-07-051-22/+13
| | | | | | | | | ApplicationActivate and ApplicationDeactivate events are now delivered. Task-number: QTBUG-21573 Task-number: QTBUG-23331 Change-Id: I58e8d7c7730c66ec210f04a74a945d3eece61e01 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Remove sections with no doc content for nowBea Lam2012-07-051-29/+41
| | | | | Change-Id: I23566853ffebec4de3c48ce4f5cd1c4b1f2389d5 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Fix various QtQuick.* submodule docsBea Lam2012-07-056-43/+107
| | | | | | | | | | | | | | | - Create module index pages for QtQuick.Window, QtQuick.XmlListModel and QtQuick.LocalStorage. - Fix references to module names in docs so that docs for properties and methods are actually generated e.g. use "QtQuick.Window2" instead of "QtQuick2.Window". There's no easy way to document Module APIs at the moment so the QtQuick.LocalStorage documentation has been updated in a hacky way to generate the correct method documentation. Change-Id: I7b34e4b4ac794acffc6d198b98e2115ccf0fa9a6 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add references between being/completeCreate in the documentationLaszlo Papp2012-07-051-0/+4
| | | | | Change-Id: I14f1c802347c9dad86f3fd7a9e858209a15d34e6 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Reorganize "concept" pages in QtQuick docsBea Lam2012-07-0535-603/+768
| | | | | | | | | | | | | | | | | This removes concepts/topic.qdoc and move this content into individual concept topic pages under individual directories for each concept to avoid having a really long "concepts" index page. This change also: - Moves components.qdoc ("Defining reusable components") into the appdevguide/ since it's not specific to QtQuick features - it's more about how to use a QtQml feature to build QML apps. - Moves the part of qtqml/doc/src/cppintegration/data.qdoc that discusses how to use C++ models with QtQuick views into quick/doc/src/concepts/modelviewsdata/data-cppmodels.qdoc. Change-Id: Id18a1d56acaaac41714c13cbc94bb3b80f337355 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Add some private V8ASSERT macros.Andrew den Exter2012-07-043-28/+25
| | | | | | | | Simple variation on the V8THROW macros to consilidate the normal usage pattern of if (!condition) THROW. Change-Id: I71aaabab705c3f73922efdaf8bb40b5dcc390101 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Let ShaderEffectSource use same multisample count as GL context.Kim Motoyoshi Kalland2012-07-042-8/+12
| | | | | Change-Id: I9b772a2c405c2fab13dfee3527212117de16e9c0 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* qmlplugindump: Add comment to file that it was auto-generatedThomas McGuire2012-07-041-2/+4
| | | | | | | | | This prevents people who do not know about this tool from accidentally changing these files by hand. Change-Id: I8ff889b953f7c637f914f8b5b8b07a36f3cdf58f Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Compile without RTTI supportEskil Abrahamsen Blomfeldt2012-07-042-2/+6
| | | | | | | | | | | We need to be able to compile without RTTI support. Fortunately QPaintEngine has built-in type info. No RTTI support is the default configuration on Windows with MSVC2010, so this is required to fix the build there. Change-Id: I89b1ed4879fd0e8e0d61ef12d77f6961fd0b07e5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Document QQmlComponent::create(QQmlIncubator&, ...)Martin Jones2012-07-041-4/+24
| | | | | | Task-number: QTBUG-25132 Change-Id: Ice6c75cbd7a45519ce7f38190db3fae95146269e Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* PathView needs drag events similar to FlickableMartin Jones2012-07-044-1/+94
| | | | | | | | Added dragging property and dragStarted() and dragEnded() signals. Task-number: QTBUG-21740 Change-Id: I718835ff7e46af615951ec5f248eba41bac31071 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Improve mouseWheel() functionCharles Yin2012-07-045-19/+55
| | | | | | | Use new angleDela() API and update the documentation. Change-Id: Ie01c979d8c411e81165caedc7e020e39f9d64371 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Improve wheel event handling.Michael Brasser2012-07-044-15/+34
| | | | | | | Use new angleDelta() rather than deprecated event data. Change-Id: I28d0a1ff1bc99b35e1ce3d553e5cb9bdc9362f4c Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Mark QQmlComponent::createObject() and incubateObject() as internalMartin Jones2012-07-041-0/+7
| | | | | | | | These functions are for use in QML Component. They are not part of the C++ API. Change-Id: I92743a3b31c2864976756e2d6d76c9057aee9c1d Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Improve performance guideChris Adams2012-07-041-7/+30
| | | | | | | | | | This commit improves documentation about binding optimisation and positioning. Task-number: QTBUG-21720 Task-number: QTBUG-25844 Change-Id: Ib2c23583adee9207dfdee9f9d4ec5473fe2a7ec6 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Report correct mouse position when made visible with hoverEnabled.Michael Brasser2012-07-042-2/+9
| | | | | | Task-number: QTBUG-24282 Change-Id: I778b2db18c28e2b33690531ec19eb24ecf444a38 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix qmlRegisterModuleApi function linkageChris Adams2012-07-043-4/+5
| | | | | | | | The qdoc tag for the \fn doc was incorrect, leading to linkage errors. Task-number: QTBUG-26236 Change-Id: Ifd407915d9a1461bb2b48a6bf54bb085425ba76b Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Refresh the TextInput.acceptableInput property when validator changes.Andrew den Exter2012-07-043-0/+32
| | | | | | Task-number: QTBUG-26260 Change-Id: I404640d9a2f000976887dcc2119f971c17a71c7e Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Make Behaviors work correctly with value types.Glenn Watson2012-07-048-7/+200
| | | | | | | | | | | | | | When a value type is referenced by sub-component a grouped property is built. This code path did not handle behaviors being declared on the entire value type. Add support for value interceptors in this code path. Also issue an additional write to the value type property before calling the interceptor on components that are not being intercepted, so that the other sub-components don't get stale values during write back. Task-number: QTBUG-22625 Change-Id: I3365f422dfa1ab2e536e19575efcceceffb85e10 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Add tests for triple click text selection in TextEdit.Andrew den Exter2012-07-043-48/+128
| | | | | | | | | | | Includes a minor behavioural fix for selectedText and getText so that they return plain text strings for plain text content rather than the raw text from QTextDocument which substitutes line break characters with unicode line or paragraph separator character. Rich text documents still return the unicode characters. Change-Id: I19a3a5bba2e4ebb0e6607e19c915a588a9a6c7db Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Don't calculate selection rects unnecessarily.Andrew den Exter2012-07-044-110/+12
| | | | | | | | QQuickTextEdit ignores the updateRequest QRect arguments, so don't bother calculating them. Change-Id: Icb9126ab799c6b216eb0c4b9e3ff3f6a4bf8f03c Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove dead code from QQuickTextControl.Andrew den Exter2012-07-043-74/+0
| | | | | | | | Either unused functions, or code paths for signals that aren't connected to anything. Change-Id: Ide24f1263d05f93917a16a3c17cb06a619cd3421 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Section headers ignore list delegate size changes when "colliding"Martin Jones2012-07-047-52/+59
| | | | | | | | Make section header updates part of the layout process. Task-number: QTBUG-23298 Change-Id: I4586bc58bc195fcc47f6db79346727eb6e3d3845 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Allow mouse interaction with 0 opacity items.Andrew den Exter2012-07-046-36/+39
| | | | | | | | | | | Don't filter event delivery to items with 0 opacity, and update the documentation the for opacity, visible and enabled properties and how each affects event delivery. Task-number: QTBUG-19193 Change-Id: Id48e4af763c9a7bbcc13b303342d303155dcadc9 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove QSKIP() for polishOnCompleted() testBea Lam2012-07-031-4/+0
| | | | | | | | The test passes reliably now on Mac. Task-number: QTBUG-21590 Change-Id: I99b9d73cd8bbdd3f0b7df19e148bc02be6227289 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Suppress QWindowSystemInterface inclusion warningsGirish Ramakrishnan2012-07-035-5/+5
| | | | | | | | QWindowSystemInterface is now part of QPA API and should be included using <qpa/*>. Change-Id: I90c71e193d77765b4ec7b92fdbe611b387b2ae4a Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
* Allow resetting a Rectangle gradient.Martin Jones2012-07-036-22/+128
| | | | | | | | | | | | If a gradient and a color are set on a rectangle, the gradient is used. This means that if you wish to override the gradient on a component with a color, you have to unset the gradient. Also remove the unused QQuickGradient::gradient() method. Task-number: QTBUG-23238 Change-Id: Ibd43cfe1bd4b867e4f6103f1d0dc0ed6176ab5c1 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Fix some commented issues from the refactor merge.Michael Brasser2012-07-032-6/+3
| | | | | Change-Id: Ied56bdfc93162b7668be7b07841948b8b5968a70 Reviewed-by: Martin Jones <martin.jones@nokia.com>