qt:qt.git
11 years agoFix loop count in animanted gifs sometimes being incorrect
Simon Hausmann [Mon, 24 Jan 2011 12:06:29 +0000 (13:06 +0100)]
Fix loop count in animanted gifs sometimes being incorrect

Applied patch supplied in QT-4426, which also completes
https://bugs.webkit.org/show_bug.cgi?id=36818

Task-number: QT-4426
Reviewed-by: Kim Motoyoshi Kalland <kim.kalland@nokia.com>
(cherry picked from commit 14e7c8bf3982d05f6fc5c744ebbad791db6ab191)

11 years agoFixed UTF-8 application names in device application menu in Symbian
Miikka Heikkinen [Mon, 24 Jan 2011 10:35:12 +0000 (12:35 +0200)]
Fixed UTF-8 application names in device application menu in Symbian

CHARACTER_SET UTF8 statement was missing from generated .rss file,
causing localized application names containing UTF-8 characters
to be rendered incorrectly.

Task-number: QT-4476
Reviewed-by: axis
(cherry picked from commit 7a5960b2991e9ac33bec0bb359ba825d0c4889af)

11 years agoHTTP: fix digest authentication
Peter Hartmann [Mon, 24 Jan 2011 13:21:18 +0000 (14:21 +0100)]
HTTP: fix digest authentication

no need to extract the realm from the user; with digest authentication
the realm is an attribute of its own.

Reviewed-by: Markus Goetz
Task-number: QTBUG-15070
(cherry picked from commit 1137379e98cab8cc67fac70b31c97001c4473eb0)

11 years agoAvoid possible font name collisions on fbserv
Alessandro Portale [Mon, 24 Jan 2011 20:43:03 +0000 (21:43 +0100)]
Avoid possible font name collisions on fbserv

QTBUG-6611 implemented the long awaited app font support on Symbian. One
of the problems with the underlying Symbian Api for font loading is that
all fonts go into one system wide font store on fbserv. All fonts are
visible to and accessible by every application. And there is no way to
find out if a font is an app font and whose process' app font it is. If
a font with a certain family name is already loaded on fbserv, no other
application can load its font with the same family name. If two
applications access the same font, bad things can happen (details:
QTBUG-16514).

This patch works around naming collisions on the fbserv. It also
prevents Qt applications from using other Qt applications' app fonts. It
does so by "marking" the name of the temporary ttf file before the file
gets loaded by fbserv. All font name strings in the font's 'name' table
get a marker string appended. The marker is composed by a "Q", the uid3,
and on Symbian^3|PR1&below the pid. The marker length is four characters.
When the QFontDatabase is populated, all own app font names are cleand
from the marker, so that the Qt app can use the original font name. Other
applications' app fonts are detected and filtered out of the own font
database.

Symbian's font Api supports only 24 characters as names for font
families. The name marker reduces the effective characters to 20. The
reduced name length is documented for
QFontDatabase::addApplication[FontFromData] as a note.

Since the app font feature is much safer now, it got re-enabled for
Symbian^1 and below by reverting
25ac59fcf1bb03c9af9a2c967218c96c7c77361a .

Task-number: QTBUG-16514
(cherry picked from commit cfb7c16d738993fc8a594361f4bdf10e24fa754a)

11 years agoFix crash in QtScript/JSC stack allocator on Symbian
Kent Hansen [Mon, 24 Jan 2011 14:32:11 +0000 (15:32 +0100)]
Fix crash in QtScript/JSC stack allocator on Symbian

The reserved (virtual) size of the chunk is not necessarily a
multiple of the "pool" size (the physical growth increment).
The reserved size is only rounded up to a multiple of the page
size (4K), not the pool size (64K).

This meant that the commit of the _last_ part of the chunk could
(and did) fail, because we tried to commit 64K while only a size
<64K was remaining.

Detect this case and reduce the requested size accordingly.
Also add a call to CRASH() in case Commit() returns an error,
to avoid obscure crashes in JSC at a later point (grow() must
not fail).

Task-number: QTBUG-16685
Reviewed-by: Simon Hausmann
(cherry picked from commit 81941e4c5dcd18ef04b2b22dd3f1b4c04620647c)

11 years agopositionViewAtIndex can fail when positioned near end of list.
Martin Jones [Fri, 21 Jan 2011 05:03:35 +0000 (15:03 +1000)]
positionViewAtIndex can fail when positioned near end of list.

We positioned the view beyond the bounds, which in some cases resulted
in only one item being created.  Combined with a bug in the bounds
fixup very many items were created.

Task-number: QT-4441
Reviewed-by: Michael Brasser
(cherry picked from commit c3dd455b03a6c03011e2446f69fc262230e91639)

11 years agoBorderImage fails for .sci source containing a URL
Martin Jones [Fri, 21 Jan 2011 05:38:15 +0000 (15:38 +1000)]
BorderImage fails for .sci source containing a URL

Task-number: QTBUG-16769
Reviewed-by: Bea Lam
(cherry picked from commit 7ddec9f3179bfd854ae53e23ab292de1f9a26377)

11 years agoFix memory leak
Aaron Kennedy [Fri, 14 Jan 2011 00:57:21 +0000 (10:57 +1000)]
Fix memory leak

Task-number: QTBUG-16526
(cherry picked from commit 4f9c026a02c2ecf0d19e7aee4ecae82e64cbaee8)

11 years agoRequest font sizes with only 0.5pt resolution.
Martin Jones [Tue, 18 Jan 2011 00:59:34 +0000 (10:59 +1000)]
Request font sizes with only 0.5pt resolution.

When animating pointSize avoid generating a huge number of fonts with
slightly different point sizes.

Task-number: QTBUG-13960
Reviewed-by: Aaron Kennedy
(cherry picked from commit f111e97adf93a933351eb5658b33a5820097757a)

11 years agoRevert "Fix loaded() signal to be emitted only once"
Bea Lam [Fri, 21 Jan 2011 01:39:28 +0000 (11:39 +1000)]
Revert "Fix loaded() signal to be emitted only once"

This reverts commit 82ff3f484c7ec49e60b7fddf23794937974a6768.

QTBUG-16796 reports that this commit is causing regressions
relating to initial sizing of items.

Task-number: QTBUG-16796
(cherry picked from commit 8c3086aa36b51a9731fce8eb8146b33ab8196aed)

11 years agoBuild failure fix (related to QT-4079)
Sami Merila [Mon, 10 Jan 2011 09:32:15 +0000 (11:32 +0200)]
Build failure fix (related to QT-4079)

Change d281cea3a445aa244901decceffd7d653ed829c8 caused build failure,
due to missing comma (one line missing from commit).

Fixed by adding the missing change.

Task-number: QT-4079
Reviewed-by: Miikka Heikkinen
(cherry picked from commit 19b6e2b944a0d1eeef0fb707a00f567e4ee870e6)

11 years agoQWidgets support for VGA screen
Sami Merila [Mon, 10 Jan 2011 08:36:41 +0000 (10:36 +0200)]
QWidgets support for VGA screen

Add pixelmetrics data for QS60Style to support VGA screensizes.

Task-number: QT-4079
Reviewed-by: Miikka Heikkinen
(cherry picked from commit d281cea3a445aa244901decceffd7d653ed829c8)

11 years agoSwitch default Phonon backend on Symbian from Helix to MMF
Gareth Stockwell [Wed, 19 Jan 2011 18:31:38 +0000 (18:31 +0000)]
Switch default Phonon backend on Symbian from Helix to MMF

If both plugins are present on a device, the MMF backend is now
loaded by default.

Task-number: QT-4472
Reviewed-by: Justin McPherson
(cherry picked from commit 808de6fd2f9835c28986b86de829579196b6163d)

11 years agoTextEdit implicit size varied depending upon wrapMode.
Martin Jones [Wed, 19 Jan 2011 01:25:22 +0000 (11:25 +1000)]
TextEdit implicit size varied depending upon wrapMode.

We failed to reset textWidth before calculating the ideal width of
the text.

Task-number: QTBUG-16710
Reviewed-by: Michael Brasser
(cherry picked from commit b481399c1c02a945e816f9385070883a0d795455)

11 years agoFix compilation error.
Jason McDonald [Wed, 19 Jan 2011 14:39:44 +0000 (00:39 +1000)]
Fix compilation error.

Protect #include of feature-specific header in #ifdef.

Task-number: QTBUG-16652
Reviewed-by: Trust Me
Acked-by: Jani Hautakangas
(cherry picked from commit a2ebd9e3f84fb8fcd2be45e91a7c71f146961e23)

11 years agoDo not load aplication fonts on Symbian^1 and below
Alessandro Portale [Wed, 19 Jan 2011 17:49:34 +0000 (18:49 +0100)]
Do not load aplication fonts on Symbian^1 and below

read http://bugreports.qt.nokia.com/browse/QTBUG-16514 for
a recipy to reboot the phone just by handling with fonts.

Symbian^1 is vulnerable, and Symbain^3 prevents a phone reboot.
Therefore, I prefer to disable the app font feature for
Symbian^1, until QTBUG-16514 us properly handled.

Task-Number: QTBUG-16514
(cherry picked from commit 25ac59fcf1bb03c9af9a2c967218c96c7c77361a)

11 years agoSupporting Qt application fonts on Symbian
Alessandro Portale [Wed, 19 Jan 2011 12:16:13 +0000 (13:16 +0100)]
Supporting Qt application fonts on Symbian

This patch finally implements the missing application font support on
Symbian. QFontDatabase's addApplicationFont[FromData],
applicationFontFamilies and removeApplicationFont are now functional and
allow an application to load, use and unload fonts at run-time.

The underlying Symbian API comes with some restrictions/specialties.
Most of them are worked around in this patch, the missing ones are left
as part of QTBUG-16514:

- The font file must be a file, not a memory buffer. Web fonts and qrc
fonts come as memory buffers. These buffers are saved to a temporary
.ttf file and the file is loaded by the underlying Symbian API. The
temporary file can only be deleted after the font is unloaded.

- The font file must be in a public location in order to be loadable by
Symbian. It can for example not reside in the private application
directory. Therefore, all application fonts (also those that are on the
file system) become a temporary .ttf file in c:\temp\.

- Symbian3/PR2 will come with a font table API which provides direct
access to font tables. Symbian3/PR1 and below are missing this API,
therefore, an own TFontStore is (ab)used to read font tables out of a
font. This patch is considering both code paths in several occasions,
making the Qt Symbian font implementation significantly less
maintainable.

- The fonts are loaded into Symbian's central font server. Loaded fonts
from different processes can have colliding font typeface names (not
file names) on that server. The server does not separate loaded fonts by
their origin processes. Working around such collisions is part of
QTBUG-16514.

The number of fonts loadable at the same time by a Qt application is
limited to the random value 5. Just to prevent abuse of the font
server's memory.

As usual, this patch was looked at by colleagues, and it was adjusted
according to the feedback. But since the bus factor for the
interaction of Qt's and Symbian's font systems is 1, I reviewed this
patch, myself.

Task-Number: QTBUG-6611
Autotest: tst_QFontDatabase::addAppFont
(cherry picked from commit 770fb729929764a1f1c5fbd3d54714cf811c81e0)

11 years agoFix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005f
Jan-Arve Sæther [Fri, 17 Dec 2010 13:41:43 +0000 (14:41 +0100)]
Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005f

The bug has been around for a while, but change 604c51f1fc5c7 made it
emerge.
The problem was that stretches were combined by always *maxing* them.
The values of 'stretch' can be interpreted as this:

-1: (the default) it means that the items should be stretched with
    the stretch factor dervived from the size hints. (In practice this
    means that they are distributed fairly).
 0: Means that the item should not be stretched
>0: Means that the item should be stretch with that number as a factor.

This meant that combining one item with a fixed size(0) and another
item with a default stretch (-1) the combined row stretch would end
up being fixed.

This also fixes how stretches are combined for spanning items too.

Task-number: QTBUG-13551
Reviewed-by: John Tapsell
(cherry picked from commit 7fbf1829e11504eca6a55f1e5dbddf2f658b5302)

11 years agoFix header not found build error
Shane Kearns [Mon, 17 Jan 2011 12:44:06 +0000 (12:44 +0000)]
Fix header not found build error

Task-Number: QT-4378
(cherry picked from commit 1de7a573c1f407d5126cf6ee1e25b4f92cbdda3c)

11 years agoWorkaround crash when multiple QNetworkAccessManager instances are used
Shane Kearns [Wed, 5 Jan 2011 11:07:56 +0000 (11:07 +0000)]
Workaround crash when multiple QNetworkAccessManager instances are used

Instead of each QNetworkAccessManager owning a QNetworkSession, they now
share a QNetworkSession if they have the same QNetworkConfiguration.
QNetworkAccessManager now uses passive roaming instead of application
level roaming. The state change signal (entering connected state) is used
to indicate reconnection instead of being triggered when sending an ALR
accept().
This preserves the previous behaviour, as QNAM always accepted the
suggested access point from bearer mobility.
In the case of multithreaded applications, one QNetworkSession will be
created for each thread which uses QNetworkAccessManager, as QNetworkSession
is not thread safe.

Task-number: QT-4378
Reviewed-by: Markus Goetz
Reviewed-by: juhvu
(cherry picked from commit ec4b73992eb7fb7254bb7a1524b8691ef2123b9f)

11 years agoFix to data detaching in OpenVG pixmap data
Jani Hautakangas [Tue, 18 Jan 2011 08:59:34 +0000 (10:59 +0200)]
Fix to data detaching in OpenVG pixmap data

QImage::converToFormat(format) won't detach QImage if
format stays the same. Because of this, internal QImage
buffer of QVGPixmapData was not deep copied. Drawing
to QPixmap target modified the original QImage that was
used to create QPixmap and in some cases crashed because
paint engine referred to wrong target.

Task-number: QT-4407
Reviewed-by: Jason Barron
(cherry picked from commit b928bab9dde43cf3acace6dfae0ae6a4f6649650)

11 years agoRemove toolcheck from generic clean targets for symbian-sbsv2
Miikka Heikkinen [Tue, 18 Jan 2011 09:44:29 +0000 (11:44 +0200)]
Remove toolcheck from generic clean targets for symbian-sbsv2

Toolcheck can cause generic clean fail (i.e. "make clean" or
"make debug-clean") for e.g. environments where Carbide command
line tools have not been installed, because sbsv2 toolchain does a
check for all tools related to target platforms, even though they are
not needed for actual cleaning.

Task-number: QTBUG-16691
Reviewed-by: Janne Koskinen
(cherry picked from commit c756d5cffdc31228b9ab9388c307bf4eb705b923)

11 years agoDon't crash Qt Creator when debugging an object alias
Aaron Kennedy [Thu, 13 Jan 2011 04:40:31 +0000 (14:40 +1000)]
Don't crash Qt Creator when debugging an object alias

Task-number: QTBUG-16131
(cherry picked from commit 3526db3b8832c357b368014e6c8ebab63d4071da)

11 years agoQTBUG-16110 updating the softkeys when app comes to foreground
mread [Mon, 17 Jan 2011 10:52:14 +0000 (10:52 +0000)]
QTBUG-16110 updating the softkeys when app comes to foreground

When an app is in the background and creates a window with softkeys,
the softkeys are not updated when the app comes to the foreground, so
they look faded. This change updates the softkeys when the app comes
to the forground.

Task-number: QTBUG-16110
Reviewed-by: Jason Barron
(cherry picked from commit 37faa3ba7c66d14e1ecbf75e93d9f0d27fa57a76)

11 years agoFix one character displacement for cursor in line edits
Miikka Heikkinen [Mon, 17 Jan 2011 13:44:44 +0000 (15:44 +0200)]
Fix one character displacement for cursor in line edits

The variable m_inlinePosition was not updated when m_preeditString
was cleared in QCoeFepInputContext. This resulted in cursor displaying
up one character beyond where it logically should have been when
using HW Qwerty keyboard on E7 and similar devices.

Task-number: QTBUG-16238
Reviewed-by: axis
(cherry picked from commit 81351f2c6f9a939e4c34cb3be6280d396c21941f)

11 years agoFix double click event on Mac OS X.
Fabien Freling [Thu, 9 Dec 2010 12:55:32 +0000 (13:55 +0100)]
Fix double click event on Mac OS X.

Fix an issue where the double click would be
triggered even with different mouse buttons.

Task-number: QTBUG-8222
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit 4ea4bcc2ddea6fc6899c14bb50b22f58b51bf7ca)

11 years agoProper fix for QGraphicsItem crash.
Yoann Lopes [Thu, 13 Jan 2011 14:16:03 +0000 (15:16 +0100)]
Proper fix for QGraphicsItem crash.

See 8ffb49a4ac68b1c243b25343053e6e99f97ec2e7

Task-number: QTBUG-16374
Reviewed-by: TrustMe
(cherry picked from commit 46ede046a34c822c612c55fdb1dc93dffe3fc6b6)

11 years agofixed CI gate flagged spelling error: occured -> occurred
Jeremy Katz [Sun, 16 Jan 2011 18:14:54 +0000 (19:14 +0100)]
fixed CI gate flagged spelling error: occured -> occurred
(cherry picked from commit c3d2d583121219836714609b250e4e52e33e393d)

11 years agovarious fixes to deal with CI gate failures
Jeremy Katz [Fri, 14 Jan 2011 13:23:56 +0000 (14:23 +0100)]
various fixes to deal with CI gate failures
(cherry picked from commit deef2cb5e01b871008b08b81691ad4a46deca328)

11 years agoFix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static
Jeremy Katz [Thu, 13 Jan 2011 12:43:56 +0000 (13:43 +0100)]
Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static

The test failed to build because QNetworkProxyFactory can't be instantiated
(pure virtual member queryProxy()), but doing so isn't necessary. The test
has also been removed from the network tests because it relies on a static
configuration, but can not guarantee that the configuration exists.
(cherry picked from commit 4d0cd05e98c3e83a4d1871c139cd8b4a2a86e988)

11 years agoQNetworkProxyFactory::systemProxyForQuery() for Symbian
Jyrki Jaakkola [Wed, 12 Jan 2011 17:23:10 +0000 (18:23 +0100)]
QNetworkProxyFactory::systemProxyForQuery() for Symbian
(cherry picked from commit 3c5eb8766e73c855782552f7c6472801e8ae820c)

11 years agoFix ConnMan bearer plugin to use new net.connman service name.
Leena Gunda [Thu, 9 Dec 2010 05:54:24 +0000 (11:24 +0530)]
Fix ConnMan bearer plugin to use new net.connman service name.
(cherry picked from commit 8eab49de0548363b18c6e2c7b4ff4a8b722992d6)

11 years agoFix QSystemSemaphore handle management issues in Symbian
Miikka Heikkinen [Thu, 13 Jan 2011 13:52:17 +0000 (15:52 +0200)]
Fix QSystemSemaphore handle management issues in Symbian

QSystemSemaphore native RSemaphore handle was unnecessarily created
again on each acquire. The creation logic was also susceptible for
random failures when two or more threads tried simultaneously acquire
the semaphore.

Task-number: QTBUG-16615
Reviewed-by: Janne Koskinen
(cherry picked from commit 570e7b38487455d394b5b74a59edc639f3dc416f)

11 years agoFixed build failure on platforms other than Symbian
Gareth Stockwell [Wed, 12 Jan 2011 13:55:17 +0000 (13:55 +0000)]
Fixed build failure on platforms other than Symbian

Reviewed-by: Ruth Sadler
(cherry picked from commit 124ad6e903767fae510e0c2f0aba4029564a95c8)

11 years agoFixed resource leak in Phonon MMF backend
Ruth Sadler [Tue, 11 Jan 2011 10:57:41 +0000 (10:57 +0000)]
Fixed resource leak in Phonon MMF backend

Task-number: QTBUG-16513
Reviewed-by: Gareth Stockwell
(cherry picked from commit b58eb0419f9f724af5d9baf8bbce4e0f1e2f3f8b)

11 years agoAllow IAP to be selected in Phonon MMF backend
Ruth Sadler [Tue, 11 Jan 2011 10:32:46 +0000 (10:32 +0000)]
Allow IAP to be selected in Phonon MMF backend

The Phonon API does not provide any way for the client to specify
which network connection should be used for streaming playback.
If the application already has a connection open, using a bearer
other than the default (e.g. using WiFi when the device default is
GPRS), it may be desirable to use it for streaming, rather than
allowing the Phonon backend to open a second connection on the
default bearer.

This patch adds a custom property on the Phonon::MediaObject,
called InternetAccessPointName.  The client can specify the IAP
which Phonon should use by setting this property.

Note that support for this property is only provided in the Phonon
MMF backend.

Task-number: QTBUG-11436
Reviewed-by: Gareth Stockwell
(cherry picked from commit 1640acce5ca8f49c5655edffa2a1108048c5a414)

11 years agoFix qglthreads test crash on Symbian
Jani Hautakangas [Tue, 11 Jan 2011 13:26:22 +0000 (15:26 +0200)]
Fix qglthreads test crash on Symbian

Use less GPU memory to make tests pass and skip
threaded rendering since eventually tries to access
main RWindow from secondary thread, which is not allowed
on Symbian

Task-number: QTBUG-13525
Reviewed-by: TRUSTME
(cherry picked from commit e49868217e29f13dba28a2fe199d82268655b9fb)

11 years agorebuild configure
Oswald Buddenhagen [Tue, 11 Jan 2011 14:42:43 +0000 (15:42 +0100)]
rebuild configure
(cherry picked from commit 5d8a544b34e04d30901658aece96040e252f3b7d)

11 years agoSetting WA_TranslucentBackground after winid() is ineffective on Symbian.
Jani Hautakangas [Mon, 10 Jan 2011 11:22:15 +0000 (13:22 +0200)]
Setting WA_TranslucentBackground after winid() is ineffective on Symbian.

Currently Symbian doesn't support semi-transparent EGL surfaces.
WA_TranslucentBackground attribute is ineffective if set after EGL
surface creation. To enable translucency in this case we need to
recreate backing store to get raster surface which supports translucency.

Task-number: QT-4416
Reviewed-by: Jason Barron
(cherry picked from commit d62e9f4a6fe199ae790b1561fd4ba9ea84bd4d1e)

11 years agoOpenVG paint engine doesn't draw glyphs well to non-integer offsets.
Jani Hautakangas [Tue, 11 Jan 2011 11:14:23 +0000 (13:14 +0200)]
OpenVG paint engine doesn't draw glyphs well to non-integer offsets.

Solution is to round adjustment offsets to integer values to prevent
blurry text.

Task-number: QTBUG-16240
Reviewed-by: Alessandro Portale
(cherry picked from commit e0ed2387bc818f11b16460b0150d4ea75bcf37d6)

11 years agoUpdate copyright year to 2011.
Jason McDonald [Mon, 10 Jan 2011 15:31:53 +0000 (01:31 +1000)]
Update copyright year to 2011.

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

11 years agoFix handle leak in symbian QTimer implementation
Shane Kearns [Fri, 7 Jan 2011 15:57:28 +0000 (15:57 +0000)]
Fix handle leak in symbian QTimer implementation

The timer handle was only being closed when a timer was cancelled,
which resulted in a leak for one shot timers that have completed normally.

Instead the timer is now closed in a destructor (closing null handles is
safe, so it doesn't matter if the handle was never created - e.g. in the
case of a zero timer)
Also added a handle check before creating a timer to prevent a leak in
case the start function is called twice in the backend.

Task-number: QTBUG-16380
Reviewed-by: mread
(cherry picked from commit 2b1b617664bfc78f6e95e53dc0f9749bd1f2d27a)

11 years agoFix crash in QTextBlock::next()/previous()
Jiang Jiang [Fri, 7 Jan 2011 15:15:25 +0000 (16:15 +0100)]
Fix crash in QTextBlock::next()/previous()

We should check not just p but also n in next()/previous(),
which is what isValid() does. Otherwise n == 0 will cause
crash in QFragmentMap.

Task-number: QTBUG-16279
Reviewed-by: Eskil
(cherry picked from commit 64852122ba71bbb297b4f1e440f6fabee16ca2fe)

11 years agoFix regression in text rendering in OpenGL2 engine
Eskil Abrahamsen Blomfeldt [Tue, 4 Jan 2011 14:35:58 +0000 (15:35 +0100)]
Fix regression in text rendering in OpenGL2 engine

Change 532115bcaa370af827a5cbad017b272842c5aacf introduced a regression
by fixing a typo in the QT_OPENGL_ES_2 macro. This caused a broken
and untested code path to be used in the GLES2 case. Since the QImage
scanlines are 32 bit aligned, QImage::width() cannot be used when
copying the data. Rather than pass in bytesPerLine() to the GL function,
I opted to revert to the proven behavior, where the pad bytes are never
read by GL but each scanline is copied separately, to avoid further
regressions on different hardware. This also seems like the more correct
approach, as the pad bytes should ideally not be copied into the cache
texture.

Reviewed-by: Samuel
(cherry picked from commit 7a54885b1df9baf793374e3cb9fdf8be93ee7c80)

11 years agoFix for qtdemo bug
Jerome Pasion [Mon, 10 Jan 2011 10:06:48 +0000 (11:06 +0100)]
Fix for qtdemo bug

Task-number: QTBUG-15931
Reviewed-by: Kevin Wright
(cherry picked from commit 963ada5805d61e318a04295b6d06e527b49cdb7a)

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Mon, 10 Jan 2011 07:03:51 +0000 (17:03 +1000)]
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:
  Update pathview test

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Alan Alpert [Mon, 10 Jan 2011 04:35:11 +0000 (14:35 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

11 years agoUpdate pathview test
Alan Alpert [Mon, 10 Jan 2011 04:32:41 +0000 (14:32 +1000)]
Update pathview test

This updates the tests to match the correct behaviour as of
1ba3e41f09ea719249286fede5d3fe96621ccb61

Task-number: QTBUG-16357

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Mon, 10 Jan 2011 03:39:54 +0000 (13:39 +1000)]
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:
  Fix loaded() signal to be emitted only once

11 years agoFix loaded() signal to be emitted only once
Bea Lam [Mon, 10 Jan 2011 02:13:00 +0000 (12:13 +1000)]
Fix loaded() signal to be emitted only once

Task-number: QTBUG-16319
Reviewed-by: Martin Jones
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Mon, 10 Jan 2011 00:42:03 +0000 (10:42 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  network tests: make IMAP, FTP testdata more flexible.
  Remove garbage empty test.
  tst_networkselftest: add checks for echo, daytime

11 years agonetwork tests: make IMAP, FTP testdata more flexible.
Rohan McGovern [Thu, 6 Jan 2011 03:39:14 +0000 (13:39 +1000)]
network tests: make IMAP, FTP testdata more flexible.

Move all hardcoded IMAP/FTP fixtures into network-settings.h.
Make it work with new and old network test server.

Reviewed-by: Markus Goetz
Task: QTBUG-15114

11 years agoRemove garbage empty test.
Rohan McGovern [Tue, 4 Jan 2011 04:30:19 +0000 (14:30 +1000)]
Remove garbage empty test.

11 years agotst_networkselftest: add checks for echo, daytime
Rohan McGovern [Fri, 31 Dec 2010 01:44:38 +0000 (11:44 +1000)]
tst_networkselftest: add checks for echo, daytime

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 7 Jan 2011 23:49:48 +0000 (09:49 +1000)]
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:
  CLucene: Use the right delete operator.
  Examples: Fix compilation with namespace.
  fix build with QT_NO_BEARERMANAGEMENT

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Fri, 7 Jan 2011 20:06:36 +0000 (06:06 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fixes crash in QGraphicsItem's destructor.
  Doc: Fixing typo

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
Qt Continuous Integration System [Fri, 7 Jan 2011 17:05:58 +0000 (03:05 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Fix crash when closing QFontDialog::getFont() dialog
  Fix timer warning when deleting item views
  Remove support for automatic tactile feedback from QS60Style
  Remove warning about null cursor handle on S60 while handle is valid

11 years agoCLucene: Use the right delete operator.
Christian Kandeler [Fri, 7 Jan 2011 15:43:46 +0000 (16:43 +0100)]
CLucene: Use the right delete operator.

Task-number: QTBUG-15787
Task-number: QTBUG-15788

11 years agoExamples: Fix compilation with namespace.
Christian Kandeler [Fri, 7 Jan 2011 15:42:16 +0000 (16:42 +0100)]
Examples: Fix compilation with namespace.

11 years agofix build with QT_NO_BEARERMANAGEMENT
Peter Hartmann [Fri, 7 Jan 2011 15:17:13 +0000 (16:17 +0100)]
fix build with QT_NO_BEARERMANAGEMENT

start() is only defined when using bearer management; that method calls
open(), which we just call directly if not using bearer.

Reviewed-by: Markus Goetz
Task-number: QTBUG-16477

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 7 Jan 2011 14:07:04 +0000 (00:07 +1000)]
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:
  tst_qnetworkreply: Add EXPECT_FAIL for ioGetFromBuiltinHttp
  Revert "Fix QNetworkReply autotest cases for QT-3494"
  Revert "QNAM HTTP: Fix missing error() signal"
  licensing: exclude generated cookie jar table from license check
  fix include path
  fix build with namespaces in new cookie jar table
  cookie jar code: enhance security by keeping track of effective TLDs
  Add support for QMetaType::QVariant in ActiveQt
  Fix QNetworkReply autotest cases for QT-3494
  Add compiler optimization for QtScript/JSC on Symbian
  improve performance of QTextEngine, esp. setBoundary by using non-detaching operator[]
  Improve docs for QTEST_MAIN macro.
  Work around an apparent GCC optimiser bug accessing arrays beyond end
  Do not crash in case a future version of libdbus has a new kind of message.
  Docs: QTBUG-9150 Incorrect snippet in class doc.
  tst_headers: make failure more detailed when failing to open a file
  Fix number of chapters in qtestlib tutorial.
  Fixed QStatusBar not to repaint itself too early
  QNAM HTTP: Fix missing error() signal
  Make it clear which security updates are needed for Visual Studio 2005.

11 years agoFixes crash in QGraphicsItem's destructor.
Yoann Lopes [Fri, 7 Jan 2011 13:29:38 +0000 (14:29 +0100)]
Fixes crash in QGraphicsItem's destructor.

Crash introduced by 783a278f243c6411f5f32d11f2165b9eed9b6f8c.
Autotest written by Niklas Kurkisuo <ext-niklas.kurkisuo@nokia.com>

Task-number: QTBUG-16374
Reviewed-by: TrustMe
11 years agoDoc: Fixing typo
Sergio Ahumada [Fri, 7 Jan 2011 11:37:12 +0000 (12:37 +0100)]
Doc: Fixing typo

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Fri, 7 Jan 2011 11:04:43 +0000 (21:04 +1000)]
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:
  QmlViewer: Remove unused class variables

11 years agotst_qnetworkreply: Add EXPECT_FAIL for ioGetFromBuiltinHttp
Markus Goetz [Fri, 7 Jan 2011 10:41:19 +0000 (11:41 +0100)]
tst_qnetworkreply: Add EXPECT_FAIL for ioGetFromBuiltinHttp

Reviewed-by: Peter Hartmann
11 years agoRevert "Fix QNetworkReply autotest cases for QT-3494"
Markus Goetz [Fri, 7 Jan 2011 10:31:20 +0000 (11:31 +0100)]
Revert "Fix QNetworkReply autotest cases for QT-3494"

We don't think this is the right fix.
This reverts commit 5d18d393808d7a4be56eb00ab9f1e9cda9e211c9.

11 years agoRevert "QNAM HTTP: Fix missing error() signal"
Markus Goetz [Fri, 7 Jan 2011 10:26:52 +0000 (11:26 +0100)]
Revert "QNAM HTTP: Fix missing error() signal"

We don't think this is the right solution.
This reverts commit de72670c620e1193fa875bf1a4adee553700bacb.

11 years agoMerge branch 'review-4.7' into staging-4.7
Gabriel de Dietrich [Fri, 7 Jan 2011 10:16:57 +0000 (11:16 +0100)]
Merge branch 'review-4.7' into staging-4.7

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Fri, 7 Jan 2011 07:51:45 +0000 (17:51 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fixed bug and performance problem in windowsstyle.
  Restored old flushing behavior in -graphicssystem opengl on desktop.

11 years agoQmlViewer: Remove unused class variables
Kai Koehne [Fri, 7 Jan 2011 07:47:51 +0000 (08:47 +0100)]
QmlViewer: Remove unused class variables

11 years agoFixed bug and performance problem in windowsstyle.
Samuel Rødal [Thu, 6 Jan 2011 12:09:14 +0000 (13:09 +0100)]
Fixed bug and performance problem in windowsstyle.

QImage::fill(Qt::transparent) pre-4.8 is a bug, also using Format_ARGB32
is very unoptimal compared to Format_ARGB32_Premultiplied.

Task-number: QTBUG-16439
Reviewed-by: Eskil Abrahamsen Blomfeldt
11 years agoRestored old flushing behavior in -graphicssystem opengl on desktop.
Samuel Rødal [Wed, 5 Jan 2011 07:25:56 +0000 (08:25 +0100)]
Restored old flushing behavior in -graphicssystem opengl on desktop.

Change 284211ccbd2cbd recently introduced a fix for EGL, to prevent
flushing when nothing has been rendered into the back buffer. However,
the skip should only be done when there's no partial update support in
the window surface. If there is partial update support we can still
flush as usual.

Reviewed-by: Gunnar Sletta
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 6 Jan 2011 22:17:58 +0000 (08:17 +1000)]
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:
  licensing: exclude generated cookie jar table from license check
  fix include path
  fix build with namespaces in new cookie jar table
  cookie jar code: enhance security by keeping track of effective TLDs
  Add support for QMetaType::QVariant in ActiveQt
  Fix QNetworkReply autotest cases for QT-3494
  Add compiler optimization for QtScript/JSC on Symbian
  improve performance of QTextEngine, esp. setBoundary by using non-detaching operator[]
  Improve docs for QTEST_MAIN macro.
  Work around an apparent GCC optimiser bug accessing arrays beyond end
  Do not crash in case a future version of libdbus has a new kind of message.
  Docs: QTBUG-9150 Incorrect snippet in class doc.
  tst_headers: make failure more detailed when failing to open a file
  Fix number of chapters in qtestlib tutorial.
  Fixed QStatusBar not to repaint itself too early
  QNAM HTTP: Fix missing error() signal
  Make it clear which security updates are needed for Visual Studio 2005.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 6 Jan 2011 19:11:35 +0000 (05:11 +1000)]
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 KERN-EXEC 0 panic on exit when bearer is searching for WLANs

11 years agolicensing: exclude generated cookie jar table from license check
Peter Hartmann [Thu, 6 Jan 2011 16:04:37 +0000 (17:04 +0100)]
licensing: exclude generated cookie jar table from license check

This file is generated from the Public Suffix List, and thus under a
different license.

Reviewed-by: Markus Goetz
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Thu, 6 Jan 2011 15:46:03 +0000 (01:46 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Designer: Block QEvent::WinIdChange.
  QUrl::setUrl should call detach
  qkeymapper_x11.cpp: fix compilation with LSB and without XKB

11 years agoFix KERN-EXEC 0 panic on exit when bearer is searching for WLANs
Shane Kearns [Thu, 6 Jan 2011 15:16:03 +0000 (15:16 +0000)]
Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANs

The access point scanner cancels itself in the destructor.
This requires the handle to be valid, but it was closed in the symbian
engine destructor immediately before deleting the AP scanner.
Because of the way symbian active objects work, the crashing function
is only called if there was an asynchronous request in progress.
So it could be missed in cases where the scan completes faster than the
test case.

Task-number: QTBUG-16484
Reviewed-by: Markus Goetz
11 years agoDesigner: Block QEvent::WinIdChange.
Friedemann Kleint [Thu, 6 Jan 2011 14:34:48 +0000 (15:34 +0100)]
Designer: Block QEvent::WinIdChange.

As it causes an obscure deletion crash related to
the formeditor rubberband on Mac.

Reviewed-by: con
11 years agoQUrl::setUrl should call detach
Olivier Goffart [Thu, 6 Jan 2011 13:51:04 +0000 (14:51 +0100)]
QUrl::setUrl should call detach

Task-number: QTBUG-16425
Reviewed-by: Gabriel
Reviewed-by: Markus Goetz
11 years agoqkeymapper_x11.cpp: fix compilation with LSB and without XKB
Olivier Goffart [Thu, 6 Jan 2011 13:01:53 +0000 (14:01 +0100)]
qkeymapper_x11.cpp: fix compilation with LSB and without XKB

Task-number: QTBUG-16312
Reviewed-by: Marius Storm-Olsen
11 years agofix include path
Mark Brand [Thu, 6 Jan 2011 12:51:55 +0000 (13:51 +0100)]
fix include path

In many situations building succeeds without explicity including
this dir in the include path, probably due to a side-effect of
calling uic on the form in this project. However, it is known
to fail at least on mingw-cross-env. Anyway, it makes sense
to explcitly add this dir to the include path since a needed
header resides here.

Merge-request: 1016
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 6 Jan 2011 12:40:13 +0000 (22:40 +1000)]
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:
  fix build with namespaces in new cookie jar table
  cookie jar code: enhance security by keeping track of effective TLDs
  Add support for QMetaType::QVariant in ActiveQt
  Fix QNetworkReply autotest cases for QT-3494
  Add compiler optimization for QtScript/JSC on Symbian
  improve performance of QTextEngine, esp. setBoundary by using non-detaching operator[]
  Improve docs for QTEST_MAIN macro.
  Work around an apparent GCC optimiser bug accessing arrays beyond end
  Do not crash in case a future version of libdbus has a new kind of message.
  Docs: QTBUG-9150 Incorrect snippet in class doc.
  tst_headers: make failure more detailed when failing to open a file
  Fix number of chapters in qtestlib tutorial.
  Fixed QStatusBar not to repaint itself too early
  QNAM HTTP: Fix missing error() signal
  Make it clear which security updates are needed for Visual Studio 2005.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 6 Jan 2011 09:28:55 +0000 (19:28 +1000)]
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:
  PathView crashed when the path is provided with undefined values.
  PathView: update modelCount before attempting to regenerate delegates.

11 years agofix build with namespaces in new cookie jar table
Peter Hartmann [Thu, 6 Jan 2011 08:51:29 +0000 (09:51 +0100)]
fix build with namespaces in new cookie jar table

forgot the QT_END_NAMESPACE macro.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 6 Jan 2011 08:50:56 +0000 (18:50 +1000)]
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:
  cookie jar code: enhance security by keeping track of effective TLDs
  Add support for QMetaType::QVariant in ActiveQt
  Fix QNetworkReply autotest cases for QT-3494
  Add compiler optimization for QtScript/JSC on Symbian
  improve performance of QTextEngine, esp. setBoundary by using non-detaching operator[]
  Improve docs for QTEST_MAIN macro.
  Work around an apparent GCC optimiser bug accessing arrays beyond end
  Do not crash in case a future version of libdbus has a new kind of message.
  Docs: QTBUG-9150 Incorrect snippet in class doc.
  tst_headers: make failure more detailed when failing to open a file
  Fix number of chapters in qtestlib tutorial.
  Fixed QStatusBar not to repaint itself too early
  QNAM HTTP: Fix missing error() signal
  Make it clear which security updates are needed for Visual Studio 2005.

11 years agoPathView crashed when the path is provided with undefined values.
Martin Jones [Thu, 6 Jan 2011 06:57:06 +0000 (16:57 +1000)]
PathView crashed when the path is provided with undefined values.

Task-number: QTBUG-16356
Reviewed-by: Bea Lam
11 years agoPathView: update modelCount before attempting to regenerate delegates.
Martin Jones [Thu, 6 Jan 2011 05:48:52 +0000 (15:48 +1000)]
PathView: update modelCount before attempting to regenerate delegates.

If the model is a VisualDataModel, the count will initally be zero
and modelCount is not updated due to itemsInserted() before the
component is completed.

Task-number: QTBUG-16357
Reviewed-by: Bea Lam
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 6 Jan 2011 05:33:51 +0000 (15:33 +1000)]
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:
  Update docs - calling overloaded functions from QML is now supported
  Doc fixes for introduction page and Item docs

11 years agoUpdate docs - calling overloaded functions from QML is now supported
Bea Lam [Thu, 6 Jan 2011 04:10:35 +0000 (14:10 +1000)]
Update docs - calling overloaded functions from QML is now supported

11 years agoDoc fixes for introduction page and Item docs
Bea Lam [Thu, 6 Jan 2011 01:16:49 +0000 (11:16 +1000)]
Doc fixes for introduction page and Item docs

Moved 'Identity' and 'Property Change Signals' sections from Item
docs to the intro page, which previously had a section on ids but
this has been moved out of the 'Properties' section since an id isn't
an ordinary property.

11 years agocookie jar code: enhance security by keeping track of effective TLDs
Peter Hartmann [Fri, 19 Nov 2010 14:24:35 +0000 (15:24 +0100)]
cookie jar code: enhance security by keeping track of effective TLDs

The problem was the following: According to the cookie RFC, domains must
have at least one dot in their name for setting a cookie (e.g. domain
example.com can set a cookie for ".example.com" but not for ".com").
The problem is: Following this rule, one could still set "supercookies"
for e.g. ".co.uk".
The solution is to generate a table from
http://publicsuffix.org which maintains a list of all "effective" TLDs
like e.g. ".co.uk".

Reviewed-by: Olivier Goffart
Task-number: QTBUG-14706

11 years agoAdd support for QMetaType::QVariant in ActiveQt
Prasanth Ullattil [Wed, 5 Jan 2011 14:19:07 +0000 (15:19 +0100)]
Add support for QMetaType::QVariant in ActiveQt

Previously when we convert the typename "QVariant" to QVaraint::Type,
it returns QVariant::Invalid. From Qt 4.7 onwards, it will return
QVariant::UserType.

Task-number: QTBUG-15157
Reviewed-by: Martin Petersson
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 5 Jan 2011 09:09:11 +0000 (19:09 +1000)]
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:
  Fix QNetworkReply autotest cases for QT-3494
  Add compiler optimization for QtScript/JSC on Symbian
  improve performance of QTextEngine, esp. setBoundary by using non-detaching operator[]
  Improve docs for QTEST_MAIN macro.
  Work around an apparent GCC optimiser bug accessing arrays beyond end
  Do not crash in case a future version of libdbus has a new kind of message.
  Docs: QTBUG-9150 Incorrect snippet in class doc.
  tst_headers: make failure more detailed when failing to open a file
  Fix number of chapters in qtestlib tutorial.
  Fixed QStatusBar not to repaint itself too early
  QNAM HTTP: Fix missing error() signal
  Make it clear which security updates are needed for Visual Studio 2005.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 5 Jan 2011 05:51:17 +0000 (15:51 +1000)]
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:
  Fix outdated tests

11 years agoFix outdated tests
Alan Alpert [Wed, 5 Jan 2011 05:41:56 +0000 (15:41 +1000)]
Fix outdated tests

selftest_noimages and qdeclarativespringanimation were correct, updating
test scripts to match.

Task-number: QTBUG-14792

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Tue, 4 Jan 2011 21:42:35 +0000 (07:42 +1000)]
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:
  Fix QNetworkReply autotest cases for QT-3494
  Add compiler optimization for QtScript/JSC on Symbian
  improve performance of QTextEngine, esp. setBoundary by using non-detaching operator[]
  Improve docs for QTEST_MAIN macro.
  Work around an apparent GCC optimiser bug accessing arrays beyond end
  Do not crash in case a future version of libdbus has a new kind of message.
  Docs: QTBUG-9150 Incorrect snippet in class doc.
  tst_headers: make failure more detailed when failing to open a file
  Fix number of chapters in qtestlib tutorial.
  Fixed QStatusBar not to repaint itself too early
  QNAM HTTP: Fix missing error() signal
  Make it clear which security updates are needed for Visual Studio 2005.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 4 Jan 2011 16:26:46 +0000 (02:26 +1000)]
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 def file names for libinfixed testlib
  Generate freeze targets in Symbian

11 years agoFix def file names for libinfixed testlib
Miikka Heikkinen [Tue, 4 Jan 2011 15:16:03 +0000 (17:16 +0200)]
Fix def file names for libinfixed testlib

Reviewed-by: Janne Koskinen
11 years agoGenerate freeze targets in Symbian
Miikka Heikkinen [Tue, 4 Jan 2011 14:20:55 +0000 (16:20 +0200)]
Generate freeze targets in Symbian

Make it possible to freeze def files via makefile targets.

Task-number: QTBUG-13769
Reviewed-by: Janne Koskinen
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Tue, 4 Jan 2011 13:00:21 +0000 (23:00 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  QMeeGoGraphicsSystemHelper::setSwapBehavior implementation.
  Support for swap modes in QGLWindowSurface.
  Pre-create the GL share widget before window surface creation.
  QMeeGoSwitchEvent exported and static.
  Fixed first element being a LineToElement in QPainterPath::connectPath()