summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtmae2009-05-0553-316/+1036
|\
| * Fixed handling of XA_PIXMAP format type in QClipboard on X11.Denis Dzyubenko2009-05-052-19/+6
| | | | | | | | | | | | | | | | | | | | | | When requesting image/ppm type we didn't return the proper pixmap because type 'PIXMAP' is not a proper image format name, but a reserved atom, so the fix is to remove redundant check that was triggered before we entered the actual function that tries to convert the clipboard content. Task-number: 252501 Reviewed-by: Brad
| * Fix typos in doc.Norwegian Rock Cat2009-05-042-3/+3
| | | | | | | | Spotted-by: Olivier
| * Fixed import of WebKit trunkSimon Hausmann2009-05-041-2/+0
| | | | | | | | | | | | Don't try to remove scons files that don't exist anymore. Reviewed-by: Trust me
| * Use the new QTextCodec::codecForUtfText in qtextstream to detect theDenis Dzyubenko2009-05-041-7/+2
| | | | | | | | | | | | utf encoding by BOM. Reviewed-by: Simon Hausmann
| * When data was copied from Mozilla Firefox to Qt, the text format was not valid.Denis Dzyubenko2009-05-044-19/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mozilla encodes the text/html format in UTF16 and adds a BOM, however it doesn't specify the charset in the html header. The fix is to guess the encoding by either charset in the html header or BOM for text/html format, or by BOM for non html formats. This commit adds a new public function QTextCodec::codecForUtfText() which can be used to guess encoding out of the BOM. Task-number: 250555 Reviewed-by: Benjamin Poulain Reviewed-by: Simon Hausmann Reviewed-by: Andreas Aardal Hanssen
| * Deprecate qt_mac_set_show_menubar for a public cross-platform API.Norwegian Rock Cat2009-05-0411-55/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm tired of these "hidden" functions. We have an AA_MacPluginApplication, but sometimes you may have a legitimate reason for setting this outside of "plugin applications." In the footsteps of the menu icon attribute, the attribute is the main leader, but menubars can disable/enable this locally the new QMenuBar::setNativeMenuBar() property. Otherwise, the menubars take their que from the application attribute. This also works for Windows CE. So, there is a bit on convergence as well. Task-number: 236757
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtOlivier Goffart2009-05-042-7/+3
| |\
| | * prefer macro over stubMaurice Kalinowski2009-05-042-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | - Windows Mobile does the same, thus we will not have double definitions or such - COINIT_MULTITHREADED is the default, meaning that 0 usually expands to it. Just be on the safe side and be more precise. Task-number: 237029 Reviewed-by: joerg
| * | Merge commit 'origin/4.5'Olivier Goffart2009-05-0433-206/+747
| |\ \ | | |/ | |/| | | | | | | Conflicts: src/gui/itemviews/qabstractitemview.cpp
| | * Added an assert so that QColormap usage without a QApplication asserts.Trond Kjernaasen2009-05-041-1/+5
| | | | | | | | | | | | | | | Task-number: 252668 Reviewed-by: Samuel
| | * Ensure that we send the Apple Events even when Cocoa isn't ready.Norwegian Rock Cat2009-05-042-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In general, Cocoa handles the the Apple Events for us. However, this is time between creating the NSApplication and Cocoa has set everything up, usually after the event loop is running. This means that until that time, the events are dropped on the floor :-/. The workaround is to use the same handler that we use for Carbon, but to only have it enabled for until Cocoa is ready to handle things. This will result in not stepping on the toes when used in a plugin (if it does, we can conditionalize it). Task-number: 252795 Reviewed-by: Richard Moe Gustavsen
| | * Fixed D-Bus socket write notifications, broken since d47c05b1Thiago Macieira2009-05-041-1/+1
| | | | | | | | | | | | | | | | | | Shame on me: copy/paste from socketRead to socketWrite, I didn't change the DBUS_WATCH_READABLE to DBUS_WATCH_WRITABLE. Reviewed-by: Trust Me
| | * Greatly reduced the complexity of the boilerplate function.Thiago Macieira2009-05-041-90/+17
| | | | | | | | | | | | | | | | | | | | | | | | I found out that all I needed to load the proper libraries was to add a string to the ".interp" section of the ELF executable containing the path to ld.so Reviewed-By: Marius Storm-Olsen
| | * Doc - Clarifying how to override a Widget's size hint in the Getting toKavindra Devi Palaraja2009-05-041-4/+8
| | | | | | | | | | | | | | | | | | | | | Know Qt Designer document. Task-number: 165435 Reviewed-by: Friedemann Kleint <friedemann.kleint@nokia.com>
| | * Added comment to clearify the use of indexes.Morten Engvoldsen2009-05-041-0/+8
| | | | | | | | | | | | | | | | | | | | | Added a comment about the use of negative indexes. Task-number: 249344 Rev-by: Marius Storm-Olsen
| | * Do not crash when passing wrong indexes to ↵Olivier Goffart2009-05-042-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | QSortFilterProxyModel::indexFomSource and *ToSource Show a warning instead Task-number: 252507 Reviewed-by: Marius Bugge Monsen
| | * Make comment explaning the Mac deployment target setting clearer.Morten Sørvig2009-05-041-4/+5
| | |
| | * Implemented an option to tune flippingAnders Bakken2009-05-044-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | export QWS_DISPLAY=directfb:boundingrectflip to enable calling Flip on the bounding rect of the dirtied area rather than each dirty rectangle. This could be faster if you update many small rectangles. Reviewed-by: TrustMe
| | * Beautified codeAnders Bakken2009-05-022-17/+17
| | | | | | | | | | | | | | | | | | Qt's coding style => Object *ptr, not Object* ptr Reviewed-by: TrustMe
| | * Improve debug output (in debug mode only)Anders Bakken2009-05-011-2/+83
| | | | | | | | | | | | | | | | | | | | | Print out detailed information about acceleration mask, blitting flags and drawing flags when passing debug. Reviewed-by: Donald <qt-info@nokia.com>
| | * Extended surface capabilitiesAnders Bakken2009-05-012-6/+31
| | | | | | | | | | | | | | | | | | | | | Clean up code and make it possible to set more DFBSurfaceCapabilities on the primary surface. Also allow users to force systemonly for the surfaces.
| | * Cleaned up surface creation codeAnders Bakken2009-05-014-34/+28
| | | | | | | | | | | | | | | | | | | | | | | | Since I am taking a copy of the description anyway it makes sense to just pass this light-weight object in as a copy rather than a const pointer. Reviewed-by: Donald <qt-info@nokia.com>
| | * Improved readability of the flip codeAnders Bakken2009-05-011-7/+2
| | | | | | | | | | | | Reviewed-by: Donald <qt-info@nokia.com>
| | * Fixed possible crash in QDirectFBPaintEngine::clipAnders Bakken2009-05-011-1/+1
| | | | | | | | | | | | | | | | | | | | | d->clip() might return 0 at this point so make sure we check before accessing it. Reviewed-by: TrustMe
| | * Apparently this is the best way to determine which to useBill King2009-05-011-5/+4
| | | | | | | | | | | | Best as I can determine via trial and error. It should make vc6 compile again though.
| | * QNetworkCookieJar: allow cookies with wrong domain attributePeter Hartmann2009-04-302-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the (old) cookie RFC 2109, the domain attribute must always contain a leading dot. Some servers do not have that, but all browsers accept those cookies anyway, so we should do that as well. Reviewed-by: Olivier Reviewed-by: Denis Task-number: 228974
| | * New autotest for Windows Mobile: tst_windowsmobileThomas Hartmann2009-04-3010-0/+446
| | | | | | | | | | | | | | | | | | | | | | | | | | | This autotest tests some Windows Mobile 5.0 specific thing like the native menubar and the integration into the window manager by taking and comparing screenshots. This should prevent nasty regressions we had. This autotest makes only sense on Windows Mobile 5.0 in 480x640 Reviewed-by: maurice
| | * Correcting typoMorten Engvoldsen2009-04-301-2/+2
| | | | | | | | | | | | Missed a whitespace - corrected it. No task
| | * Fixed busy indicator for a QProgressBar with a style sheet applied to it.jasplin2009-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For a progress bar with a style sheet applied to it, this fix ensures that the timer event is passed to the event handler that updates the busy indicator animation state. Essentially, the bug was that the decision that the event was processed by the proxy style object (baseStyle()) was based only on the return value from the event() function. In this case it is necessary to check that the event was accepted as well. Reviewed-by: ogoffart Reviewed-by: brad Task-number: 252283
| | * Fixes a possible issue in itemviws where we would not scroll to theThierry Bastian2009-04-302-10/+17
| | | | | | | | | | | | | | | | | | | | | current item on show Task-number: 252534 Reviewed-by: ogoffart
| | * QApplication::setStyle() can cause a crashRichard Moe Gustavsen2009-04-301-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QApplication::setStyle() caused a crash if called before constructing the QApplication instance for custom styles. The reason was that polish tried to create a pixmap (which is not allowed before qApp is running). This fix checks that qApp exists. Polish will anyway be called again when qApp gets constructed. Task-number: 243697 Reviewed-by: Bjørn Erik Nilsen
* | | Extend change 759338df758ad16cdfd9521b270f7e379bbfa57c to cover extramae2009-05-051-14/+25
|/ / | | | | | | | | | | | | | | | | | | selections with different foreground but no background The main concern is to avoid double painting. With anti-aliasing turned on by default, we can not draw a piece of text on top of the same piece of text without artefacts. Task-number: 252310
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtmae2009-05-042-43/+46
|\ \
| * | Mac: QWidget::setMinimumSize does not workRichard Moe Gustavsen2009-05-042-43/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | The reason is that we never applied the new max min values on the native window itself. This patch does that, and also makes sure that we do this on the appropriate times (window creation, etc) Task-number: 219695 Reviewed-by: Trenton Schulz
* | | QTextEdit::ExtraSelection failure with style sheetsmae2009-05-042-6/+39
|/ / | | | | | | | | | | | | | | | | | | the feature has to handle text with and without background, and extra selections with and without background, or even only with underline style. Trouble is that you sometimes want to accumulate styles, for example spell checking wiggly underline plus search result highlights or background markup from the css stylesheet. Task-number: 252310
* | QFileDialog::getOpenFileNames() is not shown at the correct positionRichard Moe Gustavsen2009-05-041-16/+3
| | | | | | | | | | | | | | | | | | The correct behaviour for native file dialogs on mac is to use the previous size and location settings when reopening the dialog. So we implement this behaviour with this change Task-number: 250182 Reviewed-by: Trenton Schulz
* | QDirModel now uses the same translations as QFileSystemModel toThierry Bastian2009-04-301-5/+6
| | | | | | | | | | | | represent sizes Task-number: 251703
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtKavindra Devi Palaraja2009-04-302-0/+62
|\ \
| * | Fixed QFile::copy/rename fail after initial failed attemptJoão Abecasis2009-04-302-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These functions were checking the error state after calling close(), without first resetting the error state. Turns out close() only resets the error state if isOpen() returns false. Also, the fallback for the copy operation opens the file for reading but wasn't closing it again afterwards. Now fixed. Added autotests to cover these situations. Reviewed-by: MariusSO
* | | Doc - some cleanups on the documentation of QDrawUtilKavindra Devi Palaraja2009-04-301-24/+30
|/ /
* | Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-2912-28/+281
|\ \ | |/
| * Stabilize tst_QWidget::render_systemClip2 and remove wrong ifdefBjoern Erik Nilsen2009-04-291-3/+3
| | | | | | | | We only want to dump images *if* RENDER_DEBUG is defined.
| * QTransform::map(const QRegion&) cut-off for single rect regions.Bjoern Erik Nilsen2009-04-291-0/+4
| | | | | | | | | | | | Avoid QRegion<->QPainterPath conversion if possible. Reviewed-by: Samuel
| * Speed-up QPainter::clipRegion().Bjoern Erik Nilsen2009-04-291-11/+20
| | | | | | | | | | | | | | | | | | We can speed up the calculation by using rect intersections if possible, i.e. QRegion &= QRect instead of QRegion &= QRegion. Then we'll get rid of one QRegion construction and the intersection itself is slightly faster. Reviewed-by: Samuel
| * Wrong clip in QWidget::render(QPainter *, ...) when using Qt::(Replace|No)Clip.Bjoern Erik Nilsen2009-04-292-2/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that we didn't take the painter's clip into account when setting the system viewport ("hard clip"). We only used the system clip, but we have to use system clip + painter clip, which is the current engine clip. Unfortunately, we have to calculate it again since there's no cross-platform way of retrieving it. This was only a problem with Qt::(Replace|No)Clip, since we in all other cases combine the old clip with the new one. (Uber cool) auto test included. Task-number: 250482 Reviewed-by: Samuel
| * Documented the flow layout example.Morten Engvoldsen2009-04-292-4/+113
| | | | | | | | | | | | | | | | Wrote documentation for the flowlayout class. Task-number: 252548 Rev-by: Geir Vattekar Rev-by: janarve
| * Corrected bugs in the flow layout exampleMorten Engvoldsen2009-04-294-6/+30
| | | | | | | | | | | | | | Corrected bugs in the example and added markers for snippets in the documentation. Task-number: 250616 Rev-by: Geir Vattekar
| * Corrected typoMorten Engvoldsen2009-04-291-1/+1
| | | | | | | | | | | | Changed smae to same Taks number:251646
| * Corrected description of the QLayout::takeAt() functionMorten Engvoldsen2009-04-291-1/+1
| | | | | | | | | | | | | | An item is not deleted when removed from the index. The remaining items get a new index. I changed deleted to removed. Tasknumber: 252547 Rev-by: janarve
generated by cgit v0.12 at 2025-01-06 10:34:10 (GMT)