qt:qt.git
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
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, 14 Jan 2011 03:08:43 +0000 (13:08 +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:
  Proper fix for QGraphicsItem crash.

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, 13 Jan 2011 20:35:20 +0000 (06:35 +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 QSharedMemory and QSystemSemaphore autotests for Symbian
  Fix QSystemSemaphore handle management issues in Symbian

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, 13 Jan 2011 17:24:36 +0000 (03:24 +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:
  Proper fix for QGraphicsItem crash.

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
11 years agoFix QSharedMemory and QSystemSemaphore autotests for Symbian
Miikka Heikkinen [Thu, 13 Jan 2011 14:08:42 +0000 (16:08 +0200)]
Fix QSharedMemory and QSystemSemaphore autotests for Symbian

Reviewed-by: Janne Koskinen
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
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 13 Jan 2011 11:13:56 +0000 (21:13 +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 doc typo
  Document centerIn and fill in the anchors docs
  Document level of support for QGraphicsObject properties
  Add an autotest for QVariant method params
  Don't crash Qt Creator when debugging an object alias
  Consistent Docs

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, 13 Jan 2011 08:01:24 +0000 (18:01 +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:
  Fixed build failure on platforms other than Symbian
  Fix corelib def files.
  Fix qglthreads test crash on Symbian
  Remove sqlite3_selfsigned.sis as it is no longer usable or needed.
  Allow use of command line parameters with RApaLsSession::StartApp.
  Fixed resource leak in Phonon MMF backend
  Allow IAP to be selected in Phonon MMF backend

11 years agoFix doc typo
Alan Alpert [Thu, 13 Jan 2011 06:21:58 +0000 (16:21 +1000)]
Fix doc typo

Tidy up that section a little, while I'm at it.

11 years agoDocument centerIn and fill in the anchors docs
Alan Alpert [Thu, 13 Jan 2011 05:17:47 +0000 (15:17 +1000)]
Document centerIn and fill in the anchors docs

Task-number: QTBUG-16467

11 years agoDocument level of support for QGraphicsObject properties
Alan Alpert [Thu, 13 Jan 2011 05:11:33 +0000 (15:11 +1000)]
Document level of support for QGraphicsObject properties

In the context of QML, they are not officially supported as public API
unless otherwise documented in QDeclarativeItem. This commit mentions
that somewhere.

Task-number: QTBUG-15797
Reviewed-by: Martin Jones
11 years agoAdd an autotest for QVariant method params
Aaron Kennedy [Thu, 13 Jan 2011 04:59:30 +0000 (14:59 +1000)]
Add an autotest for QVariant method params

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

11 years agoConsistent Docs
Alan Alpert [Thu, 13 Jan 2011 00:49:13 +0000 (10:49 +1000)]
Consistent Docs

Example contradicted later docs. Fixed example.

Task-number: QTBUG-16596

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
11 years agoFix corelib def files.
Miikka Heikkinen [Wed, 12 Jan 2011 08:58:06 +0000 (10:58 +0200)]
Fix corelib def files.

Added symbianCommandLine function to corelib def files.

Task-number: QTBUG-15987
Reviewed-by: TrustMe
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
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, 11 Jan 2011 23:51:25 +0000 (09:51 +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:
  Remove sqlite3_selfsigned.sis as it is no longer usable or needed.
  Allow use of command line parameters with RApaLsSession::StartApp.
  Fixed resource leak in Phonon MMF backend
  Allow IAP to be selected in Phonon MMF backend

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, 11 Jan 2011 20:32:38 +0000 (06:32 +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:
  rebuild configure
  Doc: Fixed a few misspellings of Flipable

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, 11 Jan 2011 19:03:54 +0000 (05:03 +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:
  Remove sqlite3_selfsigned.sis as it is no longer usable or needed.
  Allow use of command line parameters with RApaLsSession::StartApp.
  Fixed resource leak in Phonon MMF backend
  Allow IAP to be selected in Phonon MMF backend

11 years agorebuild configure
Oswald Buddenhagen [Tue, 11 Jan 2011 14:42:43 +0000 (15:42 +0100)]
rebuild configure

11 years agoDoc: Fixed a few misspellings of Flipable
Thorbjørn Lindeijer [Tue, 11 Jan 2011 16:11:06 +0000 (17:11 +0100)]
Doc: Fixed a few misspellings of Flipable

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, 11 Jan 2011 15:53:17 +0000 (01:53 +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:
  Install each test in a separate directory
  Do not override the target path if already defined
  Attempt to cure my pathological inability to type the word "package".

11 years agoRemove sqlite3_selfsigned.sis as it is no longer usable or needed.
Miikka Heikkinen [Tue, 11 Jan 2011 14:56:23 +0000 (16:56 +0200)]
Remove sqlite3_selfsigned.sis as it is no longer usable or needed.

Selfsigned qt.sis no longer installs on top of sqlite3_selfsigned.sis
as patching embedded sises and dependencies was removed from
patch_capabilities.pl script. However, since the regular sqlite3.sis
is nowadays signed for all three Symbian manufacturers that Qt supports,
there is no more need to have a self-signed sqlite3.sis in the first
place, so it is removed to reduce confusion.

Task-number: QTBUG-16576
Reviewed-by: axis
11 years agoAllow use of command line parameters with RApaLsSession::StartApp.
Miikka Heikkinen [Tue, 11 Jan 2011 10:48:38 +0000 (12:48 +0200)]
Allow use of command line parameters with RApaLsSession::StartApp.

When a Symbian application is launched using RApaLsSession::StartApp,
command line parameters can be given with CApaCommandLine::SetTailEndL
and will now be correctly interpreted by Qt applications as command
line parameters.

There are a couple of limitations:

1) The parameters given with CApaCommandLine::SetTailEndL will not
   be available in main method's argv array; they can be
   accessed via QCoreApplication::arguments function.

2) CApaCommandLine::SetTailEndL does support any arbitrary binary data
   as parameter, but only 8-bit string data gets parsed properly into
   QCoreApplication::arguments. For other kind of tail data, you need
   to subclass QS60MainAppUi and implement ProcessCommandParametersL
   callback.

Task-number: QTBUG-15987
Reviewed-by: axis
11 years agoInstall each test in a separate directory
Adrian Constantin [Mon, 10 Jan 2011 13:37:50 +0000 (15:37 +0200)]
Install each test in a separate directory

It prevents collision of test data.

Reviewed-by: Lucian Varlan
11 years agoDo not override the target path if already defined
Lucian Varlan [Mon, 10 Jan 2011 13:36:17 +0000 (15:36 +0200)]
Do not override the target path if already defined

Reviewed-by: Adrian Constantin
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
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
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, 11 Jan 2011 12:45:01 +0000 (22:45 +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:
  OpenVG paint engine doesn't draw glyphs well to non-integer offsets.

11 years agoAttempt to cure my pathological inability to type the word "package".
Jason McDonald [Tue, 11 Jan 2011 11:40:39 +0000 (21:40 +1000)]
Attempt to cure my pathological inability to type the word "package".

Reviewed-by: Trust Me
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
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, 11 Jan 2011 09:41:03 +0000 (19:41 +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:
  QTextCodec::codecForMib: actually use the cache

11 years agoQTextCodec::codecForMib: actually use the cache
Olivier Goffart [Tue, 11 Jan 2011 09:15:57 +0000 (10:15 +0100)]
QTextCodec::codecForMib: actually use the cache

Was removed by mistake in commit 02aecce59cb76ceb88f635203553

Reviewed-by: Peter Hartmann
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, 11 Jan 2011 03:29:32 +0000 (13:29 +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 ConnMan bearer plugin to use new net.connman service name.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Lorn Potter [Tue, 11 Jan 2011 02:49:03 +0000 (12:49 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Lorn Potter [Tue, 11 Jan 2011 02:37:31 +0000 (12:37 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

11 years agoMerge commit 'refs/merge-requests/959' of git://gitorious.org/qt/qt into integration
Lorn Potter [Tue, 11 Jan 2011 02:31:43 +0000 (12:31 +1000)]
Merge commit 'refs/merge-requests/959' of git://gitorious.org/qt/qt into integration

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 23:39:30 +0000 (09:39 +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:
  Update QTextOdfWriter test case to match actual (correct) output

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Mon, 10 Jan 2011 20:14:50 +0000 (06:14 +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:
  QFont/Windows: restrict the pixel size accuracy
  Update copyright year to 2011.
  For non-developer builds, skip test that requires private API
  tst_qhttpnetworkconnection: Compile fix
  Change QHostInfoCache to use QElapsedTime instead of QTime.
  Fix for qtdemo bug

11 years agoUpdate QTextOdfWriter test case to match actual (correct) output
Brad Hards [Mon, 3 Jan 2011 01:12:25 +0000 (12:12 +1100)]
Update QTextOdfWriter test case to match actual (correct) output

The ODF 1.1 Specification Section 15.5.11 shows the element names are tab-stops
and tab-stop (not style-tab-stops and style-tab-stop, which are just ref in the
schema).

Merge-request: 1012
Reviewed-by: Olivier Goffart
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Mon, 10 Jan 2011 16:45:05 +0000 (02:45 +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:
  Setting WA_TranslucentBackground after winid() is ineffective on Symbian.
  Fix handle leak in symbian QTimer implementation

11 years agoQFont/Windows: restrict the pixel size accuracy
Joerg Bornemann [Mon, 10 Jan 2011 15:46:48 +0000 (16:46 +0100)]
QFont/Windows: restrict the pixel size accuracy

Like on all other platforms, the pixel size accuracy is now restricted
to two digits after the decimal point.

Task-number: QTBUG-15688
Reviewed-by: Jiang Jiang
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
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
11 years agoFor non-developer builds, skip test that requires private API
Adrian Constantin [Mon, 10 Jan 2011 10:27:35 +0000 (12:27 +0200)]
For non-developer builds, skip test that requires private API

Fix build break on harmattan.

Reviewed-by: Lucian Varlan
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 13:30:17 +0000 (23:30 +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:
  Fix crash in QTextBlock::next()/previous()
  Fix regression in text rendering in OpenGL2 engine

11 years agotst_qhttpnetworkconnection: Compile fix
Markus Goetz [Mon, 10 Jan 2011 13:00:59 +0000 (14:00 +0100)]
tst_qhttpnetworkconnection: Compile fix

11 years agoChange QHostInfoCache to use QElapsedTime instead of QTime.
Niklas Kurkisuo [Mon, 10 Jan 2011 11:17:27 +0000 (12:17 +0100)]
Change QHostInfoCache to use QElapsedTime instead of QTime.

Use QElapsedTime instead of QTime for performance gain. See QT-2965 for
more info.

Task-number: QTBUG-16468
Reviewed-by: Markus Goetz
11 years agoMerge branch 'graphics-team-text-4.7' into 4.7
Eskil Abrahamsen Blomfeldt [Mon, 10 Jan 2011 11:14:55 +0000 (12:14 +0100)]
Merge branch 'graphics-team-text-4.7' into 4.7

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