aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | 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>
| | * | don't use CamelCase includesOswald Buddenhagen2013-03-138-26/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they are not available during bootstrap. Change-Id: I5e941f22cd2b9fa622730ba0bf8389394f6a30a5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| | * | Add QtQml.Models moduleAlan Alpert2013-03-1241-345/+827
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The moved Model classes can now be exposed in a QtQml import. To keep the QtQml import resticted to more core functionality, they are being exposed in a plugin module. Change-Id: I0a84642a72c7c9bbf9b6ffd2a6c33549f8e61c29 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@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>
| | * | Fixed some auto testsBernd Weimer2013-03-122-53/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.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>
| | * | Disable accessibility temporarily.Frederik Gladhorn2013-03-122-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required to update headers in QtBase. Change-Id: I373a1f13dcde8ce1cafeedb5cd2269a0f8f3a670 Reviewed-by: Jan Arve Sæther <jan-arve.saether@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>
| | * | Use official V8 string manipulation methods in QMLPeter Varga2013-03-123-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QtJSBackend's String::GetCharacter and String::Equals methods are Qt specific and they are not supported by official V8. These methods can be replaced by more "V8-friendly" implementations in QtDeclarative. Thus the mentioned methods can be removed from QtJSBackend to reduce the difference between QtJSBackend and the official V8 source. Change-Id: I5590ca62dc667e64a7f54a7e47a02d350ba0c077 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * | correct misspellingShawn Rutledge2013-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Canceled Change-Id: Ie080e5be4af0cf60cab56e906f82fb6e7b32c6e3 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@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-1210-14/+1023
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-116-61/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | Mark geometry dirty to signal scene graph that a repaint is needed.Gunnar Sletta2013-03-112-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic230ffe43b690e3f1e0e7290c4c9571f60bd34b7 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@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>
| | * | Fix warnings about overloaded virtual functions in tests (CLANG).Friedemann Kleint2013-03-112-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I1f4bda77d0520766813201726f53b439b6094a24 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| | * | Tests: add autotests for TextEdit and TextInputCaroline Chao2013-03-073-0/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check the selection is not cleared when the control receives a focus out event with one of the following reason: - Qt::ActiveWindowFocusReason - Qt::PopupFocusReason Change-Id: I38f4a4cba5e769f19de4e327d03be57a8d1d36a7 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@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>
| | * | Disable qv8profilerservice test. It is very unstableGunnar Sletta2013-03-071-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic7fada8ca457b15fb62a47d2137de7d6f8b1711a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * | Disable more unstable testsGunnar Sletta2013-03-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I54db72466ca50d65dd39e9c8e25d3a366cb737ea Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * | Remove spurious includeAlan Alpert2013-03-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While it's discouraged to use the entire module headers inside Qt, this particular example also compiles without the line. Change-Id: I75b6fc09e11d00df2f19f5db9b0209ed4cd82844 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * | Add core application functionality to Qt.application in QMLAlan Alpert2013-03-056-12/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-054-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If829341b0baef7b253a386a195d3b5e4238b8103 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * | Accessibility: Adapt memory management for Qt 5.1Frederik Gladhorn2013-03-053-48/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The model was changed to cache interfaces, so do not try to delete them. Change-Id: I5a97a6aca38036803c62d90988bb6d02196f0b84 Reviewed-by: Jan Arve Sæther <jan-arve.saether@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>
| | * | Remove extra semicolon.Frederik Gladhorn2013-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I5830f8dd2c636ad8653506c04f8ea1a9ac000f9a Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@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>
| | * | Work with synchronous replies from a custom QNetworkAccessManagerAlan Alpert2013-03-042-6/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forward port of e5783b79887299d094 from QtQuick 1. Task-number: QTBUG-27723 Change-Id: I4332dd72bb9d65167307c1ac5ce24e93b14cff5f Reviewed-by: Peter Hartmann <phartmann@rim.com>
| | * | Fix relative URL in parallax exampleAlan Alpert2013-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Samegame demo moved a while back, this didn't get updated. Change-Id: Ib34a09f606528e1e53650bbbd4d19787b1864bcb Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| | * | Added photosurface example to demo PinchArea/MouseArea togetherShawn Rutledge2013-03-045-0/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems to be important to put the MouseArea inside the PinchArea in order to support simultaneous drag/rotate/pinch. Change-Id: Ic3ec6a131bd2d4c7f8a8560cd9c3015a717fef20 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| | * | Autotests w CONFIG+=parallel_test don't depend on activation or focusShawn Rutledge2013-03-0410-68/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the test does requestActivate() or relies on isFocusWindow(), the test cannot be parallel_test. Also, a lot of the tests don't actually need the window to be active, only exposed; and waiting only for exposed is likely to make them more stable. Change-Id: I0845b9b12ddf7f0c8906d9738a3e26d46ab98820 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| | * | PinchArea autotest doesn't depend on window activation; QScopedPointerShawn Rutledge2013-03-042-20/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QQuickView pointer is guarded by a QScopedPointer to make sure it will be deleted if the test fails. And because we don't depend on window activation, the test should be parallelizable. Change-Id: I33a5dcff037087d9752b264eb067196c2a5be535 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| | * | pressedCanceledOnWindowDeactivate pops up a second windowShawn Rutledge2013-03-042-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in order to cause the first one to be deactivated. Task-number: QTBUG-29953 Change-Id: I7fec66b07976b2afc78941d39c593f99ea484522 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| | * | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-03-0438-128/+627
| | |\ \ | | | | | | | | | | | | | | | refs/staging/dev
| | | * \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-2538-128/+627
| | | |\ \ | | | | | | | | | | | | | | | | | | 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>
| | * | | | adding QtQuick.Dialogs, with FileDialog implementationShawn Rutledge2013-03-0436-0/+2954
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will obsolete the QFileDialogItem in desktop components and be available to all QtQuick applications. The QML FileDialog type is dynamically defined in the plugin by detecting which implementation will work on the current platform. Change-Id: I073c7a84bff6c02cf592dc46822a5a4b9c9bcaea Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@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-0327-22/+1365
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | | | Fix the QtQml's use of plugins for value type providersThiago Macieira2013-03-012-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the QtQuick library is loaded, it runs a global constructor that installs the QtQuick value providers. But those providers are never uninstalled when the library is unloaded, resulting in a dangling pointer stored in QtQml's singly-linked list of value providers. Since cafb02911a29b98ac2652fde64e95870e70fd547, QLibrary will unload plugins after inspecting their plugin metadata on Mac and Windows. If QtQml is trying to load a plugin that links to QtQuick (in particular, *the* qtquick2plugin plugin), it would cause the value provider to go stale. To make matters worse, it's quite likely that the plugin would get loaded soon after, at the same address in memory, which causes the valueTypeProvider list to become cyclic. Change-Id: I6f4db5475ceeaba766d9e9c78f86266c9a65806a Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>