summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Fixed compilation Solaris.Friedemann Kleint2009-05-251-10/+6
|
* Doc - removing the constraint on font size.Kavindra Devi Palaraja2009-05-221-3/+0
| | | | Reviewed-By: David Boddie
* Enabled the use of promoted widgets in new form templates.Friedemann Kleint2009-05-226-124/+183
| | | | | | | | | | | | | | | The form builder used for preview of the templates did not implement custom widget handling (FormBuilder::createCustomWidgets()). On encountering a promoted widget, the widget factory would then create a Widget Database entry specifying QWidget inheritance (emergency fallback) which could not be overidden later on. To fix this, moved the code for handling custom widgets from QDesignerResource to QSimpleResource and create a new formbuilder class that handles it especially for the New Form Dialog preview. Task-number: 254282
* Merge branch '4.5' of ../qt-45-documentationDavid Boddie2009-05-201-5/+11
|\
| * Fix parsing method calls with null arguments in Java codeEskil Abrahamsen Blomfeldt2009-05-201-5/+11
| | | | | | | | | | | | | | | | | | | | | | In Java, "null" is represented as a keyword, not as the integer 0. The old code assumed the latter. Code such as translate("fooBar", "fooBar", null); would thus not be detected by lupdate when parsing Java files. Reviewed-by: ossi
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-05-2023-407/+811
|\ \ | | | | | | | | | | | | Conflicts: doc/src/stylesheet.qdoc
| * | Inject some more Qt colors into the css to make it look a bit more QtSoftwareThomas Zander2009-05-201-22/+12
| | | | | | | | | | | | Reviewed-By: Kavindra Palaraja
| * | Remove unused variables from various About dialogs.Jason McDonald2009-05-205-38/+9
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-194-58/+67
| |\ \ | | |/
| | * Revert "Makes the layout of many of the areas be in aligned columns to ↵Simon Hausmann2009-05-191-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | immensely increase readability" This was pushed accidentially. This reverts commit ffecdf0bf9f25f7ab9aa4f69e37507dd595fecea.
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-199-64/+80
| | |\
| | | * Make ctrl+lmb and mmb work in a same way everywhere (like in browsers).kh2009-05-183-44/+51
| | | |
| | | * Make sure we add the progress bar only once.kh2009-05-181-14/+16
| | | |
| | * | Makes the layout of many of the areas be in aligned columns to immensely ↵Thomas Zander2009-05-141-21/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | increase readability Unfortunately the patch causes quite some regressions and I think some refectoring of this class would be needed. I didn't do that since there is no API docs, the variable naming is not very clarifying and the code is hard to read due to it not using the coding style and mixing tabs as well as spaces.
| * | | Doc - changing the stylesheet to use a greeny color.Kavindra Devi Palaraja2009-05-191-2/+2
| | | | | | | | | | | | | | | | Reviewed-By: David Boddie
| * | | compile fixes with namespaceshjk2009-05-191-0/+2
| | | |
| * | | Modernize the output of qdoc a bit.Thomas Zander2009-05-191-2/+62
| | | | | | | | | | | | | | | | | | | | | | | | Now we have explicit columns we cann make our docs look a bit better using some simple css additions. This adds light backgrounds in targetted places to make the text more readable.
| * | | 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
* | | qdoc: Ensure that all inner class methods are included in the functionDavid Boddie2009-05-191-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | index. Since the original code only used the parent class name as a key in the map that collects functions, you would only ever see either QHash::iterator::key() or QMap::iterator::key() in the index. This patch changes the key to the fully-qualified name for the parent class so that inner class methods are included. Reviewed-by: Martin Smith <msmith@trolltech.com>
* | 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