qt:qt.git
11 years agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Liang Qi [Fri, 29 Jul 2011 15:43:07 +0000 (17:43 +0200)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
src/gui/text/qfont_s60.cpp

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Thu, 28 Jul 2011 13:31:14 +0000 (23:31 +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 binary search in QTextEngine::findItem

11 years agoRevert binary search in QTextEngine::findItem
Jiang Jiang [Thu, 28 Jul 2011 12:15:28 +0000 (14:15 +0200)]
Revert binary search in QTextEngine::findItem

It's part of c9607f069f0fb98021daf0af9f1d1b2981018e0c which caused
crash in certain cases.

Task-number: QTBUG-17209
Reviewed-by: Gunnar Sletta
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 27 Jul 2011 16:08:55 +0000 (02:08 +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:
  Remove a duplicate include line

11 years agoRemove a duplicate include line
Liang Qi [Wed, 27 Jul 2011 13:59:02 +0000 (15:59 +0200)]
Remove a duplicate include line

Build Qt 4.7 for Symbian on Mac/gcce again.

Reviewed-by: Honglei Zhang
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 27 Jul 2011 12:12:04 +0000 (22:12 +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:
  Save previous font engine for right bearing adjustment
  Fix compilation under OSX 10.7 or using llvm-gcc.
  Fix typo in QFontDialog docs
  Reset previousGlyph once we reached a new text item

11 years agoSave previous font engine for right bearing adjustment
Jiang Jiang [Wed, 27 Jul 2011 08:42:40 +0000 (10:42 +0200)]
Save previous font engine for right bearing adjustment

In last fix I forgot that fd818312 was for saving and restoring the
right bearing (of last visible glyph) when a LineSeparator was hit
(which can have a different font engine but usually not visble),
thus we can't reset previousGlyph in that case. To make sure we
still get correct right bearing from the font engine used to shape
previousGlyph, we need to save that font engine as well. It does
make the code more complicated than simply saving the right bearing
when a QScriptItem boundary is hit, so hopefully it's an optimization
worth to be made (following e1915815).

Task-number: QTBUG-20423
Reviewed-by: Eskil
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 27 Jul 2011 08:19:46 +0000 (18:19 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Symbian^3 workaround: Avoid usage of linked fonts.

11 years agoSymbian^3 workaround: Avoid usage of linked fonts.
Alessandro Portale [Mon, 25 Jul 2011 14:22:22 +0000 (16:22 +0200)]
Symbian^3 workaround: Avoid usage of linked fonts.

"Linked Fonts" are a new feature in Symbian^3, first used in SR11.1.
This patch prevents Qt from using linked fonts in any way.

Avkon based applications benefit from Linked Fonts because they can now
transparently render multi-script text, e.g. Latin/Chinese/Japanese (Qt
does that by its own and calls the feature 'font merging'). From Qt's
poing of view, Linked Fonts are a severe regression in Symbian's API.
1 Font table Api for linked fonts is extremely slow
2 'cmap' tables do not seem to reflect the "linkage", causing garbled
  text or crashes.
3 Linked fonts appear with cryptic type face names, and are redundant
  since they are just compounds of the other, real fonts.

This patch adds a detection of Linked Fonts using
CLinkedTypefaceSpecification and prevents their inclusion into
QFontDataBase. Furthermore, it detects if the Symbian System font is a
Linked font and if needed tries to fall back to a classical Symbian
system font, e.g. "Nokia Sans S60" or "Series 60 Sans". Fallback to
"Pure" will need to be added, later on.

Task-Number: QTBUG-20007
Co-authored-by: Miklos Vlasa
Reviewed-by: mread <qt-info@nokia.com>
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Tue, 26 Jul 2011 23:34:47 +0000 (09:34 +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:
  Make it possible to update a related table after an external update

11 years agoMake it possible to update a related table after an external update
Andy Shaw [Fri, 3 Jun 2011 06:17:40 +0000 (08:17 +0200)]
Make it possible to update a related table after an external update

When a table that is related to in a QSqlRelationalTableModel gets
updated in some way (e.g. a new row, or the data is changed) then the
related model could not be updated without recreating the
QSqlRelationalTableModel.

Now, to get around this, select() can be called on the related model to
get it to be updated.

Task-number: QTBUG-7885
Reviewed-by: Charles Yin
Reviewed-by: Michael Goddard
Change-Id: Ic589e840234f3a809bcb112a807a87afe0bc25ca

11 years agoFix compilation under OSX 10.7 or using llvm-gcc.
Mike McQuaid [Tue, 26 Jul 2011 11:43:48 +0000 (13:43 +0200)]
Fix compilation under OSX 10.7 or using llvm-gcc.

Use correct error codes instead of type errors.
Thanks to Dylan Luke <lukes.dylan@gmail.com> for this patch.

Merge-request: 1304
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
Qt Continuous Integration System [Tue, 26 Jul 2011 04:34:17 +0000 (14:34 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
  Add test case name and drop parentheses for -datatags option.
  Adding QTDIR validation in tst_symbols autotest
  Disabled benchmarks referring to private headers.
  Add license header to printdatatags autotests
  Compile on symbian^3
  Compile on Symbian^3.
  Added -datatags option to QTestLib
  Fixed failure of tst_qxmlquery::evaluateToReceiver

11 years agoAdd test case name and drop parentheses for -datatags option.
Jo Asplin [Thu, 30 Jun 2011 11:34:36 +0000 (13:34 +0200)]
Add test case name and drop parentheses for -datatags option.

For completeness, the -datatags command-line option in QTestLib
now prints the test case name at the start of each output line.

NOTE: Although the file name is supposed to match the
lower-case version of the test case name, this is currently
not true in all cases (particularly not under tests/benchmarks).
Even if there was a script to enforce this convention,
the -datatags option now provides this information in a reliable way.

This patch also drops the parentheses after the test function
as these are always empty anyway.

Data tags for each test function (f() in this case) are printed in
four different ways depending on the presence of local and global
data tags:

Case 1: No tags:
tst_MyTestCase f

Case 2: Local tags only:
tst_MyTestCase f local tag 1
tst_MyTestCase f local tag 2
...

Case 3: Global tags only:
tst_MyTestCase f __global__ global tag 1
tst_MyTestCase f __global__ global tag 2
...

Case 4: Local and global tags:
tst_MyTestCase f local tag 1 __global__ global tag 1
tst_MyTestCase f local tag 2 __global__ global tag 1
...
tst_MyTestCase f local tag 1 __global__ global tag 2
tst_MyTestCase f local tag 2 __global__ global tag 2
...
...

Change-Id: Id9273039a5d33527c32abf6eb1baef80193fa585
Reviewed-by: Rohan McGovern
11 years agoAdding QTDIR validation in tst_symbols autotest
Sergio Ahumada [Wed, 29 Jun 2011 08:20:48 +0000 (10:20 +0200)]
Adding QTDIR validation in tst_symbols autotest

If the variable QTDIR is not set, you might end up checking
all the system libraries symbols.

Change-Id: I7b079d7e10fccad962cd3b2ced317eb35840bd71
Reviewed-by: Rohan McGovern
11 years agoDisabled benchmarks referring to private headers.
Jo Asplin [Mon, 27 Jun 2011 11:10:03 +0000 (13:10 +0200)]
Disabled benchmarks referring to private headers.

Certain benchmarks that referred to private
headers are removed from the list of 'trusted'
benchmarks.

Benchmarks referring to private headers are considered
bad practice for several reasons:

1) Such tests won't even build if private headers
   are not avaiable in the installed version of Qt.
2) APIs should be designed well enough to be fully
   testable through its public headers only.

Change-Id: Iccd81e12829a7b7f4bd2b88a72f3e9722520f6e2
Reviewed-by: Rohan McGovern
11 years agoAdd license header to printdatatags autotests
Sergio Ahumada [Mon, 27 Jun 2011 15:30:41 +0000 (17:30 +0200)]
Add license header to printdatatags autotests

11 years agoCompile on symbian^3
Jo Asplin [Mon, 27 Jun 2011 08:42:40 +0000 (10:42 +0200)]
Compile on symbian^3

Applies the fix of Commit 9c1e358df4b0af1a6299ea7932f8b2e8af840873
(review by Liang Qi) to four more test cases.

Change-Id: I1483d4b7c2aecde960af5d98fb8b772aeba20ec5
Reviewed-by: Sergio Ahumada
Reviewed-by: Liang Qi
11 years agoCompile on Symbian^3.
Jo Asplin [Wed, 22 Jun 2011 07:18:01 +0000 (09:18 +0200)]
Compile on Symbian^3.

Change-Id: Ie1f52be4e94ff1e51b9d5f47c75a8d2e8b7a63d4

11 years agoAdded -datatags option to QTestLib
jasplin [Wed, 8 Jun 2011 15:13:13 +0000 (17:13 +0200)]
Added -datatags option to QTestLib

Passing the -datatags option to a QTestLib program prints the available
data tags to standard output.

Data tags for each test function (f() in this case) are printed in
four different ways depending on the presence of local and global
data tags:

Case 1: No tags:
f()

Case 2: Local tags only:
f() local tag 1
f() local tag 2
...

Case 3: Global tags only:
f() __global__ global tag 1
f() __global__ global tag 2
...

Case 4: Local and global tags:
f() local tag 1 __global__ global tag 1
f() local tag 2 __global__ global tag 1
...
f() local tag 1 __global__ global tag 2
f() local tag 2 __global__ global tag 2
...
...

Reviewed-by: Rohan McGovern
Task-number: QTQAINFRA-226
Change-Id: I14de203b586a0085b8efda8e62772711e44677d2

11 years agoFixed failure of tst_qxmlquery::evaluateToReceiver
Rohan McGovern [Thu, 26 May 2011 07:01:33 +0000 (17:01 +1000)]
Fixed failure of tst_qxmlquery::evaluateToReceiver

Commit 8f95a19d330480bd86650c3d2e4e147d3bca5789 fixed the "missing Z"
of QDateTime::toString for Qt::ISODate (see QTBUG-9698).  The testdata
for this test should have been updated at the same time, but it was
forgotten.

Reviewed-by: Jason McDonald
Change-Id: I9b03519805533665afac15e0c970ac1c9e5d9ab4

11 years agoFix typo in QFontDialog docs
Jiang Jiang [Mon, 25 Jul 2011 14:16:50 +0000 (16:16 +0200)]
Fix typo in QFontDialog docs

Reviewed-by: TrustMe
11 years agoReset previousGlyph once we reached a new text item
Jiang Jiang [Mon, 25 Jul 2011 13:23:54 +0000 (15:23 +0200)]
Reset previousGlyph once we reached a new text item

The bug was introduced in fd818312. Before that, previousGlyph
is only saved in the same text item. After we moved it to
LineBreakHelper struct, it will cause crash if the font engine
in the new text item no longer contains the sub engine required
by previousGlyph.

Task-number: QTBUG-20243
Reviewed-by: Eskil
11 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Mon, 25 Jul 2011 12:09:48 +0000 (22:09 +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 compilation on Symbian platforms without SgImage support
  Fixed crash when loading 16 bits-per-pixel grayscale TIFs.

11 years agoMerge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7
Liang Qi [Mon, 25 Jul 2011 11:48:13 +0000 (13:48 +0200)]
Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7

Conflicts:
src/opengl/qpixmapdata_symbiangl.cpp

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Sat, 23 Jul 2011 01:33:38 +0000 (11:33 +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:
  Build Qt for Symbian on Mac/gcce again

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
Qt Continuous Integration System [Fri, 22 Jul 2011 20:11:20 +0000 (06:11 +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:
  Remove testing for Hide of mainwindow.
  Fix accessibility test for QWS.
  Fix test for win and mac.
  Add constants to QAccessible::Event enum.
  Call QAccessible::updateAccessibility when setText is called on QLabel
  Fix autotest for accessible tables.
  Style cleanup - space after flow control keywords.
  Add IAccessible2 table2 implementation.
  Fix a crash with QGraphicsScene.
  Use name for combobox on Unix.
  QProgressBar: transparent background on Windows Vista (partId: PP_BAR -> PP_TRANSPARENTBAR)

11 years agoBuild Qt for Symbian on Mac/gcce again
Liang Qi [Fri, 22 Jul 2011 14:51:44 +0000 (16:51 +0200)]
Build Qt for Symbian on Mac/gcce again

Fixed a few things for private header and macros.

Reviewed-by: Honglei Zhang
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Fri, 22 Jul 2011 14:33:09 +0000 (00:33 +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 the timeout calculation again.

11 years agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Liang Qi [Fri, 22 Jul 2011 08:38:28 +0000 (10:38 +0200)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/gui/image/qtiffhandler.cpp

11 years agoFix the timeout calculation again.
Thiago Macieira [Thu, 21 Jul 2011 15:10:30 +0000 (17:10 +0200)]
Fix the timeout calculation again.

The commit 412ef92162f8874a1585221125c31ef5f8ccc9cb introduced a fix, but the
fix was incomplete. Fix it for good.

Change-Id: I3e7fbdb294f8e960fbbf2e830790750240ed813a
Merge-request: 30
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1991
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
(cherry picked from commit 038d7c6c3b9815068e1f5b6df12625181f0313e1)

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Thu, 21 Jul 2011 18:19:39 +0000 (04:19 +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:
  QNetworkAccessFileBackend: Add warning for file url without scheme.
  Native memory mapped file support
  Fix compiler warning
  Create QScopedResource class

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Thu, 21 Jul 2011 12:32:21 +0000 (22:32 +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:
  Removed demo files accidentally introduced by commit 3abaecc3.
  Doc: Added a link to the How to Learn Qt document.
  Doc: Fixed shader program snippet.
  Doc: Fixed page step sizes in a snippet for QAbstractScrollArea.
  Doc: Moved general notes about character conversion.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Thu, 21 Jul 2011 11:39:49 +0000 (21:39 +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:
  Fixed crash when loading 16 bits-per-pixel grayscale TIFs.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 21 Jul 2011 07:46:33 +0000 (17:46 +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 compilation on Symbian platforms without SgImage support

11 years agoFix compilation on Symbian platforms without SgImage support
Jani Hautakangas [Thu, 21 Jul 2011 07:10:25 +0000 (10:10 +0300)]
Fix compilation on Symbian platforms without SgImage support

Reviewed-by: Laszlo Agocs
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Thu, 21 Jul 2011 05:17:52 +0000 (15:17 +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:
  Move separator skipping to proper place
  Skip shaping for hidden line/paragraph separators
  Support interface orientation for uikit.
  Add support for opening LinuxInput devices exclusively ('grabbing').
  Fixed regression in compilerwarnings.
  Properly quit the input event thread in the directfb platform plugin.
  Apply 57993ba7 properly to 4.8
  Deprecate some QPixmap functions (marked as obsolete already).
  Deprecate some functions in QImage (that have been obsolete since 4.1).
  Add QLocale::toUpper/Lower
  Fix warning for uninitialized variable

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

11 years agoMerge remote branch 'review/master' into staging
Jiang Jiang [Wed, 20 Jul 2011 13:35:01 +0000 (15:35 +0200)]
Merge remote branch 'review/master' into staging

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-review
David Boddie [Wed, 20 Jul 2011 12:59:11 +0000 (14:59 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-review

11 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Wed, 20 Jul 2011 11:14:06 +0000 (21:14 +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:
  Check for buffer overflow in Lookup_MarkMarkPos
  Delay masking the last character in Password echo mode.
  Updated license headers.
  Prevent failed rendering for NPOT textures in GLES2.
  Don't use GL_REPEAT for NPOT textures in GLES2.
  Avoid crash when surface creation fails.
  Add system tests from research:systemtests repository.

11 years agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Liang Qi [Wed, 20 Jul 2011 11:01:24 +0000 (13:01 +0200)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp

11 years agoMerge remote-tracking branch 'earth-team/master'
Olivier Goffart [Wed, 20 Jul 2011 11:00:50 +0000 (13:00 +0200)]
Merge remote-tracking branch 'earth-team/master'

11 years agoMerge remote-tracking branch 'origin/4.8' into 4.8-tools-staging
Joerg Bornemann [Wed, 20 Jul 2011 10:10:07 +0000 (12:10 +0200)]
Merge remote-tracking branch 'origin/4.8' into 4.8-tools-staging

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Wed, 20 Jul 2011 08:21:16 +0000 (18:21 +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: (34 commits)
  Remove testing for Hide of mainwindow.
  Fix accessibility test for QWS.
  Fixes leaking X11 SyncCounter when widgets get open/destroyed
  Fix the timeout calculation for futexes in QMutex.
  Fix test for win and mac.
  namespace fix
  fix build
  get rid of unwanted dependencies and unused header includes
  sync qws_dataDir() with coreapp's internal qws_dataDir()
  Add constants to QAccessible::Event enum.
  Call QAccessible::updateAccessibility when setText is called on QLabel
  Added Solaris build fix to the changes file.
  Documentation fix.
  Fix autotest for accessible tables.
  make argument quoting code on windows less arcane
  fix argument quoting on windows
  Style cleanup - space after flow control keywords.
  Add IAccessible2 table2 implementation.
  Fix potential crash when clicking in a text edit
  Compensate for different rounding rule in CG engine
  ...

11 years agoFixed crash when loading 16 bits-per-pixel grayscale TIFs.
Kim Motoyoshi Kalland [Tue, 19 Jul 2011 15:53:25 +0000 (17:53 +0200)]
Fixed crash when loading 16 bits-per-pixel grayscale TIFs.

Use the fallback path when encountering 16 bits-per-pixel
grayscale TIFs. Also fixed potential memory leak.

Task-number: QTBUG-19878
Reviewed-by: Samuel
11 years agoRemove testing for Hide of mainwindow.
Frederik Gladhorn [Wed, 20 Jul 2011 08:09:27 +0000 (01:09 -0700)]
Remove testing for Hide of mainwindow.

This event is not used anywhere and the
test seems to fail randomly.
Since this line causes more trouble than it helps
simply remove it.

Reviewed-by: TrustMe
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integ...
Qt Continuous Integration System [Wed, 20 Jul 2011 05:34:25 +0000 (15:34 +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:
  importing QtDeclarative classes for usage in QML designer
  fix QFileInfo::isSymLink() for NTFS mount points

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Tue, 19 Jul 2011 23:53:36 +0000 (09:53 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Add docs for QSqlRelationalTableModel::JoinMode
  Fixed behavior on NULL foreign keys
  update change file
  Forward port qt modifications for sqlite3.c
  Forward port the vxworks changes
  Update sqlite to 3.7.7.1

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

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Tue, 19 Jul 2011 19:24:02 +0000 (05: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:
  Removed demo files accidentally introduced by commit 3abaecc3.

11 years agoRemoved demo files accidentally introduced by commit 3abaecc3.
David Boddie [Tue, 19 Jul 2011 15:42:33 +0000 (17:42 +0200)]
Removed demo files accidentally introduced by commit 3abaecc3.

Reviewed-by: Donald Carr
11 years agoDoc: Added a link to the How to Learn Qt document.
David Boddie [Tue, 19 Jul 2011 15:22:09 +0000 (17:22 +0200)]
Doc: Added a link to the How to Learn Qt document.

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Tue, 19 Jul 2011 15:14:39 +0000 (01:14 +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: (68 commits)
  Doc: Added a link to the How to Learn Qt document.
  Doc: Fixed shader program snippet.
  Doc: Fixed page step sizes in a snippet for QAbstractScrollArea.
  Doc: Moved general notes about character conversion.
  Fix the timeout calculation for futexes in QMutex.
  namespace fix
  fix build
  get rid of unwanted dependencies and unused header includes
  sync qws_dataDir() with coreapp's internal qws_dataDir()
  Added Solaris build fix to the changes file.
  Documentation fix.
  make argument quoting code on windows less arcane
  fix argument quoting on windows
  Fix potential crash when clicking in a text edit
  Compensate for different rounding rule in CG engine
  Remove broken link to Symbian.org documentation.
  Check engine existence before increasing reference count
  Keep reference count for cached font engines in QTextEngine
  Optimize text layout.
  Fix compiler warning in qtextdocument.cpp
  ...

11 years agoDoc: Fixed shader program snippet.
David Boddie [Tue, 19 Jul 2011 14:52:20 +0000 (16:52 +0200)]
Doc: Fixed shader program snippet.

Task-number: QTBUG-18982
Reviewed-by: Kim Motoyoshi Kalland
11 years agoimporting QtDeclarative classes for usage in QML designer
Thomas Hartmann [Tue, 19 Jul 2011 13:39:30 +0000 (15:39 +0200)]
importing QtDeclarative classes for usage in QML designer

Reviewed-by: joerg
11 years agofix QFileInfo::isSymLink() for NTFS mount points
Joerg Bornemann [Tue, 19 Jul 2011 13:23:00 +0000 (15:23 +0200)]
fix QFileInfo::isSymLink() for NTFS mount points

Mount points are no symlinks. Period.
This was a regression to 4.7 which broke building Qt in a mount point.

Reviewed-by: Thomas Hartmann
Task-number: QTBUG-20431

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Tue, 19 Jul 2011 13:08:23 +0000 (23:08 +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:
  Move separator skipping to proper place
  Skip shaping for hidden line/paragraph separators
  Support interface orientation for uikit.
  Add support for opening LinuxInput devices exclusively ('grabbing').
  Fixed regression in compilerwarnings.
  Properly quit the input event thread in the directfb platform plugin.
  Apply 57993ba7 properly to 4.8
  Deprecate some QPixmap functions (marked as obsolete already).
  Deprecate some functions in QImage (that have been obsolete since 4.1).

11 years agoMove separator skipping to proper place
Jiang Jiang [Tue, 19 Jul 2011 12:55:30 +0000 (14:55 +0200)]
Move separator skipping to proper place

So that it won't crash some places that requires shaping results.

Reviewed-by: TrustMe
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Tue, 19 Jul 2011 12:36:35 +0000 (22:36 +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:
  Check for buffer overflow in Lookup_MarkMarkPos

11 years agoQNetworkAccessFileBackend: Add warning for file url without scheme.
Martin Petersson [Tue, 19 Jul 2011 10:42:40 +0000 (12:42 +0200)]
QNetworkAccessFileBackend: Add warning for file url without scheme.

When the scheme is not set for a file we should accept the url but
add a warning. The behaviour will change for Qt5 in which we should no
longer accept the url if the scheme is not set.

Task-number: QTBUG-17731
Reviewed-by: Markus Goetz
11 years agoCheck for buffer overflow in Lookup_MarkMarkPos
Jiang Jiang [Mon, 18 Jul 2011 06:49:32 +0000 (08:49 +0200)]
Check for buffer overflow in Lookup_MarkMarkPos

That may cause crash in this function with certain fonts.

Task-number: QTBUG-17238
Done-by: Alberto Garcia <agarcia@igalia.com>
Reviewed-by: Jiang Jiang
11 years agoSkip shaping for hidden line/paragraph separators
Jiang Jiang [Mon, 18 Jul 2011 09:07:33 +0000 (11:07 +0200)]
Skip shaping for hidden line/paragraph separators

Since we are not going to draw them in QTextLine::draw either,
and shaping them here will cause performance issue on certain
systems like Mac OS X 10.7 (most fonts don't have glyph for U+2028,
while font fallback handling in Core Text slowed down a bit).

Task-number: QTBUG-20252
Reviewed-by: Eskil
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Tue, 19 Jul 2011 08:31:38 +0000 (18:31 +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:
  Delay masking the last character in Password echo mode.

11 years agoDelay masking the last character in Password echo mode.
Andrew den Exter [Tue, 19 Jul 2011 05:15:58 +0000 (15:15 +1000)]
Delay masking the last character in Password echo mode.

If QT_GUI_PASSWORD_ECHO_DELAY is defined in qplatformdefs.h with an
integer value in milliseconds, QLineEdit and TextInput will display
the last character entered unmasked for that delay period and then
mask the character as normal.  If QT_GUI_PASSWORD_ECHO_DELAY is
not defined then the behaviour is unchanged.

Change-Id: I55f527932d34453828caba88e93ad57e012e79be
Task-number: QTBUG-17003
Reviewed-by: Martin Jones
11 years agoAdd docs for QSqlRelationalTableModel::JoinMode
Charles Yin [Tue, 19 Jul 2011 05:04:24 +0000 (15:04 +1000)]
Add docs for QSqlRelationalTableModel::JoinMode

Task-number:QTBUG-8217
Reviewed-by:Michael Goddard

Change-Id: Ie2af750c3a64aa634e11617cf9b3f9e7bdcf3a5f

11 years agoFixed behavior on NULL foreign keys
DaNiMoTh [Tue, 19 Jul 2011 04:57:07 +0000 (14:57 +1000)]
Fixed behavior on NULL foreign keys

Instead of using a simple INNER JOIN, like:

SELECT a,b,rel.c FROM table1, table2 WHERE (table1.smthing =
table2.smthing)

which doesn't show row where foreign keys are NULL, allow use of LEFT
JOIN like:

SELECT a,b,rel.c FROM table1 LEFT JOIN table2 ON table1.smthing =
table2.smthing

The trick works also for multi-relational tables.
Just remember to use the new API setJoinMode.

Signed-off-by: DaNiMoTh <jjdanimoth@gmail.com>
Change-Id: I349f9418e4859923977942add59872b000cac2c5
Task-number:QTBUG-8217
Reviewed-by:Michael Goddard
Reviewed-by:Charles Yin

Merge-request: 2576
Reviewed-by: Charles Yin <charles.yin@nokia.com>
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integr...
Qt Continuous Integration System [Tue, 19 Jul 2011 04:13:36 +0000 (14:13 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Updated license headers.
  Add system tests from research:systemtests repository.

11 years agoupdate change file
Charles Yin [Tue, 19 Jul 2011 03:45:44 +0000 (13:45 +1000)]
update change file

Change-Id: I3c7cecf1f099e2868653c041d88a4208b77c5748

11 years agoForward port qt modifications for sqlite3.c
Charles Yin [Tue, 19 Jul 2011 01:29:45 +0000 (11:29 +1000)]
Forward port qt modifications for sqlite3.c

Forward port from:
 1. c42bc88a9f366899747945a4478492cf765c7166
 2. 0d61cf15358e1ff0b5125542ed4a9c4b7e96c141

Task-number: QTBUG-16607
Reviewed-by: Michael Goddard
11 years agoForward port the vxworks changes
Charles Yin [Tue, 19 Jul 2011 01:22:59 +0000 (11:22 +1000)]
Forward port the vxworks changes

forward port from d7b688870aead912690188b324d370b920a7a600

Task-number: QTBUG-16607
Reviewed-by: Michael Goddard
11 years agoUpdate sqlite to 3.7.7.1
Charles Yin [Tue, 19 Jul 2011 00:53:34 +0000 (10:53 +1000)]
Update sqlite to 3.7.7.1

Updated sqlite3.h, sqlite3.c and shell.c from sqlite.org
SHA1 for sqlite3.c: d47594b8a02f6cf58e91fb673e96cb1b397aace0

Task-number: QTBUG-16607
Reviewed-by: Michael Goddard
11 years agoUpdated license headers.
Toby Tomkins [Tue, 19 Jul 2011 03:39:40 +0000 (13:39 +1000)]
Updated license headers.

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

11 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Mon, 18 Jul 2011 19:07:30 +0000 (05:07 +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:
  Fixes leaking X11 SyncCounter when widgets get open/destroyed

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Mon, 18 Jul 2011 18:53:09 +0000 (04:53 +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:
  Prevent failed rendering for NPOT textures in GLES2.
  Don't use GL_REPEAT for NPOT textures in GLES2.

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

11 years agoSupport interface orientation for uikit.
Eike Ziller [Mon, 18 Jul 2011 14:58:45 +0000 (16:58 +0200)]
Support interface orientation for uikit.

Rotates app status bar. Adheres to UISupportedInterfaceOrientations
and UIInterfaceOrientation.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Mon, 18 Jul 2011 14:45:46 +0000 (00: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:
  Avoid crash when surface creation fails.

11 years agoDoc: Fixed page step sizes in a snippet for QAbstractScrollArea.
David Boddie [Mon, 18 Jul 2011 14:30:23 +0000 (16:30 +0200)]
Doc: Fixed page step sizes in a snippet for QAbstractScrollArea.

Task-number: QTBUG-20350

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Mon, 18 Jul 2011 13:30:54 +0000 (23:30 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
  Removed files with 3rd party copyright notices.

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-review
David Boddie [Mon, 18 Jul 2011 13:21:21 +0000 (15:21 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-review

11 years agoPrevent failed rendering for NPOT textures in GLES2.
Samuel Rødal [Mon, 18 Jul 2011 12:52:16 +0000 (14:52 +0200)]
Prevent failed rendering for NPOT textures in GLES2.

Shouldn't use the (default) GL_REPEAT wrap mode on GLES2 unless
GL_OES_texture_npot is present.

Reviewed-by: Kim
11 years agoDon't use GL_REPEAT for NPOT textures in GLES2.
Samuel Rødal [Fri, 15 Jul 2011 12:37:47 +0000 (14:37 +0200)]
Don't use GL_REPEAT for NPOT textures in GLES2.

We already handle NPOT textures correctly by calling fract() on the
texture coordinates in the fragment shader, but we also need to make
sure not to set GL_REPEAT as the wrap mode, because the GLES2 spec says
that the driver should return (0, 0, 0, 1) if an NPOT texture has wrap
mode different from GL_CLAMP_TO_EDGE. Previous GLES2-implementations
we've tested on have thus not been GLES2-compliant (or supported
GL_OES_texture_npot).

Partial back-port / modification of
c5a377e944f9a87c372ff8371c66b03d861803a6 in 4.8.

Reviewed-by: Kim
11 years agoDoc: Moved general notes about character conversion.
David Boddie [Mon, 18 Jul 2011 13:02:45 +0000 (15:02 +0200)]
Doc: Moved general notes about character conversion.

Task-number: QTBUG-20411

11 years agoMerge branch '4.8' of scm.dev.nokia.troll.no:qt/qt
David Boddie [Mon, 18 Jul 2011 12:20:22 +0000 (14:20 +0200)]
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt

11 years agoAdd support for opening LinuxInput devices exclusively ('grabbing').
Mirko Vogt [Mon, 18 Jul 2011 10:42:32 +0000 (12:42 +0200)]
Add support for opening LinuxInput devices exclusively ('grabbing').

The LinuxInput stack exposes the ioctl EVIOCGRAB which allows LinuxInput devices
being opened exclusively ('grabbed'). This patch adds support for configuring
how Qt should treat LinuxInput devices (via the 'grab'-argument).
By default devices are not grabbed, so not opened exclusively (matches prior
behaviour). This however means all input (keystrokes, etc.) is passed to other
applications (shells/ttys included) accessing respective device(s) as well.

Merge-request: 2637
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
11 years agoAvoid crash when surface creation fails.
Laszlo Agocs [Mon, 18 Jul 2011 08:53:06 +0000 (11:53 +0300)]
Avoid crash when surface creation fails.

When the creation of the EGL window surface failed, the paint engine
was not destroyed in the openvg module's window surface implementation.
This led to accessing an obsolete engine instance later on in
QSymbianControl::Draw, leading to a crash. Now a new, proper engine
will be created, naturally the painting will still fail, but the
application will not crash.

Task-number: QTBUG-20339
Reviewed-by: Jani Hautakangas
11 years agoFix accessibility test for QWS.
Frederik Gladhorn [Sun, 17 Jul 2011 19:16:17 +0000 (12:16 -0700)]
Fix accessibility test for QWS.

For some reason we don't get the hide signal on QWS.

Reviewed-by: Gabi
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Mon, 18 Jul 2011 06:26:50 +0000 (16:26 +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 leaking X11 SyncCounter when widgets get open/destroyed

11 years agoFixes leaking X11 SyncCounter when widgets get open/destroyed
Aleksandar Stojiljkovic [Mon, 18 Jul 2011 05:46:01 +0000 (08:46 +0300)]
Fixes leaking X11 SyncCounter when widgets get open/destroyed

xmeminfo showed leaking memory and unreleased X11 SyncCounter for test application opening and destroying one QWidget.
It was not that critical: on 1000+ openings, heap grew ~4MB. This patch fixes the leak.

Reviewed-by: Samuel Rødal
11 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Fri, 15 Jul 2011 23:00:15 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Fri, 15 Jul 2011 13:43:26 +0000 (23:43 +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 the timeout calculation for futexes in QMutex.

11 years agoFix the timeout calculation for futexes in QMutex.
Thiago Macieira [Thu, 14 Jul 2011 12:43:44 +0000 (14:43 +0200)]
Fix the timeout calculation for futexes in QMutex.

Recalculate how much time is remaining.

This commit needs to be backported to 4.8.

Change-Id: Ib587335bb90306e65969bb26256fb388f8f6bd24
Merge-request: 20
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1666
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
(cherry picked from commit 412ef92162f8874a1585221125c31ef5f8ccc9cb)

11 years agoFixed regression in compilerwarnings.
Samuel Rødal [Fri, 15 Jul 2011 10:45:35 +0000 (12:45 +0200)]
Fixed regression in compilerwarnings.

We can't mark QImageTextKeyLang as deprecated.

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

11 years agoFix test for win and mac.
Frederik Gladhorn [Thu, 14 Jul 2011 23:27:44 +0000 (16:27 -0700)]
Fix test for win and mac.

Accidentally removed & in some places.

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

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 14 Jul 2011 20:37:23 +0000 (06: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
  get rid of unwanted dependencies and unused header includes
  sync qws_dataDir() with coreapp's internal qws_dataDir()
  Documentation fix.

11 years agonamespace fix
Joerg Bornemann [Thu, 14 Jul 2011 15:55:45 +0000 (17:55 +0200)]
namespace fix

Reviewed-by: hjk