qt:staging.git
6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr... oslo-1/master
Qt Continuous Integration System [Wed, 21 Dec 2011 13:52:54 +0000 (23:52 +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:
  qnetworkproxy_mac.cpp was not compiled in on Mac for the network module

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Wed, 21 Dec 2011 07:10:15 +0000 (17:10 +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:
  qnetworkproxy_mac.cpp was not compiled in on Mac for the network module
  Add dita_docs target to generate DITA output.
  Fix missing part from commit dae052cb11c0018121f2c4028aed9db17769fd77
  Fix a bug where 'int'  is not printed in snippets.
  SSL: fix build with -openssl-linked for OpenSSL 0.9.8*
  Fix m_longTapDetector causing crash.
  Fixes to czech translation
  Fix to incorrect ApplicationActivate event in QtOpenGL
  Symbian - Fix QFile::map with non page aligned offsets
  Update czech translation
  Symbian: fix tst_QMenuBar::task256322_highlight() regression
  I18n: Updates galician translation (4.8)
  Fix Memoy leak relateded to contextmenu.
  Set execution bits for .test files.
  Default to QDir::homePath() in Symbian native file dialogs
  Fix NTLM authentication with email address
  Fix null pointer dereference in NTLM authentication

6 years agoqnetworkproxy_mac.cpp was not compiled in on Mac for the network module
Andy Shaw [Wed, 21 Dec 2011 07:03:52 +0000 (08:03 +0100)]
qnetworkproxy_mac.cpp was not compiled in on Mac for the network module

The problem is that the coreservices configuration was not turned on due
to the fact that the configure test was never ran.  This is because the
configure test was placed in the wrong platform section and would
actually be ran for QPA and not Mac.

Task-number: QTBUG-23302

Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Tue, 20 Dec 2011 22:27:49 +0000 (08:27 +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 crash in positionInLigature

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Tue, 20 Dec 2011 18:33:40 +0000 (04:33 +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:
  SSL: fix build with -openssl-linked for OpenSSL 0.9.8*

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Tue, 20 Dec 2011 14:16:16 +0000 (00:16 +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:
  Add dita_docs target to generate DITA output.

6 years agoAdd dita_docs target to generate DITA output.
Casper van Donderen [Tue, 20 Dec 2011 12:04:25 +0000 (13:04 +0100)]
Add dita_docs target to generate DITA output.

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Tue, 20 Dec 2011 10:04:27 +0000 (20:04 +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 missing part from commit dae052cb11c0018121f2c4028aed9db17769fd77
  Fix m_longTapDetector causing crash.
  Fix to incorrect ApplicationActivate event in QtOpenGL
  Symbian - Fix QFile::map with non page aligned offsets

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Mon, 19 Dec 2011 22:20:41 +0000 (08:20 +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:
  Fix a bug where 'int'  is not printed in snippets.

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Mon, 19 Dec 2011 18:23:11 +0000 (04:23 +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 missing part from commit dae052cb11c0018121f2c4028aed9db17769fd77
  Fix m_longTapDetector causing crash.

6 years agoFix missing part from commit dae052cb11c0018121f2c4028aed9db17769fd77
Jani Hautakangas [Mon, 19 Dec 2011 18:10:26 +0000 (20:10 +0200)]
Fix missing part from commit dae052cb11c0018121f2c4028aed9db17769fd77

Forgot to amend commit before pushing, sorry.

Task-number: QTBUG-23252
Reviewed-by: TRUSTME
6 years agoFix a bug where 'int' is not printed in snippets.
Casper van Donderen [Mon, 19 Dec 2011 14:50:06 +0000 (15:50 +0100)]
Fix a bug where 'int'  is not printed in snippets.

Reviewed-By: Trust Me
6 years agoSSL: fix build with -openssl-linked for OpenSSL 0.9.8*
Peter Hartmann [Mon, 19 Dec 2011 10:46:45 +0000 (11:46 +0100)]
SSL: fix build with -openssl-linked for OpenSSL 0.9.8*

OpenSSL's SSL_ctrl() always took a "void *" argument as 4th parameter,
since at least version 0.9.7.
I have no idea why we had "const void *" in there.

Reviewed-by: Richard J. Moore <rich@kde.org>
Task-number: QTBUG-23132

6 years agoFix m_longTapDetector causing crash.
Jani Hautakangas [Mon, 19 Dec 2011 11:36:56 +0000 (13:36 +0200)]
Fix m_longTapDetector causing crash.

GL shared widget calls null poiter m_longTapDetector.
These call shouldn't happen because GL shared widget
isn't part of UI stack anymore. This patch adds null
pointer checks

Task-number: QTBUG-23252
Reviewed-by: TRUSTME
6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Mon, 19 Dec 2011 00:39:22 +0000 (10:39 +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 to incorrect ApplicationActivate event in QtOpenGL
  Symbian - Fix QFile::map with non page aligned offsets

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Fri, 16 Dec 2011 19:28:02 +0000 (05:28 +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:
  Fixes to czech translation

6 years agoFixes to czech translation
Pavel Fric [Fri, 16 Dec 2011 10:06:41 +0000 (11:06 +0100)]
Fixes to czech translation

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Fri, 16 Dec 2011 15:08:49 +0000 (01:08 +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:
  Symbian: fix tst_QMenuBar::task256322_highlight() regression

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Fri, 16 Dec 2011 13:43:59 +0000 (23:43 +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 crash in positionInLigature

6 years agoFix crash in positionInLigature
Jiang Jiang [Fri, 16 Dec 2011 13:21:49 +0000 (14:21 +0100)]
Fix crash in positionInLigature

Check boundary of pos before accessing attributes.

Task-number: QTBUG-23104
Reviewed-by: Eskil
6 years agoFix to incorrect ApplicationActivate event in QtOpenGL
Jani Hautakangas [Fri, 16 Dec 2011 09:08:46 +0000 (11:08 +0200)]
Fix to incorrect ApplicationActivate event in QtOpenGL

QEvent::ApplicationActivate is sent incorrectly when application
goes to background if OpenGL graphics system is used. The problem
is that hidden global shared QGLWidget used by QtOpenGL for root
context is added to CONE stack. Qt destroys shared GL widget
when application goes to background and underlying CCoeControl
is removed from CONE stack which causes CONE to handle
stack changes. CONE tries to focus next control in stack which
causes incorrect focus events in Qt leading to
ApplicationActivate event. GL global share widget must not
be added to CONE stack because it's hidden utility widget
and don't belong to UI widget stack.

Task-number: QTBUG-23195
Task-number: ou1cimx1#946477

Reviewed-by: Murray Read
6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 15 Dec 2011 22:06:40 +0000 (08:06 +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 czech translation
  I18n: Updates galician translation (4.8)

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
Qt Continuous Integration System [Thu, 15 Dec 2011 17:22:28 +0000 (03:22 +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:
  Fix Memoy leak relateded to contextmenu.
  Set execution bits for .test files.

6 years agoSymbian - Fix QFile::map with non page aligned offsets
Shane Kearns [Thu, 15 Dec 2011 13:29:30 +0000 (13:29 +0000)]
Symbian - Fix QFile::map with non page aligned offsets

Although it is not documented, RFileMap native API requires the offset
into the file to be a multiple of the page size.
Round down the offset requested by the user to the page size.
Add back the difference before returning the base address to the user.

e.g. if the offset passed to QFile::map was 5000:
The offset passed to RFileMap will be 4096
The address returned to the user will be the RFileMap::Base() + 904

The modified address is used to key the hash of file mappings, so that
QFile::unmap() can be passed the modified address without needing changes.

Reviewed-by: mread
Task-number: ou1cimx#953054

6 years agoUpdate czech translation
Pavel Fric [Thu, 15 Dec 2011 12:50:40 +0000 (13:50 +0100)]
Update czech translation

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Thu, 15 Dec 2011 10:11:25 +0000 (20:11 +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:
  Symbian: fix tst_QMenuBar::task256322_highlight() regression

6 years agoSymbian: fix tst_QMenuBar::task256322_highlight() regression
Satyam Bandarapu [Thu, 15 Dec 2011 09:15:15 +0000 (11:15 +0200)]
Symbian: fix tst_QMenuBar::task256322_highlight() regression

This fixes Symbian-only regression caused by
ab0a2466d7e3998caad226197355b729f523764a.

Reviewed-by: Miikka Heikkinen
6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Thu, 15 Dec 2011 00:05:09 +0000 (10:05 +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:
  Default to QDir::homePath() in Symbian native file dialogs
  directfb: Backport the work from QtBase to Qt 4.8
  [blitter] Work on tst_QPixmap::clear()
  [blitter] Use QScopedPointer for the engine and blittable
  [blitter] Generate a new serial number when resizing the
  [blitter] Fix memory leak in the blitter paintengine
  Fix NTLM authentication with email address
  Fix null pointer dereference in NTLM authentication

6 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Thu, 15 Dec 2011 00:00:12 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Wed, 14 Dec 2011 15:39:34 +0000 (01:39 +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:
  Default to QDir::homePath() in Symbian native file dialogs
  Fix NTLM authentication with email address
  Fix null pointer dereference in NTLM authentication

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Wed, 14 Dec 2011 00:04:28 +0000 (10:04 +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:
  Revert "Fix memory leaks in OpenVG and OpenGL resource pools"

6 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Wed, 14 Dec 2011 00:00:13 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Tue, 13 Dec 2011 21:18:20 +0000 (07:18 +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:
  directfb: Backport the work from QtBase to Qt 4.8
  [blitter] Work on tst_QPixmap::clear()
  [blitter] Use QScopedPointer for the engine and blittable
  [blitter] Generate a new serial number when resizing the
  [blitter] Fix memory leak in the blitter paintengine

6 years agoI18n: Updates galician translation (4.8)
Marcelino Villarino [Tue, 13 Dec 2011 18:56:14 +0000 (19:56 +0100)]
I18n: Updates galician translation (4.8)

Merge-request: 1493
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Tue, 13 Dec 2011 14:25:05 +0000 (00:25 +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:
  Fix Memoy leak relateded to contextmenu.
  Set execution bits for .test files.

6 years agoFix Memoy leak relateded to contextmenu.
Debao Zhang [Tue, 13 Dec 2011 14:09:16 +0000 (15:09 +0100)]
Fix Memoy leak relateded to contextmenu.

From Qt4.7 on, the contextmenu of
QTextEdit/QPlainTextEdit/QLineEdit/QLabel/QMainWindow etc using
QMenu::popup() instead of QMenu::exec(), but the
setAttribute(Qt::WA_DeleteOnClose) does not work, as QMenu::close()
isn't called when the menus disapper. And this causes a memory leak.

Task-number: QTBUG-22817

Merge-request: 2721
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
6 years agoSet execution bits for .test files.
Frederik Gladhorn [Fri, 25 Nov 2011 09:12:21 +0000 (10:12 +0100)]
Set execution bits for .test files.

These files turn out to be scripts.

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 13 Dec 2011 12:37:41 +0000 (22:37 +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:
  Default to QDir::homePath() in Symbian native file dialogs

6 years agoDefault to QDir::homePath() in Symbian native file dialogs
Gareth Stockwell [Tue, 13 Dec 2011 12:24:14 +0000 (12:24 +0000)]
Default to QDir::homePath() in Symbian native file dialogs

Symbian places restrictions on the directories in which the native file
dialog can browse.  If the path passed to QFileDialog::getXxxFileName()
is inaccessible, the implementation defaults to a path which is
accessible.

Previously, this default path was QDir::rootPath().  Changes to the
Symbian file engine in Qt 4.8 mean that this now returns "C:\" which is
inaccesible to the file dialog.  This patch changes the default path to
QDir::homePath(), which returns "C:\data".

Task-number: ou1cimx1#947939
Reviewed-by: Miikka Heikkinen
6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Tue, 13 Dec 2011 11:14:49 +0000 (21: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:
  directfb: Backport the work from QtBase to Qt 4.8
  [blitter] Work on tst_QPixmap::clear()
  [blitter] Use QScopedPointer for the engine and blittable
  [blitter] Generate a new serial number when resizing the
  [blitter] Fix memory leak in the blitter paintengine
  Revert "Fix memory leaks in OpenVG and OpenGL resource pools"
  Fix window surface config on OpenGL graphics system.
  Symbian: Fix a case sensitivity issue with QMAKE_EXTRA_COMPILERS
  Symbian: Fix double deletion of selected text when using predictive
  tests: fixed compile of qscriptextensionplugin test with high -jN
  Symbian: improving diagnostics for QWaitCondition
  Updated WebKit to 83439de78841f9569ad78e3a84b7b888337b5d18
  Symbian: Fix language mappings for localize_deployment
  Symbian: Only localize the application .rss that needs it, not all .rss
  Revert "Fix sqlite driver memory eating due to close failure"
  Revert "Fix sqlite driver memory eating due to close failure"
  tests: make tests compile or disable those which don't compile
  Reduce unnecessary QtCore DLL loads during Symbian app thread creation
  Fix HarfBuzz Thai character SARA AM handling

6 years agodirectfb: Backport the work from QtBase to Qt 4.8
Holger Hans Peter Freyther [Tue, 13 Dec 2011 11:02:33 +0000 (12:02 +0100)]
directfb: Backport the work from QtBase to Qt 4.8

This is copying the files (minus the API changes) to Qt 4.8. It fixes
memory leaks, adds DirectFB based image decoding, prepares EGL integration/

Merge-request: 1492
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
6 years ago[blitter] Work on tst_QPixmap::clear()
Holger Hans Peter Freyther [Tue, 13 Dec 2011 11:02:32 +0000 (12:02 +0100)]
[blitter] Work on tst_QPixmap::clear()

By default QPixmap may not hasAlphaChannel(), only if setMask()
or fill() with a transparent color is called a QPixmap will
hasAlphaChannel().

Make the QBlittablePlatformPixmap remember if there is an alpha
channel, pass this as parameter in createBlittable to make it
clear that this is required and not optional.

Update the DirectFB plugin to handle this parameter to create a
RGB32 or ARGB Surface depending on the alpha value, also only use
PreMultiplied alpha when using ARGB. Separate the two constructors
for the QDirectFbBlitter to either adopt a DirectFB Surface or to
create one.

Cherry-picked-from: qtbase:ab50b60f5cc237d5620f3ff3b2eb44c857f8f60b

Change-Id: I8abf82408ecd2d075fc6f241ace8be2a34ac56e7
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Merge-request: 1492
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
6 years ago[blitter] Use QScopedPointer for the engine and blittable
Holger Hans Peter Freyther [Tue, 13 Dec 2011 11:02:32 +0000 (12:02 +0100)]
[blitter] Use QScopedPointer for the engine and blittable

Use the QScopedPointer to prevent memory leaks, right now
the code appears to be sound but make it more clear that
calling ::setBlittable will destroy the old one.

Cherry-picked-from: qtbase:dc4764229a3eef5c0bdbd665f2e24e59398e8c51

Change-Id: Idc71add7cfd429ff5b9d0ea9908d9fff1e7ce74d
Merge-request: 59
Reviewed-on: http://codereview.qt-project.org/5243
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Merge-request: 1492
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
6 years ago[blitter] Generate a new serial number when resizing the
Holger Hans Peter Freyther [Tue, 13 Dec 2011 11:02:30 +0000 (12:02 +0100)]
[blitter] Generate a new serial number when resizing the

The raster pixmap is generating a new serial number when the pixmap
is resized, do the same for the blitter code.

Cherry-picked-from: qtbase:6e13586d8b6d80ab374197649c76e7f0b35045db

Merge-request: 1492
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
6 years ago[blitter] Fix memory leak in the blitter paintengine
Holger Hans Peter Freyther [Tue, 13 Dec 2011 11:02:30 +0000 (12:02 +0100)]
[blitter] Fix memory leak in the blitter paintengine

The raster engine and the capabilities were leaked, use the
QScopedPointer to prevent that from happening.

Cherry-picked-from: qtbase:d5f12b898b8480c891382c54672422c50218751a.

Change-Id: I31ba0117280b48ad942fbb638fb151ccb7b34385

Merge-request: 1492
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Tue, 13 Dec 2011 00:04:54 +0000 (10:04 +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:
  Fix window surface config on OpenGL graphics system.
  Symbian: Fix a case sensitivity issue with QMAKE_EXTRA_COMPILERS
  Symbian: Fix double deletion of selected text when using predictive

6 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Tue, 13 Dec 2011 00:00:13 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Mon, 12 Dec 2011 21:56:05 +0000 (07:56 +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:
  Revert "Fix memory leaks in OpenVG and OpenGL resource pools"

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Mon, 12 Dec 2011 19:30:01 +0000 (05:30 +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 NTLM authentication with email address
  Fix null pointer dereference in NTLM authentication

6 years agoFix NTLM authentication with email address
Shane Kearns [Fri, 9 Dec 2011 12:06:04 +0000 (12:06 +0000)]
Fix NTLM authentication with email address

When using "user@dns-domain" for NTLM authentication, the whole string
should be sent as the username, and the domain should be set to an
empty string.
The domain sent by the server is still reflected if the username
does not contain an '@' character.

Manually tested using MS IIS on a domain-joined PC.

Task-number: QTBUG-19894
Task-number: ou1cimx1#949951
Change-Id: Ie1f81172e71cb7cce7b8c909062be990c24aea47
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
(cherry picked from commit f74ff46c7a333d771b07d8ff38df10d9fd13bbcf)

6 years agoFix null pointer dereference in NTLM authentication
Shane Kearns [Fri, 9 Dec 2011 11:49:50 +0000 (11:49 +0000)]
Fix null pointer dereference in NTLM authentication

If NTLM authentication is required for the URL with an empty path,
then QNetworkAuthenticationCache::findClosestMatch(url.path()) returns 0.
e.g. "http://10.1.2.3".
Return a default constructed credential in this case.

Change-Id: I84ad3b308ee3f74fbbac9ad0f11dbdc66047b50b
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
(cherry picked from commit b830c9cededf995fab1b0919a81658ceaec8d422)

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Mon, 12 Dec 2011 13:45:54 +0000 (23:45 +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:
  Revert "Fix memory leaks in OpenVG and OpenGL resource pools"

6 years agoRevert "Fix memory leaks in OpenVG and OpenGL resource pools"
mread [Mon, 12 Dec 2011 13:10:28 +0000 (13:10 +0000)]
Revert "Fix memory leaks in OpenVG and OpenGL resource pools"

This reverts commit 8752faf0564bed86396b01529dc8ef5064150f4c.
Also Revert "Fix def files"
This reverts commit d2a3b9ee8c9329cac96b5e509df0e6a69dbef91c.
This was found to cause a crash in QMLGallery app.
It is not necessary to delete these resource pools at app
exit, as the OS should automatically release the resources
at this point.

Reviewed-by: Jani Hautakangas
6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Mon, 12 Dec 2011 10:20:22 +0000 (20:20 +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 window surface config on OpenGL graphics system.
  Symbian: Fix a case sensitivity issue with QMAKE_EXTRA_COMPILERS
  Symbian: Fix double deletion of selected text when using predictive

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Sat, 10 Dec 2011 00:12:07 +0000 (10:12 +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:
  tests: fixed compile of qscriptextensionplugin test with high -jN
  Symbian: improving diagnostics for QWaitCondition
  Fix stretched font positions in Lion
  Backport writingSystems support code for Cocoa from Qt 5

6 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Sat, 10 Dec 2011 00:00:12 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Fri, 9 Dec 2011 20:36:51 +0000 (06:36 +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 window surface config on OpenGL graphics system.

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
Qt Continuous Integration System [Fri, 9 Dec 2011 18:24:50 +0000 (04:24 +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:
  tests: fixed compile of qscriptextensionplugin test with high -jN

6 years agoMerge remote-tracking branch 'qt-qa-review/master'
Sergio Ahumada [Fri, 9 Dec 2011 18:01:30 +0000 (19:01 +0100)]
Merge remote-tracking branch 'qt-qa-review/master'

6 years agoFix window surface config on OpenGL graphics system.
Jani Hautakangas [Fri, 9 Dec 2011 12:40:29 +0000 (14:40 +0200)]
Fix window surface config on OpenGL graphics system.

QtOpenGL uses 16-bit configs by default but on Symbian
it should use 32-bit config.

Task-number: QTBUG-23082
Task-number: ou1cimx1#951223
Reviewed-by: Murray Read
6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Fri, 9 Dec 2011 15:07:46 +0000 (01:07 +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:
  Symbian: Fix a case sensitivity issue with QMAKE_EXTRA_COMPILERS

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Fri, 9 Dec 2011 13:18:40 +0000 (23:18 +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:
  Symbian: improving diagnostics for QWaitCondition

6 years agoSymbian: Fix a case sensitivity issue with QMAKE_EXTRA_COMPILERS
Miikka Heikkinen [Fri, 9 Dec 2011 10:12:28 +0000 (12:12 +0200)]
Symbian: Fix a case sensitivity issue with QMAKE_EXTRA_COMPILERS

The case of the drive letter generated to the absolute paths seems to
have changed between 4.7 and 4.8, which led into regression with
projects that utilize $$PWD in target name, as that still returns the
path with drive letter in same case as previously.
Fixed the critical check to be case insensitive in windows.

Task-number: ou1cimx1#951456
Reviewed-by: Murray Read
6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Fri, 9 Dec 2011 09:29:10 +0000 (19:29 +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:
  Symbian: Fix double deletion of selected text when using predictive

6 years agoSymbian: Fix double deletion of selected text when using predictive
Miikka Heikkinen [Fri, 9 Dec 2011 09:07:01 +0000 (11:07 +0200)]
Symbian: Fix double deletion of selected text when using predictive

The selected text replacement was done incorrectly, leading to removal
of additional text equal to the lenght of the original selection.
Fixed by not doing any explicit replacement, but instead faking a
preedit character that is immediately removed, which triggers selected
text removal in the input method handling of the underlying edit
control.

Task-number: ou1cimx1#938665
Reviewed-by: Sami Merila
6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Fri, 9 Dec 2011 09:09:10 +0000 (19:09 +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 stretched font positions in Lion
  Backport writingSystems support code for Cocoa from Qt 5

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
Qt Continuous Integration System [Fri, 9 Dec 2011 08:47:37 +0000 (18:47 +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:
  tests: fixed compile of qscriptextensionplugin test with high -jN
  Updated WebKit to 83439de78841f9569ad78e3a84b7b888337b5d18
  Symbian: Fix language mappings for localize_deployment
  Symbian: Only localize the application .rss that needs it, not all .rss
  Revert "Fix sqlite driver memory eating due to close failure"
  Revert "Fix sqlite driver memory eating due to close failure"
  Reduce unnecessary QtCore DLL loads during Symbian app thread creation
  Fix HarfBuzz Thai character SARA AM handling

6 years agotests: fixed compile of qscriptextensionplugin test with high -jN
Rohan McGovern [Tue, 31 May 2011 00:11:16 +0000 (10:11 +1000)]
tests: fixed compile of qscriptextensionplugin test with high -jN

Dependencies between this test and some helper projects were not
declared, so aggressively parallel builds would fail semi-randomly.

Reviewed-by: Jason McDonald
(cherry picked from commit f567467a3ac4182a4c6bb592e4ec596ec458c11b)

Change-Id: If5b1998e18009ffac58637f6723c0a2ddd49c85d

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Fri, 9 Dec 2011 00:12:27 +0000 (10:12 +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:
  Updated WebKit to 83439de78841f9569ad78e3a84b7b888337b5d18
  Symbian: Fix language mappings for localize_deployment
  Symbian: Only localize the application .rss that needs it, not all .rss
  Revert "Fix sqlite driver memory eating due to close failure"
  tests: make tests compile or disable those which don't compile
  Reduce unnecessary QtCore DLL loads during Symbian app thread creation
  Fix HarfBuzz Thai character SARA AM handling

6 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Fri, 9 Dec 2011 00:00:13 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
Qt Continuous Integration System [Thu, 8 Dec 2011 16:43:58 +0000 (02:43 +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:
  Updated WebKit to 83439de78841f9569ad78e3a84b7b888337b5d18

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Thu, 8 Dec 2011 15:56:45 +0000 (01:56 +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:
  Symbian: improving diagnostics for QWaitCondition

6 years agoSymbian: improving diagnostics for QWaitCondition
mread [Thu, 8 Dec 2011 14:00:46 +0000 (14:00 +0000)]
Symbian: improving diagnostics for QWaitCondition

If a QWaitCondition was deleted while it was waiting, it would crash in
the wait() function while trying to use its internal mutex. This crash
is not particularly obvious in its cause.

QWaitCondition can detect this delete-while-waiting case, issue
appropriate warnings and avoid a crash in its internal state.

In the app crash case where this problem was found, there is a further
crash after this one due to an externally deleted mutex. The app is
clearly at fault. But at least there's now more debug info about
what the app is doing wrong.

Task-number: ou1cimx1#946509 partial fix
Reviewed-by: Shane Kearns
6 years agoUpdated WebKit to 83439de78841f9569ad78e3a84b7b888337b5d18
Zeno Albisser [Thu, 8 Dec 2011 12:31:02 +0000 (13:31 +0100)]
Updated WebKit to 83439de78841f9569ad78e3a84b7b888337b5d18

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Thu, 8 Dec 2011 12:10:49 +0000 (22:10 +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:
  Symbian: Fix language mappings for localize_deployment
  Symbian: Only localize the application .rss that needs it, not all .rss
  Revert "Fix sqlite driver memory eating due to close failure"

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
Qt Continuous Integration System [Thu, 8 Dec 2011 01:45:25 +0000 (11:45 +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:
  tests: make tests compile or disable those which don't compile

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Thu, 8 Dec 2011 00:12:17 +0000 (10:12 +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:
  Revert "Fix sqlite driver memory eating due to close failure"

6 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Thu, 8 Dec 2011 00:00:12 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water

6 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, 7 Dec 2011 21:22:48 +0000 (07:22 +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:
  Reduce unnecessary QtCore DLL loads during Symbian app thread creation
  Fix HarfBuzz Thai character SARA AM handling

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Wed, 7 Dec 2011 21:22:44 +0000 (07:22 +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: (37 commits)
  Fix declarative examples and demos issue on Windows
  Symbian: allow apps to disable GL multisampling
  QSqlRelationalTableModel doesn't follow relations on the first column
  symbian - don't export qsymbianbearer.qtplugin twice
  Correct client rect calculation for MCL
  qmlplugindump: Fix missing flush for objects that don't fit a line.
  qmlplugindump: Avoid reporting types as attaching to themselves.
  Fix QtDemo declarative examples
  Correct image paths for dynamicscene
  Fix stretched font positions in Lion
  Symbian: Fix CBA display on application with multiple windows
  Fix def files
  Fix stack overwrite in QDBusDemarshaller
  Qt Linguist: Fix crashes
  fixed error generating wrong introspection string in header output file
  doc - document symbian behaviour of QFile::link
  Symbian - prefer sessions started by this process to choose proxy
  Backport SMP safe initialisation of QNetworkConfigurationManager
  Remove more "unused variable" warnings
  QTreeView: fix crash when starting a drag with hidden columns.
  ...

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Wed, 7 Dec 2011 15:40:45 +0000 (01: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:
  Symbian: Fix language mappings for localize_deployment
  Symbian: Only localize the application .rss that needs it, not all .rss

6 years agoSymbian: Fix language mappings for localize_deployment
Miikka Heikkinen [Wed, 7 Dec 2011 13:08:50 +0000 (15:08 +0200)]
Symbian: Fix language mappings for localize_deployment

Some Qt language codes now map to two Symbian language codes. Also added
the missing en_in mapping.

Task-number: ou1cimx1#947060
Reviewed-by: Pasi Pentikainen
6 years agoSymbian: Only localize the application .rss that needs it, not all .rss
Miikka Heikkinen [Mon, 5 Dec 2011 10:37:37 +0000 (12:37 +0200)]
Symbian: Only localize the application .rss that needs it, not all .rss

Move LANG statement into proper RESOURCE block inside generated .mmp
file, so it doesn't affect _reg.rss, which doesn't need to be
localized.

Task-number: ou1cimx1#947060
Reviewed-by: Pasi Pentikainen
6 years agoMerge remote-tracking branch 'qt-mainline/4.8'
aavit [Wed, 7 Dec 2011 13:56:36 +0000 (14:56 +0100)]
Merge remote-tracking branch 'qt-mainline/4.8'

6 years agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Liang Qi [Wed, 7 Dec 2011 13:45:19 +0000 (14:45 +0100)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/s60main/newallocator_hook.cpp

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Wed, 7 Dec 2011 12:48:49 +0000 (22:48 +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 "Fix sqlite driver memory eating due to close failure"

6 years agoRevert "Fix sqlite driver memory eating due to close failure"
Sinan Tanilkan [Wed, 7 Dec 2011 12:39:56 +0000 (13:39 +0100)]
Revert "Fix sqlite driver memory eating due to close failure"

Introduced a problem for the SDK (QTBUG-23036).

This reverts commit 9a5fb6bd5f0fb3b37897bf722e4cc1673309623c.

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Wed, 7 Dec 2011 10:08:28 +0000 (20:08 +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:
  Revert "Fix sqlite driver memory eating due to close failure"

6 years agoRevert "Fix sqlite driver memory eating due to close failure"
Honglei Zhang [Wed, 7 Dec 2011 09:56:45 +0000 (11:56 +0200)]
Revert "Fix sqlite driver memory eating due to close failure"

This reverts commit 9a5fb6bd5f0fb3b37897bf722e4cc1673309623c.
The mentioned fix has caused failure in qtcreator. Thus it has to
be reverted and new fix for the memory leak will be made.

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
Qt Continuous Integration System [Wed, 7 Dec 2011 09:49:09 +0000 (19:49 +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:
  tests: make tests compile or disable those which don't compile
  Fix declarative examples and demos issue on Windows
  Symbian: allow apps to disable GL multisampling
  QSqlRelationalTableModel doesn't follow relations on the first column
  symbian - don't export qsymbianbearer.qtplugin twice

6 years agotests: make tests compile or disable those which don't compile
Sergio Ahumada [Sun, 4 Dec 2011 01:59:31 +0000 (02:59 +0100)]
tests: make tests compile or disable those which don't compile

These changes are mostly a backport from qtbase and a fix to
those tests that are dependent on private APIs.

Change-Id: I6e647583d7aaddf525d719c3b61f59a0c9aedf74
Reviewed-by: Rohan McGovern
Reviewed-by: Friedemann Kleint
6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Wed, 7 Dec 2011 00:10:49 +0000 (10:10 +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:
  Fix declarative examples and demos issue on Windows
  Symbian: allow apps to disable GL multisampling
  QSqlRelationalTableModel doesn't follow relations on the first column
  symbian - don't export qsymbianbearer.qtplugin twice

6 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Wed, 7 Dec 2011 00:00:13 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 6 Dec 2011 21:47:38 +0000 (07:47 +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 declarative examples and demos issue on Windows
  qmlplugindump: Fix missing flush for objects that don't fit a line.
  qmlplugindump: Avoid reporting types as attaching to themselves.
  Fix QtDemo declarative examples
  Correct image paths for dynamicscene
  Fix stack overwrite in QDBusDemarshaller
  Qt Linguist: Fix crashes
  fixed error generating wrong introspection string in header output file
  Backport SMP safe initialisation of QNetworkConfigurationManager
  Remove more "unused variable" warnings
  QTreeView: fix crash when starting a drag with hidden columns.
  Set execution bits for more scripts.
  Set execution bits for .test files.
  Fix more permissions (no execute bit).
  Fix permission (no execute bit).
  QGraphicsLayoutItem - bound constraint the minimum and maximum size
  Notify X11 of its resizable state through MWM Hints.

6 years agoMerge remote-tracking branch 'qt/4.8'
Pasi Pentikainen [Tue, 6 Dec 2011 21:43:18 +0000 (23:43 +0200)]
Merge remote-tracking branch 'qt/4.8'

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Tue, 6 Dec 2011 19:30:48 +0000 (05:30 +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:
  Symbian: allow apps to disable GL multisampling
  QSqlRelationalTableModel doesn't follow relations on the first column
  symbian - don't export qsymbianbearer.qtplugin twice

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Tue, 6 Dec 2011 15:21:31 +0000 (01:21 +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:
  Fix declarative examples and demos issue on Windows

6 years agoFix declarative examples and demos issue on Windows
Daniel Molkentin [Tue, 6 Dec 2011 13:42:51 +0000 (14:42 +0100)]
Fix declarative examples and demos issue on Windows

On Windows, if the resulting binaries reside in /Delease
and /Debug subdirs. Thus we require the same hack as on
Meego where the binary alone resides in the /bin subdir.

Reviewed-by: Alessandro Portale
6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
Qt Continuous Integration System [Tue, 6 Dec 2011 12:02:15 +0000 (22:02 +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:
  Correct client rect calculation for MCL
  qmlplugindump: Fix missing flush for objects that don't fit a line.
  qmlplugindump: Avoid reporting types as attaching to themselves.
  Symbian: Fix CBA display on application with multiple windows
  Fix def files
  doc - document symbian behaviour of QFile::link
  Symbian - prefer sessions started by this process to choose proxy
  Freezing Def files in Qt
  Lightmaps demo Symbian fix
  CBA comes on top of option menu
  Fix memory leaks in OpenVG and OpenGL resource pools
  Fix sqlite driver memory eating due to close failure

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Tue, 6 Dec 2011 00:12:10 +0000 (10:12 +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:
  Correct client rect calculation for MCL
  qmlplugindump: Fix missing flush for objects that don't fit a line.
  qmlplugindump: Avoid reporting types as attaching to themselves.
  Fix QtDemo declarative examples
  Correct image paths for dynamicscene
  Symbian: Fix CBA display on application with multiple windows
  Fix def files
  doc - document symbian behaviour of QFile::link
  Symbian - prefer sessions started by this process to choose proxy
  Freezing Def files in Qt
  Lightmaps demo Symbian fix
  CBA comes on top of option menu
  Fix memory leaks in OpenVG and OpenGL resource pools
  Fix sqlite driver memory eating due to close failure