summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeengine.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Qml Debugging: Only enable if explicitly requestedv4.7.1Jason McDonald2010-11-031-0/+1
| | | | | | | | | | | | | | | | | | | Enable the remote debugging of QDeclarativeEngines only after QDeclarativeDebugHelper::enableDebugging() has been called. Approved by 4.7 Program Team. Reviewed-by: Alessandro Portale Task-number: QTBUG-13762 (cherry picked from commit b2016bbfc9c7389e7b64451417395ceba96af21f) Conflicts: src/s60installs/bwins/QtDeclarativeu.def src/s60installs/eabi/QtDeclarativeu.def
* Update license headers to release version.Jason McDonald2010-10-181-13/+13
|
* Register QtQuick 1.0 module.Aaron Kennedy2010-10-011-3/+9
| | | | | | | | Qt 4.7 is still supported, but deprecated. Reviewed-by: Martin Jones Task-number: QTBUG-13799 (cherry picked from commit 4fcf055f66cc23c9e60a7add489e394420e71914)
* This patch allows modifications on PropertyChanges on the flyThomas Hartmann2010-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is important for Bauhaus to ensure that we can edit properties and states dynamically in the visual editor Most of the changes consist of added functions for Bauhaus, that do not affect any current behaviour. Important changes: QDeclarativeAbstractBinding is holding a QSharedPointer to itself so that other classes can hold a weak reference to avoid accessing dangling pointers while keeping track of bindings. QDeclarativeStateOperation now has its own private class QDeclarativeStateOperationPrivate to hold a pointer back to QDeclarativeState since the parent is not set correctly in every context. QDeclarativePropertyChangesPrivate does now hold a QDeclarativeGuard instead of a raw pointer to the target QObject. In Bauhaus the target object might be deleted. Reviewed-by: Aaron Kennedy
* Merge branch '4.7' into qmldocsDavid Boddie2010-09-061-1/+1
|\
| * Support passing QObject derived types to QML methodsAaron Kennedy2010-09-031-1/+1
| | | | | | | | QTBUG-13047
* | Doc: Added types to method and signal documentation; other fixes.David Boddie2010-09-011-2/+2
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-08-311-0/+3
|\
| * Fix application exiting in embedded qml examplesJoona Petrell2010-08-301-0/+3
| | | | | | | | | | Task-number: QTBUG-13178 Reviewed-by: Martin Jones
* | Simplify type management codeAaron Kennedy2010-08-271-2/+2
|/
* QDeclarativeEngineDebugServer: make it a singleton.Olivier Goffart2010-08-241-5/+2
| | | | | | | | | It is already a singleton, just formalize it so it can be used in other files than qdeclarativeengine.cpp This also remove the global olbject QDeclarativeEngineDebugServer::m_engines Reviewed-by: Lasse Holmstedt
* Fix few declarative code issues discovered by static code analysisJoona Petrell2010-08-241-1/+1
| | | | | Task-number: Reviewed-by: Aaron Kennedy
* Allow QML Quit buttons to work inside QtDemo.Alan Alpert2010-08-201-1/+1
| | | | Also changes the line documenting the quit signal on QDeclarativeEngine.
* QDeclarativeImageProvider: Do not keep the global declarative mutex locked ↵Olivier Goffart2010-08-191-6/+9
| | | | | | | | | | | | | | | | when processing. The point is to be able to process images in a thread. If the mutex is locked, this is useless. Use case is a slow QDeclarativeImageProvider that generates thumbmails from large files. Even with the asynchronous attribute set to true, the gui thread would be blocked by the mutex. By using QSharedPointer, I also fix the leak of the providers (which were not deleted) Reviewed-by: Martin Jones
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-161-0/+2
|\ | | | | | | | | Conflicts: doc/src/declarative/elements.qdoc
| * qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-161-0/+2
| | | | | | | | ...and a set of functional group pages.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-131-3/+4
|\ \ | |/ | | | | | | | | | | Conflicts: doc/src/examples/simpletreemodel.qdoc doc/src/examples/spinboxdelegate.qdoc doc/src/index.qdoc
| * doc: The QML Qt element was missing from the documentation.Martin Smith2010-08-111-3/+4
| | | | | | | | Either someone removed the QML: prefix, or it was never there.
* | Doc: Fixes to Qt Quick documentation.David Boddie2010-08-091-3/+3
|/ | | | | Reviewed-by: Trust Me To-be-verified-by: Qt Doc Team
* Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527.Jerome Pasion2010-08-021-3/+2
|
* Fix compilation with QT_NO_XMLSTREAMREADERTasuku Suzuki2010-07-291-0/+2
| | | | | Merge-request: 757 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fixes for Dynamic Object Management docs. Also adds links toBea Lam2010-07-291-17/+10
| | | | | | this page from other documentation. Task-number: QTBUG-12446
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-271-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix QT_NO_DATESTRING Check the gesturemanager pointer before accessing it. Added files that had been renamed. Modified file/directory names and text to remove disallowed terminology. Cherry pick fix for MOBILITY-1077 from Qt Mobility. Fix typo in docs. Cherry pick fix for MOBILITY-1145 from Qt Mobility. Cherry pick fix for MOBILITY-1144 from Qt Mobility. Fixed the following sub-tasks for QTBUG-12192
| * Fix QT_NO_DATESTRINGTasuku Suzuki2010-07-271-3/+3
| | | | | | | | | | Merge-request: 730 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* | various doc fixesBea Lam2010-07-271-1/+1
|/
* Make rootContext and engine pointers in QDeclarativeView API constJoona Petrell2010-07-221-2/+2
| | | | | Task-number: QTBUG-12322 Reviewed-by: Aaron Kennedy
* Expand QtObject docBea Lam2010-07-211-7/+40
|
* various doc improvements for animation elementsBea Lam2010-07-201-4/+11
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-141-7/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (83 commits) Crash while runnig tst_QMdiSubWindow::emittingOfSignals test on Cocoa fix qconfig.h aliased header creation fix warning directive on gnuc qdoc: Removed navigation arrow that was causing display problems. Silence warning when building with MSVC 2005 Fix an Assert in QTextTable Revert "Fix an Assert in QTextTable" Attempt to fix build failure with msvc200{5,8} on Windows XP. fix macx not having UNICODE in DEFINES any more doc: Fixed several qdoc warnings. Fix an Assert in QTextTable doc: Fixed several qdoc warnings. QSslSocket: Improve error handling qdoc: Fixed several <div> elements that had the "/>" ending. QSslSocket: fix documentation for QSslSocket::setPeerVerifyMode() qdoc: Fixed breadcrumbs for QML examples. remove redundand translations project files make projects lupdate-friendly Timing fix for slow devices. QNAM: Add future enum attribute for Zerocopy QNAM ...
| * Fixing merge conflicts.Martin Smith2010-07-131-28/+42
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7 Conflicts: doc/src/declarative/advtutorial.qdoc src/declarative/graphicsitems/qdeclarativeloader.cpp src/declarative/graphicsitems/qdeclarativetextedit.cpp src/declarative/qml/qdeclarativeengine.cpp src/declarative/util/qdeclarativexmllistmodel.cpp
| * | qdoc: Marked some missing declarative properties and functions as \internal.Martin Smith2010-07-091-2/+2
| | |
| * | qdoc: Fixed a few links to QtObject (QML:QtObject)Martin Smith2010-07-071-3/+3
| | |
* | | Split responsibilities in QDeclarativeExpression more cleanlyAaron Kennedy2010-07-141-1/+1
| |/ |/|
* | doc improvementsBea Lam2010-07-091-0/+4
| |
* | Extend QDeclarativeImageProvider to support QPixmap loading andBea Lam2010-07-081-14/+25
| | | | | | | | | | | | | | | | | | | | synchronous loading of QImages. (QPixmaps can only be created in the main thread so they will always be loaded synchronously). This changes request() to requestImage() and adds requestPixmap() for pixmap support. Task-number: QTBUG-11989
* | Micro optimization in QML date/time formatting functions.Michael Brasser2010-07-081-12/+15
| |
* | fix doc linksBea Lam2010-07-021-2/+3
| |
* | Fix docs to link to the new QML Viewer page instead of the Runtime pageBea Lam2010-07-021-2/+1
|/ | | | | where applicable, and remove or rename references to 'qml' tool. Also improve QML Viewer docs.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-291-5/+19
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (46 commits) Ensure Loader item change listener is removed when Loader is destroyed Adapt all qmlviewer testcases to the code changes in the actual viewer. Stop QMLLauncher from crashing on exit on Mac when quitting app via the VisualDataModel hasModelChildren role shadowed user roles. Allow positioning of ListView items width sub-pixel precision. Examples clean up Docs Improve appearance when scaling Tweak Qt Demo Behaviour forget to rename the moc include when renaming deviceorientation_maemo.cpp fix namespace macros fix QML Viewer resize modes forgot to cleanup the code a bit after adding Maemo5 support Make the QML viewer usable on the N900 Test QTBUG-11222 Test ListElement type via type system, not string comparison. Test only on X11, not only on Linux (which includes embedded). Handle enums in method arguments in the same way as QtScript Allow custom parsers to handle attached properties Allow components to be created from .pragma library JS files ...
| * Allow components to be created from .pragma library JS filesAaron Kennedy2010-06-251-5/+19
| | | | | | | | QTBUG-11507
* | Doc: Changed links to explicitly refer to QML objects.David Boddie2010-06-181-11/+11
|/ | | | Reviewed-by: Trust Me
* Move knowledge of QGraphicsObject out of qml engineAaron Kennedy2010-06-161-5/+6
|
* Move some example code into snippets/ and add other doc fixesBea Lam2010-06-091-5/+6
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-011-10/+24
|\ | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix example code and image Fix doc Fix some bugs in the QML Web Browser buttons Fix zoom bug in QML Web Browser demo Fix Typo Various doc fixes and improvements Document issues with rectangle border width of 1 where clipping is used Simplify selection setting. Make TextInput more like TextEdit.
| * Various doc fixes and improvementsBea Lam2010-05-311-10/+24
| |
* | Fix QT_NO_TEXTDATE compilation errors.Andreas Aardal Hanssen2010-05-311-0/+4
|\ \ | |/ |/| | | | | Merge-request: 649 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| * Fix QT_NO_TEXTDATETasuku Suzuki2010-05-251-0/+4
| |
* | Doc fixes, improvementsBea Lam2010-05-261-58/+44
| |
* | Added autotest for Component.createObject() without Qt.createComponent()Alan Alpert2010-05-241-2/+2
| | | | | | | | | | | | Also augmented the docs for both functions a little. Task-number: QTBUG-10926
* | Move copies of toLocalFileOrQrc() to QDeclarativeEnginePrivateBea Lam2010-05-241-0/+11
| |