summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-02-0313-59/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( ca7b2e1e1ca558050cf49dd8f7c9b35e4b9d4df5 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-01-28 Trond Kjernåsen <trond@trolltech.com> Reviewed by Simon Hausmann. [Qt] Fix for endless print loop when printing web pages * Api/qwebframe.cpp: (QWebFrame::print): 2010-01-26 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Kenneth Rohde Christiansen. [Qt] Show comboboxes on Maemo 5 https://bugs.webkit.org/show_bug.cgi?id=34088 Don't try to show the combobox by simulating a mouse event from QCursor::pos() to get the combobox position right. The position on Maemo 5 is independent from the mouse and there's no QCursor::pos(). * WebCoreSupport/QtFallbackWebPopup.cpp: (WebCore::QtFallbackWebPopup::show): 2010-01-26 Holger Hans Peter Freyther <zecke@selfish.org> Reviewed by Simon Hausmann. [Qt] JavaScript prompt is currently broken https://bugs.webkit.org/show_bug.cgi?id=30914 In r52152 a patch was landed to convert a null QString to an empty WebCore::String in case the prompt was accepted but the default implementation returned the null QString. The patch tried to avoid assign to result twice and was not checking the QString if it is null but the default value. This lead to always returning an empty string on successful prompts. Fix it by checking the variable 'x' for isNull. The manual test case used didn't cover the case of non empty input, replace it with an automatic test case that should cover all cases. * WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::runJavaScriptPrompt): Fix the bug. * tests/qwebpage/tst_qwebpage.cpp: Add automatic test case (JSPromptPage::JSPromptPage): (JSPromptPage::javaScriptPrompt): (tst_QWebPage::testJSPrompt): (cherry picked from commit 4919286e4e9de496514f28432a81deb91d530fd1)
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-02-032-3/+5
| | | | | | | | | ( a54fd11a3abcd6d9c858e8162e85fd1f3aa21db1 ) Changes in WebKit/qt since the last update: Fix from Girish (cherry picked from commit df4d9f46e370a35c3178d95cae2a873e8a23ddb5)
* New Symbian signed sqlite3.sis with backup_registration.xmlMiikka Heikkinen2010-02-031-0/+0
| | | | | | | | | Sqlite3.sis was repackaged with backup_registration.xml to support device backup/restore on Symbian Task-number: QTBUG-7518 Reviewed-by: TrustMe (cherry picked from commit 11bfc79b0f832f6544843ed13ef0efbcf51b22e9)
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-02-036-13/+45
| | | | | | | | | | | | | | | | | ( 0bc66e2d86149e0fb6a33428e4f23ebfe83bfde4 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-01-25 Janne Koskinen <janne.p.koskinen@digia.com> Reviewed by Simon Hausmann. [Qt] Phone backup support for QtWebkit for Symbian devices. https://bugs.webkit.org/show_bug.cgi?id=34077 * symbian/backup_registration.xml: Added. (cherry picked from commit efce7393cb8c6d7df52539dd7b7ac616cf46036c)
* Added Symbian backup & restore support for Qt.sis and fluidlauncher.sis.Miikka Heikkinen2010-02-034-2/+22
| | | | | | Task-number: QTBUG-7518 Reviewed-by: Janne Koskinen (cherry picked from commit ad1bc0ae6500092cbfb75ab869b3757add7ba4b7)
* Documented limitations of add/setLibraryPath(s) on Symbian OSMiikka Heikkinen2010-02-031-0/+8
| | | | | | | | | | Symbian OS limits applications to loading libraries only from /sys/bin directory, so user defined library paths can only be useful for locating Qt extension plugin stubs. Task-number: QTBUG-7517 Reviewed-by: Janne Koskinen (cherry picked from commit 00c4f1dbd8484ec887aea259021f5089334f45d7)
* Avoided the loss of preedit text when losing focus on Symbian.axis2010-02-031-6/+2
| | | | | | | | | | | | | It's annoying to lose preedit (e.g. underlined) text everytime a focus switch occurs, especially because it can sometimes happen while inside the FEP menus, such as "Insert symbol". Fixed by committing the text in reset() implementation, rather than discarding it. Task: QTBUG-7439 RevBy: Sami Merila (cherry picked from commit 01952109596f7563b43b12554fda0e4abc9a51ef)
* Made characters in a password field briefly visible while typing.axis2010-02-032-2/+55
| | | | | | | | | | | | This was done by intercepting key events with text in them, and temporarily submit them as preedit text instead of real input text. Currently it does not work in WebKit, but that is because WebKit hides preedit text as well, which is a bug of its own. RevBy: Simon Hausmann Autotest: Manual testing went fine (cherry picked from commit 87ee066fc86cf6410fd008a8a5d31122a7d5cc11)
* Fixed def files on Symbian.axis2010-02-032-4/+4
| | | | (cherry picked from commit 7b7f13d7ee1d5f93ee63a635c875accce918896a)
* Rebuild configure.exe for latest change.Jason McDonald2010-02-031-0/+0
| | | | Reviewed-by: Trust Me
* Fixed the URL of known issues wiki page in docsMiikka Heikkinen2010-02-032-3/+3
| | | | | | | | Changed the URL to be version independent. Task-number: QTBUG-7295 Reviewed-by: TrustMe (cherry picked from commit 9904192f956a75a3e007e1aec99ab7db433048ce)
* Catch by reference rather than by valueIain2010-02-031-1/+1
| | | | | | | | | | Catching by value causes GCC to use the compiler support function __cxa_get_exception_ptr. This is not available in the compiler support libraries on Symbian OS prior to Symbian^3. Catching by reference avoids this problem. Reviewed-by: mread (cherry picked from commit ca3ce9263eaef963d934d221bd1dec37e7bf0871)
* Updates to new Symbian DEF file systemJason McDonald2010-02-022-8/+10
| | | | | | | | | | | | | | | | | | | | Fix bug in qbase.pri, where it tested QT_CONFIG instead of CONFIG to see if DEF files were enabled, when setting the DEF file path Fix bug in configure.exe implementation, where SYMBIAN_DEFFILES was defined when testing for its value, due to incorrect use of QMap::operator[] Tidy up configure.exe help for new def files option Task-number: QTBUG-6556 Reviewed-by: Jason Barron Reviewed-by: Janne Koskinen (cherry picked from commit f98901601fee4947fd0248f113b3a39a142292d5) Conflicts: configure.exe
* Rebuild configure.exe.Jason McDonald2010-02-021-0/+0
| | | | | Task-number: QTBUG-7480 Reviewed-by: Trust Me
* Change to release license headers.Jason McDonald2010-02-017484-97422/+97422
| | | | Reviewed-by: Trust Me
* doc: Included a note showing the actual value of UserType.Martin Smith2010-02-011-0/+2
| | | | | Task-number: QTBUG-7606 (cherry picked from commit 634eac05a6475280f2a1cc6e41e23c0c35628247)
* Assistant: Fix unintended tr context change.ck2010-02-011-10/+10
| | | | | | | Bug was introduced by af30aeb6a1ebb7307f06c122c0c93d152f4d958c Contributed-by: Ritt Konstantin (cherry picked from commit cefda8e4491ff82c96fceea2091f69160f8ae584)
* Optimise QStringList::join by pre-allocating the final size.Thiago Macieira2010-02-011-0/+10
| | | | | | | | | | This avoids a number of reallocations due to appending. This patch was contributed to us. Task-number: QTBUG-3242 Reviewed-by: Thiago Macieira (cherry picked from commit 7461ed5227e3002c4a6f74d458aa0255b7c1217d)
* audiodevices example: no devices availableKurt Korbatits2010-02-011-1/+4
| | | | | | | | audio-backend option was not being written out to qconfig.pri Task-number:QTBUG-7782 Reviewed-by:Justin McPherson (cherry picked from commit 65493e69454f8914d0ae1607e5a071ea07bb7017)
* Compile with no-webkit - add missing semi-colons.Rhys Weatherley2010-02-011-2/+2
| | | | | Reviewed-by: Sarah Smith (cherry picked from commit 416cf8a5a9384f942282a2c715ec4832eeba001d)
* Fix header labels on mac with rtlJens Bache-Wiig2010-01-291-2/+0
| | | | | | | | | | The removed code simply reduces the size of the rect when running with RightToLeft without compensating anywhere else. It seems to be a leftover from a previously removed piece of code. Reviewed-by: richard Task-number: QTBUG-6882 (cherry picked from commit b4d60000981e298b7e40605a284f2b8b9b18fff5)
* Fix a regression: icons with slightly wrong ICO header did not load.Jan-Arve Sæther2010-01-299-3/+14
| | | | | | | | | | | Regression was introduced by commit fd9cdaa55da455b90eacec571aeb2c84fa55f7e0. Also fix a completely broken autotest that didn't actually test anything. Task-number: QTBUG-7688 Reviewed-by: Alexis (cherry picked from commit 0585997b7dbe25ece9f60684171c16206d10d65f)
* doc: Corrected some bad grammar.Martin Smith2010-01-291-4/+3
| | | | | Task-number: QTBUG-7640 (cherry picked from commit aebc34877fb17405e8e5915760012a82d0178b97)
* doc: Specified default values for constructors.Martin Smith2010-01-291-0/+5
| | | | | Task-number: QTBUG-7628 (cherry picked from commit a2c153f01c9b12eb6f1d46ffaf5533bb7b3695e2)
* doc: Corrected misspelled word.Martin Smith2010-01-291-1/+1
| | | | | Task-number: QTBUG-7626 (cherry picked from commit fc7b48c2d2fb5926fa0b50f378fadc583564b7b8)
* Mac: Calling showFullScreen() then showNormal() on a widget results in top ↵Carlos Manuel Duclos Vergara2010-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | menu hiding. The problem here was the way we entered Full Screen Mode. We were using "kUIModeAllSuppressed" which does the following according to the manual: kUIModeAllSuppressed All system UI elements (including the menu bar) are hidden. However, these elements may automatically show themselves in response to mouse movements or other user activity. I changed it to "kUIModeAllHidden", which does the following: All system UI elements (including the menu bar) are hidden. To prevent a change of behavior I added the following option to the SetSystemUIMode: kUIOptionAutoShowMenuBar This flag specifies that the menu bar automatically shows itself when the user moves the mouse into the screen area that would ordinarily be occupied by the menu bar. Only valid for the presentation mode kUIModeAllHidden. Task-number: QTBUG-7625 Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 9d207f042ea135eda6bcd91c47d581914470fa6d)
* doc: Document the "Type" enum value as a const in variable.Martin Smith2010-01-292-0/+22
| | | | | Task-number: QTBUG-7605 (cherry picked from commit aa854adabedbe5ff95d02c0371ae90d85921061c)
* Don't use QDebug references. Instead, pass by value.Thiago Macieira2010-01-292-2/+2
| | | | | | | | | If you use refs, then you can't use this operator as the first argument, since qDebug() returns QDebug by-value (an rvalue temporary). That cannot be bound to a non-const ref. Task-number: QTBUG-7593 (cherry picked from commit 0c822ea63a8b2b0c32c68a49de81e0c02548f059)
* 'test -e' is a bashism. It's not available in traditional sh.Thiago Macieira2010-01-291-2/+2
| | | | | | Task-number: QTBUG-7549 Reviewed-By: Markus Goetz (cherry picked from commit 206fffb5927bae05a8d8b81c810c33a1c7a70a69)
* Drawing fake buttons using QMacStyle+QStyleOptionViewItemV4 lead to crash.Carlos Manuel Duclos Vergara2010-01-291-72/+104
| | | | | | | | | | | | | | The problem here is the fact that we "trusted" the user when the widget type was specified. The fix consists in checking the result of the conversions, if the conversion was successful (i.e. the widget was of the type specified by the user) then we proceed as usual. If the conversion was not successful (i.e. wrong widget type) then we ask the style for a sensible size. I modified this for QPushButton, QSlider and QToolButton. Task-number: qtbug-7522 Reviewed-by: jbache (cherry picked from commit f92e9c32160ca32b93173dafad2734963528446d)
* Better support for user-generated binary shadersRhys Weatherley2010-01-291-3/+35
| | | | | | | | | | | | | | | | | | | | | If the user provided their own shader with glShaderBinary(), QGLShaderProgram::addShader() would refuse to add it because it wasn't marked as "compiled". According to the OpenGL/ES 2.0 specification: "It is permissible to attach a shader object to a program object before source code has been loaded into the shader object or before the shader object has been compiled." Based on this, the compile check has been removed from addShader() which should make supporting binary shaders easier. Similarly, link() and programId() have been modified to support applications that use glProgramBinaryOES() to specify program binaries. Task-number: QTBUG-7490 Reviewed-by: Tom Cooksey (cherry picked from commit 6b6b206ed8634323570712e003fc159fbf5f8303)
* Qt/Cocoa Event Dispatcher Problem in modal dialogsRichard Moe Gustavsen2010-01-291-1/+1
| | | | | | | | | | | | | The problem is that we didn't check if the event dispatcher was interrupted before starting to wait for more events. This patch will do the interrupt test after processing modal session events, and just before starting to wait. This will fix applications that expects e.g an event loop to exit immidiatly upon a signal from a timer (without the need for the user to generate e.g. a mouse event to stop the wait). Task-number: QTBUG-7503 Reviewed-by: cduclos (cherry picked from commit 8cdab74082019c0b8a57883a11aa5093a644abdd)
* QNativeSocketEngine: Also handle unknown errors from socket engineMarkus Goetz2010-01-291-0/+5
| | | | | | | Task-number: QTBUG-7316 Task-number: QTBUG-7317 Reviewed-by: thiago (cherry picked from commit ef89c6a9f39924a3c8366ad9522b42e7b1915b01)
* Crash when deleting QMainWindow with native toolbar on Cocoa.Prasanth Ullattil2010-01-291-3/+9
| | | | | | | | | | | The crash happens while processing a paint message received by the NSToolbar after the corresponding QToolbar has been destroyed. So while cleaning up the toolbar, the view needs to be detached from the custom toolbar item. Task-number: QTBUG-7305 Reviewed-by: Carlos Manuel Duclos Vergara (cherry picked from commit c56ede1d6f5082cd10c310d473779cfea3363fe6)
* QNativeSocketEngine_win: Don't mess with linger settingsMarkus Goetz2010-01-291-2/+4
| | | | | Reviewed-by: thiago (cherry picked from commit 855ce69f17f570bc91e02bfb34d9e3f1699b3b18)
* Fixes visibility update missing when doing setParentItem on graphicsitemLeonardo Sobral Cunha2010-01-284-36/+127
| | | | | | | | | | Calling setParentItem is causing the previous opacity/visible updates to be discarded because the dirty flags were not propagated to the new parent. Also removed some unnecessary 'markDirty' and 'update' calls. Task-number: QTBUG-6738 Reviewed-by: bnilsen
* Stabilize tst_QGraphicsScene::polishItems2 (new test)Bjørn Erik Nilsen2010-01-281-2/+2
| | | | | | We are only interested in getting the posted MetaCall events delivered, so we can get away with sendPostedEvents() instead of processEvents(). Makes the test also pass on Mac g++ carbon 32.
* Updated docs regarding QGLWidget::renderText() limitations.Trond Kjernåsen2010-01-281-0/+7
| | | | Reviewed-by: Trust Me
* Added optimization flag to QGraphicsItemPrivate.Samuel Rødal2010-01-282-0/+25
| | | | | | | Avoid traversing the whole child hierarchy when opacity changes unless there are children with graphics effects. Reviewed-by: Bjørn Erik Nilsen
* Fixed child items with graphics effects not inheriting opacity.Samuel Rødal2010-01-283-6/+57
| | | | | | | We need to invalidate the graphics source pixmap cache for both child items and parent items when changing the opacity of a graphics item. Reviewed-by: Bjørn Erik Nilsen
* Made the trace replayer handle limited resolution cases better.Samuel Rødal2010-01-281-6/+22
| | | | | | Simply skip the updates that are outside the replay widget's bounds. Reviewed-by: Gunnar Sletta
* Small optimization in raster paint engine.Samuel Rødal2010-01-281-2/+2
| | | | | | Don't repeatedly update the pen / brush if no pen / brush is set. Reviewed-by: Gunnar Sletta
* Another ASSERT while deleting spansGabriel de Dietrich2010-01-282-1/+11
| | | | | | | | | That rare case when we are deleting the last span was not being taken care of. Unbelievable but true. Auto-test included. Reviewed-by: Thierry Reviewed-by: leo Task-number: QTBUG-6004
* Potential crash when adding items from QGraphicsWidget::polishEvent().Bjørn Erik Nilsen2010-01-283-18/+68
| | | | | | | | | | | These were processed immediately, so there was a fair chance that we could end up doing a virtual function call on items that were not fully constructed. This patch is also an optimization, since we never remove anything from the vector. Auto-test included. Reviewed-by: Jan-Arve
* QGraphicsWidget is painted twice on the inital show.Bjørn Erik Nilsen2010-01-284-8/+43
| | | | | | | | | | | | | Problem occured when doing something in the polishEvent() which eventually ended up as an update(). The problem was that in QGraphicsScene::addItem we scheduled a polish event after scheduling an update, resulting in update requests being processed before polish requests. Auto-test included. Task-number: QTBUG-6956 Reviewed-by: alexis
* Improve DEF file enable/disable mechanism on SymbianIain2010-01-285-27/+68
| | | | | | | | | | | | | | | | | | Provide configure flag to enable/disable the use of DEF files on Symbian. A useful side-effect was that it cleaned up how we control DEF files from qbase.pri and in WebKit. -nokia-developer still disables DEF files, as it triggers the autotest exports, which are not frozen into the DEF files. Disabling DEF files means that there is no BC with previously released versions of Qt, so this should only be used for development purposes. .pro files can specify custom locations for DEF files by setting defFilePath. Task-number: QTBUG-6556 Reviewed-by: Jason Barron
* Fix QPainter::redirection() to pass autotest.Gunnar Sletta2010-01-281-3/+2
| | | | Reviewed-by: Trond
* revert parts of 10392eef4fd4f9Joerg Bornemann2010-01-281-26/+24
| | | | | | We can't call QCOMPARE from within a nested function, because the return statement will just exit that function. VERIFY_COLOR can't be turned into a function this way.
* Move avkon component transparency check to app initialization.Jani Hautakangas2010-01-284-34/+23
| | | | Reviewed-by: Sami Merila
* Use HighlightAllOccurrences to have highlighting after full text search.kh12010-01-282-36/+67
| | | | | | | | Also use HighlightAllOccurrences to have highlighting during type and search. Some more refactoring. Task-number: QTBUG-3335 Reviewed-by: ck