summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix tr-Errors/remove QObject::tr(), mainly in ScriptToolsFriedemann Kleint2009-09-2910-60/+63
| | | | | | Note: Those messages are to be translated in Qt 4.6 for the first time. Reviewed-by: Kent Hansen <khansen@trolltech.com>
* Introduce state machine event priority, make it possible to cancel eventsKent Hansen2009-09-292-20/+89
| | | | | | | | | | | | The priority specifies whether the event should be posted to what the SCXML spec refers to as the "external" (NormalPriority) queue, or the "internal" (HighPriority) queue. Delayed events are now posted through a separate function, postDelayedEvent(). That function returns an id that can be passed to cancelDelayedEvent() to cancel it. Reviewed-by: Eskil Abrahamsen Blomfeldt
* Fix bug with posting events from HandleCommandL on Symbian.Jason Barron2009-09-291-0/+1
| | | | | | | | | | | | | | Increase the loop level counter here because this is a system event entry point. Previously, posting a deferred delete event from this function (or triggering an action that posted this event) would end up with the event not being processed on time. The reason is that these events are only processed when the event loop that posted the event returns. Since the loop counter was not previously incremented, this "nested loop" was not detected so the event would only be processed when the main event loop returned which is typically at the end of the application. Reviewed-by: axis
* Merge branch '4.5' into 4.6Thiago Macieira2009-09-291-7/+4
|\ | | | | | | | | | | | | | | 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
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-09-291-16/+10
| |\
| | * QGraphicsItem: cached embedded widget item is not repainted when widget is ↵Andreas Aardal Hanssen2009-09-291-16/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | make sure QtWebKit and QtScript are included in the .sis fileEspen Riskedal2009-09-291-0/+5
| | | | | | | | | | Task-number: QTBUG-4613 Reviewed-by: Aleksandar Babic
* | 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
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Jeremy Katz2009-09-29164-1145/+3703
|\ \
| * | After some discussion we decided to remove hasConflicts() from the API.Jan-Arve Sæther2009-09-294-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | 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
| | |
| * | 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.
| * | Minor fixes in webkit's documentationPierre Rossi2009-09-291-4/+4
| | | | | | | | | | | | Reviewed-by: Jedrzej Nowacki
| * | Do synchronous processing of events in state machine if possibleKent Hansen2009-09-292-13/+40
| | | | | | | | | | | | | | | | | | | | | | | | 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-291-0/+4
| | |
| * | 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>
* | | 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
* | 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-295-36/+42
| | | | | | | | | | | | | | | | | | | | | | 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-291-1/+1
| |
* | 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
* | Add a more proper shutdown sequence for Symbian applications.Jason Barron2009-09-291-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously both EEikCmdExit and EAknSoftkeyExit were hard coded to call exit() which promptly exited the event loop without the chance to do any UI operations. With this patch, we handle the two cases differently and allow people to essentially make the right soft key a hide instead of an exit simply by reimplementing closeEvent() and ignoring the event. EAknSoftkeyExit is now a soft exit since this does not seem to be a mandatory exit in S60. By sending a QCloseEvent to QApplication this has the effect that all windows are closed (sent another QCloseEvent) and if one of them chooses to ignore this event, the application and UI are both kept alive. This is similar to how Qt behaves on other platforms. If all windows accept the close event (default), then the application will quit() as normal. This command is sent from the right soft key. EEikCmdExit is mapped similarly as before, but calls quit() instead of exit() to be aligned with other platforms. This will cause the aboutToQuit signal to be emitted which maps very well to Qt because UI interaction is not permitted from this signal and wouldn't work in S60 anyway because in the case of EEikCmdExit, the UI has already been torn down by the UI framework. This command is sent by the End key. We could take this one step further and intercept the key event and prevent it from going to the UI framework and tearing down the UI, but this is a little too evil IMHO. If people really want to intercept that event, they can do it by reimplementing the platform specific event filter. This is equivalent to how it would be done in S60 (reimplementing HandleWsEvent). Reviewed-by: axis Reviewed-by: mread
* | Fix some docs to follow the Qt style. (remove asterisks, proper indenting)Jan-Arve Sæther2009-09-291-44/+44
| | | | | | | | Note that this does *not* change the content of the docs.
* | Dont generate public docs for QSimplex.Jan-Arve Sæther2009-09-291-0/+4
| |
* | Fix qdoc error.Jason McDonald2009-09-291-2/+2
| | | | | | | | Reviewed-by: Trust Me
* | Fix a alpha issue with RGB32 and DirectFBAnders Bakken2009-09-291-1/+4
| | | | | | | | | | | | | | | | | | | | Since we can't use RGB32 format with DirectFB (issues regarding Qt's assumptions about the alpha byte) we need to explicitly convert images of this type to the preferred alphaPixmap format. This fixes an issue where RGB32 images get a curious gray alpha overlay. Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
* | doc: add some more \since 4.6 tagsVolker Hilsheimer2009-09-2810-9/+58
| |
* | QWheelEvent not working on Cocoa 64BitPrasanth Ullattil2009-09-281-3/+3
| | | | | | | | | | | | | | | | | | The patch which added support for smooth scrolling will work only on 32 bit builds. The new methods (e.g. deviceDeltaX) of the NSEvent were added with the float return type. This should be of CGFloat type instead, which is different from float on 64 bit builds. Reviewed-by: Trust Me
* | Fix Freemantle build of JSC/WebKit.Simon Hausmann2009-09-282-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | QScript: Fix strange bugs and crashes.Olivier Goffart2009-09-283-9/+25
| | | | | | | | | | | | | | | | | | | | I was assuming that the default return value register was always set to 0 for native calls. But this is not the case. So we must ensure this. Also be consistend in the way the stackframe grow and shrink. This expose another bug in the way the call frame is created in JSC Reviewed-by: Kent Hansen
* | fixed a typo in the doc.Denis Dzyubenko2009-09-281-1/+1
| | | | | | | | Reviewed-by: trustme
* | Fix QWebHistory autotest crashesJedrzej Nowacki2009-09-281-3/+7
| | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=29803 Reviewed-by: Simon Hausmann Cherry-picked-by: Simon Hausmann
* | Fixed a crash in the boxes demo when using -graphicssystem opengl.Trond Kjernaasen2009-09-283-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | Several problems: 1. The demo leaked the scene contents, which caused cleanup problems. 2. The QGLContext::currentContext() could be changed behind Qt's back under Windows (the temp contexts never reset the current context). 3. QGLFormat::openGLVersionFlags() function would return uninitialized flags if the QGLWidget constructor happened to call qt_gl_preferGL2Engine(). Reviewed-by: Kim
* | Removed unused line in QAbstractAnimationLeonardo Sobral Cunha2009-09-281-1/+0
| | | | | | | | | | | | This line was a left-over from commit 86f5a63b018441 Reviewed-by: thierry
* | getMacPreferredLanguageAndCountry: Fix possible crashMarkus Goetz2009-09-281-1/+1
| | | | | | | | | | | | | | | | getMacPreferredLanguageAndCountry can crash when called e.g. as a root user because CFPreferencesCopyValue will return 0. Reviewed-by: denis Task-number: 261664
* | Refactor of timer verification in QAbstractAnimationLeonardo Sobral Cunha2009-09-281-6/+4
| | | | | | | | Reviewed-by: thierry
* | Fixed compile failure when running make with large -j.Rohan McGovern2009-09-281-0/+1
| | | | | | | | | | | | | | | | | | | | `ld: library not found for -lQtOpenGL' ... in opengl graphicssystem. Must build QtOpenGL before the GL graphicssystem plugin. Reviewed-by: brad
* | Animations: updateCurrentTime now receives the currentTime as paramaterThierry Bastian2009-09-2810-18/+18
| | | | | | | | Reviewed-by: Leo
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sami Merilä2009-09-281-5/+15
|\ \
| * | Impossible to interact with the year on QCalendarWidget on GraphicsViewThierry Bastian2009-09-281-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that it is using mapToGlobal to translate a mouse position andthat doesn't work well when the widget is mebedded inside graphics view. Task-number: QT-2218 Reviewed-by: Bjoern Erik Nilsen
* | | Triggering softkey action for disbled widget causes a crash.Sami Merilä2009-09-282-2/+6
|/ / | | | | | | | | | | | | | | | | | | Softkey actions need to copy enable state from action widget to prevent crash when action is triggered and action widget is disabled. OPEN: dynamically setting enable state for softkey actions. Task-number: QT-2117 Reviewed-by: Jason Barron
* | Merge branch '4.6' of git@scm.dev-nokia.troll.no:qt/qt into 4.6Andreas Aardal Hanssen2009-09-282-1/+3
|\ \
generated by cgit v0.12 at 2025-01-04 10:47:54 (GMT)