qt:digia-qt.git
7 years agoAdded missing UID3 for qsymbianbearer.dll. v4.7.0-beta1
Espen Riskedal [Mon, 3 May 2010 17:33:50 +0000 (19:33 +0200)]
Added missing UID3 for qsymbianbearer.dll.

Without a proper UID3 it is not possible to sign Qt.sis
at symbiansigned.com. I also reserved the UID3 in our
Wiki pages

Reviewed-by: Aleksandar Babic
(cherry picked from commit dfa6c04356d4fe93a88f2c237a920367220b9ed6)

7 years ago2010-04-14 Kent Hansen <kent.hansen@nokia.com>
Kent Hansen [Wed, 14 Apr 2010 16:26:58 +0000 (16:26 +0000)]
2010-04-14 Kent Hansen <kent.hansen@nokia.com>

Reviewed by Maciej Stachowiak.

        Mac OS X: Use deployment target to determine whether memory tagging should be enabled
        https://bugs.webkit.org/show_bug.cgi?id=34888

        When building on (Snow) Leopard but targeting Tiger
        (TARGETING_TIGER defined, BUILDING_ON_TIGER not defined),
        WebKit would crash on Tiger because the tags passed to mmap
        caused those function calls to fail.

        Conversely, when building on Tiger but targeting Leopard
        (BUILDING_ON_TIGER defined, TARGETING_LEOPARD defined), WebKit
        would crash on Leopard because the tags passed to vm_map and
        vm_allocate caused those function calls to fail.

        Solution: Use TARGETING_TIGER rather than BUILDING_ON_TIGER to
        govern the tag definitions. Use the same tags for vm_map and
        vm_allocate regardless of target, since they work on
        both. Fall back to the mmap tags that work on Tiger (that is,
        "no tags") if targeting Tiger, since those tags also work on
        Leopard.

        * wtf/VMTags.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@57583 268f45cc-cd09-0410-ab3c-d52691b4dbfc

7 years agoRemoved fullscreen responsiveness of softkeys
Miikka Heikkinen [Wed, 28 Apr 2010 10:17:57 +0000 (13:17 +0300)]
Removed fullscreen responsiveness of softkeys

The CEikCba class casting is not binary compatible between at least
S60 3.2 and 5.0 platforms, even though it is source compatible.
The removed code was causing stack corruption on emulator
when binaries were built on S60 3.2 SDK and run on S60 5.0 SDK.

Another solution for this feature needs to be found.

Task-number: QTBUG-10199
Reviewed-by: Shane Kearns
Reviewed-by: Janne Anttila
(cherry picked from commit d3b5460674e1ab8e11f05961390a6e62364032a8)

7 years agoPartially revert "Sunstudio12.1(5.10): Fix compile errors GTK style and other minor...
Thiago Macieira [Tue, 13 Apr 2010 21:35:01 +0000 (23:35 +0200)]
Partially revert "Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors"

The compile fix for SunCC caused a build failure for MinGW with gcc
3.4. However, QtConcurrent is not supported for Sun CC, so revert the
fix (let mingw compile and SunCC break).

This reverts part of commit a354e98838e67e9bbd9473d4cd42b89f45d0e3fe
(MR 547).
(cherry picked from commit 756c8e10b96f4b4f7b2e3d2d2c248ec261a3d407)

7 years agoDEF file fix
Janne Koskinen [Fri, 23 Apr 2010 13:59:18 +0000 (16:59 +0300)]
DEF file fix
Open C unnecessarily exports inlined getloc. entry removed.

Reviewed-by: Shane Kearns
(cherry picked from commit 02c65146610cdd5bfe1f3ee4656ba07af82afcc7)

7 years agoQtWebkit WINS DEF file freeze
Janne Koskinen [Thu, 22 Apr 2010 12:01:58 +0000 (15:01 +0300)]
QtWebkit WINS DEF file freeze

Freeze against previous release 4.6.2 to maintain BC.

Reviewed-by: Miikka Heikkinen
(cherry picked from commit 9cc9da431fd99869a83b91f5be4911e0ead2f15f)

7 years agoQtWebKit: Fixes compilation on MSVC 64
Jocelyn Turcotte [Mon, 19 Apr 2010 14:26:35 +0000 (16:26 +0200)]
QtWebKit: Fixes compilation on MSVC 64

This patch should be overwritten by the next import of QtWebKit trunk

Reviewed-by: TrustMe
(cherry picked from commit 594f81c553d52901209c079e2887fb13990ecba4)

7 years agoFixed vendor info in fluidlauncher sis package.
Miikka Heikkinen [Tue, 20 Apr 2010 11:36:31 +0000 (14:36 +0300)]
Fixed vendor info in fluidlauncher sis package.

Fluidlauncher was using default vendor info while all other demos
used Nokia as vendor.

Task-number: QTBUG-10051
Reviewed-by: Janne Koskinen
(cherry picked from commit 88a332f92a5c660ce934ea0132c9814de0cb02b6)

7 years agoFix default_deployment.pkg_prerules
Miikka Heikkinen [Tue, 20 Apr 2010 11:26:15 +0000 (14:26 +0300)]
Fix default_deployment.pkg_prerules

Due to Symbian mkspecs refactoring, some changes from 4.6 didn't get
properly merged into 4.7.

Task-number: QTBUG-10050
Reviewed-by: Janne Koskinen
(cherry picked from commit 040b480b58f76ec689eea3b0f0518a0997080cc9)

7 years agoRemove overloaded placement new operators
Janne Koskinen [Mon, 19 Apr 2010 15:45:41 +0000 (18:45 +0300)]
Remove overloaded placement new operators

WINSCW and Sun OS build fix. placement new is already defined in NonCopyable, no need for overloading.

Reviewed-by: Simon Hausmann
(cherry picked from commit cc26a3ec5c6bfde206c7354f87bebd36b70e1205)

7 years agoWINSCW compiler fix, too eager to solve inlines
Janne Koskinen [Mon, 19 Apr 2010 15:40:08 +0000 (18:40 +0300)]
WINSCW compiler fix, too eager to solve inlines

WINSCW tries immediately solve inlines causing forward declared classes to
be used before they are defined.

Reviewed-by: Simon Hausmann
(cherry picked from commit 0d1739197015a651b88d710c9c961eb0f20278f9)

7 years agoWINSCW boolean fix for XPATH
Janne Koskinen [Mon, 19 Apr 2010 15:36:56 +0000 (18:36 +0300)]
WINSCW boolean fix for XPATH

WINSCW cannot determine boolean type unless it is explicitly defined.
This fix needs to be re-applied always when files are regenerated.

Reviewed-by: Simon Hausmann
(cherry picked from commit 07aa94196e5ab6827099c683c0be96edbc62e6c0)

7 years agoWINSCW compile fix for HashMap
Janne Koskinen [Fri, 16 Apr 2010 10:53:08 +0000 (13:53 +0300)]
WINSCW compile fix for HashMap

WINSCW with templates function declarations and definitions will
have to use same names for variables or you get 'undefined identifier'

Reviewed-by: Miikka Heikkinen
(cherry picked from commit c16ca6d08d7e3e7a0972aa1975a72882559edb26)

7 years agoWINSCW compile fix for WebCore
Janne Koskinen [Wed, 14 Apr 2010 12:32:12 +0000 (15:32 +0300)]
WINSCW compile fix for WebCore

WINSCW fails to parse function pointer name if it is not
introduced before use.

Reviewed-by: Miikka Heikkinen
(cherry picked from commit e0314fa999e58a057604cdbd4bd6fdfe5248d75e)

7 years agoBuild fix for mingw
Thierry Bastian [Tue, 20 Apr 2010 15:41:06 +0000 (17:41 +0200)]
Build fix for mingw

This was preventing the activeQt tools to build
Don't know exactly why though....

Task-number: 10003
Reviewed-by: Zeno Albisser
(cherry picked from commit 90bac7f779b642ef1db5363012a994784ad029c4)

7 years agoJust use the path as the url can have an anchor attached etc...
kh1 [Tue, 20 Apr 2010 14:20:16 +0000 (16:20 +0200)]
Just use the path as the url can have an anchor attached etc...

Fixes the broken topic chooser and keyword resolving. We are only
interested in the extention, which fails if we get an url e.g. with
anchor attached.

Reviewed-by: ck
(cherry picked from commit 139497b6871d73d3366c21b51db9a74046855552)

7 years agoqdoc: Avoided putting bad chars in links
Martin Smith [Tue, 20 Apr 2010 10:33:25 +0000 (12:33 +0200)]
qdoc: Avoided putting bad chars in links
(cherry picked from commit 0a6faf00f06c8a0e2e0f4714bb14645172ee8922)

7 years agoRevert "Make offline docs the default for package generation."
Jason McDonald [Wed, 21 Apr 2010 03:04:07 +0000 (13:04 +1000)]
Revert "Make offline docs the default for package generation."

This reverts commit d66a6da84af01f1a6d4fd52d9b1cbec72a4fae3c.

7 years agoDoc: Cleaning HTML generator and updating index.qdoc
Morten Engvoldsen [Tue, 20 Apr 2010 13:51:04 +0000 (15:51 +0200)]
Doc: Cleaning HTML generator and updating index.qdoc
Adding links to the index page and removing HTML attributes like align and valing form the HTML generator

Reviewed-by: Martin Smith
(cherry picked from commit 019af5ecb5dbc9c173109ba670180177713a51ad)

7 years agoDoc: Correcting qdocconf files for assistant
Morten Engvoldsen [Tue, 20 Apr 2010 09:51:35 +0000 (11:51 +0200)]
Doc: Correcting qdocconf files for assistant
Linking correct files to the qdocconf files

Reviewed-by: Daniel Molkentin
(cherry picked from commit 84eadc0bc232d8196e08f5aa5614ce9a17ea93bd)

7 years agoQuick fix to make the documentation work, needs a proper solution though.
kh1 [Mon, 19 Apr 2010 16:59:32 +0000 (18:59 +0200)]
Quick fix to make the documentation work, needs a proper solution though.

Reviewed-by: kh
(cherry picked from commit 0fd81e81a357edb9f9e615cff28a1876bd363b2e)

7 years agoFix crash on startup on Symbian OS
Shane Kearns [Tue, 20 Apr 2010 08:34:03 +0000 (10:34 +0200)]
Fix crash on startup on Symbian OS

The changes to QThread introduced by commit
9aa4538b219ed759a47e8d1f93c2797bf07b5e2f mean that the QThread constructor
calls into the event dispatcher.
The Symbian event dispatcher owns a QThread, so it crashed when the code
re-entered the partially constructed event dispatcher and used an
uninitialised pointer.

This change delays construction of the QThread until the point of use,
so that the event dispatcher is fully constructed.

Task-number: QTBUG-10029
Reviewed-by: Jason Barron
(cherry picked from commit 2b55d52669beb72396f94e449fdf172735349b3b)

7 years agoMake offline docs the default for package generation.
Jason McDonald [Tue, 20 Apr 2010 03:02:51 +0000 (13:02 +1000)]
Make offline docs the default for package generation.

Acked-by: Martin Smith
7 years agoqdoc: Added online flag to the qdocconf file.
Martin Smith [Mon, 19 Apr 2010 09:47:36 +0000 (11:47 +0200)]
qdoc: Added online flag to the qdocconf file.

To generate the offline docs, do nothing.
To generate the online docs, add this to
your qdocconf file:
  "online = true"
(cherry picked from commit 22c44d7da7682fb2500c9b11c884e50ed4dcd042)

7 years agoShouldn't call epocRoot() in non-epoc builds in generatePkgFile
Miikka Heikkinen [Thu, 15 Apr 2010 07:47:02 +0000 (10:47 +0300)]
Shouldn't call epocRoot() in non-epoc builds in generatePkgFile

Reviewed-by: Janne Koskinen
(cherry picked from commit 9e66838d0e766da45524d38c7235441500877c41)

7 years agoFixed installer_sis target for 4.7
Miikka Heikkinen [Wed, 14 Apr 2010 14:19:12 +0000 (17:19 +0300)]
Fixed installer_sis target for 4.7

Due to pkg file generation refactoring in 4.7, these fixes hadn't
been ported from 4.6 to 4.7 previously.

Task-number: QTBUG-9864
Reviewed-by: Janne Koskinen
(cherry picked from commit c7f27ceea8f2bd420c07ce05809d0ecb06a6dc9a)

7 years agoFix option(recursive)
Miikka Heikkinen [Thu, 15 Apr 2010 12:45:37 +0000 (15:45 +0300)]
Fix option(recursive)

QMakeProject::init initializes the whole project, while
QMakeProject::reset initializes the parser for a single file.
"recursive" needs to apply to the whole project.

Task-number: QTBUG-9847
Reviewed-by: Oswald Buddenhagen
(cherry picked from commit 8295acce8b1ec3959bfd1d93028c31f49d5a5a67)

7 years agoFixed automatic patching of self-signed packages
Miikka Heikkinen [Fri, 16 Apr 2010 12:01:37 +0000 (15:01 +0300)]
Fixed automatic patching of self-signed packages

- Don't autopatch when just preprocessing pkg or creating stub package
- Copy binaries before patching so that originals are preserved.
- Only autopatch the preprocessed file so that original template is
  preserved.
- Added clear warning to patch_capabilities.pl to notify users that
  patched package is not suitable for distribution.

Task-number: QTBUG-9972
Reviewed-by: Shane Kearns
(cherry picked from commit 33aac2ca5b79afcb08c13c2b4092acfdb5056fdb)

7 years agoFix warning about illegal empty declaration.
Andrew den Exter [Mon, 19 Apr 2010 00:40:43 +0000 (10:40 +1000)]
Fix warning about illegal empty declaration.

Q_PRIVATE_SLOT declarations don't require a semi-colon.

Reviewed-by: Justin McPherson
(cherry picked from commit 017cf88ef18cdbf5d302a658c625f605320005f8)

7 years agoqdoc: Improved TOC for class ref pages.
Martin Smith [Fri, 16 Apr 2010 08:48:45 +0000 (10:48 +0200)]
qdoc: Improved TOC for class ref pages.
(cherry picked from commit 8c942f6d2998ffcd024437e408f92d38750dd025)

7 years agoThree fixes from Shane after QtMultimedia was split into two dlls.
Espen Riskedal [Fri, 16 Apr 2010 13:51:28 +0000 (15:51 +0200)]
Three fixes from Shane after QtMultimedia was split into two dlls.

Fix1: QtMultimedia to get .def files from the correct location

multimedia was split into 2 subdirectories, which means the general
purpose rule in qbase.pri no longer works.
Task-number: QTBUG-9983
Reviewed-by: Miikka Heikkinen
Fix2: Fix QtMultimedia .def files

As a result of the split of multimedia into two DLLs, made the following
changes:
1. Revert QtMultimediau.def to v4.6.2 (compatibility baseline)
2. Freeze QtMultimedia and QtMediaServices
This is compatible with 4.6.2, but not compatible with any previous 4.7
build.
Task-number: QTBUG-9983

Fix3: Add QtMediaServices.dll to Qt.sis

The new dll will now be installed by the symbian sis package.
Task-number: QTBUG-9983
Reviewed-by: Miikka Heikkinen
(cherry picked from commit 095d5b74e571c71e04cc98ba4d372e3c5c2b1f9c)

7 years agoqdoc: Added the index and fixed images in the extra files list.
David Boddie [Thu, 15 Apr 2010 18:30:12 +0000 (20:30 +0200)]
qdoc: Added the index and fixed images in the extra files list.

Reviewed-by: Trust Me
(cherry picked from commit 5b975e1dc61eaee055afc40fef13358bcd55c7d2)

7 years agoqdoc: Added TOC to module pages.
Martin Smith [Tue, 13 Apr 2010 13:36:25 +0000 (15:36 +0200)]
qdoc: Added TOC to module pages.
(cherry picked from commit 68eea9b1006074853a42853f9a34cc4eb1e04b8f)

7 years agoqdoc: Changed <ul> elements in TOC.
Martin Smith [Tue, 13 Apr 2010 12:43:48 +0000 (14:43 +0200)]
qdoc: Changed <ul> elements in TOC.

Each <ul> is now <ul class="leveli">, where i is 1..n.
(cherry picked from commit 3d3bff79216a24625ac7e5aa33b40c5363a228fc)

7 years agoFix compile errors in Direct Show media service.
Andrew den Exter [Fri, 16 Apr 2010 06:03:10 +0000 (16:03 +1000)]
Fix compile errors in Direct Show media service.

The service links against the multimedia library in addition to the
mediaservices libarary, and QAbstractVideoSurface is defined in
QtMultimedia, no QtMediaServices.
(cherry picked from commit 9471428742ba59dbb174fc275742052e4bb629ff)

7 years agoFix duplicate project entry in visual studio solution file.
Andrew den Exter [Fri, 16 Apr 2010 03:37:40 +0000 (13:37 +1000)]
Fix duplicate project entry in visual studio solution file.

The marshal project was being appended to SUBDIRS twice.

Reviewed-by: Justin McPherson
(cherry picked from commit 551d704cdafae46cdccc6217bb7f36da7e84be2d)

7 years agoAdd EXPORT defines for QtMediaServices library.
Andrew den Exter [Fri, 16 Apr 2010 03:06:10 +0000 (13:06 +1000)]
Add EXPORT defines for QtMediaServices library.

Reviewed-by: Justin McPherson
(cherry picked from commit 6514ecd97cb455082b6e6a3521dee7c623e6393d)

7 years agoFixed configure check for gstreamer.
Dmytro Poplavskiy [Fri, 16 Apr 2010 02:53:44 +0000 (12:53 +1000)]
Fixed configure check for gstreamer.

Gstreamer should be detected not only when phonon or mediaservices
are enabled, but also when they are not disabled.

Reviewed-by: Justin McPherson
(cherry picked from commit 2a26cf1a76c954f8e619b24d61650a0adf655551)

7 years agoWebKit; build with change to mediaservices.
Justin McPherson [Fri, 16 Apr 2010 02:24:01 +0000 (12:24 +1000)]
WebKit; build with change to mediaservices.

Reviewed-by: Dmytro Poplavskiy
(cherry picked from commit 690e0f27ae23189200d98e9300b63914d8e1fe30)

7 years agoQtMediaservices -> QtMediaServices.
Justin McPherson [Fri, 16 Apr 2010 01:25:04 +0000 (11:25 +1000)]
QtMediaservices -> QtMediaServices.

Reviewed-by: Dmytro Poplavskiy
(cherry picked from commit 24d5c396903c1ce12578a32c2cc10e0ae391e6d5)

7 years agoconfigure; Fixes for changes to use mediaservices.
Justin McPherson [Fri, 16 Apr 2010 00:44:47 +0000 (10:44 +1000)]
configure; Fixes for changes to use mediaservices.

Reviewed-by: Dmytro Poplavskiy
(cherry picked from commit 30cd548679d5e2ae026eb5e435e9bdceac6e4987)

7 years agoRebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2d
Andrew den Exter [Fri, 16 Apr 2010 00:08:15 +0000 (10:08 +1000)]
Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2d
(cherry picked from commit 506a39d19961aadf02946db1b4496bf98d494d8d)

7 years agoFixed compile errors in pulseaudio backend for soundeffect
Kurt Korbatits [Fri, 16 Apr 2010 00:18:00 +0000 (10:18 +1000)]
Fixed compile errors in pulseaudio backend for soundeffect

Reviewed-by:Dmytro Poplavskiy
(cherry picked from commit 16c6227415a05b8bc50162eb2a4941cb993c3377)

7 years agoFixed compile errors with gstreamer plugin
Kurt Korbatits [Thu, 15 Apr 2010 23:41:10 +0000 (09:41 +1000)]
Fixed compile errors with gstreamer plugin

Reviewed-by:Justin McPherson
(cherry picked from commit ba0d2829f3e173d4c95c49f3bbbe0cd030ff3f5f)

7 years agoCreate Mediaservices lib, separate from Multimedia.
Justin McPherson [Thu, 15 Apr 2010 09:08:00 +0000 (19:08 +1000)]
Create Mediaservices lib, separate from Multimedia.
(cherry picked from commit e85223d233c0e1d6beca748332b8fbaba3ebbf2d)

7 years agoDon't create delegates when destroying view.
Martin Jones [Wed, 14 Apr 2010 23:35:23 +0000 (09:35 +1000)]
Don't create delegates when destroying view.

Task-number: QTBUG-9840
(cherry picked from commit 114f627d14e7c4f06f82a7286c38c78388fe7623)

7 years agoFix compilation of ShivaVG, which does not have EGL.
Rhys Weatherley [Thu, 15 Apr 2010 03:40:12 +0000 (13:40 +1000)]
Fix compilation of ShivaVG, which does not have EGL.

Task-number: QTBUG-9809
Reviewed-by: Sarah Smith
(cherry picked from commit d20bf43e3f7b3d39fddd28eee5a5594de6930873)

7 years agoAttempt again to fix minGW compile error, while not breaking WinCE
Jason McDonald [Fri, 16 Apr 2010 01:07:15 +0000 (11:07 +1000)]
Attempt again to fix minGW compile error, while not breaking WinCE

Reviewed-by: Andrew den Exter
7 years agoRevert "Revert "Update Phonon ds9 backend to 4.4.0.""
Jason McDonald [Fri, 16 Apr 2010 01:03:29 +0000 (11:03 +1000)]
Revert "Revert "Update Phonon ds9 backend to 4.4.0.""

This reverts commit 1d267f33d179abbac753a72c2235e7fb07c4def7.

7 years agoRevert "Fix previous merge commit."
Jason McDonald [Fri, 16 Apr 2010 01:03:11 +0000 (11:03 +1000)]
Revert "Fix previous merge commit."

This reverts commit ab31654127d7a6e9a06a2c75bc8b2832d68cdfc0.

7 years agoFix compilation: StringImpl has no public, default constructor
Thiago Macieira [Wed, 14 Apr 2010 08:53:40 +0000 (10:53 +0200)]
Fix compilation: StringImpl has no public, default constructor

Error was:
platform/text/AtomicStringImpl.h:29: error: base `WebCore::StringImpl' with only non-default constructor in class without a constructor

Reviewed-by: Janne Koskinen
(cherry picked from commit 42bbbfb3cd36a935d30e7f49f87ab8d7f1d2b53e)

7 years agoFix compilation on Solaris, AIX and HP-UX.
Thiago Macieira [Tue, 13 Apr 2010 21:27:53 +0000 (23:27 +0200)]
Fix compilation on Solaris, AIX and HP-UX.

There's no bzero function in POSIX. It's a 4.3BSD function, legacy in
POSIX.2001 and removed in POSIX.2008.

And good compilers will inline the function anyway by a builtin. It's
one of the most basic algorithms.

Reviewed-by: Trust Me
(cherry picked from commit 59b9f56a18ef0080938626df4a30bc869f8096ef)

7 years agoqdoc: Removed all <table> attributes in favor of using css.
Martin Smith [Wed, 14 Apr 2010 11:49:47 +0000 (13:49 +0200)]
qdoc: Removed all <table> attributes in favor of using css.
(cherry picked from commit a3c73742d9b9b9329492f8f70d74d6701840062f)

7 years agoqdoc: Checked for empty title.
Martin Smith [Wed, 14 Apr 2010 08:46:45 +0000 (10:46 +0200)]
qdoc: Checked for empty title.
(cherry picked from commit 4607210dfef3b51933f03deab1037c98cbb8869c)

7 years agoqdoc: Added TOC to class ref pages.
Martin Smith [Wed, 14 Apr 2010 08:33:07 +0000 (10:33 +0200)]
qdoc: Added TOC to class ref pages.

It isn't a full TOC yet. It only includes h1, h2, etc
from the Detaled Description part. In many classes, there
aren't any of these, so many classes won't have a TOC yet.
(cherry picked from commit 61726600cc7d6412a3d25674a4f785c23c8a8f64)

7 years agoDoc: updating scripts
Morten Engvoldsen [Wed, 14 Apr 2010 14:05:59 +0000 (16:05 +0200)]
Doc: updating scripts

Revieved-by: trust-me
(cherry picked from commit 7e33165aa680e5b334182bdb34fae0f1aca69233)

7 years agoDoc: Fixing design bugs. Updating the index page and script/style files. Adding some...
Morten Engvoldsen [Tue, 13 Apr 2010 13:15:33 +0000 (15:15 +0200)]
Doc: Fixing design bugs. Updating the index page and script/style files. Adding some image files.

Reveiwed-by: trustme
(cherry picked from commit c0d02030333c9f96188b5a425f2552472ab53325)

7 years agoqdoc: Fixed .qdocconf files for assistant.
Martin Smith [Thu, 15 Apr 2010 10:23:19 +0000 (12:23 +0200)]
qdoc: Fixed .qdocconf files for assistant.
(cherry picked from commit 114cb018c088570ff0640eeb0d57594905ff9fcf)

7 years agoFix previous merge commit.
Jason McDonald [Thu, 15 Apr 2010 10:32:27 +0000 (20:32 +1000)]
Fix previous merge commit.

7 years agoRevert "Update Phonon ds9 backend to 4.4.0."
Jason McDonald [Thu, 15 Apr 2010 10:31:07 +0000 (20:31 +1000)]
Revert "Update Phonon ds9 backend to 4.4.0."

This reverts commit 19a3fc3bd817628070e5637caf158b0be79eee82.
The phonon backend in 4.4.0 is outdated. Qt has the most recent one.

Conflicts:

src/3rdparty/phonon/ds9/iodevicereader.cpp
(cherry picked from commit 6253ced81bcd60c04803f1a52bc59a239022b9c4)

Conflicts:

src/3rdparty/phonon/ds9/mediaobject.cpp

7 years agoUpdate to def files for 4.7.0-beta1
Shane Kearns [Wed, 14 Apr 2010 19:45:36 +0000 (21:45 +0200)]
Update to def files for 4.7.0-beta1

Frozen against qt-releases/4.7.0-beta1
commit 4061d0ff3e8ed72ecb83ef1026492511a0afb9fa

Task-number: QTBUG-9892
Reviewed-by: Trust Me
(cherry picked from commit e40fea6a052f172d3eb3c0901ee502d1747c3817)

7 years agoReduce QML runtime capabilities to NetworkServices and ReadUserData
Joona Petrell [Wed, 14 Apr 2010 02:15:26 +0000 (12:15 +1000)]
Reduce QML runtime capabilities to NetworkServices and ReadUserData

Task-number:
Reviewed-by: Martin Jones
(cherry picked from commit 5a1a3ab59e96bb5b2968883160564eb24d011859)

7 years agoAdd 'runtime' property to the rootContext of DeclarativeViewer
Leonardo Sobral Cunha [Tue, 13 Apr 2010 07:01:54 +0000 (17:01 +1000)]
Add 'runtime' property to the rootContext of DeclarativeViewer

The 'runtime' property is a singleton object that contains various info
about the execution environment for the qml application. Currently
it contains just one property 'isActiveWindow', which tells if the
window of the declarative viewer is active or not.

Task-number: QTBUG-8902
Reviewed-by: Martin Jones
(cherry picked from commit ffd45093795e9481505af0ae9bf5df7b6c704c72)

7 years agoDon't crash when columns == 0
Martin Jones [Wed, 14 Apr 2010 00:16:41 +0000 (10:16 +1000)]
Don't crash when columns == 0

Task-number: QTBUG-9805
(cherry picked from commit 3469fe05e4b04567598202fecc16c1decfb3ab63)

7 years agoemit onMovementStarted/Ended/Changed on wheel events
Martin Jones [Wed, 14 Apr 2010 01:29:35 +0000 (11:29 +1000)]
emit onMovementStarted/Ended/Changed on wheel events

Task-number: QTBUG-9804
(cherry picked from commit d44b7f2faa8cdc3832eac40bc45102acc3e3146a)

7 years agoComplete item creation after its initial properties have been initialized.
Martin Jones [Wed, 14 Apr 2010 01:06:49 +0000 (11:06 +1000)]
Complete item creation after its initial properties have been initialized.

Task-number: QTBUG-9800
(cherry picked from commit 955daf47a350ad9eb84b30f50431482b16ecf22f)

7 years agoEnsure view position is correct for highlight range modes that have a static highlight
Martin Jones [Tue, 13 Apr 2010 23:30:03 +0000 (09:30 +1000)]
Ensure view position is correct for highlight range modes that have a static highlight

Task-number: QTBUG-9791
(cherry picked from commit 9416f29a3ee7511c182eaa68f5523132ff64921d)

7 years agoFix EGLImage & re-enable its use in QtOpenGL
Tom Cooksey [Wed, 7 Apr 2010 15:18:04 +0000 (17:18 +0200)]
Fix EGLImage & re-enable its use in QtOpenGL

Make sure we set the EGL_KHR_image_base define when we define the
reset of the extension defines. This also makes eglCreateImageKHR
get defined when previously it wasn't.

Reviewed-By: TrustMe
(cherry picked from commit 99c17c0efb1331f5d11260b08614c9dff9bbf2e1)

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 13 Apr 2010 20:29:20 +0000 (22:29 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix qmake.pro after Symbian alternate build system integration
  Fix compile error
  Don't try to use so much permissions, use something a lot more sane
  A bit saner suggestion
  Remove not needed permissions
  Make compile on Symbian

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
Qt Continuous Integration System [Tue, 13 Apr 2010 18:01:25 +0000 (20:01 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: (21 commits)
  QtWebKit: Corrects symbols visibility for JavaScriptCore.
  QtWebKit: Fix the QWebHistory serialization auto-test
  Mark QWebFrame::overloadedSlots autotest as expected failure
  QtWebKit: Fix autotests .qrc file paths when built from tests/auto/qweb*
  QtWebKit: Build fix for WinCE.
  Fix the build of webkit examples on platforms without OpenGL and Multimedia
  QtWebKit: Fix build on mac.
  QtWebKit: Fix build on WinCE, adding missing include path.
  QtWebKit: Add missing namespace wrapper temporarily until next import.
  QtWebKit: fix build with qws temporarily until next import.
  Update src/3rdparty/webkit from trunk.
  Fix failing assertions in debug builds
  Fix the build of webkit examples on platforms without OpenGL and Multimedia
  QtWebKit: Fix build on mac.
  QtWebKit: Build fix for WinCE.
  QtWebKit: Fix build on WinCE, adding missing include path.
  QtWebKit: Change the dependency from phonon to QtMultimedia.
  QtWebKit: Add missing namespace wrapper temporarily until next import.
  QtWebKit: fix build with qws temporarily until next import.
  Update src/3rdparty/webkit from trunk.
  ...

7 years agoQtWebKit: Corrects symbols visibility for JavaScriptCore.
Jocelyn Turcotte [Tue, 13 Apr 2010 15:28:45 +0000 (17:28 +0200)]
QtWebKit: Corrects symbols visibility for JavaScriptCore.

Since it is now a static library, this configuration has to
be added explicitely.
This patch should be overwritten by the next WebKit import.

Reviewed-by: Simon Hausmann
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
Qt Continuous Integration System [Tue, 13 Apr 2010 15:20:34 +0000 (17:20 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
  QtWebKit: Fix the QWebHistory serialization auto-test
  Mark QWebFrame::overloadedSlots autotest as expected failure
  QtWebKit: Fix autotests .qrc file paths when built from tests/auto/qweb*
  QtWebKit: Build fix for WinCE.
  Fix the build of webkit examples on platforms without OpenGL and Multimedia
  QtWebKit: Fix build on mac.
  QtWebKit: Fix build on WinCE, adding missing include path.
  QtWebKit: Add missing namespace wrapper temporarily until next import.
  QtWebKit: fix build with qws temporarily until next import.
  Update src/3rdparty/webkit from trunk.
  Fix failing assertions in debug builds
  Fix the build of webkit examples on platforms without OpenGL and Multimedia
  QtWebKit: Fix build on mac.
  QtWebKit: Build fix for WinCE.
  QtWebKit: Fix build on WinCE, adding missing include path.
  QtWebKit: Change the dependency from phonon to QtMultimedia.
  QtWebKit: Add missing namespace wrapper temporarily until next import.
  QtWebKit: fix build with qws temporarily until next import.
  Update src/3rdparty/webkit from trunk.
  QtWebKit: Re-add the dependency to the static linked JavaScriptCore

7 years agoQtWebKit: Fix the QWebHistory serialization auto-test
Jocelyn Turcotte [Tue, 13 Apr 2010 14:19:29 +0000 (16:19 +0200)]
QtWebKit: Fix the QWebHistory serialization auto-test

This patch should be overwritten by the next WebKit import.

Reviewed-by: Kent Hansen
7 years agoMark QWebFrame::overloadedSlots autotest as expected failure
Kent Hansen [Tue, 13 Apr 2010 12:31:04 +0000 (14:31 +0200)]
Mark QWebFrame::overloadedSlots autotest as expected failure

It's been failing in WebKit trunk for a long time (forever?),
and the fix is not entirely trivial.
The expected failure message has the link to the upstream issue,
which has more detailed comments.

Reviewed-by: Jocelyn Turcotte
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Tue, 13 Apr 2010 12:25:05 +0000 (14:25 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (68 commits)
  Skip test for cocoa: setToolTip
  Replaced qWarning with QCOMPARE/QVERIFY statements in tst_QFileInfo
  Assistant: Handle forward/backward mouse buttons on press on Linux.
  Don't test DBus BIC if QT_NO_DBUS is defined.
  qdoc: Fixed some TOC links.
  Removed broken tests from tst_QFileInfo::isSymlink_data()
  qdoc: Added new table of contents for non-class ref pages
  Revert Merge Request 551. This introduces regressions to Qt.
  Fixed scroll area size calculation on Mac.
  Fix a race where QThread::exit() is "lost" when called after start()
  make a partial build of linguist in no-gui config
  make the code less of a trap
  fix build from top level
  Partially revert MR 543 changes to Linguist.
  Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too.
  Autotest: add some debugging, just in case there's something wrong
  Autotest: fix the fix for the rounding error.
  Fix compile error with QT_NO_LIBRARY in QtMultimedia
  the _setmode() prototype is different on win ce
  qdoc: Changed qdoc to output the new doc format.
  ...

7 years agoQtWebKit: Fix autotests .qrc file paths when built from tests/auto/qweb*
Jocelyn Turcotte [Tue, 13 Apr 2010 12:20:06 +0000 (14:20 +0200)]
QtWebKit: Fix autotests .qrc file paths when built from tests/auto/qweb*

Reviewed-by: TrustMe
7 years agoSkip test for cocoa: setToolTip
Morten Johan Sørvig [Tue, 13 Apr 2010 12:02:17 +0000 (14:02 +0200)]
Skip test for cocoa: setToolTip

We need to skip the QWidget::setToolTip test for now since it fails
on Cocoa: The reason is that the test uses QCursor::setPos that ends
up faking a mouse move on mac (which triggers tooltips). And when
the mouse moves, a mouse enter event is delivered to the widget
through cocoa, which will also fake a mouse move event. Until we
know what the best solution is, we chose to skip this test

Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
7 years agoReplaced qWarning with QCOMPARE/QVERIFY statements in tst_QFileInfo
Zeno Albisser [Tue, 13 Apr 2010 09:59:08 +0000 (11:59 +0200)]
Replaced qWarning with QCOMPARE/QVERIFY statements in tst_QFileInfo

Reviewed-by: Joao
7 years agoAssistant: Handle forward/backward mouse buttons on press on Linux.
ck [Tue, 13 Apr 2010 09:06:23 +0000 (11:06 +0200)]
Assistant: Handle forward/backward mouse buttons on press on Linux.

Written-by: kh1
Reviewed-by: ck
7 years agoDon't test DBus BIC if QT_NO_DBUS is defined.
Morten Johan Sørvig [Tue, 13 Apr 2010 10:00:02 +0000 (12:00 +0200)]
Don't test DBus BIC if QT_NO_DBUS is defined.

Change b34817d3fc adds a configure option and
wraps the dbus classes in QT_NO_DBUS. DBus is
off by default on Mac - the BIC test fails for
the missing classes.

Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
7 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Martin Smith [Tue, 13 Apr 2010 09:59:43 +0000 (11:59 +0200)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

7 years agoqdoc: Fixed some TOC links.
Martin Smith [Tue, 13 Apr 2010 09:59:01 +0000 (11:59 +0200)]
qdoc: Fixed some TOC links.

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
Qt Continuous Integration System [Tue, 13 Apr 2010 09:41:25 +0000 (11:41 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
  QtWebKit: Build fix for WinCE.
  Fix the build of webkit examples on platforms without OpenGL and Multimedia
  QtWebKit: Fix build on mac.
  QtWebKit: Fix build on WinCE, adding missing include path.
  QtWebKit: Add missing namespace wrapper temporarily until next import.
  QtWebKit: fix build with qws temporarily until next import.
  Update src/3rdparty/webkit from trunk.
  Fix failing assertions in debug builds
  Fix the build of webkit examples on platforms without OpenGL and Multimedia
  QtWebKit: Fix build on mac.
  QtWebKit: Build fix for WinCE.
  QtWebKit: Fix build on WinCE, adding missing include path.
  QtWebKit: Change the dependency from phonon to QtMultimedia.
  QtWebKit: Add missing namespace wrapper temporarily until next import.
  QtWebKit: fix build with qws temporarily until next import.
  Update src/3rdparty/webkit from trunk.
  QtWebKit: Re-add the dependency to the static linked JavaScriptCore

7 years agoRemoved broken tests from tst_QFileInfo::isSymlink_data()
Zeno Albisser [Tue, 13 Apr 2010 07:21:03 +0000 (09:21 +0200)]
Removed broken tests from tst_QFileInfo::isSymlink_data()

As long as we don't fully support NTFS junctions and volume ids,
these tests would always fail. Further they rely on directories
that are not available on Win7 anymore.

Reviewed-by: Joao
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Iain [Tue, 13 Apr 2010 08:46:39 +0000 (10:46 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7

7 years agoFix qmake.pro after Symbian alternate build system integration
Iain [Tue, 13 Apr 2010 08:40:35 +0000 (10:40 +0200)]
Fix qmake.pro after Symbian alternate build system integration

Symbian makefile build system integration forgot to update qmake.pro

Reviewed-by: Marius Storm-Olsen
7 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Martin Smith [Tue, 13 Apr 2010 08:20:16 +0000 (10:20 +0200)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

7 years agoqdoc: Added new table of contents for non-class ref pages
Martin Smith [Tue, 13 Apr 2010 08:19:26 +0000 (10:19 +0200)]
qdoc: Added new table of contents for non-class ref pages

This feature is not complete in this commit.

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Tue, 13 Apr 2010 04:45:22 +0000 (06:45 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits)
  Revert Merge Request 551. This introduces regressions to Qt.
  Fixed scroll area size calculation on Mac.
  Fix a race where QThread::exit() is "lost" when called after start()
  make a partial build of linguist in no-gui config
  make the code less of a trap
  fix build from top level
  Partially revert MR 543 changes to Linguist.
  Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too.
  Autotest: add some debugging, just in case there's something wrong
  Autotest: fix the fix for the rounding error.
  Fix compile error with QT_NO_LIBRARY in QtMultimedia
  the _setmode() prototype is different on win ce
  qdoc: Changed qdoc to output the new doc format.
  Doc: update 'developing on mac'
  fcntl.h doesn't seem to exist, either - contrary to an example on msdn
  Autotest: fix paths on the test server after update.
  Force the repaint during a window resize.
  fix compile on wince
  remove CONFIG += ordered again
  Assistant: Check namespace and virtual folder syntax of help projects.
  ...

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Tue, 13 Apr 2010 02:24:13 +0000 (04:24 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (147 commits)
  doc fixes
  Don't test XmlListModel examples on platforms without QtXmlPatterns
  More error output for QML_IMPORT_TRACE=1
  Fix declarative examples autotest, avoid using native separators
  Doc: update Rectangle smooth painting screenshot.
  Add some TextInput properties and methods
  Remove GraphicsObjectContainer from the documentation.
  import Qt 4.6 -> import Qt 4.7
  Move documentation code to snippet.
  Test fix.
  Fix test
  Fix test on QWS.
  Fix PathView crash.
  Make bindings dump more useful
  Improve font value type documentation.
  coding conventions
  Doc fixes
  Warning
  Read Maemo orientation at startup
  Exclude gestures from examples autotest
  ...

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 13 Apr 2010 00:06:01 +0000 (02:06 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix compile error
  Don't try to use so much permissions, use something a lot more sane
  A bit saner suggestion
  Remove not needed permissions
  Make compile on Symbian

7 years agodoc fixes
Yann Bodson [Mon, 12 Apr 2010 22:26:12 +0000 (08:26 +1000)]
doc fixes

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
Qt Continuous Integration System [Mon, 12 Apr 2010 21:36:37 +0000 (23:36 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
  QtWebKit: Build fix for WinCE.
  Fix the build of webkit examples on platforms without OpenGL and Multimedia
  QtWebKit: Fix build on mac.
  QtWebKit: Fix build on WinCE, adding missing include path.
  QtWebKit: Add missing namespace wrapper temporarily until next import.
  QtWebKit: fix build with qws temporarily until next import.
  Update src/3rdparty/webkit from trunk.
  Fix failing assertions in debug builds
  Fix the build of webkit examples on platforms without OpenGL and Multimedia
  QtWebKit: Fix build on mac.
  QtWebKit: Build fix for WinCE.
  QtWebKit: Fix build on WinCE, adding missing include path.
  QtWebKit: Change the dependency from phonon to QtMultimedia.
  QtWebKit: Add missing namespace wrapper temporarily until next import.
  QtWebKit: fix build with qws temporarily until next import.
  Update src/3rdparty/webkit from trunk.
  QtWebKit: Re-add the dependency to the static linked JavaScriptCore

7 years agoQtWebKit: Build fix for WinCE.
Jocelyn Turcotte [Wed, 7 Apr 2010 12:25:20 +0000 (14:25 +0200)]
QtWebKit: Build fix for WinCE.

Moved the include of an incompatible header inside platform guard
macros.
This commit should be overwritten with the next WebKit import.

Reviewed-by: Simon Hausmann
7 years agoFix the build of webkit examples on platforms without OpenGL and Multimedia
Simon Hausmann [Thu, 8 Apr 2010 14:47:11 +0000 (16:47 +0200)]
Fix the build of webkit examples on platforms without OpenGL and Multimedia

The QtWebKit module header unconditionally includes QtOpenGL, due to
a syncqt bug.

Apply the same workaround as in

    http://trac.webkit.org/changeset/53627

for OpenGL and Multimedia as link time dependencies for QtWebKit.

Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
7 years agoQtWebKit: Fix build on mac.
Jocelyn Turcotte [Thu, 8 Apr 2010 13:23:17 +0000 (15:23 +0200)]
QtWebKit: Fix build on mac.

- Enables debug_and_release explicitely since qbase.pri does
- Make DESTDIR always go in JavaScriptCore/<configuration>, not
  dependent on the debug_and_release config
- Use different targets for debug and release to prevent file clashes
This commit should be overwritten on the next WebKit import

Reviewed-by: TrustMe
7 years agoQtWebKit: Fix build on WinCE, adding missing include path.
Jocelyn Turcotte [Wed, 7 Apr 2010 10:53:41 +0000 (12:53 +0200)]
QtWebKit: Fix build on WinCE, adding missing include path.

This patch should be overwritten on next import from WebKit.

Reviewed-by: TrustMe
7 years agoQtWebKit: Add missing namespace wrapper temporarily until next import.
Jocelyn Turcotte [Tue, 6 Apr 2010 17:44:49 +0000 (19:44 +0200)]
QtWebKit: Add missing namespace wrapper temporarily until next import.

Rubber-stamped-by: Simon Hausmann
7 years agoQtWebKit: fix build with qws temporarily until next import.
Jocelyn Turcotte [Tue, 6 Apr 2010 16:04:40 +0000 (18:04 +0200)]
QtWebKit: fix build with qws temporarily until next import.

Reviewed-by: Simon Hausmann
7 years agoRevert Merge Request 551. This introduces regressions to Qt.
Thiago Macieira [Mon, 12 Apr 2010 18:55:03 +0000 (20:55 +0200)]
Revert Merge Request 551. This introduces regressions to Qt.

The regressions noticed were:

Mac OS X: qmenu::menuGeometry line 1024 (new test)
QWS and Win32: qmenubar::check_menuPosition line 1508

This reverts commits 6947390 and c1ce854.