summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativeview.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Renamed declarativeobserver plugin to qmldbg_inspectorThorbjørn Lindeijer2011-05-301-3/+3
| | | | | | | | | | | Mainly since it's a good idea to prefix the plugin on Symbian, and at the same time it's now consistency called 'inspector' rather than 'observer'. Symbian .def files will need to be updated. Change-Id: I43071331c8002f8844efd14105d01c730d97e946 Reviewed-by: Kai Koehne
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Moved the QML Observer Service and related functionality into QtThorbjørn Lindeijer2011-05-041-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code was previously developed as part of Qt Creator in share/qtcreator/qml/qmljsdebugger/ Moving it into Qt will allow us to simplify the setup required before you can debug QML applications. To avoid adding too much weight to the QtDeclarative module, a declarativeobserver plugin was introduced that contains the QDeclarativeViewObserver and related classes. The QDeclarativeObserverService is just a stub service that loads this plugin once a QML debugging client connects. The plugin implements the QDeclarativeObserverInterface A QJSDebugService was separated out of QJSDebuggerAgent, so that the service can be active while the agent is instantiated lazily. Each QDeclarativeEngine adds itself to the QJSDebugService. Currently only the first one is used when instantiating the agent. QDeclarativeObserverService is hooked into QDeclarativeView, with the view registering itself to the service, allowing the QDeclarativeViewObserver to be created for the view once somebody connects to the service. Again, only the first view is used at the moment. Change-Id: Ib50579c6d24361c2b39528e5556410d3446c2e90 Reviewed-by: Martin Jones Reviewed-by: Michael Brasser
* Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-04-031-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (237 commits) Fix animation tests after merge Remove duplicated test. Add missing test file. Changing width of RTL positioner doesn't relayout Fix TextInput auto test failure on mac. PinchArea and Flickable don't work well enough together Do not set focus unnecessarily at window activation in Symbian QS60Style: Regression in drawing dialog background QS60Style: Support menu separator (pt.2) Fix auto test failure. Support for new softkey in Symbian^3 Once Image sourceSize is set there is no way to clear it. Rotation transform with NaN angle can cause crash QSoftkeyManager auto test update Fixed not switching to MeeGo graphicssystem. Canceling image download while reading causes crash Fix width of TextInput micro focus rectangle. Return correct boundaries reasons from QTextBoundaryFinder. GridView jumps to beginning of list when resized Fixed rounding of coordinates pre-transformation in CG paintengine. ...
| * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-311-6/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-221-0/+7
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/examples/qml-examples.qdoc
| | * | Doc: Fixed links and whitespace.David Boddie2011-02-171-1/+1
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-071-12/+14
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/propertybinding.qdoc src/declarative/util/qdeclarativeview.cpp
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-171-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/elements.qdoc doc/src/declarative/extending.qdoc src/declarative/qml/qdeclarativecomponent.cpp
| | * | | | Re-organized the Qt Quick page. Changed titles and links.Jerome Pasion2010-12-201-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
* | | | | | Remove Font Smoothing hack for OS XJiang Jiang2011-03-311-8/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It only affects text rendering with static text/QTextLayout, rendering to images is not affected. Task-number: QTBUG-18048 Reviewed-by: Eskil
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-171-0/+7
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
| * | | | QDeclarativeView flickers when composited on MeeGoMartin Jones2011-03-171-0/+7
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set Qt::WA_OpaquePaintEvent and Qt::WA_NoSystemBackground for QDeclarativeView on meego. Change-Id: I301d2381ae831485d205ff42b0c15b3fa7a73424 Task-number: QTBUG-17173 Reviewed-by: Michael Brasser
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-041-11/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/samegame/SamegameCore/samegame.js mkspecs/features/symbian/default_post.prf src/declarative/qml/qdeclarativeengine.cpp src/gui/text/qtextdocumentlayout.cpp src/plugins/plugins.pro src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/s60installs.pro tests/auto/declarative/declarative.pro tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp tests/auto/declarative/qmlvisual/qmlvisual.pro
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191-1/+1
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-071-3/+4
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Yann Bodson2010-11-121-0/+8
| |\ \ \
| * | | | Make it possible to add your own graphics scene to QDeclarativeViewJoona Petrell2010-11-031-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14771 Reviewed-by: Martin Jones
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * | | | Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | |_|/ | |/| | | | | | | | | | Reviewed-by: Trust Me
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-231-3/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: src/s60main/newallocator_hook.cpp tools/runonphone/serenum_unix.cpp
| * | | Doc: Fixed broken link by referring to the errors() method instead.David Boddie2010-11-221-3/+4
| | |/ | |/| | | | | | | Task-number: QTBUG-15506
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-291-0/+8
|\ \ \ | |/ /
| * | Regression: QML fonts look bad on Mac with font smoothing onYann Bodson2010-10-291-0/+8
| |/ | | | | | | Task-number: QTBUG-14840
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-281-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/painting/qrasterizer.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/mainwindow.cpp
| * Various declarative autotest additions.Michael Brasser2010-09-231-1/+1
| |
* | Add average frame timing to QDeclarativeView, ifdef'ed out.Gunnar Sletta2010-09-081-0/+17
|/ | | | Reviewed-by: Aaron Kennedy
* Fixed spelling mistakes in documented functions, classes, etc. Part of ↵Jerome Pasion2010-07-291-2/+2
| | | | QTBUG-11938 and QTBUG-10801
* Make rootContext and engine pointers in QDeclarativeView API constJoona Petrell2010-07-221-9/+10
| | | | | Task-number: QTBUG-12322 Reviewed-by: Aaron Kennedy
* doc improvementsBea Lam2010-07-061-22/+23
|
* fix doc linksBea Lam2010-07-021-1/+1
|
* Fix drawing flicker on Qml Viewer startupJoona Petrell2010-06-091-4/+16
| | | | | Task-number: QTBUG-10251 and QTBUG-11156 Reviewed-by: Martin Jones
* Rename QDeclarativeDebugTiming -> QDeclarativeDebugTraceAaron Kennedy2010-05-271-9/+9
|
* Improve QML framerate debuggingAaron Kennedy2010-05-271-47/+51
|
* Replace QTime with QElapsedTimerAaron Kennedy2010-05-261-2/+2
|
* QDeclarativeViewPrivate should subclass QGraphicsViewPrivateBea Lam2010-05-111-13/+32
| | | | Task-number: QTBUG-10528
* Resize qmlruntime window to new dimensions when orientation changesJoona Petrell2010-05-071-10/+6
| | | | | Task-number: Reviewed-by: Warwick Allison
* docWarwick Allison2010-04-201-0/+1
|
* ResizeMode support for QGraphicsWidgets created with QDeclarativeViewJoona Petrell2010-04-161-87/+179
| | | | | Task-number: QTBUG-8814 Reviewed-by: alexis
* Class documentation fixes for declarative.Michael Brasser2010-04-161-3/+3
|
* Doc: more mention of using QUrl::fromLocalFile() for URLs on local filesystemMartin Jones2010-04-141-1/+7
|
* Fix viewer resizing on reload and File->openMartin Jones2010-03-301-0/+1
| | | | Task-number: QTBUG-9325
* Remove total wrongness.Warwick Allison2010-03-291-1/+0
| | | | Base URL of engine is not what some people think it is.
* Build Fix and port to new width and height propertiesAlexis Menard2010-03-251-2/+2
| | | | Reviewed-by:Martin Jones
* Fix leak.Michael Brasser2010-03-241-1/+2
|
* Remove dead performance measurement code from QMLAaron Kennedy2010-03-221-12/+0
|
* Fixes for the module importmae2010-03-161-0/+1
| | | | | | | | | The change makes import "url" also load plugins. We know must decide on the preferred coding style. Since native types must be registered with a unique uri, we now generate a stable uri from the plugin path and the import paths. This way we do not have to call registerTypes() multiple times.
* Merge remote branch 'qt/4.7' into qml-4.7Qt Continuous Integration System2010-03-101-4/+15
|\ | | | | | | | | Conflicts: src/declarative/util/qdeclarativestateoperations.cpp
| * doc: Fixed some QML qdoc errors.Martin Smith2010-03-051-4/+15
| |
* | Make QDeclarativeItem NOTIFY signals canonicalJoona Petrell2010-03-091-2/+2
|/ | | | | Task-number: QTBUG-7193 Reviewed-by: akennedy
generated by cgit v0.12 at 2024-09-25 12:26:11 (GMT)