summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-2420-140/+140
| | | | | | | | | | | | | 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>
* clean up qmake-generated projectOswald Buddenhagen2012-02-221-6/+0
| | | | | | | | remove "header" and assignmets which are defaults or bogus Change-Id: I1d777f5418b0f353bf276a979c6300a941927e7e Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* QmlProfilerTool: add tool to QDeclarativeAurindam Jana2012-02-2012-1/+3426
| | | | | | | | | | qmlprofiler is a standalone tool used to record profiling data of QML apps. The data is stored in a file which can be loaded in QtCreator for investigation. Change-Id: I308f4c40bc3876933bd0d32c336cef6cd6f5fb4a Reviewed-by: Kai Koehne <kai.koehne@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-0340-5180/+51
| | | | | | | | 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-3024-24/+24
| | | | | | | | | | 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-2324-24/+24
| | | | | | | | 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-172-2/+2
| | | | | | | | 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>
* Fix build break in qmlviewer.Xizhi Zhu (Steven)2012-01-141-0/+1
| | | | | | | It's introduced by commit 14b929e9c448f2cc74fa047aaf8af283b81fbaf9 in QtBase. Change-Id: Iacb5350b5f42a09b7419bf491ac9620a406422e6 Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-0522-22/+22
| | | | | Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b 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>
* qmlplugindump: Don't depend on qtquick1 and widgets.Christian Kamm2011-12-092-4/+28
| | | | | Change-Id: I38baaf2d8d02c3f35d2dece9fc580c6e1fee872d Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* qmlplugindump: Fix dumping of extended QGraphicsWidget.Christian Kamm2011-12-081-4/+5
| | | | | Change-Id: Id574b4ee98f7d985ef06619956b2c02cac68b553 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>
* Improve parsing of escape characters and regexp literals.Roberto Raggi2011-12-061-13/+34
| | | | | | | | | | | | | | | | | | | | | That is, in QML/JS you can escape characters in identifiers, e.g. var c\u0061se = 25 declares a variable called `case' with value 25. In such cases qmlmin needs to preserve the escape sequence in the declaration. Also, fix possible errors when pasting keywords after regexp literals. The minifier needs to preserve the whitespace character after the regexp delimiter, e.g. /x/instanceof blah without the white space after the regexp, the `i' of `instanceof' is parsed as a regexp flag. Change-Id: I5f426ac62949e34d092d4fdb0a41243de8ff2236 Reviewed-by: Kent Hansen <kent.hansen@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-026-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* qmlplugindump: Fix missing flush for objects that don't fit a line.Christian Kamm2011-12-021-2/+1
| | | | | | | | The missing flush could result in script bindings appearing after the closing brace of an object. Change-Id: If05764619668cc4a86f7364f6cd7feeb0d6f6e32 Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
* qmlplugindump: Avoid reporting types as attaching to themselves.Christian Kamm2011-11-291-2/+6
| | | | | | Task-number: QTCREATORBUG-6625 Change-Id: I9f778757b490cb5d79249b92f8c7b6d9d1df66e6 Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
* qmlplugindump: Fix QObject dump.Christian Kamm2011-11-221-2/+30
| | | | | | | | | * Hide deleteLater and the destroyed signal. * Add destroy and toString functions. Task-number: QTCREATORBUG-4903 Change-Id: Icbae3e1c82605baa84ac9cc8f38cd747e4dcf687 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Adding custom easing curves to property animationsAaron Kennedy2011-11-216-1/+430
| | | | | | | | QDeclarativeEasingValueType gets the property customBezierCurve. This allows to define a custom easing curve as a cubic bezier curve. Change-Id: I33ae128ce29bba2834eedcbb90a9769a5391f997 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* qmlplugindump: Fix dumping empty names for generated QMetaObjects.Christian Kamm2011-11-171-4/+29
| | | | | | | | Task-number: QTCREATORBUG-6543 Reviewed-by: Roberto Raggi Change-Id: I2e85432ea8ff84ea4172e462782c0484ed75dcde Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* Declarative: Fix compiler warnings.Friedemann Kleint2011-11-071-1/+1
| | | | | | | | - Unused parameters, variables - Usage of deprecated QAtomic::operator=(int) Change-Id: I2861968dac8ef8a3126783e3447c593808116871 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* qmlplugindump: Add flush to fix output redirection on windows.Christian Kamm2011-11-031-1/+1
| | | | | | Task-number: QTCREATORBUG-5825 Change-Id: I26c2ecb77a89b352de97c70ff17fd076872a636b Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
* qmlplugindump: Dump QObject based module api.Christian Kamm2011-10-281-4/+58
| | | | | Change-Id: Icc18392f63cd505e0264567e6c7d2d4cf7dac021 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* Remove Q_WS_*, symbian and maemo code in QtDeclarativeDamian Jansen2011-10-2615-1230/+12
| | | | | Change-Id: If64daf80f9d19973e0bc2d864b003a66be5ca61d Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Cleanup qmltestrunner.proCharles Yin2011-10-251-2/+0
| | | | | Change-Id: I4a02eeafdb29e4f75773b79649d1aabaab895213 Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Set DESTDIR for qmltestrunner.Xizhi Zhu2011-10-241-1/+2
| | | | | Change-Id: I785fe1936ae3ee9819cd30e4f5a6b99b03a8ee5f Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Rename Qt Quick-specific classes to QQuick*Kent Hansen2011-10-212-10/+10
| | | | | | | | | | | | | | | | | | | | | | 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 compilation on HarmattanSimon Hausmann2011-10-121-11/+11
| | | | | | | | | | Fix issues with QString::QString(const char*)' being private Change-Id: Ie3152d5fe952976dbda0ecb9dc28f9b6b5a1fab4 Reviewed-on: http://codereview.qt-project.org/6508 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Add DropArea item and Drag attached property.Andrew den Exter2011-10-101-2/+1
| | | | | | | | | | | | | | | | | | | Refactors drag API to improve compatibility with traditional drag and drop by reusing events and adding drop actions. Event sending is removed from MouseArea, instead the Drag object can be attached to the item that is dragged and it will send drag events when the position of that item is changed or when its active property changes. The DragTarget item is renamed to DropArea and can now communicate supported and suggested actions. Task-number: QTBUG-19747 Change-Id: I46cb77e68cf1ff32bbcbf0945facb593c9c2243c Reviewed-on: http://codereview.qt-project.org/4638 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Make qmlmin use QmlDevTools library for QML parsingKent Hansen2011-10-072-6/+4
| | | | | | | | | Needed to make it link in non-developer builds. Change-Id: I45f413df5e4c01760aa245463c809c5b502a96c2 Reviewed-on: http://codereview.qt-project.org/6130 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* make qmlmin happy with '\0' in stringCharles Yin2011-10-071-0/+1
| | | | | | | | Change-Id: Ib14e2d75ea83d71c7422eb3f9560e54095300fb9 Reviewed-on: http://codereview.qt-project.org/6089 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* qmlplugindump: Don't dump implicit signals.Christian Kamm2011-10-061-5/+18
| | | | | | | | Every property automatically has a xyzChanged signal anyway. Change-Id: I470875a94792c0fc5a6378c8be1e0eddc24a1d5a Reviewed-on: http://codereview.qt-project.org/6144 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* qmlplugindump: Explicitly add QSGMouseEvent to be dumped.Christian Kamm2011-10-061-0/+7
| | | | | | Change-Id: I93f29f151e82a3d47fb10ff587fe28ea27a2d7b4 Reviewed-on: http://codereview.qt-project.org/6143 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Compile after changes to QtBaseLars Knoll2011-09-291-0/+1
| | | | | | | | | | qmime.h got removed in QtBase, compile again after that change. Change-Id: I3e9a0454a4528db1b96d901e93ef763ba15d1a1e Reviewed-on: http://codereview.qt-project.org/5795 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Remove more QByteArray<->QString conversionsKent Hansen2011-09-291-4/+4
| | | | | | | | | | Prefer to store types as QStrings. It's only when we manipulate raw (compiled, meta-)data that utf conversion is needed. Change-Id: Ie138a69c9a409804e1b90b21c1d60dedea35bddb Reviewed-on: http://codereview.qt-project.org/5781 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Fix compilation of qmlviewerKent Hansen2011-09-291-0/+1
| | | | | | | | | | "qmlruntime.cpp:123: error: invalid use of incomplete type" 'const struct QMimeData'" Change-Id: I427fee401e9fa7cd658c3d01e7530720141e4fa0 Reviewed-on: http://codereview.qt-project.org/5786 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Build with qt-in-namespaceKent Hansen2011-09-281-1/+10
| | | | | | | | Change-Id: Ia57e4f14d94ad63194dad52892bedf316a58a79a Reviewed-on: http://codereview.qt-project.org/5693 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* qmlplugindump: Describe meta object revisions of exported types.Christian Kamm2011-09-212-12/+41
| | | | | | | | Adds the exportMetaObjectRevisions property to generated qmltypes files. Change-Id: Iafe2fe408c88bb6dd02cbb558404a5f654431248 Reviewed-on: http://codereview.qt-project.org/5311 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Add install rule for qmlminKent Hansen2011-09-191-0/+2
| | | | | | | Change-Id: I7ea6e92e8fe54092bb16d92e69a83b0257a67acf Reviewed-on: http://codereview.qt-project.org/4787 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Fix automatic insertion of semicolons.Roberto Raggi2011-09-191-7/+2
| | | | | | | | | | Use Lexer::canInsertAutomaticSemicolon() when recovering from errors generated by missing T_SEMICOLON tokens. Change-Id: Ie4011d8d3e02b02a7dccd0a09ffa28b1ec9e654d Reviewed-on: http://codereview.qt-project.org/5017 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Add support for minimizing Javascript files containing pragmas.Roberto Raggi2011-09-191-20/+92
| | | | | | | Change-Id: Ib61d5ea42ec810c36ba782b558461bc09be199dc Reviewed-on: http://codereview.qt-project.org/5016 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Added --verify-only option to qmlmin.Roberto Raggi2011-09-191-11/+17
| | | | | | | | | | | | | | | | | qmlmin has three different stages. In the first stage it generates the QML/JS minified code. In the second stage we verify that minified code is equivalent to the original code and in the final stage we produce the output. With --verify-only you can tell qmlmin to quit after the verification step. Note that this option is pretty much equivalent to the unix command qmlmin file.qml -o /dev/null. Change-Id: I91373bc1c1db8c35af2e301ad13d7b34fc384529 Reviewed-on: http://codereview.qt-project.org/4670 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Introduced qmlmin.Roberto Raggi2011-09-193-1/+529
| | | | | | | | | | qmlmin is a simple minifier for QML and Javascript files. It removes comments and layout characters. Change-Id: I387a683cd9b73e8fd225e10a75b3fcec50949938 Reviewed-on: http://codereview.qt-project.org/4442 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Re-enable QtQuickTest.Rohan McGovern2011-09-191-2/+1
| | | | | | | | | | This was disabled in refactor, but it seems to be working OK, so turn it back on. Change-Id: I35d97342c6ef7be358d9cb593a1eab27c711247c Reviewed-on: http://codereview.qt-project.org/4846 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* partial build fix of qtquick1 autotestsMatthew Cattell2011-09-091-2/+2
| | | | | | Change-Id: Ic2106ec80e1e5402f4f9bf71cc4cf23ec4657046 Reviewed-on: http://codereview.qt-project.org/4546 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix export symbols for QtDeclarative and QtQuick1.Friedemann Kleint2011-08-312-2/+2
| | | | | | | | | | | 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>