summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-2414-239/+179
|\ | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: mkspecs/features/qt.prf src/corelib/global/qglobal.h
| * More culling of Panther Code.Norwegian Rock Cat2009-06-234-192/+110
| | | | | | | | | | | | Removed lots of places where we check for Tiger. Now we can assume it. Reviewed-by: Morten Sørvig
| * Clean up the font hash and palette hash stuff.Norwegian Rock Cat2009-06-233-9/+10
| | | | | | | | | | | | | | | | | | These are used enough (at least on the mac) to justify them being accessible in a private header. As a bonus it "hides" the actual container being used, so we could potentially sway it out with something different. Reviewed by: Jens Bache-Wiig
| * Scroll the dirty parts of the scroll area in scrollby for Cocoa.Norwegian Rock Cat2009-06-231-14/+3
| | | | | | | | | | | | | | | | | | | | | | | | Ah! One less ###! The scroll functions in Carbon and Cocoa don't scroll the regions that have been marked dirty. In the past, we killed performance by updating the whole view. We got a workaround for Carbon in the form of an SPI, but I wasn't aware of a corresponding item in the NSView API, but it is there publically and available in 10.5. Fast scrolling in Cocoa now for people who like to use the keyboard. Reviewed by: Morten Sørvig
| * Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-236-18/+50
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebKit/qt/ChangeLog tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
| | * Remove some warnings in the Cocoa build.Norwegian Rock Cat2009-06-236-18/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After discussing with some of the Objective-C people I have finally got a fair number of the warnings to disappear in both 10.5 and 10.6. I also took the opportunity to remove a bunch of other warnings. Reviewed by: Morten Sørvig
| * | Fixed build error on X11 with gcc 4.1.2.jasplin2009-06-231-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | gcc 4.1.2 on X11 somehow confuses assignment of a temporarily constructed QSettings object to a reference with invalid access to the private assignment operator of QSettings. Reviewed-by: mgoetz
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-221-21/+27
|\ \ \ | |/ / | | | | | | kinetic-declarativeui
| * | QApplication: Reduce number of kdeglobals file loadsMarkus Goetz2009-06-221-21/+27
| | | | | | | | | | | | | | | | | | From 14 per X11 application down to 4. Reviewed-by: jbache
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-06-19151-467/+498
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp
| * | 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
| * | 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
| * | 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
* | | Fixing qml for QWidget support (crash)Thomas Hartmann2009-06-161-0/+6
| | | | | | | | | | | | | | | | | | | | | QWidget deletes its children in its own constructor so we have to cleanup before explicitly Reviewed-by: Aaron Kennedy
* | | Merge commit 'qt/master' into kinetic-declarativeuiBjørn Erik Nilsen2009-06-122-9/+13
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: doc/src/qnamespace.qdoc src/gui/painting/qdrawutil.cpp
| * | 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
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-119-96/+92
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/gui/graphicsview/qgraphicswidget.cpp src/gui/painting/qdrawutil.cpp src/gui/painting/qpainterpath.cpp tools/qdoc3/test/qt-cpp-ignore.qdocconf tools/qdoc3/test/qt-inc.qdocconf
| * | 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.
* | | Merge commit 'qt/master' into kinetic-declarativeuiBjørn Erik Nilsen2009-06-106-12/+146
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qabstractitemmodel.cpp src/corelib/kernel/qobject.cpp tools/qdoc3/htmlgenerator.cpp
| * | 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/qt into ↵Michael Brasser2009-06-0910-27/+73
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp tools/qdoc3/tree.cpp
| * | 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
| * | Fixes anti-aliased text rendering on smartphones (Windows Mobile)Thomas Hartmann2009-06-051-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for cleartype in qt_win_read_cleartype_settings() was not correct for Windows Mobile For anti-aliased text rendering we also have to use another pixel format for the native image. Task-number: 249642 Reviewed-by: mauricek
| * | Add a callback so Qt updates its color stuff when the profile changes.Norwegian Rock Cat2009-06-051-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | We've had a problem with a stale cache for color profiles this should make things work well. We get the callback for each display whether it needs it or not, but honesly I would rather that we update this a few times too many when people change their display profile than not at all. FWIW, this code is inspired from Apple's Tech Note TN2035.
| * | Fix for Qt issue #218037 - Add support for the WM_MOUSEHWHEEL message on Windowsminiak2009-06-051-2/+12
| | | | | | | | | | | | | | | Merge-request: 384 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| * | All of Qt's own code compiles with -pedantic now (but pcre and webkit don't ↵David Faure2009-06-042-2/+2
| | | | | | | | | | | | | | | | | | | | | seem fixable easily) Merge-request: 594 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * | add QT_NO_STATEMACHINE define so state machine can be compiled outKent Hansen2009-06-041-0/+4
| | | | | | | | | | | | Reviewed-by: Thierry Bastian