summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'qtruntime'Roberto Raggi2010-02-2310-200/+722
|\
| * Get rid of QmlModulePlugin.Roberto Raggi2010-02-234-200/+0
| |
| * Look for QML plugins in the paths specified in QML_PLUGIN_PATH env var.Roberto Raggi2010-02-234-6/+31
| |
| * Added QmlEnginePrivate::resolvePlugin.Roberto Raggi2010-02-232-3/+92
| | | | | | | | | | resolvePlugin returns the merge of the plugin's base name with the platform suffix (e.g. .dylib) and prefix (e.g. lib).
| * Merge remote branch 'origin/master' into qtruntimeRoberto Raggi2010-02-2323-246/+384
| |\
| * | Load QML extensions.Roberto Raggi2010-02-227-25/+62
| | | | | | | | | | | | | | | | | | | | | This allows projects which use the QtDeclarative module to register QML types and functions through C++ extensions. Reviewed-by: mae
| * | Document the QmlExtensionPlugin interface.Roberto Raggi2010-02-223-0/+157
| | |
| * | Merge remote branch 'origin/master' into qtruntimeRoberto Raggi2010-02-2232-747/+731
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qml.pri src/declarative/qml/qmlengine.cpp src/declarative/util/qmlview.h
| * | | Introduced QmlEngine::importExtension.Roberto Raggi2010-02-222-1/+21
| | | | | | | | | | | | | | | | importExtension can be used to import QmlExtensionInterface(s) into a QmlEngine.
| * | | Get rid of the unfriendly ImportedNamespace::isBuiltin flag.Roberto Raggi2010-02-191-27/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The `isBuiltin' flag doesn't play nice with hybrid apps where the types in a namespace are provided by both C++ and QML code. Done-with: mae
| * | | Added QmlExtensionPlugin and QmlExtensionInterface.Roberto Raggi2010-02-194-2/+75
| | | |
| * | | Introduced a new parser for qmldir files.Roberto Raggi2010-02-194-20/+352
| | | |
* | | | Fix build on solarisAlan Alpert2010-02-231-1/+1
| | | |
* | | | More precise compiler errorsAlan Alpert2010-02-231-2/+2
| |_|/ |/| | | | | | | | | | | | | | | | | | | | People were having trouble figureing what was wrong based off the previous error message. This should now be rectified - at least for users who read the docs. Reviewed-by: mae
* | | String to enum conversion in value typesAaron Kennedy2010-02-235-12/+38
| | | | | | | | | | | | | | | | | | Assigning a string to a value type enum property from a binding was not working as QmlMetaProperty didn't realise the property was of enum type.
* | | Adds QmlEasingValueType to qmlLeonardo Sobral Cunha2010-02-232-0/+127
| | | | | | | | | | | | | | | | | | | | | | | | Now it's possible to use easing curve types directly in qml as value types, {easing.type: "OutBounce"; easing.amplitude: 3}, instead of the former ugly string format, like "easeOutBounce(amplitude:3.0)". Reviewed-by: akennedy
* | | QmlExpression API reviewAaron Kennedy2010-02-238-58/+38
| | |
* | | Make QmlBinding (and friends) privateAaron Kennedy2010-02-2314-160/+163
| | | | | | | | | | | | | | | QmlBinding exposes way too many implementation details to be confident about making it public right now.
* | | Fix but in QmlMetaProperty assignment operatorAaron Kennedy2010-02-231-0/+2
| | | | | | | | | | | | QTBUG-8166
* | | Small QmlMetaProperty code cleanupAaron Kennedy2010-02-231-16/+16
| |/ |/|
* | Replace QmlList* and QList* support with a single QmlListProperty typeAaron Kennedy2010-02-2231-746/+730
| | | | | | | | | | | | | | | | As a value type QmlListProperty doesn't consume any memory in the object. It also has a companion QmlListReference class that is part of the public API for C++ developers to interact with that also manages memory issues that existed with previous solutions (if the containing QObject was destroyed it left a dangling pointer).
* | Rename MouseRegion -> MouseAreaMartin Jones2010-02-221-1/+1
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-18136-139/+151
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/linux-g++-x11egl/qplatformdefs.h src/declarative/qml/qmldom.h src/declarative/util/qmlview.cpp src/declarative/util/qmlview.h tools/qdoc3/cppcodemarker.cpp tools/qmldebugger/standalone/canvasframerate.cpp tools/qmldebugger/standalone/engine.cpp tools/qmldebugger/standalone/expressionquerywidget.cpp tools/qmldebugger/standalone/expressionquerywidget.h tools/qmldebugger/standalone/objectpropertiesview.cpp tools/qmldebugger/standalone/objectpropertiesview.h tools/qmldebugger/standalone/objecttree.cpp tools/qmldebugger/standalone/qmldebugger.cpp tools/qmldebugger/standalone/watchtable.cpp tools/qmldebugger/standalone/watchtable.h
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-16135-138/+150
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (42 commits) doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. Fix copyright year. Fix broken license headers. doc: Fixed some qdoc errors. Reusing sheets on Mac OS X 10.5 & above shows painting artifacts. doc: Fixed some qdoc errors. QNetworkAccessManager: add method to send custom requests doc: Fixed some qdoc errors. Optimization: Avoid calling out to public API function Mac: submenu shows up at the wrong position Add operator< and qHash for QSharedPointer and fix operator-. Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS) Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS) Optimized QLocale to access system locale on demand. Fix QRegion under Mac OS X. update according to Thiago's comments. Changes: add functionality for dbus auto start to qt Add license header to this file readdir64 is not available on HP-UX ...
| | * Fix copyright year.Jason McDonald2010-02-16135-135/+135
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * doc: Fixed some qdoc errors.Martin Smith2010-02-161-1/+1
| | |
| | * doc: Fixed some qdoc errors.Martin Smith2010-02-163-2/+14
| | |
* | | Make QmlDom API internalKai Koehne2010-02-185-409/+420
| | | | | | | | | | | | | | | | | | | | | It's still used by QmlDesigner, therefore the symbols have to be exported. Task-number: QTBUG-6845
* | | Compile fix with namepaceshjk2010-02-183-1/+9
| | | | | | | | | | | | Task-number: QTBUG-8205
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-1724-171/+456
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (47 commits) Add missing NOTIFY signals to various QML item class properties Fix currentIndex after itemsMoved() qmlviewer: build on symbian Revert "Replace QList<>* support with QmlListProperty" Declare QmlXmlListModelRole meta type before any code uses it. Make compile on Symbian (call Q_DECLARE_METATYPE earlier) Conditionally link webkit on wince Revert "Run dos2unix on these files." Expose LayoutItem documentation Fix palette on the N900 Fix QTBUG-8090, improve original patch effectiveness. Replace QList<>* support with QmlListProperty Run dos2unix on these files. Remove standalone QmlDebugger. It is now only available through the Mobility 404 Fix crash in QmlMetaProperty that could occur when using value-type QML binding optimizer crash QML binding optimizer crash Fix crash in QML binding optimizer Don't delete binding directly ...
| * | Revert "Replace QList<>* support with QmlListProperty"Aaron Kennedy2010-02-1710-166/+258
| | | | | | | | | | | | | | | | | | This was accidentally pushed early. This reverts commit 8454c53b304a4aba7c058b315041b3a38ad4fff5.
| * | Replace QList<>* support with QmlListPropertyAaron Kennedy2010-02-1610-258/+166
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qmlgraphicsitem.cpp src/declarative/qml/qmlmetaproperty.cpp src/declarative/qml/qmlmetatype.cpp
| * | Mobility 404Wolfgang Beck2010-02-161-2/+2
| | |
| * | Fix crash in QmlMetaProperty that could occur when using value-typeMichael Brasser2010-02-162-4/+4
| | | | | | | | | | | | properties after the engine was deleted.
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-1617-18/+267
| |\ \
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-1613-11/+48
| | |\ \
| | | * | MOBILITY-404 QS Windows.Wolfgang Beck2010-02-1611-10/+40
| | | | |
| | * | | Add QmlImageProvider to allow asynchronous access to images.Martin Jones2010-02-166-8/+227
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting an image source to image://providerid/imageid will pass the request for imageid to the provider registered for providerid. QmlImageProvider::request() is run in a low priority thread, so the main thread is not blocked while the image is loaded/rendered. Reviewed-by: Aaron Kennedy
| * | | QML binding optimizer crashAaron Kennedy2010-02-161-2/+2
| | | | | | | | | | | | | | | | | | | | The context's id values must be deleted after the compiled bindings as they may access the id values during shutdown.
| * | | QML binding optimizer crashAaron Kennedy2010-02-161-4/+5
| | | | | | | | | | | | | | | | We should check that the fetch() generation succeeded before continuing.
| * | | Fix crash in QML binding optimizerAaron Kennedy2010-02-163-138/+164
| | | | | | | | | | | | | | | | Optimized bindings need to reset the mePtr too.
| * | | Don't delete binding directlyAaron Kennedy2010-02-161-2/+4
| | |/ | |/| | | | | | | | | | Bindings should be destroyed by calling their destroy() method, not by deleting them.
| * | Remove noop codeAaron Kennedy2010-02-151-1/+0
| | |
| * | Move type initialization from global static initializers to QmlEngine ↵Warwick Allison2010-02-141-0/+8
| |/ | | | | | | | | | | construction. Task-number: QT-2798
* | Prepare translations of the declarative module.Friedemann Kleint2010-02-152-9/+9
|/ | | | | Add to translations profile. move stuff out of QObject-context, correct spelling and contractions, correct usage of tr().
* Fix warningsAaron Kennedy2010-02-121-1/+1
|
* Reference count shared expression dataAaron Kennedy2010-02-122-1/+7
| | | | | | QmlExpression uses data from the QmlCompiledComponent (eg. expression string data). It must therefore hold a reference to the QmlCompiledComponent to prevent the data being deleted.
* Cleanup public QmlMetaType APIAaron Kennedy2010-02-1211-154/+109
| | | | Remove some unnecessary methods from the QmlMetaType class
* QML Object toString should use 64-bit address on 64-bit platformsAaron Kennedy2010-02-111-1/+1
|
* Fix tst_qmlecmascript::callQtInvokablesAaron Kennedy2010-02-111-6/+8
| | | | | | The assert in qmlobjectscriptclass.cpp is valid when the call is running in a correctly created QML environment, but not valid for the test case which bypasses QML.