summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-013-3/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add the Qt::TextBypassShaping flag. QTextEngine: skip an unnecessary call to GetDeviceCaps on Windows. Add my 4.7.0 changes qdoc: Added DITA XML generator doc: Fixed confusing ownership issue. update Russian translations for Qt tools update Russian translation for Qt libraries QXmlSchema documentation correction doc: Changed last breadcrumb to not be a link. doc: Fixed reference to setSize(), which is in QRectF. QNetworkCookie: do not accept cookies with non-alNum domain QtDeclarative: Remove trailing commas in enums Doc: MonotonicClock is obviously monotonic
| | | * QtDeclarative: Remove trailing commas in enumsThiago Macieira2010-05-313-3/+3
| | | |
* | | | Add some Q_AUTOTEST_EXPORTsAaron Kennedy2010-06-032-2/+2
| | | |
* | | | Doc fixes and improvements - fix some example code, link toBea Lam2010-06-021-3/+3
|/ / / | | | | | | | | | examples from class docs and improve assorted docs
* | | 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
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-317-1/+23
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (21 commits) Doc: Fixed an off-by-one error in an example. Fix QT_NO_TEXTHTMLPARSER Fix QT_NO_DOM Fix QT_NO_TEXTSTREAM compilation errors. Fix QT_NO_VALIDATOR compilation. Doc: Removed a misleading sentence about a class constructor. Doc: correcting docs in QDrag::exec Doc: Adding note about QDrag::exec() Revert behavior of QTextLayout::boundingRect() when line width is set Fix unreasonably large width of QTextLayout::boundingRect() Doc: replacing old image Fix compilation with stricts compilers. Fix QT_NO_DIRMODEL build error in QtDeclarative. Revert "Added native key support to QSharedMemory API." Revert "Improved documentation for QSharedMemory's key/setKey functions." Fix a simple mistake in QXmlStreamReader::atEnd() docs. Improved documentation for QSharedMemory's key/setKey functions. Added native key support to QSharedMemory API. Make test work with shadow builds again. Doc: Corrected the documentation about the compression threshold. ...
| * Fix QT_NO_TEXTDATE compilation errors.Andreas Aardal Hanssen2010-05-315-1/+16
| |\ | | | | | | | | | | | | Merge-request: 649 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| | * Fix QT_NO_TEXTDATETasuku Suzuki2010-05-255-1/+16
| | |
| * | Fix QT_NO_TEXTSTREAM compilation errors.Tasuku Suzuki2010-05-312-0/+7
| | | | | | | | | | | | | | | Merge-request: 647 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
* | | Rename QDeclarativeDebugTiming -> QDeclarativeDebugTraceAaron Kennedy2010-05-271-3/+4
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-272-58/+45
|\ \
| * | Doc fixes, improvementsBea Lam2010-05-261-58/+44
| | |
| * | Allow js files with '.pragma library' to be used from WorkerScriptBea Lam2010-05-261-0/+1
| | |
* | | Improve QML framerate debuggingAaron Kennedy2010-05-271-0/+8
|/ /
* | Revert "Reading/writing a non-existent property throws an exception"Aaron Kennedy2010-05-254-14/+26
| | | | | | | | This reverts commit 2b3e7706f4459569520c77b9fb3ff2bc006e60f1.
* | Revert "Always pass context to QObject script class"Aaron Kennedy2010-05-254-9/+6
| | | | | | | | This reverts commit d982ded10a3dd5219ae40a5a3574b63ac7bdda3f.
* | Always pass context to QObject script classAaron Kennedy2010-05-254-6/+9
| | | | | | | | QTBUG-10659
* | Reading/writing a non-existent property throws an exceptionAaron Kennedy2010-05-254-26/+14
| | | | | | | | QTBUG-10659
* | Added autotest for Component.createObject() without Qt.createComponent()Alan Alpert2010-05-242-5/+9
| | | | | | | | | | | | Also augmented the docs for both functions a little. Task-number: QTBUG-10926
* | Compiler warningAaron Kennedy2010-05-241-1/+1
| | | | | | | | QTBUG-10816
* | Remove incorrect ASSERTAaron Kennedy2010-05-241-3/+1
| | | | | | | | QTBUG-10832
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-242-1/+18
|\ \
| * | Don't crash when assigning a Behavior to a grouped property.Michael Brasser2010-05-242-1/+18
| | | | | | | | | | | | | | | Task-number: QTBUG-10799 Reviewed-by: Aaron Kennedy
* | | Be slightly more verbose on assigning undefined in binding.Warwick Allison2010-05-241-1/+3
|/ / | | | | | | Task-number: QTBUG-10303
* | Move copies of toLocalFileOrQrc() to QDeclarativeEnginePrivateBea Lam2010-05-246-52/+26
| |
* | Allow resource files to be loaded in WorkerScriptBea Lam2010-05-241-3/+11
| |
* | Component::createObject() don't attempt to set parent of null objectMartin Jones2010-05-241-4/+6
| | | | | | | | | | Don't try to set graphics item parent on an object that is not a QGraphicsItem
* | Ensure QML Global Qt object functions appear in the documentation indexWarwick Allison2010-05-212-3/+305
| | | | | | | | | | | | | | | | 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
* | Remove warnings.Warwick Allison2010-05-201-2/+0
|/ | | | Task-number: QTBUG-10816
* Be consistent in conversion from string (eg. color, int rounding).Warwick Allison2010-05-201-11/+14
| | | | | Task-number: QTBUG-10820 Reviewed-by: Michael Brasser
* Simplify code to make next change clearer.Warwick Allison2010-05-201-14/+9
|
* Stop warnings.Warwick Allison2010-05-201-10/+10
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-202-5/+5
|\
| * Rename Component::errorsString() -> errorString() (and also forBea Lam2010-05-202-5/+5
| | | | | | | | QDeclarativeComponent)
* | Ensure valuetype enums can be assigned from JSAaron Kennedy2010-05-201-0/+2
|/ | | | QTBUG-10830
* Add return value for resolveTypeInNamespaceAaron Kennedy2010-05-202-3/+3
|
* Missing breakAaron Kennedy2010-05-201-0/+1
|
* Search for QML import libraries also in application directoryKai Koehne2010-05-192-8/+16
| | | | | | | | Add QCoreApplication::applicationLibraryPath again to the list of directories to search for possible QML plugins. Task-number: QTBUG-10771 Reviewed-by: mae
* Introduce a threaded interpreter for QML binding bytecodeAaron Kennedy2010-05-191-156/+233
| | | | Reviewed-by: Roberto Raggi
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1814-47/+100
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (22 commits) Regression fix for Loader anchors not working Make Qt.include() work for js files that have '.pragma library' doc fix Improve docs for Qt.quit() Prevent assignment of values (string, number, bool) to signal handlers. Make sure strings are escaped when returned via asScript. Documentation git ignore stuff Test Qt.labs.folderlistmodel plugin Fix naming. Sometimes you own QNetworkReply, sometimes you don't. Rename files; fix test. Add parent parameter to QDeclarativeExpression constructor. Round correctly in binding optimizer Don't disable SmoothPixmapTransform in qDrawBorderPixmap() Photoviewer example fixes. Port from QListModelInterface to QAbstractListModel. Use QDeclarativeScriptString for ParentChange. Set raster + gl viewport as the default for OS X. Move stuff from QML viewer to plugins. ...
| * Make Qt.include() work for js files that have '.pragma library'Bea Lam2010-05-181-0/+3
| |
| * doc fixBea Lam2010-05-181-2/+2
| |
| * Prevent assignment of values (string, number, bool) to signal handlers.Michael Brasser2010-05-181-0/+3
| | | | | | | | | | Task-number: QTBUG-10764 Reviewed-by: Aaron Kennedy
| * Make sure strings are escaped when returned via asScript.Michael Brasser2010-05-183-25/+70
| | | | | | | | Makes 273024e58d90bb9b3a5da0161f884f1af22d75df more correct.
| * Sometimes you own QNetworkReply, sometimes you don't.Aaron Kennedy2010-05-181-1/+1
| | | | | | | | God bless QNetworkAccessManager
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-187-17/+19
| |\
| | * Add parent parameter to QDeclarativeExpression constructor.Michael Brasser2010-05-187-17/+19
| | | | | | | | | | | | Also rearrange the parameter order to be more clear.
| * | Round correctly in binding optimizerAaron Kennedy2010-05-181-1/+1
| |/ | | | | | | QTBUG-9538
| * Use QDeclarativeScriptString for ParentChange.Michael Brasser2010-05-181-1/+1
| | | | | | | | | | | | | | So that scope resolution is correct, e.g. "width: parent.width-10;" in a ParentChange works correctly. Task-number: QTBUG-10675