summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Do not hide the left edge of widget in statusbarOlivier Goffart2009-05-291-1/+1
| | | | | | | Could be caused by change d2cba538 Reviewed-by: jbache Task-number: 254083
* Fix qstringbuilder documentation.hjk2009-05-291-1/+1
| | | | It was using !fn instead of \fn accidentally.
* Mac: App menus reactivated when a sheet is used on a modal dialog.Richard Moe Gustavsen2009-05-291-14/+14
| | | | | | | | We need to check all window anchestors of the sheet to make sure that there it is not in effekt application modal Task-number: 254543 Reviewed-by: Trenton Schulz
* Ensure a hierarchy of menus fade out together.Norwegian Rock Cat2009-05-294-33/+103
| | | | | | | | | | | | | On Mac OS X, when you have a large hierarchies of menus and you select the item at the end of the hierarchy. It will flash and then the rest will fade out at the same time. Qt would do a phased approach which was what no one expected. Introduce a QMacWindowFader class that can hold an arbitrary number of qwidgets and then on command fade them all down pased on the set duration. The API is a bit clumsy but is prefect for this internal API. Task-#: 251700 Reviewed-by: Richard Moe Gustavsen
* Fixed compile with MinGW.Rohan McGovern2009-05-291-3/+3
| | | | | MinGW 3.4.5 can't figure out the automatic QLatin1Char -> QString conversion in this code.
* Fixed compile of Qt/Embedded.Rohan McGovern2009-05-281-1/+1
| | | | Fix what looks like the result of a `git merge' gone wrong.
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtMichael Brasser2009-05-281-1/+1
|\
| * Fixed WinCE compile, perhaps.Rohan McGovern2009-05-281-1/+1
| | | | | | | | Fix obvious typo: frosmUtf16 -> fromUtf16
* | Export symbol needed by the declarative module.Michael Brasser2009-05-281-1/+2
| | | | | | | | Reviewed-by: Leo
* | Further optimized fast scaling of ARGB8565 images onto RGB16 images.Michael Brasser2009-05-282-5/+11
|/ | | | | | This improves performance on embedded. Reviewed-by: Samuel
* Fixed bug in GL graphics system when painting to pixmaps.Samuel Rødal2009-05-281-0/+3
| | | | | Make sure the correct texture unit is active when copying from the pixmap to the FBO in begin().
* Integrate merge-request #548 into branch 'master'Norwegian Rock Cat2009-05-281-2/+0
|\ | | | | | | | | | | | | | | | | Brad Hards (2): Remove duplicate qpdf_p.h include. Fix build when compiling Qt using -no-opengl configuration. Request-url: http://gitorious.org/qt/qt/merge_requests/548 Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
| * Remove duplicate qpdf_p.h include.Brad Hards2009-05-281-2/+0
| |
* | oops, build was broken on embeddedThierry Bastian2009-05-281-1/+1
| |
* | Polished aboutQt dialog a little bit.Denis Dzyubenko2009-05-281-5/+8
|/ | | | | | | Splitted text in the AboutQt dialog into several chunks to make use of advanced qmessagebox text fields Reviewed-By: Trenton Schulz
* Merge branch '4.5'Tom Cooksey2009-05-282-3/+6
|\ | | | | | | | | Conflicts: src/gui/embedded/qkbdtty_qws.cpp
| * 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 incorrect handling of composition modes in GL2 paint engine.Samuel Rødal2009-05-282-22/+11
| | | | | | | | | | | | | | | | Even if the source pixels are opaque we have to enable blending for the non-trivial composition modes. Some of the composition modes are independent of source alpha and depend on destination alpha for example. Reviewed-by: Tom
* | Forgot to close the TTY handle.Robert Griebl2009-05-281-0/+1
| | | | | | | | Reviewed-by: TrustMe
* | Introduce a new class QStringBuilder to speed up the creation ofhjk2009-05-285-3/+373
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QString objects from smaller chunks. The QStringBuilder class: QStringBuilder uses expression templates (using the '%' operator) to postpone any actual concatenation until it is assigned to an actual QString. At that time it knows the exact sizes of all chunks, can compute the required space, allocates once a QString of appriopriate size and then copies over the chunk data one-by-one. In addition, QLatin1Literal is a drop-in replacement for QLatin1String (which we can't change for compatibility reasons) that knows its size, therefore saving a few cycles when computing the size of the resulting string. Some further saved cycles stem from inlining and reduced reference counting logic (the QString created from a QStringBuilder has typically ref count equal to 1, while QString::append() needs an extra test) Minor changes to the existing QString class: - Introduce QString constructor to create an uninitialized QString of a given size. This particular constructor is used by QStringBuilder class. - Introduce a QT_USE_FAST_CONCATENATION macro to disable the existing overloads of operator+() and helps finding the places where they are used in code. - Introduce QT_USE_FAST_OPERATOR_PLUS. This also disables the existing overloads of operator+() and creates a new templated operator+() with identical implementation of operator%(). This allows code that is compilable QT_CAST_{TO,FROM}_ASCII to use QStringBuilder almost transparently. The only case that is not covered is creating objects like QUrl that are implicitly constructible from a QString from a QStringBuilder result. This needs to be converted explicitly to a QString first, e.g. by using QUrl url(QString(QLatin1String("http://") + hostName)); Reviewed-by: MariusSO
* | Compile fix with namespaces.hjk2009-05-289-7/+30
| |
* | Make WA_TranslucentBackground work for QGLWidgets on X11/EGLTom Cooksey2009-05-281-11/+15
| | | | | | | | Reviewed-By: TrustMe
* | Send ParentChanged event to QGLWidgets when the wId changes on EGLTom Cooksey2009-05-281-4/+5
| | | | | | | | | | | | | | | | EGL has window surfaces which are bound to a particular window ID. When that window ID changes, the EGL surface must be re-created. This is achieved by sending the QGLWidget a ParentChanged event. Reviewed-By: Trond
* | Print the error string when surface creation failsTom Cooksey2009-05-281-1/+4
| | | | | | | | Reviewed-By: TrustMe
* | Fix build on X11/OpenGL ES 2.0Tom Cooksey2009-05-281-1/+1
| | | | | | | | Reviewed-By: TrustMe
* | Do not deduce scrollbar extent twice if scrollbar policy is ↵Aurélien Gâteau2009-05-281-4/+10
| | | | | | | | | | | | | | | | Qt::ScrollBarAlwaysOn Request-url: http://qt.gitorious.org/qt/qt/merge_requests/432 Reviewed-by: Olivier Goffart Reviewed-by: Thierry
* | QStateMachine: better way to get the sender signalIndexOlivier Goffart2009-05-281-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | The QObject internals have changed, and the mutex that need to be locked to access the senders list is not the same anymore, and not accessible form qstatemachine.cpp But we do not need to loop over the senders list anyway because this is done in sender() We also do not need to lock in order to access the currentSender Reviewed-by: Eskil
* | Moved QGL2PaintEngineExPrivate into GL2 paint engine header file.Samuel Rødal2009-05-284-93/+96
| | | | | | | | Reviewed-by: Tom
* | Respect PM_ScrollView_ScrollBarSpacing in QAbstractScrollArea::minimumSizeHint()Christoph Feck2009-05-281-0/+6
| | | | | | | | | | Reviewed-by: Olivier Goffart Request-url: http://qt.gitorious.org/qt/qt/merge_requests/382
* | improved string operations all over the placeThierry Bastian2009-05-28153-823/+804
| | | | | | | | | | used character operations whenever possible better usage of QLatin1String
* | Use Qt::UniqueConnection instead of disconnect/connectOlivier Goffart2009-05-285-13/+6
| | | | | | | | | | | | | | Also fix an issue in QTreeView where a signal could be connected several times Reviewed-by: Thierry
* | Compile qstatemachine autotestOlivier Goffart2009-05-281-1/+1
| |
* | Doc change; QGraphicsView::DontClipPainter is obsolete since Qt 4.5.Andreas Aardal Hanssen2009-05-282-11/+2
| | | | | | | | Reviewed-by: Lars
* | Adds support for linking against iodbc on linux.Bill King2009-05-281-7/+1
| | | | | | | | | | | | If unixodbc detection fails, try and link/detect iodbc libraries and link against them. Reviewed-by: Lincoln Ramsay
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-2747-323/+496
|\ \ | |/ | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| * 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