aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release' into old/5.0old/5.0Oswald Buddenhagen2013-04-1138-61/+108
|\ | | | | | | Change-Id: I6e6f2ed367f89bab2114025478c873cfb132fe02
| * Doc: Spelling fix.v5.0.2Jerome Pasion2013-03-261-2/+1
| | | | | | | | | | | | | | "sufficent" -> "sufficient" Change-Id: Id46e15c3fb0a2514e8a391108065a52a18da6936 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Add changes-5.0.2 fileSergio Ahumada2013-03-251-0/+45
| | | | | | | | | | | | Change-Id: Ifb952f46be13cd1009a82131d1eb7c17962c7118 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| * Try to stabilize tst_QQuickPathViewSergio Ahumada2013-03-211-1/+1
| | | | | | | | | | Change-Id: I673604d4f0bc90352efe115422762c7c4ec210ad Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Try to stabilize qquickimage and rendernode tests.Gunnar Sletta2013-03-214-21/+22
| | | | | | | | | | | | | | | | | | | | Some of Our CI machines are running on tiny screens and recent changes in Qt have caused us to limit windows to the screen geometry (which is sensible). Change-Id: I29eb3b5c73a7ea650ac26494c25d204fb254dee3 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Fix duplicate examples for qml/quick modulesKai Koehne2013-03-2135-55/+58
| | | | | | | | | | | | Task-number: QTBUG-30233 Change-Id: Ic0a6d9112dbf8903d68f571e0ac853d89ff31ebe Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Try to stabilize qquickimage and rendernode tests.Gunnar Sletta2013-03-204-21/+22
| | | | | | | | | | | | | | | | | | Some of Our CI machines are running on tiny screens and recent changes in Qt have caused us to limit windows to the screen geometry (which is sensible). Change-Id: I29eb3b5c73a7ea650ac26494c25d204fb254dee3 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | QQuickItemView: Add guard before returning currentItem itemCaroline Chao2013-03-193-3/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | And don't check if the currentItem is empty before calling applyPendingChanges(). And an autotest. (Patch from Steffen Imhof) Task-number: QTBUG-30227 Change-Id: Ia16362a6d0dce771f20772929c32e9306ed0e0f9 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Fix jump and property changes on first move when dragging a Flickable.Andrew den Exter2013-03-192-21/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a regression introduced by https://codereview.qt-project.org/48690 whereby on the first mouse move the contentItem was moved the total distance from the touch point to where the drag distance was exceeded. For large drag thresholds this causes a noticeable jump. Reverting the dragStartOffset portion of that change fixes the regression. That same change was also resposible for the property update regression https://codereview.qt-project.org/49768 attempted to fix. That change is also reverted as it was unnecessary and may have introduced some regressions of its own. Task-number: QTBUG-30032 Change-Id: I7723b459cc5a6a0731893aeb6332d00cad1bd79b Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* | Add clocks.qmlprojecthjk2013-03-141-0/+8
| | | | | | | | | | | | Change-Id: I4fb063d1a4ccc990b5098237f1784b3dce015a81 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Smooth dragging an item with MouseArea.Andrew den Exter2013-03-143-21/+28
| | | | | | | | | | | | | | | | | | | | Calculate drag distance relative to the mouse position when a drag is detected rather than the press position so there isn't a large change in position on the first move. Task-number: QTBUG-30188 Change-Id: I5c2269c2228668a3842e18f65167637497b3beb4 Reviewed-by: Joona Petrell <joona.petrell@jollamobile.com>
* | Fixed tutorial gettingStartedQml part5.Libor Tomsik2013-03-131-5/+5
| | | | | | | | | | | | | | In FileDialog.qml the selector GridView.view.currentIndex does not work, replaced with dirView.currentIndex Change-Id: I7c1893ce3872c41fc4f0fd63bad0e6a2cff2b207 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Stephen Kelly2013-03-131-0/+2
|\ \ | | | | | | | | | refs/staging/stable
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-03-121-0/+2
| |\| | | | | | | | | | Change-Id: I9f54f308efc4d165d091f215d0b031e4e895d749
| | * define MODULE_VERSIONOswald Buddenhagen2013-02-271-0/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-29838 Change-Id: I03ce9975ede5cff53e976409e2fabff1f56e1ea9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Merge branch 'stable' into releaseJohanna Aijala2013-02-212236-2800/+10167
| | |\ | | | | | | | | | | | | Change-Id: I13e80072db1e2c14a37b6a123276be81b085e87e
* | | | Doc: Changed section title in whatsnew.qdocJerome Pasion2013-03-131-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - "Qt 5.0" is the name of the main landing page, which causes link conflicts in Qt QML module. Change-Id: I2becb864873ea3784eb4fece3ebcbe64e0a00cba Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* | | | Makes QSmoothedAnimation respect zero duration.Thomas Kristensen2013-03-133-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In automated GUI test scenarios it often desired not to wait for animations before verifying a result, so setting the duration to zero should accomplish this, before this patch; if duration was set to zero QSmoothedAnimation would treat it as if duration was not set, and used velocity to calculate animation speed. Change-Id: Ia57f1c9ffdd2056ac7c85d1cb94dbd3835fcbb7a Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
* | | | Fixed text opacity when using Text.NativeRendering.Yoann Lopes2013-03-121-1/+1
|/ / / | | | | | | | | | | | | Change-Id: I76922074c02c368f8a8a6998c478a33537e9a6e8 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | | make the sample code more consistent in contextXingtao Zhang2013-03-121-1/+1
| | | | | | | | | | | | | | | Change-Id: Id831032a937bf07b70515e95ff481ea8a741edeb Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Improve the ordering of Flickable dragging and moving property updates.Andrew den Exter2013-03-123-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the contentItem after the dragging and moving properties have been updated so they return the correct values from the onContentYChanged and onContentXChanged handlers. Task-number: QTBUG-30032 Change-Id: I15716dc8eee4d9836f96362a8b49f1d0c404b0c2 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | Improve timer dependent tests.Frederik Gladhorn2013-03-1110-5014/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tst_QQuickLoader::loadedSignal depended on sharing the engine with simultaneousSyncAsync and that function being run before it. After each test run call clearComponentCache() as that is important for caching of the network tests. The test server would send the item after 500ms. Sometimes the CI would be faster or slower. Instead of relying on timing, simply call a function when the reply should be sent. Change-Id: Ifb0447041197e1cba103570597a62a2510d31aab Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | Fix warning about uninitialized value in QML-ECMA-test (CLANG).Friedemann Kleint2013-03-111-1/+1
| | | | | | | | | | | | | | | Change-Id: Ifcc3ef0e0e65245758697d7302e8227bb6e748f7 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | | Fix warning about use of uninitialized value in QML-debug helpers.Friedemann Kleint2013-03-111-14/+14
| | | | | | | | | | | | | | | Change-Id: Ifcba9c1224dfa7db069ef71b1bb39e3c7658a7b5 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* | | Fix warning about adding int to a QString (CLANG).Friedemann Kleint2013-03-111-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ibc84dcbe5ca4519bb1ac25e5d5463ef58c48190e Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | | Simplify function with early return.Frederik Gladhorn2013-03-111-30/+31
| | | | | | | | | | | | | | | | | | Change-Id: Ic0e1a32f6c586e75fb7389ef8009e56881942cf1 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | | Stabilize tst_qquicktextinput::remoteCursorDelegate()Frederik Gladhorn2013-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases QCOMPARE(component.status(), QQmlComponent::Loading); (line 2800) is failing -- it appears to be Ready immediately. Add a delay to ensure it always hits Loading before Ready. This is a backport of change: I975f3b3ea6004f178a7b0fb21193dcbdaf483157 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Backported since the test keeps on failing for the stable branch. Change-Id: Ic90f1fc3de3e0a0ee75026cbebf8d99304a67b98 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* | | Fix TextEdit::persistentSelection docs (false by default)J-P Nurmi2013-03-011-1/+1
| | | | | | | | | | | | | | | Change-Id: I3576e08b2bf159250a163466f1402952c7520e8b Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | | Mark flaky tst_qv8profilerservice test as insignificant on MacKai Koehne2013-02-281-0/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29975 Change-Id: Ia80fab4342c365e08fde56812bd331ee7ce13bc7 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | | GridView: fix resetColumns() to calculate the amount of columns rightJ-P Nurmi2013-02-261-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-29822 Change-Id: I3649398f3d283bc2781daa6b3071538414653e6d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | | Use qmake for package dependency resolution in cmake tests.Stephen Kelly2013-02-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This allows us to remove hardcoded depends information. Change-Id: Ia2b364a65484a2d99320cc3d45cfcbb5a0b68c6e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | Fix headers without Qt module directory name in their includesJosh Faust2013-02-254-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed headers to include the Qt module directory in their #include directives, e.g. <QtCore/QObject> instead of <QObject>. QTBUG-29797 Change-Id: I6f61973deb4e48158d3eff896afd81ca4b8ae960 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | | Fix warnings about shadowing membersThiago Macieira2013-02-224-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | util/qqmlpropertymap.h:87:9: error: declaration of 'parent' shadows a member of 'this' [-Werror=shadow] [and others] Change-Id: I2ff1a3c133efe2132e74dad00596931a84a7f421 Reviewed-by: Alan Alpert <aalpert@rim.com>
* | | ListView's highlightMoveDuration should default to -1.Michael Brasser2013-02-222-1/+16
| | | | | | | | | | | | | | | Change-Id: Ibb53cc21b4f1f301569cd7724c60cb8df978921a Reviewed-by: Bea Lam <bea.lam@jollamobile.com>
* | | Flickable shouldn't grab the mouse until it starts an effective move.Andrew den Exter2013-02-225-34/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the boundBehavior prevents the flickable from moving its content item in response to a drag it shouldn't grab the mouse as that will prevent a parent MouseArea or Flickable from handling the drag. Task-number: QTBUG-29718 Change-Id: I3a1be4ed0132b91dca2fb0387ecefd39275a52da Reviewed-by: Alan Alpert <aalpert@rim.com>
* | | MouseArea shouldn't grab the mouse until there is an effective drag.Andrew den Exter2013-02-223-30/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A MouseArea shouldn't prevent a parent MouseArea or Flickable from handling a drag event unless it is going to do something useful with it. Task-number: 29717 Change-Id: I24016994f6cf9116382ef7faeb50b10e5716e10e Reviewed-by: Alan Alpert <aalpert@rim.com>
* | | Typos: tripple->tripleFrederik Gladhorn2013-02-212-21/+21
| | | | | | | | | | | | | | | | | | | | | This enables grepping. Change-Id: Ibf85800b998a02645c50b1b84d42088d16091378 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* | | Stabilize clicking in QQuickTextEdit testFrederik Gladhorn2013-02-211-0/+2
| |/ |/| | | | | | | | | | | | | | | This test would try to emulate mouse clicks and not wait inbetween. That can lead to clicks spilling over to the next mouse event. Change-Id: I320f86453215190a1c694ba49c0fc3831dcb60b9 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* | Add Test for Animating Qml Dynamic Properties using QPropertyAnimationDavid E. Narváez2013-02-214-0/+166
| | | | | | | | | | | | | | | | | | | | Test case for calling QQmlVMEMetaObject::metaCall from QPropertyAnimationPrivate::updateProperty Task-number: QTBUG-29082 Change-Id: Iecab74132eb3a843e53356effe3b6bbe4d5a8fb2 Reviewed-by: Alan Alpert <aalpert@rim.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Doc: Fix paths and add missing project files for QML and Quick examplesTopi Reinio2013-02-209-6/+102
| | | | | | | | | | | | | | | | | | | | This change fixes a number of 'example path does not exist' warnings from qdoc, and adds .qmlproject files for pure qml examples so they'll appear correctly in the example manifest files. Change-Id: Id0a424c4826fb5d8ebe6c3309bf33b976ff8477c Reviewed-by: Geir Vattekar <geir.vattekar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Fix QQuickTimeLine::accel() & accelDistance()J-P Nurmi2013-02-201-3/+4
| | | | | | | | | | | | | | | | | | | | Do not compare real numbers (velocities, accelerations and distances) to 0.0f, but use qFuzzyIsNull() and qIsNaN(). Task-number: QTBUG-29144 Change-Id: I8fe7ebfbc9f665fa2507e66344d081ef2f43b181 Reviewed-by: Alan Alpert <aalpert@rim.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Fixed build when Qt is configured with -no-opengl.Samuel Rødal2013-02-204-15/+11
| | | | | | | | | | | | Task-number: QTBUG-28849 Change-Id: I331ebca76892ce7ffbc6f8e03ff4afe0c8e28d5e Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Docs: Slow Down Animations only exists in qml1Frederik Gladhorn2013-02-191-8/+0
| | | | | | | | | | | | | | The functionality was part of qmlviewer. Change-Id: Iaf2e19acf54e6773e2b79659f4dc51b92de91dd4 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Clarify Component::createObject docsAlan Alpert2013-02-191-2/+2
| | | | | | | | | | | | Task-number: QTBUG-29650 Change-Id: Ie6f9027ff779f8a513a52b425d9a393c0ecd9c7d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Fix embedding images in text elementsEskil Abrahamsen Blomfeldt2013-02-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | It seems that the the inner target rect has either been added recently or its default has been changed to something invalid, because we need to set it to the same as targetRect for the image to show up at all. Task-number: QTBUG-29560 Change-Id: I0fe6b7c5ab07afc780b8ea33a7ccc210861e0821 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Doc: Update QtQuickTest documentationCaroline Chao2013-02-181-0/+28
| | | | | | | | | | | | | | | | | | | | Add some information about -input, -functions and -help command-line options. Add some examples on how to run a single file and a single function for a QtQuickTest based test. Change-Id: Icd5f92bf8541aa412e2cd18d82dec16a85fe78c9 Reviewed-by: Alan Alpert <aalpert@rim.com>
* | Doc: Correcting typo "without with"Marcel Krems2013-02-181-1/+1
| | | | | | | | | | Change-Id: Ibacbb9aefe9a333994014aec17a0079477a4618f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Fix missing TextInput::remove(int start, int end) docsJ-P Nurmi2013-02-151-1/+1
| | | | | | | | | | Change-Id: I0c98e713d53391a191435e5c17b58becddf6d451 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Doc: Removed reference to deprecated \badcode command.Jerome Pasion2013-02-153-7/+11
| | | | | | | | | | | | | | | | | | QDoc doesn't differentiate between \badcode and \code. They both look the same in the output. Change-Id: Ia0580f7d664ad5e33b48d6511dac7c61349cacce Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Add license files mandated by (L)GPL.Timo Jyrinki2013-02-154-0/+1660
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only qtbase includes the required LICENSE files, which are referred to from the code headers. The same files should be distributed as part of all the modules as well, so that the (L)GPL licenses are adhered. These files were wget:d from: https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL As an addition to above, added also LICENSE.FDL. All the modules additionally require it, since they include at least *.qdoc files and in some cases a couple of others. File received via wget http://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.FDL Change-Id: I35cb3523061cfb041084fe9a7e60928c44e224b2 Reviewed-by: Jason McDonald <macadder1@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 12:42:14 +0000