qt:qt.git
11 years agoImprove restoring of miximized window geomertry.
Morten Johan Sørvig [Mon, 15 Nov 2010 12:47:53 +0000 (13:47 +0100)]
Improve restoring of miximized window geomertry.

Task-number: QTBUG-2064

Follow-up commit to 54865d47cfd, which caused
a regression on multi-display systems on Windows.

11 years agoFix wrong error assumption when converting "0.0" to double
Joaquim Rocha [Mon, 15 Nov 2010 12:46:40 +0000 (13:46 +0100)]
Fix wrong error assumption when converting "0.0" to double

The function qstrtod calls strtod without first resetting the errno
but verifying it nonetheless. This could lead to situations where
the errno was already set to ERANGE and hence it would mistakenly
assume the conversion could not be done right.

Merge-request: 2507
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
11 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Mon, 15 Nov 2010 01:27:44 +0000 (02:27 +0100)]
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: (243 commits)
  Fix compilation after merge.
  SSL: Fix for capabilities in QSslCertificate auto test
  Doc: update symbian capabilities regarding SSL
  SSL: Fix crashes/hangs when retrieving CA certificates
  Doc: Fixing typo
  Coding style: bang cleanup.
  Removed call to glFinish, obsoleted by fence syncs.
  Helper-side support for QMeeGoFenceSync.
  Plugin-side support for creating/destroying/waiting on fence sync.
  Added MeeGo graphicssystem entry points for KHR_fence_sync.
  Trailing whitespace fixes.
  remove pointless assignment of deprecated variable
  QDeclarativeDebug: Keep source information when changing an expression
  Fix auto-test regression in tst_QDoubleValidator
  Fixed tst_qpixmap::grabWidget autotest failure on QWS.
  Use $${EPOCROOT} variable rather than absolute paths in .pro files
  fix tst_headers
  Fixed a shell syntax error in configure
  Flickable does not reposition its content when it is resized.
  Document that Transitions are exclusive.
  ...

11 years agoFix compilation after merge.
Olivier Goffart [Fri, 12 Nov 2010 14:37:41 +0000 (15:37 +0100)]
Fix compilation after merge.

Also fix a warning

11 years agoMerge remote branch 'origin/4.7' into qt-master-from-4.7
Olivier Goffart [Fri, 12 Nov 2010 14:33:33 +0000 (15:33 +0100)]
Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
configure
doc/src/snippets/code/doc_src_qmake-manual.qdoc
mkspecs/features/symbian/application_icon.prf
mkspecs/features/symbian/default_post.prf
mkspecs/features/symbian/symbian_building.prf
qmake/generators/symbian/initprojectdeploy_symbian.cpp
src/multimedia/audio/audio.pri
src/network/access/qnetworkaccessmanager.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl_p.h
src/plugins/bearer/corewlan/qcorewlanengine.mm
src/plugins/phonon/mmf/mmf.pro
tests/auto/qscriptvalue/tst_qscriptvalue.cpp
tests/auto/qscriptvalue/tst_qscriptvalue.h
tools/qdoc3/doc/qdoc-manual.qdocconf

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
Qt Continuous Integration System [Thu, 11 Nov 2010 21:43:02 +0000 (22:43 +0100)]
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:
  Doc: Fixing typo
  Fix auto-test regression in tst_QDoubleValidator
  QS60Style: Color calculation should be optimized
  QS60Style: Color calculation should be optimized
  With some locales, QDoubleValidator would not accept "C" locale valid numbers

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 11 Nov 2010 16:28:31 +0000 (17:28 +0100)]
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:
  ShortcutOverride has no effect on some shortcuts on Mac OS X (Cocoa).
  Fix restore of maximized window geometry on Windows
  Remove qDebug.

11 years agoShortcutOverride has no effect on some shortcuts on Mac OS X (Cocoa).
Prasanth Ullattil [Thu, 11 Nov 2010 11:29:44 +0000 (12:29 +0100)]
ShortcutOverride has no effect on some shortcuts on Mac OS X (Cocoa).

When generating the native key sequences for menu items, Qt prefers the
non private unicode characters. But the characters in the NSEvent for
keyboard events can contain characters form the unicode range reserved
for Apple.
For e.g. when user presses the "delete" key, the event contains
NSDeleteFunctionKey, where in Qt is expecting NSDeleteCharacter. For now
this is the only key identified for translation. If we find similar
translations, those can be added to qt_mac_removePrivateUnicode().

Task-number: QTBUG-12495
Reviewed-by: Denis
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, 11 Nov 2010 14:54:37 +0000 (15:54 +0100)]
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:
  SSL: Fix for capabilities in QSslCertificate auto test
  Doc: update symbian capabilities regarding SSL
  SSL: Fix crashes/hangs when retrieving CA certificates

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Thu, 11 Nov 2010 13:35:09 +0000 (14:35 +0100)]
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:
  Fix for font engines that don't support subpixel positioning

11 years agoFix restore of maximized window geometry on Windows
Morten Johan Sørvig [Thu, 11 Nov 2010 12:37:48 +0000 (13:37 +0100)]
Fix restore of maximized window geometry on Windows

Task-number: QTBUG-2064

11 years agoSSL: Fix for capabilities in QSslCertificate auto test
Shane Kearns [Wed, 10 Nov 2010 16:45:29 +0000 (16:45 +0000)]
SSL: Fix for capabilities in QSslCertificate auto test

They were in wrong section of the file due to editing error and
therefore ignored.

Reviewed-by: Markus Goetz
11 years agoDoc: update symbian capabilities regarding SSL
Shane Kearns [Wed, 10 Nov 2010 16:43:20 +0000 (16:43 +0000)]
Doc: update symbian capabilities regarding SSL

Testing shows some CA certs require ReadUserData depending which part
of the database they are stored in. Updated docs to reflect this.

Reviewed-by: Markus Goetz
11 years agoSSL: Fix crashes/hangs when retrieving CA certificates
Shane Kearns [Wed, 10 Nov 2010 15:19:14 +0000 (15:19 +0000)]
SSL: Fix crashes/hangs when retrieving CA certificates

Added error handling to the certificate retrieval thread
Made the certificate retrieval thread process critical (so if it crashes
the process will crash instead of hang)
Filter the certificate list to only fetch CA certificates which are in
X.509 format (symbian also allows WAP formats, but Qt does not support
these).
Put the TPtr8 for asynch function parameter in the class data so it does
not go out of scope while the function is in progress. Previously it was
on the stack so it could be corrupted before the certificate server had
finished using it.

Task-number: QTBUG-15005
Task-number: QTBUG-15126
Reviewed-by: Markus Goetz
11 years agoRemove qDebug.
Morten Johan Sørvig [Thu, 11 Nov 2010 12:01:37 +0000 (13:01 +0100)]
Remove qDebug.

11 years agoFix for font engines that don't support subpixel positioning
Jiang Jiang [Thu, 11 Nov 2010 09:42:05 +0000 (10:42 +0100)]
Fix for font engines that don't support subpixel positioning

Reviewed-by: aavit
11 years agoDoc: Fixing typo
Sergio Ahumada [Thu, 11 Nov 2010 10:38:15 +0000 (11:38 +0100)]
Doc: Fixing typo

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, 11 Nov 2010 10:11:53 +0000 (11:11 +0100)]
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:
  Coding style: bang cleanup.
  Removed call to glFinish, obsoleted by fence syncs.
  Helper-side support for QMeeGoFenceSync.
  Plugin-side support for creating/destroying/waiting on fence sync.
  Added MeeGo graphicssystem entry points for KHR_fence_sync.
  Trailing whitespace fixes.

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 11 Nov 2010 09:35:39 +0000 (10:35 +0100)]
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:
  Support exception handling in QtConcurrent::run()

11 years agoSupport exception handling in QtConcurrent::run()
Morten Johan Sørvig [Thu, 11 Nov 2010 08:59:53 +0000 (09:59 +0100)]
Support exception handling in QtConcurrent::run()

Use QFutureInterface::reportException() in the
same way that we do in QtConcurrent::map().

11 years agoCoding style: bang cleanup.
Michael Dominic K [Thu, 11 Nov 2010 07:25:11 +0000 (08:25 +0100)]
Coding style: bang cleanup.

Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoRemoved call to glFinish, obsoleted by fence syncs.
Michael Dominic K [Thu, 11 Nov 2010 07:25:11 +0000 (08:25 +0100)]
Removed call to glFinish, obsoleted by fence syncs.

Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoHelper-side support for QMeeGoFenceSync.
Michael Dominic K [Thu, 11 Nov 2010 07:25:10 +0000 (08:25 +0100)]
Helper-side support for QMeeGoFenceSync.

Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoPlugin-side support for creating/destroying/waiting on fence sync.
Michael Dominic K [Thu, 11 Nov 2010 07:25:09 +0000 (08:25 +0100)]
Plugin-side support for creating/destroying/waiting on fence sync.

Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoAdded MeeGo graphicssystem entry points for KHR_fence_sync.
Michael Dominic K [Thu, 11 Nov 2010 07:25:09 +0000 (08:25 +0100)]
Added MeeGo graphicssystem entry points for KHR_fence_sync.

Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoTrailing whitespace fixes.
Michael Dominic K [Thu, 11 Nov 2010 07:25:08 +0000 (08:25 +0100)]
Trailing whitespace fixes.

Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@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, 11 Nov 2010 04:39:18 +0000 (05:39 +0100)]
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:
  remove pointless assignment of deprecated variable
  fix tst_headers
  Fixed a shell syntax error in configure
  Clear X11 structure before use
  Make operator QRectF const
  Fix GC-related crash in QScriptValue::setData()
  get rid of dependency on QtGui
  Removed implicity QtGui linking from icd.pro as it is not needed.
  DFB: Make sure QPixmap::hasAlpha is respected
  fix build on mingw
  Fix some painting issues in QDirectFBPaintEngine
  QNAM: Do not need QNetworkSession in AlwaysCache load mode
  Don't crash if QScriptClass property getter returns an invalid value
  QNAM: Remove dead waitForUpstreamBytesWritten() code
  QNAM: Remove dead waitForDownstreamReadyRead() code
  fix memleak in test

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 11 Nov 2010 01:50:51 +0000 (02:50 +0100)]
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:
  QDeclarativeDebug: Keep source information when changing an expression
  Flickable does not reposition its content when it is resized.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 10 Nov 2010 22:14:47 +0000 (23:14 +0100)]
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:
  Use $${EPOCROOT} variable rather than absolute paths in .pro files

11 years agoremove pointless assignment of deprecated variable
Oswald Buddenhagen [Wed, 10 Nov 2010 21:35:50 +0000 (22:35 +0100)]
remove pointless assignment of deprecated variable

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Wed, 10 Nov 2010 20:19:57 +0000 (21:19 +0100)]
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:
  Amend commit 27fe0f93f961e78b71cd0b729a0e324b847ec023
  Fix warnings
  QtCore autotests:  make them paralelized.
  Fix crash in tst_QByteArray::qUncompress
  Support glyph subpixel positioning without subpixel rendering

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 10 Nov 2010 18:33:19 +0000 (19:33 +0100)]
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: (21 commits)
  Fixed tst_qpixmap::grabWidget autotest failure on QWS.
  Doc: Fixing typo
  Doc: Fixing typo
  Doc: Fixing typo
  Fixed tst_qwidget::testContentsPropagation auto-test failure.
  Fixed text rendering bug in raster engine when opacity != 1.0.
  Prevented race condition on texture destruction.
  More fix for QTBUG-14640:oci performance problem with qlonglong
  Doc: Fixing typo
  Fixed grabWidget sometimes returning uninitialized memory.
  Fix Malayalam Rendering - 'Ra' is PreBase
  Update .def files for QtGui and QtOpenVG
  Use 32bit textures for alpha textures after all.
  One more fix for dithering.
  Doc: Fixing typo
  Fix QTBUG-14640:oci performance problem with qlonglong
  32bit => 16bit conversion has 4byte-aligned output.
  Fix gcc bug in qReallocAligned
  Prevented threading related crash in OpenGL module.
  Fix possible crash in QStaticText and QDeclarativeTextLayout
  ...

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Wed, 10 Nov 2010 17:51:43 +0000 (18:51 +0100)]
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:
  Update the text cursor's position for input method events.

11 years agoAmend commit 27fe0f93f961e78b71cd0b729a0e324b847ec023
Olivier Goffart [Wed, 10 Nov 2010 16:40:17 +0000 (17:40 +0100)]
Amend commit 27fe0f93f961e78b71cd0b729a0e324b847ec023

It is a typo. Else, it overflows

11 years agoFix warnings
Olivier Goffart [Mon, 8 Nov 2010 08:56:56 +0000 (09:56 +0100)]
Fix warnings

Regarding conversion from char* to QString

Reviewed-by: Joao
11 years agoQtCore autotests: make them paralelized.
Olivier Goffart [Wed, 10 Nov 2010 15:14:01 +0000 (16:14 +0100)]
QtCore autotests:  make them paralelized.

The filesystem autotests are not paralized (because i was scary)

For reference, script I used:

cat corelib.pro |  grep -v "=" | grep \\\\ | cut -f1 -d\\ | sed "s/\(.*\) /\1/" | grep -v file | xargs -I{}  echo "echo CONFIG += parallel_test >>  {}/{}.pro" > t
. t

Reviexed-by: Joao
11 years agoFix crash in tst_QByteArray::qUncompress
Olivier Goffart [Wed, 10 Nov 2010 16:02:02 +0000 (17:02 +0100)]
Fix crash in tst_QByteArray::qUncompress

On 64-bit systems, len + sizeof(QByteArray::Data) could overflow and become 0
In this case, qRealloc could succeed and return 0, leading to a double free.

Reviewed-by: Joao
11 years agoUpdate the text cursor's position for input method events.
Pierre Rossi [Wed, 10 Nov 2010 14:39:19 +0000 (15:39 +0100)]
Update the text cursor's position for input method events.

Task-number: QTBUG-2064
Reviewed-by: Jiang Jiang
11 years agoSupport glyph subpixel positioning without subpixel rendering
Jiang Jiang [Wed, 10 Nov 2010 13:18:08 +0000 (14:18 +0100)]
Support glyph subpixel positioning without subpixel rendering

Previously subpixel positioning was only used when subpixel rendering
is enabled (glyphType == Raster_RGBMask), however, it does not
necessarily require that and for Mac OS X it will keep using
subpixel positioning even when LCD font smoothing (subpixel rendering)
is turned off. To maintain consistency when switching to raster,
we should support subpixel positioning in this case.

Task-number: QTBUG-5053
Reviewed-by: Jørgen Lind
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integr...
Qt Continuous Integration System [Wed, 10 Nov 2010 14:06:15 +0000 (15:06 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Fix potential buffer overrun in ALSA QAudioInput implementation.
  Fix potential buffer overrun in QAudioInput windows implementation.

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
Qt Continuous Integration System [Wed, 10 Nov 2010 13:53:28 +0000 (14:53 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml:
  QDeclarativeDebug: Add autotest for [re]setBindingForObject

11 years agoQDeclarativeDebug: Keep source information when changing an expression
Christiaan Janssen [Wed, 10 Nov 2010 13:42:24 +0000 (14:42 +0100)]
QDeclarativeDebug: Keep source information when changing an expression

Copy over the source code location of an expression when it is changed throu
the debugging facilities. This enables JavaScript breakpoints to be hit even
after the source code of the function has changed.

Task-number: QTCREATORBUG-2824
Reviewed-by: Kai Koehne
11 years agoQDeclarativeDebug: Add autotest for [re]setBindingForObject
Kai Koehne [Wed, 10 Nov 2010 13:31:53 +0000 (14:31 +0100)]
QDeclarativeDebug: Add autotest for [re]setBindingForObject

Add initial testing for setBindingForObject, resetBindingForObject in
QDeclarativeDebug.

11 years agoFix auto-test regression in tst_QDoubleValidator
Gabriel de Dietrich [Wed, 10 Nov 2010 12:21:02 +0000 (13:21 +0100)]
Fix auto-test regression in tst_QDoubleValidator

The locale from a previous test was not cleared.

Another issue has been detected, though, and reported as QTBUG-15210.

Reviewed-by: Thierry
11 years agoFixed tst_qpixmap::grabWidget autotest failure on QWS.
Samuel Rødal [Wed, 10 Nov 2010 10:05:04 +0000 (11:05 +0100)]
Fixed tst_qpixmap::grabWidget autotest failure on QWS.

We need to use the same rendering to compute the expected pixmap as used
in QPixmap::grabWidget(), or the results will look different on a 16-bit
display, as QPixmap::fromImage(ARGB32_Premultiplied_image) will get a
different internal image format compared to QPixmap pixmap(size);
pixmap.fill(Qt::transparent);

Reviewed-by: Kim
11 years agoUse $${EPOCROOT} variable rather than absolute paths in .pro files
Gareth Stockwell [Tue, 9 Nov 2010 16:44:55 +0000 (16:44 +0000)]
Use $${EPOCROOT} variable rather than absolute paths in .pro files

Task-number: QTBUG-15156
Reviewed-by: Miikka Heikkinen
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into osl1-4.7
Harald Fernengel [Wed, 10 Nov 2010 10:10:46 +0000 (11:10 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into osl1-4.7

11 years agofix tst_headers
Harald Fernengel [Wed, 10 Nov 2010 10:10:00 +0000 (11:10 +0100)]
fix tst_headers

Fix the generator and the generated file to ensure that the string
"generated" appears in the first line.

11 years agoFixed a shell syntax error in configure
Denis Dzyubenko [Wed, 10 Nov 2010 09:50:50 +0000 (10:50 +0100)]
Fixed a shell syntax error in configure

When you have EPOCROOT environment variable, but compiling for desktop
Linux, the configure script showed a shell syntax error and failed to set
the install prefix, making "install" target to install to the build
directory.

Task-number: QTBUG-15008
Reviewed-by: axis
Reviewed-by: Oswald Buddenhagen
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Wed, 10 Nov 2010 09:02:37 +0000 (10:02 +0100)]
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:
  Add more test entries for built-in JS types
  Update generated QScriptValue test files

11 years agoAdd more test entries for built-in JS types
Kent Hansen [Wed, 10 Nov 2010 08:45:36 +0000 (09:45 +0100)]
Add more test entries for built-in JS types

In particular the "wrapper" types (Boolean, Number, String) were
not tested at all.

Reviewed-by: Jedrzej Nowacki
11 years agoUpdate generated QScriptValue test files
Kent Hansen [Wed, 10 Nov 2010 08:25:54 +0000 (09:25 +0100)]
Update generated QScriptValue test files

A couple of bugs were introduced in the generator when it was
refactored; fixed now.
The generated tests are now in a separate directory/class, so
the test function qualifier had to be updated.

Reviewed-by: Jedrzej Nowacki
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, 10 Nov 2010 07:18:03 +0000 (08:18 +0100)]
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:
  Clear X11 structure before use
  Make operator QRectF const
  Fix GC-related crash in QScriptValue::setData()
  get rid of dependency on QtGui
  Removed implicity QtGui linking from icd.pro as it is not needed.
  DFB: Make sure QPixmap::hasAlpha is respected
  fix build on mingw
  Fix some painting issues in QDirectFBPaintEngine
  QNAM: Do not need QNetworkSession in AlwaysCache load mode
  Don't crash if QScriptClass property getter returns an invalid value
  QNAM: Remove dead waitForUpstreamBytesWritten() code
  QNAM: Remove dead waitForDownstreamReadyRead() code
  fix memleak in test

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Martin Jones [Wed, 10 Nov 2010 04:49:00 +0000 (14:49 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 10 Nov 2010 04:45:21 +0000 (05:45 +0100)]
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: (35 commits)
  Document that Transitions are exclusive.
  Document TextInput::select(start,end)
  doc
  Fix Text::elide docs.
  Fix Rectangle painting at small sizes.
  Fix QML ecmascript autotest.
  Fix QtQuick import.
  Export QDeclarativeDebugHelper on Symbian for QTBUG-13762
  Don't use stdint.h in our headers since it is a C99 header.
  Text alignment is broken with multi-line text and implicit size.
  Update QtOpenVg def files for bug QT-3589
  Image bounding rect should always include the area being painted
  Fix minehunt.pro (minehunt is no longer a plugin)
  Don't allow flagging of flipped tiles in Minehunt
  Remove Snake demo from QtDemo
  Fix samegame text input focus
  Whitespace fixes
  Update visual tests for Mac.
  Run all QML visual tests now.
  Make qmlvisual tests more stable
  ...

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Martin Jones [Wed, 10 Nov 2010 04:30:17 +0000 (14:30 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

11 years agoFlickable does not reposition its content when it is resized.
Martin Jones [Wed, 10 Nov 2010 04:26:08 +0000 (14:26 +1000)]
Flickable does not reposition its content when it is resized.
Call fixup() after Flickable resize to ensure contents are within
bounds.

Task-number: QTBUG-15173
Reviewed-by: Bea Lam
11 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
juhvu [Wed, 10 Nov 2010 03:54:39 +0000 (13:54 +1000)]
Merge branch '4.7' of git@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/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 10 Nov 2010 01:21:03 +0000 (02:21 +0100)]
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 wrong include path in multimedia.

11 years agoDocument that Transitions are exclusive.
Michael Brasser [Wed, 10 Nov 2010 00:17:34 +0000 (10:17 +1000)]
Document that Transitions are exclusive.

Task-number: QTBUG-15183

11 years agoFix potential buffer overrun in ALSA QAudioInput implementation.
Andrew den Exter [Tue, 9 Nov 2010 06:30:32 +0000 (16:30 +1000)]
Fix potential buffer overrun in ALSA QAudioInput implementation.

Don't write more than the supplied max buffer size to the output buffer.

Task-number: QTBUG-14549 QTBUG-8578
Reviewed-by: Derick Hawcroft
11 years agoFix potential buffer overrun in QAudioInput windows implementation.
Andrew den Exter [Tue, 9 Nov 2010 06:42:10 +0000 (16:42 +1000)]
Fix potential buffer overrun in QAudioInput windows implementation.

Don't write more than len bytes to the output buffer.

Task-number: QTBUG-14549 QTBUG-8578
Reviewed-by: Derick Hawcroft
11 years agoDocument TextInput::select(start,end)
Michael Brasser [Tue, 9 Nov 2010 23:30:06 +0000 (09:30 +1000)]
Document TextInput::select(start,end)

Task-number: QTBUG-15162

11 years agoMerge branch '4.7-upstream' into 4.7-water
Thierry Bastian [Tue, 9 Nov 2010 23:00:18 +0000 (00:00 +0100)]
Merge branch '4.7-upstream' into 4.7-water

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integr...
Qt Continuous Integration System [Tue, 9 Nov 2010 22:47:45 +0000 (23:47 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Fixed random crash in QGestureManager.

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Tue, 9 Nov 2010 21:46:53 +0000 (22:46 +0100)]
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:
  Add autotests for setting non-Object as prototype value
  Revert new flaky test
  compile fix for namespaced Qt
  Ensured that the document nodes are sorted in the generated index.
  Make qsTr() work with Unicode (non-Latin-1) strings
  Add autotest that checks return value of QScriptContext::throwXXX()
  Improve autotest coverage of QScriptEngineDebugger
  Add benchmark for emitting signals from QtScript
  Split monolithic QtScript autotest into smaller tests

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
Qt Continuous Integration System [Tue, 9 Nov 2010 19:47:07 +0000 (20:47 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: (131 commits)
  Qml Debugging: Only enable if explicitly requested
  Do not crash on Symbian
  Revert "Work around bug causing qml apps to crash on Symbian 5.0 devices."
  Work around bug causing qml apps to crash on Symbian 5.0 devices.
  Fix patch_capabilities.pl script for explicit set of capabilities
  Update license headers to release version.
  Adjust the parent index for the itemsMoved call.
  Workaround for QFileSystemWatcher regression
  Cleanup changelog for 4.7.1.
  My changes for 4.7.1
  Update change log.
  Revert "Don't define highp/mediump/lowp if desktop GL has them"
  Avoid in-place convertion of images with multiple references
  Add missing data for the autotest of in-place conversion for Pixmap
  Fixes assert in QDeclarativeWebView
  QGraphicsItem device coordinate cache unefficient in portrait mode
  Fix minehunt execution from QtDemo
  Ensure PathView updates positions when path changes.
  Support device orientation in harmattan
  Some 4.7.1 changes.
  ...

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
Qt Continuous Integration System [Tue, 9 Nov 2010 19:23:58 +0000 (20:23 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fixed deployment for symbian/linux-armcc when using shadow builds.
  Started using qtmain.lib for all Qt applications, also corelib ones.

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, 9 Nov 2010 16:38:10 +0000 (17:38 +0100)]
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:
  Doc: Fixing typo
  Doc: Fixing typo
  Doc: Fixing typo
  Fixed tst_qwidget::testContentsPropagation auto-test failure.
  Fixed text rendering bug in raster engine when opacity != 1.0.
  Prevented race condition on texture destruction.
  More fix for QTBUG-14640:oci performance problem with qlonglong
  Doc: Fixing typo
  Fixed grabWidget sometimes returning uninitialized memory.
  Fix Malayalam Rendering - 'Ra' is PreBase
  Update .def files for QtGui and QtOpenVG
  Use 32bit textures for alpha textures after all.
  One more fix for dithering.
  Doc: Fixing typo
  Fix QTBUG-14640:oci performance problem with qlonglong
  32bit => 16bit conversion has 4byte-aligned output.
  Fix gcc bug in qReallocAligned
  Prevented threading related crash in OpenGL module.
  Fix possible crash in QStaticText and QDeclarativeTextLayout
  Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors

11 years agoClear X11 structure before use
Harald Fernengel [Tue, 9 Nov 2010 16:32:15 +0000 (17:32 +0100)]
Clear X11 structure before use

This squelches valgrind warnings about uninitialized reads

Task-number: QT-3973
Reviewed-by: Robert Griebl
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Tue, 9 Nov 2010 16:01:09 +0000 (17:01 +0100)]
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:
  Really fix getting qmakespec on windows

11 years agoDoc: Fixing typo
Sergio Ahumada [Tue, 9 Nov 2010 14:57:24 +0000 (15:57 +0100)]
Doc: Fixing typo

11 years agoFixed random crash in QGestureManager.
Dominik Holland [Tue, 9 Nov 2010 13:21:38 +0000 (14:21 +0100)]
Fixed random crash in QGestureManager.

When the cachedGestures are cleaned, the Gestures should be removed in all QSets first, before the Delete.

Task: QT-4013
Reviewed By: Frederik Gladhorn

11 years agoFixed wrong include path in multimedia.
axis [Tue, 9 Nov 2010 11:25:36 +0000 (12:25 +0100)]
Fixed wrong include path in multimedia.

RevBy:    Miikka Heikkinen

11 years agoDoc: Fixing typo
Sergio Ahumada [Tue, 9 Nov 2010 12:00:25 +0000 (13:00 +0100)]
Doc: Fixing typo

11 years agoDoc: Fixing typo
Sergio Ahumada [Tue, 9 Nov 2010 11:59:11 +0000 (12:59 +0100)]
Doc: Fixing typo

11 years agoMake operator QRectF const
Harald Fernengel [Tue, 9 Nov 2010 11:39:14 +0000 (12:39 +0100)]
Make operator QRectF const

This allows us to convert a QGLRect to a QRectF also in const functions.
Function is inline and private, no ABI break.

Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoReally fix getting qmakespec on windows
aavit [Tue, 9 Nov 2010 11:20:26 +0000 (12:20 +0100)]
Really fix getting qmakespec on windows

11 years agoAdd autotests for setting non-Object as prototype value
Kent Hansen [Tue, 9 Nov 2010 11:06:31 +0000 (12:06 +0100)]
Add autotests for setting non-Object as prototype value

Currently it's possible to set the prototype to be any value,
but this doesn't make sense; see QTBUG-15154.
Mark test as expected failure until it's fixed.

11 years agoQS60Style: Color calculation should be optimized
Sami Merila [Tue, 9 Nov 2010 10:53:07 +0000 (12:53 +0200)]
QS60Style: Color calculation should be optimized

Addendum to the previous fix. Remove trailing white space as well.

Task-number: QTBUG-14860
Reviewed-by: Jani Hautakangas
11 years agoQS60Style: Color calculation should be optimized
Sami Merila [Tue, 9 Nov 2010 10:50:09 +0000 (12:50 +0200)]
QS60Style: Color calculation should be optimized

Currently, QS60Style calculates some palette colors (tooltip base and
button). Since native side does not have a color for these, but a
nine-part theme graphic, the style tries to estimate the color of the
bitmap by taking a small sample of the QPixmap and calculate the
RGB colors of 32*32 pixels. This is rather slow, it takes around
110 msecs for each QApplication, when the application is started.
Note that color is cached to member variable of style, but it is very
rarely asked again (as the color is polished to all widgets/apps)
and the cache is not shared across processes.

As a fix, style now calculates the button color (tooltip color
is no longer calculated, as no other QStyle does that, and
tooltips do not anyway work in the Qt/Symbian) and stores the
calculated value to Global QSettings together with active theme
ID. Now, when a second Qt application is launched, the stored
theme ID value is matched with currently active theme. If it
matches, then the stored Button color is used. Otherwise, color
is again calculated and stored. If theme is unchanged, the
application launch is ~95msecs faster.

Task-number: QTBUG-14860
Reviewed-by: Jani Hautakangas
11 years agoFixed tst_qwidget::testContentsPropagation auto-test failure.
Samuel Rødal [Tue, 9 Nov 2010 09:53:43 +0000 (10:53 +0100)]
Fixed tst_qwidget::testContentsPropagation auto-test failure.

Some auto-tests render into a QPixmap and check the result against
QPixmap::grabWidget(). Change acc1a2bd5520369c made grabWidget() render
into a QImage to be able to preserve background transparency. Instead,
to avoid breaking various auto-tests, we can use a QPixmap and fill it
with transparent if the widget's isOpaque flag is not set.

Task-number: QTBUG-14945
Reviewed-by: Kim
11 years agoFix GC-related crash in QScriptValue::setData()
Kent Hansen [Tue, 9 Nov 2010 08:20:36 +0000 (09:20 +0100)]
Fix GC-related crash in QScriptValue::setData()

Yet another missing API shim.
When converting the QScriptValue to JSC, a JSCell may be allocated,
which can cause the GC to trigger.
If an identifier (JSC::Identifier) is then garbage collected, the
destructor will try to remove itself from the currentIdentifierTable().
Because the API shim was missing, the identifier table was 0.
It's difficult to create a bulletproof test for this case, but the
attached test is a best effort (it crashes on my machine without the
fix).

Task-number: QTBUG-15144
Reviewed-by: Jedrzej Nowacki
11 years agoFixed deployment for symbian/linux-armcc when using shadow builds.
axis [Mon, 8 Nov 2010 15:13:54 +0000 (16:13 +0100)]
Fixed deployment for symbian/linux-armcc when using shadow builds.

RevBy:    Miikka Heikkinen

11 years agoStarted using qtmain.lib for all Qt applications, also corelib ones.
axis [Mon, 8 Nov 2010 14:18:11 +0000 (15:18 +0100)]
Started using qtmain.lib for all Qt applications, also corelib ones.

This commit also fixes the issue that 564058a1bb didn't, namely that
config tests broke on Symbian. It does this by continuing to use the
Open C libcrt0.lib library for non-Qt applications. This is also more
correct, since you should not have to compile the Qt libs to compile
a non-Qt app.

Task:     QTBUG-14735
RevBy:    Miikka Heikkinen

11 years agoMerge commit 'v4.7.1' into 4.7
Jason McDonald [Tue, 9 Nov 2010 07:49:38 +0000 (17:49 +1000)]
Merge commit 'v4.7.1' into 4.7

11 years agodoc
Warwick Allison [Tue, 9 Nov 2010 07:48:29 +0000 (17:48 +1000)]
doc

11 years agoRevert new flaky test
Kent Hansen [Tue, 9 Nov 2010 06:59:34 +0000 (07:59 +0100)]
Revert new flaky test

Apparently this crashes on Mac. Remove for now, pending further
investigation.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Tue, 9 Nov 2010 06:39:30 +0000 (07:39 +0100)]
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: (32 commits)
  Fix Text::elide docs.
  Fix Rectangle painting at small sizes.
  Fix QML ecmascript autotest.
  Fix QtQuick import.
  Export QDeclarativeDebugHelper on Symbian for QTBUG-13762
  Don't use stdint.h in our headers since it is a C99 header.
  Text alignment is broken with multi-line text and implicit size.
  Update QtOpenVg def files for bug QT-3589
  Image bounding rect should always include the area being painted
  Fix minehunt.pro (minehunt is no longer a plugin)
  Don't allow flagging of flipped tiles in Minehunt
  Remove Snake demo from QtDemo
  Fix samegame text input focus
  Whitespace fixes
  Update visual tests for Mac.
  Run all QML visual tests now.
  Make qmlvisual tests more stable
  Add documentation about script evaluation context and allowed types
  Maintain passing visualtests on X11
  Fix errors in example code. Also reverts the example code to the old
  ...

11 years agoFix Text::elide docs.
Bea Lam [Tue, 9 Nov 2010 04:33:16 +0000 (14:33 +1000)]
Fix Text::elide docs.

Reviewed-by: Michael Brasser
11 years agoFix Rectangle painting at small sizes.
Martin Jones [Tue, 9 Nov 2010 02:40:48 +0000 (12:40 +1000)]
Fix Rectangle painting at small sizes.
We require a minimum size of 5x5 for the border image caching to work.

Task-number: QTBUG-15135
Reviewed-by: Michael Brasser
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Lorn Potter [Tue, 9 Nov 2010 01:23:37 +0000 (11:23 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

11 years agoget rid of dependency on QtGui
Lorn Potter [Tue, 9 Nov 2010 01:19:01 +0000 (11:19 +1000)]
get rid of dependency on QtGui

Task-number: QTBUG-15059
Reviewed-by: trustme
11 years agoRemoved implicity QtGui linking from icd.pro as it is not needed.
juhvu [Tue, 9 Nov 2010 00:45:18 +0000 (10:45 +1000)]
Removed implicity QtGui linking from icd.pro as it is not needed.

Task-number: QTBUG-15059

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, 9 Nov 2010 00:21:06 +0000 (01:21 +0100)]
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 deployment for symbian/linux-armcc when using shadow builds.
  Started using qtmain.lib for all Qt applications, also corelib ones.
  Make qmake to pass all UTF-8 characters unchanged through parser.
  Implement support for DEPLOYMENT.display_name in Symbian
  Added .flags modifier support for DEPLOYMENT items in Symbian
  Make default application deployment removable
  Allow pkg_prerules and pkg_postrules to be targeted to separate files
  Added missing def file symbol.
  Revert "Use qtmain.lib to provide entry point for all Symbian applications"
  Fixed test after the fix to QT-4077.
  Fixed event starvation with pointer events on Symbian.

11 years agoFix QML ecmascript autotest.
Yann Bodson [Mon, 8 Nov 2010 23:16:29 +0000 (09:16 +1000)]
Fix QML ecmascript autotest.

11 years agoFix QtQuick import.
Yann Bodson [Mon, 8 Nov 2010 23:00:13 +0000 (09:00 +1000)]
Fix QtQuick import.

11 years agoMerge branch '4.7-upstream' into 4.7-water
Thierry Bastian [Mon, 8 Nov 2010 23:00:11 +0000 (00:00 +0100)]
Merge branch '4.7-upstream' into 4.7-water

11 years agoDFB: Make sure QPixmap::hasAlpha is respected
Anders Bakken [Mon, 8 Nov 2010 22:12:25 +0000 (14:12 -0800)]
DFB: Make sure QPixmap::hasAlpha is respected

An IDirectFBSurface can have an alpha channel for an opaque QPixmap.
This change will make sure we don't blend unless QPixmap::hasAlpha
returns true.

Merge-request: 913
Reviewed-by: Donald Carr <donald.carr@nokia.com>
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 8 Nov 2010 22:40:57 +0000 (23:40 +0100)]
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:
  compile fix for namespaced Qt
  Ensured that the document nodes are sorted in the generated index.
  Make qsTr() work with Unicode (non-Latin-1) strings
  Add autotest that checks return value of QScriptContext::throwXXX()
  Improve autotest coverage of QScriptEngineDebugger
  Add benchmark for emitting signals from QtScript
  Split monolithic QtScript autotest into smaller tests