summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | Doc: Updated the list of tools to include makeqpf and qvfb.David Boddie2009-05-263-8/+9
| |/ / | | | | | | | | | Reviewed-by: Marcel Schuette
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-05-2618-49/+148
| |\ \
| | * \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-264-15/+17
| | |\ \
| | | * | Doc - more screenshots and adding better descriptionKavindra Devi Palaraja2009-05-263-13/+15
| | | | | | | | | | | | | | | | | | | | Details: Work in progress
| | | * | BT: Google suggest example not launching from the Qt Demo app.Trond Kjernåsen2009-05-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example was installed in the wrong directory. Task-number: 254452 Reviewed-by: Kim
| | * | | qdoc: Indicate what iterator_categor means for container classes.Martin Smith2009-05-263-8/+13
| | |/ / | | | | | | | | | | | | Task-number: 245501
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-2633-139/+272
| | |\ \
| | | * | Fixed: QSortFilterProxyModel setDynamicSortFilter doesn't works when setting ↵Olivier Goffart2009-05-265-6/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | Fixed qmake writing targets into the root of the current drive whenRohan McGovern2009-05-262-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DESTDIR=./ and using Windows, nmake and shadow builds. qmake would canonicalize the DESTDIR of "./" to "". Then it would check if the original DESTDIR ended with "/", and if so, append it to the new DESTDIR, resulting in a DESTDIR of "/" - the root of the current drive. Don't do that. This bug doesn't occur with in-source builds because qmake detects that the source and build directories are the same directory and replaces the DESTDIR of "./" with "" before it reaches the buggy code. Autotest: included Reviewed-by: Lincoln Ramsay
| | * | | qdoc: Indicate that qAbs(T& v) compares v to a 0 of type T.Martin Smith2009-05-262-12/+38
| | | | | | | | | | | | | | | | | | | | Task-number: 246789
| * | | | Doc: Removed irrelevant links from the Qt for Windows CE documentation.David Boddie2009-05-261-2/+0
| | |/ / | |/| | | | | | | | | | Reviewed-by: Maurice Kalinowski
| * | | 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: Removed the incorrect figures for Thumb builds of libraries.David Boddie2009-05-251-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to resolve the issues around the use of Thumb code in Qt and automate the building and comparison of libraries. Reviewed-by: Trust Me
| * | | Doc: Fixed custom graphics item snippet.David Boddie2009-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As reported on qt-interest: http://lists.trolltech.com/pipermail/qt-interest/2009-May/007036.html Reviewed-by: Trust Me
| * | | Doc: Miscellaneous documentation fixes for Qt 4.5.x and later.David Boddie2009-05-255-14/+12
| | | | | | | | | | | | | | | | 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
| * | | Doc: Fixed links to resources on the qtsoftware.com Web site.David Boddie2009-05-251-3/+3
| | | | | | | | | | | | | | | | | | | | Task-number: 254463 Reviewed-by: Denis Dzyubenko
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-05-2518-121/+178
| |\ \ \
| | * | | 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
| | * | | don't build examples/qtconcurrent/qtconcurrent.pro by default on Win CEJoerg Bornemann2009-05-251-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This examples doesn't make much sense on most Windows CE devices. Task-number: 254433 Reviewed-by: mauricek BT: yes