summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5'Tom Cooksey2009-05-287-28/+42
|\ | | | | | | | | 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: Support saving forms with resources more than once in Qt JambiEskil Abrahamsen Blomfeldt2009-05-281-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a form is loaded, Designer will set the path to the resource as an absolute path rather than the path actually stored in the file. There is code to work around this to make file paths relative when saving the file later on, but no work around for Qt Jambi. So when saving Qt Jambi forms, you would get an absolute path to the resource which contains the location of the resource file (.jar or on disk) This of course breaks the concept of resources, as the .jui file was no longer portable. The fix is to special case Qt Jambi resources and set the relative path when loading them. The patch has no effect on regular Designer. Task-number: 254621 Reviewed-by: Kai Koehne
| * support for -ltcg configure switch for Windows CE buildsJoerg Bornemann2009-05-282-2/+6
| | | | | | | | | | | | | | | | | | Additionally we turn -ltcg on by default on Windows CE. See commit 56191830 for details. Reviewed-by: mauricek BT: yes
| * 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
| * Doc - final screenshot and changesKavindra Devi Palaraja2009-05-282-11/+8
| |
* | 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-287-3/+689
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2810-8/+31
| |
* | 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-28163-846/+827
| | | | | | | | | | 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-285-14/+31
| | | | | | | | | | | | 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-2794-515/+10183
|\ \ | |/ | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| * Fixed: Setting a border using stylesheet for QComboBox adds an unwated frame.Olivier Goffart2009-05-272-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Integrate merge-request #549 into branch '4.5'Simon Hausmann2009-05-276-3/+9303
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Thomas Sondergaard (2): Danish translations Updated danish translations. Added them to relevant project files. Request-url: http://qt.gitorious.org/qt/qt/merge_requests/549 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| | * Updated danish translations. Added them to relevant project files.Thomas Sondergaard2009-05-266-637/+2132
| | |
| | * Danish translationsThomas Sondergaard2009-05-203-0/+7805
| | |
| * | Fixes for merge-request #407Leonardo Sobral Cunha2009-05-272-36/+39
| | | | | | | | | | | | Removed unused line and added task number to autotest.
| * | Integrate merge-request #407 into branch 'test'Leonardo Sobral Cunha2009-05-272-0/+37
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | diaulas (1): Dont show children when parent is not visible in QGraphicsItem Request-url: http://qt.gitorious.org/qt/qt/merge_requests/407 Reviewed-by: Leonardo Sobral Cunha <leo.cunha@nokia.com>
| | * | Dont show children when parent is not visible in QGraphicsItemdiaulas2009-05-272-0/+37
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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-262-5/+39
| | | | | | | | | | | | | | | | | | | | | | | | The problem was that we don't clear the selection model if the previous selection was valid. Task-number:251341 Reviewed-by:jasplin
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-05-2621-176/+231
| |\ \
| | * | Workaround the palette issue, set it only when we search is open.kh2009-05-262-2/+38
| | | |
| | * | Fix broken search inside search results.kh2009-05-262-70/+66
| | | | | | | | | | | | | | | | Reviewed-by: kh
| | * | Doc - more images and additional descriptionKavindra Devi Palaraja2009-05-266-11/+13
| | | |
| | * | 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
| | * | Correcting bugs in classic.cssMorten Engvoldsen2009-05-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Correcting invalid padding values. none is not a valid padding value. Rev-by: David Boddie
| | * | Test for QDate::fromDate with string format.Olivier Goffart2009-05-261-0/+26
| | | | | | | | | | | | | | | | | | | | Note that two digit years are always in the year 19xx This is excepted for compatibility reason as discussed with Peter
| | * | BT: opening datetimepicker in a cell in spreadsheet demo resets the dateOlivier Goffart2009-05-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | That was a bug in the exemple. Reviewed-by: Kavindra Palaraja
| | * | Doc - whitespace cleaningKavindra Devi Palaraja2009-05-261-24/+24
| | | |
| | * | Doc - more screenshots and better descriptionKavindra Devi Palaraja2009-05-264-23/+12
| | | |
| | * | 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