aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qml.pri
Commit message (Collapse)AuthorAgeFilesLines
* Remove reference to deleted file.Michael Brasser2011-07-281-1/+0
| | | | | | | Change-Id: Ie75506c5a9d61eb50e7e2f1027b72e1c041200a9 Reviewed-on: http://codereview.qt.nokia.com/2249 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Extract all QtQuick 1 elements into a separate library/plugin.Martin Jones2011-07-121-0/+2
| | | | | | Change-Id: I41a280de2739ee08202f4be2519e5012870090f2 Reviewed-on: http://codereview.qt.nokia.com/1391 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Merge branch 'qtquick2' into v8Aaron Kennedy2011-06-091-3/+1
|\ | | | | | | | | Conflicts: src/declarative/qml/qml.pri
| * Remove clock_gettime() library dependency.Michael Brasser2011-06-091-5/+0
| | | | | | | | Should have been removed as part of cd6ebb4912a5d96c788ea0c838d8a1a06ff4029e.
| * Optimized QDeclarativeScriptString constructor for QDeclarativeExpression.Michael Brasser2011-06-091-0/+1
| | | | | | | | | | | | | | | | | | When the compiler sees a script string, it will attempt to rewrite it and store the id for the rewrite in the script string. We can then create a QDeclarativeExpression using the id, which saves us a rewrite at runtime. Reviewed-by: Aaron Kennedy
| * Fixed clock_gettime() library dependency.axis2011-06-071-2/+4
| | | | | | | | | | | | The old construct doesn't work if the QtBase source is unavailable. Reviewed-by: Marius Storm-Olsen
* | Merge branch 'master' into v8Michael Brasser2011-06-071-3/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/qml/qdeclarativecontextscriptclass.cpp src/declarative/qml/qdeclarativeengine.cpp src/declarative/qml/qdeclarativeengine_p.h src/declarative/qml/qdeclarativeglobalscriptclass.cpp src/declarative/qml/qdeclarativeinclude.cpp src/declarative/qml/qdeclarativelistscriptclass.cpp src/declarative/qml/qdeclarativeobjectscriptclass.cpp src/declarative/qml/qdeclarativeobjectscriptclass_p.h src/declarative/qml/qdeclarativetypenamescriptclass.cpp src/declarative/qml/qdeclarativevaluetypescriptclass.cpp
| * Replace QPerformanceTimer with QElapsedTimer.Michael Brasser2011-06-031-3/+1
| | | | | | | | | | | | | | QElapsedTimer has added a nsecsElapsed() function, so QPerformanceTimer is no longer needed. Reviewed-by: Charles Yin
* | Initial V8 integrationAaron Kennedy2011-06-061-16/+1
|/
* Initial import from qtquick2.Qt by Nokia2011-04-271-7/+7
| | | | | Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+141
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 17:12:28 +0000