aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update all plugins.qmltypes filesLiang Qi2013-05-272-185/+462
| | | | | | Task-number: QTBUG-31388 Change-Id: I13a821a009c6c06f2c7fe7f7d28f1a579d69c8df Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* skip failing qquickanimatedimage mirror tests for nowShawn Rutledge2013-05-271-0/+6
| | | | | | | | Failing on mac, which is a blocker for CI. Task-number: QTBUG-31370 Change-Id: Icb42bb5ae59510a8754de895070d7a3d08af2623 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Doc: Add Dialogs/Controls/Layouts in submodules sectionCaroline Chao2013-05-271-0/+6
| | | | | | Change-Id: Ide4afaa74d73ea09cf329de593283c269ecdacb3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* QmlProfiler: fix SceneGraph profilingChristiaan Janssen2013-05-273-3/+3
| | | | | Change-Id: I54c960f0b0da061816223a51795c83a9f9dd3f66 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Debugger: Make sure client list is protected by mutexKai Koehne2013-05-241-0/+3
| | | | | | | So far we didn't protect this access. Change-Id: Id738453db5e655371fa2fbf88f81cab6c0af466f Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* qmlscene: Set window flags correctly.Friedemann Kleint2013-05-231-1/+3
| | | | | | | Task-number: QTBUG-31258 Change-Id: I13dfc17c75075de155505d20c57400753de0a71d Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Do not return cacheItem->object if it is still incubatingAlbert Astals Cid2013-05-231-3/+8
| | | | | | | | | | | | | | | | | | | | It can happen that cacheItem->object in QQmlDelegateModelPrivate::object already has a value but that the cacheItem->incubationTask is still Loading. If we return the object here we can confuse some of QQmlDelegateModel consumers like QQuickItemView. E.g. in QQuickItemView if we get to return the object before the createdItem signal is emitted we will make that when the createdItem signal happens QQuickItemView::createdItem will be called it will add the item to unrequestedItems items and will expect that layout/refill will remove it from unrequestedItems if it is really one of the items we are creating, but as it has been already created the item will wrongly remain in unrequestedItems making the item view to act weird Task-number: QTBUG-28403 Change-Id: I4359391eb2a4012afd3f01d082a99692d63b6639 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Cut performance cost in QSGContext::prepareMaterial()Gunnar Sletta2013-05-233-1/+10
| | | | | | | | | | | | The hash-lookup in this function is costing us a lot, and since we're looking up the same materials again and again, and the material has a place holder for it, we can store it directly in the material at no extra cost. This was a 10% gain in this particular benchmark. Change-Id: I46b67791ce39f453fa86d1ee82f6f5c7785b46a1 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* add private export to image and rectangle nodesGunnar Sletta2013-05-232-2/+2
| | | | | Change-Id: I15aea1b1dc3d41c9efe0a38f53d6858bae273566 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* qmlscene: don't call show() on the window if it's already showingShawn Rutledge2013-05-221-1/+1
| | | | | | | | | | That way Component.onCompleted() can optionally do showMaximized() without being overridden. Task-number: QTBUG-31260 Change-Id: I6f5c3025efd3b38809be85da4172241695168a6c Reviewed-by: Nikita Krupenko <krnekit@gmail.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Partial fix for deferred properties when combined with componentsAlan Alpert2013-05-229-15/+96
| | | | | | | | | | | | | | | | | Current deferred properties implementation did not store context or compiled data pointers correctly. Those pointers are now stored when the defer is reached, so as to avoid confusion (confusion leads to asserts or crashes). Does not extend the deferred property support to allow multiple deferred blocks per item. This now prints and error and the side effect is only that one of the deferred blocks is lost. This use case is sufficiently rare that it may not be worth the cost. Task-number: QTBUG-30325 Change-Id: I80cb074ed4452e95020208a0142a91e721bced7d Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix TextEdit content size calculationJ-P Nurmi2013-05-221-1/+3
| | | | | | Task-number: QTBUG-31154 Change-Id: I9d3e31352967b99b4bbb38f5819d3d093438ee37 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Avoid redundant QColor::alphaF() calls.Gunnar Sletta2013-05-221-5/+5
| | | | | Change-Id: I3694b075e98eab9f3eacf7758881a9473999b46e Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Avoid using QColor::xxxF functions.Gunnar Sletta2013-05-222-29/+22
| | | | | | | | | | | | | | | In our usecase, the color is always used as a float so using QColor (which is ushort) internally adds a lot of pointless conversion. Enough so that it shows up in profiles as 1-2% each. Not a lot, but easy to fix. The compare function is also somewhat simplified. For colors we're primarily searching for equallity. If that fails, we just need to provide consistent values, so use the address instead of doing any fancy calculation. Change-Id: Icae7e78ed767e802c137bab7fcacff66e9a4bc66 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Disable textureinthread example when threaded gl is not available.Gunnar Sletta2013-05-224-3/+67
| | | | | | Task-number: QTBUG-30077 Change-Id: I8b6e4b8a33819fe84c843e85d863b582cfd69439 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Re-enable qmltest on MacLiang Qi2013-05-222-2/+7
| | | | | | | | | Only tst_fontloader.qml fails on Mac, and we have useful Qt.platform.os. Task-number: QTBUG-25306 Change-Id: I6f4082028a188453378ad7ef73f51b1df2d89f11 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* QQuickTextControl: emit cursorPositionChanged() only if it changedJ-P Nurmi2013-05-221-1/+4
| | | | | | Change-Id: Id6fe03677e93119a63bfe87ade3cd333bf4890a1 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Android: Make Qt5QuickParticles a dependency of Qt QuickEskil Abrahamsen Blomfeldt2013-05-221-1/+4
| | | | | | | | | | | | Since we don't have any way of parsing QML to find out which imports will be used, we need to always load Qt5QuickParticles library when using Qt Quick, since this is a dependency of the particles import itself. Otherwise, apps that use particles would crash. Task-number: QTBUG-30848 Change-Id: I24326e2d59fc05f7867233fe503b2708d50eee78 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Autotest: fix misuses of tryCompareCaroline Chao2013-05-224-29/+29
| | | | | | Change-Id: Ia06527a0a3c3cfd68ecb3372316de476e02e6c26 Reviewed-by: Albert Astals Cid <albert.astals@canonical.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fix comment: Signal is actually createdItem not itemCreatedAlbert Astals Cid2013-05-221-1/+1
| | | | | Change-Id: Ie2a259a02becdf6fb0c21d93013e0e3148187ed8 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fix PropertyAnimation docAlan Alpert2013-05-201-2/+2
| | | | | | Task-number: QTBUG-31063 Change-Id: I2329f5c92c5985ed4a65a896521ddd3f6649ce2c Reviewed-by: Bea Lam <bea.lam@jollamobile.com>
* Tools: unnecessary to make qmlplugindump a bundleLiang Qi2013-05-202-12/+8
| | | | | | | | Embed Info.plist in qmlplugindump executable in a special way. Change-Id: I7eb73d0f832ab53d352c1fd2275f77e853269c2c Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Doc: Fix some broken linksSze Howe Koh2013-05-207-30/+30
| | | | | Change-Id: I1385a8947107a7c80b32306fc587aff45536a4ec Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Prefer qFatal to assert for failure conditionMatt Vogt2013-05-191-4/+7
| | | | | | | Otherwise the explanatory message won't be seen in release mode. Change-Id: I5c9fbc86753ac5ecea3d0714b8f17207f6b713d6 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Respond appropriately to textFormat changedAlan Alpert2013-05-171-0/+1
| | | | | | | | | | If the text has not changed when textFormat changes between states other than RichText, the text was not re-laid-out. This is necessary if the text includes control tags. Task-number: QTBUG-31191 Change-Id: I3c6f5343aa85e8337b90cf86748a696d5742e906 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* Fix a warning when setActiveFocusOnTab(false) for root itemLiang Qi2013-05-171-1/+1
| | | | | | | | Task-number: QTBUG-31114 Change-Id: I4d6aac534fbc1e84593e4d7084e6a892eea4256c Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Fix a crash in QQuickRepeater::clear()J-P Nurmi2013-05-161-5/+6
| | | | | | | Change-Id: Iedf45862323ca8233be155ce65cd3348abd0a8e5 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Assert instead of crashingAlan Alpert2013-05-161-0/+4
| | | | | | | | | | | Using a singleton (at least a QJSValue one) improperly leads to a crash. Assert with an explanatory comment is a low-cost improvement until better capitalization checking is implemented. Task-number: QTBUG-30090 Change-Id: I237a1dd2aab743ae1f09e8d653aa5aeb4bd0240f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* improve docs of QSGGeometry::set[Vertex|Index]DataPatternGunnar Sletta2013-05-161-2/+4
| | | | | Change-Id: I6ca0d8549891302cc9d71bdfac11704752caaf60 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Doc: Inline a short snippetSze Howe Koh2013-05-162-62/+21
| | | | | | | | | | An indirect way of fixing a broken snippet path. The entire (but very short) file is included as a snippet in only one place, and the license text takes far more space than the snippet. Change-Id: I6f4bf588b8701b655d418a71f83a2f9263d6b532 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Move snippet into correct moduleSze Howe Koh2013-05-161-1/+1
| | | | | | | | The snippet belongs to Qt Quick's "QML Basic Type: color" (src/quick/doc/src/qmltypereference.qdoc) Change-Id: I47defee04c34f9c98ec57d840c377c680d114d71 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Document Flickable.pixelAligned.Mitch Curtis2013-05-161-0/+12
| | | | | | Change-Id: I8ea85269c2666d18bf3c3815d2de0f90e9e0a3f4 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Make Canvas respect smooth: true/falseGunnar Sletta2013-05-151-0/+1
| | | | | | Change-Id: I6e68fcfc534aca139484a9b2970e61fb22688c58 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Doc fixAlan Alpert2013-05-151-1/+1
| | | | | | Task-number: QTBUG-31155 Change-Id: I4f1ac7c31ce6d4529c368d796706aa5f93a78d1a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix warnings about unused parameters.Friedemann Kleint2013-05-152-0/+4
| | | | | Change-Id: I091a0369f2026ae820d623aadd13a3190d40a56b Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Do not use an export macro in the function definitionThiago Macieira2013-05-151-1/+1
| | | | | | | | | | qmlExecuteDeferred is exported using Q_QML_EXPORT in qqml.h, so we don't need to use one here. Better not have any than have the wrong one, which can cause problems. Cherry picked from d6d2074ff in qtquick1 Change-Id: Ief978feb503b7381ed462f71ebbd7986bd6862c3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Doc: Update references to QDeclarative* classesSze Howe Koh2013-05-152-3/+3
| | | | | Change-Id: Ifbde8c1ccfc0c759da6f2204320b9170a04179eb Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Changelog entry for not-quite-so-important behavior changeAlan Alpert2013-05-151-0/+2
| | | | | | Task-number: QTBUG-30837 Change-Id: Ia39c0d85d29cf87861083e4a5170aab701fb2199 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* Move exports conflicting with QtDeclarative into namespaceKai Koehne2013-05-154-12/+84
| | | | | | | | | | | | | | Move exported qml* symbols that conflict with QtDeclarative into an - automatically imported - namespace. This ensures apps can link against both QtDeclarative and QtQml. To keep the BC promise the old symbols are still exported. Task-number: QTBUG-29584 Change-Id: I3d31c36ca4e2faaf6f5d67a77c5c5a304c0338a4 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fix documentation of QtQuick2::DragEvent::accepted, it's a bool.Sérgio Martins2013-05-151-1/+1
| | | | | | Change-Id: I4773b8b1c1f96279e34979534a1a53e724009e44 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Doc: corrections, spelling, and ListView requirements commentsDavid Fries2013-05-155-16/+15
| | | | | | | | | | From the ListView comment I thought the model had to be derived from QAbstractListModel, but that's not the case, QAbstractListModel will work just fine, it just doesn't support specific cases such as trees. Change-Id: I59305006540ddc049e276cf412571373cbfa6c67 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Doc: Removed pages from the "qml-features" group.Jerome Pasion2013-05-155-6/+0
| | | | | | | | | -This group is from Qt 4 and no longer relevant in Qt 5. -The \group page in qtdoc is removed. Change-Id: I6349a9056ae45c98b31c70fd693adecf71e2ba8c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* Doc: Fixed a bunch of missing snippets.Jerome Pasion2013-05-157-13/+13
| | | | | | | | -moved delegate model related snippets from Qt Quick to Qt QML. -corrected snippet paths Change-Id: If688f97fb9317def16f343d5502a6a54d6761e95 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* Doc: Define Qt global object as a QML type and fix referring docsTopi Reinio2013-05-1514-39/+40
| | | | | | | | | | | This change adds the Qt global object as a QML type in the Qt QML module and fixes links to it in documentation. Task-number: QTBUG-29353 Change-Id: I1690224091a79a3309fac7a78aa0c0c734449e4f Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix warnings in stocqt-example.Friedemann Kleint2013-05-142-12/+12
| | | | | | | Task-number: QTBUG-31083 Change-Id: I97d429c1a30664373478636c6b066dbdcd2a46ee Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Changelog entry for ListView behavioural changeAlan Alpert2013-05-141-0/+4
| | | | | | | Task-number: QTBUG-30555 Change-Id: Idcb0b2457e761f806179f4900ea5b0c9cb811cea Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au> Reviewed-by: Albert Astals Cid <albert.astals@canonical.com>
* Doc: fixed some WS issues.Jerome Pasion2013-05-141-9/+9
| | | | | | | -generated by git-split-ws tool Change-Id: Icf1e85d01c818396e8dffb9b6aba2c132acfaaa1 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix crash in QQmlApplicationEngine when loading finishesJosh Faust2013-05-141-1/+2
| | | | | | | Task-number: QTBUG-30997 Change-Id: I10cb2c689408d1b31360095c2aa9e0943a5d9452 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fix sorting of QSGTextMaskMaterial (native glyph drawing).Gunnar Sletta2013-05-141-1/+1
| | | | | | | | | It seems we were hitting the bool operator rather than the pointer values so all text materials, regardless of size or style would return equal. Change-Id: I8773e5aa965035f6737920747c2cf073929ff799 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Fix typos in QQuickDrag documentation.Sérgio Martins2013-05-141-5/+5
| | | | | Change-Id: Iab8c537e16e9767ddfd837503a340eb708aa6814 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 17:26:56 +0000