aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Build with qt-in-namespaceKent Hansen2011-09-2810-6/+46
| | | | | | | | Change-Id: Ia57e4f14d94ad63194dad52892bedf316a58a79a Reviewed-on: http://codereview.qt-project.org/5693 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Don't crash when Image.source changeGunnar Sletta2011-09-282-0/+5
| | | | | | | | | | | QDeclarativePixmap::clear() may result in the texture being scheduled for deletion, so we need to make sure that our texture provider is updated properly whenever the source changes. Change-Id: Ie21c6fcba4b0cd438250dc4c263b513060cc026e Reviewed-on: http://codereview.qt-project.org/5673 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Add support for onLinkActivated with Text.StyledTextYann Bodson2011-09-282-7/+49
| | | | | | | | Change-Id: If7efa09e0e42970c6cb6ca8725713eb4a6f97ac8 Reviewed-by: Michael Brasser Reviewed-on: http://codereview.qt-project.org/5665 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Fix crash in String.arg()Chris Adams2011-09-284-12/+92
| | | | | | | | | | | | This commit ensures that the String.arg() function works correctly, by registering an anonymous function with the String Prototype object which calls the StringArg function, ensuring that the "this" object is valid (and passing the string as an argument to StringArg instead). Change-Id: I0a8cbaa12b39beb03a237c3ab62c6e21fafdedbf Reviewed-on: http://codereview.qt-project.org/4385 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Use QBasicTimer rather than QTimer in SmoothedAnimationMartin Jones2011-09-282-6/+14
| | | | | | | | | QBasicTimer does the same job for lower cost. Change-Id: I11d7033b9c456129f3f984c8baafa717f5b25d99 Reviewed-on: http://codereview.qt-project.org/5649 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Enable QSGTextEdit and QSGTextInput failures.Andrew den Exter2011-09-283-177/+288
| | | | | | | | | | | | | | | | Fix compilation errors and skip or expect fail any tests that don't pass. The following tasks have been created for failing tests: QTBUG-21686 QTBUG-21689 QTBUG-21690 QTBUG-21691 QTBUG-21693 Change-Id: I3f5bb275e1a207ebdf86e3d523cdeda1f943eb63 Reviewed-on: http://codereview.qt-project.org/5583 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* [autotests] Added expected failure for developer build in currentIndex test.Toby Tomkins2011-09-281-0/+3
| | | | | | | | | Task-number: QTBUG-21682 Change-Id: Icbe3ef45c9c58b54c195993b837713aef1dd3ca2 Reviewed-on: http://codereview.qt-project.org/5571 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* [autotest] Abort an unstable test for developer build.Toby Tomkins2011-09-281-0/+2
| | | | | | | | | Task-number: QTBUG-21688 Change-Id: I732c6dc8baa7942521cf3b9d4960a3f405d07aa2 Reviewed-on: http://codereview.qt-project.org/5577 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* [autotests] Added expected failures for developer build in a number of tests.Toby Tomkins2011-09-281-0/+12
| | | | | | | | | Task-number: QTBUG-21683 Change-Id: I0cc6150daed38a8f2207fa848be79e8cc6c56b48 Reviewed-on: http://codereview.qt-project.org/5573 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* [autotest] Abort an unstable test for developer build.Toby Tomkins2011-09-281-0/+3
| | | | | | | | | Task-number: QTBUG-21685 Change-Id: I96abcc88d861ce2c5b8778b56f34d42b58c4eb53 Reviewed-on: http://codereview.qt-project.org/5574 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* [autotests] Added expected failure for developer build.Toby Tomkins2011-09-281-0/+6
| | | | | | | | | Task-number: QTBUG-21687 Change-Id: I46f8e9c693d0fe3de48ea0f3fd967cc5ca8d1d30 Reviewed-on: http://codereview.qt-project.org/5575 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Improved testdata deployment.Rohan McGovern2011-09-282-15/+6
| | | | | | | | | | | | Don't embed the source path into the binary, instead find the testdata relative to the test's binary at runtime. Use DEPLOYMENT hints for installing testdata to a device. Change-Id: I4005422bb76adf214166fe75d66e82fb18ded04e Reviewed-on: http://codereview.qt-project.org/5578 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Manually apply SnapOneItem/Row changes from Qt 4.7Martin Jones2011-09-289-314/+441
| | | | | | | | | | | | Apply following changes to Qt 5 for both QtQuick1 and QtQuick2 items: cf23188de237009136fa1480ab8fd9e3ca364769 f85819fe083ae7c6804c884de68e906d153a6d11 09cd2f818208a83489fae034b80e6497b7cc83af Task-number: QTBUG-20683 Change-Id: I974764e57e3004514bb4c9f46c5152ad07c136a7 Reviewed-on: http://codereview.qt-project.org/5484 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Add QSGPaintedItem docs to module and fix non-standard wording.Casper van Donderen2011-09-275-11/+31
| | | | | | | Change-Id: I763b1fdabdac36935bd14005a9e38b2494319726 Reviewed-on: http://codereview.qt-project.org/5521 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Add convenience macro for fast connects in declarative.Michael Brasser2011-09-2710-50/+154
| | | | | | | | | | | | We already follow this pattern several places, so this commit creates a convenience macro for it, and replaces previous usage where appropriate. Also adds the macro several places as further optimization. Change-Id: Ieff5ed6cc51c34d0a1c8aa42ac40314ea243477a Reviewed-on: http://codereview.qt-project.org/5342 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* [autotests] Added expected failure for developer build in currentIndex test.Toby Tomkins2011-09-271-0/+3
| | | | | | | | | Task-number: QTBUG-21680 Change-Id: Ic33f4f4fc96529e0a3b2be4150829ab62fe078ff Reviewed-on: http://codereview.qt-project.org/5565 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Part of bug has re-occurred, relates to x{} behaviour.Toby Tomkins2011-09-271-0/+3
| | | | | | | | | Task-number: QTBUG-12295 Change-Id: Idcb9ceac1ad0b093e560ef793820a1ea2178c51e Reviewed-on: http://codereview.qt-project.org/5483 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Disable reordering as it is currently brokenGunnar Sletta2011-09-261-1/+1
| | | | | | | Change-Id: I28b622422aff62ea988a2918830338736df6fdbe Reviewed-on: http://codereview.qt-project.org/5528 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Make surface format plugable from the scene graph pluginGunnar Sletta2011-09-263-4/+19
| | | | | | | | | | | | | | | Also enable depth, stencil and samples by default as our default renderer requires both depth and stencil and our default rounded rectangles require multisampling The user should be able to override the default format, by getting the QSGCanvas::format(), modify it and set it back, but this is currently not supported in QWindow, so that will have to wait Change-Id: I1869003705709987ab2e9a3cebbeeec4d45a2021 Reviewed-on: http://codereview.qt-project.org/5464 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Don't give move ids to moved inserts.Andrew den Exter2011-09-262-3/+9
| | | | | | | | | | | Move ids identify a paired remove and insert, an insert that has a move id but no corresponding remove breaks anything relying on that identity. Change-Id: I9512e298bc518c5abf5bca7523a375baf8a39407 Reviewed-on: http://codereview.qt-project.org/5512 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix missing/outdated license headers.Jason McDonald2011-09-2639-271/+352
| | | | | | Change-Id: I381398b0c4f80db689a59797e2faeab5b14503eb Reviewed-on: http://codereview.qt-project.org/5491 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Call QWARN() instead of QTest::qWarn().Jason McDonald2011-09-261-1/+1
| | | | | | | | | | | The QWARN macro wraps QTest::qWarn(), but the former is the public API and the latter is merely an implementation detail that is subject to change. Change-Id: I02ae5ea384875afb7f235ef8dff0768a56afaa53 Reviewed-on: http://codereview.qt-project.org/5486 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Abort entire test as failures continue.Toby Tomkins2011-09-261-1/+1
| | | | | | | Change-Id: Ibf9d53e9a2e2ec125760f9f0ffb5a126273df7f2 Reviewed-on: http://codereview.qt-project.org/5482 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Support margins in Flickable.Martin Jones2011-09-2613-36/+625
| | | | | | | | | | | It is sometimes desireable to leave a margin/add decoration around the content of a Flickable. This adds topMargin, leftMargin, bottomMargin rightMargin, xOrigin and yOrigin properties to Flickable. Task-number: QTBUG-21362 Change-Id: Ia24ea4c63e7a8de683b68100baac782c6f3a66bb Reviewed-on: http://codereview.qt-project.org/5445 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Fix QSGTextEdit::closeSoftwareInputPanel()Joona Petrell2011-09-231-1/+1
| | | | | | | | Change-Id: If50486b3159a9e40b2808a2a18aff5668012ea76 Reviewed-on: http://codereview.qt-project.org/5400 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Get rid of redundant type member from V4 instructionsKent Hansen2011-09-235-665/+500
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When interpretation is threaded, the type member is redundant, since we can obtain the type from the instruction address. Getting rid of the type member can save at least one byte per instruction (possibly more because of alignment). On ia32, the Noop and Block instructions become 4 bytes smaller. The compiler has been refactored to leave it up to the Bytecode class to decide whether the instruction address or type (enum) should be stored. To achieve this, the "low-level" Instr union was renamed to V4Instr, and the new Instr struct used by the compiler provides typedefs for instantiating the data used by each particular instruction. Lastly, the gen() function (instruction emitter) was made template-based to provide the instruction type. The instructions Bool, Int, Real, String were renamed to Load{Bool,Int,Real,String} to make the new code more readable. This approach follows a similar refactoring in the QML-VME interpreter. Change-Id: I9bf16b099a85afdfb719a25fb18047408882d61e Reviewed-on: http://codereview.qt-project.org/5393 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* do not pollute the global namespaceGunnar Sletta2011-09-232-28/+29
| | | | | | | Change-Id: I6a6bd1b9ff89535c7af0f11dd9c501945ee0718b Reviewed-on: http://codereview.qt-project.org/5428 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* [tests] Fix unit test compilation, now uses QWidget.Toby Tomkins2011-09-233-2/+4
| | | | | | | | | Fixed unit test, also enabled this autotest to run. Change-Id: I92ad1a17d1fa4674a0746767d6a4100b21999a43 Reviewed-on: http://codereview.qt-project.org/5440 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove all font examples from qpa platform testsToby Tomkins2011-09-232-2/+2
| | | | | | | | | | | Remove all font examples, and re-enable all platform example tests. Task-number: QTBUG-21415 Change-Id: I87448cedd7f03b9483e8ec4d90474afa4d62b9c2 Reviewed-on: http://codereview.qt-project.org/5417 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Defensive ProgrammingAlan Alpert2011-09-231-0/+3
| | | | | | | | Task-number: QTBUG-21623 Change-Id: Ib906e6b50041d4e72034d6828d4dc7c503ec7bb4 Reviewed-on: http://codereview.qt-project.org/5426 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Make delegates visibleAlan Alpert2011-09-231-1/+0
| | | | | | | Change-Id: Ia932396419e41692431a9ce5e964331700810677 Reviewed-on: http://codereview.qt-project.org/5424 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Doc: Added a simple introduction to Qt and fixed links.David Boddie2011-09-232-2/+2
| | | | | | | | Change-Id: I941bde15897e3ae51756d0ae4d3d011a7a3c4511 Reviewed-on: http://codereview.qt-project.org/1976 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Peter Yard <peter.yard@nokia.com>
* Fix documentationAlan Alpert2011-09-231-5/+4
| | | | | | | | | | Had x in the y docs, and the pointX/Y weren't relative as the docs had stated. Change-Id: I709f3a30dc527d22abc2ab3987bea359c0e66214 Reviewed-on: http://codereview.qt-project.org/5376 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Use m_pleaseReset more consistentlyAlan Alpert2011-09-236-10/+2
| | | | | | | | | | Everyone had their own, and so they could conflict or be randomly un-initialized. Change-Id: Ife2c5d9972b881235e4d3a5e2a33979174de2fbc Reviewed-on: http://codereview.qt-project.org/5370 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Further delay animation creation in Behavior.Michael Brasser2011-09-231-2/+4
| | | | | | | | | | | Previously we always created the animation on the first call to write, regardless of whether the Behavior was enabled. Now we delay until the animation is needed. Change-Id: I14a319a4f045050fe6a99427b7c3804ef078d48d Reviewed-on: http://codereview.qt-project.org/5414 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Remove fonts example from qpa platform testsToby Tomkins2011-09-231-0/+3
| | | | | | | | | | Task-number: QTBUG-21415 Change-Id: I82b1600fe74a50dee8651247fcd172f09ba45a64 Reviewed-on: http://codereview.qt-project.org/4724 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* partial build fix replaced QApplication::setActiveWindow with ↵Matthew Cattell2011-09-222-9/+10
| | | | | | | | | requestActivateWindow and added widgets-private Change-Id: I6e2a3b51c10684de974a0954ca4182860d351eef Reviewed-on: http://codereview.qt-project.org/5403 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix extra selection in QML TextEditEskil Abrahamsen Blomfeldt2011-09-222-2/+2
| | | | | | | | | | | | QSGTextEdit::selectionEnd() interprets the selection end as the first character after the selection, while QSGTextNode expects it to be the end of the selection. Task-number: QTBUG-21533 Change-Id: Ia928602f8a2f845f3990a443e62f640ea72aa1d4 Reviewed-on: http://codereview.qt-project.org/5363 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Make the QML/VME interpreter threadedKent Hansen2011-09-228-525/+577
| | | | | | | | | | | | | | | | | | | | | | | | | | | This gets rid of the two-level dispatch in the interpreter loop, which gives a nice performance boost when many VME instructions must be interpreted (e.g., 40% faster for 100 StoreInteger instructions). The threading is implemented in a similar way to the V4 interpreter. The way the compiler generates instructions has been refactored, chiefly to get rid of the QDeclarativeInstruction::setType() calls (when using threading, we don't store the instruction type at all, only the address). As a nice bonus, the way instructions are defined now (creating the specific instruction's data type, rather than a generic (union) type) is more compact and less error-prone. Change-Id: If5cbd36b2526fd61b74854712711b06cd7e1ed7d Reviewed-on: http://codereview.qt-project.org/5246 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Make the QML-VME interpreter "threading"-friendlyKent Hansen2011-09-221-18/+19
| | | | | | | | | | | Get rid of the while (something); use labels and gotos instead. This is done in preparation of making the interpreter threaded (i.e. using computed goto to chain instructions together). Change-Id: I8f41e5e8295db939225547364dec3f7466f71a2b Reviewed-on: http://codereview.qt-project.org/5245 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Stop managing lifetime of materialAlan Alpert2011-09-221-9/+5
| | | | | | | | | | Let scenegraph handle it in its own thread. Task-number: QTBUG-21586 Change-Id: I5affcec4abbc79fff0c60e740d2c1cf04e3385f2 Reviewed-on: http://codereview.qt-project.org/5345 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Change burst to use ms instead of sAlan Alpert2011-09-224-20/+104
| | | | | | | | | Also renames that variable, and adds a burst example. Change-Id: I53787612f287e71d9afb5618bd445c8aa72fd39e Reviewed-on: http://codereview.qt-project.org/5349 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Constrain while loop on item countAlan Alpert2011-09-221-4/+4
| | | | | | | | | pos won't necessarily change, but item count does like in the above loop Task-number: QTBUG-21315 Change-Id: Iaedabeacf4ebe3cd0505193395047b3d65a09442 Reviewed-on: http://codereview.qt-project.org/5347 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Recognize deformable performance level properlyAlan Alpert2011-09-222-2/+2
| | | | | | | | | Task-number: QTBUG-21305 Change-Id: I88cfe56f0f22abc92a083b2a0a8da059ebefc652 Reviewed-on: http://codereview.qt-project.org/5344 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Tighter bounding box checkAlan Alpert2011-09-221-2/+9
| | | | | | | | | | | Because the gernic check works on floats and how .toPoint rounds, we need to redo the bounds checking inside Turbulence Task-number: QTBUG-21564 Change-Id: Ib56a8d420d9abf8035360b7908e89e28938799a8 Reviewed-on: http://codereview.qt-project.org/5343 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Wheel event support in qmltestlib + few fixes.juhvu2011-09-224-11/+131
| | | | | | | | | | added unit test and orientaion support for mouseWheel Change-Id: I9c26dc762281bc32965769c151414ac0e177ad0f Reviewed-on: http://codereview.qt-project.org/5272 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Juha Vuolle <juha.vuolle@nokia.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Additional ListView section header placement optionsMartin Jones2011-09-227-158/+591
| | | | | | | | | | | | | | | | | | Add a section.labelPositioning property which can be a combination of: - ViewSection.InlineLabels - section labels are shown inline between the item delegates separating sections (default). - ViewSection.CurrentLabelAtStart - the current section label sticks to the start of the view as it is moved. - ViewSection.NextLabelAtEnd - the next section label (beyond all visible sections) sticks to the end of the view as it is moved. Task-number: QTBUG-12880 Change-Id: I4601828337412bd3a83769c9b8df3f6d4d7474b8 Reviewed-on: http://codereview.qt-project.org/5192 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Fix compilation with QT_NO_*Tasuku Suzuki2011-09-211-0/+2
| | | | | | | | | | | | | | | | Merge-request: 1206 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit eb61f612fea1b76fe01ee237e5bd160f66aeca3d) Conflicts: src/network/access/qhttpthreaddelegate.cpp src/network/access/qhttpthreaddelegate_p.h Change-Id: Id4f8154d1b5f69ab490d9818facfdf5a733ec794 Reviewed-on: http://codereview.qt-project.org/4593 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qmlplugindump: Describe meta object revisions of exported types.Christian Kamm2011-09-213-13/+49
| | | | | | | | Adds the exportMetaObjectRevisions property to generated qmltypes files. Change-Id: Iafe2fe408c88bb6dd02cbb558404a5f654431248 Reviewed-on: http://codereview.qt-project.org/5311 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Fix processing of unary T_MINUS_MINUS tokens after semicolon insertion.Roberto Raggi2011-09-211-1/+1
| | | | | | | | | | There was a typo in the code, instead of pushing a T_MINUS_MINUS token the lexer synthesized a T_PLUS_PLUS. Change-Id: I62dcf263ac363196231fe8f02e98f280899ef85a Reviewed-on: http://codereview.qt-project.org/5293 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 07:37:32 +0000