qt:qt.git
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
Qt Continuous Integration System [Thu, 3 Nov 2011 17:02:35 +0000 (03:02 +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:
  Re-apply change a14033620fab5edca44293ec6dfcc904e2e0eb20 by Andreas Kling
  Re-apply change 3489808c1dcd157ac09dd6da16bc057b56696d59 by Ademar de Souza Reis Jr
  Re-apply change 3dd9e66baaa0848bcc2eb7daecf2b63724624358 by Ademar de Souza Reis Jr
  Updated WebKit to 99371ddc1d61832131835964a753e1c5817f6916

10 years agoRe-apply change a14033620fab5edca44293ec6dfcc904e2e0eb20 by Andreas Kling
Andreas Kling [Thu, 22 Sep 2011 12:48:44 +0000 (14:48 +0200)]
Re-apply change a14033620fab5edca44293ec6dfcc904e2e0eb20 by Andreas Kling

Sentences should end with a period! (Poor man's rebuild trigger.)

10 years agoRe-apply change 3489808c1dcd157ac09dd6da16bc057b56696d59 by Ademar de Souza Reis Jr
Ademar de Souza Reis Jr [Tue, 20 Sep 2011 14:12:04 +0000 (11:12 -0300)]
Re-apply change 3489808c1dcd157ac09dd6da16bc057b56696d59 by Ademar de Souza Reis Jr

Workaround MSVC2010 problems when linking QtWebKit
Include MSVC2010 in the list of compilers where incremental
build is disabled (INCREMENTAL:NO).

Change suggested by Simo Falt <simo.falt@nokia.com>

10 years agoRe-apply change 3dd9e66baaa0848bcc2eb7daecf2b63724624358 by Ademar de Souza Reis Jr
Ademar de Souza Reis Jr [Mon, 19 Sep 2011 13:43:14 +0000 (10:43 -0300)]
Re-apply change 3dd9e66baaa0848bcc2eb7daecf2b63724624358 by Ademar de Souza Reis Jr

dos2unix on a webkit source file (fix support for Visual Studio)
webkit/Source/WebCore/bindings/js/JSExceptionBase.h had CRLF
terminations, which Visual Studio didn't like for some reason.

Reported by Simo Falt. Patch is also being submited to upstream
(webkit.org)

10 years agoUpdated WebKit to 99371ddc1d61832131835964a753e1c5817f6916
Zeno Albisser [Thu, 3 Nov 2011 16:13:03 +0000 (17:13 +0100)]
Updated WebKit to 99371ddc1d61832131835964a753e1c5817f6916

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Wed, 2 Nov 2011 13:44:48 +0000 (23:44 +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 QFont related compilation errors on Mac OSX Carbon

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Wed, 2 Nov 2011 07:23:05 +0000 (17:23 +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:
  Correct faulty 4.7->4.8 merge of Symbian def-files

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Tue, 1 Nov 2011 18:23:22 +0000 (04:23 +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:
  Missing icon in the designer documentation
  Fridge magnet example code snippet error
  qpaintdevice-qt3.html documentation errors
  QWebElement example missed information
  QSPlitter style-sheet example was invalid
  Errors in QSqlDriver::handle examples
  QGLColormap example was invalid
  QPointer made no mention of QWeakPointer
  Invalid links to http://developer.symbian.org
  QNetworkDiskCache documentation missed information
  QStyleSheet example used a property that is hidden.
  QList document referenced to non existing function
  QXmlQuery::bindVariable documentation bug
  Fix multiple typos in QLineF documentation.
  Qmake project file docs lacked information.
  Documentation error in SSL document
  Fix multiple typos in documentation.
  Fix for QVector::toList - code example documentation.

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 1 Nov 2011 17:01:29 +0000 (03:01 +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: (62 commits)
  Correct faulty 4.7->4.8 merge of Symbian def-files
  SSL documentation: correct enum name
  Updated changelog for Qt 4.8
  Fix QFile::copy() returning false but error() being NoError
  Symbian - disable memory mapping in QNetworkDiskCache
  Revert "Fixed deployment problems with MSVC 2005 and 2008 SP1"
  Harfbuzz shaper: kerning adjustment does not need to be modified by RTL
  QIODevice - disallow setTextMode when not open
  Adding items to a view with no delegate crashes.
  Update changelog for Qt 4.8
  Fix possible crash in glyph cache when deleting and creating contexts
  Added Lithuanian translation of Qt.
  Remove idc from mingw build.
  Update changelog for Qt 4.8
  Update changelog for Qt 4.8
  Doc: Fix example code
  Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504
  Add the ability to enable various SSL bug workarounds.
  Fix security issue on website due to bad JS.
  Fix security problem on webpage due to bad JS
  ...

10 years agoCorrect faulty 4.7->4.8 merge of Symbian def-files
Liang Qi [Tue, 1 Nov 2011 16:02:03 +0000 (17:02 +0100)]
Correct faulty 4.7->4.8 merge of Symbian def-files

Done-with: Pasi Pentikainen
Reviewed-by: Jani Hautakangas
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Tue, 1 Nov 2011 13:34:46 +0000 (23:34 +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 QFont related compilation errors on Mac OSX Carbon

10 years agoMissing icon in the designer documentation
artoka [Tue, 1 Nov 2011 12:47:21 +0000 (13:47 +0100)]
Missing icon in the designer documentation

In the documentation there was missing icon in the
Object Inspector section. Added reference to
editbreaklayout.png icon and cleared a bit the
description. Added also the image to the
doc/src/images - folder.

Task-number: QTBUG-17739

Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoFridge magnet example code snippet error
artoka [Tue, 1 Nov 2011 12:47:20 +0000 (13:47 +0100)]
Fridge magnet example code snippet error

Documentation states that QTextStream::readLine() is used but
the example uses ">>" operator. Changed the example to use
readLine()-method.

Task-number: QTBUG-7678

Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoqpaintdevice-qt3.html documentation errors
artoka [Tue, 1 Nov 2011 12:47:19 +0000 (13:47 +0100)]
qpaintdevice-qt3.html documentation errors

Document instructed to user qApp->x11Info() to access
x11Info in the examples. The QApplication doesn't have
x11Info() -method, QWidget does. Changed the examples
to use QWidget instead of QApplication.

Task-number: QTBUG-18544

Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoQWebElement example missed information
artoka [Tue, 1 Nov 2011 12:47:19 +0000 (13:47 +0100)]
QWebElement example missed information

In the example there was told to use
button.evaluateJavaScript("click()"); which doesn't work.
Instead of "click()" it should be "this.click()".
Changed to "this.click()".

Task-number: QTBUG-17029

Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoQSPlitter style-sheet example was invalid
artoka [Tue, 1 Nov 2011 12:47:18 +0000 (13:47 +0100)]
QSPlitter style-sheet example was invalid

QSPlitter::handle:pressed - example missed "image:" text
when image is set. Added "image:".

Task-number: QTBUG-20069

Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoErrors in QSqlDriver::handle examples
artoka [Tue, 1 Nov 2011 12:47:17 +0000 (13:47 +0100)]
Errors in QSqlDriver::handle examples

In the examples the const char* variable was compared
to QString with "==" operator which doesn't work. Changed
the comparison to use qstrcmp - method.

Task-number: QTBUG-20089

Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoQGLColormap example was invalid
artoka [Tue, 1 Nov 2011 12:47:17 +0000 (13:47 +0100)]
QGLColormap example was invalid

QGLColormap example missed int argc and char *argv[] from
main - method. Filling the QGLColormap with for - loop
was not working because of the 0 - size. Added arguments
to main - method and changed the filling so that
for-loop uses size of 256.

Task-number: QTBUG-3563

Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoQPointer made no mention of QWeakPointer
artoka [Tue, 1 Nov 2011 12:47:16 +0000 (13:47 +0100)]
QPointer made no mention of QWeakPointer

QPointer didn't mention QWeakPointer although those are
"related" to each other. Added link to "see also" section.

Task-number: QTBUG-20721

Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoInvalid links to http://developer.symbian.org
artoka [Tue, 1 Nov 2011 12:47:15 +0000 (13:47 +0100)]
Invalid links to http://developer.symbian.org

Fixed "SBSv2" and "Installing qt for the Symbian platform"
links from the installation.qdoc. Fixed platform security
link from the external-resources.qdoc.

Task-numbers: QTBUG-18313, QTBUG-18313, QTBUG-11312

Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoQNetworkDiskCache documentation missed information
artoka [Tue, 1 Nov 2011 12:47:14 +0000 (13:47 +0100)]
QNetworkDiskCache documentation missed information

Documentation didn't mention which unit (B,kB,MB) is used
in setMaximumCacheSize and maximumCacheSize. Added unit to
be bytes.

Task-number: QTBUG-15562

Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoQStyleSheet example used a property that is hidden.
artoka [Tue, 1 Nov 2011 12:47:14 +0000 (13:47 +0100)]
QStyleSheet example used a property that is hidden.

In the QStyleSheet documentation an example for boolean used QDialog {etch-disabled-text:1} property that is undocumented.
Changed the property to QDialogButtonBox{ dialogbuttonbox-buttons-have-icons: 1; } that is documented.

Task-number: QTBUG-11489

Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoQList document referenced to non existing function
artoka [Tue, 1 Nov 2011 12:47:13 +0000 (13:47 +0100)]
QList document referenced to non existing function

QList documentation introduces a QStringList-class and states that it has function: QStringList::find. Function does not exist.
Changed so that the mention of the QStringList::find-function is removed from the documentation.

Task-number: QTBUG-16164

Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoQXmlQuery::bindVariable documentation bug
artoka [Tue, 1 Nov 2011 12:47:12 +0000 (13:47 +0100)]
QXmlQuery::bindVariable documentation bug

Second code example in the documentation stated that the setQuery-method should be called before bindVariable-method.
Changed so that bindVariable-method is called first and then the setQuery-method as it should be.

Task-number: QTBUG-17025

Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoFix multiple typos in QLineF documentation.
artoka [Tue, 1 Nov 2011 12:47:11 +0000 (13:47 +0100)]
Fix multiple typos in QLineF documentation.

QLineF::angleTo, QLineF::setLength(), QLineF::dx() and QLineF::dy()
were missing detailed information

QLineF::angleTo - method returns the angle of two lines compared to
each other. Documentation stated that the return value is in degrees.
This fix adds specific information that the return value (angle)
is returned in _positive_ degrees. setLength()-method missed
information whether the angle is also changed if the given length
is negative. Added mention that angle is also changed. dx() and dy()
didn't mention whether the return value is negative or positive.
Added mention that positive if p2()>=p1() else negative.

Task-numbers: QTBUG-14759, QTBUG-14756, QTBUG-14677

Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoQmake project file docs lacked information.
artoka [Tue, 1 Nov 2011 12:47:11 +0000 (13:47 +0100)]
Qmake project file docs lacked information.

The qmake project files documentation lacked information about "*="-operator usage. Added couple of links pointing to
the qmake advanced usage - page where "*="-usage is explained.

Task-number: QTBUG-9675

Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoDocumentation error in SSL document
artoka [Tue, 1 Nov 2011 12:47:10 +0000 (13:47 +0100)]
Documentation error in SSL document

The order of setting environment variable OPENSSL_LIBS and configure was wrong. OPENSSL_LIBS is now instructed to be set first before configure.

Task-number: QTBUG-14521

Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoFix multiple typos in documentation.
artoka [Tue, 1 Nov 2011 12:47:09 +0000 (13:47 +0100)]
Fix multiple typos in documentation.

Link typo in the forum nokia icon article. Typo in
the Symbian qt introduction document. Typos in the
Diagram Scene example documentation.

The link url was ending with a slash character in the icon
article. Slash characted removed. In the symbian introduction
doc there was a missing "p" character in the environment
variables listing (QT_SIS_OPTIONS). There was 6 typos
in the Diagram Scene example documentation.

Task-numbers: QTBUG-13983, QTBUG-11820, QTBUG-14732

Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoFix QFont related compilation errors on Mac OSX Carbon
Samuli Piippo [Tue, 1 Nov 2011 12:51:22 +0000 (13:51 +0100)]
Fix QFont related compilation errors on Mac OSX Carbon

Task-number: QTBUG-22318

Merge-request: 1434
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
10 years agoFix for QVector::toList - code example documentation.
artoka [Tue, 1 Nov 2011 12:47:09 +0000 (13:47 +0100)]
Fix for QVector::toList - code example documentation.

Code example in the documentation used QString values in QVector<double>.

Task-number: QTBUG-21067

Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Tue, 1 Nov 2011 12:46:45 +0000 (22:46 +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:
  Supporting parallel pointer event delivery on Symbian
  Removed unix specific mmap use from QString benchmark

10 years agoMerge remote-tracking branch 'qt/4.8'
Pasi Pentikainen [Tue, 1 Nov 2011 12:30:47 +0000 (14:30 +0200)]
Merge remote-tracking branch 'qt/4.8'

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Tue, 1 Nov 2011 04:02:20 +0000 (14:02 +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 documentation: correct enum name

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 [Mon, 31 Oct 2011 22:35:52 +0000 (08:35 +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:
  Symbian - disable memory mapping in QNetworkDiskCache
  Adding items to a view with no delegate crashes.
  Fix security problem on webpage due to bad JS
  Accepting predicted text using hardware keyboard replaces unwanted part
  Doc: adding link to the Qt Quick Components for Symbian page.

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Mon, 31 Oct 2011 16:18:51 +0000 (02:18 +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:
  Updated changelog for Qt 4.8

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Mon, 31 Oct 2011 16:10:21 +0000 (02:10 +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:
  Supporting parallel pointer event delivery on Symbian

10 years agoSupporting parallel pointer event delivery on Symbian
mread [Tue, 7 Jun 2011 12:52:19 +0000 (13:52 +0100)]
Supporting parallel pointer event delivery on Symbian

Symbian's wserv and cone are introducing APIs to send apps position
updates for multiple pointers in one message.

The change consists of a refactoring of processTouchEvent() to handle
multiple pointer changes, enabling receipt of the new messages, and
handling of the new messages.

Task-number: QTBUG-18286
Reviewed-by: Shane Kearns
10 years agoSSL documentation: correct enum name
Peter Hartmann [Mon, 31 Oct 2011 15:49:46 +0000 (16:49 +0100)]
SSL documentation: correct enum name

10 years agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Liang Qi [Mon, 31 Oct 2011 14:03:00 +0000 (15:03 +0100)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/mainpage.qdoc
doc/src/platforms/supported-platforms.qdoc
doc/src/qt-webpages.qdoc
src/network/access/qnetworkdiskcache.cpp

10 years agoUpdated changelog for Qt 4.8
Jo Asplin [Mon, 31 Oct 2011 13:43:10 +0000 (14:43 +0100)]
Updated changelog for Qt 4.8

Task-number: QTQAINFRA-226

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 31 Oct 2011 10:28:36 +0000 (20: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:
  Fix QFile::copy() returning false but error() being NoError

10 years agoFix QFile::copy() returning false but error() being NoError
xiechyong [Fri, 28 Oct 2011 04:07:26 +0000 (21:07 -0700)]
Fix QFile::copy() returning false but error() being NoError

Calling close() after setError() will unset the error.

Task-number: QTBUG-11982
Merge-request: 2712
Reviewed-by: ossi
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Fri, 28 Oct 2011 15:31:56 +0000 (01:31 +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 configuration parameter change for linux building
  Improve patch_capabilities script output.
  Fix QtSql autotest server addresses
  Update SQLite version number in legal document
  Update SQLite version mentioned in licence document
  Symbian Linuxification building case changes
  Fix FTP example to handle failure to open network session
  Use QBasicAtomicInt as a static variable
  FTP - fix interoperability issues with SIZE command
  QS60StyleAnimation exception safety
  Catch potential throw in ~QSymbianControl
  Fixed access to null threadData in ~QObjectPrivate
  Fix the build for makefile build system of Symbian
  Symbian - fix compile error when default configured

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Fri, 28 Oct 2011 11:38:50 +0000 (21:38 +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:
  Removed unix specific mmap use from QString benchmark

10 years agoRemoved unix specific mmap use from QString benchmark
mread [Fri, 28 Oct 2011 11:23:32 +0000 (12:23 +0100)]
Removed unix specific mmap use from QString benchmark

The mmap flags MAP_ANONYMOUS and MAP_POPULATE are unix specific, and
are not supported by Symbian's posix headers. The benchmark code using
them, already unix-only, now is removed from Symbian builds.

Task-number: QTBUG-18197
Reviewed-by: Shane Kearns
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 28 Oct 2011 10:32:43 +0000 (20:32 +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 - disable memory mapping in QNetworkDiskCache

10 years agoSymbian - disable memory mapping in QNetworkDiskCache
Shane Kearns [Fri, 28 Oct 2011 10:20:07 +0000 (11:20 +0100)]
Symbian - disable memory mapping in QNetworkDiskCache

The implementation of memory mapped files in Open C requires
munmap to be called from the same thread as mmap. As the
QIODevice can be handed off to another thread, this breaks
application code that works on other operating systems.

Task-number: QT-5309
Reviewed-by: Tadaaki Matsumoto
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integ...
Qt Continuous Integration System [Fri, 28 Oct 2011 09:43:24 +0000 (19:43 +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:
  Revert "Fixed deployment problems with MSVC 2005 and 2008 SP1"

10 years agoRevert "Fixed deployment problems with MSVC 2005 and 2008 SP1"
Joerg Bornemann [Fri, 28 Oct 2011 09:32:26 +0000 (11:32 +0200)]
Revert "Fixed deployment problems with MSVC 2005 and 2008 SP1"

This reverts commit ec41d27565ed0b4d517f30563def135d0b4c7a8d.

Adding the define _BIND_TO_CURRENT_VCLIBS_VERSION led to linking problems
for several people. Also, this leads to problems when using the binary
installer for development.

Reviewed-by: Andy Shaw <andy.shaw@digia.com>
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Fri, 28 Oct 2011 03:34:36 +0000 (13:34 +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:
  QIODevice - disallow setTextMode when not open

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 27 Oct 2011 21:09:47 +0000 (07: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:
  Harfbuzz shaper: kerning adjustment does not need to be modified by RTL

10 years agoHarfbuzz shaper: kerning adjustment does not need to be modified by RTL
John Tapsell [Thu, 27 Oct 2011 18:52:03 +0000 (20:52 +0200)]
Harfbuzz shaper: kerning adjustment does not need to be modified by RTL

Merge-request: 1435
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoQIODevice - disallow setTextMode when not open
Shane Kearns [Thu, 20 Oct 2011 15:55:02 +0000 (16:55 +0100)]
QIODevice - disallow setTextMode when not open

Calling setTextMode() before open() would make the device appear to be
already open and cause later errors.
Added a qWarning and documentation update to prevent this API misuse

Task-number: QTBUG-20905
Change-Id: I2e06cd8e79f4afcf27417ac0eae6ebef980a17aa
Reviewed-by: Thiago Macieira (Intel) <thiago.macieira@intel.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
(cherry picked from commit 29c30a20bab4c4ea892b95c08c71bb5f136bb82c)

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
Qt Continuous Integration System [Thu, 27 Oct 2011 10:35:53 +0000 (20:35 +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:
  Fix security problem on webpage due to bad JS
  Accepting predicted text using hardware keyboard replaces unwanted part
  Doc: adding link to the Qt Quick Components for Symbian page.

10 years agoMerge remote-tracking branch 'upstream/4.7' into 4.7
Sergio Ahumada [Thu, 27 Oct 2011 10:29:33 +0000 (12:29 +0200)]
Merge remote-tracking branch 'upstream/4.7' into 4.7

Conflicts:
src/gui/inputmethod/qcoefepinputcontext_s60.cpp

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Thu, 27 Oct 2011 09:49:24 +0000 (19: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:
  Fix possible crash in glyph cache when deleting and creating contexts

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 27 Oct 2011 05:51:05 +0000 (15:51 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Adding items to a view with no delegate crashes.

10 years agoAdding items to a view with no delegate crashes.
Martin Jones [Thu, 27 Oct 2011 05:22:45 +0000 (15:22 +1000)]
Adding items to a view with no delegate crashes.

If there is no delegate then clear state and return.

Change-Id: I786b9bc4018706797056fbd1ad25d25663102707
Task-number: QTBUG-22379
Reviewed-by: Andrew den Exter
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Wed, 26 Oct 2011 19:51:47 +0000 (05:51 +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 security issue on website due to bad JS.
  Doc: adding link to the Qt Quick Components for Symbian page.

10 years agoMerge remote-tracking branch 'qt-doc-review/master'
Casper van Donderen [Wed, 26 Oct 2011 14:16:00 +0000 (16:16 +0200)]
Merge remote-tracking branch 'qt-doc-review/master'

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Wed, 26 Oct 2011 14:02:01 +0000 (00:02 +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

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Wed, 26 Oct 2011 12:48:18 +0000 (22:48 +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 configuration parameter change for linux building

10 years agoSymbian configuration parameter change for linux building
Pasi Pentikainen [Tue, 25 Oct 2011 14:50:02 +0000 (17:50 +0300)]
Symbian configuration parameter change for linux building

Symbian configuration changed to use opengl es2 parameter which
works both with configure.exe (symbian windows building) and
configure sh-script (symbian linux building).

Reviewed-by: Miikka Heikkinen
10 years agoUpdate changelog for Qt 4.8
Mark Brand [Wed, 26 Oct 2011 10:59:31 +0000 (12:59 +0200)]
Update changelog for Qt 4.8

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Wed, 26 Oct 2011 09:02:01 +0000 (19:02 +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: (29 commits)
  Fix possible crash in glyph cache when deleting and creating contexts
  Added Lithuanian translation of Qt.
  Remove idc from mingw build.
  Update changelog for Qt 4.8
  Update changelog for Qt 4.8
  Add the ability to enable various SSL bug workarounds.
  Fix performance regression on Mac OS X when creating/destroying QMutex
  Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4
  Symbian - Change working directory of applications in ROM
  QtGui def file update
  Show SaxBookmarks as maximized in Symbian
  Early construction of status pane and softkeys for Symbian boosted apps
  Maximized dialogs are incorrectly positioned after layout switch
  Fix bug in QStringToBSTR.
  Fix regression in ListView
  Fixed resource leak when setting QProgressBar style sheet
  Fix regression introduced by 1bfef526ef3d1deb7cf0f11dc1880f33937a85ac
  don't lock the global mutex if there is nothing to protect
  fix possible race conditions
  simplify the code by using QSystemLibrary a bit smarter
  ...

10 years agoMerge remote-tracking branch 'qt-mainline/4.8'
aavit [Wed, 26 Oct 2011 08:58:13 +0000 (10:58 +0200)]
Merge remote-tracking branch 'qt-mainline/4.8'

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 [Wed, 26 Oct 2011 07:52:38 +0000 (17:52 +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:
  Doc: Fix example code
  Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504
  Accepting predicted text using hardware keyboard replaces unwanted part
  Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4
  Workaround to VideoCore III scissor bug.
  Fix to QGLWidget crash
  Update def files
  Fix crash on exit when overriding signal handlers in states.
  Typo fix
  Add new signals to indicate GPU resource usage.
  symbian - search drives for translation files
  symbian - search drives for translation files
  Cannot flick to the end of a horizontal list view width LayoutMirroring
  Backport more imports directory caching changes.
  Symbian - fix deleteLater not working from RunL
  Fix more test DEPLOYMENT statements for Symbian
  Fix deployment for declarative tests, examples on Symbian
  Fix StrictlyEnforceRange with snapOneItem/Row and header behavior, pt 2
  Backport imports directory caching performance optimization

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Wed, 26 Oct 2011 07:43:02 +0000 (17:43 +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:
  Improve patch_capabilities script output.

10 years agoImprove patch_capabilities script output.
Miikka Heikkinen [Tue, 25 Oct 2011 13:37:45 +0000 (16:37 +0300)]
Improve patch_capabilities script output.

Now prefix any actual patching errors with "ERROR:" so that they will
be obvious also in QtCreator builds.

Task-number: QTBUG-22267
Reviewed-by: Sami Merila
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 25 Oct 2011 15:20:20 +0000 (01:20 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
  Fix QtSql autotest server addresses

10 years agoFix possible crash in glyph cache when deleting and creating contexts
Eskil Abrahamsen Blomfeldt [Tue, 25 Oct 2011 13:58:49 +0000 (15:58 +0200)]
Fix possible crash in glyph cache when deleting and creating contexts

The freeResource(), used in the glyph cache as a notifier of when the
owner context of the cache disappears, is never called if the context
is in a group with other contexts that share its resources. This
implements a second notifier function instead which can be used to
invalidate the glyph cache when its context is destroyed.

Task-number: QTBUG-22324
Reviewed-by: Samuel
10 years agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Liang Qi [Tue, 25 Oct 2011 12:56:51 +0000 (14:56 +0200)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/corelib/kernel/qeventdispatcher_symbian.cpp
src/declarative/qml/qdeclarativetypeloader.cpp
src/imports/gestures/gestures.pro
src/imports/particles/particles.pro
src/opengl/qgl.cpp
src/opengl/qgl_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro
tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro
tests/auto/qaudioinput/qaudioinput.pro
tests/auto/qaudiooutput/qaudiooutput.pro
tests/auto/qchar/qchar.pro
tests/auto/qclipboard/test/test.pro
tests/auto/qsound/qsound.pro

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
Qt Continuous Integration System [Tue, 25 Oct 2011 11:34:02 +0000 (21: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 bug in QStringToBSTR.
  Fix regression in ListView
  Fixed resource leak when setting QProgressBar style sheet
  Fix regression introduced by 1bfef526ef3d1deb7cf0f11dc1880f33937a85ac
  don't lock the global mutex if there is nothing to protect
  fix possible race conditions
  simplify the code by using QSystemLibrary a bit smarter
  use QSystemLibrary::resolve() instead of GetProcAddress() win API calls
  nativewifi bearer plugin: prefer DLL Safe Search mode
  make QElapsedTimer use QSystemLibrary on win
  QTBUG-21058: Fix for possible crashes in QTextControl::setCursorWidth()
  Fix bug in QGraphicsItem::isVisibleTo().
  nano-opts, styling fixes
  don't assume the PATH envvar is latin1-encoded
  Set missing flags in the option when rendering QTreeView drag pixmap
  Fix typo when updating accessible treeview selection.

10 years agoFix QtSql autotest server addresses
Honglei Zhang [Tue, 25 Oct 2011 10:16:30 +0000 (13:16 +0300)]
Fix QtSql autotest server addresses

Fix QtSql autotest server addresses. Old server which are located in
Oslo shall not be used. New servers are located in Brisbane.

Reviewed-by: Trust Me
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 25 Oct 2011 10:13:14 +0000 (20:13 +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:
  Update SQLite version number in legal document

10 years agoUpdate SQLite version number in legal document
Honglei Zhang [Tue, 25 Oct 2011 10:10:06 +0000 (13:10 +0300)]
Update SQLite version number in legal document

SQLite version in Qt 4.8 is upcated to 3.7.7.1.

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 [Tue, 25 Oct 2011 01:30:08 +0000 (11:30 +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

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Mon, 24 Oct 2011 23:09:32 +0000 (09:09 +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:
  Update changelog for Qt 4.8

10 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Mon, 24 Oct 2011 23:00:12 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 24 Oct 2011 19:45:23 +0000 (05:45 +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:
  Added Lithuanian translation of Qt.
  Remove idc from mingw build.

10 years agoAdded Lithuanian translation of Qt.
Rimas Kudelis [Mon, 24 Oct 2011 17:34:54 +0000 (19:34 +0200)]
Added Lithuanian translation of Qt.

Merge-request: 2703
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoRemove idc from mingw build.
Markku Heikkila [Mon, 24 Oct 2011 17:28:45 +0000 (19:28 +0200)]
Remove idc from mingw build.

Mingw tool chain does not support com/idl so remove it.

Task-number: QTBUG-22260
Merge-request: 2710
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoUpdate changelog for Qt 4.8
miniak [Mon, 24 Oct 2011 17:25:51 +0000 (19:25 +0200)]
Update changelog for Qt 4.8

MR #1272: Fix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)
MR #2616: QProgressBar: transparent background on Windows Vista (partId: PP_BAR -> PP_TRANSPARENTBAR)
MR #2526: Fix comctl32 v6 dependency generation in Visual Studio 2005 and higher
MR #2519: fix qFadeEffect windowOpacity issue on Windows
MR #769: qt_reg_winclass(): use RegisterClassEx() to load the small IDI_ICON1 icon correctly

Merge-request: 2708
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Mon, 24 Oct 2011 14:06:57 +0000 (00:06 +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

10 years agoUpdate changelog for Qt 4.8
Sinan Tanilkan [Mon, 24 Oct 2011 13:47:12 +0000 (15:47 +0200)]
Update changelog for Qt 4.8

Change recieved from Aurélien Gâteau

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Mon, 24 Oct 2011 08:25:11 +0000 (18:25 +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:
  Update SQLite version mentioned in licence document

10 years agoUpdate SQLite version mentioned in licence document
Honglei Zhang [Mon, 24 Oct 2011 08:20:11 +0000 (11:20 +0300)]
Update SQLite version mentioned in licence document

SQLite version has been updated to 3.7.7.1 since Qt 4.8. The version
number is corrected in licence document for 3rd party components.

Reviewed-by: Trust Me
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Sat, 22 Oct 2011 23:09:29 +0000 (09:09 +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:
  Add the ability to enable various SSL bug workarounds.
  Fix performance regression on Mac OS X when creating/destroying QMutex
  Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4
  Symbian - Change working directory of applications in ROM
  QtGui def file update
  Show SaxBookmarks as maximized in Symbian
  Early construction of status pane and softkeys for Symbian boosted apps
  Maximized dialogs are incorrectly positioned after layout switch

10 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Sat, 22 Oct 2011 23:00:13 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Sat, 22 Oct 2011 02:13:41 +0000 (12:13 +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:
  Add the ability to enable various SSL bug workarounds.
  Fix performance regression on Mac OS X when creating/destroying QMutex

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integration
Qt Continuous Integration System [Fri, 21 Oct 2011 21:22:24 +0000 (07:22 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
  Doc: Fix example code

10 years agoDoc: Fix example code
Sergio Ahumada [Fri, 21 Oct 2011 21:15:05 +0000 (23:15 +0200)]
Doc: Fix example code

Task-number: QTWEBSITE-281

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Fri, 21 Oct 2011 20:31:35 +0000 (06:31 +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: the png_handle_cHRM crash bug in bundled libpng 1.5.4

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Fri, 21 Oct 2011 16:24:40 +0000 (02: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:
  Symbian - Change working directory of applications in ROM
  QtGui def file update
  Show SaxBookmarks as maximized in Symbian
  Early construction of status pane and softkeys for Symbian boosted apps
  Maximized dialogs are incorrectly positioned after layout switch

10 years agoMerge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Fri, 21 Oct 2011 14:44:38 +0000 (00:44 +1000)]
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team

* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
  Fix security problem on webpage due to bad JS
  Accepting predicted text using hardware keyboard replaces unwanted part

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 21 Oct 2011 11:48:39 +0000 (21: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:
  Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504

10 years agoRegression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504
Sami Merila [Fri, 21 Oct 2011 11:40:28 +0000 (14:40 +0300)]
Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504

After 2be143ebb5246bb2f9b674bb09d23df5b2b6c504, if user opts to spell
a word him/herself instead of using the suggested word list, the
result is incorrect. The existing preedit string is committed,
then cursor is moved to the beginning and user written word is
added. E.g. user writes 'tadaa' then selects to spell it again and
writes 'radar', in editor there is 'radartadaa'.

Regression is caused due to storing the cursor pointer even in cases
where there is no stored preedit string.

Task-number: QTBUG-22147
Reviewed-by: Miikka Heikkinen
10 years agoAdd the ability to enable various SSL bug workarounds.
Richard Moore [Wed, 19 Oct 2011 09:40:57 +0000 (11:40 +0200)]
Add the ability to enable various SSL bug workarounds.

There are lots of buggy SSL servers around and to connect to them you
need to disable various features. This commit adds the ability to
disable the SSL ticket extension, the ability to disable the insertion
of empty fragments, and the ability to disable compression.

Task-number: QTBUG-21906

Change-Id: I3e1d0347a46e9030b889bbf15b2aad19b8513b73
Merge-request: 68
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
(cherry picked from commit 78d02e93aca5325fc5be9bfd275862795207abaa)

(commit was cherry-picked from Qt 5 to 4.8 after agreeing with the
author because the merge request was filed against Qt 5.)

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Fri, 21 Oct 2011 10:25:57 +0000 (20:25 +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:
  Fix security issue on website due to bad JS.

10 years agoMerge remote-tracking branch 'mainline/4.8'
Casper van Donderen [Fri, 21 Oct 2011 10:23:24 +0000 (12:23 +0200)]
Merge remote-tracking branch 'mainline/4.8'