aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlscene
Commit message (Collapse)AuthorAgeFilesLines
* Add slow animations mode to qmlsceneAaron Kennedy2012-02-142-1/+10
| | | | | Change-Id: I0f850258e2cf5363bca2fa1c8b098aa5982eb232 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Remove QtQuick1 elements from qtdeclarativeMatthew Vogt2012-02-031-49/+48
| | | | | | | | QtQuick1 is now contained in a separate repository. Task-number: QTBUG-23737 Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-301-1/+1
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: If39bd256b0fa85eba17ea30f8ab87ea27d758908 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-231-1/+1
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Update copyright year in Nokia copyright headers.Jason McDonald2012-01-171-1/+1
| | | | | | | | Update copyright headers from before 2011, and a couple of new ones that were merged after the previous change to copyright headers. Change-Id: Ia76e08e2734afa4ef3f1207dbcda5ff3bc81b366 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Support opening filedialog again in qmlsceneGunnar Sletta2011-12-141-0/+5
| | | | | Change-Id: If6d7dded83a4bbb5d68b74741fc7a531165b7fef Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Link against widgets only when availableGunnar Sletta2011-12-122-1/+5
| | | | | Change-Id: Id7c474fe48bfa99d765267c0e3be1cbf80597548 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Implemented multiple windows and GL context sharingGunnar Sletta2011-12-081-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | What was traditionally the QQuickRenderLoop which was used to support one QQuickCanvas instance has now grown to support multiple QQuickCanvas instances and is now called QQuickWindowManager, of which there are two implementations. QQuickRenderThreadSingleContextWindowManager: One QSGContext and one OpenGL context is being used to draw all the windows and we alternate between which surface the gl context is bound to. This implementation relies on that swap does not block, but that the graphics pipeline is vsynced and will eventually block as the buffer queue is filled up. This is the behavior we get on Mac OS X and Wayland. The benefit of this implementation is that we have vsync'ed animations, and the synchronizaiton between GUI and render thread is simple. (well, simple relative to the alternative, that is). QQuickTrivialWindowManager: One QSGContext and one OpenGL context is being used on the GUI thread. Animations are ticked from a timer. Performance of this implementation will deteriorate if the driver is using blocking swap. Task-number: QTBUG-19455 Change-Id: Ib961ac7d71eb49c70a057872b7cac020c4d19f3d Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Cleaned up the qmlscene code a bitGunnar Sletta2011-12-062-116/+15
| | | | | Change-Id: I2aed4786e5426a7f05acced39ef849c03f1ab935 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Say hello to QtQuick moduleKent Hansen2011-12-022-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change moves the QtQuick 2 types and C++ API (including SceneGraph) to a new module (AKA library), QtQuick. 99% of this change is moving files from src/declarative to src/quick, and from tests/auto/declarative to tests/auto/qtquick2. The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to a plugin, src/imports/qtquick2, just like it's done for QtQuick 1. All tools, examples, and tests that use QtQuick C++ API have gotten "QT += quick" or "QT += quick-private" added to their .pro file. A few additional internal QtDeclarative classes had to be exported (via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the QtQuick 2 implementation. The old header locations (e.g. QtDeclarative/qquickitem.h) will still be supported for some time, but will produce compile-time warnings. (To avoid the QtQuick implementation using the compatibility headers (since QtDeclarative's includepath comes first), a few include statements were modified, e.g. from "#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".) There's a change in qtbase that automatically adds QtQuick to the module list if QtDeclarative is used. Together with the compatibility headers, this should help reduce the migration pain for existing projects. In theory, simply getting an existing QtDeclarative-based project to compile and link shouldn't require any changes for now -- but porting to the new scheme is of course recommended, and will eventually become mandatory. Task-number: QTBUG-22889 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Remove Q_WS_*, symbian and maemo code in QtDeclarativeDamian Jansen2011-10-262-5/+1
| | | | | Change-Id: If64daf80f9d19973e0bc2d864b003a66be5ca61d Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Rename Qt Quick-specific classes to QQuick*Kent Hansen2011-10-211-6/+6
| | | | | | | | | | | | | | | | | | | | | | The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Declarative: Give qmlscene top level window flags.Friedemann Kleint2011-10-181-24/+28
| | | | | | | Add menu and close buttons on Windows as well. Change-Id: Ie458f8f21b14583c1a02d48819ec797e6db7390e Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* 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-07 06:51:30 +0000