9 years agoCompile when one includes <QtGui/QtGui> without putting explicitly all Qt subdirs... 4.6
Olivier Goffart [Wed, 30 Sep 2009 09:26:04 +0000 (11:26 +0200)]
Compile when one includes <QtGui/QtGui> without putting explicitly all Qt subdirs in the include path

9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Sami Merilä [Wed, 30 Sep 2009 09:24:26 +0000 (12:24 +0300)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoFix tst_QFontDialog::task256466_wrongStyle() autotest failure in Cocoa.
Prasanth Ullattil [Wed, 30 Sep 2009 08:22:29 +0000 (10:22 +0200)]
Fix tst_QFontDialog::task256466_wrongStyle() autotest failure in Cocoa.

Some fonts contain only styles other than Normal (or Regualr). If we try
to retrive the font sizes for such fonts by passing an empty style
string, the QFontDatabase will return a null list. This was causing the
autotest to fail. This patch will make sure that a style is always
selected in the QFontDialog.

Reviewed-by: Olivier
9 years agoStabilize and speedup QGraphicsItem and QGraphicsView and QGraphicsProxyWidget test
Olivier Goffart [Wed, 30 Sep 2009 08:38:09 +0000 (10:38 +0200)]
Stabilize and speedup QGraphicsItem and QGraphicsView and QGraphicsProxyWidget test

9 years agoFixed warning in public header:
Olivier Goffart [Tue, 29 Sep 2009 16:18:26 +0000 (18:18 +0200)]
Fixed warning in public header:

qcommonstyle.h:87: warning: virtual void QCommonStyle::polish(QPalette&) was hidden
qs60style.h:77: warning:   by QS60Style::polish

Reviewed-by: Jeremy
9 years agoStabilize listview test
Olivier Goffart [Tue, 29 Sep 2009 15:15:49 +0000 (17:15 +0200)]
Stabilize listview test

9 years agoFtp example application crashes (due to keypad navigation)
Sami Merilä [Wed, 30 Sep 2009 09:16:56 +0000 (12:16 +0300)]
Ftp example application crashes (due to keypad navigation)

Keypad navigation tries to calculate the minimal distance of next
widget to the direction of pressed navigation key. This calculation
in QWidgetPrivate::widgetInNavigationDirection dies not take into
account that some widgets might have focusProxy setup.

In the reported case, ignoring focus proxy means that QDialogButtonBox
gets the focus and it hands it over to first button in its tab order.
Unfortunately, this button is disabled 'Download' button. Now, when
Select key is pressed, button action is triggered causing a crash.

Solution is to skip widgets that have focus proxies
in widgetInNavigationDirection.

Task-number: QT-2177
Reviewed-by: Alessandro Portale
9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Jani Hautakangas [Wed, 30 Sep 2009 08:44:53 +0000 (11:44 +0300)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoSymbian specific fixes to QComboBox
Jani Hautakangas [Wed, 30 Sep 2009 08:37:58 +0000 (11:37 +0300)]
Symbian specific fixes to QComboBox

Fixes QComboBox edit field geometry in s60style
Fixes softkey crash when setting a custom itemview to QComboBox
Fixes Symbian keyboard input interval in tst_QComboBox::virtualAutocompletion()

Reviewed-by: Sami Merila
9 years agoremove two expected failures
Kent Hansen [Wed, 30 Sep 2009 08:37:29 +0000 (10:37 +0200)]
remove two expected failures

The tests now pass after the last update of src/3rdparty/javascriptcore.

9 years agoUpdated JavaScriptCore from /home/khansen/dev/qtwebkit to jsc-for-qtscript-4.6-stagin...
Kent Hansen [Wed, 30 Sep 2009 08:33:01 +0000 (10:33 +0200)]
Updated JavaScriptCore from /home/khansen/dev/qtwebkit to jsc-for-qtscript-4.6-staging-30092009 ( e8f42cf0203bee0ba89a05e0e773d713782129b4 )

9 years agoFix linking on windows, building qt in namespace
Jarek Kobus [Wed, 30 Sep 2009 08:35:59 +0000 (10:35 +0200)]
Fix linking on windows, building qt in namespace

RevBy: Thiago Macieira <thiago.macieira@trolltech.com>

9 years agoFix the sub-attaq menu (new game and quit).
Alexis Menard [Wed, 30 Sep 2009 08:24:02 +0000 (10:24 +0200)]
Fix the sub-attaq menu (new game and quit).

Now QStateMachine can be a child of a QState but here in sub-attaq
the code was not design for that so the code breaks.


9 years agofix string builder for QT_NO_CAST_FROM_ASCII on Windows
hjk [Tue, 29 Sep 2009 09:49:53 +0000 (11:49 +0200)]
fix string builder for QT_NO_CAST_FROM_ASCII on Windows

Reviewed-by: thiago
9 years agoMerge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Janne Anttila [Wed, 30 Sep 2009 07:32:08 +0000 (10:32 +0300)]
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6

9 years agoAdded sql driver deployment for qsqldriver autotest in Symbian.
Janne Anttila [Wed, 30 Sep 2009 07:30:29 +0000 (10:30 +0300)]
Added sql driver deployment for qsqldriver autotest in Symbian.

The sqlite driver is required to run this autotest, and using cetest
requires that all plugins are deployed with deployment statements.

Reviewed-by: TrustMe
9 years agoFixed some S60 installation documentation issues.
Miikka Heikkinen [Wed, 30 Sep 2009 07:27:34 +0000 (10:27 +0300)]
Fixed some S60 installation documentation issues.

Task-number: QT-2204
Reviewed-by: Janne Anttila
9 years agoMerge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Miikka Heikkinen [Wed, 30 Sep 2009 06:37:33 +0000 (09:37 +0300)]
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6

9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Kurt Korbatits [Wed, 30 Sep 2009 04:57:14 +0000 (14:57 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoFixed error in notify() signal and totalTime() in QAudioInput and
Kurt Korbatits [Wed, 30 Sep 2009 04:53:37 +0000 (14:53 +1000)]
Fixed error in notify() signal and totalTime() in QAudioInput and
-The notify() signal was not firing the correct number of times.
-The totalTime() on wince was incorrect (unit test).

Reviewed-by:Justin McPherson

9 years agoFix a memory leak of EGLSurface's in QGLContext
Rhys Weatherley [Wed, 30 Sep 2009 04:34:21 +0000 (14:34 +1000)]
Fix a memory leak of EGLSurface's in QGLContext

Reviewed-by: Julian de Bhal
9 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Bill King [Wed, 30 Sep 2009 00:41:59 +0000 (10:41 +1000)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6

9 years ago(ODBC) Better fix for readonly result set
Bill King [Wed, 30 Sep 2009 00:38:49 +0000 (10:38 +1000)]
(ODBC) Better fix for readonly result set

This fixes an issue where a forwardonly result set would force
forwardonly on the next query, despite what the user had explicitly set.

Reviewed-by: Justin McPherson
9 years agoConvert OpenGL convolution filter to OpenGL2 paint engine
Rhys Weatherley [Wed, 30 Sep 2009 00:27:01 +0000 (10:27 +1000)]
Convert OpenGL convolution filter to OpenGL2 paint engine

The convolution filter was still using the old-style OpenGL1
method for interfacing to the paint engine.

Reviewed-by: trustme
9 years agoMake QPF's implementation of alphaMapForGlyph() consistent.
Rhys Weatherley [Tue, 29 Sep 2009 22:37:09 +0000 (08:37 +1000)]
Make QPF's implementation of alphaMapForGlyph() consistent.

The QPF implementation of alphaMapForGlyph() was returning
color values of RGBA = (a, a, a, 255) instead of (0, 0, 0, a),
which was inconsistent with all the other font engines.

This inconsistency caused some QPF-specific workarounds in the
OpenGL and OpenVG paint engines.  This change removes the workarounds
and makes QPF generate the right colors from the start.  Paint
engines that ignore the color table or which don't use the
alphaMapForGlyph() function (e.g. raster) are not affected.

Reviewed-by: Paul
9 years agoChanged internal tr()'s to be QString::fromLatin1() in alsa builtin.
Kurt Korbatits [Tue, 29 Sep 2009 22:05:28 +0000 (08:05 +1000)]
Changed internal tr()'s to be QString::fromLatin1() in alsa builtin.
Internal strings don't need translations, changed to use fromLatin1


9 years agoShorter button texts.
Alessandro Portale [Tue, 29 Sep 2009 20:04:47 +0000 (22:04 +0200)]
Shorter button texts.

They do not fit into landscape smallscreen.

Reviewed-By: TrustMe
9 years agoAdded standard dialogs to keypad navigation test.
Alessandro Portale [Tue, 29 Sep 2009 19:53:17 +0000 (21:53 +0200)]
Added standard dialogs to keypad navigation test.

QFileDialog::getOpenFileName(), QFileDialog::getSaveFileName(),
QFileDialog::getExistingDirectory(), etc...

Reviewed-By: TrustMe
9 years agoQString(" => QString::fromLatin1("
Anders Bakken [Tue, 29 Sep 2009 18:11:22 +0000 (11:11 -0700)]
QString(" => QString::fromLatin1("

Prevent qWarning when building with QT_DIRECTFB_WARN_ON_RASTERFALLBACKS

Reviewed-by: Donald Carr <donald.carr@nokia.com>
9 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Espen Riskedal [Tue, 29 Sep 2009 16:40:52 +0000 (18:40 +0200)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

9 years agoFix compile of anomaly for S60 3.1 SDK
Espen Riskedal [Tue, 29 Sep 2009 16:38:42 +0000 (18:38 +0200)]
Fix compile of anomaly for S60 3.1 SDK

It seems that for 3.1 we need to explicitly link with insock.dll as well

Reviewed-by: Aleksandar Babic
9 years agoSkipping two test cases due to Open C bug.
Aleksandar Sasha Babic [Tue, 29 Sep 2009 16:28:02 +0000 (18:28 +0200)]
Skipping two test cases due to Open C bug.

In Open C 1.6 release there is a bug in mmap(...) function.
The bug has been reported.

9 years agoRestoring cases that have been lost.
Aleksandar Sasha Babic [Tue, 29 Sep 2009 07:08:44 +0000 (09:08 +0200)]
Restoring cases that have been lost.

Due to bad merge some of the cases were removed.
They have been restored now.

Some adaptation for Symbian platform was needed as well.
We must not forget that local socket implementation is
based on RSocket, and therefore similar to having TCP_SOCKET
as basckend. So, in soe places it we had to give some time
for events to propagate by introducing qTest::wait()

9 years agoAdds QUrl::fromUserInput, gathered from QWebView::guessUrlFromString.
Jocelyn Turcotte [Tue, 29 Sep 2009 16:00:40 +0000 (18:00 +0200)]
Adds QUrl::fromUserInput, gathered from QWebView::guessUrlFromString.

Reviewed-by: Thiago Macieira
9 years agomark test as expected failure only when JIT is enabled
Kent Hansen [Tue, 29 Sep 2009 15:38:08 +0000 (17:38 +0200)]
mark test as expected failure only when JIT is enabled

With the interpreter it works.

9 years agoAdd Slovenian translation
Jure Repinc [Tue, 29 Sep 2009 15:22:21 +0000 (17:22 +0200)]
Add Slovenian translation

Merge-request: 1320
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoUsed the correct placeholder for the second argument
Jure Repinc [Tue, 29 Sep 2009 15:02:27 +0000 (17:02 +0200)]
Used the correct placeholder for the second argument

Merge-request: 1320
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoThe text fit now in the screen.
Alexis Menard [Tue, 29 Sep 2009 15:14:35 +0000 (17:14 +0200)]
The text fit now in the screen.


9 years agoMerge commit 'origin/4.5' into 4.6
Oswald Buddenhagen [Tue, 29 Sep 2009 14:57:57 +0000 (16:57 +0200)]
Merge commit 'origin/4.5' into 4.6


9 years agominor fixes in Russian translations
Ritt Konstantin [Tue, 29 Sep 2009 14:55:26 +0000 (16:55 +0200)]
minor fixes in Russian translations

Merge-request: 1611
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoMerge commit 'qt/4.6' into mmfphonon
Frans Englich [Tue, 29 Sep 2009 14:48:54 +0000 (16:48 +0200)]
Merge commit 'qt/4.6' into mmfphonon

9 years agoMy changelog for 4.5.3.
Alexis Menard [Tue, 29 Sep 2009 14:46:24 +0000 (16:46 +0200)]
My changelog for 4.5.3.

9 years agoMake sure delayed events are cancelled when a state machine halts
Kent Hansen [Tue, 29 Sep 2009 14:40:48 +0000 (16:40 +0200)]
Make sure delayed events are cancelled when a state machine halts

Otherwise the events might creep into the event loop if the state
machine is restarted.

Reviewed-by: Eskil Abrahamsen Blomfeldt
9 years agoRemove "inline" keyword from unused constructors
Harald Fernengel [Tue, 29 Sep 2009 14:41:48 +0000 (16:41 +0200)]
Remove "inline" keyword from unused constructors

Found during API review, make the private safety constructors follow the
pattern of our Q_DISABLE_COPY macro.

Reviewed-by: Robert Griebl
9 years agoRebuild configure.exe
Kent Hansen [Tue, 29 Sep 2009 23:28:29 +0000 (16:28 -0700)]
Rebuild configure.exe

Bring it up-to-date with commit 950f80620b56e9ed277240dc16087f3e4b53cc4a.

9 years agoMerge commit 'qt/4.6' into mmfphonon
Frans Englich [Tue, 29 Sep 2009 14:29:20 +0000 (16:29 +0200)]
Merge commit 'qt/4.6' into mmfphonon

9 years agoFix tr-Errors/remove QObject::tr(), mainly in ScriptTools
Friedemann Kleint [Tue, 29 Sep 2009 13:43:02 +0000 (15:43 +0200)]
Fix tr-Errors/remove QObject::tr(), mainly in ScriptTools

Note: Those messages are to be translated in Qt 4.6
for the first time.
Reviewed-by: Kent Hansen <khansen@trolltech.com>
9 years agoIntroduce state machine event priority, make it possible to cancel events
Kent Hansen [Tue, 29 Sep 2009 13:04:09 +0000 (15:04 +0200)]
Introduce state machine event priority, make it possible to cancel events

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
9 years agoFix bug with posting events from HandleCommandL on Symbian.
Jason Barron [Tue, 29 Sep 2009 10:42:09 +0000 (12:42 +0200)]
Fix bug with posting events from HandleCommandL on Symbian.

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

Reviewed-by: axis
9 years agoFix auto-test failure for QFileSystemModel::sort
Alexis Menard [Tue, 29 Sep 2009 12:51:06 +0000 (14:51 +0200)]
Fix auto-test failure for QFileSystemModel::sort

This test was failing on the farm because the rootPath for the model
was invalid. QDir::rootPath on Windows return C:\ but in the farm
the temp directory is in E:\ therefore the sort was only triggered on C:\
and this explain the failure.

I also make comparaisons a bit more robust.


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


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
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 agoMerge commit 'qt/4.6' into mmfphonon
Frans Englich [Tue, 29 Sep 2009 10:56:05 +0000 (12:56 +0200)]
Merge commit 'qt/4.6' into mmfphonon

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

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:

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

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.

        * Api/qwebelement.cpp:
        * Api/qwebelement.h:
        * tests/qwebelement/tst_qwebelement.cpp:

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

        * 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.

        * Api/qwebelement.cpp:
        * Api/qwebelement.h:
        Methods removed:
        - QWebElement::callFunction
        - QWebElement::functions
        - QWebElement::scriptableProperty
        - QWebElement::setScriptableProperty
        - QWebElement::scriptableProperties
        * tests/qwebelement/tst_qwebelement.cpp:

2009-09-25  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>

        Reviewed by Simon Hausmann.

        [Qt] Rename QWebElement::evaluateScript
        to QWebElement::evaluateJavaScript.

        * Api/qwebelement.cpp:
        * Api/qwebelement.h:
        * tests/qwebelement/tst_qwebelement.cpp:

2009-09-25  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>

        Reviewed by Simon Hausmann.

        [Qt] Update the stypeProperty API of QWebElement.

        * Api/qwebelement.cpp:
        - Merge the stypeProperty and the computedStyleProperty methods
        - Remove the default value for the style resolving enum
        - Rename ResolveRule to StyleResolveStrategy
        - 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:
        * tests/qwebframe/tst_qwebframe.cpp:

2009-09-24  Jon Honeycutt  <jhoneycutt@apple.com>

        Reviewed by Alice Liu.

        * Api/qwebpage.cpp:
        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:


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

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.


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).


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