aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlscene
Commit message (Collapse)AuthorAgeFilesLines
* Respect the default format from the scene graph adaptation layerGunnar Sletta2013-02-051-1/+1
| | | | | Change-Id: I080c25ed8b8cc8b743043b5aa348927749c1f0eb Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Merge branch 'stable' into devGunnar Sletta2013-01-172-6/+6
|\ | | | | | | | | | | | | | | Conflicts: src/qml/doc/qtqml.qdocconf src/quick/doc/qtquick.qdocconf Change-Id: I087fa14720995a5e53c43567dc4a3c29eb9992a9
| * Update copyright year in Digia's license headersSergio Ahumada2013-01-101-1/+1
| | | | | | | | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * make use of qtHaveModule()Oswald Buddenhagen2013-01-101-1/+1
| | | | | | | | | | | | | | Change-Id: I23f11c944fafb5863a960dcc83bc1e57e189f662 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Modify qmlscene usage text to be consistentRichard Moe Gustavsen2013-01-041-4/+4
| | | | | | | | | | | | | | | | - last line was not aliged correctly with the previous lines. - usage of capital letter was inconsistent. Change-Id: Ied7caab8296a635e105764bc2e95aa9e78f1cfcb Reviewed-by: Alan Alpert <aalpert@rim.com>
* | Merge branch 'stable' into devFrederik Gladhorn2013-01-041-1/+1
|\| | | | | | | | | | | | | | | | | Conflicts: src/qml/qml/parser/qqmljskeywords_p.h sync.profile tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp Change-Id: I9bc6659e1bab924009167bec567354d40a77a8cb
| * Change qFatal to qWarningAlan Alpert2012-12-061-1/+1
| | | | | | | | | | | | | | | | | | While the process should terminate immediately with a non-zero exit code on component error, it does that in the next line already. The main difference is dropping the backtrace, which is not useful in this case. Change-Id: I866ea00e62cb9d1b7c506b9819cd9bb2750ac81f Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Add command-line option to enable multisamplingGunnar Sletta2012-12-111-3/+9
|/ | | | | Change-Id: I9ec8961342c23ea2c116c970e84aa412365412a9 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Remove the remaining usages of deprecated QWindow accessorsShawn Rutledge2012-11-301-1/+1
| | | | | Change-Id: I146e7b8e3ae0ee74f5f4e3ef85f59d50a639c0f5 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Enable mobule build with QT_NO_TRANSLATIONTasuku Suzuki2012-11-261-0/+8
| | | | | | Change-Id: Id7aeef0d499f48ddc64b4ea3e4dc713db8458c38 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
* Fix security warning about passing a variable to printf-formatting.Friedemann Kleint2012-11-221-1/+1
| | | | | Change-Id: I7ea8ff54d24fe0818cd216d4aac0e8970461306e Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Examples and fixes for QML Window propertiesShawn Rutledge2012-11-091-0/+3
| | | | | | | | | Setting Window.color in QML takes effect immediately. It was only possible to set the property at startup. Examples demonstrate new Window property features. Change-Id: Ic5b43d0d84371f3fe5c42223ccc98e6de27aed10 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* All QWindow properties that have "window" in them have been renamed.Shawn Rutledge2012-11-081-1/+1
| | | | | | | Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase. Change-Id: I9614cc2c7ed119c663b3f6f99267483e291e529c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* qmlscene can start with either an Item or Window as the qml rootShawn Rutledge2012-11-051-30/+56
| | | | | | | | | | | Before, it assumed that the root is an Item and needs to have a Window created. But it's useful for an application to have a Window as the root, and it was already possible by writing a different C++ main function (see qtdeclarative/examples/window/window/window.cpp). It doesn't take much to give qmlscene this flexibility too. Change-Id: Ie808e78a42074e13aa9d3c87723ec9ac8fdbaf4a Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* follow qt_tool.prf now setting up DESTDIROswald Buddenhagen2012-11-011-2/+0
| | | | | Change-Id: Ia07dc830586fd30f4ee98c64e9f2accae5cf2f06 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Change organisation to Qt Project.Frederik Gladhorn2012-10-251-2/+2
| | | | | Change-Id: Ia55cf3cff4f019c82588d44c0b9c63cb97d965be Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-231-24/+24
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* qmlscene: fixed dependency on QtWidgetsRohan McGovern2012-07-301-1/+1
| | | | | | | | Don't unnecessarily refer to QApplication for installTranslator(); this is a static member of QCoreApplication. Change-Id: I7b0e0e30abe1f3a5c114136f1107de3fd7dbc815 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Remove work-around for Q_DECLARE_METATYPE(QFileInfo) being added to QtCoreMarc Mutz2012-07-261-3/+0
| | | | | Change-Id: Ibf1f9a451164982bcd50195b210c5b59e684937e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Work around Q_DECLARE_METATYPE(QFileInfo) being added to QtCoreMarc Mutz2012-07-251-0/+2
| | | | | Change-Id: Ic83e5fdaa7ef289f40cbeb4633a75d93d38c0bdb Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Add I18N support to qmlsceneCharles Yin2012-07-171-1/+35
| | | | | | Task-number: QTBUG-22391 Change-Id: Id567d4aabf47ce4790cf33979c4e464ba4f09357 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* QQuickCanvas renamesAlan Alpert2012-07-171-1/+1
| | | | | | | | | | | | | | | | QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* "export" the qml tools for qtPrepareTool() useOswald Buddenhagen2012-07-111-9/+2
| | | | | | | | | | notably, this disables the build of qmlplugindumpd.exe under windows - it is not clear to me why somebody would want to do that, as both sets of libraries would be available, and the output from both variants should be the same. Change-Id: I95c77b2aa32f17f9d6df0e5d4b9d11f456d860f6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove some unnecessary indirection.Robin Burchell2012-06-251-17/+14
| | | | | | | | There's no need to heap allocate our QQuickView, and there's no need to have a seperate pointer to QWindow when we can just use the QQuickView directly. Change-Id: Ia2bc83c9dc83d1df1ec793836793f752d67e9415 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* qmlscene: add --transparent argumentGirish Ramakrishnan2012-06-191-0/+14
| | | | | | | The option makes qmlscene request a format with alpha for the QQuickView. Change-Id: I6490e606dd0af534147de95783f3a2ddfa8c52c8 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Small cleanup: remove braces from single line conditionals.Robin Burchell2012-06-191-9/+5
| | | | | Change-Id: I20588ad0634aebec8374a570179ee43dd1b1dd3b Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix compilation for QT_NO_FILEDIALOGTasuku Suzuki2012-06-091-1/+1
| | | | | Change-Id: I2112bc8c9fe58cda84f498f9062b4b32b9ef0c24 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add --resize-to-root option, sets ResizeViewToRootObject on the qmlscene view.Robin Burchell2012-05-281-10/+11
| | | | | | | | Sometimes it is useful to be able to resize a view from within QML, for example, when writing QML which must operate in both portrait and landscape conditions. Change-Id: I10564bb3c8661fae6c1d175985268a409dc3dafd Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Initial bundle supportAaron Kennedy2012-05-041-1/+10
| | | | | Change-Id: I095249f64ecf4ef1e3fbfb164e3d50edffab61e8 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Enabled widget free compilation of QtQuickDonald Carr2012-04-181-1/+1
| | | | | | | | | | There is no hard dependency of QtQuick on QWidget. This change makes the minor adjustments required to remove the build dependency altogether. This patch follows the path of least resistance bypassing any elements with a dependency on the legacy QWidget functionality. Change-Id: Ie3f47d3b4f60a1460dbb5d76a494a2c329469cc0 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Debugger: Use "QML" also in macro namesKai Koehne2012-03-301-1/+1
| | | | | | | | QT_DECLARATIVE_DEBUG will be removed as soon as qtbase is updated. Change-Id: I9dbfe95b8bcb3bf1502319a040a758389b6977a2 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Debugger: Allow enabling of qml debugger without startup warningKai Koehne2012-03-271-2/+2
| | | | | | | | | | | Add QT_DECLARATIVE_DEBUG_NO_WARNING define to support enabling the qml debugger without printing the usual startup warning. This should be used with care, but e.g. for qmlscene the warning probably confuses more than it helps. Change-Id: I33704857baebfc8bca60abbff09138e259390b49 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Allow qmlscene to quit immediately after startingMatthew Vogt2012-03-211-0/+9
| | | | | | | | | Useful for running tests that have no interactive element, where all computation is performed in the initialization phase of processing the QML source. Change-Id: Id3f87fc504a30eb4e351804a98fe265db8fe93c9 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-242-11/+11
| | | | | | | | | | | | | Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 14:07:24 +0000