aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-241-1030/+0
| | | | | | | | | | | | | 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>
* 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>
* Fixed compile.Rohan McGovern2012-01-241-2/+4
| | | | | | | | | QEventLoop::DeferredDeletion was deprecated long ago, and finally has been removed. Replace it with QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete) Change-Id: Ic03f26a57efeb35aefab67a913f56001303aa3e4 Reviewed-by: Michael Brasser <michael.brasser@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 license headers.Jason McDonald2012-01-051-1/+1
| | | | | Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QDeclarative tests: Introduce base class for data tests.Friedemann Kleint2011-12-211-35/+26
| | | | | | | | | | | | | | | | | In tests/auto/shared/util.* replace macros/find functions by a base class QDeclarativeDataTest with accessors for the data directory helper functions to create URLs from it. The class relies on QFINDTESTDATA, which is the standard way of locating test data. Using the class should reduce the number of calls to QFileInfo.exists(), etc significantly. In addition, provide utility functions for messages. Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Change-Id: Id2beacb157922ee9412f9e45cf9695cec1f8379a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Say hello to QtQuick moduleKent Hansen2011-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Deleting an incubated object after setInitialState() crashesMartin Jones2011-11-301-0/+37
| | | | | | | | | | | Incubating objects are often parented in setInitialState(), which can lead to the incubating object being deleted after object creation, but before completion. When incubator.clear() is called after this point, it would attempt to delete the already deleted object. This change guards the incubation object in the incubator. Change-Id: I9585e93027250b8b6b3f1777b10ee1008ae7b818 Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
* QtDeclarative: Fix warnings in tests.Friedemann Kleint2011-11-281-1/+1
| | | | | | | | | | | - Unused parameters - Missing interfaces - tst_QQuickListView: Fix call canvas->rootContext()->setContextProperty to use a QVariant (instead of implicitly converting to QObject*) which was apparently intended. Change-Id: Idc95d9408051e6f5b7005a7eccd764ac218ff867 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix crash in incubator when a guarded context is deletedAaron Kennedy2011-11-171-0/+20
| | | | | Change-Id: Ice7375c344b7e8d0d11cc6ee0bdfdf864ecd7109 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Ensure that chained incubation works from componentCompleted.Martin Jones2011-11-011-0/+129
| | | | | | | | | Make chained AsynchronousIfNested initiated from componentComplete work correctly, i.e. asynchronous incubator is not Ready until all chained creation is Ready. Change-Id: I286cc10e2f09e36dcc6034f3f23681e833d7e6e8 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Make qdeclarativeincubator test compile againKent Hansen2011-10-241-1/+0
| | | | | Change-Id: I6586a75f52964d9dc466e70a9115c17fb3838d62 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Allow QDeclarativeIncubator to be deleted within statusChanged() callbackAaron Kennedy2011-10-201-0/+75
| | | | | Change-Id: I17621870b67d8a975545adc27ddaf9695e6a9428 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Allow one incubator to start in the statusChanged() of anotherAaron Kennedy2011-10-201-0/+85
| | | | | Change-Id: I91cb7e2a8ecc67f34cdcadc0b71f819c2881e2da Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Behave correctly when AsynchronousIfNested is nestedAaron Kennedy2011-10-201-0/+40
| | | | | | | | When AIN is nested within a synchronous AIN, it should behave synchronously. Change-Id: Ib3f8281667118d7787967f25e27797f67e581006 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* QDeclarativeIncubator wasn't calling statusChanged() for nested casesAaron Kennedy2011-10-141-1/+27
| | | | | | | Change-Id: I1811951bdcdd69d4ad1643ed54a8ea097fa718b5 Reviewed-on: http://codereview.qt-project.org/6638 Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Use TESTDATA macro in declarative tests.Michael Brasser2011-10-141-3/+3
| | | | | | | | | Includes a few other minor cleanups as well. Task-number: QTBUG-21721 Change-Id: I5b1c2c116e63748c6b4199183212de8a00037af1 Reviewed-on: http://codereview.qt-project.org/6473 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QDeclarativeIncubator autotestsAaron Kennedy2011-10-071-2/+150
| | | | | | Change-Id: I5c4594c40fccfe6cb8b198a5fd6c11b468b0562e Reviewed-on: http://codereview.qt-project.org/6118 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Allow incubators to be driven recursivelyAaron Kennedy2011-10-061-0/+47
| | | | | | Change-Id: If8ce239372c3cf3166b666329ba812b25ee54669 Reviewed-on: http://codereview.qt-project.org/6102 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Always delete object if incubator is cancelledAaron Kennedy2011-10-061-0/+31
| | | | | | | Change-Id: Iad04340bac9d1345069e540e6bf9dbf671ce9226 Reviewed-on: http://codereview.qt-project.org/6088 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* QDeclarativeIncubator autotestsAaron Kennedy2011-10-041-0/+161
| | | | | | | | Change-Id: Ib1b70903c5aa82fc1112c17db1b676b4740ea685 Task-number: QTBUG-21151 Reviewed-on: http://codereview.qt-project.org/5940 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* QDeclarativeIncubator::clear() and autotestsAaron Kennedy2011-10-031-0/+239
Change-Id: I2a14c01c7f9412459572e9960cb95a4c24e068aa Task-number: QTBUG-21151 Reviewed-on: http://codereview.qt-project.org/5911 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 12:57:55 +0000