aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml
Commit message (Collapse)AuthorAgeFilesLines
* Add string::arg method in installTranslatorFunctionsKai Koehne2014-12-051-0/+6
| | | | | | | | | | | QJSEngine::installTranslatorFunctions install the translator functions to any given JS object. However, the custom string::arg() method is only added in qqmlbuiltinfunctions.cpp, making the use of qsTr() in other pure-JS programs quite hard. Task-number: QTBUG-43113 Change-Id: Ia9ed97a4c07a4d167c792f3ea13e4f6e96c97423 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix crashes on QNX/x86Simon Hausmann2014-12-031-7/+6
| | | | | | | | | | | | | | | On x86 we assume that ebx holds the address of the global offset table for position independent code. So before placing a run-time call we restore the register from it's position we saved it on earlier on the stack. However after commit d9f33ccdef985badc56fd8940373748626beffc7 the register wasn't saved on the stack anymore in the prologue because we skipped because it's caller saved. So when we seemingly reloaded ebx with the GOT from the stack, we loaded it from a location we never saved it to. This patch makes sure to always save it on the stack so that we can always restore it. Change-Id: I8f6a8e38779151fff517f17220f29a7cb45ca89d Task-number: QTBUG-43036 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Regression: Fix array data corruptionSimon Hausmann2014-12-022-2/+4
| | | | | | | | | | | | | When inserting into a sparse JS array, we may have to re-allocate the underlying data vector. When that happens we must reload the ArrayData pointer, to avoid returning a wrong pointer in ArrayData::insert. This patch also fixes the valgrind support in the memory allocator by correctly marking the mmap'ed memory region as inaccessible. Change-Id: I86aabc2cec74a4f3c8396463910d90c8968a741d Task-number: QTBUG-42956 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix loading of .ui.qml form files with cached compilation unitsSimon Hausmann2014-12-021-15/+21
| | | | | | | | | Simplify the type loading logic and try the Type -> Type.qml and Type -> Type.ui.qml mapping in a simple loop that tries off-disk and cached compilation unit loading. Change-Id: I537feabd0a158a71f330bede9e6988291298ae81 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Document Qt.application.supportsMultipleWindows property.Mitch Curtis2014-11-251-0/+6
| | | | | | | | | The documentation was not added in 0df606e2ab8f3b60e1ad57dba245acf2e7810612. Change-Id: I0a5802a66021e17d1280f3969981c9e8a62c8119 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Don't embded qmldbg_tcp plugin to libQt5Qml in static buildPasi Petäjäjärvi2014-11-111-5/+0
| | | | | | | | | | | Embedding qmldbg_tcp sources to libQt5Qml causes multipled definitions of QTcpServerConnection symbols with static build on Qt Quick 2 applications. Qmake can resolve dependencies to static plugins applications use, so no need to embed this to libQt5Qml. Change-Id: I18c5e44b9ac3de4ef8be29cc5944de3527566b3c Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
* Inspector: Do not assert when trying to stream QModelIndexKai Koehne2014-11-071-2/+10
| | | | | | | | | | | | | | | | | | | | Some QVariant's like QModelIndex cannot be streamed in a meaningful way: QDataType::save() will return false for them. However, this leads to a qWarning and Q_ASSERT in QVariant::operator<<(). To prevent this we're calling QDataType::save() manually beforehand. We however throw away the result if it succeeds, and still call QVariant::operator<<() to get the benefits of the QDataStream version handling. The alternatives would be to make QVariant::operator<<() not assert, or blacklist all known types with problems manually. Both seem to be difficult though ... Change-Id: I4f5fe6d5a3a076c24fbc73371a4d12d720de53da Task-number: QTBUG-42438 Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Avoid stack overflow when destroying InternalClassUlf Hermann2014-11-061-18/+17
| | | | | | | | | If there are deep object hierarchies connected to an InternalClass the recursive nature of the destroy() method could lead to a stack overflow. By changing the recursion into an iteration this is avoided. Change-Id: I6667f268a366749c2dbc5f7147882388f192a9c5 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* qv4: assign split of edges to loop header to the correct groupFawzi Mohamed2014-11-051-1/+13
| | | | | | | | | | | | | | | (i.e assign split edges to the correct loop group, now for real) The fix of 25b6fae1eb26645a30b3e7e254ce0b585757351c did try fix QTBUG-41766 and simplify the logic to assign the inserted statement to a loop group. Unfortunately that was incorrect if the target basic block starts a group. In that case if the source was already inside the group we should add it to the target basic block, otherwise to the one containing the target block (as before). There was no visible regression caused by this. Change-Id: Id50c42305fc5ac6aedaffa89d8f8dc3b5e976aa4 Task-number: QTBUG-41766 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Mark cleanup function as unused if compiled with QT_QML_NO_DEBUGGERUlf Hermann2014-11-051-0/+1
| | | | | | | | | | The static cleanup function in qqmldebugserver.cpp is only used if the debug server is actually created. If not we can mark it as unused to avoid compile warnings. Enclosing it in #ifdef would be uglier. Task-number: QTBUG-42394 Change-Id: Ieb7fa38ecb346e80ce815ced85eb3a168bad9d99 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* qv4: assign split edges to the correct loop groupFawzi Mohamed2014-11-041-9/+1
| | | | | | | | | | | | | | | | | | | | | edge splitting had a strange logic to assign the inserted statement to a loop, which would go wrong for example for the statement just after the loop header. I guess that was done to increase the likelihood that the goto removed from the final instructions. Given that we are talking about critical edges it is always possible to emit them in a bad order, and I do not think that the old logic was really better than simply always use the loop group of the target which is always correct. It might be worthwhile to ensure that the block it is emitted just before the target block, or improve the handling of empty gotos in the backend, but in this patch we go for the simplest solution. If one would notice worse code, either one of the provious improvements could be done, or the old logic could be kept, changing just the if (container == 0) to container = toBB->containingGroup(); Change-Id: I26a488e9e2cb2b692fa8187ee658fb4dd98bfa8b Task-number: QTBUG-41766 Reviewed-by: Bernd Lamecker <bernd.lamecker@basyskom.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix memory leak in QQmlLocaleDataLiang Jian2014-11-041-1/+1
| | | | | | | | Call the correct destructor in QQmlLocaleData::destroy() to prevent memory leak. Change-Id: Id5b7657443521fbb46486bfbc5575d914c7c7b71 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix memory leak in QV4::QQmlSequenceLiang Jian2014-11-041-1/+1
| | | | | | | | Use the correct destructor in QV4::QQmlSequence::destroy() to prevent memory leak Change-Id: If9531f731abe5cd9aecfb9642ebf4f5108978f99 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Doc: Qt Quick Designer UI formsLeena Miettinen2014-11-031-0/+6
| | | | | | | | | | Since Qt Creator 3.3 and Qt 5.4, Qt Quick Designer handles .ui.qml files that are similar to the .ui files of Qt Designer. Change-Id: I147e82a111ca7d3b806c4c6c94cc73b35a67785b Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Fix memory leak caused by QV4::ErrorObjectJian Liang2014-11-021-1/+1
| | | | | | | | | | We should destruct QV4::ErrorObject::Data instead of QV4::ErrorObject in QV4::ErrorObject::destroy() since all the members is stored in QV4::ErrorObject::Data. Task-number: QTBUG-42340 Change-Id: Ifff6413c0726591c335a421a5f289c1886f80980 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Get rid of !this and similar constructsLars Knoll2014-10-3118-112/+100
| | | | | | | | | The C++ standard doesn't allow calling member functions on a mull object. Fix all such places, by moving the checks to the caller where required. Change-Id: I10fb22acaf0324d8ffd3a6d8e19152e5d32f56bb Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Don't allocate less memory than requiredLars Knoll2014-10-311-0/+2
| | | | | | | | | When switching from a simple to a sparse array, keep the previously allocated size, to not corrupt memory. Change-Id: I33f0fb049a2ad6f24ee3703f2c333855830fe9d2 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix ICC-on-Mac warning about unknown #pragmaThiago Macieira2014-10-301-2/+2
| | | | | | | qqml.h(506): warning #161: unrecognized #pragma Change-Id: I089007db4c4d0701eff32ce0b1c2fff1f65d5c48 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Revert: use the new form of QTranslator::load() for more flexibilityShawn Rutledge2014-10-281-4/+2
| | | | | | | | | | | | | | | | | | | This reverts commit 427646b8d7c52e5b84240e07ffd391217ce3bfa8. It seems that it should have been more correct, but we are still not shipping English translations, and static QString find_translation() in qtranslator.cpp will return any language which is in QLocale::uiLanguages() for which the translation file is found. That is a long list on OSX. Reverting the patch means find_translation() is not called in such cases. This change can be re-done whenever we are more sure that the attempt to find a translation will succeed in finding a sensible one, or fall back to not translating, rather than choosing a language that the user didn't intend. Task-number: QTBUG-41977 Change-Id: I425946cc71cec96b4f38629eb2b7e80220c5236d Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
* Reduce memory pressure on system malloc when allocating large items on the ↵Simon Hausmann2014-10-271-0/+7
| | | | | | | | | | | GC heap Try to free our large items for every 8 megabytes of additional large item memory we allocate. This helps in particular on 32-bit builds and was noticable in tst_qqmlecmascript::push_and_shift(). Change-Id: I4cc0b188e58ccaf32026e38c7aaf1cfadc83148b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Don't check the this pointer for 0 in member functionsLars Knoll2014-10-279-27/+27
| | | | | | | | | | | | This actually violates the C++ standard that defines that you aren't allowed to call member functions on an invalid object. Instead insert the 0 pointer checks on the caller side where required. Change-Id: I8be3c3831594bb6482e9ef6de6e590ec437ac0f8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Reduce size of ArrayData by one pointerLars Knoll2014-10-274-33/+42
| | | | | | | | | | The pointer to the real data is not required anymore, as it always follows the class itself. Like this we save one pointer of overhead, and one indirection when doing reads and writes of array data. Change-Id: If6afdac8e97b57420b50e7b7eb8979f77e8dbbcf Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Rework our simple array implementationLars Knoll2014-10-279-184/+199
| | | | | | | | | | | Implement the simple array as a circular buffer instead of an array with head room. This fixes a couple of severe issues with performance and memory management if the array is being used as a queue. Task-number: QTBUG-41421 Change-Id: I146ad8a874407c108aa8fe1eae68e9957e154847 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix QQmlTypeData object leakJian Liang2014-10-271-0/+1
| | | | | | | | Drop the refcount added in QQmlTypeLoader::getType() to prevent object leakage in resolveQmlType. Change-Id: I8bd9c486294912cc00ce5feb350c3ff79c6aac09 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Properly handle negative years when printing JS Dates to strings.Ulf Hermann2014-10-241-1/+7
| | | | | | | | | | JavaScript knows a year 0. That is correctly translated into QDateTime terms when creating a Date object, but it's not correctly translated back when converting the JavaScript date to a string. Task-number: QTBUG-29491 Change-Id: I46b200a144434187656d08e87f422f97523acd0e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix syntax error when trying to declare read-only object propertiesSimon Hausmann2014-10-245-1030/+1063
| | | | | | | | | | | | | | | | | | | | The grammar did not allow for the declaration of readonly property QtObject foo: QtObject { ... } and it required a workaround through an alias: readonly property alias foo: _foo property QtObject _foo: QtObject { ... } This was merely a glitch in the grammar, I see no reason not to support this. The semantics are like a const pointer in C++, the property itself is read-only but the object pointed to has per-property defined read/write semantics. Task-number: QTBUG-41971 Change-Id: I99e2e7ed58731e387a38e46ec39922d280a21ceb Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix license headers in Qml grammar specificationSimon Hausmann2014-10-241-48/+42
| | | | | | | | | | The grammar file itself wasn't updated accordignly and the license headers that are embedded in the grammar that will be copied into the generated files were also oudated. Re-generating the parser would produce files with the wrong license headers. Change-Id: I1db83df8a9c4bddfb58901f41a4d40f6b1396507 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Doc: Updated the code snippets for the toLocalexxx functionsVenu2014-10-241-3/+3
| | | | | | | | | | Using Date() as a regular function without the new operator returns a string and not a date object. Change-Id: I083bb62c0cb3041a053d43e3085c3d0d10423db6 Task-number: QTBUG-41712 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* QmlEngine: Use separate mutex for network access managerKai Koehne2014-10-232-2/+3
| | | | | | | | | | | | | Creating the network access manager can involve blocking calls to DBus, which apparently can take quite long in pathological cases. Using the same mutex in this case like for instance registering objects can therefore result in a freezing UI. Mitigate this by introducing a separate mutex. Task-number: QTBUG-41183 Change-Id: I55bd8453d8e4bbc0bda1591eb3fd48b50ca921c1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Doc: Fixed an error in the QML snippetVenu2014-10-231-6/+6
| | | | | | | | | | | Also updated the C++ snippet to look like a gui app that shows the QML example, instead of a console app that just provides the context data to the QML example. Change-Id: I17aca9f03521cfcadba1a965a4924e87cbf14c62 Task-number: QTBUG-41699 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fix assignment to QObject pointer propertiesSimon Hausmann2014-10-231-5/+4
| | | | | | | | | | | This commit ammends 59ed8c355b99df0b949003a438ab850274261aa0 to always query the Qt meta-type registry to retrieve the QMetaObject for a QObject pointer type. Change-Id: I70d876a5acfa23967fd1a57c96fcd5ac853eaf49 Task-number: QTBUG-39614 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
* Fix non-compiling QtQml code snippetAlex Blasche2014-10-231-1/+1
| | | | | | | Task-number: QTBUG-42006 Change-Id: I3c59b0ba27518750cba667f414f58edaa136d250 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Reduce memory pressure on the JS stack during garbage collectionSimon Hausmann2014-10-221-6/+16
| | | | | | | | | | | | As the example in QTBUG-42051 demonstrates, QML may produce a lot of binding objects and each of them produce a QV4::Persistent. During the mark phase we may run out of JS stack space. One fix (for the future) is to reduce the number of QV4::Persistent objects, but in the meantime we can also reduce the pressure on the stack by draining it earlier. Task-number: QTBUG-42051 Change-Id: Iea73f8a869048ea0bf3f4a64dbd24b6fb8c68f6b Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
* Fix a PIDLIST_ABSOLUTE leak in QQmlEngine on WindowsJocelyn Turcotte2014-10-221-1/+5
| | | | | | | | | | | | | | The documentation of SHParseDisplayName doesn't mention that you need to free the ppidl parameter, but the documentation of the ITEMIDLIST does mention that you need to ILFree any ITEMIDLIST passed as PIDLIST_ABSOLUTE. Reproduced the leak by repeatedly showing and closing the window on the task's example. Task-number: QTBUG-41588 Change-Id: I91d08728fc907c59e56ae344a2d12f0865031120 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Check list property before component when validating bindingsUlf Hermann2014-10-211-2/+2
| | | | | | | | | There are lists that won't accept a component as element. For example QQuickItem's children will only accept QQuickItems. Task-number: QTBUG-41848 Change-Id: I0fc7b0d1a4770d596caf681be92dff216f48d32b Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* qmlstatemachine: Rename StateBase to StateKevin Funk2014-10-2113-71/+102
| | | | | | | | | | | | As discussed with Brett Stottlmyer and Alan Alpert. Add a section about the implications when importing both QtQml.StateMachine and QtQuick in one single QML file. Change-Id: I8755f4b578e2a6ff4c2377c7a8a0b996ba9b7129 Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-10-142-11/+25
|\ | | | | | | | | | | | | | | | | Conflicts: src/qml/jsruntime/qv4objectiterator.cpp src/qml/jsruntime/qv4objectiterator_p.h src/quick/scenegraph/qsgthreadedrenderloop.cpp Change-Id: Ia54a9acd96530aa6683c228597af0ca25eadec4f
| * Fix crash with foreach on arguments objectSimon Hausmann2014-09-112-14/+37
| | | | | | | | | | | | | | | | | | | | | | | | We call fullyCreate() on the arguments object when it's initialized on an foreach iterator. That itself however might trigger an allocation, which in turn might collect the ForEachIteratorObject, which is missing a "ProtectThis" in its constructor. Change-Id: Ib8f7e39201e727cde91cbbe8a82cba78aa980f0d Task-number: QTBUG-40844 Reviewed-by: Albert Astals Cid <albert.astals@canonical.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Fix QQmlExpression/QQmlScriptString/QQmlBinding crashesSimon Hausmann2014-10-0923-87/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the QQmlScriptString we store the binding id and it is an index into the runtimeFunctions array of the compilation unit. However we don't store the compilation unit and instead in QQmlBinding and QQmlExpression try to retrieve it from the cache via the context url (we have the context after all). That turns out to be not a reliable way, as sometimes the URL might slightly differ from the originally compiled cache (qrc:/// turning to qrc:/ maybe). Consequently the type is (unnecessarily) compiled again and unfortunately not _linked_, therefore the runtime functions array is empty. Another option is that when the component was created from a QByteArray, then no entry exists in the cache in the first place. This patch addresses the problem by storing a reference to the compilation unit in the QQmlContextData. That we can safely retrieve and it'll make sure the compilation unit also stays alive. In the process of that the manual reference counting was switched over to QQmlRefCount and QQmlRefPointer for QV4::CompilationUnit. Task-number: QTBUG-41193 Change-Id: I9111f9a3b65618e453954abcd789c039e65a94f7 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Doc: Updated the QML State Machine docsVenu2014-10-091-106/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Excluded the src/imports/statemachine directory from qtquick.qdocconf to avoid unnecessary qdoc warnings. - corrected a broken link to an external source - changed the group name to avoid collision - added a \qmlmodule page for QtQml.StateMachine - Reduced the amount of duplication between the C++ and QML state machine overviews. Task-number: QTBUG-41561 Change-Id: I87c815fada7006f0609331e315bb338f062bb4db Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | use the new form of QTranslator::load() for more flexibilityShawn Rutledge2014-10-011-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As the docs explain, the variant of QTranslator::load() taking a const QLocale& is better because it "uses QLocale::uiLanguages() and not simply the locale name, which refers to the formatting of dates and numbers and not necessarily the UI language." And, using a default-constructed QLocale permits QLocale::setDefault() to override the system locale, so for example an application's main.cpp can do that before constructing a QQmlApplicationEngine. Task-number: QTBUG-7329 Change-Id: Ia29a4c894087c92b071c0fe484728866f2660fe6 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | documentation for qmldir "depends" declarationShawn Rutledge2014-10-011-0/+19
| | | | | | | | | | | | | | | | | | | | [ChangeLog][QtQml][qmldir] added the ability to declare dependencies on other modules in a module definition qmldir file Task-number: QTBUG-41489 Change-Id: Icd526bc7617bc3e4f725c7d008d0522a201cf645 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | qmldir parser: add support for "depends component version" syntaxShawn Rutledge2014-10-012-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | Dependency declarations are initially for the benefit of qmlimportscanner which does not (yet) use this parser. This patch adds support for dependencies into the qmldir parser for completeness, along with autotests. It is necessary to prevent errors at runtime when parsing a qmldir which contains the "depends" declaration. Task-number: QTBUG-41489 Change-Id: Ief2524a30140c42874f94f1735755b171e15dcf7 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Document that QQmlApplicationEngine's root item must be a window.Mitch Curtis2014-09-301-1/+5
| | | | | | | | | | Change-Id: I22466e82105c9b56894a53400394d1124191f93d Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | Fix compiler warningLars Knoll2014-09-301-0/+1
| | | | | | | | | | | | | | | | | | Add a matching operator delete to our operator new to shut up MSVC. Task-number: QTBUG-40652 Change-Id: I1396094d23c4d0cfc88a73fabbab05f1d4ec7b44 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Doc: Combine the extending QML tutorial chapters into a single exampleTopi Reinio2014-09-301-113/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | Combine the six examples associated with each tutorial chapter into a single, top-level example project 'extending-qml', with subprojects for each of the tutorial chapters. Clean up the docs, add links, and a note about a warning that the user may see when running the code in the first chapter. Task-number: QTBUG-32947 Change-Id: Idba4e2153817ab29f1afaf1947d1f2e25964e7b3 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | Fix example in scope documentationSimon Hausmann2014-09-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The example tried to demonstrate the use of direct access to properties of the root component object, but unfortunately it also defined an id property that clashed with it. Therefore the provided example did not work as intended and produced a "stringified" object reference instead of the text of the "title" property. This patch changes the id to avoid a clash. Change-Id: Ib9abcf48482773a0dcdf5e2375d1445d87ccf4ef Reviewed-by: Michael Brasser <michael.brasser@live.com>
* | Cleanup: Simplify CompiledData::Unit structure to always include the string ↵Simon Hausmann2014-09-244-14/+28
| | | | | | | | | | | | | | table at the end Change-Id: Iae86b8f4dc0dc67c14974472f627e28d6795369f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Allow multiple cached qml unit registration functionsSimon Hausmann2014-09-241-5/+7
| | | | | | | | | | | | | | | | Only few will be necessary, but this allows for greater flexibility at run-time. Change-Id: Ia03abeb6296a5dee97544209c578dc2974af7cbc Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Doc: apply title case to all section1 titlesNico Vertriest2014-09-245-5/+5
| | | | | | | | | | | | Task-number: QTBUG-41250 Change-Id: I303d989992c9685f73baae50c64accf71b43549f Reviewed-by: Topi Reiniö <topi.reinio@digia.com>