summaryrefslogtreecommitdiff
path: root/src/declarative/qml/qdeclarativeengine.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
| * Optimize QDeclarativeEngine::importExtensionmae2010-03-311-20/+31
| | | | | | | | | | Avoid double initialization of QPluginLoader and assert that modules are imported with a stable uri
* | Fix bug when adding import paths manuallyAlan Alpert2010-03-311-1/+7
|/ | | | | | | Paths were being added relatively even though they should be converted to a canoncial form. Patch originally by tmikola Reviewed-by: mae
* Fix qml plugin loading with specified path in qmldirmae2010-03-301-3/+8
| | | | | | The fix makes it possible to specify an ABSOLUTE path as well, e.g.: plugin mimehunt C:\sys\bin
* Simplify import path.Warwick Allison2010-03-301-55/+33
| | | | Reviewed-by: mae
* Use QDateTime when specifying a "date" property in QMLAaron Kennedy2010-03-291-2/+3
| | | | QT-718
* Add importPathList, mainly for doc purposes.Warwick Allison2010-03-291-10/+24
|
* Source resizing for QDeclarativeImageProvider too.Warwick Allison2010-03-291-2/+2
| | | | (fixes test too)
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-261-116/+132
|\
| * Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-251-49/+73
| |\ | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.cpp src/declarative/qml/qdeclarativecompiler.cpp
| * | doc: Fixed all the remaining qdoc errors. For now.Martin Smith2010-03-241-116/+132
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-251-1/+0
|\ \ \ | | |/ | |/|
| * | Qt.Infinite -> Animation.InfiniteMichael Brasser2010-03-251-3/+0
| | | | | | | | | | | | | | | Too misleading to have on the Qt object, as it only means infinite for animation loops.
| * | Replace Animation's repeat property with loops.Michael Brasser2010-03-251-0/+2
| | | | | | | | | | | | | | | You can now loop a fixed number of times as well as forever. The old repeat behavior (loop forever) can be acheived with loops: Qt.Infinite.
* | | Forgot to add a file.Alan Alpert2010-03-251-8/+10
|/ / | | | | | | | | Forgot to add these, the primary changes, to commit 870dbc7542beb07b84378f356cbe568a2ae8b7e1
* | Manual merge.Warwick Allison2010-03-231-3/+36
| |
* | Test imports with realistic paths (previously passed accidentally).Warwick Allison2010-03-231-3/+10
| | | | | | | | Fix failure when import path is ancestor dir of other import path.
* | Deprecate inline Script {} blocksAaron Kennedy2010-03-221-5/+1
| | | | | | | | | | | | | | | | Inline blocks/includes have been replaced with an import syntax: import "foo.js" as Foo this gives better separation between QML and code. Imported script blocks also have a mandatory qualifier, which leads to better optimization potential.
* | Remove dead performance measurement code from QMLAaron Kennedy2010-03-221-2/+0
| |
* | Reduce amount of qmldir parsingmae2010-03-191-25/+19
| | | | | | | | | | This is done by storing the parsed components (QDeclarativeDirComponents). There's still potential for optimization (QT-617)
* | Fix local type lookupmae2010-03-191-13/+10
|/ | | | | | This change removes the hacky final baseUrl+TypeName+".qml" lookup. In order to still support internal files in remote modules, a new qmldir keyword "internal" is introduced.
* Use the correct base URL in resolveUriMartin Jones2010-03-181-3/+2
|
* Another fix to findmae2010-03-171-3/+5
| | | | | Do not try to instantiate types that are explicitely forbidden in the qmldir (because the version does not match).
* Improve implicit "." importmae2010-03-171-0/+7
| | | | | | The change moves the implicit "." import to the very end, i.e. the first lookup. It also gets the content of a remote qmldir from the resources.
* Fix auto testmae2010-03-171-8/+8
| | | | | This repairs 9727cb35b30e07d1f72100a39c8d23e438e2746c. The lookup can only happen if we have a file import (and not a library import)
* Fix type lookup with urlmae2010-03-171-8/+8
| | | | | | The existence of a non-empty qmldir file (e.g. for defining a plugin) should not change the lookup rules for qml files via url
* Add an implicit import "." to types loaded from a local urlmae2010-03-171-0/+1
| | | | | | This triggers the loading of the qmldir and the import of native types from available plugins. The change puts native types on par with types defined in qml files.
* One url for an *unqualilfied* import is not special.Warwick Allison2010-03-171-1/+2
| | | | Stops tst_qdeclarativelanguage passing when network transparency breaks.
* Optimization: Reduce unnecessary QObject allocationsAaron Kennedy2010-03-171-17/+16
|
* Optimization: Combine QDeclarativeDeclarativeData and QObject allocationsAaron Kennedy2010-03-171-1/+4
|
* Fixes for the module importmae2010-03-161-38/+110
| | | | | | | | | 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 branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-161-70/+123
|\ | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeengine.cpp tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-161-5/+6
| |\
| | * Fix regression from previous commitmae2010-03-151-5/+6
| | | | | | | | | | | | | | | Support quoted imports without qualitifier id but with qmldir. This makes it possible again to launch the flickr demo from a remote site.
| * | Little more doc on QabstractItemModel and QML.Martin Jones2010-03-151-2/+4
| |/
| * Remove Qt.closestAngle().Michael Brasser2010-03-121-20/+0
| | | | | | | | This functionality is now built in to RotationAnimation.
| * Fix importing qml modules from rcc resourcesmae2010-03-111-39/+48
| | | | | | | | | | | | Done with Roberto. Reviewed-by: Roberto Raggi
| * Document - and use - the qmlRegisterXXX template functionsmae2010-03-101-5/+5
| | | | | | | | This commit removes the obsolete QML_REGISTER_TYPE macros.
| * when loading debug import plugins on Mac, try with _debug.dylib suffixmae2010-03-101-0/+3
| |
| * Merge remote branch 'qt/4.7' into qml-4.7Qt Continuous Integration System2010-03-101-6/+4
| |\ | | | | | | | | | | | | Conflicts: src/declarative/util/qdeclarativestateoperations.cpp
| | * doc: Fixed several qdoc errors.Martin Smith2010-03-091-2/+2
| | |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-081-4/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (64 commits) Carbon: usage of menu bars can cause exceptions to be thrown Mac: compile fix Fix build JPEG plugin: Use switch() instead of if() don't try to build corewlan plugin when corewlan was not found at configure Avoid conversion to/from QChar in the cn codec to unicode Avoid memory allocations in conversion from Gb2312/Gb18030 to unicode fix corewlan detection error when building for 10.5 when 10.6 is also fixed treatment of zlib on Mac when crossbuilding Partial overloading support for qdbus cli tool. Allow empty authority in QUrl::setAuthority as per docs. Added test for QTBUG-6962: Empty authority ignored by QUrl::setAuthority. fixed case of GL include directory check in MAC_APPLICATION_MENU translations Re-generate the Unicode tables after updates to the program that generates them Fix the code after merge: DerivedNormalizationProps has two or more columns add some usefull definitions to qunicodetables_p.h qchar.cpp: fix identation finish last commit prefer DerivedNormalizationProps.txt over CompositionExclusions.txt ...
| | | * doc: Fixed some QML qdoc errors.Martin Smith2010-03-051-4/+2
| | | |
| * | | Integrate QML's object ownership with the JS collectorAaron Kennedy2010-03-091-1/+61
| |/ / | | | | | | | | | | | | | | | | | | QML now behaves in a way similar to QtScript when it comes to QObject ownership. QT-2803
* | | Remove WorkerListModel and integrate its functionality into ListModel.Bea Lam2010-03-161-1/+0
|/ / | | | | | | Task-number: QT-2829
* | Fix Qt.tint() algorithmAaron Kennedy2010-03-081-10/+6
| | | | | | | | QT-2424
* | Allow unquoted enum syntax for value typesAaron Kennedy2010-03-051-0/+1
|/ | | | QTBUG-5424
* Compile fix for winceThierry Bastian2010-03-041-3/+3
| | | | Reviewed-by: Leo Cunha
* Remove Qt.playSound()Michael Brasser2010-03-041-25/+0
| | | | Use SoundEffect instead.
* Add formatting functions to QML's global Qt object.Michael Brasser2010-03-041-0/+65
| | | | The plan is for these to replace DateTimeFormatter.
* system import path not supported with Qt 4.6.Warwick Allison2010-03-041-0/+4
|
View Lorry Controller Status