aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-2417-294/+294
| | | | | | | | | | | | | 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>
* QtDeclarative/Quick: Fix warnings.Friedemann Kleint2012-02-161-0/+1
| | | | | Change-Id: I71bd638fcc41356e0b76df27ec76ad3ed5ef90d9 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Add basic plugin metadata for QtQuick2 import plugin.Michael Brasser2012-02-161-5/+1
| | | | | | | | | | This indirectly fixes the qdebugmessageservice autotest, which was getting confused by the "old plugin" warning. Also updated the extension plugin interface to use org.qt-project rather than com.trolltech. Change-Id: I94fc6cf03d23e606c2e2333b013dd2b698f04623 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove etcprovider plugin.Michael Brasser2012-02-157-472/+1
| | | | | | | | | | | Handling image providers via QDeclarativeExtensionPlugin is not a pattern we want to promote for library code. The plugin was also missing documentation and autotests. It might be appropriate to be re-added later as an example showing the use of an image provider with a texture factory. Change-Id: I2d8f3208aebd55180bd627b3f9acc0679eb6328c Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Change variant properties to var properties.Justin McPherson2012-02-132-5/+5
| | | | | | | Helps with the use of js objects in test data etc. Change-Id: I95661118a8ded277c0e1d3c951182dee3f550e12 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* qmltest: Remove obsolete skipAll function.Jason McDonald2012-02-131-6/+0
| | | | | | | | | | The skipAll function has been left in qmltest for a transitional period to give upstream projects time to catch up with the removal of the function from the API. This transitional period is now finished. Task-number: QTBUG-21652 Change-Id: I10173ef9a676b804e6cf2e7f6e9a82f7b7b4c078 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* qmltest: Count passes, fails and skips consistently.Jason McDonald2012-02-131-1/+7
| | | | | | | | | | | | | | | | | | | | | This commit changes qmltest to count one pass per data row, rather than a single pass for an entire data-driven test function. This makes counting of passes consistent with counting of fails and skips which were already counted once per data row. This change also means that the plain-text, xml and light-xml output formats will now show one result per data row, so that every data row executed will be shown in the test output with either a pass, fail or skip result. Previously data rows that passed were not shown in the output, preventing analysis of total number of tests runs, pass-rates, and various other metrics. This commit corresponds to (and depends on) a commit in the qtbase module which changes the behaviour of qtestlib in the same way. Task-number: QTBUG-21848 Task-number: QTBUG-22124 Change-Id: I3c1f0e68bdff4087b9ccfc80a3f96f4541335b6f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Pass the QQuickCanvas to texture factories.Gunnar Sletta2012-02-091-1/+1
| | | | | | | | | This makes it a lot more convenient as we then have direct access to the GL context, createTexture(), invalidation signal and more. Change-Id: I114514d1379c4d0efcc35c512fa2b485da3438b0 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Remove code related to test location.Jason McDonald2012-02-091-11/+0
| | | | | | | | | Testlib no longer does anything with the test location and neither do any of Qt's tests, so this code is no longer needed. Change-Id: Ic370b6b741382a90454c893bffcab4a7328a2f9e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* qmltest: Perform extra checks after each data row is executed.Jason McDonald2012-02-091-1/+4
| | | | | | | | | Add calls to the new function QTestResult::finishedCurrentTestData() to verify that expected failures and expected messages have been produced. Change-Id: Ia139a962c705a5f47be992b7f2e81775aa2e2f28 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Remove QtQuick1 elements from qtdeclarativeMatthew Vogt2012-02-0318-2306/+4
| | | | | | | | 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-3028-28/+28
| | | | | | | | | | 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>
* Move sqldatabase into a module API pluginCharles Yin2012-01-254-2/+686
| | | | | Change-Id: Icd0bbfe16804abf1bbadbabddf3a30b5b18df30c Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove Symbian specific code.Xizhi Zhu (Steven)2012-01-242-20/+0
| | | | | Change-Id: Ifbcc92f1d44d46760ac7c5be24a997384fa22266 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-2327-27/+27
| | | | | | | | 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>
* Remove the use of QT_MODULE()Gunnar Sletta2012-01-206-6/+0
| | | | | Change-Id: I1c07231b0bf412fe490a44b9a060bb2e2ef11154 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Change testlib skipAll function to failure.Jason McDonald2012-01-191-5/+3
| | | | | | | | | | Be more insistent that tests using the obsolete skipAll() function should change to using skip() by treating calls to skipAll() as test failures. After a further grace period the skipAll() function will be removed. Change-Id: Ic2448af2f8176909afa151b6e8c29587dfd17f1f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in Nokia copyright headers.Jason McDonald2012-01-1711-11/+11
| | | | | | | | 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>
* Update copyright year in license headers.Jason McDonald2012-01-0516-16/+16
| | | | | Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Say hello to QtQuick moduleKent Hansen2011-12-028-6/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 QSGContext and QSGTexture from QDeclarativePixmapDataGunnar Sletta2011-12-022-5/+32
| | | | | | | | | | | | | | | | | | | | | | | In order to cleanly support multiple windows we need to not have the QSGContext reference in QDeclarativeEngine and we need to be able to have one copy of the texture for each QSGContext that is not sharing when we have multiple windows. This also makes it easier to the release graphical resources from a running application, which is another feature that we want to eventually implement. This patch does remove an adaptation feature which is the decodeToTexture, which seemed like a good idea at the time but in hindsight has not been used for anything. Edit: resolved conflict in qquickimage.cpp Edit: updated QDeclarativePixmap testcase Edit: updated QQuickImage testcase Edit: Rebased on top of QDeclarativePixmapCacheChanges Change-Id: Ifc61dd8158d3f841437d029b6031a91196145517 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Windows: Fix building of XML list model plugin.Friedemann Kleint2011-12-012-3/+3
| | | | | | Change-Id: Ia070f4b4fd726d201dde7aa43e2c62eacfaff40e Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Change the license header from BSD to LGPLCharles Yin2011-12-011-27/+28
| | | | | Change-Id: I68b118f45d0f34607af1a727f24bc94ddb6b6a07 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Move XmlListModel to seperate pluginCharles Yin2011-12-016-1/+1456
| | | | | | | | | | | | | XmlListModel is the only feature inside QtDeclarative which depends on the QtXmlPatterns module, move this item to a separate plugin can reduce the unnecessary dependency in most use cases. To use the new XmlListModel, an additional "import QtQuick.xmllistmodel 2.0" is needed. Task-number:QTBUG-22158 Change-Id: I9e19eb6cbba46cd40fb7ffcdbd741f346779a54d Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* qmltestrunner reports wrong LOC for failed test casesCharles Yin2011-11-281-4/+4
| | | | | | | | | The callerFile() and callerLine() calls GetFrame() with incorrect index, the right index should be the current frame index + 1. Task-number:QTBUG-22887 Change-Id: I694073b80853bf66e02414a158c8e155f8be8390 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Add QtQuick1 plugin's major version to target pathKent Hansen2011-11-231-1/+1
| | | | | | | | | This ensures that the plugin is only loaded when "import QtQuick 1.0" (or 1.x, rather) is used, and not when "import QtQuick 2.0" (or a later version) is used. Change-Id: I3f7621f316449071d7a891c72840ab1d2fd6b962 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Silence compiler warnings about unused variables (MSVC)Kai Koehne2011-11-212-0/+2
| | | | | | | Fixes most 'C4189: local variable is initialized but not referenced' warnings Change-Id: I8c5a1ba0a50dd3fcb22294e564425846362ee911 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix qmltestrunner crash bug when report filename and line numberCharles Yin2011-11-091-21/+0
| | | | | | | | | | The HandleScpe is not needed here. Also for each test file, the rootObj should reset its internal states properly, otherwise the following test cases are polluted by the previous tests. Task-number:QTBUG-22620 Change-Id: I1e4869070b8712e5a6c755461d52bd12d1f03160 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Declarative: Fix compiler warnings.Friedemann Kleint2011-11-071-2/+2
| | | | | | | | - Unused parameters, variables - Usage of deprecated QAtomic::operator=(int) Change-Id: I2861968dac8ef8a3126783e3447c593808116871 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Remove Q_WS_*, symbian and maemo code in QtDeclarativeDamian Jansen2011-10-266-55/+1
| | | | | Change-Id: If64daf80f9d19973e0bc2d864b003a66be5ca61d Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Remove warning messages from TestCase.qmlCharles Yin2011-10-251-2/+4
| | | | | | | | | qtest_run should be called only when the whole TestCase is completely loaded. Task-number:QTBUG-22299 Change-Id: Id2874ed2493ccea72a4f17e6cb61aeb58ae4fa31 Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Fix qmltestrunner hang bug when no TestCase itemCharles Yin2011-10-241-0/+2
| | | | | | | | | | | Add a hasTestCase property to the global qtest object, set it to true in each TestCase's onCompleted handler. qmltestrunner only enter the event loop if this property is true to avoid infinite waiting. Task-number:QTBUG-22281 Change-Id: Id609432210ae795d8c128901e64ba0aef4551f01 Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Rename Qt Quick-specific classes to QQuick*Kent Hansen2011-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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>
* Add file and lineno parameters to warn() methodCharles Yin2011-10-211-6/+7
| | | | | Change-Id: I1ddfd4793a26a16bf85b72c50d84080cd0b26a87 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Remove SkipMode from qtestlib API.Jason McDonald2011-10-212-15/+4
| | | | | | | | | | The SkipMode parameter to QSKIP has been removed in qtbase, therefore it must also be removed here. Task-number: QTBUG-21851, QTBUG-21652 Change-Id: I8016f8c28338b1b532bdb593c796d699b99250dc Reviewed-by: Charles Yin <charles.yin@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove the InputContext module.Andrew den Exter2011-10-1810-1470/+1
| | | | | | | | | | | | | The input context module provided a bridge between QML and a QInputContext which allowed an application to implement it's own input method in-process. However since QInputContext has been replaced and now only exists as a QWidget compatibility API this module no longer works with the QtQuick 2 items and porting it to the new QPlatformInputContext API does not seem to be an option as there is no way to override the instance provided by the platform integration. Change-Id: Ica602377436fcea42b9ffd05e1b347e2ee52acc8 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove more QByteArray<->QString conversionsKent Hansen2011-09-291-1/+1
| | | | | | | | | | 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>
* Build with qt-in-namespaceKent Hansen2011-09-281-1/+7
| | | | | | | | 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>
* Wheel event support in qmltestlib + few fixes.juhvu2011-09-221-3/+21
| | | | | | | | | | added unit test and orientaion support for mouseWheel Change-Id: I9c26dc762281bc32965769c151414ac0e177ad0f Reviewed-on: http://codereview.qt-project.org/5272 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Juha Vuolle <juha.vuolle@nokia.com> Reviewed-by: Charles Yin <charles.yin@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>
* Merge branch 'master' into refactorGunnar Sletta2011-09-121-2/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/cppextensions/qwidgets/qwidgets.pro examples/declarative/minehunt/main.cpp examples/declarative/minehunt/minehunt.pro src/declarative/items/context2d/qsgcontext2d.cpp src/declarative/items/qsgflickable.cpp src/declarative/items/qsgtextedit.cpp src/declarative/items/qsgtextinput.cpp src/declarative/particles/qsgangleddirection.cpp src/declarative/particles/qsgcumulativedirection.cpp src/declarative/particles/qsgcumulativedirection_p.h src/declarative/particles/qsgfollowemitter.cpp src/declarative/particles/qsgmodelparticle.cpp src/declarative/particles/qsgparticlesystem.cpp src/qtquick1/util/qdeclarativeview.h tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp Change-Id: Ib4be2a5e742dee1a399d73da97161736f77448e5
| * remove useless debug logCharles Yin2011-09-071-2/+1
| | | | | | | | | | | | Change-Id: I715135c54db97df38bdd7915a01efbb3596d549a Reviewed-on: http://codereview.qt.nokia.com/4313 Reviewed-by: Charles Yin <charles.yin@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-314-4/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Move all QML file parsing into the QDeclarativeScript namespaceAaron Kennedy2011-08-301-1/+2
| | | | | | | | | | | | Change-Id: I5969686a796cbfb2eeb3729014df7f01e51b0620 Reviewed-on: http://codereview.qt.nokia.com/3797 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
| * Remove V8 submodule from QtDeclarativeKent Hansen2011-08-293-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtDeclarative should now link against the QtV8 library from qtbase. The patch files have been moved to qtbase as well. Applications that use the QtDeclarative private headers may need to add the following to their .pro file: QT += v8-private This ensures that <private/v8.h> is found, which is (indirectly) included by many QtDeclarative private headers. Task-number: QTBUG-20963 Change-Id: I31e973a6fcc0c416d3b258a61c26564cee3dcd4b Reviewed-on: http://codereview.qt.nokia.com/3093 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* | Get declarative running on new gui/opengl stack.Samuel Rødal2011-08-292-3/+4
| | | | | | | | | | | | | | | | | | Rename QGuiGLContext -> QOpenGLContext, QGL* -> QOpenGL*, etc. Change-Id: I08379029d756e28b20ae141ca30ed801626b513d Reviewed-on: http://codereview.qt.nokia.com/3711 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | Merge branch 'master' into refactorGunnar Sletta2011-08-253-6/+12
|\| | | | | | | | | | | | | | | | | | | | | 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
| * QML Autotests: Use fuzzy compare for real numbersJulian de Bhal2011-08-231-2/+2
| | | | | | | | | | | | | | Change-Id: I5ae2859d15502b29e3a744e155ceabe50d83bcff Reviewed-on: http://codereview.qt.nokia.com/3290 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
| * add dummy notify signals to remove warningsCharles Yin2011-08-081-3/+5
| | | | | | | | | | | | | | Change-Id: Id8eca4ca2d72a1b3a4293d6ed19ef7f3fdb02d37 Reviewed-on: http://codereview.qt.nokia.com/2712 Reviewed-by: Charles Yin <charles.yin@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>