aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* Debugger: Fix crash when app exits while debuggingKai Koehne2013-08-213-4/+13
| | | | | | | | 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>
* Dragging MouseArea nested in Flickable does not work with touch to mouseMartin Jones2013-08-192-6/+8
| | | | | | | | | | | | | 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-161-1/+1
| | | | | | | | | | 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>
* 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>
* 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-141-1/+3
| | | | | | | | | | | | 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-142-3/+8
|\ | | | | | | refs/staging/stable
| * Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-08-092-3/+8
| |\ | | | | | | | | | Change-Id: I3bcc89d3e503b933e4bd4df241c8169e73fb9bd5
| | * 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-291-3/+3
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-32578 Change-Id: Ic89058abc55e5e079f44862986b2132114456147 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | | Fix hover event crashJosh Faust2013-08-121-1/+8
|/ / | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Fix needless conversion from char * to QStringKai Koehne2013-08-091-20/+20
| | | | | | | | | | | | | | | | | | Converting the strings to UTF-16 unconditionally whenever the library is loaded is overkill. Anyhow, the literals are only passed to methods also accepting a QLatin1String, so we don't have to convert at all. Change-Id: I84e813ac989344bc2e359f340696423766392c93 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Remove unused local variablesKai Koehne2013-08-091-3/+0
| | | | | | | | | | Change-Id: I910c47cd404c0c5c1c324e956927966e834b488e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Stop the update timer when no windows are visibleGunnar Sletta2013-08-071-1/+4
| | | | | | | | | | Change-Id: Ib9758a99891829d9bec81996687373d08ecfa055 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | Remove C-style casts from public headers.Thiago Macieira2013-08-062-16/+16
| | | | | | | | | | | | | | Task-number: QTBUG-32735 Change-Id: I14c313d17b80dce1826290ddd634f449b315190e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Doc: createObject: adapted description of exampleNico Vertriest2013-08-061-51/+52
| | | | | | | | | | | | | | | | | | | | | | | | Plus language/style edits Restored brief statement QQmlComponent.cpp Task-number: QTBUG-32222 Change-Id: I07da54bad3e13f163475ed2a0760e66d50795f6f Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Improve memory usage of QQuickTextNode.Michael Brasser2013-08-062-8/+8
| | | | | | | | | | | | | | | | | | | | The typical number of BinaryTreeNodes needed for a text line should be much lower than 256. Task-number: QTBUG-32770 Change-Id: I85aa161eb7cb6e55657213304b7577a0a33f1b67 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Fix crash in QQmlDebugService::objectForLocationInfo()Duncan Cunningham2013-08-051-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixed crash in QQmlDebugService::objectForLocationInfo() where it was using QObject pointers in the object reference id hash table that had been deleted. Now objectForLocationInfo() checks if the QObject has been deleted and removes it from the object reference hash before trying to look up the filename, line number, and column number. Change-Id: Iba7be7c490e97a2e7685685b0c6e501cfe1e833e Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* | Avoid using connect in QQuickImplicitSizeItem.Michael Brasser2013-08-011-14/+2
| | | | | | | | | | | | | | | | | | | | In the past connect has shown up as a noticeable cost in item creation. Avoid the use here by refactoring to call base class implementation and emit override signal as well. Task-number: QTBUG-32764 Change-Id: If3e5a1cc55c113d812705fcfdc7a17aee9d6f51c Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* | Fix crash when changing non-cached source of image during animationMichael Brasser2013-08-011-2/+2
| | | | | | | | | | | | | | | | | | Ensure deferred deletions are handled while syncing, otherwise texture might be deleted after sync but before deferred deletion is processed. Task-number: QTBUG-32513 Change-Id: Id276f536a5722a36baae815b7b550b574eeeb483 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Remove comment that QQuickPaintedItem is only useful for porting.Gunnar Sletta2013-08-011-3/+0
| | | | | | | | | | Change-Id: I5d4a7917baa7c8f8dd7cfe3f49c6cf4fe5532ac0 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Fixed distance field text getting clipped at small sizes.Yoann Lopes2013-08-011-1/+1
| | | | | | | | | | | | Task-number: QTBUG-32750 Change-Id: I6bdf63d3cbcaaeb54c7c1ae25dfc55fc7e964075 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Doc: Clean up docs for PathView.highlightRangeMode enum valuesTopi Reinio2013-08-011-16/+19
| | | | | | | | | | | | | | | | | | Fix PathView.NoHighlightRange description, move the enum values into a list, and do some minor editing. Task-number: QTBUG-16160 Change-Id: I5356c21ea3244ce43defa346da11696a8706c71f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Rectangle which only draw an opaque border should not be blended.Gunnar Sletta2013-08-011-1/+1
| | | | | | | | | | Change-Id: I55996a1c38ad6da4566d2160155503a27ad4a20b Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Correctly update flickable visibleArea.heightRatio when geometry changesNils Jeisecke2013-07-311-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this fix the visibleArea.heightRatio and widthRatio values were only updated on geometry changes when flicking was active. So when setting the flickable geometry to the content geometry and thereby disabling flicking the ratios were not updated. This could for example cause wrong scrollbar renderings. The ratios are now also calculated directly after accessing the visibleArea property for the first time. The new autotest covers both problems. Change-Id: I54ba606524557fb328a198c312c1f65eb125c5a3 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | QQuickListViewPrivate::updateStickySections(): add missing null checkJ-P Nurmi2013-07-291-1/+1
| | | | | | | | | | | | Task-number: QTBUG-32711 Change-Id: I45ed6829f2c240e8352dac33beeee803cb88a18d Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | FolderListModel: Do not return invalid URLs like "file:" when navigating up.Friedemann Kleint2013-07-291-8/+4
| | | | | | | | | | | | | | Task-number: QTBUG-32139 Change-Id: I715b97eb85bc4235de6a2bb696131efae56477fd Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | FolderListModel: Fix setting of directory in componentComplete().Friedemann Kleint2013-07-291-2/+2
| | | | | | | | | | | | | | | | | | Discovered when fixing Task-number: QTBUG-32139 Change-Id: I94d1a958069666ed43db146a7393e5f1ff4e177e Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-07-269-23/+47
|\| | | | | | | Change-Id: Ibb0e597c0cd02732bae3ef0ccc31c3ef36c75584
| * Workaround for distance field glyph upload problem.Yoann Lopes2013-07-261-2/+4
| | | | | | | | | | | | | | | | | | | | | | It seems uploading an image (into a texture) which has padding at the end of each scanLine and alpha-only pixel format is broken with some OpenGL ES drivers. The workaround is to upload one line at a time. Task-number: QTBUG-30908 Change-Id: Ic680654951b6aec294c1a173708c1fb75e57ff8f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| * Keep the QML ColorDialog's controls in sync with the color propertyShawn Rutledge2013-07-252-7/+26
| | | | | | | | | | | | | | | | | | | | Until now, the user could change the color by dragging the crosshairs or the sliders, but if the application set the color property, it did not programmatically move the crosshairs and sliders. Task-number: QTBUG-32545 Change-Id: Idd54e711400dfd78d570161297559f9521c1d67f Reviewed-by: Liang Qi <liang.qi@digia.com>
| * Correct initial/minimum size of default QML ColorDialogShawn Rutledge2013-07-251-1/+1
| | | | | | | | | | | | Change-Id: Idd53d9c7246b17a9159faec06a7ce6c6355cd09f Task-number: QTBUG-32572 Reviewed-by: Liang Qi <liang.qi@digia.com>
| * Doc: Link to QML Qt object in relevant locationsTopi Reinio2013-07-252-1/+6
| | | | | | | | | | | | | | | | | | | | There is no obvious path to find the reference for QML Qt object. This change adds links to it in Qt QML module index page and QML Basic Types documentation. Task-number: QTBUG-31921 Change-Id: I8a4ef1b3e696a0a7dec416d759ae64110e59c6c0 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Modified the term for the Qt global object.Jerome Pasion2013-07-251-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QtQml::Qt is a "QML global object" to differentiate it from the Qt namespace. "QML Qt object" "QML Qt global object" "Qt global object" (in the context of QML-only pages) Change-Id: I1d2896ad48e8432c5eb8b18f05af247986bff336 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * Link between "QML Basic Type: date" and QML Date object documentation.Mitch Curtis2013-07-233-8/+9
| | | | | | | | | | | | | | | | | | | | The basic date type seems useless if you don't know it can be used as as JavaScript date (with QML extensions). Task-number: QTBUG-32492 Change-Id: I14962f4e57522f5515f0e78d484aa59fcd9dff3c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Always use QDir::exists() for checking if something existsAndy Shaw2013-07-251-16/+2
| | | | | | | | | | | | | | | | | | | | | | If there is a custom file engine in use by the application then it will not be able to tell if the file exists if the system stat() call is used. Therefore we let it use QDir::exists() on all platforms to ensure that this is taken care of. Change-Id: I0c93cfdad1e71b40512bcf1766de6a705a76bd9c Reviewed-by: Marcus Tillmanns <maddimax@gmail.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Resizing items out of the list viewport should not change the viewportAlbert Astals Cid2013-07-241-4/+6
|/ | | | | | | | Consider the old geometry, not the new one to check if an item was outside the viewport or not Change-Id: I108412d560faf86130044f3d091254c07af0c004 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Use GET method for redirect in QDeclarativeXMLHttpRequest.Friedemann Kleint2013-07-221-0/+5
| | | | | | | | Initial-patch-by: Marek Więckowski <wiecko@fuw.edu.pl> Task-number: QTBUG-32332 Change-Id: I5514d97ef8574f8e7eef8fcca39bed4cd7e917ad Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* Fix CLANG-warning '&&' within '||' [-Wlogical-op-parentheses].Friedemann Kleint2013-07-121-1/+1
| | | | | Change-Id: Id724c86f87a78048df9b93f2d190593d36261943 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Fix CLANG-warning about unused member variable m_defaultAntialiasingMode.Friedemann Kleint2013-07-121-1/+0
| | | | | Change-Id: I68a04532bacd326b4bb3eb8f9a7ee04c67fcd68e Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Docs: restore missing ListModel methodsJ-P Nurmi2013-07-081-9/+9
| | | | | Change-Id: Icb491d14d42af769928b1663be0877e23ff43850 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fixed typo 'backens'Thorbjørn Lindeijer2013-07-081-1/+1
| | | | | Change-Id: I65e4492d1bc70e5344c0edc37a7c2f87fe355e62 Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 10:10:10 +0000