aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
Commit message (Collapse)AuthorAgeFilesLines
...
* | Make the qml/js matrix4x4 type more usefulSean Harmer2015-11-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is used in Qt3D. We also added these additional functions there but for a nice user experience that doesn't kick up errors depending upon the order in which QML modules are imported it would be useful to add these new functions here too. In the long term it would be nice if these QtGui type wrappers were in a qtqmlgui module that was implicitly imported by both QtQuick and Qt3D. Change-Id: Iab03bb6c79b89bcecb4b3204cd0cb01d71f36701 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Shortcut: make both nativeText and portableText availableJ-P Nurmi2015-11-052-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | They have different use cases. One is for display purposes, whereas the other is suitable for storing to settings etc. [ChangeLog][QtQuick] Added Shortcut.nativeText and portableText properties to read back the key sequence as a string Change-Id: I5575925ae08ccc9fa8933afc053651b0f3813181 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | qquickanimatorjob_p.h: fix inconsistent override warningsJ-P Nurmi2015-11-041-16/+16
| | | | | | | | | | Change-Id: I0d76e8fc630fa30b54ee56a3227856903d0951a9 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | Fix childrenRect calculationCornelius Mika2015-10-311-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Because the 'bottom' and 'right' variables were both initialized to 0, the bottom right corner of the children rect was clamped to coordinates >= (0, 0). Additionally, replace FLT_MAX with the more appropriate std::numeric_limits<qreal>::max(). Task-number: QTBUG-38732 Change-Id: I073b0b44737cf1faed5e4f6a5d466dd830d451bf Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Doc: fixed link issuesNico Vertriest2015-10-301-1/+1
| | | | | | | | | | | | Task-number: QTBUG-43810 Change-Id: I9f989cd59780ab325cd3f8ddb824868763e369b3 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | virtual QQuickAnimatorJob::afterNodeSync()J-P Nurmi2015-10-292-3/+4
| | | | | | | | | | | | | | | | This is a suitable hook for custom animator jobs to access QQuickItemPrivate::containerChildNode(). Change-Id: Ie23fd9d6fe053843dd9ac2e8153fabd36873883a Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | Move QQuickTextDocumentWithImageResources out of qquicktext_p_p.hJ-P Nurmi2015-10-297-184/+254
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickTextDocumentWithImageResources was autotest-exported in b63185. The problem is that the QQuickLabel in qtquickcontrols2 inherits QQuickText, and therefore includes the private header. An autotest- exported class with Q_OBJECT macro leads to a linking error: qquickcontrol.obj : error LNK2019: unresolved external symbol "public: static struct TestNamespace::QMetaObject const TestNamespace::QQuickTextDocumentWithImageResources::staticMetaObject" (?staticMetaObject@QQuickTextDocumentWithImageResources@TestNamespace@@2UQMetaObject@2@B) referenced in function "public: static class TestNamespace::QString __cdecl TestNamespace::QQuickTextDocumentWithImageResources::tr(char const *,char const *,int)" (?tr@QQuickTextDocumentWithImageResources@TestNamespace@@SA?AVQString@2@PBD0H@Z) qquicklabel.obj : error LNK2001: unresolved external symbol "public: static struct TestNamespace::QMetaObject const TestNamespace::QQuickTextDocumentWithImageResources::staticMetaObject" (?staticMetaObject@QQuickTextDocumentWithImageResources@TestNamespace@@2UQMetaObject@2@B) ..\..\lib\Qt5LabsTemplatesTestInfix.dll : fatal error LNK1120: 1 unresolved externals Change-Id: I7e8731973c4ad67fca40f87bf009dc55336c3d6f Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Doc: create link to enum list fillModeNico Vertriest2015-10-271-3/+2
| | | | | | | | | | | | Task-number: QTBUG-45880 Change-Id: I99b2b000179d22553113a4ea5dd505094a3e08be Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-269-68/+83
|\| | | | | | | | | | | | | | | Conflicts: tests/auto/qml/qml.pro tools/qmlprofiler/qmlprofilerclient.cpp Change-Id: Id47f15a5ab38f8ec79f0a26c92805acba62caac4
| * Make it possible to change sources of ShaderEffect again.Gunnar Sletta2015-10-202-30/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 92433623b31388e2e8c4d532033dad6189eaab24 introduced a bug where an unused material would clear its typeid pointer. This resulted in that a changed shadereffect would in all likelyhood get the same pointer for its changed shader which would result in using the same GL shader inside the renderer. This change rewrites the logic so that the cache is per render thread and the cache is cleaned up along with other GL/SG resources as part of scene graph invalidation. Task-number: QTBUG-48856 Change-Id: Id2feb14f584b5f5c176e8176cc9f1b54abd0d079 Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
| * Scene Graph: Fixed memory leak in QSGBatchRenderer::Renderer::map()Martin Banky2015-10-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the uncommon case (m_context->hasBrokenIndexBufferObjects() || m_visualizeMode != VisualizeNothing) of mapping a buffer, malloc is called without first freeing the previous malloc. Regression was introduced with: qt5 commit: 9347499e78f03710eaf24af3c1e7ac650d0ef81d qtdeclarative commit: a371bac3fba73f92aaa63a68d8ab1ae81a1d1031 [ChangeLog][QtQuick][Scene Graph] Fixed memory leak in QSGBatchRenderer::Renderer::map() Task-number: QTBUG-48799 Change-Id: I5ef4b7301d390463845aeb192851f86655962499 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * Fix QQuickTextDocumentWithImageResources image loadingRoman Pasechnik2015-10-152-22/+18
| | | | | | | | | | | | | | | | | | | | | | QQuickTextDocumentWithImageResources always tries to load images itself and not using QTextDocument internal resources. What it should do: 1) Check if QTextDocument already has image resource and use it. 2) If not, try to load resource manually. Change-Id: Ifc4d919fc4a08b4efae50e06a42f1af7cee67af3 Task-number: QTBUG-32525 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| * AnimatedSprite: avoid unnecessary redrawsTim Blechmann2015-10-142-4/+17
| | | | | | | | | | | | | | | | | | AnimatedSprite currently triggers a redraw for every update. however this should only be done, when the next frame will actually be different to the current one. Change-Id: I550bd32c02807e4c3f4847fb2608f5ad0cf0a59a Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
| * QQuickItem: detect loop in KeyNavigation chainLiang Qi2015-10-141-1/+3
| | | | | | | | | | | | Task-number: QTBUG-47229 Change-Id: I22dbe5ee1fff4e9a8de4fa69b43e4d9a87677192 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Correct some areas of QQuickItem's documentationMitch Curtis2015-10-131-8/+8
| | | | | | | | | | Change-Id: I2a2c684cd3f55a5a4311fd28b893e6a93c022ace Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Fixed 'plataforms' typo in WheelEvent documentationDaniel Levin2015-10-061-1/+1
| | | | | | | | | | | | Change-Id: I08907f6c0d435c2a056f759ba58f616a5b0368d2 Signed-off-by: Daniel Levin <dendy.ua@gmail.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* | Quick: Sanitize reading environment variables.Friedemann Kleint2015-10-2612-70/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Where possible, use qEnvironmentVariableIsSet()/ qEnvironmentVariableIsEmpty() instead of checking on the return value of qgetenv(). Where the value is required, add a check using one of qEnvironmentVariableIsSet()/Empty(). Move QSGAtlasTexture::qsg_envInt() to qsgrenderer.cpp for reuse as qt_sg_envInt() and add qt_sg_envFloat(). Change-Id: I4c93f16c228d4f537154f389a0fa1427654485f7 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | Doc: corrected mistake in documentation Using TransitionsNico Vertriest2015-10-221-5/+4
| | | | | | | | | | | | Task-number: QTWEBSITE-565 Change-Id: I669aee1acbc76a98e481f9b107f2d104b0fb60bd Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Fix QQuickPathViewPrivate::snapToIndex()J-P Nurmi2015-10-222-7/+7
| | | | | | | | | | | | | | | | | | | | QQuickPathView::setCurrentIndex() set moveReason to "SetIndex", but snapToIndex() overrode it to "Other". This caused updateCurrent() to change the current index during snap animation and caused binding loops in Qt Quick Controls 2. Change-Id: I6c5f34c69886cb5c234ed78535bb356fbb38b3a6 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | QQuickItem: Make setParent() error message more usefulGabriel de Dietrich2015-10-221-1/+1
| | | | | | | | | | Change-Id: Ie39b7ee91024b6b090fce2b58bb240cbae724b8f Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Several cases of s/decelerating from/decelerating to/.Edward Welbourne2015-10-211-8/+8
| | | | | | | | | | | | | | | | | | The relevant easing curves all start out fast and end stationery; so it's at the *end* that they attain zero "velocity", so they're decelerating *to* zero, not from it. Change-Id: Ia691e39ef59708828a7e7f8af46b775abbff86fd Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Revert "Doc: corrected not working snippet"Topi Reinio2015-10-212-2/+1
| | | | | | | | | | | | | | | | | | This reverts commit f8bde8841631c6e4fa64a56f77522567455f8709, and fixes the original problem of a snippet not being found by using a relative path for the \snippet command. Change-Id: Ie932beea1ba07cf5b298528ba61b5a45b84cb19b Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Doc: Corrected qdoc errors \generatelist{related}Nico Vertriest2015-10-214-11/+4
| | | | | | | | | | | | | | | | Task-number: QTBUG-43810 Change-Id: I9ffb78dc02453590008416ba74f3d1a7f56b36fa Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | QQuickItemPrivate: added a accessibleRole()Liang Qi2015-10-213-4/+22
| | | | | | | | | | | | | | Which is used in QAccessibleQuickItem. Change-Id: Ie9c9d59783c4af0c53a3ffe88046132fb6b5c0fd Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Doc: Update examplesinstallpath to include the repository nameTopi Reinio2015-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The examplesinstallpath variable in .qdocconf files defines the path under QT_INSTALL_EXAMPLES where examples are found. To match the way examples are packaged in Qt 5.6, prefix each install path with the repository name. Task-number: QTBUG-48736 Change-Id: Ic081654ad3dfb87d3053772fabd5546c75070a7c Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | QQuickItem: fully document stackBefore() and stackAfter()Mitch Curtis2015-10-201-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the following behavior initially came as a surprise to me: int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); QQmlApplicationEngine engine; engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); QObject *window = engine.rootObjects().first(); // Assume that a and b are rectangles declared in that order, respectively. QQuickItem *a = window->property("a").value<QQuickItem*>(); QQuickItem *b = window->property("b").value<QQuickItem*>(); // a is rendered below b (assume that rendering happens here) qDebug() << "a.z =" << a->z() << "b.z =" << b->z(); // a.z = 0 b.z = 0 a->stackAfter(b); // a is rendered above b qDebug() << "a.z =" << a->z() << "b.z =" << b->z(); // a.z = 0 b.z = 0 b->setZ(1); // a is rendered below b qDebug() << "a.z =" << a->z() << "b.z =" << b->z(); // a.z = 0 b.z = 1 a->stackAfter(b); // a is rendered below b qDebug() << "a.z =" << a->z() << "b.z =" << b->z(); // a.z = 0 b.z = 1 return app.exec(); } I would have thought that stackBefore()/stackAfter() would also change the z value, but it makes sense that it doens't, as z is never really validated, as such. Still, we should document the exact behavior, including information about tab focus ordering. Change-Id: Iafc45aec402d8461e7b53525f81195171f659dff Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Doc: solved various qdoc errors qtdeclarativeNico Vertriest2015-10-201-18/+0
| | | | | | | | | | | | Task-number: QTBUG-43810 Change-Id: I2e9fa91d63c5998df50f3678e485135e8518916d Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Doc: corrected qdoc error missing topic commandNico Vertriest2015-10-202-29/+2
| | | | | | | | | | | | | | | | | | | | Removed 3 unnecessary ingroup statements plus accompanying generatelist statement Task-number: QTBUG-43810 Change-Id: I54f1e13b7b80afc2529765a177c0fca5090de1e0 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Support alpha in QQuickWindow::grabWindow().Gunnar Sletta2015-10-164-4/+8
| | | | | | | | | | | | Change-Id: I2dd69745427d8f5e882303d2a4de3935ddca02e9 Task-number: QTBUG-48787 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Doc: corrected syntax errors \qmlmethodNico Vertriest2015-10-152-3/+2
| | | | | | | | | | | | | | Task-number: QTBUG-43810 Change-Id: I694e9046ba32144b084277637b47d7ce23c633a9 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Doc: corrected not working snippetNico Vertriest2015-10-152-1/+2
| | | | | | | | | | | | Task-number: QTBUG-43810 Change-Id: I62a68494c7130b6d82987e337983b43243a61b5f Reviewed-by: Martin Smith <martin.smith@digia.com>
* | QQuickItem: correct focus reason for key navigationLiang Qi2015-10-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we used Qt::OtherFocusReason for normal key navigation, such as up/down/left/right. But in style world, the reason is critical for focus change. Now we follow the way in widgets world, use Qt::TabFocusReason and Qt::BacktabFocusReason for down/up and right/left(or reversed if mirrored). Task-number: QTBUG-41801 Change-Id: I99e97ea4ced2cef9b3280c578c3a463de8fe1727 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Handle QSG_NO_DEPTH_BUFFER correctlyLaszlo Agocs2015-10-141-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Just not requesting a depth buffer is insufficient since there's nothing guaranteeing that the EGL or other implementation will return depthless configs. When the depth buffer is always there, setting the environment variable is futile. To do what the user has requested, the value has to be checked in the renderer too. Change-Id: I1f572bc6f2f5b5aa94070a239d6e871e3421a51f Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | qquickitemchangelistener_p.h: add comments for the sake of clarityJ-P Nurmi2015-10-131-3/+3
| | | | | | | | | | Change-Id: I63728b127d196d692f42b096e670ea0a3e336968 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | qquickitemchangelistener_p.h: remove an extra semi-colonJ-P Nurmi2015-10-131-1/+1
| | | | | | | | | | Change-Id: I034fa0093aa6dad41c2566a8c7ef8fba9e7d4b82 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Libraries: Fix single-character string literals.Friedemann Kleint2015-10-132-2/+2
| | | | | | | | | | | | | | Use character literals where applicable. Change-Id: I294fc4cb5cbbd23df9735ba2b398118f37cbe08a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Remove special handling of popup windows on OS XTor Arne Vestbø2015-10-131-14/+0
| | | | | | | | | | | | | | | | The handling should be taken care of at the QPA level, not in the individual QWindow subclasses. Change-Id: Iff564dac0c997eb97b426962d126e88c4703cdaa Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | Privately export QQuickTransitionManagerGabriel de Dietrich2015-10-121-1/+1
| | | | | | | | | | | | | | | | We use QQuickTransitionManager for tracking transitions in QtQuick templates, specially in the Panel type. Change-Id: I394814576176b6d6766a44651673a5c8147e11ba Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Don't send delayed mouse presses to ancestors of the replaying Flickable.Andrew den Exter2015-10-125-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | If a Flickable delayed a mouse press event and then replayed it later, ancestor items of that Flickable would receive the press twice: once when filtering events of the Flickable, and again when the event was replayed to a descendent of the Flickable. Extend the protection against a Flickable receiving that repeat event to all ancestor items so this doesn't happen. Change-Id: I438c146130c24a7d47e9e8712a1ab08f3d915a06 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com> Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>
* | Remove special handling of shortcut eventsTor Arne Vestbø2015-10-071-7/+0
| | | | | | | | | | | | | | | | | | | | The logic is already handled in QGuiApplicationPrivate::processKeyEvent(), so doing it in the QQuickWindow is redundant. In addition, the logic will soon move to QPA which will break this code if left in. Change-Id: I4d22362dedfa62ada4ab4683e15c6c0cad45e4b5 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Add missing "We mean it" comments to private headers.Friedemann Kleint2015-10-06117-0/+1287
| | | | | | | | | | | | Task-number: QTBUG-48594 Change-Id: Ifc207938de7f0c8995fc712df92665f222612647 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | QQuickTextEdit/Input: revise implicit resizing - take twoJ-P Nurmi2015-10-044-16/+34
| | | | | | | | | | | | | | | | Referencing unexported symbols (ExtraData) from an inlined method does not work with MinGW. Change-Id: I19935c84c4e2014f73bcd1801d182d193166bd44 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | QQuickTextEdit/Input: revise implicit resizingJ-P Nurmi2015-10-034-8/+22
| | | | | | | | | | | | | | | | | | | | Rename explicitImplicitSize to better descriptive implicitResize, and add a method to disable the default behavior. QQuickTextField was unable to access the flag directly, because ExtraData is not exported (and we prefer to keep it that way). Change-Id: Ia8b8281267adfc376e03a14882708e9cf80f0451 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-0213-20/+73
|\| | | | | | | | | | | | | Conflicts: src/quickwidgets/qquickwidget.cpp Change-Id: I3e2326bc86a9d3adaafbe3830b75ce9afa81c45b
| * Image: fix crash when switching between multiple screensMitch Curtis2015-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When moving a Qt Quick application containing Image delegates in a view (e.g. ListView, GridView, etc.) between multiple screens, it's possible that the amount of visible delegates changes due to potential differences in the screens' sizes. For example, moving an application using the Window + left/right arrow keys on Windows causes the window to snap to the side of the screen. If one screen is smaller than the other, moving the application back and forth in this manner will cause some delegates to be destroyed, as they are no longer visible in the smaller screen. However, between receiving the Component.destruction signal in QML and being actually destroyed in C++, the Images may try to reload their pixmaps (when the cache property is set to false, for example). Since the views had (correctly) already hidden those delegates and hence they had no associated QQmlEngine, the load() function would crash because of the assumption that there was a valid engine. This patch checks that there is a valid QQmlEngine with which to load pixmaps before doing so. Change-Id: I8a3f0ec5220fddfd79758985c1eb2b55b0baae47 Task-number: QTBUG-45991 Reviewed-by: Gunnar Sletta <gunnar@sletta.org> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Link to Item Layers documentation from each property of layerMitch Curtis2015-09-231-2/+15
| | | | | | | | | | | | | | | | The layer properties desperately lack code snippets, but the Item Layers section has some, so link to that. Change-Id: I3172102b5a1f95bfc495242a16141f030db0dd3c Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * Fix ViewTransition property type in documentationMitch Curtis2015-09-221-3/+3
| | | | | | | | | | | | | | They were all documented as being lists. Change-Id: I95b843ed75dd922d9a3d8824e666a344688091c9 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * Fix compilation of QtDeclarative with QT_NO_GESTURESTobias Koenig2015-09-224-1/+9
| | | | | | | | | | | | | | | | Allow to compile QtDeclarative module with QT_NO_GESTURES define enabled. Change-Id: I5335f97c675d75c71c81edcc8307338ed3571663 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * Fix grammar in Performance docsMitch Curtis2015-09-191-1/+1
| | | | | | | | | | Change-Id: I3e012d1124973d9f33123f6b68acfeffeeedb018 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * Revert "Avoid calling potentially pure virtual method"David Edmundson2015-09-181-9/+18
| | | | | | | | | | | | | | | | | | | | This reverts commit 2d34ed2e655d79bed95859f1d32c2abfacbfb6f1. This change was only needed in Qt 5.4 Change-Id: Ica636da9a3deba68abbfda12e5ea72b296d9ad64 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 20:05:15 +0000