summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Add the chart utility from qtestlib-tools.Morten Sørvig2009-05-1213-1/+1479
| | | | | | | | | | It is now possible run the benchmarks with "-chart" to generate charts for benchmarks that produce chartable data. See examples/qtestlib/tutorial5 for an example. This patch has minimal inpact on QTestLib itself. Most of the functionality is implemented in a separate tool which QTestLIb calls after detecting the chart command line option.
* Merge branch '4.5'Thiago Macieira2009-05-111-2/+4
|\
| * Update the --help output of qdbusxml2cpp.Thiago Macieira2009-05-111-2/+4
| | | | | | | | | | | | | | Don't say we produce output when no options are passed if we don't. Task-number: 222778 Reviewed-by: Trust Me
* | Compile on Mac OS X.Norwegian Rock Cat2009-05-111-3/+8
| | | | | | | | | | | | | | | | The friend thing doesn't really work when it's defined in the class you want to be a friend of, so do the promotion technique instead. Reviewed-by: Thierry Bastian
* | QToolBarLayout and QDockWidgetLayout, which are private classes, areThierry Bastian2009-05-081-4/+8
| | | | | | | | | | | | | | | | | | | | no more exported designer was using QToolBarLayout members. We fixed that by using styles. Reviewed-by: Friedemann Kleint Reviewed-by: ogoffart
* | Merge branch '4.5'Thiago Macieira2009-05-075-60/+163
|\ \ | |/ | | | | | | | | Conflicts: src/gui/painting/qbackingstore.cpp src/gui/painting/qwindowsurface_raster.cpp
| * Compiler warnings (Mac/Carbon)Bjoern Erik Nilsen2009-05-071-1/+1
| | | | | | | | Reviewed-by: nrc
| * Make the error dialogs less annoying. Show only one instead of many.kh2009-05-071-11/+37
| |
| * Implement new cmd option to remove the full text search index.kh2009-05-073-0/+46
| |
| * Cleanup, no functional change.kh2009-05-071-48/+79
| |
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-064-15/+43
|\ \ | |/ | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
| * Put the Dochwidget tabs on top as this was often requested.kh2009-05-061-0/+1
| |
| * Fixes broken last tab page handling in case the search was hidden.kh2009-05-064-15/+42
| |
* | Show the BGR mode in the titlebar of the qvfb window.Paul Olav Tvete2009-05-051-1/+10
| | | | | | | | | | | | Slightly hacky, but isolated change. Reviewed-by: Tom
* | make quote/escape parsing more qmake-compatibleOswald Buddenhagen2009-04-291-50/+67
| |
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-291-2/+4
|\ \ | |/
| * Fix compile failure on Visual C++ 6.Jason McDonald2009-04-291-2/+4
| | | | | | | | | | | | No need to be excessively clever here. Reviewed-by: Trust Me
* | 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 '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-11-21 12:27:40 (GMT)