summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/4.5'Olivier Goffart2009-05-183-3/+10
|\ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/kernel/qobject_p.h src/network/access/qhttpnetworkconnection.cpp
| * Fixed a bug caused by forms with a sizepolicy of 'Fixed' on the main container.Friedemann Kleint2009-05-182-3/+6
| | | | | | | | | | | | | | | | | | | | Restore 4.4 behaviour by using a QStackedLayout as the layout containing the actual form (as was in 4.4). The difference in behaviour was caused by insertion of an additional widget with a QVBoxLayout which is supposed to ease setting of inheritable properties (style, etc). Reviewed-by: Kai Köhne <kai.koehne@nokia.com> Task-number: 253236
| * Made it possible to set string properties using ↵Friedemann Kleint2009-05-181-0/+4
| | | | | | | | | | | | | | | | | | QDesignerFormWindowCursor::setProperty. Ensure the text does not get clobbered by the subproperty handling. Reviewed-by: Kai Köhne <kai.koehne@nokia.com> Task-number: 253278
* | qdoc: Added back the list count that was lost in translation.Martin Smith2009-05-181-1/+2
| |
* | qdoc: Added name alignment for summaries.Martin Smith2009-05-152-286/+617
| |
* | Make the charts work on internet explorer (tested on IE8)Morten Sørvig2009-05-152-5/+14
| |
* | Merge branch '4.5'Thiago Macieira2009-05-145-4/+28
|\ \ | |/ | | | | | | Conflicts: tools/macdeployqt/shared/shared.cpp
| * Use isNull() for strings instead of comparing against QString().Jesper Thomschütz2009-05-142-3/+3
| | | | | | | | | | | | foo == QString() should be foo.isNull(). Fixes 7 warnings in the Norwegian Breakfast Network Reviewed-by: Samuel
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Friedemann Kleint2009-05-131-0/+13
| |\
| | * Turn off Link Time Code Generation (/LTCG) by defaultMarius Storm-Olsen2009-05-131-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turning on LTCG affected too many projects, where customers applications would take a long time linking, severly affecting their development time (even though it was only added for release builds) We turn it off by default, and add a -ltcg configuration option, and the possibility to also do CONFIG+=ltcg in projects, should they not want it for Qt, but in their own projects. (Same, they can build Qt with it, and do CONFIG-=ltcg for their project) Reviewed-by: andy
| * | Added API for quietly saving a form.Friedemann Kleint2009-05-132-1/+12
| |/ | | | | | | | | | | | | | | | | Task-number: 163220 Added to FormWindowBase. Required among other things for Qt Creator code completion for uic-generated-headers. Acked-by: dt <qtc-committer@nokia.com>
* | Only build the QWS keymap converter in embedded builds.Robert Griebl2009-05-141-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Merge branch '4.5'Thiago Macieira2009-05-131-3/+3
|\ \ | |/ | | | | | | Conflicts: tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| * qdoc: Fixed some qdoc errors.Martin Smith2009-05-131-3/+3
| |
* | Merge commit 'origin/4.5'Olivier Goffart2009-05-132-89/+105
|\ \ | |/
| * Doc - removing trailing whitespacesKavindra Devi Palaraja2009-05-121-2/+2
| |
| * Doc - cleaning up the documentation of QUiLoader.Kavindra Devi Palaraja2009-05-121-89/+105
| | | | | | | | | | | | | | | | | | Also mentioned an important point: If you subclass QUiLoader and reimplement either createAction(), createActionGroup(), createLayout(), or createWidget() -- you must call the original implementation first, within your implementation. Reviewed-by: João Abecasis <joao@abecasis.name>
| * Version update.kh2009-05-121-0/+0
| |
* | Fixed Qt 4.6 source package compilation by moving the qvfb skins.Friedemann Kleint2009-05-1371-46/+14
| | | | | | | | | | | | | | Move skins to tools/shared/deviceskin and have them included automatically by the profile. Acked-by: Jason McDonald <jason.mcdonald@nokia.com> Acked-by: Warwick Allison <warwick.allison@nokia.com>
* | Fixed compile on Windows in debug-only mode.Rohan McGovern2009-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | A Qt project can't unconditionally do `CONFIG+=release' or `CONFIG+=debug' since the release and debug libraries are named differently on Windows. In this case, CONFIG+=release meant this project was looking for QtSql.lib, but when Qt is configured with `-debug', only QtSqld.lib exists. Reviewed-by: Rhys Weatherley
* | Replace all instances of "Ctrl+Q" with QKeySequence::Quit.Norwegian Rock Cat2009-05-122-2/+2
| | | | | | | | We introduce this new enum, we should be using it.
* | 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
| | |
generated by cgit v0.12 at 2024-10-24 17:34:20 (GMT)