summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
Commit message (Collapse)AuthorAgeFilesLines
* Port away from QRegion::rects()HEADdevMarc Mutz2017-12-011-7/+3
| | | | | | | Use being()/end() instead. Change-Id: Ie556bcb555be1f4024b70dff9653b1d00585fd17 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Replace Q_NULLPTR with nullptrKevin Funk2017-09-271-2/+2
| | | | | Change-Id: I1d645e10f702288ddd63f35df7c57d66533ffd6f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* QDeclarativeTextEdit fix sign compare warningNikita Baryshnikov2017-04-261-1/+1
| | | | | | | in oldAlignment == opt.alignment() Change-Id: Ie7672507d2ba0380fecada58c0cab6983c6e5afb Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-171-1/+1
|\ | | | | | | Change-Id: If9912b8068ded874986a4cc91c8ed8146900487f
| * Doc: Change instances of 'OS X' to 'macOS'5.6.2Topi Reinio2016-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the Mac platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase). Change-Id: Iec248314791d9dbb1ab11959121376265cefd7fc Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-294-5/+5
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iba1819a7e10957f4bb5be90852747a4b459a3172
| * Merge remote-tracking branch 'origin/5.6.0' into 5.6Frederik Gladhorn2016-03-171-1/+1
| |\ | | | | | | | | | Change-Id: Icf88d0a2abb226cf067ba13d3d7b3d4bf8075a8c
| | * Doc: Replace Mac OS X with OS XNico Vertriest2015-07-161-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-40759 Change-Id: I1c05a2d07f38da1129bc127fd17c15f843b16bda Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * | Export QDeclarativeTextEditPrivate, QDeclarativeLayoutItemMarc Mutz2016-03-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | They are used in tests and while these tests don't call functions on them, a ubsan build will need and fail to access the type_info for these classes. Change-Id: I4badf9f70f4153acd3caea865ff137e443cb0a8d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * | Make more ctors explicitMarc Mutz2016-03-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. One is even a protected ctor. Change-Id: If047884d130206b8ea42148476ab449c2cbf7529 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * | Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-071-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Change-Id: I1ef66cc4a88f71ae804c2f19e59456bc6b55f6c6 Task-number: QTBUG-45291 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* / QDeclarativeTextInput: update API to use setBlinkingCursorEnabledRichard Moe Gustavsen2016-04-261-1/+1
|/ | | | | | | | | QWidgetLineControl::setCursorBlinkPeriod was renamed to QWidgetLineControl::setBlinkingCursorEnabled in qtbase:1b5bc97. This patch will update QDeclarativeTextInput to use the new API. Change-Id: If88c0d44f2ab29c9bc00f5a0226a28d45976ed43 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5v5.5.0-alpha1Frederik Gladhorn2015-02-241-1/+1
|\
| * Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-201-1/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I85eac7ffdbd673aeba4e7437fa5a9dc50759a736
| | * QDeclarativeTextEdit: fix use of uninitialised value.David Faure2015-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Detected by valgrind (in Qt 4.8.6): ==27068== Conditional jump or move depends on uninitialised value(s) ==27068== at 0x70C7289: QDeclarativeTextEdit::updateTotalLines() (qdeclarativetextedit.cpp:1742) Change-Id: I17856a6d5e06f10f2daf5f3534c175526f21b5dc Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Update copyright headersAntti Kokko2015-02-2387-609/+609
|/ / | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I9e68d256991ef7325c29c38ce9c007506ce6b150 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* / [TextLayout] Drop unused memberKonstantin Ritt2014-12-141-16/+0
|/ | | | | | | | QStaticTextItem never uses `chars` and `numChars`. A respective change to QStaticText will follow. Change-Id: I004a2e5d61841de63775d8207b5fd0bdf416f4c7 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-164-8/+33
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I842b005b9818c9e201a09d51bcf418e2dd0a1ef9
| * Make sure that the itemview's count property is reliableNils Jeisecke2014-09-104-8/+33
| | | | | | | | | | | | | | | | | | | | This fixes a missing countChanged signal when model changes happen while the itemview component is not completely initialized. Task-number: QTBUG-37115 Change-Id: I20c749b9e521b0292186adbecd09e1d362520881 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-2587-1653/+957
| | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I736aeb1a53f8aac59e8df360447864fea64d3dee Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | Fix Flickable mouse grab issue.Robert Griebl2014-08-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This issue cannot be reproduced on the desktop with a mouse (at least I could not). It can however reliably be reproduced on iMX6 embedded hardware with a touch-screen. It seems like the TS driver is reporting mouse events with a much more coarse granularity than the USB mouse driver, which in turn triggers this bug. (Qt4's declarative, as well as Qt5's quick1 and 2 all have the same issue) Change-Id: I01c9fc433a78d5f79518786783e24f3f93eaa50a Task-number: QTBUG-27185 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-291-1/+4
|\| | | | | | | Change-Id: Ib65e8d81071452904ec3b0423e91dca1b0101452
| * Compile fix: do not use composeMode() if QT_NO_IM is defined.Steffen Imhof2014-07-021-1/+4
| | | | | | | | | | | | Change-Id: Ib0046657ba687e6427c67c7dce0d71ec3be87f48 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | Merge remote-tracking branch 'origin/stable' into devIikka Eklund2014-04-011-1/+1
|\| | | | | | | Change-Id: I222f518e398b90382e452921411cfe81836ce02f
| * Ensure TextEdit's text is vertically aligned after resizing its height.Mitch Curtis2014-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | The current code only updates the alignment if the width of the TextEdit changed, but we must also check if the height has changed. Task-number: QTBUG-36069 [ChangeLog][QtDeclarative][TextEdit] Fixed TextEdit not vertically aligning its text after having its height changed. Change-Id: I428a01111874c70d2151213d2b3c5553e7f21186 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-241-1/+1
|\| | | | | | | Change-Id: Ic5bcce627df03517c29597e6bb864f7b3fad2ebe
| * Correct QDeclarativeTextEdit::positionToRectangle().v5.3.0-beta1Mitch Curtis2014-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | d->yoff is the content offset when the content is not top aligned. This means that positionToRectangle() returned incorrect values when the content was bottom or vertical center aligned. In other words, it didn't apply the offset but gave coordinates from the beginning of the content instead of from the beginning of the item. Change-Id: I044b79434b9a67b0539050e39953d5889a3ed1db Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-03-111-1/+1
|\| | | | | | | Change-Id: I09ce9ad6e50bdb6034717d45ad73b4d21474a6e2
| * Fix typos in comments and documentationSergio Ahumada2014-03-051-1/+1
| | | | | | | | | | Change-Id: Ie7c4d63d632bf32ee583ddcd807252225ddde3fd Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | whitespace fixesOswald Buddenhagen2014-02-2016-84/+84
|/ | | | | | | | remove trailing spaces & expand tabs Change-Id: Ia088c8cc8a83d068f6e2ec84903b5220cd3411f1 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Prospective build fix after commit f8dbed12266c42785c1e4758eed05833ec035f33 ↵Simon Hausmann2014-02-172-1/+11
| | | | | | | | | in qtbase Pass through the QVariant argument provided by the caller (QInputMethod). Change-Id: Ia99546cd16287c14ce414d6aad0ea04488e7c6e2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix MSVC-warning about unused variable d in qdeclarativeitem.cpp.Friedemann Kleint2014-01-291-3/+2
| | | | | Change-Id: I39fe8076e53d159b060db8884df108a790bc6469 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Remove QtAlgorithms usage from QtQuick1.Friedemann Kleint2013-09-261-1/+3
| | | | | | | | QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: I774f69bd3e60764a144b921a2383d832b38765ce Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Merge branch 'dev' into stableSergio Ahumada2013-03-1933-123/+2
|\ | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: Ic10a8c118053323004cafe1b4bffd990a16aaf7f
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-142-18/+29
| |\ | | | | | | | | | Change-Id: I39178ea637dc950cbbb631b725350ab99897ad45
| * \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-252-48/+37
| |\ \ | | | | | | | | | | | | Change-Id: I71384165752875c073dfbcbd279cfdc82eeea4dc
| * \ \ Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-02-191-5/+6
| |\ \ \ | | | | | | | | | | | | | | | refs/staging/dev
| | * \ \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-181-5/+6
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I4fd7f5c1096b0460bd23e2831e6207d63c2b69e3
| * | | | | Fix QDeclarativeListView currentSection property updateNils Jeisecke2013-02-181-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Model modifications that did not trigger the refill logic caused the view's currentSection property to contain an outdated value. A new autotest has been added to catch the bug. Task-number: QTBUG-29712 Change-Id: I88cf1295ac55dad7596b6ba1fe475ebf98a31026 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * | | | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-2832-123/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: Ic5b55b26967d65b3f11cac6fc3963f33ec6051a4 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* | | | | Smooth dragging an item with MouseArea.Andrew den Exter2013-03-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: I46918a7b3c62bdaef567b6a9fed651ce33434247 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* | | | | Fix jump and property changes on first move when dragging a Flickable.Andrew den Exter2013-03-191-4/+4
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a regression 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. Task-number: QTBUG-30032 Change-Id: I92c119d27dc2e22203484f9ada5978697d171957 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* | | | Improve emission of FocusScope focusChanged signals.Andrew den Exter2013-02-272-18/+29
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emit activeFocusChanged up the focus tree when an item receives a focus event, rather than when the focusItem changes which happens before internal state is sufficiently updated for hasFocus and hasActiveFocus to return the correct values from within a changed signal handler. There are some limitions to this. First the signals are not emitted reliably when the scene is not active which makes sense for activeFocus but not for focus. The second is in some instances the focus and activeFocus can update unnecessarily while the focus chain sorts itself out. QDeclarativeItem tests by Andreas Aardal Hanssen <andreas@hanssen.name> Task-number: QTBUG-28288 Task-number: QTBUG-25644 Change-Id: Ib3d17c42754c15a08b34c3388f50b45cc1d2a831 Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name> Reviewed-by: Alan Alpert <aalpert@rim.com>
* | | Flickable shouldn't grab the mouse until it starts an effective move.Andrew den Exter2013-02-221-26/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: 29718 Change-Id: Ief82ef7b898ea2581fd0b7e52548f451d887e2f1 Reviewed-by: Alan Alpert <aalpert@rim.com>
* | | MouseArea shouldn't grab the mouse until there is an effective drag.Andrew den Exter2013-02-221-22/+17
| |/ |/| | | | | | | | | | | | | | | | | 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: QTBUG-29717 Change-Id: I17caa51ebc2e547e73e727fd185e60644591ad2b Reviewed-by: Alan Alpert <aalpert@rim.com>
* | Doc: Removed reference to deprecated \badcode command.Jerome Pasion2013-02-151-5/+6
|/ | | | | | | | | QDoc doesn't differentiate between \badcode and \code. They both look the same in the output. Change-Id: I3661a893a9413a0b137e236083cc9ac5677ffecb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1087-87/+87
| | | | | | Change-Id: I0281c3f6c10bb7c57f0e470306f38e96badf997b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Backport PathView currentIndex fixes from Qt 5Bea Lam2012-12-121-37/+58
| | | | | | | | | | | | Backport 447e5acb880ebda498891623dc4009984cb73bc6 and 0fc361f96b06ba318e70610e46beb421753cae9d which fix bugs related to currentIndex. The first commit ensures currentIndex=0 when all items are removed; the second ensures that the initial currentIndex value is respected and also resets the view correctly if the model changes. Change-Id: I73266a211001a54163be8415d449802ff077a72e Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* Fix crash when mapping coordinates to & from the root item.Nicolas Tisserand2012-12-121-4/+18
| | | | | | | | | | | | | | | The crash triggered by our (supported & documented) use-cases (calling map{From,To}Item with a null value), has been introduced earlier this year, by this change: https://qt.gitorious.org/qt/qt/commit/bec02b3f3 Also: * Clarify QDeclarativeItem::map{From,To}Item statement ordering. * Handle the engine-less item corner case. Change-Id: I33678f7267a4b624bfa61247a643f37ad2ec735d Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* Ensure QDeclarativeTextLayout uses the correct penChris Adams2012-11-291-1/+12
| | | | | | | | | | | | | | | | | | When a styled text specifies a font region with some color set, QDeclarativeTextLayout used to revert to using a default-constructed (black-colored) pen for text occurring after the </font> tag, rather than the "default" (property-defined) color. This commit ensures that the correct pen is used, by setting the pen of the "inert" painter to be an invalid color rather than a default constructed pen. It then detects when the current pen transitions back to this invalid pen, and switches back to using the default color. Task-number: QTBUG-28135 Change-Id: I6bcc43fbcf7fb2c680959d27b1422364ebb473ae Reviewed-by: Alan Alpert <aalpert@rim.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 18:20:43 +0000