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
*	Fix bidi reordering of RTL text with embedded images	Eskil Abrahamsen Blomfeldt	2011-08-16	1	-2/+0
\| \| \| \| \| \| \| \| \| \|	According to the UBA, the object replacement character should be considered ON. There's no reason to special case its directionality, as the bidi algorithm will already have given it an implicit directionality. Task-number: QTBUG-20910 Reviewed-by: Lars
*	Fixed infinite loop when loading certain SVGs.	Kim Motoyoshi Kalland	2011-08-15	1	-1/+1
\| \| \| \| \|	Task-number: QTBUG-16216 Reviewed-by: aavit
*	Minor optimizations for QTextEngine	Ritt Konstantin	2011-08-08	1	-17/+25
\| \| \| \| \| \| \| \| \|	Optimize script assignment, skip calls to QUnicodeTables::script() for the codepoints handled explicitly. Make the helper functions of QTextEngine::elidedText() inlined Merge-request: 1298 Reviewed-by: yoann
*	uikit: update SDK setting for the simulator	Eike Ziller	2011-08-05	1	-1/+1
\|
*	Add option to compare to different platform in lancelot autotest	aavit	2011-08-05	8	-74/+140
\|
*	uikit: Use release Qt for simulator, update README	Eike Ziller	2011-08-05	3	-83/+103
\|
*	Automatic closing of input panel on uikit when QML item looses focus.	Eike Ziller	2011-08-05	3	-6/+65
\| \| \| \| \| \| \| \| \| \| \|	I.e. we remember which item had focus when we got the request to open the input panel, and close it when that looses focus, even if we don't get an explicit close request. Also set the "returnKey" to "Return" instead of "Done" if the focus item is a TextEdit. This adds a dependency of the platform plugin to declarative.
*	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵	Qt Continuous Integration System	2011-08-03	3	-23/+40
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fixed compile error in qwindowsurface_qws.cpp. Fixed regression introduced by 5842d19cf3dff37a85c. Fix gamma corrected source color in GL
\| *	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team	Qt Continuous Integration System	2011-08-03	2	-5/+10
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Fixed compile error in qwindowsurface_qws.cpp. Fixed regression introduced by 5842d19cf3dff37a85c.
\| \| *	Fixed compile error in qwindowsurface_qws.cpp.	Samuel Rødal	2011-08-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-20713 Reviewed-by: Jørgen Lind
\| \| *	Fixed regression introduced by 5842d19cf3dff37a85c.	Samuel Rødal	2011-08-03	1	-4/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need a normalized rectangle. Reviewed-by: aavit
\| * \|	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team	Qt Continuous Integration System	2011-08-01	1	-18/+30
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \|	* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Fix gamma corrected source color in GL
\| \| *	Fix gamma corrected source color in GL	Jiang Jiang	2011-07-29	1	-18/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GL_EXT_framebuffer_sRGB expects linear RGB as input color, thus we need to convert sRGB based input color into linear RGB first before using glBlendColor with it. Task-number: QTBUG-20574 Reviewed-by: Samuel Rødal
* \| \|	Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵	Qt Continuous Integration System	2011-08-03	3	-21/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Remove DerivedSources.pro from WebKit. Support debuggable in the makefile build system Mark all Symbian debug binaries debuggable by default Detect linked fonts by name (insead of via CLinkedTypeface* Api)
\| * \ \	Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7	Liang Qi	2011-08-03	2	-0/+7
\| \|\ \ \
\| \| * \ \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2011-08-02	1	-107/+0
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove DerivedSources.pro from WebKit.
\| \| \| * \| \|	Remove DerivedSources.pro from WebKit.	Jocelyn Turcotte	2011-08-02	1	-107/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This .pro file gets processed by qmake while looking recursively for pro files. This may cause warnings and the file isn't necessary since derived sources have to be pre-generated before importing WebKit into src/3rdparty. Reviewed-by: Benjamin Poulain
\| \| * \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2011-08-02	2	-0/+7
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Support debuggable in the makefile build system Mark all Symbian debug binaries debuggable by default
\| \| \| * \| \| \|	Support debuggable in the makefile build system	Liang Qi	2011-08-02	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-20697 Reviewed-by: Shane Kearns Reviewed-by: Miikka Heikkinen
\| \| \| * \| \| \|	Mark all Symbian debug binaries debuggable by default	Miikka Heikkinen	2011-08-02	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CODA 4.1.* cannot be used to debug binaries that do not have DEBUGGABLE_UDEBONLY keyword specified, so add this keyword to all projects by default. Adding this keyword has no impact for previous versions of CODA or TRK. Task-number: QTBUG-20669 Reviewed-by: Shane Kearns
\| * \| \| \| \| \|	Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7	Liang Qi	2011-08-03	55	-271/+2160
\| \|\ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵	Qt Continuous Integration System	2011-08-02	1	-0/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: QLabel documentation: add warning about sanitizing input
\| * \| \| \| \| \| \|	QLabel documentation: add warning about sanitizing input	Peter Hartmann	2011-08-02	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make users more aware of QLabel guessing the text format. Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
* \| \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵	Qt Continuous Integration System	2011-08-02	2	-2/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Revert "fix QFileInfo::isSymLink() for NTFS mount points" Fix typo for ifdef QT_NO_ACCESSIBILITY Call QAccessible::updateAccessibility when a widget is deleted Don't include qdbusvirtualobject header twice.
\| * \ \ \ \ \ \ \	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team	Qt Continuous Integration System	2011-08-01	284	-29670/+42335
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (59 commits) Revert "fix QFileInfo::isSymLink() for NTFS mount points" Fix typo for ifdef QT_NO_ACCESSIBILITY Call QAccessible::updateAccessibility when a widget is deleted Revert binary search in QTextEngine::findItem Remove a duplicate include line Save previous font engine for right bearing adjustment Symbian^3 workaround: Avoid usage of linked fonts. Make it possible to update a related table after an external update Fix compilation under OSX 10.7 or using llvm-gcc. Add test case name and drop parentheses for -datatags option. Adding QTDIR validation in tst_symbols autotest Disabled benchmarks referring to private headers. Add license header to printdatatags autotests Compile on symbian^3 Compile on Symbian^3. Added -datatags option to QTestLib Fixed failure of tst_qxmlquery::evaluateToReceiver Fix typo in QFontDialog docs Reset previousGlyph once we reached a new text item Build Qt for Symbian on Mac/gcce again ...
\| \| * \| \| \| \| \| \| \|	Revert "fix QFileInfo::isSymLink() for NTFS mount points"	Jiang Jiang	2011-08-01	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 70a434dc1c24f306805900b5ad7a45c7272702c6.
\| \| * \| \| \| \| \| \| \|	Merge branch '4.8-upstream' into master-water	Water-Team	2011-07-29	6	-31/+88
\| \| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Fix typo for ifdef QT_NO_ACCESSIBILITY	Frederik Gladhorn	2011-07-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: TrustMe
\| \| * \| \| \| \| \| \| \| \|	Call QAccessible::updateAccessibility when a widget is deleted	José Millán Soto	2011-07-29	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge-request: 1310 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
\| \| * \| \| \| \| \| \| \| \|	Merge branch '4.8-upstream' into master-water	Water-Team	2011-07-27	2	-2/+57
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \	Merge branch '4.8-upstream' into master-water	Water-Team	2011-07-26	22	-9/+366
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \	Merge branch '4.8-upstream' into master-water	Water-Team	2011-07-25	2	-6/+10
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \	Merge branch '4.8-upstream' into master-water	Water-Team	2011-07-23	2	-2/+5
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch '4.8-upstream' into master-water	Water-Team	2011-07-22	7	-13/+99
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch '4.8-upstream' into master-water	Water-Team	2011-07-21	198	-9966/+275
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't include qdbusvirtualobject header twice.	Frederik Gladhorn	2011-07-21	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It was in the public and private headers section. Reviewed-by: Thiago
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '4.8-upstream' into master-water	Water-Team	2011-07-20	63	-20313/+42103
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \| \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵	Qt Continuous Integration System	2011-08-01	52	-269/+2148
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| / / \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Make macdeployqt more robust against usage of symbolic links. Document support for Linguist on Mac. Make mac(deploy\|change)qt handle dylibs that use Qt inside an app bundle. Guard macdeployqt against @rpath and @loader_path too. Fix typo. OpenVG cleanup. Include trailing space width in RTL text line width Fix the compilation error when QT_NO_PLUGIN_CHECK was set. Fixed holes in border image drawing by introducing new API. Properly resolve and use glMapBuffer / glUnmapBuffer on GLES2. Revert "fix QFileInfo::isSymLink() for NTFS mount points" Remove debug output. Add some sound support to the uikit platform. Add flickrdemo uikit example project. Fix uikit simulator build. Get subpixel antialiasing again w/combo of raster and affine transform Add initial support for bitmap version 4/5 headers. optimize QRawFont::supportsCharacter() Switch to use floating point pixelSize in QRawFont completely Add a way to check if we have a matching family in the database.
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team	Qt Continuous Integration System	2011-07-29	1	-13/+32
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Make macdeployqt more robust against usage of symbolic links.
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make macdeployqt more robust against usage of symbolic links.	Eike Ziller	2011-07-29	1	-13/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If binaries linked against Versions/Current and a specific version, the framework's binary would be copied twice, leading to duplicate symbols exceptions. Instead we now check for that condition and replicate the symbolic link. Reviewed-by: TrustMe
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team	Qt Continuous Integration System	2011-07-27	2	-0/+118
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Document support for Linguist on Mac.
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document support for Linguist on Mac.	Eike Ziller	2011-07-27	2	-0/+118
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes dragging documents on Linguist dock icon, double clicking document in Finder, and the "open" terminal command. Task-number: QTBUG-20194 Reviewed-by: Oswald Buddenhagen
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team	Qt Continuous Integration System	2011-07-26	2	-26/+62
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Make mac(deploy\|change)qt handle dylibs that use Qt inside an app bundle. Guard macdeployqt against @rpath and @loader_path too. Fix typo.
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make mac(deploy\|change)qt handle dylibs that use Qt inside an app bundle.	Eike Ziller	2011-07-26	2	-18/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Needed e.g. for Qt Creator, which is a bundle of plugins. Reviewed-by: TrustMe
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Guard macdeployqt against @rpath and @loader_path too.	Eike Ziller	2011-07-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: TrustMe
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo.	Eike Ziller	2011-07-26	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: TrustMe
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team	Qt Continuous Integration System	2011-07-26	3	-1/+18
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: OpenVG cleanup. Include trailing space width in RTL text line width
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team	Qt Continuous Integration System	2011-07-26	392	-33783/+45944
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (102 commits) Fix the compilation error when QT_NO_PLUGIN_CHECK was set. Fixed holes in border image drawing by introducing new API. Properly resolve and use glMapBuffer / glUnmapBuffer on GLES2. Revert "fix QFileInfo::isSymLink() for NTFS mount points" Remove debug output. Add some sound support to the uikit platform. Add flickrdemo uikit example project. Fix uikit simulator build. Get subpixel antialiasing again w/combo of raster and affine transform Add initial support for bitmap version 4/5 headers. optimize QRawFont::supportsCharacter() Removed demo files accidentally introduced by commit 3abaecc3. Doc: Added a link to the How to Learn Qt document. Doc: Fixed shader program snippet. importing QtDeclarative classes for usage in QML designer fix QFileInfo::isSymLink() for NTFS mount points QNetworkAccessFileBackend: Add warning for file url without scheme. Check for buffer overflow in Lookup_MarkMarkPos Delay masking the last character in Password echo mode. Add docs for QSqlRelationalTableModel::JoinMode ...