8 years agoDef files frozen for 4.6.0 RC v4.6.0-rc1
Shane Kearns [Wed, 11 Nov 2009 12:20:07 +0000 (13:20 +0100)]
Def files frozen for 4.6.0 RC

Reviewed-By: Espen Riskedal
Task-Number: QTBUG-4748
(cherry picked from commit 3a492b3bcd3898335dd36b46906a5b9cce5120f3)

8 years agoSwitch on DEF files
Shane Kearns [Tue, 10 Nov 2009 13:28:43 +0000 (14:28 +0100)]
Switch on DEF files

DEF files containing the frozen DLL exports are in use for Symbian OS
builds, except developer builds (configured with -developer-build)

The reason for this exception is that developer builds export additional
private interfaces to allow autotests to inject or monitor the internal
data of a class.

These autotest exports are not part of the API or the binary interface,
so they are excluded from DEF files.

Task-number: QTBUG-4436
Reviewed-by: Jason Barron
(cherry picked from commit 7b997d150c35ece3164d7e2b08701c962e6af1ed)

8 years agoRewind def files to beta
Shane Kearns [Wed, 11 Nov 2009 08:08:55 +0000 (09:08 +0100)]
Rewind def files to beta

Reviewed-By: Espen Riskedal
Task-Number: QTBUG-4748
(cherry picked from commit 9113737e9011b3cc9d69196650fcc11a7253408e)

8 years agoCorrect URL format.
Jason McDonald [Wed, 11 Nov 2009 03:39:27 +0000 (13:39 +1000)]
Correct URL format.

Reviewed-by: Trust Me
8 years agoSort sections in changes file so things are easier to find.
Jason McDonald [Wed, 11 Nov 2009 03:32:45 +0000 (13:32 +1000)]
Sort sections in changes file so things are easier to find.

Reviewed-by: Trust Me
8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Jason McDonald [Wed, 11 Nov 2009 03:20:46 +0000 (13:20 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6


8 years agoFirst pass review of changes file.
Jason McDonald [Wed, 11 Nov 2009 03:16:26 +0000 (13:16 +1000)]
First pass review of changes file.

Cleanup descriptions + reformat to 80 columns.

Reviewed-by: Trust Me
8 years agoDocument changes for Ian Walters.
Rhys Weatherley [Wed, 11 Nov 2009 02:13:50 +0000 (12:13 +1000)]
Document changes for Ian Walters.

8 years agoQWS keymap changes
Robert Griebl [Tue, 10 Nov 2009 22:33:18 +0000 (23:33 +0100)]
QWS keymap changes

Reviewed-by: TrustMe
8 years agoDocumentation: Adding comments to QHoverEvent class
Morten Engvoldsen [Tue, 10 Nov 2009 21:02:21 +0000 (22:02 +0100)]
Documentation: Adding comments to QHoverEvent class
Explaining the difference between hover events and enter/leave/move events
Task-number: QT-1116
Reviewed-by: Bjørn Erik Nilsen
8 years agoexporting QGraphicsEffectSource is required
Daniel Molkentin [Tue, 10 Nov 2009 19:42:56 +0000 (20:42 +0100)]
exporting QGraphicsEffectSource is required

Q3MainWindow and Q3TitleBar depend on it.

Reviewed-By: dt
Reviewed-By: Alessandro Portale
8 years agoqfontcombobox auto test added to tests/auto/auto.pro
Joerg Bornemann [Tue, 10 Nov 2009 17:58:05 +0000 (18:58 +0100)]
qfontcombobox auto test added to tests/auto/auto.pro

Reviewed-by: TrustMe
8 years agoQt covers BC break in Symbian
Alessandro Portale [Tue, 10 Nov 2009 17:08:21 +0000 (18:08 +0100)]
Qt covers BC break in Symbian

Workaround: fntstore.h has an inlined function
'COpenFont* CBitmapFont::OpenFont()' that returns a private data member.
The header will change between minor SDK versions, thus break BC. But
Qt has to build on any SDK version and run on other versions of Symbian
OS. Also Qt does not want to deliver that BC to Qt based apps.

This hack performs the needed pointer arithmetic to get the right
COpenFont* pointer, no matter if the 'Flexible Memory Model' is already
supported or not.

The author is not proud of this commit.

Task-number: QT-2250
Reviewed-by: Iain
Reviewed-by: Shane Kearns
modified:   src/gui/text/qfontdatabase_s60.cpp

8 years agoRemoved unused public Api from QS60Style
Alessandro Portale [Tue, 10 Nov 2009 13:27:24 +0000 (14:27 +0100)]
Removed unused public Api from QS60Style

QS60Style::setStyleProperty() and QS60Style::styleProperty() were
intended as generic property setter/getters, but are not needed

Reviewed-by: Sami Merila
modified:   src/gui/styles/qs60style.cpp
modified:   src/gui/styles/qs60style.h
modified:   src/gui/styles/qs60style_p.h
modified:   src/gui/styles/qs60style_s60.cpp
modified:   src/gui/styles/qs60style_simulated.cpp
modified:   src/s60installs/eabi/QtGuiu.def

8 years agoChangelog update
Jedrzej Nowacki [Tue, 10 Nov 2009 15:47:59 +0000 (17:47 +0200)]
Changelog update

Changelog update contains all major changes in QtWebkit, QtScript and
brief information about the state machine framework.

Reviewed-by: Simon Hausmann
8 years agoRemoved mention of purged graphics effects from the documentation.
Samuel Rødal [Tue, 10 Nov 2009 16:43:03 +0000 (17:43 +0100)]
Removed mention of purged graphics effects from the documentation.

8 years agoAdded some changes to changes-4.6.0.
Samuel Rødal [Tue, 10 Nov 2009 14:54:52 +0000 (15:54 +0100)]
Added some changes to changes-4.6.0.

8 years agolinguist changes
Oswald Buddenhagen [Tue, 10 Nov 2009 16:18:33 +0000 (17:18 +0100)]
linguist changes

8 years agofrench translation of qt_help
Pierre Rossi [Fri, 6 Nov 2009 15:58:15 +0000 (16:58 +0100)]
french translation of qt_help

8 years agoDocument change of qdoc3 binary location.
Daniel Molkentin [Tue, 10 Nov 2009 15:57:47 +0000 (16:57 +0100)]
Document change of qdoc3 binary location.

Reviewed-by: TrustMe
8 years agoDoc: remove graphics for effects that are no longer in scope.
Volker Hilsheimer [Tue, 10 Nov 2009 15:13:48 +0000 (16:13 +0100)]
Doc: remove graphics for effects that are no longer in scope.

8 years agoAdd my changes to the 4.6.0 changelog
Jørgen Lind [Tue, 10 Nov 2009 14:59:31 +0000 (15:59 +0100)]
Add my changes to the 4.6.0 changelog

8 years agoMerge branch 'tools-team/4.6' (early part) into 4.6
Oswald Buddenhagen [Tue, 10 Nov 2009 13:36:53 +0000 (14:36 +0100)]
Merge branch 'tools-team/4.6' (early part) into 4.6


8 years agoMy change
Jarek Kobus [Tue, 10 Nov 2009 13:17:43 +0000 (14:17 +0100)]
My change

8 years agoImprovements to graphics effects API after review round.
Samuel Rødal [Tue, 10 Nov 2009 12:35:42 +0000 (13:35 +0100)]
Improvements to graphics effects API after review round.

* Get rid of QGraphicsEffectSource from the public API, instead add
  convenience functions in QGraphicsEffect. This way we commit to less
  API, and are free to introduce a customizable QGraphicsEffectSource
  in a future release.
* Move PixmapPadMode into QGraphicsEffect and tweak the names of the
  enum values.
* Make QGraphicsBlurEffect::BlurHint into a bit flag, for extensibility.

Reviewed-by: Bjørn Erik Nilsen
8 years agoSome 4.6.0 changes.
Trond Kjernåsen [Tue, 10 Nov 2009 12:04:54 +0000 (13:04 +0100)]
Some 4.6.0 changes.

8 years agoAdd my changes to the 4.6.0 changelog
Leonardo Sobral Cunha [Tue, 10 Nov 2009 12:35:21 +0000 (13:35 +0100)]
Add my changes to the 4.6.0 changelog

8 years agoBT: JavaScriptCore makes applications crash on leopard
Richard Moe Gustavsen [Tue, 10 Nov 2009 11:47:44 +0000 (12:47 +0100)]
BT: JavaScriptCore makes applications crash on leopard

JavaScriptCore checks the Mac OS version when building, and uses
symbols only defined in i e.g.snow leopard when building on snow
This means that if you build Qt on snow leopard and later move
it to leopard, applications will crash looking for a missing
symbol (pthread_setname_np in particular).
In Qt, we garuantee that you can run your applications on 10.4 and up
for Carbon, and 10.5 and up for Cocoa. So using compile time checks
this way is not a proper soulution.

Result: In Qt, never use symbols not defined on all supported OS
versions, or at least implement run-time checks.

Rev-By: Simon Hausmann
Rev-By: Tor Arne
Rev-By: MortenS
8 years agoDoc: fix typo in link
Volker Hilsheimer [Tue, 10 Nov 2009 12:22:45 +0000 (13:22 +0100)]
Doc: fix typo in link

8 years agoDesigner: Use toolbar in Signal/Slot editor
Friedemann Kleint [Tue, 10 Nov 2009 12:00:22 +0000 (13:00 +0100)]
Designer: Use toolbar in Signal/Slot editor

as in the other tool windows.
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Task-number: QTCREATORBUG-239

8 years agoChangelog: part 2
Thiago Macieira [Tue, 10 Nov 2009 11:20:54 +0000 (12:20 +0100)]
Changelog: part 2

8 years agofix WebKit build on Windows CE 6
Joerg Bornemann [Mon, 2 Nov 2009 17:41:06 +0000 (18:41 +0100)]
fix WebKit build on Windows CE 6

Again, we have fun with the C time functions on Windows CE.
On Windows CE 5: the functions are declared but not defined.
On Windows CE 6: the functions are neither declared nor defined.

Reviewed-by: Simon Hausmann
8 years agoAdd my changes to the 4.6.0 changelog.
Bradley T. Hughes [Tue, 10 Nov 2009 11:05:07 +0000 (12:05 +0100)]
Add my changes to the 4.6.0 changelog.

8 years agoAdded my changes in Qt 4.6.0 to the change log.
Kim Motoyoshi Kalland [Tue, 10 Nov 2009 10:52:19 +0000 (11:52 +0100)]
Added my changes in Qt 4.6.0 to the change log.

8 years agoAdded my changelog entries.
axis [Tue, 10 Nov 2009 10:40:24 +0000 (11:40 +0100)]
Added my changelog entries.

8 years agoAdd some of my changes to changes-4.6.0
Eskil Abrahamsen Blomfeldt [Tue, 10 Nov 2009 10:12:31 +0000 (11:12 +0100)]
Add some of my changes to changes-4.6.0

Update changes-4.6.0 with relevant changes.

Reviewed-by: Trond


8 years agoAdded my changes to changes-4.6.0.
Kim Motoyoshi Kalland [Tue, 10 Nov 2009 10:07:44 +0000 (11:07 +0100)]
Added my changes to changes-4.6.0.

8 years agoChangelog: My changes.
Thiago Macieira [Tue, 10 Nov 2009 10:01:10 +0000 (11:01 +0100)]
Changelog: My changes.

Also reorganise some things I saw wrong.

8 years agoUpdated changelog with my changes
Benjamin Poulain [Tue, 10 Nov 2009 09:49:59 +0000 (10:49 +0100)]
Updated changelog with my changes

8 years agoRichards changes into the changelog
Richard Moe Gustavsen [Tue, 10 Nov 2009 09:35:17 +0000 (10:35 +0100)]
Richards changes into the changelog

8 years agoRe-apply change e53c26b52c890f242491e0dfed4201313d98f720 by Marius Storm-Olsen
Marius Storm-Olsen [Fri, 6 Nov 2009 08:33:33 +0000 (09:33 +0100)]
Re-apply change e53c26b52c890f242491e0dfed4201313d98f720 by Marius Storm-Olsen

API review: Rename functions numColors(), setNumColors() and numBytes()
QPaintDevice and QImage used the functions numColors(), setNumColors(),
and numBytes(). However, this is not consistent with the rest of the Qt
API which uses *Count() and set*Count().

Removed all usage of these functions inside Qt and test-cases.

Reviewed-by: Andreas Aardal Hanssen
8 years agoRe-apply change 2a9596d85a6c44fe1eba98447ab95ca913f10e29 by Joerg Bornemann
Joerg Bornemann [Tue, 27 Oct 2009 15:19:19 +0000 (16:19 +0100)]
Re-apply change 2a9596d85a6c44fe1eba98447ab95ca913f10e29 by Joerg Bornemann

Re-apply change 62923e7edacf6a1d28accaff70cbdc0176890d62 by Joerg Bornemann
Re-apply change fa1856bcb2eff41dadf0900202dd43f44ddb2343 by Joerg Bornemann
WebKit compile fix for Windows CE
Not sure if this is right fix.
We could also disable PLUGIN_PACKAGE_SIMPLE_HASH.
But this is automatically enabled when NETSCAPE_PLUGIN_API is

Reviewed-by: thartman
8 years agoRe-apply change 914d5847532a85a564a5df4a2bc8bdccb0f91abb by Shane Kearns
Shane Kearns [Wed, 28 Oct 2009 07:52:30 +0000 (08:52 +0100)]
Re-apply change 914d5847532a85a564a5df4a2bc8bdccb0f91abb by Shane Kearns

Re-apply change cadd19cd98b9a6ff7ff8755f7774027400aadb0f by Shane Kearns
Re-apply change 6bc9ef388590b4bfb281d2e1510dc7c3d1837349 by Shane Kearns
Fix to 8e0fbc2caa3edefb78d6667721235b783bc1a850
This version of the fix will set the def file only if defblock is enabled
in qbase.pri. That means that def files don't get turned on for webkit
but not for the whole project (avoids build failures in the continuous
integration system when other teams change the exported symbols)

Reviewed-by: Jason Barron
8 years agoRe-apply change 4f62d29e8ae464c223af5bc08ae219d9b198da63 by David Boddie
David Boddie [Mon, 26 Oct 2009 16:35:17 +0000 (17:35 +0100)]
Re-apply change 4f62d29e8ae464c223af5bc08ae219d9b198da63 by David Boddie

Re-apply change b4be512bffba65bf4577a2b8275d7c38ce5501a1 by David Boddie
Re-apply change 6f36d0aafaccbb9affe8ac1b82c225d985aa7491 by David Boddie
Doc: Added internal or hidden placeholder documentation.
Reviewed-by: Trust Me
To-be-completed-by: QtWebKit developers
8 years agoRe-apply change 0951f86be22633e1ff763de935f9c35a20f8a575 by Thiago Macieira
Thiago Macieira [Mon, 26 Oct 2009 10:04:21 +0000 (11:04 +0100)]
Re-apply change 0951f86be22633e1ff763de935f9c35a20f8a575 by Thiago Macieira

Re-apply change 7293097060383bcb75ee9f3e6a270de3b5bee2dc by Thiago Macieira
Re-apply change e2ef97128c006ac2a5c99c67bb54eebaa3b45720 by Thiago Macieira
Implement symbol hiding for JSC's JIT functions.
These functions are implemented directly in assembly, so they need the
proper directives to enable/disable visibility. On ELF systems, it's
.hidden, whereas on Mach-O systems (Mac) it's .private_extern. On
Windows, it's not necessary since you have to explicitly export. I
also implemented the AIX idiom, though it's unlikely anyone will
implement AIX/POWER JIT.

That leaves only HP-UX on PA-RISC unimplemented, from the platforms
that Qt supports. It's also unlikely that we'll imlpement JIT for it.

Reviewed-by: Kent Hansen
(this commit was 26d0990c66068bfc92a2ec77512b26d4a0c11b02, but was
lost during a WebKit update)

8 years agoRe-apply change 16d98a3fa8e5cf5f41e35e257b8791ce030a4ce1 by Thiago Macieira
Thiago Macieira [Mon, 26 Oct 2009 09:56:57 +0000 (10:56 +0100)]
Re-apply change 16d98a3fa8e5cf5f41e35e257b8791ce030a4ce1 by Thiago Macieira

Re-apply change cbb2efb13cdf05aabc245e2b0157883146cf069d by Thiago Macieira
Re-apply change 3f7a99565de7ed17d7ac4c0a25b02997b094b1a9 by Thiago Macieira
Fix linking of WebKit on Linux 32-bit.
It was missing the ".text" directive at the top of the file,
indicating that code would follow. Without it, the assembler created
"NOTYPE" symbols, which would result in linker errors.

8 years agoRe-apply change 62ed4c43c8c2fe3457de6d7570c2ae4a09a5ecf0 by David Boddie
David Boddie [Fri, 23 Oct 2009 12:51:48 +0000 (14:51 +0200)]
Re-apply change 62ed4c43c8c2fe3457de6d7570c2ae4a09a5ecf0 by David Boddie

Re-apply change 914de965a8380e7620209c7b26e984ed9fbccc57 by David Boddie
Re-apply change 37dc859e7e2e0f135e4c40bc7f6f824fcdb21e86 by David Boddie
Doc: Fixed and synchronized QWebView related documentation.
Reviewed-by: Trust Me
8 years agoRe-apply change b065fda13c29110fc81f77c9bbf1069d562b4d67 by Martin Smith
Martin Smith [Fri, 16 Oct 2009 12:30:39 +0000 (14:30 +0200)]
Re-apply change b065fda13c29110fc81f77c9bbf1069d562b4d67 by Martin Smith

Re-apply change 422c747c5108f9f0c544b5dd0789df32aa498fb7 by Martin Smith
Re-apply change cef1901dbd96be81fc4139b50b094dfae5223e6f by Martin Smith
Re-apply change 0f8bff1970d4b0f10e98ce7d6ab341620f4ce76b by Martin Smith
doc: Changed Trolltech to Nokia

8 years agoRe-apply change fdb9419f23d1cd2a9ddfc1f7e2fb58f6e845483b by Jocelyn Turcotte
Jocelyn Turcotte [Tue, 13 Oct 2009 09:34:27 +0000 (11:34 +0200)]
Re-apply change fdb9419f23d1cd2a9ddfc1f7e2fb58f6e845483b by Jocelyn Turcotte

Re-apply change 2fbc823bb66db6ef6f6acc74d2baa96ebe1dec81 by Jocelyn Turcotte
Re-apply change 6125aabeccb01a07c706fe4227279eb827e8e890 by Jocelyn Turcotte
Re-apply change 6b8ac349b9a477863a8c8388dcc0658f3284bc54 by Jocelyn Turcotte
Re-applying commit ee0a43fee20cc398b505eb65218ebed56dfc8f39
by Simon Hausmann

Fix crash of QtScript on Mac OS X

When compiling on 10.4 but running on 10.5 the flags passed to vm_map cause
it to crash.

For now fall back to the use of mmap() as allocator instead.

Reviewed-by: Kent Hansen
8 years agoRe-apply change 29afcb69d6023aba012051bd2a026b57b3689732 by Liang QI
Liang QI [Tue, 3 Nov 2009 11:05:50 +0000 (12:05 +0100)]
Re-apply change 29afcb69d6023aba012051bd2a026b57b3689732 by Liang QI

Re-apply change 1db4a133a9d35e00bad50541fb8d64079a7debea by Liang QI
Fix tst_qwebpage and tst_qwebframe compilation on Symbian.
RevBy: TrustMe

8 years agoUpdated WebKit from /home/jturcott/dev/webkit/ to qtwebkit/qtwebkit-4.6 ( 363898ca378...
Jocelyn Turcotte [Mon, 9 Nov 2009 17:38:17 +0000 (18:38 +0100)]
Updated WebKit from /home/jturcott/dev/webkit/ to qtwebkit/qtwebkit-4.6 ( 363898ca378e2198b855ca2f8921c5e4f898c5e2 )

Changes in WebKit/qt since the last update:

++ b/WebKit/qt/ChangeLog
2009-11-09  Benjamin Poulain  <benjamin.poulain@nokia.com>

        Reviewed by Kenneth Rohde Christiansen.

        Add a non-const iterator to QWebElementCollection.
        Move the two attributes of the iterator to private.

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

2009-11-09  Laszlo Gombos  <laszlo.1.gombos@nokia.com>

        Reviewed by Kenneth Christiansen.

        [Qt] Remove the sessionStorage setting (per Page)

        This setting allows to run sessionStorage on/off on a per page
        basis. Remove this prematurely exposed API.

        * Api/qwebsettings.cpp:
        * tests/qwebpage/tst_qwebpage.cpp:

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

        Reviewed by Simon Hausmann.

        [Qt] Remove the QWebPage:webInspectorTriggered signal.
        User customization of the communication between QWebPage
        and QWebInspector will be properly designed in the next version.

        * Api/qwebinspector.cpp:
        * Api/qwebpage.cpp:
        * Api/qwebpage.h:
        * QtLauncher/main.cpp:

2009-11-05  Simon Hausmann  <hausmann@webkit.org>

        Reviewed by Tor Arne Vestbø.

        Added a missing re-implementation of QGraphicsItem::inputMethodQuery().

        * Api/qgraphicswebview.cpp:
        * Api/qgraphicswebview.h:

2009-11-04  Simon Hausmann  <hausmann@webkit.org>

        Reviewed by Tor Arne Vestbø.

        Provide a dummy re-implementation of QGraphicsLayoutItem::sizeHint(),
        similar to QWebView.

        * Api/qgraphicswebview.cpp:
        * Api/qgraphicswebview.h:

2009-11-04  Simon Hausmann  <hausmann@webkit.org>

        Reviewed by Tor Arne Vestbø.

        Removed zoomFactoryChanged() signal and added
        linkClicked() to QGraphicsWebView, for consistency with

        * Api/qgraphicswebview.cpp:
        * Api/qgraphicswebview.h:

2009-11-04  Simon Hausmann  <hausmann@webkit.org>

        Reviewed by Tor Arne Vestbø.

        Added QGraphicsWebView::findText() for convenience and consistency
        with QWebView.

        * Api/qgraphicswebview.cpp:
        * Api/qgraphicswebview.h:

2009-11-04  Simon Hausmann  <hausmann@webkit.org>

        Reviewed by Tor Arne Vestbø.

        Added QGraphicsWebView::pageAction() and triggerPageAction(), for
        consistency with QWebView.

        * Api/qgraphicswebview.cpp:
        * Api/qgraphicswebview.h:

2009-11-04  Simon Hausmann  <hausmann@webkit.org>

        Reviewed by Tor Arne Vestbø.

        Removed QGraphicsWebView::toHtml() after API review.

        That's consistent with QWebView and also based on the assumption that
        toHtml() is called less frequently than setHtml().

        * Api/qgraphicswebview.cpp:
        * Api/qgraphicswebview.h:
        * tests/qgraphicswebview/tst_qgraphicswebview.cpp:

2009-11-04  Simon Hausmann  <hausmann@webkit.org>

        Reviewed by Tor Arne Vestbø.

        Removed the interactive property of QGraphicsWebView.

        There are clearly use-cases for this feature, but it will require
        more work to make this fully work with an enum to have fine-grained
        control over the interactivity levels. For now it is easy to achieve
        in user-code what the boolean property did.

        * Api/qgraphicswebview.cpp:
        * Api/qgraphicswebview.h:
        * tests/qgraphicswebview/tst_qgraphicswebview.cpp:

2009-11-04  Simon Hausmann  <hausmann@webkit.org>

        Reviewed by Tor Arne Vestbø.

        Make the QGraphicsWebView constructor explicit.

        * Api/qgraphicswebview.h:

2009-11-05  Simon Hausmann  <hausmann@webkit.org>

        Last Qt 4.5 build fix (*sigh*)

        * tests/qwebpage/tst_qwebpage.cpp:
        (inputMethodHints): inputMethodHints() is only used for
        Qt 4.6, so guard the whole function.

2009-11-05  Simon Hausmann  <hausmann@webkit.org>

        Another prospective build fix against Qt 4.5 (build bot)

        Don't compile & run the QGraphicsWebView portion of the
        input methods auto test with Qt 4.5.

        * tests/qwebpage/tst_qwebpage.cpp:

2009-11-05  Simon Hausmann  <hausmann@webkit.org>

        Prospective build fix against Qt 4.5 (build bot)

        * Api/qgraphicswebview.cpp:
        (QGraphicsWebViewPrivate::setInputMethodEnabled): Guard the
        use of Qt 4.6 specific API with #ifdefs.

2009-11-01  Simon Hausmann  <hausmann@webkit.org>

        Reviewed by Kenneth Christiansen.

        [Qt] Fix enabling of input method support on QGraphicsWebView.

        Instead of setting the unsupported widget attribute on the
        QGraphicsWidget in setInputMethodEnabled() set the
        ItemAcceptsInputMethod GraphicsItem flag directly.

        Changed the existing input method auto test to run once
        on a QWebView and once on a QGraphicsWebView.

        * Api/qgraphicswebview.cpp:
        * tests/qwebpage/tst_qwebpage.cpp:

2009-11-04  Simon Hausmann  <hausmann@webkit.org>

        Reviewed by Kenneth Christiansen.

        Added QGraphicsWebView::modified property, for consistency
        with QWebView.

        * Api/qgraphicswebview.cpp:
        * Api/qgraphicswebview.h:
        * tests/qgraphicswebview/tst_qgraphicswebview.cpp:

2009-11-04  Simon Hausmann  <hausmann@webkit.org>

        Reviewed by Kenneth Christiansen.

        Removed status and progress properties of QGraphicsWebView.
        Added loadProgress and statusBarMessage signals instead,
        after API review.

        * Api/qgraphicswebview.cpp:
        * Api/qgraphicswebview.h:
        * tests/qgraphicswebview/tst_qgraphicswebview.cpp:

8 years agoExtending QScopedPointer test case
João Abecasis [Fri, 6 Nov 2009 16:35:10 +0000 (17:35 +0100)]
Extending QScopedPointer test case

... to also test QScopedArrayPointer, QCustomScopedPointer and

Added one level of indirection to comparison test case to avoid
double-delete in case of test failure. The test also tests other aspects
of Q*Scoped*Pointer behavior.

Reviewed-by: Olivier Goffart
8 years agoMake QScopedPointer::operator== and != non-member
João Abecasis [Fri, 6 Nov 2009 15:09:39 +0000 (16:09 +0100)]
Make QScopedPointer::operator== and != non-member

Non-member operator allows implicit conversions on both arguments.

A single operator is enough to support QScopedArrayPointer,
QCustomScopedPointer and QScopedSharedPointer since equality semantics
don't change and the deleter is managed in the base class.

Reviewed-by: Marius Storm-Olsen
8 years agoMy changes for 4.6.0
Paul Olav Tvete [Tue, 10 Nov 2009 09:04:06 +0000 (10:04 +0100)]
My changes for 4.6.0

8 years agoQNAM HTTP Code: Start authorization header with capital letter
Markus Goetz [Tue, 10 Nov 2009 08:48:47 +0000 (09:48 +0100)]
QNAM HTTP Code: Start authorization header with capital letter

HTTP header names are case insensitive, but stick to what all browsers
etc. use to work around buggy servers.

Task-number: QTBUG-5618
Reviewed-by: Peter Hartmann
8 years agoUpdated changelog with my changes
Tom Cooksey [Tue, 10 Nov 2009 07:52:00 +0000 (08:52 +0100)]
Updated changelog with my changes

8 years agoFix failing sub-src target
Marius Storm-Olsen [Tue, 10 Nov 2009 06:40:26 +0000 (07:40 +0100)]
Fix failing sub-src target

sub-src was iterating over SRC_SUBDIRS and not SUBDIRS. So, when the
tools were refactored out to handle distributed builds of host tools
with Electric Cloud, these tools were not included in the iteration.

Adding $$TOOLS_SUBDIRS to the recurse fixes this.

Also avoid setting dependencies for non-ordered builds

Reviewed-by: Jason McDonald
8 years agoUpdate change log with multimedia changes.
Andrew den Exter [Tue, 10 Nov 2009 04:41:27 +0000 (14:41 +1000)]
Update change log with multimedia changes.

8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Kurt Korbatits [Tue, 10 Nov 2009 04:36:01 +0000 (14:36 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

8 years agoupdate changelog
Derick Hawcroft [Tue, 10 Nov 2009 04:22:39 +0000 (14:22 +1000)]
update changelog

8 years agoupdate dist/changes-4.6.0
Bill King [Tue, 10 Nov 2009 04:09:39 +0000 (14:09 +1000)]
update dist/changes-4.6.0

8 years agoFixed runtime error in QAudioInput::bytesReady() function
Kurt Korbatits [Mon, 9 Nov 2009 04:26:02 +0000 (14:26 +1000)]
Fixed runtime error in QAudioInput::bytesReady() function
If bytesReady() was called before start(), Div by Zero.
Added check for this condition.

Reviewed-by:Justin McPherson

8 years agoChanges to low-level audio API.
Kurt Korbatits [Thu, 5 Nov 2009 04:18:38 +0000 (14:18 +1000)]
Changes to low-level audio API.
QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic)
QAudio::SuspendState -> QAudio::SuspendedState
QAudio::StopState -> QAudio::StoppedState
QAudioDeviceInfo::deviceList() -> QAudioDeviceInfo::availableDevices()
clock() -> elapsedUSecs()
totalTime() -> processedUSecs()
QIODevice* start(QIODevice*) -> void start(QIODevice*), QIODevice*

Reviewed-by:Justin McPherson

8 years agoAdd QScriptDeclarativeClass
Aaron Kennedy [Mon, 9 Nov 2009 01:58:49 +0000 (11:58 +1000)]
Add QScriptDeclarativeClass

QScriptDeclarativeClass is a private, but exported, class used by the
declarativeui module.  It is very similar to QScriptClass, but slightly
faster and provides a couple of "backdoor" extension mechanisms used
by declarative.

Reviewed-by: Warwick Allison
8 years agoadded missing include for template instantiation (in qDeleteAll)
mae [Fri, 30 Oct 2009 09:50:34 +0000 (10:50 +0100)]
added missing include for template instantiation (in qDeleteAll)
(cherry picked from commit d01db18696a7729b0d54af76f5224aed6750f3bb)

8 years agoDuring a GC mark the scope chain of QScriptContexts
Aaron Kennedy [Mon, 9 Nov 2009 01:33:14 +0000 (11:33 +1000)]
During a GC mark the scope chain of QScriptContexts

It appears that simply being in the scope chain of an existant frame
isn't sufficient to be marked.  This can lead to a QScriptContext
scope chain that contains a JSObject that has been collected.

For example, this code:

QScriptContext *ctxt = engine->pushContext();
previouslyCreatedFunctionObject.call(); // causes a GC

can lead to the object added to the scope chain to have become
invalid.  This leads to hilarity later on.

Reviewed-by: Kent Hansen
8 years agoChanges to low-level audio API.
Kurt Korbatits [Tue, 10 Nov 2009 03:07:46 +0000 (13:07 +1000)]
Changes to low-level audio API.
QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic)
QAudio::SuspendState -> QAudio::SuspendedState
QAudio::StopState -> QAudio::StoppedState
QAudioDeviceInfo::deviceList() ->
clock() -> elapsedUSecs()
totalTime() -> processedUSecs()
QIODevice* start(QIODevice*) -> void
start(QIODevice*), QIODevice*

Reviewed-by:Justin McPherson

8 years agoMerge branch '4.6' of ../qt into 4.6
Kurt Korbatits [Tue, 10 Nov 2009 03:01:07 +0000 (13:01 +1000)]
Merge branch '4.6' of ../qt into 4.6

8 years agoDon't reset view if a query fails.
Derick Hawcroft [Mon, 9 Nov 2009 03:56:46 +0000 (13:56 +1000)]
Don't reset view if a query fails.
The view of a table gets reset if for example a query fails.
However this also resets and removes the Header views of the
table. A better solution visually is to keep them displayed.

Task-number: QTBUG-3162

8 years agoMove QCustomScopedPointer to a private header
Harald Fernengel [Mon, 9 Nov 2009 16:52:57 +0000 (17:52 +0100)]
Move QCustomScopedPointer to a private header

The API is internal, so it should live in its private header. The class
was introduced during the lifetime of 4.6 (not in 4.5), so the move is
binary compatible.

Task-number: QTBUG-5617
Reviewed-by: João Abecasis <joao@abecasis.name>
8 years agoCode in gui/* should be completely namespaced
hjk [Mon, 9 Nov 2009 15:51:05 +0000 (16:51 +0100)]
Code in gui/* should be completely namespaced

And not rely on random QT_USE_NAMESPACE being pulled in from *.moc files.

8 years agoDont set DontCreateNativeAncestors attribute.
Denis Dzyubenko [Mon, 9 Nov 2009 15:24:17 +0000 (16:24 +0100)]
Dont set DontCreateNativeAncestors attribute.

This fixes painting artifacts on dock widgets. It would be nice to use
this attribute again once the painting is fixed.

Reviewed-by: trustme
8 years agoAssistant: Add missing initialization of member variable.
ck [Mon, 9 Nov 2009 15:21:40 +0000 (16:21 +0100)]
Assistant: Add missing initialization of member variable.

Reviewed-by: kh1
8 years agoMerge commit 'qtwebkit/qtwebkit-4.6' into 4.6
Jocelyn Turcotte [Mon, 9 Nov 2009 15:15:32 +0000 (16:15 +0100)]
Merge commit 'qtwebkit/qtwebkit-4.6' into 4.6

8 years agoQNetworkCookie: Add the dot prefix of the domain while adding to the jar
Jocelyn Turcotte [Fri, 6 Nov 2009 12:35:46 +0000 (13:35 +0100)]
QNetworkCookie: Add the dot prefix of the domain while adding to the jar
instead than when parsing the cookie header.

This corrects the bug QT-2379, happening in the following sequence:
parseCookie -> setCookieUrl -> toRawForm -> parseCookie
where a default domain would now also have a dot prefix, and shouldn't.

Reviewed-by: Peter Hartmann
8 years agoUpdate INSTALL and README + friends for the everywhere package
Jason McDonald [Mon, 9 Nov 2009 14:23:18 +0000 (00:23 +1000)]
Update INSTALL and README + friends for the everywhere package

Make INSTALL and README more generic, avoid repeating stuff that's
already in the product docs, and move the Windows Signing stuff into the
product docs.

Task-number: QTBUG-5453
Reviewed-by: Espen Riskedal
8 years agoDoc: updated documentation for Google Suggest Example
Morten Engvoldsen [Mon, 9 Nov 2009 12:34:44 +0000 (13:34 +0100)]
Doc: updated documentation for Google Suggest Example

Documented the Google Suggest Example. Adding descriptions and screenshot. and correcting indent

Task-number: QT-700

Rev-by: Volker Hilsheimer
8 years agoMerge branch '4.6-platform' into 4.6
Denis Dzyubenko [Mon, 9 Nov 2009 12:20:37 +0000 (13:20 +0100)]
Merge branch '4.6-platform' into 4.6

8 years agoMy relevant changes-4.6.0 updates
Markus Goetz [Mon, 9 Nov 2009 12:06:06 +0000 (13:06 +0100)]
My relevant changes-4.6.0 updates

Reviewed-by: TrustMe
8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Morten Engvoldsen [Mon, 9 Nov 2009 12:03:20 +0000 (13:03 +0100)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

8 years agoÿþd
Morten Engvoldsen [Mon, 9 Nov 2009 12:02:51 +0000 (13:02 +0100)]

8 years agoCompile in 64bit with debug
Olivier Goffart [Mon, 9 Nov 2009 11:47:40 +0000 (12:47 +0100)]
Compile in 64bit with debug

8 years agoMerge branch '4.6-api-review' into 4.6
Marius Storm-Olsen [Mon, 9 Nov 2009 11:38:17 +0000 (12:38 +0100)]
Merge branch '4.6-api-review' into 4.6

8 years agoFixed pan gesture handlers in standard Qt widgets.
Denis Dzyubenko [Mon, 9 Nov 2009 11:28:58 +0000 (12:28 +0100)]
Fixed pan gesture handlers in standard Qt widgets.

Reviewed-by: Richard
8 years agoMerge commit 'b65fd82299' from qt-core-team 4.6 into 4.6
Marius Storm-Olsen [Mon, 9 Nov 2009 11:34:59 +0000 (12:34 +0100)]
Merge commit 'b65fd82299' from qt-core-team 4.6 into 4.6


8 years agoDefault to X11 instead of QWS for commercial builds
Paul Olav Tvete [Mon, 9 Nov 2009 10:20:15 +0000 (11:20 +0100)]
Default to X11 instead of QWS for commercial builds

Reviewed-by: Thiago
Reviewed-by: Jason McDonald
8 years agoAPI review: *Count() are not plural
Marius Storm-Olsen [Fri, 6 Nov 2009 11:58:19 +0000 (12:58 +0100)]
API review: *Count() are not plural

Obsolete the plural version, and replace its usage in Qt.

Reviewed-by: Andreas Aardal Hanssen
8 years agoAPI review: Rename numRects() -> rectCount()
Marius Storm-Olsen [Fri, 6 Nov 2009 11:04:15 +0000 (12:04 +0100)]
API review: Rename numRects() -> rectCount()

QRegion::numRects() is marked obsolete.
Removed all usage of the old function inside Qt and test-cases.

Reviewed-by: Andreas Aardal Hanssen
8 years agoAPI review: Rename numPages() -> pageCount()
Marius Storm-Olsen [Fri, 6 Nov 2009 10:43:08 +0000 (11:43 +0100)]
API review: Rename numPages() -> pageCount()

QPrintPreviewWidget wasn't following the Qt API naming convention of
*Count()/set*Count(). Introduce proper function, and obsolete the old.
Removed all usage of the old function in Qt.

Reviewed-by: Andreas Aardal Hanssen
8 years agoAPI review: Rename numDigits() and setNumDigits()
Marius Storm-Olsen [Fri, 6 Nov 2009 10:37:33 +0000 (11:37 +0100)]
API review: Rename numDigits() and setNumDigits()

QLCDNumber doesn't follow the API convention of *Count and set*Count().
Introduce properly named functions, and obsolete the old ones.

Reviewed-by: Andreas Aardal Hanssen
8 years agoMy changes for 4.6.0
Peter Hartmann [Mon, 9 Nov 2009 10:43:39 +0000 (11:43 +0100)]
My changes for 4.6.0

8 years agoFix Assistant losing font settings across invocations.
kh1 [Mon, 9 Nov 2009 10:50:10 +0000 (11:50 +0100)]
Fix Assistant losing font settings across invocations.

Task-number: QTBUG-5333
Reviewed-by: ck
8 years agoFix some warnings.
kh1 [Fri, 6 Nov 2009 11:15:14 +0000 (12:15 +0100)]
Fix some warnings.

Reviewed-by: ck
8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Bradley T. Hughes [Mon, 9 Nov 2009 10:46:57 +0000 (11:46 +0100)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6


8 years agoAssistant: Fix bugs related to setting the current filter remotely.
ck [Mon, 9 Nov 2009 10:43:34 +0000 (11:43 +0100)]
Assistant: Fix bugs related to setting the current filter remotely.

1. Filter combo box now gets updated on remote setCurrentFilter.
2. Argument to remote setCurrentFilter now gets checked. If there is
   no such filter, we reject it.

8 years agoDoc: typo fixed
Joerg Bornemann [Mon, 9 Nov 2009 10:20:06 +0000 (11:20 +0100)]
Doc: typo fixed

Reviewed-by: TrustMe
8 years agoUpdated change log
Prasanth Ullattil [Mon, 9 Nov 2009 10:14:59 +0000 (11:14 +0100)]
Updated change log

8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
jasplin [Mon, 9 Nov 2009 09:00:48 +0000 (10:00 +0100)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

8 years agoMy changes.
jasplin [Mon, 9 Nov 2009 08:59:33 +0000 (09:59 +0100)]
My changes.

8 years agoMore inDestructor checks.
Warwick Allison [Mon, 9 Nov 2009 08:10:23 +0000 (18:10 +1000)]
More inDestructor checks.
Declarative tripped these (crashes).

Reviewed-by:Aaron Kennedy