summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeengine.cpp
Commit message (Collapse)AuthorAgeFilesLines
* 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-031-0/+4
|
* Build fix on windowsTobias Hunger2010-03-021-1/+1
|
* Fix qml import modules loading on Windowsmae2010-03-021-8/+20
| | | | | | On windows, when importing a declarative plugin by name, extend with "d.dll" in the debug case, then with ".dll". This is in sync with qmake's behaviour for libraries.
* Protect against double initialization.Roberto Raggi2010-02-251-5/+19
|
* Fix compilation due to enabling of QStringBuilder throughoutThiago Macieira2010-02-251-1/+1
|
* Introduced QDeclarativeExtensionPlugin::registerTypes(uri).Roberto Raggi2010-02-251-2/+10
| | | | | | Now, you have to reimplement registerTypes(uri) to expose native QML types, and initializeEngine(engine,uri) to add instances to the QML engine's root context.
* Rename QDeclarativeMetaProperty -> QDeclarativePropertyAaron Kennedy2010-02-251-2/+1
| | | | There's nothing meta about our properties.
* Add support for qml imports directory in configure, qmake, and qmlenginemae2010-02-241-7/+12
|
* Make QDeclarativeMetaType and QDeclarativeType privateAaron Kennedy2010-02-241-3/+2
|
* Simplify QML element registration headersAaron Kennedy2010-02-241-0/+12
|
* Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-241-0/+1901
QDeclarativeXXX.