summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'qt-mainline/4.8'aavit2011-06-099-143/+41
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-06-082-21/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (32 commits) Fix autotest on Windows Compile on Mac OS X Ammend last commit Implemented QAccessibleTextEdit::attributes() Changing cursor position in all boundaries code clean-up for QSystemSemaphore simplify QSharedMemoryPrivate::cleanHandle() minor improvements for QSharedMemory fix potential keyfile leaking refactoring of the QWSSharedMemory class allow the user to averride QT_QWS_TEMP_DIR in qplatformdefs.h minor typo fix minor code simplification minor code simplification avoid the QT_NO_ASCII warning remove an unused headers nano optimization don't reallocate memory if the old buffer has sufficient capacity fix potential memory leaking don't delete the lock if it was not created by this surface ...
| | * minor code simplificationRitt Konstantin2011-06-061-7/+2
| | | | | | | | | | | | | | | | | | | | | `ascii` wasn't used Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * avoid the QT_NO_ASCII warningRitt Konstantin2011-06-061-1/+1
| | | | | | | | | | | | | | | Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * remove an unused headersRitt Konstantin2011-06-061-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | these headers weren't used anymore since QLock, QWSLock and QWSSharedMemory classes had been introduced Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * QSessionManager: fix build on QWSRitt Konstantin2011-06-061-0/+3
| | | | | | | | | | | | | | | Merge-request: 2627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-06-085-25/+29
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (54 commits) Update internal state before emitting configurationChanged() signals. Fixed qmlshadersplugin manual test shaders on SGX family GPU:s. Fixed qmlshadersplugin on windows VC2008 toolchain. Reset input context in Symbian when another window is opened. KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget() Close context menus during orientation change. Have -small-screen enabled in certain examples on Symbian always. Update Japanese translations. Revert some of "Make QMLViewer startup animation stop after a while" Fix for winscw QtGui.def Add private method for flushing the pixmap cache. QDeclarative: Fix QPerformanceTimer on Symbian Fix QTreeWidget autotest cases on Symbian/VGA Increase SSL readbuffer 1 -> 16 kB Fix pixel metrics for Symbian VGA devices Revert "Fix QNetworkConfigurationManager usage outside main thread first" Avoid buffer overrun in QMacPixmapData resizing Fix glyph metrics with QStaticText/Freetype/raster and light/no hinting Fix tst_QGraphicsItem::sorting() test case for Symbian Fix QHeaderView test case for VGA Symbian devices. ...
| | * \ Merge remote branch 'upstream/4.8' into qt-4.8-from-4.7Toby Tomkins2011-06-084-97/+6
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/styles/qs60style.cpp
| | * \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-071-0/+7
| | |\ \ \
| | | * | | Close context menus during orientation change.Laszlo Agocs2011-06-061-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make non-native QMenus, i.e. context menus, work like in Avkon. Reviewed-by: Miikka Heikkinen Reviewed-by: Sami Merila Task-number: QTBUG-19656
| | * | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-315-25/+22
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qtextengine.cpp src/gui/text/qtextengine_p.h src/gui/text/qtextlayout.cpp src/plugins/phonon/mmf/mmf.pro src/plugins/s60/5_0/5_0.pro tests/auto/qtextlayout/tst_qtextlayout.cpp
| | | * | Fix for BCM2727 chip detection on SymbianJani Hautakangas2011-05-301-18/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSymbianGraphcisSystemEx::hasBCM2727() uses bool QApplicationPrivate::useTranslucentEGLSurfaces to decide if Symbian is running on BCM2727 chip which is not entirely correct. bool QApplicationPrivate::useTranslucentEGLSurfaces should be assigned according to QSymbianGraphcisSystemEx::hasBCM2727() and QSymbianGraphcisSystemEx::hasBCM2727() should be also static function. Task-number: QTBUG-19578 Reviewed-by: Laszlo Agocs
| | | * | Fix QMenuBar autotest failures for SymbianSami Merila2011-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Effectively three fixes to reach same autotest results as on other Symbian devices and to make the case not crash (itself, or Qt). a) Fix null pointer usage in QWidget. This is mostly theoretic case, since it requires that previous focus widget has widget, yet it doesn't have internal winId. Still test case manages to make this happen, so lets prevent the null pointer use. b) Skip activatedCount_noQt3() test case, since it would require shortcut support and leads to test crash. Qt for Symbian should have shortcut support as a result of task http://bugreports.qt.nokia.com/browse/QTBUG-5730 c) Ensure that menu has at least 360 width in tests that send keypresses to the menu. Otherwise, menuitems might get set into menu extension, which makes highlight tests fail (since item is not visible). Task-number: QT-5053 Reviewed-by: Tomi Vihria
| | | * | Documented Symbian peculiarity about QDesktopWidget::availableGeometryMiikka Heikkinen2011-05-271-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian QDesktopWidget::availableGeometry() is not guaranteed to return correct values at the time the resize event related to the geometry change is passed to the widgets. There is a similar issue with QDesktopWidget::screenGeometry(). Documented this fact. Task-number: QTBUG-14058 Reviewed-by: Sami Merila
| | | * | Fix non-Symbian builds broken by previous commit.Miikka Heikkinen2011-05-273-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-5065 Reviewed-by: Sami Merila
| | | * | Fix SYMBIAN_VERSION_* ifdeffingMiikka Heikkinen2011-05-273-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFileDialog and QSoftkeyManager broke in S60 5.3 platform because incorrect version ifdeffing. Task-number: QT-5065 Reviewed-by: Sami Merila
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-17190-3223/+3223
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updating file with CRLF line endings for the updated header Fix a regression in QList::mid() update gitignore remove -fno-stack-protector Fix make confclean Update licenseheader text in source files
| | | | * | Update licenseheader text in source filesJyri Tahtela2011-05-13190-3223/+3223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-06-085-5/+13
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: (56 commits) Fix compile when configure with no fontconfig support Fix warning in qtextengine compilation Reorder member varibles in QGlyphRunPrivate to eliminate warning Revert 36e01e69 Fixed compile of tst_qscriptextensionplugin on some Windows configurations Add function QGlyphRun::setRawData() Correct antialias disabling logic for Core Text Correct QStaticText tests after recent changes Add missing license header. Add basic static text drawing capability to lance Fix Windows build Refactor glyph pretransform check Add the new 'glhypnotizer' demo. Fix problem with cosmetic stroking of cubic beziers Fix autotest to not depend on rasterization details Still use midpoint rendering of aliased ellipses Symbian build failure for Armv5 Fix the wayland windowsurface so that we have stencil and depth buffer We need to let the currentContext be in the same state after Track Wayland changes ...
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-06-074-97/+6
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: (25 commits) Horizontal lines appearing under entered characters Move qts60plugindeployment rule to correct scope Skipping tst_QEventLoop::processEventsExcludeSocket for qws Fixed compile of tst_qscriptextensionplugin on some Windows configurations QS60Style: Checked state is not shown on highlighted itemview item Removing unused code after introduction of round robin scheduler tst_qeventloop runs the event loop to ensure socket messages arrive Schedule Symbian active objects with a round robin scheduler Fix the build break for QUrl autotest on Symbian Fixed def files for WINSCW Fixed def files for ARMV5 Fix the build break for QStyleSheetStyle autotest on Symbian Fix bug about daylight saving missing on Symbian platfrom. Fix the build break caused by the missing parameter for QSKIP macro. Document the Symbian main window size issue at application start. QS60Style: icon is not shown correctly in a menu item in all cases QS60Style: Remove 3.x specific code from style Fix Coverity issues found from QS60Style Removed qts60plugin references also from config.profiles Remove s60 plugin dll from the iby file too. ...
| | * | | | Removing unused code after introduction of round robin schedulermread2011-06-013-64/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Existing code that was used to defer active objects and otherwise alter their execution time is unnecessary and unused after the round robin scheduler introduction. So it is being removed here. Task-number: QTBUG-15019 Reviewed-by: Shane Kearns
| | * | | | Schedule Symbian active objects with a round robin schedulermread2011-06-011-32/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each call to QEventDispatcherSymbian::processEvents allows pre-existing active objects with priority >= CActive::EPriorityStandard to run once. Active objects with lower priorities can only run if no higher priority active object has run. Task-number: QTBUG-15019 Reviewed-by: Tom Sutcliffe Reviewed-by: axis
| | * | | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-05-23232-3973/+4011
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/s60/src/qcoreapplication_3_1.cpp src/plugins/s60/src/qcoreapplication_3_2.cpp src/plugins/s60/src/qdesktopservices_3_1.cpp src/plugins/s60/src/qdesktopservices_3_2.cpp src/plugins/s60/src/qlocale_3_1.cpp src/plugins/s60/src/qlocale_3_2.cpp
| | * | | | | Opening taskswitcher, pushes application softkeys to top of switcherSami Merila2011-05-191-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If application does not have active window, do not update CBA, since this causes the CBA to become on foreground. Task-number: QTBUG-19225 Reviewed-by: Miikka Heikkinen
* | | | | | | Protect against deleted windowsLars Knoll2011-06-081-0/+16
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that the window is still there before trying to deliver an event to it. Reviewed-by: Samuel
* | | | | | Merge remote branch 'qt/4.8' into fire-masterPaul Olav Tvete2011-06-06232-4289/+4083
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/wayland/qwaylandclipboard.cpp src/plugins/platforms/wayland/qwaylandclipboard.h src/plugins/platforms/wayland/qwaylanddisplay.cpp src/s60installs/eabi/QtOpenGLu.def
| * | | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-24232-3940/+3940
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-1812-331/+71
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/wheel.qdoc src/gui/util/qflickgesture.cpp src/gui/util/qflickgesture_p.h src/gui/util/qscroller.cpp src/gui/util/qscroller.h src/gui/util/qscroller_p.h src/gui/util/qscrollerproperties.cpp src/gui/util/qscrollerproperties.h tests/auto/qscroller/tst_qscroller.cpp
| | * | | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-13232-3940/+3940
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
| * | | | | | Fix in-process drag-n-drop of image data, image/* was not available.David Faure2011-05-191-6/+22
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we give the exact initial QMimeData to the dropEvent, we only get application/x-qt-image as available mimeType. We need to go through QDropData to call xdndObtainData, which can still do some in-process optimization, but there we can do the "saving QImage to the requested format" conversion. Task-number: QTBUG-4110 Merge-request: 860 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| * | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-05-176-17/+55
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (55 commits) Fix thread safety regression of QNetworkConfigurationManager Fix instability in QNetworkConfigurationManager autotest Support word selection list with predictive text from splitview Fix softkey icon positioning in S60 5.3 QDeclarativeMouseArea: block context menu events ListViews loses items if all visible items are removed. Make TextEdit word selection more natural. Clear confusion between QMainWindow and QMainWindowLayout. Fix for rounded corners bug in QMenu Compile QWidgetPrivate::setParent_sys might be using null pointer Ensure the TextEdit cursor delegate is repositioned on mouse events. Don't crash on an invalid replacementStart from an input method. Fix incorrect hardware address on systems without getifaddrs() Enable multisampling on Symbian if hw supports it Fix QtCoreu.def file error Introduce platform extension to QGraphicsSystem Fix Symbian/WinsCW build break Prevent crash in OpenGL engine when scaling images / pixmaps. emit QNetWorkAccessManager::finished on QNetworkReply::abort() ...
| | * \ \ \ \ Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Olivier Goffart2011-05-167-28/+75
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qt_s60_p.h
| | * | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-143-15/+24
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-05-131-15/+20
| | | |\ \ \ \
| | | | * | | | Fix softkey icon positioning in S60 5.3Miikka Heikkinen2011-05-131-15/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In S60 5.3, Avkon apparently expects softkey icons to be 32x32 and positions them accordingly into the softkey, instead of needing the application to supply the whole softkey image. Fixed by skipping the softkey image centering when S60 version is 5.3 or larger. Task-number: QTBUG-19104 Reviewed-by: Sami Merila
| | | * | | | | Support word selection list with predictive text from splitviewSami Merila2011-05-132-0/+4
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When splitview is active and user taps a predicted word, mouse button should be forwarded to m_pointerHandler, which opens a suggested word list. When splitview is not active, but there are HW QWERTY keys in the device, tapping a word, should only move the cursor. Without HW QWERTY and no splitview, native editing state handles the functionality. Task-number: QTBUG-19062 Reviewed-by: Miikka Heikkinen
| | * | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-121-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | QWidgetPrivate::setParent_sys might be using null pointerSami Merila2011-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix possible null pointer usage. Issue found by Coverity tool. Reviewed-by: Miikka Heikkinen
| | * | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-112-1/+4
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qwidget_p.h src/gui/painting/qgraphicssystem_p.h src/plugins/plugins.pro src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtDeclarativeu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtMultimediau.def src/s60installs/bwins/QtNetworku.def src/s60installs/bwins/QtOpenGLu.def src/s60installs/bwins/QtScriptu.def src/s60installs/bwins/QtSqlu.def src/s60installs/bwins/QtTestu.def src/s60installs/bwins/QtXmlPatternsu.def src/s60installs/bwins/phononu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtTestu.def
| | | * | | | Introduce platform extension to QGraphicsSystemJani Hautakangas2011-05-102-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt on Symbian needs some special capabilities to be able to work on 32MB GPU. This patch introduces some Symbian specific functions to QGraphicsSystem Task-number: QTBUG-17882 Reviewed-by: Laszlo Agocs
| | * | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-063-0/+26
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainterpath.cpp src/gui/text/qfontengine_ft.cpp src/s60installs/eabi/QtGuiu.def
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-05-051-0/+5
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Skip test on MacOS due to problems with corewlan plugin Send User-Agent from the network request in http proxy CONNECT command Fix initial main window dimensions for "fullscreen with softkeys" case Fix compile errors in bearer tests Fix QNetworkConfigurationManager usage outside main thread first
| | | | * | | | Fix initial main window dimensions for "fullscreen with softkeys" caseMiikka Heikkinen2011-05-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The application main window defaults to fullscreen size when initially constructed, even if softkeys are specified for it, as the screen furniture is constructed later in show_sys. This resulted in the main window being partially under softkeys. Fixed by invoking handleClientAreaChange() explicitly in show_sys in fullscreen with softkeys case. Task-number: QTBUG-19043 Reviewed-by: Sami Merila
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-05-042-0/+21
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix ordinal number conflict QPainterPath: Ignore calls with NaN/Infinite parameters memory leak fix Fixes crash in QWidget::effectiveWinId. Revert symbol addition in b033bb9
| | | | * | | | Fixes crash in QWidget::effectiveWinId.Bjørn Erik Nilsen2011-05-022-0/+21
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Widgets are left in a transitional (and incosistent) state while being re-parented, which caused QWidget::effectiveWinId() to crash in certain circumstances. See patch for more details. Auto test included. Reviewed-by: ogoffart
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-05-172-16/+16
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: (23 commits) Fix QGLWidget::renderPixmap for raster engine on Mac Check if OES_texture_npot is present on OpenGL ES 2. Fix tst_QVariant::invalidColor Move QTextCursor::MoveStyle to Qt namespace Move the painting redirection to the unified toolbar surface. Fix misspelled word in comment. Build fix for tst_qrawfont Add some QRawFont related low level functions to avoid extra copying Compile on Mac Rename QGlyphs -> QGlyphRun Fix QRawFont::setPixelSize() on Mac Remove warning from QColor::setNamedColor(). Add internal documentation for QUnifiedToolbarSurface. Fix QPainter::drawGlyphs() with non-affine transformation Remove misspelled comment in tst_qtextdocument.cpp Only enable design metrics for scalable fonts Add a way to retrieve CTFontRef from QFont Include pixel size of font in exported HTML from QTextDocument Fix the autotest condition. Change the repaint() call to an update(). ...
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-165-298/+0
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert all QScroller and QFlickGesture related code. Fix regression that caused waitForXXX(-1) to fail.
| | * | | | | Revert all QScroller and QFlickGesture related code.Robert Griebl2011-05-165-298/+0
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commits 0274e68767cce6440515a68d6af868725d5577a4 2770b1277744bb676e96e4ae8c89acd645ec895d 02e1f4e83dc8e3c4ab957095167b3d34c51ba3c1 fdf3be5b6b5db75833e0a7e9a90445ddd794fe4d d1f9a534da288884f443a975f428b0cfe0a7b29b 205d607c3387d074fb87f8deb77a8f515ae2e189 32d200da9cc7a4dfb3f302f22ef5718a286845c9 3e0df49f978933b1e4e6b48c695bf813ec9a2828 82bbc1c1611bde33680d22a1a3c6449e51d7b0b9 b78ffe51f9a4c4ac705e435d45fffe39864c032d fe438d7d828021d7f86301af36fe8dff2768532a df30d58de183d13c649ef7e0fbb8e2b3658e0862 fa845566b3733bc06454b71e33b1ff405ba32280 4f9a318d639c4e7e09e56751d31608fb39d472af 4810b587a65d81f8f90646efd09cadeb1276a756 7bad867382ad6c84155ffcfbb361709a8e8184ab 64ec011c6132496eb9555c1d09e7fd4ddf472837 81492e56aba5b5761500543665012a85d6835513 b668857b3749b39c3a61e0a25e750740b74df552 78a7a02b3b85435bc28eb23e9210522467171e42 Reviewed-By: Ralf Engels
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-05-134-28/+66
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fix QtOpenGL def file for armv5. Disable QtConcurrent for Symbian winscw builds. Fix loss of focus and activation when hiding a child widget Symbian build failure for Armv5 Fix softkeys in case a dialog with softkeys that have icons is closed. Update softkeys after orientation switch. Provide internal API to avoid automatic translation of input widget Do not allow fullscreen/maximized windows to expand beyond client rect
| | * | | | | Fix loss of focus and activation when hiding a child widgetMiikka Heikkinen2011-05-122-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't deactivate the active window when hiding its child if it has another child that currently has the focus. Task-number: QTBUG-19196 Reviewed-by: Sami Merila