summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Put the Dochwidget tabs on top as this was often requested.kh2009-05-061-0/+1
|
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Geir Vattekar2009-05-069-25/+61
|\
| * fixed a typo in QPrintDialog documentationPierre Rossi2009-05-061-1/+1
| |
| * Fixes broken last tab page handling in case the search was hidden.kh2009-05-064-15/+42
| |
| * 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-0625-1465/+1567
|\
| * 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-064-11/+27
| | | | | | | | | | | | | | | | 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-052-0/+4
| | | | | | | | | | | | | | | | | | 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
| * Syntax error on configure scriptJoão Abecasis2009-05-051-1/+1
| | | | | | | | | | | | | | | | Reported downstream to Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525570 Reviewed-by: Alexis Reviewed-by: Thiago
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Morten Sørvig2009-05-0519-35/+1015
| |\
| * | 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-056-25/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-052-1/+19
| | | | | | | | | | | | | | | | | | 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
|\
| * Revert "Fix tabbar issues with Oxygen style"Jens Bache-Wiig2009-05-051-41/+32
| | | | | | | | | | | | | | | | | | | | The patch has some issues with text eliding which are not really possible to solve properly without providing the elidemode to the styleoption. Under these circumstances it seems better just to fix the problem in Oxygen itself which has already been patched when compiled with 4.5. This reverts commit d7072b5577e3c07e984885cf05d5f9b217c6f473.
| * QListView in icon mode could crash when removing the last elementThierry Bastian2009-05-051-3/+4
| | | | | | | | | | Task-number: 252292 Reviewed-by: ogoffart
| * On Windows loosing focus should result in clearing focus if widget is ↵Denis Dzyubenko2009-05-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | embedded somewhere. If a widget is embedded to non-Qt window on Windows, then we should still clear the focus whenever we receive WM_KILLFOCUS since we won't get WM_ACTIVATEAPP in this case. This is an addition to 6ed196051d0f19bfe2d045eaf12f5f5ca30670d0 Task-number: 251259 Reviewed-by: Thierry
* | Fix memory leak in QFutureMorten Sørvig2009-05-052-0/+33
|/ | | | | | | | | The held results were not cleared by QFutureInterface::operator=(QFutureInterface) Add call to resultStore().clear(), similar to the destructor. This needs to be done in the header since we know the template type here. Task-number: 252208 Reviewed-by: brad
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Morten Sørvig2009-05-0523-179/+200
|\
| * Rename QDirectFBSurface to QDirectFBWindowSurfaceAnders Bakken2009-05-045-34/+34
| | | | | | | | | | | | | | This helps avoid confusion between IDirectFBSurface and QDirectFBSurface. Reviewed-by: Donald <qt-info@nokia.com>
| * Lock for read only when possibleAnders Bakken2009-05-049-25/+40
| | | | | | | | | | | | | | | | | | | | From benchmarking I've established that surface->Lock(DSLF_READ) is faster than surface->Lock(DSLF_WRITE) which is faster than surface->Lock(DSLF_READ|DSLF_WRITE). This patch will make us Lock for read only, when possible. Reviewed-by: Donald <qt-info@nokia.com>
| * QNetworkCookieJar: do not allow cookies for domains like ".com"Peter Hartmann2009-05-042-0/+18
| | | | | | | | | | | | | | | | the domain attribute in cookies must always contain one embedded dot, according to RFC 2109 section 4.3.2 Reviewed-by: Thiago Task-number: 251467
| * Added function that was removed on the way from Qt3 to Qt4Morten Engvoldsen2009-05-041-0/+1
| | | | | | | | | | | | | | QMimeSource::serialNumber was removed in Qt 4. This was not documented in Porting to Qt 4 Task-number:250575 Rev-By: Trenton Schulz
| * Added a check that X11 timestamp goes forward only.Denis Dzyubenko2009-05-041-15/+20
| | | | | | | | | | | | | | | | Got a case somehow with a timestamp of the mouse event that is less than the timestamp we already had, so we need to make sure time only goes forward. Reviewed-by: Brad
| * Added an assert so that QColormap usage without a QApplication asserts.Trond Kjernaasen2009-05-041-1/+5
| | | | | | | | | | Task-number: 252668 Reviewed-by: Samuel
| * Ensure that we send the Apple Events even when Cocoa isn't ready.Norwegian Rock Cat2009-05-042-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In general, Cocoa handles the the Apple Events for us. However, this is time between creating the NSApplication and Cocoa has set everything up, usually after the event loop is running. This means that until that time, the events are dropped on the floor :-/. The workaround is to use the same handler that we use for Carbon, but to only have it enabled for until Cocoa is ready to handle things. This will result in not stepping on the toes when used in a plugin (if it does, we can conditionalize it). Task-number: 252795 Reviewed-by: Richard Moe Gustavsen