aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlscene
Commit message (Collapse)AuthorAgeFilesLines
* Fix export symbols for QtDeclarative and QtQuick1.Friedemann Kleint2011-08-311-1/+1
| | | | | | | | | | | Fix build on Windows and compiler warnings. Requires 090ee21eac7257644422e35395194e5fd7fb8efa in qtbase. Change-Id: Ief8da504ccd3e2c2e78644cc9943d685c4302019 Reviewed-on: http://codereview.qt.nokia.com/3988 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Merge branch 'master' into refactorGunnar Sletta2011-08-311-3/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/v8 src/declarative/declarative.pro src/declarative/items/qsgcanvas.cpp src/declarative/items/qsgshadereffectsource_p.h src/declarative/items/qsgview.cpp src/declarative/particles/qsgcustomparticle.cpp src/imports/gestures/gestures.pro src/imports/particles/particles.pro src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro src/qtquick1/qtquick1.pro tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsglistview/qsglistview.pro tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro Change-Id: I423344f83e1835116cad531b877fde6e68a8849a
| * More efficient type name cacheAaron Kennedy2011-08-301-3/+8
| | | | | | | | | | | | | | | | | | | | Instead of creating completely separate hashes for all the types used by every QML file, we simply link to the QDeclarativeTypeModule. This uses much less memory, and is faster to construct at startup. Change-Id: I28bc2807074f9c6f38096d6e4ce8be744159d023 Reviewed-on: http://codereview.qt.nokia.com/3741 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* | Merge branch 'master' into refactorGunnar Sletta2011-08-252-6/+4
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/items/qsgcanvas.cpp src/declarative/items/qsgitem.cpp src/declarative/items/qsgtextnode.cpp tests/auto/declarative/examples/examples.pro tools/qmlviewer/qmlviewer.pro Change-Id: Icbb0ef5dc79b658c62fd2b2c25a66c9bb3cbeb10
| * Respect $$QT.declarative.binsRohan McGovern2011-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | A module's tools should build directly into $$QT.<module>.bins, just like its libraries and plugins. Change-Id: Ic5e885ae0fe99220e07fd643d9bb5b28008e0fa5 Reviewed-on: http://codereview.qt.nokia.com/2802 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
| * Introduced a CONFIG option that enables declarative debug servicesThorbjørn Lindeijer2011-08-022-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the need for applications to explicitly make a call to enable the debug services, and rather does it in declarative.h when the 'declarative_debug' CONFIG option is used. Done-with: Kai Koehne Reviewed-by: Martin Jones Reviewed-by: Michael Brasser (cherry picked from commit 5517cc588c39814530b8bfd957821f55be42acf2) Change-Id: Iacfc5a9b2ca0c2610288cf86f190b4a9950cacd1 Reviewed-on: http://codereview.qt.nokia.com/2436 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Don't enable qmlscene compability mode for commented out imports.Andrew den Exter2011-08-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | Valid import statements should be at the start of a line, maybe preceded by some white space. Task-number: QTBUG-20649 Change-Id: I1944bce0d30e680ebdb0798f5ae4e8c91a057a13 Reviewed-on: http://codereview.qt.nokia.com/2423 Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* | Make QSGCanvas a QWindow instead of a QGLWidgetGunnar Sletta2011-08-051-74/+20
| | | | | | | | | | | | Change-Id: I71a04f61acff893a35c00204ed11bdf852830485 Reviewed-on: http://codereview.qt.nokia.com/2675 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Build against refactor.Samuel Rødal2011-07-291-8/+8
|/ | | | Change-Id: I0143767405afe968c0aea71651bd9e3dc7a74e23
* Extract all QtQuick 1 elements into a separate library/plugin.Martin Jones2011-07-122-3/+2
| | | | | | Change-Id: I41a280de2739ee08202f4be2519e5012870090f2 Reviewed-on: http://codereview.qt.nokia.com/1391 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Update licenseheader text in source files for qtdeclarative Qt moduleJyri Tahtela2011-07-081-17/+17
| | | | | | | | Replace old license header with correct one. Change-Id: I492ddaaa0227b2c8faf11bdcd6e12e7231a54a10 Reviewed-on: http://codereview.qt.nokia.com/1312 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Disable vsync animations by defaultGunnar Sletta2011-06-101-0/+6
| | | | Change-Id: Ia614915ddb96f5c51e9883885479f1269ab361ed
* added private headers to qmlsceneGunnar Sletta2011-05-041-1/+1
|
* Initial import from qtquick2.Qt by Nokia2011-04-272-0/+594
Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 15:17:52 +0000