aboutsummaryrefslogtreecommitdiffstats
path: root/src/qtquick1/util/qdeclarativeview.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Remove QtQuick1 elements from qtdeclarativeMatthew Vogt2012-02-031-752/+0
| | | | | | | | QtQuick1 is now contained in a separate repository. Task-number: QTBUG-23737 Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-301-1/+1
| | | | | | | | | | 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>
* Update obsolete contact address.Jason McDonald2012-01-231-1/+1
| | | | | | | | 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>
* Update copyright year in license headers.Jason McDonald2012-01-051-1/+1
| | | | | Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add accessibility to qmlFrederik Gladhorn2012-01-021-0/+6
| | | | | | | | | | | | | | | 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>
* Debugger: Create InspectorService only when debugging is enabledKai Koehne2011-10-171-2/+4
| | | | | Change-Id: Ie9704233012b0bd0e473c5ee6011e6382c61900f Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Merge branch 'master' into refactorGunnar Sletta2011-08-111-1/+0
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/declarative.pro src/imports/gestures/gestures.pro src/imports/inputcontext/inputcontext.pro src/qtquick1/graphicsitems/qdeclarativeitem.cpp src/qtquick1/qtquick1.pro Change-Id: I782be7090d8b6da9c890bc8e778722da93da8037
| * Merge the QJSEngine and QJSValue development branch into master.Simon Hausmann2011-07-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* | Build against refactor.Samuel Rødal2011-07-291-1/+1
|/ | | | Change-Id: I0143767405afe968c0aea71651bd9e3dc7a74e23
* Delete scene if you aren't going to use it.Alan Alpert2011-07-281-0/+2
| | | | | | | | | | Also make QDeclarativeOpenMetaObjectType zero its engine when the engine dies, because this was leading to problems when the scene wasn't deleted. Also fixes a few other potential deletion problems. Change-Id: I37fa2d1a0b438a6ea7d8cf4c5c9d0bd869faa959 Reviewed-on: http://codereview.qt.nokia.com/2250 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* qmlviewer resizes the root object multiple times.Martin Jones2011-07-261-0/+5
| | | | | | | | | | | | | | In SizeRootObjectToView mode on initial load the view was set to root object size, then the sceneResized() slot would resize back, then we would finally reset back to the correct value in statusChanged(true). Now react directly to the initial size being set. Change-Id: Ib6977cf7bad3fe79b9ac80bb6d916fb0f57c5f5e Fixes: QTBUG-16499 Reviewed-on: http://codereview.qt.nokia.com/2148 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* QDeclarativeView/QSGView SizeRootObjectToView still resizes viewMartin Jones2011-07-261-1/+2
| | | | | | | | | | | Only resize view to object in SizeRootObjectToView if the view has not had a size set, i.e. at initial construction. Change-Id: Ic5ad3cbb3b071c3498047be893da2c7bf0957986 Fixes: QTBUG-15863 Reviewed-on: http://codereview.qt.nokia.com/2132 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Bulk update of QtQuick 1 docs to \qmlmodule syntaxAlan Alpert2011-07-211-1/+1
| | | | | | | | Change-Id: I7ed2b54ef5a706dcaf7e19d221a6dda7b2620e8c Reviewed-on: http://codereview.qt.nokia.com/1681 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Extract all QtQuick 1 elements into a separate library/plugin.Martin Jones2011-07-121-0/+737
Change-Id: I41a280de2739ee08202f4be2519e5012870090f2 Reviewed-on: http://codereview.qt.nokia.com/1391 Reviewed-by: Martin Jones <martin.jones@nokia.com>