summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-0254-489/+586
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/itemviews/puzzle/puzzle.pro examples/qtconcurrent/imagescaling/imagescaling.pro examples/widgets/movie/movie.pro tools/configure/configureapp.cpp Will rebuild configure.exe in next commit.
| * Improve readability of QDFBWindowSurface::scrollAnders Bakken2009-06-011-21/+18
| | | | | | | | | | | | The batch-blits buys us nothing and this is much more readable. Reviewed-by: TrustMe
| * Don't support porter duff |= source overAnders Bakken2009-05-291-96/+24
| | | | | | | | | | | | | | | | DirectFB and Qt treats these things rather differently so the mapping just doesn't work very well. Only use DirectFB for SourceOver stuff (which is the default mode anyway) Reviewed-by: Donald <qt-info@nokia.com>
| * Removed nested comment signature in the doc to fix a warning.Denis Dzyubenko2009-05-291-1/+1
| | | | | | | | Reviewed-by: David Boddie
| * Remove unused variable.Alexis Menard2009-05-291-1/+0
| |
| * Fixed a crash in the GL 2 paintengine when drawing text.Trond Kjernåsen2009-05-291-0/+3
| | | | | | | | | | | | | | | | The new glyph cache may return null images for e.g. space characters. Task-number: 253468 Reviewed-by: Samuel BT: yes
| * Fixed build issues with MSVCThierry Bastian2009-05-291-0/+14
| | | | | | | | | | | | | | | | | | | | in atomic operations, we declare Interlock... functions in the namespace That can confuse the compiler because they are also declared in another header outside the namespace. Same problem in clucene where we include windows.h from within the NS. Task-number: 254214 Reviewed-by: ogoffart
| * Doc - marked QFileDialog::setOption() with the since 4.5 tag.Kavindra Devi Palaraja2009-05-291-2/+3
| | | | | | | | | | Task-number: 254549 Reviewed-by: TrustMe
| * Remove all force raster on RGB32 stuffAnders Bakken2009-05-284-75/+32
| | | | | | | | | | | | | | | | | | Previously we allowed RGB32 but forced fallbacks for all drawing operations. It turns out blitting operations doesn't work right either so we'll rather just disallow this format altogether. See also 36ae58e7a6a888d3ae7bd162d59daada550bbfb1 Reviewed-by: Donald <qt-info@nokia.com>
| * Warn when trying to use an unsupported formatAnders Bakken2009-05-281-5/+10
| | | | | | | | | | | | | | Due to incompatibilities between RGB32 in DirectFB and Qt we can't use RGB32. Reviewed-by: Donald <qt-info@nokia.com>
| * Fix a ASSERT/Crash when adding two times the same QAction to a QGW.Alexis Menard2009-05-281-2/+4
| | | | | | | | | | | | | | | | | | We were adding two times in the QActionPrivate list the entry for the current QGraphicsWidget if the action was existing before. Task-number:KDE Reviewed-by:bnilsen BT:yes
| * Fix wrong sorting when using the QFileSystemModel with QTreeViewAlexis Menard2009-05-283-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An optimization was made to the sorting of QFileDialog to sort only the current root (meaning what the user see). This avoided slowness when the model was big with lots of leafs. The problem here is for the treeview, the root is always the same, we expands only nodes. In that case, a recursive sorting is needed to ensure that all expanded nodes are correctly sorted (and filtered). This will be slower that's why i use an hidden flag in the d pointer to deactivate the recursive sort for the QFileDialog. Task-number:254701 Reviewed-by:olivier BT:yes
| * Scroll the dirty region with WA_PaintOnScreenBenjamin Poulain2009-05-281-0/+2
| | | | | | | | | | | | | | | | When QWidget::scroll() is called on a widget with WA_PaintOnScreen, scroll the dirty region. Task-number: 254742 Reviewed-by: bnilsen
| * Fixed a problem with streaming QIcons containing multiple pixmaps.Trond Kjernåsen2009-05-281-3/+6
| | | | | | | | | | | | | | | | | | If pixmaps were added through QIcon::addFile() with different sizes than the sizes of the pixmaps themselves, streaming the icon in didn't work properly. Task-number: 254374 Reviewed-by: Kim
| * Don't assume the tty was in K_XLATE when application startedTom Cooksey2009-05-281-1/+3
| | | | | | | | | | | | | | Instead, query the mode at startup, store it and restore it on exit. Reviewed-By: TrustMe Task-number: 254194
| * BT: aboutQt dialog is too big.Denis Dzyubenko2009-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | Make use of setInformativeText in qmessagebox for aboutQt dialog for now. Proper fix might be to add scrollable widget to the dialog, or split the about info into several pieces, though it cannot be done in a patch release. Task-number: 254464 Reviewed-by: Trenton Schulz
| * Fixed: Setting a border using stylesheet for QComboBox adds an unwated frame.Olivier Goffart2009-05-271-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was already fix. But there was still a frame if there was a stylesheet on the applicaiton. The reason is that the frame's constructor call the style for some hints. And later the combobox will query the style again for the frame hint, before the view get polished. The problem is that the StyleSheetStyle will fill the css cache with wrong information on the first call. This is not visible if there is no stylesheet as in the constructor, the widget style is still the default application stylesheet if there is no global applicaiton stylesheet. Task-number: 254589 Reviewed-by: jbache BT:
| * QNetworkReply internals: do not assert when aborted and reading dataPeter Hartmann2009-05-271-1/+2
| | | | | | | | | | | | | | | | ...but just silently return. This is ok because at another location in QNetworkReplyImplPrivate we do the same. Reviewed-by: Thiago Task-number: 254638
| * Fixed a possible assert in QGtkStyleJens Bache-Wiig2009-05-271-32/+31
| | | | | | | | | | | | | | | | | | | | | | We now set and unset the GTK_HAS_FOCUS flag on the same painting call only if focus is set instead of resetting it on each painting call. This is a tiny optimization but also kills a possible assert on certain versions of Gtk+ (as reported with Red Hat Enterprise Linux 5). Task-number: 254614 Reviewed-by: denis
| * Fixes for merge-request #407Leonardo Sobral Cunha2009-05-271-3/+2
| | | | | | | | Removed unused line and added task number to autotest.
| * Dont show children when parent is not visible in QGraphicsItemdiaulas2009-05-271-0/+5
| | | | | | | | | | | | | | | | | | When setVisible() is called on a QGraphicsItem, if the parent of that item was hidden, the child shouldn't be actually shown. Task-number: 197802 Reviewed-by: leo Reviewed-by: alexis
| * Fixed aliasing pointer corruption in QDataStream.Trond Kjernaasen2009-05-271-15/+77
| | | | | | | | | | | | | | | | | | | | | | Use a union instead of an unsafe cast when swapping the bytes in the QDataStream streaming operators. The old seems to cause problems with Link Time Code Generation optimizations with the MSVC compilers. Task-number: 247708 Reviewed-by: Samuel Reviewed-by: Thiago BT: yes
| * QFileDialog selection bug when calling it multiple times.Alexis Menard2009-05-261-5/+6
| | | | | | | | | | | | | | | | The problem was that we don't clear the selection model if the previous selection was valid. Task-number:251341 Reviewed-by:jasplin
| * Fix a painting issue in the QGtkStyle statusbarJens Bache-Wiig2009-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | We should use the "statusbar" string when we draw the sizegrip. Since gtkstatusbar is the only gtk widget using the paint_resize_grip and it uses the "statusbar" string itself it should be safe to assume this. Task-number: 254535 Reviewed-by: rosch
| * SSL: Remove broken system certificate loading codeMarkus Goetz2009-05-261-24/+1
| | | | | | | | | | Task-number: 254365 Reviewed-by: Peter Hartmann
| * BT: Fixed GL textdrawing in the Boxes demo.Trond Kjernaasen2009-05-262-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | Reworked the 85f98acaa3a38079071bea711e43c9a86edec1f6 fix, since it broke glyph positioning in the GL engine under Windows. Instead of changing the glyph cache margin, which impacts where the glyph is positioned, we just make the image the glyph is drawn into 4 pixels bigger in width/heigth. The margin in QImageTextureGlyphCache needs to be reworked.. Task-number: 254450 Reviewed-by: Eskil
| * Carbon, QFontDialog::getFont() ignore the "initial" parameterRichard Moe Gustavsen2009-05-261-8/+31
| | | | | | | | | | | | | | | | | | | | Seems like no code was written to handle other font engines than CoreText. Unfortunatly the engine on Carbon is ATSUI. This patch adds general code for converting a QFont to an NSFont so the dialog can support other engines than CoreText Task-number: 251957 Reviewed-by: Trenton Schulz
| * Clearifying QWebFrame docsMorten Engvoldsen2009-05-261-2/+3
| | | | | | | | | | | | | | | | | | | | Adding docs to toHtml() and toPlainText() Task-number: 253088 Rev-by: Ariya Hidayat Rev-by: David Boddie
| * Fix a crash in Phonon::EffectWidgetJens Bache-Wiig2009-05-261-1/+2
| | | | | | | | | | | | | | | | | | | | When creating a UI based on double types we only assigned the control pointer in certain cases. This would crash because the tooltip did not check for the pointer, but the real issue was that we didnt assign the control in the first place. Task-number: 249710 Reviewed-by: Richard Moe Gustavsen
| * qdoc: Indicate what iterator_categor means for container classes.Martin Smith2009-05-262-4/+8
| | | | | | | | Task-number: 245501
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-2619-75/+108
| |\
| | * Fixed: QSortFilterProxyModel setDynamicSortFilter doesn't works when setting ↵Olivier Goffart2009-05-263-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the model initially This was caused by two different bug: - In the QSortFilterProxyModel, we need to re-sort when setting the source model change the sorting column (happen when setting a model initially) - In the treeview, we need to activate the sorting even if there is no column yet (because the initial model is empty Task-number: 254234 Reviewed-by: Thierry BT:
| | * fix double slash prepending causing troubles on WinCEMaurice Kalinowski2009-05-261-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Before adding a / to the path one should check if it doesn't end with one already. Otherwise one might get paths like //My Documents on WinCE causing the native call to crash the filesystem service on that system. Reviewed-by: alexis
| | * BT:Fix access of deleted memory with a static QCursor.Michael Goddard2009-05-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | If a QCursor with a predefined shape is declared static, it could be destroyed after the application dtor has already cleaned up QCursor memory. Task-number: 254467 Reviewed-by: Rhys Weatherley
| | * Doc: Clarified what close(), abort() and disconnectFromHost() really doDavid Boddie2009-05-251-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the socket connection. (Reviewed - see below.) Also included corrections to the description of how to send SocketError and SocketState values via signals. (Trust me - as part of an earlier revision of the custom types documentation.) Task-number: 222907 Reviewed-by: Andy Shaw
| | * Doc: Miscellaneous documentation fixes for Qt 4.5.x and later.David Boddie2009-05-254-13/+11
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Doc: Removed documentation about the non-existentDavid Boddie2009-05-251-2/+0
| | | | | | | | | | | | | | | | | | | | | QKeyEvent::standardKey() function. Task-number: 254074 Reviewed-by: Trust Me
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-05-2511-116/+152
| | |\
| | | * BT: Namespace compile fixes.Norwegian Rock Cat2009-05-252-1/+2
| | | | | | | | | | | | | | | | | | | | This broke again. I Need to get a way to automate this, I'll discuss with QA.
| | | * fix warning in QtSvg if qreal == floatJoerg Bornemann2009-05-251-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: mauricek
| | | * BT:Fix a clipping issue in tabbar tabsJens Bache-Wiig2009-05-251-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On XP and Vista where tabs use taboverlap, the currently dragged would loose the outline. We need to compensate for the taboverlap when creating the draggable widget, otherwise the outline will be clipped. Task-number: 254453 Reviewed-by: nrc
| | | * BT: fix systray balloon crash bug on Windows CEJoerg Bornemann2009-05-251-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Its the context menu handling code... again. Problem is, that during execution of translateMouseEvent, the widget is closed and a modal message box is shown. After that, there's no widget at globalPos and thus, alienWidget is null. This patch just adds a null check for alienWidget. Task-number: 254425 Reviewed-by: mauricek BT: yes
| | | * Adding details to QSettings functionsMorten Engvoldsen2009-05-251-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding details to the documentation of custom storage format and related functions. Task-number: 207865 Rev-by: David Boddie Rev-by: Marius Storm-Olsen
| | * | Doc: Fixed terminology.David Boddie2009-05-251-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-05-2549-385/+519
| | |\ \
| | * \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-05-2017-191/+89
| | |\ \ \
| | * | | | Doc: Fixed the paper sizes again.David Boddie2009-05-201-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 254179 Reviewed-by: Norwegian Rock Cat
| * | | | | qdoc: Indicate that qAbs(T& v) compares v to a 0 of type T.Martin Smith2009-05-261-12/+37
| | |_|_|/ | |/| | | | | | | | | | | | | Task-number: 246789
| * | | | BT: Prevent crash in Designer when using a scroll wheel to change a property.Norwegian Rock Cat2009-05-251-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was some strangeness happening here with parents, but the main problem was the fact that wheel was getting sent to the focusframe and not to the widget below. However, the focusframe has the "transparent for mouse events" flag set and wheel events probably should be transparent as well. Task-number: 253539 Reviewed-by: Richard Moe Gustavsen
| * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-252-0/+9
| |\ \ \ \ | | | |_|/ | | |/| |