aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* qmlscene can start with either an Item or Window as the qml rootShawn Rutledge2012-11-052-0/+27
| | | | | | | | | | | 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>
* 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>
* 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-293-14/+14
| | | | | | | | | | 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>
* 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>
* 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>
* Change qml list interfaceMarco Bubke2012-10-238-35/+92
| | | | | 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>
* 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>
* 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-191-5/+4
| | | | | | | | | | | 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>
* 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>
* 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>
* Doc: Changed the title to fix broken linksVenugopal Shivashankar2012-10-161-1/+1
| | | | | Change-Id: I84bdb335980fdeae0c91021179ede19eae79e811 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Remove interim compatibility measuresAlan Alpert2012-10-1614-156/+93
| | | | | | | | Also update some variables in qtdeclarative which failed to update rootItem->contentItem. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d3 Reviewed-by: Alan Alpert <416365416c@gmail.com>
* Fix crash in the qmlpuppet at finishingMarco Bubke2012-10-151-1/+2
| | | | | | | Task-number: QTCREATORBUG-8042 Change-Id: I30a5b40d6441ea1631ba11a97b062720e70ddca8 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Adding DesignerWindowManager for Qt Quick DesignerMarco Bubke2012-10-157-10/+277
| | | | | | | | | DesignerWindowManager implements a render path just for Qt Quick Designer, which is single threaded and does not open visible windows. Change-Id: I02b0d1b819a7a5391b9bb14ee6efa1a32e0c8ad7 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* We need to export QQmlVMEMetaObject to support the designerThomas Hartmann2012-10-121-1/+1
| | | | | | | | In the designer we need to access QQmlVMEMetaObject. Change-Id: I36627c6ce1c2c27bef8dd85374b65a542b00d1ef Reviewed-by: Aurindam Jana <aurindam.jana@digia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* Update docs after modularization of docsTor Arne Vestbø2012-10-124-11/+8
| | | | | | | | | The global files now live in qtbase only, and are made available to the other modules via the $QT_INSTALL_DOCS variable. Change-Id: I131408e27fec5b722ac1dece8e1ccf421fdaad67 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Fix performance bottleneck in QQuickWindow::mouseMoveEvent().Sérgio Martins2012-10-113-8/+42
| | | | | | | | | | | | | | | | | | When a mouse move event is received, a lot of time is spent looking for items with cursors, recursively. With this patch, it will only recur into item hierarchies that contain cursors. Not having cursors is much more common than having them. Benchmark included: Before: 15 msecs per iteration (total: 62, iterations: 4) After: 0.000064 msecs per iteration (total: 68, iterations: 1048576) Task-number: QTBUG-27054 Change-Id: I3a5441652ca1c0b8d2cbc5683013562174f5af4a Reviewed-by: Alan Alpert <416365416c@gmail.com>
* Remove calculateHash functionPeter Varga2012-10-101-79/+3
| | | | | | | This function has been moved into QtV8 module. Change-Id: Ibc5b0a52bd158e8880a10300eb6b89b7f43db0f6 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix QObject::receivers() within connectNotify()Thomas McGuire2012-10-101-2/+6
| | | | | | | | | The receiver count needs to be correct in connectNotify() to be compatible with ordinary connections. Fix this and add test. Change-Id: Icff0486dac49876b8c5d8836a85cff9284368a52 Reviewed-by: Alan Alpert <416365416c@gmail.com>
* crash fix in designersupportThomas Hartmann2012-10-091-1/+4
| | | | | | | | | | | | Unless result is an insert iterator, qCopy() assumes that all iterators in the range [result + (finish - start)] are dereferenceable. This is not the case for an empty list. Using foreach instead. Change-Id: I2212a88e9b462ae2220ba5aeb43c662592cec57f Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* Complete QmlJSVisitor for UiParameterListThomas Hartmann2012-10-084-1/+11
| | | | | | | | QmlJS::Visitor was missing the visit for UiParameterList. Change-Id: I3c2cb76b934059ebcef53c1a0faad3f239b33359 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Christian Kamm <kamm@incasoftware.de>
* Doc: Cleaned up Qt Quick module's titles and added them to groupJerome Pasion2012-10-044-10/+14
| | | | | | | -'qmlmodules' group contains the QML APIs in Qt Change-Id: I797e6ee0c9e643a92b9e16d476c93b34e79d67d8 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* Fix emitting originYChanged signals even when originY wouldn't changeGabriel de Dietrich2012-10-032-2/+12
| | | | | | | | | | | Same for originXChanged. Conflicts: src/quick/items/qquickflickable.cpp src/quick/items/qquickflickable_p_p.h Change-Id: I1a316f326b924da4722b692cf27db48312fc9236 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix in QmlJS parser for UiParameterListThomas Hartmann2012-10-012-0/+3
| | | | | | | | | | | | The propertyTypeToken was not initilized in this case. Not having the source location of this token leads to bugs in the tooling. e. g.: QTCREATORBUG-7931 I also added the initializer for program keeping the parser and the grammar in sync. Change-Id: Id7bfb4b6dd1b9689e701a858b6c769d3addab5dc Reviewed-by: Christian Kamm <kamm@incasoftware.de>
* Allow grabbing windows rendered without showing for testing.Balazs Kelemen2012-09-285-21/+24
| | | | | | | | | | | To make QQuickWindowPrivate::setRenderWithoutShowing more useful for autotesting we can allow grabbing such windows. This is safe if the platform window have been created and the window has a valid size. Change-Id: I8b9a2aaeb93935f662b75ef29651730b890441d5 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix potential crash when using text and more than 1 QQuickViewEskil Abrahamsen Blomfeldt2012-09-282-7/+20
| | | | | | | | | | | We need to use a resource guard for the FBO in case there is no current context when the glyph cache is deleted. This reverts commit b3264e2cb6a8fe87754aa1335ab9f8d5e3910c14 which was implemented as a band-aid for this crash. Change-Id: I5b3a09a3998da38836ea851cd0978d3ddadcd2cc Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix a crash in QQmlPropertyCache::findPropertyJocelyn Turcotte2012-09-282-25/+29
| | | | | | | | | | | | | | | | | | | | | When the top type of a QML component is a C++ type registered with qmlRegisterExtendedType, its QObjectPrivate::metaObject is already a QQmlProxyMetaObject that gets chained as the parent of the QQmlVMEMetaObject of the component. When QQmlPropertyCache::findProperty iterates over the parents chain of a child item, our QQmlProxyMetaObject eventually gets static_casted to QQmlVMEMetaObject and causes a crash. This patch implements a poor man's dynamic_cast in QQmlVMEMetaObject::parentVMEMetaObject to fix the crash. Other casts of parent.asT1() are changed to use parentVMEMetaObject as well even though in those cases the static_cast is guaranteed by the context. Task-number: QTBUG-27334 Change-Id: I5982fc273ccf466960ce54974cff5662e6ab605a Reviewed-by: Matthew Vogt <mattvogt2@gmail.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Update qMetaType helpers usage.Jędrzej Nowacki2012-09-271-8/+8
| | | | | | | | QtDeclarative is using private meta type api to register custom types, but the helper functions were updated to a new signature. Change-Id: I467b283b5b1ccdad8ebd1a2bb651e8ad59b9c55d Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Doc: Removed the verbs from the page and section titlesVenugopal Shivashankar2012-09-261-15/+13
| | | | | | Change-Id: I9f8b98e40340a5f871f7a66a3d7ea63675e21d34 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Work around mis-optimisation on QNX/SGX in AA vertex shaderSean Harmer2012-09-262-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | The new AA algorithm which is implemented in the vertex shader of SmoothColorMaterialShader and SmoothTextureMaterialShader exposes a driver bug in the glsl compiler/optimiser for the GPU used in the BlackBerry PlayBook. The bug results in the if (scale < 0.0) scale = 1.0 code always being executed even when the condition is false. This leads to massive corrupion of Image, Rectangle, and BorderImage elements when the antialiasing property is enabled. This commit works around the compiler bug by refactoring the vertex shader to explicitly include an else clause. The check for negative values is now performed on the numerator only as the denominator is dot(dir, dir) which is always positive (square of magnitude of dir vector). This gives the correct behaviour on all platforms (that I have access to). Change-Id: I236542c9b59ff2915e95cbd9300b442be316bba9 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* doc: Fix some typos in C++ integration documentationEskil Abrahamsen Blomfeldt2012-09-263-3/+3
| | | | | Change-Id: I883109cf2528a5e10487b38f453c2eed96cc3204 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Android also needs <ctype.h> for isspace() to be found.Samuel Rødal2012-09-251-1/+1
| | | | | Change-Id: Ic1299cd8949c37c6909b8d2ab36e930097335a4d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fixed instances of "to to" in qtdeclarative.Samuel Rødal2012-09-241-1/+1
| | | | | | | Really it should just be "to". Change-Id: I3263c8d6ce2f0ad33ab12d7ddb9202beac578f91 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fixed missing virtual destructors in qtdeclarative.Samuel Rødal2012-09-249-4/+25
| | | | | | Change-Id: I0b0e63b572617a56874e27361479de2690644aa3 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Windows CE buildfixAndreas Holzammer2012-09-242-1/+5
| | | | | | | | | Windows CE has a define for CONST, so undef it. Change-Id: I13d363657e91956c611dee4cf90cd17f6a0fa234 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add missing QT_{BEGIN,END}_{NAMESPACE,HEADER}Sergio Ahumada2012-09-232-0/+8
| | | | | Change-Id: I5f61a443b49d40c66669fa0c679df7eaab761e73 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>