summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
Commit message (Collapse)AuthorAgeFilesLines
* Change to release license header.Jason McDonald2011-02-16147-1924/+1924
| | | | Reviewed-by: Trust Me
* Fix declarative autotest compilation on SymbianJoona Petrell2011-02-141-1/+1
| | | | | | Task-number: Reviewed-by: Martin Jones (cherry picked from commit e46c44f9538dbe5b44ce61d3a42403cfa471ae8b)
* Make addImportPath() work for windows paths starting with lower caseBea Lam2011-02-141-2/+4
| | | | | | | | | | | | | Was causing assert failure on windows if the 'c:' was lower case, since it was being added to the import path database with a lower case and thus later lookups with an upper case 'c:' would fail. This change fixes the check for whether the path refers to a local path or not. Task-number: QTBUG-16885 Change-Id: I0a2a2f705443ed453fb2b13f8599e035c2bd2877 Reviewed-by: Martin Jones (cherry picked from commit 33512bc223be373975426ffcc6f8fa783a7582c9)
* Update modules-related tests and docsBea Lam2011-02-142-2/+24
| | | | | | | | Added tests for remote imports and fixed/improved examples and text in the docs. Change-Id: I8f411a0287c4d50ec3cebe5567d803689cd5b1c7 (cherry picked from commit d7e42d7c5b0eb6513526d0c21025939a467e8d68)
* Support seperate versions of installed modulesmae2011-02-091-12/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QML supports versioned types in modules. There's a version major and a version minor. This makes it possible to have a module com.organisation.fancycomponents with version 1.0, and later you could ship a new module com.organisation.fancycomponents which contains a more recent version 1.1 or 2.0 AND also the old versions to keep old code running. This is good. The problem is that this is difficult with certain QA procedures. It's hard to verify that a new module is indeed 100% compatible with the previous versions. The change extends the import mechanism by adding optional versioning to the component patch. With the patch, you can add a new module com.organisation.fancycomponents.2.0 which will be loaded when the QML file specifies "import com.organisation.fancycomponents 2.0". The patch works as follows: if you try to load com.organisation.fancycomponents in version 2.0, the engine first looks for com/organisation/fancycomponents.2.0, then for com/organisation/fancycomponents.2 then for com.organisation/fancycomponents. Reviewed-by: Aaron Kennedy Task-number: QTBUG-16455 (cherry picked from commit dd49b322b327fe87d8420abcce0e6cee877a88d7)
* Fix memory leakAaron Kennedy2011-01-211-0/+5
| | | | | Task-number: QTBUG-16526 (cherry picked from commit 4f9c026a02c2ecf0d19e7aee4ecae82e64cbaee8)
* Don't crash Qt Creator when debugging an object aliasAaron Kennedy2011-01-181-1/+1
| | | | | Task-number: QTBUG-16131 (cherry picked from commit 3526db3b8832c357b368014e6c8ebab63d4071da)
* Update copyright year to 2011.Jason McDonald2011-01-11143-145/+145
| | | | | Reviewed-by: Trust Me (cherry picked from commit ac5c099cc3c5b8c7eec7a49fdeb8a21037230350)
* WorkerScript could starve image loading of CPU.Martin Jones2010-12-231-1/+1
| | | | | | | | We use idle priority for image loading and XmlListModel in order to keep the UI responsive, but WorkerScript used LowPriority which would significantly reduce CPU available for image loading. Task-number: QTBUG-16167
* Improve QDeclarativeComponent test coverage.Michael Brasser2010-12-222-12/+0
|
* Don't truncate image:// url strings prematurelyBea Lam2010-12-202-8/+20
| | | | | | | | Url fragments and queries were being removed from the image ids passed to QDeclarativeImageProvider. Task-number: QTBUG-16195 Reviewed-by: Martin Jones
* QmlDebugger: Fix runtime warnings about unregistered metatypesKai Koehne2010-12-161-1/+4
| | | | | | | | | | | Check whether the type of a property is known to the metatype system before trying to read from it. That avoids lots of runtime warnings e.g. for the QSequentialGroup::currentAnimation property, which type QAbstractAnimation * isn't registered by default via qRegisterMetaType<>(). Reviewed-by: Christiaan Janssen Task-number: QTCREATORBUG-2853
* Docs: implications of creating network access managers in other threadsBea Lam2010-12-141-20/+33
| | | | Task-number: QTBUG-16032
* Fix broken database creation caused by previous fixBea Lam2010-12-101-8/+17
| | | | | | | | 16447b1193fedf5fdcf1f3d270fa73c5036a1ba0 removed unused directory but the fix meant that the base Databases directory was no longer automatically created. Task-number: QTBUG-15909
* QDeclarativeProperty doc improvementsBea Lam2010-12-091-3/+16
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-094-35/+45
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update QtGui bwins def file for QTBUG-15615 highlightFollowsCurrentItem: false was not always honored ListView: Fix calculation of currentItem position when out of view. Update QtGui def files Fix openDatabaseSync() to not create unused directory Document support for QVariantList and QVariantMap type conversion Some doc clarification for components and javascript integration Cursor shouldn't blink while dragging cursor position Qt.include() docs weren't being picked up by qdoc Doc: make it clear that "z" affects sibling stacking order.
| * Fix openDatabaseSync() to not create unused directoryBea Lam2010-12-071-1/+0
| | | | | | | | | | Task-number: QTBUG-15909 Reviewed-by: Warwick Allison
| * Some doc clarification for components and javascript integrationBea Lam2010-12-061-12/+16
| |
| * Qt.include() docs weren't being picked up by qdocBea Lam2010-12-062-22/+29
| | | | | | | | | | | | | | This moves the Qt.include() docs to qdeclarativeengine.cpp and also documents it in the "Integrating JavaScript" page. Task-number: QTBUG-15855
* | Add libinfix support for QML plugins in Symbian.Miikka Heikkinen2010-12-091-1/+7
|/ | | | | Task-number: QTBUG-14736 Reviewed-by: Alessandro Portale
* Mention that image providers should be added before loading QML filesBea Lam2010-12-031-0/+3
|
* Append qml import path individually for each available drive on SymbianJoona Petrell2010-12-021-1/+29
| | | | | Task-number: QTBUG-15405 Reviewed-by: Jason Barron
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-301-2/+1
|\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix resource leak in QEgl::getCompatibleVisualld() Fixed OpenGL state getting out of sync. Fix whitespace in previous 1e7b4e396ec3bacc1a769208b990c5e0450f0d3a Declarative: Fix compiler warnings (Linux/g++)
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Joona Petrell2010-11-3018-258/+599
| |\ | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeengine.cpp src/declarative/qml/qdeclarativepropertycache.cpp
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-262-1/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed OpenGL state getting out of sync. Fix whitespace in previous 1e7b4e396ec3bacc1a769208b990c5e0450f0d3a Declarative: Fix compiler warnings (Linux/g++)
| | * | Declarative: Fix compiler warnings (Linux/g++)Friedemann Kleint2010-11-262-1/+3
| | | | | | | | | | | | | | | | Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | | | Correct ownership semantics for QObject derived typesAaron Kennedy2010-11-301-2/+9
| | | | | | | | | | | | | | | | Task-number: QTBUG-15697
* | | | Correctly handle CppOwnership even when a QDeclarativeData doesn't existAaron Kennedy2010-11-301-3/+1
| |_|/ |/| | | | | | | | Task-number: QTBUG-15695
* | | Improve consistency in handling of aliases, bindings and value typesAaron Kennedy2010-11-2917-256/+599
| | | | | | | | | | | | Task-number: QTBUG-13719
* | | Fix warnings related to unused variables.Thiago Macieira2010-11-262-1/+2
|/ / | | | | | | | | | | | | Just add some Q_UNUSED for parameters or remove the variable we don't need for the others. Reviewed-by: Trust Me
* | Fix type punning warnings from gccAaron Kennedy2010-11-262-31/+35
|/ | | | Also clean up some code uglyness in the process
* Allow javascript date and regexp objects in WorkerScript messagesBea Lam2010-11-241-0/+13
| | | | | Task-number: QTBUG-14666 Reviewed-by: Aaron Kennedy
* Don't leak QML compiled data objectsAaron Kennedy2010-11-193-7/+3
| | | | Task-number: QTBUG-14761
* Fix compilation by s/intptr_t/quintptr/Thiago Macieira2010-11-113-4/+4
| | | | | | | | | intptr_t is defined in some C header that we don't include. I don't know which one it is, but without it, it fails to compile with: declarative/qml/qdeclarativecontext.cpp:477: error: 'intptr_t' was not declared in this scope Reviewed-By: Trust Me
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-111-1/+2
|\ | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QDeclarativeDebug: Keep source information when changing an expression Flickable does not reposition its content when it is resized.
| * QDeclarativeDebug: Keep source information when changing an expressionChristiaan Janssen2010-11-101-1/+2
| | | | | | | | | | | | | | | | | | Copy over the source code location of an expression when it is changed throu the debugging facilities. This enables JavaScript breakpoints to be hit even after the source code of the function has changed. Task-number: QTCREATORBUG-2824 Reviewed-by: Kai Koehne
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-101-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (21 commits) Fixed tst_qpixmap::grabWidget autotest failure on QWS. Doc: Fixing typo Doc: Fixing typo Doc: Fixing typo Fixed tst_qwidget::testContentsPropagation auto-test failure. Fixed text rendering bug in raster engine when opacity != 1.0. Prevented race condition on texture destruction. More fix for QTBUG-14640:oci performance problem with qlonglong Doc: Fixing typo Fixed grabWidget sometimes returning uninitialized memory. Fix Malayalam Rendering - 'Ra' is PreBase Update .def files for QtGui and QtOpenVG Use 32bit textures for alpha textures after all. One more fix for dithering. Doc: Fixing typo Fix QTBUG-14640:oci performance problem with qlonglong 32bit => 16bit conversion has 4byte-aligned output. Fix gcc bug in qReallocAligned Prevented threading related crash in OpenGL module. Fix possible crash in QStaticText and QDeclarativeTextLayout ...
| * Doc: Fixing typoSergio Ahumada2010-11-091-1/+1
| |
* | Don't use stdint.h in our headers since it is a C99 header.Martin Jones2010-11-082-12/+5
| | | | | | | | | | | | | | | | | | | | | | This caused problems in user applications depending upon the order of inlcusion and/or defining __STDC_LIMIT_MACROS. stdint.h is also not present in msvc, but is present in mingw. Switch to using quintptr. Task-number: QTBUG-14691 Task-number: QTBUG-13953 Reviewed-by: Bea Lam
* | Add documentation about script evaluation context and allowed typesBea Lam2010-11-041-2/+28
| | | | | | | | Task-number: QTBUG-14919
* | Largely rewrite the Using QML in C++ Applications documentation. ItBea Lam2010-11-042-7/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | now has an overview of different approaches to QML/C++ integration and demonstrates how to pass data between QML and C++ through properties/functions/signals. The part in the old docs that focused on QDeclarativeContext has been merged into the QDeclarativeContext class docs (although most of the info was largely covered in there already) and the part that covered Network Components has been moved to the QDeclarativeComponent class docs. The custom enum types example previously in extending-tutorial.qdoc has been moved to these new docs. Task-number: QTBUG-14923
* | Qml Debugging: Only enable if explicitly requestedKai Koehne2010-11-022-0/+3
|/ | | | | | | | | | | | | 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
* Doc: Fixed typoThorbjørn Lindeijer2010-11-011-1/+1
|
* Set the location of the closing brace.Roberto Raggi2010-10-262-4/+4
| | | | Reviewed-by: Christian Kamm
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-10-251-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: Fixed case of a library file name to enable MinGW builds on Fedora. Doc: Made Qt::TextLongestVariant internal again. Doc: Fixed minor documentation issues. Doc: Reorganized the platform and compiler notes pages. Doc: Removed non-ASCII characters and reformatted the text. Doc: Fixed documentation style and qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed snippet reference for the Getting Started QML guide. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Renamed an external reference to work around an auto-linking issue. Doc: Fixed qdoc warnings. Doc: Fixed links to the online BSD license information. Doc: Fixed qdoc warnings. Doc: Re-added a link to the Qt site related to testing tools. Doc: Marked some new properties as internal for now. Doc: Renamed a project file. Doc: Added missing examples and snippets.
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-2013-77/+94
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-2012-144/+397
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-1411-24/+207
| |\ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-0813-42/+147
| |\ \ \ \
| * | | | | Doc: Fixed qdoc warnings.David Boddie2010-10-071-1/+2
| | | | | |