aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | qquicktransitionmanager_p_p.h: remove unnecessary includeJ-P Nurmi2015-11-131-2/+2
| | | | | | | | | | | | | | | | This allows the popup framework in Qt Quick Controls 2 to include the header without pulling in unexported classes via indirect includes. Change-Id: Ia69b248c8c227d5c1b44f13a185c07f94a7b5968 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | Ensure we call updateTexture for all dynamic textures.Michael Brasser2015-11-132-2/+2
| | | | | | | | | | Change-Id: I888dc4b1dbc49deeb13f967b0da34cd2273f1680 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | Don't make currentIndex skip an extra item on removalAlberto Mardegan2015-11-134-4/+70
| | | | | | | | | | | | | | | | | | | | | | | | Improve the logic for determining the desired viewport position, which got partially broken with 134d980a7fcf61c5440019bcfb3fdfc39c3f5f3c. Let's not alter topItem and bottomItem if their index appears to be correct. Task-number: QTBUG-49330 Change-Id: Ib1c88de51be28cbb0afb1741440adb03ae8ebd87 Reviewed-by: Albert Astals Cid <albert.astals@canonical.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Doc: added link to Qt5 Cadaques in external resourcesNico Vertriest2015-11-121-1/+6
| | | | | | | | | | | | Task-number: QTBUG-45921 Change-Id: If114e6bab5e69851a67bdda1588a428b31d7b691 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Introduce a more sane "default constructor" for Qt.matrix4x4()Sean Harmer2015-11-112-1/+10
| | | | | | | | | | | | | | | | | | | | If no arguments are specified, create an identity matrix. This is by far the most common use case. This change avoids having to type in the 16 arguments of the identity matrix. Change-Id: I9e0d71897c5368d19ae87cff936df4b9e5e9b84a Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | 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-053-8/+28
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Proper handling of composite types with different versions.Marco Benelli2015-11-031-9/+17
| | | | | | | | | | Change-Id: I967da2eb1867f218d47faf8a589d1773e6f57fc7 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Load component synchronously in method_createQmlObjectUlf Hermann2015-11-035-68/+152
| | | | | | | | | | | | | | | | | | | | | | setData() is not guaranteed to synchronously load the type. In fact, most of the time, it doesn't. However, by adding a private Synchronous mode to QQmlTypeLoader we can prefetch the type synchronously and then inject it into the component. Task-number: QTBUG-45418 Change-Id: I640f12ad20c01b778b5bc41f43574d8aea504195 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | qmlscene/qml tools: Temporarily disable High DPI options.Friedemann Kleint2015-11-022-0/+8
| | | | | | | | | | | | | | | | To be re-enabled once the attribute names are final. Task-number: QTBUG-46615 Change-Id: Id463167ab102e3c2f3af4fe39675853eae3bb851 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | CMake: Make sure to export all pluginsKevin Funk2015-11-023-0/+21
| | | | | | | | | | | | | | | | | | | | Also export plugins ending on "Factory". CMake by default only picks up plugins which have a PLUGIN_CLASS_NAME ending on "Plugin" Task-number: QTBUG-43438 Change-Id: Ib954276dc0eee83f9d48bed0502a16df8194ce9b Reviewed-by: Tim Blechmann <tim@klingt.org> Reviewed-by: Stephen Kelly <steveire@gmail.com>
* | Fix childrenRect calculationCornelius Mika2015-10-313-5/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | 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: added required include statement QtQmlNico Vertriest2015-10-301-0/+4
| | | | | | | | | | | | Task-number: QTBUG-48172 Change-Id: I571a2a28856c95e4293c526aefc8e7ca8c88a0aa Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Doc: added spec on defining enums register.typesNico Vertriest2015-10-301-0/+1
| | | | | | | | | | | | Task-number: QTBUG-48050 Change-Id: Id737e89aa59885d22132bcde020ed04b509201ed Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Doc: corrected typo in doc basic typesNico Vertriest2015-10-301-1/+1
| | | | | | | | | | | | Task-number: QTWEBSITE-517 Change-Id: I5177d45f294566e9551e08755ef627008e86cd35 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Doc: fixed link issuesNico Vertriest2015-10-302-2/+2
| | | | | | | | | | | | Task-number: QTBUG-43810 Change-Id: I9f989cd59780ab325cd3f8ddb824868763e369b3 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Remove uses of QT_POINTER_SIZE, replacing with proper constructsThiago Macieira2015-10-293-6/+6
| | | | | | | | | | | | | | | | | | | | | | Where the size of void* was really wanted, use sizeof(void*). There's only one use of QT_POINTER_SIZE in qtdeclarative now, in fdegen/ main.cpp selecting the ELF size constants. It's easier to keep it like that than to use C++ selecting constructs. The tool isn't built anyway. Change-Id: I1d0f78915b5942aab07cffff140fa0f99ce7d7d4 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* | Use the correct macro to detect 64-bit value encodingThiago Macieira2015-10-295-12/+12
| | | | | | | | | | | | | | We have a macro for it, so let's use it. Change-Id: I1d0f78915b5942aab07cffff140fa0ac23392362 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* | Fix qmlcompiler build on win32.Erik Verbruggen2015-10-291-2/+2
| | | | | | | | | | Change-Id: Ie1239b6ba5f5ba77dd081ad6392d962822d124dc Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.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-2910-186/+258
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Export QQmlLocale privatelyJ-P Nurmi2015-10-281-1/+1
| | | | | | | | | | | | | | | | Allows QQuickSpinBox to call QQmlLocale::wrap() to be able to pass QLocale to QJSValue::call(). Change-Id: I01e4daccdc8bfe6a5c591819ac54bc51603268aa Reviewed-by: Liang Qi <liang.qi@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>
* | QML: Fix typeof context property.Erik Verbruggen2015-10-2713-2/+119
| | | | | | | | | | | | | | | | This was missing from f21e8c641af6b2d10f0d7e7e0fc6a755dab3673c. Task-number: QTBUG-48524 Change-Id: I5cc6a979d965a1ef6b7fbc916a7ca9df868b459a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-2622-69/+290
|\| | | | | | | | | | | | | | | Conflicts: tests/auto/qml/qml.pro tools/qmlprofiler/qmlprofilerclient.cpp Change-Id: Id47f15a5ab38f8ec79f0a26c92805acba62caac4
| * qmllint: Add unit-testsSérgio Martins2015-10-259-1/+123
| | | | | | | | | | Change-Id: Ia3eb33e89597e3811112ce78d8a59a822cc9190c Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * 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-153-22/+34
| | | | | | | | | | | | | | | | | | | | | | 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>
| * qmlprofiler: Use server's datastream version for communicationUlf Hermann2015-10-151-0/+2
| | | | | | | | | | | | | | | | As qmlprofiler doesn't support datastream version negotiation we have to use the data stream version the server uses by default: QT_4_7. Change-Id: I0fa89f82f0f6c651e8e377bd578f8d7ae61045ab Reviewed-by: Simon Hausmann <simon.hausmann@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-143-1/+66
| | | | | | | | | | | | 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>
* | Binding: document that property can be grouped if it's a value typeMitch Curtis2015-10-231-0/+17
| | | | | | | | | | Change-Id: Ie33410027556857fefb87517ebb336c2714bc6c6 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | V4: do not run optimizer for functions of >300 statements.Erik Verbruggen2015-10-231-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The time it takes to run the optimizer depends on both the number of IR statements, and the number of basic-blocks. Many functions that have more than 300 statements are either the %entry point, or methods that set a large number of member variables. Both are not performance sensitive, so skipping them won't hurt execution speed. Actually, not optimizing them does improve startup speed. Basic blocks need to contain at least one statement (the terminator), so a large number basic blocks always results in at least an equal number of IR statements. Therefore they do not need to be taken into account. (An example of an excessive amount of basic blocks is a switch with 9000 cases: this will generate ~27000 basic blocks.) Change-Id: Iabf809d8ad293f4f27ece06d136aa281991a1b0f Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Update plugins.qmltypes for QtQuick importKai Koehne2015-10-232-1757/+325
| | | | | | | | | | Change-Id: I943eef590a759f4cf8d546ce153d8d259d36e762 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Update plugins.qmltypesKai Koehne2015-10-2310-30/+832
| | | | | | | | | | | | | | | | Update all plugins.qmltypes except for QtQuick2. Change-Id: If79b82fa54d159171f45a1bd2e9432c76b3c5686 Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | QML: file leak of QFileSelector.Erik Verbruggen2015-10-222-0/+8
| | | | | | | | | | | | | | | | When no "custom" file selector is set, the QQmlFileSelector would not delete the QFileSelector it created/owned. Change-Id: I0235d0dabdb8522db0b8b74a2a2d69ee5a20abb6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | QML: Sanitize reading environment variables.Friedemann Kleint2015-10-229-31/+52
| | | | | | | | | | | | | | | | | | | | | | 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(). Change-Id: Ia8b7534e6f5165bd8a6b4e63ccc139c42dd03056 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | 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-223-7/+16
| | | | | | | | | | | | | | | | | | | | 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-222-2/+5
| | | | | | | | | | Change-Id: Ie39b7ee91024b6b090fce2b58bb240cbae724b8f Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | QQmlNativeDebugConnector: Do not translate warning.Friedemann Kleint2015-10-221-2/+2
| | | | | | | | | | | | | | qWarnings() usually are not translated. Change-Id: I0375e0e21054d33349d3f56ee9ac6f580e366736 Reviewed-by: Ulf Hermann <ulf.hermann@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>
* | Missing early n in co[n]version.Edward Welbourne2015-10-211-1/+1
| | | | | | | | | | Change-Id: I7ca28b42797a8f0781706af4ffd3e8f0dac41aa3 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 11:32:02 +0000