summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fixed qDebugs within tests being written as "error" tags in theRohan McGovern2009-05-079-16/+66
| | | | | | | | | | | | | xunitxml testlog. `error' in xunit causes many xunit processing tools to consider the test as failing. This is different semantics from native testlib XML, where a qDebug is considered a message and not a failure. Change it to put qDebugs under the "system-err" tag when using xunitxml to retain semantic compatibility with testlib XML. Autotest: tst_selftests
* Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-0659-864/+1850
|\ | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
| * Improved debug output for directfb:debugAnders Bakken2009-05-061-6/+10
| | | | | | | | | | | | Include info on the primary surface pixelformat. Reviewed-by: TrustMe
| * Pass the scale parameter as an int.Anders Bakken2009-05-061-1/+1
| | | | | | | | | | | | We're just printout out the integer value anyway. Reviewed-by: TrustMe
| * Make Scale publicAnders Bakken2009-05-061-1/+3
| | | | | | | | | | Needed for fallback warnings Reviewed-by: TrustMe
| * Fix crash in QWebView when application has a style sheetMarkus Goetz2009-05-061-1/+1
| | | | | | | | | | Task: 252796 Rev-By: Tor Arne
| * Crash in QWidget::render when passing an untransformed QPixmap painter.Bjoern Erik Nilsen2009-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash only occurred on Windows and X11 when running with -graphicssystem raster. The reason is that the actual paint device in QRasterPaintEngine::begin() is changed to pixmap->data->buffer(), which means QPaintEngine::paintDevice() returns something else than what it was told to paint on (see cb0c899b56b84154f69ddc545991bc6ded96ab01) The root of the problem, however, was that we used a weird condition (painter->worldMatrixEnabled(), added in 345072b9 for Qt 4.4) to find the target device. We did that because the shared painter was completely different in 4.4. We refactored it in 4.5.0, and we can only trust QPaintEngine::paintDevice to be the target device. Auto-test included. Task-number: 252837 Reviewed-by: Trond
| * QNetworkDiskCache: check if opening file succeedsBenjamin C Meyer2009-05-061-2/+6
| | | | | | | | | | | | | | | | In QNetworkDiskCache::prepare() When QTemporaryFile::open fails, delete the cache item and return 0 rather then returning a closed device. And a spelling mistake in a qWarning() Reviewed-by: Peter Hartmann
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Geir Vattekar2009-05-0611-27/+91
| |\
| | * QGraphicsItem::setOpacity(0.0) does not trigger an update.Bjoern Erik Nilsen2009-05-063-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that we discarded update requests for fully transparent items, which is correct, but we even did that when the update was issued from QGraphicsItem::setOpacity. We don't have to, and shouldn't, consider the opacity in that case. Whenever we reach the fullUpdateHelper call in setOpacity it means we have to do an update regardless of the current opacity (oldOpacity was not 0.0 if the currentOpacity is 0.0). Auto-test included. Task-number: 252913 Reviewed-by: Andreas
| | * Re-enabled antialiasing for large font sizes in OpenGL paint engine.Samuel Rødal2009-05-064-7/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 4.4 alphaMapForGlyph() would return valid images for any font size, but this was changed in 4.5, forcing us to use the path fallback instead. This lead to non-antialiased fonts when not using a multisample-enabled GL format. This patch re-introduces the alphaMapForGlyph() fallback in QFontEngine from 4.4 which uses the raster paint engine to draw the glyph. Task-number: 247083 Reviewed-by: Trond
| | * Prevented X server crash when calling XFillPolygon with >200000 points.Samuel Rødal2009-05-061-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | Don't know why the X server crashes, but it's reproducible both by us and customers so we should fall back to the raster paint engine to avoid the crash. Task-number: 244362 Reviewed-by: Trond
| | * Fixed bug in QTabBar::setTabButton() for a scrolled tab bar.jasplin2009-05-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | This fix ensures that the current tab is visible after calling setTabButton() on a scrolled tab bar. Reviewed-by: bnilsen Task-number: 252472
| | * Added comment to QTextStream - clarification of the documentationMorten Engvoldsen2009-05-061-1/+2
| | | | | | | | | | | | | | | | | | Explained why you cannot use QTextStream::atEnd with stdin. Task-number:251171
| | * Fixing task 252319Thomas Hartmann2009-05-061-3/+0
| | | | | | | | | | | | | | | | | | | | | This is still not a perfect solution since it breaks 245347 again Task-number: 252319 Reviewed-by: Maurice
| * | Doc: Updated docs for collision between QGraphicsItemsGeir Vattekar2009-05-061-8/+20
| |/ | | | | | | Task-number: 252287
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Geir Vattekar2009-05-065-10/+19
| |\
| | * fixed a typo in QPrintDialog documentationPierre Rossi2009-05-061-1/+1
| | |
| | * Optimize QCocoaView::registerDragTypes and mode switching in QtCreator.Morten Sørvig2009-05-063-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were registering the types each time drag and drop was enabled, which caused slowdowns when for example switching between the Edit and Debug modes in QtCreator. Instead, register the types on first enable and also when the custom types change. Add check to draggingEntered() that disables the drag if WA_DropSiteRegistered is false. Reviewed-by: nrc
| | * Moved the QT_BEGIN_NAMESPACE macro to the right place in qsslcipher.cppThiago Macieira2009-05-061-1/+1
| | | | | | | | | | | | | | | Task-number: 252298 Reviewed-by: Peter Hartmann
| * | Doc: Added links to Text Object Example in QTextDocument and QTextObjectGeir Vattekar2009-05-062-2/+2
| |/ | | | | | | Task-number: 244858
| * Doc: Said that QTextCursor is an implicitly shared class inGeir Vattekar2009-05-061-1/+4
| | | | | | | | | | | | QTextCursor::operator= Task-number: 247955
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Geir Vattekar2009-05-0622-1464/+1543
| |\
| | * QComboBox: Click-drag-release does not work for combo boxes using CocoaRichard Moe Gustavsen2009-05-061-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that the mouse event was redirected to the active pop-up, while it should have been redirected to the widget under the mouse under the active popup. This patch does the correct redirection Task-number: 252259 Reviewed-by: Trenton Schulz
| | * Mac OS X QWidget::setMinimumSize locks.Richard Moe Gustavsen2009-05-062-43/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was code for updating the size constrains inside setConstraints_sys. This is now added. Factored out the code that does this into a function, and since we never applied size constraines on a window upon creation, I also added an extra call from that code part Task-number: 219695 Reviewed-by: Trenton Schulz
| | * Fixed scrolling performance issue related to hidden blocksmae2009-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | Due to a wrong lookup (confusing line and block number) the scroll optimization was broken, causing the entire view to be updated. Reviewed-by: Thorbjørn Lindeijer
| | * Fixed some inconsistencies for image drawing on non-integer coords.Samuel Rødal2009-05-062-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | Don't use aliased coordinate delta for image drawing. Related to change fde7475bcf9c10522a8170e6eb8fb9a8fadc21cd. Task-number: 251561 Reviewed-by: Trond
| | * Fixes crash when mysql_init() returns 0Bill King2009-05-051-1/+1
| | | | | | | | | | | | Task-number: 250632
| | * Cleaned up codeAnders Bakken2009-05-051-24/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | Put all variables in the same area for QDirectFBPaintEnginePrivate. Make QDirectFBPaintEngine a friend. Also, do away with setClipDirty and replace it with d->clipDirty = true; Reviewed-by: TrustMe
| | * Cleaned up codeAnders Bakken2009-05-051-439/+443
| | | | | | | | | | | | | | | | | | | | | Move private functions to the bottom of the file to be more in line with how most qt cpp files are structured. Reviewed-by: TrustMe
| | * Refactored image cachingAnders Bakken2009-05-057-141/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make image caching a lot cleaner and more sensible. By default we do not cache images since creating a preallocated surface is quick and we don't really want to waste memory. In the case where the driver does not support preallocated surfaces you can enable image caching to speed up drawImage. Reviewed-by: TrustMe
| | * Make sure image caching works with Qt3SupportAnders Bakken2009-05-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Store whether qt was built with qt3support enabled in .qmake.cache. We need this info to decide if QT3_SUPPORT should be defined when we include qimage_p.h. Otherwise we get data corruption issues since the size of struct in Qt is larger than the one we include in libqdirectfb. Reviewed-by: Donald <qt-info@nokia.com>
| | * Cleaned up code a littleAnders Bakken2009-05-051-41/+28
| | | | | | | | | | | | | | | | | | Made SurfaceCache entirely inline for better readability. Reviewed-by: TrustMe
| | * Don't call prepare more than necessaryAnders Bakken2009-05-053-22/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store the memory address of our last QRasterBuffer::prepare() call to make sure we reprepare if someone has unlocked and locked the device behind our back. Also optimize QDirectFBDevice::memory() since it might get called a fair bit. Reviewed-by: Donald <qt-info@nokia.com>
| | * DirectFB can't handle "mirrored" scalesAnders Bakken2009-05-051-14/+23
| | | | | | | | | | | | | | | | | | | | | | | | Fall back to raster engine when using a transform with m11 < 0 || m22 < 0. Task-number: 252921 Reviewed-by: Donald <qt-info@nokia.com>
| | * Fix line encoding on PowerVR headersTom Cooksey2009-05-052-742/+742
| | | | | | | | | | | | Reviewed-by: Paul
| | * Fix infinite recursion with QT3_SUPPORTJoão Abecasis2009-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | Forward setDesktopBackground to setBackground as is mentioned in the docs. Reviewed-by: Paul
| | * Extend change 759338df758ad16cdfd9521b270f7e379bbfa57c to cover extramae2009-05-051-14/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selections with different foreground but no background The main concern is to avoid double painting. With anti-aliasing turned on by default, we can not draw a piece of text on top of the same piece of text without artefacts. Task-number: 252310
| | * QTextEdit::ExtraSelection failure with style sheetsmae2009-05-052-6/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the feature has to handle text with and without background, and extra selections with and without background, or even only with underline style. Trouble is that you sometimes want to accumulate styles, for example spell checking wiggly underline plus search result highlights or background markup from the css stylesheet. Task-number: 252310
| | * Improved debug outputAnders Bakken2009-05-051-30/+30
| | | | | | | | | | | | | | | | | | | | | Format the debug info on blitting, drawing and acceleration capabilities better. Reviewed-by: TrustMe
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Morten Sørvig2009-05-0514-35/+867
| | |\
| | * | Make command-quit not terminate the program on Qt/Cocoa.Morten Sørvig2009-05-051-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead instigate the quit by calling QApplication::quit(), using the code that was already in place. This allows QApplication::exec() to return normally and prevents resrouce leaks for objects created on the stack in main(). Reviewed-by: nrc
| * | | Doc: Updated QImageReader::supportedImageFormat() to include SVGGeir Vattekar2009-05-061-0/+1
| | |/ | |/| | | | | | | Task-number: 252415
| * | Add QMAKE_INCDIR_POWERVR to specify the location of pvr2d.h & wsegl.hTom Cooksey2009-05-054-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | Allow setting of a QMAKE_INCDIR_POWERVR in the mkspec to specify where the pvr2d.h & wsegl.h files are located. Set to src/3rdparty/powervr to use the headers distributed with Qt (for SGX-based SoCs). Reviewed-by: Trustme
| * | Add headers required for building PowerVR driverTom Cooksey2009-05-054-3/+751
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PowerVR driver on Qt for Embedded Linux needs to use Imagination Techologies' proprietary pvr2d & wsegl APIs. These are the headers for those APIs, allowing the powervr driver to be built. Ideally, these headers would be provided as part of the SDK supplied by chipset vendors. For now, we include these headers to let people get going with the driver. Licence headers were approved by legal for inclusion into Qt, after some negotiation with ImgTec (who have also approved their inclusion into Qt). The headers have also passed a scan by Talko, provided the licence headers aren't touched. Reviewed-by: Paul
| * | Ensured correct rounding of scaled image drawing at non-integer coords.Samuel Rødal2009-05-052-25/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Images coordinates should simply be rounded and are not to be subject to the aliased coordinate delta. The patch also adds a tiny delta in QSpanData::setupMatrix() to ensure coordinates for fetching from source images are rounded the opposite direction of the target rectangle. This removes a lot of artifacts when trying to do border-image based drawing on non-integer coordinates. A new qps test for border-image drawing is included. Task-number: 251561 Reviewed-by: Trond
| * | Fixed bug where 0-opacity would cause images to be drawn fully opaque.Samuel Rødal2009-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The bug appears in the raster paint engine and only in release mode as the cause of the bug is in the MMX and SSE blend functions which are disabled in debug. To prevent it simply we return early if we detect that we have an opacity of 0. Reviewed-by: Trond
| * | Fix regression in drawing parts of pixmaps on Panther.Norwegian Rock Cat2009-05-051-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The width of a pixmap is NOT the same as the bytes per row. We may have been able to do that in the past, but it doesn't work in the general case. I also took the liberty to introduce a QCFType to automatically handling the free in the general case. Task-number: 252176 Reviewed-by: sroedal
| * | Support rotated displays with 15 and 16 bit BGR pixel formats.Paul Olav Tvete2009-05-054-0/+51
| |/ | | | | | | | | | | | | | | To avoid increasing code size for an uncommon case, the code is #ifdef QT_QWS_ROTATE_BGR Task-number: 250299 Reviewed-by: Tom
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Morten Sørvig2009-05-053-45/+39
| |\
generated by cgit v0.12 at 2024-11-13 14:07:25 (GMT)