Qt.git - Qt s a cross-platform application framework that is used for developing application software that can be run on various software and hardware platforms with little or no change in the underlying codebase, while still being a native application with native capabilities and speed.

	Commit message (Collapse)	Author	Age	Files	Lines
*	OpenVG cleanup.	Nikolaos Korkakakis	2011-07-26	2	-0/+13
\| \| \| \| \| \| \|	Changes needed to reflect the updates in the QWindowSurface. Merge-request: 1309 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
*	Include trailing space width in RTL text line width	Jiang Jiang	2011-07-26	1	-1/+5
\| \| \| \| \|	Task-number: QTBUG-15511 Reviewed-by: Eskil
*	Fix the compilation error when QT_NO_PLUGIN_CHECK was set.	Nikolaos Korkakakis	2011-07-26	1	-1/+6
\| \| \| \| \|	Merge-request: 1307 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
*	Fixed holes in border image drawing by introducing new API.	Samuel Rødal	2011-07-26	10	-148/+294
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When rasterizing two adjacent QRectFs it's important that the shared x or y-edges have the exact same coordinates, or there might be a hole or an overlapping pixel when they are rasterized. Since the drawPixmapFragments API was based on a center position and a scale, it can not be used for this purpose, as the in the situation of two horizontally adjacent rectangles the right edge of the left-most rect and the left edge of the right-most edge are computed differently. Thus rounding errors can cause them to not be equal, especially when there's also a scaling / translating painter transform involved. Thus, to not sacrifice performance, we need to introduce a new drawPixmapFragments API that's simply takes an array of target rectangles and an array of source rectangles. It should give a slight performance boost for the border pixmap use case as well, since there are less floating point multiplications / divisions involved. Task-number: QTBUG-19079 Reviewed-by: Kim
*	Properly resolve and use glMapBuffer / glUnmapBuffer on GLES2.	Samuel Rødal	2011-07-26	3	-13/+28
\| \| \| \| \| \| \| \| \|	Even though we're able to resolve the function pointers, the spec says we have to check for the GL_OES_mapbuffer extension before we use them. Fixes a crash on a platform that doesn't advertise the extension but still resolves the function pointers. Reviewed-by: Kim
*	Revert "fix QFileInfo::isSymLink() for NTFS mount points"	Jiang Jiang	2011-07-26	1	-1/+2
\| \| \| \|	This reverts commit 70a434dc1c24f306805900b5ad7a45c7272702c6.
*	Remove debug output.	Eike Ziller	2011-07-26	1	-1/+0
\|
*	Add some sound support to the uikit platform.	Eike Ziller	2011-07-25	10	-29/+827
\|
*	Add flickrdemo uikit example project.	Eike Ziller	2011-07-25	5	-0/+638
\|
*	Fix uikit simulator build.	Eike Ziller	2011-07-25	1	-2/+2
\|
*	Get subpixel antialiasing again w/combo of raster and affine transform	Eskil Abrahamsen Blomfeldt	2011-07-25	1	-9/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert part of hot fix 48ff7e5af99923396243940979d15d4ec2e2730c since it is no longer needed in Qt 4.8 due to the introduction of a separate code path for the FreeType case in drawCachedGlyphs(). This is also explained in the description for that commit. The consequence of the commit was that subpixel antialiasing would be turned off for all text drawn with a transformation and the raster engine. In the past this was not the case, it is however the case in several other paint engine, so the regression was deemed okay to hot fix the original problem. In Qt 4.8 the original problem has been fixed properly. Task-number: QTBUG-16205 Reviewed-by: Jiang Jiang
*	Add initial support for bitmap version 4/5 headers.	Ilya Konkov	2011-07-22	5	-9/+79
\| \| \| \| \| \| \|	The headers are just skipped, information stored in them is ignored. Merge-request: 824 Reviewed-by: Kim Motoyoshi Kalland <kim.kalland@nokia.com>
*	optimize QRawFont::supportsCharacter()	Ritt Konstantin	2011-07-22	2	-4/+15
\| \| \| \| \| \| \| \| \|	a single UCS-4-encoded codepoint could morph into 1 or 2 UCS-2-encoded codepoints only; thus, allocating QString just to parse it could be avoided and the well-defined UCS-4 to UCS-2 arithmetic could be used instead Merge-request: 1305 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
*	Merge remote branch 'mainline/4.8'	Jiang Jiang	2011-07-22	360	-33660/+44144
\|\
\| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵	Qt Continuous Integration System	2011-07-21	6	-11/+97
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| *	Merge remote-tracking branch 'earth-team/master'	Olivier Goffart	2011-07-20	6	-11/+97
\| \| \|\
\| \| \| *	QNetworkAccessFileBackend: Add warning for file url without scheme.	Martin Petersson	2011-07-19	2	-7/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| *	Native memory mapped file support	Shane Kearns	2011-06-28	3	-4/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QT-5026 Reviewed-by: mread
\| \| \| *	Fix compiler warning	Shane Kearns	2011-06-27	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| \| *	Create QScopedResource class	Shane Kearns	2011-06-27	1	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This has similar purpose to QScopedPointer, and is implemented using it. Symbian has many resource classes, e.g. RFile, RSocket, which behave as value types, but require the Close() member function to be called to release the server side resource owned by the handle. This class can be used to give exception safety, for example when trying to add a resource class to a container std::bad_alloc could be thrown. By assigning the resource to QScopedResource when it is opened, and calling take() after it is added to the container, it is ensured that the resource will be closed if an exception is thrown. Equivalent to the symbian pattern: CleanupClosePushL(file); container.AppendL(file); //transfers ownership, may leave CleanupStack::Pop(file); With STL exceptions we can do: QScopedResource ptr(file); container.append(file); //transfers ownership, may throw ptr.take; Reviewed-By: mread
\| * \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵	Qt Continuous Integration System	2011-07-21	180	-9904/+19
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| \| * \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-review	David Boddie	2011-07-20	248	-10753/+1890
\| \| \|\ \ \
\| \| \| * \ \	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team	Qt Continuous Integration System	2011-07-19	176	-9889/+0
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Removed demo files accidentally introduced by commit 3abaecc3.
\| \| \| \| * \| \|	Removed demo files accidentally introduced by commit 3abaecc3.	David Boddie	2011-07-19	176	-9889/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Donald Carr
\| \| \| * \| \| \|	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team	Qt Continuous Integration System	2011-07-19	72	-864/+1890
\| \| \| \|\ \ \ \ \| \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* '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 ...
\| \| \| \| * \| \|	Doc: Added a link to the How to Learn Qt document.	David Boddie	2011-07-19	1	-1/+2
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	Doc: Fixed shader program snippet.	David Boddie	2011-07-19	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-18982 Reviewed-by: Kim Motoyoshi Kalland
\| \| \| \| * \| \|	Doc: Fixed page step sizes in a snippet for QAbstractScrollArea.	David Boddie	2011-07-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-20350
\| \| \| \| * \| \|	Doc: Moved general notes about character conversion.	David Boddie	2011-07-18	1	-10/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-20411
\| \| \| \| * \| \|	Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt	David Boddie	2011-07-18	68	-849/+1871
\| \| \| \| \|\ \ \
\| * \| \| \| \ \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵	Qt Continuous Integration System	2011-07-21	18	-62/+256
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \ \ \ \ \ \	Merge remote branch 'review/master' into staging	Jiang Jiang	2011-07-20	18	-62/+256
\| \| \|\ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team	Qt Continuous Integration System	2011-07-19	14	-31/+194
\| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* '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).
\| \| \| * \ \ \ \ \ \ \	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team	Qt Continuous Integration System	2011-07-12	4	-30/+61
\| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Add QLocale::toUpper/Lower
\| \| \| * \ \ \ \ \ \ \ \	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team	Qt Continuous Integration System	2011-07-12	1	-1/+1
\| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Fix warning for uninitialized variable
\| * \| \| \ \ \ \ \ \ \ \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵	Qt Continuous Integration System	2011-07-20	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
\| \| * \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'origin/4.8' into 4.8-tools-staging	Joerg Bornemann	2011-07-20	7	-20289/+40195
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵	Qt Continuous Integration System	2011-07-20	54	-20/+1905
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7	Liang Qi	2011-07-20	54	-20/+1905
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2011-07-19	1	-0/+3
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Check for buffer overflow in Lookup_MarkMarkPos
\| \| \| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Check for buffer overflow in Lookup_MarkMarkPos	Jiang Jiang	2011-07-19	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration	Qt Continuous Integration System	2011-07-19	5	-4/+190
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Delay masking the last character in Password echo mode.
\| \| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Delay masking the last character in Password echo mode.	Andrew den Exter	2011-07-19	5	-4/+190
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵	Qt Continuous Integration System	2011-07-19	44	-0/+1698
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| \| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated license headers.	Toby Tomkins	2011-07-19	22	-425/+425
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add system tests from research:systemtests repository.	Toby Tomkins	2011-07-12	44	-0/+1698
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2011-07-18	2	-2/+15
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \|_\|/ / / / / / / / / / / / / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| \| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent failed rendering for NPOT textures in GLES2.	Samuel Rødal	2011-07-18	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Shouldn't use the (default) GL_REPEAT wrap mode on GLES2 unless GL_OES_texture_npot is present. Reviewed-by: Kim
\| \| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't use GL_REPEAT for NPOT textures in GLES2.	Samuel Rødal	2011-07-18	1	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2011-07-18	2	-3/+3
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Avoid crash when surface creation fails.