summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added QTextListFormat::ListUpperRoman and QTextListFormat::ListLowerRoman ↵Nils Jeisecke2009-07-1311-7/+129
| | | | | | | for roman numbering of lists as supported by HTML/ODF Reviewed-by: Olivier Goffart Merge-request: 681
* Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-07-131-0/+1
|\
| * Fix initialization of the HTML 5 offline storage.Simon Hausmann2009-07-131-0/+1
| | | | | | | | | | | | Place the databases into the normal data location. Reviewed-by: Ariya
* | Removed two generated files.Simon Hausmann2009-07-132-43/+0
| | | | | | | | | | | | They were added by accident. Nevermind :) Reviewed-by: Trust me
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-07-1321-178/+390
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp src/3rdparty/webkit/JavaScriptCore/generated/Grammar.h src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp src/3rdparty/webkit/WebCore/generated/CSSGrammar.h src/3rdparty/webkit/WebCore/generated/Grammar.cpp src/3rdparty/webkit/WebCore/generated/Grammar.h src/3rdparty/webkit/WebCore/generated/XPathGrammar.cpp src/3rdparty/webkit/WebCore/generated/XPathGrammar.h src/3rdparty/webkit/WebKit/qt/ChangeLog tools/linguist/lrelease/main.cpp tools/linguist/lupdate/main.cpp tools/linguist/shared/profileevaluator.cpp
| * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-07-1318-2040/+3375
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb4957a561d3f85d4cd5602832375c66f378b521 ) Changes in WebKit since the last update: ++ b/LayoutTests/ChangeLog 2009-06-04 Ariya Hidayat <ariya.hidayat@nokia.com> Rubber-stamped by Tor Arne Vestbø. Added Qt-specific expected result for Canvas pointInPath's test. Qt's QPainterPath::contains(point) returns false if the point is exactly along one of the edges (except the origin). Until we find a workaround for this, compensate it in the expected result. * platform/qt/fast/canvas/pointInPath-expected.txt: Added. 2009-01-11 Simon Fraser <simon.fraser@apple.com> Reviewed by Oliver Hunt https://bugs.webkit.org/show_bug.cgi?id=23242 Add testcase for incremental repaint after use of ctx.transform(), and enhanced isPointInPath testcase to do testing after use of ctx.transform(). * fast/canvas/canvas-incremental-repaint-2.html: Added. * fast/canvas/pointInPath-expected.txt: * fast/canvas/pointInPath.js: * platform/mac/fast/canvas/canvas-incremental-repaint-2-expected.checksum: Added. * platform/mac/fast/canvas/canvas-incremental-repaint-2-expected.png: Added. * platform/mac/fast/canvas/canvas-incremental-repaint-2-expected.txt: Added. ++ b/WebCore/ChangeLog 2008-12-18 Bernhard Rosenkraenzer <bero@arklinux.ch> Reviewed by Darin Adler. https://bugs.webkit.org/show_bug.cgi?id=22205 Fix compatibility with bison 2.4, partially based on older patch by Priit Laes <amd@store20.com> * WebCore/css/CSSGrammar.y: Made compatible with bison 2.4 2009-07-13 Cédric Luthi <cedric.luthi@gmail.com> Reviewed by Tor Arne Vestbø. Fix NPWindow clip rect in PluginViewMac The rect should be in window-coordinates. This bug can be observed with Flash 10 here: http://www.permadi.com/tutorial/cursorTracker/ * plugins/mac/PluginViewMac.cpp: 2009-07-13 Simon Hausmann <hausmann@webkit.org> Reviewed by Ariya Hidayat. Fix Qt implementation of WebCore::directoryName to return the absolute directory name instead of the base file name. * platform/qt/FileSystemQt.cpp: (WebCore::directoryName): 2009-07-13 Simon Hausmann <hausmann@webkit.org> Reviewed by Ariya Hidayat. Fix WebCore::Path::isEmpty() for the Qt port to return true if there is no element in the path. QPainterPath::isEmpty() returns also true if there is one single MoveTo element inside, which makes sense but doesn't patch Webcore's is-empty definition. * platform/graphics/qt/PathQt.cpp: (WebCore::Path::isEmpty): Use elementCount() == 0. 2009-01-11 Simon Fraser <simon.fraser@apple.com> Reviewed by Oliver Hunt https://bugs.webkit.org/show_bug.cgi?id=23242 Fix CanvasRenderingContext2D::transform to do a pre-multiply, rather than a post-multiply into m_transform. This bug did not affect drawing, but did cause m_transform to be incorrect, which impacted willDraw(), and isPointInPath. Test: fast/canvas/canvas-incremental-repaint-2.html * html/CanvasRenderingContext2D.cpp: (WebCore::CanvasRenderingContext2D::transform): 2009-07-04 Sriram Yadavalli <sriram.yadavalli@nokia.com> Reviewed by Simon Hausmann. https://bugs.webkit.org/show_bug.cgi?id=26439 QtWebKit fails in loading www.nytimes.com in Windows/Linux QNetworkReplyHandler is ignoring content associated with 401 error. This causes the XHR response handling to fail. Simon: Added also ProxyAuthenticationRequiredError, to handle the same case when going through proxies, as suggested by Prasanth. * platform/network/qt/QNetworkReplyHandler.cpp: (WebCore::QNetworkReplyHandler::finish): ++ b/WebKit/qt/ChangeLog Fix crash with plugins when the plugin stream is cancelled. Similar to r26667 handle the case where didReceiveResponse on the plugin view results in failure to set up the stream and setMainDocumentError being called instead. This will set the m_pluginView back to 0 and we need check for it before calling didReceiveData. This was triggered by consecutive execution of LayoutTests/plugins/return-error-from-new-stream-callback-in-full-frame-plugin.html followed by LayoutTests/scrollbars/scrollbar-crash-on-refresh.html * WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::committedLoad): 2009-07-13 Simon Hausmann <hausmann@webkit.org> Reviewed by Ariya Hidayat.
| * implement proper vpath handlingOswald Buddenhagen2009-07-1312-114/+173
| | | | | | | | | | | | | | | | | | | | | | | | this also removes the bogus special casing of various filename-containing variables inside the pro parser. while this is a feature as such, it restores backwards compatibility without damaging the correct behavior again, so it qualifies for 4.5. based on a2f40fce2a1cf3c19a13fa27eea08192493ab76e from creator Task-number: 254098
| * factor out linguist-specific partOswald Buddenhagen2009-07-137-67/+168
| | | | | | | | it is simpler to keep it in sync with creator then.
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-07-131-0/+2
|\ \ | |/ | | | | | | | | Conflicts: src/network/access/qnetworkaccesshttpbackend.cpp src/network/access/qnetworkreplyimpl.cpp
| * tst_qnetworkreply: qDebug instead of qWarningMarkus Goetz2009-07-131-1/+1
| |
| * QNAM: Fix double sending of a HTTP requestMarkus Goetz2009-07-132-0/+9
| | | | | | | | | | | | | | | | | | In some cases, weird timing issues could occur. In those cases, an EOF was sent twice for the upload data, leading to the HTTP code being confused and sending the request headers twice. Task-number: 257662 Reviewed-by: Thiago Macieira
| * QFlags::testFlag(): handle the zero case appropriately.Frans Englich2009-07-132-1/+25
| | | | | | | | | | | | | | | | Brought up by Andy. See perforce change 314809, 17b07e3ab6192b31f77fd2f126705b9ab53b3937. Related to task 221708. Reviewed-By: Andy Shaw (cherry picked from commit cc24c46c117248ecb98200416e7f25375e6bb476)
| * Fix line endings.Alexis Menard2009-07-131-22/+22
| |
* | doc: Use \inheaderfile to show which include file to include.Martin Smith2009-07-132-1/+2
| | | | | | | | | | | | | | Letting qdoc output it automatically produces the wrong header file name. Task-number: 217268 210171 220664
* | fix bug in qmake DEPLOYMENT variableJoerg Bornemann2009-07-131-2/+1
| | | | | | | | | | | | | | | | | | | | The documentation states "The default deployment target path for Windows CE is %CSIDL_PROGRAM_FILES%\target, which usually gets expanded to \Program Files\target." Now this statement is true. Task-number: 257053 Reviewed-by: mauricek
* | QTreeView: now dragging lots of items is fastThierry Bastian2009-07-137-6/+51
| |
* | tst_qnetworkreply: qDebug instead of qWarningMarkus Goetz2009-07-131-2/+2
| |
* | Fix font propagation issues with QComboBox and the popup menu.Norwegian Rock Cat2009-07-133-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has always been a bit bumpy, the problem is that the popup normally has its own styling from the desktop, plus it's its own top-level and that is normally a boundary for propagation. Of course, people are surprised by this (especially when it works for editable). So, we need to be a bit better propagating the info. Also the QStyleOptionMenuItem has the correct font, but if it's set on a window, by the time it reaches the popup, its resolve mask is very weak, so it will fail to resolve at all. Setting the point size allows the font to have a bit of strength. Task-number: 257486 Reviewed-by: Jens Bache-Wiig
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-07-13189-3018/+7298
|\ \
| * | QFlags::testFlag(): handle the zero case appropriately.Frans Englich2009-07-132-1/+25
| | | | | | | | | | | | | | | | | | | | | Brought up by Andy. See perforce change 314809, 17b07e3ab6192b31f77fd2f126705b9ab53b3937. Related to task 221708. Reviewed-By: Andy Shaw
| * | doc: Clarified what Qt::HANDLE is on Windows.Martin Smith2009-07-132-5/+11
| | | | | | | | | | | | Task-number: 193615
| * | Cut-off in QGraphicsView not hit if setting a scene rect.Bjørn Erik Nilsen2009-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsScene::sceneRect() returns the growingItemsBoundingRect if not a particular scene rect is set; otherwise the sceneRect is returned. This cut-off aims to do less processing when the exposed region covers the entire scene, but it won't get hit in case of a sceneRect because we always check against the growingItemsBoundingRect. Task-number: 257192
| * | Revert "Fixed leak of plugin instances"João Abecasis2009-07-131-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mjansen reported on #qt-labs that this change crashes KDE applications that were calling delete on their plugins. It turns out that is also how QPluginLoader works, so the commit was a bad idea to start with. This reverts commit 4c7004122a858cd6d891efc7923ba11484fbf997. Reviewed-by: Thiago Macieira
| * | fix warning in qstringbuilder.h by using QLatin1Charhjk2009-07-131-1/+1
| | | | | | | | | | | | Reviewed-by: Volker Hilsheimer
| * | Fixed the lineendings in the tst_qsqltablemodel.cppDenis Dzyubenko2009-07-131-22/+22
| | |
| * | Removed an assert from the QNetworkReply.Denis Dzyubenko2009-07-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible that finished() function will be called several times, for example if the user calls QNetworkReply::close() as a result of the authenticationRequired() signal, the connection will be closed (which results in emitting a finished() signal), and then the authentication will be cancelled, which will also try to emit the same signal, however the connection state will already be set to Finished. The fix is to just make sure if the finished() signal has already been emitted by checking if the connection state is not Finished or Aborted. Reviewed-by: Thiago Macieira
| * | Unified common code in QSyntaxHighlighter::rehighlight() and ↵J-P Nurmi2009-07-131-17/+14
| | | | | | | | | | | | | | | | | | | | | QSyntaxHighlighter::rehighlightBlock() Merge-request: 379 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * | Added QSyntaxHighlighter::rehighlightBlock() auto testJ-P Nurmi2009-07-131-1/+28
| | | | | | | | | | | | | | | Merge-request: 379 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * | Added QSyntaxHighlighter::rehighlightBlock(QTextBlock)J-P Nurmi2009-07-132-0/+28
| | | | | | | | | | | | | | | Merge-request: 379 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * | Fix crash after "Remove QT_WA and non-Unicode code paths, dropping Win9x and ↵Bjoern Erik Nilsen2009-07-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NT support" tst_QGraphicsProxyWidget crashed because the QAlphaWidget tried to access a deleted widget. Before we had the if check, but that was removed with this commit: 55137901. Completely wrong, we must check the widget pointer before using it. Reviewed-by: jbache
| * | Stabilize tst_QGraphicsView::mouseTracking2 (on Windows).Bjoern Erik Nilsen2009-07-131-1/+3
| | | | | | | | | | | | | | | | | | | | | Use QApplication::sendEvent directly instead of calling the static sendMouseMove function, which also calls QTest::mouseMove. This test failed with spy.count() being 2 instead of 1 (which is correct since we both use QTest::mouseMove and QApplication::sendEvent).
| * | Fix broken tst_QGraphicsItem::sorting.Bjoern Erik Nilsen2009-07-131-1/+2
| | | | | | | | | | | | | | | A top-level window on Windows cannot have a smaller width than 120. Increase the width by 20 and expect another row of items to be painted.
| * | Fixes autotest to match the new code (db level precisionPolicy).Bill King2009-07-131-1/+1
| | |
| * | Fixes up the autotest for mysql over ODBC connection.Bill King2009-07-131-2/+2
| | |
| * | Merge commit 'origin/4.5'Bill King2009-07-1318-154/+416
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/kbddrivers/usb/main.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qwidget/tst_qwidget.cpp
| | * Fixes failure when table has null fields to updateBill King2009-07-132-1/+63
| | | | | | | | | | | | | | | | | | | | | Fixes an issue where too many parameters are bound when updating QSqlTableModel where the stored record has NULLs in it. Reviewed-by: Justin McPherson
| | * Fix memory leak in $$system() calls from .pro filesOswald Buddenhagen2009-07-101-0/+4
| | | | | | | | | | | | cherry-picked 07730341bd739aac823ac9b4336d8294510a35e2 from creator
| | * remove totally pointless conditionalOswald Buddenhagen2009-07-101-1/+1
| | | | | | | | | | | | cherry-picked 167a09b20614d282ec898f69fc2a3f0bafa11229 from creator
| | * remove dead codeOswald Buddenhagen2009-07-101-10/+0
| | | | | | | | | | | | cherry-picked d8b1cc5f0ecbb8de734d241d72a05b325c2bbb2c from creator
| | * Fixed a crash with input methodsPierre Rossi2009-07-103-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | The inputContext's focusWidget was not reset when disabling input methods. Thanks to Benjamin P. Task-number: 257832 Reviewed-by: Denis
| | * rewrite makeplurals.sh in perlOswald Buddenhagen2009-07-103-44/+43
| | | | | | | | | | | | ... so it works under windows as well.
| | * make tests independent of PATH contentsOswald Buddenhagen2009-07-103-11/+19
| | | | | | | | | | | | use absolute paths for the tested executables
| | * Fix QDFBPaintEngine::drawTiledPixmap/fillRectAnders Bakken2009-07-101-57/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | Until this fix very few cases of drawTiledPixmap and fillRect(r, textureBrush) have been handled by DirectFB. This patch makes it possible to accelerate such operations. Reviewed-By: Donald <qt-info@nokia.com>
| | * Designer: Restore Widget box title when switching to docked modeJoão Abecasis2009-07-091-0/+6
| | | | | | | | | | | | Reviewed-by: Friedemann Kleint
| | * Stop showing then hiding windows on starting designer in top-level modeJoão Abecasis2009-07-091-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kind of like f37bd111f7622a34b3a7bd63f5a82f6042dc0f0d, but the real thing. The widget box wasn't showing on Linux when switching to top-level mode. Incidentally, this was the main window there... Reviewed-by: Friedemann Kleint After some persuasion the Cat also came to see things this way.
| | * QNAM: httpDownloadPerformance auto testMarkus Goetz2009-07-091-0/+126
| | | | | | | | | | | | Reviewed-by: Peter Hartmann
| | * Pass the device arg to the keyboard drivers.Anders Bakken2009-07-094-8/+4
| | | | | | | | | | | | | | | | | | | | | We didn't use to pass the device in to the keyboard handlers rendering them mostly useless. Reviewed-by: TrustMe
| | * emit dataChanged() signalDerick Hawcroft2009-07-091-0/+1
| | | | | | | | | | | | Task-number:207874
| | * Plugged possible memory leak in getPSQLVersion()Stian Sandvik Thomassen2009-07-091-2/+2
| | | | | | | | | | | | | | | | | | | | | Call PQclear() regardless of the status of the result returned by PQexec(). Reviewed-by: Bill King
| | * Hopefully fix isnan/isinf for good (for all platforms)Bill King2009-07-081-12/+20
| | |