summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Optimize QGraphicsItem::setFlags.Bjørn Erik Nilsen2010-01-211-9/+21
| | | | | | | | | We don't have to do a full blown QGraphicsItem::setFlag call from QGraphicsItem::setFlags, only to change the ItemStacksBehindParent bits. We can do it directly (with care). Task-number: QTBUG-6877 Reviewed-by: alexis
* Optimize QGraphicsScenePrivate::itemAcceptsHoverEvents_helperBjørn Erik Nilsen2010-01-211-4/+4
| | | | | | | | Make sure we do cheap tests before the more expensive ones. This function is called from QGraphicsScene::addItem. Task-number: QTBUG-6877 Reviewed-by: alexis
* Improve performance of QGraphicsItem::setParentItem.Bjørn Erik Nilsen2010-01-213-35/+62
| | | | | | | | | The biggest optimization here is "updateAncestorFlags()". It's much faster to update all the flags rather than trying to enable/disable certain flags according to the current state. Task-number: QTBUG-6877 Reviewed-by: alexis
* Make sure cursor is painted at the correct position when we are using IM.Jan-Arve Sæther2010-01-212-2/+8
| | | | | | | | | When the line edit was refactored into a line control this regression was introduced. This regression was introduced by change fb7d86cf23227302d48db279ec589221d11a1f6a. Task-number: QTBUG-4789 Reviewed-by: Alan Alpert
* Purely cosmetic (formatting) changes to GL2 engine's GLSLTom Cooksey2010-01-211-333/+357
| | | | | | This makes GLSL dumps _significantly_ easier to read. Reviewed-By: TrustMe
* Use an attribute value for the PMV matrix rather than a uniformTom Cooksey2010-01-215-31/+42
| | | | | | | | | | | | | | This has several advantages: First, updating an attribute value seems to be cheaper than updating a uniform. Second, vertex atribute values are independent of shader program, which means they persist across changing of the shader program. This makes code simpler and reduces GL state changes. Note: Credit goes to Samuel for finding this little gem. :-) For the 25920 solid QGraphicsRectItem test case, this gives 10% improvement on desktop and 27% on the SGX. Reviewed-By: Kim
* Remove unnecessary depth uniform from GL2 engine's GLSLTom Cooksey2010-01-211-6/+0
| | | | Reviewed-By: Samuel
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2010-01-2128-84/+331
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-219073-13996/+21198
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-211-3/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix semitransparent windows with DirectFB
| | | * Fix semitransparent windows with DirectFBAnders Bakken2010-01-211-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | This filling of the window surface is a bug. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-201-3/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Fixed some earlier incorrect documentation fixes.
| | | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-2099-467/+1202
| | | |\ \
| | | * | | Doc: Fixed some earlier incorrect documentation fixes.David Boddie2010-01-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-207-11/+171
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: 1st attempt at USB serial port enumerator for linux Corrected alphabetic order in the docs for events. Implemented event filter functions for Symbian.
| | | * | | 1st attempt at USB serial port enumerator for linuxShane Kearns2010-01-204-0/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enumerate the ACM ports which are created in /dev after plugging in the phone. Tested on Kubuntu (karmic koala), using 5800XM and N95. Linux has two USB drivers of interest. 1: CDC-ACM, this loads automatically, and creates /dev/ttyACM<n> for the USB modem interface 2: USBSERIAL, this needs to be loaded manually using modprobe, and creates /dev/ttyUSB<n> for each ACM interface on the phone The second ttyUSB port is the one we need, this enumerator does not pick the correct port yet. (1st port is ECACM:0, i.e. the modem, 2nd port is ECACM:1, i.e. the general purpose port used by TRK) according to lsusb, the 1st ACM descriptor has: class 2 (comms) subclass 2 (abstract - modem) protocol 1 (AT commands) 2nd ACM descriptor has: class 2 (comms) subclass 2 (abstract - modem) protocol 255 (vendor specific) Linux 2.6.33 RC3 has a hardcoded list of nokia phones in cdc-acm.c for which the protocol 255 ACM port will be recognised as a second ttyACM Task-number: QTBUG-7446 Reviewed-by: Miikka Heikkinen
| | | * | | Corrected alphabetic order in the docs for events.axis2010-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | | * | | Implemented event filter functions for Symbian.axis2010-01-202-10/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously only the symbian specific event filters were called, but now all filters in QApplication, QAbstractEventDispatcher and QInputContext should be called. Task: QT-2629 RevBy: Jason Barron Autotest: Passed
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-208-18/+83
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QGraphicsItem::hasFocus() performance regression. Fix crashes in QByteArray Move the labels a bit down so that they align better vertically with the field. Add command to qmake to do symbian-uid generation Fixed QBitmap::load to load into bitmap format again. Fixed a crash under X11 when drawing QPixmaps to QGLPixelBuffers. Text drawing is not fast currently
| | | * | | QGraphicsItem::hasFocus() performance regression.Bjørn Erik Nilsen2010-01-201-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was that we always climbed the parent chain to look for a panel item (QGraphicsItem::isActive()) before checking the scene's focus item. Task-number: QTBUG-6749 Reviewed-by: alexis
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-2011-28/+74
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (115 commits) Avoid calling WSAGetLastError() so often in nativeWrite Cocoa: Fix painting errors on QGLWidget resizing. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( e15bd5454732bab9ffff4e1e5a755f41fd4e2eff ) fix qm generation under windows More changelog additions for QtWebKit Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8f6992f4e8f027818429d428393b08068eca9ffa ) fixes MMF plugin for Phonon when buidling with WINSCW Update my changelog for 4.6.1 My changes for 4.6.1 doc: Corrected parameter value in snippet. doc: This bug wasn't really a bug; it just required clarification. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8b9165d3bc84d1c8cc7df49a191cc3857b5530d4 ) Polish the changes file. Copy changes file from 4.6 branch. Changed log updated Update change log with Yoann Lopes work. Update changelog with some of my stuff fix sametext and number heuristics my 4.6.1 changelog contributions Added changelog entries. ...
| | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Jason McDonald2010-01-2022-52/+273
| | | |\ \ \
| | | | * | | Avoid calling WSAGetLastError() so often in nativeWriteMarkus Goetz2010-01-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: joao
| | | | * | | Cocoa: Fix painting errors on QGLWidget resizing.Morten Johan Sørvig2010-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the patch in my previous commit. (remove "if 0")
| | | | * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-209-24/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( e15bd5454732bab9ffff4e1e5a755f41fd4e2eff ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-11-19 Jocelyn Turcotte <jocelyn.turcotte@nokia.com> Reviewed by Kenneth Rohde Christiansen. [Qt] Fix QWebInspector destruction problem. https://bugs.webkit.org/show_bug.cgi?id=31664 * Api/qwebpage.cpp: (QWebPage::~QWebPage):
| | | * | | | Merge commit 'upstream/4.6.1' into 4.6Jason McDonald2010-01-200-0/+0
| | | |\ \ \ \
| | | | * | | | fix qm generation under windowsv4.6.1Oswald Buddenhagen2010-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Daniel Molkentin (cherry picked from commit e4953b7262d8122747569efee194b6eb46d40749)
| | | | * | | | More changelog additions for QtWebKitJason McDonald2010-01-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust me (cherry picked from commit 59ee1b9d387468a5a80b5c450aa202d1b33e6bd1) Conflicts: dist/changes-4.6.1
| | | | * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-144-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 8f6992f4e8f027818429d428393b08068eca9ffa ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-01-14 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Kenneth Rohde Christiansen. [Qt] Update Symbian .def symbol export files after private API additions. * symbian/bwins/QtWebKitu.def: * symbian/eabi/QtWebKitu.def: (cherry picked from commit f894fb8228e35a43b2baf80666ca5bca6e987064)
| | | | * | | | fixes MMF plugin for Phonon when buidling with WINSCWEspen Riskedal2010-01-147-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | syncqt was changed, so include paths got messed up because of the relative path bug when building for WINSCW. We simply now make sure to include as <Phonon/foobar.h> instead of <phonon/FooBar> to fix it. Reviewed-by: Aleksandar Sasha Babic
| | | | * | | | Update my changelog for 4.6.1Thiago Macieira2010-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 8c7e85c7b9933949c7a7c05489f5f6bfd1ce4312)
| | | | * | | | My changes for 4.6.1Jason McDonald2010-01-141-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 42fc59ed04e1675ecae7fa87303a148c4b0c1ed1) Conflicts: dist/changes-4.6.1
| | | | * | | | doc: Corrected parameter value in snippet.Martin Smith2010-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7158 (cherry picked from commit 52ecb299691defc3be6d202c7fab71bf865c710a)
| | | | * | | | doc: This bug wasn't really a bug; it just required clarification.Martin Smith2010-01-142-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reported bug was actually not a bug. It is ok to pass the enum value as a string here, because the enumeration type has been registered with the meta-object system with the Q_ENUMS() macro. However, I have added a bit of text to clarify things a bit. Task-number: QTBUG-7158 (cherry picked from commit cd0772335cc9bcedd582cacc834bf4609ca650b0)
| | | | * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-143-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 8b9165d3bc84d1c8cc7df49a191cc3857b5530d4 ) Changes in WebKit/qt since the last update: * Cherry-pick of http://trac.webkit.org/changeset/53181 ( http://bugreports.qt.nokia.com/browse/QTBUG-7290 ) (cherry picked from commit dd62687182830aa353ef573f653fe913fd42a8d0)
| | | | * | | | Polish the changes file.Jason McDonald2010-01-131-169/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | * | | | Copy changes file from 4.6 branch.Jason McDonald2010-01-131-6/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | * | | | Merge branch '4.6.1' of git@scm.dev.nokia.troll.no:qt/qt-releases into 4.6.1Jason McDonald2010-01-137-45/+178
| | | | |\ \ \ \
| | | | | * | | | fix sametext and number heuristicsOswald Buddenhagen2010-01-137-45/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 92e9a48 ("eliminate Translator::replace()") eliminated the correctness as well. whoops. this code should be more efficient as well ... (cherry picked from commit 2bd2e35078e0cdf9f1458892adcd0939504b59bb)
| | | | * | | | | Changed log updatedPrasanth Ullattil2010-01-131-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit c90c5b6124bb952500c1d3ca0114163729414771)
| | | | * | | | | Update change log with Yoann Lopes work.Yoann Lopes2010-01-131-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 81e1d9a9e9ff6649727bd26ea0c3be971813866d)
| | | | * | | | | Update changelog with some of my stuffMarkus Goetz2010-01-131-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit d1f73b7be62b0f6e9294b5d78ccd0680cb9fe118)
| | | | * | | | | my 4.6.1 changelog contributionsBradley T. Hughes2010-01-131-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit eef74a19b867f307d7a0c0c47f3ee0ce2c4d283e)
| | | | * | | | | Added changelog entries.axis2010-01-131-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit bb689ca42deee2034a3475fa0c5f9337ec1aebbb)
| | | | * | | | | Update changes file with Rhys Weatherley's work.Rhys Weatherley2010-01-131-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 7abb2cfdea14fa71aabcd79635aa8f407ed96186)
| | | | * | | | | Update changes fileAlan Alpert2010-01-131-0/+2
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6580 (cherry picked from commit bdef1a949ea32c5fe0bd2926171b813cff0cee2a)
| | | | * | | | Fixes warning in the QMacStyleOlivier Goffart2010-01-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warning such as QFont::setPointSizeF: Point size <= 0 (-1.000000), must be greater than 0 because the font size might be specified in pixel, and pointSizeF returns -1 if the font size is in pixel (as documented) Reviewed-by: jbache Task-number: QTBUG-7263 (cherry picked from commit a34d372b45d75a32dcc300dbb7f8151e15df4294)
| | | | * | | | fix release mode crash in qfont.cpp initFontSubst() on Windows mobileJoerg Bornemann2010-01-131-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we've disabled LTCG for Windows CE by default, the code in initFontSubst() crashes on Windows mobile. Adding the extra const solves this problem. Task-number: QTBUG-6641 Reviewed-by: ossi (cherry picked from commit 8798b36880d1387d2d27f7fb35ccbf02af6232a0)
| | | | * | | | Avoid coordinate limitations in the raster engine.Gunnar Sletta2010-01-132-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lines that are longer than 2^15 will overflow in qgrayraster.c so we need to clip them. Also, we need to clip the bounding rectangle to avoid an endless clip-loop Task: http://bugreports.qt.nokia.com/browse/QTBUG-6198 Reviewed-by: Samuel (cherry picked from commit d4e81805ff47a266890f9638cf29647889d5c730)
| | | | * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-1310-1/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( bd6591b4acaf2172ab05702153ef539c0ac89cbb ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-12-18 Joe Ligman <joseph.ligman@nokia.com> Reviewed by Kenneth Rohde Christiansen. [Qt] Add new API to QWebFrame to scrollRecursively starting with any css overflow then checking current frame and then ancestors https://bugs.webkit.org/show_bug.cgi?id=32668 * Api/qwebframe.cpp: (QWebFramePrivate::scrollOverflow): (QWebFrame::scrollRecursively): * Api/qwebframe.h: * Api/qwebframe_p.h: * tests/qwebframe/qwebframe.qrc: * tests/qwebframe/testiframe.html: Added. * tests/qwebframe/testiframe2.html: Added. * tests/qwebframe/tst_qwebframe.cpp: (cherry picked from commit 04bdf9f6a77e9ebf96431f89b8240a037b3d2b09)