summaryrefslogtreecommitdiff
path: root/src/declarative/qml/qdeclarativeengine.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Doc: Fixes to Qt Quick documentation.David Boddie2010-08-091-3/+3
| | | | | | | | | | | | | | | Reviewed-by: Trust Me To-be-verified-by: Qt Doc Team
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-131-23/+18
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainter.cpp src/gui/text/qtextengine.cpp tests/auto/qimage/tst_qimage.cpp tests/auto/qpainter/tst_qpainter.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf
| * | 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.
| * 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
* | Remove usage of deprecated QScriptValue* functionOlivier Goffart2010-08-061-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Tests were untouched. Regexp used: git grep -O"sed -i 's/qScriptValueFromQMetaObject *<\([^>]*\)> *(\([^&*\(),]*\))/\\2->scriptValueFromQMetaObject<\\1>()/g'" qScriptValueFromQMetaObject git grep -O"sed -i 's/qScriptValueFromValue(this, */toScriptValue(/'" qScriptValueFromValue git grep -O"sed -i 's/qScriptValueFromValue(\([^&*\(),]*\), */\\1->toScriptValue(/'" qScriptValueFromValue git grep -O"sed -i 's/qScriptValueFromValue(&\([^&*\(),]*\), */\\1.toScriptValue(/'" qScriptValueFromValue git grep -O"sed -i 's/qScriptValueToValue</qscriptvalue_cast</'" qScriptValueToValue Rev-by: dev mailing list
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-061-15/+15
|/ | | | | | | | | | | | | | | Test directory untouched. This just apply those regexp: git grep -O"sed -i 's/qVariantValue</qvariant_cast</'" qVariantValue git grep -O"sed -i 's/qVariantSetValue(\([^&*\(),]*\), */\\1.setValue(/'" qVariantSetValue git grep -O"sed -i 's/qVariantSetValue *<\([^>]*\)> *(\([^&*\(),]*\), */\\2.setValue<\\1>(/'" qVariantSetValue git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*([^&*\(),]*)\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantFromValue\( *[(<]\)/QVariant::fromValue\\1/'" qVariantFromValue git checkout src/corelib/kernal/qvariant* Rev-by: dev mailing list
* 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-101-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-261-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
| |
* | Ensure QML Global Qt object functions appear in the documentation indexWarwick Allison2010-05-211-2/+304
|/ | | | | | | | Also moves documentation of Qt global object to alongside code. Docs are slightly misleading because they say "Qt::argb" etc. when "Qt.argb" would be clearer. Downgrades QTBUG-7725 from P2 to P4 as remaining functions are standard webJS. Task-number: QTBUG-7725
* Stop warnings.Warwick Allison2010-05-201-10/+10
|
* Search for QML import libraries also in application directoryKai Koehne2010-05-191-4/+6
| | | | | | | | Add QCoreApplication::applicationLibraryPath again to the list of directories to search for possible QML plugins. Task-number: QTBUG-10771 Reviewed-by: mae
* Restructure the examples. They are now organized into variousBea Lam2010-05-171-2/+2
| | | | | | subdirectories to make it easier to locate examples for certain features (e.g. animation) and to distinguish between different types of examples (e.g. very basic examples vs complex demo-like examples).
* Qt.include() support in worker scriptsAaron Kennedy2010-05-141-0/+3
|
* Only add "include" property in non-workerscript threadsAaron Kennedy2010-05-141-1/+2
|
* Missing files from 645b9ee9dd6e0576542cc61872ecedb408ca8a89Aaron Kennedy2010-05-141-0/+2
| | | | Grrr
* Fix broken benchmarks.Michael Brasser2010-05-131-5/+6
|
* Avoid warnings as delegates with bindings to parent are created and destroyed.Martin Jones2010-05-061-1/+3
| | | | Task-number: QTBUG-10359
* Fix some compiler warnings.Martin Jones2010-05-061-23/+23
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-051-1/+1
|\
| * Fix qdoc errorsBea Lam2010-05-051-1/+1
| |
* | Allow dynamic deletion of objects created with createQmlObjectAlan Alpert2010-05-041-1/+4
|/ | | | Task-number: QTBUG-10328
* Add Qt.fontFamilies() methodAaron Kennedy2010-04-301-0/+12
| | | | QTBUG-10239
View Lorry Controller Status