summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Only display the choice of license if we can find the filesMarius Storm-Olsen2009-05-291-20/+23
| | | | | | Task-number: 254451 Reviewed-by: eskil BT: yes
* Fixed build issues with MSVCThierry Bastian2009-05-291-8/+8
| | | | | | | | | | in atomic operations, we declare Interlock... functions in the namespace That can confuse the compiler because they are also declared in another header outside the namespace. Same problem in clucene where we include windows.h from within the NS. Task-number: 254214 Reviewed-by: ogoffart
* BT: Support saving forms with resources more than once in Qt JambiEskil Abrahamsen Blomfeldt2009-05-281-12/+22
| | | | | | | | | | | | | | | | | When a form is loaded, Designer will set the path to the resource as an absolute path rather than the path actually stored in the file. There is code to work around this to make file paths relative when saving the file later on, but no work around for Qt Jambi. So when saving Qt Jambi forms, you would get an absolute path to the resource which contains the location of the resource file (.jar or on disk) This of course breaks the concept of resources, as the .jui file was no longer portable. The fix is to special case Qt Jambi resources and set the relative path when loading them. The patch has no effect on regular Designer. Task-number: 254621 Reviewed-by: Kai Koehne
* support for -ltcg configure switch for Windows CE buildsJoerg Bornemann2009-05-281-0/+1
| | | | | | | | | Additionally we turn -ltcg on by default on Windows CE. See commit 56191830 for details. Reviewed-by: mauricek BT: yes
* Integrate merge-request #549 into branch '4.5'Simon Hausmann2009-05-272-2/+4
|\ | | | | | | | | | | | | | | | | Thomas Sondergaard (2): Danish translations Updated danish translations. Added them to relevant project files. Request-url: http://qt.gitorious.org/qt/qt/merge_requests/549 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * Updated danish translations. Added them to relevant project files.Thomas Sondergaard2009-05-262-2/+4
| |
* | Workaround the palette issue, set it only when we search is open.kh2009-05-262-2/+38
| |
* | Fix broken search inside search results.kh2009-05-262-70/+66
| | | | | | | | Reviewed-by: kh
* | Correcting bugs in classic.cssMorten Engvoldsen2009-05-261-4/+4
| | | | | | | | | | | | Correcting invalid padding values. none is not a valid padding value. Rev-by: David Boddie
* | Changed qdoc to simplify the output for overloaded functions.Martin Smith2009-05-251-3/+1
| | | | | | | | Task-number: 249222
* | Changed qdoc program to display version from QT_VERSION_STR.Martin Smith2009-05-251-1/+3
| | | | | | | | Task-number: 251486
* | 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
* | 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
| | |
| * | 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
| * 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
* | 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.
* 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>
* qdoc: Fixed some qdoc errors.Martin Smith2009-05-131-3/+3
|
* 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
|
* 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
* 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
|
* 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
|
* Fix compile failure on Visual C++ 6.Jason McDonald2009-04-291-2/+4
| | | | | | No need to be excessively clever here. Reviewed-by: Trust Me
* Changed doc.trolltech.com links to doc.qtsoftware.comSimon Hausmann2009-04-2811-11/+11
| | | | Reviewed-by: David Boddie
* 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
|\
| * 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
| * 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
| |
| * 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
| * Change Qt version number to 4.5.2Thiago Macieira2009-04-247-11/+11
| | | | | | | | Reviewed-By: TrustMe
| * cleanupkh2009-04-233-68/+22
| |
| * 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