summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* french translation of qt_helpPierre Rossi2009-11-102-1/+22
|
* Merge branch 'tools-team/4.6' (early part) into 4.6Oswald Buddenhagen2009-11-1019-275/+323
|\ | | | | | | | | Conflicts: src/corelib/tools/qscopedpointer.h
| * Designer: Use toolbar in Signal/Slot editorFriedemann Kleint2009-11-101-9/+10
| | | | | | | | | | | | as in the other tool windows. Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QTCREATORBUG-239
| * Assistant: Add missing initialization of member variable.ck2009-11-091-0/+1
| | | | | | | | Reviewed-by: kh1
| * Fix Assistant losing font settings across invocations.kh12009-11-092-62/+67
| | | | | | | | | | Task-number: QTBUG-5333 Reviewed-by: ck
| * Fix some warnings.kh12009-11-091-3/+2
| | | | | | | | Reviewed-by: ck
| * Assistant: Fix bugs related to setting the current filter remotely.ck2009-11-093-10/+14
| | | | | | | | | | | | 1. Filter combo box now gets updated on remote setCurrentFilter. 2. Argument to remote setCurrentFilter now gets checked. If there is no such filter, we reject it.
| * record id-based messages even if they have an empty sourceOswald Buddenhagen2009-11-063-20/+16
| | | | | | | | | | | | this makes sense if one uses lupdate only for validation purposes, i.e. to find out if the code uses only ids which are defined in some external specification.
| * handle messages with ids (more) correctlyOswald Buddenhagen2009-11-064-52/+138
| | | | | | | | | | when comparing two messages which both have ids, compare only the ids. this affects finding/reporting duplicates and merging.
| * kill TranslatorMessage::operator==() and qHash(TranslatorMessage)Oswald Buddenhagen2009-11-065-29/+27
| | | | | | | | preparation work ...
| * eliminate TranslatorMessagePtr from the Translator apiOswald Buddenhagen2009-11-066-48/+51
| |
| * improve ordered message insertionOswald Buddenhagen2009-11-061-1/+1
| | | | | | | | | | | | | | | | | | in a ts file, the top level categorization are the contexts, so it makes no sense to make messages adjoint by file when the context is different. a more clever algorithm which tries to order the entire contexts is conceivable. that would be advantageous for files which use multiple contexts subsequentially if each context appears in only one file.
| * eliminate Translator::contains()Oswald Buddenhagen2009-11-063-11/+11
| | | | | | | | replace the one use case with something more efficient
| * eliminate Translator::replace()Oswald Buddenhagen2009-11-063-17/+3
| |
| * use right method to record new messagesOswald Buddenhagen2009-11-061-1/+1
| | | | | | | | consistent with all other source parsers
| * do not consider plural source in comparisonsOswald Buddenhagen2009-11-061-4/+0
| | | | | | | | | | | | | | | | two messages with identical singular but different plural sources simply make no sense. this should be quite a bit faster, as it saves lots of QHash<QString,...> lookups.
| * remove unused TranslatorMessage::operator<()Oswald Buddenhagen2009-11-062-12/+0
| | | | | | | | it was once needed for QMap, but we don't use that any more
| * cut code dupe ...Oswald Buddenhagen2009-11-061-12/+5
| | | | | | | | ... with gotos :)
| * don't construct a new message for look-up purposes onlyOswald Buddenhagen2009-11-063-13/+5
| |
* | Merge branch '4.6-platform' into 4.6Denis Dzyubenko2009-11-091-0/+11
|\ \
| * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Bradley T. Hughes2009-11-0917-164/+300
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qwidget_win.cpp
| * | | Added a -no-native-gestures option for configure.exeDenis Dzyubenko2009-11-061-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The option allows to disable native Windows7 gestures since they require the creation of the native window handle. This partially disabled alien widgets concept and make window resizing slower and more flickery. Reviewed-by: Espen Riskedal
* | | | Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-099-19/+30
|\ \ \ \
| * | | | API review: *Count() are not pluralMarius Storm-Olsen2009-11-095-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Obsolete the plural version, and replace its usage in Qt. Reviewed-by: Andreas Aardal Hanssen
| * | | | API review: Rename functions numColors(), setNumColors() and numBytes()Marius Storm-Olsen2009-11-062-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPaintDevice and QImage used the functions numColors(), setNumColors(), and numBytes(). However, this is not consistent with the rest of the Qt API which uses *Count() and set*Count(). Removed all usage of these functions inside Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
| * | | | API review: QRegExp::numCaptures() -> QRegExp::captureCount()Marius Storm-Olsen2009-11-062-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | QRegExp::numCaptures() is marked as obsolete. Replaced all usage in Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
* | | | Merge commit 'b65fd82299' from qt-core-team 4.6 into 4.6Marius Storm-Olsen2009-11-091-4/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/io/qfsfileengine.cpp tests/auto/qfile/tst_qfile.cpp
| * | | Add src/tools/tools.pro, and use when building host tools for xcompilingMarius Storm-Olsen2009-11-041-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure.exe would simply initiate a build for each of the tools in order. However, this would break certain distributed build systems, since they would return right away after initiating the make. Thus, sometimes moc et al. would try to link before bootstrap lib was built. Reviewed-by: Jason McDonald
* | | | Merge commit 'ceteam/4.6' into 4.6Joerg Bornemann2009-11-091-3/+33
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Conflicts: dist/changes-4.6.0
| * | | cetest crashes and no helpful debugging providedKeith Isdale2009-11-061-3/+33
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Unguarded use of QList::first() leads to Q_ASSERT() if the list is empty Add support for a "-d" option to project file print parser debugging Do not make use of QMAKESPEC variables in .qmake.cache instead determine the current default if mkspec was not passed to cetest Task-number: QTBUG-5490 Reviewed-by: Lincoln Ramsay Joerg Bornemann
* | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-063-1/+10
|\ \ \
| * \ \ Merge branch '4.6-s60' into 4.6axis2009-11-062-0/+5
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-051-1/+1
| | |\ \
| | * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-0415-43/+106
| | |\ \ \
| | * | | | Added UIDs to projects lacking themMiikka Heikkinen2009-11-042-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added symbianpkgrules.pri include to some examples Reviewed-by: Janne Koskinen
| * | | | | Make declarative support in configure.exe auto.Martin Jones2009-11-061-1/+5
| | |_|/ / | |/| | | | | | | | | | | | | Reviewed-by: Warwick Allison
* | | | | Assistant: Fixes related to search configuration.ck2009-11-062-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Remove superfluous definition of QT_CLUCENE_SUPPORT in assistant.pro. It was not evaluated anywhere. 2. Bugfix for searvh widget when working with non-CLucene search lib. Reviewed-by: kh1
* | | | | Assistant: Fix bugs on cached collection file handling.ck2009-11-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. When the dates between the caller-supplied and the cached versions of a collection file differed, we used to overwrite the cached with the original version. This was obviously wrong - we should only overwrite when the cached version is older. 2. We also forgot to set the zoom factor when overwriting. Task-number: QTBUG-4899 Reviewed-by: kh1
* | | | | Assistant: Reset default homepage on collection file update.ck2009-11-051-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: kh1
* | | | | Assistant: Look for document encoding in XML headers as well.ck2009-11-056-57/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-1770 Reviewed-by: kh1 Conflicts: tools/assistant/lib/lib.pro
* | | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-0415-46/+107
|\| | | |
| * | | | eval: add key for the installer to grep for.Daniel Molkentin2009-11-041-1/+1
| | |/ / | |/| | | | | | | | | | Reviewed-By: con
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-0413-24/+89
| |\ \ \
| | * \ \ Merge commit '51c9b68' into 4.6Morten Johan Sørvig2009-11-041-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0 src/gui/kernel/qevent.h
| | | * | | Removed the margin in assistant on Mac.Denis Dzyubenko2009-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 9551b8c349ce4e15a57c24a2408ee1b73c2b7510 enabled documentMode on the tabbar in Assistant. To make it look more native we also remove the margin around the tabwidget. Reviewed-by: Prasanth
| | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-platform-team into 4.6Bradley T. Hughes2009-10-301-0/+1
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | * | | | Declarative building infrastructure.Warwick Allison2009-11-042-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Does nothing if no declarative directories installed.
| | * | | | qdoc updates for QMLWarwick Allison2009-11-0410-23/+75
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:Michael Brasser
| * | | | | qdoc: Fixed XHTML breakage caused by the Google search bar markup.David Boddie2009-11-031-2/+2
| |/ / / / | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-032-16/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qevent.cpp src/network/ssl/qsslerror.cpp
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 19:46:46 +0000