qt:qt.git
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Fri, 20 May 2011 07:22:25 +0000 (17:22 +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:
  QLibrary: support .so file extension on AIX.

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Fri, 20 May 2011 03:48:01 +0000 (13:48 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
  Increased EPOCHEAPSIZE for qpainter benchmark
  Increased EPOCHEAPSIZE for few benchmarks
  Update Symbian DEF-files
  Improve DEFINES crossplatform compatibility in Symbian builds.
  Freezing the QtCore defs again for 4.8.

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master...
Qt Continuous Integration System [Thu, 19 May 2011 23:24:33 +0000 (09:24 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging:
  Re-apply licenseheader text in source files for qt4.8
  Updating file with CRLF line endings for the updated header
  Update licenseheader text in source files for qt4.8
  Updated DEF files for QtGui and QtOpenGl
  Updated DEF files for QtGui and QtOpenGL

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Thu, 19 May 2011 19:17:58 +0000 (05:17 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
  Fixed compile of qdrawhelper_neon.cpp.

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Thu, 19 May 2011 15:52:28 +0000 (01:52 +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:
  Update qhostinfo autotest to expect RFC5952 formatted ipv6 addresses

11 years agoMerge remote-tracking branch 'qt/4.8'
Jyri Tahtela [Thu, 19 May 2011 13:56:55 +0000 (16:56 +0300)]
Merge remote-tracking branch 'qt/4.8'

11 years agoQLibrary: support .so file extension on AIX.
Pierre Rossi [Thu, 19 May 2011 12:42:16 +0000 (14:42 +0200)]
QLibrary: support .so file extension on AIX.

As explained in the doc from IBM: "AIX also supports shared objects with
the file name .so".

Reviewed-by: Thiago
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 19 May 2011 11:47:06 +0000 (21:47 +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 rendering of Mac controls onto a QImage

11 years agoFixed compile of qdrawhelper_neon.cpp.
Samuel Rødal [Thu, 19 May 2011 08:45:50 +0000 (10:45 +0200)]
Fixed compile of qdrawhelper_neon.cpp.

We need to use the quad-word intrinsic and reinterpret the cast to
a signed int vector.

Reviewed-by: Kim Motoyoshi Kalland <kim.kalland@nokia.com>
11 years agoUpdate qhostinfo autotest to expect RFC5952 formatted ipv6 addresses
Shane Kearns [Wed, 18 May 2011 14:08:53 +0000 (15:08 +0100)]
Update qhostinfo autotest to expect RFC5952 formatted ipv6 addresses

Test required updating due to ebc134db484eee31491836b619aad1ee86e3070e

Reviewed-by: Martin Petersson
11 years agoFix rendering of Mac controls onto a QImage
Andy Shaw [Wed, 11 May 2011 06:30:08 +0000 (08:30 +0200)]
Fix rendering of Mac controls onto a QImage

When a context was requested for a painter then it would not get a valid
context because it did not account for the QImage case.  This fix adds
QImage to the list of devtypes that the raster engine needs a context
for.

Task-number: QTBUG-19117
Reviewed-by: Samuel
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Wed, 18 May 2011 18:58:55 +0000 (04:58 +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:
  Symbian socket: Implement systemProxyForQuery for service networks
  tst_q3dns: update test to follow RFC-5952.
  Doc: update platform notes on Mac to reflect WA_MacNoCocoaChildWindow (cherry picked from commit b240f8a2ee3b7ff82a389fbf5dfd076792f385e8)
  QT_USE_QSTRINGBUILDER to fix source compatibility
  Make QHostAddress.toString() follow RFC-5952 for IPv6 address format.

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Wed, 18 May 2011 14:59:17 +0000 (00:59 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
  Increased EPOCHEAPSIZE for qpainter benchmark
  Increased EPOCHEAPSIZE for few benchmarks

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
Qt Continuous Integration System [Wed, 18 May 2011 14:22:24 +0000 (00:22 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
  Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ASCII range
  Fix crashes with regular expressions QtScript on ARM traditional architectures

11 years agoMerge remote-tracking branch 'origin/4.8'
Olivier Goffart [Wed, 18 May 2011 13:13:10 +0000 (15:13 +0200)]
Merge remote-tracking branch 'origin/4.8'

11 years agoMerge remote-tracking branch 'earth-staging/master'
Olivier Goffart [Wed, 18 May 2011 13:13:03 +0000 (15:13 +0200)]
Merge remote-tracking branch 'earth-staging/master'

11 years agoSymbian socket: Implement systemProxyForQuery for service networks
Shane Kearns [Tue, 17 May 2011 12:07:42 +0000 (13:07 +0100)]
Symbian socket: Implement systemProxyForQuery for service networks

When the specified (or active/default) network is a service network,
try to determine the appropriate IAP network within it.
This is the highest priority active network (if any)
followed by the highest priority discovered network (if any)
or the highest priority network as a last resort.

As Symbian doesn't include proxy type in the comms database, proxies
are assumed to be http type unless the port is 1080 (iana assigned
port for SOCKS) in which case the proxy is set as SOCKS type.

Also fixed unitialised member issue with SymbianIapId internal class

Task-number: QTBUG-18618
Reviewed-by: Markus Goetz
11 years agoIncreased EPOCHEAPSIZE for qpainter benchmark
Miikka Heikkinen [Wed, 18 May 2011 12:17:20 +0000 (15:17 +0300)]
Increased EPOCHEAPSIZE for qpainter benchmark

Insufficient heap size was causing out-of-memory errors in qpainter
benchmark.

Task-number: QTBUG-17724
Reviewed-by: TrustMe
11 years agoIncreased EPOCHEAPSIZE for few benchmarks
Miikka Heikkinen [Wed, 18 May 2011 09:55:47 +0000 (12:55 +0300)]
Increased EPOCHEAPSIZE for few benchmarks

Insufficient heap size was causing containers-sequential and
qgraphicsscene benchmarks to panic in Symbian^1 devices.

Task-number: QTBUG-17725
Reviewed-by: Sami Merila
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Wed, 18 May 2011 09:40:44 +0000 (19:40 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (37 commits)
  Update Symbian DEF-files
  Revert all QScroller and QFlickGesture related code.
  Improve DEFINES crossplatform compatibility in Symbian builds.
  Fix regression that caused waitForXXX(-1) to fail.
  Freezing the QtCore defs again for 4.8.
  X11: Keep the menubar inside the widgetbox window in toplevel mode
  Retain ABI and API compatibility when Qt is built with EGL.
  Allow 'typeinfo <file>' lines in qmldir.
  qmlplugindump: Use command line options with a single dash.
  qmlplugindump: Allow dumping by path without URI.
  Move qmldump from Qt Creator to Qt.
  QmlDebug: Fix QmlOstPlugin compilation failure
  Fix GLES2 include path for applications when not using the dash shell
  fixup for 23e772584531278e3b2a6c735ff9db88f7ffd76e
  QmlDebug: Fix QmlOstPlugin compilation failure
  Enable performance monitoring at application startup.
  Remove not supported qmake api
  Added Wayland selection support.
  Added Wayland selection support.
  Add the wayland client libraries to rpath if we use rpath
  ...

11 years agotst_q3dns: update test to follow RFC-5952.
Martin Petersson [Wed, 18 May 2011 08:29:25 +0000 (10:29 +0200)]
tst_q3dns: update test to follow RFC-5952.

QHostAddress::toString() was updated to follow RFC-5952.

Reviewed-by: Markus Goetz
11 years agoUpdate Symbian DEF-files
Sami Merila [Wed, 18 May 2011 08:04:25 +0000 (11:04 +0300)]
Update Symbian DEF-files

Due to removal of QScroller and related classes, QtGui DEF files needed
to be updated.

Additionally, there was some new functionality in QDeclarative that
required updation of QtDeclarative DEF-files.

Reviewed-by: Trust Me
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
Qt Continuous Integration System [Wed, 18 May 2011 07:55:56 +0000 (17:55 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (195 commits)
  Re-apply licenseheader text in source files for qt4.8
  Revert all QScroller and QFlickGesture related code.
  Fix regression that caused waitForXXX(-1) to fail.
  Fix thread safety regression of QNetworkConfigurationManager
  Fix instability in QNetworkConfigurationManager autotest
  Support word selection list with predictive text from splitview
  Fix softkey icon positioning in S60 5.3
  QDeclarativeMouseArea: block context menu events
  ListViews loses items if all visible items are removed.
  Make TextEdit word selection more natural.
  Fixed license header.
  Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile
  Clear confusion between QMainWindow and QMainWindowLayout.
  Fix for rounded corners bug in QMenu
  Compile
  QWidgetPrivate::setParent_sys might be using null pointer
  Ensure the TextEdit cursor delegate is repositioned on mouse events.
  Don't crash on an invalid replacementStart from an input method.
  Fix QGLWidget::renderPixmap for raster engine on Mac
  Check if OES_texture_npot is present on OpenGL ES 2.
  ...

11 years agoRe-apply licenseheader text in source files for qt4.8
Jyri Tahtela [Wed, 18 May 2011 07:48:47 +0000 (10:48 +0300)]
Re-apply licenseheader text in source files for qt4.8

New files after merged from qt/4.8

Reviewed-by: Trust Me
11 years agoMerge remote-tracking branch 'qt/4.8'
Jyri Tahtela [Wed, 18 May 2011 07:41:09 +0000 (10:41 +0300)]
Merge remote-tracking branch 'qt/4.8'

Conflicts:
doc/src/examples/wheel.qdoc
src/gui/util/qflickgesture.cpp
src/gui/util/qflickgesture_p.h
src/gui/util/qscroller.cpp
src/gui/util/qscroller.h
src/gui/util/qscroller_p.h
src/gui/util/qscrollerproperties.cpp
src/gui/util/qscrollerproperties.h
tests/auto/qscroller/tst_qscroller.cpp

11 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Tue, 17 May 2011 23:11:22 +0000 (09:11 +1000)]
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (55 commits)
  Fix thread safety regression of QNetworkConfigurationManager
  Fix instability in QNetworkConfigurationManager autotest
  Support word selection list with predictive text from splitview
  Fix softkey icon positioning in S60 5.3
  QDeclarativeMouseArea: block context menu events
  ListViews loses items if all visible items are removed.
  Make TextEdit word selection more natural.
  Clear confusion between QMainWindow and QMainWindowLayout.
  Fix for rounded corners bug in QMenu
  Compile
  QWidgetPrivate::setParent_sys might be using null pointer
  Ensure the TextEdit cursor delegate is repositioned on mouse events.
  Don't crash on an invalid replacementStart from an input method.
  Fix incorrect hardware address on systems without getifaddrs()
  Enable multisampling on Symbian if hw supports it
  Fix QtCoreu.def file error
  Introduce platform extension to QGraphicsSystem
  Fix Symbian/WinsCW build break
  Prevent crash in OpenGL engine when scaling images / pixmaps.
  emit QNetWorkAccessManager::finished on QNetworkReply::abort()
  ...

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
Qt Continuous Integration System [Tue, 17 May 2011 22:33:51 +0000 (08:33 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team:
  Updating file with CRLF line endings for the updated header
  Update licenseheader text in source files for qt4.8
  X11: Keep the menubar inside the widgetbox window in toplevel mode
  Retain ABI and API compatibility when Qt is built with EGL.
  Allow 'typeinfo <file>' lines in qmldir.
  qmlplugindump: Use command line options with a single dash.
  qmlplugindump: Allow dumping by path without URI.
  Move qmldump from Qt Creator to Qt.

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
Qt Continuous Integration System [Tue, 17 May 2011 14:58:00 +0000 (00:58 +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: (114 commits)
  Fixed license header.
  Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile
  Remove Q_ASSERT's from qsharedmemory autotest
  Remove Q_ASSERT's from QNetworkReply autotest
  Remove Q_ASSERT's from qabstractxmlnodemodel test
  Remove Q_ASSERT from QXmlStream autotest
  Remove Q_ASSERT from qxmlquery autotest
  Remove Q_ASSERT's from QXmlStream autotest
  Remove Q_ASSERT from QItemModel autotest
  Remove Q_ASSERT's from qxmlquery autotest
  Remove Q_ASSERT from qxmlquery autotest
  Remove Q_ASSERT's from QXmlStream autotest
  Remove Q_ASSERT from qabstractxmlnodemodel test
  Remove Q_ASSERT from qscriptvaluegenerated test
  Remove Q_ASSERT from QVariant autotest
  Remove Q_ASSERT's from QTreeView autotest
  Remove Q_ASSERT from qtesselator autotest
  Remove unused function from qtessellator autotest
  Remove Q_ASSERT from qscriptvaluegenerated test
  Remove Q_ASSERT's from qscriptvaluegenerated test
  ...

11 years agoUpdating file with CRLF line endings for the updated header
Sergio Ahumada [Tue, 17 May 2011 07:01:46 +0000 (09:01 +0200)]
Updating file with CRLF line endings for the updated header

This file requires CRLF line terminators to pass the tst_moc test
after a license update.

11 years agoMerge remote-tracking branch 'qt/4.8'
Sami Lempinen [Tue, 17 May 2011 06:18:56 +0000 (09:18 +0300)]
Merge remote-tracking branch 'qt/4.8'

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Tue, 17 May 2011 02:56:03 +0000 (12:56 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: (23 commits)
  Fix QGLWidget::renderPixmap for raster engine on Mac
  Check if OES_texture_npot is present on OpenGL ES 2.
  Fix tst_QVariant::invalidColor
  Move QTextCursor::MoveStyle to Qt namespace
  Move the painting redirection to the unified toolbar surface.
  Fix misspelled word in comment.
  Build fix for tst_qrawfont
  Add some QRawFont related low level functions to avoid extra copying
  Compile on Mac
  Rename QGlyphs -> QGlyphRun
  Fix QRawFont::setPixelSize() on Mac
  Remove warning from QColor::setNamedColor().
  Add internal documentation for QUnifiedToolbarSurface.
  Fix QPainter::drawGlyphs() with non-affine transformation
  Remove misspelled comment in tst_qtextdocument.cpp
  Only enable design metrics for scalable fonts
  Add a way to retrieve CTFontRef from QFont
  Include pixel size of font in exported HTML from QTextDocument
  Fix the autotest condition.
  Change the repaint() call to an update().
  ...

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 16 May 2011 14:59:56 +0000 (00:59 +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:
  Revert all QScroller and QFlickGesture related code.
  Fix regression that caused waitForXXX(-1) to fail.

11 years agoRevert all QScroller and QFlickGesture related code.
Robert Griebl [Thu, 12 May 2011 13:54:11 +0000 (15:54 +0200)]
Revert all QScroller and QFlickGesture related code.

This reverts commits
 0274e68767cce6440515a68d6af868725d5577a4
 2770b1277744bb676e96e4ae8c89acd645ec895d
 02e1f4e83dc8e3c4ab957095167b3d34c51ba3c1
 fdf3be5b6b5db75833e0a7e9a90445ddd794fe4d
 d1f9a534da288884f443a975f428b0cfe0a7b29b
 205d607c3387d074fb87f8deb77a8f515ae2e189
 32d200da9cc7a4dfb3f302f22ef5718a286845c9
 3e0df49f978933b1e4e6b48c695bf813ec9a2828
 82bbc1c1611bde33680d22a1a3c6449e51d7b0b9
 b78ffe51f9a4c4ac705e435d45fffe39864c032d
 fe438d7d828021d7f86301af36fe8dff2768532a
 df30d58de183d13c649ef7e0fbb8e2b3658e0862
 fa845566b3733bc06454b71e33b1ff405ba32280
 4f9a318d639c4e7e09e56751d31608fb39d472af
 4810b587a65d81f8f90646efd09cadeb1276a756
 7bad867382ad6c84155ffcfbb361709a8e8184ab
 64ec011c6132496eb9555c1d09e7fd4ddf472837
 81492e56aba5b5761500543665012a85d6835513
 b668857b3749b39c3a61e0a25e750740b74df552
 78a7a02b3b85435bc28eb23e9210522467171e42

Reviewed-By: Ralf Engels
11 years agoImprove DEFINES crossplatform compatibility in Symbian builds.
Miikka Heikkinen [Mon, 16 May 2011 12:30:04 +0000 (15:30 +0300)]
Improve DEFINES crossplatform compatibility in Symbian builds.

DEFINES statements that define strings needed separate statements for
symbian-sbsv2 builds and Makefile based plaforms, as there is one extra
layer of escaping needed in Makefile builds. Improved compatibility by
making qmake remove one layer of escaping before writing the .mmp MACROs
based on DEFINES.

Note: Symbian-abld builds still do not support string DEFINES as the
      toolchain simply can't handle them in .mmp files, no matter how
      they are escaped.

Note2: Symbian-sbsv2 support for escaped DEFINES is not perfect either,
       as bld.inf files do not like doubly escaped characters in
       extension rules (e.g. double-quotation mark as part of a string).
       This makes it impossible to pass such DEFINES to extra compilers.

Task-number: QTBUG-19232
Reviewed-by: Oswald Buddenhagen
11 years agoMerge remote-tracking branch 'qt/4.8'
Jyri Tahtela [Mon, 16 May 2011 12:36:03 +0000 (15:36 +0300)]
Merge remote-tracking branch 'qt/4.8'

11 years agoFix inconsistency between Qt and ICU in Shift-JIS codec with regards to ASCII range
Simon Hausmann [Mon, 16 May 2011 12:04:31 +0000 (14:04 +0200)]
Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ASCII range

Qt's Shift-JIS codec maps the characters 0x5c and 0x7e to unicode yen (0x5a)
and unicode overline (0x203e). ICU and (as it turns out) Symbian's native
Shift-JIS codec preserve 0x5c and 0x7e when converting to Unicode.

Qt's behaviour creates a problem when loading japanese web sites that are
encoded in Shift-JIS. When they reference external JavaScript files, those tend
to inherit the current page encoding (unless the character set is explicitly
specified). Consequently JavaScript tends to contain regular expressions (as a
built-in feature of the language), which in turn uses backslashes for escape
sequences. Therefore it is crucial that the encodings used to decode the script
preserve the ASCII range, i.e. do not convert 0x5c (ascii backslash) to
something else.

This patch corrects the behaviour of Qt's Shift-JIS codec to leave all
characters < 0x80 unaltered in the process of conversion to and from
Unicode.

Task: QTBUG-19335

Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
11 years agoFix crashes with regular expressions QtScript on ARM traditional architectures
Simon Hausmann [Mon, 16 May 2011 11:47:09 +0000 (13:47 +0200)]
Fix crashes with regular expressions QtScript on ARM traditional architectures

Save and restore the r8 register properly.

Backport of http://trac.webkit.org/changeset/65242 from WebKit trunk

Reviewed-by: Jedrzej Nowacki
11 years agoFix regression that caused waitForXXX(-1) to fail.
Thiago Macieira [Mon, 16 May 2011 11:20:25 +0000 (13:20 +0200)]
Fix regression that caused waitForXXX(-1) to fail.

Regression was introduced by 8d4cd52b6981a4e6deea7fdb77f56e40c4f3e6ba
when it failed to check when msecs == -1. This manifested visibly in KDE
failing to connect to any SSL site -- kioslaves are synchronous and use
waitForXXX(-1) (in this particular case, waitForEncrypted, which calls
waitForReadyRead).

Also, take the opportunity to convert these tests in QTcpSocket to use
port 80 (a defined service in the test server) instead of port 22.

Reviewed-by: Martin Petersson
11 years agoFreezing the QtCore defs again for 4.8.
Laszlo Agocs [Mon, 16 May 2011 10:22:47 +0000 (12:22 +0200)]
Freezing the QtCore defs again for 4.8.

11 years agoMerge remote-tracking branch 'origin/4.8'
Olivier Goffart [Mon, 16 May 2011 08:25:07 +0000 (10:25 +0200)]
Merge remote-tracking branch 'origin/4.8'

11 years agoMerge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7
Olivier Goffart [Mon, 16 May 2011 08:02:12 +0000 (10:02 +0200)]
Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7

Conflicts:
src/gui/kernel/qt_s60_p.h

11 years agoMerge remote branch 'origin/4.8' into qa-review-master
Rohan McGovern [Sun, 15 May 2011 23:09:31 +0000 (09:09 +1000)]
Merge remote branch 'origin/4.8' into qa-review-master

Conflicts:
tests/auto/qaccessibility/tst_qaccessibility.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp

11 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Sat, 14 May 2011 16:05:55 +0000 (02:05 +1000)]
Merge branch 4.7 into qt-4.8-from-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 [Fri, 13 May 2011 16:37:41 +0000 (02:37 +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 instability in QNetworkConfigurationManager autotest
  Support word selection list with predictive text from splitview
  Fix softkey icon positioning in S60 5.3

11 years agoFix thread safety regression of QNetworkConfigurationManager
Shane Kearns [Fri, 13 May 2011 15:19:18 +0000 (16:19 +0100)]
Fix thread safety regression of QNetworkConfigurationManager

Changes in 4.8 led to a timer being created in the wrong thread.
I have restored the invokeMethod used to call startPolling() to solve
this problem.

Reviewed-By: mread
11 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Fri, 13 May 2011 16:09:00 +0000 (02:09 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

11 years agoFix instability in QNetworkConfigurationManager autotest
Shane Kearns [Fri, 13 May 2011 15:32:58 +0000 (16:32 +0100)]
Fix instability in QNetworkConfigurationManager autotest

QThread::isFinished() can return false after the finished() signal is
emitted, so test the event loop's timeout() function instead.
Don't compare prescan configurations, as these may be cached by the OS.
It was causing the test to fail on linux if run before any other network
test.

Reviewed-by: mread
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Fri, 13 May 2011 14:34:33 +0000 (00:34 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  Allow 'typeinfo <file>' lines in qmldir.
  qmlplugindump: Use command line options with a single dash.
  qmlplugindump: Allow dumping by path without URI.
  Move qmldump from Qt Creator to Qt.

11 years agoUpdate licenseheader text in source files for qt4.8
Jyri Tahtela [Fri, 13 May 2011 14:24:24 +0000 (17:24 +0300)]
Update licenseheader text in source files for qt4.8

Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.

Reviewed-by: Trust Me
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Sami Merila [Fri, 13 May 2011 12:38:23 +0000 (15:38 +0300)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7

11 years agoSupport word selection list with predictive text from splitview
Sami Merila [Fri, 13 May 2011 12:36:43 +0000 (15:36 +0300)]
Support word selection list with predictive text from splitview

When splitview is active and user taps a predicted word, mouse button
should be forwarded to m_pointerHandler, which opens a suggested word
list. When splitview is not active, but there are HW QWERTY keys in the
device, tapping a word, should only move the cursor. Without HW QWERTY
and no splitview, native editing state handles the functionality.

Task-number: QTBUG-19062
Reviewed-by: Miikka Heikkinen
11 years agoFix softkey icon positioning in S60 5.3
Miikka Heikkinen [Fri, 13 May 2011 12:29:53 +0000 (15:29 +0300)]
Fix softkey icon positioning in S60 5.3

In S60 5.3, Avkon apparently expects softkey icons to be 32x32 and
positions them accordingly into the softkey, instead of needing the
application to supply the whole softkey image.
Fixed by skipping the softkey image centering when S60 version is 5.3
or larger.

Task-number: QTBUG-19104
Reviewed-by: Sami Merila
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
Qt Continuous Integration System [Fri, 13 May 2011 11:35:03 +0000 (21:35 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (54 commits)
  Fix QtOpenGL def file for armv5.
  Disable QtConcurrent for Symbian winscw builds.
  Fix loss of focus and activation when hiding a child widget
  Symbian build failure for Armv5
  QmlDebug: Fix QmlOstPlugin compilation failure
  Fix GLES2 include path for applications when not using the dash shell
  fixup for 23e772584531278e3b2a6c735ff9db88f7ffd76e
  QmlDebug: Fix QmlOstPlugin compilation failure
  update def files
  Fix softkeys in case a dialog with softkeys that have icons is closed.
  Update softkeys after orientation switch.
  Enable performance monitoring at application startup.
  ifdef out mac/no_coreservices path more cleanly
  fix build on symbian
  Provide internal API to avoid automatic translation of input widget
  Remove not supported qmake api
  Added Wayland selection support.
  Added Wayland selection support.
  Add the wayland client libraries to rpath if we use rpath
  Fix the wayland windowsurface so that we have stencil and depth buffer
  ...

11 years agoMerge remote-tracking branch 'qt/4.8'
Jyri Tahtela [Fri, 13 May 2011 11:30:46 +0000 (14:30 +0300)]
Merge remote-tracking branch 'qt/4.8'

Conflicts:
src/s60installs/eabi/QtOpenGLu.def

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Fri, 13 May 2011 10:39:05 +0000 (20:39 +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:
  X11: Keep the menubar inside the widgetbox window in toplevel mode
  Retain ABI and API compatibility when Qt is built with EGL.

11 years agoX11: Keep the menubar inside the widgetbox window in toplevel mode
Michał Zając [Fri, 13 May 2011 08:40:05 +0000 (10:40 +0200)]
X11: Keep the menubar inside the widgetbox window in toplevel mode

For now the appmenu protocol does not make it possible to associate a
menubar with all application windows. This means in top level mode you
can only reach the menubar when the widgetbox window is active. Since
this is quite inconvenient, better not use the native menubar in this
configuration and keep the menubar in the widgetbox window.

Merge-request: 1229
Reviewed-by: denis
11 years agoRetain ABI and API compatibility when Qt is built with EGL.
Michał Zając [Fri, 13 May 2011 08:39:34 +0000 (10:39 +0200)]
Retain ABI and API compatibility when Qt is built with EGL.

Author: Felix Geyer <debfx-pkg@fobos.de>

Merge-request: 1230
Reviewed-by: ossi
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Fri, 13 May 2011 08:28:46 +0000 (18: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:
  QDeclarativeMouseArea: block context menu events
  ListViews loses items if all visible items are removed.

11 years agoQDeclarativeMouseArea: block context menu events
Caio Marcelo de Oliveira Filho [Fri, 13 May 2011 07:01:28 +0000 (17:01 +1000)]
QDeclarativeMouseArea: block context menu events

If the MouseArea accepts the same button used to trigger a context
menu event, it should not let the event to be delivered to item
behind.

This is important for items that do implement contextMenuEvent(), like
QDeclarativeWebView. When there's a mouse area on top of this item and
that accepts the right click (in Linux), the event was still being
delivered and the WebView menu was incorrectly appearing.

QtWebKit bug https://bugs.webkit.org/show_bug.cgi?id=56526 documents this
problem.

Change-Id: I386fac6c96f47b8616e2eeb7e5f97043ba418980
Merge-request: 1185
Reviewed-by: Martin Jones <martin.jones@nokia.com>
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Fri, 13 May 2011 06:32:13 +0000 (16:32 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
  Fix QtOpenGL def file for armv5.
  Disable QtConcurrent for Symbian winscw builds.
  Fix loss of focus and activation when hiding a child widget
  Symbian build failure for Armv5
  Fix softkeys in case a dialog with softkeys that have icons is closed.
  Update softkeys after orientation switch.
  Provide internal API to avoid automatic translation of input widget
  Do not allow fullscreen/maximized windows to expand beyond client rect

11 years agoListViews loses items if all visible items are removed.
Martin Jones [Fri, 13 May 2011 05:28:30 +0000 (15:28 +1000)]
ListViews loses items if all visible items are removed.

Occurs when at end of list and all visible items are removed in
multiple steps, without entering the event loop.
We were not updating visibleIndex if there were no visible items
when handling itemsRemoved().
Also avoid skipping items in refill if there are no valid visible
items for reference.

Change-Id: I2ff58fb191f6b053f33d5446220d597eb15b66d4
Task-number: QTBUG-19198
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 [Fri, 13 May 2011 04:31:32 +0000 (14:31 +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:
  Make TextEdit word selection more natural.

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
Qt Continuous Integration System [Fri, 13 May 2011 04:14:30 +0000 (14:14 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
  Fixed license header.
  Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile

11 years agoMake TextEdit word selection more natural.
Andrew den Exter [Fri, 13 May 2011 03:49:20 +0000 (13:49 +1000)]
Make TextEdit word selection more natural.

QTextControl will only extend the selection to a word if the cursor is
directly over it which prevents the selection being extended if the
mouse is dragged up or down a to a shorter line of text making it
difficult to select multiple lines of text.  Just disable that
limitation when the TextEdit word selection is enabled.

Change-Id: I3b9d1575c0141db8441197d740de94a90eacc077
Task-number: QTBUG-19230
Reviewed-by: Martin Jones
11 years agoFixed license header.
Rohan McGovern [Fri, 13 May 2011 04:10:29 +0000 (14:10 +1000)]
Fixed license header.

11 years agoEnsure that recursive QMAKE_EXTRA_TARGETS use the correct makefile
Rohan McGovern [Thu, 12 May 2011 07:45:55 +0000 (17:45 +1000)]
Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile

Recursive QMAKE_EXTRA_TARGETS were omitting the `-f' option to make.
This would break in the case where the correct makefile was not named
`Makefile'.  The included autotest demonstrates the problem.

Note that this was fixed for normal targets back in 2005
by faac7bd178654fd67a6f3f9cf4f6f2605071448d (p4 202370), but was not
fixed for extra targets.

Reviewed-by: ossi
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, 12 May 2011 18:39:02 +0000 (04: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:
  Clear confusion between QMainWindow and QMainWindowLayout.

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Thu, 12 May 2011 17:40:55 +0000 (03:40 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
  Fix QtOpenGL def file for armv5.

11 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Thu, 12 May 2011 16:06:44 +0000 (02:06 +1000)]
Merge branch 4.7 into qt-4.8-from-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 [Thu, 12 May 2011 14:50:47 +0000 (00:50 +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 for rounded corners bug in QMenu

11 years agoClear confusion between QMainWindow and QMainWindowLayout.
Fabien Freling [Thu, 12 May 2011 12:10:56 +0000 (14:10 +0200)]
Clear confusion between QMainWindow and QMainWindowLayout.

The variables activateUnifiedToolbarAfterFullScreen
and useHIToolBar were implemented in both classes.
This was an obvious bug, where variable would be
initialized in one class and use in the other one.

Task-number: QTBUG-18874
Reviewed-by: Yoann Lopes
(cherry picked from commit 15a5eaf0eeb44833a052b6201171fca4b9e8f74e)

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into master-qml...
Kai Koehne [Thu, 12 May 2011 14:19:07 +0000 (16:19 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into master-qml-staging

11 years agoFix QtOpenGL def file for armv5.
Laszlo Agocs [Thu, 12 May 2011 13:37:04 +0000 (15:37 +0200)]
Fix QtOpenGL def file for armv5.

Reviewed-by: TRUSTME
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Thu, 12 May 2011 13:20:27 +0000 (23:20 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (250 commits)
  Disable QtConcurrent for Symbian winscw builds.
  Fix loss of focus and activation when hiding a child widget
  Symbian build failure for Armv5
  update def files
  Fix softkeys in case a dialog with softkeys that have icons is closed.
  Update softkeys after orientation switch.
  ifdef out mac/no_coreservices path more cleanly
  fix build on symbian
  Provide internal API to avoid automatic translation of input widget
  Allow different text for undo actions and items in QUndoView
  Allow using not only prefixes for undo command text
  QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the no-PATH_MAX case
  Massively update the hurd-g++ mkspec.
  Sockets: Fix potential null pointer usages
  Update QTBUG-17223 for Qt 4.8
  Do not allow multiple threads to acquire a QMutex
  rebuild configure
  fix tst_qnetworkreply::httpProxyCommands autotest
  Send User-Agent from the network request in http proxy CONNECT command
  QSslConfiguration documentation fix
  ...

11 years agoFix for rounded corners bug in QMenu
Jani Hautakangas [Thu, 12 May 2011 10:54:46 +0000 (13:54 +0300)]
Fix for rounded corners bug in QMenu

Currently QMenus have opaque black corners in cases
where theme supports rounded corners. This patch fixes
it by setting WA_TranslucentBackground flag to QMenu
widget.

Task-number: QTBUG-16857
Reviewed-by: Sami Merila
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, 12 May 2011 10:53:11 +0000 (20:53 +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:
  QWidgetPrivate::setParent_sys might be using null pointer

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
Qt Continuous Integration System [Thu, 12 May 2011 10:20:01 +0000 (20:20 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
  Allow 'typeinfo <file>' lines in qmldir.
  qmlplugindump: Use command line options with a single dash.
  qmlplugindump: Allow dumping by path without URI.
  Move qmldump from Qt Creator to Qt.

11 years agoDisable QtConcurrent for Symbian winscw builds.
Laszlo Agocs [Thu, 12 May 2011 10:16:45 +0000 (12:16 +0200)]
Disable QtConcurrent for Symbian winscw builds.

While QtConcurrent is nowadays usable with RVCT and GCCE compilers,
the compiler used for the winscw target has problems with the
templates still. To enable building 4.8 on winscw, the patch
defines QT_NO_CONCURRENT and QT_NO_QFUTURE in qglobal.h for
this target. However this causes further complications in the
Q_OBJECT classes of QtConcurrent because moc will be run without
having QT_NO_CONCURRENT and QFUTURE defined (as moc is not a Symbian
app and for other Symbian targets they must not be defined, which makes
differentiation in qglobal.h impossible for the moc run) and having a
moc file generated for a class that will be ifdef'ed out during
compilation causes build breaks. Therefore additional dummy stubs are
provided in QFutureWatcherBase.

Reviewed-by: Liang Qi
11 years agoAllow 'typeinfo <file>' lines in qmldir.
Christian Kamm [Wed, 9 Feb 2011 15:02:31 +0000 (16:02 +0100)]
Allow 'typeinfo <file>' lines in qmldir.

Also add documentation for that change.

Reviewed-by: Aaron Kennedy
Change-Id: Ifae395bc9b6699c03f9879dcb5407d23a4caab85
(cherry picked from b9839fc1e0e1d98911aef5149a58dd4bdacd8bc1)

11 years agoqmlplugindump: Use command line options with a single dash.
Christian Kamm [Tue, 19 Apr 2011 12:24:35 +0000 (14:24 +0200)]
qmlplugindump: Use command line options with a single dash.

Keep the old -- options for compatibility.

Change-Id: I9c9b0beccc7043cf8b4b654bdba33946abf8c7b6
Task-number: QTBUG-18834
(cherry picked from commit 175382d834142f2a55b4e209af870ab40f741d2d)

11 years agoqmlplugindump: Allow dumping by path without URI.
Christian Kamm [Fri, 11 Mar 2011 08:14:16 +0000 (09:14 +0100)]
qmlplugindump: Allow dumping by path without URI.

This migrates b980a9b9646a89b5b24efeca40926408a71334de from the
Qt Creator's copy into the qmlplugindump in Qt.

Change-Id: I1ab90f491f5df0e6570aa43a91073e7b332e41df
(cherry picked from commit 9fcece7b455b6540a67780cc3874b230e586b7c4)

11 years agoMove qmldump from Qt Creator to Qt.
Christian Kamm [Wed, 9 Feb 2011 15:00:31 +0000 (16:00 +0100)]
Move qmldump from Qt Creator to Qt.

Also rename it to qmlplugindump.

Qmlplugindump is a tool that loads a QML module and prints type
information about the types contained in its plugins to the standard
output.

Reviewed-by: Aaron Kennedy
Change-Id: I7c35c34af23adc1c37453393d71e492dedfc6a9b
(cherry picked from b5265d4e99e5c90532e190632951070cf1a2b630)

11 years agoCompile
Olivier Goffart [Thu, 12 May 2011 09:12:55 +0000 (11:12 +0200)]
Compile

11 years agoQWidgetPrivate::setParent_sys might be using null pointer
Sami Merila [Thu, 12 May 2011 09:05:32 +0000 (12:05 +0300)]
QWidgetPrivate::setParent_sys might be using null pointer

Fix possible null pointer usage.
Issue found by Coverity tool.

Reviewed-by: Miikka Heikkinen
11 years agoFix loss of focus and activation when hiding a child widget
Miikka Heikkinen [Wed, 11 May 2011 12:42:25 +0000 (15:42 +0300)]
Fix loss of focus and activation when hiding a child widget

Don't deactivate the active window when hiding its child if it has
another child that currently has the focus.

Task-number: QTBUG-19196
Reviewed-by: Sami Merila
11 years agoSymbian build failure for Armv5
Sami Merila [Thu, 12 May 2011 07:27:03 +0000 (10:27 +0300)]
Symbian build failure for Armv5

1. Changed externs to Q_GUI_EXPORTs
2. ABSENTed missing exports from openGL's DEF-file

Reviewed-by: Tomi Vihria
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Thu, 12 May 2011 07:15:00 +0000 (17:15 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  QmlDebug: Fix QmlOstPlugin compilation failure
  QmlDebug: Fix QmlOstPlugin compilation failure
  Enable performance monitoring at application startup.
  Augment documentation
  QmlDebugger: removing slots in Live Preview
  QmlDebugger: adding slots to items in Live Preview
  Fixed license header
  Fixed compile on Windows
  Added forgotten file qdeclarativeobserverinterface_p.h
  Removed some trailing whitespace
  Introduced a CONFIG option that enables declarative debug services
  Moved the QML Observer Service and related functionality into Qt
  QDeclarativeDebugServer: Send hello answer before any service messages
  Removed some superfluous semicolons

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 12 May 2011 06:55:47 +0000 (16:55 +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:
  Ensure the TextEdit cursor delegate is repositioned on mouse events.

11 years agoQmlDebug: Fix QmlOstPlugin compilation failure
Kai Koehne [Thu, 12 May 2011 06:33:21 +0000 (08:33 +0200)]
QmlDebug: Fix QmlOstPlugin compilation failure

Fix signature of waitForMessage.

Reviewed-by: Tom Sutcliffe
11 years agoEnsure the TextEdit cursor delegate is repositioned on mouse events.
Andrew den Exter [Mon, 9 May 2011 03:57:34 +0000 (13:57 +1000)]
Ensure the TextEdit cursor delegate is repositioned on mouse events.

Update the micro focus when a mouse press changes the cursor position
of a read only TextEdit.

Change-Id: I11855037f7938b2cd23ac6ad165722b5289b4f46
Task-number: QTBUG-19109
Reviewed-by: Martin Jones
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 12 May 2011 03:04:01 +0000 (13: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:
  Don't crash on an invalid replacementStart from an input method.

11 years agoDon't crash on an invalid replacementStart from an input method.
Andrew den Exter [Mon, 9 May 2011 04:04:08 +0000 (14:04 +1000)]
Don't crash on an invalid replacementStart from an input method.

Ensure the cursor position does not exceed the bounds of the
current text.

Change-Id: If38f7729372562324d11eadd1a976c0c6da91863
Task-number: QTBUG-19054
Reviewed-by: Martin Jones
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
Qt Continuous Integration System [Thu, 12 May 2011 02:42:53 +0000 (12:42 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
  Remove Q_ASSERT's from qsharedmemory autotest

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Wed, 11 May 2011 17:23:34 +0000 (03:23 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
  Fix QGLWidget::renderPixmap for raster engine on Mac
  Check if OES_texture_npot is present on OpenGL ES 2.
  Fix tst_QVariant::invalidColor
  Move QTextCursor::MoveStyle to Qt namespace
  Move the painting redirection to the unified toolbar surface.
  Fix misspelled word in comment.
  Build fix for tst_qrawfont
  Add some QRawFont related low level functions to avoid extra copying
  Compile on Mac
  Rename QGlyphs -> QGlyphRun
  Fix QRawFont::setPixelSize() on Mac
  Remove warning from QColor::setNamedColor().
  Add internal documentation for QUnifiedToolbarSurface.
  Fix QPainter::drawGlyphs() with non-affine transformation

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, 11 May 2011 16:43:30 +0000 (02:43 +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 incorrect hardware address on systems without getifaddrs()

11 years agoMerge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master...
Qt Continuous Integration System [Wed, 11 May 2011 15:39:22 +0000 (01:39 +1000)]
Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master-integration

* 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse:
  Fix GLES2 include path for applications when not using the dash shell
  Remove not supported qmake api
  Added Wayland selection support.
  Added Wayland selection support.
  Add the wayland client libraries to rpath if we use rpath
  Fix the wayland windowsurface so that we have stencil and depth buffer
  Dont do doneCurrent in swapBuffers
  Lighthouse: Fix up Xlib

11 years agoFix QGLWidget::renderPixmap for raster engine on Mac
Jiang Jiang [Wed, 11 May 2011 14:56:24 +0000 (16:56 +0200)]
Fix QGLWidget::renderPixmap for raster engine on Mac

The QPixmap buffer is backed by QRasterPixmapData instead of
QMacPixmapData for the raster engine, thus we have to update
qt_mac_pixmap_get_base() and qt_mac_pixmap_get_bytes_per_line(),
so that QGLWidget can locate the offscreen buffer from a QPixmap.

Reviewed-by: Fabien Freling
11 years agoDoc: update platform notes on Mac to reflect WA_MacNoCocoaChildWindow
Richard Moe Gustavsen [Mon, 4 Apr 2011 08:47:28 +0000 (10:47 +0200)]
Doc: update platform notes on Mac to reflect WA_MacNoCocoaChildWindow
(cherry picked from commit b240f8a2ee3b7ff82a389fbf5dfd076792f385e8)

11 years agoMerge remote-tracking branch 'origin/4.8'
Olivier Goffart [Wed, 11 May 2011 14:18:20 +0000 (16:18 +0200)]
Merge remote-tracking branch 'origin/4.8'

11 years agoCheck if OES_texture_npot is present on OpenGL ES 2.
Kim Motoyoshi Kalland [Wed, 11 May 2011 08:53:00 +0000 (10:53 +0200)]
Check if OES_texture_npot is present on OpenGL ES 2.

Unless the OES_texture_npot extension is present, non-power-
of-two textures have some restrictions on OpenGL ES 2.

Reviewed-by: Samuel