aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qml
Commit message (Collapse)AuthorAgeFilesLines
* qml tool on OSX: wait for a timeout before exitingShawn Rutledge2013-11-201-4/+28
| | | | | | | | | | | | Double-clicking to open a QML file was not working because it would exit if no files are given on the command line. It needs to wait a while for the QFileOpenEvent. Task-number: QTBUG-34926 Change-Id: Icb585a777b0438db85120c62e7717f0f6eafffb1 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Remove '-enable-debugger' argument from qml executableKai Koehne2013-11-162-10/+5
| | | | | | Task-number: QTBUG-34836 Change-Id: I3ab2a16036a1086c0ac1f50880a402caf9f54f2d Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Add a verbose mode to qmlAlan Alpert2013-11-111-24/+35
| | | | | | | | | The extra output is primarily useful for debugging, and on windows it will actually make an ugly command prompt window appear. Change-Id: I552e479515a6f5249685844143601cb7449a10b5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Fix qml runtime when loading files that imported other filesAlan Alpert2013-11-011-8/+9
| | | | | | | | | | | QQmlComponent::setData does not perform any URL processing. Consequently when using that function we need to 'normalize' the URLs ourselves to ensure that the engine finds them acceptable. Task-number: QTBUG-34301 Change-Id: Ia0f3a51129423020f7e4d7003ca356af3f89b441 Reviewed-by: Antti Piira <apiira@blackberry.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* qml tool: compiles with clangShawn Rutledge2013-10-301-1/+1
| | | | | | | | The error was that app can be uninitialized if the switch goes into the default branch. Change-Id: Ic690e1dd257cf88ee04d019b5b81121cecb48564 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Make qtdeclarative compile with -no-guiTasuku Suzuki2013-10-252-35/+70
| | | | | Change-Id: I079f5e09a0099550348388379c496fc8f8cfa27c Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fix WinCE build.v5.2.0-alpha1Sérgio Martins2013-09-251-1/+1
| | | | | Change-Id: Ie0536ad94f88efe1e54226ed7f1d9e1042ffcc19 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* qml: handle all possible QtMsgType in switch because of -WerrorShawn Rutledge2013-09-251-0/+1
| | | | | | | | | | | Perhaps this illustrates why having -Werror is more of an annoyance than whatever it was supposed to help: https://codereview.qt-project.org/#change,65253 cannot be merged until the new enum value that it adds is handled _everywhere_ that it can be. Change-Id: I2bba730b471683487e38693c9ace2d09be4c874d Reviewed-by: hjk <hjk121@nokiamail.com>
* Add qml toolAlan Alpert2013-09-178-0/+736
This tool simply runs QML files using a QQmlApplicationEngine. It is configurable so as to behave, by default, like qmlscene in that it will automatically place non-Window QtQuick 2 Items inside a QQuickWindow with the size of the root item. The configuration is extensible so that other GUI scenes can also use it by altering the configuration files in their installation. On OS X, it is an app bundle, and handles the QFileOpenEvent so that it can be the tool with which qml files are usually launched by double-clicking. (This does not break the ability to use it on the command line too: the options still work, you just have to give the path to the executable inside the bundle.) Change-Id: I6bac813ce188be54842a78d7b532fcf2d54dc443 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>