qt:qt.git
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Fri, 14 Oct 2011 21:35:55 +0000 (07:35 +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:
  support the obj-c #import statement in the dependency generator

10 years agosupport the obj-c #import statement in the dependency generator
Oswald Buddenhagen [Fri, 14 Oct 2011 10:55:28 +0000 (12:55 +0200)]
support the obj-c #import statement in the dependency generator

Task-number: QTBUG-21965
Reviewed-by: joerg
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Fri, 14 Oct 2011 09:33:32 +0000 (19:33 +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:
  Update 4.8.0 changelog
  Changelog: update changes-4.8.0 for Richard
  Add briefs for the new 4.8 examples.
  Add briefs to the new 4.8 demos.
  Add a brief to all demos and examples for manifest

10 years agoMerge remote-tracking branch 'qt-doc-review/master'
Casper van Donderen [Fri, 14 Oct 2011 09:29:10 +0000 (11:29 +0200)]
Merge remote-tracking branch 'qt-doc-review/master'

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 13 Oct 2011 09:58:54 +0000 (19:58 +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 -nn for .cpp MOC preprocessing for INTEGRITY
  Remove commented out code.
  Update Polish translations for 4.8

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Thu, 13 Oct 2011 08:10:19 +0000 (18:10 +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: (213 commits)
  Doc updates to Qt for Symbian installation instructions and platform notes.
  Doc updates to platform notes document.
  Fix accessible menu not returning child name.
  Fix broken qglthreads autotest build on Solaris.
  Doc updates to platform notes of Qt 4.8 doc.
  Disabled activeqt/webbrowser example from mingw build.
  Don't store the alignment attribute for spacers
  Doc updates to Qt 4.8 platform notes documentation.
  Update changelog for Qt-4.8.0: add QtWebKit notes
  Update changelog for Qt 4.8
  Fix broken Solaris build (getpwnam_r usage)
  Improve sbsv2 whatlog support.
  Sentences should end with a period! (Poor man's rebuild trigger.)
  Update changes-4.8.0 file
  Modified SymSQL documentation in sql-driver.qdoc according review comments
  Added correct licence headers to symsql source files
  Documentation modifications for SymbianSQL added into sql-driver.qdoc
  Release Symbian SQL driver
  Fixed a typo found by static checker
  Added SQL driver plugin implementation for Symbian.
  ...

10 years agoAdd -nn for .cpp MOC preprocessing for INTEGRITY
Rolland Dudemaine [Wed, 12 Oct 2011 18:38:10 +0000 (20:38 +0200)]
Add -nn for .cpp MOC preprocessing for INTEGRITY

qmake generates .gpj project files for INTEGRITY.
Calls to moc on headers or code that do not produce actual output cause
a Note to be generated. This is considered as an error during build by
the Green Hills gbuild build tool.
-nn can be added to not generate that note when no output is generated.
This was already done for headers in util/integrity/qt.bod, but it was
not there yet for .cpp files.

Merge-request: 2693
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoRemove commented out code.
Rolland Dudemaine [Wed, 12 Oct 2011 18:38:09 +0000 (20:38 +0200)]
Remove commented out code.

Merge-request: 2693
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoUpdate Polish translations for 4.8
Jarek Kobus [Wed, 12 Oct 2011 09:17:01 +0000 (11:17 +0200)]
Update Polish translations for 4.8

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Mon, 10 Oct 2011 13:38:02 +0000 (23:38 +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:
  Fixes: libpng symbols exported from QtGui.dll on Windows
  omit unassigned (and too recent codepoints) from the text Normalization process
  Fixed broken window surface flush when depth is 24 and bpp is not 32.

10 years agoMerge remote-tracking branch 'qt-fire-review/master'
aavit [Mon, 10 Oct 2011 12:48:26 +0000 (14:48 +0200)]
Merge remote-tracking branch 'qt-fire-review/master'

10 years agoFixes: libpng symbols exported from QtGui.dll on Windows
aavit [Mon, 10 Oct 2011 12:22:17 +0000 (14:22 +0200)]
Fixes: libpng symbols exported from QtGui.dll on Windows

The upgrade of the bundled libpng to version 1.5 had the side effect
of causing the png functions to be exported from the QtGUi DLL
when built with the MS Visual C++ compiler.

Task-number: QTBUG-21455
Reviewed-by: Kim
10 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, 7 Oct 2011 12:51:54 +0000 (22:51 +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:
  Do not let QGLContext get out of sync when doing mixed VG-GL rendering
  Create auto test for http HEAD request
  QNAM - fix poor performance of HEAD request with authentication
  symbian - add support for ELangKazakh and ELangEnglish_India
  QAuthenticator::setUser() parse user name in form user@domain
  A patch for 'Fix to QtOpenGL crash'
  Update Korean Translations
  Document updates to Qt for Symbian installation instructions and platform notes.
  Always recreate backing store when TLW transparency changes
  Crash in QDeclarativeCompiler::indexOfProperty
  Fix to QtOpenGL crash
  Incorrect 'break' in switch-case was replaced by 'return'
  QLineControl: selectedTextChanged() signal is omitted in some cases
  QML import path puts Qt dirs in correct Symbian order
  Avoid runtime warning about interlace handling from libpng 1.5
  symbian bearer: fix tst_qnetworksession test failures
  Refactor dangerous multiple inheritance
  Fix RConnection handle leak in symbian bearer plugin
  Prevent crash when cache is changed on the fly
  Add missing checks for httpReply in QNetworkHttpBackend.

10 years agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Liang Qi [Fri, 7 Oct 2011 12:21:59 +0000 (14:21 +0200)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
doc/src/getting-started/installation.qdoc
doc/src/platforms/platform-notes.qdoc
src/corelib/tools/qlocale_symbian.cpp
src/gui/kernel/qwidget_p.h
src/network/access/qnetworkaccesshttpbackend.cpp
src/opengl/qgl.cpp
src/plugins/bearer/symbian/qnetworksession_impl.cpp

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Fri, 7 Oct 2011 12:07:42 +0000 (22: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:
  omit unassigned (and too recent codepoints) from the text Normalization process
  Fixed broken window surface flush when depth is 24 and bpp is not 32.

10 years agoomit unassigned (and too recent codepoints) from the text Normalization process
Konstantin Ritt [Fri, 7 Oct 2011 11:56:35 +0000 (13:56 +0200)]
omit unassigned (and too recent codepoints) from the text Normalization process

> handle any code points that were not defined in the earlier version
> as if they were unassigned: such code points will not decompose or compose,
> and their Canonical_Combining_Class value will be zero.
see http://www.unicode.org/reports/tr15/#Guaranteeing_Process_Stability for details

we should respect that the QChar::Unicode_Unassigned == 0
and thus less than any other QChar::UnicodeVersion value

Merge-request: 952
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Fri, 7 Oct 2011 05:53:25 +0000 (15:53 +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:
  purge "Translation Rules for Plurals"
  add -list-languages option to lupdate

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Fri, 7 Oct 2011 00:13:18 +0000 (10:13 +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:
  Doc updates to "Installing Qt for the Symbian Platform" page.

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integ...
Qt Continuous Integration System [Thu, 6 Oct 2011 18:28:42 +0000 (04:28 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
  Fix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)
  QHostInfo: fix a race condition under CE

10 years agopurge "Translation Rules for Plurals"
Oswald Buddenhagen [Thu, 6 Oct 2011 17:08:39 +0000 (19:08 +0200)]
purge "Translation Rules for Plurals"

the page had only exemplary character and was thus utterly incomplete.
document the new "lupdate -list-languages" instead.

10 years agoadd -list-languages option to lupdate
Oswald Buddenhagen [Thu, 6 Oct 2011 14:56:16 +0000 (16:56 +0200)]
add -list-languages option to lupdate

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 6 Oct 2011 12:48:34 +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:
  Ukrainian translation updated

10 years agoFix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)
miniak [Thu, 6 Oct 2011 10:42:17 +0000 (12:42 +0200)]
Fix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)

Merge-request: 1272
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
10 years agoUkrainian translation updated
Victor Ostashevsky [Thu, 6 Oct 2011 10:22:12 +0000 (12:22 +0200)]
Ukrainian translation updated

Merge-request: 1415
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoQHostInfo: fix a race condition under CE
Konstantin Ritt [Thu, 6 Oct 2011 10:09:14 +0000 (12:09 +0200)]
QHostInfo: fix a race condition under CE

Merge-request: 1339
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 6 Oct 2011 06:13:29 +0000 (16:13 +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:
  Do not let QGLContext get out of sync when doing mixed VG-GL rendering

10 years agoDo not let QGLContext get out of sync when doing mixed VG-GL rendering
Laszlo Agocs [Thu, 6 Oct 2011 05:26:48 +0000 (08:26 +0300)]
Do not let QGLContext get out of sync when doing mixed VG-GL rendering

The default graphics system is openvg, this means that apps using
QGLWidget (despite the official recommendation), without explicitly
setting opengl as the graphics system will use both the openvg and
opengl modules to perform rendering. This presents some problems
because QtOpenGL's comes with its own wrapper over QEglContext,
and making a foreign QEglContext (e.g. from VG) current will cause
its state to get out of sync, resulting in various drawing issues
due to skipped makeCurrent and similar calls.

The patch works this around by querying the current context from
EGL in QGLContext::currentContext() and returning null if the
EGLContext does not match. This somewhat ugly workaround ensures
that at least QGLContext::currentContext() will not lie: It will
not return a valid pointer when the underlying QEglContext's
underlying EGLContext is not actually the current context. This
will allow e.g. QGLPaintDevice::beginPaint to correctly recognize
the need for making the GL widget's context current and thus
avoid various rendering issues in certain games.

Task-number: QTTH-1553
Reviewed-by: Jani Hautakangas
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 6 Oct 2011 01:11:41 +0000 (11:11 +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:
  Build fix for WINCE to qfilesystemengine_win.cpp
  Fixed typo in QSettings documentation.
  remove dead code

10 years agoBuild fix for WINCE to qfilesystemengine_win.cpp
jaanttil [Wed, 5 Oct 2011 19:28:19 +0000 (21:28 +0200)]
Build fix for WINCE to qfilesystemengine_win.cpp

Merge-request: 2662
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoFixed typo in QSettings documentation.
Sam Protsenko [Wed, 5 Oct 2011 17:42:21 +0000 (19:42 +0200)]
Fixed typo in QSettings documentation.

Merge-request: 1411
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 5 Oct 2011 09:43:18 +0000 (19: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:
  Create auto test for http HEAD request
  QNAM - fix poor performance of HEAD request with authentication

10 years agoDoc updates to "Installing Qt for the Symbian Platform" page.
Eero Hyyti [Wed, 5 Oct 2011 09:29:53 +0000 (12:29 +0300)]
Doc updates to "Installing Qt for the Symbian Platform" page.

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Tue, 4 Oct 2011 20:19:05 +0000 (06:19 +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:
  Added Qt Quick Components link to document

10 years agoCreate auto test for http HEAD request
Shane Kearns [Mon, 3 Oct 2011 15:29:43 +0000 (16:29 +0100)]
Create auto test for http HEAD request

This is in order to have a regression test for QT-5304.
However the test is also checking basic functionality of head
requests too.

Task-Number: QT-5304
Reviewed-By: Martin Petersson
10 years agoQNAM - fix poor performance of HEAD request with authentication
Shane Kearns [Mon, 3 Oct 2011 15:27:34 +0000 (16:27 +0100)]
QNAM - fix poor performance of HEAD request with authentication

QHttpNetworkReply was waiting for a body to be sent for 401 and 407
responses, whereas with a HTTP HEAD request, there will be no body.

This delayed the authentication signal until after the http channel
is closed by the server after a timeout. For example with the server
used for autotesting, the authentication signal is delayed 15 seconds.

When the server has a very long timeout, the authentication signal may
not be emitted at all.

Task-Number: QT-5304
Reviewed-By: Martin Petersson
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Tue, 4 Oct 2011 13:53:37 +0000 (23:53 +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 integrity gbuild to the project file for convenience
  don't build activeqt examples on mingw
  QNetworkAccessBackend::start() is used although QT_NO_BEARERMANAGEMENT is defined.
  Updated Russian translation
  Ukrainian translation updated for 4.8
  retreving -> retrieving
  Removed duplicate Spectrum Analyzer entry from demos doc page.
  Removed obsolete QWS_ALPHA_CURSOR feature.
  Removed duplicate link from QFinalState documentation.
  Clarified keypad navigation specific event documentation.
  docs: Typo and link fixes.
  Use the right callback in QObject::disconnect()

10 years agoAdded Qt Quick Components link to document
Eero Hyyti [Tue, 4 Oct 2011 12:29:57 +0000 (15:29 +0300)]
Added Qt Quick Components link to document

10 years agoremove dead code
Oswald Buddenhagen [Tue, 4 Oct 2011 09:30:37 +0000 (11:30 +0200)]
remove dead code

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Tue, 4 Oct 2011 08:25:11 +0000 (18:25 +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:
  QDeclarativeDebug: Fix autotest breakage in qdeclarativedebugjs
  Fix assert
  Compile fix for Symbian
  Debugger: Fix autotest breakage
  Debugger: Rename qdeclarativedebug* to qdeclarativeenginedebug*
  Rename QDeclarativeEngineDebugServer to ~Service
  Fix aliasing bug when compiled with gcc 4.6
  Debugger: Move QT_DECLARATIVE_DEBUG handling out of qdeclarative.h
  FocusScope's focusItem must always be a descendent
  QDeclarativeDebugJs: Disable unstable autotest
  Add qdeclarativedebugjs autotests to declarative.pro
  tests: Use CONFIG option instead of QDeclarativeDebugHelper class

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Tue, 4 Oct 2011 02:06:31 +0000 (12:06 +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:
  QNetworkRequest autotest: adapt to new cookie parsing (re. commas)
  Remove support for multiple cookies in one Set-Cookie header to follow RFC6265.

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr... v4.8.0-rc1
Qt Continuous Integration System [Mon, 3 Oct 2011 15:05:20 +0000 (01:05 +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 possible crash in QFontEngineFT

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Mon, 3 Oct 2011 09:22:58 +0000 (19:22 +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:
  Added text about -random and -seed options in QTest to changelog
  Add another part of the source code to the snippet.
  Update changes-4.8.0
  Update translation sources.
  Update the changelog for qdoc in 4.8

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Mon, 3 Oct 2011 06:02:23 +0000 (16:02 +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:
  symbian - add support for ELangKazakh and ELangEnglish_India

10 years agoAdded text about -random and -seed options in QTest to changelog
Magne Zachrisen [Fri, 30 Sep 2011 12:30:18 +0000 (14:30 +0200)]
Added text about -random and -seed options in QTest to changelog

10 years agoMerge remote-tracking branch 'mainline/4.8'
Casper van Donderen [Fri, 30 Sep 2011 08:55:26 +0000 (10:55 +0200)]
Merge remote-tracking branch 'mainline/4.8'

10 years agoAdd another part of the source code to the snippet.
Casper van Donderen [Fri, 30 Sep 2011 07:56:46 +0000 (09:56 +0200)]
Add another part of the source code to the snippet.

Fixes: QTBUG-21765

10 years agoadd integrity gbuild to the project file for convenience
Oswald Buddenhagen [Thu, 29 Sep 2011 19:19:51 +0000 (21:19 +0200)]
add integrity gbuild to the project file for convenience

10 years agodon't build activeqt examples on mingw
Oswald Buddenhagen [Thu, 29 Sep 2011 16:09:08 +0000 (18:09 +0200)]
don't build activeqt examples on mingw

amends 0c70be512bfc40e8a2a09f60a66b7ecb114e748e

10 years agoQNetworkAccessBackend::start() is used although QT_NO_BEARERMANAGEMENT is defined.
shkim [Thu, 29 Sep 2011 14:14:05 +0000 (16:14 +0200)]
QNetworkAccessBackend::start() is used although QT_NO_BEARERMANAGEMENT is defined.

Merge-request: 2690
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoUpdated Russian translation
Sergey Belyashov [Thu, 29 Sep 2011 14:09:01 +0000 (16:09 +0200)]
Updated Russian translation

Merge-request: 1406
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoQDeclarativeDebug: Fix autotest breakage in qdeclarativedebugjs
Kai Koehne [Thu, 29 Sep 2011 10:12:15 +0000 (12:12 +0200)]
QDeclarativeDebug: Fix autotest breakage in qdeclarativedebugjs

In case a service is waiting for messages via waitForMessage, deliver
all arriving messages to the service directly, not only the first one.

In the case of QDeclarativeDebugJS::watchExpressions() test case,
the first message is actually WATCH_EXPRESSIONS , followed by
BREAKPOINTS. However, the second BREAKPOINTS command wasn't
delivered directly, but queued in the main event loop. As soon as
waitForMessage() was returning, QJSDebugClient was just calling
waitForMessage() anew (because BREAKPOINTS wasn't delivered yet),
blocking the main event loop from being run.

Reviewed-by: Aurindam Jana
10 years agoFixed broken window surface flush when depth is 24 and bpp is not 32.
Samuel Rødal [Wed, 28 Sep 2011 13:22:56 +0000 (15:22 +0200)]
Fixed broken window surface flush when depth is 24 and bpp is not 32.

Some X servers use a compact representation of 24 depth visuals. In that
case we can't use the shared memory or XPutImage paths, as Qt's RGB32
does not match the internal memory layout.

Also fixed QPixmap::fromImage() to work in this case to prevent the red
and blue channels from being swapped.

Task-number: QTBUG-21754
Reviewed-by: Alberto Mardegan
10 years agoUpdate changes-4.8.0
Jens Georg [Wed, 28 Sep 2011 14:36:32 +0000 (16:36 +0200)]
Update changes-4.8.0

10 years agoUpdate translation sources.
Casper van Donderen [Thu, 29 Sep 2011 09:56:31 +0000 (11:56 +0200)]
Update translation sources.

Reviewed-By: Geir Vattekar
10 years agoUpdate the changelog for qdoc in 4.8
Casper van Donderen [Thu, 29 Sep 2011 09:11:24 +0000 (11:11 +0200)]
Update the changelog for qdoc in 4.8

Reviewed-By: Trust Me
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Wed, 28 Sep 2011 15:26:38 +0000 (01:26 +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:
  Doc updates to Qt for Symbian installation instructions and platform notes.
  Doc updates to platform notes document.
  Doc updates to platform notes of Qt 4.8 doc.
  Doc updates to Qt 4.8 platform notes documentation.

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 28 Sep 2011 14:25:35 +0000 (00:25 +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:
  QAuthenticator::setUser() parse user name in form user@domain

10 years agosymbian - add support for ELangKazakh and ELangEnglish_India
Shane Kearns [Wed, 28 Sep 2011 14:12:44 +0000 (15:12 +0100)]
symbian - add support for ELangKazakh and ELangEnglish_India

I have not cherry picked this from 4.8 because it's tied up with a
feature implementation that refactored the code somewhat.

Task-number: QT-5298
Reviewed-by: mread
10 years agoQAuthenticator::setUser() parse user name in form user@domain
Martin Petersson [Mon, 20 Jun 2011 11:03:40 +0000 (13:03 +0200)]
QAuthenticator::setUser() parse user name in form user@domain

Task-number: QTBUG-19894
Change-Id: I063dbc66e5f47a83cc1c0aee8913062b4b5e42bc
(cherry picked from commit d3313bc2f095dc15718b2a1ed613489ab1ae0927)

10 years agoUkrainian translation updated for 4.8
Victor Ostashevsky [Wed, 28 Sep 2011 11:56:00 +0000 (13:56 +0200)]
Ukrainian translation updated for 4.8

Merge-request: 1404
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoretreving -> retrieving
Albert Astals Cid [Wed, 28 Sep 2011 11:55:45 +0000 (13:55 +0200)]
retreving -> retrieving

Reported by Freek de Kruijf in KDE translation project

Merge-request: 1405
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoMerge remote-tracking branch 'mainline/4.8'
Oswald Buddenhagen [Wed, 28 Sep 2011 11:55:00 +0000 (13:55 +0200)]
Merge remote-tracking branch 'mainline/4.8'

10 years agoFix assert
Aaron Kennedy [Wed, 28 Sep 2011 07:27:30 +0000 (17:27 +1000)]
Fix assert

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 28 Sep 2011 03:48:09 +0000 (13:48 +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:
  A patch for 'Fix to QtOpenGL crash'
  Always recreate backing store when TLW transparency changes
  Crash in QDeclarativeCompiler::indexOfProperty
  Fix to QtOpenGL crash

10 years agoA patch for 'Fix to QtOpenGL crash'
Jani Hautakangas [Tue, 27 Sep 2011 20:55:42 +0000 (23:55 +0300)]
A patch for 'Fix to QtOpenGL crash'

EGL API was used also on non-EGL Symbian platforms
which generated compile errors when compiling Qt
on those platforms. This patch #ifdefs EGL usage
correctly for EGL enabled platforms only.

Reviewed-by: TRUSTME
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
Qt Continuous Integration System [Tue, 27 Sep 2011 18:19:32 +0000 (04:19 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
  Document updates to Qt for Symbian installation instructions and platform notes.

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Tue, 27 Sep 2011 14:28:41 +0000 (00:28 +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:
  Update Korean Translations

10 years agoRemoved duplicate Spectrum Analyzer entry from demos doc page.
jaanttil [Tue, 27 Sep 2011 13:42:04 +0000 (15:42 +0200)]
Removed duplicate Spectrum Analyzer entry from demos doc page.

Task-number: QTBUG-19735

Merge-request: 1402
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoRemoved obsolete QWS_ALPHA_CURSOR feature.
jaanttil [Tue, 27 Sep 2011 13:42:03 +0000 (15:42 +0200)]
Removed obsolete QWS_ALPHA_CURSOR feature.

QWS_ALPHA_CURSOR was only mentioned in qfeatures.txt and corresponding
QT_NO_QWS_ALPHA_CURSOR was not used anywhere in Qt code.

Task-number: QTBUG-20337

Merge-request: 1402
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoRemoved duplicate link from QFinalState documentation.
jaanttil [Tue, 27 Sep 2011 13:42:02 +0000 (15:42 +0200)]
Removed duplicate link from QFinalState documentation.

Task-number: QTBUG-14553

Merge-request: 1402
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoClarified keypad navigation specific event documentation.
jaanttil [Tue, 27 Sep 2011 13:42:02 +0000 (15:42 +0200)]
Clarified keypad navigation specific event documentation.

Task-number: QTBUG-15631

Merge-request: 1402
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agodocs: Typo and link fixes.
jaanttil [Tue, 27 Sep 2011 13:42:01 +0000 (15:42 +0200)]
docs: Typo and link fixes.

Task-number: QTBUG-9224
Task-number: QTBUG-13442
Task-number: QTBUG-19858
Task-number: QTBUG-20957
Task-number: QTBUG-21447

Merge-request: 1402
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoUse the right callback in QObject::disconnect()
Olivier Goffart [Fri, 23 Sep 2011 18:42:50 +0000 (20:42 +0200)]
Use the right callback in QObject::disconnect()

Change-Id: Idf2f725dd859aa5c960e5889678cac0e139e44b0
Reviewed-on: http://codereview.qt-project.org/5475
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit d5ad900c77af563a1f3cfb0d252fd173249493fb)

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Tue, 27 Sep 2011 13:24:35 +0000 (23:24 +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:
  Update 4.8.0 changelog
  Changelog: update changes-4.8.0 for Richard

10 years agoUpdate Korean Translations
shkim [Tue, 27 Sep 2011 13:18:19 +0000 (15:18 +0200)]
Update Korean Translations

Merge-request: 1401
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoDocument updates to Qt for Symbian installation instructions and platform notes.
Eero Hyyti [Tue, 27 Sep 2011 13:09:42 +0000 (16:09 +0300)]
Document updates to Qt for Symbian installation instructions and platform notes.

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master...
Qt Continuous Integration System [Tue, 27 Sep 2011 12:19:18 +0000 (22:19 +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:
  Disabled activeqt/webbrowser example from mingw build.

10 years agoDoc updates to Qt for Symbian installation instructions and platform notes.
Eero Hyyti [Tue, 27 Sep 2011 12:11:36 +0000 (15:11 +0300)]
Doc updates to Qt for Symbian installation instructions and platform notes.

10 years agoQNetworkRequest autotest: adapt to new cookie parsing (re. commas)
Peter Hartmann [Tue, 27 Sep 2011 11:59:17 +0000 (13:59 +0200)]
QNetworkRequest autotest: adapt to new cookie parsing (re. commas)

Cookies cannot be separated by commas anymore, but are separated by
new lines.
See "Remove support for multiple cookies in one Set-Cookie header to
follow RFC6265."

Reviewed-by: Martin Petersson
Task-number: QTBUG-21456

10 years agoAlways recreate backing store when TLW transparency changes
Gareth Stockwell [Wed, 31 Aug 2011 14:52:25 +0000 (15:52 +0100)]
Always recreate backing store when TLW transparency changes

When using either the opengl or openvg graphics system on Symbian,
if a TLW is made transparent, the widget switches to using raster
rendering, because EGL surface transparency is currently not
supported by the platform.

This patch enables the reverse to occur: when the widget is
subsequently made opaque, rendering switches back to using GL/VG.

Task-number: QTBUG-21211
Reviewed-by: Jani Hautakangas
Reviewed-by: Laszlo Agocs
Reviewed-by: Sami Merila
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Tue, 27 Sep 2011 07:25:35 +0000 (17:25 +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: (22 commits)
  Fix accessible menu not returning child name.
  Fix broken qglthreads autotest build on Solaris.
  Don't store the alignment attribute for spacers
  Update changelog for Qt-4.8.0: add QtWebKit notes
  Update changelog for Qt 4.8
  Fix broken Solaris build (getpwnam_r usage)
  Improve sbsv2 whatlog support.
  Sentences should end with a period! (Poor man's rebuild trigger.)
  Modified SymSQL documentation in sql-driver.qdoc according review comments
  Added correct licence headers to symsql source files
  Documentation modifications for SymbianSQL added into sql-driver.qdoc
  Release Symbian SQL driver
  Fixed a typo found by static checker
  Added SQL driver plugin implementation for Symbian.
  Symbian: Fix qmdiarea autotest regressions
  Fix memory leaks in schema validation
  Symbian: Added copy-paste functionality to FEP input context
  symbian: Implement QNetworkConfiguration::purpose()
  Workaround MSVC2010 problems when linking QtWebKit
  dos2unix on a webkit source file (fix support for Visual Studio)
  ...

10 years agoMerge remote-tracking branch 'qt-mainline/4.8'
aavit [Tue, 27 Sep 2011 07:11:18 +0000 (09:11 +0200)]
Merge remote-tracking branch 'qt-mainline/4.8'

10 years agoDoc updates to platform notes document.
Eero Hyyti [Tue, 27 Sep 2011 06:38:54 +0000 (09:38 +0300)]
Doc updates to platform notes document.

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
Eero Hyyti [Tue, 27 Sep 2011 05:49:10 +0000 (08:49 +0300)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging

10 years agoCrash in QDeclarativeCompiler::indexOfProperty
Sami Merila [Tue, 27 Sep 2011 05:17:25 +0000 (08:17 +0300)]
Crash in QDeclarativeCompiler::indexOfProperty

In QDeclarativePropertyCache, plain integer bitfield overrideIndex is
initialized with -1 in class constructor. Unfortunately, ARM compiler
treats bitfields as unsigned, unless explicitly defined as signed [1].
Therefore, overrideIndex actually gets initial value of 2147483647,
which causes array operations done with the index to fail.

As a fix, define overrideIndex as signed int bitfield.

[1] http://www.keil.com/support/man/docs/armccref/armccref_Babjddhe.htm
Under bitfields/Note: "A plain bitfield, declared without either
signed or unsigned qualifiers, is treated as unsigned"

Task-number: QT-5285
Reviewed-by: Aaron Kennedy
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Tue, 27 Sep 2011 00:20:24 +0000 (10:20 +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:
  Update changes-4.8.0 file
  Only limit cursor position when line is wrapped
  Make sure cursor position doesn't exceed line end
  Allow shared EGL contexts for xcb and xlib platforms
  Allow generic EGL platform contexts to be shared
  4.8 Changes: OpenGL Framebuffer Format
  stop tslib plugin having same file name as linux input plugin
  Avoid unnecessary detach of a QImage in QPixmapDropShadowFilter

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Mon, 26 Sep 2011 18:36:02 +0000 (04:36 +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:
  Improve sbsv2 whatlog support.
  Modified SymSQL documentation in sql-driver.qdoc according review comments
  Added correct licence headers to symsql source files
  Documentation modifications for SymbianSQL added into sql-driver.qdoc
  Release Symbian SQL driver
  Fixed a typo found by static checker
  Added SQL driver plugin implementation for Symbian.
  Symbian: Fix qmdiarea autotest regressions
  Fix memory leaks in schema validation
  Symbian: Added copy-paste functionality to FEP input context
  symbian: Implement QNetworkConfiguration::purpose()
  symbian bearer: fix tst_qnetworksession test failures
  Fix the incorrect sizeHint given by QLabel on Symbian

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 26 Sep 2011 12:24:57 +0000 (22:24 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix broken qglthreads autotest build on Solaris.
  Don't store the alignment attribute for spacers

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Mon, 26 Sep 2011 10:59:22 +0000 (20:59 +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 possible crash in QFontEngineFT

10 years agoFix possible crash in QFontEngineFT
Eskil Abrahamsen Blomfeldt [Mon, 26 Sep 2011 10:18:46 +0000 (12:18 +0200)]
Fix possible crash in QFontEngineFT

Avoid crash if set pointer is null.

Task-number: QTBUG-21647
Reviewed-by: Jiang Jiang
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
Qt Continuous Integration System [Sat, 24 Sep 2011 06:34:16 +0000 (16:34 +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 accessible menu not returning child name.

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Fri, 23 Sep 2011 18:34:47 +0000 (04:34 +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:
  Update changelog for Qt-4.8.0: add QtWebKit notes
  Update changelog for Qt 4.8

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Fri, 23 Sep 2011 17:08:09 +0000 (03:08 +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 accessible menu not returning child name.

10 years agoFix accessible menu not returning child name.
Frederik Gladhorn [Fri, 23 Sep 2011 12:23:52 +0000 (14:23 +0200)]
Fix accessible menu not returning child name.

When accessible name is set, QAccessibleMenu would always return
the menu's name, not that of the child action.

Task-Number: QTBUG-21578
Reviewed-by: Jan-Arve
10 years agoFix broken qglthreads autotest build on Solaris.
Iikka Eklund [Fri, 23 Sep 2011 15:13:39 +0000 (17:13 +0200)]
Fix broken qglthreads autotest build on Solaris.

qglthreads autotest can not find usleep() function when
compiling on Solaris platform. Added qplatformdefs.h include
to fix compilation.

Task-number: QTBUG-21594

Merge-request: 1394
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoDoc updates to platform notes of Qt 4.8 doc.
Eero Hyyti [Fri, 23 Sep 2011 12:45:01 +0000 (15:45 +0300)]
Doc updates to platform notes of Qt 4.8 doc.

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
Qt Continuous Integration System [Fri, 23 Sep 2011 12:12:38 +0000 (22:12 +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: (84 commits)
  Disabled activeqt/webbrowser example from mingw build.
  Fix broken Solaris build (getpwnam_r usage)
  Sentences should end with a period! (Poor man's rebuild trigger.)
  Workaround MSVC2010 problems when linking QtWebKit
  dos2unix on a webkit source file (fix support for Visual Studio)
  Update changelog for Qt 4.8
  add 4.8 changes created/merged by me
  Fixed automatic plugin path resolving for predefined Qt plugins.
  Resolve a number of compilation issues with INTEGRITY
  runonphone: Include USB serial ports on OS X for CODA, too
  Update changelog for Qt 4.8.0
  Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE
  Update changelog for Qt 4.8
  QGraphicsWidget::setLayoutDirection doesn't propagate to new children
  Update changelog for Qt 4.8
  Prevent unnecessary graphics item updates when graphics effect changes.
  Updated change-log for 4.8
  Update changes file for 4.8.0
  Update changelog for Qt 4.8
  runonphone: Implement traceswitch support for coda
  ...

10 years agoDisabled activeqt/webbrowser example from mingw build.
Simo Fält [Fri, 23 Sep 2011 11:56:23 +0000 (14:56 +0300)]
Disabled activeqt/webbrowser example from mingw build.

10 years agoDon't store the alignment attribute for spacers
Jarek Kobus [Fri, 23 Sep 2011 10:19:02 +0000 (12:19 +0200)]
Don't store the alignment attribute for spacers

And for QLayoutWidget as it is not allowed and will create
a code which doesn't compile

Reviewed-by: con <qtc-committer@nokia.com>
Task-number: QTBUG-21575

10 years agoDoc updates to Qt 4.8 platform notes documentation.
Eero Hyyti [Fri, 23 Sep 2011 09:34:34 +0000 (12:34 +0300)]
Doc updates to Qt 4.8 platform notes documentation.