summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2009-12-0210-36/+85
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-12-027-11/+11
| |\
| | * Bump version to 4.6.1Jason McDonald2009-12-017-11/+11
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Creator crashes when reloading externally modified .ui files on MacPrasanth Ullattil2009-12-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac QWidget::destroy() sends an AcceptDropsChange event after clearing the guards for QPointer. This was used to store a QPointer to the widget being deleted & that will never be cleared. The fix removed the setAcceptDrops() from destroy. And as an extra protection make sure designer will not treat that event as interesting. Task-number: QTCREATORBUG-307 Reviewed-by: Denis Dzyubenko Reviewed-by: Friedemann Kleint
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-298-33/+77
| |\ \ | | |/
| | * fix crash on closing all files under certain circumstancesOswald Buddenhagen2009-11-263-11/+11
| | | | | | | | | | | | | | | | | | | | | after all, it is no good idea to announce the removal of all columns just to let the view headers adjust themselves - it also makes the views emit currentItemChanged() which has some undesirable side effects. so don't do it an fix the header manually.
| | * ignore Alt+Space acelerators - useless and too many false positivesOswald Buddenhagen2009-11-261-2/+13
| | | | | | | | | | | | Task-number: QTBUG-4429
| | * offer only possible countries for each languageOswald Buddenhagen2009-11-252-8/+27
| | | | | | | | | | | | | | | otherwise qlocale will silently clobber the user's (most probably bogus) choice anyway.
| | * make qph use language attributesOswald Buddenhagen2009-11-251-5/+18
| | |
| | * the definition needs xml escaping, tooOswald Buddenhagen2009-11-251-1/+1
| | |
| | * don't write context into <definition> fieldOswald Buddenhagen2009-11-251-3/+2
| | | | | | | | | | | | | | | | | | there is really no point in doing so Reviewed-by: hjk
| | * qph: don't clobber <definition> fieldsOswald Buddenhagen2009-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the translator comment field is not written out, so reading the definition into it is basically discarding it as far as any roundtrips which arrive at qph again are concerned. the message's disambiguation seems most suitable for the task. Reviewed-by: hjk Task-number: QTBUG-4498
| | * fix class/struct mismatch in the bootstrap magicOswald Buddenhagen2009-11-251-2/+4
| | | | | | | | | | | | | | | | | | qlocale.h includes qobjectdefs.h which forward-declares it as a class. Reviewed-by: aportale
| | * Assistant: Move tab widget allocation up.ck2009-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | We follow the controversial RABU ("Resource Acquisition Before Usage") pattern here. Patch is actually by con. Reviewed-by: con
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-271-0/+7
| |\ \ | | |/
| * | Fixed key handling in the documentation index widgetDenis Dzyubenko2009-11-251-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | On Mac up/down arrow keys move the cursor to the beginning/end of the lineedit, however if the lineedit is used to control the indexwidget in assistant, we need to prevent it to get those events and move the text cursor. Reviewed-by: kh
* | | trolltech => nokiaOswald Buddenhagen2009-11-271-1/+1
| | |
* | | support @-style list files on the command lineOswald Buddenhagen2009-11-261-61/+79
| | | | | | | | | | | | Task-number: QTBUG-4099
* | | Merge branch '4.6'Thiago Macieira2009-11-2582-851/+1152
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/modules.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/webkit/fancybrowser/mainwindow.cpp src/gui/widgets/qtabbar.cpp src/gui/widgets/qtabbar_p.h tests/auto/qpixmap/tst_qpixmap.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/tabbedbrowser.cpp translations/translations.pri
| * | 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.
| | * | | | 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
generated by cgit v0.12 at 2025-01-02 20:41:03 (GMT)