summaryrefslogtreecommitdiff
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-2770-755/+843
|\ | | | | | | kinetic-declarativeui
| * Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-251-0/+36
| |\
| | * updates french phrasebookPierre Rossi2009-11-231-0/+36
| | |
| * | Fix build on AIX: all of the .a file is linked into the program.Oswald Buddenhagen2009-11-241-0/+7
| |/ | | | | | | | | | | | | | | | | The qlibraryinfo.cpp is only needed by lrelease. It has a hack for qmake_libraryInfoFile(), which doesn't work on AIX. So don't put qlibraryinfo.cpp in libbootstrap.a, but instead build directly for lrelease. Reviewed-by: thiago
| * Merge remote branch 'staging/4.6' into 4.6Oswald Buddenhagen2009-11-236-28/+44
| |\
| | * don't use qWarning for things which are not really warningsOswald Buddenhagen2009-11-202-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | ... so the tools are usable with QT_FATAL_WARNINGS. it may be sensible to "degrade" the c++ parser warnings to info messages. possibly later ... Task-number: QTBUG-5683
| | * fix crash on closing "rightmost" fileOswald Buddenhagen2009-11-201-2/+4
| | | | | | | | | | | | | | | | | | "This cannot happen" ... yeah, right. :} Task-number: QTBUG-5989
| | * fix encodings, take NOswald Buddenhagen2009-11-203-17/+21
| | | | | | | | | | | | | | | Task-number: QTBUG-4499 Task-number: QTBUG-5276
| | * don't overwrite explicitly specified CODECFORTR on UTF-16 inputOswald Buddenhagen2009-11-193-2/+3
| | |
| | * fix potentially wrong output codec for UTF-16 input filesOswald Buddenhagen2009-11-191-1/+1
| | | | | | | | | | | | querying the actual codec before the file has been read is pointless
| * | revert QT -= xml nonsenseOswald Buddenhagen2009-11-201-2/+0
| | | | | | | | | | | | | | | | | | we have CONFIG -= qt in bootstrap.pri, so all QT settings are irrelevant. the actual breakage comes from a bad cherry-pick in the release branch.
| * | QT —= xml for bootstrapped lreleaseOswald Buddenhagen2009-11-201-0/+2
| | |
| * | Merge commit 'b345b96dc14cc0da3a9ff44216d447e6f2c8ad97' from oslo-staging-1 ↵Simon Hausmann2009-11-201-1/+1
| |\ \ | | | | | | | | | | | | into 4.6
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-1963-681/+710
| | |\ \
| | * | | Enabled documentMode in assistant only on Mac.Denis Dzyubenko2009-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The doc says setting a document mode removes a frame, which makes assistant look weird on non-Mac platforms. Reviewed-by: Prasanth
| * | | | fix accepting of old license keys (pre 4.6)Peter Hartmann2009-11-191-2/+5
| | |_|/ | |/| | | | | | | | | | Reviewed-by: Thiago Macieira
| * | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-1966-718/+785
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch '4.6' of oslo-staging-1 into 4.6Simon Hausmann2009-11-191-36/+68
| | |\ \ | | | |/
| | | * Fixed a few license checks in configure.exe.axis2009-11-181-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | Needs recompile. Reviewed-By: Thiago Macieira
| | | * configure.exe: Update to the new licensing structure.Thiago Macieira2009-11-181-26/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Symbian commercial licenses and adapt to the possibility from the RT operating systems Task-number: QT-2518 Reviewed-by: axis
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-1813-85/+235
| | | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe
| | * | \ Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1960-663/+671
| | |\ \ \
| | | * | | Ran the script utils/normalizeOlivier Goffart2009-11-1859-662/+662
| | | | | | | | | | | | | | | | | | | | | | | | Over src/ tools/ examples/ and demos/
| | | * | | Fix html output of docsThomas Zander2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sub-title was too big which was caused by an unclosed anchor tag. Reviewed-by: David Boddie
| | | * | | QMenu: make the menu follow its parent/caused layout directionThierry Bastian2009-11-181-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The autotest are included Task-number: QTBUG-5884 Reviewed-by: ogoffart
| | * | | | doc: Removed google search engine.Martin Smith2009-11-191-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The google search engine for the doc tree must be generated after the doc tree has been built. The google search engine for the doc tree should only appear in the online docs.
| * | | | | Properly return the absolute file path for help files.kh12009-11-191-11/+13
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug that can only be seen on windows when we have the collection storage location on e.g. Drive c:\ while the help files reside on a different drive. QHelpEngineCore::registerDocumentation would fail to gather the proper relative file path, thus register the file with it's absolute path. In QHelpEngineCore::documentationFileName we still assumed that all files in the collection are registered relative and fail to concatenate the proper path. Now we check if the path is already absolute and return. Reviewed-by: ck
* | | | | Fix for packaging as module.Warwick Allison2009-11-271-1/+2
| | | | |
* | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-1920-107/+319
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
| * | | | French translation of designerBenjamin Poulain2009-11-181-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Pierre Rossi
| * | | | Updates the french translation of qt strings in qt_fr.tsPierre Rossi2009-11-181-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also took care of placing non breakable spaces before double punctuation characters. Reviewed-by: Benjamin Poulain
| * | | | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-182-1/+7
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| Conflicts: configure.exe
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-173-11/+31
| | |\ \ | | | |/
| | * | qttracerelay: Handle wrong command line parametersMarkus Goetz2009-11-171-0/+6
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5550 Reviewed-by: TrustMe
| | * | configure.exe: fix when configured with -openssl-linkedPeter Hartmann2009-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before, when configured with -openssl-linked, configure.exe hang, because of the following: We were checking for XQMAKESPEC via something like 'dictionary["XQMAKESPEC"] == "someValue"' , which added the XQMAKESPEC value to the dictionary. Later (line 3030), we checked whether XQMAKESPEC was set (which was now true), and we used the value although it was empty. Reviewed-by: Thiago Macieira Reviewed-by: Denis Dzyubenko
| * | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-172-10/+30
| |\ \ \ | | | |/ | | |/|
| | * | Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-162-10/+30
| | |\ \
| | | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-1352-588/+894
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0
| | | * | Fixed up qttracereplay and trace graphicsystem a bit.Gunnar Sletta2009-11-092-10/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added "qttrace" to binary file, making it possible to do a sanity verification of the input file in qttracereplay - Sanity check input binary file, both for existance and for content in qttracereplay - Console app on windows and mac - Added helpful output for -h and --help command line options Reviewed-by: Samuel
| | * | | Fix Qt file header, as spotted by tst_headers.Thiago Macieira2009-11-131-1/+1
| | | |/ | | |/| | | | | | | | | Reviewed-By: Trust Me
| * | | Fixed the closing of the A attribute at the start of each class pageThorbjørn Lindeijer2009-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It needs to be closed with </a> instead of the short /> notation, in order for browsers like Firefox and Chrome not to get confused. It caused the span used to make the subtitle smaller to only have effect up until the link to the module started (only applying the span to the opening '['). Reviewed-by: Martin Smith <msmith@trolltech.com>
| * | | Fix crash on windows running while without gui. Should be 4.6 main.kh12009-11-161-1/+4
| | | | | | | | | | | | | | | | Reviewed-by: ck
| * | | fix linking following lrelease bootstrappingOswald Buddenhagen2009-11-131-0/+2
| | | | | | | | | | | | | | | | qsettings_win needs advapi32
| * | | do not (fail to) compile qdatastream into qmake and cetestOswald Buddenhagen2009-11-131-1/+0
| | | | | | | | | | | | | | | | | | | | for some reason, this did build on linux and windows, but symbian seems somewhat stricter.
| * | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-1312-126/+229
| |\ \ \ | | |/ /
| | * | qdoc3: Allow the full signature for QML signals and methodsMartin Smith2009-11-114-25/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...in the \qmlmethod and \qmlsignal commands, and the corresponding "attached" ones. Previously, the type was not allowed, but it really should be there, which means the \qmlmethod and \qmlsignal commands should be updated throughout.
| | * | qdoc3: Output the full signature for QML signals and methodsMartin Smith2009-11-112-2/+5
| | | | | | | | | | | | | | | | In the Method Documentation and Signal Documentation sections.
| | * | qdoc3: Fixed a linking problem for qml methods.Martin Smith2009-11-117-88/+152
| | | | | | | | | | | | | | | | | | | | | | | | Note the Invalid Syntax errors for some uses of \qmlmethod and \qmlsignal. A syntactically correct signature is now required as the argument.
| | * | Add tr() to strings of Assistant that need to be translatedBenjamin Poulain2009-11-111-2/+2
| | | |
| | * | french translation of qt_helpPierre Rossi2009-11-112-1/+22
| | | |
View Lorry Controller Status