summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-10-092-9/+48
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Bea Lam2009-10-091-3/+5
| |\ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: examples/declarative/layouts/Button.qml
| | * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-10-081-2/+3
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt
| | * | Call QApplication::exit() repeatedlyAaron Kennedy2009-10-081-3/+5
| | | | | | | | | | | | | | | | | | | | This is necessary incase we want to exit before we've entered the event loop.
| * | | Merge branch 'kinetic-declarativeui' of ↵Bea Lam2009-10-091-3/+5
| |\ \ \ | | | |/ | | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Add command line options.Bea Lam2009-10-081-6/+43
| | | |
* | | | Improve qdoc generated QML documentation.Michael Brasser2009-10-097-10/+33
| |/ / |/| |
* | | Fix (properly) test image saving.Warwick Allison2009-10-081-2/+3
| |/ |/|
* | Fix relative-URLs of test scriptsWarwick Allison2009-10-081-2/+3
|/
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-10-071-8/+27
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Fix so items are stretched to width of viewer if viewer is resized;Bea Lam2009-10-071-8/+27
| | | | | | | | | | otherwise, shrink viewer to width of main canvas item. (Last fix did not work because usually items should resize with the viewer.)
* | Fix portability of visual tests: fix filenames to be relative to base (URL).Warwick Allison2009-10-072-6/+6
|/ | | | Still not font-portable.
* Merge branch 'kinetic-declarativeui' of ↵Bea Lam2009-10-053-3/+6
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-043-3/+6
| |\ | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure
| | * doc: Fixed numerous qdoc errors.Martin Smith2009-10-021-0/+1
| | |
| | * make private qws/qvfb data directory non-default, default to non-user specificJeremy Katz2009-10-022-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This turns the changes in 072e748adbdab1d51b240b9983ce82b213b66f18 off by default. Define QT_PRIVATE_QWS to turn them on. This must be done for both qvfb (X11 build) and libQtGui (QWS build). Failure to do so will result in an inability for applications to communicate with the server. Task-number: QTBUG-1711 Reviewed-by: Paul
* | | Fix so fx items are not stretched to the width of the menu bar inBea Lam2009-10-051-1/+2
|/ / | | | | | | qmlviewer.
* | Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-10-0234-220/+316
|\ \ | |/ | | | | | | Conflicts: configure.exe
| * Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-10-012-9/+8
| |\
| | * make -{source,target}-language actually override values from filesOswald Buddenhagen2009-10-011-4/+4
| | | | | | | | | | | | -help says it does, and it kinda makes sense
| | * make -help reflect realityOswald Buddenhagen2009-10-011-5/+4
| | |
| * | fix ts and qm targets for shadow builds and builds with -prefixOswald Buddenhagen2009-10-017-42/+56
| | |
| * | remove *_untranslated.tsOswald Buddenhagen2009-10-017-8/+3
| | | | | | | | | | | | | | | | | | | | | with the current scheme of running "make ts" only when doing a particular translation and checking in only the relevant file, these files are never updated. lconvert can generate an empty template from any translation anyway.
| * | remove unused translations.proOswald Buddenhagen2009-10-011-34/+0
| | |
| * | Touch up and fixes for the documentation frontpageJens Bache-Wiig2009-10-011-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - I reverted the font enlargement. This should be up to the user. - The fonts are now uniform again, giving a more professional apparance. - Added a slight gradient for the headers to give it a more modern look. - Fixed a rendering glitch with webkit where no borders were visible. The qt-resources.qdoc is basically there to export the image. Reviewed-by: Morten Engvoldsen
| * | Doc: Removed the old Console edition and updated edition naming.David Boddie2009-10-014-16/+4
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Exclude the MMF Phonon plugin folder for qdoc.Frans Englich2009-10-011-0/+1
| | | | | | | | | | | | As done for the other plugins. Brought to attention by Volker.
| * | Enable qws/qvfb use for multiple users on one machineJeremy Katz2009-10-013-10/+11
| | | | | | | | | | | | | | | Task-number: QTBUG-1711 Reviewed-by: Paul
| * | qdoc: Added a missing "/" in a "<h2>".Martin Smith2009-10-011-38/+45
| | |
| * | doc: Fixed ending of header in the HTML generated for \sincelistThorbjørn Lindeijer2009-10-011-2/+1
| | |
| * | Merge branch '4.5' into 4.6Thiago Macieira2009-09-301-4/+11
| |\ \ | | |/
| | * Fix locale encoding in XLIFF filesAndy Shaw2009-09-301-4/+11
| | | | | | | | | | | | | | | | | | xlf uses xx-YY notation instead of xx_YY Reviewed-by: ossi
| * | Moving some QVFB stuff out of the configure script and into .pro filesJoão Abecasis2009-09-302-11/+12
| | | | | | | | | | | | Reviewed-by: Paul Olav Tvete
| * | qdoc: Modified the support for \sincelist.Martin Smith2009-09-304-29/+137
| | | | | | | | | | | | It now finds a lot more \since 4.6 stuff.
| * | Add Slovenian translationJure Repinc2009-09-291-0/+1
| | | | | | | | | | | | | | | Merge-request: 1320 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | Enable QtScript by default on WindowsKent Hansen2009-09-291-2/+2
| | | | | | | | | | | | Reviewed-by: Simon Hausmann
| * | fix solaris buildOswald Buddenhagen2009-09-291-1/+5
| | | | | | | | | | | | "A class with a reference member must have a user-defined constructor."
| * | Improve error reporting when qdoc cannot open a source file.Jason McDonald2009-09-291-1/+2
| | | | | | | | | | | | | | | | | | | | | Make the user's life easier by including the reason for the error in the failure message. Reviewed-by: Trust Me
| * | Assistant, Designer, Lingist and QMake manuals weren't generated.Jason McDonald2009-09-296-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | qdoc3 warns when it doesn't find doc source files that are listed in the .qdocconf file, but it doesn't error out. Thus the manuals haven't been generated since the 4.6 doc reorganization, but the failure has been silent. Reviewed-by: Trust Me
* | | Auto-resize window when a new file is opened from the Open dialog. AlsoBea Lam2009-10-011-1/+2
| | | | | | | | | | | | | | | set the Open dialog's initial directory to directory of the current file.
* | | If there's only one engine, auto-connect to it and hide engines view.Bea Lam2009-09-305-5/+35
| | | | | | | | | | | | Also auto-load available engines on connect.
* | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-09-292-23/+6
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ Merge branch 'kinetic-declarativeui' of ↵Bea Lam2009-09-291-2/+8
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Remove redundant "Fetch object" button and text field.Bea Lam2009-09-292-16/+0
| | | | |
| * | | | Use splitter to separate tree and property views. Helps with problemsBea Lam2009-09-291-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | with viewing complex trees since the tree's horizontal scrollbar is not appearing either.
* | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-09-2923-438/+747
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe mkspecs/features/qt.prf
| * | | Merge branch 'origin/4.5' into 4.6Oswald Buddenhagen2009-09-252-11/+83
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: translations/qt_ru.ts
| | * | Add Russian translation for Qt DesignerRitt Konstantin2009-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | Update Russian phrasebookRitt Konstantin2009-09-251-10/+82
| | | | | | | | | | | | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | Fix broken .ui file - class name was not specified correctly.Rhys Weatherley2009-09-181-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: trustme