summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Install phonon.Frans Englich2009-05-051-0/+5
|
* Add include paths for STL such that phonon builds. See comment for details.Frans Englich2009-05-051-0/+7
|
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-05-0517-157/+556
|\
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-05-051-16/+16
| |\
| | * S60Style: latest pixel metrics included.Sami Merilä2009-05-051-16/+16
| | |
| * | Hacked select to listen also expectfds in Symbain OS for given sockets.Janne Anttila2009-05-051-5/+42
| |/ | | | | | | | | | | | | | | | | This change was needed since plain readfs/writefds select call to Open C sometimes jammed. By adding expectfds to select call, the select seems not to hang anymore but returns. This workaround should be removed once Open C performs accorinding to POSIX standard.
| * Fix for thread termination in Symbian OS.Janne Anttila2009-05-042-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Open C does not support all pthread funtions, thread termination in Symbian OS is implemented differently. Before this fix, QThread::Terminate just terminated the native thread. Because QThreadPrivate::finish was not called, the 'running', 'finished' etc flags were not set and thread termination related signals were not correctly emitted. In UNIX finish is called by pthread_cancel since thread cancelation points are set. In Symbian OS we need to call it manually since pthread_cancel is not supported. It was necessary to add a new parameter to QThreadPrivate::finish, which tells whether the native thread handle can be closed or not. This was required since 'symbian_thread_handle.Terminate' will not succeed if thread handle is closed. On the other hand we cannot first terminate the thread and then call QThreadPrivate::finish. Autotest: qthread and qprocess passes in HW (5800) and Emulator Review By: miikka.heikkinen@digia.com
| * Merge commit 'private/translucentWindows'Jason Barron2009-04-3012-90/+169
| |\ | | | | | | | | | | | | Conflicts: src/gui/styles/qs60style_symbian.cpp
| | * Avoid overwriting a user set palette.Jason Barron2009-04-304-33/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The polish(QWidget*) function is called the first time a widget is shown and therefore setting the widget's palette in this function will overwrite the user set palette if one is specified before show() is called. The solution is to break this into two parts, the first part sets the global palette in polish(QApplication*) and this is the part of the palette that is independent of widget. The second part involves adding the widget specific palettes using the QApplication:: setPalette() function that takes a classname and this is done in the polish(QWidget*) function.
| | * Small optimization when hiding windows.Jason Barron2009-04-301-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a window is hidden, it will call releaseBuffer() on the backing store which in turn will resize the window surface to a null rect. In this case, there is no need to update the QImage with the data pointer since it will be updated on the subsequent beginPaint() when the image is resized to a valid size again. This also avoids doing unnecessary locking on the FBSERV heap which still involves a context switch on older versions of Symbian.
| | * Some code cleanups after review.Jason Barron2009-04-291-3/+3
| | | | | | | | | | | | | | | Change these lines of code to either make it more consistent or more readable after review.
| | * Undo implementation of setWindowOpacity_sys().Jason Barron2009-04-291-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | This function was implemented using API from Symbian that will be deprecated. It was never actually suitable anyway since this function cannot be called after the window has been shown and this needs to be a runtime decision for Qt. The solution is to use SetTransparencyAlphaChannel(), but that will come later.
| | * Fixes crash when setting geometry on an obscured window.Jason Barron2009-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | Since Qt on Symbian now destroys the backing store when it gets hidden or obscured we need to be careful not to use functions like moveRect() when we don't have a backing store since this function is really a backing store optimization and therefore assumes one exists.
| | * Make QPixmap::grabWindow() work for top level windows.Jason Barron2009-04-291-1/+1
| | | | | | | | | | | | | | | | | | Its not enough to mask with Qt::Desktop because this enum value also includes Qt::Window so masking would give us a non-zero result thus causing the 'if' case to resolve to true which is not what we want.
| | * Fix compilation of QS60Style after bad merge.Jason Barron2009-04-281-1/+1
| | | | | | | | | | | | | | | | | | The previous commit on this file broke compilation. It should have called setBrush() instead of setColor() to set the Window role of the palette to use a texture brush.
| | * Get transparency working by clearing the window surface.Jason Barron2009-04-281-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is duplicated code from the raster paint engine's beginPaint() function. For translucent windows the previous contents must be cleared from the backing store before the new content is painted. This class should probably be re-written as a subclass of the raster version. The reason we cannot use that implementation directly is because we cannot use QNativeImage because it doesn't provide anywhere we can do locking.
| | * More work on translucent windows.Jason Barron2009-04-283-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One step closer to semi-transparent windows, but not there yet. This gets the transparent contents into the window, but the previous contents are not cleared so it keeps drawing the backing store on top of itself each time a Draw() is done. SetBackgroundColor() indicates to WSERV that our window is semi-transparent. We also make sure not to use 'EDrawModeWriteAlpha' when the widget is non-opaque since this actually changes the alpha channel on the frame buffer (not the window) so the gives undesired results. It's a faster draw mode though so we should use it where we can.
| | * Fixes: Add support for translucent windows in Symbian.Jason Barron2009-04-286-3/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warning, this is completely untested! Details: This should (in theory) get translucent windows working but this hasn't been tested yet. The emulator environment seems to return only 16ColorMU display modes which implies the window is opague so Qt ignores the translucent flag. HW seems to create 16ColorMA windows, but it hasn't been tested there yet either (no time).
| | * We previously had some hacks in this function to avoid creating aJason Barron2009-04-281-2/+4
| | | | | | | | | | | | | | | | | | backing store with the ARGB32 format (which is slower to draw on), but we actually want this in some cases so let's do this properly and move the hacks somewhere else.
| | * Fix background painting.Jason Barron2009-04-283-42/+26
| | | | | | | | | | | | | | | | | | | | | This is a reverted patch that has been rebased on to another branch and then caused conflicts so it might contain an error or two. Basically we need to store the background texture from the style into the palette so that it can be replaced by applications that don't want it.
| * | S60Style: Build break fix for 3.2SDK environment (it is lacking some skin ↵Sami Merilä2009-04-301-9/+9
| | | | | | | | | | | | IDs that are available in 3.2RnD environment).
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicSami Merilä2009-04-301-2/+4
| |\ \
| | * \ Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-04-301-3/+6
| | |\ \
| | * | | Fixed bug in QTemporaryFile::rename.Janne Anttila2009-04-301-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The nativeInitFileName of file engine was not set in rename fallback case. Now it is set by calling: fileEngine()->setFileName This error was found with QNetworkDiskCache test case.
| * | | | S60Style: Layout spinbox so that up and down buttons are side-by-side, not ↵Sami Merilä2009-04-301-13/+66
| | |/ / | |/| | | | | | | | | | on top of each other.
| * | | S60Style: buildbreak fix - missing lines from commit ↵Sami Merilä2009-04-301-3/+6
| |/ / | | | | | | | | | d333404c72aa6c707cf389899999f2247454b824
| * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-04-296-78/+332
| |\ \
| | * | S60Style: Use title font for GroupBox title.Sami Merilä2009-04-291-0/+5
| | | |
| | * | S60Style: Styled QToolBar implementation.Sami Merilä2009-04-294-41/+258
| | | |
| * | | Fixed temporary file rename problem in Symbian OS.Janne Anttila2009-04-291-1/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian OS temp file rename will always go to fallback solution since close for temp file does not really close the handle. The fallback implements rename by copy and remove. But in symbian OS also the remove after copy failed since it was done through local 'in' object. However the file was still open in object doing the remove. The fix is to close the local 'in' object and use current 'this' object to remove the file. This object points to QTemporaryFile and it will make sure that temp file is first closed before trying to remove.
* | | ARMV6 optimizations to qdrawhelperMiikka Heikkinen2009-05-056-18/+1251
| | |
* | | Fixed #ifdef syntaxMiikka Heikkinen2009-05-041-1/+1
| |/ |/|
* | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-292-13/+29
|\ \ | |/
| * Enable dynamic [de|con]struction of window surfaces based on visibilityJason Barron2009-04-282-13/+29
| | | | | | | | | | | | | | | | | | When a window becomes completely obscured either because it has been hidden or another window is completely covering it, the backing store should be deallocated to save memory and then re-allocated when the window is later made visible again. Reviewed-by: Iain <qt-info@nokia.com>
* | Basic optimizations to qdrawhelper for RVCT builds:Miikka Heikkinen2009-04-292-37/+69
|/ | | | | | | - Force static inline methods to be actually inline - Force ARM code for strategic methods RevBy: axis
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-281-2/+2
|\
| * Fixed ASSERT panic in Symbian event dispatcher.Janne Anttila2009-04-281-2/+2
| | | | | | | | | | | | | | Moved ASSERT in QSelectThread::requestSocketEvents after mutex lock, since select thread might still have the lock and that's why the notifier might be in m_AOStatuses hash. After main thread has the mutex lock, notifier should not be anymroe in hash.
* | Always build Qt libs with "All -Tcb" capabilities in SymbianMiikka Heikkinen2009-04-281-5/+1
|/
* Removed setting the unnecessary parent for menu structuresMarkku Luukkainen2009-04-281-1/+0
|
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicMarkku Luukkainen2009-04-283-6/+16
|\
| * Qt lib dependencies had to be revisited as there were issues with someAleksandar Sasha Babic2009-04-271-4/+2
| | | | | | | | components when working on Tube HW.
| * Workaround for problems with paging Core and Sql libsMiikka Heikkinen2009-04-272-2/+14
| |
* | Fixed wrong menu showing up on S60 while launching a dialog.Markku Luukkainen2009-04-283-11/+38
|/
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-04-27311-5662/+9987
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure.exe recompiled with MSVC6. Conflicts: configure.exe examples/network/network.pro src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qfilesystemmodel_p.h src/gui/kernel/qapplication.cpp tests/auto/_Categories/qmake.txt tests/auto/qfile/test/test.pro tests/auto/qfile/tst_qfile.cpp tests/auto/qlibrary/tst_qlibrary.cpp tests/auto/qline/tst_qline.cpp tests/auto/qstyle/tst_qstyle.cpp tests/auto/qtextstream/tst_qtextstream.cpp tests/auto/qtranslator/qtranslator.pro tests/auto/qwaitcondition/tst_qwaitcondition.cpp translations/qt_ja_JP.ts
| * Re-send network request properly when the socket is in Closing state.Denis Dzyubenko2009-04-241-0/+8
| | | | | | | | | | | | | | | | | | This fixes the "QAbstractSocket::connectToHost() called when already connecting/connected to <hostname>". The issue was that we were trying to call connect on a socket that was in a Closing state. We have to wait for the disconnected signal before we try to connect again. Reviewed-by: Prasanth
| * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-04-243-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6ebe3865025e2bb4d767a79435af4daf5a9b4db ) Changes in WebKit since the last update: ++ b/WebKit/qt/ChangeLog Rubber-stamped by Ariya Hidayat. Fix qdoc warning about link to QAction::isEnabled. * Api/qwebpage.cpp: 2009-04-24 Simon Hausmann <simon.hausmann@nokia.com>
| * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-04-2414-11/+601
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 242472777d440a540b4bc944c84eb522388e384e ) Changes in WebKit since the last update: ++ b/ChangeLog 2009-04-24 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Ariya Hidayat. Added support for generating API docs in the Qt build using "make docs" * WebKit.pro: Include docs.pri for "make docs" target. ++ b/WebKit/qt/ChangeLog 2009-04-24 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Ariya Hidayat. Added support for generating API docs in the Qt build using "make docs" Added code snippets and overview from the Qt sources references in the API docs. * Api/qwebpage.cpp: Adjust paths to snippets. * Api/qwebview.cpp: Ditto. * docs/docs.pri: Added. * docs/qtwebkit.qdoc: Added. * docs/qtwebkit.qdocconf: Added. * docs/webkitsnippets/qtwebkit_build_snippet.qdoc: Added. * docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp: Added. * docs/webkitsnippets/simple/main.cpp: Added. * docs/webkitsnippets/simple/simple.pro: Added. * docs/webkitsnippets/webpage/main.cpp: Added. * docs/webkitsnippets/webpage/webpage.pro: Added. Moved QtWebKit documentation into the WebKit project under src/3rdparty/webkit This is needed to have "make docs" inside WebKit and allows contributors to the WebKit project to write API docs. I'm doing the change in 4.5 to simplify merging with Qt 4.6. Reviewed-by: Trust me
| * Return the correct MIB number for TSCII. When the code wasFrans Englich2009-04-241-2/+1
| | | | | | | | | | | | | | | | | | | | | | written, IANA hadn't assigned one. Requested/spotted by Nokia i18n team. Task-number: 251790 Reviewed-by: Brad Reviewed-by: Denis AutoTest: In this submit.
| * Alias for QUtf16Codec is wrong.Frans Englich2009-04-241-3/+1
| | | | | | | | | | | | | | | | Requested/spotted by Nokia i18n team/Darpan. Task-number: 252102 Reviewed-by: Denis AutoTest: In this submit.
| * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-04-2419-42/+438
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5ea85e03f22fb6fb87275774a2c53031941017e ) Changes in WebKit since the last update: ++ b/JavaScriptCore/ChangeLog 2009-01-22 Oliver Hunt <oliver@apple.com> Reviewed by Geoff Garen. <rdar://problem/6516853> (r39682-r39736) JSFunFuzz: crash on "(function(){({ x2: x }), })()" <https://bugs.webkit.org/show_bug.cgi?id=23479> Automatic semicolon insertion was resulting in this being accepted in the initial nodeless parsing, but subsequent reparsing for code generation would fail, leading to a crash. The solution is to ensure that reparsing a function performs parsing in the same state as the initial parse. We do this by modifying the saved source ranges to include rather than exclude the opening and closing braces. * bytecode/CodeBlock.cpp: (JSC::CodeBlock::reparseForExceptionInfoIfNecessary): add an assertion for successful recompile * parser/Lexer.h: (JSC::Lexer::sourceCode): include rather than exclude braces. * parser/Nodes.h: (JSC::FunctionBodyNode::toSourceString): No need to append braces anymore. 2009-01-21 Alexey Proskuryakov <ap@webkit.org> Suggested by Oliver Hunt. Reviewed by Oliver Hunt. https://bugs.webkit.org/show_bug.cgi?id=23456 Function argument names leak * parser/Nodes.cpp: (JSC::FunctionBodyNode::~FunctionBodyNode): Destruct parameter names. 2009-01-22 Beth Dakin <bdakin@apple.com> Reviewed by Sam Weinig. Fix for https://bugs.webkit.org/show_bug.cgi?id=23461 LayoutTests/ fast/js/numeric-conversion.html is broken, and corresponding <rdar://problem/6514842> The basic problem here is that parseInt(Infinity) should be NaN, but we were returning 0. NaN matches Safari 3.2.1 and Firefox. * runtime/JSGlobalObjectFunctions.cpp: (JSC::globalFuncParseInt): 2009-01-13 Beth Dakin <bdakin@apple.com> Reviewed by Darin Adler and Oliver Hunt. <rdar://problem/6489314> REGRESSION: Business widget's front side fails to render correctly when flipping widget The problem here is that parseInt was parsing NaN as 0. This patch corrects that by parsing NaN as NaN. This matches our old behavior and Firefox. * runtime/JSGlobalObjectFunctions.cpp: (JSC::globalFuncParseInt): ++ b/LayoutTests/ChangeLog 2009-01-22 Oliver Hunt <oliver@apple.com> Reviewed by Geoff Garen. <rdar://problem/6516853> (r39682-r39736) JSFunFuzz: crash on "(function(){({ x2: x }), })()" <https://bugs.webkit.org/show_bug.cgi?id=23479> Add additional reparsing tests. * fast/js/reparsing-semicolon-insertion-expected.txt: * fast/js/resources/reparsing-semicolon-insertion.js: (commaParenTest): (commaParenThrowTest): 2009-01-22 Beth Dakin <bdakin@apple.com> Reviewed by Sam Weinig. Fix for https://bugs.webkit.org/show_bug.cgi?id=23461 LayoutTests/ fast/js/numeric-conversion.html is broken, and corresponding <rdar://problem/6514842> The basic problem here is that parseInt(Infinity) should be NaN, but we were returning 0. NaN matches Safari 3.2.1 and Firefox. * fast/js/numeric-conversion-expected.txt: * fast/js/resources/numeric-conversion.js: 2009-01-13 Beth Dakin <bdakin@apple.com> Reviewed by Darin Adler and Oliver Hunt. Updated test and results for <rdar://problem/6489314> REGRESSION: Business widget's front side fails to render correctly when flipping widget parseInt(NaN) should be NaN. * fast/js/numeric-conversion-expected.txt: * fast/js/resources/numeric-conversion.js: ++ b/WebCore/ChangeLog 2009-03-13 Adam Bergkvist <adam.bergkvist@ericsson.com> Reviewed by Alexey Proskuryakov. https://bugs.webkit.org/show_bug.cgi?id=24349 [QT] HTTP status text is never set Set HTTP status text to the reason phrase attribute of QNetworkReply. * platform/network/qt/QNetworkReplyHandler.cpp: (WebCore::QNetworkReplyHandler::sendResponseIfNeeded): 2009-03-02 Dirk Schulze <krit@webkit.org> Reviewed by Holger Freyther. Added putImageData to Qt. Discussed with Ariya Hidayat. [Qt] lacks putImageData support in Canvas https://bugs.webkit.org/show_bug.cgi?id=22186 * platform/graphics/qt/ImageBufferQt.cpp: (WebCore::ImageBuffer::putImageData): 2009-03-01 Larry Ewing <lewing@novell.com> Reviewed by Alexey Proskuryakov. https://bugs.webkit.org/show_bug.cgi?id=24080 NPN_GetValue casting to the wrong type and writing outside bounds Make sure to cast the value to the correct type so that only memory owned by the value is written to. * plugins/gtk/PluginViewGtk.cpp (PluginView::getValueStatic): * plugins/qt/PluginViewQt.cpp (PluginView::getValueStatic): * plugins/mac/PluginViewMac.cpp (PluginView::getValueStatic): (PluginView::getValue): 2009-02-27 Adam Treat <adam.treat@torchmobile.com> Reviewed by Eric Seidel. https://bugs.webkit.org/show_bug.cgi?id=24229 If an image has no alpha channel there is no reason to use SourceOver. * platform/graphics/qt/ImageQt.cpp: (WebCore::Image::drawPattern): (WebCore::BitmapImage::draw): 2009-02-27 Zack Rusin <zack@kde.org> Reviewed by Nikolas Zimmermann. Qt: be more reasonable about scrolled lines cMouseWheelPixelsPerLineStep is currently a constant set to 13.3. it doesn't match our metrics meaning that Qt scrolls by ~2 lines by default which is quite irritating. so lets scroll vertically by the Qt set number of lines * Qt default single step scroll * platform/qt/WheelEventQt.cpp: 2009-02-25 Dirk Schulze <krit@webkit.org> Reviewed by Oliver Hunt. Ported arcTo to Qt. Qt has no native support for arcTo. This changes calculate the behavior of arcTo and draws it with lineTo and arc. [QT] implement Canvas arcTo https://bugs.webkit.org/show_bug.cgi?id=23873 * platform/graphics/qt/PathQt.cpp: (WebCore::Path::addArcTo): 2009-03-12 Adam Treat <adam.treat@torchmobile.com> Reviewed by Oliver Hunt. https://bugs.webkit.org/show_bug.cgi?id=24498 Fix the Qt port to use the same algorithm for drawing dashed and dotted borders as the other ports. This makes the Qt port pixel-for-pixel perfect compared to border drawing with Apple's canonical mac port and much closer to konqueror and firefox behavior. * platform/graphics/qt/GraphicsContextQt.cpp: (WebCore::GraphicsContext::drawLine): 2009-03-09 Adam Treat <adam.treat@torchmobile.com> Reviewed by George Staikos. https://bugs.webkit.org/show_bug.cgi?id=24463 WebCore::qstring is detaching and copying twice for every single WebCore::TextRun that is processed and drawn. This elevates this method to one of the top-ten most expensive methods in all of QtWebKit according to profiling. This changes the method so that QString only detaches when absolutely necessary. * platform/graphics/qt/FontQt.cpp: (WebCore::qstring): (WebCore::fixSpacing): (WebCore::Font::drawComplexText): (WebCore::Font::floatWidthForComplexText): (WebCore::Font::offsetForPositionForComplexText): (WebCore::Font::selectionRectForComplexText): ++ b/WebKit/qt/ChangeLog 2009-03-02 Benjamin C Meyer <benjamin.meyer@torchmobile.com> Reviewed by George Staikos. https://bugs.webkit.org/show_bug.cgi?id=21230 On X11 match the behavior of Firefox and also copy the url to the clipboard selection when the action Copy Link Location is executed. * Api/qwebpage.cpp: (QWebPage::triggerAction):