qt:bada-lighthouse.git
9 years agoMerge branch '4.6' master
Thiago Macieira [Tue, 29 Sep 2009 12:37:15 +0000 (14:37 +0200)]
Merge branch '4.6'

Conflicts:
doc/src/qt4-intro.qdoc

9 years agoMerge branch '4.5' into 4.6
Thiago Macieira [Tue, 29 Sep 2009 12:35:34 +0000 (14:35 +0200)]
Merge branch '4.5' into 4.6

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

9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Espen Riskedal [Tue, 29 Sep 2009 12:10:46 +0000 (14:10 +0200)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agomake sure QtWebKit and QtScript are included in the .sis file
Espen Riskedal [Tue, 29 Sep 2009 12:07:29 +0000 (14:07 +0200)]
make sure QtWebKit and QtScript are included in the .sis file

Task-number: QTBUG-4613
Reviewed-by: Aleksandar Babic
9 years agoEnable QtScript by default on Windows
Kent Hansen [Tue, 29 Sep 2009 11:55:41 +0000 (13:55 +0200)]
Enable QtScript by default on Windows

Reviewed-by: Simon Hausmann
9 years agoDisable ECMAScript date test.
Olivier Goffart [Tue, 29 Sep 2009 11:36:21 +0000 (13:36 +0200)]
Disable ECMAScript date test.

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
9 years agoFix EGL/GLX surface leak when using texture-from-pixmap
Tom Cooksey [Tue, 29 Sep 2009 09:09:01 +0000 (11:09 +0200)]
Fix EGL/GLX surface leak when using texture-from-pixmap

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
9 years agoFix typo.
Alexis Menard [Tue, 29 Sep 2009 11:21:35 +0000 (13:21 +0200)]
Fix typo.

Reviewed-by: TrustMe
9 years agoadded my changes to the changelog
Denis Dzyubenko [Tue, 29 Sep 2009 11:18:05 +0000 (13:18 +0200)]
added my changes to the changelog

Reviewed-by: trustme
9 years agoRecorrect formextractor example build break after updating 3rdparty/webkit
Jocelyn Turcotte [Tue, 29 Sep 2009 11:10:54 +0000 (13:10 +0200)]
Recorrect formextractor example build break after updating 3rdparty/webkit

9 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Jeremy Katz [Tue, 29 Sep 2009 11:06:17 +0000 (13:06 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agofix warnings about declarations shadowing class members (autotest reported)
Jeremy Katz [Tue, 29 Sep 2009 11:03:42 +0000 (13:03 +0200)]
fix warnings about declarations shadowing class members (autotest reported)

Reviewed-by: Olivier
9 years agoAfter some discussion we decided to remove hasConflicts() from the API.
Jan-Arve Sæther [Tue, 29 Sep 2009 07:46:06 +0000 (09:46 +0200)]
After some discussion we decided to remove hasConflicts() from the API.

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.

9 years agoAdd missing docs for QGraphicsAnchor
Jan-Arve Sæther [Tue, 29 Sep 2009 07:45:39 +0000 (09:45 +0200)]
Add missing docs for QGraphicsAnchor

9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Jani Hautakangas [Tue, 29 Sep 2009 10:59:29 +0000 (13:59 +0300)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoStabilize tests
Olivier Goffart [Tue, 29 Sep 2009 10:28:03 +0000 (12:28 +0200)]
Stabilize tests

9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Jani Hautakangas [Tue, 29 Sep 2009 10:58:30 +0000 (13:58 +0300)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoFix spelling error in the demo browser close-multiple-tabs dialog
Tor Arne Vestbø [Tue, 29 Sep 2009 10:52:37 +0000 (12:52 +0200)]
Fix spelling error in the demo browser close-multiple-tabs dialog

9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Jani Hautakangas [Tue, 29 Sep 2009 10:49:57 +0000 (13:49 +0300)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoRe-apply change e20c832098d98076a0f988ce01b53586e370d272 by Simon Hausmann
Simon Hausmann [Mon, 28 Sep 2009 19:14:16 +0000 (21:14 +0200)]
Re-apply change e20c832098d98076a0f988ce01b53586e370d272 by Simon Hausmann

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

9 years agoRe-apply change e433f472a765d738238a6b380060ce15c4910148 by Jedrzej Nowacki
Jedrzej Nowacki [Mon, 28 Sep 2009 15:27:19 +0000 (17:27 +0200)]
Re-apply change e433f472a765d738238a6b380060ce15c4910148 by Jedrzej Nowacki

Fix QWebHistory autotest crashes
https://bugs.webkit.org/show_bug.cgi?id=29803

Reviewed-by: Simon Hausmann
Cherry-picked-by: Simon Hausmann
9 years agoUpdated WebKit from /home/joce/dev/qtwebkit/ to qtwebkit-4.6-snapshot-29092009-2...
Jocelyn Turcotte [Tue, 29 Sep 2009 10:36:30 +0000 (12:36 +0200)]
Updated WebKit from /home/joce/dev/qtwebkit/ to 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.

9 years agoSoftkey fixes to QMenu tests.
Jani Hautakangas [Tue, 29 Sep 2009 10:41:33 +0000 (13:41 +0300)]
Softkey fixes to QMenu tests.

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
9 years agoUpdate mkdist-webkit script to use latest tag
Jocelyn Turcotte [Tue, 29 Sep 2009 10:33:06 +0000 (12:33 +0200)]
Update mkdist-webkit script to use latest tag

Reviewed-by: Simon Hausmann
9 years agoEnable QtScript by default
Kent Hansen [Tue, 29 Sep 2009 10:30:38 +0000 (12:30 +0200)]
Enable QtScript by default

JavaScriptCore should build on Tier 1 and Tier 2 platforms now.

Reviewed-by: Simon Hausmann
9 years agoMinor fixes in webkit's documentation
Pierre Rossi [Tue, 29 Sep 2009 08:46:39 +0000 (10:46 +0200)]
Minor fixes in webkit's documentation

Reviewed-by: Jedrzej Nowacki
9 years agoMaking tst_qParallelAnimationGroup work for Symbian
mread [Tue, 29 Sep 2009 10:08:58 +0000 (11:08 +0100)]
Making tst_qParallelAnimationGroup work for Symbian

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
9 years agoDo synchronous processing of events in state machine if possible
Kent Hansen [Tue, 29 Sep 2009 09:59:01 +0000 (11:59 +0200)]
Do synchronous processing of events in state machine if possible

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
9 years agodoc: Describe the semantics of targetless state machine transitions
Kent Hansen [Mon, 28 Sep 2009 17:08:00 +0000 (19:08 +0200)]
doc: Describe the semantics of targetless state machine transitions

9 years agoQScript: fix the way the js stack is advanced.
Olivier Goffart [Tue, 29 Sep 2009 07:27:40 +0000 (09:27 +0200)]
QScript: fix the way the js stack is advanced.

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
9 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Jason McDonald [Tue, 29 Sep 2009 09:18:41 +0000 (19:18 +1000)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

9 years agoRemove mentions of QtSW.
Jason McDonald [Tue, 29 Sep 2009 09:13:30 +0000 (19:13 +1000)]
Remove mentions of QtSW.

Reviewed-by: Trust Me
9 years agoAdd the -testability option to Qt applications.
Petri Kiiskinen [Tue, 29 Sep 2009 09:06:40 +0000 (11:06 +0200)]
Add the -testability option to Qt applications.

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>
9 years agoRemove mention of QtSW.
Jason McDonald [Tue, 29 Sep 2009 09:07:01 +0000 (19:07 +1000)]
Remove mention of QtSW.

Reviewed-by: Trust Me
9 years agoQGraphicsItem: cached embedded widget item is not repainted when widget is updated
Andreas Aardal Hanssen [Mon, 28 Sep 2009 14:13:19 +0000 (16:13 +0200)]
QGraphicsItem: cached embedded widget item is not repainted when widget is 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
9 years agoHTTP backend: store the date header in the cached resource
Peter Hartmann [Tue, 29 Sep 2009 08:38:33 +0000 (10:38 +0200)]
HTTP backend: store the date header in the cached resource

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
9 years agoMac: Fix build failure on tiger
Richard Moe Gustavsen [Tue, 29 Sep 2009 08:48:15 +0000 (10:48 +0200)]
Mac: Fix build failure on tiger

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

9 years agoDoc: Snow Leopard is supported as a Tier 2 platform.
Volker Hilsheimer [Tue, 29 Sep 2009 08:38:47 +0000 (10:38 +0200)]
Doc: Snow Leopard is supported as a Tier 2 platform.

Discussed in the program team - adding it as a Tier 1 platform is too
ambitious.

9 years agofix solaris build
Oswald Buddenhagen [Tue, 29 Sep 2009 08:36:03 +0000 (10:36 +0200)]
fix solaris build

"A class with a reference member must have a user-defined constructor."

9 years agoUpdate docs for softkeys to match new API and implementation.
Jason Barron [Tue, 29 Sep 2009 08:20:22 +0000 (10:20 +0200)]
Update docs for softkeys to match new API and implementation.

These docs were outdated and referred to API that no longer exists so
we refresh them with some updated info.

Reviewed-by: Sami Merila
9 years agoFix a bug in QPixmapCache when the cache is trimmed by QCache.
Alexis Menard [Tue, 29 Sep 2009 07:50:07 +0000 (09:50 +0200)]
Fix a bug in QPixmapCache when the cache is trimmed by QCache.

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

9 years agoUse glXGetProcAddress to resolve glx extensions
Tom Cooksey [Sun, 23 Aug 2009 10:08:20 +0000 (12:08 +0200)]
Use glXGetProcAddress to resolve glx extensions

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
9 years agoI18N: Add new module, fix spelling glitch.
Friedemann Kleint [Tue, 29 Sep 2009 07:39:13 +0000 (09:39 +0200)]
I18N: Add new module, fix spelling glitch.

9 years agoRevert the new QFSEventsFileSystemWatcherEngine on Mac for now.
Alexis Menard [Tue, 29 Sep 2009 07:11:37 +0000 (09:11 +0200)]
Revert the new QFSEventsFileSystemWatcherEngine on Mac for now.

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

9 years agoAdd a more proper shutdown sequence for Symbian applications.
Jason Barron [Mon, 28 Sep 2009 15:52:22 +0000 (17:52 +0200)]
Add a more proper shutdown sequence for Symbian applications.

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
9 years agoMerge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Miikka Heikkinen [Tue, 29 Sep 2009 06:49:11 +0000 (09:49 +0300)]
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6

9 years agoFixed: Fluidlauncher doesn't react to keys.
Miikka Heikkinen [Tue, 29 Sep 2009 06:37:52 +0000 (09:37 +0300)]
Fixed: Fluidlauncher doesn't react to keys.

Some recent changes had made Fluidlauncher unresponsive to keyboard
input. It appears none of the Fluidlauncher widgets got keyboard
focus by default, so set the focus explicitly to proper widget.

Task-number: QT-2214
Reviewed-by: Alessandro Portale
9 years agoFix some docs to follow the Qt style. (remove asterisks, proper indenting)
Jan-Arve Sæther [Tue, 29 Sep 2009 06:27:49 +0000 (08:27 +0200)]
Fix some docs to follow the Qt style. (remove asterisks, proper indenting)

Note that this does *not* change the content of the docs.

9 years agoDont generate public docs for QSimplex.
Jan-Arve Sæther [Tue, 29 Sep 2009 06:21:39 +0000 (08:21 +0200)]
Dont generate public docs for QSimplex.

9 years agoImprove error reporting when qdoc cannot open a source file.
Jason McDonald [Tue, 29 Sep 2009 06:16:55 +0000 (16:16 +1000)]
Improve error reporting when qdoc cannot open a source file.

Make the user's life easier by including the reason for the error in
the failure message.

Reviewed-by: Trust Me
9 years agoFix qdoc error.
Jason McDonald [Tue, 29 Sep 2009 06:14:16 +0000 (16:14 +1000)]
Fix qdoc error.

Reviewed-by: Trust Me
9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Jason McDonald [Tue, 29 Sep 2009 06:11:20 +0000 (16:11 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoAssistant, Designer, Lingist and QMake manuals weren't generated.
Jason McDonald [Tue, 29 Sep 2009 06:09:03 +0000 (16:09 +1000)]
Assistant, Designer, Lingist and QMake manuals weren't generated.

qdoc3 warns when it doesn't find doc source files that are listed in the
.qdocconf file, but it doesn't error out.  Thus the manuals haven't been
generated since the 4.6 doc reorganization, but the failure has been
silent.

Reviewed-by: Trust Me
9 years agoTidy changes file for 4.5.3.
Jason McDonald [Tue, 29 Sep 2009 04:58:04 +0000 (14:58 +1000)]
Tidy changes file for 4.5.3.

Reviewed-by: Trust Me
9 years agoFixes failing autotest.
Bill King [Tue, 29 Sep 2009 03:46:10 +0000 (13:46 +1000)]
Fixes failing autotest.

9 years agoFix a alpha issue with RGB32 and DirectFB
Anders Bakken [Tue, 29 Sep 2009 01:37:25 +0000 (18:37 -0700)]
Fix a alpha issue with RGB32 and DirectFB

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>
9 years agoFixes compile
Bill King [Tue, 29 Sep 2009 00:09:30 +0000 (10:09 +1000)]
Fixes compile

9 years agodoc: add some more \since 4.6 tags
Volker Hilsheimer [Mon, 28 Sep 2009 22:24:01 +0000 (00:24 +0200)]
doc: add some more \since 4.6 tags

9 years agoQWheelEvent not working on Cocoa 64Bit
Prasanth Ullattil [Mon, 28 Sep 2009 20:49:12 +0000 (22:49 +0200)]
QWheelEvent not working on Cocoa 64Bit

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
9 years agoUpdate changes file for 4.5.3 for DirectFB
Anders Bakken [Fri, 25 Sep 2009 16:25:22 +0000 (09:25 -0700)]
Update changes file for 4.5.3 for DirectFB

Reviewed-by: TrustMe
9 years agoFix Freemantle build of JSC/WebKit.
Simon Hausmann [Mon, 28 Sep 2009 19:14:16 +0000 (21:14 +0200)]
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

9 years agoAdded my 4.5.3 changes to changelog.
Samuel Rødal [Mon, 28 Sep 2009 17:26:47 +0000 (19:26 +0200)]
Added my 4.5.3 changes to changelog.

9 years agoFix to Q3PopupMenu autotest on windows
Thierry Bastian [Mon, 28 Sep 2009 16:11:39 +0000 (18:11 +0200)]
Fix to Q3PopupMenu autotest on windows

100ms is not enough because there is a delay for the popup.

9 years agoQScript: Add test for getting backtrace of recursive functions
Olivier Goffart [Mon, 28 Sep 2009 15:21:13 +0000 (17:21 +0200)]
QScript: Add test for getting backtrace of recursive functions

9 years agoQScript: Fix strange bugs and crashes.
Olivier Goffart [Mon, 28 Sep 2009 14:28:36 +0000 (16:28 +0200)]
QScript: Fix strange bugs and crashes.

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
9 years agofixed a typo in the doc.
Denis Dzyubenko [Mon, 28 Sep 2009 15:28:57 +0000 (17:28 +0200)]
fixed a typo in the doc.

Reviewed-by: trustme
9 years agoFix QWebHistory autotest crashes
Jedrzej Nowacki [Mon, 28 Sep 2009 15:27:19 +0000 (17:27 +0200)]
Fix QWebHistory autotest crashes

https://bugs.webkit.org/show_bug.cgi?id=29803

Reviewed-by: Simon Hausmann
Cherry-picked-by: Simon Hausmann
9 years agoFixed a crash in the boxes demo when using -graphicssystem opengl.
Trond Kjernaasen [Mon, 28 Sep 2009 14:52:04 +0000 (16:52 +0200)]
Fixed a crash in the boxes demo when using -graphicssystem opengl.

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
9 years agoRemoved unused line in QAbstractAnimation
Leonardo Sobral Cunha [Mon, 28 Sep 2009 14:50:35 +0000 (16:50 +0200)]
Removed unused line in QAbstractAnimation

This line was a left-over from commit 86f5a63b018441

Reviewed-by: thierry
9 years agogetMacPreferredLanguageAndCountry: Fix possible crash
Markus Goetz [Mon, 28 Sep 2009 14:32:32 +0000 (16:32 +0200)]
getMacPreferredLanguageAndCountry: Fix possible crash

getMacPreferredLanguageAndCountry can crash when called e.g. as a
root user because CFPreferencesCopyValue will return 0.

Reviewed-by: denis
Task-number: 261664

9 years agoFixing the autotest for other platforms, hopefully...
João Abecasis [Mon, 28 Sep 2009 13:48:48 +0000 (15:48 +0200)]
Fixing the autotest for other platforms, hopefully...

Reviewed-by: Joerg Bornemann
9 years agoRefactor of timer verification in QAbstractAnimation
Leonardo Sobral Cunha [Mon, 28 Sep 2009 14:21:46 +0000 (16:21 +0200)]
Refactor of timer verification in QAbstractAnimation

Reviewed-by: thierry
9 years agoCorrect the formextractor which was using removed QWebElement API
Jocelyn Turcotte [Mon, 28 Sep 2009 14:12:40 +0000 (16:12 +0200)]
Correct the formextractor which was using removed QWebElement API

Reviewed-by: Kent Hansen
9 years agoFixed compile failure when running make with large -j.
Rohan McGovern [Mon, 28 Sep 2009 13:54:04 +0000 (23:54 +1000)]
Fixed compile failure when running make with large -j.

  `ld: library not found for -lQtOpenGL'

... in opengl graphicssystem.

Must build QtOpenGL before the GL graphicssystem plugin.

Reviewed-by: brad
9 years agoAnimations: updateCurrentTime now receives the currentTime as paramater
Thierry Bastian [Mon, 28 Sep 2009 13:52:32 +0000 (15:52 +0200)]
Animations: updateCurrentTime now receives the currentTime as paramater

Reviewed-by: Leo
9 years agotst_qnetworkcookiejar: Backported 4.6 changes
Markus Goetz [Mon, 28 Sep 2009 13:33:55 +0000 (15:33 +0200)]
tst_qnetworkcookiejar: Backported 4.6 changes

Reviewed-by: TrustMe
9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Sami Merilä [Mon, 28 Sep 2009 13:29:13 +0000 (16:29 +0300)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoFix tst_QTextDocument::cursorPositionChangedOnSetText
mae [Mon, 28 Sep 2009 13:09:29 +0000 (15:09 +0200)]
Fix tst_QTextDocument::cursorPositionChangedOnSetText

The test was introduced to make sure that the cursor position changed signal
was not emitted excessively on setPlainText or on setHtml. The original
fix however still included one superfluous emission for a temporary
QTextCursor object. This was fixed by change 930ba91ec1e630, this change
adjusts the auto test accordingly.

Reviewed-by: Simon Hausmann
9 years agoTriggering softkey action for disbled widget causes a crash.
Sami Merilä [Mon, 28 Sep 2009 13:24:48 +0000 (16:24 +0300)]
Triggering softkey action for disbled widget causes a crash.

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
9 years agoImpossible to interact with the year on QCalendarWidget on GraphicsView
Thierry Bastian [Mon, 28 Sep 2009 13:13:57 +0000 (15:13 +0200)]
Impossible to interact with the year on QCalendarWidget on GraphicsView

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
9 years agoMerge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Janne Anttila [Mon, 28 Sep 2009 13:14:00 +0000 (16:14 +0300)]
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6

9 years agoFixed QMessageBox::updateSize test case for S60.
Janne Anttila [Mon, 28 Sep 2009 13:07:58 +0000 (16:07 +0300)]
Fixed QMessageBox::updateSize test case for S60.

In S60 message boxes are always in portrait mode located on the bottom
of screen and they occypy the whole sreen width. In addition
messageboxes in S60 does not have their own buttons, but the buttons are
located in system softkey area. That's why adding standard buttons for
message box in S60 does not change the dialog size.

Reviewed-by: Sami Merila
9 years agoMac: build issue (autotest stalls build)
Richard Moe Gustavsen [Mon, 28 Sep 2009 13:07:24 +0000 (15:07 +0200)]
Mac: build issue (autotest stalls build)

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
9 years agoMerge branch '4.6' of git@scm.dev-nokia.troll.no:qt/qt into 4.6
Andreas Aardal Hanssen [Mon, 28 Sep 2009 13:01:30 +0000 (15:01 +0200)]
Merge branch '4.6' of git@scm.dev-nokia.troll.no:qt/qt into 4.6

9 years agoMerge commit 'origin/4.5' into 4.6
Andreas Aardal Hanssen [Mon, 28 Sep 2009 13:00:54 +0000 (15:00 +0200)]
Merge commit 'origin/4.5' into 4.6

Reviewed-by: Joao
Conflicts:
src/gui/graphicsview/qgraphicsview.cpp
src/gui/widgets/qspinbox.cpp
tests/auto/qgraphicsview/tst_qgraphicsview.cpp

9 years agoMac: backport efd84105355 to silence visibility warnings
Richard Moe Gustavsen [Mon, 28 Sep 2009 12:56:03 +0000 (14:56 +0200)]
Mac: backport efd84105355 to silence visibility warnings

Make sure that we build objective c files with visibility
hidden as default

Reviewed-by: prasanth
9 years agoFix qdoc error.
Jason McDonald [Mon, 28 Sep 2009 12:50:06 +0000 (22:50 +1000)]
Fix qdoc error.

Reviewed-by: Trust Me
9 years agoFix qdoc error
Jason McDonald [Mon, 28 Sep 2009 12:46:19 +0000 (22:46 +1000)]
Fix qdoc error

Reviewed-by: Trust Me
9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Jason McDonald [Mon, 28 Sep 2009 12:44:45 +0000 (22:44 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoFix qdoc errors
Jason McDonald [Mon, 28 Sep 2009 12:44:16 +0000 (22:44 +1000)]
Fix qdoc errors

Reviewed-by: Trust Me
9 years agoUpdated JavaScriptCore from /home/khansen/dev/qtwebkit to jsc-for-qtscript-4.6-stagin...
Kent Hansen [Mon, 28 Sep 2009 12:34:18 +0000 (14:34 +0200)]
Updated JavaScriptCore from /home/khansen/dev/qtwebkit to jsc-for-qtscript-4.6-staging-28092009 ( b98dec961e9389ddd5e10d7c4086de9a297cb984 )

9 years agoadd a test for custom QEventTransition
Kent Hansen [Mon, 28 Sep 2009 12:26:37 +0000 (14:26 +0200)]
add a test for custom QEventTransition

Test that the event has the right attributes.
Also improve the custom QSignalTransition test to cover all attributes.

9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Jason McDonald [Mon, 28 Sep 2009 12:29:19 +0000 (22:29 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoQGraphicsItem with parent flag ItemClipsChildrenToShape not visible
Andreas Aardal Hanssen [Mon, 28 Sep 2009 12:24:38 +0000 (14:24 +0200)]
QGraphicsItem with parent flag ItemClipsChildrenToShape not visible

Regression against Qt 4.4. Children of items with ItemClipsChildrenToShape
would only be discovered if the view's expose region contained the outer
bounding rect of all items, _if_ there was at least one item in the
scene that enabled ItemIgnoresTransformations.

The reason for this bug is that the presence of an untransformable item
causes the item lookups to go through a different path
(QGraphicsViewPrivate::itemsInArea()). This function had the bug that it
didn't correctly discover children of clip-items. Because of this, in
the provided test case you could "work around" the bug by either removing
the clip flag, or the transformation flag.

Task-number: QTBUG-4151
Reviewed-by: Alexis
9 years agoFix qdoc error.
Jason McDonald [Mon, 28 Sep 2009 12:28:49 +0000 (22:28 +1000)]
Fix qdoc error.

Reviewed-by: Trust Me
9 years agoDocument that scope unix is true for Symbian platform.
Frans Englich [Mon, 28 Sep 2009 11:40:13 +0000 (13:40 +0200)]
Document that scope unix is true for Symbian platform.

Task-number: QTBUG-2989
Reviewed-by: Jason Barron
9 years agoMake the test pass on both large and small screens.
Paul Olav Tvete [Mon, 28 Sep 2009 11:56:24 +0000 (13:56 +0200)]
Make the test pass on both large and small screens.

Reviewed-by: Joerg
9 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Janne Koskinen [Mon, 28 Sep 2009 11:58:22 +0000 (14:58 +0300)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoWebcore build break on Symbian fix
Janne Koskinen [Mon, 28 Sep 2009 11:52:38 +0000 (14:52 +0300)]
Webcore build break on Symbian fix

Prepending adds epoc32\include too early into generated
systeminclude path search order causing Webcore build
to break due to wrong animation.h header getting included.

Reviewed-by: Jason Barron
9 years agoDeep copy QImage based on non-owned data so we can safely store them
Gunnar Sletta [Mon, 28 Sep 2009 11:25:41 +0000 (13:25 +0200)]
Deep copy QImage based on non-owned data so we can safely store them

Reviewed-by: Samuel