summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix double entries in the sidebar of QFileDialogAlexis Menard2009-04-222-0/+30
| | | | | | | | | The problem is QUrl == operator is case sensitive. On Windows we don't want double entries for C:\dev or c:\dev so i convert the url in lower case and compare them (on Windows only) to avoid duplicate entries. Task-number:226483 Reviewed-by:jasplin
* Fix my previous commit since I missed the q out of qtestlibAndy Shaw2009-04-221-1/+1
| | | | | Task-number: 251848 Reviewed-by: TrustMe
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Andy Shaw2009-04-222-19/+113
|\
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Rohan McGovern2009-04-2137-11380/+437
| |\
| | * Fix some keyboard issuesAnders Bakken2009-04-211-18/+112
| | | | | | | | | | | | | | | | | | | | | | | | Without this patch Alt-modifiers doesn't work. The extra mappings are needed for certain keys to work right on atleast one known DirectFB implementation/hardware combination. Reviewed-by: Donald <qt-info@nokia.com>
| * | Fixes unit tests always giving 0 exit code when Qt is configured withRohan McGovern2009-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `-developer-build'. This was an undocumented hack to make it easier for our autotest scripts to detect crashes in unit tests. Going forward, it should not be required. Reviewed-by: Shane Bradley Acked-by: Jesper Thomschütz
* | | Fix the code snippet for executing a test, it should be CONFIG not QTAndy Shaw2009-04-221-1/+1
| |/ |/| | | | | | | Task-number: 251848 Reviewed-by: TrustMe
* | correct the HowTokh2009-04-211-3/+2
| | | | | | | | | | Task-number: none Reviewed-by: kh
* | Fix incorrect year and version number in assistant docs.kh2009-04-211-0/+0
| | | | | | | | | | | | | | | | | | Should have been part of 8aa8997f18afb85cb17f5b2a875a004302df4c72 Sorry the HOWTO file was not entirely clear that the *.qch needs to be updated too. Task-number: 251421 Reviewed-by: kh
* | Fix Q3FileDialog bug that make impossible to rename twice a fileAlexis Menard2009-04-211-4/+9
| | | | | | | | | | | | | | | | | | The line edit (to rename the file) contains a guard to avoid double emit when the editing is finished but this flag was not set back properly so it was making the line edit not usable afterwards. Task-number: 251779 Reviewed-by: bnilsen
* | BT: Revert "Fixes: Don't fill the pixmap because we will copy the cache ↵Andreas Aardal Hanssen2009-04-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into it." This reverts commit 0985805ab3c7de5b15c115a98afb15944b6d93b9. The Elastic Nodes example shows a black background for the cache pixmap if the call to fill isn't there. Alexis and I both agree that it makes no sense that we fill the pixmap with transparent pixels instead of just drawing with QPainter::CompositionMode_Source, but since this regression was introduced after 4.5.0 was released we must revert before we investigate further. Reviewed-by: Alexis
* | BT: Fix update regression for cached QGraphicsItem (Elastic Nodes stuck)Andreas Aardal Hanssen2009-04-212-1/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug in 4.5.0 where cached items that call update() after they have been moved or transformed failed to get a call to paint(), so the last cache image was used to draw. The easiest way to reproduce this bug is in the Elastic Nodes example. If you press, wait, then release, the nodes will consistently move to sunken state, then back to normal state. But if you click quickly while moving the mouse, the nodes will stay sunken. The bug was that the item was marked as dirty as a result of being moved, and when the mouse button was released, the node item's call to update() was discarded, as the item was "already dirty". The fix is to allow invalidation of the cache even if the item is marked as dirty. Reviewed-by: bnilsen
* | BT: Make things work on 10.3Norwegian Rock Cat2009-04-211-1/+1
| | | | | | | | | | | | The #ifdef was typed wrong. Reviewed-by: Prasanth Ullattil
* | We don't need to call two times itemChange when an item is deleted.Alexis Menard2009-04-212-6/+35
| | | | | | | | | | | | | | | | | | Previously we were calling two times itemChange on the parent to give QGraphicsItem::ItemChildAddedChange. We don't need that. One is enough. BT : yes Task-number: BT Reviewed-by: Andreas
* | Fix a problem where QPrintDialog/Unix didn't update print-to-file states.Trond Kjernåsen2009-04-211-1/+3
| | | | | | | | | | | | | | | | | | Setting a QPrinter to print to e.g. a PDF file and then passing the QPrinter object to a QPrintDialog didn't update the printer combobox and filename lineedit states correctly. Task-number: 224728 Reviewed-by: Samuel
* | Fixed a flicker when switching current source in Phonon::MediaObjectThierry Bastian2009-04-211-18/+9
| | | | | | | | Task-number: 251776
* | BT: Fix lock-up & crash in the Elastic Nodes exampleAndreas Aardal Hanssen2009-04-211-3/+8
| | | | | | | | | | | | | | | | Ensure that we don't divide by 0 when two nodes are exactly on top of each other. Reviewed-by: Alexis Reviewed-by: Joao
* | Doc - Changed the namespace in the qdocconf file to reflect Qt 4.5.1kh2009-04-216-19/+19
| | | | | | | | | | | | | | | | should have been part of c8285ec610b02f440f692be90aed1e6925a8675 Task-number: 251346 Reviewed-by: TrustMe BT: yes
* | QTableWidget header items not re-translated by QUiLoader.Friedemann Kleint2009-04-211-2/+2
| | | | | | | | | | | | Task: 251691 Translate correct header item (fix to new feature). Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Fix non-opaque text from widget palette being blitted, not blended.Samuel Rødal2009-04-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | QPainter inherits some properties from the widget, among other font and pen. These are set in the painter's state in initFrom(), but in 4.5 we forgot to call QPaintEngineEx::penChanged() to let an extended paint engine know that the pen has changed. This caused the raster engine to believe it could blit non-opaque text, due to the fast_text flag not being correctly updated. Task-number: 251534 Reviewed-by: Paul
* | Fix crash in OpenGL paint engine with hq antialiasing and TxProjectSamuel Rødal2009-04-211-2/+8
| | | | | | | | | | | | | | | | Use painter paths instead of rectangles for perspective transformed rects, as the rectangles might have been clipped. Task-number: 251485 Reviewed-by: Trond
* | Fixed a typo.Martin Pejcoch2009-04-211-1/+1
| | | | | | | | Reviewed-by: Kavindra
* | There is no way to delete a invalid entry in the sidebar of QFileDialog.Alexis Menard2009-04-213-4/+112
| | | | | | | | | | | | | | | | | | | | | | We can't remove an item in the sidebar if the bookmark is not valid (i.e. link to a non existing directory). ItemViews doesn't allow you to have disabled items and to select them at the same time, so i have implemented a delegate that paint in gray if the bookmark is invalid. So you can click on it and delete it. Task-number: 251341 Reviewed-by: jasplin
* | Fix a bug in QFileDialog sidebar when the bookmark has an hidden parentAlexis Menard2009-04-213-1/+40
| | | | | | | | | | | | | | | | | | | | | | If the bookmark in the sidebar has an hidden parent and the QFileDialog is set up to not show hidden files, then clicking on the bookmark move the current dir to root (like if the bookmark was invalid) instead of entering in the dir. The fix was to fetch the parent dir and the bookmark dir when the user select it in the sidebar. Task-number: 251321 Reviewed-by: jasplin
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-04-211-3/+15
|\ \
| * | Missing debug .rc file with a clean shadow buildLincoln Ramsay2009-04-211-3/+15
| |/ | | | | | | | | | | | | | | | | | | | | | | When generating Windows Makefiles, qmake writes out a .rc file for each of debug and release (unless you've limited to just one build type). When doing a clean shadow build, the first .rc file is written into a directory that does not exist but the code was not handling the error case. The fix does 2 things. 1) Attempt to create the destination directory if we can't write the file. 2) Die with an error if we still can't write the file after doing #1. Reviewed-by: Marius Storm-Olsen
* | BT: Remove turkish translation files created by previous change.Jason McDonald2009-04-2110-11291/+0
|/ | | | | | | | Remove the *_tr_TR.ts files added in change 5e3cae2754bf5f50aa10fef2c8d3bb7d33407b96 and remove their entries from .pro files to prevent them coming back next time someone does "make ts". Reviewed-by: Trust Me
* don't detach in qHash()Lars Knoll2009-04-201-2/+2
| | | | Signed-off-by: Thiago Macieira <thiago.macieira@nokia.com>
* Fix tabbar issues with Oxygen styleJens Bache-Wiig2009-04-201-32/+41
| | | | | | | | | | | | | | | | | Oxygen style was looking a bit broken when using 4.5 features such as close buttons and icons. This was because it re-implements the tabbartablabel primitive we needed to ensure spacing for the buttons. We had to modify the way we draw tabs slightly to make it more backward compatible so that oxygen get the same region as before and we ensure space for it in the CE_TabBarTab case instead. Note that the drawback to this approach is that the focus rect needs to be moved out of the tablabel and into the CE_TabBarTab case so it covers the entire tab which can potentially cause problems if people depend on the label to draw the focus rect. However the new case is also more consistent with how buttons draw their focus. Task-number: 251635 Reviewed-by: nrc
* Doc - Mentioned that ActiveQt is now part of the Open source versionsKavindra Devi Palaraja2009-04-201-3/+3
| | | | | | of Qt. Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
* Unable to build ActiveQt with Opensource edition.Prasanth Ullattil2009-04-207-51/+40
| | | | | | | Updated the project files and headers necessary for enabling this. Reviewed-by: Thiago Macieira Reviewed-by: Jens Bache-Wiig
* Fixed key sequence eating behavior for QShortcut and QAction.jasplin2009-04-206-31/+86
| | | | | | | | | | | | | | | | | | A disabled QShortcut should eat its key sequence even for complex sequences like "Ctrl-E 1". For example, a line edit with such a shortcut should not display 1 after typing "Ctrl-E" and then "1". The patch achieves this essentially by moving more of the decision making (of whether to eat the key secuence) from shortcutmap.cpp to qhortcut.cpp. Moreover, an invisible QAction should not eat any of its key sequences (primary nor alternates). In the example above, the line edit would display 1 when typing this sequence for an invisible action. The patch achieves this by temporarily unregistering all of the action's shortcuts while the action is invisible. Reviewed-by: mariusSO Task-number: 251246
* don't create double backslash in qdoc3 command on WindowsJoerg Bornemann2009-04-201-1/+1
| | | | Reviewed-by: janarve
* Fixed incorrect documentation.axis2009-04-201-3/+4
|
* mac: remove special handling of the editor frame now that stylesheets work ↵Oswald Buddenhagen2009-04-201-7/+0
| | | | properly
* do not add UI_DIR to INCLUDEPATH if no FORMS are usedOswald Buddenhagen2009-04-201-4/+6
| | | | Reviewed-by: mariusSO
* This fix a bug on the QFileSystemModel with a custom icon providerAlexis Menard2009-04-203-2/+53
| | | | | | | | | | | We were calling the provider with invalid path, with the default one it fallback to all standard icons but with a custom one we call a public method with an invalid QFileInfo. It was happening on windows only for the My Drives view because in that case the parent path is null, my Drives is a logical view. Task-number: 251295 Reviewed-by: jasplin
* Properly support the "prefer antialias" font styleGunnar Sletta2009-04-201-3/+9
| | | | | | | | | | Since the introduction of the texture glyph cache we rendered these fonts as 8-bit gray masks which looked bad and cut off a few pixels for thin glyphs. Changed the preferred format of the font engine to be Raster_RGBMask. Task-number: 248141 Reviewed-by: Eskil B
* Get rid of compiler warning.jasplin2009-04-201-1/+1
| | | | Reviewed-by: TrustMe
* BT: Update text of About Qt dialogJason McDonald2009-04-2016-125/+126
| | | | | | Add Copyright message as requested by Legal, and update .ts files again. Reviewed-by: Trust Me
* Ifdef out the QWS blend functions for less common bitdephts by defaultGunnar Sletta2009-04-201-45/+45
| | | | | | | | ARGB32_PM, RGB32, ARGB8565_PM and RGB16 are optimizied elsewhere and they are the most important formats. The implemenentation of several of these depths are also buggy, so one can question their relevance. Reviewed-by: Samuel
* Make the 32-bit ARGBPM on 16-bit RGB blend function fasterGunnar Sletta2009-04-201-101/+33
| | | | | | | The "optimized" version of this function was actually slower by quite a bit, so revert it to the old "trivial" code. Reviewed-by: Samuel
* Fix drawhelper pixel-writeback when dest has alpha.Gunnar Sletta2009-04-201-1/+1
| | | | | | | | The blending always happens in 32-bit premultiplied so the conversion back to dest-format needs to base itself on premlutiplied too. Task-number: 182246 Reviewed-by: Samuel
* Fix ARGB24PM->RGB16 for i386 GCCGunnar Sletta2009-04-201-20/+1
| | | | | | | | | | There was special code for gcc to run super-fast, but it was buggy and didn't blend properly. Kill this code for the benefit of the normal blend function. The performance on an Intel Quad Core 2 was not too different from the bytemul approach. Task-number: 246009 Reviewed-by: Trond
* Fix ARGB8565 onto RGB16 image blending on windowsGunnar Sletta2009-04-201-3/+3
| | | | | | | The rounding was just wrong... Task-number: 246009 Reviewed-by: Trond
* Fix docs for QPixmapCache::setCacheLimit()/cacheLimit()Gunnar Sletta2009-04-201-2/+4
|
* Some ifdefs for debugging clipping performanceGunnar Sletta2009-04-201-0/+36
|
* BT: Fix a crash when using Q(File)Dialog::open() in QCocoa.Norwegian Rock Cat2009-04-201-1/+4
| | | | | | | | If we don't have a sheet, we need to recreate it in Cocoa. Unfortunately, we neglected to reassign the NSWindow pointer in that case, so the program would crash. Reviewed-by: Richard Moe Gustavsen
* fix compilation of QtWebKit with Visual StudioJoerg Bornemann2009-04-201-1/+6
| | | | | | | | | | | | | | | Commits 6e5774d84e7e3b68736f95fae09a084bd5b9ac7a and 014af3e99616f9ee13ca365566828f7daf77a7f6 broke the Qt build for Visual Studio / IncrediBuild. The problem is as follows: QtWebKit has too many entries in INCLUDE_PATHS. In moc.prf is a rule that builds a mocinclude.tmp that contains command line options for moc. moc gets then called with @mocinclude.tmp. Above commits create an QMAKE_EXTRA_TARGET for the mocinclude.tmp, which is necessary for parallel MinGW builds. Alas, qmake -tp vc doesn't support QMAKE_EXTRA_TARGET. See task 189914. Once this task is solved, this commit must be reverted. Reviewed-by: joao
* Fixes over-verboseness in OCI tables function.Bill King2009-04-191-2/+2
| | | | | Differring case of username shouldn't mean adding the username on front. Also fixes autotest failures.