aboutsummaryrefslogtreecommitdiffstats
path: root/src/qtquick1
Commit message (Collapse)AuthorAgeFilesLines
* Remove QtQuick1 elements from qtdeclarativeMatthew Vogt2012-02-03152-63673/+0
| | | | | | | | QtQuick1 is now contained in a separate repository. Task-number: QTBUG-23737 Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Accessibility: Use new updateAccessibility() API in declarative.Friedemann Kleint2012-02-012-3/+3
| | | | | Change-Id: I7ab5c767c9d21c9cad1ee7f7c1f6e21ed4dccef3 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Don't use region.numRects()Lars Knoll2012-02-011-1/+1
| | | | | | | The method has been removed in QtCore. Change-Id: I5dabe7da0ab9de617a6c241196ba803d4e887518 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-30149-149/+149
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: If39bd256b0fa85eba17ea30f8ab87ea27d758908 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix segfault now that the signature of roleNames is changed.Stephen Kelly2012-01-251-2/+3
| | | | | | | (QtBase c3ad8c1c062a972b7fb75d8b51a1f80cb371d503) Change-Id: I037787f895f71b746c38557f6fdbfbba5813cb25 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Add missing include.Stephen Kelly2012-01-241-0/+1
| | | | | | | | | | Fixes build after requirement for Q_DECLARE_METATYPE(T*) to be fully defined. In QtBase (4b8ceb41aed352f10d36db5284453f425dbc5f3f) Change-Id: I7ea42ec45797fafdde94ea5b58c6c71640710196 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove Symbian specific code.Xizhi Zhu (Steven)2012-01-246-36/+9
| | | | | Change-Id: Ifbcc92f1d44d46760ac7c5be24a997384fa22266 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-23149-149/+149
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Remove the use of QT_MODULE()Gunnar Sletta2012-01-2057-57/+0
| | | | | Change-Id: I1c07231b0bf412fe490a44b9a060bb2e2ef11154 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Update copyright year in Nokia copyright headers.Jason McDonald2012-01-172-2/+2
| | | | | | | | 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>
* QDeclarativeExpression: storing column number in expression locationChristiaan Janssen2012-01-164-6/+6
| | | | | Change-Id: I2d69738158abfc76f80b1cfc0e0ccb145fda2245 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Remove out-of-line uses of qMalloc/qFree/qRealloc.Robin Burchell2012-01-121-2/+2
| | | | | | | | | Per http://codereview.qt-project.org/#change,11562, we are trying to remove these in favour of direct allocation, or (in the case of inline code) specialised out-of-line wrappers. Change-Id: I113609c4f97dc5c8020a72cbd398572cdb5b7505 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Adapt to QInputPanel::inputDirection() APIPekka Vuorela2012-01-123-3/+4
| | | | | | | Information moved from QGuiApplication into QInputPanel. Change-Id: Idd80609f4b67bffae7222a1fa27918724ebf60f6 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Initialize isAccessible to 0.Frederik Gladhorn2012-01-051-1/+1
| | | | | Change-Id: Icf76fbd0bd8fba929e6238f556447761a4eb34c7 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-05147-147/+147
| | | | | Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add accessibility to qmlFrederik Gladhorn2012-01-029-0/+276
| | | | | | | | | | | | | | | This consists of two parts: An attached property for QML items and a plugin for the accessibility framework. The attached property simply takes care of some properties (name, role) that are needed in order to expose semantics of the application to assistive tools. The plugin exposes the hierarchy of QML items to the accessibility framework. Change-Id: I32f5603d0d9549b01b3645b205b710b9801762f7 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Make editors commit preedit themselves on losing focusPekka Vuorela2011-12-201-1/+3
| | | | | Change-Id: I1d42a8804068718c7347b4f652289f9724c25a3c Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* TextEdits to include tentative commit in text propertyPekka Vuorela2011-12-141-2/+2
| | | | | | | | | | Similar to what qtbase 1dbfbf4c66187e7522888c19d78024cfceaea570 did for QTextEdit. Now available only in plain text, html support pending. Change-Id: I0b23a45fc484512d3354f66e1a6134e2d70eb8b5 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com> Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Remove dead private method from TextEdit implementationsPekka Vuorela2011-12-092-18/+0
| | | | | Change-Id: I6c9a7c71607167b326dc45a35d97bcaf25a9d1b9 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Introduce more generic fast property handlingAaron Kennedy2011-12-053-17/+0
| | | | | | | Also reduce the number of direct calls to qt_metacall(). Change-Id: I04cd6e516a3e61058548309a19fe0b830f15c93f Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Use QWidgetTextControl in the QtQuick1 TextEdit.Andrew den Exter2011-12-022-6/+9
| | | | | | | | | | | QDeclarative1TextEdit and QTextEdit have the same compatbility requirements so it makes sense they continue sharing the same line control implementation. This allows the QtQuick 2 TextInput to diverge without creating a third variation of QTextControl, Task-number: QTBUG-22627 Change-Id: Id4a8f6a17aeb756c3385cf8fca3de61b8c4be757 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Use QWidgetLineControl in the QtQuick1 TextInput.Andrew den Exter2011-12-022-29/+29
| | | | | | | | | | | QDeclarative1TextInput and QLineEdit have the same compatbility requirements so it makes sense they continue sharing the same line control implementation. This allows the QtQuick 2 TextInput to diverge without creating a third variation of QLineControl. Task-number: QTBUG-22627 Change-Id: Ic06f66f1cb55e78f7129889a4877c3aba5ba72f6 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Move QDeclarativePropertyValueInterceptor into a private headerAaron Kennedy2011-12-011-1/+1
| | | | | | | This should never have been public. Change-Id: I77811413c93fdc7767d0921e12284e9a8bc88752 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fix uninitialized member variable in QDeclarativeTextEditPekka Vuorela2011-12-011-1/+1
| | | | | | Change-Id: I7ef3902488bb4ba1129933e3a4015e266be8b821 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Made TextInput mouse events commit preeditPekka Vuorela2011-12-011-30/+25
| | | | | | | | | Similar to what was earlier done on QWidgets editors. Additionally updated tests to check QInputPanel::invokeAction instead of the obsolete QInputContext mouse handler. Change-Id: Ia2bd22eebdeed79cff7a4925129b28dd1500b1ad Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Remove harfbuzz cruft from {declarative,qtquick1}.proKent Hansen2011-11-251-3/+0
| | | | | | | | | As of b97215b04c0bf12ecfd51ccdeaedd1fab5e8bc03 in qtbase, modules outside of qtbase can include private text headers without depending on the harfbuzz sources being present. Change-Id: Idb3d70d70c1f0f194382a405daa573e66146272a Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* TextInput elements not to have tentative commit in inputMethodQueryPekka Vuorela2011-11-241-1/+1
| | | | | | | | Tentative commit should not be part of surrounding text, it's already a property of the input method. Change-Id: I64aec9763fb20770b6729f7f59dcbe23cf5a6718 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Use the AST for binding rewriting when possible.Michael Brasser2011-11-231-3/+1
| | | | | Change-Id: I1ac8bd39ea7e02f7c236c030ca233e1060746431 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Silence compiler warnings about unused variables (MSVC)Kai Koehne2011-11-211-3/+4
| | | | | | | Fixes most 'C4189: local variable is initialized but not referenced' warnings Change-Id: I8c5a1ba0a50dd3fcb22294e564425846362ee911 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix Qt Declarative namespace compilation.Toby Tomkins2011-11-211-1/+2
| | | | | Change-Id: Ib3294278985cd43e40610dacd7b69bf98ff4d788 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QDeclarativePixmapCache: Add missing enumeration values and break.Friedemann Kleint2011-11-091-1/+7
| | | | | Change-Id: Ia83a4932d50133aaae5d488d7be0df99a75be576 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix crash on exit when overriding signal handlers in states.Michael Brasser2011-11-091-2/+3
| | | | | | | | Cherry-picked from 93c64e1be3a2d68eb504d7c4f7c60f66ce1ff650 in 4.7. Task-number: QTBUG-21617 Change-Id: I99ce8292d53954f5229867a384f47bedf7fad315 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Declarative: Add define _CRT_SECURE_NO_WARNINGS for MSVC.Friedemann Kleint2011-11-081-0/+2
| | | | | | | | | Silence warnings about usage of strcmp(), etc. Using wrapper is not an option here for performance reasons. Change-Id: Ia444a637080c910b8a9a888f422e65c812ba546c Reviewed-by: Chris Adams <christopher.adams@nokia.com> Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
* Rename QDeclarativePropertyCache::Data to QDeclarativePropertyDataAaron Kennedy2011-10-261-1/+1
| | | | | | | This class is now too large to be nicely nested. Change-Id: I32cfa5caa524b8bf447d1f8c53ef2763f60bdac1 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Declarative: Fix MSVC and g++ warningsFriedemann Kleint2011-10-191-1/+2
| | | | | | | | | | | | | | | | | Potentially severe: - Fix int/bool mismatches - Use of uninitialized variable - Do connectionMask shift operations in 64bit - Enum type mismatch for QLineControl::EchoMode Various: - class/struct mismatches - UnhandledEnumeration values - Unused variables - Constructor initialization order Change-Id: Ieb52f8990445fe95f94070175a0f9beb66863240 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Debugger: Create InspectorService only when debugging is enabledKai Koehne2011-10-171-2/+4
| | | | | Change-Id: Ie9704233012b0bd0e473c5ee6011e6382c61900f Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Cannot flick to the end of a horizontal ListView with LayoutMirroringMartin Jones2011-10-172-15/+10
| | | | | | | | | | | | | | | Forward port of fix for QTBUG-21756. minXExtent calculated the offset due to highlight range incorrectly (reversed) when mirroring enabled. Also us same algorithm for fixup() in GridView and ListView uses. For QtQuick 2, this change also reverses the beginning and end highlight range, as it should be, i.e. the preferredHighlightBegin is from the right side in RightToLeft mode. Also added snapping tests. Task-number: QTBUG-21756 Change-Id: Ica0ba4ab5db0ce9c77f2da75e9f8293550bd37d1 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove QMetaObjectBuilder from declarative.Friedemann Kleint2011-10-142-2/+2
| | | | | | | | Link on Windows. Change-Id: Idca11c1a21ad5aebf79d6487692d912b4dea249f Reviewed-on: http://codereview.qt-project.org/6553 Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
* Use QBasicAtomicInt load() and store() instead of implicit castingBradley T. Hughes2011-10-101-4/+4
| | | | | | | | | | | | | The implicit casts will be unavailable in the near future. This is a follow up to commit 7f8472af8c03296be9e9ce50d8e9b3089eedf2f1, which didn't catch all usages of the implicit cast and assignment operator. Change-Id: If05c343e2851b41e4a351c56328c4406c688fa0d Reviewed-on: http://codereview.qt-project.org/6351 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove redundant checks in qdeclarativestategroupKent Hansen2011-10-071-1/+1
| | | | | | | | | | Checking once should be enough for everyone. Task-number: QTBUG-20482 Change-Id: I6cc1c608d9c1da0f4f745e436b9611937a8db160 Reviewed-on: http://codereview.qt-project.org/6054 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Remove more QByteArray<->QString conversionsKent Hansen2011-09-293-9/+9
| | | | | | | | | | Prefer to store types as QStrings. It's only when we manipulate raw (compiled, meta-)data that utf conversion is needed. Change-Id: Ie138a69c9a409804e1b90b21c1d60dedea35bddb Reviewed-on: http://codereview.qt-project.org/5781 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Asynchronous component instantiationAaron Kennedy2011-09-292-2/+2
| | | | | | | | | | | | | This introduces two main: * the QML compiler executes in a separate thread * item instantiation can be interrupted and resumed to allow it to be split across multiple frames. Task-number: QTBUG-21151 Change-Id: I9631c62bb77da3a2e0c37f0da3719533fdce4fef Reviewed-on: http://codereview.qt-project.org/5676 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Manually apply SnapOneItem/Row changes from Qt 4.7Martin Jones2011-09-284-156/+223
| | | | | | | | | | | | Apply following changes to Qt 5 for both QtQuick1 and QtQuick2 items: cf23188de237009136fa1480ab8fd9e3ca364769 f85819fe083ae7c6804c884de68e906d153a6d11 09cd2f818208a83489fae034b80e6497b7cc83af Task-number: QTBUG-20683 Change-Id: I974764e57e3004514bb4c9f46c5152ad07c136a7 Reviewed-on: http://codereview.qt-project.org/5484 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Velocities reported by Flickable in onFlickStarted can be 0Martin Jones2011-09-161-9/+21
| | | | | | | | | | | | | | | Change 55cfbdb7c64068ae68f7baaceb8acfb96cb0c07e manually applied from Qt 4.7 Ensure the smoothed velocity is set at the start of the flick. Ensure that the smoothed velocity animation isn't restarted unless there is new valid data. Change-Id: Ia77249be9980aba268a1bfa0ea3f69c49fa09e5e Reviewed-by: Bea Lam Reviewed-on: http://codereview.qt-project.org/4712 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove some unused includes.Jędrzej Nowacki2011-09-154-5/+0
| | | | | | | Change-Id: I5090b0d3c88f3c972b1f1d2a56a954138f8d02ca Reviewed-on: http://codereview.qt-project.org/4283 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Fixed compile on mac (workaround for build system bug)Rohan McGovern2011-09-151-0/+13
| | | | | | | | | | | | | | | | | When using QT += somemodule, and using frameworks on mac, qmake refuses to add `-framework somemodule' to the compiler flags unless the framework can be found on disk. This can easily break when compiling two frameworks out of the same source tree. In this case, if QtQuick1 were qmake'd prior to QtDeclarative being built (which is expected for a clean build), it would incorrectly put -lQtDeclarative into the link line even if QtDeclarative should be built as a framework. The problem would disappear if qmake was re-run. Change-Id: I79cbfc454e0ab564ce6597b4f7e613c1ff39473f Reviewed-on: http://codereview.qt-project.org/4938 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Merge branch 'master' into refactorGunnar Sletta2011-09-123-3/+18
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/cppextensions/qwidgets/qwidgets.pro examples/declarative/minehunt/main.cpp examples/declarative/minehunt/minehunt.pro src/declarative/items/context2d/qsgcontext2d.cpp src/declarative/items/qsgflickable.cpp src/declarative/items/qsgtextedit.cpp src/declarative/items/qsgtextinput.cpp src/declarative/particles/qsgangleddirection.cpp src/declarative/particles/qsgcumulativedirection.cpp src/declarative/particles/qsgcumulativedirection_p.h src/declarative/particles/qsgfollowemitter.cpp src/declarative/particles/qsgmodelparticle.cpp src/declarative/particles/qsgparticlesystem.cpp src/qtquick1/util/qdeclarativeview.h tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp Change-Id: Ib4be2a5e742dee1a399d73da97161736f77448e5
| * Fix left alignment of native RTL pre-edit text.Andrew den Exter2011-09-072-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | If there is no committed text in a TextInput or TextEdit determine if the pre-edit text is right to left before falling back to the global keyboard settings. Change-Id: I7e5568e936341602b8faf7be120f9a770c115f48 Task-number: QMLNG-72 Reviewed-by: Michael Brasser Reviewed-on: http://codereview.qt.nokia.com/4176 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Delay masking the last character in Password echo mode.Andrew den Exter2011-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QT_GUI_PASSWORD_ECHO_DELAY is defined in qplatformdefs.h with an integer value in milliseconds, QLineEdit and TextInput will display the last character entered unmasked for that delay period and then mask the character as normal. If QT_GUI_PASSWORD_ECHO_DELAY is not defined then the behaviour is unchanged. Task-number: QTBUG-17003 Reviewed-by: Martin Jones (cherry picked from commit f9e7aee2019d321edd655bfde7de43f20a106971) Change-Id: Iddfa0daa1b39f0589cab27e5003fdd86ad81ff89 Reviewed-on: http://codereview.qt.nokia.com/4170 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
| * Debugger: Move QT_DECLARATIVE_DEBUG handling out of qdeclarative.hKai Koehne2011-09-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Apps don't have to (directly or indirectly) include qdeclarative.h. Instead, move the static instance to qdeclarativeengine.h, and qdeclarativeview.h, qsgview.h (which instantiate their own engine). Change-Id: I8b3e63ad4f134969734a2cc712395145d90e0dfa Reviewed-on: http://codereview.qt.nokia.com/3941 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>