summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.8-upstream' into master-waterWater-Team2011-06-2923-163/+207
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-06-271-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Make it compile with openssl 1.0.0d, gcc 4.6 QStringBuilder: do not crash with null char* Fix event delevery order QSocketNotifier autotest - fix compile with MSVC
| | * Fix event delevery orderOlivier Goffart2011-06-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some functions (such as QObject::moveToThread) did not keep the event ordered by priority. And because qUpperBound is used to add events, that mean new events would not be inserted in order. Task-number: QTBUG19637 Change-Id: I38eb9addb1cdd45b8566e000361ac6e5f1f2c2b8 Reviewed-on: http://codereview.qt.nokia.com/733 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> (cherry picked from commit 7eeabcf70db658bca847498f618a94a375c95f5f)
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-06-271-2/+8
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Incorrect property name in QAccessibleAbstractSpinBox::setCurrentValue When asking for relations, don't crash on children that don't return an interface. Remove more inconsistencies with invisible. QAccessibleToolButton::text should return accessibleName if set. Remove stray semicolon. Do not expose text when echo mode is not Normal. Check validator when changing text using accessibility functions. Fix some issues introduced in df6713b8f55fc007796f40. Add tilde (both ~ and ~<userName>) expansion to QFileDialog on UNIX. Avoid bogus accessibility focus events from menus. Build fix for Mac OS 10.5 Avoided calling updateAccessibility() from updateMicroFocus if the item was hidden Notify a11y framework of FocusChanges for QGraphicsObject Call updateAccessibility on the QGraphicsObject in updateMicroFocus Fix updateAccessibility for QGraphicsObjects Make accessibility work on Windows with alien
| * \ \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-06-245-31/+89
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (28 commits) Use numeric virtual keyboard for all number entry modes. QTBUG-17776, reporting terminated threads as not running on Symbian Splitview - Auto-translation rules changed Support clipboard function on Symbian Added qmlshadersplugin to Symbian qt.iby-file. Workaround webkit deadlock on macos x Disable antialiasing for tiled image drawing. Ensure visibility of input widget in QML app when doing layout switch Def update for gui, openvg, and opengl. Revert "Def update." Fix trailing whitespace Remove unnecessary resizes during orientation change Revert "Symbian: Fix QFontInfo::pixelSize()" Improving warning messages in QVolatileImage. Proper naming for raster pixmap and paintengine on Symbian. Def update. Handle QVolatileImage-backed pixmaps optimally in drawPixmap(). Resizable graphicsview's background is drawn incorrectly in splitview Add inputcontext reset to orientation switch in Symbian QS60Style: QGroupBox is drawn as white box in upcoming Symbian release ...
| | * | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-245-31/+89
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qpixmap_raster_symbian.cpp src/gui/image/qpixmapdatafactory.cpp src/gui/painting/qgraphicssystem.cpp src/gui/styles/qs60style.cpp src/network/bearer/qnetworkconfigmanager_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtOpenGLu.def src/s60installs/bwins/QtOpenVGu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
| | | * | Support clipboard function on SymbianGuoqing Zhang2011-06-231-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-19996 Reviewed-by: Sami Merila
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-06-201-7/+5
| | | |\ \
| | | * | | Remove unnecessary resizes during orientation changeJani Hautakangas2011-06-172-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Orientation change causes unnecessary resize to top level window on Symbian. This causes recreation of EGL surfaces which is not wanted. Task-number: QTBUG-19911 Reviewed-by: Sami Merila
| | | * | | Proper naming for raster pixmap and paintengine on Symbian.Laszlo Agocs2011-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As QTBUG-19880 highlighted, the old S60 naming is not suitable for these classes anymore. Task-number: QTBUG-19913 Reviewed-by: Jani Hautakangas
| | | * | | Drop-down menu position is altered when Partial VKB is invokedSami Merila2011-06-144-30/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a new window is shown and splitview is open, native side claims that available screen area for the application is only the screen area above keyboard. However, since opening a new window, will eventually lead to keyboard getting closed, the new window will look strange occupying only top part of the screen. Fix it so that when a new window opens and splitview is open, window will still get its extent set to fullscreen area (minus native panes, if available). Task-number: QT-5103 Reviewed-by: Miikka Heikkinen
| | | * | | Fix SVG icons on softkeys in new Symbian devicesMiikka Heikkinen2011-06-141-17/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SVG icons automatically resize to the size of the pixmap, so the size of the icon pixmap needs to be what the platform expects. Added custom pixel metrics for CBA icon size that can be utilized for this purpose. Task-number: QT-5115 Reviewed-by: Sami Merila
| | | * | | Fix screen dimensions after orientation change in split screen mode.Miikka Heikkinen2011-06-141-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The client area dimensions reported by native side only encompass the screen not covered by virtual keyboard and ignore the status pane. Fixed by recalculating proper client area in handleClientAreaChange() using layout metrics. Task-number: QT-5105 Reviewed-by: Sami Merila
| * | | | | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-06-2423-174/+179
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-06-222-7/+10
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fix crash in PropertyChanges. Scroll correctly when cursorPosition is changed within onTextChanged. Fixing OpenGL module build error on Solaris Fix dialog position adjustment regression in Symbian SSL readbuffer 16->32 kB Fixes to how resize event and layout request are posted. Limit the cookies count per domain to 50. Add missing freeTexture() from fix for QTBUG-19180 Last word inputted was duplicated after input method hints changed Simplify texture pooling logic in GL graphics system. Fixed move a QGraphicsWidget and invalidate its layout at the same time Fix infinite recursion when changing geometry on Mac
| | | * \ \ \ Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-06-222-7/+10
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/qgl.cpp src/opengl/qpixmapdata_symbiangl.cpp src/opengl/qwindowsurface_gl.cpp
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-06-161-7/+5
| | | | |\ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Fixes to how resize event and layout request are posted. Fixed move a QGraphicsWidget and invalidate its layout at the same time Fix infinite recursion when changing geometry on Mac
| | | | | * | Fix infinite recursion when changing geometry on MacGabriel de Dietrich2011-05-261-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some complex widgets might get a negatively sized rectangle when calling QWidgetPrivate:setGeometry_sys_helper(), triggering a infinite recursion. Normalizing the rectangle size before checking for size change is enough to break this infinite recursion. Reviewed-by: Richard Task-number: QTBUG-17333
| | | | * | | Fix dialog position adjustment regression in SymbianMiikka Heikkinen2011-06-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removal of StyleChange event sending to dialogs in to previous optimization (QTBUG-17840) caused dialogs to no longer adjust their position properly at orientation switch. Added sending of a dummy resize event for dialogs in case of KEikDynamicLayoutVariantSwitch to trigger the adjustment. Task-number: QT-5101 Reviewed-by: Sami Merila
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-06-221-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: trivial: fix typo in comment changelog docu update for QNX 6.5 get rid of anacronysm massive improvements for the QNX screen driver massive improvements for the QNX mouse driver massive improvements for the QNX keyboard driver disable the Embedded Linux data directory permissions check for QNX skip two subtests that are known to fail on QNX implement POSIX IPC based QLock, QWSLock and QWSSharedMemory backends implement POSIX IPC based QSystemSemaphore and QSharedMemory backends add a configure-time check for an IPC support make QProcess really work on QNX make the kernel attempt to emulate an instruction with a misaligned access use RoundRobin scheduler by default on QNX a major refactoring of the mkspecs tree for QNX buildfix for qmake
| | | * | | | disable the Embedded Linux data directory permissions check for QNXRitt Konstantin2011-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so make it posible to store the Embedded Linux data directory on ACL-less file systems (like various FATs, ETFS and so on) Merge-request: 1259 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-06-212-0/+15
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Adding debug output for not supported gl features Compile fix in network for ios Make it possible to compile in a screen plugin name in QWS Don't redefine EGL defines Compile fixes in corelib for ios Export IPHONEOS_DEPLOYMENT_TARGET from qmake Adding arm armv6 and armv7 as valid archs for mac builds reset certain global variables on deletion Made tst_QWidget::repaintWhenChildDeleted() pass.
| | | * | | | | Make it possible to compile in a screen plugin name in QWSIan2011-06-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jørgen Lind
| | | * | | | | reset certain global variables on deletionLars Knoll2011-06-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt_button_down needs to be reset to 0 if it points to the widget being deleted. Reviewed-by: Samuel
| | | * | | | | Made tst_QWidget::repaintWhenChildDeleted() pass.Samuel Rødal2011-06-201-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement some missing functionality in QWidget::destroy(). (cherry picked from commit 0273bc5d22cd1fa08854b023f9b6c318fc75f3fa)
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-06-2012-108/+82
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (82 commits) Doc: Fixed spelling errors that were blocking the CI system. Added missing license headers. Added missing license headers. Doc: Added missing license headers for documentation and examples. qdoc: Fixed code to match comments in QML files. Fixed API types. Doc: Speculative attempt to fix build breakage. Doc: Fixed file name of a header file to use lower case characters. Doc: Speculative attempt to fix build breakage. Doc: Fixed file name of a header file to use lower case characters. Doc: Fixed links. Doc: Added a snippet to show how to test the Qt version. Added an additional check to workaround an issue on Windows. Doc: Fixed a scope test for maemo5 and made an error a warning instead. converted to unix txt file try to resolve CRLR problems "TAB character in non-leading whitespace" fixed * fixed trailing- and whitespaces * "How To Learn Qt" is almost complete. Last section is missing * Several external and internal (Qt) web links added Undo accidental breakage. Doc: Added some more information about visited links in rich text. ...
| | | * \ \ \ \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-1716-154/+92
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc examples/draganddrop/fridgemagnets/main.cpp examples/script/context2d/main.cpp
| | | * | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-24232-4271/+4011
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| | | * | | | | | | Fixed breakage caused by b727e5b95c1f0bd308b228fcf0445b42847ae583.David Boddie2011-05-241-13/+0
| | | | | | | | | |
| | | * | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-169-25/+126
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Doc: Fixed qdoc warnings.David Boddie2011-05-123-37/+20
| | | | | | | | | | |
| | | * | | | | | | | Doc: Fixed qdoc warnings.David Boddie2011-05-112-7/+10
| | | | | | | | | | |
| | | * | | | | | | | Doc: Fixed qdoc warnings.David Boddie2011-05-1110-66/+54
| | | | | | | | | | |
| | | * | | | | | | | Merge commit 'refs/merge-requests/1220' of git://gitorious.org/qt/qt into ↵David Boddie2011-05-058-14/+12
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-requests/1220
| | | * | | | | | | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-042-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
| | * | | | | | | | | | Fix build break in S60 5.0 environmentMiikka Heikkinen2011-06-201-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-19225 Reviewed-by: Sami Merila
| | * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamSami Lempinen2011-06-201-5/+8
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Skip softkeys update if application is not on foreground in SymbianMiikka Heikkinen2011-06-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Window deactivation in Qt applications when another application such as task switcher is opened on top of them caused softkeys to display incorrectly for the duration of Qt application being on the background. Task-number: QTBUG-19225 Reviewed-by: Sami Merila
| | | * | | | | | | | | Revert "Opening taskswitcher, pushes application softkeys to top of switcher"Miikka Heikkinen2011-06-171-5/+3
| | | | |_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 38d04b8cd5a26564945b833450a104fe82d97e14. The above commit was reverted as it caused regression, the problem described in task QTBUG-6115 was reintroduced.
| * | | | | | | | | | move some internal helper functions from qglobal.cpp to qcore_mac*Ritt Konstantin2011-06-093-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | namely: void qt_mac_to_pascal_string(const QString &s, Str255 str, TextEncoding encoding = 0, int len = -1); QString qt_mac_from_pascal_string(const Str255 pstr); OSErr qt_mac_create_fsref(const QString &file, FSRef *fsref); OSErr qt_mac_create_fsspec(const QString &file, FSSpec *spec); remove relevant "extern" declarations all over the Qt sources Merge-request: 2615 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* | | | | | | | | | | Mac: respect WA_ShowWithoutActivating flagRichard Moe Gustavsen2011-06-281-1/+4
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems like we just made any window key when showing it, regardless if WA_ShowWithoutActivating was set. This patch will fix this. Rev-By: msorvig
* | | | | | | | | | Merge remote-tracking branch 'upstream/4.8'Frederik Gladhorn2011-06-201-0/+16
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge remote branch 'qt-mainline/4.8'aavit2011-06-099-143/+41
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | 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-tracking branch 'upstream/4.8' into 4.8Frederik Gladhorn2011-06-12232-4465/+4226
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | 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>