summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * cleanup, normalized connect, etc...kh2009-04-231-24/+24
| | | | | | | | | | Task-number: none Reviewed-by: TrustMe
| * 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
| * correct the HowTokh2009-04-211-3/+2
| | | | | | | | | | Task-number: none Reviewed-by: kh
| * Fix incorrect year and version number in assistant docs.kh2009-04-211-0/+0
| | | | | | | | | | | | | | | | | | Should have been part of 8aa8997f18afb85cb17f5b2a875a004302df4c72 Sorry the HOWTO file was not entirely clear that the *.qch needs to be updated too. Task-number: 251421 Reviewed-by: kh
| * Doc - Changed the namespace in the qdocconf file to reflect Qt 4.5.1kh2009-04-216-19/+19
| | | | | | | | | | | | | | | | should have been part of c8285ec610b02f440f692be90aed1e6925a8675 Task-number: 251346 Reviewed-by: TrustMe BT: yes
| * QTableWidget header items not re-translated by QUiLoader.Friedemann Kleint2009-04-211-2/+2
| | | | | | | | | | | | Task: 251691 Translate correct header item (fix to new feature). Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * BT: Remove turkish translation files created by previous change.Jason McDonald2009-04-215-5/+0
| | | | | | | | | | | | | | | | Remove the *_tr_TR.ts files added in change 5e3cae2754bf5f50aa10fef2c8d3bb7d33407b96 and remove their entries from .pro files to prevent them coming back next time someone does "make ts". Reviewed-by: Trust Me
| * Unable to build ActiveQt with Opensource edition.Prasanth Ullattil2009-04-202-8/+5
| | | | | | | | | | | | | | Updated the project files and headers necessary for enabling this. Reviewed-by: Thiago Macieira Reviewed-by: Jens Bache-Wiig
| * mac: remove special handling of the editor frame now that stylesheets work ↵Oswald Buddenhagen2009-04-201-7/+0
| | | | | | | | properly
* | 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>
* Fix the About Qt dialog text to be truthful, post-LGPLJason McDonald2009-04-186-110/+12
| | | | | | | | | | | | | | | | | Update the text of the About Qt dialog, as directed by Legal. Note that this change breaks string freeze as the text is translatable, however Legal has decided that shipping legally correct text has priority over shipping complete translations. This change includes updated .ts files to correct the source strings, but no updated translations. This change also removes out-of-date licensing text from the About dialogs of Designer, Assistant, Linguist, QtConfig and qdbusviewer. Those particular changes should not break translations as they only remove translatable strings and do not modify any others. Task-number: 247608 Reviewed-by: Trust Me .....review will be conducted after submission.
* Fix incorrect year and version number in assistant docs.Jason McDonald2009-04-171-2/+2
| | | | | Task: 251421 Reviewed-by: Trust Me
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jarek Kobus2009-04-1721-116/+29
|\
| * Doc - Changed the namespace in the qdocconf file to reflect Qt 4.5.1Kavindra Devi Palaraja2009-04-161-1/+1
| | | | | | | | | | | | Task-number: 251346 Reviewed-by: TrustMe BT: Yes
| * Remove obsolete code.Jason McDonald2009-04-161-9/+1
| | | | | | | | | | | | | | | | Remove the last few unnecessary directives using obsolete values of QT_VERSION. There are a few references to old QT_VERSION's left, but they are legitimate and should not be removed. Reviewed-by: Trust Me
| * Remove obsolete pre-processor directives that check QT_VERSION.Jason McDonald2009-04-1616-96/+0
| | | | | | | | | | Reviewed-by: Trust Me ....though discussed with three devs.
| * protect against circular inclusion of pro/pri filesOswald Buddenhagen2009-04-151-1/+7
| | | | | | | | Task-number: 250574
| * do not crash on lines starting with an equal signOswald Buddenhagen2009-04-151-0/+3
| |
| * fix uninitialized variable readOswald Buddenhagen2009-04-151-4/+12
| |
| * add some commentsOswald Buddenhagen2009-04-151-4/+4
| |
| * Make choosing a file path for a QUrl-type property work on Windows.Friedemann Kleint2009-04-151-1/+1
| | | | | | | | | | Use QUrl::fromLocalFile to construct the url string. Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
* | Fix management of svg iconsJarek Kobus2009-04-172-9/+9
|/ | | | | Task: 251248 Revieved-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Display QAction keyboard shortcuts in action editor correctly.Friedemann Kleint2009-04-155-13/+25
| | | | Use PropertySheetKeySequenceValue instead of plain strings.
* Fix typo.Morten Sørvig2009-04-141-1/+1
| | | | Reviewed-by: nrc
* update/fix configureMaurice Kalinowski2009-04-082-3/+12
| | | | | | | | Reviewed-by: Thiago - display the nokia internal usage text like on configure - instead of skipping the license check we need to actually call it to set QT_EDITION and friends properly. Otherwise the build gets broken.
* Don't check license for internal configurationsMarius Storm-Olsen2009-04-081-1/+2
| | | | | | | A Nokia build doesn't require a license. Reviewed-by: mauricek BT: yes
* compile with aCCOswald Buddenhagen2009-04-071-2/+2
|
* Fixes: Support for OpenGL ES 2.0 in configure.exe (Windows CE)Thomas Hartmann2009-04-071-1/+13
| | | | | RevBy: Joerg Details: -opengl-es-2 option for configure.exe
* Merge commit 'ab56759cefbcf2072ac777f0d897e561f5a3c8af' into 4.5Joerg Bornemann2009-04-061-6/+6
|\
| * don't display warning message when calling checksdk -listJoerg Bornemann2009-04-011-6/+6
| | | | | | | | | | | | | | checksdk -list now displays the list of available SDK without yielding the warning message "No SDK specified: Defaulting to ...". Reviewed-by: mauricek
* | Make the configure.exe program work for the commercial release licenses.Thiago Macieira2009-04-041-21/+14
| | | | | | | | | | Reviewed-by: TrustMe BT: yes
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5kh2009-04-021-9/+10
|\ \
| * | re-initialize some variables for each fileOswald Buddenhagen2009-04-021-5/+4
| | |
| * | fix evaluation of CONFIG() and contains()Oswald Buddenhagen2009-04-021-3/+4
| | | | | | | | | | | | cherry-picked from creator's b3ec859c80bd0656cfc48cfe6514ec4f631b8206
| * | fix wrong evaluation of arguments to qmake functionsOswald Buddenhagen2009-04-021-1/+2
| | | | | | | | | | | | cherry-pick 28dacdfdf3eed04ec47a1e8eb206bd3ffb979c08 from creator