qt:qt.git
11 years agoMerge remote branch 'origin/4.6' into qt-4.7-from-4.6
Thiago Macieira [Mon, 22 Nov 2010 16:15:13 +0000 (17:15 +0100)]
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

No changes.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Mon, 22 Nov 2010 11:13:50 +0000 (12:13 +0100)]
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:
  Compile when USER_TIMER_MINIMUM isn't defined
  Docs: QTBUG-10866 Description of how AutoConnection is resolved.
  Fix compilation with Sun Studio 12.1.
  Compile with QT_NO_PROXYSCREEN.
  silence compiler warnings
  Don't let posted events starve native dialogs (regression)

11 years agoCompile when USER_TIMER_MINIMUM isn't defined
Bradley T. Hughes [Mon, 22 Nov 2010 09:52:31 +0000 (10:52 +0100)]
Compile when USER_TIMER_MINIMUM isn't defined

Just user a value of zero instead. Windows will use USER_TIMER_MINIMUM
anyways (according to the SetTimer() docs).

Reviewed-by: trustme
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Mon, 22 Nov 2010 08:06:21 +0000 (09:06 +0100)]
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:
  Update qml visual tests on mac.
  Doc

11 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Mon, 22 Nov 2010 07:06:10 +0000 (08:06 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fixed handling of QInputMethodEvents with nonzero replacementLength.

11 years agoUpdate qml visual tests on mac.
Yann Bodson [Mon, 22 Nov 2010 06:37:47 +0000 (16:37 +1000)]
Update qml visual tests on mac.

Task-number: QTBUG-14792

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Peter Yard [Mon, 22 Nov 2010 04:51:16 +0000 (14:51 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

11 years agoDocs: QTBUG-10866 Description of how AutoConnection is resolved.
Peter Yard [Mon, 22 Nov 2010 04:48:17 +0000 (14:48 +1000)]
Docs: QTBUG-10866 Description of how AutoConnection is resolved.

11 years agoDoc
Aaron Kennedy [Mon, 22 Nov 2010 00:32:02 +0000 (10:32 +1000)]
Doc

Task-number: QTBUG-15456

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 19 Nov 2010 22:58:07 +0000 (23:58 +0100)]
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:
  Fix compilation with Sun Studio 12.1.
  Compile with QT_NO_PROXYSCREEN.
  silence compiler warnings
  Don't let posted events starve native dialogs (regression)

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Fri, 19 Nov 2010 17:57:02 +0000 (18:57 +0100)]
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:
  Doc: Fixing typo.
  Fix possible missing glyphs in raster engine glyph cache
  Fix possible corrupted text when gl glyph cache becomes full
  Check correctly before including SSE4.2 header.
  Fixed crash when destroying QGLWidget
  Prevent crash in GL 2 engine when stroking null rectangle.
  Compile fix.
  Documentation update for new switching events.
  Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system.
  Doc: Fixing typo
  Fix possible missing glyphs in text when using GL engine

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 19 Nov 2010 17:22:27 +0000 (18:22 +0100)]
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:
  Fix compilation with Sun Studio 12.1.
  Compile with QT_NO_PROXYSCREEN.
  silence compiler warnings
  Don't let posted events starve native dialogs (regression)

11 years agoDoc: Fixing typo.
Sergio Ahumada [Fri, 19 Nov 2010 15:16:46 +0000 (16:16 +0100)]
Doc: Fixing typo.

11 years agoFixed handling of QInputMethodEvents with nonzero replacementLength.
axis [Fri, 19 Nov 2010 10:15:55 +0000 (11:15 +0100)]
Fixed handling of QInputMethodEvents with nonzero replacementLength.

These types of events replace text that is already in the widget, but
WebKit did not check for replacementLength at all.

RevBy:    Janne Koskinen
Task:     QT-4303
Task:     https://bugs.webkit.org/show_bug.cgi?id=49787
AutoTest: Included

11 years agoFix possible missing glyphs in raster engine glyph cache
Eskil Abrahamsen Blomfeldt [Fri, 19 Nov 2010 13:38:58 +0000 (14:38 +0100)]
Fix possible missing glyphs in raster engine glyph cache

Two possible failures when using the glyph cache on raster engine and
populating the cache with very many glyphs:
1. Change 72f161739b270b01807f97cd853030440f0fd430 caused the maximum
   height of the glyph cache to be 32768, which was not sufficient for
   large fonts with very many characters (e.g. Chinese text)
2. Since we are using QPainter to draw into the glyph cache for RGB32
   glyphcaches, and QPainter does not support very high coordinates,
   we need to create a reference image that references a section of the
   glyph cache and paint into that instead.

Task-number: QT-3971
Reviewed-by: Samuel
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Fri, 19 Nov 2010 13:17:08 +0000 (14:17 +0100)]
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:
  Move qmlvisualaids to another repo
  Initial commit of qmlvisualaids
  Allow testing of raster engine on Mac from qmlviewer
  Don't leak QML compiled data objects
  Add missing symbols to QtOpenGL arm def file
  Add missing symbols to QtOpenGL emulator def file
  Doc: clarify Flickable children vs. contentItem children.
  Add a test on QWS
  Fix parent bug for QDeclarativeOpenMetaObject
  Add missing symbols in QtGui emulator def file

11 years agoFix compilation with Sun Studio 12.1.
Thiago Macieira [Fri, 19 Nov 2010 12:29:04 +0000 (13:29 +0100)]
Fix compilation with Sun Studio 12.1.

Error was:
"tst_qdbusconnection.cpp", line 301: Error: Could not find a match for QTest::qCompare<QTest::T>(QObject*, MyObject*, const char[29], const char[5], const char[24], int) needed in tst_QDBusConnection::registerObject().
"tst_qdbusconnection.cpp", line 498: Error: Could not find a match for QTest::qCompare<QTest::T>(QObject*, TestObject*, const char[39], const char[12], const char[24], int) needed in tst_QDBusConnection::callSelf().

Task-number: QTBUG-15324
Patch-by: Pavel Heimlich
Reviewed-by: Thiago Macieira
11 years agoFix possible corrupted text when gl glyph cache becomes full
Eskil Abrahamsen Blomfeldt [Fri, 19 Nov 2010 11:38:36 +0000 (12:38 +0100)]
Fix possible corrupted text when gl glyph cache becomes full

When the OpenGL glyph cache filled up (the max texture size on the
hardware was exceeded) the characters would be drawn as black blocks
instead. As a work-around for this, the cache will now be cleared and
repopulated whenever this happens, meaning that once in a while (when
a lot of different glyphs have been drawn in a font) there will be a
performance hit. A more complete solution is described in QTBUG-13784,
but this requires so much refactoring that it was deemed too risky for
a patch release. This patch fixes the problem with a small penalty
and low risk.

Task-number: QT-3971
Reviewed-by: Samuel
11 years agoCompile with QT_NO_PROXYSCREEN.
Sam Magnuson [Fri, 19 Nov 2010 10:24:58 +0000 (11:24 +0100)]
Compile with QT_NO_PROXYSCREEN.

Merge-request: 931
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agosilence compiler warnings
Harald Fernengel [Fri, 19 Nov 2010 09:58:09 +0000 (10:58 +0100)]
silence compiler warnings

Silence shadowing warnings from gcc.

11 years agoMove qmlvisualaids to another repo
Alan Alpert [Fri, 19 Nov 2010 09:31:01 +0000 (19:31 +1000)]
Move qmlvisualaids to another repo

Moved to a personal repo, since its fate is a little uncertain so it
shouldn't draw this much attention.

Task-number: QTBUG-14792

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Alan Alpert [Fri, 19 Nov 2010 08:31:04 +0000 (18:31 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

11 years agoInitial commit of qmlvisualaids
Alan Alpert [Fri, 19 Nov 2010 08:29:11 +0000 (18:29 +1000)]
Initial commit of qmlvisualaids

A tool to make it easier to do the platform visual updating. Needs to be
streamlined at least a little in order to make it feasible to stay up to
date.

Task-number: QTBUG-14792

11 years agoAllow testing of raster engine on Mac from qmlviewer
Aaron Kennedy [Fri, 19 Nov 2010 06:34:05 +0000 (16:34 +1000)]
Allow testing of raster engine on Mac from qmlviewer

11 years agoDon't leak QML compiled data objects
Aaron Kennedy [Fri, 19 Nov 2010 06:23:52 +0000 (16:23 +1000)]
Don't leak QML compiled data objects

Task-number: QTBUG-14761

11 years agoAdd missing symbols to QtOpenGL arm def file
Joona Petrell [Fri, 19 Nov 2010 04:40:33 +0000 (14:40 +1000)]
Add missing symbols to QtOpenGL arm def file

11 years agoAdd missing symbols to QtOpenGL emulator def file
Joona Petrell [Fri, 19 Nov 2010 03:29:48 +0000 (13:29 +1000)]
Add missing symbols to QtOpenGL emulator def file

11 years agoDoc: clarify Flickable children vs. contentItem children.
Martin Jones [Fri, 19 Nov 2010 00:55:22 +0000 (10:55 +1000)]
Doc: clarify Flickable children vs. contentItem children.

11 years agoAdd a test on QWS
Alan Alpert [Thu, 18 Nov 2010 23:19:41 +0000 (09:19 +1000)]
Add a test on QWS

Without a single test, it fails anyways.

Task-number: QTBUG-14792

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, 18 Nov 2010 15:53:04 +0000 (16:53 +0100)]
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 correctly before including SSE4.2 header.
  Fixed crash when destroying QGLWidget
  Prevent crash in GL 2 engine when stroking null rectangle.
  Compile fix.
  Documentation update for new switching events.
  Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system.
  Doc: Fixing typo
  Fix possible missing glyphs in text when using GL engine

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 18 Nov 2010 14:58:51 +0000 (15:58 +0100)]
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:
  Don't let posted events starve native dialogs (regression)

11 years agoFix parent bug for QDeclarativeOpenMetaObject
Marco Bubke [Thu, 18 Nov 2010 12:35:44 +0000 (13:35 +0100)]
Fix parent bug for QDeclarativeOpenMetaObject

The dynamic meta object was not called because no parent meta object was called.

Reviewed-By: Aaron Kennedy
11 years agoDon't let posted events starve native dialogs (regression)
Bradley T. Hughes [Thu, 18 Nov 2010 11:42:14 +0000 (12:42 +0100)]
Don't let posted events starve native dialogs (regression)

After commit eb1015c7bbf135af3656110a4d112377c1209db8, it is possible
for posted events to starve some of the (most likely internal) messages
used by native dialogs.

This commit reverts eb1015c7bbf135af3656110a4d112377c1209db8, and
instead introduces a Windows timer to keep sendPostedEvents() happening
while the event queue is very active. The GetMessage() hook we install
will eventually see when the queue is empty and we can use PostMessage()
again, which will then stop this timer.

This fixes the regression reported in QTBUG-14655, as well as all of the
other reported regressions and problems since the initial commit
31f1ff91028dd7f90925d5b3737e4d88b5fb07aa (which ensures that posted
events are sent even when Windows is spinning the message loop).

Task-number: QTBUG-14655
Reviewed-by: joao
11 years agoAdd missing symbols in QtGui emulator def file
Joona Petrell [Thu, 18 Nov 2010 10:57:20 +0000 (20:57 +1000)]
Add missing symbols in QtGui emulator def file

11 years agoCheck correctly before including SSE4.2 header.
Mike McQuaid [Thu, 18 Nov 2010 05:40:36 +0000 (05:40 +0000)]
Check correctly before including SSE4.2 header.

Previously, this failed machines that only had SSE4.1 but not
SSE4.2 due to an assumption that nmmintrin.h could be included
when only using SSE4.1.

Fixes http://bugreports.qt.nokia.com/browse/QTBUG-13623.

Merge-request: 929
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 18 Nov 2010 09:58:38 +0000 (10:58 +0100)]
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:
  Fine-tune the tests being run on the CI system.
  Standardize selection color in visual test

11 years agoFine-tune the tests being run on the CI system.
Alan Alpert [Thu, 18 Nov 2010 05:38:32 +0000 (15:38 +1000)]
Fine-tune the tests being run on the CI system.

We don't want to bother running tests on QWS, or text tests on X11 until
they update the ubuntu version.

Task-number: QTBUG-14792

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, 18 Nov 2010 05:32:06 +0000 (06:32 +0100)]
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 destroying QGLWidget
  Prevent crash in GL 2 engine when stroking null rectangle.
  Compile fix.
  Documentation update for new switching events.
  Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system.
  Doc: Fixing typo
  Fix possible missing glyphs in text when using GL engine

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 18 Nov 2010 02:02:18 +0000 (03:02 +0100)]
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:
  Use GLIBC functions on any GLIBC architecture.
  tst_qnetworkreply: Fix ugly test

11 years agoStandardize selection color in visual test
Alan Alpert [Thu, 18 Nov 2010 00:55:41 +0000 (10:55 +1000)]
Standardize selection color in visual test

Task-number: QTBUG-14792

11 years agoUse GLIBC functions on any GLIBC architecture.
Oswald Buddenhagen [Wed, 17 Nov 2010 18:08:02 +0000 (19:08 +0100)]
Use GLIBC functions on any GLIBC architecture.

Make use of __GLIBC__ instead of Q_OS_LINUX for functions available
globally in GNU libc, not just on Linux.

the !__UCLIBC__ are still needed, as uClibc defines __GLIBC__ for
compatibility with a lot of applications which rely on it.

Task-number: QTBUG-15401

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, 17 Nov 2010 15:11:29 +0000 (16:11 +0100)]
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 destroying QGLWidget
  Prevent crash in GL 2 engine when stroking null rectangle.
  Compile fix.
  Documentation update for new switching events.
  Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system.
  Doc: Fixing typo
  Fix possible missing glyphs in text when using GL engine

11 years agoFixed crash when destroying QGLWidget
Thorbjørn Lindeijer [Tue, 16 Nov 2010 12:19:29 +0000 (14:19 +0200)]
Fixed crash when destroying QGLWidget

The QGLWidget destroys the QGLContext, which in turn destroys the
bound pixmap. When this happens there may not be a current QGLContext,
so check that before trying to restore it.

Done-with: Gunnar Sletta
Reviewed-by: Samuel
11 years agotst_qnetworkreply: Fix ugly test
Markus Goetz [Wed, 17 Nov 2010 12:22:50 +0000 (13:22 +0100)]
tst_qnetworkreply: Fix ugly test

Properly use the event loop.
Signals have to be connected directly after using the get()
method of QNetworkAccessManager. Else they might have already
been emitted while the event loop was spinning.

Reviewed-by: Peter Hartmann
11 years agoPrevent crash in GL 2 engine when stroking null rectangle.
Samuel Rødal [Wed, 17 Nov 2010 12:01:38 +0000 (13:01 +0100)]
Prevent crash in GL 2 engine when stroking null rectangle.

Task-number: QTBUG-15320
Reviewed-by: Kim
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 17 Nov 2010 11:52:35 +0000 (12:52 +0100)]
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:
  Fix license text.
  Doc: fix a typo in QML/Qt UI integration

11 years agoCompile fix.
Samuel Rødal [Wed, 17 Nov 2010 09:58:57 +0000 (10:58 +0100)]
Compile fix.

Not sure why this worked before.

Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
11 years agoDocumentation update for new switching events.
Michael Dominic K [Wed, 17 Nov 2010 09:55:09 +0000 (10:55 +0100)]
Documentation update for new switching events.

Merge-request: 926
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoSend QMeeGoSwitchEvent to toplevel widgets before switching graphics system.
Michael Dominic K [Wed, 17 Nov 2010 09:55:08 +0000 (10:55 +0100)]
Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system.

Merge-request: 926
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
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, 17 Nov 2010 08:34:13 +0000 (09:34 +0100)]
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:
  Doc: Fixing typo
  Fix possible missing glyphs in text when using GL engine

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 17 Nov 2010 07:04:52 +0000 (08:04 +0100)]
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:
  Fix license text.
  Doc: fix a typo in QML/Qt UI integration

11 years agoFix license text.
Jason McDonald [Wed, 17 Nov 2010 05:36:21 +0000 (15:36 +1000)]
Fix license text.

Reviewed-by: Trust Me
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 17 Nov 2010 03:38:54 +0000 (04:38 +0100)]
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:
  Remove pointSize from visual tests
  Update visuals for X11
  Added missing symbols in QtCore and QtGui def files needed by fix made to QT-4077
  Fix regression due to 6cf397f7ac35a058096528a7ad8bfaf623b30747
  Remove some excess pngs
  Update qml visual tests
  VisualDataModel::count should be 0 until a valid delegate is set.
  Doc: Remove default from PathView path property
  Record images on more than just the first frame.
  Turn off font antialiasing during tests.
  Shrink size of a visual test

11 years agoRemove pointSize from visual tests
Alan Alpert [Wed, 17 Nov 2010 00:58:53 +0000 (10:58 +1000)]
Remove pointSize from visual tests

Too unstable

Task-number: QTBUG-14792

11 years agoUpdate visuals for X11
Alan Alpert [Wed, 17 Nov 2010 00:38:53 +0000 (10:38 +1000)]
Update visuals for X11

Text visual tests may be dependant on the specific version of
libfreetype. Comparison images have been regenerated with the specific
version that the test machines use.

Task-number: QTBUG-14792

11 years agoDoc: Fixing typo
Sergio Ahumada [Tue, 16 Nov 2010 20:47:14 +0000 (21:47 +0100)]
Doc: Fixing typo

11 years agoFix possible missing glyphs in text when using GL engine
Eskil Abrahamsen Blomfeldt [Tue, 16 Nov 2010 12:27:57 +0000 (13:27 +0100)]
Fix possible missing glyphs in text when using GL engine

If you create/destroy gl contexts a lot, you may sometimes get a new
context with the same pointer as a destroyed context. When you look up
the glyph cache in the font engine using the context pointer as a key,
you will then get a glyph cache which contains no valid data. We need
to reset the glyph cache completely in this case and set up bindings for
the new context so that the glyph cache can be repopulated and reused.

Note that there is a different solution for this in Qt 4.8, so this is
temporary solution for the Qt 4.7.x series.

Task-number: QT-4162
Reviewed-by: Fabien Freling
11 years agoDoc: fix a typo in QML/Qt UI integration
Pierre Rossi [Tue, 16 Nov 2010 11:53:13 +0000 (12:53 +0100)]
Doc: fix a typo in QML/Qt UI integration

Reviewed-by: Geir Vattekar
11 years agoAdded missing symbols in QtCore and QtGui def files needed by fix made to QT-4077
Joona Petrell [Tue, 16 Nov 2010 08:46:50 +0000 (18:46 +1000)]
Added missing symbols in QtCore and QtGui def files needed by fix made to QT-4077

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Alan Alpert [Tue, 16 Nov 2010 08:46:00 +0000 (18:46 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

11 years agoFix regression due to 6cf397f7ac35a058096528a7ad8bfaf623b30747
Martin Jones [Tue, 16 Nov 2010 08:25:06 +0000 (18:25 +1000)]
Fix regression due to 6cf397f7ac35a058096528a7ad8bfaf623b30747

PathView needed to update internal item count when delegate was set.
VDM::count() didn't call into the internal VDM when querying count.

Task-number: QTBUG-14781
Reviewed-by: Alan Alpert
11 years agoRemove some excess pngs
Alan Alpert [Tue, 16 Nov 2010 07:38:45 +0000 (17:38 +1000)]
Remove some excess pngs

These are no longer used by these tests

Task-number: QTBUG-14792

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Alan Alpert [Tue, 16 Nov 2010 06:09:03 +0000 (16:09 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

11 years agoUpdate qml visual tests
Alan Alpert [Tue, 16 Nov 2010 05:44:32 +0000 (15:44 +1000)]
Update qml visual tests

Added guidelines for size, and shrunk tests that exceeded them.
Also updated the visuals for all text tests now that antialiasing is off
Also some other minor cleanups.
Also had to update the visuals for all tests, due to the bug in
generating the test scripts being fixed (all need to be remade).

Task-number: QTBUG-14792

11 years agoVisualDataModel::count should be 0 until a valid delegate is set.
Martin Jones [Tue, 16 Nov 2010 05:59:56 +0000 (15:59 +1000)]
VisualDataModel::count should be 0 until a valid delegate is set.

There are no visual items if there is no delegate.

Task-number: QTBUG-14781
Reviewed-by: Robert Griebl
11 years agoDoc: Remove default from PathView path property
Martin Jones [Tue, 16 Nov 2010 05:21:51 +0000 (15:21 +1000)]
Doc: Remove default from PathView path property

Task-number: QTBUG-15073

11 years agoRecord images on more than just the first frame.
Alan Alpert [Tue, 16 Nov 2010 04:54:06 +0000 (14:54 +1000)]
Record images on more than just the first frame.

8fc0d1c36cae1b0 introduced this bug when recording new visual tests.

Task-number: QTBUG-14792

11 years agoTurn off font antialiasing during tests.
Alan Alpert [Tue, 16 Nov 2010 03:31:47 +0000 (13:31 +1000)]
Turn off font antialiasing during tests.

Font antialiasing varies from machine to machine, and so is too unstable
Also switching to a monospaced font in visual tests to attempt to
pre-empt another possible source of instability.

This commit also slightly increases verbosity of test failure messages
to be more useful in the CI system

Task-number: QTBUG-14792

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Alan Alpert [Tue, 16 Nov 2010 00:58:50 +0000 (10:58 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

11 years agoShrink size of a visual test
Alan Alpert [Tue, 16 Nov 2010 00:55:12 +0000 (10:55 +1000)]
Shrink size of a visual test

Task-number: QTBUG-14792

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, 16 Nov 2010 00:32:31 +0000 (01:32 +0100)]
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:
  doc: Fix documentation of QTextEdit::setDocument

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, 15 Nov 2010 22:11:48 +0000 (23:11 +0100)]
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:
  doc: Fix documentation of QTextEdit::setDocument

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integr...
Qt Continuous Integration System [Mon, 15 Nov 2010 19:44:14 +0000 (20:44 +0100)]
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:
  Fixed QGesture autotest for QGesture lazy deletion.
  Crash fix, when the Object will be deleted during handling a QGestureEvent.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Mon, 15 Nov 2010 17:10:20 +0000 (18:10 +0100)]
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: (23 commits)
  compile with quintptr instead of intptr_t
  Enable OpenGL scissors test
  Remove -fno-omit-frame-pointer and -fno-optimize-sibling-calls in mkspecs, add -Wno-psabi
  Fix for E32User-CBASE 46 Panic when using CActiveSchedulerWait
  QNAM HTTP: Ignore double content-length headers
  Don't pack Harfbuzz structs, this causes unaligned access crashes.
  qmake vcxproj generator: fix description of custom build tools
  Fix for KERN-EXEC 0 caused by QNetworkAccessManager::get
  Minor adjustments to merge-request 915
  Implement brush transformations for directfb.
  Add FreeBSD's certificate bundle to the certificates list.
  SSL internals: upon error, read all errors from OpenSSL
  Added an example for QTest::touchEvent to the documentation.
  Push and pop the thread-default context for the current thread
  Fix compilation by s/intptr_t/quintptr/
  qmake vcxproj generator: fix description of custom build tools
  Minor adjustments to merge-request 915
  Implement brush transformations for directfb.
  Add FreeBSD's certificate bundle to the certificates list.
  SSL internals: upon error, read all errors from OpenSSL
  ...

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Mon, 15 Nov 2010 14:33:20 +0000 (15:33 +0100)]
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:
  Update all qmlvisual tests
  Take snapshots starting from the first frame
  Stabilize visual test focusscope/test3.qml
  ListView: items with size < 1.0 were layed out incorrectly.
  ListView.SnapToItem with ListView.StrictlyEnforceRange is broken.
  Fix failing visual tests
  Remove unneeded semicolons.

11 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Perttu Pohjonen [Mon, 15 Nov 2010 13:24:25 +0000 (15:24 +0200)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

11 years agodoc: Fix documentation of QTextEdit::setDocument
Eskil Abrahamsen Blomfeldt [Tue, 2 Nov 2010 08:22:37 +0000 (09:22 +0100)]
doc: Fix documentation of QTextEdit::setDocument

QTextEdit::setDocument() has failed to delete its current document
since June 2006 despite its claims of the otherwise. Since most Qt
versions now exhibit this behavior, the only safe way to fix the problem
is to change the documentation to reflect what actually happens.

Task-number: QTBUG-14049
Reviewed-by: Lars
11 years agoFixed QGesture autotest for QGesture lazy deletion.
Dominik Holland [Mon, 15 Nov 2010 12:08:03 +0000 (13:08 +0100)]
Fixed QGesture autotest for QGesture lazy deletion.

Reviewed By: Trust Me

11 years agocompile with quintptr instead of intptr_t
Thiago Macieira [Mon, 15 Nov 2010 11:59:41 +0000 (12:59 +0100)]
compile with quintptr instead of intptr_t

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, 15 Nov 2010 11:06:57 +0000 (12:06 +0100)]
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:
  Remove driver bug work-around from GL 2 paint engine.
  Don't set -mfpu=neon globally if the compiler supports neon.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Alan Alpert [Mon, 15 Nov 2010 10:19:33 +0000 (20:19 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

11 years agoUpdate all qmlvisual tests
Alan Alpert [Mon, 15 Nov 2010 10:18:21 +0000 (20:18 +1000)]
Update all qmlvisual tests

Previous commit means that the snapshots are in different frames. All
tests must be updated.

Task-number: QTBUG-14792

11 years agoTake snapshots starting from the first frame
Alan Alpert [Mon, 15 Nov 2010 09:44:40 +0000 (19:44 +1000)]
Take snapshots starting from the first frame

Partly because it's invaluble for the times people forget to record a
test as a snapshot, partly because it provides more data on the initial
state of the test case.

Task-number: QTBUG-14792

11 years agoEnable OpenGL scissors test
Adrian Constantin [Mon, 15 Nov 2010 09:13:22 +0000 (11:13 +0200)]
Enable OpenGL scissors test

Reviewed-by: Petri Latvala
11 years agoRemove -fno-omit-frame-pointer and -fno-optimize-sibling-calls in mkspecs, add -Wno...
Petri Latvala [Wed, 10 Nov 2010 10:38:22 +0000 (12:38 +0200)]
Remove -fno-omit-frame-pointer and -fno-optimize-sibling-calls in mkspecs, add -Wno-psabi

Reviewed-by: Adrian Constantin
11 years agoStabilize visual test focusscope/test3.qml
Alan Alpert [Mon, 15 Nov 2010 09:16:05 +0000 (19:16 +1000)]
Stabilize visual test focusscope/test3.qml

Colored rects are better than text. At least here.

Task-number: QTBUG-14792

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integr...
Qt Continuous Integration System [Mon, 15 Nov 2010 08:19:54 +0000 (09:19 +0100)]
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:
  Crash fix, when the Object will be deleted during handling a QGestureEvent.

11 years agoFix for E32User-CBASE 46 Panic when using CActiveSchedulerWait
Perttu Pohjonen [Mon, 15 Nov 2010 07:49:32 +0000 (09:49 +0200)]
Fix for E32User-CBASE 46 Panic when using CActiveSchedulerWait

Fixing the initial problem of this error opened up a possibility to
start a new WLAN scan while there was one still ongoing. This caused
a crash.

Task-number: QT-3996

11 years agoListView: items with size < 1.0 were layed out incorrectly.
Martin Jones [Mon, 15 Nov 2010 07:35:12 +0000 (17:35 +1000)]
ListView: items with size < 1.0 were layed out incorrectly.

If the size of an item was less than one its endPosition() was less
than its position(), which caused incorrect layout (overlapping items).

Task-number: QTBUG-15242
Reviewed-by: Yann Bodson
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7staging
Ville Pernu [Mon, 15 Nov 2010 07:22:49 +0000 (09:22 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7staging

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Alan Alpert [Mon, 15 Nov 2010 05:54:30 +0000 (15:54 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Mon, 15 Nov 2010 05:43:10 +0000 (06:43 +0100)]
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:
  QNAM HTTP: Ignore double content-length headers
  Don't pack Harfbuzz structs, this causes unaligned access crashes.
  qmake vcxproj generator: fix description of custom build tools
  Minor adjustments to merge-request 915
  Implement brush transformations for directfb.
  Add FreeBSD's certificate bundle to the certificates list.
  SSL internals: upon error, read all errors from OpenSSL
  Added an example for QTest::touchEvent to the documentation.
  Push and pop the thread-default context for the current thread
  Fix compilation by s/intptr_t/quintptr/

11 years agoListView.SnapToItem with ListView.StrictlyEnforceRange is broken.
Martin Jones [Mon, 15 Nov 2010 04:44:50 +0000 (14:44 +1000)]
ListView.SnapToItem with ListView.StrictlyEnforceRange is broken.

The bounds behavior with ListView.StrictlyEnforceRange enabled should
not be affected by snapping behavior in fixup() since
ListView.StrictlyEnforceRange has a stronger positioning policy.

Task-number: QTBUG-15329
Reviewed-by: Michael Brasser
11 years agoFix failing visual tests
Alan Alpert [Mon, 15 Nov 2010 03:24:39 +0000 (13:24 +1000)]
Fix failing visual tests

One case of non-standardized text, and one case of what is presumably
random number generation.

Task-number: QTBUG-14792

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration
Qt Continuous Integration System [Mon, 15 Nov 2010 03:15:12 +0000 (04:15 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging:
  qdoc: Added QML Elements to the Assistant index
  qdoc: Fixed virtualness and constness of the fileBase() function.
  Added the location of Getting Started with QML code.

11 years agoRemove unneeded semicolons.
Martin Jones [Mon, 15 Nov 2010 01:23:52 +0000 (11:23 +1000)]
Remove unneeded semicolons.

Extra semicolons break building with sun studio.

Task-number: QTBUG-15326
Reviewed-by: Alan Alpert
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Mon, 15 Nov 2010 00:20:38 +0000 (01:20 +0100)]
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 PathView key navigation docs.
  Ensure increment/decrementCurrentIndex always move items in the correct direction.
  Ensure loaded item's parent is set before component completion.

11 years agoQNAM HTTP: Ignore double content-length headers
Markus Goetz [Sat, 13 Nov 2010 13:38:49 +0000 (14:38 +0100)]
QNAM HTTP: Ignore double content-length headers

Task-number: QTBUG-15311
Reviewed-by: ogoffart
11 years agoDon't pack Harfbuzz structs, this causes unaligned access crashes.
Andreas Kling [Fri, 12 Nov 2010 15:08:35 +0000 (16:08 +0100)]
Don't pack Harfbuzz structs, this causes unaligned access crashes.

The memory-greediest structs have been reordered anyway, so the gain
from forcibly packing them is mostly negligible.

Task-number: QTBUG-13395
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7staging
Ville Pernu [Fri, 12 Nov 2010 13:53:27 +0000 (15:53 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7staging