qt:ritts_qt.git
7 years agoadd QStringList::sort(Qt::CaseSensitivity) overload improvements/qstringlist/sort-overload
Ritt Konstantin [Tue, 12 Jul 2011 23:28:54 +0000 (03:28 +0400)]
add QStringList::sort(Qt::CaseSensitivity) overload

QTBUG: 12892

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Tue, 12 Jul 2011 15:16:09 +0000 (01:16 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
  Fix license header in qs60keycapture_p.h and qs60keycapture.cpp
  Fixing WINSCW compile error
  whitespace fixes
  Enable key capture and RemCon interfaces for Qt apps on Symbian

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
Qt Continuous Integration System [Tue, 12 Jul 2011 09:42:39 +0000 (19:42 +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:
  Rename textBeforeOffsetFromString to start with q.
  Fix license header.
  Implement text interface for QLineEdit.
  Lion Support: Fix QSpinBox look
  My changes for 4.8.0
  Make this feature public for Qt 4.8 (was privately added for Qt 4.7)
  Lion Support: Hand made rendering of selected tab text
  Add DBus VirtualObject to handle multiple paths.

7 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Tue, 12 Jul 2011 03:55:50 +0000 (13:55 +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:
  Fixing WINSCW compile error

7 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Mon, 11 Jul 2011 16:06:15 +0000 (02:06 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integ...
Qt Continuous Integration System [Mon, 11 Jul 2011 10:10:29 +0000 (20:10 +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: fix typo

7 years agoDoc: fix typo
Joerg Bornemann [Mon, 11 Jul 2011 09:15:05 +0000 (11:15 +0200)]
Doc: fix typo

Reviewed-by: TrustMe
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Mon, 11 Jul 2011 07:50:15 +0000 (17:50 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fixing WINSCW compile error

7 years agoFixing WINSCW compile error
mread [Tue, 5 Jul 2011 10:21:39 +0000 (11:21 +0100)]
Fixing WINSCW compile error

Refactoring the body of a large TRAP into a separate function. This was
not compiling on WINSCW, perhaps due to the use of #ifdef within the
TRAP macro expansion. It does compile now.

Reviewed-by: Sami Merila
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Sat, 9 Jul 2011 23:08:32 +0000 (09: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:
  sync win32-g++-cross with win32-g++ (lib prefix and extension)
  Fix resource leak in symbian socket engine
  Use memmove in QListData::append(int) as regions overlap.
  Flicking behaviour of ListView/GridView SnapOnItem is inconsistent
  Skip flick velocity test on Mac.
  Try again to fix flickable velocity on Mac.
  Try to fix Mac CI test failure
  Flickable is too sensitive.
  Reduce timing dependancy in flickable test
  Velocities reported by Flickable in onFlickStarted can be 0
  Fix memory leak in QHostInfo
  Regression: Some QMenus are shown completely transparent in Symbian

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

7 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, 9 Jul 2011 16:37:26 +0000 (02:37 +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:
  sync win32-g++-cross with win32-g++ (lib prefix and extension)

7 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Sat, 9 Jul 2011 16:05:49 +0000 (02:05 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Sat, 9 Jul 2011 03:31:34 +0000 (13:31 +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:
  Fix resource leak in symbian socket engine
  Use memmove in QListData::append(int) as regions overlap.

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Fri, 8 Jul 2011 23:07:45 +0000 (09: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: (29 commits)
  Update the Window title when closing the last tab.
  Fix S60 compile
  Remove some metrics parsing code from Core Text
  Fix compilation with c++0x mode
  Fix Windows compile
  On symbian QMessageBox does not look like native dialog
  Move styleName out of QtFontStyle::Key
  Fix bidi reordering when part of text is rendered by fallback font
  Fix regressions in previous QFontDatabase patch
  Don't issue GL calls when the geometry is empty
  Fixed missing painting with X11 paint engine.
  Applied fix (dea9ca8b7a4166e1c3d3fc374621ad02c1220d3a)from qt5/qtbase.
  Add font related changes in 4.8 into changes
  Committing the qt-webpages.qdoc file with the online links
  Preparing documentation package for 4.8-beta
  Store styleName in font database
  Doc: Clarified the range of return values from QLineF::angle().
  Doc: Fixed \since declarations. (cherry picked from commit 358e018dbb4b4dbdbfc702a6d462f113a1357e1e)
  Doc: Standardized on QtQuick for \since declarations. (cherry picked from commit 609dc22f719ecb8d48349fd56f84960bbf46d731)
  Doc: Removed whitespace. (cherry picked from commit 01b3f508d1f7e9951baf60f487feadfa98ba4751)
  ...

7 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Fri, 8 Jul 2011 23:00:15 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

7 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, 8 Jul 2011 22:08:15 +0000 (08:08 +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:
  Flicking behaviour of ListView/GridView SnapOnItem is inconsistent
  Skip flick velocity test on Mac.
  Try again to fix flickable velocity on Mac.
  Try to fix Mac CI test failure
  Flickable is too sensitive.
  Reduce timing dependancy in flickable test
  Velocities reported by Flickable in onFlickStarted can be 0
  Fix memory leak in QHostInfo
  Regression: Some QMenus are shown completely transparent in Symbian

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration 4.7
Qt Continuous Integration System [Fri, 8 Jul 2011 16:57:29 +0000 (02:57 +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:
  sync win32-g++-cross with win32-g++ (lib prefix and extension)

7 years agosync win32-g++-cross with win32-g++ (lib prefix and extension)
Mark Brand [Fri, 8 Jul 2011 16:52:36 +0000 (18:52 +0200)]
sync win32-g++-cross with win32-g++ (lib prefix and extension)

qmake now needs library prefix and extension to be supplied. This was
added to plain win32-g++ in dbbf06e. Now added to win32-g++-cross.

Without this, static libraries get named 'X.lib' instead of 'libX.a'.

Merge-request: 1283
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
7 years agoFix resource leak in symbian socket engine
Shane Kearns [Fri, 8 Jul 2011 15:49:28 +0000 (16:49 +0100)]
Fix resource leak in symbian socket engine

Timer created when a socket is being used synchronously was not being
closed on destruction of the socket engine.

Reviewed-by: mread
7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Fri, 8 Jul 2011 16:27:24 +0000 (02:27 +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:
  Applied fix (dea9ca8b7a4166e1c3d3fc374621ad02c1220d3a)from qt5/qtbase.
  Committing the qt-webpages.qdoc file with the online links
  Preparing documentation package for 4.8-beta
  Doc: Clarified the range of return values from QLineF::angle().
  Doc: Fixed \since declarations. (cherry picked from commit 358e018dbb4b4dbdbfc702a6d462f113a1357e1e)
  Doc: Standardized on QtQuick for \since declarations. (cherry picked from commit 609dc22f719ecb8d48349fd56f84960bbf46d731)
  Doc: Removed whitespace. (cherry picked from commit 01b3f508d1f7e9951baf60f487feadfa98ba4751)
  Modified \since command behavior slightly to handle project and version.
  Doc: Added a simple introduction to Qt and fixed links. (cherry picked from commit 9ed61311bce15b8f1bb4b30ee9133f1a2355f41d)
  Doc: Added more appropriate links to help reduce confusion.
  Doc: Removed non-ASCII characters from the documentation. (cherry picked from commit 1bd6f1bd280ee6e1ecd4de2291c8ccfb4d06b7a4)
  Doc: Updated documentation with \since 4.8 declarations.

7 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Fri, 8 Jul 2011 16:05:37 +0000 (02:05 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

7 years agoUse memmove in QListData::append(int) as regions overlap.
Thiago Macieira [Fri, 8 Jul 2011 08:42:49 +0000 (10:42 +0200)]
Use memmove in QListData::append(int) as regions overlap.

It's undefined behaviour to memcpy regions with overlapping area. You
have to use memmove.

Change-Id: I912c819bf7ab26ba1e60028ee9d7c833dfc5138a
Reviewed-on: http://codereview.qt.nokia.com/1355
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
(cherry picked from commit d96b7b809e614dd416709acec768529457120b9f)

7 years agoMerge remote branch 'upstream/4.8'
Jerome Pasion [Fri, 8 Jul 2011 11:17:37 +0000 (13:17 +0200)]
Merge remote branch 'upstream/4.8'

Conflicts:
doc/src/external-resources.qdoc

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Fri, 8 Jul 2011 10:43:36 +0000 (20:43 +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 S60 compile
  Remove some metrics parsing code from Core Text
  Fix compilation with c++0x mode
  Fix Windows compile
  Move styleName out of QtFontStyle::Key
  Fix regressions in previous QFontDatabase patch
  Don't issue GL calls when the geometry is empty
  Fixed missing painting with X11 paint engine.
  Add font related changes in 4.8 into changes
  Store styleName in font database
  update 4.8.0 changes file
  Fix resource leak in QFontEngineDirectWrite
  Fix transformations on DirectWrite rasterized text
  Remove openvglite plugin

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Fri, 8 Jul 2011 10:33:02 +0000 (20:33 +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 license header in qs60keycapture_p.h and qs60keycapture.cpp

7 years agoFix license header in qs60keycapture_p.h and qs60keycapture.cpp
Honglei Zhang [Fri, 8 Jul 2011 10:21:39 +0000 (13:21 +0300)]
Fix license header in qs60keycapture_p.h and qs60keycapture.cpp

Commit bad513727833e207f7f8ca0d7c07c44c1addfb57 has old license
header in qs60keycature_p.h and qs60keycapture.cpp. New header is
used.

Reviewed-by: Trust Me
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Fri, 8 Jul 2011 08:36:47 +0000 (18: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:
  Rename textBeforeOffsetFromString to start with q.
  Fix QProcess emitting two started signals on X11
  Fix license header.
  Add Q_DECL_CONSTEXPR
  Use Q_DECL_CONSTEXPR in QFlags
  Implement text interface for QLineEdit.
  Fix QScopedPointerarray default constructor
  HTTP internals: continue gzip decompression if buffer fills exactly
  HTTP internals: do not discard data if not receiving gzip end marker
  Support partial input mode  - documentation update
  Add a null check for the backend in QNetworkReplyImpl.
  Support partial input mode
  Fixes switching runtime graphics system when the maximized window is shown or hidden.

7 years agoRename textBeforeOffsetFromString to start with q.
Frederik Gladhorn [Fri, 8 Jul 2011 08:22:39 +0000 (01:22 -0700)]
Rename textBeforeOffsetFromString to start with q.

Exported functions should start with q.

Reviewed-by: TrustMe
7 years agoMerge remote branch 'mainline/4.8' into staging
Jiang Jiang [Fri, 8 Jul 2011 07:57:45 +0000 (09:57 +0200)]
Merge remote branch 'mainline/4.8' into staging

Conflicts:
dist/changes-4.8.0

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Fri, 8 Jul 2011 07:13:23 +0000 (17:13 +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:
  Flicking behaviour of ListView/GridView SnapOnItem is inconsistent
  Skip flick velocity test on Mac.
  Try again to fix flickable velocity on Mac.
  Try to fix Mac CI test failure
  Flickable is too sensitive.
  Reduce timing dependancy in flickable test
  Velocities reported by Flickable in onFlickStarted can be 0

7 years agoFlicking behaviour of ListView/GridView SnapOnItem is inconsistent
Martin Jones [Mon, 4 Jul 2011 00:08:15 +0000 (10:08 +1000)]
Flicking behaviour of ListView/GridView SnapOnItem is inconsistent

Improve the response of the views when SnapOneItem/Row is enabled.
In this case it is best to be much more reactive to the user input
since even a small movement in a particular direction indicates
a change to the next/previous item.

Change-Id: I6a8eb689c3b12cdc67f24106032e36bba82d2846
Task-number: QTBUG-19874
Reviewed-by: Bea Lam
(cherry picked from commit e7bebcf0c59368340df524db4a53ae2595d057d7)

7 years agoSkip flick velocity test on Mac.
Martin Jones [Sun, 3 Jul 2011 23:52:15 +0000 (09:52 +1000)]
Skip flick velocity test on Mac.

Change-Id: Ib995961d7b1a939e5feb86d72a82408d1ceebe88
Task-number: QTBUG-19676
Reviewed-by: Bea Lam
(cherry picked from commit 8fbb802fa50d0a01c9c01d007a3e016c45fa863c)

7 years agoTry again to fix flickable velocity on Mac.
Martin Jones [Thu, 30 Jun 2011 07:09:34 +0000 (17:09 +1000)]
Try again to fix flickable velocity on Mac.

Change-Id: Id2693a69739886f9a171f3f6438a5404dff8e901
Task-number: QTBUG-19676
Reviewed-by: Bea Lam
(cherry picked from commit 927b22b06ee2e749395e73f457fe3c16ea087864)

7 years agoTry to fix Mac CI test failure
Martin Jones [Thu, 30 Jun 2011 02:05:14 +0000 (12:05 +1000)]
Try to fix Mac CI test failure

Try slowing down the flick to give the slow CI machine a better
chance of success.

Change-Id: Id61473e73a38bb888b9bee47cffb913c936155b9
Task-number: QTBUG-19676
Reviewed-by: Bea Lam
(cherry picked from commit 343069c7843321b33f06bfd42d476abae76dcece)

7 years agoFlickable is too sensitive.
Martin Jones [Wed, 29 Jun 2011 06:33:04 +0000 (16:33 +1000)]
Flickable is too sensitive.

Drag, stop, release should result in a pan, which does not trigger
a flick.  The current flick threshold velocity is too low, leading
to flicks when a pan gesture is more desireable.

Change-Id: I3aa3bf28cc0ccbb043f3390ff4e044ea587ba3ff
Task-number: QTBUG-19933
Reviewed-by: Bea Lam
(cherry picked from commit 20f8357c8ee570f57091e20b9c0a9a1455dc1e8d)

7 years agoReduce timing dependancy in flickable test
Martin Jones [Wed, 29 Jun 2011 06:23:28 +0000 (16:23 +1000)]
Reduce timing dependancy in flickable test

Interval of 10ms between synthesized flick move events is too prone
to timing difference on CI platforms.

Change-Id: Id5da794a7294868c8f5e544fa71edeec967e31ca
Task-number: QTBUG-19676
Reviewed-by: Bea Lam
(cherry picked from commit 6fb7cdf8741ca924413dd7cbc09fad91ddc04823)

7 years agoVelocities reported by Flickable in onFlickStarted can be 0
Martin Jones [Tue, 28 Jun 2011 05:35:58 +0000 (15:35 +1000)]
Velocities reported by Flickable in onFlickStarted can be 0

Ensure the smoothed velocity is set at the start of the flick.  Ensure
that the smoothed velocity animation isn't restarted unless there is
new valid data.

Change-Id: I00f8bbf1fe91faeea752b093c4658ad0f53ad06d
Task-number: QTBUG-19676
Reviewed-by: Bea Lam
(cherry picked from commit a2d97672bfaace677a4308db93f5802ba53af46e)

7 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, 7 Jul 2011 23:17:05 +0000 (09:17 +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:
  Update the Window title when closing the last tab.
  On symbian QMessageBox does not look like native dialog
  Fix bidi reordering when part of text is rendered by fallback font

7 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Thu, 7 Jul 2011 23:00:14 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 7 Jul 2011 17:14:06 +0000 (03:14 +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 memory leak in QHostInfo

7 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Thu, 7 Jul 2011 16:06:16 +0000 (02:06 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

7 years agoFix memory leak in QHostInfo
Shane Kearns [Thu, 7 Jul 2011 13:17:58 +0000 (14:17 +0100)]
Fix memory leak in QHostInfo

QHostInfo was leaking in the code path where it removes duplicate
name lookups after one has completed.

Task-number: QT-5121
Reviewed-by: Markus Goetz
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 7 Jul 2011 12:52:13 +0000 (22:52 +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: Some QMenus are shown completely transparent in Symbian

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Thu, 7 Jul 2011 11:37:35 +0000 (21:37 +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:
  Fix QProcess emitting two started signals on X11

7 years agoFix QProcess emitting two started signals on X11
Christian Strømme [Fri, 3 Jun 2011 15:55:09 +0000 (17:55 +0200)]
Fix QProcess emitting two started signals on X11

On X11 QProcess would emit two started signals when calling
QProcess::waitForStarted(). We should expect that the private
implementation of waitForStarted() should emit the started signal
and return true or false appropriately.

Task-number: QTBUG-7039
Change-Id: I3d381399ab7a39bf57db03a110fa6747a4fc6a24
Reviewed-on: http://codereview.qt.nokia.com/331
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
(cherry picked from commit 883b120d2f39c532cdd1a98d962af83be5adc4bd)

7 years agoFix license header.
Frederik Gladhorn [Thu, 7 Jul 2011 10:37:47 +0000 (12:37 +0200)]
Fix license header.

Reviewed-by: TrustMe
7 years agoRegression: Some QMenus are shown completely transparent in Symbian
Sami Merila [Thu, 7 Jul 2011 10:08:05 +0000 (13:08 +0300)]
Regression: Some QMenus are shown completely transparent in Symbian

Fix for menu transparency (QTBUG-16857) unveiled an issue in the
QS60Style when drawing QMenu background.

Style skips drawing of the menu background, since placeHolder
texture for QPalette::Window is not replaced with real background
for menus. Therefore, we need to check if the widget's palette
is still untouched when deciding whether or not to draw the
menu background.

Task-number: QTBUG-20255
Reviewed-by: Tomi Vihria
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 7 Jul 2011 09:12:49 +0000 (19:12 +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 the Window title when closing the last tab.

7 years agoUpdate the Window title when closing the last tab.
Casper van Donderen [Thu, 7 Jul 2011 09:01:28 +0000 (11:01 +0200)]
Update the Window title when closing the last tab.

Fixes: QTBUG-20243

Reviewed-By: Kevin Wright
7 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, 7 Jul 2011 05:54:09 +0000 (15:54 +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:
  HTTP internals: continue gzip decompression if buffer fills exactly
  HTTP internals: do not discard data if not receiving gzip end marker
  Support partial input mode  - documentation update
  Add a null check for the backend in QNetworkReplyImpl.
  Support partial input mode
  Fixes switching runtime graphics system when the maximized window is shown or hidden.

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Wed, 6 Jul 2011 22:16:34 +0000 (08:16 +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 Q_DECL_CONSTEXPR
  Use Q_DECL_CONSTEXPR in QFlags
  Fix QScopedPointerarray default constructor

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 6 Jul 2011 18:38:00 +0000 (04:38 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix bidi reordering when part of text is rendered by fallback font

7 years agoAdd Q_DECL_CONSTEXPR
Olivier Goffart [Wed, 6 Jul 2011 14:35:04 +0000 (16:35 +0200)]
Add Q_DECL_CONSTEXPR

Defined to the c++0x constexpr when compiler supports it

Change-Id: I82687fe46848eedf3cffc39982106749b3dde8aa
Reviewed-on: http://codereview.qt.nokia.com/1247
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
(cherry picked from commit 28f927f8e092a02e233559f6da7fa96cf722c77d)

7 years agoUse Q_DECL_CONSTEXPR in QFlags
Olivier Goffart [Wed, 6 Jul 2011 14:37:14 +0000 (16:37 +0200)]
Use Q_DECL_CONSTEXPR in QFlags

Change-Id: I851e0b1c3f80a7b33a38cb1ab2665dc0f3c73adc
Reviewed-on: http://codereview.qt.nokia.com/1248
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
(cherry picked from commit c0c6dd2b022cfd667f32b8a48bcac86ac07d3880)

7 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Wed, 6 Jul 2011 16:05:48 +0000 (02:05 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Wed, 6 Jul 2011 15:02:33 +0000 (01: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:
  Fix S60 compile
  Remove some metrics parsing code from Core Text
  Fix compilation with c++0x mode
  Fix Windows compile
  Move styleName out of QtFontStyle::Key
  Fix regressions in previous QFontDatabase patch
  Don't issue GL calls when the geometry is empty
  Fixed missing painting with X11 paint engine.
  Add font related changes in 4.8 into changes
  Store styleName in font database

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 6 Jul 2011 14:37:54 +0000 (00:37 +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:
  On symbian QMessageBox does not look like native dialog

7 years agoFix S60 compile
Jiang Jiang [Wed, 6 Jul 2011 13:24:06 +0000 (15:24 +0200)]
Fix S60 compile

7 years agoRemove some metrics parsing code from Core Text
Jiang Jiang [Wed, 6 Jul 2011 12:31:33 +0000 (14:31 +0200)]
Remove some metrics parsing code from Core Text

The respective value in some of the default fonts like Lucida Grande
are simply not reliable. It seems that the only reliable way to get
such information is by going through all the glyphs.

It seems that these code are not well tested on Mac and should be
removed for now since it caused visible regressions in QLineEdit
rendering.

Reviewed-by: Eskil
7 years agoFix compilation with c++0x mode
Lars Knoll [Wed, 6 Jul 2011 11:42:49 +0000 (13:42 +0200)]
Fix compilation with c++0x mode

Reviewed-by: Olivier
7 years agoFix Windows compile
Jiang Jiang [Wed, 6 Jul 2011 11:35:49 +0000 (13:35 +0200)]
Fix Windows compile

7 years agoOn symbian QMessageBox does not look like native dialog
Sami Merila [Wed, 6 Jul 2011 11:32:10 +0000 (14:32 +0300)]
On symbian QMessageBox does not look like native dialog

If API QMessageBox::setInformativeText() is used to set informative
text to the messagebox, the text is added to the "icon column",
which makes the messagebox look really weird.

Use layoutDirection() and add informative text to the same column
where other text elements are added.

Task-number: QTBUG-9924
Reviewed-by: Tomi Vihria
7 years agoImplement text interface for QLineEdit.
Frederik Gladhorn [Tue, 5 Jul 2011 15:05:11 +0000 (17:05 +0200)]
Implement text interface for QLineEdit.

Add boundary helper functions to the QAccessibleTextInterface.
Move LineEdit over to use QTextBoundaryFinder.

Reviewed-by: Jan-Arve
7 years agoMove styleName out of QtFontStyle::Key
Jiang Jiang [Wed, 6 Jul 2011 09:50:58 +0000 (11:50 +0200)]
Move styleName out of QtFontStyle::Key

Makes the code clearer and more explicit.

Reviewed-by: Eskil
7 years agoFix bidi reordering when part of text is rendered by fallback font
Eskil Abrahamsen Blomfeldt [Wed, 6 Jul 2011 09:44:57 +0000 (11:44 +0200)]
Fix bidi reordering when part of text is rendered by fallback font

If the fallback font is used for part of a RTL text, we need to
position the different text items accordingly, subtracting the advance
instead of adding it.

Task-number: QTBUG-17117
Done-with: Lars

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Tue, 5 Jul 2011 23:09:34 +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: (22 commits)
  QS60Style: QMessageBox theme background is incorrect
  Adding "hkscs_2004" to the codec alias table
  Adding Kazakh entry to the codec alias table
  On symbian QMessageBox icon is on different side than in native dialog
  Flicking behaviour of ListView/GridView SnapOnItem is inconsistent
  Skip flick velocity test on Mac.
  Try again to fix flickable velocity on Mac.
  Try to fix Mac CI test failure
  qmlplugindump: Fix dumping with -path on Mac.
  qmlplugindump: Improve error message for misbehaving plugin components.
  Flickable is too sensitive.
  Reduce timing dependancy in flickable test
  Velocities reported by Flickable in onFlickStarted can be 0
  qmldump: Fix export comparison.
  QmlInspector: Some code cleanups
  QmlInspector: Some cleanup in the Color Picker tool
  QmlInspector: Unified mouse and keyboard event handling
  QmlInspector: Removed private header postfix and Qt namespace
  QmlInspector: Share code between QGV/SG based QML debugging
  qmlplugindump: For extended types, remove exports of the base object.
  ...

7 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Tue, 5 Jul 2011 23:00:16 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Tue, 5 Jul 2011 22:52:50 +0000 (08:52 +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:
  HTTP internals: continue gzip decompression if buffer fills exactly
  HTTP internals: do not discard data if not receiving gzip end marker
  Add a null check for the backend in QNetworkReplyImpl.

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 5 Jul 2011 18:50:46 +0000 (04:50 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Support partial input mode  - documentation update
  Support partial input mode

7 years agoFix QScopedPointerarray default constructor
Olivier Goffart [Tue, 5 Jul 2011 12:06:01 +0000 (14:06 +0200)]
Fix QScopedPointerarray default constructor

Since the compiler cannod find the template argument if there is no
argument passed to the constructor, this effectively means there is
no default constructor.

Add a default constructor

Task-number: QTBUG-20256
Change-Id: I310d5e1f3f94a8fe69fd3a5c46f2f51bca60facd
Reviewed-on: http://codereview.qt.nokia.com/1165
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
(cherry picked from commit d789e40c58c1ce8441d3bb4d6ca8d01fe02ad1a7)

7 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Tue, 5 Jul 2011 16:29:46 +0000 (02:29 +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:
  QS60Style: QMessageBox theme background is incorrect
  Adding "hkscs_2004" to the codec alias table
  Adding Kazakh entry to the codec alias table
  On symbian QMessageBox icon is on different side than in native dialog

7 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Tue, 5 Jul 2011 16:06:20 +0000 (02:06 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

7 years agoHTTP internals: continue gzip decompression if buffer fills exactly
Peter Hartmann [Tue, 5 Jul 2011 15:32:54 +0000 (17:32 +0200)]
HTTP internals: continue gzip decompression if buffer fills exactly

Reviewed-by: Markus Goetz
Reviewed-by: Prasanth Ullattil
Task-number: QTBUG-12908

7 years agoHTTP internals: do not discard data if not receiving gzip end marker
Peter Hartmann [Tue, 5 Jul 2011 14:21:50 +0000 (16:21 +0200)]
HTTP internals: do not discard data if not receiving gzip end marker

some servers send gzip data without the gzip end markers. In that case,
we should deliver all content and tear down the gzip data structures.

Reviewed-by: Markus Goetz
Patch-by: Tor Arne Vestbø and Peter Hartmann
Task-number: QTBUG-16022

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Tue, 5 Jul 2011 14:37:20 +0000 (00:37 +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:
  Fixes switching runtime graphics system when the maximized window is shown or hidden.

7 years agoSupport partial input mode - documentation update
Sami Merila [Tue, 5 Jul 2011 14:13:04 +0000 (17:13 +0300)]
Support partial input mode  - documentation update

Update the documentation related to the QApplication attribute.

Task-number: QTBUG-16572
Reviewed-by: Tomi Vihria
7 years agoAdd a null check for the backend in QNetworkReplyImpl.
Jocelyn Turcotte [Tue, 5 Jul 2011 13:53:57 +0000 (15:53 +0200)]
Add a null check for the backend in QNetworkReplyImpl.

This is a blurry attempt to fix a crash happening during bearer session loss/recovery.

Reviewed-by: Markus Goetz
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Tue, 5 Jul 2011 13:32:09 +0000 (23:32 +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:
  Lion Support: Fix QSpinBox look
  My changes for 4.8.0
  Make this feature public for Qt 4.8 (was privately added for Qt 4.7)

7 years agoSupport partial input mode
Sami Merila [Tue, 5 Jul 2011 13:14:01 +0000 (16:14 +0300)]
Support partial input mode

Connect the internal private API to the QApplication public
attribute. This allows the enabling/disabling of the splitview
functionality from apps without any hacks.

Task-number: QTBUG-16572
Reviewed-by: Tomi Vihria
7 years agoLion Support: Fix QSpinBox look
Gabriel de Dietrich [Tue, 5 Jul 2011 12:06:43 +0000 (14:06 +0200)]
Lion Support: Fix QSpinBox look

Also sets the read-only state in QStyleOptionSpinBox, wich wasn't before.

Reviewed-by: Jens Bache-Wiig
7 years agoMy changes for 4.8.0
Jan-Arve Saether [Tue, 5 Jul 2011 12:04:28 +0000 (14:04 +0200)]
My changes for 4.8.0

7 years agoFix regressions in previous QFontDatabase patch
Jiang Jiang [Tue, 5 Jul 2011 11:40:57 +0000 (13:40 +0200)]
Fix regressions in previous QFontDatabase patch

1. QtFontStyle::Key comparison should either use styleName or
   style, etc., but not both.
2. When initializing a QFont from QFontDatabase::font(), style
   and weight parameters should always be set even when we found
   a match styleName, in case these parameters will be used for
   comparison later.

Reviewed-by: Eskil
7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-team
Jan-Arve Saether [Tue, 5 Jul 2011 11:36:13 +0000 (13:36 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-team

7 years agoFixes switching runtime graphics system when the maximized window is shown or hidden.
Stanislav Ionascu [Tue, 5 Jul 2011 10:48:11 +0000 (12:48 +0200)]
Fixes switching runtime graphics system when the maximized window is shown or hidden.

Merge-request: 1287
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 5 Jul 2011 10:30:49 +0000 (20:30 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (122 commits)
  Fixing WINSCW compile error
  whitespace fixes
  Update changelog with Accessibility fixes.
  Fix horizontal center alignment with trailing space
  Regression: QS60Style - All standardIcons are drawn as "small icons"
  Changelog: Add mention of qmlplugindump.
  Enable key capture and RemCon interfaces for Qt apps on Symbian
  Doc: Fixing typo
  QS60Style: provide more standard icons
  changelog
  Compile with DEBUG_FONTENGINE define
  minor optimization
  remove the old compatibility code
  make QFontEngineQPF1 work even without mmap(2) support
  Update QtOpenGL section in Symbian platform notes.
  Re-apply licenseheader text in source files for qt4.7
  Make sure the declarative plugin of QtWebKit is build once.
  Doc: Fixing typo
  Update 4.8.0 changes file
  The qmlshadersplugin deployment must be scoped same as its building
  ...

7 years agoFixing WINSCW compile error
mread [Tue, 5 Jul 2011 10:21:39 +0000 (11:21 +0100)]
Fixing WINSCW compile error

Refactoring the body of a large TRAP into a separate function. This was
not compiling on WINSCW, perhaps due to the use of #ifdef within the
TRAP macro expansion. It does compile now.

Reviewed-by: Sami Merila
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 5 Jul 2011 10:20:12 +0000 (20:20 +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: QMessageBox theme background is incorrect

7 years agowhitespace fixes
mread [Tue, 5 Jul 2011 10:18:00 +0000 (11:18 +0100)]
whitespace fixes

Making these whitespace fixes in preparation for fixing a compile error
and my editor likes to fix whitespace.

7 years agoQS60Style: QMessageBox theme background is incorrect
Sami Merila [Tue, 5 Jul 2011 10:05:15 +0000 (13:05 +0300)]
QS60Style: QMessageBox theme background is incorrect

Use correct native theme graphic for dialog backgrounds. In the past,
native menu background graphic was used for dialogs and menus.

Task-number: QTBUG-9924
Reviewed-by: Tomi Vihria
7 years agoDon't issue GL calls when the geometry is empty
Eskil Abrahamsen Blomfeldt [Tue, 5 Jul 2011 08:33:59 +0000 (10:33 +0200)]
Don't issue GL calls when the geometry is empty

This works as a band-aid and optimization for QT-5104, because in the
text in the example, which contains latin text and has a latin default
font set, will think of all spaces between the cyrillic characters as
latin characters, hence it will make separate text items for them and
issue separate glDrawElements() calls. By cutting off if there are no
glyphs to draw, we can avoid hitting the actual bug for this and several
other use cases, making it less likely to happen.

Task-number: QT-5104
Reviewed-by: Samuel
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Tue, 5 Jul 2011 09:16:36 +0000 (19:16 +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 with Accessibility fixes.
  Fix horizontal center alignment with trailing space
  Regression: QS60Style - All standardIcons are drawn as "small icons"
  Changelog: Add mention of qmlplugindump.
  QS60Style: provide more standard icons
  Update QtOpenGL section in Symbian platform notes.
  The qmlshadersplugin deployment must be scoped same as its building
  Do not try to open VKB if it is already open in Symbian
  Introduce QPixmap::fromSymbianRSgImage(RSgImage*) to GL engine

7 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Tue, 5 Jul 2011 09:09:12 +0000 (11:09 +0200)]
Merge branch '4.8-upstream' into master-water

7 years agoMake this feature public for Qt 4.8 (was privately added for Qt 4.7)
Jan-Arve Saether [Tue, 5 Jul 2011 08:39:35 +0000 (10:39 +0200)]
Make this feature public for Qt 4.8 (was privately added for Qt 4.7)

7 years agoMerge remote-tracking branch 'qt/4.8'
Sami Lempinen [Tue, 5 Jul 2011 07:10:56 +0000 (10:10 +0300)]
Merge remote-tracking branch 'qt/4.8'

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Tue, 5 Jul 2011 06:41:00 +0000 (16:41 +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:
  Flicking behaviour of ListView/GridView SnapOnItem is inconsistent
  Skip flick velocity test on Mac.
  Try again to fix flickable velocity on Mac.
  Try to fix Mac CI test failure
  qmlplugindump: Fix dumping with -path on Mac.
  qmlplugindump: Improve error message for misbehaving plugin components.
  Flickable is too sensitive.
  Reduce timing dependancy in flickable test
  Velocities reported by Flickable in onFlickStarted can be 0
  qmldump: Fix export comparison.
  QmlInspector: Some code cleanups
  QmlInspector: Some cleanup in the Color Picker tool
  QmlInspector: Unified mouse and keyboard event handling
  QmlInspector: Removed private header postfix and Qt namespace
  QmlInspector: Share code between QGV/SG based QML debugging
  qmlplugindump: For extended types, remove exports of the base object.
  qmlplugindump: Build debug version if possible.
  QDeclarativeDebug: Add code coverage information

7 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Tue, 5 Jul 2011 00:58:56 +0000 (10:58 +1000)]
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  Fix horizontal center alignment with trailing space
  Regression: QS60Style - All standardIcons are drawn as "small icons"
  QS60Style: provide more standard icons
  Update QtOpenGL section in Symbian platform notes.
  The qmlshadersplugin deployment must be scoped same as its building
  Do not try to open VKB if it is already open in Symbian
  Introduce QPixmap::fromSymbianRSgImage(RSgImage*) to GL engine

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review
Martin Jones [Tue, 5 Jul 2011 00:34:57 +0000 (10:34 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review

7 years agoMerge remote branch 'origin/4.7' into qt-4.8-from-4.7
Jani Hautakangas [Mon, 4 Jul 2011 21:11:09 +0000 (00:11 +0300)]
Merge remote branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
doc/src/external-resources.qdoc
src/gui/text/qtextlayout.cpp
src/opengl/qwindowsurface_gl.cpp

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Mon, 4 Jul 2011 20:55:19 +0000 (06:55 +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:
  Lion Support: Hand made rendering of selected tab text