summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Add three new style-hints to QFont to match CSS' generic font familiesTor Arne Vestbø2010-07-086-1/+34
| | | | | | | | The defaults were chosen to match major web browsers. See: http://xhva.net/log/?p=160 Reviewed-by: Simon Hausmann
* The forward declaration should have been in the namespace for QImageDataBenjamin Poulain2010-07-081-2/+2
| | | | Reviewed-by: Olivier Goffart
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-0813-344/+522
|\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes the sqlite driver bug QTBUG-11904 (pointer aliasing) Add test and fix style for the SSE2 implementation of ARGB32 conversion Build fix, the header of QImageData did not declare QImageWriter. SSE2 implementation of convert_ARGB_to_ARGB_PM_inplace for QImage Moved primitive SSE2 painting utilities to qdrawingprimitive_sse2_p.h Move logic for building SIMD extensions to gui.pro Fix text drawing into alpha pixmap with opengl engine
| * Fixes the sqlite driver bug QTBUG-11904 (pointer aliasing)Charles Yin2010-07-081-22/+25
| | | | | | | | | | | | | | Applying upstream sqlite patch from: http://www.sqlite.org/src/info/d6ae275122 Task-number: QTBUG-11904 Reviewed-by: Michael Goddard
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-07-0718-350/+618
| |\
| | * Add test and fix style for the SSE2 implementation of ARGB32 conversionBenjamin Poulain2010-07-072-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | The commit beba018814b35c4bd032e6b9fa948e4bac34c59a introduce conversion from ARGB32 to ARGB32_PM with SSE2. This patch add a benchmark for this type of usage, and change the name to use lowercase for SSE2 (style convention).
| | * Build fix, the header of QImageData did not declare QImageWriter.Benjamin Poulain2010-07-071-0/+2
| | | | | | | | | | | | | | | Including this header in the SSE2 file broke the build because QImageWriter was not declared.
| | * SSE2 implementation of convert_ARGB_to_ARGB_PM_inplace for QImageJohn Brooks2010-07-078-14/+144
| | | | | | | | | | | | | | | Merge-request: 725 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | * Moved primitive SSE2 painting utilities to qdrawingprimitive_sse2_p.hJohn Brooks2010-07-073-157/+218
| | | | | | | | | | | | | | | Merge-request: 725 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | * Move logic for building SIMD extensions to gui.proJohn Brooks2010-07-072-145/+133
| | | | | | | | | | | | | | | | | | | | | | | | Enables SIMD files to be built outside of painting.pri by appending files to SSE_SOURCES etc. Merge-request: 725 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * | Fix text drawing into alpha pixmap with opengl engineEskil Abrahamsen Blomfeldt2010-07-072-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The merge 03dc74984749adf5b11482bf871a47086217845c mistakenly merged the glyphMargin() (which had been removed in 4.7 because QGLTextureGlyphCache now inherits from the image glyph cache) with the glyphPadding() which had been introduced in separate commits in both branches (probably backported.) This broke text drawing into a pixmap with an alpha with the GL engine, because we'd assume a margin of 1, but the alphaMapForGlyph() function doesn't support margins. Task-number: QTBUG-11987 Reviewed-by: Gunnar
* | | Use lower case for including system header filesGareth Stockwell2010-07-076-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All platform includes are now lower case, i.e. '#include <foobar.h>' rather than '#include <FooBar.h>'. Note that Qt includes are still camel case, e.g. '#include <QtGui/QWidget>' Task-number: QTBUG-6528 Reviewed-by: trustme
* | | Added trace statements to Phonon MMF backendGareth Stockwell2010-07-071-0/+17
| | | | | | | | | | | | Reviewed-by: trustme
* | | MMF Phonon backend: call winId() from VideoWidget constructorGareth Stockwell2010-07-072-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | This is to be consistent with the backends for other platforms, which also call QWidget::winId() on the VideoWidget (or one of its children) during construction. Reviewed-by: Thierry Bastian
* | | Fixed crash which occurs when switching between video clipsGareth Stockwell2010-07-072-13/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Phonon::MediaObject::setCurrentSource() is called when the MediaObject is connected to a Phonon::VideoWidget, the MMF::AbstractVideoOutput pointer is propagated inside the backend from the first MMF::AbstractVideoPlayer to the second. If the VideoWidget is subsquently re-sized, the code path enters the ScaleFactors branch of the MMF::SurfaceVideoPlayer::handleParametersChanged function. At this point, m_displayWindow is still set to the inital null value, and the assertion therefore fails. This change ensures that m_displayWindow is updated before attempting to apply the scale factor change. Task-number: QTBUG-11377 Reviewed-by: Thierry Bastian
* | | Close media clip before creating new player objectGareth Stockwell2010-07-075-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Failure to Close() an existing MMF player utility object before creating a new one - which happens in the MMF backend's implementation of Phonon::MediaObject::setCurrentSource() - causes intialization of the newly-created utility to fail later on. Task-number: QTBUG-11377 Reviewed-by: Thierry Bastian
* | | Enable bufferStatus signal during video clip loading on NGA platformsGareth Stockwell2010-07-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | CVideoPlayerUtility::RegisterForVideoLoadingNotification() was only called in the DSA, not the NGA, variant of the Phonon MMF backend. Task-number: QTBUG-11378 Reviewed-by: Thierry Bastian
* | | Prevent crash when video is played without a VideoWidgetGareth Stockwell2010-07-073-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | The Phonon API allows video to be played via a Phonon::MediaObject, even if no Phonon::VideoWidget has been connected to it. This patch prevents the Phonon MMF backend crashing in this scenario due to dereferencing a null pointer. Reviewed-by: Thierry Bastian
* | | Add partial update deployment rules to QtNetworkShane Kearns2010-07-071-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | Partial update allows you to build a qtnetwork.sis which can be installed on top of a matching qt.sis, but contains only the qtnetwork.dll file. This is faster to install, so it's useful when developing qtnetwork. Reviewed-by: Simon Hausmann
* | | Fix crash when handleCommand() called before softkeys are updatedJason Barron2010-07-072-1/+6
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Softkeys are updated via a compressable event that is posted via the event loop. Since these events are not delivered immediately, there is a chance that a call to handleCommand() could happen before the softkeys have been updated which can lead to a crash if the previous QAction's have been deleted already since the data structure used by QSoftKeyManager is outdated. The likeliness of this is increased by the fact that S60 commands are normally sent from the WSERV active object which has a higher priority than the active object used by Qt's event loop which means commands will preempt the event loop. The fix is to introduce a flag that keeps track of pending update requests and if a command is received while there are outstanding requests, force the softkeys to be updated before handling the command. Task-number: QT-3571 Reviewed-by: axis
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-068-34/+121
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix autotest Adapt the TapAndHold recognizer to non-touch too add setNativeArguments() and nativeArguments() fix bogus return value from qprocess::execute() qdoc: Simplified code to enable fixing of QTBUG-6340. Doc: fixing img style
| * Adapt the TapAndHold recognizer to non-touch tooThomas Zander2010-07-061-23/+40
| | | | | | | | | | | | | | | | The QTapAndHoldGestureRecognizer now can trigger also on mouse and GraphicsSceneMouse events and all of them will cause the gesture start event to be sent after the touch interval timed out. Reviewed-by: Denis
| * add setNativeArguments() and nativeArguments()Oswald Buddenhagen2010-07-067-7/+71
| | | | | | | | | | | | | | | | | | | | this function enables starting subprocesses which need command lines which cannot be constructed via the portable list-based api. such cases would be programs which need quoting rules which diverge from the msvc runtime. Reviewed-by: joerg Task-number: QTBUG-7620 (and various others which boil down to that)
| * fix bogus return value from qprocess::execute()Oswald Buddenhagen2010-07-061-4/+10
| | | | | | | | | | Task-number: QTBUG-230, QTBUG-5866 Reviewed-by: joerg
* | Support QSslSocket::systemCaCertificates() on SymbianSimon Hausmann2010-07-063-1/+199
|/ | | | | | | | | Implemented access to the unified certificate store on Symbian with Shane and Peter's help. Task-number: QTBUG-11399 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-052-3/+29
|\ | | | | | | | | | | | | 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-052-3/+29
| | | | | | | | | | | | | | | | | | 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-053-5/+50
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| * | 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
| * | 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
* | 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.
* | 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.
* 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
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-0335-368/+410
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0235-368/+410
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-024-5/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0223-206/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * 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
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-0341-177/+595
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0241-177/+595
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Fixed Qt symbian/linux-armcc mkspec when configured with -qtlibinfix.axis2010-07-021-0/+1
| | | | | | | | | | | | | | | | | | | | Task: QTBUG-11396 RevBy: Simon Hausmann
generated by cgit v0.12 at 2024-12-04 05:09:16 (GMT)