summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Michaels first commitMichael D Scull2010-07-0726-0/+840
|
* dummy commit to check permissionsRoland Wolf2010-07-071-0/+0
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-063-71/+15
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Spectrum demo: fixed installation Spectrum build: fixed DLL rpath
| * Spectrum demo: fixed installationGareth Stockwell2010-07-062-10/+11
| | | | | | | | | | | | | | | | | | All binaries must be written into $$QT_BUILD_DIR/demos/spectrum in order for them to be correctly installed. Task-number: QTBUG-11572 Task-number: QTBUG-11756 Reviewed-by: Andy Shaw
| * Spectrum build: fixed DLL rpathGareth Stockwell2010-07-062-60/+3
|/ | | | | | | | | | Rather than explicitly modifying LD_LIBRARY_PATH using a shell script when the application is launched, the relative path from the application binary to the FFT library is encoded in the application using an --rpath flag. Task-number: QTBUG-11756 Reviewed-by: Andy Shaw
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-054-4/+41
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Support time zone designator in QDateTime::fromString() based on ISO 8601-2004 standard.
| * Support time zone designator in QDateTime::fromString() based on ISO ↵Liang Qi2010-07-054-4/+41
| | | | | | | | | | | | | | | | | | 8601-2004 standard. Task-number: QTBUG-11623 Reviewed-by: Denis Dzyubenko Reviewed-by: David Boddie
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-0511-36/+161
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Set the registration time while using the collection generator to register. Network: Optimize HTTP proxy lookup on Windows qdoc: Added explanation of autmatically generated signal hanlers. QSslSocket::systemCaCertificates(): fix for WinCE Doc: fixing search script and style qdoc: Fixed type linking for QML properties (most of them).
| * | Set the registration time while using the collection generator to register.kh12010-07-051-0/+2
| | | | | | | | | | | | | | | Task-number: QTBUG-11911 Reviewed-by: ck
| * | Network: Optimize HTTP proxy lookup on WindowsMarkus Goetz2010-07-051-5/+32
| | | | | | | | | | | | | | | | | | | | | Only try auto config retrieval once. Patch by Kai Koehne. Task-number: QTBUG-10106
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-055-15/+61
| |\ \
| | * | QSslSocket::systemCaCertificates(): fix for WinCEPeter Hartmann2010-07-052-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on WinCE the function is called "CertOpenStore", and not "CertOpenSystemStoreW". Patch-by: Ismail Donmez Task-number: QTBUG-11905
| | * | Doc: fixing search script and styleMorten Engvoldsen2010-07-053-15/+43
| | | |
| * | | qdoc: Added explanation of autmatically generated signal hanlers.Martin Smith2010-07-051-12/+58
| |/ / | | | | | | | | | Task-number: QTBUG-11575
| * | qdoc: Fixed type linking for QML properties (most of them).Martin Smith2010-07-053-4/+8
| | | | | | | | | | | | Task-number: QTBUG-6340
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-051-13/+39
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "Character spacing when drawing a QPicture to a high DPI device."
| * | Revert "Character spacing when drawing a QPicture to a high DPI device."Trond Kjernåsen2010-07-051-13/+39
| | | | | | | | | | | | | | | | | | This reverts commit d0fb8557f3fc3e7c9305662d118228ceca9df72b. This change breaks justified text drawing in QPrintPreview, so it's reverted for now.
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-053-7/+16
|\ \ \ | |/ / |/| / | |/ | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Warn when drawPixmapFragments is called with an invalid source rect Fix build failure with cs2009q3 toolchain.
| * Warn when drawPixmapFragments is called with an invalid source rectAndy Shaw2010-07-051-0/+9
| | | | | | | | | | | | | | | | | | | | When drawPixmapFragments() is called with fragments that has invalid source rects in it, then usually it causes the pixmap drawn on screen to appear corrupted. However it has been reported that a crash can occur (not reproducable locally) so by adding a warning in debug mode only means that this can hopefully be caught at development time. Reviewed-by: Trond
| * Fix build failure with cs2009q3 toolchain.Aaron McCarthy2010-07-052-7/+7
| | | | | | | | Use Qt typedef for unsigned 32-bit integers.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-0448-486/+591
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: make image handler includes private fix symbian build doc improvements rebuild configure s/INCPATH/INCLUDEPATH/ Fix Windows build Consolidate zlib configuration redundancy Fixed whitespace formatting Fix incomplete support for built-in jpeg, mng, tiff and gif handlers Split image handler plugin project files No explicit link to zlib/jpeg for system mng/tiff Removed stray line continuations Long live else! qdoc: Added a solution for creating tables of contents for manuals. Doc: Fixed markup. Fixed size hint for combo box on windows
| * make image handler includes privateOswald Buddenhagen2010-07-0418-32/+32
| | | | | | | | | | now that they live in gui/image/ instead of plugins/imageformats/, the handlers need to get the usual _p suffix.
| * fix symbian buildOswald Buddenhagen2010-07-031-2/+2
| | | | | | | | | | as absolutely braindead as it is, symbian is a unix as far as qmake is concerned.
| * doc improvementsOswald Buddenhagen2010-07-031-5/+4
| |
| * rebuild configureOswald Buddenhagen2010-07-031-0/+0
| |
| * s/INCPATH/INCLUDEPATH/Oswald Buddenhagen2010-07-031-1/+2
| |
| * Fix Windows buildMark Brand2010-07-031-4/+4
| | | | | | | | | | | | | | | | Set the QT_NO_IMAGEFORMAT_* defines like the unix configure does. This avoids that we try to link the image handlers into QtGui when they are built as plugins. Reviewed-by: ossi
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-0341-456/+561
| |\ |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Consolidate zlib configuration redundancy Fixed whitespace formatting Fix incomplete support for built-in jpeg, mng, tiff and gif handlers Split image handler plugin project files No explicit link to zlib/jpeg for system mng/tiff Removed stray line continuations Long live else! qdoc: Added a solution for creating tables of contents for manuals. Doc: Fixed markup. Fixed size hint for combo box on windows
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-0241-456/+561
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Consolidate zlib configuration redundancy Fixed whitespace formatting Fix incomplete support for built-in jpeg, mng, tiff and gif handlers Split image handler plugin project files No explicit link to zlib/jpeg for system mng/tiff Removed stray line continuations Long live else! qdoc: Added a solution for creating tables of contents for manuals. Doc: Fixed markup. Fixed size hint for combo box on windows
| | * Consolidate zlib configuration redundancyMark Brand2010-07-026-64/+21
| | | | | | | | | | | | | | | Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Fixed whitespace formattingMark Brand2010-07-021-55/+57
| | | | | | | | | | | | | | | Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Fix incomplete support for built-in jpeg, mng, tiff and gif handlersMark Brand2010-07-026-55/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, although the configure shell script could configure built-in support for these image formats, the .pr[io] files would nevertheless build them as plugins. Support was also missing from qimagereader and qimagewriter. This has now been added. Configure.exe, while clearly intended to support this too, needed a few minor fixes. For example, the usage of values "qt" and "yes" was inconsistent. For both configure tools, the explanation of the *non*-related options has been clarified, i.e: -no-libjpeg -qt-libjpeg -system-libjpeg These options have nothing to do with the plugin/built-in distinction. There are (still) no configure options for specifying "plugin" or "built-in" for these image formats. Quite reasonably, "plugin" is selected for shared Qt and "built-in" is selected for static Qt. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Split image handler plugin project filesMark Brand2010-07-0225-208/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One pri for each handler, e.g. src/gui/image/qjpeghandler.pri. One pri for each 3rd party package, e.g src/3rdparty/libjpeg.pri. One shared pri for zlib dependency of 3rd party packages. This was really about image handler plugins, but PNG got the same treatment for consistency's sake. Also, moved image handler source files from plugins to src/gui/image so they are with the other image handlers. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * No explicit link to zlib/jpeg for system mng/tiffMark Brand2010-07-022-19/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For "system" mng or tiff, the shared library mechanism takes care of loading zlib. For exotic cases like static system mng/tiff/zlib, one should use configure's -l option. Trying to cover such cases in project files leads to clutter which is at best harmless for other cases. Png already had this arrangement. The same principle applies to jpeg which is a potential dependency of tiff and mng. However, bundled tiff and mng are built without jpeg. Shared system jpeg is loaded automatically if needed. Static system jpeg can be handled with configure's -l option. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Removed stray line continuationsMark Brand2010-07-021-4/+2
| | | | | | | | | | | | | | | Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Long live else!Mark Brand2010-07-021-4/+4
| | | | | | | | | | | | | | | Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-02459-10752/+10430
| | |\ | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-html-templates.qdocconf
| | | * Fixed size hint for combo box on windowsJens Bache-Wiig2010-06-112-25/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you use larger fonts or DPI on windows, the combobox can calculate a size hint that results of text eliding on items. This fix removes some duplicate code in Vista style and adds a dpi dependant size hint for XP style. Task-number: QTBUG-7552 Reviewed-by: richard
| | * | qdoc: Added a solution for creating tables of contents for manuals.David Boddie2010-07-023-34/+112
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Doc: Fixed markup.David Boddie2010-06-302-4/+4
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-0352-197/+644
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Hide some more files from git-status. Fixed Qt symbian/linux-armcc mkspec when configured with -qtlibinfix. Fixed symbian/linux-armcc mkspec when configured with -qtlibinfix. Fixed deployment locations for various profiles. Added a top-level runonphone target for Qt and QtWebKit. QS60Style: Simplify QMenu drawing QS60Style: Remove gap from QProgressDialog ColorDialog is incorrectly positioned Support for "deploy" make target in Symbian qtguiu.def merge conflict fix Fix for include "private/qt_s60_p.h" in non-symbian builds Making orbit input methods work with Qt apps with -no-s60 Using the remaining valid data to construct the QTime object when msec parsing failed. QProgressDialog text is too close to dialog border fix for broken input method loading Avkon Removal DEF file updates Stub version of QS60Style Avkon removal configured with -no-s60 QFileDialog broken in landscape in N8
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-0252-197/+644
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Hide some more files from git-status. Fixed Qt symbian/linux-armcc mkspec when configured with -qtlibinfix. Fixed symbian/linux-armcc mkspec when configured with -qtlibinfix. Fixed deployment locations for various profiles. Added a top-level runonphone target for Qt and QtWebKit. QS60Style: Simplify QMenu drawing QS60Style: Remove gap from QProgressDialog ColorDialog is incorrectly positioned Support for "deploy" make target in Symbian qtguiu.def merge conflict fix Fix for include "private/qt_s60_p.h" in non-symbian builds Making orbit input methods work with Qt apps with -no-s60 Using the remaining valid data to construct the QTime object when msec parsing failed. QProgressDialog text is too close to dialog border fix for broken input method loading Avkon Removal DEF file updates Stub version of QS60Style Avkon removal configured with -no-s60 QFileDialog broken in landscape in N8
| | * | | | Hide some more files from git-status.axis2010-07-022-0/+4
| | | | | |
| | * | | | Fixed Qt symbian/linux-armcc mkspec when configured with -qtlibinfix.axis2010-07-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-11396 RevBy: Simon Hausmann
| | * | | | Fixed symbian/linux-armcc mkspec when configured with -qtlibinfix.axis2010-07-025-11/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-11396 RevBy: Miikka Heikkinen
| | * | | | Fixed deployment locations for various profiles.axis2010-07-025-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | * | | | Added a top-level runonphone target for Qt and QtWebKit.axis2010-07-021-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | * | | | QS60Style: Simplify QMenu drawingSami Merila2010-07-021-35/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This cleans up implementation of menu item drawing and "fixes" it, by moving the rect calculations to occur in subElementRect() method, instead of in the drawing code itself. Reviewed-by: Alessandro Portale
| | * | | | QS60Style: Remove gap from QProgressDialogSami Merila2010-07-021-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When showing a progressDialog with QS60Style, there is a strange empty area after the QProgressbar. This is reserved for label even if it is not showing one. Reviewed-by: Alessandro Portale
| | * | | | ColorDialog is incorrectly positionedSami Merila2010-07-021-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to somewhat special nature of colorDialog, it makes no sense to make it fullscreen, as it is not totally stretchable in height. Making it fullscreen only makes it appear higher on the screen and there is an ugly gap between the dialog and softkeys. Therefore, as a fix, colorDialog is shown in its "natural" window state. Task-number: QTBUG-11668 Reviewed-by: Miikka Heikkinen
generated by cgit v0.12 at 2024-11-16 04:12:13 (GMT)