summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QNAM: Use QFileNetworkReply for qrc:/ URL schemaMisha Tyutyunik2010-09-222-3/+6
| | | | | | | Resources do not need network access and can be quicker loaded with QFileNetworkReply. Reviewed-by: Markus Goetz
* Make the de-inlined isRightToLeft not get called from updatePropertiesThiago Macieira2010-09-221-20/+23
| | | | | | | | | | | | | | | | | | Before Qt 4.7, QString::isRightToLeft was an inline function that called QString::updateProperties(). In Qt 4.7, QString::isRightToLeft was de-inlined and is now called from QString::updateProperties(). According to the Binary Compatibility Guidelines, it's ok to de-inline a function provided that it's ok the old method is called. Under some rare circumstances nowadays, the old method could be called from updateProperties(), which would result in an infinite loop (updateProperties -> isRightToLeft -> updateProperties -> ...) This is usually prevented by -fvisibility-inlines-hidden in GCC (automatic in Qt) and also by -Wl,-Bsymbolic-functions (not automatic, must pass -reduced-relocations to configure). Reviewed-by: Bradley T. Hughes
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-2220-111/+103
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: apply msvc flags to wince too fix qt static build on wince fix build with QT_NO_GESTURES qmake: fix quoting of moc calls Use regparm(3) for ICC too, otherwise it's an ABI mismatch in QChar Regenerate the Unicode tables after updates to the generator tool Compile in C++0x mode remove extra includes minor clean-ups minor improvements for data parsers tiny clean-up for generated data move QUnicodeTables:: script() and lineBreakClass() implementations make lupdate test less fragile Enable building Qt/Webkit with debug symbols Add breakpad support
| * apply msvc flags to wince tooRomain Pokrzywka2010-09-212-2/+2
| | | | | | | | Reviewed-by: mariusso
| * fix qt static build on winceRomain Pokrzywka2010-09-212-14/+15
| | | | | | | | Reviewed-by: mariusso
| * fix build with QT_NO_GESTURESRomain Pokrzywka2010-09-211-1/+1
| |
| * Use regparm(3) for ICC too, otherwise it's an ABI mismatch in QCharThiago Macieira2010-09-211-1/+1
| | | | | | | | Reviewed-By: Bradley T. Hughes
| * Regenerate the Unicode tables after updates to the generator toolThiago Macieira2010-09-212-65/+82
| |
| * remove extra includesRitt Konstantin2010-09-2111-10/+1
| |
| * move QUnicodeTables:: script() and lineBreakClass() implementationsRitt Konstantin2010-09-211-17/+0
| | | | | | | | from qchar.cpp to qunicodetables.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-201-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Enable building Qt/Webkit with debug symbols Add breakpad support
| | * Enable building Qt/Webkit with debug symbolsAnders Bakken2010-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | With this patch one can configure with -webkit-debug to build Webkit with debug symbols without having to manually edit WebCore.pro. Merge-request: 816 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-2210-85/+50
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (105 commits) Fixed drawing a large number of glyphs with the same font under GL. Bump version to 4.7.1. Qt headers must be included before X11 headers Fixes bezier curves not being drawn when it is a line. Avoid creating copy of an image in memory when storing as jpeg QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbian Add exception barrier to QCertificateRetriever::RunL() Reference correct declarative elements page. QtWebKit: Update tag files to match the same content on qtwebkit.git QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit. QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit. Doc: updating the qdocconf files and the stylesheet Doc: updating details on Tier 2 platforms Doc: adding remark on release of qt quick element support in creator Update configure.exe Revert "let WebKit inject itself into the qt configuration" Revert "fix qt_webkit_version.pri install for in-Qt builds" Revert "Fixed incorrect Symbian scoping." QS60Style: Itemviews are drawn incorrectly Change to commercial license headers in preparation for release. ...
| * | | Fixed drawing a large number of glyphs with the same font under GL.Trond Kjernåsen2010-09-214-9/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our glyph caching system doesn't take GL texture size limitation into account, and assumes you can create an infinitely large texture. On top of that, the cache will never create a cache that is wider than 256, or QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH, which means we'll hit the texture size limit even faster. With this patch the entire texture is utilized. However, to fix in properly we need to support having multiple texture for each font engine. That will be fixed shortly (see task QTBUG-13784). Task-number: QT-3971 Reviewed-by: Eskil
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Jason McDonald2010-09-213-72/+16
| |\ \ \
| | * | | Qt headers must be included before X11 headersBenjamin Poulain2010-09-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | X11 symbols are conflicting with some of the Qt ones. Qt headers needs to be included before the X11 ones in order to compile on Maemo. Reviewed-by: Samuel Rødal
| | * | | Fixes bezier curves not being drawn when it is a line.Yoann Lopes2010-09-211-41/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some old work-around code is no longer needed... Task-number: QTBUG-13721 Reviewed-by: Samuel
| | * | | Avoid creating copy of an image in memory when storing as jpegaavit2010-09-211-28/+13
| | |/ / | | | | | | | | | | | | | | | | Task-number: QT-3871 Reviewed-by: Kim
| * | | Bump version to 4.7.1.Jason McDonald2010-09-213-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-09-221-2/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Improved output of patch_capabilities.pl script Button remains pressed if release event happens outside of widget
| * | | Button remains pressed if release event happens outside of widgetSami Merila2010-09-211-2/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style tracks the pressed down state for itemviews and some other widgets that required highlight pressed down graphics. However, the implementation was faulty as it required that a mouse release event occurs in another widget, instead of anywhere. This partially fixes QTBUG-13759. Task-number: QTBUG-13759 Reviewed-by: Jani Hautakangas
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-211-3/+5
|\ \ \ | |/ / |/| |
| * | Implement QAudioInput::suspend() using CMMFDevSound::Stop()Gareth Stockwell2010-09-174-42/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As with playback mode, lack of support for CMMFDevSound::Pause() in DevSound's recording mode causes problems on some devices. Specifically, while QAudioInput works fine on the Nokia 5800, this bug was observed on the Nokia N8. This fix means that suspending and resuming audio input will work correctly on all devices. Task-number: QTBUG-13506 Reviewed-by: Derick Hawcroft
| * | Discard buffer pointer when DevSound is stoppedGareth Stockwell2010-09-171-0/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-13504 Reviewed-by: Derick Hawcroft
| * | Suppress overflow errors raised by Symbian DevSound during playbackGareth Stockwell2010-09-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QAudioOutput::suspend() and QAudioOutput::resume() are called repeatedly, with a short delay between each call, DevSound occasionally raises a KErrOverflow error. The backend previously translated this into QAudio::IOError, causing the object to transition into the QAudio::Stopped state. This error can be safely ignored, with playback resuming as soon as more audio data is provided to DevSound. This patch therefore suppresses the error. Task-number: QTBUG-13059 Reviewed-by: Derick Hawcroft
| * | Discard empty buffer on call to QAudioOutput::resume()Gareth Stockwell2010-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Symbian backend holds buffers which are passed to it from DevSound, exposing the memory of these buffers via the QIODevice interface. When QAudioOutput::resume() is called, the backend re-starts data flow by passing the buffer it holds back to DevSound. Previously, this would not happen if the buffer was empty, potentially causing playback to stall. This patch ensures that the buffer is always sent back to DevSound, and data flow therefore always resumes. Task-number: QTBUG-13059 Reviewed-by: Derick Hawcroft
| * | Permit QAudioOutput::processedUSecs() to be called immediately after start()Gareth Stockwell2010-09-171-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QAudioOutput::processedUSecs() is called very soon after QAudioOutput::start(), the DevSound instance owned by the Symbian backend may still be initializing. This patch causes the function to return zero, rather than failing an assertion. Task-number: QTBUG-13059 Reviewed-by: Derick Hawcroft
| * | Discard all DevSound buffers held when QAudioInput::suspend() calledGareth Stockwell2010-09-171-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Resuming recording causes buffers previously provided to the client (via MDevSoundObserver::BufferToBeEmptied()) to be invalidated. The buffers therefore must be discarded when recording is suspended. Task-number: QTBUG-13058 Reviewed-by: Derick Hawcroft
| * | Fixed buffer overrun in Symbian QAudioInput backendGareth Stockwell2010-09-171-4/+6
| | | | | | | | | | | | | | | Task-number: QTBUG-13058 Reviewed-by: Derick Hawcroft
| * | Prevent crash in QGLGlyphCache due to dangling context references.Samuel Rødal2010-09-141-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | We need to clear the context from the cache when it's destroyed even if it doesn't belong to a widget. Task-number: QTBUG-13622 Reviewed-by: Trond
| * | Fixed crash in input methods when using symbols menu and numbers onlyaxis2010-09-101-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When inputting only numbers, the symbol menu should not do anything. However in the old code the resource id of the symbol table was still being set, so the symbol key on N97 would look up a table that was not valid for the current input mode and crash. Fixed by setting the symbol table id to zero under those conditions. RevBy: Sami Merila Task: QTBUG-13472 AutoTest: Included (cherry picked from commit 5cef786a651c675d3428060a19bfd9d9ecee6083)
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-205-13/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compile warning on Windows. Fixed painter path drawing on FBO without stencil buffer. Fixed color of cosmetic pens when printing under Windows. Fixed infinite loop when loading jpeg without EOI from memory.
| * | | Fixed compile warning on Windows.Kim Motoyoshi Kalland2010-09-201-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: bnilsen
| * | | Fixed painter path drawing on FBO without stencil buffer.Kim Motoyoshi Kalland2010-09-202-0/+30
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13450 Reviewed-by: Samuel
| * | | Fixed color of cosmetic pens when printing under Windows.Trond Kjernåsen2010-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When the PS_COSMETIC style is used, the pen width has to be 1. Task-number: QTBUG-13065 Reviewed-by: Samuel
| * | | Fixed infinite loop when loading jpeg without EOI from memory.Kim Motoyoshi Kalland2010-09-201-11/+8
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13653 Reviewed-by: aavit
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-201-4/+4
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed memory leak in Symbian when Options menu was launched.
| * | | Fixed memory leak in Symbian when Options menu was launched.Janne Anttila2010-09-201-4/+4
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13437 Reviewed-by: Janne Koskinen
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-201-2/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qmake: Make smart library merge architecture-aware Slovenian translation: some updates and fixes Added galician translation Fix one hang of QNAM on Symbian.
| * | | Fix one hang of QNAM on Symbian.Jocelyn Turcotte2010-09-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This one happened especially more often on amazon.de. While one channel was taken by one request, but postponed because it was still in disconnecting mode, another request would come, pick the same channel, and overwrite the request/reply assignment of this channel. The first request would be left unhandled eternally. Reviewed-by: Markus Goetz
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-209-24/+53
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes QPen dash offset for OpenGL paint engines (1.x & 2.x). Support multisampled pbuffers under Windows. tst_qpixmapfilter: Fix compilation in namespace qtextcodec_symbian: Add few aliases Give a warning in QPixmap::handle() if pixmap is not X11 class. Make QStaticText honor QPainter::pen() for rich text on X11 w/raster Fixed compilation of MeeGo graphics system without eglext.h Fixed memory corruption issue in qt_blurImage for Indexed8 images.
| * | | Fixes QPen dash offset for OpenGL paint engines (1.x & 2.x).Yoann Lopes2010-09-202-0/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13409 Reviewed-by: Trond
| * | | Support multisampled pbuffers under Windows.Trond Kjernåsen2010-09-202-14/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multisampled pbuffers don't work in conjunction with the render_texture extension. Now we turn off the render_texture extension if a multi- sampled format is requested. Task-number: QTBUG-13503 Reviewed-by: Samuel
| * | | qtextcodec_symbian: Add few aliasesOlivier Goffart2010-09-201-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: Denis
| * | | Give a warning in QPixmap::handle() if pixmap is not X11 class.Samuel Rødal2010-09-201-2/+6
| | | | | | | | | | | | | | | | Reviewed-by: Markus Goetz
| * | | Make QStaticText honor QPainter::pen() for rich text on X11 w/rasterEskil Abrahamsen Blomfeldt2010-09-201-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The document layou will call setPen() with the PaintContext's text color. If this is different from the current painter settings, the pen will be passed on to the paint engine. The result was that, on X11 using the raster (or opengl) engine, QStaticText would record the pen as changed even when it hadn't explicitly been changed by the document. Task-number: QTBUG-13740 Reviewed-by: Samuel
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-172-5/+11
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compilation of MeeGo graphics system without eglext.h Fixed memory corruption issue in qt_blurImage for Indexed8 images.
| | * | Fixed compilation of MeeGo graphics system without eglext.hSamuel Rødal2010-09-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | We don't rely on this header, so there's no need to include it. Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | * | Fixed memory corruption issue in qt_blurImage for Indexed8 images.Samuel Rødal2010-09-171-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If transposed was set to 0 we did not check the color depth of the image and ended up with a buffer overflow. Reviewed-by: Jens Bache-Wiig
* | | | Update QtDeclarative def filesJoona Petrell2010-09-202-3/+9
| | | |