aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Remove tst_qquicktextedit::alignments()J-P Nurmi2012-09-1311-91/+0
| | | | | | | | | | | These tests are not valid. Will be covered by Lancelot-based scenegraph rendering tests: https://codereview.qt-project.org/#change,34437 Change-Id: I5f32d09f95bab1b153c821b101599ee7d52e1867 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: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
* Remove tst_qquicktextinput::horizontalAlignment()J-P Nurmi2012-09-134-36/+0
| | | | | | | | | | | These tests are not valid. Will be covered by Lancelot-based scenegraph rendering tests: https://codereview.qt-project.org/#change,34437 Change-Id: I1bb6261d7849ec00e23acce496c1e2e61152322e 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: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
* tst_v4::qtscript(): QSKIP -> QEXPECT_FAILJ-P Nurmi2012-09-131-3/+1
| | | | | Change-Id: I0a9b657b3ce81e0fc3bc788d0db64d27505eba10 Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* Qt Quick docs: Added link to the submodules' pages.Jerome Pasion2012-09-122-2/+29
| | | | | Change-Id: Ia5d8967e241e0697f2903f26899d878210dd5570 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
* Add .qmltypes filesKai Koehne2012-09-1220-0/+6814
| | | | | | | | | | | | | | | | | | | | .qmltypes files are used by e.g. Qt Creator to provide code completion etc for QML types defined in plugins. The added files where generated with qmlplugindump, e.g. qmlplugindump QtQuick.Particles 2.0 > plugins.qmltypes (ideally make qmltypes would do the same, but it's not working as expected right now). The exception is the QtQuick plugin: Here the file is generated with qmlplugindump -builtins > plugins.qmltypes and contains also the types registered in the qml library itself. Change-Id: I1a6b6641cb5ec3ecffe08e8926d8c1bc082ae6de Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* tst_QJSEngine::jsFutureReservedWords(): QSKIP -> QEXPECT_FAILJ-P Nurmi2012-09-121-1/+10
| | | | | | Task-number: QTBUG-27193 Change-Id: Iaf0bed44374396e59ad3d7f977e3f29d7d5112ee Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-118-14/+1
| | | | | Change-Id: Ide2e054e9b5b58976410d16ca4f76fd55e61676d Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* qmlplugindump: Fix handling of implicit signalsKai Koehne2012-09-101-1/+1
| | | | | | | Change I70affc450 added inverted logic. Change-Id: I6cb25d3881a0487545a3eeac289a34fedcc21d8f Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* Fix calculation of QML_RENDER_TIMING valuesThomas McGuire2012-09-102-4/+4
| | | | | | | | The sync time was not taken into account Change-Id: I3d8adb637572c72438e20729a80513850a80d17e Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Alan Alpert <416365416c@gmail.com>
* QML_RENDER_TIMING: Add time since last frame to outputThomas McGuire2012-09-102-2/+10
| | | | | | | | | This is quite useful to see how much time the rest of the app takes. The same information has been available in QtQuick1. Change-Id: I31ae91bfa764a4d8013af80de9459514ed72314f Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add QML_RENDER_TIMING output for the single-threaded caseThomas McGuire2012-09-101-0/+22
| | | | | | Change-Id: Ia3958c7c26bf2fd9dd72a07fc6f5ff3a28b0a349 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Use DEFINE_BOOL_CONFIG_OPTION for QML_RENDER_TIMINGThomas McGuire2012-09-101-5/+5
| | | | | | | | This makes it easier to grep for. Change-Id: I7630e05c4afddb4ab3ce1a7691466d7307325988 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Update the git-archive export optionsThiago Macieira2012-09-102-2/+4
| | | | | | | | | | | | | | The .gitattributes and .gitignore files do not need to be present in packaged sources, as they are for people using the Git repository. People who download tarballs usually don't reimport into Git -- they should just download the actual repositories. Meanwhile, the .tag file is quite useful. Instead of making Git extract to the useless SHA-1 of the "$Id$\n" string, ask git-archive to store the SHA-1 of the commit being packaged. Change-Id: I5850800f9706dda342596a9db383e9d2c60e3c3e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* doc: fix some more typosSergio Ahumada2012-09-109-9/+9
| | | | | Change-Id: I7fa055049b9e5900d597754c6004febb153de12b Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* test: Check for null string comparisonSergio Ahumada2012-09-101-1/+1
| | | | | | | Do not compare a QString to QString(). Instead use the .isEmpty() method. Change-Id: I4ef0c050f97b2070ed13d89305ad894479e42dd6 Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* tst_qquickfontloader: remove unnecessary skips on WindowsJ-P Nurmi2012-09-071-21/+0
| | | | | | Change-Id: I319d0a5cc2387c5bc1b308e6e12a33e720a2d722 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* Fix tst_qquickanimatedimage::mirror_running()J-P Nurmi2012-09-071-10/+14
| | | | | | Change-Id: I6916d90736144101b52449485b09335ac124e498 Reviewed-by: Caroline Chao <caroline.chao@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Compile following qreal -> float change in QtGui/math3d classesSean Harmer2012-09-071-2/+2
| | | | | | | | | | | This is needed following change https://codereview.qt-project.org/#change,33148 Change-Id: I836d4037306d1efbff48668ff8dd2b7b5ce97516 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* QtQml tests: remove QSKIP -> wrap within !QTEST_CROSS_COMPILED guardsJ-P Nurmi2012-09-072-14/+12
| | | | | Change-Id: I200bf6feb137e39061f144bdabd825dea70bd539 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* tst_QQuickPathView::package(): updated QSKIP()J-P Nurmi2012-09-071-1/+1
| | | | | | | | | | QTBUG-21590 has been marked as resolved, but the problem persists. A new bug QTBUG-27170 has been reported and the QSKIP() updated accordingly. Task-number: QTBUG-27170 Change-Id: I91d7df2588d87af833502f6c11d2e6a051e4ebb5 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* doc: fix some typos in .cpp filesSergio Ahumada2012-09-0726-31/+31
| | | | | Change-Id: Ica7685aefde84ec80d8af7a67541af454de4adce Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* qmlplugindump: Fix dumping of typesKai Koehne2012-09-071-1/+1
| | | | | | | Dumping broke with commit 70a2c049. Change-Id: Ifbae3dbc3e2d255c1e7f8848c579c04d0bf4b48e Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* qmlplugindump: Take care of 'void' typesKai Koehne2012-09-071-2/+2
| | | | | | | QMetaMethod::typeName() does now return "void" instead of an empty string (change 22d621dd). Change-Id: I70affc450a7dd36b121cbcf580c0ca6fd5944f0b Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* Updated tst_QJSEngineJ-P Nurmi2012-09-071-9/+5
| | | | | | | | | | Replaced several QSKIP() instances with QEXPECT_FAIL() and removed execScript from the list global object properties as it has been removed from V8: http://codereview.chromium.org/7046002/ Task-number: QTBUG-27169 Change-Id: I28bbb38971ad80551ec24285a321e545db44a79d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* tst_qquickflickable: fix compilation warningJ-P Nurmi2012-09-071-1/+1
| | | | | | | | warning: converting 'false' to pointer type for argument 2 of 'void QQmlContext::setContextProperty(const QString&, QObject*)' Change-Id: Iec0f8bba115f05c7392d6654cd1f52d06ff96e97 Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* Wrap tst_qqmllocale::timeZoneUpdated() within Q_OS_UNIX to remove QSKIPJ-P Nurmi2012-09-071-19/+20
| | | | | | Change-Id: I9cb0da7dbca6401069f572aef15d5375aadce30d Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* Doc: Fix documentation issues.Kim Motoyoshi Kalland2012-09-077-27/+104
| | | | | Change-Id: I03c4faa1aee60cd1ad706cb6c1b983f03311d251 Reviewed-by: aavit <qt_aavit@ovi.com>
* doc: fix some typos in .qml filesSergio Ahumada2012-09-0714-14/+14
| | | | | Change-Id: Ice5d60b06ec9ab81fbd98fd1679c8834f3018938 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Attempt to fix tst_QQuickListView::sectionsDelegate_headerVisibility()J-P Nurmi2012-09-061-5/+4
| | | | | | | Task-number: QTBUG-24395 Change-Id: I07b0fc17566e86dcebf913721f293378cf15466b Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* Fix typo in documentation.Sérgio Martins2012-09-061-1/+1
| | | | | Change-Id: I4d8d12cfce58e49789146639cc6734b6cf1643fa Reviewed-by: David Faure <faure@kde.org>
* Doc: Use settings from global qdocconf.Casper van Donderen2012-09-052-101/+6
| | | | | | | Depends on the integration of #34077 Change-Id: I188d7617c4805d00226d0fb8d5768a02d24c6933 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
* Doc: Fix some documentation issues.Kim Motoyoshi Kalland2012-09-055-31/+22
| | | | | Change-Id: I0f7e60fd6060381bd8790dfaacc3a39a890a0fe7 Reviewed-by: aavit <qt_aavit@ovi.com>
* Remove windowmanager hacks form the incubation controller.Gunnar Sletta2012-09-045-60/+54
| | | | | | | | | | Tie incubation directly to wether animations are running or not. When animations are running, we incubate for a third of a frame only. When animations are not running we incubate whatever is left as the scene is anyway idle. Change-Id: I88c9248e9d7b3b35c99fca52aeb9c681d1b4a306 Reviewed-by: Martin Jones <martin.jones@nokia.com>