qt:qt.git
11 years agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Liang Qi [Fri, 1 Jul 2011 07:00:13 +0000 (09:00 +0200)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/s60installs/s60installs.pro

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 30 Jun 2011 21:10:40 +0000 (07:10 +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:
  Update 4.8.0 changes file

11 years agoUpdate 4.8.0 changes file
Shane Kearns [Thu, 30 Jun 2011 16:18:33 +0000 (17:18 +0100)]
Update 4.8.0 changes file

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, 29 Jun 2011 23:05:32 +0000 (09:05 +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 QWidget::palettePropagation2() autotest on Symbian (part 2)
  Fix QWidget::palettePropagation2() autotest on Symbian

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, 29 Jun 2011 19:19:04 +0000 (05:19 +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:
  QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5

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, 29 Jun 2011 15:33:44 +0000 (01:33 +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 text color in some cases of QML and QStaticText

11 years agoFix QWidget::palettePropagation2() autotest on Symbian (part 2)
Sami Merila [Wed, 29 Jun 2011 11:40:24 +0000 (14:40 +0300)]
Fix QWidget::palettePropagation2() autotest on Symbian (part 2)

Add also include to QS60Style to avoid build failure.

Task-number: QT-5011
Reviewed-by: Miikka Heikkinen
11 years agoFix QWidget::palettePropagation2() autotest on Symbian
Sami Merila [Wed, 29 Jun 2011 11:36:09 +0000 (14:36 +0300)]
Fix QWidget::palettePropagation2() autotest on Symbian

Autotest fails since calling QApplication::setPalette() clears away
QPalette hash (class specific palette information). QS60Style tries
to re-set theme-specific hash after updating application palette with
real theme background, but does not take into account that application
might have defined own custom palette hash data.

As a fix, store the previously set palette hash information and restore
it after calling QApplication::setPalette(). Additionally, remove the
palette change event sending, since QApplication will post that event
anyway when palette is updated.

Task-number: QT-5011
Reviewed-by: Miikka Heikkinen
11 years agoQTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5
Simo Fält [Fri, 17 Jun 2011 06:31:01 +0000 (09:31 +0300)]
QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5

Replaced std::cout with QTextStream

Reviewed-by: Eckhart Köppen
(cherry picked from commit f078275a2a4b2a279a6fcc24df3c21fe8b21f007)

11 years agoFix text color in some cases of QML and QStaticText
Eskil Abrahamsen Blomfeldt [Tue, 28 Jun 2011 15:07:13 +0000 (17:07 +0200)]
Fix text color in some cases of QML and QStaticText

This reverts 518c2a58ed6fdfd7449cb4476aa8ea0d32ad16e3 which caused a
regression.

When writing systems are mixed and an underline is set on the font,
QPainter will set a pen with the current color and a new width on
itself before drawing the decoration. This would cause the recorder
in QStaticText to mark the pen as dirty, saving the current pen
color in all subsequent text items. The effect was e.g. that in QML
the cached color would override the current one, making it impossible
to change the color on the text without forcing a relayout somehow.

The right fix is to only mark the pen as dirty when its color actually
changes.

Task-number: QTBUG-20159
Reviewed-by: Jiang Jiang
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Wed, 29 Jun 2011 08:02:38 +0000 (18:02 +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:
  Fix vertical positioning of glyphs in raster engine with FreeType
  Ensure a small event check interval on uikit platform.
  Change default application font for uikit platform.
  Use the QPoint memory layout change only on Desktop Mac
  Fix 2cb398e1d901e62384bb2b388761cfd18fc8804a in case of no coreservices
  Add IPHONEOS deployment vars to makespec
  Post key events via QWindowSystemInterface, don't post events direcly
  Use nicer fonts and a few little patches to uikit platform.
  Update README and qmlapplicationviewer to suit 4.8.
  Updated proof-of-concept UIKit mkspecs

11 years agoAdded qmlshadersplugin to Symbian s60installs.pro-file.
Marko Niemelä [Wed, 29 Jun 2011 07:52:39 +0000 (10:52 +0300)]
Added qmlshadersplugin to Symbian s60installs.pro-file.

Task-number: QTBUG-18346
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 [Wed, 29 Jun 2011 07:50:00 +0000 (17: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:
  Added qmlshadersplugin to Symbian s60installs.pro-file.

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Tue, 28 Jun 2011 16:39:37 +0000 (02:39 +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 vertical positioning of glyphs in raster engine with FreeType
  Ensure a small event check interval on uikit platform.
  Change default application font for uikit platform.
  Use the QPoint memory layout change only on Desktop Mac
  Fix 2cb398e1d901e62384bb2b388761cfd18fc8804a in case of no coreservices
  Add IPHONEOS deployment vars to makespec
  Post key events via QWindowSystemInterface, don't post events direcly
  Use nicer fonts and a few little patches to uikit platform.
  Update README and qmlapplicationviewer to suit 4.8.
  Updated proof-of-concept UIKit mkspecs

11 years agoFix vertical positioning of glyphs in raster engine with FreeType
Jiang Jiang [Tue, 28 Jun 2011 13:53:28 +0000 (15:53 +0200)]
Fix vertical positioning of glyphs in raster engine with FreeType

Reviewed-by: aavit
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, 28 Jun 2011 13:33:45 +0000 (23:33 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix KERN-EXEC 0 errors in symbian bearer plugin

11 years agoFix KERN-EXEC 0 errors in symbian bearer plugin
Shane Kearns [Tue, 28 Jun 2011 12:08:45 +0000 (13:08 +0100)]
Fix KERN-EXEC 0 errors in symbian bearer plugin

The plugin was ignoring errors when opening a handle, and as a result
crashed if the handle was invalid.
Error checking / handle validity checks added.

Task-number: QTBUG-18572
Reviewed-by: mread
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master...
Qt Continuous Integration System [Tue, 28 Jun 2011 12:32:13 +0000 (22:32 +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

11 years agoEnsure a small event check interval on uikit platform.
con [Tue, 28 Jun 2011 10:39:13 +0000 (12:39 +0200)]
Ensure a small event check interval on uikit platform.

For some reason I sometimes get huge nextTimerEvent() values.

11 years agoChange default application font for uikit platform.
con [Tue, 28 Jun 2011 10:13:57 +0000 (12:13 +0200)]
Change default application font for uikit platform.

11 years agoUse the QPoint memory layout change only on Desktop Mac
con [Tue, 28 Jun 2011 09:57:01 +0000 (11:57 +0200)]
Use the QPoint memory layout change only on Desktop Mac

Reviewed-by: gunnar
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Tue, 28 Jun 2011 08:49:27 +0000 (18:49 +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:
  Reorder variable to eliminate warnings
  Only compare styleNames if they are not empty
  Add styleName to QFontDef comparison

11 years agoFix 2cb398e1d901e62384bb2b388761cfd18fc8804a in case of no coreservices
con [Tue, 28 Jun 2011 07:30:20 +0000 (09:30 +0200)]
Fix 2cb398e1d901e62384bb2b388761cfd18fc8804a in case of no coreservices

Reviewed-by: Ritt Konstantin <ritt.ks@gmail.com>
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Mon, 27 Jun 2011 19:38:23 +0000 (05:38 +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: (42 commits)
  qsystemlibrary needs no special treatment
  my changelog for 4.8.0
  Use numeric virtual keyboard for all number entry modes.
  Add a function that returns the D-Bus local machine ID
  QTBUG-17776, reporting terminated threads as not running on Symbian
  Splitview - Auto-translation rules changed
  Support clipboard function on Symbian
  Added qmlshadersplugin to Symbian qt.iby-file.
  Add an SSE4.2 even simpler version of toLatin1
  Workaround webkit deadlock on macos x
  QAuthenticator::setUser() parse user name in form user@domain
  tst_qnetworkreply: add a test for http abort.
  Disable antialiasing for tiled image drawing.
  Ensure visibility of input widget in QML app when doing layout switch
  Def update for gui, openvg, and opengl.
  Revert "Def update."
  Fix trailing whitespace
  Remove unnecessary resizes during orientation change
  Revert "Symbian: Fix QFontInfo::pixelSize()"
  Improving warning messages in QVolatileImage.
  ...

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Mon, 27 Jun 2011 18:53:44 +0000 (04:53 +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:
  Make it compile with openssl 1.0.0d, gcc 4.6
  QStringBuilder: do not crash with null char*
  Fix event delevery order
  QSocketNotifier autotest - fix compile with MSVC

11 years agoMake it compile with openssl 1.0.0d, gcc 4.6
Bernhard Rosenkraenzer [Mon, 27 Jun 2011 16:12:46 +0000 (18:12 +0200)]
Make it compile with openssl 1.0.0d, gcc 4.6

SSL_ctrl's prototype has changed slightly in openssl 1.0.0x - the 4th
argument is now a void* as opposed to a const void*.
gcc 4.6 doesn't allow this as an implicit cast.

Merge-request: 1239
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
Qt Continuous Integration System [Mon, 27 Jun 2011 15:16:46 +0000 (01:16 +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:
  Incorrect property name in QAccessibleAbstractSpinBox::setCurrentValue
  When asking for relations, don't crash on children that don't return an interface.
  Remove more inconsistencies with invisible.
  QAccessibleToolButton::text should return accessibleName if set.
  Remove stray semicolon.
  Do not expose text when echo mode is not Normal.
  Check validator when changing text using accessibility functions.
  Fix some issues introduced in df6713b8f55fc007796f40.
  Add tilde (both ~ and ~<userName>) expansion to QFileDialog on UNIX.
  Avoid bogus accessibility focus events from menus.
  Build fix for Mac OS 10.5
  Avoided calling updateAccessibility() from updateMicroFocus if the item was hidden
  Notify a11y framework of FocusChanges for QGraphicsObject
  Call updateAccessibility on the QGraphicsObject in updateMicroFocus
  Fix updateAccessibility for QGraphicsObjects
  Make accessibility work on Windows with alien

11 years agoQStringBuilder: do not crash with null char*
Olivier Goffart [Mon, 27 Jun 2011 11:09:23 +0000 (13:09 +0200)]
QStringBuilder: do not crash with null char*

This is supported by the others operator+

Change-Id: I9a1d1a0afb63acf32935948111d43ca6da370363
Reviewed-on: http://codereview.qt.nokia.com/764
Reviewed-by: hjk
(cherry picked from commit 53a16752c257d2f4f99ecef2cde1580b817fc12a)

11 years agoAdd IPHONEOS deployment vars to makespec
Ian [Mon, 27 Jun 2011 10:33:50 +0000 (12:33 +0200)]
Add IPHONEOS deployment vars to makespec

Merge-request: 1275
Reviewed-by: con
11 years agoPost key events via QWindowSystemInterface, don't post events direcly
Ian [Mon, 20 Jun 2011 14:19:11 +0000 (16:19 +0200)]
Post key events via QWindowSystemInterface, don't post events direcly

Merge-request: 1275
Reviewed-by: con
11 years agoUse nicer fonts and a few little patches to uikit platform.
Ian [Mon, 20 Jun 2011 13:26:26 +0000 (15:26 +0200)]
Use nicer fonts and a few little patches to uikit platform.

Merge-request: 1275
Reviewed-by: con
11 years agoUpdate README and qmlapplicationviewer to suit 4.8.
con [Mon, 27 Jun 2011 12:16:11 +0000 (14:16 +0200)]
Update README and qmlapplicationviewer to suit 4.8.

11 years agoUpdated proof-of-concept UIKit mkspecs
Ian [Tue, 21 Jun 2011 09:02:14 +0000 (11:02 +0200)]
Updated proof-of-concept UIKit mkspecs

Merge-request: 1275
Reviewed-by: con
11 years agoMerge remote-tracking branch 'qt-mainline/4.8'
aavit [Mon, 27 Jun 2011 13:43:22 +0000 (15:43 +0200)]
Merge remote-tracking branch 'qt-mainline/4.8'

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
Qt Continuous Integration System [Mon, 27 Jun 2011 13:24:49 +0000 (23:24 +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:
  Re-apply licenseheader text in source files for qt4.8

11 years agoRe-apply licenseheader text in source files for qt4.8
Jyri Tahtela [Mon, 27 Jun 2011 13:18:20 +0000 (16:18 +0300)]
Re-apply licenseheader text in source files for qt4.8

New files after previous license change round.

Reviewed-by: Trust Me
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Mon, 27 Jun 2011 11:56:15 +0000 (21:56 +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:
  Reorder variable to eliminate warnings

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master...
Qt Continuous Integration System [Mon, 27 Jun 2011 11:38:51 +0000 (21:38 +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:
  QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5

11 years agoFix event delevery order
Olivier Goffart [Fri, 24 Jun 2011 15:26:20 +0000 (17:26 +0200)]
Fix event delevery order

Some functions (such as QObject::moveToThread) did not keep
the event ordered by priority.
And because qUpperBound is used to add events, that mean new
events would not be inserted in order.

Task-number: QTBUG19637
Change-Id: I38eb9addb1cdd45b8566e000361ac6e5f1f2c2b8
Reviewed-on: http://codereview.qt.nokia.com/733
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
(cherry picked from commit 7eeabcf70db658bca847498f618a94a375c95f5f)

11 years agoReorder variable to eliminate warnings
Jiang Jiang [Sat, 25 Jun 2011 14:59:26 +0000 (16:59 +0200)]
Reorder variable to eliminate warnings

Reviewed-by: Frederik Gladhorn
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
Qt Continuous Integration System [Mon, 27 Jun 2011 08:54:55 +0000 (18:54 +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: (182 commits)
  qsystemlibrary needs no special treatment
  my changelog for 4.8.0
  Use numeric virtual keyboard for all number entry modes.
  Add a function that returns the D-Bus local machine ID
  QTBUG-17776, reporting terminated threads as not running on Symbian
  Splitview - Auto-translation rules changed
  Support clipboard function on Symbian
  Added qmlshadersplugin to Symbian qt.iby-file.
  Add an SSE4.2 even simpler version of toLatin1
  Skip boundry neutral characters in bidi itemization
  Workaround webkit deadlock on macos x
  symbian socket engine: resolve some fixme and todo items
  trivial: fix typo in comment
  Fix QDeclarativeInspector when starting with ,block
  changelog
  docu update for QNX 6.5
  get rid of anacronysm
  massive improvements for the QNX screen driver
  massive improvements for the QNX mouse driver
  massive improvements for the QNX keyboard driver
  ...

11 years agoMerge remote-tracking branch 'qt/4.8'
Jyri Tahtela [Mon, 27 Jun 2011 08:47:01 +0000 (11:47 +0300)]
Merge remote-tracking branch 'qt/4.8'

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Mon, 27 Jun 2011 08:20:27 +0000 (18:20 +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:
  Only compare styleNames if they are not empty
  Add styleName to QFontDef comparison

11 years agoOnly compare styleNames if they are not empty
Jiang Jiang [Mon, 27 Jun 2011 08:15:39 +0000 (10:15 +0200)]
Only compare styleNames if they are not empty

Task-number: QTBUG-19366

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Mon, 27 Jun 2011 07:56:23 +0000 (17: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:
  Fix broken rpath on wayland
  Make sure to call damage on the buffer when we damage it
  Update the wayland plugin

11 years agoAdd styleName to QFontDef comparison
Jiang Jiang [Thu, 23 Jun 2011 12:19:48 +0000 (14:19 +0200)]
Add styleName to QFontDef comparison

To make sure we cache different font engines with different style
names.

Task-number: QTBUG-19366

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 [Fri, 24 Jun 2011 21:50:54 +0000 (07:50 +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: (28 commits)
  Use numeric virtual keyboard for all number entry modes.
  QTBUG-17776, reporting terminated threads as not running on Symbian
  Splitview - Auto-translation rules changed
  Support clipboard function on Symbian
  Added qmlshadersplugin to Symbian qt.iby-file.
  Workaround webkit deadlock on macos x
  Disable antialiasing for tiled image drawing.
  Ensure visibility of input widget in QML app when doing layout switch
  Def update for gui, openvg, and opengl.
  Revert "Def update."
  Fix trailing whitespace
  Remove unnecessary resizes during orientation change
  Revert "Symbian: Fix QFontInfo::pixelSize()"
  Improving warning messages in QVolatileImage.
  Proper naming for raster pixmap and paintengine on Symbian.
  Def update.
  Handle QVolatileImage-backed pixmaps optimally in drawPixmap().
  Resizable graphicsview's background is drawn incorrectly in splitview
  Add inputcontext reset to orientation switch in Symbian
  QS60Style: QGroupBox is drawn as white box in upcoming Symbian release
  ...

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Fri, 24 Jun 2011 18:09:46 +0000 (04: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:
  qsystemlibrary needs no special treatment

11 years agoqsystemlibrary needs no special treatment
Oswald Buddenhagen [Fri, 24 Jun 2011 14:00:19 +0000 (16:00 +0200)]
qsystemlibrary needs no special treatment

this was just a merge artifact

11 years agoQSocketNotifier autotest - fix compile with MSVC
Shane Kearns [Fri, 24 Jun 2011 14:08:28 +0000 (15:08 +0100)]
QSocketNotifier autotest - fix compile with MSVC

Reviewed-By: Sergio Ahumada
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Fri, 24 Jun 2011 09:56:09 +0000 (19:56 +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:
  my changelog for 4.8.0
  QAuthenticator::setUser() parse user name in form user@domain
  tst_qnetworkreply: add a test for http abort.
  Fix a case of SP_MediaSkipForward returning the wrong pixmap.
  fix an incorrect OpenMode flags handling in QBuffer::open()
  move some internal helper functions from qglobal.cpp to qcore_mac*
  make the previous change foolproof
  get rid of extra copying (another one)
  get rid of extra copying
  add a benchmark for QCFString
  Fix errors in qsocketnotifier test

11 years agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Liang Qi [Fri, 24 Jun 2011 09:52:41 +0000 (11:52 +0200)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/gui/image/qpixmap_raster_symbian.cpp
src/gui/image/qpixmapdatafactory.cpp
src/gui/painting/qgraphicssystem.cpp
src/gui/styles/qs60style.cpp
src/network/bearer/qnetworkconfigmanager_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtOpenGLu.def
src/s60installs/bwins/QtOpenVGu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp

11 years agoMerge remote-tracking branch 'origin/4.8'
Olivier Goffart [Fri, 24 Jun 2011 09:12:15 +0000 (11:12 +0200)]
Merge remote-tracking branch 'origin/4.8'

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, 23 Jun 2011 21:44:01 +0000 (07:44 +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:
  Use numeric virtual keyboard for all number entry modes.

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Thu, 23 Jun 2011 13:23:05 +0000 (23: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: (34 commits)
  symbian socket engine: resolve some fixme and todo items
  trivial: fix typo in comment
  Fix QDeclarativeInspector when starting with ,block
  changelog
  docu update for QNX 6.5
  get rid of anacronysm
  massive improvements for the QNX screen driver
  massive improvements for the QNX mouse driver
  massive improvements for the QNX keyboard driver
  disable the Embedded Linux data directory permissions check for QNX
  skip two subtests that are known to fail on QNX
  implement POSIX IPC based QLock, QWSLock and QWSSharedMemory backends
  implement POSIX IPC based QSystemSemaphore and QSharedMemory backends
  add a configure-time check for an IPC support
  make QProcess really work on QNX
  make the kernel attempt to emulate an instruction with a misaligned access
  use RoundRobin scheduler by default on QNX
  a major refactoring of the mkspecs tree for QNX
  buildfix for qmake
  qmlplugindump: Add -v option.
  ...

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 23 Jun 2011 13:13:51 +0000 (23:13 +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:
  Add a function that returns the D-Bus local machine ID
  Add an SSE4.2 even simpler version of toLatin1

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team
aavit [Thu, 23 Jun 2011 13:11:31 +0000 (15:11 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team

11 years agomy changelog for 4.8.0
Peter Hartmann [Thu, 23 Jun 2011 12:56:45 +0000 (14:56 +0200)]
my changelog for 4.8.0

11 years agoUse numeric virtual keyboard for all number entry modes.
Miikka Heikkinen [Thu, 23 Jun 2011 12:33:42 +0000 (15:33 +0300)]
Use numeric virtual keyboard for all number entry modes.

Qt::DialableCharactersOnly and Qt::ImhFormattedNumbersOnly now use
numeric mode virtual keyboard as they are supposed to. '*' and '#' keys
can be used to enter the non-digit characters allowed in these modes.

Task-number: QT-5085
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, 23 Jun 2011 11:11:35 +0000 (21:11 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  QTBUG-17776, reporting terminated threads as not running on Symbian
  Splitview - Auto-translation rules changed

11 years agoAdd a function that returns the D-Bus local machine ID
Thiago Macieira [Tue, 21 Jun 2011 19:14:01 +0000 (21:14 +0200)]
Add a function that returns the D-Bus local machine ID

Reviewed-by: Lars Knoll
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Thu, 23 Jun 2011 09:14:23 +0000 (19:14 +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 broken rpath on wayland
  Make sure to call damage on the buffer when we damage it
  Update the wayland plugin

11 years agoFix broken rpath on wayland
Jørgen Lind [Thu, 23 Jun 2011 09:08:23 +0000 (11:08 +0200)]
Fix broken rpath on wayland

11 years agoMake sure to call damage on the buffer when we damage it
Jørgen Lind [Thu, 23 Jun 2011 08:14:51 +0000 (10:14 +0200)]
Make sure to call damage on the buffer when we damage it

11 years agoUpdate the wayland plugin
Jørgen Lind [Wed, 22 Jun 2011 08:00:28 +0000 (10:00 +0200)]
Update the wayland plugin

to shar bfea3d6befdb688d5354e6f15a9400ea637febf9

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Thu, 23 Jun 2011 08:57:08 +0000 (18:57 +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:
  Skip boundry neutral characters in bidi itemization
  Update autotest case after toHtml change
  Proper fix for previous deallocation problem
  No need to destroy match pattern again
  Fix fontconfig usage in X11 font database
  Fix empty lines in Qt HTML when displayed in external browsers (again)
  Make it possible to set color of QStaticText with pixel size >= 64

11 years agoQTBUG-17776, reporting terminated threads as not running on Symbian
mread [Wed, 22 Jun 2011 10:39:23 +0000 (11:39 +0100)]
QTBUG-17776, reporting terminated threads as not running on Symbian

On Symbian app shutdown all threads are terminated and their stack
memory is released, but there is no time for notification of exit of
these threads. So any attempt to access stack data in such a thread
from static data destruction will cause a crash.

This was happening with the XmlQuery thread. It was testing if the
thread was still running, and QThread thought it was because there was
no notification. So when the XmlQuery thread was asked to exit, and
QThread::exit tried to access a stack based QEventLoop, there was a
crash.

By adding a test if the thread has been terminated to
QThread::isRunning(), clients can now rely on this to know that it is
safe to call exit() on a thread. The existing code is made safe again.

Task-number: QTBUG-17776
Reviewed-by: Shane Kearns
11 years agoSplitview - Auto-translation rules changed
Sami Merila [Thu, 23 Jun 2011 07:38:02 +0000 (10:38 +0300)]
Splitview - Auto-translation rules changed

When using "splitview" (virtual keyboard with non-fullscreen
editing mode), it is currently auto-translating the cursor to the
center of the screen if possible.

It would be preferable, if the translation would only be minimal,
just enough for cursor to be visible. This makes scrolling of
input widget (i.e. large editor) easier to use, as text flows
naturally (row-by-row) and not in "jumps" like it used to do.

Additionally, limit the translation to the end of input widget
boundary.

Task-number: QTBUG-20034
Reviewed-by: Miikka Heikkinen
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, 23 Jun 2011 06:55:52 +0000 (16:55 +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:
  Support clipboard function on Symbian
  Added qmlshadersplugin to Symbian qt.iby-file.

11 years agoSupport clipboard function on Symbian
Guoqing Zhang [Thu, 23 Jun 2011 06:41:50 +0000 (09:41 +0300)]
Support clipboard function on Symbian

Task-number: QTBUG-19996
Reviewed-by: Sami Merila
11 years agoAdded qmlshadersplugin to Symbian qt.iby-file.
Marko Niemelä [Thu, 23 Jun 2011 06:40:34 +0000 (09:40 +0300)]
Added qmlshadersplugin to Symbian qt.iby-file.

Task-number: QTBUG-18346
Reviewed-by: Sami Merila
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Thu, 23 Jun 2011 02:05:15 +0000 (12:05 +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 autotest build failure in qdatetime

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Thu, 23 Jun 2011 00:18:59 +0000 (10:18 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (269 commits)
  Incorrect property name in QAccessibleAbstractSpinBox::setCurrentValue
  DEF file updates for Symbian
  QTBUG-19883 Adding top level TRAP for QThreads on Symbian
  Revert "QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread"
  Fix alignment value not handled in ODF
  Silence a compiler warning about unhandled enum in switch
  Silence the "array out of bounds" warning in GCC 4.6.
  Silence the callgrind warnings in our source code when using gcc 4.6
  Create a function that merges the SSE common code
  Improve toLatin1 x86 SIMD by using a new SSE4.1 instruction
  Revert "Fix compilation of lrelease on Windows"
  QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread
  Also test http proxy in the QTcpServer benchmark
  Symbian QFileSystemWatcher: fix potential crash
  Enable QTcpServer benchmark on symbian
  Fix building the OpenVG graphicssystem on Linux with static libs
  fix build on windows 7
  Fix compilation of lrelease on Windows
  Allow selecting fonts with irregular style names
  When asking for relations, don't crash on children that don't return an interface.
  ...

11 years agoIncorrect property name in QAccessibleAbstractSpinBox::setCurrentValue
José Millán Soto [Sun, 12 Jun 2011 22:31:38 +0000 (00:31 +0200)]
Incorrect property name in QAccessibleAbstractSpinBox::setCurrentValue

Merge-request: 1263
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
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 [Wed, 22 Jun 2011 22:15:40 +0000 (08:15 +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:
  Fix crash in PropertyChanges.
  Scroll correctly when cursorPosition is changed within onTextChanged.
  Fixing OpenGL module build error on Solaris
  Fix dialog position adjustment regression in Symbian
  SSL readbuffer 16->32 kB
  Fixes to how resize event and layout request are posted.
  Limit the cookies count per domain to 50.
  Add missing freeTexture() from fix for QTBUG-19180
  Last word inputted was duplicated after input method hints changed
  Simplify texture pooling logic in GL graphics system.
  Fixed move a QGraphicsWidget and invalidate its layout at the same time
  Fix infinite recursion when changing geometry on Mac

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, 22 Jun 2011 21:43:10 +0000 (07:43 +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: (23 commits)
  Workaround webkit deadlock on macos x
  Disable antialiasing for tiled image drawing.
  Ensure visibility of input widget in QML app when doing layout switch
  Def update for gui, openvg, and opengl.
  Revert "Def update."
  Fix trailing whitespace
  Remove unnecessary resizes during orientation change
  Revert "Symbian: Fix QFontInfo::pixelSize()"
  Improving warning messages in QVolatileImage.
  Proper naming for raster pixmap and paintengine on Symbian.
  Def update.
  Handle QVolatileImage-backed pixmaps optimally in drawPixmap().
  Resizable graphicsview's background is drawn incorrectly in splitview
  Add inputcontext reset to orientation switch in Symbian
  QS60Style: QGroupBox is drawn as white box in upcoming Symbian release
  Symbian: Fix QFontInfo::pixelSize()
  Drop-down menu position is altered when Partial VKB is invoked
  Fix SVG icons on softkeys in new Symbian devices
  Fix screen dimensions after orientation change in split screen mode.
  Qmlshadersplugin examples added.
  ...

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Wed, 22 Jun 2011 18:03:06 +0000 (04:03 +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 engine: resolve some fixme and todo items

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
Qt Continuous Integration System [Wed, 22 Jun 2011 17:53:25 +0000 (03:53 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Wed, 22 Jun 2011 17:07:49 +0000 (03:07 +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:
  Skip boundry neutral characters in bidi itemization

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Wed, 22 Jun 2011 14:34:13 +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:
  Fix QDeclarativeInspector when starting with ,block
  qmlplugindump: Add -v option.
  qmlplugindump: Fix emitted tooling version.

11 years agoAdd an SSE4.2 even simpler version of toLatin1
Thiago Macieira [Wed, 22 Dec 2010 18:52:48 +0000 (19:52 +0100)]
Add an SSE4.2 even simpler version of toLatin1

Use the new PCMPESTRM instruction (Parallel CoMPare Explicit-length
STRings with result in a Mask) which is added in SSE4.2 for
facilitating string operations. The "compare ranges" mode allows us to
search for characters outside the Latin 1 range and then use the
SSE4.1 PBLENDVB instruction to replace those with question marks.

Unlike previous SSE compare instructions, the PCMPxSTRx family allows
us to operate on unsigned 16-bit values. This saves us another
parallel add.

Reviewed-By: Samuel Rødal
11 years agoSkip boundry neutral characters in bidi itemization
Jiang Jiang [Wed, 22 Jun 2011 12:23:47 +0000 (14:23 +0200)]
Skip boundry neutral characters in bidi itemization

According to UAX #9, bidiItemize should act as if those characters
don't exist. If we don't, dir and status.eor here may become
QChar::DirBN, thus interfere the result of bidiItemize.

Task-number: QTBUG-19949
Reviewed-by: Lars Knoll
11 years agoMerge remote branch 'origin/4.7' into qt-4.8-from-4.7
Jani Hautakangas [Wed, 22 Jun 2011 11:38:32 +0000 (14:38 +0300)]
Merge remote branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/opengl/qgl.cpp
src/opengl/qpixmapdata_symbiangl.cpp
src/opengl/qwindowsurface_gl.cpp

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Wed, 22 Jun 2011 11:08:04 +0000 (21:08 +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: (108 commits)
  Doc: Fixed spelling errors that were blocking the CI system.
  QDeclarativeDebug: Fix cases where multiple packets arrive in one go
  Fix build break in S60 5.0 environment
  Added missing license headers.
  Skip softkeys update if application is not on foreground in Symbian
  Revert "Opening taskswitcher, pushes application softkeys to top of switcher"
  DEF file updates for Symbian
  QTBUG-19883 Adding top level TRAP for QThreads on Symbian
  Added missing license headers.
  Fix js debugging autotest on Windows + Add license header
  Rewrite autotests for js debugging
  Revert "QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread"
  Rename qdeclarativescriptdebugging autotest directory
  Fix alignment value not handled in ODF
  Silence a compiler warning about unhandled enum in switch
  Silence the "array out of bounds" warning in GCC 4.6.
  Silence the callgrind warnings in our source code when using gcc 4.6
  Create a function that merges the SSE common code
  Improve toLatin1 x86 SIMD by using a new SSE4.1 instruction
  QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread
  ...

11 years agoMerge remote branch 'qt-mainline/4.8'
aavit [Wed, 22 Jun 2011 11:01:36 +0000 (13:01 +0200)]
Merge remote branch 'qt-mainline/4.8'

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Wed, 22 Jun 2011 10:44:56 +0000 (20:44 +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:
  trivial: fix typo in comment
  changelog
  docu update for QNX 6.5
  get rid of anacronysm
  massive improvements for the QNX screen driver
  massive improvements for the QNX mouse driver
  massive improvements for the QNX keyboard driver
  disable the Embedded Linux data directory permissions check for QNX
  skip two subtests that are known to fail on QNX
  implement POSIX IPC based QLock, QWSLock and QWSSharedMemory backends
  implement POSIX IPC based QSystemSemaphore and QSharedMemory backends
  add a configure-time check for an IPC support
  make QProcess really work on QNX
  make the kernel attempt to emulate an instruction with a misaligned access
  use RoundRobin scheduler by default on QNX
  a major refactoring of the mkspecs tree for QNX
  buildfix for qmake

11 years agoWorkaround webkit deadlock on macos x
Shane Kearns [Tue, 21 Jun 2011 13:50:08 +0000 (14:50 +0100)]
Workaround webkit deadlock on macos x

The webkit AtomicallyInitializedStatic and Qt's Q_GLOBAL_STATIC can
deadlock on the Mac, as the mac compiler inserts calls to
__cxa_guard_acquire and __cxa_guard_release around initialisation of
local statics.
In Q_GLOBAL_STATIC case, this is the QGlobalStaticDeleter local static
Whereas webkit AtomicallyInitializedStatic is a local static variable
in any case.

Problem is triggered because webkit constructs QNetworkConfigurationManager
inside the constructor of a local static - networkStateNotifier
And the generic bearer plugin calls QNetworkInterface::allInterfaces
in the bearer thread, which needs an initialised Q_GLOBAL_STATIC.

Reviewed-by: Laszlo Agocs
11 years agosymbian socket engine: resolve some fixme and todo items
Shane Kearns [Wed, 1 Jun 2011 15:54:33 +0000 (16:54 +0100)]
symbian socket engine: resolve some fixme and todo items

Should be no behaviour changes from this commit, one function is renamed
and otherwise it is comment changes. (stuff we were unsure about when
creating the code initially but have decided to keep)

Multicast is not fully supported by symbian, and out of scope for the
QTBUG-7274 task. So the two stub functions are left with the ### comment
for the benefit of a future implementor.

Task-number: QTBUG-18371
Reviewed-by: Markus Goetz
11 years agotrivial: fix typo in comment
Harald Fernengel [Wed, 22 Jun 2011 09:01:40 +0000 (11:01 +0200)]
trivial: fix typo in comment

11 years agoMerge remote branch 'qt-qml-review/master' into master-qml-staging
Kai Koehne [Wed, 22 Jun 2011 07:52:05 +0000 (09:52 +0200)]
Merge remote branch 'qt-qml-review/master' into master-qml-staging

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

* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
Qt Continuous Integration System [Tue, 21 Jun 2011 15:07:16 +0000 (01:07 +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:
  Fix QDeclarativeInspector when starting with ,block

11 years agoFix QDeclarativeInspector when starting with ,block
Aurindam Jana [Tue, 21 Jun 2011 13:59:44 +0000 (15:59 +0200)]
Fix QDeclarativeInspector when starting with ,block

Change-Id: I3797567f22f61abf59ec5332ebc74b3fa37ede93
Reviewed-by: kkoehne
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Tue, 21 Jun 2011 13:30:14 +0000 (23:30 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
  QDeclarativeDebug: Fix cases where multiple packets arrive in one go
  Fix build break in S60 5.0 environment
  Skip softkeys update if application is not on foreground in Symbian
  Revert "Opening taskswitcher, pushes application softkeys to top of switcher"
  Fix js debugging autotest on Windows + Add license header
  Rewrite autotests for js debugging
  Rename qdeclarativescriptdebugging autotest directory
  Create property cache in case of Component{} root

11 years agochangelog
Ritt Konstantin [Tue, 21 Jun 2011 11:51:17 +0000 (13:51 +0200)]
changelog

Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
11 years agodocu update for QNX 6.5
Ritt Konstantin [Tue, 21 Jun 2011 11:51:16 +0000 (13:51 +0200)]
docu update for QNX 6.5

Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
11 years agoget rid of anacronysm
Ritt Konstantin [Tue, 21 Jun 2011 11:51:15 +0000 (13:51 +0200)]
get rid of anacronysm

the QNX4 support was dropped-out - the Q_OS_QNX4 ifdef-ed code is a dead cargo;
the Q_OS_QNX6 macro was renamed to Q_OS_QNX

Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
11 years agomassive improvements for the QNX screen driver
Ritt Konstantin [Tue, 21 Jun 2011 11:51:14 +0000 (13:51 +0200)]
massive improvements for the QNX screen driver

* implement the QWS client-server mode support;
* implement argb8888 (32bpp), rgb888 (24bpp) and rgb565 (16bpp) formats support
(both big- and little-endian);
* make the driver to use the system-configured/supported WxHxD dimensions
rather than a hard-coded WxHx'argb8888' one;
* implement screen blanking (dpms) support;
* proper resources clean-up on errors;
* code cleanups and various minor improvements

Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
11 years agomassive improvements for the QNX mouse driver
Ritt Konstantin [Tue, 21 Jun 2011 11:51:13 +0000 (13:51 +0200)]
massive improvements for the QNX mouse driver

add support for the input devices with an absolute positioning;
decrease lagging on slow machines by queueing more mouse events than just 10 of them;
fix an issue with losing the button press state between subsequent loops (ie long drag'n'drop)

Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
11 years agomassive improvements for the QNX keyboard driver
Ritt Konstantin [Tue, 21 Jun 2011 11:51:12 +0000 (13:51 +0200)]
massive improvements for the QNX keyboard driver

update the code to work on recent QNXs (6.4 and newer);
support all keycodes defined in sys/keycodes.h;
support unicodes as well as scancodes

Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>