summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-053-2/+87
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-053-492/+8
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Improve QML documentation viewing in Assistant.Michael Brasser2009-05-053-2/+87
| | | | | | | | | | | | | | | The element pages now load correctly. A separate QML 'book' is also generated, which will be targeted at non-C++ programmers.
* | | Remove qmlconvAaron Kennedy2009-05-051-1/+1
| |/ |/|
* | Remove QML XML supportAaron Kennedy2009-05-052-492/+0
| |
* | Improve error handling consistencyAaron Kennedy2009-05-051-0/+8
|/
* Fix typo.Michael Brasser2009-05-011-1/+1
|
* Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-04-303-34/+43
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Support stdinWarwick Allison2009-04-301-12/+14
| |
| * Documentation work.Michael Brasser2009-04-302-22/+29
| |
* | qdoc: Corrected some qdoc warnings.Martin Smith2009-04-301-1/+2
|/
* Rename duiviewer to qmlviewer.Michael Brasser2009-04-305-29/+28
|
* Resizable.Warwick Allison2009-04-302-3/+10
| | | | | | Resizing is not propagated to canvas view and root item. Examples may or may not resize meaningfully. Skins are device-oriented and so do not resize.
* qdoc: Corrected some qdoc warnings.Martin Smith2009-04-291-1/+2
|
* 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
| | | | |
generated by cgit v0.12 at 2024-11-28 19:48:17 (GMT)