summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Update year in Nokia copyright messages.Jason McDonald2012-01-111249-1250/+1250
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-12-226-6/+6
|\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Symbian: Fix exporting and importing of some functions for autotests Symbian: Fix SRCDIR usage in qlayout autotest. Symbian: Fix qcssparser autotest Symbian: Fix qscriptextensionplugin autotest
| * Symbian: Fix exporting and importing of some functions for autotestsMiikka Heikkinen2011-12-216-6/+6
| | | | | | | | | | | | | | | | | | Symbian builds seem more strict about properly declaring exports than other builds, so added proper exporting and importing to some function declarations. Task-number: ou1cimx1#957184 Reviewed-by: mread
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-12-201-1/+1
|\ \ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fix crash in positionInLigature
| * | Fix crash in positionInLigatureJiang Jiang2011-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | Check boundary of pos before accessing attributes. Task-number: QTBUG-23104 Reviewed-by: Eskil
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-12-204-30/+47
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fix missing part from commit dae052cb11c0018121f2c4028aed9db17769fd77 Fix m_longTapDetector causing crash. Fix to incorrect ApplicationActivate event in QtOpenGL Symbian - Fix QFile::map with non page aligned offsets
| * | Fix missing part from commit dae052cb11c0018121f2c4028aed9db17769fd77Jani Hautakangas2011-12-191-0/+1
| | | | | | | | | | | | | | | | | | | | | Forgot to amend commit before pushing, sorry. Task-number: QTBUG-23252 Reviewed-by: TRUSTME
| * | Fix m_longTapDetector causing crash.Jani Hautakangas2011-12-191-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GL shared widget calls null poiter m_longTapDetector. These call shouldn't happen because GL shared widget isn't part of UI stack anymore. This patch adds null pointer checks Task-number: QTBUG-23252 Reviewed-by: TRUSTME
| * | Fix to incorrect ApplicationActivate event in QtOpenGLJani Hautakangas2011-12-163-27/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QEvent::ApplicationActivate is sent incorrectly when application goes to background if OpenGL graphics system is used. The problem is that hidden global shared QGLWidget used by QtOpenGL for root context is added to CONE stack. Qt destroys shared GL widget when application goes to background and underlying CCoeControl is removed from CONE stack which causes CONE to handle stack changes. CONE tries to focus next control in stack which causes incorrect focus events in Qt leading to ApplicationActivate event. GL global share widget must not be added to CONE stack because it's hidden utility widget and don't belong to UI widget stack. Task-number: QTBUG-23195 Task-number: ou1cimx1#946477 Reviewed-by: Murray Read
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-12-161-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Symbian: fix tst_QMenuBar::task256322_highlight() regression
| * | Symbian: fix tst_QMenuBar::task256322_highlight() regressionSatyam Bandarapu2011-12-151-0/+2
| | | | | | | | | | | | | | | | | | | | | This fixes Symbian-only regression caused by ab0a2466d7e3998caad226197355b729f523764a. Reviewed-by: Miikka Heikkinen
* | | Merge branch '4.8-upstream' into master-waterWater-Team2011-12-154-23/+32
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-12-141-2/+2
| |\ \ \ | | |/ / | | | / | | |/ | |/| | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Default to QDir::homePath() in Symbian native file dialogs Fix NTLM authentication with email address Fix null pointer dereference in NTLM authentication
| | * Default to QDir::homePath() in Symbian native file dialogsGareth Stockwell2011-12-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian places restrictions on the directories in which the native file dialog can browse. If the path passed to QFileDialog::getXxxFileName() is inaccessible, the implementation defaults to a path which is accessible. Previously, this default path was QDir::rootPath(). Changes to the Symbian file engine in Qt 4.8 mean that this now returns "C:\" which is inaccesible to the file dialog. This patch changes the default path to QDir::homePath(), which returns "C:\data". Task-number: ou1cimx1#947939 Reviewed-by: Miikka Heikkinen
| * | [blitter] Work on tst_QPixmap::clear()Holger Hans Peter Freyther2011-12-132-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default QPixmap may not hasAlphaChannel(), only if setMask() or fill() with a transparent color is called a QPixmap will hasAlphaChannel(). Make the QBlittablePlatformPixmap remember if there is an alpha channel, pass this as parameter in createBlittable to make it clear that this is required and not optional. Update the DirectFB plugin to handle this parameter to create a RGB32 or ARGB Surface depending on the alpha value, also only use PreMultiplied alpha when using ARGB. Separate the two constructors for the QDirectFbBlitter to either adopt a DirectFB Surface or to create one. Cherry-picked-from: qtbase:ab50b60f5cc237d5620f3ff3b2eb44c857f8f60b Change-Id: I8abf82408ecd2d075fc6f241ace8be2a34ac56e7 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com> Merge-request: 1492 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| * | [blitter] Use QScopedPointer for the engine and blittableHolger Hans Peter Freyther2011-12-132-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the QScopedPointer to prevent memory leaks, right now the code appears to be sound but make it more clear that calling ::setBlittable will destroy the old one. Cherry-picked-from: qtbase:dc4764229a3eef5c0bdbd665f2e24e59398e8c51 Change-Id: Idc71add7cfd429ff5b9d0ea9908d9fff1e7ce74d Merge-request: 59 Reviewed-on: http://codereview.qt-project.org/5243 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com> Merge-request: 1492 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| * | [blitter] Generate a new serial number when resizing theHolger Hans Peter Freyther2011-12-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The raster pixmap is generating a new serial number when the pixmap is resized, do the same for the blitter code. Cherry-picked-from: qtbase:6e13586d8b6d80ab374197649c76e7f0b35045db Merge-request: 1492 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| * | [blitter] Fix memory leak in the blitter paintengineHolger Hans Peter Freyther2011-12-131-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The raster engine and the capabilities were leaked, use the QScopedPointer to prevent that from happening. Cherry-picked-from: qtbase:d5f12b898b8480c891382c54672422c50218751a. Change-Id: I31ba0117280b48ad942fbb638fb151ccb7b34385 Merge-request: 1492 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | | Fix Memoy leak relateded to contextmenu.Debao Zhang2011-12-131-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | From Qt4.7 on, the contextmenu of QTextEdit/QPlainTextEdit/QLineEdit/QLabel/QMainWindow etc using QMenu::popup() instead of QMenu::exec(), but the setAttribute(Qt::WA_DeleteOnClose) does not work, as QMenu::close() isn't called when the menus disapper. And this causes a memory leak. Task-number: QTBUG-22817 Merge-request: 2721 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-12-121-8/+18
|\ \ | |/ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fix window surface config on OpenGL graphics system. Symbian: Fix a case sensitivity issue with QMAKE_EXTRA_COMPILERS Symbian: Fix double deletion of selected text when using predictive
| * Symbian: Fix double deletion of selected text when using predictiveMiikka Heikkinen2011-12-091-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | The selected text replacement was done incorrectly, leading to removal of additional text equal to the lenght of the original selection. Fixed by not doing any explicit replacement, but instead faking a preedit character that is immediately removed, which triggers selected text removal in the input method handling of the underlying edit control. Task-number: ou1cimx1#938665 Reviewed-by: Sami Merila
* | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-12-072-12/+14
|\ \ | |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-12-052-12/+14
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Correct client rect calculation for MCL Symbian: Fix CBA display on application with multiple windows Fix def files doc - document symbian behaviour of QFile::link Symbian - prefer sessions started by this process to choose proxy Freezing Def files in Qt Lightmaps demo Symbian fix CBA comes on top of option menu Fix memory leaks in OpenVG and OpenGL resource pools Fix sqlite driver memory eating due to close failure
| | * Correct client rect calculation for MCLmread2011-12-021-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The clientRect calculation was adjusting the rectangle for the status pane. But this is now taken into account in the rectangle from Avkon, so we do not need to adjust when the status pane is there. However Avkon is supplying an inconsistent clientRect depending on whether we have all Avkon panes disabled (status pane and CBAs). When enabled, Avkon takes the splitview keyboard off the clientRect space, when disabled, Avkon ignores the splitview keyboard. Since we want to ignore the splitview keyboard effect on the clientRect, we only adjust when the Avkon panes are enabled. This has been tested with splitview keyboard, orientation change and debug output of the client rectangle returned in the following situations: - Normal app with status pane and CBA - App with CBA but invisible status pane - App with status pane and CBA disabled Task-number: ou1cimx1#938780 Reviewed-by: Miikka Heikkinen
| | * Symbian: Fix CBA display on application with multiple windowsMiikka Heikkinen2011-12-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an application has more than one window and each window has widgets that can receive focus, sometimes a situation happened when the last focused window isn't actually the window that contains the current focused widget, which led to displaying incorrect CBA. Changed CBA displaying evaluation to be done whenever any control is focused instead of just windows. This can add a couple of extra S60->setRecursiveDecorationsVisibility() calls to some applications, but since that is typically already called multiple times anyway, it shouldn't be an issue. Task-number: ou1cimx1#935663 Reviewed-by: Sami Merila
| | * CBA comes on top of option menuAri Lehtola2011-11-301-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | Layout has changed so that option menu starts from bottom of screen. CBA is set behind in this case Reviewed-by: Miikka Heikkinen Task-number: ou1cimx1#932398
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-12-023-4/+61
|\ \ \ | |/ / |/| |
| * | Fix stretched font positions in LionJiang Jiang2011-12-012-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Mac OS X 10.7 and up, According to http://lists.apple.com/archives/Coretext-dev/2011/Nov/msg00006.html we need to manually apply transform matrix to advances if text matrix as been applied, CTRunGetPositions won't apply it. Task-number: QTBUG-22825 Reviewed-by: Eskil
| * | Backport writingSystems support code for Cocoa from Qt 5Jiang Jiang2011-12-011-2/+52
| | | | | | | | | | | | | | | | | | | | | Mark writingSystems support based on languages from Core Text. Task-number: QTBUG-20996 Reviewed-by: Morten Sorvig
* | | Remove more "unused variable" warningsGabriel de Dietrich2011-11-301-2/+2
| | | | | | | | | | | | Reviewed-by: Frederik
* | | QTreeView: fix crash when starting a drag with hidden columns.David Faure2011-11-301-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Crash was introduced by d639105759491 (Qt-4.8 only) Amended to remove "unused variable" warning. Task-number: QTBUG-15834 Merge-request: MR-2725 Reviewed-by: Gabriel
* | | Merge branch '4.8-upstream' into master-waterWater-Team2011-11-294-4/+14
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-11-284-4/+14
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: New API to set AVKON flag to inputcontext in Qt/Symbian. Fixing memory leak in QtGui qt_cleanup
| | * Merge remote-tracking branch 'flex/master'Pasi Pentikainen2011-11-253-1/+14
| | |\
| | | * New API to set AVKON flag to inputcontext in Qt/Symbian.Satyam Bandarapu2011-11-253-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This API is to pass any AVKON FEP flag to QCoeFepInputContext. Implemented as an exported private API, which is available only in Qt/Symbian. If latin keyboard flag is passed to this API and editor is Email/Url, virtual keyboard launches always with latin characters regardless of input language. Reviewed by: Sami Merila
| | * | Merge remote-tracking branch 'flex/master'Pasi Pentikainen2011-11-251-3/+0
| | |\ \ | | | |/
| | | * Fixing memory leak in QtGui qt_cleanupJani Hyvonen2011-11-221-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In qt_cleanup() the S60->setButtonGroupContainer(0) - which sets the QS60Data::cba to zero - is called before calling delete S60->buttonGroupContainer(). Because of this the currently set QS60Data::cba gets never deleted. A call S60->setButtonGroupContainer(0) which sets the QS60Data::cba pointer to zero is now called after calling the delete S60->buttonGroupContainer(). Task-number: QTBUG-22741 Reviewed-by: Murray Read
* | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-11-271-1/+1
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'qt-qa-review/master'Sergio Ahumada2011-11-261-1/+1
| |\ \ \
| | * \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-221-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: Doc: Fixing typo
| | | * | | Doc: Fixing typoSergio Ahumada2011-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reducing the amount of spelling errors from NBN. Change-Id: I9b228bb95b4a757cff57595125009e70b0097d86 Reviewed-by: Rohan McGovern
* | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-11-258-131/+394
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-11-248-131/+394
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fix Linux-Symbian parallel cross-compilation configure step Symbian: don't merge native clipboard, overwrite. Surviving out of memory in Qt Quick app Export QtGui functions required by QtMultimediaKit backend fix bearer crash Fix alignment of non-wrapped richtext QML Text elements.
| | * | | | Symbian: don't merge native clipboard, overwrite.Shane Kearns2011-11-221-0/+3
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If copying text from a Qt application that has both plaintext and formatted text representations, then S60 applications only see the plaintext. If copying data from an S60 application, the Qt application can see the plaintext. However as this was merged with the existing clipboard contents in Qt, the formatted text was unchanged. Now, we clear the internal clipboard QMimeData before writing the contents of the symbian clipboard to it. This ensures stale data from a previous copy is not left behind. Task-Number: ou1cimx1#927246 Reviewed-By: mread
| | * | | Surviving out of memory in Qt Quick appmread2011-11-214-129/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QtQuickPlayground app contains a version of samegame which allow the user to edit the code. By setting the ball size to 8, the app can run out of memory. This leaves it in a pretty bad state. But apps on Symbian shouldn't crash due to OOM and should allow some operation. This change fixes the immediate OOM crashes in declarative, gui and corelib. It shows warning dialogs which explain what has gone wrong and leaves the app in a state that can be exited cleanly from the Symbian task list. Task-number: QT-5319 Reviewed-by: Shane Kearns Reviewed-by: Gareth Stockwell Reviewed-by: Martin Jones
| | * | | Export QtGui functions required by QtMultimediaKit backendGareth Stockwell2011-11-183-2/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order for video rendering to work, the Symbian QtMultimediaKit backend needs access to QtGui functionality which is not exposed via public interfaces, namely: * QSymbianControl::setIgnoreFocusChanged(bool) * Setting custom painting modes, which control how content is blitted from the backing store into the native window surface * Requesting notification when Qt drawing starts and stops, so that the backend can ensure this does not interfere with video rendering. Until now, this has been achieved by the backend including private QtGui headers. If these headers are not present in the environment in which QtMobility is compiled, a warning is printed, telling the user that video / viewfinder rendering will not work correctly when the resulting binaries are installed. This patch adds a Symbian-specific public interface to QtGui, which exports the functionality above. Task-number: MOBILITY-747 Reviewed-by: mread
* | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-11-243-0/+12
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-11-232-0/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: Sequential reading not supported. DeclarativeDebugServer: Instantiate QPluginLoader on heap Fix failing unit tests. qmlplugindump: Fix dumping empty names for generated QMetaObjects. Fix compile with -qtnamespace Properly protect access to pixmap reader thread with mutex Move tga support from Qt3d to Qt. Move tga support from Qt3d to Qt. Properly protect access to pixmap reader thread with mutex qmlplugindump: Add flush to fix output redirection on windows.
| | * | | | Move tga support from Qt3d to Qt.Sarah Smith2011-11-142-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rev-By: Samuel Rodal Fix-for: QTBUG-21955 Part of fix for https://bugreports.qt.nokia.com/browse/QTBUG-21955 Having tga plugin inside a Qt add-on causes packaging problems. There have been many queries over the years for tga support even tho it is a niche image format. It is particularly useful for OpenGL work as a texture format since it is a blittable bitmap, but it is very innefficient compared to png or jpg. For this reason only read support is added, and this is documented. Also add some unit tests. The unit tests are in the qimagereader suite, and this is the right place for them as the other formats are tested there. Noticed that there was an annoying bug with tiff files and chased it down, in the hope of getting a clean test case PASS. Looks as tho there is a bit of work for someone to fix the other FAILs, but the ones for tga are all passing.
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-11-231-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Hide png symbols in a namespace for -qt-libpng
generated by cgit v0.12 at 2025-01-10 07:50:07 (GMT)