summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-04-16262-6788/+7923
|\ | | | | | | windows-7-multitouch
| * QTreeView automatic resize can be brokenThierry Bastian2009-04-163-20/+37
| | | | | | | | | | | | | | QTreeView sometimes autoresizes the wrong column Task-number: 210390 Reviewed-by: janarve
| * Make subpixel antialiasing of text work on Mac OS X under carbonGunnar Sletta2009-04-164-41/+92
| | | | | | | | | | | | | | | | | | | | Implement the alphaRGBMapForGlyph function and make use of it in the raster engine. The gamma correction is currently hardcoded to 2.0 which looks very good on two separate displays (iMac and MacBook Pro). Ideally this would be picked from the system settings or computed dynamically, but as long as 2.0 works, we'll stick to that. Reviewed-by: Samuel
| * Fixes: Faster string-splitting in QResource::findNode()Gunnar Sletta2009-04-161-7/+37
| | | | | | | | | | | | | | | | | | RevBy: Samuel Details: Creating the intermediate stringlist and appending all the temporary strings to it costs quite a bit. Fix this by introducing a StringSpliter class that is malloc-free and uses QStringRef instead. Found during S60 Performance week
| * Fixes: Make QDir::cleanPath() slightly faster, by avoiding some detach calls..Gunnar Sletta2009-04-161-4/+8
| | | | | | | | | | | | | | | | | | RevBy: Samuel Details: We have the size of the array and we don't realloc, so we can use direct pointer access. This saves us a few detach() calls and some refcount checking in the inner loops... Found during S60 Performance week...
| * Fixes: Speed up QFileInfo::setFile() a bit...Gunnar Sletta2009-04-161-6/+4
| | | | | | | | | | | | | | | | RevBy: Samuel Details: When doing initFileEngine on a operational QFileInfo, it will detach(), which creates copy of the file engine, then we delete this engine and create our own engine. Creating a clean QFileInfo, saves us one temporary file engine..
| * Experimental fix for speeding up QResource::name()...Gunnar Sletta2009-04-161-2/+8
| |
| * Reduce the number of calls to cleanPath() in QResourceRoot::findNodeSamuel Rødal2009-04-161-8/+16
| | | | | | | | | | | | | | Move the cleanPath call out of the function and outside the loops to avoid doing the same work over and over. Reviewed-by: Gunnar Sletta
| * Optimize vector normalize for vectors of length 1Rhys Weatherley2009-04-155-39/+63
| | | | | | | | | | | | If the square of the length is very close to 1, then avoid the qSqrt(). Reviewed-by: trustme
| * Add the QQuaternion::nlerp() function as a counterpart to slerp()Rhys Weatherley2009-04-153-0/+98
| | | | | | | | | | | | | | | | nlerp() implements "normalized linear interpolation", which is faster than slerp() and gives approximate results that are good enough for some applications. Reviewed-by: trustme
| * Rename QQuaternion::interpolate() to slerp()Rhys Weatherley2009-04-153-7/+7
| | | | | | | | | | | | slerp() is the more common-place name in the 3D community. Reviewed-by: trustme
| * Remove the int constructors from the vector classesRhys Weatherley2009-04-158-37/+0
| | | | | | | | | | | | | | | | The int constructors existed to make fixed-point conversions faster in certain circumstances. With the removal of fixed-point support, they are no longer required. Reviewed-by: trustme
| * Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-152-9/+26
| |\
| | * protect against circular inclusion of pro/pri filesOswald Buddenhagen2009-04-151-1/+7
| | | | | | | | | | | | Task-number: 250574
| | * do not crash on lines starting with an equal signOswald Buddenhagen2009-04-151-0/+3
| | |
| | * fix uninitialized variable readOswald Buddenhagen2009-04-151-4/+12
| | |
| | * add some commentsOswald Buddenhagen2009-04-151-4/+4
| | |
| | * Changelog for 4.5.1Denis Dzyubenko2009-04-151-0/+42
| | |
| | * GTK: Fix line edit background color with custom brushJens Bache-Wiig2009-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | We should allways use the brush and not the color if possible. Task-number: 240842 Reviewed-by: nrc
| | * Silence warning about unused static function on WindowsJoão Abecasis2009-04-151-0/+2
| | | | | | | | | | | | Reviewed-by: mariusSO
| | * QFileDialog : Fix filters that doesn't work if whitespaces at the endAlexis Menard2009-04-152-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | The fix is basically remove the whitespaces at the end otherwise the reg exp will be wrong. Task-number: 240789 Reviewed-by: jasplin
| | * Fixed and improved the example codeJan-Arve Sæther2009-04-152-14/+58
| | |
| | * Updated changesPaul Olav Tvete2009-04-151-0/+3
| | |
| | * Make choosing a file path for a QUrl-type property work on Windows.Friedemann Kleint2009-04-151-1/+1
| | | | | | | | | | | | | | | Use QUrl::fromLocalFile to construct the url string. Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jarek Kobus2009-04-1543-858/+2198
| | |\
| | | * Update changelog with my changesBradley T. Hughes2009-04-151-0/+26
| | | |
| | | * Fixed painting issues with draggable tabsJens Bache-Wiig2009-04-153-75/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a few of the remaining glitches tabbar animations have: * We no longer grab tabs but paint them through QStyle. This makes tabs work and animate correctly when they are outside the visible region. * Buttons now correctly follow tabs when dropped * Gtkstyle recieved some polish to make it look more native. Task-number: 247694, 251166 Reviewed-by: nrc
| | | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Kavindra Devi Palaraja2009-04-152-2/+9
| | | |\
| | | | * Prevent crash in qt_scrollRectInImage.Samuel Rødal2009-04-152-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clip both against the source and target device rectangles. Task-number: 247937 Reviewed-by: Trond BT: yes
| | | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Kavindra Devi Palaraja2009-04-158-15/+96
| | | |\ \ | | | | |/ | | | | | | | | | | Merge commit '4e9c2364e8e9580aa317e9387338d45207ac4baa' into HEAD
| | | | * My 4.5.1 changes.Morten Sørvig2009-04-151-2/+16
| | | | |
| | | | * Update the item if the text has changed but the boundingRect is theAlexis Menard2009-04-152-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | same. updateBoudingRect update the item only if the boundingRect change but if we have 123 as an initial text and then we set 321 as the new text, then nothing happen because the rect is the same. In case the boundingRect change then we call update 2 times but the item is already dirty so the second call will just return. BT:yes Reviewed-by: Andreas
| | | | * BT: Updated configure for OpenGL ES 2.0 Windows CEFriedemann Kleint2009-04-151-0/+0
| | | | |
| | | | * Reparenting QGLWidgets did sometimes caused warnings to be printed onTrond Kjernåsen2009-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mac/Cocoa. Check if the view is visible before attaching it to a context. Task-number: related to 250066 Reviewed-by: Norwegian Rock Cat BT: yes
| | | | * BT: Namespace compile fixes for Cocoa.Norwegian Rock Cat2009-04-153-6/+15
| | | | | | | | | | | | | | | | | | | | It worked in 4.5.0, so it should work in 4.5.1 too.
| | | | * My changesJan-Arve Sæther2009-04-151-6/+19
| | | | |
| | | | * My changes for 4.5.1João Abecasis2009-04-151-0/+10
| | | | | | | | | | | | | | | | | | | | BT: yes
| | | * | Doc - clarified that on Windows, for 32-bit programs running in WOW64Kavindra Devi Palaraja2009-04-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode, the settings are stored in HKEY_LOCAL_MACHINE\Software\WOW6432node. Task-number: 232011 Reviewed-by: Martin Petersson <martin.petersson@trolltech.com>
| | | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Kavindra Devi Palaraja2009-04-153-7/+18
| | | |\ \ | | | | |/
| | | | * My ChangeLog.Andreas Aardal Hanssen2009-04-151-1/+9
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | * Correcting paragraphMorten Engvoldsen2009-04-151-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made a mistake when pushing e0706ca2fbce063c263bad9a1eee24f057f170bd I Corrected this. Task-number: 250254 Rev-by: Frans Englich Rev-by: Geir Vattekar
| | | | * BT: OpenGL ES 2.0 now compiles properly for Windows CEThomas Hartmann2009-04-151-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | glpixmapfilter should not be compiled for OpenGL ES 2.0 on nay platform Reviewed-by: Tom Cooksey
| | | | * Added remark about XML inputMorten Engvoldsen2009-04-151-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stated a remark about the need to use well-formed XML as input to the example. Rev-by: Geir Vattekar
| | | * | Doc - changed "MAY NOT" to an italicized version of 'may not' for someKavindra Devi Palaraja2009-04-151-1/+1
| | | |/ | | | | | | | | | | | | consistency.
| | | * BT: Fix Cocoa bug w/OpenGL widgets in dock widgets would disappear.Norwegian Rock Cat2009-04-155-23/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NSOpenGLContext seems to be tied to the window. So if the view changes from one window to another, the OpenGL context needs to be cleared. We can do this by hooking into the viewWillChangeWindow and viewDidChangeWindow events and clear and reset the drawable respectively. We also found out that QCocoaOpenGLView was not being used at all, so just remove it to get rid of any confusion. Task-number: 250066 Reviewed-by: Trond
| | | * BT: Fix a crash on certain theme changes in GNOMEJens Bache-Wiig2009-04-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We did not update initGtkWidgets on theme changes which could lead to crashes as the contents of the widget hash depend on certain properties in the style. A simple way to reproduce this would be to change between the redmond gtk theme and cleanlooks. Task-number: 251115 Reviewed-by: paul
| | | * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-04-1513-700/+1794
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e446518445c51c56471e41b1697e2a9e9f3adf36 ) Changes in WebKit since the last update: ++ b/WebCore/ChangeLog 2009-02-03 Dirk Schulze <krit@webkit.org> Reviewed by Sam Weinig. This is a follow up of r40546. Call toImage() once speeds up ImageBuffer::getImageData() * platform/graphics/qt/ImageBufferQt.cpp: (WebCore::ImageBuffer::getImageData): 2009-02-03 Dirk Schulze <krit@webkit.org> Reviewed by Sam Weinig and Oliver Hunt. Added getImageData() support for QtWebKit. [QT] lacks getImageData / putImageData support in Canvas https://bugs.webkit.org/show_bug.cgi?id=22186 * platform/graphics/qt/ImageBufferQt.cpp: (WebCore::ImageBuffer::getImageData): 2009-04-14 Benjamin C Meyer <benjamin.meyer@torchmobile.com> Reviewed by George Staikos. https://bugs.webkit.org/show_bug.cgi?id=25099 When creating a QNetworkRequest make sure to populate the CacheLoadControlAttribute with the value set by the ResourceRequest::cachePolicy() so that the cache will be used as WebKit expects. * WebKit/qt/tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::requestCache): * platform/network/qt/ResourceRequestQt.cpp: (WebCore::ResourceRequest::toNetworkRequest): 2009-04-07 Brady Eidson <beidson@apple.com> Reviewed by Darin Adler While working on <rdar://problem/5968249>, noticed some glaring problems with LocalStorage. * page/DOMWindow.cpp: (WebCore::DOMWindow::localStorage): Return the cached m_localStorage object if it exists to avoid creating multiple representations for the same underlying StorageArea. * page/DOMWindow.h: (WebCore::DOMWindow::optionalLocalStorage): Return m_localStorage, not m_sessionStorage. ++ b/WebKitTools/ChangeLog 2009-02-25 Adam Treat <adam.treat@torchmobile.com> Reviewed by Alexey Proskuryakov. Do not queue the calls to 'DumpRenderTree::dump()' as this can result in more than one call as a test that calls 'notifyDone()' can then be subsequently fully loaded and initiate a second dump. Also make sure to stop any existing page load that is happening before running the next test. Combined this serves to produce 217 more passing tests for the Qt port or roughly 5% at this point. * DumpRenderTree/qt/DumpRenderTree.cpp: (WebCore::DumpRenderTree::DumpRenderTree): (WebCore::DumpRenderTree::open):
| | | * BT: QAbstractSocket: fix check for closing state (typo)Peter Hartmann2009-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | emit disconnected() if we were in ConnectedState or in ClosingState before Reviewed-by: Thiago Task-number: 250976
| | | * The submenu of a multicolumn menu have an incorrect positionThierry Bastian2009-04-152-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The submenu would always appear to the side of the menu instead of its right. Task-number: 250673 Reviewed-by: ogoffart
| | * | Make the configured namespace part of QT_BUILD_KEY_COMPAT too.Jarek Kobus2009-04-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The eclipse integration is namespaced, but it still pulled in system plugins like the oxygen style through QT_BUILD_KEY_COMPAT check in QLibraryPrivate::isPlugin() Task: 250185 Reviewed-by: dt <qtc-committer@nokia.com> BT: yes