summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2009-09-291486-23924/+1037083
|\ | | | | | | | | Conflicts: doc/src/qt4-intro.qdoc
| * Merge branch '4.5' into 4.6Thiago Macieira2009-09-294-100/+79
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/platform-notes.qdoc src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
| | * added my changes to the changelogDenis Dzyubenko2009-09-291-1/+6
| | | | | | | | | | | | Reviewed-by: trustme
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-09-292-16/+41
| | |\
| | | * QGraphicsItem: cached embedded widget item is not repainted when widget is ↵Andreas Aardal Hanssen2009-09-292-16/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated When calling QGraphicsItem::update() on a cached item, the cache is meant to be invalidated. In the reported bug, the user had a fixed scene rect set for his scene, and removing an item caused the entire scene to be updated (marked as "all needs to be updated"). In this case, calling update() on the cached item did not cause the item's cache to be invalidated. The item's new appearance didn't show up until the next invalidation, which was the same call to update(), but this time without a preceeding full scene update. The fix is to always invalidate the cache, regardless. But only schedule a repaint of the item in some cases (e.g., in this case the whole scene was marked for update, in which case it's unnessary for this one item to schedule a repaint of itself). It's worth noting that in 4.6, removing an item be delete does not cause the whole scene to be updated, and because of that this error was not exposed. It's there nevertheless. Reviewed-by: bnilsen
| | * | Remove mentions of QtSW.Jason McDonald2009-09-292-3/+3
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Remove mention of QtSW.Jason McDonald2009-09-291-1/+1
| | |/ | | | | | | | | | Reviewed-by: Trust Me
| | * Tidy changes file for 4.5.3.Jason McDonald2009-09-291-99/+24
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Update changes file for 4.5.3 for DirectFBAnders Bakken2009-09-281-3/+14
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Added my 4.5.3 changes to changelog.Samuel Rødal2009-09-281-0/+12
| | |
| | * tst_qnetworkcookiejar: Backported 4.6 changesMarkus Goetz2009-09-281-14/+14
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Mac: build issue (autotest stalls build)Richard Moe Gustavsen2009-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building Qt static on Mac, the test included actually stops the build process, prompting the user for 'Promteroo?' The reason is that configure runs qmake on all the tests inside the test/auto directory, including the one that is meant for testing qmake itself. In other words, this test should not be qmake'ed when running configure, only when running the qmake auto test. However, the qmake auto test does not run the prompt test anymore either. So the solution for now is to just comment out the test project as well. Reviewed-by: alexis
| | * Mac: backport efd84105355 to silence visibility warningsRichard Moe Gustavsen2009-09-281-2/+1
| | | | | | | | | | | | | | | | | | | | | Make sure that we build objective c files with visibility hidden as default Reviewed-by: prasanth
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Espen Riskedal2009-09-291-2/+2
| |\ \
| | * | Enable QtScript by default on WindowsKent Hansen2009-09-291-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann
| * | | make sure QtWebKit and QtScript are included in the .sis fileEspen Riskedal2009-09-291-0/+5
| |/ / | | | | | | | | | | | | Task-number: QTBUG-4613 Reviewed-by: Aleksandar Babic
| * | Disable ECMAScript date test.Olivier Goffart2009-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | On slow machines, the time in which the reference and the result are computed may vary by one second. Task-number: QTBUG-4614 Reviewed-by: Kent Hansen
| * | Fix EGL/GLX surface leak when using texture-from-pixmapTom Cooksey2009-09-291-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The QScopedPointer changes mean that the pixmap data's reference count is now decremented after the cleanup hooks are called. The hooks should also only be called when the pixmap data gets deleted, so we don't actually have to check the reference count at all. Reviewed-by: TrustMe
| * | Fix typo.Alexis Menard2009-09-291-2/+2
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Recorrect formextractor example build break after updating 3rdparty/webkitJocelyn Turcotte2009-09-291-7/+7
| | |
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Jeremy Katz2009-09-29177-1253/+3879
| |\ \
| | * | After some discussion we decided to remove hasConflicts() from the API.Jan-Arve Sæther2009-09-296-49/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hasConflicts() does only make sense for a tool/editor of the layout, and how this function would help the tool is only guesswork at the moment. We keep the private API though, in order to let the autotests we inherited from Orbit pass.
| | * | Add missing docs for QGraphicsAnchorJan-Arve Sæther2009-09-291-0/+18
| | | |
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jani Hautakangas2009-09-292-52/+42
| | |\ \
| | | * | Stabilize testsOlivier Goffart2009-09-292-52/+42
| | | | |
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jani Hautakangas2009-09-291-1/+1
| | |\ \ \ | | | |/ /
| | | * | Fix spelling error in the demo browser close-multiple-tabs dialogTor Arne Vestbø2009-09-291-1/+1
| | | | |
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jani Hautakangas2009-09-29181-1263/+3913
| | |\ \ \ | | | |/ /
| | | * | Re-apply change e20c832098d98076a0f988ce01b53586e370d272 by Simon HausmannSimon Hausmann2009-09-291-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Freemantle build of JSC/WebKit. Remove __clear_cache which is an internal function of GCC https://bugs.webkit.org/show_bug.cgi?id=28886 Patch by Gabor Loki <loki@inf.u-szeged.hu> on 2009-09-28 Reviewed by Simon Hausmann. Although __clear_cache is exported from GCC, this is an internal function. GCC makes no promises about it. * jit/ExecutableAllocator.h: (JSC::ExecutableAllocator::cacheFlush): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48824 268f45cc-cd09-0410-ab3c-d52691b4dbfc
| | | * | Re-apply change e433f472a765d738238a6b380060ce15c4910148 by Jedrzej NowackiJedrzej Nowacki2009-09-291-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix QWebHistory autotest crashes https://bugs.webkit.org/show_bug.cgi?id=29803 Reviewed-by: Simon Hausmann Cherry-picked-by: Simon Hausmann
| | | * | Updated WebKit from /home/joce/dev/qtwebkit/ to ↵Jocelyn Turcotte2009-09-29152-1116/+3595
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtwebkit-4.6-snapshot-29092009-2 ( 999c28aa9f6ad9e0d6a26a794220e1cb45408a97 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-09-28 HJK Reviewed by Simon Hausmann. Compile fix with namespaced Qt. * Api/qwebinspector_p.h: 2009-09-27 Joe Ligman <joseph.ligman@mindspring.com> Reviewed by Simon Hausmann. [Qt] Adding API setFocus and hasFocus to QWebElement. This API is needed for clients that want to check/set the focus node of the document. https://bugs.webkit.org/show_bug.cgi?id=29682 * Api/qwebelement.cpp: (QWebElement::hasFocus): (QWebElement::setFocus): * Api/qwebelement.h: * tests/qwebelement/tst_qwebelement.cpp: (tst_QWebElement::hasSetFocus): 2009-09-25 Csaba Osztrogonac <oszi@inf.u-szeged.hu> Reviewed by Simon Hausmann. [Qt] Make tst_qwebframe work if Qt built without SSL support https://bugs.webkit.org/show_bug.cgi?id=29735 * tests/qwebframe/tst_qwebframe.cpp: Missing #ifndef blocks added. 2009-09-24 Jocelyn Turcotte <jocelyn.turcotte@nokia.com> Reviewed by Simon Hausmann. [Qt] Update QWebElement API to remove script related methods. QWebElement::evaluateScript is the only one kept, these are removed to postpone most of the QtWebKit<->JavaScript API design after 4.6. https://bugs.webkit.org/show_bug.cgi?id=29708 * Api/qwebelement.cpp: * Api/qwebelement.h: Methods removed: - QWebElement::callFunction - QWebElement::functions - QWebElement::scriptableProperty - QWebElement::setScriptableProperty - QWebElement::scriptableProperties * tests/qwebelement/tst_qwebelement.cpp: (tst_QWebElement::evaluateScript): 2009-09-25 Jocelyn Turcotte <jocelyn.turcotte@nokia.com> Reviewed by Simon Hausmann. [Qt] Rename QWebElement::evaluateScript to QWebElement::evaluateJavaScript. https://bugs.webkit.org/show_bug.cgi?id=29709 * Api/qwebelement.cpp: (QWebElement::evaluateJavaScript): * Api/qwebelement.h: * tests/qwebelement/tst_qwebelement.cpp: (tst_QWebElement::evaluateJavaScript): 2009-09-25 Jocelyn Turcotte <jocelyn.turcotte@nokia.com> Reviewed by Simon Hausmann. [Qt] Update the stypeProperty API of QWebElement. https://bugs.webkit.org/show_bug.cgi?id=29711 * Api/qwebelement.cpp: (QWebElement::styleProperty): - Merge the stypeProperty and the computedStyleProperty methods - Remove the default value for the style resolving enum - Rename ResolveRule to StyleResolveStrategy (QWebElement::setStyleProperty): - Remove the priority argument since it is possible to control the behaviour by adding !important or removing in the value. * Api/qwebelement.h: * tests/qwebelement/tst_qwebelement.cpp: (tst_QWebElement::style): (tst_QWebElement::computedStyle): * tests/qwebframe/tst_qwebframe.cpp: 2009-09-24 Jon Honeycutt <jhoneycutt@apple.com> Reviewed by Alice Liu. * Api/qwebpage.cpp: (QWebPagePrivate::QWebPagePrivate): Pass 0 for new Page constructor argument.
| | | * | Update mkdist-webkit script to use latest tagJocelyn Turcotte2009-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann
| | | * | Enable QtScript by defaultKent Hansen2009-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JavaScriptCore should build on Tier 1 and Tier 2 platforms now. Reviewed-by: Simon Hausmann
| | | * | Minor fixes in webkit's documentationPierre Rossi2009-09-291-4/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Jedrzej Nowacki
| | | * | Making tst_qParallelAnimationGroup work for Symbianmread2009-09-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The animation was not starting in time, as events from Symbian app start up had not had time to be flushed through. The addition of a 1s QTest::qWait gives plenty of time for the app to settle. Reviewed-by: Janne Anttila
| | | * | Do synchronous processing of events in state machine if possibleKent Hansen2009-09-293-13/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid delayed scheduling in the cases where there's no need to delay it (e.g. when the state machine intercepts a signal or event). Task-number: QTBUG-4491 Reviewed-by: Eskil Abrahamsen Blomfeldt
| | | * | doc: Describe the semantics of targetless state machine transitionsKent Hansen2009-09-292-0/+33
| | | | |
| | | * | QScript: fix the way the js stack is advanced.Olivier Goffart2009-09-292-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible to call QScriptEngine::pushContext before we start any evaluation. We need to change JSC so it doesn't always start at the beginning of the stack. Also fix QScriptContext::pushContext not to waste space between callframes. Reviewed-by: Kent Hansen
| | | * | Add the -testability option to Qt applications.Petri Kiiskinen2009-09-293-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If this option is given, Qt will load a plugin called "qttestability" and run an initialisation function from it. This allows one to just install the plugin in a non-debug device in order to enable testing. Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | | Softkey fixes to QMenu tests.Jani Hautakangas2009-09-293-18/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Softkeys add two extra "Select" and "Back" actions to menu by default. First two actions in menu will be "Select" and "Back". Reviewed-by: Janne Anttila
| * | | | fix warnings about declarations shadowing class members (autotest reported)Jeremy Katz2009-09-297-50/+50
| | |/ / | |/| | | | | | | | | | Reviewed-by: Olivier
| * | | HTTP backend: store the date header in the cached resourcePeter Hartmann2009-09-291-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we need the date header to calculate the age of the page, although this increases disk usage when using a QNetworkDiskCache. A solution to reduce the disk access of QNetworkDiskCache will be considered for a later version of Qt. Reviewed-by: Markus Goetz Reviewed-by: Aleksandar Sasha Babic
| * | | Mac: Fix build failure on tigerRichard Moe Gustavsen2009-09-291-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I had to add inn some constants for dealing with pixel smooth scolling on mac when building on Tiger. This is done according to: http://developer.apple.com/legacy/mac/library/qa/qa2005/qa1453.html RevBy:prasanth
| * | | Doc: Snow Leopard is supported as a Tier 2 platform.Volker Hilsheimer2009-09-291-1/+7
| | | | | | | | | | | | | | | | | | | | Discussed in the program team - adding it as a Tier 1 platform is too ambitious.
| * | | fix solaris buildOswald Buddenhagen2009-09-291-1/+5
| | | | | | | | | | | | | | | | "A class with a reference member must have a user-defined constructor."
| * | | Update docs for softkeys to match new API and implementation.Jason Barron2009-09-291-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These docs were outdated and referred to API that no longer exists so we refresh them with some updated info. Reviewed-by: Sami Merila
| * | | Fix a bug in QPixmapCache when the cache is trimmed by QCache.Alexis Menard2009-09-296-48/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a bug in QPixmapCache when QCache trims the content, some keys were not invalidated. The ifdef for WinCE (that i removed) was a wrong fix, it let the auto-test pass but it doesn't fix the bug. The approach here is to add a QPixmapCacheEntry that release the key it owns when QCache deletes it : we are now sure that nothing happen in our back. Reviewed-by:paul Reviewed-by:trond
| * | | Use glXGetProcAddress to resolve glx extensionsTom Cooksey2009-09-292-57/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On systems where the GL driver is pluggable (like Mesa), we have to use the glXGetProcAddressARB extension to resolve other function pointers as the symbols wont be in the GL library, but rather in a plugin loaded by the GL library. This fix basically makes texture-from-pixmap work on Mesa drivers like intel i915 & friends. Reviewed-by: Trond
| * | | I18N: Add new module, fix spelling glitch.Friedemann Kleint2009-09-292-1/+3
| | | |
| * | | Revert the new QFSEventsFileSystemWatcherEngine on Mac for now.Alexis Menard2009-09-291-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new QFSEventsFileSystemWatcherEngine was introduced in 4.6 in order to speed up Qt, but we have experienced dead lock and auto-tests regressions (QFilesystemModel). Task-number:QT-2217 Reviewed-by:brad Reviewed-by:denis Reviewed-by:richard