summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-0634-791/+1667
|\ | | | | | | kinetic-declarativeui
| * 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
| |\
| | * 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
| * | 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
| * 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-051-0/+2
| |/ | | | | | | | | | | | | | | | | 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
| * 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-041-0/+7
| | | | | | | | | | | | | | | | 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 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
* | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-062-55/+49
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-0617-82/+220
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Use <propname>Changed() signal as the notify signal for dynamic propertiesAaron Kennedy2009-05-061-2/+2
| | | |
| * | | Support simple nested property groupsAaron Kennedy2009-05-051-47/+47
| | | |
| * | | Remove misleading commentAaron Kennedy2009-05-051-6/+0
| | | |
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-05118-1193/+1738
|\ \ \ \ | |_|/ / |/| | | | | | | kinetic-declarativeui
| * | | Show text in tabs of a QTabBar while compileing with QT_NO_TABWIDGETOlivier Goffart2009-05-051-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Spotted by looking at the code Reviewed-by: bnilsen
| * | | Add padding around the text in the QTabBar.Olivier Goffart2009-05-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is only usefull when eliding text. We just make SE_TabBarTabText match to what's computed by QTabBar::tabSizeHint Reviewed-by: jbache
| * | | Accept the event when doing keyboard search on a itemview.Olivier Goffart2009-05-051-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required for KHTML Patch by David Faure (the test is not really related) Reviewed-by: Thierry Task-number: 252912
| * | | Fix behavior of QButtonGroup::addButton(QAbstractButton, int).Daniel Molkentin2009-05-052-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method did not adhere to the documented behavior nor according to its precedessor in Qt 3 times. Now, when being passed -1 as argument, it will automatically assign ids. They will all be negative, starting from -2. Reviewed-by: mae <qt-info@nokia.com>
| * | | Partially revert 37c72476fc444d3089075473cb4e9aa42ed64694Bjoern Erik Nilsen2009-05-051-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that mouse move events were not forwarded to the scene when mouse tracking was explicitly enabled on the view. Mouse tracking is disabled by default unless the scene contains an item that accepts hover events or has a cursor set. A mouse move event can only occur if: 1) a mouse button is pressed while moving the mouse 2) mouse tracking is enabled That means the part I've reverted was only hitting when mouse tracking was explicitly enabled, which is wrong. We always have to forward mouse move events to the scene if the view is getting them in the first place. Auto test included. Reviewed-by: Andreas
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtmae2009-05-0534-298/+483
| |\ \ \
| | * | | Fixed handling of XA_PIXMAP format type in QClipboard on X11.Denis Dzyubenko2009-05-052-19/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When requesting image/ppm type we didn't return the proper pixmap because type 'PIXMAP' is not a proper image format name, but a reserved atom, so the fix is to remove redundant check that was triggered before we entered the actual function that tries to convert the clipboard content. Task-number: 252501 Reviewed-by: Brad
| | * | | Use the new QTextCodec::codecForUtfText in qtextstream to detect theDenis Dzyubenko2009-05-041-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | utf encoding by BOM. Reviewed-by: Simon Hausmann
| | * | | When data was copied from Mozilla Firefox to Qt, the text format was not valid.Denis Dzyubenko2009-05-043-19/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mozilla encodes the text/html format in UTF16 and adds a BOM, however it doesn't specify the charset in the html header. The fix is to guess the encoding by either charset in the html header or BOM for text/html format, or by BOM for non html formats. This commit adds a new public function QTextCodec::codecForUtfText() which can be used to guess encoding out of the BOM. Task-number: 250555 Reviewed-by: Benjamin Poulain Reviewed-by: Simon Hausmann Reviewed-by: Andreas Aardal Hanssen
| | * | | Deprecate qt_mac_set_show_menubar for a public cross-platform API.Norwegian Rock Cat2009-05-049-54/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm tired of these "hidden" functions. We have an AA_MacPluginApplication, but sometimes you may have a legitimate reason for setting this outside of "plugin applications." In the footsteps of the menu icon attribute, the attribute is the main leader, but menubars can disable/enable this locally the new QMenuBar::setNativeMenuBar() property. Otherwise, the menubars take their que from the application attribute. This also works for Windows CE. So, there is a bit on convergence as well. Task-number: 236757
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtOlivier Goffart2009-05-042-7/+3
| | |\ \ \
| | | * | | prefer macro over stubMaurice Kalinowski2009-05-042-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Windows Mobile does the same, thus we will not have double definitions or such - COINIT_MULTITHREADED is the default, meaning that 0 usually expands to it. Just be on the safe side and be more precise. Task-number: 237029 Reviewed-by: joerg
| | * | | | Merge commit 'origin/4.5'Olivier Goffart2009-05-0418-192/+264
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/| Conflicts: src/gui/itemviews/qabstractitemview.cpp
generated by cgit v0.12 at 2025-02-23 02:46:56 (GMT)