summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* make qm file creation a regular build stepOswald Buddenhagen2009-11-104-33/+55
| | | | | | | | | this is mostly a revert of the revert of the previous attempt, only that this time we have a bootstrapped lrelease which won't blow up for cross-compilations. Reviewed-By: Jason McDonald Task-Id: QTBUG-4939
* build lrelease bootstrappedOswald Buddenhagen2009-11-1018-29/+170
| | | | | | | | needed for build-time qm generation in qt itself. the downsides are a) that the other bootstrapped tools grow by ~12kB (on x86) due to qdatastream being pulled in by qbytearray and qstring and b) that lrelease isn't l10n'd itself anymore (the latter could be fixed by building a non-qobject qtranslator).
* don't use qApp->arguments()Oswald Buddenhagen2009-11-101-16/+15
| | | | preparation work for bootstrapping
* remove obsolete SETTINGS dependency on TEXTSTREAMOswald Buddenhagen2009-11-102-37/+35
| | | | Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* 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
* Move QCustomScopedPointer to a private headerHarald Fernengel2009-11-099-90/+159
| | | | | | | | | The API is internal, so it should live in its private header. The class was introduced during the lifetime of 4.6 (not in 4.5), so the move is binary compatible. Task-number: QTBUG-5617 Reviewed-by: João Abecasis <joao@abecasis.name>
* Code in gui/* should be completely namespacedhjk2009-11-091-4/+5
| | | | And not rely on random QT_USE_NAMESPACE being pulled in from *.moc files.
* 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-068-20/+41
| | | | | | 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-0613-53/+239
| | | | | 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 remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-06360-3076/+8673
|\
| * Fix a signed/unsigned comparison warningJoão Abecasis2009-11-061-1/+1
| |
| * Improving reliability and information from the large file testJoão Abecasis2009-11-061-0/+35
| | | | | | | | | | | | | | | | | | | | | | Saw a couple of sporadic failures on Windows platforms. Debug output should help find what's happening. Once the fillFileSparsely test fails, there's no point in trying to read what we failed to write so maximum tested size is reset on a failed write. Reviewed-by: Markus Goetz
| * Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-06214-1659/+4643
| |\ | | | | | | | | | | | | Conflicts: dist/changes-4.6.0
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-0611-4/+59
| | |\
| | | * Merge branch 'feature' into 4.6Jørgen Lind2009-11-0611-4/+59
| | | |\
| | | | * Fix QT_NO_GRAPHICSVIEWJørgen Lind2009-11-061-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: paul
| | | | * Fix QT_NO_WHEELEVENTJørgen Lind2009-11-061-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | * Fix QT_NO_WHATSTHISJørgen Lind2009-11-061-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: tom
| | | | * Fix QT_NO_MENUBARJørgen Lind2009-11-061-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: tom
| | | | * Fix QT_NO_SHORTCUTJørgen Lind2009-11-062-2/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | | | * Fix QT_NO_DATESTRINGJørgen Lind2009-11-062-0/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: tom
| | | | * Fix QT_NO_GRAPHICSEFFECTJørgen Lind2009-11-065-2/+33
| | | | | | | | | | | | | | | | | | | | Reviewed-by: paul
| | | | * Fix QT_NO_TABLETEVENTJørgen Lind2009-11-061-0/+6
| | | | | | | | | | | | | | | | | | | | Reviewed-by: tom
| | | | * Fix QT_NO_STATUSTIPJørgen Lind2009-11-061-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: paul
| | | | * Fix QT_NO_TOOLBARJørgen Lind2009-11-061-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: tom
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-063-33/+68
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Doc: Fixed a URL to ensure that it can be used in well-formed XML.David Boddie2009-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | Doc: Moved external references to a separate collection.David Boddie2009-11-062-32/+67
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | Doc: Trivial fix.David Boddie2009-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Merge branch '4.6-s60' into 4.6axis2009-11-0656-384/+1599
| | |\ \ \
| | | * | | Initial LFLAGS support for qmake on Symbian OSIain2009-11-052-12/+53
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Shane Kearns
| | | * | | QS60Style: Harmonize theme graphic with LineEdit and QTextEditSami Merilä2009-11-053-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In S60 the single line and multi line editors have same theme background. We should share one as well. Now we are using fancy notepad graphic with QTextEdit, but it makes QTextEdits to look apart from QLineEdits and in some themes it is styled rather badly (as it is not a central graphic item in a theme). Therefore it is better to use one and same graphic for both widgets. Task-number: QTBUG-5259 Reviewed-by: Alessandro Portale
| | | * | | QProgressBar is drawn stretched in QS60StyleSami Merilä2009-11-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style draws the ends of scrollbar as too wide, causing the themegraphic to stratch which looks horrible. Task-number: QTBUG-5445 Reviewed-by: Alessandro Portale
| | | * | | QS60Style: Checked menu check indicators are not shownSami Merilä2009-11-051-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style does not draw checked menu indicators at all. This is due to that it initializes used style option with style option's base class. Therefore relevant data for menu item indicator is not copied. Task-number: QTBUG-4717 Reviewed-by: Alessandro Portale
| | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-0592-353/+1193
| | | |\ \ \
| | | * | | | Fixed symbian-abld build problems with xmlpatternsxqtsMiikka Heikkinen2009-11-052-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qmake generators for symbian can't handle .depends for SUBDIRS values, instead relying on the order of subdirs. Reordered the subdirs as a hot fix to get test case to build before qmake can be properly fixed. Also removed duplicate inclusion of xmlpatterns.pri, which was causing compile time warnings due to duplicate MACRO statements in mmps. Reviewed-by: Janne Koskinen
generated by cgit v0.12 at 2024-10-14 09:57:48 (GMT)