aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Dispose of WorkerScripts in correct IsolateAaron Kennedy2011-06-074-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were disposing them in the main thread isolate which caused corruption of the v8 heap. Specifically this showed in asserting allocations of persistent handles.
* | | | | Allow the same QObject to be used in multiple QDeclarativeEnginesAaron Kennedy2011-06-074-30/+137
| | | | |
* | | | | Merge branch 'master' into v8Michael Brasser2011-06-071370-10783/+51680
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/qml/qdeclarativecontextscriptclass.cpp src/declarative/qml/qdeclarativeengine.cpp src/declarative/qml/qdeclarativeengine_p.h src/declarative/qml/qdeclarativeglobalscriptclass.cpp src/declarative/qml/qdeclarativeinclude.cpp src/declarative/qml/qdeclarativelistscriptclass.cpp src/declarative/qml/qdeclarativeobjectscriptclass.cpp src/declarative/qml/qdeclarativeobjectscriptclass_p.h src/declarative/qml/qdeclarativetypenamescriptclass.cpp src/declarative/qml/qdeclarativevaluetypescriptclass.cpp
| * | | | Fix crash for prematurely deleted QSGItemPrivate::itemNodeInstanceGabriel de Dietrich2011-06-061-0/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | The OwnedByParent flag was set whereas it should had been cleared right after creating QSGItemPrivate::itemNodeInstance. Reviewed-by: Kim
| * | | Revert some of "Make QMLViewer startup animation stop after a while"Alan Alpert2011-06-033-36/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts most of commit c6e6a35aeb8794d68a3ca0c4e27a3a1181c066b5. Only the startup.qml changes were meant to go in. The other stuff is an experimental feature that was not supposed to be merged in. Reviewed-by: Michael Brasser
| * | | Update "What's New" with change to Binding.Michael Brasser2011-06-031-0/+3
| | | |
| * | | Replace QPerformanceTimer with QElapsedTimer.Michael Brasser2011-06-0310-418/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QElapsedTimer has added a nsecsElapsed() function, so QPerformanceTimer is no longer needed. Reviewed-by: Charles Yin
| * | | Add docs and test for Binding changes.Michael Brasser2011-06-023-0/+101
| | | | | | | | | | | | | | | | | | | | Change-Id: I6bce140bf80c3e0defd7603aecfb7f658520f4d3 Reviewed-by: Martin Jones
| * | | Restore original binding when Binding's when clause becomes false.Michael Brasser2011-06-021-6/+43
| | | | | | | | | | | | | | | | | | | | Change-Id: I7e2ba1f6e3cd1e049ec2666ab8191cb91acbfe50 Reviewed-by: Martin Jones
| * | | Make Binding a value source.Michael Brasser2011-06-022-7/+21
| | | | | | | | | | | | | | | | | | | | Change-Id: I1a9003f1e506c53e172bfae418f536ad0da2bf47 Reviewed-by: Martin Jones
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtdeclarative-stagingMartin Jones2011-06-0165-368/+352
| |\ \ \
| | * | | QDeclarative: fixed clean animation listsChristiaan Janssen2011-05-313-7/+39
| | | | | | | | | | | | | | | | | | | | Change-Id: I9dd8b4fcd3f04193410710981a511b9f69e5dc19
| | * | | DeclarativeObserver: Don't fade in the highlight edgeThorbjørn Lindeijer2011-05-312-58/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It feels more responsive when the highlight is immediately visible. Change-Id: Ie3dd0693ecc38f33b001c86970b220b45b37fdfc Reviewed-by: Kai Koehne (cherry picked from commit 0b4e028ec294992df01430bdf978982835c7df5c)
| | * | | Renamed declarativeobserver plugin to qmldbg_inspectorThorbjørn Lindeijer2011-05-3162-303/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mainly since it's a good idea to prefix the plugin on Symbian, and at the same time it's now consistency called 'inspector' rather than 'observer'. Symbian .def files will need to be updated. Change-Id: I43071331c8002f8844efd14105d01c730d97e946 Reviewed-by: Kai Koehne (cherry picked from commit 206ebd5af21d94c3f3b49d2cb645105a63e6f5fb)
| * | | | Small doc fix.Martin Jones2011-06-011-2/+2
| |/ / / | | | | | | | | | | | | Change-Id: Id3720c9ad6d3dc459cf7b726a443cc1ac390e223
| * | | Remove more webkit dependency from qtdeclarative.Martin Jones2011-05-31113-5800/+0
| | | | | | | | | | | | | | | | Change-Id: I75fd903e6a8160210652c2cec3c4636e908a9ade
| * | | Remove the examples/declarative/demos copy.Martin Jones2011-05-31152-7834/+0
| | | | | | | | | | | | | | | | | | | | | | | | Not sure why it is here, but it shouldn't be. Change-Id: I1a2f9cc994de13690bbc77d41005051e340291f7
| * | | Ensure doc code snippet can be loaded by QML engine.Martin Jones2011-05-311-2/+0
| | | | | | | | | | | | | | | | Change-Id: I2249a064a0c2afa3de1a9252ab4796af5bbeacc8
| * | | Remove webbrowser demo from qtdeclarative module.Martin Jones2011-05-3123-1215/+0
| | | | | | | | | | | | | | | | | | | | | | | | qtdeclarative should not depend on webkit. Change-Id: I82e3f49dbe710e408c1a74911787541a9ea9efa1
| * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarativeMartin Jones2011-05-313-43/+41
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/debugger/qpacketprotocol.cpp Change-Id: I61f500a08ce73def34c093344bfdad44a6c9a6f1
| | * \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-stagingQt Continuous Integration System2011-05-313-40/+40
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging: QmlDebugger: adding slots to items in Live Preview QmlDebugger: parsing packets iteratively in the communication protocol
| | | * | | QmlDebugger: adding slots to items in Live PreviewChristiaan Janssen2011-05-302-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kai Koehne (reapplied commit 89d9b83aa26db4f528250c3fe4716b81955c6929 from qtcreator)
| | | * | | QmlDebugger: parsing packets iteratively in the communication protocolChristiaan Janssen2011-05-301-37/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kai Koehne (reapplied commit fea13a449c59690ae7b7f43aa64f50c0a290a2cf from qtcreator)
| * | | | | Merge branch 'qtquick2'Martin Jones2011-05-312267-179069/+147863
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/flickr/common/Progress.qml demos/declarative/flickr/common/RssModel.qml demos/declarative/flickr/common/ScrollBar.qml demos/declarative/flickr/common/Slider.qml demos/declarative/flickr/mobile/Button.qml demos/declarative/flickr/mobile/GridDelegate.qml demos/declarative/flickr/mobile/ImageDetails.qml demos/declarative/flickr/mobile/ListDelegate.qml demos/declarative/flickr/mobile/TitleBar.qml demos/declarative/flickr/mobile/ToolBar.qml demos/declarative/webbrowser/content/Button.qml demos/declarative/webbrowser/content/FlickableWebView.qml demos/declarative/webbrowser/content/Header.qml demos/declarative/webbrowser/content/ScrollBar.qml demos/declarative/webbrowser/content/UrlInput.qml demos/declarative/webbrowser/webbrowser.qml doc/src/snippets/declarative/mousearea/mousearea-snippet.qml examples/declarative/modelviews/webview/newwindows/qml/alerts.html examples/declarative/modelviews/webview/newwindows/qml/content/Mapping/map.html examples/declarative/modelviews/webview/newwindows/qml/content/pics/cancel.png examples/declarative/modelviews/webview/newwindows/qml/content/pics/ok.png examples/declarative/modelviews/webview/newwindows/qml/newwindows.html src/declarative/graphicsitems/qdeclarativetextinput.cpp src/declarative/qml/qdeclarativecompiledbindings.cpp src/declarative/qml/qdeclarativecompiledbindings_p.h src/declarative/qml/qdeclarativedom.cpp src/declarative/qml/qdeclarativedom_p.h src/declarative/qml/qdeclarativedom_p_p.h src/declarative/qml/qdeclarativeengine.cpp src/declarative/qml/qdeclarativetypeloader.cpp src/imports/particles/particles.cpp tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.4.png tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.6.png tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.0.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.0.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.2.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.3.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.4.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.5.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.7.png tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.2.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.4.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.5.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext2.0.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.0.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.1.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.2.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.3.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.4.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.7.png tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp Change-Id: I40df8a9403a58a6c03a0f1734f16a5cbed6c85ff
| * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-stagingQt Continuous Integration System2011-05-282-6/+18
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging: QmlDebugger: removing slots in Live Preview QmlDebugger: adding slots to items in Live Preview
| | * | | | QmlDebugger: removing slots in Live PreviewChristiaan Janssen2011-05-271-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kai Koehne (cherry picked from commit 582be247290fd015798b3d84d692c0236dbff4e1)
| | * | | | QmlDebugger: adding slots to items in Live PreviewChristiaan Janssen2011-05-272-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kai Koehne (cherry picked from commit 1f0f8a1b15fa4efa58feb2799614afc8bf0bd6e3)
| * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-stagingQt Continuous Integration System2011-05-2714-770/+63
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging: DeclarativeObserver: Fixed duplicates in item selection DeclarativeObserver: Removed the SubcomponentEditorTool Pass QList as const reference when possible Fixed crashes in Observer mode related to infinite bounding rects
| | * | | | DeclarativeObserver: Fixed duplicates in item selectionThorbjørn Lindeijer2011-05-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only add items to the current selection that aren't already part of it. Also removed checking item for null, since it doesn't make sense to include null pointers in the list of items to select. Task-number: QTCREATORBUG-3426 Change-Id: I5a365570f87f72665b3382d05ca9937f56e8956b Reviewed-by: Christiaan Janssen (cherry picked from commit f75fda0365a4e4bf1f26dedc40d96d37a2599174)
| | * | | | DeclarativeObserver: Removed the SubcomponentEditorToolThorbjørn Lindeijer2011-05-2711-697/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tool made selecting items in your QML app more complicated than necessary. Now, left-click will always just select the top-most item under the mouse and right-click will allow you to select any of the items below. Also, the highlighted bounding rect now always applies to just one item, instead of also including the children bounding rect. Reviewed-by: Kai Koehne Change-Id: I17b5ab397d951fd68711590469ca6e723a9cb0e6 (cherry picked from commit 73060143c30d38ea99e6d7a77ff81c94f58899d7)
| | * | | | Pass QList as const reference when possibleThorbjørn Lindeijer2011-05-273-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoids some reference counting. Reviewed-by: Kai Koehne Change-Id: I4de83aa4df6833fa2287ac1854bbb0052d15cee9 (cherry picked from commit bdd8f188ac352c99ee218318a59089f387a31d60)
| | * | | | Fixed crashes in Observer mode related to infinite bounding rectsThorbjørn Lindeijer2011-05-273-67/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug fixed by avoiding uniting or subtracting QPolygonF with potentially infinite coordinates. The LiveSelectionIndicator now uses a QGraphicsRectItem rather than a QGraphicsPolygonItem and displays only the boundaries of selected objects, not including their children. The SubcomponentMaskLayerItem now works with rectangles and uses a QRegion to determine the area around the current context, converting this to a polygon only as a last step. Reviewed-by: Kai Koehne Task-number: QTCREATORBUG-4559 Change-Id: I266f5387fa67017fc50215282a95b4ee6498be6d (cherry picked from commit d03065da2999b8539d8c5160b58d56dd94373d6f)
| * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-stagingQt Continuous Integration System2011-05-24731-12178/+12178
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging: Update licenseheader text in source files for qtdeclarative Qt module
| | * | | | Update licenseheader text in source files for qtdeclarative Qt moduleJyri Tahtela2011-05-24731-12178/+12178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
| * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-stagingQt Continuous Integration System2011-05-231061-180/+49060
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging: Doc: Fixed qdoc warnings. Doc: Various fixes to documentation, some based on changes in master. Doc: Added missing project and desktop files. Squashed commit of changes from the 4.8-temp branch. Doc: Fixed incorrect inline snippet for an example .sci file. Squashed commit of the changes from the mobile-examples repository (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
| | * | | | Doc: Fixed qdoc warnings.David Boddie2011-05-233-11/+57
| | | | | |
| | * | | | Doc: Various fixes to documentation, some based on changes in master.David Boddie2011-05-233-31/+35
| | | | | |
| | * | | | Doc: Added missing project and desktop files.David Boddie2011-05-2314-0/+224
| | | | | |
| | * | | | Squashed commit of changes from the 4.8-temp branch.David Boddie2011-05-23969-0/+50542
| | | | | |
| | * | | | Doc: Fixed incorrect inline snippet for an example .sci file.David Boddie2011-05-231-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18812 (cherry picked from commit 4e8672c87bd7e740b01ca29a2a3c8ba902ed664b) (cherry picked from commit d1e70c3dd05df1f92f7a895de0b86b0c3a562511)
| | * | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-23217-2081/+147
| |/ / / / | | | | | | | | | | | | | | | | | | | | (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-stagingQt Continuous Integration System2011-05-201-4/+0
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging: Remove Qt3Support code from qtdeclarative module
| | * | | Remove Qt3Support code from qtdeclarative moduleJason McDonald2011-05-201-4/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: I7da1286486a138042717241461062883aacc6250 Task-number: QTBUG-19325 Reviewed-by: Rohan McGovern
| * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-stagingQt Continuous Integration System2011-05-142-3/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging: Honor -nomake for examples and demos Update module version number to 5.0.0
| | * | | Honor -nomake for examples and demosEckhart Koppen2011-05-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't build or install demos and examples when they are disabled. Reviewed-by: TrustMe
| | * | | Update module version number to 5.0.0Eckhart Koppen2011-05-131-3/+3
| | | | | | | | | | | | | | | | | | | | Updated .pri file variables
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-stagingQt Continuous Integration System2011-05-132-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging: Make QLineControl send accessibility updates.
| | * | | Make QLineControl send accessibility updates.Frederik Gladhorn2011-05-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make it emit the signals for the right object, it needs its parent to be the QGraphicsItem/SGItem/QLineEdit. According to IA2 it should emit TextUpdated and CursorMoved signals. TextChanged is deprecated. More fine grained signals would be desireable but this makes changes work at all. Reviewed-by: Morten Sorvig
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-stagingQt Continuous Integration System2011-05-124-2/+51
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging: QmlDebug: Fix QmlOstPlugin compilation failure QmlDebug: Fix QmlOstPlugin compilation failure
| | * | | QmlDebug: Fix QmlOstPlugin compilation failureKai Koehne2011-05-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix signature of waitForMessage. Reviewed-by: Tom Sutcliffe (cherry picked from commit 5c830ed2a612b940c377fb4e8a2372655f175707)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 03:24:46 +0000