qt:kde-qt.git
7 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

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

7 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
7 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

7 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
7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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.

7 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

7 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

7 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
7 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

7 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>
7 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

7 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

7 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

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 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

7 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

7 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

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 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

7 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
7 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
7 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
7 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

7 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>
7 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>
7 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>
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 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

7 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

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

Reviewed-by: Trust Me
7 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

7 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

7 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

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

7 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
7 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
7 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

7 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

7 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
7 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

7 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

7 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

7 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
7 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

7 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

7 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

7 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

7 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

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Tue, 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

7 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

7 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.

7 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
  ...

7 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.

7 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

7 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
7 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

7 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

7 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.

7 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

7 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

7 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

7 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
7 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
7 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

7 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.

7 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

7 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
7 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

7 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

7 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/

7 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
7 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

7 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.

7 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
7 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.

7 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
7 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>
7 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

7 years agoqmake vcxproj generator: fix description of custom build tools
Joerg Bornemann [Fri, 12 Nov 2010 12:16:03 +0000 (13:16 +0100)]
qmake vcxproj generator: fix description of custom build tools

The description of custom build tools that handle more than one extra
compiler cannot be separated by ampersands in Visual Studio 2010.
This seems to be a msbuild bug. We'll just circumvent this issue by
changing the separator in the description to comma.

Task-number: QTBUG-13986
Reviewed-by: ossi
7 years agoFix for KERN-EXEC 0 caused by QNetworkAccessManager::get
Ville Pernu [Fri, 12 Nov 2010 12:08:54 +0000 (14:08 +0200)]
Fix for KERN-EXEC 0 caused by QNetworkAccessManager::get

QT-4155 bug.
Canceling Network Session before canceling connection notifier
notifications causes a call to an invalid RConnection instance.
Fix: CanceL Network session after canceling notifications.

7 years agoRemove driver bug work-around from GL 2 paint engine.
Samuel Rødal [Fri, 12 Nov 2010 13:34:46 +0000 (14:34 +0100)]
Remove driver bug work-around from GL 2 paint engine.

For platforms where the driver bug isn't fixed, the work-around should
be done by packagers instead.

Reviewed-by: Gunnar Sletta
7 years agoMinor adjustments to merge-request 915
Donald Carr [Thu, 11 Nov 2010 17:33:36 +0000 (17:33 +0000)]
Minor adjustments to merge-request 915

Fix minor stylistic issue raised by Oswald

Removed duplicate sourceSurface pointer introduced by sibling merge request

7 years agoImplement brush transformations for directfb.
Sam Magnuson [Mon, 8 Nov 2010 21:21:05 +0000 (13:21 -0800)]
Implement brush transformations for directfb.

Merge-request: 915
Reviewed-by: Donald Carr <donald.carr@nokia.com>
(cherry picked from commit b62079cf17044e09999eb1808788926ea921fb05)

7 years agoAdd FreeBSD's certificate bundle to the certificates list.
Raphael Kubo da Costa [Thu, 11 Nov 2010 17:30:40 +0000 (18:30 +0100)]
Add FreeBSD's certificate bundle to the certificates list.

The FreeBSD base system does not ship a certificate bundle, but the
ca_root_nss port provides one extracted from Mozilla's root CA list.

As discussed in QTBUG-14013, it should be preferrable to have bundle
files than separate certificate files, so the path for the certificate
has been added directly.

Signed-off-by: Raphael Kubo da Costa <kubito@gmail.com>
Merge-request: 896
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
7 years agoSSL internals: upon error, read all errors from OpenSSL
Peter Hartmann [Thu, 11 Nov 2010 09:42:31 +0000 (10:42 +0100)]
SSL internals: upon error, read all errors from OpenSSL

... and not only the last one. One call to OpenSSL can produce several
errors, which we should always read all. Otherwise, malicious clients
could intentionally poison the error queue.

Inspired-by: Merge request 2290
Reviewed-by: Olivier Goffart
Reviewed-by: Markus Goetz
Task-number: QTBUG-14513

7 years agoAdded an example for QTest::touchEvent to the documentation.
Denis Dzyubenko [Wed, 10 Nov 2010 10:28:36 +0000 (11:28 +0100)]
Added an example for QTest::touchEvent to the documentation.

Reviewed-by: trustme
7 years agoPush and pop the thread-default context for the current thread
Philip Van Hoof [Mon, 1 Nov 2010 15:59:44 +0000 (16:59 +0100)]
Push and pop the thread-default context for the current thread

Merge-request: 869
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
(cherry picked from commit aa88b7044dd86850e6986aa80104bb38bb7b12eb)

7 years agoFix compilation by s/intptr_t/quintptr/
Thiago Macieira [Wed, 10 Nov 2010 18:32:29 +0000 (19:32 +0100)]
Fix compilation by s/intptr_t/quintptr/

intptr_t is defined in some C header that we don't include. I don't
know which one it is, but without it, it fails to compile with:

declarative/qml/qdeclarativecontext.cpp:477: error: 'intptr_t' was not declared in this scope

Reviewed-By: Trust Me
7 years agoqmake vcxproj generator: fix description of custom build tools
Joerg Bornemann [Fri, 12 Nov 2010 12:16:03 +0000 (13:16 +0100)]
qmake vcxproj generator: fix description of custom build tools

The description of custom build tools that handle more than one extra
compiler cannot be separated by ampersands in Visual Studio 2010.
This seems to be a msbuild bug. We'll just circumvent this issue by
changing the separator in the description to comma.

Task-number: QTBUG-13986
Reviewed-by: ossi
7 years agoCrash fix, when the Object will be deleted during handling a QGestureEvent.
Dominik Holland [Fri, 12 Nov 2010 09:47:55 +0000 (10:47 +0100)]
Crash fix, when the Object will be deleted during handling a QGestureEvent.

The QGestures will now not be deleted immediatly. QGestureManager waits until all
QGestureEvents are processed and will delete the QGestures afterwards.

Task: QT-4022
Reviewed By: Zeno Albisser

7 years agoFix PathView key navigation docs.
Martin Jones [Fri, 12 Nov 2010 05:54:50 +0000 (15:54 +1000)]
Fix PathView key navigation docs.

Task-number: QTBUG-15222
Reviewed-by: Yann Bodson
7 years agoEnsure increment/decrementCurrentIndex always move items in the correct direction.
Martin Jones [Fri, 12 Nov 2010 05:35:41 +0000 (15:35 +1000)]
Ensure increment/decrementCurrentIndex always move items in the correct direction.

With < 4 items the shortest distance algorithm doesn't work since it
is equal distance either way.

Task-number: QTBUG-15260
Reviewed-by: Yann Bodson
7 years agoEnsure loaded item's parent is set before component completion.
Martin Jones [Fri, 12 Nov 2010 03:39:58 +0000 (13:39 +1000)]
Ensure loaded item's parent is set before component completion.

Also documented Loader sizing behavior.

Task-number: QTBUG-14873
Reviewed-by: Michael Brasser
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Fri, 12 Nov 2010 01:41:56 +0000 (02:41 +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:
  Don't set -mfpu=neon globally if the compiler supports neon.

7 years agoMerge branch '4.7-upstream' into 4.7-doc
A-Team [Thu, 11 Nov 2010 23:00:13 +0000 (00:00 +0100)]
Merge branch '4.7-upstream' into 4.7-doc