summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix regression introduced in c08e708037d33271825ce6a6a1ac640e96b70c36João Abecasis2009-11-172-4/+14
| | | | | | | | | | | 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
* Fix QIODevice::getChar optimizationJoão Abecasis2009-11-171-46/+12
| | | | | | | | | | | | | | | In Text mode there would be a huge penalty on each '\r' found even if the internal buffer was not exhausted, because we would repeatedly remove the '\r' from the buffer and put it back it. Before following through to the unoptimized code, anyway. Instead, we now loop over the internal buffer until we find a suitable character. Reduced code duplication by having QIODevice::getChar directly call QIODevice::read and letting compilers do their job. Reviewed-by: Markus Goetz
* Remove needless loop in QIODevice::seekJoão Abecasis2009-11-171-12/+7
| | | | | | | | | | | Either the buffer has more data than is being skipped and it can be cleared or it doesn't and we must skip it. If the total size of QRingBuffer exceeds INT_MAX there'll be bigger problems (e.g., QRingBuffer::size() will overflow) that can only be handled there and there's no point trying to work around them here. Reviewed-by: Markus Goetz
* There should only be one write buffer at a time in QFileJoão Abecasis2009-11-171-1/+1
| | | | | | | | | | | To be sure, we should explicitly use the size of that buffer and not the whole QRingBuffer when flushing the data. With this change, we make violations of the one-buffer-rule explicitly fail on flush(), but we avoid corrupting data and reading past the buffer's end. Reviewed-by: Markus Goetz
* qttracerelay: Handle wrong command line parametersMarkus Goetz2009-11-171-0/+6
| | | | | Task-number: QTBUG-5550 Reviewed-by: TrustMe
* configure.exe: fix when configured with -openssl-linkedPeter Hartmann2009-11-172-1/+1
| | | | | | | | | | | | | before, when configured with -openssl-linked, configure.exe hang, because of the following: We were checking for XQMAKESPEC via something like 'dictionary["XQMAKESPEC"] == "someValue"' , which added the XQMAKESPEC value to the dictionary. Later (line 3030), we checked whether XQMAKESPEC was set (which was now true), and we used the value although it was empty. Reviewed-by: Thiago Macieira Reviewed-by: Denis Dzyubenko
* Fix inputMethods QWebPage autotest failure.Simon Hausmann2009-11-161-3/+3
| | | | | | | | Skip the part that tests for Qt::ImFont after the earlier patch that resolves the returned fonts. We can't query for the generic family anymore in this test. Reviewed-by: Trust me
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-11-1656-1446/+3491
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( ca38203fba92cf48d59328403f64036907fd3433 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-11-16 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Kenneth Rohde Christiansen. API documentation fixes. * Api/qgraphicswebview.cpp: Removed duplicate docs. * Api/qwebelement.cpp: Added missing docs. * Api/qwebsettings.cpp: Ditto. 2009-11-14 Antonio Gomes <tonikitoo@webkit.org> Reviewed by Antti Koivisto. [Qt] Broken back/forward after using ErrorPageExtension to set error page https://bugs.webkit.org/show_bug.cgi?id=30573 Implemented autotests for covering the back/forward reset problem involving error pages. * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::errorPageExtension): 2009-11-16 Holger Hans Peter Freyther <zecke@selfish.org> Reviewed by NOBODY (OOPS!). [Qt] Do not show the QWidget when the WebCore::Widget is hidden https://bugs.webkit.org/show_bug.cgi?id=31203 The clipping code was making a QWidget visible even if the WebCore::Widget was hidden. Fix the bug by calling setVisible only if the WebCore::Widget is shown. * WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::QtPluginWidget::show): Override WebCore::Widget (WebCore::QtPluginWidget::hide): Override WebCore::Widget (WebCore::QtPluginWidget::handleVisibility): New method to call setVisible when we are visible (FrameLoaderClientQt::createPlugin): Hide the QWidget by default 2009-11-09 Benjamin Poulain <benjamin.poulain@nokia.com> Reviewed by Kenneth Rohde Christiansen. https://bugs.webkit.org/show_bug.cgi?id=30628 Add an API to get all the attributes from a QWebElement. * Api/qwebelement.cpp: (QWebElement::attributesName): * Api/qwebelement.h: * tests/qwebelement/tst_qwebelement.cpp: (tst_QWebElement::listAttributes): 2009-11-13 Andras Becsi <becsi.andras@stud.u-szeged.hu> Reviewed by Kenneth Rohde Christiansen. [Qt] Enable Page Cache if setMaximumPagesInCache needs it. This fixes https://bugs.webkit.org/show_bug.cgi?id=31266. * Api/qwebsettings.cpp: (QWebSettingsPrivate::apply): (QWebSettings::setMaximumPagesInCache): 2009-11-13 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> Reviewed by Simon Hausmann. Update documentation for the Qt API * Api/qgraphicswebview.cpp: * Api/qwebelement.cpp: * Api/qwebframe.cpp: * Api/qwebsettings.cpp: * Api/qwebview.cpp: 2009-11-13 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> Reviewed by Simon Hausmann. Use correct install-path when running qdoc3 * docs/docs.pri: 2009-11-12 Antonio Gomes <tonikitoo@webkit.org> Reviewed by Jan Alonzo. [Qt] Various doc fixes https://bugs.webkit.org/show_bug.cgi?id=31358 QWebPage's constructor docs are mentioning "QWebView": "Constructs an empty QWebView with parent". * Api/qwebpage.cpp: 2009-11-11 Antonio Gomes <tonikitoo@webkit.org> Reviewed by Kenneth Christiansen. [Qt] Various doc fixes https://bugs.webkit.org/show_bug.cgi?id=31358 Fixed wrong documentation: item's dimensions do fit to Web page content by default. Kenneth agreed to land this as a followup patch to the just landed documentation patch. * Api/qgraphicswebview.cpp: 2009-11-11 David Boddie <dboddie@trolltech.com> Reviewed by Kenneth Christiansen. [Qt] Various doc fixes https://bugs.webkit.org/show_bug.cgi?id=31323 Fixed and synchronized QWebView related documentation. * Api/qgraphicswebview.cpp: * Api/qwebview.cpp: 2009-11-09 Laszlo Gombos <laszlo.1.gombos@nokia.com> Reviewed by Kenneth Rohde Christiansen. [Qt] Few classes have virtual functions but non-virtual destructor https://bugs.webkit.org/show_bug.cgi?id=31269 * Api/qgraphicswebview.cpp: (QGraphicsWebViewPrivate::~QGraphicsWebViewPrivate): Add virtual destructor. 2009-10-30 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> Reviewed by NOBODY (OOPS!). [Qt] Use the default timeout interval for JS as the HTML tokenizer delay for setHtml() This ensures that long-running JavaScript (for example due to a modal alert() dialog), will not trigger a deferred load after only 500ms (the default tokenizer delay) while still giving a reasonable timeout (10 seconds) to prevent deadlock. https://bugs.webkit.org/show_bug.cgi?id=29381 * Api/qwebframe.cpp: Document the behaviour * WebCoreSupport/FrameLoaderClientQt.cpp: set the custom tokenizer delay for substitute loads * tests/qwebframe/tst_qwebframe.cpp: Add test 2009-11-13 Jocelyn Turcotte <jocelyn.turcotte@nokia.com> Reviewed by Kenneth Rohde Christiansen. [Qt] Fix initial QWebView focus behavior. focusController->setFocused(true) was not always called. https://bugs.webkit.org/show_bug.cgi?id=31466 * Api/qwebpage.cpp: (QWebPagePrivate::focusInEvent): 2009-11-12 Benjamin Poulain <benjamin.poulain@nokia.com> Reviewed by Kenneth Rohde Christiansen. Custom printing shrink factors https://bugs.webkit.org/show_bug.cgi?id=29042 This reverts commit r49769. The public API for this needs to be reviewed before its inclusion in Qt. * Api/qwebsettings.cpp: (QWebSettingsPrivate::apply): (QWebSettings::QWebSettings): * Api/qwebsettings.h: Update documentation for the Qt API * Api/qgraphicswebview.cpp: * Api/qwebelement.cpp: * Api/qwebframe.cpp: * Api/qwebsettings.cpp: * Api/qwebview.cpp: 2009-11-13 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> Reviewed by Simon Hausmann.
* tst_qtcpsocket: Check if proper connection error occursMarkus Goetz2009-11-161-0/+43
| | | | | | | | We have a bug in our way of calling select() on Windows, this test case triggers it. Task-number: QTBUG-5799 Reviewed-by: thiago
* Prospective Symbian/abld build fixSimon Hausmann2009-11-161-1/+1
| | | | | | | Include QtNetwork as module to work around abld issue of local includes not working. Reviewed-by: axis
* Fixed swipe gesture on the Mac.Denis Dzyubenko2009-11-161-1/+1
| | | | | | | Swipe on Mac is a singleshot gesture which goes directly to the finished state (fake gesture started event will be sent by Qt in this case). Reviewed-by: Richard
* doc: Fixed qdoc errors.Martin Smith2009-11-162-1/+9
|
* Doc: Adding explanation to QTextEditMorten Engvoldsen2009-11-161-1/+1
| | | | | | | Specifying explanation on tabStopWidth : int QTBUG-5470 David Boddie
* doc: Fixed qdoc errors.Martin Smith2009-11-162-4/+11
|
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Morten Engvoldsen2009-11-164-17/+39
|\
| * doc: Fixed qdoc according to Bjarne's recommendation.Martin Smith2009-11-164-17/+39
| | | | | | | | | | | | Someone had changed an operator==() and an operator!=() from single parameter members to two-parameter friends but hadn't changed the qdoc comments.
* | Doc: Added short explanation to textEdit->toPlainText()Morten Engvoldsen2009-11-161-1/+3
|/ | | | Explaining(nbsp) the exception in character conversion.
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Morten Engvoldsen2009-11-161-6/+6
|\
| * Don't sendPostedEvents() twice when calling processEvents() manuallyBradley T. Hughes2009-11-161-6/+6
| | | | | | | | | | | | | | | | | | Commit fe0f807e1f4e7510c6d8cddd848bcbc25e358651 could cause sendPostedEvents() to be called twice, which caused regressions in tests/auto/qtimer. Fix this by only calling sendPostedEvents() "manually" if we didn't see a WM_QT_SENDPOSTEDEVENTS message. Reviewed-by: Prasanth Ullattil
* | Doc: Correcting contact info.Morten Engvoldsen2009-11-161-3/+3
|/ | | | Correcting contact info. Removed email and redirecting reader to Jira
* Designer crashes in Mac Cocoa port.Prasanth Ullattil2009-11-161-0/+3
| | | | | | | | | When we reparent a widget, it has to be removed from the old view before it is added to the new one. Otherwise this can cause the old view to have an invalid first responder, causing crash. Task-number: QTBUG-5327 Reviewed-by: Denis
* Fix compilation without Qt3support (on Windows CE, Symbian)Simon Hausmann2009-11-161-1/+1
| | | | | | Don't use QFile's Qt3support member, use fileName() instead. Reviewed-by: Trust me
* Fix input method support on widgets that have a focus proxy set.Simon Hausmann2009-11-133-9/+77
| | | | | | | | | When enabling/disabling a widget or changing its InputMethodEnabled attribute, use the focus proxy widget's input context for reset and for setting the focus widget on the input context. Task-number: QTBUG-5781 Reviewed-by: Denis
* Fix S60 input method not showing up in editable QGraphicsTextItemsSimon Hausmann2009-11-132-2/+6
| | | | | | | | Correctly set the ItemAcceptsInputMethod flag in setTextInteractionFlags. Reviewed-by: Andreas Reviewed-by: axis Reviewed-by: Janne Koskinen
* Fix compilation on solaris-g++-64.Thiago Macieira2009-11-131-0/+1
| | | | | | | | Add the "reserved" member to QVectorData in that configuration. Since this is only about the bootstrapped version of Qt, there are no binary compatibility issues. Reviewed-by: Bradley T. Hughes
* Autotest: use the new QDBusServiceWatcher classThiago Macieira2009-11-131-13/+9
|
* Merge branch '4.6' of ../qt-doc-team into 4.6David Boddie2009-11-132-0/+267
|\
| * Doc: Added missing example documentation.David Boddie2009-11-132-0/+267
| | | | | | | | Reviewed-by: Trust Me
* | Doc: Add link to the Symbian Introduction.Volker Hilsheimer2009-11-131-0/+2
| |
* | Doc: fix typo.Volker Hilsheimer2009-11-131-1/+1
| | | | | | | | Fixes: QTBUG-5146
* | xmlpatterns autotest: adjust line endingsPeter Hartmann2009-11-131-1/+3
| | | | | | | | | | | | | | all test machines have "autocrlf = false", we need to adjust the tests to that. Reviewed-by: Frans Englich
* | xmlpatterns: unify error messages in generator and generated filePeter Hartmann2009-11-132-2/+2
| | | | | | | | | | | | | | An error message was changed in a cpp file, and this patch changes it also in the file it is generated from. Reviewed-by: Frans Englich
* | Introduce QFileNetworkReply in QNetworkAccessManagerMarkus Goetz2009-11-134-0/+326
| | | | | | | | | | | | | | | | | | | | | | | | | | The QFileNetworkReply is a wrapper around QFile that has therefore similar performance. This avoids the usage of the unperformant QNetworkAccessFileBackend. The benchmark qfile_vs_qnetworkaccessmanager shows that the QFileNetworkReply's performance is better than 0.9x of QFile compared to QNetworkAccessFileBackend which had about 0.5x of QFile. Reviewed-by: Peter Hartmann
* | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-1351-292/+523
|\ \
| * | Add an entry to the changelog about the XUnit support in QtTestThiago Macieira2009-11-131-1/+4
| | |
| * | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1350-291/+519
| |\ \
| | * | Fixed a crash when configuring an audio effect with the Phonon dialogThierry Bastian2009-11-121-2/+3
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5731 Reviewed-by: jan-arve
| | * | Merge commit 'widget/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-1149-289/+516
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qbrush.cpp
| | | * | Fixed: QFontComboBox emits the currentFontChanged() signal twiceOlivier Goffart2009-11-112-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2438 Reviewed-by: Thierry
| | | * | QAbstractScrollArea: Wheel over a scrollarea that has only one horizontal ↵Olivier Goffart2009-11-113-8/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scrollbar If the vertical scrollbar is hidden, scroll using the other scrollbar. Reviewed-by: Thierry Task-number: QTBUG-1760
| | | * | Small caps font variant wouldn't be used when defined through style sheetsGabriel de Dietrich2009-11-112-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The font comparison (operator==) didn't check the capital attribute, which is the one responsible for this variant. Now it does. Auto-test updated. Reviewed-by: Samuel Reviewed-by: Olivier
| | | * | Fix Font combobox: one can set the current font without it being changedThierry Bastian2009-11-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5693 Reviewed-by: ogoffart
| | | * | QKeySequence::mnemonic: add a warning if the text contains severals '&'Olivier Goffart2009-11-112-9/+56
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5667 Reviewed-by: Gabriel
| | | * | Revert "Always set a clip on the painter in QGraphicsView."Andreas Aardal Hanssen2009-11-112-75/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4bf7f90a27377f439e86d6175e5e3cdebd131be0. The change is already reverted in kinetic-declarativeui. Reviewed-by: Warwick Allison Reviewed-by: bnilsen
| | | * | QDockWidget also emits dockLocationChanged when the state is restoredThierry Bastian2009-11-102-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...on the main window. Task-number: QTBUG-1304 Reviewed-by: ogoffart
| | | * | Make it possible for QMainWindow to restore the geom of undocked widgetThierry Bastian2009-11-102-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5663 Reviewed-by: ogoffart
| | | * | Fixed: Stylesheet and background image issue in ScrollAreaOlivier Goffart2009-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using background-image and background-attachement: scroll and background-repeat: no-repeat The rectangle used to draw the image was not correctly computed. Reviewed-by: Thierry Task-number: QTBUG-3783
| | | * | Menubars in dual screen mode now popup the menus on the correct screenThierry Bastian2009-11-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an item is split then its menu appears on the screen which contains most of it. Task-number: QTBUG-773 Reviewed-by: ogoffart
| | | * | Replace most processEvents() with sendPostedEvents().Jan-Arve Sæther2009-11-101-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a change Brad did to the event dispatcher we are no longer guaranteed that processEvents will process *all* events in the event queue. (most of the time _it_will_ process all events) I only replaced processEvents for the tests that failed.
| | | * | Replace most processEvents() with sendPostedEvents().Jan-Arve Sæther2009-11-101-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a change Brad did to the event dispatcher we are no longer guaranteed that processEvents will process *all* events in the event queue. (most of the time _it_will_ process all events) I only replaced processEvents for the tests that fail.