qt:qt.git
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Thu, 1 Sep 2011 13:24:34 +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: (26 commits)
  Add a brief to all demos and examples for manifest
  QSslCertificate: also check common name for blacklisted certificates
  QSslCertificate: regenerate blacklisted certificates, they were expired
  don't crash when destroying the shortcuts
  Doc: added since tag to QDateTime::msecsTo
  QSslCertificate: blacklist fraudulent *.google.com
  QDeclarative::hasActiveFocus should return false for hidden items
  FocusScope's focusItem must always be a descendent
  Disable activeqt on win32-g++ (it doesn't build).
  fix warning
  remove unused functions
  Make the DBus timeout configurable in QDBusAbstractInterface.
  Fix a typo in qt-conf docs.
  Revert "Fix build with the Clang compiler"
  Added missing no_include_pwd check
  Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'
  Fix build with the Clang compiler
  Change spacing of title in offline style.
  Add support for rawFonts loaded from data in FaceId
  examples: fix compilation with namespaced Qt.
  ...

10 years agoAdd a brief to all demos and examples for manifest
Casper van Donderen [Thu, 1 Sep 2011 13:14:42 +0000 (15:14 +0200)]
Add a brief to all demos and examples for manifest

Conflicts:

doc/src/examples/broadcastreceiver.qdoc
doc/src/examples/combowidgetmapper.qdoc
doc/src/examples/dragdroprobot.qdoc
doc/src/examples/elasticnodes.qdoc
doc/src/examples/fademessage.qdoc
doc/src/examples/fingerpaint.qdoc
doc/src/examples/portedasteroids.qdoc
doc/src/examples/portedcanvas.qdoc
doc/src/examples/qml-examples.qdoc
doc/src/examples/recipes.qdoc
doc/src/examples/rsslisting.qdoc
doc/src/examples/schema.qdoc

10 years agoMerge remote branch 'mainline/4.8'
Casper van Donderen [Wed, 31 Aug 2011 08:22:19 +0000 (10:22 +0200)]
Merge remote branch 'mainline/4.8'

Conflicts:
tools/qdoc3/cppcodemarker.cpp
tools/qdoc3/node.cpp

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Wed, 31 Aug 2011 01:46:11 +0000 (11:46 +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:
  don't crash when destroying the shortcuts
  Disable activeqt on win32-g++ (it doesn't build).
  fix warning
  remove unused functions
  Make the DBus timeout configurable in QDBusAbstractInterface.
  Fix a typo in qt-conf docs.
  Revert "Fix build with the Clang compiler"
  Added missing no_include_pwd check
  Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'
  Fix build with the Clang compiler
  Change spacing of title in offline style.
  Add support for rawFonts loaded from data in FaceId
  examples: fix compilation with namespaced Qt.
  Russian translation update
  Update Japanese translations for Qt 4.8.
  directfb: Include directfbgl.h directly
  tests: fix QNetworkProxyFactory test
  don't detach until the list is going to be modified
  optimize QList::removeAll()

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Tue, 30 Aug 2011 21:10:39 +0000 (07:10 +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:
  QSslCertificate: also check common name for blacklisted certificates
  QSslCertificate: regenerate blacklisted certificates, they were expired
  QSslCertificate: blacklist fraudulent *.google.com

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integ...
Qt Continuous Integration System [Tue, 30 Aug 2011 12:45:56 +0000 (22:45 +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:
  Doc: added since tag to QDateTime::msecsTo

10 years agoQSslCertificate: also check common name for blacklisted certificates
Peter Hartmann [Tue, 30 Aug 2011 11:10:06 +0000 (13:10 +0200)]
QSslCertificate: also check common name for blacklisted certificates

... to reduce the possibility of blacklisting valid certificates that
happen to have the same serial number as a blacklisted one, which is
unlikely, but possible.

Reviewed-by: Richard J. Moore <rich@kde.org>
10 years agoQSslCertificate: regenerate blacklisted certificates, they were expired
Peter Hartmann [Tue, 30 Aug 2011 10:24:30 +0000 (12:24 +0200)]
QSslCertificate: regenerate blacklisted certificates, they were expired

regenerating blacklisted certificates with same serial number and
common name, but longer validity: Now they are valid for 10 years.

10 years agodon't crash when destroying the shortcuts
Konstantin Ritt [Tue, 30 Aug 2011 08:34:31 +0000 (12:34 +0400)]
don't crash when destroying the shortcuts

as shortcutDestroyed(..) modifies the shortcuts list.
disconnect from shortcutDestroyed() first, or operate on a detach()-ed list

this was uncovered by QList::removaAll() optimization patch.

10 years agoDoc: added since tag to QDateTime::msecsTo
Joerg Bornemann [Tue, 30 Aug 2011 09:43:17 +0000 (11:43 +0200)]
Doc: added since tag to QDateTime::msecsTo

10 years agoQSslCertificate: blacklist fraudulent *.google.com
Peter Hartmann [Tue, 30 Aug 2011 09:33:01 +0000 (11:33 +0200)]
QSslCertificate: blacklist fraudulent *.google.com

blacklist the leaf certificate for now. There might well be more fake
certificates in the wild, for that either the Diginotar.nl root cert
needs to be disabled on the system or OCSP would need to be enabled
(not supported by Qt yet).

Reviewed-by: Richard J. Moore <rich@kde.org>
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Tue, 30 Aug 2011 09:33:03 +0000 (19:33 +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: (193 commits)
  qdoc3: Updates to qdoc to print error message in ALL CAPS
  Fix conversion of QAbstractItemModel::rowsMoved() parameters
  Do not unconditionally use pkg-config in .pro files
  Updated WebKit to dda59e50379214c098f365a39c4d64b39ced427e
  Revert "Don't second-guess the "engine"; call cleanPath on absolutePaths"
  Revert "In 4.7 QFileInfo::absolute(File)Path returned clean paths"
  In 4.7 QFileInfo::absolute(File)Path returned clean paths
  Porting the QTBUG-21084 fix to 4.7.4
  ret is an "internal" path, no need to re-process it
  We prefer capitalized drive letters, make it so sooner
  Don't second-guess the "engine"; call cleanPath on absolutePaths
  Compare non-canonical paths before falling back on expensive computation
  Fix QDir::operator==(const QDir &) const
  Fixed use of deleted object in XmlPatterns EvaluationCache
  Check if bridge plugin vector is still valid.
  Updated WebKit to 85d4df147ac7b239497b05979a51fd6fde7580fd
  Updated WebKit to 836fa24be73978fb292e954abb151fb46b1d97e0
  uikit: get rid of the "min 30fps" for event handling.
  uikit: update README
  Doc: Added a note to Code Editor example docs
  ...

10 years agoMerge branch '4.8'
Casper van Donderen [Tue, 30 Aug 2011 08:44:54 +0000 (10:44 +0200)]
Merge branch '4.8'

Conflicts:
doc/src/declarative/righttoleft.qdoc

10 years agoMerge remote branch 'mainline/4.8'
Casper van Donderen [Tue, 30 Aug 2011 08:40:03 +0000 (10:40 +0200)]
Merge remote branch 'mainline/4.8'

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Tue, 30 Aug 2011 08:18:02 +0000 (18:18 +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:
  QDeclarative::hasActiveFocus should return false for hidden items
  FocusScope's focusItem must always be a descendent

10 years agoQDeclarative::hasActiveFocus should return false for hidden items
Alan Alpert [Tue, 30 Aug 2011 08:03:32 +0000 (18:03 +1000)]
QDeclarative::hasActiveFocus should return false for hidden items

In graphics view you can be the focus item without being visible,
but you still won't receive events. QML should hide these distinctions.

Task-number: QTBUG-21045

10 years agoFocusScope's focusItem must always be a descendent
Alan Alpert [Mon, 15 Aug 2011 03:44:44 +0000 (13:44 +1000)]
FocusScope's focusItem must always be a descendent

Task-number: QTBUG-20699
Reviewed-by: Michael Brasser
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
Qt Continuous Integration System [Mon, 29 Aug 2011 21:19:18 +0000 (07:19 +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:
  Do not unconditionally use pkg-config in .pro files
  Updated WebKit to dda59e50379214c098f365a39c4d64b39ced427e
  Updated WebKit to 85d4df147ac7b239497b05979a51fd6fde7580fd
  Updated WebKit to 836fa24be73978fb292e954abb151fb46b1d97e0
  Updated WebKit to 4277f8277b1daf3ec33c996f5a760ccd1113af4b
  Updated WebKit to 8ed79cb10ca72b5d240beae674a7932963cbd007
  Updated WebKit to 66b76cdb8ef823f27a8229c5cae2d35e7f2d3c59

10 years agoMerge remote-tracking branch 'review/master'
Sergio Ahumada [Mon, 29 Aug 2011 19:09:25 +0000 (21:09 +0200)]
Merge remote-tracking branch 'review/master'

10 years agoqdoc3: Updates to qdoc to print error message in ALL CAPS
Martin Smith [Mon, 29 Aug 2011 13:43:56 +0000 (15:43 +0200)]
qdoc3: Updates to qdoc to print error message in ALL CAPS

when the path argument for an \example command
refers to a directory that does not exist.

Task-number:  QTBUG-21165

10 years agoMerge remote-tracking branch 'upstream/4.8'
Sergio Ahumada [Mon, 29 Aug 2011 08:51:04 +0000 (10:51 +0200)]
Merge remote-tracking branch 'upstream/4.8'

Conflicts:
tools/qdoc3/cppcodemarker.cpp

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Mon, 29 Aug 2011 07:53:55 +0000 (17:53 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  Fix conversion of QAbstractItemModel::rowsMoved() parameters

10 years agoFix conversion of QAbstractItemModel::rowsMoved() parameters
Bea Lam [Mon, 29 Aug 2011 06:35:23 +0000 (16:35 +1000)]
Fix conversion of QAbstractItemModel::rowsMoved() parameters

VisualDataModel was emitting itemsMoved() signal with incorrect
"to" value when multiple items were moved forwards.

Reviewed-by: Martin Jones
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Sun, 28 Aug 2011 15:03:37 +0000 (01:03 +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 graphics memory quota for Symbian applications
  Fix warning about missing qs60keycapture_p.h header in gui
  Reimplement MR1271 over coda patch
  Fixed Symbian memory leak in utcToLocal(QDate &, QTime &)
  Fix bad merge on a couple of xml examples
  DEF file freeze

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 [Sun, 28 Aug 2011 08:53:38 +0000 (18:53 +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:
  Porting the QTBUG-21084 fix to 4.7.4

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Sun, 28 Aug 2011 02:18:40 +0000 (12: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:
  uikit: get rid of the "min 30fps" for event handling.
  uikit: update README
  Fix QGLGlyphCache for Open GL ES (1).
  Revert "Include trailing space width in RTL text line width"
  Fix justification of RTL text
  uikit: fix examples to no longer ship the custom fonts
  Use CoreText for font rendering on uikit.

10 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Sat, 27 Aug 2011 16:04:06 +0000 (02:04 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
Qt Continuous Integration System [Sat, 27 Aug 2011 14:14:32 +0000 (00:14 +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:
  Check if bridge plugin vector is still valid.
  QWindowsStyle: fix bug in eventFilter on KeyPressed event with alt pressed: incorrect work with list

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Sat, 27 Aug 2011 08:08:21 +0000 (18:08 +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: (21 commits)
  Revert "Don't second-guess the "engine"; call cleanPath on absolutePaths"
  Revert "In 4.7 QFileInfo::absolute(File)Path returned clean paths"
  In 4.7 QFileInfo::absolute(File)Path returned clean paths
  ret is an "internal" path, no need to re-process it
  We prefer capitalized drive letters, make it so sooner
  Don't second-guess the "engine"; call cleanPath on absolutePaths
  Compare non-canonical paths before falling back on expensive computation
  Fix QDir::operator==(const QDir &) const
  Off-by-one error in assert condition...
  Leftovers from 401722ef9e6fe79bd41f9d5f79668f5c4997c8e6
  Merged fileTemplate test with QTBUG_4796
  Cleanup code: removing empty stubs
  Fix QTemporaryFile regressions and new found issues
  Use "native paths" on POSIX platforms as well
  Cleanup #includes
  Add output on test failure
  Atomic implementation of create file and obtain handle for Win/Symbian
  Minimize encoding conversions when generating unique file name
  Use QStringBuilder when copying template for modification
  Make Symbian follow Windows code in temporary path generation
  ...

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team
Qt Continuous Integration System [Sat, 27 Aug 2011 02:57:03 +0000 (12:57 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team: (246 commits)
  Do not unconditionally use pkg-config in .pro files
  Updated WebKit to dda59e50379214c098f365a39c4d64b39ced427e
  Updated WebKit to 85d4df147ac7b239497b05979a51fd6fde7580fd
  Updated WebKit to 836fa24be73978fb292e954abb151fb46b1d97e0
  Updated WebKit to 4277f8277b1daf3ec33c996f5a760ccd1113af4b
  Updated WebKit to 8ed79cb10ca72b5d240beae674a7932963cbd007
  Updated WebKit to 66b76cdb8ef823f27a8229c5cae2d35e7f2d3c59
  uikit: update SDK setting for the simulator
  Add option to compare to different platform in lancelot autotest
  uikit: Use release Qt for simulator, update README
  Automatic closing of input panel on uikit when QML item looses focus.
  Fixed compile error in qwindowsurface_qws.cpp.
  Fixed regression introduced by 5842d19cf3dff37a85c.
  Remove DerivedSources.pro from WebKit.
  Support debuggable in the makefile build system
  QLabel documentation: add warning about sanitizing input
  runonphone: fix failure to terminate
  Fix license headers in new files from coda patch
  runonphone: command line args improperly passed to TRK after CODA patch
  Mark all Symbian debug binaries debuggable by default
  ...

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 [Sat, 27 Aug 2011 01:43:46 +0000 (11:43 +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:
  Fixed use of deleted object in XmlPatterns EvaluationCache
  Crash when creating scroll bar skin graphics on S60 (debug only)
  QS60Style omits drawing theme background in some Symbian SDKs
  Fix for qml1shaderplugin GPU resource handling on Symbian
  Make it easier to select words at the start of a line.
  Doc: Fixing typo
  In landscape mode QComboboBox popup can not be showed completely
  Fix left alignment of native RTL pre-edit text.

10 years agoMerge branch 4.7 into qt-4.8-from-4.7
Sergio Ahumada [Fri, 26 Aug 2011 21:42:57 +0000 (23:42 +0200)]
Merge branch 4.7 into qt-4.8-from-4.7

Conflicts:
doc/src/index.qdoc
src/xmlpatterns/expr/qevaluationcache_p.h

10 years agoDo not unconditionally use pkg-config in .pro files
Rohan McGovern [Thu, 18 Aug 2011 23:03:51 +0000 (09:03 +1000)]
Do not unconditionally use pkg-config in .pro files

Using the first pkg-config in PATH is prone to errors when
cross compiling.  This is a known issue, and `configure' already
avoids using pkg-config for cross compiling (unless -force-pkg-config is
used).  However, there was previously no way for a .pro file to test
whether or not the user had passed -force-pkg-config.

Let !contains(QT_CONFIG, no-pkg-config) be used to test whether or not it
is safe to run pkg-config.

10 years agoUpdated WebKit to dda59e50379214c098f365a39c4d64b39ced427e
Ademar de Souza Reis Jr [Fri, 26 Aug 2011 21:12:05 +0000 (18:12 -0300)]
Updated WebKit to dda59e50379214c098f365a39c4d64b39ced427e

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, 26 Aug 2011 21:06:26 +0000 (07:06 +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:
  Porting the QTBUG-21084 fix to 4.7.4

10 years agoRevert "Don't second-guess the "engine"; call cleanPath on absolutePaths"
João Abecasis [Fri, 26 Aug 2011 15:58:27 +0000 (17:58 +0200)]
Revert "Don't second-guess the "engine"; call cleanPath on absolutePaths"

This reverts commit 07afddbf4bc029f776810381c7317fffa100eb60.

This breaks QDir autotests on windows.

10 years agoRevert "In 4.7 QFileInfo::absolute(File)Path returned clean paths"
João Abecasis [Fri, 26 Aug 2011 15:33:47 +0000 (17:33 +0200)]
Revert "In 4.7 QFileInfo::absolute(File)Path returned clean paths"

This reverts commit 2e32fca2c0f5252864d348df929d9858486763b1.

The fix there is incorrect as it breaks QFileInfo autotests.

10 years agoIn 4.7 QFileInfo::absolute(File)Path returned clean paths
João Abecasis [Fri, 26 Aug 2011 15:09:01 +0000 (17:09 +0200)]
In 4.7 QFileInfo::absolute(File)Path returned clean paths

Let's play nice and keep that "feature".

Task-number: QTBUG-19995

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Fri, 26 Aug 2011 13:17:29 +0000 (23:17 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  Fix memory leak in ListModel custom parser
  Correct documentation of TextInput.PasswordEchoOnEdit.

10 years agoPorting the QTBUG-21084 fix to 4.7.4
mread [Fri, 26 Aug 2011 12:30:53 +0000 (13:30 +0100)]
Porting the QTBUG-21084 fix to 4.7.4

This fixes a memory leak. It's SR1 tagged for 4.7.4.

Task-number: QTBUG-21084
Reviewed-by: Honglei Zhang
10 years agoret is an "internal" path, no need to re-process it
João Abecasis [Fri, 26 Aug 2011 09:01:48 +0000 (11:01 +0200)]
ret is an "internal" path, no need to re-process it

Where "internal" means that it uses Qt's separator '/', regardless of
the native one.

10 years agoWe prefer capitalized drive letters, make it so sooner
João Abecasis [Fri, 26 Aug 2011 09:03:55 +0000 (11:03 +0200)]
We prefer capitalized drive letters, make it so sooner

Reviewed-by: Prasanth Ullattil
10 years agoDon't second-guess the "engine"; call cleanPath on absolutePaths
João Abecasis [Fri, 26 Aug 2011 08:39:52 +0000 (10:39 +0200)]
Don't second-guess the "engine"; call cleanPath on absolutePaths

This ensures there is a single definition of what constitutes an
absolute path in Qt.

Task-number: QTBUG-19995
Reviewed-by: Prasanth Ullattil
10 years agoCompare non-canonical paths before falling back on expensive computation
João Abecasis [Thu, 11 Aug 2011 14:17:40 +0000 (16:17 +0200)]
Compare non-canonical paths before falling back on expensive computation

Reviewed-by: Prasanth Ullattil
10 years agoFix QDir::operator==(const QDir &) const
João Abecasis [Thu, 11 Aug 2011 13:49:37 +0000 (15:49 +0200)]
Fix QDir::operator==(const QDir &) const

We can't rely on absolute paths when comparing directories for equality
as these don't take into account symbolic links and may also bypass ../
and ./ simplification.

Instead, canonical paths must be computed and can then be compared
according to the case sensitivity rules for the platform or file engine,
as is done in QFileInfo.

Task-number: QTBUG-20495
Reviewed-by: Prasanth Ullattil
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, 26 Aug 2011 11:36:42 +0000 (21:36 +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:
  Fixed use of deleted object in XmlPatterns EvaluationCache

10 years agoFixed use of deleted object in XmlPatterns EvaluationCache
mread [Fri, 26 Aug 2011 11:07:31 +0000 (12:07 +0100)]
Fixed use of deleted object in XmlPatterns EvaluationCache

This problem was shown up by the Ilta-Sanomat QML app on Symbian.
Changes to the EvaluationCache class in
23267553627ac3c4cbcd918283bee8e665deeff9 meant that it was now trying
to access the declaration object after it had been deleted.
This change takes the data needed from the declaration object (1 bool)
and stores that instead

Task-number: QTTH-1492
Reviewed-by: Honglei Zhang
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Fri, 26 Aug 2011 10:07:23 +0000 (20:07 +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:
  Check if bridge plugin vector is still valid.

10 years agoCheck if bridge plugin vector is still valid.
Frederik Gladhorn [Fri, 26 Aug 2011 08:33:20 +0000 (10:33 +0200)]
Check if bridge plugin vector is still valid.

Q_GLOBAL_STATIC may be destroyed and we still send
ObjectDestroyed notifications.
This only shows now that we actually send the Destroyed notifications.

10 years agoMerge remote-tracking branch 'mainline/4.8'
Oswald Buddenhagen [Fri, 26 Aug 2011 07:54:33 +0000 (09:54 +0200)]
Merge remote-tracking branch 'mainline/4.8'

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Thu, 25 Aug 2011 23:14:03 +0000 (09:14 +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: (21 commits)
  Revert "Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus"
  Symbian: Not possible to catch RequestSoftwareInputPanel in eventFilter
  Fix problem with grabWindow on Mac OS X 10.6 with Cocoa
  Added an additional check to workaround an issue on Windows.
  don't crash when destroying children
  Fix compile issue with Mac OS X 10.5
  Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus
  Exact word bubble doesn't disappear when screen is tapped (fix part 2)
  Fix QPixmap::grabWindow() on Mac OS X Lion
  Update 4.7.4 changes
  Exact word bubble doesn't disappear when screen is tapped
  Make text rendering working outside the gui thread on Symbian.
  Doc: Clarified the range of return values from QLineF::angle().
  Doc: Fixed \since declarations.
  Doc: Standardized on QtQuick for \since declarations.
  Doc: Removed whitespace.
  Modified \since command behavior slightly to handle project and version.
  Doc: Added a simple introduction to Qt and fixed links.
  Doc: Added more appropriate links to help reduce confusion.
  Doc: Removed non-ASCII characters from the documentation.
  ...

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

10 years agoUpdated WebKit to 85d4df147ac7b239497b05979a51fd6fde7580fd
Ademar de Souza Reis Jr [Thu, 25 Aug 2011 22:42:19 +0000 (19:42 -0300)]
Updated WebKit to 85d4df147ac7b239497b05979a51fd6fde7580fd

This time also including WebKitLibraries/*.a, needed for the
Mac build.

10 years agoUpdated WebKit to 836fa24be73978fb292e954abb151fb46b1d97e0
Ademar de Souza Reis Jr [Thu, 25 Aug 2011 17:38:12 +0000 (14:38 -0300)]
Updated WebKit to 836fa24be73978fb292e954abb151fb46b1d97e0

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Thu, 25 Aug 2011 16:35:27 +0000 (02:35 +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:
  uikit: get rid of the "min 30fps" for event handling.
  uikit: update README

10 years agouikit: get rid of the "min 30fps" for event handling.
Eike Ziller [Thu, 25 Aug 2011 10:33:08 +0000 (12:33 +0200)]
uikit: get rid of the "min 30fps" for event handling.

This is actually not needed if done correctly.

10 years agouikit: update README
Eike Ziller [Thu, 25 Aug 2011 11:03:42 +0000 (13:03 +0200)]
uikit: update README

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Thu, 25 Aug 2011 15:58:03 +0000 (01:58 +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:
  Doc: Added links to the plugin deployment guide.

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 [Thu, 25 Aug 2011 13:56:52 +0000 (23:56 +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: (21 commits)
  Revert "Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus"
  Symbian: Not possible to catch RequestSoftwareInputPanel in eventFilter
  Fix problem with grabWindow on Mac OS X 10.6 with Cocoa
  Added an additional check to workaround an issue on Windows.
  don't crash when destroying children
  Fix compile issue with Mac OS X 10.5
  Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus
  Exact word bubble doesn't disappear when screen is tapped (fix part 2)
  Fix QPixmap::grabWindow() on Mac OS X Lion
  Update 4.7.4 changes
  Exact word bubble doesn't disappear when screen is tapped
  Make text rendering working outside the gui thread on Symbian.
  Doc: Clarified the range of return values from QLineF::angle().
  Doc: Fixed \since declarations.
  Doc: Standardized on QtQuick for \since declarations.
  Doc: Removed whitespace.
  Modified \since command behavior slightly to handle project and version.
  Doc: Added a simple introduction to Qt and fixed links.
  Doc: Added more appropriate links to help reduce confusion.
  Doc: Removed non-ASCII characters from the documentation.
  ...

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Thu, 25 Aug 2011 13:36:38 +0000 (23:36 +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:
  QWindowsStyle: fix bug in eventFilter on KeyPressed event with alt pressed: incorrect work with list

10 years agoDoc: Added a note to Code Editor example docs
Geir Vattekar [Thu, 25 Aug 2011 13:28:43 +0000 (15:28 +0200)]
Doc: Added a note to Code Editor example docs

    Task-number: QTBUG-9004
Reviewed-by: David Boddie
10 years agoDoc: QItemDelegate->QStyledItemDelegate in Star Delegate docs
Geir Vattekar [Thu, 25 Aug 2011 13:18:57 +0000 (15:18 +0200)]
Doc: QItemDelegate->QStyledItemDelegate in Star Delegate docs

    Task-number: QTBUG-9440

10 years agoQWindowsStyle: fix bug in eventFilter on KeyPressed event with alt pressed: incorrect...
peterpa [Thu, 25 Aug 2011 13:04:48 +0000 (15:04 +0200)]
QWindowsStyle: fix bug in eventFilter on KeyPressed event with alt pressed: incorrect work with list

Merge-request: 2664
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@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, 25 Aug 2011 12:43:53 +0000 (22: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:
  Crash when creating scroll bar skin graphics on S60 (debug only)

10 years agoCrash when creating scroll bar skin graphics on S60 (debug only)
Sami Merila [Thu, 25 Aug 2011 11:21:30 +0000 (14:21 +0300)]
Crash when creating scroll bar skin graphics on S60 (debug only)

When fetching bitmap graphics from native without fallback information,
do not define fallback-mif file, since native side uses ASSERT_DEBUG
to crash the client if file info exists, but bitmap ID is not defined.

This started crashing when root theme removed default scrollbar
graphics from its content for Belle release.

Task-number: QTBUG-15993
Reviewed-by: Miikka Heikkinen
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, 25 Aug 2011 08:45:08 +0000 (18:45 +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:
  QS60Style omits drawing theme background in some Symbian SDKs

10 years agoFix memory leak in ListModel custom parser
Bea Lam [Thu, 25 Aug 2011 08:13:44 +0000 (18:13 +1000)]
Fix memory leak in ListModel custom parser

ModelNodes created by the parser for ListElement definitions were not
deleted.

Task-number: QTBUG-21084
Reviewed-by: Michael Brasser
10 years agoQS60Style omits drawing theme background in some Symbian SDKs
Sami Merila [Thu, 25 Aug 2011 08:11:28 +0000 (11:11 +0300)]
QS60Style omits drawing theme background in some Symbian SDKs

Latest internal RnD releases have upgraded Symbian version to 5.4.
As QS60Style was not aware of this, all the textures that didn't
define any version information (i.e. available in all versions)
were not drawn at all.

Task-number: QT-5176
Reviewed-by: Miikka Heikkinen
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Wed, 24 Aug 2011 23:15:26 +0000 (09:15 +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:
  Spelling fix
  Fixed lost flushes in raster window surface.
  Fix compilation of qjpeg on MinGW with GCC 4.6
  uikit: Use correct pixmap data format.
  Correctly position aliased lines with flat caps

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

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Wed, 24 Aug 2011 19:39:52 +0000 (05:39 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (41 commits)
  Spelling fix
  Fix compilation of qjpeg on MinGW with GCC 4.6
  Make the DBus timeout configurable in QDBusAbstractInterface.
  Fix non-ascii name issues in ICD.
  Compile fix for Symbian 5th and earlier
  Improve documentation for QDeclarativeView::setSource()
  fix copying webkit guide under windows
  Add a QApplication::queryKeyboardModifiers() method.
  Symbian: Fix backspace on empty lines of multiline textedits
  Handle CloseSoftwareInputPanel event in QCoeFepInputContext
  Fix delayed password masking mid-string.
  Disabled splitscreen translation still moves screen
  Doc: Fixed qdoc warnings.
  don't crash when destroying codec list
  Fix a crash in a11y introduced by d289e54f2d2aa066cb3
  Doc: Fixed qdoc warnings.
  test: Fix `tst_qfiledialog' in a namespaced build
  Fix files that don't end with a newline character
  Fix bug QTBUG-13901, Mac style button rect
  Improved comment finding code.
  ...

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, 24 Aug 2011 14:41:36 +0000 (00:41 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix for qml1shaderplugin GPU resource handling on Symbian

10 years agoDoc: Added a link in Symbian Intro to Required Capabilities
Geir Vattekar [Wed, 24 Aug 2011 13:29:37 +0000 (15:29 +0200)]
Doc: Added a link in Symbian Intro to Required Capabilities

    Task-number: QTBUG-8942

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team
aavit [Wed, 24 Aug 2011 13:09:40 +0000 (15:09 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Wed, 24 Aug 2011 13:01:08 +0000 (23:01 +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 QGLGlyphCache for Open GL ES (1).
  Revert "Include trailing space width in RTL text line width"
  Fix justification of RTL text

10 years agoDoc: Added info on ordered targets for VS to qmake manual
Geir Vattekar [Wed, 24 Aug 2011 12:59:41 +0000 (14:59 +0200)]
Doc: Added info on ordered targets for VS to qmake manual

    Task-number: QTBUG-11988
Reviewed-by: David Boddie
10 years agoDoc: Small addition to the QML anchor layout docs
Geir Vattekar [Wed, 24 Aug 2011 12:50:12 +0000 (14:50 +0200)]
Doc: Small addition to the QML anchor layout docs

    Task-number: QTBUG-15514
Reviewed-by: David Boddie
10 years agoFix for qml1shaderplugin GPU resource handling on Symbian
Marko Niemelä [Wed, 24 Aug 2011 12:29:17 +0000 (15:29 +0300)]
Fix for qml1shaderplugin GPU resource handling on Symbian

qml1shaderplugin now automatically recovers from situations when GL context is
destroyed and related FBOs and shaderprograms become invalid. Additionally the
shaderprograms are created lazily so that no GPU memory is used if items are
not visible.

Task-number: QTBUG-20724 QTBUG-20736
Reviewed-by: Jani Hautakangas
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-team
David Boddie [Wed, 24 Aug 2011 11:59:11 +0000 (13:59 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-team

10 years agoDoc: Internalized QDeclarativeTypeLoader
Geir Vattekar [Wed, 24 Aug 2011 10:58:20 +0000 (12:58 +0200)]
Doc: Internalized QDeclarativeTypeLoader

    Task-number: QTBUG-21029

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 24 Aug 2011 10:53:22 +0000 (20:53 +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:

10 years agoMerge commit 'v4.7.4' into 4.7
Timo Turunen [Wed, 24 Aug 2011 10:19:24 +0000 (13:19 +0300)]
Merge commit 'v4.7.4' into 4.7

10 years agoFix QGLGlyphCache for Open GL ES (1).
Eike Ziller [Mon, 22 Aug 2011 10:12:59 +0000 (12:12 +0200)]
Fix QGLGlyphCache for Open GL ES (1).

When resizing the font texture the code was using glGetTexImage
which is not available on Open GL ES.
We need to cache the font texture data, and draw the glyphs on
it in addition, so we can copy the data when resizing the texture size.

10 years agoRevert "Include trailing space width in RTL text line width"
Eskil Abrahamsen Blomfeldt [Wed, 24 Aug 2011 07:41:29 +0000 (09:41 +0200)]
Revert "Include trailing space width in RTL text line width"

This reverts commit 2fa986aa670bee0fafb30241f40bb3556594e32b.
The fix was wrong. Use the IncludeTrailingSpaces flag if you want
to include the trailing spaces in the text width.

Reviewed-by: Jiang Jiang
10 years agoFix justification of RTL text
Eskil Abrahamsen Blomfeldt [Wed, 24 Aug 2011 07:13:45 +0000 (09:13 +0200)]
Fix justification of RTL text

Since the trailing space is included in the QScriptLine, it may affect
the positions of preceding script items when the text is RTL. The best
solution for this would be to disregard the trailing space in the layout
process, or somehow make it have an advance of 0 so it doesn't affect
the layout. However, to minimize the impact of the change, and to be
consistent with previous work arounds such as
bf992df6434fc37715f728ca09601c5567dd83c9, we simply include the trailing
(visually leading) space in the justification pass for now.

Task-number: QTBUG-20920
Reviewed-by: Lars
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Wed, 24 Aug 2011 07:35:17 +0000 (17:35 +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:
  uikit: fix examples to no longer ship the custom fonts
  Use CoreText for font rendering on uikit.

10 years agouikit: fix examples to no longer ship the custom fonts
Eike Ziller [Wed, 24 Aug 2011 07:26:07 +0000 (09:26 +0200)]
uikit: fix examples to no longer ship the custom fonts

10 years agoUse CoreText for font rendering on uikit.
Eike Ziller [Mon, 15 Aug 2011 07:31:15 +0000 (09:31 +0200)]
Use CoreText for font rendering on uikit.

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Wed, 24 Aug 2011 06:24:10 +0000 (16:24 +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:
  Spelling fix
  Fixed lost flushes in raster window surface.
  uikit: Use correct pixmap data format.
  Correctly position aliased lines with flat caps

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, 24 Aug 2011 06:04:09 +0000 (16:04 +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:
  In landscape mode QComboboBox popup can not be showed completely

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 24 Aug 2011 02:20:05 +0000 (12:20 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Make it easier to select words at the start of a line.

10 years agoMake it easier to select words at the start of a line.
Andrew den Exter [Wed, 24 Aug 2011 01:26:29 +0000 (11:26 +1000)]
Make it easier to select words at the start of a line.

QTextControl's word selection will only include a word if the cursor
position is past the mid point of the word. This can make it
difficult to select words near the edges of the screen on touch
devices.  For the TextEdit word selection mode select a word ignore
the relative position within a word.

Change-Id: I2bc61376f663836fedd7e157448f0b565a64d485
Task-number: QT-5206
Reviewed-by: Martin Jones
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integ...
Qt Continuous Integration System [Wed, 24 Aug 2011 00:12:13 +0000 (10:12 +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 compilation of qjpeg on MinGW with GCC 4.6

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Tue, 23 Aug 2011 23:12:53 +0000 (09: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: (21 commits)
  Fix non-ascii name issues in ICD.
  Compile fix for Symbian 5th and earlier
  fix copying webkit guide under windows
  Symbian: Fix backspace on empty lines of multiline textedits
  uikit: Fixes for Open GL ES 1 and for pre-3GS devices
  uikit: Fix warning.
  Use thumb instructions for uikit
  Fix compilation with thumb2.
  Update uikit README: svg works, warn about thumb
  Fix bidi reordering of RTL text with embedded images
  Doc: Fixed qdoc warnings.
  Fixed infinite loop when loading certain SVGs.
  Doc: Fixed qdoc warnings.
  Improved comment finding code.
  Added language information to the pure documentation parser.
  Doc: Fixes to Qt tutorial
  Fixed external link to DevNet Wiki.
  qdoc: Fixed a crash caused by accessing a null pointer.
  Doc: Fixed the example of an encoded URL in the class description.
  Doc: Added a copy of the online style images for the qdoc manual.
  ...

10 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Tue, 23 Aug 2011 23:00:11 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

10 years agoMerge branch 4.7 into qt-4.8-from-4.7
Sergio Ahumada [Tue, 23 Aug 2011 20:45:26 +0000 (22:45 +0200)]
Merge branch 4.7 into qt-4.8-from-4.7

Conflicts:
doc/src/index.qdoc

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Tue, 23 Aug 2011 19:23:47 +0000 (05:23 +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:
  Doc: Said that QIODevice::isSequential returns false by default

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Tue, 23 Aug 2011 18:33:50 +0000 (04:33 +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:
  Doc: Fixing typo
  Fix left alignment of native RTL pre-edit text.

10 years agoDoc: Fixing typo
Sergio Ahumada [Tue, 23 Aug 2011 18:13:43 +0000 (20:13 +0200)]
Doc: Fixing typo

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Tue, 23 Aug 2011 14:51:35 +0000 (00:51 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Revert "Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus"
  Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus