aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Determine QQuickItem::childAt() correctlyKari Hautamäki2016-02-244-4/+116
| | | | | | | | | | | [ChangeLog][QtQuick][QQuickItem] Fix to wrong calculation of child at a given point. Previously coordinates of width+1 and height+1 were counted as a child. That caused a child Rect of (0, 0, 100, 100) to be reported as a child at (100, 100), which is wrong (correct max coordinate is (99, 99).) Task-number: QTBUG-41833 Change-Id: I6124a275a5dc1a38eab448235102d563e2a8b0ca Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-1927-138/+500
|\ | | | | | | | | | | | | | | | | Conflicts: src/quick/items/qquickitem.cpp tests/auto/quick/qquickgridview/tst_qquickgridview.cpp tests/auto/quick/qquicklistview/tst_qquicklistview.cpp Change-Id: I3cf47faa2fe567d62fffd985aeecbefe5811cc42
| * Make it easier to link to QAbstractItemModel sectionMitch Curtis2016-02-171-1/+1
| | | | | | | | | | | | | | | | | | Linking to "QAbstractItemModel" will take the user to the class documentation, when it was intended to take them to the "Using C++ Models with Qt Quick Views" page. Change-Id: Id705353bf729fe9990ca6f77e3d4e430cff33918 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * Fix off-by-one when checking overlaps in selection rangesEskil Abrahamsen Blomfeldt2016-02-171-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was found while researching QTBUG-49596. The selection ranges in the QGlyphRun are inclusive, so the length needs to be end - start + 1. For a node of 1 glyph with either preceding or succeeding node, we would detect an overlap always, since the initial rangeLength would be 0. This is reproduced by the textinput_selected_fallback_font.qml test, but the bug was hidden by a different bug in QTextLayout. Change-Id: I65d70b1223eebeb5cfbb277fade7f4753465364f Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Revert "Fix crash on QQmlEngine destruction."Robin Burchell2016-02-172-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2e75be5f64fb21cbbdff3353dbd507c2ca26946a. This patch was originally written by Andrew den Exter in 222e06bf4ed509e72c1533cbe1d4859ca96933f3, externally from the main Qt tree. I upstreamed this as part of our porting efforts. Some time later, this was accidentally reverted in 2e75be5f64fb21cbbdff3353dbd507c2ca26946a: we can't go back in time to examine exactly what happened, but presumably Andrew didn't notice that I had upstreamed this, attempted to apply the patch and ignored the "already applied" warning by accident - and continued on dutifully with the patch accidentally reverted. This change is correct, though, and is thus reinstated. Change-Id: Idfe6ab39ad011f0401de25fe056aa3eb3fb8b424 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-02-1516-10/+268
| |\ | | | | | | | | | Change-Id: Ib4eb5c3572cb5ec11eb744572ec796dc7e70456d
| | * Don't build designer for wincev5.6.0-rc1Andreas Holzammer2016-02-051-1/+1
| | | | | | | | | | | | | | | Change-Id: I3c122c0fe56b12a8e91c68ceff357600adcfc2bf Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| | * Rerender natively rendered text items when DPI scaling changes.Andreas Hartmetz2016-02-056-3/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The whole purpose of native rendering is to optimize precisely for a given pixel grid. DPI scaling can change when either settings of the current screen are changed, or when the window is moved to a different screen. Details: - add an ItemDevicePixelRatioHasChanged item change event - detect DPI scaling changes by watching screen (identity) and screen config changes - when DPI scaling changes, recursively send an ItemDevicePixelRatioHasChanged signal to all items with content - when a natively renderet TextItem catches such an event, call updateLayout() which automatically picks up the new logical DPI Task-number: QTBUG-49019 Change-Id: I9f4f8d1a7f2c172ed26c276294ab143161c4a48b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| | * Fix crash in Installer Framework when used with Qt 5.6Simon Hausmann2016-02-022-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | IFW uses QQmlV4Function in a QJSEngine environment, so there is no QML context. Up to commit cc98678f404cd49750076795f39b31bfa36c80c3 that would work. Let's fall back to the root context as scope if we don't have a qml context. Change-Id: Ib240746a95a0d16d61620f97abc31e4c74f36723 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| | * Merge 5.6 into 5.6.0Oswald Buddenhagen2016-02-0234-178/+361
| | |\ | | | | | | | | | | | | Change-Id: I971229ff050c98258729ad70d9e06b89e5bbf617
| | * | QQuickItem: fix another infinite loop in nextItemInFocusChain()Liang Qi2016-01-308-6/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-50516 Change-Id: I6a1513b22401b0fe45da758a239ad82038b83264 Reviewed-by: Zsombor Egri <zsombor.egri@canonical.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * | | GridView: Sanitize visible items after model insertionGabriel de Dietrich2016-02-133-13/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is basically the same patch as 35d8d060b8621cfd, but this time for GridView instead of ListView. The major difference is that GridView seems to do the right thing when the model insertions happen after the visible index. That explains the missing part of the patch in applyInsertionChange() as compared to the same function in QQuickListView. Also, QQuickGridView auto-tests are a bit more robust than their ListView counterpart. So no changes were necessary to existing test cases. Task-number: QTBUG-48870 Change-Id: I19b24c4d84a1a4cef4fdb3ddd3381d0c6b93a76a Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| * | | QQuickGridView: Refactor FxViewItem releasing codeGabriel de Dietrich2016-02-131-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same as 51443673dce131f2. Change-Id: I785f777e761aba369014d1e4ad8020066f35fbe0 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
| * | | Factor out testing code for QTBUG_48870_fastModelUpdatesGabriel de Dietrich2016-02-133-91/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is going to be reused for QQuickGridview's counterpart. Change-Id: I3eaf272229b0e45dfc8c0b78ba94d57c72f9cc5d Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
| * | | QQuickPixmapCache: Use readImage's (more useful) error message.Robin Burchell2016-02-121-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | readImage already assigns to errorString if something goes wrong, so there's no need to overwrite it with a less useful error message (which doesn't tell us what actually went wrong). Before: Invalid image data: test.qml After: Error decoding: test.qml: Unsupported image format Change-Id: I7df3d24497d001e18453034c6f9f63bb51bd0ecc Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Michael Brasser <michael.brasser@live.com>
* | | | Merge dev into 5.7Oswald Buddenhagen2016-02-175-4/+27
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: I20e942d00dcb1f7947850ca12f136851922b9f1c
| * | | | Add Window.window attached propertyJ-P Nurmi2016-02-125-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Window attached property exposes all kinds of window attributes, but not the window itself. Being able to access the window is often useful for various purposes. For example, in QML TestCase, to be able to access the window of the TestCase so that one can call various slots such as requestActivate(). Change-Id: Id03c9f277bb17810b41a60957011ccf07399e149 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | | | | Doc: Fix incorrect 'See also' referencesTopi Reinio2016-02-172-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes these documentation warnings: src/quick/items/qquickgridview.cpp:1512: warning: Can't link to 'l' src/quick/items/qquicklistview.cpp:2183: warning: Can't link to 'l' Change-Id: Icbe4715f12cd66742873c815ef2ffc29b96b36fb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-1223-37/+355
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I356ec83cf687bd2833f9a7c5e820d56b1efa8979
| * | | Fix Animators in itemview and positioner transitionsJ-P Nurmi2016-02-114-7/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In itemview/positioner transitions, Animator's target-property is never explicitly set. QQuickItemViewTransition passes the animation target as a "default target" instead. This change adds missing handling for the default target. QQuickItemViewTransition sets up default "x" and "y" state actions. If Animator drives opacity, scale, or basically anything else than x/y animations, it failed to extract the from/to values from the state action list. This change fixes the issue that if the default state actions do not match the animator property (x/y vs. scale/opacity), it uses from/to values specified on the animator itself. Before, it did that only if the default state action list was empty. This is not the case with itemview/positioner transitions. Change-Id: I0f15e20bc860ddec23e59efebbc9cd346317f4de Task-number: QTBUG-50908 Reviewed-by: Gunnar Sletta <gunnar@sletta.org> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| * | | Fix grammar in QML property aliases documentationMitch Curtis2016-02-111-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifa5c046d389f8f4b538b5b7727b99a0dd26a6121 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * | | QQmlComponent: mention errors when component is prematurely destructedMitch Curtis2016-02-101-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idb5dc9e68b92cb6b20b4e8df44ed6ac55aaa9568 Task-number: QTBUG-45745 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * | | QuickTest, QmlImportScanner: replace QStringLiteral with QLatin1StringAnton Kudryavtsev2016-02-102-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... in string comparisons. It's more efficient. Change-Id: Ia157618cf870870f24c4a2962a385962da819275 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * | | Bump versionOswald Buddenhagen2016-02-081-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ife0809638e3af50304c37931cae3c5d16906b936
| * | | Lancelot: Add test for mixing breaks and wraps in selectionsEskil Abrahamsen Blomfeldt2016-02-051-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a test for QTBUG-49596. It's separate from the fix, because the fix is in Qt Gui. Task-number: QTBUG-49596 Change-Id: Ic035e58b477422dcb137e528381d9b70d6542215 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
| * | | Fix crash when Canvas has negative width or heightMitch Curtis2016-02-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | m_fbo is null when using a threaded render loop. Change-Id: I297ba651f9605f1718dbe9d09bd30e9682fb8401 Task-number: QTBUG-50085 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| * | | Don't call render during expose, since we are already calling render().Jan Arve Saether2016-02-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This causes drawing artifacts on Win7 with ANGLES d3d11 backend. Task-number: QTBUG-49923 Change-Id: I801282c4359bd485d1894e409e34393b4264d994 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| * | | Fix negative emitRate causing app to hangMitch Curtis2016-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieb74ab1a1369ca8c70243002e6b6deec86c03dd6 Task-number: QTBUG-50250 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * | | Doc: correct Item::contains() return typeNikita Krupenko2016-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifbfb36cee6742dbd34c1743fba0fa30a304f25ed Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * | | Fix QQuickItemViewPrivate::updateUnrequestedPositions()J-P Nurmi2016-02-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't attempt to reposition unrequested items at negative indexes, meaning that they are not in the model. The chances are that they have been already deleted. Change-Id: Iadd08518b11e0ea5d7965215a517aafaf35c95ba Task-number: QTBUG-48277 Reviewed-by: Nikita Krupenko <krnekit@gmail.com> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| * | | Window attached property: fix notifier signalsJ-P Nurmi2016-02-022-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change notifiers must be emitted when an item's window is reset. Otherwise any existing bindings don't get re-evaluated, and in worst scenario one ends up with dangling pointers. Change-Id: I6075957f1447bb8628d25bd822345e45837c027a Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
| * | | qmlplugindump: option to merge qmltypes.Marco Benelli2016-02-024-3/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtCreator does not handle dependencies between Qml types defined in different qmltypes files. Sometimes manual editing of qmltypes file is needed to let QtCreator find the missing type information. With the new -merge option it is possible to merge a qmltypes file to the output of qmlplugindump. Dependencies are correctly merged but components are simply added, so they could cause conflict. Change-Id: I6569339e4f05d37ea63fa2173983b4d595ae0ad6 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
| * | | Flickable: ensure movementEnded after wheel/trackpad flickShawn Rutledge2016-02-023-2/+36
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In qtdeclarative/tests/manual/touch/flicktext.qml it was already clear that the moving/movingVertically/Horizontally properties did not revert to false after a trackpad flick on OS X. It turns out that the failure to emit the movementEnded signal also caused a scrolling bug in ListView. QQuickFlickable::wheelEvent() looks at event->phase(), but ScrollEnd is not absolute: on OS X with a bluetooth trackpad, it happens once when the user's fingers are lifted, then the "momentum" events occur with ScrollUpdate, and then ScrollEnd happens again at the end of the momentum phase. But if the user's fingers come to rest before being lifted, to stop the momentum, then the ScrollEnd phase happens only once, and that's actually the end of scrolling, flicking and movement, all at once. The events don't seem to provide enough information to disambiguate these two cases; but if ScrollEnd phase occurs, and then we don't receive any more events within some short time interval, we can be pretty sure the scrolling really ended. So, use a timer to check whether any more events have been received, a little later after the ScrollEnd phase. The movementEnded signal can now be emitted for several reasons: the regular timeline ended movement, the velocityTimeline ended movement, or the movementEndingTimer sent an event. Also, when flicking with a physical mouse wheel, flickStarted was emitted multiple times; now it will be emitted only once. Task-number: QTBUG-47151 Change-Id: I534e99befbd9bf6af24c4ebdca73dd21964f1063 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | | Quick: replace QStringLiteral with QLatin1StringAnton Kudryavtsev2016-02-106-61/+61
| | | | | | | | | | | | | | | | | | | | | ... in string comparisons. It's more efficient. Change-Id: I51b4f5dd79ddb8a448e59ebfc537b86b78730dfb Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Qml: replace QStringLiteral with QLatin1StringAnton Kudryavtsev2016-02-109-29/+29
| | | | | | | | | | | | | | | | | | | | | ... in string comparisons. It's more efficient. Change-Id: I3be5a2be9ba5d55546472eac28f5f639a496bf3b Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Don't deep copy std::vector [-Wclazy-foreach]Sérgio Martins2016-02-082-6/+6
| | | | | | | | | | | | | | | Change-Id: Ic326786a64c9b6dcd8cee1b45dec45de9cd90414 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Include qqml.h in qqmlengine.h for convenienceMitch Curtis2016-02-052-37/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user creates a Qt Quick Application Project in Creator, they get this main.cpp: int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); return app.exec(); } According to the current documentation, if they then want to register a C++ type for use in QML, they need to add a separate "#include <QtQml>" (which is actually a module-wide include and brings a lot of unnecessary files with it). If the most common (or perhaps only) use case for that function (and all of the others declared in qqml.h but documented as requiring QtQml) is related to QQmlEngine, then it makes sense for qqmlengine.h to include qqml.h. This change makes it so that users can use these functions with no changes to the code that Creator provides, as QQmlApplicationEngine includes QQmlEngine. Change-Id: I9d6be2e1abfd4cc831ca04dab4c2a9e50021f748 Task-number: QTBUG-50343 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | QSGDefaultRectangleNode: Fix off-by-one color renderingJakub Adam2016-02-013-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implicit conversion from floating-point to int, which simply truncates the number's fractional part, may have caused the rectangle fill to be rendered in a color with some of its RGB components different by ±1 from the specified value. For example, the actual on-screen color of the following QML item was #010101 on 32bit Intel (no antialiasing or alpha channel): Rectangle { width: 100 height: 100 color: '#020202' } This commit improves precision of the calculation by applying qRound() before the conversion to integer. Change-Id: Ia849c31ba9872e7a92608245406d178051b21917 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | | Enable V4 JIT for aarch64Laszlo Agocs2016-02-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64-bit ARM boards (f.ex. with Tegra X1) are becoming common and therefore enabling the JIT would be highly beneficial. Change-Id: I5ee46258151885194f93d2528edddd5f51dff964 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-2949-415/+562
|\| | | | | | | | | | | Change-Id: Iec1b2de53c275996364c4bab0123ccb3e6e9895e
| * | photosurface demo: Improve handling of image directories.Friedemann Kleint2016-01-292-3/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to pass URLs on the command line. If no argument is given and the pictures location as returned by QStandardPaths exists and has contents, show it, Otherwise, show the file dialog as was before. Set context properties containing pictures location, image name filters and initial URL. Derive the image filter string from QImageReader/QMimeDatabase. Change-Id: I89bdff27416bf8ef725aa4e17853b2f634cf059b Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
| * | PathView: don't leak item referencesJ-P Nurmi2016-01-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every getItem() call increases the reference count. If getItem() was called on an item that was already managed, we must pair it with a call to releaseItem() in order to keep the reference count in sync. Change-Id: I897d19c77bc0c58717065cbe925c45a14153ad0b Task-number: QTBUG-50655 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * | Fix rejecting drag enter events in QML DropAreaSebastian Sauer2016-01-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't initiate a drag and drop if the event was rejected. What happens is: QQuickDropArea::dragEnterEvent() sets d->containsDrag = true QQuickDropArea::dragLeaveEvent() sets d->containsDrag = false HOWEVER, when the enter event is rejected, the leave event is never delivered, and the drop area remains blocked because it thinks the first drag action is not done yet. Change-Id: I74c53fbe778c954e4aa2f22f393318c4938a5afe Task-number: QTBUG-39453 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * | Doc: corrected minor link issue to id attributeNico Vertriest2016-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | Change-Id: I0143e212b2236cef5bfad42fb9b0f9837b825649 Task-number: QTBUG-43810 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
| * | qmlimportscanner: do not use local predicates.Marco Benelli2016-01-281-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | Some (?) pre C++11 compilers are not able to resolve template arguments for std::find_if when the predicates are local to the function. Change-Id: I1e5c4adc3409bd32081ddedff158ab9dcc2eaa9a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | stocqt example: Choose font depending on platform.Friedemann Kleint2016-01-279-17/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example used the font "Open Sans" which is only available on UNIX platforms and causes it to look baroque on WinRT. Add a settings file specifying the font and override via file selector. Change-Id: I1a9284d928ac57289d75b5fb9477849ac518787b Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | QML: do not wrap property values of type QVariant.Erik Verbruggen2016-01-272-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When reading a propety from a QGadget or a QObject, the values are stored in a QVariant and later unwrapped/converted to the correct JavaScript type. However, if the property value is a QVariant, it does not need to wrap it (again) in a QVariant. Change-Id: I633d3194f82b6032fc15d9994c4dee5e5609fd21 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | Don't check for revisions when assigning to grouped propertiesLars Knoll2016-01-277-10/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This leads to wrong behavior in some cases, where we reject valid revisions, and there is probably no case, where this could lead to a conflict for the user of the API. Change-Id: I1614332cf4c07c6a227551612331dd69b2ae71f3 Task-number: QTBUG-40043 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * | Animated sprite would stop after running for 24 hours.Jan Arve Saether2016-01-271-2/+2
| | | | | | | | | | | | | | | | | | | | | Fix is to use QElapsedTimer instead of QTime. Change-Id: I03d0a2428c7f0d82c4c54ab844023b09baf15175 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * | Preparations for re-rendering native text on DPI scaling changes.Andreas Hartmetz2016-01-265-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes only non-functional changes so the next patch can make mostly functional changes. QQuickText: rename q_imageLoaded() to q_updateLayout(). Says what it does, not when it is called. QQuickWindow: split QQuickWindow::forcePolish() into QQuickWindow::handleScreenChanged() and QQuickWindowPrivate::forcePolish(). Change-Id: Ief2ae30cd9f27ee8083b2c75765fb5278bde5ea8 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 17:53:08 +0000