aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
Commit message (Collapse)AuthorAgeFilesLines
* QQuickLoader: fix the recursion guard for size updatesJ-P Nurmi2013-03-171-3/+6
| | | | | | | | Task-number: QTBUG-30183 Change-Id: Ic8720e1e35bf2f349d74d2021dd202849da67852 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Add TextEdit::selectByKeyboardJ-P Nurmi2013-03-154-2/+54
| | | | | | | | | The main use case is for enabling text selection by keyboard for read-only editors. Change-Id: Ieaa9af366fd0eaf863a104a2fdf33c9ddad38b10 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* QQuickWindow: expose activeFocusItem as a propertyJ-P Nurmi2013-03-152-0/+12
| | | | | Change-Id: Ifd393399f93b04313cd66d7873fb99b505640c8a Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* QQuickView's equivalent in QtQuick1 is QDeclarativeViewDebao Zhang2013-03-151-1/+1
| | | | | Change-Id: I12104e8bd58a406a0ff03c110e2df54bbc1c816c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add some docs, improve scope of var.Frederik Gladhorn2013-03-142-1/+11
| | | | | Change-Id: I62e0b3bb4882f58ba58b3c8d71679e4ad2dbc5a3 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-1410-44/+56
|\ | | | | | | | | | | | | Conflicts: tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro Change-Id: I2fd99ed8bd03302b9bbf31e6f21990f6455c4f1c
| * Makes QSmoothedAnimation respect zero duration.Thomas Kristensen2013-03-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | 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>
| * Improve the ordering of Flickable dragging and moving property updates.Andrew den Exter2013-03-121-4/+15
| | | | | | | | | | | | | | | | | | | | 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>
| * 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>
| * 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>
| * 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>
| * 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>
* | Polish usage of a QElapsedTime instance in QSGThreadedRenderLoopJędrzej Nowacki2013-03-131-1/+3
| | | | | | | | | | | | | | | | The patch should make valgrind happy, by not using an uninitialized memory. Change-Id: Iec7f16c56f250dd121a37f03da4cfc5d9e5c0742 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Fix usages of \since for QML itemsThomas McGuire2013-03-135-5/+6
| | | | | | | | | | | | | | | | | | | | \since uses the QML import, not the Qt version. When adding a new property, it needs a REVISION argument and the type needs to be registered again for the new version. Change-Id: I2e636e9d26c8e989729eadad2ef73a836c35caa1 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Documentation and versioning for new Window propertiesShawn Rutledge2013-03-133-3/+126
| | | | | | | | | | | | | | | | Even some of the properties that existed in 5.0 were not documented. Change-Id: I25a14b9b19425a6c792d06bc41983e9abd1d17d0 Task-number: QTBUG-29807 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Abort rendering when QOpenGLContext::create/makeCurrent fails.Gunnar Sletta2013-03-131-5/+13
| | | | | | | | | | | | Task-number: QTBUG-30158 Change-Id: Ic8239fe6f074c989e4474d46042e1a82796b4908 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | Fix remote image loading for AnimatedSpriteAlan Alpert2013-03-123-4/+12
| | | | | | | | | | | | | | | | | | The Sprite generated behind the scenes had no QmlEngine associated, and the engine is needed by QQuickPixmap for async loading. Task-number: QTBUG-28086 Change-Id: Ibf3b03c54b339fe8f44201dc6fcb507e5274bbec Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Fix QString usage in createPixmapDataSync().Friedemann Kleint2013-03-121-2/+2
| | | | | | | | | | | | | | Warning introduced by 707bbe5dea9d7398b205124a54422f2fafb6f151 . Change-Id: I20f0da00ea519cc2ec82a1d13f1887c099a3947c Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | Fixed incorrect vsync delta time in QSGThreadedRenderLoop.Yoann Lopes2013-03-121-1/+1
| | | | | | | | | | Change-Id: I32bb720e9c9aa0278959dd64e5e1c449bdace7d1 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Introduce QML_FBO_FLUSH_BEFORE_DETACH to work around FBO issue.Michael Brasser2013-03-121-0/+3
| | | | | | | | | | | | | | | | | | | | On some AMD hardware, detaching the depth attachment immediately after rendering to an FBO will cause rendering issues. Adding an explicit glFlush before detaching seems to work around the issue. Task-number: QTBUG-29265 Change-Id: I97c7b87c1c3d3a69a4d6228dd9459745710c5f4c Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Create the sg render thread's opengl context on the GUI threadGunnar Sletta2013-03-121-34/+12
| | | | | | | | | | Change-Id: I710d80ebb4e5a12fda1f58f54089b0e72268dfcf Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | Support activeFocusOnTab in QQuickItemLiang Qi2013-03-123-2/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add activeFocusOnTab as property to QQuickItem. Setting the property allows automatic keyboard navigation between all elements that have it set. This key event handler will only be called after the QML key handlers, such as KeyNavigation and Keys, and the C++ key event handlers, such as keyPressEvent function. Algorithm is most done by Frederik Gladhorn, in cooperation with Gabriel de Dietrich. Done-with: Frederik Gladhorn <frederik.gladhorn@digia.com> Done-with: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Change-Id: I8b58be9c20d113661fe85d27bdb1af84340d9de5 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Fix displacement transition bug for horizontal caseGuenter Schwann2013-03-111-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-29944 Change-Id: I23381f7a1d2c8d3c6df007b5b11c12b0db3bb1e9 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Replace deprecated V8 functionsPeter Varga2013-03-111-23/+23
| | | | | | | | | | | | | | | | The External::Wrap and External::Unwrap functions became deprecated in the mainline V8. Replace them as it is officially proposed. Change-Id: Ieac1da53997da440a909939d86c98f17a124c068 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Remove comment about performance in qquickitem's clip property.Gunnar Sletta2013-03-111-4/+0
| | | | | | | | | | Change-Id: I2d1b9a86251466445d506969d779308e2d7b92bb Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | Fix MSVC warning C4819 under Chinese localeDebao Zhang2013-03-111-4/+4
| | | | | | | | | | | | | | | | | | | | warning C4819: The file contains a character that cannot be represented in the current code page (936) Change-Id: I53dc345e03b0ec6f951bd2763bc1bab4aef63d04 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Handle focus events directly in TextEdit.Frederik Gladhorn2013-03-073-29/+30
| | | | | | | | | | | | | | | | | | Instead of relying on the item change where we don't get focus reason, use focusInEvent and focusOutEvent. Change-Id: I2db7d81c67c65595b929fdcedc568af360831c5c Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | TextInput: Update text deselection on focus out eventCaroline Chao2013-03-071-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The text selection should not be cleared when the focus out event received has one the following reasons: - Qt::ActiveWindowFocusReason - Qt::PopupFocusReason When the user opens a menu or navigates to another window, the eventual selection should not be clearer. This also makes the behavior consistent with TextEdit. Change-Id: Ibc6242cb2f8207cf5281925c8e20b88394f21eea Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | TextInput: Handle focus event directlyCaroline Chao2013-03-073-27/+31
| | | | | | | | | | | | | | | | | | Use focusInEvent and focusOutEvent instead of changeItem to handle focus event. (One benefit is the focus events have the focus reason and changeItem doesn't). Change-Id: I164820f375f0ffddc529d59565a3e448b84c6042 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Focus reasonCaroline Chao2013-03-075-24/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | When trying to do for example text handling it becomes obvious that focus handling is not proper. A mouse click focus should de-select text, while a window change should preserve the selection. Re-introduce focus reason. Change-Id: I3322c976437cba68938d7c9188e549bdb499fa5a Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Fix rendering of subpixel positioned native textEskil Abrahamsen Blomfeldt2013-03-073-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To get accurate sampling of the native text rendering, we use nearest filtering. This, however, does not work well when we're sampling in the middle of pixels and the result is that with text which is positioned at 0.5 offsets, we will sample the wrong pixels and get artifacts from this. The main use case for native rendered text is unrotated and unscaled text, so we fix this use case by pixel-aligning the translation factor. Done-with: Samuel Task-number: QTBUG-30022 Change-Id: I6911196d6ff491dca3b329c42da1c6dd7263cff0 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Add core application functionality to Qt.application in QMLAlan Alpert2013-03-052-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This exposes some information to QML which is available on the QCoreApplication instance. A future change should make it possible to restrict this for use in scripting environments (which should not have access to the QCoreApplication). That has been left out of this change because proper support for such restrictions is not yet in place. Change-Id: Ica144fcfb0b42fa6df8d0cb1c7c03eb97282b489 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Android support: build fixesPaul Olav Tvete2013-03-053-2/+5
| | | | | | | | | | | | Change-Id: If829341b0baef7b253a386a195d3b5e4238b8103 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Fix crash for keypress without active focus.Frederik Gladhorn2013-03-051-1/+1
| | | | | | | | | | | | | | | | | | If there was no active focus item we need to use tryShortcutEvent with the window as target. Change-Id: I420925781bbbda79fe2a62a5774230ae77c2cd34 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Load "@2x" images on high-dpi "retina" systems.Morten Johan Sørvig2013-03-051-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for the existence of a "@2x" file when loading an image from a local file url. For example, Image { source = "foo.png" } will load "foo@2x.png" if that file exists. Change-Id: I37688d035bc9eb412d54be0eb758dd52ebfa5d90 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-03-0411-93/+101
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-2511-93/+101
| |\| | | | | | | | | | Change-Id: Ia02971527a2d1a80c5624d69330428818aab3a41
| | * Fix warnings about shadowing membersThiago Macieira2013-02-222-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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-221-1/+3
| | | | | | | | | | | | | | | 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-221-26/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-221-30/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * 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>
| | * 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>
| | * 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>
* | | Enablers for input methods on AndroidPaul Olav Tvete2013-03-044-4/+20
| | | | | | | | | | | | | | | | | | Change-Id: Ic26722cf530e7a787e7a8f92b645e3c4883d9822 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | Do not print out leaked pixmaps by defaultGunnar Sletta2013-03-031-1/+12
| | | | | | | | | | | | | | | Change-Id: Id112def9710efa943ffc5350a25d40d4c4f463a1 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | | Added examples on how to use FBOs with scene graph.Gunnar Sletta2013-03-035-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I also cleaned up the naming of the other scene graph examples a bit, so that they sort together in the samples list and have a more obvious naming scheme. Task-number: QTBUG-29548 Change-Id: I455eacb02c06058a6d49e12e4f1813ec80b655f6 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>