aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Document toys examplesAlan Alpert2012-01-205-0/+71
| | | | | Change-Id: I376c4169ffff19e06b55e578e57101a476500b04 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Adhere to examples standards more consistentlyAlan Alpert2012-01-2024-4/+4
| | | | | | | Example subfolders should be named 'content' Change-Id: I23f5b0ef44108f54f9b1703f04faf02cafc78efb Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Added a few material flagsGunnar Sletta2012-01-204-3/+11
| | | | | Change-Id: Id324ebb82df985f1a7380761cc4923f60c7d1f20 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Use queryAccessibleInterface instead of new QAccessibleQuickItemJan-Arve Saether2012-01-201-7/+2
| | | | | | | | | In some cases this could prevent us from actually returning the expected QAccessibleQuickItemValueInterface. This is also more future-proof in case we add more QAI subclasses. Change-Id: Id66dc21418671a3045d93c0a44dc74aa0aff30af Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Doc: Improve Qt.locale docs.Martin Jones2012-01-202-6/+47
| | | | | Change-Id: I3ef5c4a0bedbaa346b001852bba8e9ff9347e9e0 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Remove the use of QT_MODULE()Gunnar Sletta2012-01-20119-119/+0
| | | | | Change-Id: I1c07231b0bf412fe490a44b9a060bb2e2ef11154 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Update TextInput.acceptableInput on component complete.Andrew den Exter2012-01-204-24/+144
| | | | | | | | | | | | QValidator doesn't notify when it's validation criteria changes so is susceptible to order of evaluation issues. Deferring the initial validation will ensure validators with static criteria are correctly applied. Notification from QValidator on changes would solve this for all cases: QTBUG-23694. Task-number: QTBUG-21103 Change-Id: I920f36645fd18ce809db56b5daf73545f1d603dc Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add quick module to .pro fileAlan Alpert2012-01-201-1/+1
| | | | | Change-Id: I1d07613f8588b48aa7fc9ebe0c09e78ba43a9e02 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix lockup in views due to endless polish loop.Martin Jones2012-01-207-124/+157
| | | | | | | | | | | | | It was possible to cause an endless polish loop in some rare cases. Eliminate all calls to polish() within existing polish() code paths. Cleanup delegate creation and cancelling in the cacheBuffer area. Adjust first item position correctly when inserting/removing before visibleItems list. Change-Id: I508a2e6de8cb09d904466cbf5fb6b5dfd1e89c49 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Assigning empty object to Q_PROPERTY(QVariantMap)Matthew Vogt2012-01-194-8/+132
| | | | | | | | | Correct the evaluation of an empty javascript object during assignment to a QVariantMap property. Task-number: QTBUG-23586 Change-Id: Ifa891a017690a36bd5837bc6b4dd0e47eb515a46 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Extend the documentation on DoubleValidator.Andrew den Exter2012-01-191-0/+17
| | | | | | | | Elaborate on what is valid, intermediate, and invalid. Task-number: QTBUG-22081 Change-Id: If0ef270eaee60b530fdf6275e36b2208d41c7639 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add a baseUrl property to Text and TextEdit.Andrew den Exter2012-01-1912-3/+190
| | | | | | | | | Specifies the base URL which embedded links in rich text are resolved against. By default this is the URL of the item. Task-number: QTBUG-23655 Change-Id: Ib51b8503a18d9ac4e1801c77b77b3595d8f4912a Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Don't load embedded images from the current working directory.Andrew den Exter2012-01-1914-29/+203
| | | | | | | | | | | Override QTextImageHandler's image loading as it will attempt to resolve relative paths and load the image itself if the document returns an invalid image from loadResource, which we don't want as it bypasses the pixmap cache and resolves against the application and current working directory instead of the Text items context. Change-Id: Ia1d3633036f96d902e1ac03dae5d5b203fba7ff1 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix range checking in AbstractItemModel examplesMatthew Vogt2012-01-192-2/+2
| | | | | | | | Fix range checking in AbstractItemModel examples Task-number: QTBUG-23574 Change-Id: I6f2d4c18e1fb33ee369ebc75f501e524e8e63615 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Change testlib skipAll function to failure.Jason McDonald2012-01-191-5/+3
| | | | | | | | | | Be more insistent that tests using the obsolete skipAll() function should change to using skip() by treating calls to skipAll() as test failures. After a further grace period the skipAll() function will be removed. Change-Id: Ic2448af2f8176909afa151b6e8c29587dfd17f1f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Use mediump in distance field shaders for the alpha threshold.Yoann Lopes2012-01-181-12/+12
| | | | | | | lowp or highp cause some problems depending on the hardware. Change-Id: I2762c04548656de8fdb34711f52e5cf05d8c2ac5 Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
* The rendering signals must be direct connections.Gunnar Sletta2012-01-181-2/+2
| | | | | Change-Id: I6fd492096e21dfe1580d003cd9165a2d4c7f37dc Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Compile since recent API changesGunnar Sletta2012-01-181-1/+0
| | | | | Change-Id: Id8f8b238661a46cf071f671d5d40e5c683c8ccc9 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Move accessibility test to QtQuick 2.Frederik Gladhorn2012-01-189-126/+28
| | | | | | | | The test now only depends on Quick 2 and no longer a mix of widgets, Quick 1 and 2. Change-Id: I3120e11dadb8bb7d7635e6baa1cb905d917353ea Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Allow QML URLs to contain pre-encoded octetsMatthew Vogt2012-01-1810-16/+245
| | | | | | | | | Use QUrl Tolerant parsing mode to permit user-supplied URLs to contain pre-encoded octets which are not mangled by string conversion. Task-number: QTBUG-22756 Change-Id: I4b160b04340b95221d1eb3336bda8c0b38d2e232 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Insertions were calculating wrong insertion posBea Lam2012-01-186-87/+143
| | | | | | | | | | | | | | | | | | | | | | | After removes, and after each insertion, the view must adjust the visibleItems.first() position and call layoutVisibleItems() to ensure that the correct insertion position is calculated for insertions that follow. When applyInsertionChange() in GridView and ListView calculates the position for item insertion, it looks at the current positions of the items in visibleItems, so these positions must be updated prior to this calculation. Otherwise, insertions that follow a remove may not calculate this position correctly and will neglect to add some items, and multiple insertions may unnecessarily create items at positions that are not actually visible. resetFirstItemPosition() is changed to take a set position and it replaces resetItemPosition() since it can do the same thing. Task-number: QTBUG-23610 QTBUG-23609 Change-Id: I8839ee7d15853301435e80c0dc563f93fc3605cf Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Made QQuickTextInput follow input direction changesPekka Vuorela2012-01-175-24/+89
| | | | | | | | | | | | | Cursor of empty field should align based on input method direction. Now input method allowed to change direction on run time. Also earlier cursor wasn't properly drawn on correct alignment at all. Change-Id: I4601f10e6b5dde09591bd484b05f001add6c1573 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com> Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* QQuickTextEdit to follow input method direction changesPekka Vuorela2012-01-173-15/+62
| | | | | | Change-Id: I458f85452a2ffe1c43438f9588cfc271461a42c6 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Debugger: Simplify protocol of QDebugMessageServiceKai Koehne2012-01-172-14/+4
| | | | | Change-Id: I3f97a344b8d0e0d73a75e84310c1e8ed59573ee7 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Fix crash when using namespaces for JS module APIs.Glenn Watson2012-01-171-1/+1
| | | | | | | Fix unitialized variable in constructor. Change-Id: Ibc39d7512990ad293789280e26797be1ecd1ade1 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Doc: fix QML Examples linkMartin Jones2012-01-171-1/+1
| | | | | Change-Id: Id4637a7953f05ee9eac712116f68218a0c8b9ff9 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Connection was accidentally of the Queued varietyAlan Alpert2012-01-171-1/+1
| | | | | | | | | | | This connection needs to be direct, because right after that signal is emitted the next frame is drawn (before we return to the event loop at least). The sprite updating needs to happen in time for the frame or the sprites get confused. Task-number: QTBUG-23407 Change-Id: Ie56465145461486456462154dfafe546fedaaaaa Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Update Screen exampleAlan Alpert2012-01-171-38/+5
| | | | | | | | DPI API never made it into the final API, because there were more issues than valid usecases. Change-Id: Ie56465145461486456462154dfafe546fedaddee Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Update copyright year in Nokia copyright headers.Jason McDonald2012-01-17193-193/+193
| | | | | | | | Update copyright headers from before 2011, and a couple of new ones that were merged after the previous change to copyright headers. Change-Id: Ia76e08e2734afa4ef3f1207dbcda5ff3bc81b366 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Match QRect changeAlan Alpert2012-01-171-7/+0
| | | | | | | | 3b973971fb1e483b9b3514358a415781c3c24ba8 changes the order of data members on mac, the struct we're using to fake QRect needs to match. Change-Id: Id2ecf1726e64514e12dd72980a0c0ad2b693c483 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Added log and status properties to ShaderEffect.Kim Motoyoshi Kalland2012-01-167-87/+227
| | | | | | | Task-number: QTBUG-23531 Change-Id: I136f6d9642ff9d4074fe8dae1f5714a05349107a Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Console API: Add console.infoKai Koehne2012-01-165-3/+8
| | | | | | | | Add console.info for the sake of completeness. It's mapped to qDebug(), just like console.log, console.debug, print. Change-Id: Ife1cfbfe810d4e5e9175343778dff734a56f4a80 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Console API: Autotest reshufflingKai Koehne2012-01-169-149/+277
| | | | | | | | | Move the console tests from qdeclarativeqt to qdeclarativeconsole, and the test for the QML_CONSOLE_EXTENDED property to debugger/qdebugmessageservice. Change-Id: I704bd0a4a28aa1b0eb51df67d32fd6865b114d41 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Remove all reimplementations of relationTo() returning Unrelated.Jan-Arve Saether2012-01-162-6/+0
| | | | | | | | QAccessibleInterface::relationTo() already return QAccessible::Unrelated by default. No need to duplicate that code. Change-Id: Ie64e798a1935619af32ae41d7e14ae26bd9bf523 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Fix preedit text visibility for TextEditJiang Jiang2012-01-161-30/+55
| | | | | | | | | | | | | For an empty TextEdit with preedit text, we need to add the text separately since the blockIterator will not go through that case. Also fixed preedit text appended at the end of any commited text. Move the code for adding text into SelectionEngine so that we can reuse it for adding preedit text. Task-number: QTBUG-22647 Change-Id: Id4fe04099b16949ff5de0747881c6dc96ef0673f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* QDeclarativeExpression: storing column number in expression locationChristiaan Janssen2012-01-1626-61/+89
| | | | | Change-Id: I2d69738158abfc76f80b1cfc0e0ccb145fda2245 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Avoid creating unnecessary copies of TextEdit's text data.Andrew den Exter2012-01-165-24/+29
| | | | | | | | Delay rebuilding the text data from QTextDocument until it is actually requested rather than everytime the contents of the document change. Change-Id: Ibfdc9e9e0372010f0731fb02a223c8b59a67f2c3 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Test more of QQuickImageParticleAlan Alpert2012-01-164-4/+128
| | | | | | | | | | | | | Now the color variance properties are tested, as is the debug code. Just running the debugging code is valid testing, as it contains pointer derefernces that could cause runtime errors, and this codepath is not always enabled at runtime. Additionally, debug mode control has been consolidated in the ParticleSystem. However, this was not necessary for this test addition. Change-Id: Ie56465145461486456462154dfafe546fedabcba Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Wait for polish at the start of addOrRemoveBeforeVisibleAlan Alpert2012-01-161-0/+1
| | | | | Change-Id: I1cf13af7e9b854cee7754b31643438eab3085084 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Handle views with negative width/heightMartin Jones2012-01-164-19/+77
| | | | | | | | | A view with a negative d->size() would get stuck in an infinite loop. Also make sure item layout/visibility is updated when the view size changes. Change-Id: I1f16a714ecebe1c4b71902c460e27fb0f1c4406f Reviewed-by: Bea Lam <bea.lam@nokia.com>
* lower case QML components are accepted when used with 'as' importMatthew Vogt2012-01-1619-6/+66
| | | | | | | | | If an Object Binding is in a namespace, ensure that the Component name begins with a capital letter. Task-number:QTBUG-20786 Change-Id: Id4a0c0fdb0c9b9516bea597a4994bb7519339bc9 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Fix build break in qmlviewer.Xizhi Zhu (Steven)2012-01-141-0/+1
| | | | | | | It's introduced by commit 14b929e9c448f2cc74fa047aaf8af283b81fbaf9 in QtBase. Change-Id: Iacb5350b5f42a09b7419bf491ac9620a406422e6 Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
* Stabilized tst_qquickcanvasSamuel Rødal2012-01-131-33/+45
| | | | | | | | For some reason the mouseFiltering() and headless() cases fail if the touch test cases run first. Change-Id: I30839b09e9f7b287c88e6983424add5cf40a6d1a Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* QTouchEvent::TouchPoint::isPrimary() is gone.Samuel Rødal2012-01-131-1/+1
| | | | | Change-Id: I6fbaac28a060fd527e0226d55419a9055125368a Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Reintroduce plugin support for asynchronous hardware specific texturesGunnar Sletta2012-01-135-80/+110
| | | | | Change-Id: Iad36542d2137e7a6470009c308ece3de389907c1 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Add tests for item polish bug on MacBea Lam2012-01-135-8/+52
| | | | | | | | | | | | | On Mac OS X, if a QQuickItem triggers a polish request from Component.onCompleted, its updatePolish() function is not called. The tst_qquickitem::polishOnCompleted() test demonstrates this. If a running animation is added to the polishOnCompleted.qml in the test, the test will pass. Task-number: QTBUG-23481, QTBUG-23480, QTBUG-21590 Change-Id: I172b12e784aa458c43c23e0ee43f034f0bd332ee Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Don't delete global appCharles Yin2012-01-131-1/+4
| | | | | | | | Sometimes delete the global GUI app causes crash, this is a work around fix. Change-Id: Ic2406e7a085483de5d96321de8257663925b7e5e Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Use QGuiApplication, not QApplication, in testsDamian Jansen2012-01-1310-92/+92
| | | | | Change-Id: I7802293e6cafb90686c103972bc036cf74184714 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Disable an unstable test.Gunnar Sletta2012-01-121-0/+1
| | | | | Change-Id: I2f346ce26bfb23e148cb5b0ad73a934930a4fdf7 Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
* Fix preedit text visibility when TextInput is emptyJiang Jiang2012-01-121-1/+1
| | | | | | | Task-number: QTBUG-22646 Change-Id: I5162ffdebdee6f956a9a79b2307a2ac53cc4890b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>