summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-267-169/+207
|\ | | | | | | | | | | Conflicts: qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.h
| * Build break fix for commit d8465414e6fd543cfc20e732030dedd8d2bc685f.Janne Anttila2010-02-261-2/+2
| | | | | | | | | | | | | | | | RVCT does not like static inline, and variables should not be defined in case statement without braces. In this case the temp variable was actually unnecessary. Reviewed-By: TrustMe
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-255-168/+185
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Removed an export that shouldn't be exported. Reduced the code and memory footprint of the keymap. Enabled Qt key events to work also when native key code is missing. Crash in QGraphicsScenePrivate::setFocusItemHelper Improvements to itemview keypad navigation in S60. Fix SymbianMakefileGenerator::absolutizePath for clean builds Misc fixes to FLM files
| | * Removed an export that shouldn't be exported.axis2010-02-251-1/+1
| | |
| | * Reduced the code and memory footprint of the keymap.axis2010-02-252-129/+124
| | | | | | | | | | | | | | | | | | | | | This was done by using a static const data structure instead of a list. RevBy: Alessandro Portale
| | * Enabled Qt key events to work also when native key code is missing.wasila2010-02-253-164/+141
| | | | | | | | | | | | | | | | | | | | | If it is missing we base the event on the scan code instead. RevBy: Alessandro Portale Signed-off-by: axis <qt-info@nokia.com>
| | * Improvements to itemview keypad navigation in S60.Janne Anttila2010-02-252-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic used in this commit is partially taken from sliders. This commit makes it possible to interact (change row or column) in itemview even itemview does not have editFocus. Interacting without editFocus is enabled when it is not possible to keypad navigate to reuqested direction. In addition if keypad navigation to any direction is not possible (i.e there is only one listwidget on screen), there is no sense to add "done" softkey to get out of edit focus. Task-number: QTBUG-4802 Reviewed-by: Alessandro Portale
| * | Revert changes made in scroll_sys().Fabien Freling2010-02-251-1/+13
| |/ | | | | | | | | | | | | | | | | | | The optimization created some glitches. It now works properly but it could be improved performance-wise. Task-number: QTBUG-5926 Task-number: QTBUG-5994 Reviewed-by: Morten Sorvig
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-231-0/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Always define Q_WS_S60 on Symbian unless configured with -no-s60. Enable window size caching on Symbian NGA variants. Use the SYMBIAN_BUILD_GCE macro to check if the GCE variant can be used enable bytepair compression for S60 3.2 and newer
| | * Enable window size caching on Symbian NGA variants.Jason Barron2010-02-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabling this flag saves us the round-trip to WSERV whenever RWindow::Size() is called because the size is cached on the client side. This can improve performance because functions like eglSwapBuffers() call Size() to see if the window size has changed and without the cache this introduces an extra IPC call for every frame. Task-number: QT-2849 Reviewed-by: Iain
| * | fix crash on Windows CE on WM_SETTINGCHANGEJoerg Bornemann2010-02-221-0/+5
| |/ | | | | | | | | | | | | | | On Windows CE, lParam parameter is a constant, not a char pointer. The only valid value is INI_INTL. Task-number: QTBUG-7943 Reviewed-by: ninerider
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-256-4/+71
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (35 commits) Doc: Added a config file for creating Simplified Chinese docs directly. Doc: add a few lines about bearer managment to "What's New" page. Fix the SIMD implementations of QString::toLatin1() Update of the QScriptValue autotest suite. New data set for QScriptValue autotest generator. Autotest: make tst_qchar run out-of-source too Autotest: add a test for roundtrips through toLatin1/fromLatin1 Implement toLatin1_helper with Neon QRegExp::pos() should return -1 for empty/non-matching captures Revert "qdoc: Finished "Inherited by" list for QML elements." Revert "qdoc: List new QML elements in \sincelist for What's New page." Add the Unicode normalisation properties. Autotest: add a test for QDBusPendingCallWatcher use in threads Doc: placeholders for new feature highlights. doc: mark as reimplemented. Update of the QScriptValue autotest suite. New autotests cases for QScriptValue autotests generator. QScriptValue autotest generator templates change. Fix license template. QScriptValue::isQMetaObject crash fix. ...
| * | Cache scene coordinates of a hotspot in a QGesture.Denis Dzyubenko2010-02-242-1/+2
| | | | | | | | | | | | Reviewed-by: trustme
| * | Prevent stale QWidget pointers in QCocoaViewMorten Johan Sørvig2010-02-234-3/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QCocoaView has two "back" pointers ot its owning QWidget and the corresponding QWidgetPrivate. The lifetime of the QCocoaView might be longer and that of the QWidget if Cocoa itself holds references to it. In addition accessing a QWidget that is being destroyed is not safe. Set both pack pointers to NULL in ~QWidget. This prevents following stale pointers in the QCocoaView callbacks. This also means that we'll see the NULL pointers, add gurads for that.
* | | Fix seg-fault when no X11 desktop environment is presentTom Cooksey2010-02-241-23/+53
| | | | | | | | | | | | Reviewed-By: ossi
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-232-3/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (33 commits) Skip complex FBO tests if combined depth-stencil isn't supported Make tst_QGL::glWidgetRendering use same test as FBO autotest Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ( 9303f6d67fb964b71ed3e7361367c3ccfaba5e0a ) Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ( 5381ceeb37d97365cfb2f037650dbb4e495bca4e ) Adjust the mkdist-webkit script before the importation of WebKit. Make mediaservices use existing GStreamer qmake vars Detect GStreamer even when we're not building phonon Fix build on systems without XVideo headers Make the XVideo configure test actually pass if XV is present Add a configure test for XVideo support Fixed cosmetic glitch in QTabBar label's rendering improve sql support for mingw64 improve 64 bit support on windows Made the qDrawPixmaps() API public (with modifications). Fix GL viewports under -graphicssystem raster. QSortFilterProxyModel: Sorting occured unnecessarily when the dynamicSortFilter is turned off Fix test with gcc 4.0 where QT_USE_FAST_CONCATENATION cannot be enabled. Fix build with wingw Imporve win64 support for mingw Compile ...
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-02-231-1/+1
| |\ \
| | * | Imporve win64 support for mingwThierry Bastian2010-02-221-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: ogoffart
| * | | Fix GL viewports under -graphicssystem raster.Gunnar Sletta2010-02-231-2/+3
| |/ / | | | | | | | | | | | | | | | GL widgets and native controls have paintonscreen set and bypasses backingstore. They can thus not rely on the windowsurface flushing but must be repainted via normal means
* | | Merge remote branch 'origin/master'Thiago Macieira2010-02-232-90/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc doc/src/declarative/tutorial2.qdoc doc/src/declarative/tutorial3.qdoc src/declarative/graphicsitems/qmlgraphicsmousearea.cpp src/multimedia/playback/qmediaplayer.cpp
| * | | clean up x11 desktop detectionOswald Buddenhagen2010-02-222-90/+31
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KDE_FULL_SESSION is reliable since kde 2.x or so. DESKTOP_SESSION is not reliable, unless one uses a new gnome. GNOME_DESKTOP_SESSION_ID was temporarily unreliable. the two together should be reliable. copy the xfce4 detection from the xdg-open tool. assumed to be reliable. remove the window manager hacks, as they are redundand with the asssumedly reliable detection methods above. Reviewed-by: jbache
* | | Cocoa: Sheets loose their opacity on 2nd showRichard Moe Gustavsen2010-02-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that setParent_sys is wiping out opacity for the window regardless of what the value is from before. This patch does the correct thing, namely look at the WA_WState_WindowOpacitySet flag. Task-number: QTBUG-5100 Reviewed-by: cduclos
* | | Cocoa: Fix build with namespaceRichard Moe Gustavsen2010-02-222-2/+1
| | | | | | | | | | | | Reviewed-by: MortenS
* | | Cocoa: namespace build fixRichard Moe Gustavsen2010-02-221-1/+2
| | | | | | | | | | | | Reviewed-by: msorvig
* | | Merge branch 'master' of git:qt/qtThiago Macieira2010-02-213-17/+22
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc doc/src/declarative/advtutorial2.qdoc doc/src/declarative/advtutorial3.qdoc doc/src/declarative/advtutorial4.qdoc doc/src/declarative/tutorial1.qdoc doc/src/declarative/tutorial2.qdoc doc/src/declarative/tutorial3.qdoc
| * | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-201-1/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp
| * \ \ Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-191-7/+5
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
| | * | Simplify code, fix a compiler warning... profit!João Abecasis2010-02-181-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Well, it was a compiler warning on master... :-/ Reviewed-by: Janne Anttila Reviewed-by: axis
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-181-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNAM HTTP: Always set channel.reply to 0 when done Revert "Added note to make QList destructor virtual in version 5" Fix s390(x) atomic ops related crashes Fix undefined sequence point compiler warning
| | | * | Fix undefined sequence point compiler warningDirk Mueller2010-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | level = ++level is not guaranteed to work, as the increment is not required to happen before the assignment. Change this code to be less obscure and use standard defined behavior. Merge-request: 471 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | | Merge remote branch 'origin/4.6' into integration-master-from-4.6Rohan McGovern2010-02-182-10/+9
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: src/corelib/codecs/qtextcodec.h
| | * | | Support for dynamic localization in Symbian softkeys.Janne Anttila2010-02-172-10/+9
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds support for dynamic i.e. runtime localization of S60 softkeys. Note that translations are not provided yet with qt.sis (QTBUG-4919), meaning that localization does not actually happen unless application developer provides its own translation (including translation for softkeys). Task-number: QTBUG-6785 Reviewed-by: Jason Barron
| * | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-1812-58/+190
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/codecs/qtextcodec.h tests/auto/gestures/tst_gestures.cpp
| * \ \ \ Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-171-0/+8
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/helpviewer.cpp
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-121-0/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Compile fix on Mac with 10.5 sdk. QTestLib: don't crash if data tag requested, none available Implement the blend functions with SSE2 doc: Added some since version information. Ignore touch and gesture events when excluding input events Implemented GraphicsView Panel support for gestures. doc: Fixed several typos. Add MSVC-specific expected failures for JS test suite
| | | * | | Compile fix on Mac with 10.5 sdk.Denis Dzyubenko2010-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * | | Ignore touch and gesture events when excluding input eventsDenis Dzyubenko2010-02-121-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When asked to exclude input events when processing events in the event dispatcher we should also exclude touch and gesture events on Windows and Mac. Reviewed-by: Bradley T. Hughes
* | | | | | Merge remote branch 'origin/master'Thiago Macieira2010-02-201-1/+5
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-1812-58/+190
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/linux-g++-x11egl/qplatformdefs.h src/declarative/qml/qmldom.h src/declarative/util/qmlview.cpp src/declarative/util/qmlview.h tools/qdoc3/cppcodemarker.cpp tools/qmldebugger/standalone/canvasframerate.cpp tools/qmldebugger/standalone/engine.cpp tools/qmldebugger/standalone/expressionquerywidget.cpp tools/qmldebugger/standalone/expressionquerywidget.h tools/qmldebugger/standalone/objectpropertiesview.cpp tools/qmldebugger/standalone/objectpropertiesview.h tools/qmldebugger/standalone/objecttree.cpp tools/qmldebugger/standalone/qmldebugger.cpp tools/qmldebugger/standalone/watchtable.cpp tools/qmldebugger/standalone/watchtable.h
| * | | | | MOBILITY-404 QS Windows.Wolfgang Beck2010-02-161-1/+5
| | |/ / / | |/| | |
* | | | | Cocoa: calling QEventLoop::exec from mouse up causes problemRichard Moe Gustavsen2010-02-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If one create e.g. a modal dialog from a mouse up event handler, we qt_button_down global variable was pointing to a widget before the handler returned. This meant that you could not push another button in the window, since the qt_button_down would grab the mouse. This patch clears qt_button_down before sending mouse up events. Reviewed-by: denis
* | | | | Cocoa: event dispatcher eats mouse eventsRichard Moe Gustavsen2010-02-191-39/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that the event dispatcher did not flush queued user input events under some circumstances (when adding the exec-flag to processEvents). And this caused problems in the QML-editor in creator regarding focus frames. This patch makes sure that we always flush the queued user input events when calling processEvents. Task-number: QTBUG-8274 Reviewed-by: Prasanth Reviewed-by: cduclos
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1Fabien Freling2010-02-194-39/+41
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Compile.Morten Johan Sørvig2010-02-183-2/+2
| | | | | | | | | | | | | | | | | | | | NSInteger is int/long on 32/64 bit.
| * | | | Mac: QSystemTrayIcon::DoubleClick and midmouse not workingRichard Moe Gustavsen2010-02-173-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac, we never emit the activation signal of the tray icon with other reasons than triggered. The reason; it was never implemented. This patch connect the dots. Task-number: QTBUG-5770
| * | | | Incorrect mouse coordinates used when compressing WM_MOUSEMOVE messages.Prasanth Ullattil2010-02-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the coordinates passed in the LPARAM parameter, the pt passed with the MSG is not always correct. Task-number: QTBUG-7637 Reviewed-by: Denis
| * | | | Reusing sheets on Mac OS X 10.5 & above shows painting artifacts.Prasanth Ullattil2010-02-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Window modal dialogs are shown as sheets on Mac, reusing them is showing some painting artificats. So make sure we create a new window everytime a sheet is shown. This only applies to Carbon, the Cocoa versions dont have this problem. Task-number: QTBUG-8198 Reviewed-by: MortenS
| * | | | Mac: submenu shows up at the wrong positionRichard Moe Gustavsen2010-02-151-23/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If one opens a menu with a submenu, the submenu will be shown at a wrong position on screen. The reason is that upon show, the top menu will be centered on screen. But the child menu will be shown first, and tries to center of the parent that has not yet been shown. So moving the top menu upon show will fool the subwindow. This patch will move the center code into the setGeometry_sys function so that any resize on the window before it has been shown will re-center the window correctly. Task-number: QTBUG-2196 Reviewed-by: prasanth
* | | | | Fix an issue about double-click on Mac OS X.Fabien Freling2010-02-191-1/+1
|/ / / / | | | | | | | | | | | | | | | | A test is added when we double-click to verify that both pushed buttons are the same.
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-1311-19/+149
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (28 commits) Optimized QLocale to access system locale on demand. Fix QRegion under Mac OS X. update according to Thiago's comments. Changes: add functionality for dbus auto start to qt Add license header to this file readdir64 is not available on HP-UX Fix bug in QDirPrivate::setPath, affecting QDir::cd, cdUp and setPath qdoc3: Completed handling of the new \pagekeywords command. Wrong cursor shown by the parent window after setOverrideCursor(). Fixed Mac OS X compile time error by using GLint for temp. qdoc3: Added curly braces in switch statement for braindead compiler. qdoc: Added a build rule for the documentation - disabled by default. Doc: Added the qdoc manual to the repository for future maintenance. qdoc3: Fixed bug in creation of qt.pageindex. qdoc3: Added capability to create qt.pageindex. Incorrect property setter generated by dumpcpp for Microsoft Word 2007. Cocoa: Implement our own NSApplication subclass Cocoa: Menu in menubar stays highlighted qdoc: Made a temporary fix for comment highlighting. Doc: Tidied up the class layout and removed an unnecessary image. ...