aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Install the Qt Quick 2 examples in the "qtquick" dirThiago Macieira2012-11-0943-87/+87
| | | | | | | | Leave the "qtdeclarative" dir for Qt Quick 1, which is where it used to be in Qt 4. Change-Id: I44997771d77617564fc608c1aba95e3ada8f9a69 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Don't install tst_qmltest to $QTDIR/testsKai Koehne2012-11-091-0/+3
| | | | | | | | | Don't try to install the tst_qmltest by default, since it will install itself to $QTDIR/tests. Task-number: QTBUG-26661 Change-Id: I310f660cc486ffb4358af14ea15db389375ed802 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* tests: Mark some tests as insignificant on MacSamuli Piippo2012-11-092-0/+4
| | | | | | | | | Task-number: QTBUG-27890 Change-Id: I48edea29ccaa593e4bab61c1a968130a5d3457f3 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Expose "Qt.application.supportsMultipleWindows".Samuel Rødal2012-11-092-0/+9
| | | | | | | | | | Useful on platforms like kms and eglfs that only support a single QWindow. On those platforms the QML application can thus choose to use a Rectangle instead of a Window to show dialogs etc. Change-Id: Idc3f46d2cad6cf3f55c5c84df2c8511407bd4849 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
* Don't use design metrics with NativeRendering on TextInputEskil Abrahamsen Blomfeldt2012-11-091-0/+3
| | | | | | | | | | We only set the design metrics property in init(), before the renderType has been set. Since updateLayout() is called every time the renderType changes, it should be sufficient to set it there. Change-Id: If5b2cb3738e8135195848857a30f4e646bdf1d0b Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* All QWindow properties that have "window" in them have been renamed.Shawn Rutledge2012-11-0826-183/+202
| | | | | | | Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase. Change-Id: I9614cc2c7ed119c663b3f6f99267483e291e529c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix compilation issue with clang in C++11 mode.Erik Verbruggen2012-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | As with all other qHash functions, providing a default value for the seed is needed. Compiler error: In file included from qml/v8/qv8engine.cpp:42: In file included from qml/v8/qv8engine_p.h:57: In file included from /Users/erik/dev/qt5-stable/qtbase/include/QtCore/qvariant.h:1: In file included from /Users/erik/dev/qt5-stable/qtbase/include/QtCore/../../src/corelib/kernel/qvariant.h:50: In file included from /Users/erik/dev/qt5-stable/qtbase/include/QtCore/qhash.h:1: /Users/erik/dev/qt5-stable/qtbase/include/QtCore/../../src/corelib/tools/qhash.h:107:35: error: no matching function for call to 'qHash' Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(t))) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~ [skipping macro expansion and candidate qHash functions] qml/v8/qv8engine_p.h:89:13: note: candidate function not viable: requires 2 arguments, but 1 was provided inline uint qHash(const v8::Handle<v8::Object> &object, uint seed) Change-Id: I917785ce5ce596757fe06ced1536797090bb0f77 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* When declarative debug tests fail in CI, confirm timeout as reasonShawn Rutledge2012-11-081-0/+2
| | | | | | | | | Hope to correct errors like FAIL! : tst_QQmlInspector::reloadQml() 'QQmlDebugTest::waitForSignal( m_client, SIGNAL(responseReceived()))' returned FALSE. () Change-Id: Iebf29d4de0bc19396041565e5a4cd32561345235 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Fixes the examples shared macro.Caroline Chao2012-11-081-1/+1
| | | | | | | | | | Detection of the platform's name Mac was wrong. Task-number: QTBUG-27894 Change-Id: I3194fac4e78d12682871dec63a905b4c940fb80c Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Prevent crash when doing threaded rendering of multiple windows.Samuel Rødal2012-11-082-5/+8
| | | | | | | | | | Don't call renderSceneGraph() on non-renderable windows. We also don't call syncSceneGraph() on them, which is where the renderer will be set. Also get rid of harmless warning about non-renderable windows. Change-Id: I24739abefe0d554efb568514057719f981590c28 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Examples separated out of Ie808e78a42074e13aa9d3c87723ec9ac8fdbaf4av5.0.0-beta2Shawn Rutledge2012-11-074-14/+149
| | | | | Change-Id: Iec54ed5d7c41c6103ddfe07509b905914806d435 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* qmlscene can start with either an Item or Window as the qml rootShawn Rutledge2012-11-056-33/+133
| | | | | | | | | | | 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>
* QQmlPropertyCache: adding setParent()Thomas Hartmann2012-11-052-0/+6
| | | | | | | | | | | setParent() enables to dynamically set the parent of a QQmlPropertyCache. This is used in the Qt Quick Designer to create dynamic properties on an arbitrary object. Change-Id: I0dafabcacf4222fc1bfe693736cbd23e1e928e8f Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com> Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* Fix a missing word in the docsJan Kundrát2012-11-051-1/+1
| | | | | | | | The functionality is "*no* longer available", of course. Change-Id: I2c9f2633d74b98c16216f68e3d7e080422cf6506 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* transformOriginPoint is deprecatedShawn Rutledge2012-11-051-1/+1
| | | | | | Task-number: QTBUG-26423 Change-Id: I28f8160c2c52f62ef901ed569b94fefdab387729 Reviewed-by: Alan Alpert <416365416c@gmail.com>
* Fix conditional jump based on an uninitialized value.Jędrzej Nowacki2012-11-021-1/+1
| | | | | | | | QElapsedTimer is POD and it is not initialized by default. Change-Id: Ie6997e1c4225b9ba584de52cc0c9647f26e45438 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* follow qt_tool.prf now setting up DESTDIROswald Buddenhagen2012-11-016-11/+0
| | | | | Change-Id: Ia07dc830586fd30f4ee98c64e9f2accae5cf2f06 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* adjust to qt_plugin.prf changes, part 2Oswald Buddenhagen2012-11-015-19/+0
| | | | | | | | DESTDIR and INSTALLS+=target are set up automatically now, but PLUGIN_TYPE needs to be defined. Change-Id: I2dab25a2527d376eaa37f233782ffe4b6a58b8f8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Update Nokia references to Digia's.Caroline Chao2012-11-012-2/+2
| | | | | | Change-Id: I3be91d4a6a1116c79ab6aca89d189c88a265d339 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* CMake: Remove obsolete test_modules testStephen Kelly2012-11-013-87/+0
| | | | | | | The generated module_includes test is a super-set of this test. Change-Id: I086d81806cdbc3c4afbeae0f8683a5b693b6f85a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* adjust to qt_plugin.prf changes, part 1Oswald Buddenhagen2012-10-294-0/+5
| | | | | | | | PLUGIN_TYPE will need to be defined. do this before the respective change in qtbase, due to the reverse dependency. Change-Id: I97e7574b48512958689dab0c0697f2edc8666807 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Prepare for removal of Softkeys APIJan Arve Saether2012-10-291-8/+2
| | | | | | Change-Id: I28f0d1b66da10a9d578e3aea3fe73a5d28322852 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Doc: Removed reference to QTDIR and did some language editsVenugopal Shivashankar2012-10-291-104/+115
| | | | | Change-Id: I3c7854342fc89c97423c8540a6c5cc51070a5639 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Changed the plugin module nameVenugopal Shivashankar2012-10-2915-37/+70
| | | | | | | | | | The earlier name, com.nokia.TimeExample is irrelevant now. Also updated all instances of documentation where this older module name was referred. Change-Id: Ic252d0e72af23c2d39d5fed55f242e47c1b6bde9 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* CMake: Add a test for module includesStephen Kelly2012-10-291-0/+7
| | | | | Change-Id: Ie9fd7929c1ea22f8acf51bafce64ade74d51a00e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove stale QT_MODULE() usage casesSergio Ahumada2012-10-2910-20/+0
| | | | | | | | As of Qt5, this macro is defined to be empty; simply get rid of these leftovers. Change-Id: Ib3a8e8eae98e2839c3db4bf34be8dcf43f49af11 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Update qml test scenes with new property namesaavit2012-10-293-4/+4
| | | | | Change-Id: I67953f257f8948f3ec821cf3e5bc4763aff8d1aa Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Test: Fix tst_qqmlecmascript::exportDateCaroline Chao2012-10-292-2/+2
| | | | | | | Get timezone offset of the date specified and not the default value. Change-Id: I58dba896098cbee72a2e4ec15ba2c928121e6cff Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* test: Mark `tst_qquicklistview', `tst_qquicktext', and `tst_qquicktextedit' ↵Sergio Ahumada2012-10-293-0/+6
| | | | | | | | as insignificant Task-number: QTBUG-27740 Change-Id: I20b15ae35f736f1c43a85e9a37ec3fda19896b07 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Change organisation to Qt Project.Frederik Gladhorn2012-10-251-2/+2
| | | | | Change-Id: Ia55cf3cff4f019c82588d44c0b9c63cb97d965be Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Mark failing tests as insignificant.Stephen Kelly2012-10-241-0/+2
| | | | | Change-Id: I2dbed0d5fe632a034a0f656c2e3ccc3e63d4078b Reviewed-by: Richard J. Moore <rich@kde.org>
* Fix crash in qtlocation tests.Friedemann Kleint2012-10-241-1/+1
| | | | | | | Task-number: QTBUG-27696 Change-Id: I0cc12e1be25a789a8245fae3a444629ca57872ef Reviewed-by: Christopher Adams <chris.adams@qinetic.com.au> Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>
* Allow QQmlDebugProcess to be child of other qobjects.Frederik Gladhorn2012-10-237-8/+9
| | | | | | | | | | | Some tests when failing would leave the process running. For example on my machine tst_qqmlinspector would hang and restarting it would not work because the before started process was still blocking the port. Change-Id: I32dfb4874b18d7dcf34d0f40819b17dedd794ff3 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Allow tests to run despite custom message patterns.Frederik Gladhorn2012-10-231-1/+1
| | | | | | | With QT_MESSAGE_PATTERN some tests would not run without explanation. Change-Id: I68a9eda08fe56508ffaaef209a1f236621aa932e Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Change qml list interfaceMarco Bubke2012-10-2311-38/+160
| | | | | Change-Id: I185c6f4cef6105544504324c1616b5995c219fe3 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* Adding invalidate function to QQmlPropertyCacheThomas Hartmann2012-10-232-0/+34
| | | | | | | | This is required for tooling to update a QMetaObject inside a running QQmlEngine. Change-Id: I26d3aeed57d39c361c150261c4e1a84094e6f657 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* Make Rectangle border be inner instead of centered on the outline.Samuel Rødal2012-10-226-127/+10
| | | | | | | | | | | | | This avoids awkward situations such as when clipping to a parent item of the same size and makes it easier to reason about the bounding rectangle of the item. Task-number: QTBUG-21341 Change-Id: If015cfbc5792429f4a407fc0547ea71eca779eda Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Skip flaky subtests of tests/auto/qmltest.Friedemann Kleint2012-10-222-0/+2
| | | | | | | | | | - Skip test_key_click() in events/tst_events.qml. - Skip test_pixel pixel/tst_pixel.qml. Task-number: QTBUG-27671 Change-Id: Id78c34244d346910e28a2368f9fe3a41f54b8fb9 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix qmltest library.Friedemann Kleint2012-10-201-4/+16
| | | | | | | | | | - Avoid hangs (waiting for frameSwapped) and crashes in window managers for empty windows by giving windows a minimum size if they have 0x0 (observed on Mac, Windows). - Polishing, set proper window flags, title, object name, output. Change-Id: Iad5d66c3adbbfe085390132987e95f4c69272831 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* Change Q_ASSERTs in qquick[threaded]windowmanager.cpp to qWarning().Friedemann Kleint2012-10-202-11/+22
| | | | | | | | | As they also triggers when a non-existing file is loaded into QML2 or windows have invalid sizes. Change-Id: Iab1ce6c99f2bc2cb360ddaccce539cb97979ad5a Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* Re-enable tst_QJSEngine::stringObjects testPeter Varga2012-10-191-4/+0
| | | | | | | | Corresponding bug has been fixed in QtJSBackend thus re-enable test and remove expected failures. Change-Id: I72d6ce31a1c932db29dad0758e0c2654543a5b1f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* QQmlOpenMetaObjectType: extend interface for visual designerThomas Hartmann2012-10-192-0/+21
| | | | | | | | We need those 3 functions to rebuild OpenMetaObject in the visual designer. Change-Id: I70affe5850f46683a049615b3173a4f30c338401 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Add polishItems to the designer supportMarco Bubke2012-10-192-0/+7
| | | | | Change-Id: Ibec0b1f6c438f0c7b40c81ec81cd092768701f34 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Fix QQuickTextInput::moveCursorSelection()Konstantin Ritt2012-10-194-51/+47
| | | | | | | | | | | by using fixed QTextBoundaryFinder behavior. Update QQuickTextInput autotests. Task-number: QTBUG-11365 Change-Id: I81761c019e2fe80c9795fe54a2a990bfc5d4b709 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix list functions for the data propertyMarco Bubke2012-10-181-11/+27
| | | | | | | | The Qml Designer needs this functions. Task-number: QTCREATORBUG-8039 Change-Id: I6e072723630cf971ad3eda921497699611ae934e Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Temporarily skip tst_QJSEngine::stringObjects testPeter Varga2012-10-181-0/+2
| | | | | | | | Expected failures of this test block to land a patch to QtJSBackend that fixes them. Change-Id: If5c73cb668f9cc05e605e4f37c0dfabc0eecb5a8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* QQuickItem: handle QEvent::StyleAnimationUpdateJ-P Nurmi2012-10-171-0/+3
| | | | | Change-Id: Id5c4de6bdcd395a1e32449e69d773e9a35fab4c9 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Doc: Cleaned up \module and \qmlmodule page for Qt Quick and Qt QML.Jerome Pasion2012-10-175-10/+8
| | | | | | | | -Qt Quick: used a regular page instead of \qmlmodule -Cleaned up titles and membership Change-Id: I8ae24fec203ea675d213bd0df6105d0c2abd8164 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Make Qt.quit() from inside QML work in the examplesJan Kundrát2012-10-171-0/+2
| | | | | | | | Without this patch, the samegame's quit button does not work. Change-Id: I904832d018d589e90564534ac1eca02e0dbb54fc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* QQuickScreen attached obj handles screenChanged and geometryChangedShawn Rutledge2012-10-162-7/+22
| | | | | | | | | | sizeChanged is replaced with geometryChanged. Given a Window, it also needs to connect to the Window's screenChanged signal. The result is that if the screen is changed after the QQuickView is created, the Screen attached object will be updated. Change-Id: I64473dd960376b861eb50e3e5a1a296d0030e766 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>