aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Reintroduce docs for Qt Quick Models and Views examplesTopi Reinio2013-09-187-5/+150
| | | | | | | | | The .qdoc files/images for these examples were lost during modularization. This change adds them back and fixes related links. Change-Id: Id5260daad1c38284e3aa8178ae82d24067f4e88c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Improve QML Date object documentation.Mitch Curtis2013-09-171-7/+97
| | | | | | | | | | | | | | | | | Carrying on from https://codereview.qt-project.org/#change,61255, I've added documentation for the from*String() functions, as they weren't actually documented. I've also formatted some arguments and linked to Locale documentation where the format enums are mentioned. Note that, because of QTBUG-32505, I can't link to the format enum directly, so I just link to the Locale page itself. The import QtQuick 2.0 should also be removed from the documentation when that bug is fixed. Task-number: QTBUG-32492 Change-Id: I19c6c8450746ef2a68bc55fd3ef7db776f4acc35 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Move properties of Locale QML type to correct moduleTopi Reinio2013-09-175-34/+34
| | | | | | | | | Moves property and method documentation for QML Locale type from Qt Quick to Qt Qml module, and fix a number of broken links in locale-related docs. Change-Id: Id9e01314ea867987f5159ca3bffcc40abb27b289 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Fix qmlClearTypeRegistrations testsAlan Alpert2013-09-176-1/+210
| | | | | | | | | | The manual test now tests that QtQuick can be loaded second try, and an autotest has been added to ensure that the function does not affect correctness. Task-Number: QTBUG-32078 Change-Id: Ifd55e12c2c31e2e181054f897f10f02a2811c5d1 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Mark tst_qquicktrailsemitter insignificant on windowsAlan Alpert2013-09-171-0/+2
| | | | | | | | | Has been blocking CI intermittently, but not locally reproducable. Task-number: QTBUG-33421 Change-Id: I0e876fe1f236a00a9ecad2231aa7ff50a4b8d590 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Add missing file to qquickflickable testMartin Jones2013-09-091-0/+26
| | | | | | Change-Id: I69014a85f61bbf1958daa1e4b6cda59534c04a83 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Stabilize tst_QQuickMultiPointTouchArea.Friedemann Kleint2013-09-061-94/+79
| | | | | | | Center windows on screen, introduce QScopedPointer. Change-Id: Ia9205f74211eba1f2d2250ff1c76f54618ed7d79 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fix a warning about not using a set variableLaszlo Papp2013-09-051-0/+1
| | | | | | | | | 6a36bcb7945109daebd6464ee6d0a3f6724fb18b fixed similar warnings, but apparently the tools folder was left out. Change-Id: If7f889e404264688fa6208afcd3bfdba5a161714 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Removed the static intialized boolean of qquickitemsmodule.Dominik Holland2013-09-051-5/+0
| | | | | | | | | This prevents a reregistration of the all QQuick2 types when qmlClearTypeRegistrations() is called Task-number: QTBUG-32078 Change-Id: I33b4c069183d6344a2f14b4147eaa7056c3b72b9 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fix qmlClearEnginePlugins() to clear engine plugins.Dominik Holland2013-09-051-16/+38
| | | | | | | Task-number: QTBUG-32078 Change-Id: I2d3aeb6b91ffdb9b8c70ad93d1e43daada84fb7f Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Fix crash tst_qqmllanguageDominik Holland2013-09-051-1/+0
| | | | | | | | | | | | qmlClearTypeRegistrations() shouldn't be called when instances of QQmlEngine are still open. This can lead to unexpected behavior. For the qmlClearTypeRegistrations() function there is separate autotest Task-number: QTBUG-32078 Change-Id: I32612bc82602593d902bbffc58911e427b50524f Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fix tons of reference errors in tst_qquickpositionersJ-P Nurmi2013-09-051-0/+6
| | | | | | | | | Due to missing context properties: ReferenceError: fooBar is not defined Task-number: QTBUG-33018 Change-Id: Ibba95ab688a8d5cadc94bdeb30d0ec087ffe3c0c Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fix compiler warning about unused variableKai Koehne2013-09-041-1/+1
| | | | | Change-Id: I2dda2462170658a678a35a6fafdb5d39a8d8e9f4 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fix crash on QV8Engine destructionJosh Faust2013-08-301-1/+1
| | | | | | | | | | | | QObjects tracked by QV8Engine can end up causing bindings to execute when the QV8Engine is being deleted, which can call through to QV8Engine::fromVariant(). This change ensure that that is valid while the QObjects are being destroyed. Task-number: QTBUG-31555 Change-Id: Iaea402ff65993bb2322af403d3590653005e30fe Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Stabilize tst_rendernode.Friedemann Kleint2013-08-301-8/+33
| | | | | | | | Center windows on screen, add QSKIP for screen depth, add error message to color comparison. Change-Id: I03d600a4810f27654e0b971b19631ba51c9f6874 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* tst_QQuickItemLayer: Specify precision in shader for ANGLE.Friedemann Kleint2013-08-301-2/+2
| | | | | | | | | tst_QQuickItemLayer::layerSourceRect() QQuickCustomMaterialShader: Shader compilation failed: ERROR: 0:9: '' : No precision specified for (float). Change-Id: I3ab87c747bed5b8c8cfcf5527ee2a8b2ebd891a2 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* tst_qquickpathview::cancelDrag(): Move mouse after setUrl().Friedemann Kleint2013-08-301-1/+1
| | | | | | | | | Take correct window size into account. Task-number: QTBUG-32662 Change-Id: Ie04c8fe8e254d232f076e6f9d9d0d96f12a4530f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Initialize variables in ShaderEffectSource's texture provider.Gunnar Sletta2013-08-281-0/+4
| | | | | Change-Id: I3d737b923ee0282f58d7a2ee96824f184469daf5 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Fix crash when trying to set versioned group propertiesSimon Hausmann2013-08-281-1/+3
| | | | | | | | | | | If a property isn't available due to revisioning, we print an error message. Producing the error message should be done with care of obj->type being -1 to avoid out-of-bounds on the output->types array. Task-number: QTBUG-33179 Change-Id: I7bd420f2dfa0ca2d616340a68999d58022974435 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Updated distance field glyph caches to use QDistanceField.Yoann Lopes2013-08-276-31/+40
| | | | | | | | | | | | | | Some OpenGL drivers assume alpha-only images are always tightly packed, regardless of what is set for GL_UNPACK_ALIGNMENT. We now use QDistanceField to store glyphs, which aligns scanlines on a 1-byte boundary, instead of QImage which uses a 4-byte boundary. A previous workaround uploaded scanlines one at a time, but this is also broken with some other drivers... Task-number: QTBUG-30908 Task-number: QTBUG-32861 Change-Id: I46527fb48de1e00116f776427c45baa752c6176d Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Don't crash due to KeyRelease on an unloaded ItemShawn Rutledge2013-08-271-3/+3
| | | | | | | Task-number: QTBUG-33127 Change-Id: Ie0c28abdb32c3b2318f934d3d2ddf459329384a2 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Fix girth of native text with grayscale AA or styleEskil Abrahamsen Blomfeldt2013-08-272-46/+41
| | | | | | | | | | | | | | | | | | When using a grayscale glyph cache, the source data should be interpreted differently, like in the OpenGL paint engine. We should not do srgb gamma correction and we should use the default blend mode. This also fixes styled text, since that will always default to a grayscale glyph cache. This patch ensures: 1. That we detect when the font requires grayscale AA (e.g. when font smoothing is turned off in the OS) 2. That we interpret the source data correctly. Task-number: QTBUG-31720 Change-Id: I600f4a28cd443caa0a8d5544d219b47436cde693 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Fix warning about unused variable.Friedemann Kleint2013-08-271-1/+0
| | | | | Change-Id: I29f5b2b890f561bc97749d19c0c5f461511c7637 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Explicitly call setCursor in the QQuickMouseArea constructorDaiwei Li2013-08-271-0/+6
| | | | | | | | | | | | | | QQuickItemPrivate has a boolean hasCursor that is used by QQuickWindow to determine whether to use the cursor for an item. QQuickMouseArea has a default cursorShape of Qt.ArrowCursor that is ignored due to hasCursor not being set. Thus, call setCursor in the QQuickMouseArea constructor to sync the cursor state of the QQuickItem and the MouseArea. Task-number: QTBUG-33157 Change-Id: I56402564bd72bdc89d6ef8e5bc75bfd07c096202 Reviewed-by: Josh Faust <jfaust@suitabletech.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Stabilize tests using utilities from QQuickViewTestUtil.Friedemann Kleint2013-08-266-11/+84
| | | | | | | | | | | | | Change QQuickViewTestUtil::createView() to center the window on the screen to avoid taskbar areas. Add routine to move the mouse away and use that in tests using QQuickViewTestUtil::flick() and other mouse interaction since the mouse cursor can interfere with it. Affected tests: qquickgridview, qquickpathview, qquickflickable, qquicklistview, qquickrepeater and qquickpositioners. Task-number: QTBUG-33017 Change-Id: I540c0efb54a231dcb44c8fd5ad9573a2d4d4b9df Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Stabilize tst_qquickmousearea.Friedemann Kleint2013-08-232-411/+387
| | | | | | | | | | | | Replace createView() by initView(), instantiate windows on stack or use QScopedPointer. Center view in available geometry and make sure the mouse cursor is outside, since otherwise it can interfere with drag->active(). Remove insignification introduced by c1fbee270f50c44f47d4eb287765ad60f362c87a . Task-number: QTBUG-33006 Change-Id: I8fc661444bc42899dfa3d87887c594270483e508 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* fix include guard to not clash with qscriptvalueiteratorMichael Zanetti2013-08-231-3/+3
| | | | | | | Change-Id: Ifb51ed15c93ed68e2a18edd4cda4a921f7e41c34 Reviewed-by: Albert Astals Cid <albert.astals@canonical.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org>
* tst_qquickitem: Make exclusion more fine-grained.Friedemann Kleint2013-08-232-2/+3
| | | | | | | | | Revert 764bd1cb0f8f2db4f84018890b9ebb8b42741789 . Task-number: QTBUG-32664 Change-Id: Idbe476a3e34b584b12e653f23a36d58028a2bf21 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Debugger: Fix crash when app exits while debuggingKai Koehne2013-08-217-4/+104
| | | | | | | | Make sure we don't access an already deleted v8engine any more. Task-number: QTBUG-33100 Change-Id: Ic517577ae30b41375cbf9f787cfe0a29121171e2 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* Fix some style issues in tst_qquickwindowJosh Faust2013-08-191-16/+15
| | | | | | Change-Id: I5802f10f9aaff3e443696644d07203160fbc3b91 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Dragging MouseArea nested in Flickable does not work with touch to mouseMartin Jones2013-08-195-41/+58
| | | | | | | | | | | | | A MouseArea with a drag target nested in a Flickable does not work. This is due to QQuickWindow calling childMouseEventFilter() twice - once in sendFilteredTouchEvent() and later in sendEvent(). Since childMouseEventFilter() has already been called, deliver the mouse event directly in sendFilteredTouchEvent(). Task-number: QTBUG-32920 Change-Id: I22acee3c66ee6c06e71c9c876fb02dbcb6119a8d Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* Doc fixAlan Alpert2013-08-161-2/+3
| | | | | | | Grammar and word choice Change-Id: If736f1d7a6f6396101924c9357c5235605b80b43 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix currentIndex in Qml itemView when assigning an empty modelNils Jeisecke2013-08-163-1/+31
| | | | | | | | | | When assigning an empty model to e.g. a ListView after component initialization has been completed, currentIndex is now correctly set to -1. Change-Id: I540c034944009ccb8894bf84f400658ef9f0371f Task-number: QTBUG-32838 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Marking tst_qquickgridview as insignificant in win and macxSimo Fält2013-08-161-0/+3
| | | | | | | | This test is flaky. Task-number: QTBUG-33017 Change-Id: I589706937a6de44291694029afb11c05a285c1cd Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Marking tst_qquicktextedit as insignificant in winSimo Fält2013-08-161-0/+1
| | | | | | | | This test haven't passed in WIN after the stage was made blocking. Change-Id: I246f96e98080845c5364aba720158dbd42a5f454 Task-number: QTBUG-32540 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Don't repaint the Canvas if it's just changing position.Mitch Curtis2013-08-161-1/+1
| | | | | | | Task-number: QTBUG-33005 Change-Id: I94613c0a0e066798800e068aee7c6288fce54dbd Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-08-153-0/+48
|\ | | | | | | Change-Id: I3953f2473e3b2cf9768286fef1c5efd08c61c6f0
| * Add changes-5.1.1 filev5.1.1Alan Alpert2013-08-151-0/+44
| | | | | | | | | | | | Task-number: QTBUG-32808 Change-Id: I44852be41c18491a38f80afa71eda8b85b51381d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Marking tst_qquickitem as insignificant in winSimo Fält2013-08-151-0/+2
| | | | | | | | | | | | | | | | This test haven't passed in WIN after the stage was made blocking. Task-number: QTBUG-32664 Change-Id: I0e84ff202d28a018e3e04dcf15f3a9ce6c66349b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Marking tst_qquickmousearea as insignificant on winSimo Fält2013-08-151-0/+2
| | | | | | | | | | | | | | | | This test seems flaky in windows. Task-number: QTBUG-33006 Change-Id: I1c67e1a498e4c5765580a316504e04776af5e109 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Make sure we propegate the filtering state to the internal texture.Gunnar Sletta2013-08-151-1/+1
| | | | | | | | | | Change-Id: Id928cf35eba254270b29a34129eb977dab34db63 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Unset the cursor when an Item is unparentedDaiwei Li2013-08-142-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | It's possible for a cursor to get stuck if an item gets deleted. QQuickItemPrivate::derefWindow sets the cursorItem in QQuickWindowPrivate to 0, but doesn't unset the cursor. This causes the cursor to get stuck until the user hovers their mouse over an item that has a cursor set. Change-Id: I1d5d3ff13d69c76e4f8fe86b1f5b669bb714ecca Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Sergio Ahumada2013-08-1477-3983/+361
|\ \ | | | | | | | | | refs/staging/stable
| * | Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-08-0977-3983/+361
| |\| | | | | | | | | | Change-Id: I3bcc89d3e503b933e4bd4df241c8169e73fb9bd5
| | * Doc: Update example used for QML getting started tutorialTopi Reinio2013-08-0916-268/+353
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the example project referred to in Getting Started with Qt Quick tutorial. - Fix coding/comment style issues - Change plugin TARGET name, Use /imports as the destination directory - Fix qmldir with proper module info, delete unused qmldir from /core - Add a .qmlproject file Change-Id: If269e61fb76399faae753469dc251d07cc219139 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Doc: Remove unused /parts directory from QML getting started exampleTopi Reinio2013-08-0256-3718/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example code for getting started with QML doc has six smaller projects under /parts - these out of sync with the main example code in its parent directory, they are undocumented and not referred to in any other documentation. The QML getting started guide itself uses \code blocks to present the code snippets. Change-Id: I3b9c83a60fdeb9fa13f364b04c38943222c682cb Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * QtQuick.Dialogs.ColorDialog: set current color in the QColorDialogShawn Rutledge2013-07-311-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | It was a missing feature to set the current color programmatically, either before or after showing the dialog. Task-number: QTBUG-32621 Change-Id: I62a811f7c36eaab5356c5924bf3447deca55ada3 Reviewed-by: Liang Qi <liang.qi@digia.com>
| | * Make buttons and tabs larger in QML examples and dialogsShawn Rutledge2013-07-295-11/+17
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-32578 Change-Id: Ic89058abc55e5e079f44862986b2132114456147 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | | test: Mark tst_qqmlmoduleplugin::incorrectPluginCase() as XFAILSergio Ahumada2013-08-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Mark incorrectPluginCase() as expected failure on OS X 10.8 Task-number: QTBUG-32652 Change-Id: I8fd2c0ceacabfc74defe84fc6538b268145c5110 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | | Fix hover event crashJosh Faust2013-08-123-1/+65
|/ / | | | | | | | | | | | | | | | | | | | | | | | | It was possible for a hover event to be sent to a QQuickItem that has already been scheduled to be deleted (through deleteLater()). This lead to an access on an already-freed object when the leave event is generated. This change ensures that the item is part of a scene before generating the hover enter event. Task-number: QTBUG-32771 Change-Id: I69adb6bbd0ae52c70a6bda4e6c918b7671549a4c Reviewed-by: Alan Alpert <aalpert@blackberry.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 11:16:11 +0000