summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-181-61/+67
|\ | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem_p.h
| * Fixes: Tablet not sending mouse release events.Thomas Zander2009-06-171-61/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | Rewrote the usage of XCheckTypedWindowEvent to now use a XCheckIfEvent based scanner. Using XCheckTypedWindowEvent caused us to sometimes hop over relevant events while doing compression. So we could end up merging a tablet move event with another tablet move event even while there was a mouse-release event between them. This rewrite makes sure we stop merging when needed. Task: 249606 Reviewed-by: Bradley T. Hughes
* | Change behavior of how touch and mouse events work togetherBradley T. Hughes2009-06-188-93/+76
| | | | | | | | | | | | | | | | We now send both types of events, i.e. accepting TouchBegin doesn't block mouse events anymore. We are also introducing the idea of a "primary" touch point, which is the one that the system is also generating mouse events for. This lets us reuse existing mouse event code while still being able to add multi-touch support.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-17151-309/+309
|\ \ | |/ | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene_p.h
| * Merge license header changes from 4.5Volker Hilsheimer2009-06-16151-309/+309
| |\
| | * Cleanup our usage of the term "Qt Software".Jason McDonald2009-06-161-3/+3
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-16151-302/+302
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Rename nsCursorForQCursor -> qt_mac_nsCursorForQCursor.Morten Sørvig2009-06-154-4/+4
| | | | | | | | | | | | Reviewed-by: Richard Moe Gustavsen
* | | Compile after botched mergeBradley T. Hughes2009-06-161-1/+1
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-164-19/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/qnamespace.qdoc doc/src/snippets/code/src_gui_qproxystyle.cpp src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebKit/qt/ChangeLog src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_x11.cpp src/gui/kernel/qt_x11_p.h src/gui/kernel/qwidget.cpp src/gui/styles/qproxystyle.cpp src/gui/styles/qstyle.cpp src/scripttools/debugging/qscriptdebugger.cpp src/scripttools/debugging/qscriptenginedebugger.cpp src/sql/drivers/odbc/qsql_odbc.cpp src/sql/kernel/qsqldatabase.cpp src/sql/kernel/qsqldriver.cpp
| * | Fix for resetting DESKTOP_STARTUP_ID envvar.Denis Dzyubenko2009-06-162-16/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That was wrong to reset environment variable returned with a putenv since getenv returns a value only. This fix reverts to old behavior when unsetenv is not available and will leak 20 bytes once on qapplication initialization. This fixes 2f4ca8e06be0477503acf2a4bf38a1c76f52e5b1. Reviewed-by: Bradley T. Hughes
| * | doc: Fixed several qdoc errors.Martin Smith2009-06-161-1/+1
| | |
| * | Fixed compile of Qt/Embedded.Rohan McGovern2009-06-131-2/+2
| | | | | | | | | | | | | | | | | | | | | Fixes compile error: kernel/qapplication_qws.cpp: In static member function 'static bool QApplicationPrivate::qws_apply_settings()': kernel/qapplication_qws.cpp:2014: error: no match for 'operator!' in '!QApplicationPrivate::styleOverride' kernel/qapplication_qws.cpp:2014: note: candidates are: operator!(bool) <built-in>
| * | Improved resetting the DESKTOP_STARTUP_ID envvar on X11Denis Dzyubenko2009-06-122-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | We shouldn't put static variable into the environment since it will crash if someone tries to access environment after Qt has been unloaded. Task-number: related to 217782 Reviewed-by: Bradley T. Hughes
| * | Integrating QProxyStyleJens Bache-Wiig2009-06-123-74/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This class adds convenient support for proxy styles in Qt. Note that to support proper proxying, styles now call their functions through proxy() so that the proxy regains control over subcomponents. Note that there is a small price to be payed by the extra function call which can at the cost of readability be redirected to the private class member in the future. Task-number: 229556 Reviewed-by: trond
| * | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-124-12/+20
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| | * Copy-paste didn't work for application on non-first screen in multiscreen setup.Denis Dzyubenko2009-06-112-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to subscribe to xfixes selection notify events on all available screens. Also implemented delayed subscription to xfixes events since we don't really need clipboard change notifications unless the application explicitely asked for by (i.e. created a qclipboard object). Task-number: 255609 Reviewed-by: Bradley T. Hughes
| | * Doc fix: add a link to focus() and focusWidget() from QWidget::setFocus ↵Denis Dzyubenko2009-06-111-2/+2
| | | | | | | | | | | | | | | | | | documentation. Reviewed-by: TrustMe
| | * Compilefix for QT_NO_TABLETEVENT and QT_NO_COMPLETERThomas Hartmann2009-06-101-2/+4
| | | | | | | | | | | | | | | Task-number: 253086 Reviewed-by: Joerg
| * | QMenu, QMenuBar: small cleanupThierry Bastian2009-06-121-1/+0
| | | | | | | | | | | | | | | Removed calls to the widget getters because we have the members directly in the private class.
| * | Make repeated calls to QToolTip::hideText() still hide the textmae2009-06-121-8/+13
| | | | | | | | | | | | | | | | | | | | | Previously the 300 msec hide timer was restarted every time hideText() was called. Reviewed-by: Thorbjorn Lindeijer
| * | doc: Fixed several qdoc warnings.Martin Smith2009-06-121-2/+2
| | |
* | | Fix memory leak when detaching QTouchEventTouchPointPrivateBradley T. Hughes2009-06-151-0/+2
| | | | | | | | | | | | | | | When detaching, we need to deref the original data to prevent us from leaking it.
* | | Make QTouchEvent::TouchPoint scene coordinate functions return screen ↵Bradley T. Hughes2009-06-151-0/+5
| | | | | | | | | | | | | | | | | | coordinates for widgets Previously these returned empty/invalid values.
* | | use char[] instead of QBitArray to pass to ioctlBradley T. Hughes2009-06-151-7/+14
| | | | | | | | | | | | Using the QBitArray::data_ptr() directly didn't work, unfortunately
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multitouchBradley T. Hughes2009-06-152-7/+4
|\ \ \
| * | | All events should be filtered through the gesture manager.Denis Dzyubenko2009-06-151-5/+1
| | | |
| * | | Set the gesture manager state before sending an eventDenis Dzyubenko2009-06-151-2/+3
| | | |
* | | | EV_CNT and ABS_CNT aren't available everywhere, use *_MAX + 1 insteadBradley T. Hughes2009-06-151-2/+2
|/ / /
* | | Merge of masterBradley T. Hughes2009-06-159-104/+144
| | |
* | | Add multitouch support for the RX-71 deviceBradley T. Hughes2009-06-153-0/+297
| | | | | | | | | | | | | | | We have to by-pass X11 mouse events when using this device since we are reading directly from the /dev/input/event* device files.
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-129-96/+92
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem_p.h
| * | Removed qApp and replaced with QApplication:: for static member callsThierry Bastian2009-06-118-77/+75
| | |
| * | remove q->layout() and q->parentWidget() code where unnecessaryThierry Bastian2009-06-112-9/+9
| | |
| * | Clean up qwidget_p.h since the last changeOlivier Goffart2009-06-111-8/+6
| | | | | | | | | | | | | | | Reviewed-by: bnilsen Reviewed-by: Denis
| * | removed superflous indirection (ie. using q->..) instead of using theThierry Bastian2009-06-101-2/+2
| | | | | | | | | | | | private class member.
* | | remove duplicated code and API (merge QTouchEvent and QGraphicsSceneTouchEvent)Bradley T. Hughes2009-06-115-141/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | the API for these 2 classes is identical, the implementation is almost identical, they share the same data structures, so bite the bullet and merge them. this means we go back to using screenPos() instead of globalPos() again
* | | another API review round: change Q*TouchEvent size() functions to return ↵Bradley T. Hughes2009-06-114-15/+17
| | | | | | | | | | | | | | | | | | rects instead these are more useful, as already shown in the fingerpaint example
* | | rename Qt::WA_AcceptedTouchBeginEvent to Qt::WA_WState_AcceptedTouchBeginEventBradley T. Hughes2009-06-111-3/+5
| | | | | | | | | | | | | | | this is an internal widget state variable, so the name should reflect that (and we shouldn't include it in the docs either)
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-106-12/+146
|\ \ \ | |/ /
| * | small code cleanup that improves some loopsThierry Bastian2009-06-102-10/+19
| | | | | | | | | | | | it uses les foreach
| * | Implemented the NET_WM_SYNC protocol on X11.Denis Dzyubenko2009-06-094-2/+127
| | | | | | | | | | | | | | | | | | | | | | | | Done with Thorbjørn Lindeijer Task-number: 220550 Reviewed-by: Thorbjørn Lindeijer Reviewed-by: mae
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-088-25/+67
|\ \ \ | |/ /
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtOswald Buddenhagen2009-06-081-1/+2
| |\ \
| | * | Fix GDI object leak.Prasanth Ullattil2009-06-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In case the SetWindowRgn() fails, the region object has to be deleted. Task-number: 251293 Reviewed-by: Denis Dzyubenko
| * | | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-081-5/+8
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/phonon/qt7/quicktimevideoplayer.mm src/gui/text/qfontengine_win.cpp tools/linguist/shared/cpp.cpp
| | * Revert "BT: Fixed crash on Mac caused by erroneous handling of native focus ↵jasplin2009-06-051-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | events." This reverts commit 7314c07a3e443b1d5349b419a03db8d41ca43f7e. As reported by Eike, this patch caused several problems for Qt Creator. Potentially it may cause problems for other (external) applications as well. An alternative fix (scheduled for 4.5.x) needs to be found for tasks 254456 and 254460. Reviewed-by: Richard Moe Gustavsen
| | * Example MDI: keybord focus not working correctly!Richard Moe Gustavsen2009-06-051-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | The reason is that cocoa looses the first responder when we raise the fake window inside the MDA area. So we need to re-set the first responder again Task-number: 255040 Reviewed-by: Trenton Schulz
| * | Fix QT_NO_DATASTREAM macro checks and improve readabilityRitt Konstantin2009-06-083-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Some checks where in the wrong locations, and some endifs where hard to read. Merge-request: 611 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| * | Revert two of my commits, restoring the original fix for focus handling.Denis Dzyubenko2009-06-051-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix that was introduced adds regressions, and I don't see a way we can fix it without breaking someone elses code. So restoring the original fix that just avoid a crash (autotest by Thierry is included). Revert "Revert Avoid a crash when setting a focus in a widget hierarchy containing" Revert "Setting a focus on a widget hierarchy which contains both visible and invisible widgets could cause a crash." This reverts commit be833a4f25a8ec8c3dd7a8ac4fa4b0507c93e7ee. This partially reverts commit 1a7da7096bbda17197738061902f4489af234bc0 Reviewed-by: Thierry Bastian Reviewed-by: Prasanth Ullattil