aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QQmlInspectorService: handle views only with supported plugins.v5.4.0Ulf Hermann2014-12-051-0/+1
| | | | | | | Task-number: QTBUG-43048 Change-Id: I5b32bd0a1e28fdf56b5346580daf21e7ec1b9f8c Reviewed-by: Kevin Funk <kevin.funk@kdab.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* qttest: make findChild available only for QtTest 1.1Fawzi Mohamed2014-12-0579-87/+89
| | | | | Change-Id: I4ceb1a969bd4296b82f899088b02b5e8cf100bcd Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Update plugins.qmltypesKai Koehne2014-12-057-16/+278
| | | | | | Change-Id: I9b6c54b572d4653d609b154000e274b9e64d591f Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Add string::arg method in installTranslatorFunctionsKai Koehne2014-12-052-0/+11
| | | | | | | | | | | 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>
* Added change log for 5.4.0Simon Hausmann2014-12-021-0/+144
| | | | | Change-Id: Ie3e238a3ccac1d95978229316977d131be3010d6 Reviewed-by: Lars Knoll <lars.knoll@digia.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>
* Skip tst_qquickwindow::headless() when using ANGLE/Windows.Friedemann Kleint2014-12-021-0/+5
| | | | | | | | | The test crashes frequently. Task-number: QTBUG-42967 Change-Id: Ic17c6187bfa657154a9b04eb9c5b9a3de291cb1e Reviewed-by: Andrew Knight <andrew.knight@theqtcompany.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.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>
* Make effectiveDevicePixelRatio() return a qreal.Morten Johan Sørvig2014-11-302-2/+2
| | | | | | | | | | Fractional scale factors are not as broken as previously believed, especially for Qt Quick. Keep the door open for finding a way to support it at some point in the future. Change-Id: Ifeadcc53175ac6c25ea0288d5fe1966e3de408f9 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.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>
* Invalidate font caches when switching between threadsv5.4.0-rc1Eskil Abrahamsen Blomfeldt2014-11-137-3/+108
| | | | | | | | | | | | | | | | | | The font caches can only be used from a single thread at a time. QFontEngineFT for instance, uses a global static thread storage which is accessed on releasing and creating engines, and this causes a crash if the font engine is created on one thread and released on another. We use the updatePolish() function to make sure the caches are empty before entering updatePaintNode(), and then we invalidate the cache again after updatePaintNode() is done. [ChangeLog][Text] Fixed uncommon crash in text nodes. Change-Id: I01dbc2ed58aeebd03d77a157c700330334bdb385 Task-number: QTBUG-38800 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Doc: Change the div classes for three-column layoutTopi Reinio2014-11-111-12/+12
| | | | | | | | | | | | | The new documentation style for publishing docs under qt.io requires dedicated div classes for pages that use a three- column layout. The new divs enable the columns to stack and react to changes in the window width. Task-number: QTBUG-42086 Change-Id: Id0ccb0ef7e0be237789b8c891db05413efc1f8aa Reviewed-by: Martin Smith <martin.smith@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>
* qml: obey QT_NO_REGULAREXPRESSION definePasi Petäjäjärvi2014-11-111-1/+4
| | | | | | | | Not all platforms do have QRegularExpression as it is based on pcre. Change-Id: I3247f8b2213f78a6e537f6781d97b0c6382482ad Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Revert "Fix pixel bleed in BorderImage"Eskil Abrahamsen Blomfeldt2014-11-107-439/+72
| | | | | | | | | | | | | | | | | | | | | | | This reverts commit a9238292145e05d36be7c35bdd50829c6400a3de. It also reverts follow-up commits: 87755d0437413cfb875c50e3dfa53030601567c9 c2c710e5a8d66fa696276aa69c2e3b00436eefe5 cc8a76ce8ea76afe912902067e95ca2abf9e482f The new implementation is much too slow because it will cause each section of the border image to be uploaded to the atlas, and it will not be shared between different border images nor between different sizes of the border. The performance regression is so significant that it's not worth it for the original bug fix. We leave the tests around, so some of those might regress due to this. Change-Id: I3f56f4564255ebb77e6487881a6a11b19ad0234e Task-number: QTBUG-42288 Task-number: QTBUG-35838 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Merge "Merge remote-tracking branch 'origin/5.4' into 5.4.0" into ↵Jani Heikkinen2014-11-1018-218/+296
|\ | | | | | | refs/staging/5.4.0
| * Merge remote-tracking branch 'origin/5.4' into 5.4.0Oswald Buddenhagen2014-11-1018-218/+296
| |\ | | | | | | | | | Change-Id: I2c69deb3bc69da1a06485aaf72fb298b08756734
| | * qmlscene: Simplify context sharing logic.Pierre Rossi2014-11-071-9/+3
| | | | | | | | | | | | | | | | | | | | | We can use the new application attribute for this now. Change-Id: Ia0a6d13d36316ec9becfb5d3251b8461ac73a2d0 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| | * QQuickWindow: let 'clearFocusObject' clear all the way to the rootRichard Moe Gustavsen2014-11-071-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code was wrong, as it cleared focus from the active focus item directly. By doing so we would only clear focus inside the focus scope that surrounded the item, but leave the scope itself with active focus (which would then be the focus object). The intended result is rather to end up with the root as focus object. Change-Id: I455a8939f8bc6c48765119b995aa781aee6d1e70 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| | * QQuickWindow autotest: verify that onClosing can block close()Shawn Rutledge2014-11-071-0/+20
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-40093 Change-Id: I800259f45d95736172d500494e68042180178e93 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
| | * Debug: Make it possible to save distance field cache on WindowsEskil Abrahamsen Blomfeldt2014-11-071-75/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes compilation possible of the saveTexture() function which is used to store the distance field glyph cache on disk when debugging. It also changes the warnings output from here to have no prefix, since this is anyway always available as the context in Qt 5. Change-Id: If3b64f0921a59c485b5321a5465369708e764afc Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
| | * Inspector: Do not assert when trying to stream QModelIndexKai Koehne2014-11-072-3/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Stabilize tst_QQuickAccessibleJan Arve Sæther2014-11-061-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | There is no reason to wait for the window to activate Task-number: QTBUG-42355 Change-Id: I5faaff5bddd367e6dd57a6a922011c87c847148e Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
| | * Initialize member variable QSGAnimationDriver::m_lag.Friedemann Kleint2014-11-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes purify warning: [W] UMR: Uninitialized memory read in QSGAnimationDriver::advance(void) {1 occurrence} QSGAnimationDriver::advance(void) [qtdeclarative\src\quick\scenegraph\qsgcontext.cpp:221] Task-number: QTBUG-42213 Change-Id: Ide35830c60c5935644747da5cfbad1cdbd357232 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| | * 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>
| | * Add attached Window::contentItem propertyJ-P Nurmi2014-11-055-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is essential to the Qt Quick Controls for implementing floating text selection handle popups. Change-Id: Ibae65110a5db6d65dacd197fef3ad567d11342dc Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@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>
| | * Add a debug function to save contents of distance field cacheEskil Abrahamsen Blomfeldt2014-11-054-173/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | Just copy the one from QSGSharedDistanceFieldCache with some compile fixes to the superclass so we store the default cache as well. Change-Id: I1fcc390601eea58f8b7729c9cead418e4c94714c Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.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 not having a context when cleaning up on WindowsLaszlo Agocs2014-11-101-3/+18
|/ / | | | | | | | | | | | | | | | | | | | | The same old issue surfaces in the windows render loop too. The basic render loop is already fixed, apply a similar patch to the windows one too. Task-number: QTBUG-42213 Change-Id: I07068315f5164014e329b8ce061947c97ae9da61 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* / Documentation: Update QtQuick import value to 2.4Caroline Chao2014-11-051-3/+3
|/ | | | | | | | There are new APIs in Qt 5.4, the import version needed is 2.4. Change-Id: I1c52c6a50362f539670d9ad00e03e57208234a17 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fix disappearing nodes when adding in two levels of batch rootEskil Abrahamsen Blomfeldt2014-11-041-6/+12
| | | | | | | | | | | | | | | | | | | | | | | When having e.g. a clip node inside another clip node and adding children to the innermost, we would get into the situation where we did a partial rebuild for the outermost root, but its available render order count would not be updated to reflect the change deeper down in the tree. Since the z range would be based on the outermost batch root's knowledge of the maximum render order in the tree, what would happen is that the z of the rendered nodes would increase steadily until they went outside of the viewing volume and disappeared. When decreasing the available order count of a batch root, we need to also decrease the available order count of its parents. If any of them drop below zero, we need to rebuild the render lists. [ChangeLog][QtQuick] Fixed nodes sometimes disappearing when adding many new nodes to the tree. Change-Id: I39c34acf0e1e0e87601f0fcd983f8da38cee029f Task-number: QTBUG-42096 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* 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>
* Don't use qDebug and qWarning for formatted outputThiago Macieira2014-10-311-37/+38
| | | | | | | | | | | | | | | | | | | | They are not meant to be used like that. If you want formatted output to the console, use stdio.h functions or std::cout. Otherwise, you get something like: $ qmlscene -h [233103.196] (126848)(usage|?qmlscene?|__libc_start_main|?qmlscene?): Usage: qmlscene [options] <filename> [233103.197] (126848)(usage|?qmlscene?|__libc_start_main|?qmlscene?): [233103.197] (126848)(usage|?qmlscene?|__libc_start_main|?qmlscene?): Options: [233103.198] (126848)(usage|?qmlscene?|__libc_start_main|?qmlscene?): --maximized ............................... Run maximized [...] I've replaced all qDebug with puts/printf and most qWarning with fprintf to stderr. In my opinion, some of the qWarnings aren't errors, so I replaced those with puts/printf too. Change-Id: I3e493950bc4a588059fec6c7441b010c2780dffd Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Get rid of !this and similar constructsLars Knoll2014-10-3121-124/+108
| | | | | | | | | 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>
* BorderImage: Fix white area when size changes after first paintEskil Abrahamsen Blomfeldt2014-10-312-1/+8
| | | | | | | | | | | | | When e.g. growing the size of the border image in an animation, we would not get updates of the paint nodes when the size was so small that the bounded target rect and source rect did not change (when the size was smaller than the sum of the borders). Since this can happen, we also need to detect when the size changes and update the node for this case. Task-number: QTBUG-42022 Change-Id: I0849d740f363e66a3a4fd6de23fc9d7399ab0779 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* 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>
* Fix Canvas documentation.Mitch Curtis2014-10-301-6/+6
| | | | | | | | | | | getContext documentation wasn't showing up due to a syntax error: "any ..." Also fixed some small issues here and there. Change-Id: I3c0444d25bd0fea72fb4fcbf07b3e00794ff1414 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* text input: always let cursor rect have a width == 1Richard Moe Gustavsen2014-10-303-27/+24
| | | | | | | | | | | | | | | | Instead of using a cursor width of null when a cursor delegate is set, we should to use a value of 1. Otherwise the rect we e.g return from cursorRect() will be invalid. An alternative would be to use the width of the delegate, but that was found to be controversial. On iOS we saw a bug with this when telling iOS to position text spelling popups underneath the cursor. Since the cursor rect we got was invalid (zero-width), no popup would show. Change-Id: Ice51b9a1bd33f331183e3acec61b7d9c0f5163cd Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* Repeater & itemviews: fix setModel() JS array handlingJ-P Nurmi2014-10-297-3/+129
| | | | | | | | | | | | QVariant comparison in setModel() started failing because JS arrays are now passed as a QJSValue. Re-assigning the same array content should not trigger a model change. This change restores the old behavior it had before, when JS arrays were passed as QVariantLists. Change-Id: I1882b3531f2893b116dbd817edeecab1ae812ce8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Remove mouse grabber if touch used for mouse emulation has been grabbedDaniel d'Andrada2014-10-293-10/+104
| | | | | | | | | | | | | | | | | | | | If an item grabs a touch that is currently being used for mouse pointer emulation, the current mouse grabber should lose the mouse as mouse events will no longer be generated from that touch point. Example of what happens without this patch: -User touches a MouseArea. It gets pressed. -Some other item grabs that touch. -This touch eventually ends. -The MouseArea would still be pressed. And what will happens instead after this patch: -User touches a MouseArea. It gets pressed. -Some other item grabs that touch. -The MouseArea gets canceled and released -This touch eventually ends. Change-Id: I24114f18be564553a4a768243bb20379affe7a8f Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Revert: use the new form of QTranslator::load() for more flexibilityShawn Rutledge2014-10-284-16/+13
| | | | | | | | | | | | | | | | | | | 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>
* Do not crash QML apps on startupJan Arve Saether2014-10-282-9/+16
| | | | | | | | | This started crashing because of 8f6436f125faae91eb472ddddbbae06dba5da671 Task-number: QTBUG-42227 Change-Id: I9e4862f6008c6ad6ec54469f2b39dd6be583e422 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Don't document Context2D's TextMetrics as its own QML type.Mitch Curtis2014-10-281-21/+3
| | | | | | | | | | | | | | | It can't be instantiated like a QML type, so it's actually better to just document measureText() (which is the only way to construct objects of this type) as returning an object containing some metrics for the current font. This should have no effect on user code. This solves the issue of the new TextMetrics type's documentation not showing up. TextMetrics is a type that *can* be instantiated and is more feature complete. It provides a declarative API for the functions that take arguments in QFontMetrics. Change-Id: I46251e6f3aa7179ab569f5131307181f71043df4 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 03:46:55 +0000