aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix typos in ParticleSystem documentationMitch Curtis2016-01-041-2/+2
| | | | | Change-Id: I417250992dbba3b67e891b0e929c09f2c95da299 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* QQuickFlipable: Set enabled property on whichever side is considered active.Robin Burchell2015-12-311-4/+13
| | | | | | | | | | | | | | This fixes a regression in behavior whereby input is not blocked when the side changes. In QtQuick1, input was tied to opacity: items with a 0 opacity would not receive input. In QtQuick2, this is not the case. [ChangeLog][QtQuick][Flipable] Flipable now toggles the 'enabled' property on whichever side is active. This restores broken behavior compatibility with QtQuick1, and blocks input to whichever side is not active. Change-Id: I36e29089cd7ffd05bf1f415490e0e0816a86bf30 Task-number: QTBUG-37072 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Fix crash in a non-debug build with assertions enabledThiago Macieira2015-12-291-12/+4
| | | | | | | | | | | | | | | | | | | | QV4::Heap::Base::setVtable has a Q_ASSERT on the state of Base::mm_data, but that member is never initialized anywhere (that is, the Base class does not properly protect its invariant). There were workarounds in some places for initializing the member, but only in debug mode. That was wrong for a number of reasons: 1) Q_ASSERT is still enabled if QT_FORCE_ASSERTS is defined 2) in release mode, the compiler will remove the double initialization anyway Another solution would be to give QV4::Heap::Base a constructor that initializes the member, but I am not sure whether adding a constructor to this class is permitted. Task-number: QTBUG-49681 Change-Id: Ic90fe6b1cbe84978a02fffff141beacbe73c0b9c Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* QQuickDropArea include cleanupSamuel Gaist2015-12-242-5/+0
| | | | | | | Remove unused includes Change-Id: I088b7efda4269faaceb39ea865eadc85fb2f9039 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Fix ListView.OverlayHeaderJ-P Nurmi2015-12-233-2/+146
| | | | | | | | Infinite loop because of rounding in QQuickFlickablePrivate::fixup(). Change-Id: Icffe216587d90660ac3cb8090a676868416566c8 Task-number: QTBUG-50105 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* Revert "Fix QtSharedPointer::ExternalRefCountData object leaks"J-P Nurmi2015-12-236-27/+2
| | | | | | | | | | This reverts commit 839d2d3e2368bc8e107d22203b0611c852f54319, which has been causing crashes in qtquickcontrols2 auto tests and making it nearly impossible to integrate anything over the past few days. Change-Id: I570b286a067aae5e3c2d8c56ad601e1a6cb58c20 Task-number: QTBUG-50134 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* V4: Shrink IR::Temp by removing unnecessary padding.Erik Verbruggen2015-12-231-5/+5
| | | | | | | On 64bit systems, the size goes from 32 bytes to 24. Change-Id: Ic97f98b8f64fd5452f259e825a6bfd1656484fc5 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Fix inconsistent use of 'override'.Erik Verbruggen2015-12-231-2/+2
| | | | | Change-Id: Id3295937bdbd2372a77f273ce5c048807d43f51e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Improve Scene Graph and Rendering documentationMitch Curtis2015-12-211-2/+2
| | | | | Change-Id: I4046e267d4c3a5eae9d3977b2d5f11987c4d1206 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Fix QtSharedPointer::ExternalRefCountData object leaksJian Liang2015-12-186-2/+27
| | | | | | | | | | | Call destroyObject() for every QV4::Heap::QObectWrapper object in heap in QV4::MemoryManager::sweep() to make sure the QPointer object contained in QV4::Heap::QObjectWrapper is properly destructed. We also keep track of QObjectWrapper in QV4::Heap::ModelObject to make sure we destory them in QV4::MemoryManager::sweep() Change-Id: I3b3e96cfc300c2e21ab691762879ac2970afa90c Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* qml: preserve composite singleton types.Marco Benelli2015-12-176-8/+40
| | | | | | | | Composite singleton types used to always have version -1,-1; regardless of what is written in qmldir. Change-Id: Ia193e73695e57095f6a09b97768805f2f23cd56a Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Link to drag and drop examples in relevant placesMitch Curtis2015-12-162-0/+3
| | | | | | | | So users at least have some idea of how to use these types, as their documentation is quite lacking. Change-Id: Ic4644cc259fabbd1462e611316dcec3c5a0d2c4e Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Fix crash when grabbing a QQuickWidget before it is shown.Friedemann Kleint2015-12-152-6/+16
| | | | | | | | Do not access null share contexts. Task-number: QTBUG-49929 Change-Id: I1c88563df71dd6c5d186b6f2ae147614fcc6ded9 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Fix QQuickPaintedItem::renderTarget docsJ-P Nurmi2015-12-151-1/+1
| | | | | Change-Id: I503ba2c7b6b58f01c8270d3a1416ec197f24e0e2 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Don't warn about non-existent default properties when one was foundMitch Curtis2015-12-154-5/+64
| | | | | | | | | | When at least one default property of a target object is considered valid by an animation, we don't need to warn about other default properties that weren't found. Change-Id: I648f17a55fdfcbed2b4c7e94d88206c3dc3d1a32 Task-number: QTBUG-22141 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Fix containsMouse with touch and hoverEnabledPaul Olav Tvete2015-12-153-0/+137
| | | | | | | | | | | When we synthesize a press/release from touch, the item believes that the mouse never leaves, so if we have several mouse areas, they may all claim that they contain the mouse at the same time. The solution is to synthesize a move back to the actual mouse position. Task-number: QTBUG-40856 Change-Id: I43610d95aa383f847db18b387405b0c4e91cea0f Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* Fix shader compiler error (uniform and out variables with same name)Sean Harmer2015-12-151-2/+2
| | | | | Change-Id: I991b22bf52f3523762df25ce7d5d7e8a0f08a2a2 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QQuickWidget: Update position of offscreen window in show().Friedemann Kleint2015-12-151-0/+1
| | | | | | | | | | The position of the offscreen window needs to be exact as it is used for popup menus by the Quick Controls. Updating the position in show amends the situation. Task-number: QTBUG-49097 Change-Id: I416021d6632ede45b1f9dc6b35a3ff15394566ee Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* qmlplugindump: Don't try to import Qt.test.qtestrootAlbert Astals Cid2015-12-151-0/+8
| | | | | | | | | | | Qt.test.qtestroot is only provided by quick_test_main so if we find any plugin that tries to inherit from TestCase.qml qmlplugindump will fail trying to import this unexistant import Change-Id: Idee881fa641267a17594dd3c92e929ca3473f3df Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Timo Jyrinki <timo.jyrinki@canonical.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* qDelete(hash/map.values()) -> qDelete(hash/map)Albert Astals Cid2015-12-152-2/+2
| | | | | | | Saves iterating the whole container and unneeded allocation of a list Change-Id: Iae1f8e0cf3a17b163cf930c43a27b2ebb4315e5c Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Fix styled text core profile shaderSean Harmer2015-12-151-3/+3
| | | | | | | Without this all styled text appears as solid-filled rectangles. Change-Id: I7b64b274b3562b75ed7126d4bb8e89b6cb8d6f77 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QQuickTextEdit: Fully qualify enumerations in changed() signals.Friedemann Kleint2015-12-152-6/+9
| | | | | | | | | Fix warnings when running tst_qquicktextedit: QWARN : tst_qquicktextedit::mouseSelectionMode_accessors() QSignalSpy: Unable to handle parameter 'mode' of type 'QQuickTextEdit::SelectionMode' of method 'mouseSelectionModeChanged', use qRegisterMetaType to register it. QWARN : tst_qquicktextedit::textFormat() QSignalSpy: Unable to handle parameter 'textFormat' of type 'QQuickTextEdit::TextFormat' of method 'textFormatChanged', use qRegisterMetaType to register it. Change-Id: I2d41f970777c9ee4d8999acceed9e1b9cf52b0f0 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* qmlplugindump: add manual tests.v5.6.0-beta1Marco Benelli2015-12-1028-0/+1190
| | | | | | | | | Added a small test infrastructure in order to run tests on sample projects and quickly define new test cases. Running tests will also compile (and clean) sample tests. Change-Id: Ibd0e48201dafe335198479d605d676ca5b753566 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Clean up correctly in rendercontrol to avoid crashesLaszlo Agocs2015-12-092-7/+13
| | | | | | | | | | Not destroying the Animator controller leads to scenegraph animators running even after destroying the rendercontrol and the window. Add the missing delete call and fix the somewhat broken cleanup sequence. Task-number: QTBUG-49635 Change-Id: I170b4bb4b065bda46d8ab9ad9a3992bc8cfd1d1e Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Particle Turbulence image now reads correctly from QRC or local filesAriel Molina2015-12-081-1/+2
| | | | | | | | Turbulence was always reading from local files and never reading from QRC files. Change-Id: I93501f136a6934764422e2a914c01f359b054b2e Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Turbulence was accidentally deactivated on geometry changedAriel Molina2015-12-081-1/+0
| | | | | | | | Geometry changes triggered a grid initialization which removed the reference to the Particle System thus deactivating the Affector, fixed. Change-Id: I56446ae2116a9645d2e4b51c42358cdfb360ee82 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Make QQuickWidget update inside a proxy widgetLaszlo Agocs2015-12-081-1/+8
| | | | | | | | | | | | | Performance will be bad but this allows having simple scenes in a QQuickWidget embedded into a QGraphicsView (ouch). This kind of setup is strongly discouraged but QWidget already has the readback-based fallback for render(), so we only need to add the update re-routing to the proxy widget. Task-number: QTBUG-49724 Change-Id: I1c80cb0a7b401327304ec7b92c77dc654d843b33 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* Correct heightmap values for TurbulenceAriel Molina2015-12-071-3/+3
| | | | | | | | Turbulence was only taking into account the red component, and it was wrongly using the image sideways. Change-Id: I7f50e44a198993b9ea2ac0a66c1952bf9c7e92fb Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* QQuickImageBase: Add support for @3x imagesOlivier Goffart2015-12-071-28/+12
| | | | | | | | | | | | Use the qt_findAtNxFile function from QtGui. Note: this changes the behavior slightly if the file name contains '@2x' not at the end of the file name. We now check that it contains '@2x.' including the dot. Change-Id: I7e6a97d2d9c5aa0706538badf22a13e4c41824c0 Reviewed-by: Edward Welbourne <edward.welbourne@theqtcompany.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* ListView: Sanitize visibleItems list after model insertionsGabriel de Dietrich2015-12-073-17/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In QQuickListViewPrivate::applyInsertionChange(), we update the visibleItems list by first shifting the currently visible items and then we add as many items as the model was added and at the right position. We do this in such a way that we won't create items that will not be visible right away (and may be deleted right after by removeNonVisibleItems()). However, this may leave gaps in the item index sequence, and QQuickListView doesn't always recover gracefully from it. The purpose of this patch is to make sure those gaps are cleared right after inserting the new items. Since the insertions can happen in two different places (either before or after the first visible item) we need to update the visibleItems list accordingly. The way we sanitize visibleItems is by removing those items that lie beyond a possible index gap. If insertion happens before the first visible item, we'll remove all those items before the insertion point. If the insertion happens after the first visible item, we'll remove the items after the insertion point. Besides that, the logic for inserting before the visible position was wrong. As items are inserted bottom-up in that case, the insertion would start by just accounting for the item's size until the condition pos > from && insertionIdx < visibleIndex would become false only because 'pos' would be small enough. After that, the next loop run would start adding items before the 'from' position, which is wrong. Our fix is to move the condition outside the loop if the insertion index will be before the visible index and just account for the items' size in that case. Otherwise, the insertion happens as usual until pos < from. Change-Id: I35767cf6e9737bea1fe7677e580245fc7172710c Task-number: QTBUG-48870 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* Flickable: avoid perturbing the timeline further while in overshootShawn Rutledge2015-12-071-4/+6
| | | | | | | | | | | | | | | | | | | The bug was that when using the mouse wheel, a single "scroll down" wheel event followed by a rapid succession of "scroll up" events would cause extreme overshoot. Experimentally determined that when this happens, the calls to timeline.accel() in QQuickFlickablePrivate::flick() were occurring after the call to accel in QQuickFlickablePrivate::viewportAxisMoved(). But nearby, data.inOvershoot is set to true, so that can be used to avoid calling accel() additional times in flick(). So basically, this patch avoids doing any more acceleration in response to further wheel events after the momentum from previous events has already taken the content beyond bounds. Task-number: QTBUG-21328 Change-Id: I3ab5510a288a080f6b526407b6a2293c44a2498a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* Auto-tests for fast model updates while flickingGabriel de Dietrich2015-12-074-2/+160
| | | | | | | | | | | | | | | Stress testing might sound unfair, but it can happen that the user is flicking the view while the model gets updated resulting in an internally inconsistent state. We need to cover this and start working on a solution. The test is initially blacklisted as it's not expected to pass all the time. Task-number: QTBUG 48870 Change-Id: I7c1e4fd1876f52dd2dad5a28584b571753ebe69a Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* QQuickAnimatorJob: store the target with a QPointerPaul Lemire2015-12-074-1/+84
| | | | | | | | | | | | | | | This avoids ending up with invalid pointers when under some circumstances the target (which is not owned by the QQuickAnimatorJob) is destroyed between the time the QQuickAnimatorJob is created and the time it is initialized. This is the case when the target of an Animator is the item loaded by a Loader and that the animator is started just before setting the Loader to inactive. Also added an auto test for that special case. Task-number: QTBUG-49634 Change-Id: Iab9bfe76d13755ba735432c6f97bde175d308814 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Add .qmltypes files for built-in QML APIOswald Buddenhagen2015-12-075-0/+1876
| | | | | | | | | | | | | | | | | This adds two .qmltypes files: QtQml/plugins.qmltypes describes the components in the QtQml import, and builtins.qmltypes the enumerations in the implicit "Qt" namespace that does not require an import. builtins.qmltypes is automatically picked up by Qt Creator for each Qt version, while plugins.qmltypes will only be parsed if the import is used. Done-with: Kai Koehne <kai.koehne@theqtcompany.com> Done-with: Marco Benelli <marco.benelli@theqtcompany.com> Change-Id: Ia2b1739172c827b945d118b41b647c0a15f3419d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* tst_qquicktextedit::hAlignVisual(): Fix failure on Windows.Friedemann Kleint2015-12-071-0/+1
| | | | | | | | | | | | Set a suitable font, fixing the error: FAIL! : tst_qquicktextedit::hAlignVisual() Compared values are not the same Actual (left): 2 Expected (0) : 0 Task-number: QTBUG-48546 Change-Id: I4d6222a39647229c65f3e5aa12c39d50a722e584 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* MultiPointTouchArea: Fixed released() duplication on mouse release.Alexandr Akulich2015-12-021-6/+2
| | | | | | | | | | | | | | | | | | | | MousePress and MouseRelease event handlers now better integrated into generic touch processing methods. We used to manually add a touch point for mouse press event and prevent updateTouchData() from pressed() emission, but mouseRelease handler used to cause the signal emission in updateTouchData() and then emit the signal on its own. The code reworked to always emit pressed() and released() signals from the single place in updateTouchData(). [ChangeLog][QtQuick][MultiPointTouchArea] Fixed released() signal duplication on mouseReleaseEvent. Task-number: QTBUG-44370 Change-Id: I2d88931ba56d6edf778213c61e9467c2b6abf0e7 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* QQuickListView: Refactor FxViewItem releasing codeGabriel de Dietrich2015-12-011-14/+16
| | | | | Change-Id: Id13e982ff3286ec6f369c3d5898de3da3314579d Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* Initialize _startX and _startYAlbert Astals Cid2015-12-011-0/+1
| | | | | | | | Otherwise valgrind complains about "Conditional jump or move depends on uninitialised value(s)" Change-Id: If1cc6f2839799a80dde5106700bb26fda4b357c3 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Properly check the arguments of mapFrom/ToItemLars Knoll2015-12-013-21/+69
| | | | | | | | | Check that we have the right type and number of arguments and throw a type error if they don't match. Change-Id: I23d37074bf0a6f88e656897862eedc8f7c9f9f8f Task-number: QTBUG-41686 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Fix test casesLars Knoll2015-12-013-4/+4
| | | | | | | | | This test case changed after change 2e00500b9f32f25a15563a4fd35375ead12c14a7 got merged into qtbase. With that change, colors with alpha components will now be converted correctly to a #AARRGGBB string. Change-Id: I8a1edc846537bf7868ba56d819d7aedae1a10fa1 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Update examples to deal correctly with fine-grained wheel eventsAllan Sandfeld Jensen2015-11-302-8/+4
| | | | | | | | | Zooming in large steps on every wheel-events breaks with fine-grained wheel events like we get on touch-pads. We should therefore not encourage that in our examples. Change-Id: Ie2e70b91c66c73f12ef1f6cd55c8610ae70b36ed Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* qquickwindow: handle QEvent::ShortcutOverrideRichard Moe Gustavsen2015-11-301-0/+7
| | | | | | | | | | | | | | | | | | | After qtbase:c7e5e1d, QEvent::ShortcutOverride is no longer sent directly to the focus object, but to the window. But since QQuickWindow didn't catch it, it ended up nowhere. This patch will implement the same strategy as QWidgetWindow, and let QQuickWindow forward the ShortcutOverride event the same way as key events. Note that even if the event was never being delivered, the corresponding key events would still end up in the focus object and trigger shortcuts. But if a window global shortcut existed with the same key sequence, it would grab the shortcut instead of the override, which was wrong. Change-Id: I4ad7b3879adac14d88a3fbce5851409d0963d163 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* Fix autotests for change in QtNetworkDaniel Molkentin2015-11-295-6/+6
| | | | | | | See change 4efa50a5e37497bc3a3dd30f27db7d8100e3f6a5 in qtbase Change-Id: I00e5e529faed029bc3bc461a3b1807811d33c769 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* tst_qquicktextedit: Fix warning about uninitialized variable.Friedemann Kleint2015-11-271-2/+2
| | | | | | | | | tst_qquicktextedit.cpp: In member function 'void tst_qquicktextedit::positionAt()': tst_qquicktextedit.cpp:2428:68: warning: 'y1' may be used uninitialized in this function [-Wmaybe-uninitialized] tst_qquicktextedit.cpp:2425:64: warning: 'y0' may be used uninitialized in this function [-Wmaybe-uninitialized] Change-Id: I28d5a8c1c5421e20097b25ca18915763bac3200c Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Fix bogus warning when using Binding on value typesLars Knoll2015-11-271-26/+20
| | | | | | | | | In addition streamline the code and only do the lookup of the property name once. Change-Id: If2bad4b9179214492ff5692cf1f503f927ca2246 Task-number: QTBUG-48918 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Create proper offscreen surface the first timePaul Olav Tvete2015-11-271-3/+5
| | | | | | | | | | | Make sure the context is correct the first time we create the offscreenSurface, so we don't have to destroy it immediately afterwards and create a new one. This causes problems with some (probably buggy) drivers. Task-number: QTBUG-48440 Change-Id: I4790e1b02738fc84aca201430548934d8054e2b2 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* QmlJs: separate dumping of Qt built-ins and QtQml.Marco Benelli2015-11-271-3/+37
| | | | | | | | | | builtins.qmltypes used to contain also definitions that belong to QtQml. This patch makes qmlplugindump dump only Qt built-ins when called with the '-builtin' option, and makes dumping of QtQml work correctly. Change-Id: I123b9cae6f2557cf281f857df51fae095cbc25cc Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Don't try to resolve id values or singleton member as propertiesLars Knoll2015-11-271-1/+2
| | | | | | | | | | | | Change 1a1f10806c901bc10483370a932d41af0c9629cd started mapping id values to member expressions in the IR. But these should of course not get resolved against local properties of the object. Change-Id: I56bef738ec60b818d7af86bb1aa6d37b2c01d3fd Task-number: QTBUG-49484 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: Anton Kreuzkamp <anton.kreuzkamp@kdab.com>
* Revert "qmlscene/qml tools: Temporarily disable High DPI options."Friedemann Kleint2015-11-262-12/+10
| | | | | | | | | | | | Re-enable the options after the attributes have their final names. Add options for enabling scaling. This reverts commit 051684f125bbc31bd882c4cd313c3482bcd145a0. Task-number: QTBUG-46615 Task-number: QTBUG-48379 Change-Id: If862061c688f9febff3b9511a4f19649b07d2011 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Make property interceptors work on alias properties againLars Knoll2015-11-269-114/+267
| | | | | | | | | | | | | | | | | | | Fixes a regression introduced by change 01c0c0963794f4dd8c3601e8340cc3dc4dec41bd, where interceptors wouldn't work correctly on alias properties. This required some refactoring and splitting out the interceptor handling from the VMEMO into it's own class, as we are now installing bindings directly on the target property of an alias and not on the alias anymore. We now resolve the target property inside the QML object creator and install a interceptor metaobject on the target if required where we can then register the interceptor. Change-Id: I3ebc8f492ce5dcab7acf901711b47336d5182ffa Task-number: QTBUG-49072 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 03:25:06 +0000