summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-122-32/+2
|\ | | | | | | kinetic-declarativeui
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Benjamin Poulain2009-11-117-115/+198
| |\
| | * 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
| |/
* | Merge remote branch 'qt/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-11-1132-302/+420
|\ \ | |/
| * 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
* | | | Don't display "QML" for attached signals/methods.Michael Brasser2009-11-111-2/+2
| | | |
* | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2009-11-112-0/+16
|\ \ \ \ | | | | | | | | | | | | | | | into kinetic-declarativeui
| * | | | Add ability for viewer to slow down animations.Michael Brasser2009-11-102-0/+16
| | | | | | | | | | | | | | | | | | | | This is useful for debugging complex transitions.
* | | | | Change stateChanged(State) signatures to have (QmlDebugWatch::State)Bea Lam2009-11-116-9/+9
|/ / / / | | | | | | | | | | | | and (QmlDebugQuery::State) parameters.
* | | | qdoc3: Allow the full signature for QML signals and methodsMartin Smith2009-11-104-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.
* | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-0920-166/+306
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/animation/qabstractanimation.cpp src/gui/graphicsview/qgraphicsview.cpp src/s60installs/s60installs.pro tools/configure/configureapp.cpp tools/qdoc3/node.h
| * | | 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-051-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
generated by cgit v0.12 at 2025-01-04 06:14:35 (GMT)