summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* compileMaurice Kalinowski2009-04-071-1/+1
| | | | | | | Reviewed-by: thartman function declaration was missing arguments as done in the other testcases in 831d2742b7c41924f052acd81620e8bfc58afde7 (cherry picked from commit e517ecc9025b68179c67a383791eefbedfee0543)
* compile for non x11 systemsMaurice Kalinowski2009-04-071-0/+2
| | | | | Reviewed-by: joerg (cherry picked from commit a93551a2e3e590400b09bc076d3a6883c162b75d)
* Make compile when Qt3Support is turned offBill King2009-04-071-0/+2
| | | | (cherry picked from commit 6393b9fa8474b7b9e86319f54477cba9bec65d11)
* BT: Fixed treeview painting regression on VistaJens Bache-Wiig2009-04-071-6/+14
| | | | | | | | | | | | The old code did not split up the frame from the central parts of the itemview selection box correctly. We now draw the edges as border images instead. Previously this would lead to somewhat ugly scaling artifacts for small header sections. Task: 248839 Reviewed-by: ogoffart (cherry picked from commit 041a8ecdb5f11dfc499f8f8f77d85cb63508c093)
* BT: Adjust the colliding mice example to work with coalesced updates.Norwegian Rock Cat2009-04-074-25/+30
| | | | | | | | | | | | | | | | | | | | It seems that Cocoa is much more strict about coalesced updates than Carbon ever was. The upshot of this is that some examples that "worked" after a fashion in Carbon, do not exhibit good frame rates with Cocoa. The reason why is that apparently Cocoa will decide to flush to the screen every time a timer fires. If you have a lot of timers that are all dependent on doing on update to the screen, you will get undesirable effects. Thankfully, it is possible to adjust the examples to follow best practices and get a good result. So, we now only do the animation once using QGraphicsScene::advance(). We are also able to make the mice less heavy (no QObject subclass). I've updated the docs and someone on the doc team has kindly volunteered to go through them. Reviewed-by: Andreas (cherry picked from commit 1bb9d8fcd59a91751c8d91e2885e2b05eff4d1bb)
* Removed usage of NaN in SVG gradients.Kim Motoyoshi Kalland2009-04-072-3/+5
| | | | | | | | | | The previous change 6c2dd295b2ca2f9125fe072d035a3784ce748718 to remove usage of NaN in SVG gradients was incomplete. This commit should fix that. Task-number: 250146 Reviewed-by: Samuel (cherry picked from commit 003223dcfc1fa884b82085db19d4c4056bf6eaa0)
* Update WebKit from code.staikos.net/srv/git/webkitTor Arne Vestbø2009-04-0712-1657/+744
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using branch origin/qtwebkit-4.5 (f72c14123c593dc9d649d25b7186334bba0026b5) Changes in WebKit since the last update: ++ b/WebCore/ChangeLog 2009-04-06 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> Reviewed by Simon Hausmann. [Qt] Don't show and hide the platformPluginWidget, as it's our QWebView * plugins/mac/PluginViewMac.cpp: (WebCore::PluginView::show): (WebCore::PluginView::hide): (WebCore::PluginView::setParentVisible): 2009-04-06 Mike Belshe <mike@belshe.com> Reviewed by Eric Seidel. HTMLCanvasElement crash when ImageBuffer creation fails. https://bugs.webkit.org/show_bug.cgi?id=23212 Check for NULL before using the ImageBuffer as we might be low on memory and creation may have failed. Test case creation blocked by: https://bugs.webkit.org/show_bug.cgi?id=25055 * html/HTMLCanvasElement.cpp: (WebCore::HTMLCanvasElement::createImageBuffer): 2009-04-05 Erik L. Bunce <elbunce@xendom.com> Reviewed by Simon Hausmann. https://bugs.webkit.org/show_bug.cgi?id=25050 Fix an assert failure when dropping an 'empty' text/uri-list on a QWebView. * platform/qt/DragDataQt.cpp: (WebCore::DragData::asURL): ++ b/WebKitTools/ChangeLog 2009-03-31 Adam Roben <aroben@apple.com> Make resolve-ChangeLogs -f work when the working tree has spaces in its path Reviewed by Mark Rowe and David Kilzer. * Scripts/resolve-ChangeLogs: (sub fixMergedChangeLogs): Quote the path to resolve-ChangeLogs in case it contains spaces. 2009-03-17 David Kilzer <ddkilzer@apple.com> resolve-ChangeLogs should not die on unmerged non-ChangeLog files Reviewed by Adam Roben. Fixes the following bug in resolve-ChangeLogs: Use of uninitialized value in -e at ./WebKitTools/Scripts/resolve-ChangeLogs line 132. Died at ./WebKitTools/Scripts/resolve-ChangeLogs line 164. * Scripts/resolve-ChangeLogs: (findUnmergedChangeLogs): Check the result of findChangeLog() to make sure we don't add undef values to the list of files being returned. 2009-03-11 David Kilzer <ddkilzer@apple.com> Bug 24378: resolve-ChangeLogs should use git status or svn status to find and fix unmerged ChangeLogs <https://bugs.webkit.org/show_bug.cgi?id=24378> Reviewed by Adam Roben. * Scripts/resolve-ChangeLogs: If -f|--fix-merged is not passed and no file or directory names are specified on the command-line then try to find unmerged ChangeLog files based on 'svn stat' or 'git diff'. Added global $isGit and $isSVN variables so that isGit() and isSVN() only have to be called once. (findUnmergedChangeLogs): Added. (cherry picked from commit 1d3706f2b66ba5fbb586e532fc29852f55d81c86)
* remove dead codeMaurice Kalinowski2009-04-071-1/+0
| | | | | Reviewed-by: jbache (cherry picked from commit 6ce4a3b66e2b31f80d1a2d09a4c4087f88a7a9e8)
* BT: Fix combobox background color regressionJens Bache-Wiig2009-04-072-9/+5
| | | | | | | | | | There was a regression in the background color for QComboBox popups. This should resolve it. It essentially tells the system to stay off the system palette while QGtkStyle is used. We will introduce a cleaner style hint for this in 4.6. Reviewed-by: nrc (cherry picked from commit f06c4f2d7378b40a0a184393a8986032d5a700ee)
* Doc - Mentioned what the default filters are forKavindra Devi Palaraja2009-04-071-1/+4
| | | | | | | | QFileSystemModel::filter(). Task-number: 250285 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com> (cherry picked from commit cf65dea821a2ba796bb1f32c80de6b9db224dff5)
* Rename these files to have lowercase .txt extension.Thiago Macieira2009-04-072-0/+0
| | | | | | | | mkdist doesn't case-insensitive comparison. Reviewed-by: TrustMe BT: yes (cherry picked from commit 5bb504a78cad5e38cd522785a37898f4e88cd272)
* Install the animation.mng file.Thiago Macieira2009-04-071-1/+1
| | | | | | | | | Otherwise, for people who install Qt (everyone outside Nokia), the animation file isn't present. Reviewed-by: Trust Me BT: yes (cherry picked from commit 73f5131793d52d93b18a40d36599e063f18246e9)
* Corrected typo.jasplin2009-04-071-1/+1
| | | | | Reviewed-by: jasplin (cherry picked from commit 1a125061f201bb7ee746f1eddc0604cd85a6545c)
* Doc - Clarified that button style on X11 platforms may depend on theKavindra Devi Palaraja2009-04-071-1/+2
| | | | | | | | desktop environment. Task-number: 250338 Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com> (cherry picked from commit 38b5bff2fab59e965aba59b4f121a7c8945e4d75)
* Remove QTDIR dependency from moc autotestSimon Hausmann2009-04-071-10/+26
| | | | | | | | Use qmake -query QT_INSTALL_HEADERS at test startup time instead of relying on the dead QTDIR environment variable. Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> (cherry picked from commit d071b3528f51aaded18029f2f22e8db03e47a2a6)
* Moc autotest cleanupSimon Hausmann2009-04-071-12/+0
| | | | | | | Remove unused QTDIR tests. Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> (cherry picked from commit 10ba12c7b73b89761a43a450c2932c8a56bf64db)
* Fix moc autotest failuresSimon Hausmann2009-04-072-3/+11
| | | | | | | | | | | | | We have to pass the correct include paths when testing the multiple inheritance warning, because we want moc to find the QtGui and QObject headers. In addition we have to adjust the line numbers and include QObject in the qobject test to avoid a warning about the unknown QObject superclass. Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> (cherry picked from commit 73cffd26dcfbfee48caf86329d636361d02e5c03)
* BT: Fix a crash when running a widget window modal when it has no parentNorwegian Rock Cat2009-04-061-7/+5
| | | | | | | | | We changed the logic for determining sheets, but it seems we forgot to take the parentWidget() into account. It's required for WindowModality to make any sense. Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 1e32cdefa382b16eaffc663594ccab1dbe1faebb)
* QThread::start(): priority has no effect on Linux systemsBradley T. Hughes2009-04-061-0/+12
| | | | | | | | | | The default scheduling policy on Linux doesn't allow specifying thread priorities, so the priority passed to start() and setPriority() has no effect. Document this. Task number: 249997 Reviewed-by: Kavindra Devi Palaraja <kavindra.palaraja@nokia.com> (cherry picked from commit 638b61dec0d335b12d48fe561b19a0f0f6ef83a3)
* Fix up color matching on 64-bit Cocoa.Norwegian Rock Cat2009-04-061-7/+38
| | | | | | | | | | | | | | | | | It seems that GetThemeTextColor is not available at all for 64-bit versions of the operating system and there is no good equivalent. We were using a technique where we would create a small pixmap and then use HIThemeSetTextFillColor() with the proper enum. However, this function will silently set a black color if it doesn't know about the enum. So, we get black when we really shouldn't. It also seems to produce colors that are a bit different from the Carbon function. So, in the meantime, just hard code the values in. It might break if you are hacking the resources in Mac OS X, but we'll have to live with that until we get a real function. Task-number: 248918 Reviewed-by: Prasanth Ullattil (cherry picked from commit c350892f55a1d8633be54f09e6e4596f4687bc89)
* Update the qmake documentation regarding when the .qmake.cache isAndy Shaw2009-04-061-0/+3
| | | | | | | processed. Reviewed-by: TrustMe (cherry picked from commit 020ced4994bace0ed7f494bec8905afa959f76ed)
* Make the configure.exe program work for the commercial release licenses.Thiago Macieira2009-04-042-21/+14
| | | | | Reviewed-by: TrustMe BT: yes
* Add some timing capabilitiesAnders Bakken2009-04-043-1/+26
| | | | | | | Add some frames-per-second output for debugging when QT_DIRECTFB_TIMING is defined. Reviewed-by: Donald <qt-info@nokia.com>
* QScreen::flush() no longer draws the titlebarAnders Bakken2009-04-041-5/+0
| | | | | | We don't need to chain to the base class anymore. Reviewed-by: Donald <qt-info@nokia.com>
* Silence warning and beautify codeAnders Bakken2009-04-032-24/+13
| | | | | | | Even though these variables couldn't really be used uninitialized GCC 4.3.2 thinks it could. This is nicer, more readable and faster anyway. Reviewed-by: Donald <qt-info@nokia.com>
* QGtkStyle: Fix styling and palette issues related to combo boxJens Bache-Wiig2009-04-035-39/+89
| | | | | | | | | | | | | | | | | | | | | | Well actually this change is a bit bigger than just that. *We no longer override the palette you provide in polish so it should be a bit more frienly toward custom application changes. * Another issue was that we would generate the palette information when we got the style callback from gtkButton but then the line edits might not yet have been polished. Hence we now return from the callback and instead post the update for later. * We had to modify the PE_Frame entry to draw a raised menu when the custom combo box delegate was used. * We now simply ignore custom qtconfig palette entries when using GtkStyle since they only cause trouble with it. Task-number: 250142 Reviewed-by: nrc
* Fixes crash in QTreeView with QSortFilterProxyModelOlivier Goffart2009-04-031-0/+1
| | | | | | | | | If we get an hover event while the model gets invalidated, we might ends up calling itemDecorationAt before the viewitem is refreshed. Can be reproduced in KTorrent (Relates to KDE bug 172198) or Kopete trunk Reviewed-by: Thierry
* Do not loose WindowType flags when setting translucent background in X11Olivier Goffart2009-04-031-1/+1
| | | | | | | | This fixes KRunner on XMonad. The Qt::Dialog flag of the krunner dialog was lost when the Qt::WA_TranslucentBackground was set, leading to incorrect behaviour in some window manager (such as xmonad) Reviewed-by: Samuel
* Fix a crash in QFileDialog with a proxy on it.Alexis Menard2009-04-033-22/+91
| | | | | | | | | | | | The main problem is that enterDirectory received a QModelIndex that can be a proxy index and not a source index if there is a proxy set on the QFileDialog. This fix basically discover some other crashes in the completer. The problem was that we didn't apply the proxy to the completer too. So we basically messed up source and proxy indexes. Both have a proxy set now and convert the model indexes if needed. Task-number:250194 Reviewed-by:jasplin
* Use QMAKE_LIBS_OPENGL_QT in the GL ES config testsTom Cooksey2009-04-033-3/+3
| | | | | | | | | The OpenGL ES config tests are there to test if there's enough to build QtOpenGL, not OpenGL applications using Qt. Therefore we should use QMAKE_LIBS_OPENGL_QT rather than QMAKE_LIBS_OPENGL. This is mostely because Qt needs to link against EGL whereas Qt applications do not. Reviewed-by: TrustMe
* Add config test for XLibTom Cooksey2009-04-033-0/+20
| | | | | | | | | Previously, it was entirely possible to successfully configure Qt/X11 without any X11 installed. The problems would only start showing up once you stated building. This is not very useful if you're cross-compiling and trying to setup the paths correctly. Reviewed-by: Denis
* BT: Compilation on WinCE.Trond Kjernåsen2009-04-031-1/+1
| | | | Reviewed-by: Kim
* Use the standard 'type name = value' variable declaration for PODThiago Macieira2009-04-031-1/+1
| | | | | | | | | | | | types. C++ is nice, but we don't have to use confusing syntax when plain old C works (and is correct). This apparently fixes a compilation error on MSVC 6, that doesn't like the constructor-like initialisation for POD types. Reviewed-by: Trust Me BT: yes
* Removed usage of NaN in SVG gradients.Kim Motoyoshi Kalland2009-04-034-17/+22
| | | | | | | | | | | | | | Since there is no way to find out if gradient stops have been added to a gradient, a gradient stop at NaN was earlier used in the SVG module to mark the gradient as empty. This could cause floating point exceptions. The usage of NaN has now been replaced by a boolean in QSvgGradientStyle. Duplicate entry "qxmlpatterns" was removed from auto.pro in the auto test directory. Task-number: 250146 Reviewed-by: Samuel
* Fix focus policy propagation bug in QCompleter.jasplin2009-04-032-0/+65
| | | | | | | | | | | | | | | Commit 4a00810cc394b7da99ddb2d13eb045352ede25d3 ensures that setting the focus policy of a widget applies to its proxy (if any) as well. This propagation effect is however unfortunate for a QCompleter in PopupCompletion mode. The client widget (typically a QLineEdit or a QTextEdit) acts as the focus proxy to the popup menu. Internally, the completer sets the focus policy of the popup menu to NoFocus, but this should not affect the focus policy of the editor. Reviewed-by: janarve Task-number: 250064
* My changesJarek Kobus2009-04-031-0/+1
|
* Suppress unnecessary "Could not re-create the temporary EGL surface" warningsRhys Weatherley2009-04-031-1/+1
| | | | | | | The wrong temporary surface id was being used to recreate the EGL surface. It was "tempSurface" when it should have been -1. Reviewed-by: Ian Walters
* Add information about QT_* defines that are needed to make PowerVR workRhys Weatherley2009-04-031-0/+3
| | | | | | | The QT_QWS_CLIENTBLIT and QT_NO_QWS_CURSOR defines must be supplied or the direct paint regions used by the PowerVR driver won't work. Reviewed-by: trustme
* some more quoting for qmake ...Oswald Buddenhagen2009-04-022-2/+2
| | | | sometimes, even two reviews are not enough ...
* Adding auto-tests for commits a2fcc4a5 and 8d500381João Abecasis2009-04-024-1/+78
| | | | | | | Task-number: 244500 Task-number: 244485 Reviewed-by: ossi Reviewed-by: thiago
* Only set system style when it actually changesJens Bache-Wiig2009-04-021-1/+5
| | | | | | | | | | | This issue would cause Qt Creator and similar apps with proxy styles to loose their custom styling whenever any x11 system settings changed. This happened because we would re-read the settings and override the system style even if the system style did not actually change would be set on the application. We Task-number: 250199 Reviewed-by: ogoffart
* Make mkdist-webkit work from in-source buildsSimon Hausmann2009-04-021-1/+1
| | | | | | | Explicitly unset QTDIR_build, to make sure we generate Makefiles with real rules to call the extra tools. Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5kh2009-04-024-12/+19
|\
| * make relative #include relative to the current fileOswald Buddenhagen2009-04-021-1/+1
| | | | | | | | i.e., use "", not <> and thus rely on the include path
| * re-apply improved version of 3aff9113a9702ea6f7e099a73136a718ae1b992fOswald Buddenhagen2009-04-022-2/+8
| | | | | | | | | | | | | | this time, it can deal with directories which are absolute to start with. Reviewed-by: mariusSO
| * re-initialize some variables for each fileOswald Buddenhagen2009-04-021-5/+4
| |
| * fix evaluation of CONFIG() and contains()Oswald Buddenhagen2009-04-021-3/+4
| | | | | | | | cherry-picked from creator's b3ec859c80bd0656cfc48cfe6514ec4f631b8206
| * fix wrong evaluation of arguments to qmake functionsOswald Buddenhagen2009-04-021-1/+2
| | | | | | | | cherry-pick 28dacdfdf3eed04ec47a1e8eb206bd3ffb979c08 from creator
* | fixes empty tab after pdf file open, new tab after middle mouse clickkh2009-04-022-3/+57
| | | | | | | | | | Task-number: none Reviewed-by: --global
* | fixes empty tab after pdf file openkh2009-04-021-3/+10
|/ | | | | Task-number: none Reviewed-by: --global