summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-3180-952/+1012
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (43 commits) Fix compilation on Windows: forgot to change one toTime_tHelper handle qt-format PO flags handle encoding of PO files make variable naming politically correct :-D add Plural-Forms header in PO writer simplify arabic plural rule don't mark untranslated messages as fuzzy in PO files support gettext POT files fix writing of length variant separators in the singular case make PO header handling less of a monster hack fix updating of X-Source-Language PO header interpret source language "en" as "POSIX" (more precisely: "none specified") Fix compilation with Sun CC: no semi-colon after Q_ENUM. Remove the "Insert unicode control character" menu entry on X11. adds a timeout option to QThreadPool::waitForDone(); Remove leading whitespace from Qt header macros. Rename the xxxMsecsSinceEpoch functions to xxxMSecsSinceEpoch. Add QDateTime members that operate on 64-bit milliseconds. Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct. qdoc: Added <div> elements to some html output for class references. ...
| * Fix compilation on Windows: forgot to change one toTime_tHelperThiago Macieira2010-03-311-1/+1
| |
| * handle qt-format PO flagsOswald Buddenhagen2010-03-311-1/+24
| |
| * handle encoding of PO filesOswald Buddenhagen2010-03-317-135/+218
| |
| * make variable naming politically correct :-DOswald Buddenhagen2010-03-311-4/+4
| |
| * add Plural-Forms header in PO writerOswald Buddenhagen2010-03-3111-34/+74
| |
| * simplify arabic plural ruleOswald Buddenhagen2010-03-311-1/+1
| |
| * don't mark untranslated messages as fuzzy in PO filesOswald Buddenhagen2010-03-315-12/+8
| | | | | | | | ... as this is what gettext processors expect.
| * support gettext POT filesOswald Buddenhagen2010-03-311-0/+14
| | | | | | | | | | these are in fact the same as PO files, only that exporting to one automatically drops translations.
| * fix writing of length variant separators in the singular caseOswald Buddenhagen2010-03-311-0/+2
| |
| * make PO header handling less of a monster hackOswald Buddenhagen2010-03-311-44/+80
| | | | | | | | | | | | instead of doing string editing magic, parse the header properly. don't add a template file comment, either - it's not mandatory, after all.
| * fix updating of X-Source-Language PO headerOswald Buddenhagen2010-03-311-0/+3
| |
| * interpret source language "en" as "POSIX" (more precisely: "none specified")Oswald Buddenhagen2010-03-312-1/+3
| | | | | | | | | | | | | | we set it to that value when writing xliff, as the header is mandatory and no better value is possible. it seems unlikely that an unqualified "english" would be used if somebody meant to actually specify a source language, so this hack should be ok.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-3161-750/+611
| |\ |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (31 commits) Fix compilation with Sun CC: no semi-colon after Q_ENUM. Remove the "Insert unicode control character" menu entry on X11. adds a timeout option to QThreadPool::waitForDone(); Remove leading whitespace from Qt header macros. Rename the xxxMsecsSinceEpoch functions to xxxMSecsSinceEpoch. Add QDateTime members that operate on 64-bit milliseconds. Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct. qdoc: Added <div> elements to some html output for class references. Fix compile error on mingw. MONILITY-645 Do not override alternate background color in Plastique Fix QComboBox ignoring foreground role in some styles Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined Fix compilation with Sun CC: Ensure that we return QPair<long,long> in all cases. Update PLATFORM(SPARC64) to CPU(SPARC64) jui files are no c++ ... scan some more file types by default Support EtchDisabledText with spin box on Windows style QNAM HTTP: Fix invoking a method when being destructed right now ...
| * Fix compilation with Sun CC: no semi-colon after Q_ENUM.Thiago Macieira2010-03-311-1/+1
| | | | | | | | | | | | | | Error was: "graphicsitems/qdeclarativepathview_p.h", line 80: Error: "}" expected instead of ";" Reviewed-by: Olivier Goffart
| * Remove the "Insert unicode control character" menu entry on X11.Pierre Rossi2010-03-314-8/+59
| | | | | | | | | | | | | | | | It's still displayed when it seems to make sense with respect to the active keyboard layouts. It can also be enabled from qtconfig. Task-number: QTBUG-9186 Reviewed-by: Denis
| * adds a timeout option to QThreadPool::waitForDone();Pierre Rossi2010-03-313-7/+15
| | | | | | | | | | Task-number: QTBUG-2695 Reviewed-by: Benjamin Poulain
| * Remove leading whitespace from Qt header macros.Thiago Macieira2010-03-313-23/+23
| | | | | | | | | | | | | | The tst_headers::macros test doesn't like it. It's easier to remove the spaces than to fix the test. Reviewed-by: Markus Goetz
| * Rename the xxxMsecsSinceEpoch functions to xxxMSecsSinceEpoch.Thiago Macieira2010-03-314-31/+31
| | | | | | | | | | | | Matches the addMSecs existing functions in QTime and QDateTime. Reviewed-by: Marius Storm-Olsen
| * Add QDateTime members that operate on 64-bit milliseconds.Thiago Macieira2010-03-313-15/+174
| | | | | | | | | | | | | | This complements QDateTime::currentMsecsSinceEpoch. Task-number: QTBUG-9017 Reviewed-by: Denis Dzyubenko
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-3149-720/+363
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits) Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct. qdoc: Added <div> elements to some html output for class references. Fix compile error on mingw. MONILITY-645 Do not override alternate background color in Plastique Fix QComboBox ignoring foreground role in some styles Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined Fix compilation with Sun CC: Ensure that we return QPair<long,long> in all cases. Update PLATFORM(SPARC64) to CPU(SPARC64) jui files are no c++ ... scan some more file types by default Support EtchDisabledText with spin box on Windows style QNAM HTTP: Fix invoking a method when being destructed right now Fixed a typo in the QDoubleValidotor doc. Trivial fix to JavaScriptCore to fix building with MSVC 2010 Autotest: oops, fix oops: remove qguard from auto.pro Autotests: oops, remove last traces of QGuard Remove QGuard. Unskip test that used to crash ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-3049-720/+363
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits) Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct. qdoc: Added <div> elements to some html output for class references. Fix compile error on mingw. MONILITY-645 Do not override alternate background color in Plastique Fix QComboBox ignoring foreground role in some styles Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined Fix compilation with Sun CC: Ensure that we return QPair<long,long> in all cases. Update PLATFORM(SPARC64) to CPU(SPARC64) jui files are no c++ ... scan some more file types by default Support EtchDisabledText with spin box on Windows style QNAM HTTP: Fix invoking a method when being destructed right now Fixed a typo in the QDoubleValidotor doc. Trivial fix to JavaScriptCore to fix building with MSVC 2010 Autotest: oops, fix oops: remove qguard from auto.pro Autotests: oops, remove last traces of QGuard Remove QGuard. Unskip test that used to crash ...
| | | * Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct.Thiago Macieira2010-03-301-3/+2
| | | | | | | | | | | | | | | | | | | | Apparently the SDKs cannot agree on the contents of this struct, so let's memset the entire thing.
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-3049-720/+364
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (24 commits) qdoc: Added <div> elements to some html output for class references. Fix compile error on mingw. MONILITY-645 Do not override alternate background color in Plastique Fix QComboBox ignoring foreground role in some styles Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined Fix compilation with Sun CC: Ensure that we return QPair<long,long> in all cases. Update PLATFORM(SPARC64) to CPU(SPARC64) jui files are no c++ ... scan some more file types by default Support EtchDisabledText with spin box on Windows style QNAM HTTP: Fix invoking a method when being destructed right now Fixed a typo in the QDoubleValidotor doc. Trivial fix to JavaScriptCore to fix building with MSVC 2010 Autotest: oops, fix oops: remove qguard from auto.pro Autotests: oops, remove last traces of QGuard Remove QGuard. Unskip test that used to crash QtScript: Add yet more missing API shims ...
| | | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-30949-2284/+5829
| | | | |\
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-3044-678/+278
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits) Fix compile error on mingw. MONILITY-645 Do not override alternate background color in Plastique Fix QComboBox ignoring foreground role in some styles Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined Fix compilation with Sun CC: Ensure that we return QPair<long,long> in all cases. Update PLATFORM(SPARC64) to CPU(SPARC64) jui files are no c++ ... scan some more file types by default Support EtchDisabledText with spin box on Windows style QNAM HTTP: Fix invoking a method when being destructed right now Fixed a typo in the QDoubleValidotor doc. Trivial fix to JavaScriptCore to fix building with MSVC 2010 Autotest: oops, fix oops: remove qguard from auto.pro Autotests: oops, remove last traces of QGuard Remove QGuard. Unskip test that used to crash QtScript: Add yet more missing API shims QtScript: Make sure the old identifier table is restored ...
| | | | | | * Fix compile error on mingw.Jason McDonald2010-03-301-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compile error seems to be going back and forth between mingw and wince compilers. Prefer correctness and portability over brevity by initializing each field of the struct one-by-one to guarantee portability between compilers. Reviewed-by: Lincoln Ramsay
| | | | | | * MONILITY-645Wolfgang Beck2010-03-305-18/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Merging bearer header.
| | | | | | * Do not override alternate background color in PlastiqueJens Bache-Wiig2010-03-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This palette tweak is no longer needed now that we set alternate row color on application startup. It also breaks on systems such as GNOME and KDE where you can configure this color. Reviewed-by: ogoffart Task-number: QTBUG-6516
| | | | | | * Fix QComboBox ignoring foreground role in some stylesJens Bache-Wiig2010-03-291-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically all styles using SH_Combobox_Popup would not previously respect the foreground role set. We need to set it for multiple color roles since styles sometimes interpret them differently. Reviewed-by: ogoffart Task-number: QTBUG-8796
| | | | | | * Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't definedThiago Macieira2010-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | | | * Fix compilation with Sun CC:Thiago Macieira2010-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "node.cpp", line 1337: Error: There is extra text on this line. Reviewed-by: Trust Me
| | | | | | * Ensure that we return QPair<long,long> in all cases.Thiago Macieira2010-03-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a compilation failure on AIX. Reviewed-By: Marius Storm-Olsen
| | | | | | * Update PLATFORM(SPARC64) to CPU(SPARC64)Thiago Macieira2010-03-291-1/+1
| | | | | | |
| | | | | | * jui files are no c++ ...Oswald Buddenhagen2010-03-291-0/+1
| | | | | | |
| | | | | | * scan some more file types by defaultOswald Buddenhagen2010-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - java & jui - js, qs & qml Task-number: QTBUG-9429
| | | | | | * Support EtchDisabledText with spin box on Windows styleJens Bache-Wiig2010-03-291-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ogoffart Task-number: QTBUG-7525
| | | | | | * QNAM HTTP: Fix invoking a method when being destructed right nowPeter Hartmann2010-03-291-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thiago Macieira
| | | | | | * Fixed a typo in the QDoubleValidotor doc.Denis Dzyubenko2010-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | * | | qdoc: Added <div> elements to some html output for class references.Martin Smith2010-03-305-42/+86
| | | | | |/ | | | | |/| | | | | | | | | | | | | Task: QTBUG-9504
| | | | * | Trivial fix to JavaScriptCore to fix building with MSVC 2010John Brooks2010-03-272-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Thiago Macieira
| | | | * | Autotest: oops, fix oops: remove qguard from auto.proThiago Macieira2010-03-271-1/+0
| | | | | |
| | | | * | Autotests: oops, remove last traces of QGuardThiago Macieira2010-03-273-421/+68
| | | | | |
| | | | * | Remove QGuard.Thiago Macieira2010-03-264-197/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This class is no longer in use by QtDeclarative. Task-number: QT-3031 Reviewed-by: Bradley T. Hughes
| | | | * | Unskip test that used to crashKent Hansen2010-03-261-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | After updating JavaScriptCore for 4.7 it no longer crashes.
| | | | * | QtScript: Add yet more missing API shimsKent Hansen2010-03-264-4/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - for QScriptEngine and QScriptContext; we don't control what the JSC functions are doing, so it's better to have shims than not to have them (which can cause something to blow up), even if they might not be strictly necessary as of this writing. - for QScriptDeclarativeClass; otherwise the identifiers might be created/destroyed in the wrong engine. - for QScriptValueIterator destructor; otherwise the identifiers might be destroyed in the wrong engine. This is an attempt to fix a crash in Bauhaus, but it might still be crashing (i.e. still some shims missing, somewhere) ;(
| | | | * | QtScript: Make sure the old identifier table is restoredKent Hansen2010-03-263-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Use a shim to take care of that.
| | | | * | Compile on Maemo 5Harald Fernengel2010-03-261-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmake for Maemo 5 needs to be bootstrapped with an older gcc, which doesn't like foreach() in templates. Use a traditional for loop to iterate over the container instead.
| | | | * | Fix compile error with QT_NO_TEXTHTMLPARSER in QtGuiTasuku Suzuki2010-03-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 528 Reviewed-by: Zeno Albisser
| | | | * | uic3: -extract: Write XPM-images correctly.Friedemann Kleint2010-03-2610-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add magic header '/* XPM */' and turn off wrapping of lines that broke image readers. Add a command line option to activate line-wrapping in case someone exclusively wants to use the extracted images for embedding in code. Also do line-wrapping in case images are embedded into the ui-file. Note: The current versions of MSVC do not seem to have a limitation of line lengths any more. Task-number: QTBUG-9207 Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
generated by cgit v0.12 at 2024-10-24 03:21:52 (GMT)