aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
Commit message (Collapse)AuthorAgeFilesLines
* Fix warning QQuickImplicitSizeItem redefines signalsv5.1.0-alpha1Caroline Chao2013-03-272-6/+8
| | | | | | | | | Task-number: QTBUG-30258 Change-Id: I3ab2a3ffbe22f583ac422f876be3037c07e8255d Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Doc: Fixed some uses of terminolgies in qdoc files.Jerome Pasion2013-03-2628-207/+193
| | | | | | | | | | | -"element" -> "type" or "object" (not in all cases where this change applies) -some instances of QtQuick. It should be "Qt Quick". -only in qdoc files. Examples and source code changes will be done later. Task-number: QTBUG-30180 Change-Id: Ie587461a138e97606f761ad1e90909c91b479303 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Merge remote-tracking branch 'origin/dev' into stableFrederik Gladhorn2013-03-2211-1193/+1506
|\ | | | | | | | | | | | | These two patches should have targeted 5.1 and went in just at the wrong time. Change-Id: Idd0a7a812fb11e2aea2c187d5e82aa31494c576c
| * Optimize QQuickTextEdit for larger documents.Pierre Rossi2013-03-2011-1193/+1506
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rationale is to not end up re-processing the whole document on each update Since we know where the editing takes place, we can break down the text edit's contents in several text nodes and only re-create the affected text nodes upon editing. This requires ripping out the SelectionEngine helper class from QQuickTextNode so that QQuickTextEdit can tap into its functionality directly. A positive side-effect of this exercise is that it should be much harder to to come across GlyphNodes packing more than 16300 glyphs or so. Task-number: QTBUG-29596 Change-Id: Id29b0709baa43f5b29c44ab02398ba996be3e28a Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Merge branch 'dev' into stableSergio Ahumada2013-03-20185-10516/+2827
|\| | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: I6178a580b4c99aded1a69032a02169cff502b71d
| * Make sure that TextInteractionFlags get set.Frederik Gladhorn2013-03-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The first time the function is called, it could fail to set the flags. Calling setSelectByKeyboard(true) would not actually set the text interaction flags (was == on). The test didn't detect it because it called setReadOnly before setSelectByKeyboard. Change-Id: Ia54cc782b6ad5a74f1d7029c92fa230116d034b0 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * QQuickItem: Support FocusReason in focusNextPrevLiang Qi2013-03-181-1/+1
| | | | | | | | | | Change-Id: Ib1b69607e1b4b52bad6e382d8102a42553f13432 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * 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
| * | 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
| * | | | 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>
| * | | | Fix docs for Canvas.renderStrategy, the default is CooperativeGunnar Sletta2013-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29833 Change-Id: I3ee680d2decb01ff514852b2445617e6ab1b1480 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * | | | Allow shortcut overrides.Frederik Gladhorn2013-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When delivering shortcut events, make it possible for the current active focus item to override the focus. The use case is having an edit/copy menu (ctrl+c) and a text edit. When the text edit is focused, it should override the global shortcut. Change-Id: Ide5b94832289c32762ef7304cdc94c107301d579 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * | | | Avoid ambiguous include guards in SG classesGunnar Sletta2013-02-2617-42/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These include guards stem from the olden days before the QSG prefix and many of them are conflict prone, which can lead to pretty bisarrer errors for the user. Change-Id: I0e76c68a588404b6e82be9ecc2e7afa3b9a48e78 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * | | | Change Canvas to use Image and antialiasing by default.Gunnar Sletta2013-02-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3033cba7c2f9e1dd9886e8f92ece1a2f43f60c01 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * | | | Improved documentation in the Screen attached propertyShawn Rutledge2013-02-251-9/+37
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can attach to the Window now too, so needs some clarification about when to use it that way. The orientation properties also need more description to avoid confusion. Change-Id: Ib537422f6001d8b64de176e60a6433b2e25551b9 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * | | Make sure exposeEvents trigger a render passGunnar Sletta2013-02-212-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We needs this on non-compositing window managers to trigger repaints on partial updates. Change-Id: Ied5f3e854173c5e00ad7e1222aeb66eb9c96158c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * | | Don't print leak warnings on exit by defaultGunnar Sletta2013-02-204-27/+54
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29780 Change-Id: I6f35253dbec6346af239c0ab341caad9f4f9b862 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * | | QQuickScreen is exposed as an attached property on Window tooShawn Rutledge2013-02-201-0/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I13ee75247cbe6238de1b58cf0005c39fc4314e96 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * | | Add QQuickTextDocumentFrederik Gladhorn2013-02-197-0/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding QQuickTextDocument as a way to access the QTextDocument of QQuickTextEdit from C++. This makes it possible to use a QSyntaxHighlighter from C++ without exposing more than one single qml property in the TextEdit. Change-Id: If1790b591493adcb0b68aef0c8ca706e00450657 Reviewed-by: Alan Alpert <aalpert@rim.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>