summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* QTBUG-13301: The menubar does now work when no window is showingRichard Moe Gustavsen2010-09-222-10/+11
| | | | | | | | | | | | | The reason is that actions from the menu bar have no target, and is therefore sendt down the responder chain. This is sometimes neccessary to make it work with modal dialogs. But this also means that there will be no first responder window to catch the action if no window is showing on screen. Luckily, in 4.8, we added our own QNSApplication. And this will also be the last resort in the responder chaing. Hence, we add code to handle the menu bar action here. Rev-by: carlos
* Fix crash in Mac font loadingJiang Jiang2010-09-142-8/+3
| | | | | | | | | | | Commit f2f6330d915cbe3d0989ad280738ed0a6954cd35 introduced an extra CFRelease of QCFString, which will cause crash. Also, since we are not refering to ATS font in Cocoa code anymore, conversion of CTFontRef to CGFontRef should not rely on platform fonts, we use CTFontCopyGraphicsFont to get the corresponding CGFontRef directly. Reviewed-by: Eskil Abrahamsen Blomfeldt
* fix tiff reader to handle TIFFTAG_SAMPLESPERPIXEL for grayscale imagesLuboš Luňák2010-09-141-2/+5
| | | | | | | | | | | | | | | This commit fixes reading a .tiff file from ImageMagick which reports the following: TIFFTAG_BITSPERSAMPLE = 8 TIFFTAG_SAMPLESPERPIXEL = 2 TIFFTAG_PHOTOMETRIC = PHOTOMETRIC_MINISBLACK The reader uses QImage::Format_Indexed8, but since the samples per pixel value this should be (non-existent) QImage::Format_Indexed16, causing memory corruption. The fix falls back to the "normal" way of reading tiff images. Merge-request: 2467 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-1011-68/+167
|\ | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix typos. Fix typo in declative example. test for gdb version before runnning dwarf indexing Fix Core Text font loading for certain Mac Fonts Support sub pixel positioning of glyphs in raster engine Added basic tests for threaded QPainter drawing onto FBOs and PBOs.
| * Fix Core Text font loading for certain Mac FontsJiang Jiang2010-09-103-29/+24
| | | | | | | | | | | | | | | | | | | | | | Font names enumerated by Core Text cannot be found by ATSFontFamilyFindFromName because ATS is expecting native names instead of the names returned by Core Text. This patch get rid of ATS font matching code in Cocoa code path to simplify the code, avoid deprecation warnings (in the future) and fix this issue. Task-number: QTBUG-11145 Reviewed-by: Eskil
| * Support sub pixel positioning of glyphs in raster engineEskil Abrahamsen Blomfeldt2010-09-0910-39/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the raster engine to provide the same quality of text rendering as the native engine on Mac Cocoa, we need to support rendering to different sub pixel positions for each glyph. The number of subpixel positions is arbitrary and has to be detected, but it's usually three or four. Each position will give slightly different coverages inside the pixel and thus different rasterizations. Other font engines which support sub pixel positioning of glyphs can provide the same functionality by implementing supportsSubPixelPositions() to return true, and then adding the subPixelPosition argument to the x coordinate used in alphaRGBMapForGlyph(). Task-number: QTBUG-5053 Reviewed-by: Jiang Jiang
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-1057-610/+882
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * Fixed crash in input methods when using symbols menu and numbers onlyaxis2010-09-101-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | When inputting only numbers, the symbol menu should not do anything. However in the old code the resource id of the symbol table was still being set, so the symbol key on N97 would look up a table that was not valid for the current input mode and crash. Fixed by setting the symbol table id to zero under those conditions. RevBy: Sami Merila Task: QTBUG-13472 AutoTest: Included
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-092-2/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Editable QComboBox popup immediately closes itself after a click Change RLibrary handle in QS60PluginResolver to be process wide Cursor is misplaced in the editors text area QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbian
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-092-2/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Editable QComboBox popup immediately closes itself after a click Change RLibrary handle in QS60PluginResolver to be process wide Cursor is misplaced in the editors text area QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbian
| | | * Editable QComboBox popup immediately closes itself after a clickSami Merila2010-09-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is due that timer that blocks for while mouse release events (blockMouseReleaseTimer) is not started. There is an optimization in QComboBox that tries to avoid calling d->viewContainer() since that method creates the viewContainter if it doesn't exist. Unfortunately this optimization does not take into account if the container is already created. In this particular case, viewContainer is already created, but since QComboBox creates a QLineEdit, it skips the timer start, which leads to situation where combobox's popup menu receiving mouse release event and thus closes itself. As a fix, blockMouseReleaseTimer is started if the viewContainer is already created. Task-number: QTBUG-13231 Reviewed-by: axis
| | | * Cursor is misplaced in the editors text areaSami Merila2010-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QInputMethodEvent::Cursor with value 0 is sent to QLineEdit, cursor is still visible. QLineControl (text control widget inside QLineEdit) handles the internal state of cursor visibility correctly and then promptly ignores the state when drawing the text. Issue is corrected by checking the cursor visibility state when drawing the cursor into widget. Task-number: QT-3670 Reviewed-by: axis
| * | | Fixed the scrolling of text in QLineEdit with right alignmentThierry Bastian2010-09-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The scrolling internal member was not changed in cas the text was bigger than the lineedit. Task-number: QTBUG-13520 Reviewed-by: gabi
| * | | Removing Q_ENUMS declaration in QTransformJørgen Lind2010-09-091-1/+0
| |/ / | | | | | | | | | | | | | | | since QTransform does not inherit QObject its redundant Reviewed-by: gunnar
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-091-17/+122
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix tst_qimage with QT_NO_EXCEPTIONS qdrawhelper: Optimisations in fetchTransformedBilinear qdrawhelper: use SSE2 for interpolation in fetchTransformedBilinear qdrawhelper: small optimisations in fetchTransformBilinear QEasingCurve::operator== returning wrong value
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-081-17/+122
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix tst_qimage with QT_NO_EXCEPTIONS qdrawhelper: Optimisations in fetchTransformedBilinear qdrawhelper: use SSE2 for interpolation in fetchTransformedBilinear qdrawhelper: small optimisations in fetchTransformBilinear QEasingCurve::operator== returning wrong value
| | | * qdrawhelper: Optimisations in fetchTransformedBilinearOlivier Goffart2010-09-081-30/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Scaling down, no rotation, with SSE2. Specialize for ARGB32 not tiled, so the pixelbound can be simplified Reviewed-by: Samuel
| | | * qdrawhelper: use SSE2 for interpolation in fetchTransformedBilinearOlivier Goffart2010-09-081-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when scale down, with no rotations Process the pixel 4 by 4 and do the interpolation using SSE2 Reviewed-by: Samuel
| | | * qdrawhelper: small optimisations in fetchTransformBilinearOlivier Goffart2010-09-081-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Another way to compute the interpolation that does less multiplications. Small inpact on benchmark Made-with: Samuel
| * | | Pulled code form initializeDb() out into addFontToScreenDevice()Alessandro Portale2010-09-081-52/+53
| | | | | | | | | | | | | | | | | | | | | | | | Preparations for Application font support on Symbian Task-Number: QTBUG-6611
| * | | Moved font list getter to qfontdatabase_s60.cpp. Reusable.Alessandro Portale2010-09-082-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | Preparations for Application font support on Symbian Task-Number: QTBUG-6611
| * | | Pulled some code from One long function into a short oneAlessandro Portale2010-09-081-5/+11
| |/ / | | | | | | | | | | | | | | | Preparations for Application font support on Symbian Task-Number: QTBUG-6611
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-081-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Let's not duplicate Symbian softkey menu top-level actions in submenu. Remove some .pro statements left behind after IAP usage cleanup Ignore MAKEFILE variable for Symbian abld and sbsv2 builds.
| | * | Let's not duplicate Symbian softkey menu top-level actions in submenu.Janne Anttila2010-09-081-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old code incorrectly added the toplevel menu to menubar, where as submenu should have been added. This change only has impact to case where menu is being manually constructed by creating softkey action with menu and by adding actions to that menu. Normal "Options" menus are already working correctly. Task-number: QTBUG-12189 Reviewed-by: Miikka Heikkinen
| * | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-09-0813-58/+57
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Add missing license header Fixed input context trying to squeeze content into a full widget. Cleaned up position tracking in the Symbian input methods. Revert "Long-press shortcuts for symbols on QWERTY keyboard don't work" Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it. Compile fix WinCE Ensure that we load system libraries from the correct location. Some small Solaris fixes. Fix QtScript Date <--> QDateTime (local time) conversion Fix Qt applications freezing until mouse/keyboard events occur. Recognize GL_ARB_shader_objects as indicating shaders
| | * Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-09-0713-58/+57
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Add missing license header Fixed input context trying to squeeze content into a full widget. Cleaned up position tracking in the Symbian input methods. Revert "Long-press shortcuts for symbols on QWERTY keyboard don't work" Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it. Compile fix WinCE Ensure that we load system libraries from the correct location. Some small Solaris fixes. Fix QtScript Date <--> QDateTime (local time) conversion Fix Qt applications freezing until mouse/keyboard events occur. Recognize GL_ARB_shader_objects as indicating shaders
| | | * Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-09-0713-58/+57
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Add missing license header Fixed input context trying to squeeze content into a full widget. Cleaned up position tracking in the Symbian input methods. Revert "Long-press shortcuts for symbols on QWERTY keyboard don't work" Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it. Compile fix WinCE Ensure that we load system libraries from the correct location. Some small Solaris fixes. Fix QtScript Date <--> QDateTime (local time) conversion Fix Qt applications freezing until mouse/keyboard events occur. Recognize GL_ARB_shader_objects as indicating shaders
| | | | * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-0713-58/+57
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/Makefile.win32 src/corelib/io/qfsfileengine_win.cpp src/corelib/kernel/qeventdispatcher_win.cpp src/gui/dialogs/qfiledialog_win.cpp src/gui/inputmethod/qcoefepinputcontext_s60.cpp src/gui/text/qfontdatabase_win.cpp src/gui/util/qsystemtrayicon_win.cpp src/script/utils/qscriptdate.cpp tests/auto/qinputcontext/tst_qinputcontext.cpp tests/auto/qscriptengine/tst_qscriptengine.cpp
| | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-0613-58/+57
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add missing license header Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it. Compile fix WinCE Ensure that we load system libraries from the correct location.
| | | | | | * Ensure that we load system libraries from the correct location.Jan-Arve Sæther2010-09-0313-58/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a security hole that has been there for a while, but the public awareness have recently rised so the threat is more imminent now. The solution is to fix all places where we dynamically load system libraries. More specifically, we now load all system libraries with an absolute path that points to a library in the system directory (usually c:\windows\system32). We therefore introduce a small class named QSystemLibrary that only loads libraries located in the system path. This shares some of the API with QLibrary (in order to make the patch as small as possible). We don't fix QLibrary due to risk of regressions. In addition, applications can fix the code that calls QLibrary themselves. The problem does not apply to Windows CE, since the search order is documented as not searching in the current directory. However, it touches some CE-specific code - therefore QSystemLibrary is sometimes used on WinCE (however, it will just do a normal LoadLibrary() since its safe anyway). This change does not affect the testability plugin (it is not clearly documented where that plugin is located, and the plugin should never be used in production code anyway) Loading OpenSSL libraries The ssl libraries are handled specially, and searched in this order (we cannot expect them to always be in the system folder): 1. Application path 2. System libraries path 3. Trying all paths inside the PATH environment variable Task-number: QT-3825 Reviewed-by: Thiago Macieira Reviewed-by: Peter Hartmann
| | | | | * | Fixed input context trying to squeeze content into a full widget.axis2010-09-061-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was reproduced on N97. If the FEP detects that the widget is full while still editing text, it will try to send those events as key events instead. Since this screws up the content in the widget, we stop those events from reaching the widget in the input context. AutoTest: Passed Task: QTBUG-12949 RevBy: Miikka Heikkinen (cherry picked from commit 5ca6264933af60b3cd376b7f08bea008fa69b515)
| | | | | * | Cleaned up position tracking in the Symbian input methods.axis2010-09-063-15/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixed a case where using password mode would lead to Qt believing that the cursor was one step to the left of where it really was. This would have the effect of replacing the last character instead of appending to it, and even crashing if the cursor was all the way to the left. The code is also much cleaner this way, but it meant that QTBUG-9867 had to be solved differently this time. We do this by assuming that and empty FEP update means "erase last character", which seems to work well in practice. Also added a long overdue autotest for the FEP input methods. Most tests pass, but some don't, which I will try to fix later. Task: QTBUG-9867 Task: QTBUG-12949 RevBy: Miikka Heikkinen AutoTest: Included (cherry picked from commit 52cf47565e402dc682038ccaf8d725401802b603)
| | | | | * | Revert "Long-press shortcuts for symbols on QWERTY keyboard don't work"axis2010-09-063-16/+2
| | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 05eacd9ad40f8adb5aaa12a8b90113a73b43f642. Conflicts: src/gui/inputmethod/qcoefepinputcontext_p.h src/gui/inputmethod/qcoefepinputcontext_s60.cpp (cherry picked from commit c5901037f0d3ccd45b0c79b38ef5b04552dad0aa)
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-071-5/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove unnecessary function declarations from qpixmap_s60_p.h Fix text size issues for high ppi displays
| | * | | | Remove unnecessary function declarations from qpixmap_s60_p.hJani Hautakangas2010-09-071-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TRUSTME
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-071-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Always call QPainter::end() before using the object drawn to. Doc: Reworded a brief description for clarity. Doc: Added a small note about using .pro files in SUBDIRS.
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-079-110/+301
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-0611-213/+86
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-0213-61/+76
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-0113-223/+396
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-2725-69/+197
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-2424-195/+265
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-1744-195/+939
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Doc: Reworded a brief description for clarity.David Boddie2010-08-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-073-8/+16
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove unused variable Make compile on gcce resolving method name does not work for Symbian so need to use ordinal instead
| | * | | | | | | | | | Remove unused variableThomas Zander2010-09-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: axis
| | * | | | | | | | | | Make compile on gcceThomas Zander2010-09-072-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of friend use static to avoid gcce saying a formerly extern declaration turned into a static declaration. Reviewed-by: axis
| | * | | | | | | | | | resolving method name does not work for Symbian so need to use ordinal insteadPetri Kiiskinen2010-09-071-0/+6
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 768 Signed-off-by: axis <qt-info@nokia.com>
| * | | | | | | | | | Replaced QWeakPointer to *Pointer in QGestureManager.Dominik Holland2010-09-072-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QWeakPointer was part of a key in a QMap. When the QWeakPointer gets deleted, the key changes and the sorting of the Map was wrong. That leads to an random crash. It should be safe not to use QWeakPointer as we remove pointers from the objectGestures map when a widget or graphicsitem gets destroyed. Reviewed-by: Denis Dzyubenko
| * | | | | | | | | | Fixed hiding a window on X11 before it was shown.Denis Dzyubenko2010-09-071-0/+7
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On X11 show() just issues a request to show a window, so if someone tries to call hide() before the window was successfully mapped to the screen by the window manager it will not work (on most window managers unfortunately). So instead, when hide() is called we internally mark the window as "no need to show anymore" and then if we still get MapNotify event, we will hide the window right away. Reviewed-by: Markus Goetz Reviewed-by: Bradley T. Hughes