summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-04-161-3/+18
|\
| * QFileDialog: When passing an invalid path in static functions the nativeAlexis Menard2009-04-161-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dialog don't appear on Windows. The problem is with the directory that you can specify when calling the static functions. It can include a file in that path which means that the file will be selected by default when the dialog appears. But if you give an invalid file as a selection to the Windows API, then it simply don't display the dialog. The patch is basically checking the dir we get when we are called. workingDirectory tested it already and fallback to the current directory if the argument is invalid. I just check now if workingDirectory changed the path (that means the parameter value was incorrect) and select nothing in that case. Using this trick avoid stating again the complete path to check if the selection exist. (i.e. path() on QFileInfo don't call stat()). Task-number: 250120 Reviewed-by: jan-arve Reviewed-by: jasplin
* | Remove obsolete pre-processor directives that check QT_VERSION.Jason McDonald2009-04-1616-96/+0
| | | | | | | | | | Reviewed-by: Trust Me ....though discussed with three devs.
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-04-162-4/+21
|\ \ | |/
| * QX11Embed crashes on 64-bit SolarisBradley T. Hughes2009-04-161-4/+3
| | | | | | | | | | | | | | | | The data passed to XChangeProperty should be long arrays, as this is what Xlib expects. Task-number: 244062 Reviewed-by: Rhys Weatherley
| * Add sql changes to 4.5.1 changelogBill King2009-04-161-0/+18
| |
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-04-1661-925/+2568
|\ \ | |/
| * 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
| | * Stabilize test for QItemDelegateOlivier Goffart2009-04-151-0/+1
| | |
| | * Fixes QSortFilterProxyModel not reporting child if the model need to fetchMoreOlivier Goffart2009-04-152-0/+90
| | | | | | | | | | | | | | | | | | | | | | | | QSortFilterProxyModel::hasChildren need to construct the mapping. And when it tries to construct the mapping, it needs to fetch the childs, so there is none. Task-number: 250023 Reviewed-by: Marius Bugge Monsen
| | * Fixes warning about potential use of uninitialized valueOlivier Goffart2009-04-151-14/+12
| | | | | | | | | | | | Reviewed-by: bnilsen
| | * Fix regression in QString::replace(int, int, QChar) when string is emptyPaul Olav Tvete2009-04-152-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QString::replace was optimized, this specific overload missed out on sanity checking of the arguments. Task-number: 249517 Reviewed-by: Joao Reviewed-by: hjk BT: yes
| * | 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
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jarek Kobus2009-04-155-23/+181
| |\
| | * BT: Fix a regression to 4.4 in Graphics View's handling of child clippersAndreas Aardal Hanssen2009-04-153-14/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression caused by optimizations in QGraphicsItem and QGraphicsScene. The changes in QGraphicsItem fix bugs in QGraphicsItem::mapToParent functions, which did the translation before applying the transformation, instead of the other way (transform, then translate). This bug caused almost all mapToParent and mapRectToParent functions to behave wrongly. Unfortunately the new helper functions in QGraphicsScene for discovering items made use of these functions, which introduced a regression. Fixing these functions also fixes item discovery. The other part of this change fixes a regression caused by c1909321, which luckily happened after 4.5.0 and never saw the light of day. The fix is to also invalidate the cached clip path even if there is no scene, which is necessary if you build your scene graph outside the scene, and finish off by adding the root item to the scene. Task-number: 250680 Reviewed-by: Alexis