summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Background in landscape mode on S60 5.0 is brokenSami Merilä2009-11-271-0/+1
| | | | | | | | | | | | | | After initial fix, 99% of widgets draw temselves properly after orientation switch. However, QScrollAreas lose their palette hash, which causes scrollarea background to re-start from theme background top-left. As a correction, we re-set the theme palette hash after calling QApplication::setPalette, since that clears palette hash. Task-number: QTBUG-6125 Reviewed-by: Alessandro Portale (cherry picked from commit 41f1276392444b9e46b30f3537a8a63af6fffc9d)
* Fixing background painting after orientation switch.Alessandro Portale2009-11-272-1/+2
| | | | | | | | | | | | | | | | | Fixing previous fixes of QS60StylePrivate::setBackgroundTexture with commit SHAs a80e58335e69c8ce96d1596e0ed2d14e424a0d5e and d4089399a3ab7548a864d5a399e08df85c444783 Now, the palette gets the updated background brush and the palette is actually set as application palette. Also making sure that QS60StylePrivate::handleDynamicLayoutVariantSwitch does the right things in the right order. So that Table headers are not broken after orientaion switch. Task-number: QTBUG-6125 Task-number: QT-1478 Reviewed-by: Shane Kearns (cherry picked from commit 89c537dbd1b4bfbfcb3a3e3644c093b5a6e85469)
* Revert "Fixes implicit grabbing in Qt/Cocoa"Jason McDonald2009-11-262-29/+30
| | | | This reverts commit 49360b3237363db2a8d6c6eeafb0aaa83d3efdc0.
* Fix crash of QtWebKit on any page with Flash when compiled witn MinGW.Jocelyn Turcotte2009-11-251-2/+2
| | | | | | | | | Early push of this fix which should be overwritten by the fix upstreamed in WebKit trunk later. Reviewed-by: Simon Hausmann (cherry picked from commit dddd3e5fc9658ebbb5f94b343e7c7c0cd27eb7f2) (cherry picked from commit 4c3539dfbc65d5decdd842d4181f9aa3d38d213c)
* On Windows Flash is played only while moving mouse inside the plugin.Prasanth Ullattil2009-11-251-1/+1
| | | | | | | | | Qt is using the same window message as Flash plugin. We need to check the window handle before we treat this as Qt internal message. Reviewed-by: Bradley T. Hughes (cherry picked from commit 48e56643f1b7daf7c255a1e58f0e213b06e15f65) (cherry picked from commit 7b845236d8670bb9cb5884ea60f422d09dafd89c)
* Fixes implicit grabbing in Qt/CocoaDenis Dzyubenko2009-11-252-30/+29
| | | | | | | | | | When delivering mouse events in Qt/Cocoa set the implicit mouse grabber and deliver the event to it and do not try to propagate the event to the parent view. Reviewed-by: Prasanth (cherry picked from commit aae81f370f6afede95064bc75eb7ee6ac13b1c30) (cherry picked from commit 106121a74bca32a6411b9ca968ee415f8bdfbff1)
* Fix QFile::map in Linux 64bitOlivier Goffart2009-11-251-1/+1
| | | | | | | | | On 64bit, qint64(size_t(-1)) = -1 Reviewed-by: Joao Reviewed-by: Thiago (cherry picked from commit 829d9e10ad3d26fb2fddef01c8e36352018c3fec) (cherry picked from commit c71c46430317b70e784f0952d0aac048775ad842)
* Fix softkeys for QDialogButtonBoxes created without a parent.Jason Barron2009-11-251-0/+24
| | | | | | | | | | | | | | Inthe case where a QDialogButtonBox was created without a parent, for example in the FTP example, the softkeys that are automatically created inside the button box were not being added to the right widget when the button box was given a parent (or added to a layout) later. This patch resolves that issue by handling the ParentChange event and then adding the softkeys at this point. Task-number: QTBUG-6086 Reviewed-by: axis (cherry picked from commit a0c8e134a284d45520dd3a229e68dbcd155299e6)
* Compile fix for win32-icc.Jan-Arve Sæther2009-11-241-0/+12
| | | | | | | | | | The Intel Compiler inlined the destructor of QObjectPrivate too agressively, causing it to generate a call to ~QObjectData for QtGui. ~QObjectData is not exported from QtCore, so it failed linking. Task-number: QTBUG-5145 Reviewed-by: Alexis Menard (cherry picked from commit db5e4496229a776768464d1d3d2e1f8e81bd6ba0)
* Don't crash in eval() function when QtScript debugger is attachedKent Hansen2009-11-241-2/+8
| | | | | | | | | | | | | | | | | | | | | | The built-in eval() function bypasses the script registration performed by QScriptEngine::evaluate(), so if we get an atStatement() callback from JSC from that script, the scriptID-to-sourceProvider lookup will fail. In this case, just return from atStatement() without delivering the positionChange() callback to the QScriptEngineAgent, since the agent will not have received the scriptLoad() callback for that script anyway. This is a change in behavior from 4.5, but we consider it the minimum-impact fix at this point to keep 4.6.0 from crashing. The only downside is that debugging will effectively be "disabled" for the script passed to eval(), but that's a lot better than crashing. Task-number: QTBUG-6108 Reviewed-by: Jedrzej Nowacki (cherry picked from commit 23002374d11598b26b6585e78dc073071a13f0ec)
* WinCE: only use native menu bars for windows mobileninerider2009-11-231-0/+3
| | | | | | | | | On Windows CE the native menubar must not be used. The corresponding flag was never set for Windows CE. Task-number: QT-2530 Reviewed-by: Maurice (cherry picked from commit cda63c368dbb5acd040e2190db8f25de69462d8e)
* Revert check for file size to a warning in QFile::mapJoão Abecasis2009-11-231-1/+1
| | | | | | | | | | | | | The check, introduced in c66de8a19b558e14097c402480eeabf0b5ec2351, changes behavior and it is not clear whether we should prevent mmaping beyond EOF. FWIW, python prevents it. Leaving a warning in there for now so as not to break applications that depend on the feature. Task-number: QTBUG-6008 Reviewed-by: Thiago Macieira (cherry picked from commit 095c92f03e0c01b878eaa0cd1b7844171ce9241f)
* Fix regression introduced in 1e6b424b692b20dcfec920f8d3563e520ec1ff05João Abecasis2009-11-231-1/+5
| | | | | | | | | | | | | When processing the result of QIODevice::readLine, forgot to take into account that a '\0' is appended to the array. The terminating character is not accounted for in the number of bytes returned. By pre-allocating a byte for the terminating null character, we make sure we'll actually read 16k bytes on each and every iteration. Task-number: QTBUG-6019 Reviewed-by: Thiago Macieira (cherry picked from commit b7692016f282251002b3e85dfcb5567bd91a12c0)
* Fixed antialiasing in the GL based QGraphicsView demos under X11.Trond Kjernåsen2009-11-231-1/+6
| | | | | | | | | | | | | | | All the examples/demos that used a QGraphicsView with a QGLWidget as a viewport, that had multisampling enabled, was broken after 7b61fbf03e170a7da37d5f57ed4053aae719ec7f. This is because the reparented QGLWidget will be forced to use the parent widget's visual, which in this case does not contain any multisample buffers. The QX11Info structure for QGLWidget is put together based on the QGLFormat that is passed into the QGLWidget constructor and will in most cases always be different from the parent widget visual. Task-number: QTBUG-5998 and QTBUG-6003 Reviewed-by: Eskil (cherry picked from commit 5cf6f6276a3a9103876937c300c1adce157eebeb)
* Incorrect DropAction returned by QDrag::exec() on Cocoa.Prasanth Ullattil2009-11-231-1/+1
| | | | | | | | | | | The action performed by the latest drag and drop operation is stored in the global DnDParams structure. The QDrag::exec() return value has to be fetcted from this global variable instead of the temporary copy on stack. Commit 0d231c32cc7670d356d486b13648cb5bd471ffef broke this. Task-number: QTBUG-6001 Reviewed-by: Denis (cherry picked from commit a222302ca45e33306dacae0aa16a572c13abc483)
* Q_ASSERT failure when resizing a span to (1,1) in 1st cellGabriel de Dietrich2009-11-231-1/+1
| | | | | | Reviewed-by: Olivier Task-number: QTBUG-6004 (cherry picked from commit 75d68b2b245da91ec9f985893f9b233d9d6a0793)
* Fix configure warning for non-symbian buildsJason McDonald2009-11-231-2/+4
| | | | | | | | | Configure complains about "Could not retrieve HKEY_LOCAL_MACHINE\Software\Symbian\EPOC SDKs setting". It should only try to do that for Symbian builds. Reviewed-by: Lincoln Ramsay (cherry picked from commit 7e7e3c3fe15780aa7d024e136acaf697ab49458c)
* Fixes regression in QListView: Selection would not expend to the full viewportOlivier Goffart2009-11-211-2/+6
| | | | | | | | | | Commit ecc202c introduced the regression while fixing another regression (QTBUG-5854) The selection would not expend to the whole viewport. Reviewed-by: Robert Griebl (cherry picked from commit 73153fa5288e22d27f26d0e1045e82698c9a6343)
* Do not recreate the VGImage if the size is unchangedRhys Weatherley2009-11-202-33/+10
| | | | | | | | | | When a pixmap's contents change in QVGPixmapData, only recreate the VGImage in the GPU if the size is different than before. This should help reduce GPU memory fragmentation. Task-number: QT-2504 Reviewed-by: Sarah Smith (cherry picked from commit a8c8c2274d2d0a708786adbb357013955f99c0af)
* Remove unmatched else in non-EGL mode for OpenVG pixmap dataRhys Weatherley2009-11-201-1/+0
| | | | | Reviewed-by: Gunnar Sletta (cherry picked from commit 55b1f191d2ab97b2c1029f12e2315412e74a1dc2)
* Prevent a deep copy of QImage::bits() in the OpenVG pixmap implementationRhys Weatherley2009-11-201-2/+10
| | | | | | Task-number: QTBUG-5869 Reviewed-by: Sarah Smith (cherry picked from commit 73477789bdeeba851cf095cbdda5c36d9f5c31df)
* Remember to match the actual arguments too.Thiago Macieira2009-11-202-0/+20
| | | | (cherry picked from commit b1196d5733ae01660e4345a5bbecd9c1b32238a4)
* Disable the deprecation warning for this signal since we're using it nowThiago Macieira2009-11-201-5/+0
| | | | | Task-number: QTBUG-5972 (cherry picked from commit f01c631f84f9373b06d0572bfed7a4e8213a46a7)
* Revert "Stop using the NameOwnerChanged signal without arg0 in QtDBus itself"Thiago Macieira2009-11-201-0/+3
| | | | | | | This partially reverts commit 1176ecf0b533279e5a1c97f183e5c5f1c57fb188. Task-number: QTBUG-5972 (cherry picked from commit db1cff73726ff12d50139769dc8071f9e9173261)
* Revert "Doc: Added an example to demonstrate the QWebElement class."Jason McDonald2009-11-202-15/+0
| | | | | | | | This reverts commit 19d63f4d932ae16d0e1c69892681ecd1fabeb44c. Conflicts: doc/src/qt4-intro.qdoc
* remove bogus doc paragraphs relating to codecForUtfText()Oswald Buddenhagen2009-11-201-6/+0
| | | | | | | | | these aren't *strictly* bogus, but rather confusing. the real issue is that the functions would get confused by something which looks like a BOM, but isn't, and there is nothing one could do about it. Reviewed-by: Volker Hilsheimer (cherry picked from commit bb4e301ce6762ab300618c579bd65ea1ee17dc2d)
* doc: Fixed qdoc according to Bjarne's recommendation.Martin Smith2009-11-203-16/+38
| | | | | | | Someone had changed an operator==() and an operator!=() from single parameter members to two-parameter friends but hadn't changed the qdoc comments. (cherry picked from commit d65bff4c94fb11bbad02420459a9375621051823)
* Doc: Added an example to demonstrate the QWebElement class.David Boddie2009-11-202-0/+15
| | | | | Reviewed-by: Trust Me (cherry picked from commit d46b4208147ec01aba19c703f21954f068b4dc06)
* Fix for compile error in Phonon MMF backendGareth Stockwell2009-11-207-62/+14
| | | | | | | | | | | | | | | | | This was introduced by d0b0b525de. The use of QT_NO_DEBUG macros causes release-armv5 builds to fail when the -release option is passed to configure. This change causes the debugging code (ObjectDump and related classes) to be included in release builds, although these functions are not executed. This is a temporary fix; task QTBUG-6012 has been created for re-removing this code from release builds. Reviewed-by: Frans Englich (cherry picked from commit f3118df6af745759a73d8a9f40d1fa1a90a4385a)
* Freeze def files against 4.6.0Shane Kearns2009-11-196-8/+40
| | | | | | Reviewed-By: Trust Me (cherry picked from commit 1f6aa19209a7d22bb15bf0a0afb2d62200c0d3fa) (cherry picked from commit 2a444790abd05de2dd5aa546ad1745f911f2a73c)
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-11-197-6/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 7bdf90f753d25fb1b5628b0980827df11110ad5a ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-11-18 Paul Olav Tvete <paul.tvete@nokia.com> Reviewed by Simon Hausmann. [Qt] Make the QWebElement::render() test pass when pixmaps aren't 32 bit. * tests/qwebelement/tst_qwebelement.cpp: (tst_QWebElement::render): 2009-11-18 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Tor Arne Vestbø. Clarify and simplify the legal section in the overview documentation, after review with our legal team. * docs/qtwebkit.qdoc: 2009-11-18 Simon Hausmann <simon.hausmann@nokia.com> Reviewed and suggested by Tor Arne Vestbø. Fix the autotest after commit ecbb2c0dd21bfc197e1f7b53150ec9b1a1d8cb8f to compare the Qt::ImFont property's family against an explicitly previously configured family. * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::inputMethods): (cherry picked from commit 1ca2903b81c77573d37c5bd486b8d8e49a87ffc1)
* Compile with mixed carbon/cocoa universal builds.Morten Johan Sørvig2009-11-193-9/+23
| | | | | | | | | | | | | Moc got confused when Q3FileDialog was there in the carbon build but not in the cocoa build. (QT_MAC_USE_COCOA is defined by macros which moc does not evaluate) Fix this by porting Q3FileDialog to cocoa by using the compat functions in QFileDialog. revby:Prasanth Ullattil (cherry picked from commit e59d974ddf2f2a413611ba4d8594c6413499a645)
* Export QStateMachine::WrappedEvent and QStateMachine::SignalEventEskil Abrahamsen Blomfeldt2009-11-191-2/+2
| | | | | | | | | These two classes were missing exports. Since the accessors are inline, the bug would only be visible when someone tried to call the constructors of the classes. Reviewed-by: Kent Hansen (cherry picked from commit c7135e9b8d76e50daaa38d5d163687357878dc24)
* Fix the evaluation nag in binary installs with commercial licenses.Thiago Macieira2009-11-191-12/+14
| | | | | | | | | | | It wasn't generating any message, but it did think it was an evaluation install. So all Qt console applications produced an extra newline and the GUI ones showed the Qt logo briefly. I noticed because of the extra newline when building Qt itself. Reviewed-by: Trust Me (cherry picked from commit 732e0d01df867200546ddb5e6f8695f263e1ee0d)
* Application object must be constructed before QScriptEngineKent Hansen2009-11-191-1/+5
| | | | | | | | | | This is required due to the switch to the JavaScriptCore-based back-end. Instead of segfaulting somewhere inside JSC::initializeThreading(), call qFatal() when this constraint has been violated. Reviewed-by: Simon Hausmann (cherry picked from commit fb4e81bdc692efe0db9aa38dd2b941578c0f0370)
* remove unneeded JavaScriptCore.proKent Hansen2009-11-191-69/+0
| | | | | | | | | The file was erroneously imported from WebKit trunk. It is not used when building QtScript, and the only practical effect it has is to cause configure to spit out a warning. Reviewed-by: Simon Hausmann (cherry picked from commit 83c61c4dfb2425d92eced3b41d61b153a286a242)
* Fix QCombobox painting regression on WindowsOlivier Goffart2009-11-191-2/+0
| | | | | | | | | | Some style relies on this broken behaviour that was fixed in commit e1a81c96790bee72ee4fbd2b0c4a7b48078c4ec1 The text on the combobox uses the wrong palette role. Reviewed-by: jbache (cherry picked from commit a1e1867ae3cac6b54cd06e9fc0ad1aa0b476fe9d)
* LineEdit graphics are sometimes missing from webpages with s60styleSami Merilä2009-11-192-25/+43
| | | | | | | | | | | | | | | | | | | If the webpage does define BODY colors for background, it is possible that lineEdits are not drawn at all. Actually, they are drawn but with transparent background, which makes them near-invisible. This is due to that QS60Style tries to check if the themePalette has been changed and if it has forwards the drawing of that particular widget to common style. Common style unfortunately uses active style's palette to draw the widget. S60Style defines Base to be transparent (to get the theme background shine through) and common style tries to use Base to draw lineEdit. End result is transparent lineEdit on webpage. This fix makes more educated deduction when it tries to see if style has been changed. This is related to QTBUG-4885. Task-number: QTBUG-4885 Reviewed-by: Janne Koskinen (cherry picked from commit 75ebdd04f41dd75be1e046a1c54ced0bfb78a0f2)
* Crash when rendering a scene using DeviceCoordinateCacheGabriel de Dietrich2009-11-191-3/+6
| | | | | | | | | | | The execution flow would allow the widget the scene would be rendered on to be null. However this very widget was being used when using DeviceCoordinateCache to get the desktop size. We now skip this optimisation when no widget is given. Auto-test included. Reviewed-by: bnilsen Task-number: QTBUG-5904 (cherry picked from commit b6070e9a069219e4049fcf017d6a160b80bf37b7)
* Fix tst_QGraphicsView::inputMethodSensitivity autotestOlivier Goffart2009-11-191-0/+2
| | | | | | | | | | The problem was that the scene was not notified it lost the focus when it was disconnected from the view (with setScene) So when it got back the focus, nothing was updated because the scene thought it still had the focus. Reviewed-by: jasplin (cherry picked from commit c535df0f286826c5575ec00c7e4c3f811a73918b)
* Fixed Multi-length strings not implemented for float functionsOlivier Goffart2009-11-191-3/+19
| | | | | | | Task-number: QTBUG-5963 Reviewed-by: Oswald Buddenhagen Reviewed-by: Eskil (cherry picked from commit a73e660fd05bafc402d63d71e811a621e46f452d)
* Revert "Fix detection of linux-g++"Paul Olav Tvete2009-11-194-4/+4
| | | | | | | | | | This reverts commit 333bd2e761af8aaf6efd3d66eb028af046c4dfc2. The change broke compilation of QWS, since QtGui depends on glib, but doesn't link with it directly. This needs to be fixed properly, but not just before the release. Reviewed-by: Harald Fernengel (cherry picked from commit baab5f7e77c1216ede839766c97abef1a708b365)
* Fixed compilation on AIX 6.1 with xlC 10.1Samuel Rødal2009-11-194-6/+12
| | | | | | Task-number: QTBUG-3368 Reviewed-by: Thiago Macieira (cherry picked from commit 223b5de63e56c6c3dfbc5000b460baa653ab3f75)
* Update license headers to release version.Jason McDonald2009-11-193339-43446/+43446
| | | | Reviewed-by: Trust Me
* Softkeymanager to not update sofkeys when native s60 dialog is shownJason Barron2009-11-191-0/+4
| | | | | | | | | Fixes Qt Bug: QTBUG-5788 Softkeys do not change to dialog specific ones when native S60 dialog is being opened on top of Qt application Initial-patch-by: Markus Nolvi Reviewed-by: axis (cherry picked from commit 127164943f0783a4bb4d18834b5e002f08427e00)
* Complement Phonon for Symbian documentation.Frans Englich2009-11-191-0/+4
| | | | | Reviewed-by: Gareth Stockwell (cherry picked from commit e5f0b9568e969b55d0f3a84b6fc5d5f0de8d3f1f)
* Fix QGtkStyle crash when switching themes.Robert Griebl2009-11-192-31/+46
| | | | | | | | This is a workaround for a bug that we introduced with the QGtkStyle refactoring to properly support Maemo5. RevBy: jbache (cherry picked from commit d173dabf3e441bf4a16237df1a90e256ae525596)
* Fix multiple regressions in QGtkStyle caused by freetype fixesJens Bache-Wiig2009-11-192-13/+20
| | | | | | | | | | | | | | | | | Qt 4.6 reports smaller sizes for all fonts which means a lot of the size adjustments QGtkStyle does were now off. I have adjusted most of them including some fixes to menu items themselves. Note that the changes were introduced with this change: 04d18b38c38c5ff623b30366ea08d56128b9b7d0 We now also adapt to GNOME 2.16 style submenu arrow sizes. Combo boxes, line edits, spin boxes and push buttons should finally have a uniform height. Task-number: QTBUG-5753 Reviewed-by: thorbjorn (cherry picked from commit 5d4f58843bb1c8590986aa710dbea30525578a5f)
* Fix regression introduced in c08e708037d33271825ce6a6a1ac640e96b70c36João Abecasis2009-11-191-4/+2
| | | | | | | | | | | | When writing nothing to a file, not actually writing anything is not an error. Also, from a change introduced in the same commit, there is no point in checking for EOF when writing. Task-number: QTBUG-5847 Reviewed-by: Olivier Goffart (cherry picked from commit 72ee915bb0465549b7ca8e62d2af146cc44fdeac)
* Removing unnecessary chunking and stat'ing when reading QIODeviceJoão Abecasis2009-11-191-54/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chunk size increased to QIODEVICE_BUFFERSIZE (currently 16k) where chunking is still needed. Namely, on sequential devices and when QByteArray is unable to allocate a large enough buffer. This is necessary for backward compatibility Improved validation and prevention of overflow in maxSize argument. Updated autotest that relied on a null QByteArray when no data was available and no errors were found. The only guarantee we should be providing in this case is an empty result -- even though that behavior is preserved for the time being. Affected functions: * QIODevice::read(qint64 maxSize) Chunking will still happen for large maxSize (i.e., QByteArray resize fails), where it could be used as a synonym for QIODevice::readAll(). No stat'ing performed. Read from device continues for as long as it is successful. Stops if an error occurs or if we get less data than requested. * QIODevice::readAll() Chunking is performed for sequential devices where total size wouldn't be known beforehand. For sequential devices, reading continues as long as data is returned, even if less than requested. Non-sequential devices will be stat'ed once. If QIODevice::size returns 0, this is taken to mean unknown size and chunking is performed. Otherwise, a single read request is made for the specified size. On failure to resize QByteArray, nothing is returned. * QIODevice::readLine(qint64 maxSize) Chunking is performed for maxSize == 0, or if we can't allocate a large enough buffer. No stat'ing performed at this level. Read from device continues until EOL is found, as long as we get all requested data. Task-number: QT-2347 Reviewed-by: Thiago Macieira Reviewed-by: Miikka Heikkinen (cherry picked from commit 1e6b424b692b20dcfec920f8d3563e520ec1ff05)
generated by cgit v0.12 at 2024-08-22 19:48:43 (GMT)