qt:ritts_qt.git
6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr... 4.8
Qt Continuous Integration System [Sat, 10 Sep 2011 15:34:49 +0000 (01:34 +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:
  Disable autotest broken by the change to QCache in 7ab0bed
  Generate glyphs in un-transformed coordinate system.
  Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFT
  Reset trailingSpaces in relayout
  Prevent QPixmapCache potentially growing indefinitely.
  Allocate 16-byte aligned memory independent of platform for raster pool.
  Fix trailing spaces problem by not adding it to QScriptLine.length
  Fix RTL layout for fonts when non-printable character has an advance
  Fix regression in tst_qrawfont
  Make it compile on mac
  Fixed compiling error in qvfb.
  micro optimizations
  fix "comparison between signed and unsigned" warnings
  on windows, don't resolve the gdi32's symbols for each QRawFont instance
  fix typo in the docs
  QRawFont: add missed operator !=
  optimize QGlyphRun's operator == a bit
  QGlyphRun: make operator != inlined
  QGlyphRun: don't detach if the decoration wasn't actually changed
  QPA event loop: Set a timeout != 0 if there are no timers.

6 years agoMerge remote-tracking branch 'qt-fire-review/master'
aavit [Sat, 10 Sep 2011 14:43:04 +0000 (16:43 +0200)]
Merge remote-tracking branch 'qt-fire-review/master'

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Sat, 10 Sep 2011 06:41:32 +0000 (16:41 +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:
  find qt.conf more reliably

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Sat, 10 Sep 2011 05:37:30 +0000 (15:37 +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: (120 commits)
  Disable autotest broken by the change to QCache in 7ab0bed
  Generate glyphs in un-transformed coordinate system.
  Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFT
  Reset trailingSpaces in relayout
  Prevent QPixmapCache potentially growing indefinitely.
  Allocate 16-byte aligned memory independent of platform for raster pool.
  Fix trailing spaces problem by not adding it to QScriptLine.length
  fix build for desktop
  Dragging in nested views no longer works as expected
  Fix the build with -qtnamespace configure options
  Updated WebKit to a2bd2bb (qtwebkit-2.2-week35)
  Fix implicit height not growing when pre-edit text wraps.
  Removed the unnecessary dependency of the QtHelp module on the QtXml one
  Modified \since command behavior slightly to handle project and version.
  Added an additional check to workaround an issue on Windows.
  Fix leak in State element.
  Fix leak in bindings created by PropertyChanges.
  Revert readonly BorderImage::sourceSize change
  URLs used with scheme handler use appropriate encoding for scheme
  Update license headers
  ...

6 years agoDisable autotest broken by the change to QCache in 7ab0bed
aavit [Sat, 10 Sep 2011 05:22:10 +0000 (07:22 +0200)]
Disable autotest broken by the change to QCache in 7ab0bed

Reviewed-by: trustme
6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Sat, 10 Sep 2011 00:12:14 +0000 (10:12 +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:
  Merge fixes for QDir::operator==
  QSslCertificate: block all DigiNotar (intermediate and root) certs
  Restore Qt4.7 behaviour of QFileInfo::absolute(File)Path
  Fix compile error on MSVC2008
  Fix comparison of absolute, unclean paths in QDir
  Wrap calls to Sequence::push_back

6 years agofind qt.conf more reliably
Oswald Buddenhagen [Fri, 9 Sep 2011 16:41:52 +0000 (18:41 +0200)]
find qt.conf more reliably

a qmake invoked with a relative path would not find qt.conf, because it
already changed CWD, which would confuse our copy of
QCoreApplication::applicationFilePath() (see also QTBUG-21381).
we already have the absolute path to the qmake executable in
Option::qmake_abslocation, so just use it.

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integ...
Qt Continuous Integration System [Fri, 9 Sep 2011 12:18:02 +0000 (22:18 +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:
  qmake vcxproj generator: fix XML conversion for build events

6 years agoGenerate glyphs in un-transformed coordinate system.
Samuel Rødal [Fri, 2 Sep 2011 11:48:26 +0000 (13:48 +0200)]
Generate glyphs in un-transformed coordinate system.

Avoids rounding issues with very large coordinates.

Task-number: QTBUG-21262 - QRasterPaintEngine & QFontEngineFT - fonts corrupted when scrolling to the bottom of long texts
Reviewed-by: Eskil
Signed-off-by: Aleksandar Stojiljkovic <aleksandar.stojiljkovic@nokia.com>
6 years agoUse QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFT
Aleksandar Stojiljkovic [Thu, 8 Sep 2011 09:00:41 +0000 (12:00 +0300)]
Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFT

Task-number: QTBUG-21162 - Letters get truncated when font size=72 and set to Italic
Reviewed-by: Eskil
6 years agoReset trailingSpaces in relayout
Jiang Jiang [Fri, 9 Sep 2011 08:52:40 +0000 (10:52 +0200)]
Reset trailingSpaces in relayout

Reviewed-by: TrustMe
6 years agoPrevent QPixmapCache potentially growing indefinitely.
Samuel Rødal [Fri, 9 Sep 2011 07:51:18 +0000 (09:51 +0200)]
Prevent QPixmapCache potentially growing indefinitely.

QPixmapCache has until now refused to throw out shared pixmaps, i.e.
ones that still have shallow copies lying around. This leads to problems
when someone inserts two shallow copies using different keys, causing
the cache itself containing multiple shallow copies and thus forever
refusing to throw out those entries.

It's rather easy for this to accidentally happen in a user application
since QPixmap::load() or QPixmap(const QString &fileName, ...)
automatically cache the pixmap in the QPixmapCache, thus if the user
then calls QPixmapCache::insert() on the same pixmap or a shallow copy
it is locked in the QPixmapCache forever.

The only reason for not throwing out a pixmap that's shared would be to
prevent re-loading a pixmap from file when a user has a direct reference
to it in his application, but in that case the user is unlikely to
re-load the pixmap from file in any case. Therefore it seems the best
fix is to get rid of this limitation.

Task-number: QTBUG-21359
Reviewed-by: John Brooks
Reviewed-by: Olivier Goffart
6 years agoAllocate 16-byte aligned memory independent of platform for raster pool.
Samuel Rødal [Thu, 8 Sep 2011 11:10:47 +0000 (13:10 +0200)]
Allocate 16-byte aligned memory independent of platform for raster pool.

Fixes crash on MIPS (see original merge request
https://qt.gitorious.org/qt/qt/merge_requests/1366).

Reviewed-by: Olivier Goffart
6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Fri, 9 Sep 2011 06:19:06 +0000 (16:19 +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 double click and drag not extending word selection.

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team
aavit [Thu, 8 Sep 2011 19:42:55 +0000 (21:42 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team

6 years agoMerge remote-tracking branch 'qt-mainline/4.8'
aavit [Thu, 8 Sep 2011 19:42:31 +0000 (21:42 +0200)]
Merge remote-tracking branch 'qt-mainline/4.8'

Conflicts:
tools/qvfb/qvfbshmem.cpp

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 8 Sep 2011 16:27:12 +0000 (02:27 +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:
  Split CFLAGS from pkg-config properly
  Ensure that the proxystyle is used over the style's own functions
  runonphone: Add a missing space between a message and the file name
  Perl check for windows configure.
  QSettings: don't assume XDG_CONFIG_HOME is latin1-encoded
  QSettings: use the common appdata dir when bootstrapping qmake on win
  Replace explicit surrogate handlers by inline methods of QChar class

6 years agoqmake vcxproj generator: fix XML conversion for build events
Joerg Bornemann [Thu, 8 Sep 2011 15:44:05 +0000 (17:44 +0200)]
qmake vcxproj generator: fix XML conversion for build events

Task-number: QTBUG-20419
Reviewed-by: ossi
6 years agoFix trailing spaces problem by not adding it to QScriptLine.length
Jiang Jiang [Thu, 8 Sep 2011 14:31:53 +0000 (16:31 +0200)]
Fix trailing spaces problem by not adding it to QScriptLine.length

It seems to be the only sane way to fix it. Previous attempts to
fix it by compensating the trailing space width all failed in some
cases, one of the trickiest is when we are having embedded LTR text
that has trailing spaces in a RTL paragraph.

In this patch we leave line.length not including the trailing space
length, but saving it to a separated variable, so that we can always
add it back when needed (QTextLine::textLength() for instance).

It fixed all the problems in different alignments of both RTL and
LTR text. And no regression is found yet.

Reviewed-by: Eskil
6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Thu, 8 Sep 2011 10:16:03 +0000 (20:16 +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 RTL layout for fonts when non-printable character has an advance
  Fix regression in tst_qrawfont
  Make it compile on mac
  Fixed compiling error in qvfb.
  micro optimizations
  fix "comparison between signed and unsigned" warnings
  on windows, don't resolve the gdi32's symbols for each QRawFont instance
  fix typo in the docs
  QRawFont: add missed operator !=
  optimize QGlyphRun's operator == a bit
  QGlyphRun: make operator != inlined
  QGlyphRun: don't detach if the decoration wasn't actually changed

6 years agoFix RTL layout for fonts when non-printable character has an advance
John Tapsell [Thu, 8 Sep 2011 08:14:33 +0000 (10:14 +0200)]
Fix RTL layout for fonts when non-printable character has an advance

If a non-printable character has an advance, we would lay out the text
as if the character was part of the output, and then ignore the
character later when the text was rendered. To fix cases such as this,
we take the dontPrint attribute into consideration when adjusting the
advances.

Task-number: QTBUG-21347
Reviewed-by: Eskil
Reviewed-by: Lars
6 years agoFix regression in tst_qrawfont
Eskil Abrahamsen Blomfeldt [Thu, 8 Sep 2011 07:01:43 +0000 (09:01 +0200)]
Fix regression in tst_qrawfont

Change 4d8cd11179e6cca162efe650d308124dc7aefb14 broke QRawFont on
Windows by removing some code. After the font has been renamed, we need
to use the new font tables rather than the old ones for registering the
font in the system.

Reviewed-by: aavit
6 years agoFix double click and drag not extending word selection.
Andrew den Exter [Thu, 8 Sep 2011 02:28:49 +0000 (12:28 +1000)]
Fix double click and drag not extending word selection.

mousePressed isn't set on the second press of a double click and so
can't be used to determine if all selections should be skipped.  Instead
skip only the single click and drag selections if mousePressed is false.

Change-Id: I5e7ba033f38b0f9b98fdca5c61a8548f92991601
Task-number: QTBUG-20925
Reviewed-by: Martin Jones
6 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Thu, 8 Sep 2011 01:54:18 +0000 (11: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:
  Dragging in nested views no longer works as expected
  Fix implicit height not growing when pre-edit text wraps.
  Fix leak in State element.
  Fix leak in bindings created by PropertyChanges.

6 years agoSplit CFLAGS from pkg-config properly
Jan Arne Petersen [Wed, 7 Sep 2011 19:38:21 +0000 (21:38 +0200)]
Split CFLAGS from pkg-config properly

Add support for DEFINES and INCLUDEPATH to link_pkgconfig so moc uses
the cflags properly.

Task-number: QTBUG-19922
Merge-request: 2674
Reviewed-by: ossi
6 years agoEnsure that the proxystyle is used over the style's own functions
Andy Shaw [Wed, 7 Sep 2011 18:40:48 +0000 (20:40 +0200)]
Ensure that the proxystyle is used over the style's own functions

When calling a style function such as pixelMetric() then this should be
done via the proxy style and not on the style directly.  This is so that
the proxy style always has a chance to override the original style's
implementation and still preserve the fallback to the base style.

Task-number: QTBUG-20849
Merge-request: 2645
Reviewed-by: olivier
6 years agorunonphone: Add a missing space between a message and the file name
Martin Storsjo [Wed, 7 Sep 2011 18:28:31 +0000 (20:28 +0200)]
runonphone: Add a missing space between a message and the file name

Merge-request: 2670
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoPerl check for windows configure.
Markku Heikkila [Wed, 7 Sep 2011 18:08:34 +0000 (20:08 +0200)]
Perl check for windows configure.

Works for Windows, *nix check is done by bash shell.

Task-number: QTBUG-5710
Merge-request: 1362
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoQSettings: don't assume XDG_CONFIG_HOME is latin1-encoded
Konstantin Ritt [Wed, 7 Sep 2011 17:51:24 +0000 (19:51 +0200)]
QSettings: don't assume XDG_CONFIG_HOME is latin1-encoded

use QFile::decodeName() instead

Merge-request: 1341
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoQSettings: use the common appdata dir when bootstrapping qmake on win
Konstantin Ritt [Wed, 7 Sep 2011 17:51:23 +0000 (19:51 +0200)]
QSettings: use the common appdata dir when bootstrapping qmake on win

QSystemLibrary doesn't depend on QObject, so nothing could stop us

Merge-request: 1341
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Wed, 7 Sep 2011 16:13:46 +0000 (02:13 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

6 years agoMerge fixes for QDir::operator==
Shane Kearns [Tue, 6 Sep 2011 15:43:29 +0000 (16:43 +0100)]
Merge fixes for QDir::operator==

There were two fixes in 4.8 which each fixed a part of the problem.
Comparing canonical paths is more correct, but is only possible where
both directories exist. If neither directory exists, then compare
absolute paths instead.
Changed a regression test, because /tmp is a symbolic link on MacOS.
I.E. "/tmp/.." is canonically "/private" and not "/" as expected.

Task-Number: QTBUG-20495
Reviewed-By: joao
6 years agoReplace explicit surrogate handlers by inline methods of QChar class
suzuki toshiya [Wed, 7 Sep 2011 09:58:54 +0000 (11:58 +0200)]
Replace explicit surrogate handlers by inline methods of QChar class

Merge-request: 1284
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Wed, 7 Sep 2011 09:37:21 +0000 (19:37 +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 build for desktop
  Fix the build with -qtnamespace configure options

6 years agofix build for desktop
Konstantin Ritt [Wed, 7 Sep 2011 01:16:36 +0000 (05:16 +0400)]
fix build for desktop

QTBUG: 20236

Merge-request: 2672
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
6 years agoMake it compile on mac
aavit [Wed, 7 Sep 2011 06:34:23 +0000 (08:34 +0200)]
Make it compile on mac

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
Qt Continuous Integration System [Wed, 7 Sep 2011 02:57:33 +0000 (12:57 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
  Updated WebKit to a2bd2bb (qtwebkit-2.2-week35)

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 7 Sep 2011 01:28:23 +0000 (11:28 +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:
  Dragging in nested views no longer works as expected
  Fix implicit height not growing when pre-edit text wraps.
  Fix leak in State element.
  Fix leak in bindings created by PropertyChanges.

6 years agoDragging in nested views no longer works as expected
Martin Jones [Wed, 7 Sep 2011 00:44:01 +0000 (10:44 +1000)]
Dragging in nested views no longer works as expected

The detection of a replay event doesn't work if the release event is
not handled due to a parent grabbing the mouse.  Use the
spontaneous() flag to determine if we are dealing with a replay
event.

Change-Id: I36e39e6ad8e426bd5f5f2a013aa236aac34ba5cc
Task-number: QTBUG-21219
Reviewed-by: Michael Brasser
6 years agoMerge remote-tracking branch 'qt-air-review/master'
Sergio Ahumada [Tue, 6 Sep 2011 16:19:00 +0000 (18:19 +0200)]
Merge remote-tracking branch 'qt-air-review/master'

6 years agoQSslCertificate: block all DigiNotar (intermediate and root) certs
Peter Hartmann [Mon, 5 Sep 2011 10:53:49 +0000 (12:53 +0200)]
QSslCertificate: block all DigiNotar (intermediate and root) certs

and do not only check leaf certificates, but all intermediates and
the root. Tested manually with the cross-signed intermediates.

Reviewed-by: Richard J. Moore <rich@kde.org>
6 years agoFix the build with -qtnamespace configure options
suzuki toshiya [Sat, 3 Sep 2011 14:20:46 +0000 (23:20 +0900)]
Fix the build with -qtnamespace configure options

Merge-Request: 1291
Reviewed-by: Liang Qi <liang.qi@nokia.com>
6 years agoMerge remote-tracking branch 'qt-fire-team/master'
aavit [Tue, 6 Sep 2011 13:03:50 +0000 (15:03 +0200)]
Merge remote-tracking branch 'qt-fire-team/master'

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
Qt Continuous Integration System [Tue, 6 Sep 2011 10:57:47 +0000 (20:57 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
  Updated WebKit to fb3b4700aa5abbb2db471b4f0eb7946ce4850cc4

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team
Qt Continuous Integration System [Tue, 6 Sep 2011 10:38:18 +0000 (20:38 +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:
  Updated WebKit to a2bd2bb (qtwebkit-2.2-week35)

6 years agoUpdated WebKit to a2bd2bb (qtwebkit-2.2-week35)
Ademar de Souza Reis Jr [Mon, 5 Sep 2011 21:43:21 +0000 (18:43 -0300)]
Updated WebKit to a2bd2bb (qtwebkit-2.2-week35)

Changes since last sync:
    [https://webkit.org/b/66016 #66016]: [Qt] Add test for correct order of load signals in QWebPage
    [https://webkit.org/b/28851 #28851]: Emit last progress notification before calling dispatchDidFinishLoad
    [https://webkit.org/b/67285 #67285]: [Qt] Unskip API test for load signals order
    [https://webkit.org/b/67307 #67307]: [Qt][Symbian] REGRESSION(93235) Missing .def update
    [https://webkit.org/b/49448 #49448]: (restricted bug)
    [https://webkit.org/b/64737 #64737]: (restricted bug)
    [https://webkit.org/b/64741 #64741]: (restricted bug)
    [https://webkit.org/b/66015 #66015]: (restricted bug)
    [https://webkit.org/b/66141 #66141]: (restricted bug)
    [https://webkit.org/b/66360 #66360]: (restricted bug)
    [https://webkit.org/b/66699 #66699]: (restricted bug)
    [https://webkit.org/b/66799 #66799]: (restricted bug)
    [https://webkit.org/b/67556 #67556]: (restricted bug)

6 years agoMerge remote-tracking branch 'qt-air-review/master'
Sergio Ahumada [Tue, 6 Sep 2011 10:04:59 +0000 (12:04 +0200)]
Merge remote-tracking branch 'qt-air-review/master'

6 years agoFix implicit height not growing when pre-edit text wraps.
Andrew den Exter [Tue, 6 Sep 2011 00:28:38 +0000 (10:28 +1000)]
Fix implicit height not growing when pre-edit text wraps.

QTextDocument::isEmpty() doesn't account for pre-edit text so use the
return value of size() to determine if implicitHeight should fall back
to the font height instead.

Change-Id: I028552a7646372b22894c45946a57ec4951b044a
Task-number: QTBUG-21288
Reviewed-by: Martin Jones
6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 5 Sep 2011 23:58:29 +0000 (09:58 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Removed the unnecessary dependency of the QtHelp module on the QtXml one

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team
Qt Continuous Integration System [Mon, 5 Sep 2011 18:17:09 +0000 (04:17 +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: (179 commits)
  Updated WebKit to fb3b4700aa5abbb2db471b4f0eb7946ce4850cc4
  Doc: added since tag to QDateTime::msecsTo
  QDeclarative::hasActiveFocus should return false for hidden items
  FocusScope's focusItem must always be a descendent
  Fix conversion of QAbstractItemModel::rowsMoved() parameters
  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.
  uikit: get rid of the "min 30fps" for event handling.
  uikit: update README
  QWindowsStyle: fix bug in eventFilter on KeyPressed event with alt pressed: incorrect work with list
  Crash when creating scroll bar skin graphics on S60 (debug only)
  ...

6 years agoRemoved the unnecessary dependency of the QtHelp module on the QtXml one
Constantin Makshin [Mon, 5 Sep 2011 17:43:00 +0000 (19:43 +0200)]
Removed the unnecessary dependency of the QtHelp module on the QtXml one

Merge-request: 2669
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoRestore Qt4.7 behaviour of QFileInfo::absolute(File)Path
Shane Kearns [Fri, 2 Sep 2011 17:40:45 +0000 (18:40 +0100)]
Restore Qt4.7 behaviour of QFileInfo::absolute(File)Path

Many applications relied on the undefined behaviour that the
filesystem engines returned clean paths (despite the documentation
stating that they may not), and consequently suffered regressions with
Qt 4.8.

Unix paths are once again cleaned if necessary.
Windows/Symbian paths were already cleaned, but now use the utility
function to check if a path is dirty, to avoid duplicated code.

Task-number: QTBUG-19995
Change-Id: If8c18469f149291c9d079ae3da23bc2087bbd49a
Reviewed-on: http://codereview.qt.nokia.com/4154
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
6 years agoFix compile error on MSVC2008
Shane Kearns [Fri, 2 Sep 2011 17:39:16 +0000 (18:39 +0100)]
Fix compile error on MSVC2008

Change-Id: I4f6192b9db601076688b52bfd794ea80a7346729
Reviewed-on: http://codereview.qt.nokia.com/4153
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
6 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Sat, 3 Sep 2011 10:24:11 +0000 (20:24 +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: (33 commits)
  Revert readonly BorderImage::sourceSize change
  URLs used with scheme handler use appropriate encoding for scheme
  Fix memory leak in ListModel custom parser
  DEF file update
  If automatic translation of input widget is off, skip reset
  Prevent leakage of native window handles
  QSslCertificate: blacklist fraudulent *.google.com
  Symbian: Not possible to catch RequestSoftwareInputPanel in eventFilter
  Added an additional check to workaround an issue on Windows.
  Exact word bubble doesn't disappear when screen is tapped (fix part 2)
  Exact word bubble doesn't disappear when screen is tapped
  Compile fix for Symbian 5th and earlier
  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
  Make text rendering working outside the gui thread on Symbian.
  Fix softkeys cleanup
  Fix clientRect usage in QWidgetPrivate::setGeometry_sys()
  Do not allow fullscreen/maximized windows to expand beyond client rect
  ...

6 years agoMerge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7
Liang Qi [Sat, 3 Sep 2011 09:38:54 +0000 (11:38 +0200)]
Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7

Conflicts:
tools/qdoc3/htmlgenerator.cpp

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Sat, 3 Sep 2011 01:03:03 +0000 (11:03 +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:
  Modified \since command behavior slightly to handle project and version.

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
Qt Continuous Integration System [Fri, 2 Sep 2011 19:29:48 +0000 (05:29 +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:
  Update license headers
  Silently ignore a wrong parameter count instead of crashing
  Introducing --address <bus> parameter to qdbus
  Introduce menubar plugin system
  Introduce QAbstractPlatformMenuBar
  Hide Q<Platform>MenuAction
  Fix warning about initialization order

6 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Fri, 2 Sep 2011 16:08:26 +0000 (02:08 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

6 years agoFixed compiling error in qvfb.
luohua [Fri, 2 Sep 2011 14:47:56 +0000 (16:47 +0200)]
Fixed compiling error in qvfb.

Merge-request: 1324
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
6 years agoModified \since command behavior slightly to handle project and version.
David Boddie [Thu, 30 Jun 2011 17:08:43 +0000 (19:08 +0200)]
Modified \since command behavior slightly to handle project and version.

(The since argument can contain a project name and version, defaulting
to the qdoc project if only a version number is specified.)
Refactored common code into the Generator class.
Fixed \sincelist HTML generation for tables containing only one item.
(cherry picked from commit 6a2f18140bbc41207eb2f5e2323b699600d89606)

Reapplied after bad v4.7.4 merge

6 years agoMerge remote-tracking branch 'origin/4.8'
Liang Qi [Fri, 2 Sep 2011 13:19:53 +0000 (15:19 +0200)]
Merge remote-tracking branch 'origin/4.8'

6 years agoFix comparison of absolute, unclean paths in QDir
Shane Kearns [Thu, 1 Sep 2011 14:04:33 +0000 (15:04 +0100)]
Fix comparison of absolute, unclean paths in QDir

QDir::operator== was creating a clean absolute path for comparison
purposes if the original path was relative.
However original absolute paths were trusted, even though they could
be unclean. Now they are checked for cleanliness first.

Task-Number: QTBUG-19995
Task-Number: QTBUG-20495
Change-Id: I047a1a40ae5151e4604085e4ac87f30a4e4979c4
Reviewed-on: http://codereview.qt.nokia.com/4099
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
6 years agomicro optimizations
Konstantin Ritt [Fri, 2 Sep 2011 11:58:57 +0000 (13:58 +0200)]
micro optimizations

use an inlined version of isValid() everywhere;
don't detach where is non required;
get rid of extra checks where possible

Merge-request: 1343
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
6 years agofix "comparison between signed and unsigned" warnings
Konstantin Ritt [Fri, 2 Sep 2011 11:58:51 +0000 (13:58 +0200)]
fix "comparison between signed and unsigned" warnings

Merge-request: 1343
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
6 years agoon windows, don't resolve the gdi32's symbols for each QRawFont instance
Konstantin Ritt [Fri, 2 Sep 2011 11:58:46 +0000 (13:58 +0200)]
on windows, don't resolve the gdi32's symbols for each QRawFont instance

Merge-request: 1343
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
6 years agofix typo in the docs
Konstantin Ritt [Fri, 2 Sep 2011 11:58:40 +0000 (13:58 +0200)]
fix typo in the docs

Merge-request: 1343
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
6 years agoQRawFont: add missed operator !=
Konstantin Ritt [Fri, 2 Sep 2011 11:58:35 +0000 (13:58 +0200)]
QRawFont: add missed operator !=

Merge-request: 1343
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
6 years agooptimize QGlyphRun's operator == a bit
Konstantin Ritt [Fri, 2 Sep 2011 11:35:18 +0000 (13:35 +0200)]
optimize QGlyphRun's operator == a bit

Merge-request: 2652
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
6 years agoQGlyphRun: make operator != inlined
Konstantin Ritt [Fri, 2 Sep 2011 11:35:12 +0000 (13:35 +0200)]
QGlyphRun: make operator != inlined

Merge-request: 2652
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
6 years agoQGlyphRun: don't detach if the decoration wasn't actually changed
Konstantin Ritt [Fri, 2 Sep 2011 11:35:07 +0000 (13:35 +0200)]
QGlyphRun: don't detach if the decoration wasn't actually changed

Merge-request: 2652
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Fri, 2 Sep 2011 11:15:03 +0000 (21:15 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
  Added an additional check to workaround an issue on Windows.

6 years agoAdded an additional check to workaround an issue on Windows.
David Boddie [Wed, 1 Jun 2011 12:11:09 +0000 (14:11 +0200)]
Added an additional check to workaround an issue on Windows.

Reviewed-by: David Boddie
Original-patch-by: Friedemann Kleint
(cherry picked from commit 8b1654ec6a892e84c1654c9196e80461ee6e92fa)

6 years agoWrap calls to Sequence::push_back
João Abecasis [Fri, 26 Aug 2011 13:43:06 +0000 (15:43 +0200)]
Wrap calls to Sequence::push_back

In C++11 push_back is overloaded to support rvalue-references,

   void std::vector<T>::push_back(const T &);
   void std::vector<T>::push_back(T &&);

so attempting to get the address for push_back is ambiguous.

Instead of hardcoding the function signature, the better and more
general solution is to allow the compiler to do the required overload
resolution itself, also allowing for implicit conversions to take place.

Task-number: QTBUG-18996
Done-with: Liang Qi
Reviewed-by: Olivier Goffart
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 2 Sep 2011 08:00:14 +0000 (18:00 +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:
  URLs used with scheme handler use appropriate encoding for scheme

6 years agoFix leak in State element.
Michael Brasser [Thu, 1 Sep 2011 23:45:16 +0000 (09:45 +1000)]
Fix leak in State element.

If a state was destroyed while active, it would leak bindings.

Task-number: QTBUG-21194
Reviewed-by: Aaron Kennedy
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Fri, 2 Sep 2011 04:14:33 +0000 (14:14 +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:
  Revert readonly BorderImage::sourceSize change

6 years agoFix leak in bindings created by PropertyChanges.
Michael Brasser [Thu, 1 Sep 2011 23:14:33 +0000 (09:14 +1000)]
Fix leak in bindings created by PropertyChanges.

Change-Id: I1c7b575e1ace2b879dba130cd31e3ff8cf67260a
Task-number: QTBUG-17770
Reviewed-by: Aaron Kennedy
6 years agoRevert readonly BorderImage::sourceSize change
Martin Jones [Thu, 1 Sep 2011 23:04:37 +0000 (09:04 +1000)]
Revert readonly BorderImage::sourceSize change

Revert a32728ce8cf4fa1d1dc1001b1fadc66e9c86e025
Writing to BorderImage sourceSize has never been allowed and issued
a warning, however this should not have been enforced in a patch
release.

Change-Id: I8f8d10e6ccd4e771fd38a27ce9d68f921b761d96
Task-number: QTTH-1501

6 years agoURLs used with scheme handler use appropriate encoding for scheme
mread [Thu, 1 Sep 2011 13:11:33 +0000 (14:11 +0100)]
URLs used with scheme handler use appropriate encoding for scheme

URLs passed to scheme handler always used to use raw encoding.
That broke URLs containing spaces passed to the browser.

Then QTBUG-18772 changed it so that they always used % encoding.
That broke URLs containing spaces used to open files, resulting
in QTBUG-21209.

This change fixes it so that web URLs are % encoded and file
URLs are raw encoded.

Task-number: QTBUG-21209
Reviewed-by: Honglei Zhang
6 years agoMerge branch 4.8 into qt-4.8-from-4.7
Sergio Ahumada [Thu, 1 Sep 2011 10:45:36 +0000 (12:45 +0200)]
Merge branch 4.8 into qt-4.8-from-4.7

Conflicts:
    tools/qdoc3/ditaxmlgenerator.cpp
    tools/qdoc3/htmlgenerator.cpp

6 years agoMerge branch 4.7 into qt-4.8-from-4.7
Sergio Ahumada [Thu, 1 Sep 2011 10:32:03 +0000 (12:32 +0200)]
Merge branch 4.7 into qt-4.8-from-4.7

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Thu, 1 Sep 2011 08:52:56 +0000 (18:52 +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: (75 commits)
  Update license headers
  Fix build with Clang for libpng versions 1.4.0 to 1.5.2
  Silently ignore a wrong parameter count instead of crashing
  Introducing --address <bus> parameter to qdbus
  Fix Symbian system date format parsing.
  Fix QXmlSimpleReader auto test failer
  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
  qdoc3: Updates to qdoc to print error message in ALL CAPS
  Fix pointer event mapping when windows are fixed to native orientation
  Do not unconditionally use pkg-config in .pro files
  Updated WebKit to dda59e50379214c098f365a39c4d64b39ced427e
  Updated WebKit to 85d4df147ac7b239497b05979a51fd6fde7580fd
  Updated WebKit to 836fa24be73978fb292e954abb151fb46b1d97e0
  Doc: Added a note to Code Editor example docs
  ...

6 years agoUpdate license headers
Gabriel de Dietrich [Thu, 1 Sep 2011 08:35:23 +0000 (10:35 +0200)]
Update license headers

This ammends commit 9aeadca09ab4e27ebf299873f90490d585b4fb7f

Reviewed-by: Frederik Gladhorn
Merge-request: 1254

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 1 Sep 2011 04:27:51 +0000 (14:27 +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:
  Fix memory leak in ListModel custom parser

6 years agoFix memory leak in ListModel custom parser
Bea Lam [Thu, 1 Sep 2011 04:00:16 +0000 (14:00 +1000)]
Fix memory leak in ListModel custom parser

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

(Commit backported from c1491c356f3cca92a359468ce37f38bc1873eec4
in qt-qml-staging)

Task-number: QTBUG-21084
Change-Id: I36ca0ffba1a94355abe42a95e49723548d9a575a
Reviewed-by: Michael Brasser
6 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Wed, 31 Aug 2011 23:00:13 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

6 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 21:13:57 +0000 (07:13 +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:
  Designer: Fix static linking.

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 31 Aug 2011 16:54:52 +0000 (02:54 +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:
  DEF file update
  If automatic translation of input widget is off, skip reset
  Prevent leakage of native window handles

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Wed, 31 Aug 2011 16:34:02 +0000 (02:34 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (25 commits)
  qdoc3: Updates to qdoc to print error message in ALL CAPS
  Doc: Added a note to Code Editor example docs
  Doc: QItemDelegate->QStyledItemDelegate in Star Delegate docs
  Doc: Added a link in Symbian Intro to Required Capabilities
  Doc: Added info on ordered targets for VS to qmake manual
  Doc: Small addition to the QML anchor layout docs
  Doc: Internalized QDeclarativeTypeLoader
  Doc: Said that QIODevice::isSequential returns false by default
  Doc: Said that QList::clear deallocates memory
  Doc: Updated platform notes for MultiMedia and Phonon
  Doc: Added links to the plugin deployment guide.
  Doc: Fix doc bug in QMouseEvent
  Doc: Fixed doc bug in QMetaObject
  Doc: Fixed date format doc bug in QDateTime/Qt namespace
  Doc: Removed internal Phonon classes from doce
  qdoc3: Updates for QTBUG-20776; include fileToOpen path.
  qdoc3: Updates for QTBUG-20776; clear map between runs.
  qdoc3: Updates for QTBUG-20739 (no read-only for QML components)
  qdoc3: Updates for QTBUG-20776 and QTBUG-20777
  qdoc: Check pointer for null before dereferencing.
  ...

6 years agoDEF file update
Gareth Stockwell [Wed, 31 Aug 2011 16:10:44 +0000 (17:10 +0100)]
DEF file update

Reviewed-by: TrustMe
6 years agoDesigner: Fix static linking.
Jarek Kobus [Wed, 31 Aug 2011 14:11:47 +0000 (16:11 +0200)]
Designer: Fix static linking.

Fix a regression introduced by change
e7762b60d519c9ae4b47f6c4ceece584408247ea working
around an issue caused by changing the behaviour of qFindChild<> in
99160bb9f851bf02fe5345b5f52217b6c77a57c4.

Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com>
Task-number: QTBUG-21173

6 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 12:20:26 +0000 (22:20 +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 build with Clang for libpng versions 1.4.0 to 1.5.2

6 years agoMerge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7
Sergio Ahumada [Wed, 31 Aug 2011 11:54:04 +0000 (13:54 +0200)]
Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7

Conflicts:
src/network/ssl/qsslcertificate.cpp

6 years agoMerge branch 'qt-4.7' into 4.7
Liang Qi [Wed, 31 Aug 2011 11:15:17 +0000 (13:15 +0200)]
Merge branch 'qt-4.7' into 4.7

Conflicts:
src/gui/inputmethod/qcoefepinputcontext_s60.cpp

6 years agoFix build with Clang for libpng versions 1.4.0 to 1.5.2
Tor Arne Vestbø [Tue, 30 Aug 2011 14:15:07 +0000 (16:15 +0200)]
Fix build with Clang for libpng versions 1.4.0 to 1.5.2

Versions 1.4.0 to 1.5.2 of libpng declare png_longjmp_ptr to
have a noreturn attribute if PNG_PEDANTIC_WARNINGS_SUPPORTED
is enabled, but most declarations of longjmp in the wild do
not add this attribute. This causes problems when the png_jmpbuf
macro expands to calling png_set_longjmp_fn with a mismatched
longjmp, as compilers such as Clang will treat this as an error.

To work around this we override the png_jmpbuf macro to cast
longjmp to a png_longjmp_ptr.

See also http://llvm.org/bugs/show_bug.cgi?id=10338

Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
6 years agoSilently ignore a wrong parameter count instead of crashing
Peter Grasch [Wed, 31 Aug 2011 09:32:00 +0000 (11:32 +0200)]
Silently ignore a wrong parameter count instead of crashing

Merge-request: 1363
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
6 years agoIntroducing --address <bus> parameter to qdbus
Peter Grasch [Wed, 31 Aug 2011 09:31:59 +0000 (11:31 +0200)]
Introducing --address <bus> parameter to qdbus

Merge-request: 1363
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
6 years agoMerge branch '4.8' into water-team-master
Frederik Gladhorn [Wed, 31 Aug 2011 09:24:58 +0000 (11:24 +0200)]
Merge branch '4.8' into water-team-master

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Sami Merila [Wed, 31 Aug 2011 09:23:33 +0000 (12:23 +0300)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7

6 years agoIf automatic translation of input widget is off, skip reset
Sami Merila [Wed, 31 Aug 2011 09:21:15 +0000 (12:21 +0300)]
If automatic translation of input widget is off, skip reset

If there is an existing transformataion in use and application has
indicated that it won't use automatic translation of input widget
when using spliview, do not reset the transformation as this will
also remove the original transformation.

Task-number: QT-5225
Reviewed-by: Miikka Heikkinen