summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicSami Merilä2009-05-053-92/+1
|\
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-05-0512-21/+1273
| |\
| * | Implemented: 247278 Remove unnecessary includes from qbackingstore.cpp.Janne Anttila2009-05-051-5/+0
| | |
| * | Fixed Q_OS_SYMBIAN ifdef usage in qfiledialog_p.h.Janne Anttila2009-05-051-1/+1
| | | | | | | | | | | | | | | The old implementation caused: qfiledialog_p.h:102: warning: garbage at end of `#ifdef' argument
| * | Implemented: 247272 Remove qtestnetworkservers.hJanne Anttila2009-05-052-87/+1
| | | | | | | | | | | | | | | Qt 4.5 introduced a new network-settings.h file. Adapt all network autotests to use that file and get rid of qtestnetworkservers.h
* | | S60Style: intersect QTable background graphics with viewPort rect.Sami Merilä2009-05-051-12/+10
| |/ |/|
* | Let phonon build for winscw.Frans Englich2009-05-051-0/+6
| |
* | Enable Phonon for Symbian.Frans Englich2009-05-051-1/+1
| |
* | Enable phonon, if enabled in configure.Frans Englich2009-05-051-1/+1
| |
* | 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-0533-203/+620
|\ \ | |/
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-05-0513-45/+50
| |\
| | * S60Style: latest pixel metrics included.Sami Merilä2009-05-051-16/+16
| | |
| | * S60Style: renamed pixelmetricsmapper files and relocated them all under one ↵Sami Merilä2009-05-0512-29/+34
| | | | | | | | | | | | subfolder.
| * | Enabled disconnectWhileConnectingNoEventLoop test case for Symbian OS.Janne Anttila2009-05-051-3/+9
| | | | | | | | | | | | Had to increase also test case timeouts to make it pass in Symbian OS.
| * | 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.
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-05-041-0/+1
| |\
| | * Don't show Symbian plugin stubs in Git.axis2009-05-041-0/+1
| | |
| * | 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-3013-92/+171
| |\ | | | | | | | | | | | | 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.
| | * 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.
| * | 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.
| * | | Fixed tst_QSslSocket::sslErrors test for Symbian HW.Janne Anttila2009-04-291-12/+18
| | | |
* | | | ARMV6 optimizations to qdrawhelperMiikka Heikkinen2009-05-057-19/+1252
| | | |
* | | | Fixed #ifdef syntaxMiikka Heikkinen2009-05-041-1/+1
| | | |
* | | | Fixed symbian-sbsv2 ICON keyword so that it will generate iconsMiikka Heikkinen2009-04-301-0/+1
| |/ / |/| | | | | | | | compatible with older devices (S60 3.1 and up).
* | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-04-294-14/+37
|\ \ \ | |/ /
| * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-04-292-13/+29
| |\ \ | | |/