qt:qt.git
11 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Mon, 17 Jan 2011 10:02:29 +0000 (20:02 +1000)]
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (74 commits)
  fixed CI gate flagged spelling error: occured -> occurred
  file rename
  various fixes to deal with CI gate failures
  Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static
  Proper fix for QGraphicsItem crash.
  Fix QSharedMemory and QSystemSemaphore autotests for Symbian
  Fix QSystemSemaphore handle management issues in Symbian
  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
  QNetworkProxyFactory::systemProxyForQuery() for Symbian
  Fixed build failure on platforms other than Symbian
  Fix corelib def files.
  Fix qglthreads test crash on Symbian
  rebuild configure
  Doc: Fixed a few misspellings of Flipable
  Remove sqlite3_selfsigned.sis as it is no longer usable or needed.
  ...

11 years agoMerge remote branch 'origin/4.7' into qt-master-from-4.7
Olivier Goffart [Mon, 17 Jan 2011 09:35:23 +0000 (10:35 +0100)]
Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf

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, 17 Jan 2011 03:20:55 +0000 (13:20 +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:
  fixed CI gate flagged spelling error: occured -> occurred
  file rename
  various fixes to deal with CI gate failures
  Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static
  QNetworkProxyFactory::systemProxyForQuery() for Symbian

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

11 years agofile rename
Jeremy Katz [Fri, 14 Jan 2011 13:46:54 +0000 (14:46 +0100)]
file rename

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

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, 14 Jan 2011 10:05:51 +0000 (20:05 +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 system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static
  QNetworkProxyFactory::systemProxyForQuery() for 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 [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/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 13 Jan 2011 23:58:51 +0000 (09:58 +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 system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static
  QNetworkProxyFactory::systemProxyForQuery() for Symbian

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

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 agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 13 Jan 2011 14:18:43 +0000 (00:18 +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:
  QNetworkProxyFactory::systemProxyForQuery() for Symbian

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 agoQNetworkProxyFactory::systemProxyForQuery() for Symbian
Jyrki Jaakkola [Wed, 12 Jan 2011 17:23:10 +0000 (18:23 +0100)]
QNetworkProxyFactory::systemProxyForQuery() for Symbian

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Wed, 12 Jan 2011 17:18:45 +0000 (03:18 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Use runtime path instead of compile time on Maemo

11 years agoUse runtime path instead of compile time on Maemo
Jiang Jiang [Wed, 12 Jan 2011 15:38:49 +0000 (16:38 +0100)]
Use runtime path instead of compile time on Maemo

Since maemo programs are cross-compiled, we need to use the runtime
application path to locate script files here.

Reviewed-by: aavit
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 agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
Qt Continuous Integration System [Wed, 12 Jan 2011 14:00:36 +0000 (00:00 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Mac: pixmaps dont treat alpha exactly the same as other platforms

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Wed, 12 Jan 2011 10:32:02 +0000 (20:32 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Doc: Fixing typo
  Only test control character handling in X11
  Compile when qreal != double
  Make application font family names locale sensitive in X11
  Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight
  Add line spacing to QTextBlockFormat, get/set functions, CSS support
  Optimize texture glyph cache
  Disable certain GPOS features by default
  Move advances for control character in Indic syllable shaping

11 years agoMac: pixmaps dont treat alpha exactly the same as other platforms
Richard Moe Gustavsen [Wed, 12 Jan 2011 09:47:29 +0000 (10:47 +0100)]
Mac: pixmaps dont treat alpha exactly the same as other platforms

From fixing qwidget autotest, it seems to be the case that filling
a pixmap with a solid color on mac changes the hasAlpha status. This
is different from X11 (and raster engine). That is, the following
code will produce different result:

QPixmap pixmap(100, 100);
pixmap.setAlphaChannel(QPixmap(100, 100));
qDebug() << "Has alpha after setting channel?" << pixmap.hasAlpha();
pixmap.fill(Qt::red);
qDebug() << "Has alpha after fill?" << pixmap.hasAlpha();

So, this patch remove the possibility of converting an already alpha
supporting pixmap to non-alpha upon fill. NB: somewhat related, the
following code works the same on both x11, raster and mac (prints
'false'), but still seems wrong:

QPixmap pixmap2(pixmap);
qDebug() << "pixmap2 has alpha initially?" << pixmap2.hasAlpha();

Rev-By: Fabien Freling
11 years agoDoc: Fixing typo
Sergio Ahumada [Wed, 12 Jan 2011 10:07:34 +0000 (11:07 +0100)]
Doc: Fixing typo

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 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Tue, 11 Jan 2011 22:15:41 +0000 (08:15 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Only test control character handling in X11
  Compile when qreal != double
  Make application font family names locale sensitive in X11
  Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight
  Add line spacing to QTextBlockFormat, get/set functions, CSS support
  Optimize texture glyph cache
  Disable certain GPOS features by default
  Move advances for control character in Indic syllable shaping

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 agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Tue, 11 Jan 2011 18:40:35 +0000 (04:40 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
  QProcessManager: minor optimization
  use qBinaryFind instead of bsearch
  use qBinaryFind instead of bsearch
  fix two more "comparison between signed and unsigned integer expressions" warnings
  fix 'QChar::QChar(char)' is deprecated
  fix another "comparison between signed and unsigned integer expressions"
  fix warning "comparison between signed and unsigned integer expressions"
  fix warning "missing braces around initializer for 'in_addr::<anonymous union>'"
  fix warning "'SeedStorage* randTLS()' defined but not used"
  remove unused header include
  make the modifySemaphore() signal-safe on linux
  fix/stabilizate the year sign change test
  deal with utcOffset in a correct way

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 agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Tue, 11 Jan 2011 15:31:59 +0000 (01:31 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Only test control character handling in X11
  Compile when qreal != double
  Make application font family names locale sensitive in X11
  Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight
  Add line spacing to QTextBlockFormat, get/set functions, CSS support
  Optimize texture glyph cache
  Disable certain GPOS features by default
  Move advances for control character in Indic syllable shaping

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 agoQProcessManager: minor optimization
Ritt Konstantin [Tue, 11 Jan 2011 13:31:05 +0000 (16:31 +0300)]
QProcessManager: minor optimization

QHash is slightly faster than QMap and should be preferred where
the key order has no meaning;
take() is faster than value() + remove()

Reviewed-by: Olivier Goffart
Merge-request: 1017

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 agouse qBinaryFind instead of bsearch
Konstantin Ritt [Tue, 11 Jan 2011 13:12:02 +0000 (14:12 +0100)]
use qBinaryFind instead of bsearch

Merge-request: 906
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agouse qBinaryFind instead of bsearch
Konstantin Ritt [Tue, 11 Jan 2011 13:12:01 +0000 (14:12 +0100)]
use qBinaryFind instead of bsearch

depending on platform, qBinaryFind might be up to 3 times faster than bsearch
or a bit bit slower at the worst case; so why don't simply use qBinaryFind instead of bsearch and be an optimist? ;)

also we know that all color names are in the lower case already and thus
we can avoid lowercasing of them again and again, and again;
the name to find needs to be lowercased separately instead.

some color-by-name-lookup numbers:
before:
 0.000737 msecs per iteration (total: 3,684, iterations: 5000000)
after:
 0.000154 msecs per iteration (total: 771, iterations: 5000000)

Merge-request: 906
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agofix two more "comparison between signed and unsigned integer expressions" warnings
Konstantin Ritt [Tue, 11 Jan 2011 12:58:23 +0000 (13:58 +0100)]
fix two more "comparison between signed and unsigned integer expressions" warnings

SQLLEN is unnecessarily an unsigned int

Merge-request: 955
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agofix 'QChar::QChar(char)' is deprecated
Konstantin Ritt [Tue, 11 Jan 2011 12:58:22 +0000 (13:58 +0100)]
fix 'QChar::QChar(char)' is deprecated

Merge-request: 955
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agofix another "comparison between signed and unsigned integer expressions"
Konstantin Ritt [Tue, 11 Jan 2011 12:58:21 +0000 (13:58 +0100)]
fix another "comparison between signed and unsigned integer expressions"

on win, when used in FD_SET, FD_ISSET, etc., socketDescriptor assumed to be
SOCKET which is unsigned int

Merge-request: 955
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agofix warning "comparison between signed and unsigned integer expressions"
Konstantin Ritt [Tue, 11 Jan 2011 12:58:20 +0000 (13:58 +0100)]
fix warning "comparison between signed and unsigned integer expressions"

sizeof produces signed int result; QT_SOCKOPTLEN_T is int

Merge-request: 955
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agofix warning "missing braces around initializer for 'in_addr::<anonymous union>'"
Konstantin Ritt [Tue, 11 Jan 2011 12:58:19 +0000 (13:58 +0100)]
fix warning "missing braces around initializer for 'in_addr::<anonymous union>'"

v.s_addr = 0; does the same

Merge-request: 955
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agofix warning "'SeedStorage* randTLS()' defined but not used"
Konstantin Ritt [Tue, 11 Jan 2011 12:58:19 +0000 (13:58 +0100)]
fix warning "'SeedStorage* randTLS()' defined but not used"

by setting the proper macro-guards;
regroup macro-guards for better readability (superfluous change, I know);
fix typos in the comments

was not splited into two commits to make it more clear why and how
that warning is fixed now

Merge-request: 955
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agoremove unused header include
Ritt Konstantin [Tue, 11 Jan 2011 11:35:08 +0000 (14:35 +0300)]
remove unused header include

sysV shm isn't used in QSystemSemaphore

Merge-request: 998
Reviewed-by: Olivier Goffart
11 years agomake the modifySemaphore() signal-safe on linux
Ritt Konstantin [Tue, 11 Jan 2011 11:33:33 +0000 (14:33 +0300)]
make the modifySemaphore() signal-safe on linux

as POSIX man says, if semop() is interrupted by a signal,
it shall return -1 and set errno to EINTR.
in qcore_unix_p.h, we have EINTR_LOOP helper macro exactly for such cases ;)

Task-number: QTBUG-14434
Merge-request: 998
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 [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 agofix/stabilizate the year sign change test
Ritt Konstantin [Tue, 11 Jan 2011 12:26:19 +0000 (13:26 +0100)]
fix/stabilizate the year sign change test

this test might fail for the Qt::LocalTime spec in some cases

Merge-request: 2536
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agodeal with utcOffset in a correct way
Ritt Konstantin [Tue, 11 Jan 2011 12:26:18 +0000 (13:26 +0100)]
deal with utcOffset in a correct way

like how we do that for ISO format

Reviewed-by: ddenis
Merge-request: 2536
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Tue, 11 Jan 2011 11:54:42 +0000 (21:54 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
  handle O_NONBLOCK'ed pipes specific error on write()
  move POSIX-specific debug to qprocess_unix.cpp

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 agohandle O_NONBLOCK'ed pipes specific error on write()
Ritt Konstantin [Tue, 11 Jan 2011 10:31:44 +0000 (11:31 +0100)]
handle O_NONBLOCK'ed pipes specific error on write()

according to the write(2) docs:

When write requests greater than {PIPE_BUF} bytes to a pipe that
has available space at least 1 byte, if O_NONBLOCK is set,
write transfers what it can and returns the number of bytes written.

When write requests of {PIPE_BUF} or less  bytes to a pipe that has no
enough space, or write requests for greater than {PIPE_BUF} bytes
to a pipe that has no space, if O_NONBLOCK  is  set,
write returns -1 and sets errno to EAGAIN.

Merge-request: 997
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agomove POSIX-specific debug to qprocess_unix.cpp
Ritt Konstantin [Tue, 11 Jan 2011 10:31:43 +0000 (11:31 +0100)]
move POSIX-specific debug to qprocess_unix.cpp

Merge-request: 997
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
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 agoOnly test control character handling in X11
Jiang Jiang [Tue, 11 Jan 2011 08:45:03 +0000 (09:45 +0100)]
Only test control character handling in X11

It was a issue in HarfBuzz only.

Reviewed-by: Andy Shaw
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 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Tue, 11 Jan 2011 08:41:33 +0000 (18:41 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Compile when qreal != double
  Make application font family names locale sensitive in X11
  Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight
  Add line spacing to QTextBlockFormat, get/set functions, CSS support
  Optimize texture glyph cache
  Disable certain GPOS features by default
  Move advances for control character in Indic syllable shaping

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
Qt Continuous Integration System [Tue, 11 Jan 2011 05:10:09 +0000 (15:10 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
  BM2: Little fix to make the `make check-trusted' to work on Linux and Windows.

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 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Tue, 11 Jan 2011 01:44:27 +0000 (11:44 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Compile when qreal != double
  Make application font family names locale sensitive in X11
  Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight
  Add line spacing to QTextBlockFormat, get/set functions, CSS support
  Optimize texture glyph cache
  Disable certain GPOS features by default
  Move advances for control character in Indic syllable shaping

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 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
Qt Continuous Integration System [Mon, 10 Jan 2011 22:28:10 +0000 (08:28 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
  BM2: Little fix to make the `make check-trusted' to work on Linux and Windows.

11 years agoBM2: Little fix to make the `make check-trusted' to work on Linux and Windows.
Sergio Ahumada [Mon, 10 Jan 2011 21:52:36 +0000 (22:52 +0100)]
BM2: Little fix to make the `make check-trusted' to work on Linux and Windows.

Reviewed-by: Joao
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 agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 10 Jan 2011 19:04:34 +0000 (05:04 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  qmake: fix wrong case label in toString(subSystemOption)
  qt project files: create pkg-config files for mingw
  qmake: write and install pkg-config files for mingw
  qmake: don't limit pkg-config writing to unix generator
  qmake: fix double directory separator

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 agoqmake: fix wrong case label in toString(subSystemOption)
Joerg Bornemann [Mon, 10 Jan 2011 16:01:06 +0000 (17:01 +0100)]
qmake: fix wrong case label in toString(subSystemOption)

Reviewed-by: TrustMe
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Mon, 10 Jan 2011 15:43:51 +0000 (01:43 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Compile when qreal != double
  Make application font family names locale sensitive in X11
  Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight
  Add line spacing to QTextBlockFormat, get/set functions, CSS support
  Optimize texture glyph cache
  Disable certain GPOS features by default
  Move advances for control character in Indic syllable shaping

11 years agoqt project files: create pkg-config files for mingw
Mark Brand [Mon, 10 Jan 2011 15:41:57 +0000 (16:41 +0100)]
qt project files: create pkg-config files for mingw

This is mostly the same as for unix.

Merge-request: 2543
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoqmake: write and install pkg-config files for mingw
Mark Brand [Mon, 10 Jan 2011 15:41:56 +0000 (16:41 +0100)]
qmake: write and install pkg-config files for mingw

Merge-request: 2543
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoqmake: don't limit pkg-config writing to unix generator
Mark Brand [Mon, 10 Jan 2011 15:41:55 +0000 (16:41 +0100)]
qmake: don't limit pkg-config writing to unix generator

Move pkg-config related methods from unix generator to base class
so they can be used by other generators too.

Merge-request: 2543
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoqmake: fix double directory separator
Mark Brand [Mon, 10 Jan 2011 15:41:54 +0000 (16:41 +0100)]
qmake: fix double directory separator

Merge-request: 2543
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
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 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2
Eskil Abrahamsen Blomfeldt [Mon, 10 Jan 2011 14:11:52 +0000 (15:11 +0100)]
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2

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 agoMerge branch 'qt-graphics-team-text-master'
Eskil Abrahamsen Blomfeldt [Mon, 10 Jan 2011 13:11:30 +0000 (14:11 +0100)]
Merge branch 'qt-graphics-team-text-master'

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 agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 10 Jan 2011 12:09:39 +0000 (22:09 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix reversed condition introduced in 9a6cfc07e5
  Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher
  Fix compilation error on Solaris
  Check elapsed time only once