aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
* QQuickTextInput: handle QKeySequence::DeleteCompleteLineJ-P Nurmi2015-11-262-1/+14
| | | | | | | | Change-Id: I56bb1f56a9c37137bab322b699d6345e82449c9c Task-number: QTBUG-49643 Reviewed-by: Kai Uwe Broulik <kde@privat.broulik.de> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Private export QQuickPenJ-P Nurmi2015-11-261-1/+1
| | | | | | | | | | | | | | When including QtQuick headers outside of QtQuick, MSVC fails to link the staticMetaObject of any unexported Q_OBJECT class that it sees. QQuickPen is the only autotest-exported type in qquickrectangle_p.h. All other types in the same header (QQuickRectangle, QQuickGradient, and QQuickGradientStop) are private exported. Because of the MSVC linking behavior described above, those private exports are worthless if the last remaining type is not exported. Change-Id: Ife1bf466fa46a1b86ddf8ff76ab73c1beaa71acc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* ListView: fix random crashes when accessing deleted objectsJ-P Nurmi2015-11-262-3/+3
| | | | | | | | | | These crashes occur randomly with tst_combobox from qtquickcontrols2, and with the test case attached to the linked bug report. Change-Id: If7d91045f86ec33e7fe398ed02f3edf80700651a Task-number: QTBUG-48277 Reviewed-by: Nikita Krupenko <krnekit@gmail.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Fix crash related to BoundFunctionsFrank Meerkoetter2015-11-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | This fix prevents the crash documented in QTBUG-49076. To quote Erik on the cause of the crash: Call stack is probably: FunctionPrototype::method_bind -> BoundFunction::create -> mm::allocObject -> BoundFunction::BoundFunction -> Heap::FunctionObject -> (Scoped)FunctionObject::init -> engine::newObject -> ... -> mm::allocObject The call to Heap::FunctionObject in BoundFunction is the call to the parent class constructor, which causes an allocation. But at that point, BoundFunction's target is still zero-initialised (the real initialization happens first thing *after* the parent class' constructor is called). Change-Id: If256f59168867cba9c886642ebaacb1d56801da4 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Private export QQuickItemViewJ-P Nurmi2015-11-201-2/+2
| | | | | | | | | | | | | | Qt Quick Controls 2 ComboBox needs access to: - QQuickItemView::itemAt() - QQuickItemView::indexAt() QQuickItemViewAttached had to be exported because it's in the same header file and has the Q_OBJECT macro (MSVC would fail to link staticMetaObject). Alternatively, it could have been moved to another header file. Change-Id: Icaab2c90c136074ae78ce02a422794bb7ccff4aa Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6Liang Qi2015-11-207-3/+53
|\
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-11-177-3/+53
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/quick/util/qquickimageprovider.cpp Change-Id: I7ca4e49468b5ba697208287be4684e42b9900023
| | * Don't normalize the path via the shell if it is a qrc based pathAndy Shaw2015-11-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing a qrc based path to shellNormalizeFileName() was causing problems with the Windows API. Since it won't change the path in this case anyway because the path is not valid on the file system then there is no need to do any checking. Task-number: QTBUG-46248 Change-Id: If20075c25aade3740287250b4e1f31538b398f8f Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| | * Fix grammar in TextInput documentationMitch Curtis2015-11-021-1/+1
| | | | | | | | | | | | | | | Change-Id: I78ecd97c25da70faf8438dd02d50952d2fb80a22 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| | * Doc: added documentation to undocumented functionsNico Vertriest2015-11-025-2/+49
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-36985 Change-Id: I219375d405fbfb53611c0138698e955d9cd5d821 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | | Fixing compilation with -no-rttiThomas Hartmann2015-11-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DesignerSupport should not keep users from compiling with -no-rtti. Next step is to move DesignerSupport into a library and only build it on desktop platforms. Task-number: QTBUG-49154 Change-Id: Ie0037f3371c24da56f34f27b1f39e8c318e41451 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Doc: Added link to Extending QMLNico Vertriest2015-11-201-2/+1
|/ / | | | | | | | | | | Task-number: QTBUG-33521 Change-Id: I616369c3a535395ddb465a2f787dec7fc055a503 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | QQuickWidget: Emulate visibility for offscreen windowUlf Hermann2015-11-162-1/+35
| | | | | | | | | | | | | | | | | | The "visibility" and "visible" properties are exported to QML and should return useful values. Task-number: QTBUG-49054 Change-Id: I3c474885653c4b57659b02f183293e3186edc972 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Document default argument behavior of Qt.createComponent()Mitch Curtis2015-11-161-2/+15
| | | | | | | | | | | | | | | | | | It's not currently clear how to get the default mode when also passing a parent, though lots of Qt code simply omits the argument. Change-Id: I35db7cf57991a2a3fafe4d00df2879b98037e93c Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
* | qmlimportscanner: Improve command line help.Friedemann Kleint2015-11-161-6/+13
| | | | | | | | | | | | | | | | | | Output example line containing the Qt import path ready for copy & paste. Task-number: QTBUG-48424 Change-Id: I44d0793ade4322d376ed2b72e5c3935b19ba2c7d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 12:08:57 +0000