summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-04-2829-1267/+1276
|\ | | | | | | kinetic-declarativeui
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-2811-11/+11
| |\
| | * Changed doc.trolltech.com links to doc.qtsoftware.comSimon Hausmann2009-04-2811-11/+11
| | | | | | | | | | | | Reviewed-by: David Boddie
| * | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-277-119/+169
| |\ \ | | |/
| | * fixes undefined behavior will closing all tabskh2009-04-276-116/+165
| | | | | | | | | | | | | | | Task-number: 249001, 236473 Reviewed-by: kh
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jarek Kobus2009-04-2732-265/+252
| | |\
| | * | Make dark color schemes look better in property editor (especially schemes ↵Jarek Kobus2009-04-271-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | which have a grey color for text) Task: 252251 RevBy: Markus Goetz <Markus.Goetz@nokia.com>
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-276-6/+6
| |\ \ \ | | | |/ | | |/|
| | * | Increment Qt version number in qdoc namespaces.Jason McDonald2009-04-276-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we saw with the 4.5.1 release, failing to increment the namespaces when incrementing the Qt version causes some featuresof Assistant to break. Reviewed-by: Trust Me
| * | | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-255-114/+137
| |\ \ \ | | |/ /
| | * | fixes empty tab titles after restartkh2009-04-242-14/+10
| | | |
| | * | cleanup, no functional changekh2009-04-243-94/+118
| | | |
| | * | init combobox member and make sure we won't access it uninitializedkh2009-04-241-6/+9
| | | |
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-243-3/+6
| |\ \ \ | | |/ /
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-04-243-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 242472777d440a540b4bc944c84eb522388e384e ) Changes in WebKit since the last update: ++ b/ChangeLog 2009-04-24 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Ariya Hidayat. Added support for generating API docs in the Qt build using "make docs" * WebKit.pro: Include docs.pri for "make docs" target. ++ b/WebKit/qt/ChangeLog 2009-04-24 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Ariya Hidayat. Added support for generating API docs in the Qt build using "make docs" Added code snippets and overview from the Qt sources references in the API docs. * Api/qwebpage.cpp: Adjust paths to snippets. * Api/qwebview.cpp: Ditto. * docs/docs.pri: Added. * docs/qtwebkit.qdoc: Added. * docs/qtwebkit.qdocconf: Added. * docs/webkitsnippets/qtwebkit_build_snippet.qdoc: Added. * docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp: Added. * docs/webkitsnippets/simple/main.cpp: Added. * docs/webkitsnippets/simple/simple.pro: Added. * docs/webkitsnippets/webpage/main.cpp: Added. * docs/webkitsnippets/webpage/webpage.pro: Added. Moved QtWebKit documentation into the WebKit project under src/3rdparty/webkit This is needed to have "make docs" inside WebKit and allows contributors to the WebKit project to write API docs. I'm doing the change in 4.5 to simplify merging with Qt 4.6. Reviewed-by: Trust me
| * | | Merge branch '4.5'Thiago Macieira2009-04-241-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts (version number change in 4.5): src/corelib/global/qglobal.h src/qbase.pri tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| | * | Change Qt version number to 4.5.2Thiago Macieira2009-04-247-11/+11
| | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| * | | Remove the Direct3D engine.Gunnar Sletta2009-04-241-57/+2
| | | |
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-233-68/+22
| |\ \ \ | | |/ /
| | * | cleanupkh2009-04-233-68/+22
| | | |
| * | | Merge branch '4.5'Thiago Macieira2009-04-236-32/+57
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| | * | fixes open an empty page on invalid keywordkh2009-04-231-0/+2
| | | |
| | * | make sure we wait until the page has fully loaded before duplicatingkh2009-04-233-1/+19
| | | |
| | * | update the filter combobox if we set a passed filterkh2009-04-231-2/+11
| | | |
| | * | use qdoc3 debug version only when it is availableJoerg Bornemann2009-04-231-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | By default there is no debug version built of qdoc3. In this case we should call the release build. Reviewed-by: kh
| | * | Set the current filter if one gets passed by commandline.kh2009-04-231-0/+3
| | | | | | | | | | | | | | | | | | | | Task-number: none Reviewed-by: kh
| | * | cleanup, normalized connect, etc...kh2009-04-231-24/+24
| | | | | | | | | | | | | | | | | | | | Task-number: none Reviewed-by: TrustMe
| * | | Make BGR mode configurable through the GUIPaul Olav Tvete2009-04-231-0/+2
| | | |
| * | | Add BGR format to qvfbPaul Olav Tvete2009-04-233-1/+19
| | | |
| * | | Adding 2bpp support to qvfbPaul Olav Tvete2009-04-233-864/+855
| | | |
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-236-12/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qfeatures.h src/gui/painting/qtransform.cpp util/scripts/make_qfeatures_dot_h
| | * | Make all qdoc footers consistent with the main Qt docs.Jason McDonald2009-04-226-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the same copyright message in all doc footers. As a side-effect, this change also removes most of the remaining THISYEAR placeholders, and fixes some footers that try to use 110% of the page width. Reviewed-by: Thiago
| * | | Remove git merge conflict markersSimon Hausmann2009-04-222-2/+0
| | | | | | | | | | | | | | | | Reviewed-by: Trust me
* | | | Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-04-283-1/+491
|\ \ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Handle Connection objects.Roberto Raggi2009-04-271-13/+68
| | | | |
| * | | | removed most featuresmae2009-04-241-10/+17
| | | | |
| * | | | Updated the QML converter.Roberto Raggi2009-04-241-10/+5
| | | | |
| * | | | experiment with treating State and Transition slightly special: they are ↵mae2009-04-241-4/+4
| | | | | | | | | | | | | | | | | | | | automatically added to the states resp. transitions property. This allows us to make the [...,...,...,...] list syntax superfluous.
| * | | | small cleanupsmae2009-04-241-2/+11
| | | | |
| * | | | map the ParentChange qml tag to a ParentChangeSet in dui.mae2009-04-241-13/+31
| | | | | | | | | | | | | | | | | | | | | | | | | It might be a consideration to use the former moveToParent property, maybe it was a bit hacky, but less to type.
| * | | | finalize support for namespacepathmae2009-04-241-2/+10
| | | | |
| * | | | qmlconv does not need to be a bundle app.Roberto Raggi2009-04-241-1/+1
| | | | |
| * | | | load foo.js for a foo.dui if it exists. This lets us use the import keyword ↵mae2009-04-241-1/+3
| | | | | | | | | | | | | | | | | | | | for real modules. Fix qmlconv, also get rid of the function() for signal properties.
| * | | | imported qmlconv utility for conveniencemae2009-04-243-1/+397
| | | | |
* | | | | qdoc: Corrected a few qdoc warnings.Martin Smith2009-04-282-14/+20
|/ / / / | | | | | | | | | | | | | | | | | | | | Changed some qDebug() output in qdoc to be real qdoc waqrnings with location information for the user. These were in the qmlproperty command processing.
* | | | Make the documentation build.Alexis Menard2009-04-232-2/+0
| | | |
* | | | Change the QML element docs filename prefix "qml-" rather than "qml".Martin Jones2009-04-232-5/+5
| | | | | | | | | | | | | | | | Otherwise there is a clash with the QmlFoo C++ classes.
* | | | Merge in changes to old kinetic-dui branch.Michael Brasser2009-04-234-8/+31
| | | |
* | | | Merge branch 'master' of ../../qt/qt into kinetic-declarativeuiMichael Brasser2009-04-2223-144/+32
|\ \ \ \ | |/ / /
| * | | Merge branch '4.5'Rhys Weatherley2009-04-2114-19/+15
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
generated by cgit v0.12 at 2024-10-25 01:33:52 (GMT)