summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed typos 'indended' -> 'intended'Thorbjørn Lindeijer2009-04-212-6/+6
|
* Fixes: Incorrect textIndent() values in ODFThomas Zander2009-04-211-1/+1
| | | | | | RevBy: Simon Hausmann Task: 247952 Details: Use pixelToPoint on the text-indent values.
* Fixes: Qt expects hardcoded wacom device identifiers from xorg.confThomas Zander2009-04-212-11/+11
| | | | | | Task: 210132 RevBy: Bradley T. Hughes Details:Make wacom detection use atoms instead of string compares
* Merge branch '4.5'Thiago Macieira2009-04-2046-438/+499
|\ | | | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| * 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
* | Speed up texture uploads for hardware without n-pot-2 texture support.Trond Kjernåsen2009-04-201-53/+106
| | | | | | | | | | | | | | | | | | Implement a manual fast scale, so that we can do a scale, swizzle and mirror in the same loop without any temporary image copies. This potentially increases texture uploads on embedded hw with a factor of 10. Reviewed-by: Samuel
* | Make sure we use a premultiplied alpha format for 32 bit EGL screens.Trond Kjernåsen2009-04-201-1/+1
| | | | | | | | Reviewed-by: Gunnar
* | Make sure the cached SVG image node uses the premultiplied format.Trond Kjernåsen2009-04-201-0/+3
| | | | | | | | Reviewed-by: Gunnar
* | Doc update for QGraphicsProxyWidget::setWidget().Andreas Aardal Hanssen2009-04-201-3/+2
| | | | | | | | | | Reviewed-by: Joao Reviewed-by: Kavindra
* | Fixup docs for QGraphicsProxyWidget::setWidget().Andreas Aardal Hanssen2009-04-201-0/+4
| |
* | Fix QGraphicsProxyWidget's window flag handlingAndreas Aardal Hanssen2009-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes a few bugs and adds autotests for QGraphicsProxyWidget and QGraphicsWidget's window flag handling. The former behavior has been that you must set window flags on QGraphicsProxyWidget explicitly after calling proxy->setWidget(); otherwise both the flags from the embedded widget and the proxy would be partially ignored. Example: QLineEdit *edit = new QLineEdit(0, Qt::Window); // that's the default scene.addWidget(edit, Qt::Window); // proxy still has no window decos proxy->setWindowFlags(Qt::Window); // now it got decorations :-/ QGraphicsWidget's window flags are immune to reparenting, and are always polished with the necessary hints regardless of whether you set the flags during construction time or later. This is a feature QGraphicsWidget can provide because it allows toplevel widgets (without parents) to be normal widgets (i.e., non-windows). So the new behavior of QGraphicsProxyWidget is to respect its own window flags and ignore those of the embedded widget, regardless of what flags the embedded widget has when it's embedded. When QWidget auto-embeds child windows (file dialogs, popups, etc), it passes the correct window flags to the QGraphicsProxyWidget to ensure that the right flags are set. Task-number: 251407 Reviewed-by: Joao
* | Working on QGraphicsProxyWidget's handling of widget flags.Andreas Aardal Hanssen2009-04-205-11/+146
| |
* | Clean up white space.Jan-Arve Sæther2009-04-201-165/+160
| |
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-2086-7861/+23485
|\ \ | |/ | | | | | | Conflicts: src/gui/itemviews/qheaderview_p.h
| * 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.
| * Miscellaneous cleanups for Sql tests.Bill King2009-04-191-12/+31
| |
| * Make temporary files close-on-execOswald Buddenhagen2009-04-181-0/+11
| | | | | | | | Reviewed-By: thiago
| * sanitize whitespace & parenthesesOswald Buddenhagen2009-04-181-128/+127
| |
| * Run syncqt when available and necessaryDirk Mueller2009-04-181-1/+1
| | | | | | | | | | | | | | | | | | The nightly public snapshots contain bin/syncqt but do not contain the include/ directory. Hence configure needs to detect this case and run syncqt to create the include tree so that configure actually passes Signed-off-by: Thiago Macieira <thiago.macieira@nokia.com>
| * Fix the About Qt dialog text to be truthful, post-LGPLJason McDonald2009-04-1866-7450/+22935
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the text of the About Qt dialog, as directed by Legal. Note that this change breaks string freeze as the text is translatable, however Legal has decided that shipping legally correct text has priority over shipping complete translations. This change includes updated .ts files to correct the source strings, but no updated translations. This change also removes out-of-date licensing text from the About dialogs of Designer, Assistant, Linguist, QtConfig and qdbusviewer. Those particular changes should not break translations as they only remove translatable strings and do not modify any others. Task-number: 247608 Reviewed-by: Trust Me .....review will be conducted after submission.
| * Fix an endianess issue with 32 bit pixmaps on big endian systems.Trond Kjernåsen2009-04-171-1/+1
| | | | | | | | | | | | | | | | On big endian systems with Xrender, the QPixmap::toImage() function did an unnecessary byte swap for 32 bit pixmaps. Task-number: 196152 Reviewed-by: Samuel
| * compilePaul Olav Tvete2009-04-171-1/+1
| | | | | | | | | | heh, it was perfectly safe to remove the QT_VERSION ifdefs, but QT_VERISON was another matter...
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-04-171-1/+1
| |\
| | * autotest didn't compile with gccThierry Bastian2009-04-171-1/+1
| | |
| * | BT: Obsolete license textJason McDonald2009-04-171-6/+0
| |/ | | | | | | | | | | | | | | | | In the docs, index.html had a statement about licensing that is no longer true, plus the file it linked to longer exists. This change removes the offending paragraph from the docs. Task-number: 251348 Reviewed-by: Carlos Duclos
| * Compile.Jan-Arve Sæther2009-04-171-3/+3
| |
| * Possible assert when hiding tabbed QDockWidgetThierry Bastian2009-04-172-3/+35
| | | | | | | | | | | | | | | | | | The problem is in QTabBar which emits the currentChanged signal before accessing its own internal data. As we react to that signal by possibly removing/adding tabs, it can cause a assertion failure. Task-number: 251184 Reviewed-by: ogoffart
| * BT: Make native QFontDialog work when using show and changing windowsNorwegian Rock Cat2009-04-171-3/+5
| | | | | | | | | | | | | | | | | | Cocoa's font manager uses "first responder" which is a great idea, but breaks as soon as we change windows. Thankfully we can just set the target and we are OK. An upshot is that we don't need the delegate, but I'm not going to push my luck on that. Reviewed-by: Richard Moe Gustavsen
| * Display error with QTableView with custom default row heightThierry Bastian2009-04-173-8/+50
| | | | | | | | | | | | | | QHeaderView can sometimes display holes when using default row height Task-number: 248050 Reviewed-by: ogoffart