summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* fix crash on closing "rightmost" fileOswald Buddenhagen2009-11-231-2/+4
| | | | | | | "This cannot happen" ... yeah, right. :} Task-number: QTBUG-5989 (cherry picked from commit 7367a12c4a0d7686b9d35778e5de33a463504d75)
* fix accepting of old license keys (pre 4.6)Peter Hartmann2009-11-201-2/+5
| | | | | Reviewed-by: Thiago Macieira (cherry picked from commit 9e75354eabbc3c58472ed0c3dc9cba831827c38a)
* configure.exe: fix when configured with -openssl-linkedJason McDonald2009-11-191-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 (cherry picked from commit 009f01107fd062c1cd478fc9dbf20d927ff9c459) Conflicts: configure.exe
* Fixed a few license checks in configure.exe.axis2009-11-191-13/+5
| | | | | | | Needs recompile. Reviewed-By: Thiago Macieira (cherry picked from commit de8b7a4e69b0c5bb5504fd0930cde290984b0cc7)
* configure.exe: Update to the new licensing structure.Thiago Macieira2009-11-191-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 (cherry picked from commit d1779085462e7050a32e2f785767b4ce0d0cbfe0)
* 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. (cherry picked from commit 8c6edd82358a37bf906e3994eea069a3b93e85fc)
* Update license headers to release version.Jason McDonald2009-11-191153-14989/+14989
| | | | Reviewed-by: Trust Me
* French translation of designerBenjamin Poulain2009-11-191-0/+1
| | | | | Reviewed-by: Pierre Rossi (cherry picked from commit 80cd617b05ad3e647c87dc063d40cde0617344ca)
* Updates the french translation of qt strings in qt_fr.tsPierre Rossi2009-11-191-2/+38
| | | | | | | | Also took care of placing non breakable spaces before double punctuation characters. Reviewed-by: Benjamin Poulain (cherry picked from commit f9c7a523ce7d39b9a1299267ffbfac0c220ad51c)
* Fixed up qttracereplay and trace graphicsystem a bit.Gunnar Sletta2009-11-162-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 (cherry picked from commit 9c6e3590da6c49d055d452b08de0e51b0b77f1c4)
* Fix Qt file header, as spotted by tst_headers.Thiago Macieira2009-11-141-1/+1
| | | | | Reviewed-By: Trust Me (cherry picked from commit cbdfc6c2f761af6248355bf9bf71ac011d48b14b)
* Doc: Fixed whitespace.David Boddie2009-11-131-6/+5
| | | | | Reviewed-by: Trust Me (cherry picked from commit e029886be27c2434ecfb71f08a0c1a574a1ae533)
* Doc: Attempt to fix broken Xcode markup.David Boddie2009-11-131-2/+2
| | | | | | Reviewed-by: Trust Me To-be-reviewed-in: Qt Documentation Team repository (cherry picked from commit 44523147cb5f3d934bc33e028dfb093edcd2802c)
* Add tr() to strings of Assistant that need to be translatedBenjamin Poulain2009-11-131-2/+2
| | | | (cherry picked from commit 500e71ab649a5053667ff3f9dc7d87730b565756)
* 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-051-1/+5
| | |_|/ / | |/| | | | | | | | | | | | | Reviewed-by: Warwick Allison
generated by cgit v0.12 at 2024-08-22 21:25:17 (GMT)