aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update docs after modularization of docsTor Arne Vestbø2012-10-129-788/+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 imageelements example deploymentTopi Reinio2012-10-121-1/+1
| | | | | | | | Some of the .qml files were missing from INSTALLS Task-number: QTBUG-26996 Change-Id: I9508ca3c43f354a16405af68dbca0133117ee2e2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix performance bottleneck in QQuickWindow::mouseMoveEvent().Sérgio Martins2012-10-116-9/+146
| | | | | | | | | | | | | | | | | | 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>
* Add missing contents dir to installation of canvas exampleMiikka Heikkinen2012-10-101-1/+1
| | | | | | | Task-number: QTBUG-26995 Change-Id: Ib346c857f9e0bc97bb2e4365abddb6475c7142d4 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.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-102-2/+8
| | | | | | | | | 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>
* In tst_qqmlnotifier, verify the result of QObject::receivers()Thomas McGuire2012-10-101-0/+24
| | | | | Change-Id: If7f93e51afc46c153a87d00a9d9913e0058a09e8 Reviewed-by: Alan Alpert <416365416c@gmail.com>
* Update regex related tests of QJSEnginePeter Varga2012-10-101-15/+12
| | | | | | | | | Modify expected results based on ECMA-262 standard and current results of JSC. Task-number: QTBUG-27169 Change-Id: I705d474b2a62775860f6ff6eba8a0f6b28f50ff3 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.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>
* Be more verbose about error when using shared.h for examplesOliver Wolff2012-10-041-6/+14
| | | | | | | | Instead of just aborting the program it should at least give a hint about what actually went wrong. Change-Id: I4019b3c026ba1777905f457562bdc77e5c05df4f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* 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>
* Use correct path to qml files when looking for them in examplesOliver Wolff2012-10-041-1/+18
| | | | | | | | | | | | | As executables might end up in different folders on different plaforms when built, examples' shared.h should not rely on having the qml files in the same folder as the executables. On Windows they end up in debug/ release by default, while they are put in foo.app/Contents/MacOs on Mac if app_bundle is set in CONFIG. Change-Id: If0cea4c186920eb4689d5941b6ff5f333d97c574 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@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-283-8/+21
| | | | | | | | | | | 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>
* Examples: Fix calcqlatr.qmlprojectKai Koehne2012-09-281-1/+1
| | | | | Change-Id: I6a88f4f5c774962ad6c022954e0070d2a2eaadbd Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* Added lancelot-based scenegraph rendering regression testaavit2012-09-27208-0/+9671
| | | | | Change-Id: I6718d00ba96dc9c96dac82de4ded9228f6bfb990 Reviewed-by: Paul Olav Tvete <paul.tvete@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>
* HTML template: Updated copyright notice from Nokia to Digia PlcJerome Pasion2012-09-262-28/+3
| | | | | Change-Id: I0656a4331e3a6f6a6a527500565c73f50b61f8d1 Reviewed-by: Martin Smith <martin.smith@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>
* Mark some tests as insignificant to let change#35527 be integratedKonstantin Ritt2012-09-262-0/+6
| | | | | Change-Id: Ic4f7200e04d1decf3eb1be551606a73eeb90c5e5 Reviewed-by: Sergio Ahumada <sergio.ahumada@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-243-3/+3
| | | | | | | 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>
* test: Change declarative -> qml in global.cfgSergio Ahumada2012-09-241-1/+1
| | | | | | | This change will be needed to run tst_bic Change-Id: Id924b501bfd26121168c8e0e14dc49cbb883ccb2 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* tst_QQuickListView::sectionsDelegate_headerVisibility(): restore QSKIPJ-P Nurmi2012-09-241-0/+2
| | | | | | Task-number: QTBUG-24395 Change-Id: Idd403aa5e81965f4ebf14378b28b47c099a2c487 Reviewed-by: Caroline Chao <caroline.chao@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>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-232193-38283/+38230
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add QT_{BEGIN,END}_{NAMESPACE,HEADER} to qtquickglobal.hThiago Macieira2012-09-221-0/+6
| | | | | | | | Unit test is testing for it Change-Id: Ie37a0f7103dbe8c19a4cfbca2d4fe026c805ba0b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Doc: Updated doc templates in doc/globalJerome Pasion2012-09-212-2/+28
| | | | | | Task-number: QTBUG-27293 Change-Id: I37bb8ceb958d12d3670eb9db920078a585578721 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Qt QML: Updated qtqml.qdocconfJerome Pasion2012-09-211-5/+4
| | | | | | | modified path to doc/global Change-Id: I646b69c38381556f786e0b4346118d035cbd3648 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Avoid hanging if glGetIntegerv() fails.Jason Barron2012-09-211-1/+1
| | | | | | | | | If 'count' is not initialized, it could be anything and if the call to glGetIntegerv() fails and leaves this value unchanged then the loop could go through any number of iterations. Change-Id: Ibdcfd018b70e265ef6aeab87a5df8c0530c653a7 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Examples: Moved example documentation.Jerome Pasion2012-09-2192-720/+3511
| | | | | | | | | -inline \example pages into separate .qdoc files -fixed broken links to paths -moved ui-components under examples/quick Change-Id: I6e009b9213be3e1f4bed51bdbeb76a7a2142c80b Reviewed-by: Martin Smith <martin.smith@digia.com>
* Qt Quick: modified sources into documentation buildJerome Pasion2012-09-211-1/+5
| | | | | | | -added plugins and removed examples directory Change-Id: I66a5037334ec7249aa44e8bfa65fe5905b296f9d Reviewed-by: Martin Smith <martin.smith@digia.com>
* Qt Quick: Updated qtquick.qdocconfJerome Pasion2012-09-214-10/+758
| | | | | | | | Fixed paths to sources Added doc/global Change-Id: I377b31eba3b790ff3e6a69b2d1fbffce0229aac6 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Fix Flickable movementEnded() signal emissionAndras Becsi2012-09-181-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In case the content was flicked horizontally so that the vertical position did not change handleMouseReleaseEvent performed a fixup for the vertical position to be an integer _before_ starting the horizontal flick. For some large content the rounding fixup had finished before the flicking animation started which resulted in a premature emission of the movementEnded() signal. This race condition did not affect vertical flicking because the vertical animation had always been started before the horizontal fixup was scheduled. The issue was revealed by QQuickWebView which above a certain velocity threshold locks the movement in one direction, thus produces the exact same vertical position throughout a horizontal pan gesture. This patch removes the race condition by starting the flick animation in either direction first then performing the position fixup if needed. There does not seem to be a reliable way to auto-test this. Change-Id: Idc8fb59b0a6ead71c6cfc7083a386d51048ec50c Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Use the Module Identifier Directive to make the TimeExample correctLaszlo Papp2012-09-181-0/+1
| | | | | | | | | | | | | | | | From the documentation: "Declares the module identifier of the module. The <ModuleIdentifier> is the (dotted URI notation) identifier for the module, which must match the module's install path. The module identifier directive must be the first line of the file. Exactly one module identifier directive may exist in the qmldir file." More information can be found here: Task-number: QTBUG-26551 Change-Id: Ifd2a7e9a2868ac05baed0dbde9638ce85ff5004a Reviewed-by: Matthew Vogt <mattvogt2@gmail.com>
* qmlplugindump: Update help outputKai Koehne2012-09-181-1/+1
| | | | | | | | Qt.labs.particles 4.7 doesn't work since ages. Instead use Qt.labs.folderlistmodel 2.0. Change-Id: Ie11133adad88ac6120ab05aef9713f8e768f8bc8 Reviewed-by: Christian Kamm <kamm@incasoftware.de>
* Remove outdated bic test file.Frederik Gladhorn2012-09-172-18160/+0
| | | | | Change-Id: I41d90c8ed183f67c745ceb2ea187bb8a38c202fc Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
* Auto tests: PlatformQuirks::isClipboardAvailable()J-P Nurmi2012-09-173-111/+116
| | | | | Change-Id: I24c4417b7475ab07a47fbf5bf23d859e38b5c9ae Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* Autotests: Use qInstallMessageHandlerKai Koehne2012-09-1412-75/+74
| | | | | | | qInstallMsgHandler got deprecated in Qt 5. Change-Id: Icb6423c7d9f7e507ba36376b0af5ad183379c494 Reviewed-by: Martin Jones <martin.r.jones@gmail.com>
* Add a Q_UNREACHABLE to improve code generation a littleThiago Macieira2012-09-132-0/+2
| | | | | | | | The code can't reach there anyway, so let's help the compiler out a little. Change-Id: Icee6ebe426c1116a7baaf2c5766c6d8f8276f3ac Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Make the instruction table be constThiago Macieira2012-09-133-7/+7
| | | | | | | It's never going to be modified, so it should be const. Change-Id: Ibc3bac0583f72ccbf7caa69aeab029bae03d3cdd Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Remove tst_qquicktext::alignments()J-P Nurmi2012-09-1311-97/+0
| | | | | | | | | | | These tests are not valid. Will be covered by Lancelot-based scenegraph rendering tests: https://codereview.qt-project.org/#change,34437 Change-Id: I4e5e1b7b5b141d377e4367d143ded6abbddd52a1 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Caroline Chao <caroline.chao@nokia.com> Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>