aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix crash in instruction dumpAaron Kennedy2012-02-232-4/+4
| | | | | | Change-Id: I2cfa9da120a602b52f401dd304b44cd17c47b220 Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Use new plugin system in QtDeclarative.Friedemann Kleint2012-02-2355-55/+101
| | | | | | | | - Use prefix "org.qt-project" for interfaces. - Use new macros, add json files. Change-Id: I53df83f95153c5c9c462098584606284470a5ae0 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove warning produced by 'parent' reference.Matthew Vogt2012-02-233-9/+54
| | | | | | | | | | | When Qt.createQmlObject is invoked from QML, any contained references to parent produce a warning from V8. To prevent this, move the assignment of the parent object to before the initial execution of the bindings. Task-number: QTBUG-24464 Change-Id: Ib330822f1ca46ec5a6af648a56197da09669c3f2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Clean up some of the view transition docsBea Lam2012-02-232-66/+72
| | | | | | | Fix some of the wording in the docs. Change-Id: I07892bec06c78b73bdd93926719d609405e263b3 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Fix for bad operator precedence causing right mouse button issuesAlex Wilson2012-02-231-2/+2
| | | | | | | | | | | Binary or (|) has higher operator precedence than a ternary in C, causing the original expression here to function quite incorrectly for anything other than the common left-mouse-button-only case. I just added brackets -- feel free to change this to "if"s if you think that would more clearly avoid this issue in future. Change-Id: Ie20bd7e805b89a393794d3240fb0ae680b29ff64 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix Text eliding with implicit height and maximumLineCount.Andrew den Exter2012-02-233-3/+11
| | | | | | | | Ignore the height of the text if the element height is invalid. Task-number: QTBUG-24293 Change-Id: I1646c3f64583da40e6166aeea24c2c4af42cb279 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* QML locale.firstDayOfWeek returns 7 for SundayMartin Jones2012-02-232-2/+41
| | | | | | | To match JS Date object, Sunday should be 0. Change-Id: I662c0b1fcbf921fa1c4bb58f900366dd088b343b Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
* Small doc fixes.Michael Brasser2012-02-231-3/+3
| | | | | Change-Id: I54ed2d0387b85ac853d94cfe716a1f6016986e2a Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
* Fix font size calculation in headings in StyledText.Yann Bodson2012-02-238-81/+228
| | | | | | | | | | | Calculate the font size correctly even when the size is specified in pixels and update this size when the font changes. Also make sure that the text layout's font is set before parsing. Task-number: QTBUG-24458 Change-Id: Ida7723f6e4f4b9fd3a6878076f4beaf5bda8f7f7 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Reduce QQuickTextEdit memory usage.Andrew den Exter2012-02-236-202/+84
| | | | | | | | | Remove unnecessary members from QQuickTextEditPrivate and QQuickTextControlPrivate and re-order and pack to reduce padding for alignment. Change-Id: I14f5e3fc01646d02745f095c2a4b168cd675745d Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* QML_RUNTIME_TESTING should be disabled by default.Michael Brasser2012-02-231-1/+1
| | | | | Change-Id: I67e0dae6f21162b962c1ce4454dc3d82e4e40049 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Update number of reserved bits.Michael Brasser2012-02-231-1/+1
| | | | | Change-Id: I38e112c2493abd9ec79b97e6e28334a3ba66543c Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Remove the last sql dependency in declarativeMartin Jones2012-02-221-2/+1
| | | | | Change-Id: Ib2410e1b32e2cc5216d5fc9659bc45fb46a1da61 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* clean up qmake-generated projectOswald Buddenhagen2012-02-2218-97/+11
| | | | | | | | remove "header" and assignmets which are defaults or bogus Change-Id: I1d777f5418b0f353bf276a979c6300a941927e7e Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* DebugMessageService: Remove unneeded dataAurindam Jana2012-02-222-7/+4
| | | | | | | Do not send version info of QMessageLogContext. Change-Id: I32dd4a548ee2b918e5d04dcdffd4d5545fd2f54f Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* CodeCoverage: Fixes regression.Caroline Chao2012-02-223-34/+11
| | | | | | | | | | | | | | | | Fixes segmentation fault introduced by qtbase change: 36f5cc848de2525 Coverage data are now saved in QTestLog::stopLogging. Also the current application name needs to be set for a quick test as well. Remove also code coverage call to installCodeCoverage from quicktest due to refactor of the code coverage setup in qtestlib. This should be less error-prone. See qtbase change: 949b7452e0d2402 Change-Id: I13566cc43dfb3af264d3b2be2e5f2617128f4801 Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* Positioners cleanupAlan Alpert2012-02-226-107/+116
| | | | | | | | Use qreal for positions and spacing instead of ints, and make the positionedItems list take care of filtering out invisible items. Change-Id: Icad93ad89c848e40a70bd7a9539bd810e27020df Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Add test verifying that QObject-derived pointer is passed correctly.Matthew Vogt2012-02-222-0/+57
| | | | | | | | Ensure that an object derived from QObject is correctly passed to an invokable function from QML. Change-Id: I71eefe8c480e1f1574804d05244b53f29c7fbf0d Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Doc improvements for positionersBea Lam2012-02-224-220/+220
| | | | | | | | | | | - Fix docs that say opacity changes can trigger an add transition since this is no longer the case - Be more clear about when the move transition is applied - Be more clear about which anchors are allowed/disallowed in which positioners - Add example to Positioner attached property Change-Id: I78417ac5b8eba1af5587955121b7fd4e2ca21169 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Whitespace fixes for positionersAlan Alpert2012-02-222-23/+23
| | | | | Change-Id: I53a8a023e218cd41b2c01a7c931c95edfbaee780 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Reduce the size of QQuickTextInputPrivate.Andrew den Exter2012-02-223-110/+69
| | | | | | | | Remove some redundant or obsolete member and reorder members to minimise padding for alignment. Change-Id: I2660007baa07bea076e9ad307061af87c07e37cf Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Implement String.localeCompare() using QString::localeAwareCompare()Martin Jones2012-02-225-0/+83
| | | | | | | | v8's localeCompare() implementation is not locale aware, so we use Qt's locale aware compare. Change-Id: Ia9092b3d6754545bb797adac26080ac7a29dcd92 Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
* DebugMessageService: Also pass Debug Context InfoAurindam Jana2012-02-213-15/+49
| | | | | | | | Use QMessageHandler which provides context information such as line, file and function for the debug output. Change-Id: I475faf4a1363d8419dec910b8a23cc44666c1908 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* v8profiler: Actually submit dataKai Koehne2012-02-213-25/+43
| | | | | | | Fix regression introduced in 82dfecab3. Change-Id: Icd90c483b9b2fde8d4cf522f3a35368cd395b120 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* Reduce size of QQuickItemPrivateAaron Kennedy2012-02-217-306/+363
| | | | | Change-Id: I02653536f68cfef3dfc06acaf30e2565a97dc194 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Release resources on shutdown..Gunnar Sletta2012-02-211-3/+11
| | | | | Change-Id: I7758f5ba1f58e19d92e394133cccd449ce5a1756 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Flicking a pathview with large delegate spacing is inconsistentMartin Jones2012-02-214-24/+94
| | | | | | | | | | | | The deceleration is inconsistent and dragging slowly is jerky. This was largely due to the poor resolution of the path points. pointAt() now interpolates, and the dragging logic is more accurate. Also removed the rounding of item positioning so that side-by-side items don't bounce around. Task-number: QTBUG-24312 Change-Id: I956aff0b83c3c1211d5657159c3de1e4ef0b5171 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* fix typo error in documentationCharles Yin2012-02-211-1/+1
| | | | | Change-Id: Ic3706b0920b8a50f994e0627bda6baf0fd04b81c Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Renames QAnimation2ChangeListener to QAnimationJobChangeListenerCharles Yin2012-02-218-18/+18
| | | | | Change-Id: I921b252380d095fb878b4e5d36df0b5a13a3888f Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Remove sql dependency from declarative.proCharles Yin2012-02-211-1/+1
| | | | | Change-Id: I43aa11e948a498796788587e03a699f121308d1b Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Stabilise ListView and GridView testsBea Lam2012-02-214-92/+139
| | | | | | | | | | | | | | | | | Some tests need to wait for view to be updated before proceeding. This ensures a polish is received before proceeding - before checking through child items after initial load - after changing content y unless some other QTRY_* is already doing the job. Also fixed some tests that randomly failed for other reasons. Task-number: QTBUG-22872 QTBUG-23605 Change-Id: I2d41bf09fae09b90fd3aadbd5349e991c3339761 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix condition check against wrong variableBea Lam2012-02-211-1/+1
| | | | | Change-Id: I0857166e666e886077e4b0eda2d8b00b13f99ba6 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Skip tst_QQuickListView::sectionsDelegate() for nowBea Lam2012-02-211-0/+2
| | | | | | | Failing occasionally Change-Id: I74fdc7f0d71a92ef2ea19df3125a362e2fa199c5 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Reduce the size of QTextPrivate.Andrew den Exter2012-02-214-88/+95
| | | | | | | | Remove some unnecessary members, store colors as QRgb values instead of QColor, and reorder members to minimise alignment padding. Change-Id: Id3958429008c97a5714734a529250fe881e2161b Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Add optimizations for QJSValue tests for MSVC.Jędrzej Nowacki2012-02-211-6/+0
| | | | | | | | The comment is not valid. It was added for QScriptValue generated test which are not included in QJSValue tests. Change-Id: I958e3c1d1f57cfa0ad34d1a8c8387deec792efaf Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* cacheBuffer makes delegates appear briefly in wrong positionMartin Jones2012-02-212-2/+3
| | | | | | | | | Set delegates that are created asynchronously to non-visible. This would have happened the next time addVisibleItems() was called. Task-number: QTBUG-24364 Change-Id: I4b628bef186c8c41bd6a4d9e4ac402d59bcb4972 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Remove the callback facility from context node.Justin McPherson2012-02-213-33/+3
| | | | | | | | | | | - It's not really necessary. - It's probably a mis-use of QSGNode::preprocess() - Because it triggers a race between object deletion in the main thread and preprocess() in the render thread. Change-Id: I51433f508db306aab53398f8c3d1d8c9d9e986fd Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* DeclarativeEngineDebugService: Fix CrashAurindam Jana2012-02-212-0/+20
| | | | | | | | Iterate through contents of QVariantMap to convert QObjects to streamable type. Change-Id: I2cb64a84aef674904de43f9a0c0fee539b87a59a Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Fix gcc compiler warnings.Friedemann Kleint2012-02-212-2/+3
| | | | | | Change-Id: I22d0a45bdcf68c454af0aab9fa62dd2d126d63c2 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Make compile.Michael Brasser2012-02-213-0/+3
| | | | | | | Fix compile after 054114a459580b71e170dc6bf356e8943d0ed068 in qtbase. Change-Id: Ibeea6b4b2e3c5f420446b15edd1df7bf88535dcd Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove commit headersAaron Kennedy2012-02-2053-53/+0
| | | | | | | | These were used when we were porting from QtQuick 1 to QtQuick 2 but are no longer necessary. Change-Id: I0eeb7e13b4affdd6ab6c6dddea760afcdf38ee4f Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Console API: Pass context information from js to qt logging frameworkKai Koehne2012-02-203-83/+113
| | | | | | | | Log the file, line, function context from the original calls in js. Also print the stack trace as part of one multi-line message. Change-Id: I53836df081f3ce06e9b52ebb647ba172ff6bdbef Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* QmlProfilerTool: add tool to QDeclarativeAurindam Jana2012-02-2012-1/+3426
| | | | | | | | | | qmlprofiler is a standalone tool used to record profiling data of QML apps. The data is stored in a file which can be loaded in QtCreator for investigation. Change-Id: I308f4c40bc3876933bd0d32c336cef6cd6f5fb4a Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Delete v8methods array at destructionAaron Kennedy2012-02-201-0/+1
| | | | | Change-Id: I6412ad352ad23db4100fffc9285532eb7e0b3a71 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Don't store source after script data is createdAaron Kennedy2012-02-202-6/+1
| | | | | Change-Id: I84fd61893db3578b80beb85b9a88ed325ea7584f Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Reduce memory by not calling QUrl::toString() multiple timesAaron Kennedy2012-02-2013-20/+52
| | | | | Change-Id: I57ce25f4e20cac048ff507a8c195b83adc30040d Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Don't store object and property in QDeclarativeAbstractBindingAaron Kennedy2012-02-2012-61/+175
| | | | | Change-Id: Ia164655f6329ec80dc466a1a3a5613a73e1c23ac Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Reduce size of QV8BindingsAaron Kennedy2012-02-206-44/+82
| | | | | Change-Id: I4bd8fed3f38aa358fb42e21b5cf19ff1aa61c138 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Reduce size of QDeclarativeJavaScriptExpressionAaron Kennedy2012-02-205-45/+78
| | | | | Change-Id: Ie1242d18ef10e5cbd9c1cab27c31ad3f6d9281fd Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Reduce size of QV8Bindings::BindingAaron Kennedy2012-02-203-38/+46
| | | | | | | Use the instruction ptr instead of copying data Change-Id: I2e9c8ce2fcf5d664ac98d8d58b5733b60e8bf548 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>