aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Adding QQuickWidget's path to the qtquick.qdocconfJerome Pasion2014-03-111-2/+5
| | | | | | | | -allows QDoc to detect and generate documentation. Task-number: QTBUG-37272 Change-Id: I83aedead99c7fccb03fe4a7fa34be45fc94ae010 Reviewed-by: Friedemann Kleint <[email protected]>
* Allow detaching V4 debuggers in agent destructorUlf Hermann2014-03-111-0/+3
| | | | | | | | We don't know in which order the QML engines and the debug service are deleted on shutdown. Change-Id: I9d23b3c88eee125a93c5b0f8ea85466013233737 Reviewed-by: Simon Hausmann <[email protected]>
* Doc: Qt QML: Document signals (not handlers) under \qmlsignalSze Howe Koh2014-03-113-9/+17
| | | | | | | | Task-number: QTBUG-35846 Change-Id: I989617865a79bfbf1f1ffd3b105598025dde54c5 Reviewed-by: Mitch Curtis <[email protected]> Reviewed-by: Jerome Pasion <[email protected]>
* Don't delete the QML engines from the profiler service destructorUlf Hermann2014-03-111-1/+1
| | | | | | Task-number: QTBUG-37382 Change-Id: Ib40d69813794e18cc7c7f05e10881b1b23a93b4e Reviewed-by: Simon Hausmann <[email protected]>
* Cleanup our runtime methodsLars Knoll2014-03-1126-579/+565
| | | | | | | | | Move all our runtime methods into the QV4::Runtime struct and give them nicer names without underscores. Sort them logically and remove a few unused methods. Change-Id: Ib69b71764ff194d0ba211aac581f9a99734d8180 Reviewed-by: Simon Hausmann <[email protected]>
* Fix copying of Property'sLars Knoll2014-03-1013-46/+68
| | | | | | | | | | Data properties don't contain valid data in the set field if they are being stored in Objects. Thus we should never access that field unless we are dealing with accessor properties. Change-Id: I19dcbaee7ebd042ae24387f92a93571d75ca578a Reviewed-by: Simon Hausmann <[email protected]>
* Fix compile errorLars Knoll2014-03-101-1/+1
| | | | | Change-Id: Iba3860ef8ea940b8f232e21e273b0ac83d895882 Reviewed-by: Simon Hausmann <[email protected]>
* Stack size increase for x86 QNX systemsJames McDonnell2014-03-101-0/+4
| | | | | | | | | | | Increase the size of the stack for the scene graph thread on x86 QNX systems. The default stack size (132K) is too small for the MESA graphics driver shared libraries on these systems. Task-number: QTBUG-37338 Change-Id: I8b50aece98ef3f530f2202fc89a0e90b0b2e2e72 Reviewed-by: Sergio Ahumada <[email protected]> Reviewed-by: Gunnar Sletta <[email protected]>
* MultiPointTouchArea: make nested.qml autotest easier to debugShawn Rutledge2014-03-101-5/+54
| | | | | | | Visual feedback Change-Id: I8f670d5f4729149e5ee02c2e9a36b5570ac3c5a7 Reviewed-by: Frederik Gladhorn <[email protected]>
* Fix TextEdit::lineCount to update as appropriateJ-P Nurmi2014-03-102-1/+52
| | | | | | | | | | The total line count needs to be updated when geometry, document size or wrapping mode changes. Task-number: QTBUG-37263 Change-Id: If58a2f77022475e8bcb7cca0f2a091ee837b39a5 Reviewed-by: Pierre Rossi <[email protected]> Reviewed-by: Caroline Chao <[email protected]>
* Remove several uses of module includesAndrew Knight2014-03-106-5/+10
| | | | | | | | | | Module includes are discouraged because they may increase compilation time. While debugging a broken core module include header, a number of module include infractions were discovered in qtdeclarative. Replace them with their more specific counterparts. Change-Id: I614e9a6aa2177f396e5289f3cdb3c35faa0202c9 Reviewed-by: Gunnar Sletta <[email protected]>
* MultiPointTouchArea: handles mouse too, unless mouseEnabled is falseShawn Rutledge2014-03-106-10/+594
| | | | | | | | | | | | | | | | | | | A new boolean property mouseEnabled is introduced (true by default). If set to true, then it will handle any non-synthetic mouse event as if it were a touch point. If set to false, the area becomes transparent for real mouse events so that a MultiPointTouchArea can be stacked on top of a MouseArea in order to separate handling of touch and mouse. In either case it continues to absorb and ignore synthesized mouse events (including touch-to-mouse synthesis in QQuickWindow). [ChangeLog][QtQuick][MultiPointTouchArea]handles mouse as a touchpoint; added mouseEnabled property to permit transparent pass-through to mouse-sensitive items Change-Id: I4af94d838f0060154494589c0f15c6858ee89ddb Task-number: QTBUG-31047 Reviewed-by: Frederik Gladhorn <[email protected]>
* QQuickWidget: handle resize to empty sizePaul Olav Tvete2014-03-102-0/+15
| | | | | | | | | | | Resizing to an empty size needs to be handled as if the widget was hidden. Restoring to a non-empty size is like a show, except that we are rendering synchronously. Task-number: QTBUG-37046 Change-Id: I572e4763c4a28bfe7347868e109acca5b357db50 Reviewed-by: Laszlo Agocs <[email protected]> Reviewed-by: Gunnar Sletta <[email protected]>
* Fixed qqmlapplicationengine autotest build for QT_NO_PROCESSOliver Wolff2014-03-101-0/+4
| | | | | Change-Id: Ie5993fac36a29a7d7edcadf5030dc2b5bf95b506 Reviewed-by: Andrew Knight <[email protected]>
* V4 SSA: remove unused code.Erik Verbruggen2014-03-081-49/+1
| | | | | Change-Id: I56b3e5400e7b9880b9534117ac17a80436ff1733 Reviewed-by: Lars Knoll <[email protected]>
* V4: fix address printing for real.Erik Verbruggen2014-03-081-7/+15
| | | | | | | | | | The previous patch contained the wrong formatting string for 64bit platforms. Good compilers will warn on this (and fail compiling with -Werror). Fixed the issue in such a way that we now have static checking for both 32bit/64bit platforms by the compiler. Change-Id: Idf4a80d8795605c61ef812426c9984df1ceac4d4 Reviewed-by: Lars Knoll <[email protected]>
* V4 JIT: enable JIT on win64.Erik Verbruggen2014-03-082-1/+11
| | | | | Change-Id: I640d507c33fd4c4df6d6284b473df5cea9e5c4b4 Reviewed-by: Lars Knoll <[email protected]>
* Use an array of Value's for Object::memberDataLars Knoll2014-03-0710-95/+81
| | | | | | | | | | This cuts the memory required to store properties in an object in half for the common case. Accessor properties require two slots inside memberData, but data properties only one. Change-Id: I0bab1b88ca9ed5930abf065c77c89985b9ed5320 Reviewed-by: Simon Hausmann <[email protected]>
* Reserve a double slot for accessor propertiesLars Knoll2014-03-074-45/+118
| | | | | | | | | | Reserve two slots in the internal class for accessor properties. This opens up reducing the default storage required per data property to one Value. In practice this implies cutting the required memory in half. Change-Id: Ifed897852bbdfd810018f0d6b049fca6690ead2c Reviewed-by: Simon Hausmann <[email protected]>
* Use fuzzy comparison for another Flickable StopAtBounds case.Michael Brasser2014-03-071-4/+4
| | | | | | | | | | | | | Be consistent with 268f4615dcf19aad3603833af83ba28eca886aa5, and use fuzzyLessThanOrEqualTo when checking whether we are at or past the bounds when dragging. This prevents a condition where: 1. A Flickable with StopAtBounds is at one of the bounds. 2. A quick flick will sometimes (rarely) cause the Flickable to flick past the bounds. Change-Id: I4165fa133f556fb9d47cc691d11b2ecb77746b33 Reviewed-by: Martin Jones <[email protected]>
* QQuickWidget: handle windowChangePaul Olav Tvete2014-03-072-5/+28
| | | | | | | | When the toplevel window changes, QQuickWidget needs to recreate the context so it is compatible with the new window. Change-Id: Ic7c3410061a33f223e20e3d1f93437917abcff18 Reviewed-by: Laszlo Agocs <[email protected]>
* Move some methods from ExecutionContext to CallContextLars Knoll2014-03-073-42/+35
| | | | | | | | This is where they really belong. Slightly simplifies and cleans up the code. Change-Id: Ib5782c1f57c761c46f4bc52c3d496220299f8ac9 Reviewed-by: Simon Hausmann <[email protected]>
* Better way of retrieving the prototype property for FunctionObjectsLars Knoll2014-03-074-65/+31
| | | | | | | | | Make sure FunctionObjects always have the prototype property at index 0. This way we can speed up the instanceOf operator even more, and at the same time save 16-28 bytes of memory per FunctionObject. Change-Id: I8527bc8f9dc7b04a9db8395b5f05bab47ddc21ce Reviewed-by: Simon Hausmann <[email protected]>
* Remove the name member of FunctionObjectLars Knoll2014-03-075-14/+30
| | | | | | | | The data is anyway stored in the name property of the FunctionObject, and is not performance critical. Change-Id: If1784b0ec6f368bc474c246bb9c2c50d5e56b689 Reviewed-by: Simon Hausmann <[email protected]>
* Reduce memory consumption of FunctionObjectLars Knoll2014-03-076-52/+39
| | | | | | | | | Remove varCount and formalParameterCount members in FunctionObject and retrieve them from the CompiledFunction instead. Change-Id: I8a6cdc6d354b0f33da9d67a4c3dbfe8a7cc96176 Reviewed-by: Simon Hausmann <[email protected]>
* Remove unused entries in CompiledDataLars Knoll2014-03-072-9/+4
| | | | | Change-Id: Ie5313371fa5dec6630a1d955d4409ea4d6163810 Reviewed-by: Simon Hausmann <[email protected]>
* Fix test failure in qqmldebugjs autotestLars Knoll2014-03-073-5/+13
| | | | | | | | | | | | | | The debugger should only have one breakpoint that can be set per line. Nevertheless, we should have proper line number information available in case we stop at other places. We also need a debug instruction before the return statement, so that step out will always find a last stopping point in the parent frame. Change-Id: I86145fc244148f106a4a97ce69ab60b568c8dac6 Reviewed-by: Simon Hausmann <[email protected]>
* Fixes to breakpoint handlingLars Knoll2014-03-074-37/+42
| | | | | | | | Make sure stepping works correctly, and we always break at a valid breakpoint. Change-Id: I6a3032b3ae204484b8a92b2031904a7f681c7f80 Reviewed-by: Simon Hausmann <[email protected]>
* Add a Line instruction to the interpreterLars Knoll2014-03-0711-150/+31
| | | | | | | | | | This unifies the way we handle line numbers in the JIT and Interpreter. Remove the now unused lineNumberMapping code and data. Change-Id: I1d60b1fbb77e70b531fa73d93410683e84dd1e3c Reviewed-by: Simon Hausmann <[email protected]>
* Simplify our breakpoint handlingLars Knoll2014-03-075-271/+71
| | | | | | | | | | | | | | | | | Only store a Hash of break points in the debugger, instead of the involved logic that currently adds and removes break points. Add the current line number to the Debug statements in the interpreter, and pass them on to the debugger for checking whether we should really break. This adds a slight additional overhead to running inside the debugger, but greatly simplifies the logic and doesn't require modifying the bytecode anymore. This in turn opens up the possibility to run the debugger on JIT generated code later on. Change-Id: If2a3ae8f8d08b69a3a704cbbe0a84000f917a32e Reviewed-by: Simon Hausmann <[email protected]>
* Remove old compiler and VMESimon Hausmann2014-03-0734-9890/+83
| | | | | | | | | | | | This removes the bulk of the code. A few smaller cleanups remain, to be done in smaller changes as they move code around. Additionally the "optimize" option of qqmlbundle was removed. It called QQmlScript::Parser::preparseData, which however was not implemented and always returned an empty QByteArray. Therefore "optimize" would not do anything and the class is gone now :) Change-Id: I0c265e756704cb53c5250be1f69e4a3e1b6e64d5 Reviewed-by: Lars Knoll <[email protected]>
* QQuickWidget: make sure to use the proper GL formatPaul Olav Tvete2014-03-072-19/+14
| | | | | | | | | | We cannot be sure that the toplevel widget has the correct GL format, and we do not want to force depth and stencil buffers on surfaces that do not need them. Therefore, we have to create an offscreen surface for the FBO. Change-Id: I7dfc3a6f84bf79125f3ab811a204972e95e245a3 Reviewed-by: Laszlo Agocs <[email protected]>
* Add the features of QLoggingCategory to QML's debugging methods.Giorgos Tsiapaliokas2014-03-074-8/+17
| | | | | | | | | | It is now possible to modify the output of QML's debugging methods. Also the prefix of "qml" makes it possible to capture the output from the QML files using qInstallMessageHandler. This commit depends on qtbase/4967c7106568d5df0be4d40bf793583c7c6bdb69 Change-Id: I2c7a2cb96a0b91fd3249dc2dacbab63e6ac68243 Reviewed-by: Kai Koehne <[email protected]>
* V4 JIT: fix stack space reserving codeErik Verbruggen2014-03-071-2/+2
| | | | | | | | sub32 will truncate the register's content, which is a bit problematic when the stack is located outside the first 4G (e.g. on win64). Change-Id: I8c2c55c0e08f4e5b67295ba6a8a26d7d55d4477f Reviewed-by: Lars Knoll <[email protected]>
* V4: fix address printing on 64bit platformsErik Verbruggen2014-03-073-2/+15
| | | | | | | | The addresses were truncated to 32bits, which is a problem on win64, because JITted code ended up outside that range. Change-Id: I0d8b92486714340dffe4b4c2de29cf11a929a149 Reviewed-by: Lars Knoll <[email protected]>
* Fix MSVC2012 compiler warnings in disabled code.Erik Verbruggen2014-03-073-5/+13
| | | | | | | ... that should soon get enabled. Change-Id: I2f8393cab5e99a7f5d3c7df6af6385fefd2d4dd1 Reviewed-by: Lars Knoll <[email protected]>
* V4 JIT: fix up register usage for linux/macos on x86_64.Erik Verbruggen2014-03-072-5/+7
| | | | | Change-Id: Ia6f3a78410fd41c58904a60f4c7a0630cf5230d0 Reviewed-by: Lars Knoll <[email protected]>
* Fix more MSVC2012 compiler warnings.Erik Verbruggen2014-03-073-20/+39
| | | | | | | All are conversions from size_t to int or to unsigned. Change-Id: Ic94c938dcad6d50a32dd6ec62da2341869cf994d Reviewed-by: Simon Hausmann <[email protected]>
* QML testlib: Do not modify the arguments passed into QGuiApplication.Friedemann Kleint2014-03-071-8/+6
| | | | | | | | | argc/argv passed into QGuiApplication must match those of main on Windows due to the special command line parsing. Task-number: QTBUG-36466 Change-Id: Id722692d2bdc18a6627fdaeffb349b78137ae314 Reviewed-by: Alan Alpert <[email protected]>
* MouseArea: make clear containsMouse requires the cursor to be insideShawn Rutledge2014-03-071-1/+2
| | | | | | | Task-number: QTBUG-37133 Change-Id: I5d0943963bf423c3f930365502e42b54a71d9e88 Reviewed-by: Jerome Pasion <[email protected]> Reviewed-by: Alan Alpert <[email protected]>
* Fix a couple of typos in the documentationLaszlo Papp2014-03-062-9/+9
| | | | | Change-Id: Ie06af2e33e5adf6d56391929bd763b01e57557b0 Reviewed-by: Jerome Pasion <[email protected]>
* QSGBatchRenderer: return when a shader is not returned by the managerAndrew Knight2014-03-061-0/+4
| | | | | | | | | | If a shader can't be found from the manager (e.g., if it failed to link), return from rendering. This prevents the renderer from crashing on a null pointer. Task-number: QTBUG-37290 Change-Id: I44d0bbb721854c0bc6da681ff55f71140a5cb0bc Reviewed-by: Gunnar Sletta <[email protected]>
* Switch the code path from the old compiler and VME to the new code pathSimon Hausmann2014-03-062-4/+1
| | | | | Change-Id: Ib1b38ec07830f8df9fa4caacd00879434608053b Reviewed-by: Lars Knoll <[email protected]>
* [new compiler] Fix crash in tst_qquickpathviewSimon Hausmann2014-03-061-1/+3
| | | | | | | | | | | | | QQuickPathView's attached object uses a dynamic meta-object. So when installing bindings - such as a signal handler - on it and we want to determine the property cache for it, we must not use the QQmlEnginePrivate::cache overload that takes a QObject pointer, as that will - rightly so - return a null pointer. Instead in this case it is okay to go with the static type overload, by using the meta-object of the attached type known at compile time. This is consistent with the VME code path. Change-Id: Iffc64f7ee4677c6cc60d071b80f4032cf8037ab7 Reviewed-by: Lars Knoll <[email protected]>
* [new compiler] Fix potential infinite recursion when using the incubatorSimon Hausmann2014-03-061-3/+3
| | | | | | | | | | Some auto-tests use the incubation controller with a one-step boolean, so shouldInterrupt() always returns true. When we're in the finalization phase enabling the bindings one-by-one, pop one off the bindings stack and enable it _before_ doing the shouldInterrupt() check. Otherwise we don't progress at all. Change-Id: Ibd5bbc253f8e8f74b08c91b018533c9e2735d2c8 Reviewed-by: Lars Knoll <[email protected]>
* [new compiler] Fix incorrect accelerated lookups to id objectsSimon Hausmann2014-03-062-3/+4
| | | | | | | | | | When compiling JS code in the scope of a component, make sure to always set the id object mapping, even if it is empty. Otherwise the id objects from one scope might leak into another, leading to id object dependencies that are invalid. Change-Id: Ib2bca11203acd6924e8c74f9560a1ee3e00d7e39 Reviewed-by: Lars Knoll <[email protected]>
* Doc: Fix "Right-to-left User Interfaces"Takumi Asaki2014-03-061-8/+8
| | | | | | | | * Change from QApplication to QGuiApplication * Change from qmlviewer to qmlscene Change-Id: I6ceee763c125c4896905884f55437e3f375408d7 Reviewed-by: Topi Reiniƶ <[email protected]>
* Stabilize tst_QQuickPathView:dataModel()J-P Nurmi2014-03-062-5/+4
| | | | | | | | | | | | | | | - QQuickPathView::setCurrentIndex() result must be immediate => no need for random QTest::qWait(100) there. - Remove another random QTest::qWait(100) after inserting a model item. Instead, wait for the desired result ie. delegate creation with QTRY_VERIFY(). - Furthermore, disable the default highlight move duration to avoid the auto test and QQuickPathView's internal timeline fighting over the current index. Task-number: QTBUG-35705 Change-Id: Ie53fdcc8f7955a03027da38b075e6042a3aea7f2 Reviewed-by: Alan Alpert <[email protected]>
* Fix GridView flow enum docsJ-P Nurmi2014-03-061-13/+13
| | | | | | | | Task-number: QTBUG-37232 Change-Id: Ib975181e6cff9a86f642d822dfc92773528598cb Reviewed-by: Leena Miettinen <[email protected]> Reviewed-by: Thomas Hartmann <[email protected]> Reviewed-by: Alan Alpert <[email protected]>
* Reset the expose cycle when polishAndSync aborts.Gunnar Sletta2014-03-052-16/+27
| | | | | | | | | | | | | | | On platforms with misbehaving expose behavior, we will get and exposure, even though the window is not renderable. This results in the renderthread being in the "wait for polish" state while the GUI thread goes back to "no state". Check for this and reset render thread's expose cycle when it is hit. Task-number: QTBUG-37201 Change-Id: I6a6c89d9016301ff19443f88a2c182012b4eb65f Reviewed-by: Ulf Hermann <[email protected]> Reviewed-by: Eskil Abrahamsen Blomfeldt <[email protected]>