aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add list of changes for 5.4.1 relative to 5.4.0v5.4.1wip/tizenSimon Hausmann2015-02-041-0/+50
| | | | | | Change-Id: I2ea7f237ffb4af6445e62178f824421104be1f1d Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* QQuickTextItem: fix crash on polishingGiuseppe D'Angelo2015-01-291-1/+1
| | | | | | | | | | The "d->extra" pointer is lazily allocated, hence we must check if it's valid before dereferencing it. Task-number: QTBUG-44128 Change-Id: Id69c91e889193b0e9b73ed178c0ff3b13003227f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix failing assertion in debug builds for JS that calls constantsSimon Hausmann2015-01-153-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | For true() we generate IR that looks like this: temp = true result = call temp() and therefore the move at isel time has IR::Call as source and a temp as base for the call. However constant propagation in the optimizer transforms this to result = call true() and that's a case we didn't handle in the IR visitor. Since we have Runtime::callValue we can however handle this case as well and the run-time will consequently produce the expected run-time error. Change-Id: Ia94a8116388e66f9f339913307f68e33a5c18a19 Task-number: QTBUG-43819 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> Reviewed-by: Jan Kundrát <jkt@kde.org> Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* doc: The correct enum name is 'Time', not 'LastModified'.Gunnar Sletta2015-01-121-1/+1
| | | | | Change-Id: I4e75b97e9e70a440a2e2ec96af04d004323f09bb Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Make opengl context current in context2d's toImage if necessaryUlf Hermann2015-01-121-4/+26
| | | | | | | | | | With the basic render loop the scene graph thread is the render thread and thus we don't get a different opengl context for context2d in immediate/fbo mode. We have to make sure the opengl context is current when we call flush() from functions exposed to JS. Change-Id: Idd91cf1ce9c299a7645cf3b78d4498652376b17e Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Fix timing output from windows render loopLaszlo Agocs2015-01-111-1/+1
| | | | | | | Print the frame time, not the total, and in milliseconds. Change-Id: Ia7fe3bea8efafcce475c49517d7adab1b3841729 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Print exceptions in JS slotsKai Koehne2015-01-091-5/+9
| | | | | | | | | Do print JS exceptions raised in slots to the console, and clear the status afterwards. Otherwise exceptions raised might silently propagate to later JS calls. Change-Id: I122f3026aa18028415c5a4672cb3287e7d58ac4d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix grammatical error in Text and TextEdit documentation.Mitch Curtis2015-01-092-2/+2
| | | | | Change-Id: I6fd68166108a060931cd6bcd64ccd865d251a4c3 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* TextEdit: fix construction time text cacheJ-P Nurmi2015-01-082-1/+13
| | | | | | | | | | | QQuickTextEdit does not apply cached text to the underlying document until component construction is complete. However, if text() was called during the construction (eg. because of a binding), it would blindly overwrite the cached text with (still) empty document content. Task-number: QTBUG-41583 Change-Id: I6c5c1b6283d70d8a5ec2c8bd986095ee3c35a14c Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Parse dates as Qt::RFC2822Date tooAlbert Astals Cid2015-01-083-1/+10
| | | | | | | | [ChangeLog][QtQml] Fix JavaScript Date parsing to correctly accept RC2822 dates. Task-number: QTBUG-38011 Change-Id: Ic7d3f5b8c624d6780d4c3595fd2efe22c427ffd3 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* doc: Fixed copy/paste errors in DSM snippetsAlejandro Exojo2014-12-303-3/+0
| | | | | | | | | The comments make sense only for the first button, the one that changes the text label. Change-Id: I984f3eff7c797cbccafcba2a0eeaaff9001094e6 Reviewed-by: Brett Stottlemyer <bstottle@ford.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Remove unnecessary QString::toUtf8 method callNobuaki Sukegawa2014-12-201-1/+0
| | | | | | Change-Id: Idc4c5466e23e72d33441bbc19f03fbc27348b09f Reviewed-by: Alejandro Exojo Piqueras <suy@badopi.org> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix invalid assertionNobuaki Sukegawa2014-12-201-1/+1
| | | | | Change-Id: Ifd26d6863ad396e15d0097ed560eee8d281caccd Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix GC crash with conditional breakpoints and JS consoleSimon Hausmann2014-12-191-4/+6
| | | | | | | | | | | | We may choose to execute an expression in a specific frame within the debugger, which is where we pop context's until we reached the frame in question. If we are trying to execute an expression at the top of the stack (or with a conditional breakpoint expression), then we don't have a frame and don't need to pop contexts. But also also don't need to call Scope::alloc(-1). Change-Id: I1f6754a3d77d943aed9bf4468e817a5269a3c547 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QMLJS: remove unused/unsupported command-line optionsErik Verbruggen2014-12-191-1/+1
| | | | | Change-Id: I9710a20752c318a0572aef43779c0289bedf0aa5 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix compile issue with -opengl dynamic on WindowsAndy Shaw2014-12-181-3/+5
| | | | | Change-Id: I2b17482c0e8d04718e91b9772784afce4ebdc101 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* V4: fix reverse type propagationErik Verbruggen2014-12-182-10/+17
| | | | | | | | | Only do integer add/sub/mul when all operands are known to be integers. [ChangeLog][QtQml] Fixed invalidly opportunistic truncating of non-integer values for additions/subtractions/multiplications in JavaScript and binding expressions. Change-Id: I21b3bede2fb3e8033305591110b98cc9e6bf52f8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* V4: only optimize out to-int32 conversions when the operands are int32.Erik Verbruggen2014-12-182-2/+13
| | | | | | | | | The operands of bit-ops are not typed as int32 when no type-inference is done, like for the interpreter. Task-number: QTBUG-43309 Change-Id: I67af18e14ddbc0649530ac23601332ee7d7a1f34 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Doc: Updated the snippet to call the right functionVenu2014-12-181-1/+1
| | | | | | Change-Id: I0ac6424e728b8a06f6bcbe30d036a22f649129bb Task-number: QTBUG-43406 Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
* rendercontrol example: calculate fbo size correctlyLaszlo Agocs2014-12-171-1/+1
| | | | | | | Take device pixel ratio into account. Change-Id: I729d562ad9523e11ee304136f668f496d4e00f37 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* Fix build with MinGW due to -WerrorSérgio Martins2014-12-171-0/+8
| | | | | | | | | | | On Windows the correct format is %I64d and %I64u: https://stackoverflow.com/questions/2844/how-do-you-printf-an-unsigned-long-long-int Similar ifdefs are found in testlib/qtestcase.cpp Change-Id: Ic65e60f7d391285e292ac8c65944d8af3be205f4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix QQuickText alignment when lineHeight is setDaiwei Li2014-12-162-3/+15
| | | | | | | | | | | Text is always aligned to the top of the lineHeight rectangle, and no offset is added when verticalAlignment is set to AlignVCenter or AlignBottom. This change adds an offset based on the lineHeight and font height in those cases. Task-number: QTBUG-42050 Change-Id: Ibc63c80d4178b0f5c498cc126156df828855fd76 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Change Qt bugtracker URL to qt.ioAlex Blasche2014-12-162-2/+2
| | | | | | Change-Id: I3dde034b2a36c324df9f4e1fd2e05a07a7237c04 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Mark qmlRegisterCustomExtendedType as \internalAlejandro Exojo2014-12-121-0/+1
| | | | | | | | | | | | | | The function was added in 5.4, but it makes use of QQmlCustomParser, which at the moment is private API. This way Qt3D or bleeding edge users can still use the function, while keeping freedom to change QQmlCustomParser. Since 5.4.0 had the typo in the \relates, users won't see a change from 5.4.0 to 5.4.1. Change-Id: I7f791f5b39e2a2c9fc83f4c450e6da9eec5b5e46 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Bump versionOswald Buddenhagen2014-12-121-1/+1
| | | | Change-Id: Id0e49a99f2862d6dcc05f176769fdee0643524ee
* Input method support for QQuickWidgetPaul Olav Tvete2014-12-112-0/+10
| | | | | | | | | | Make sure QGuiApplication::focusObject() returns the QQuickItem that has focus, and forward input method events. Task-number: QTBUG-42677 Change-Id: Ic07f93a2529c3dde67272b489bdc61fd25582a69 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
* Restore extension types documentationAlejandro Exojo2014-12-103-3/+85
| | | | | | | | | | | | | | | | | | The documentation on QML extension types was accidentally removed on the big restructuring of commit 28def0bdd084989c17a157e0c4ab80c259081caa. This restores it to a section on the "Defining QML Types from C++" page mostly unchanged, and makes the source of the example that was already there visible. The reference documentation of the qmlRegisterExtendedType is added as well, and the one for qmlRegisterExtendedUncreatableType and qmlRegisterCustomExtendedType that was added in fcb40ff6d71f4561401e6b2bd4d7fc706fff8eee is now fixed. It was not being generated because referred to "QQmlEgine" instead of "QQmlEngine". Change-Id: I1403b10076c64a4c0d760f72b06dd52c38b351a5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* QML Debugging: Fix breakpoints/stepping in a with-statement.Erik Verbruggen2014-12-102-1/+25
| | | | | | | | Also fix the stack-trace generation, otherwise the debugger engine would report a breakpoint hit on the wrong line. Change-Id: I6eb4b508fbdca64d03badd8f9312a05c78781ded Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Add hiDPI @2x retina image support to AnimatedImageMarko Kangas2014-12-101-1/+8
| | | | | | | | | Copied hiDPI image support from base Image-class in to overwritten load() function that ignored it before. Change-Id: Iee89b572b523bbf990b6dd0e94c59c71f2b2ed31 Task-number: QTBUG-43104 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Fix the visualization of unmerged batch geometries without indexJocelyn Turcotte2014-12-092-2/+5
| | | | | | | | | | | | indexData() is null for most QSGGeometryNodes subclasses in QtQuick, make sure that we draw using vertex array data in that case. The patch also increases the contrast of the line pattern, since it is almost invisible with brighter hue values, to make it easier to see which batches aren't merged. Change-Id: Ife7b26692ee318feb0810ee0e787289eb151ea8a Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Windows: Don't disable JITSérgio Martins2014-12-091-2/+2
| | | | | | | | [ChangeLog][QtQml][Windows] V4 JIT was re-enabled after it was disabled by mistake in 5.4.0. Task-number: QTBUG-43171 Change-Id: I16206e094c210b1eadbfef9ee04cf78d3a7dcebe Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* QML Debugging: Fix crash when stepping through try-catch block.Erik Verbruggen2014-12-095-18/+57
| | | | | | | | | Also fix the stack-trace generation, otherwise the debugger engine would report a breakpoint hit on the wrong line. Task-number: QTBUG-42723 Change-Id: I1f655a5174b28a1c9c31c85bbe023fbce5ddbb96 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* QML: fix warning in testsErik Verbruggen2014-12-091-1/+7
| | | | | | | | Mark unused fields as Q_UNUSED. They are still "used" to check if the compiler will generate warnings/errors (which it shouldn't). Change-Id: I38e1668e88d94ab8f26a92a06f5207b77369e136 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* QML: fix warning in testsErik Verbruggen2014-12-091-23/+0
| | | | | | | Remove unused function that wouldn't be emitted anyway. Change-Id: I623d5d44bca9a1358cf9e66ff557992aba9ae451 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* QML: fix warning in testsErik Verbruggen2014-12-091-1/+0
| | | | | | | Remove unused constant. Change-Id: I3fb3512f7ea54102450eeeda1a56c73fe6b26025 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Merge "Merge remote-tracking branch 'origin/5.4.0' into 5.4" into ↵Simon Hausmann2014-12-0989-110/+385
|\ | | | | | | refs/staging/5.4
| * Merge remote-tracking branch 'origin/5.4.0' into 5.4Simon Hausmann2014-12-0589-110/+385
| |\ | | | | | | | | | Change-Id: I5978bab8a4fde4c2ee33907fd81f49cb69e4fb26
| | * 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>
* | | QML: fix warning in testsErik Verbruggen2014-12-091-2/+0
| | | | | | | | | | | | | | | | | | | | | Remove unused class field. Change-Id: I90981546e33d4839a91c418a8746e6f2ebc3bf46 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | | Quick: fix testErik Verbruggen2014-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | /Users/erik/dev/qt5-stable/qtdeclarative/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp:1561:60: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int] items << qMakePair(QString("new item " + j), QString::number(j)); ~~~~~~~~~~~~^~~ Change-Id: I94bd952abf82a8f174772482330b5fdd636578ad Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | | Avoid string-based connect in QQuickImageBase.Michael Brasser2014-12-082-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | String-based connect is relatively slow, and should be avoided in core items. This improves performance of the tst_librarymetrics_performance::instantiation_cached(043) image - empty test case (approximately halving the time). Task-number: QTBUG-43096 Change-Id: I02485c515435eceacc95c55f877fc8566e7406d7 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | | Fix \inqmlmodule usage: only use one parameterAlejandro Exojo2014-12-0833-36/+36
|/ / | | | | | | | | | | | | | | Since the command just links back to the corresponding module page, only the first parameter is used, and the version causes more confusion. Change-Id: I73ed289550c576747132f77b83c1257094059cd1 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Correct QtQml.Models \qmlmodule version.Mitch Curtis2014-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example, the following documentation [1] says: Import Statement: import QtQml.Models 2.0 This should be: Import Statement: import QtQml.Models 2.1 The module documentation [2] is correct, but there's no visible link to that page from [1]. [1] http://qt-project.org/doc/qt-5/qml-qtqml-models-objectmodel.html [2] http://qt-project.org/doc/qt-5/qtqml-models-qmlmodule.html Change-Id: Ib2ab7b821ad7e98c20b396b26f745ee39434b7fb Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Fix QtQuick2 module unload supportChris Adams2014-12-0410-1/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | This commit ensures that the value type providers installed by the QtQuick2 QML module during initialization are uninstalled when the plugin is unloaded. It also fixes a bug in the type compiler so that it now works with types from plugins which get unloaded and then reloaded. Task-number: QTBUG-43004 Change-Id: I4b3fb75aae65dfbc5de9c88701ed82514087ab7d Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
* | Error out when trying to set an item as its own parentFrederik Gladhorn2014-12-031-1/+1
| | | | | | | | | | | | Task-number: QTBUG-43063 Change-Id: I92a33047ac7fa2afeff4986b6e42c07afbc59918 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Fix application build when combining with Mac OS X Cocoa headersSimon Hausmann2014-12-031-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OSX's AssertMacros.h unconditionally defines macros like "check" and that clashes with qml's type discovery templates that define a check function and that are used by qmlRegisterType and friends. There's a comment in the OS X headers suggesting that this will be fixed in the "next" release, but that hasn't happened for a while and the bug is still present in 10.10. So let's work around it and make life easier for people using Qml and Cocoa at the same time. Change-Id: I005d21188f92deaebd45bce2e6484cd4deeb9a34 Task-number: QTBUG-36309 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 13:39:42 +0000