summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* Fix compilation of tst_qwidget with some compilers.Jason Barron2009-04-281-2/+2
| | | | | Some compilers such as the Metroworks compiler do not like it when the two pointers have different types so cast them to be the same.
* 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.
* 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>
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-282-27/+31
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicAleksandar Sasha Babic2009-04-281-2/+2
| |\
| | * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-04-282-8/+8
| | |\
| | * | 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.
| * | | Simple refactoring how the data are fetched and stored.Aleksandar Sasha Babic2009-04-281-25/+29
| | |/ | |/|
* | | Always build Qt libs with "All -Tcb" capabilities in SymbianMiikka Heikkinen2009-04-281-5/+1
|/ /
* | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-281-1/+9
|\ \ | |/
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-04-281-6/+4
| |\
| * | These tst_qtcpsockets require more time to finish in Symbian OSJanne Anttila2009-04-281-1/+9
| | | | | | | | | | | | | | | | | | The modified test cases are: - disconnectWhileConnecting - disconnectWhileLookingUp
* | | Changed generated file headers to have timestamp in ISO format insteadMiikka Heikkinen2009-04-282-8/+8
| |/ |/| | | | | of localized format.
* | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-287-22/+43
|\ \ | |/
| * Fixed unresolved merge conflict in network-settings.hJanne Anttila2009-04-281-3/+0
| |
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-04-289-32/+182
| |\
| | * 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-2810-33/+167
| | |\
| | | * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-282-17/+129
| | | |\
| | | | * 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.
| | | * | Removed preserving read-only flag from winscw deployed files to makeMiikka Heikkinen2009-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | functionality similar to hw deployment.
| | * | | Fixed wrong menu showing up on S60 while launching a dialog.Markku Luukkainen2009-04-283-11/+38
| | | | |
| * | | | Skipped disconnectWhileConnectingNoEventLoop for now in Symbian OS.Janne Anttila2009-04-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | This test case hanhs the execution always and causes problems in nighly buils and automatic executions. Skip it until it is fixed.
| * | | | Fixed copy/paste error in QtNetworkSettings::expectedReplyFtp.Janne Anttila2009-04-281-3/+1
| | | | |
* | | | | Re-enabled winscw target for non-OS_WIN builds.Miikka Heikkinen2009-04-281-6/+4
| |_|_|/ |/| | |
* | | | Network server test related data (serever name, IP address ...) can nowAleksandar Sasha Babic2009-04-271-13/+127
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be read from a file at runtime. This should make auto testing more flexibile. Currently this is supported for Symbian platform. The file is named "iap.txt" and should be placed under "C:\data". When creating file use UNIX line ending and UTF 16 LE encoding. Conflicts: tests/auto/network-settings.h
* | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-271-2/+5
|\ \ \ | |/ /
| * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-04-273-10/+17
| |\ \
| * | | Enabled and fixed tst_QSslSocket::waitForMinusOne test for Symbian.Janne Anttila2009-04-271-2/+5
| | |/ | |/|
* | | Workaround for problems with paging Core and Sql libsMiikka Heikkinen2009-04-272-2/+14
| | |
* | | Make all Symbian binaries pageable by default.Miikka Heikkinen2009-04-271-1/+1
| |/ |/|
* | Minor optimization to symbian-sbsv2 extra target predeps generation.Miikka Heikkinen2009-04-271-1/+1
| |
* | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-27777-16674/+37974
|\ \ | |/
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2009-04-279-24/+404
| |\
| * | Fixed compilation of qmake on MSVC6.axis2009-04-273-3/+3
| | |
| * | Fixed a few typos in qmake makefile for win32.axis2009-04-271-1/+2
| | |
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-04-27774-16671/+37970
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | init combobox member and make sure we won't access it uninitializedkh2009-04-241-6/+9
| | | |
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-04-2418-73/+311
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-242-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-242-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requested/spotted by Nokia i18n team/Darpan. Task-number: 252102 Reviewed-by: Denis AutoTest: In this submit.
generated by cgit v0.12 at 2025-08-21 01:00:54 (GMT)