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
*	Revert "Attempt at fixing Phonon build issue on Symbian."	Thiago Macieira	2010-04-04	1	-18/+20
\| \| \| \| \| \| \| \| \|	This reverts commit 7992ea34f9f1ed67d4e44f43c3a8133ae5aa3ac4. Turns out that this had already been fixed before the update to 4.4.0, but never upstreamed. Revert to the fixed version. I'll upstream the bugfix.
*	Attempt at fixing Phonon build issue on Symbian.	Thiago Macieira	2010-04-04	1	-3/+5
\| \| \| \| \| \| \|	Why, why did someone think that template QObjects with partially exported symbols was a good idea? Reviewed-by: Trust Me
*	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-04-03	1	-0/+14
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: [plugins] Don't conclude that a .debug file is a plugin.
\| *	[plugins] Don't conclude that a .debug file is a plugin.	Thiago Macieira	2010-04-03	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On Unix systems (that are not Mac), the Qt buildsystem splits the code from the debug symbols using objcopy. The resulting .debug file contains a valid ELF header, with a copy of the main library's section headers. But the contents of those sections are missing. When we try to dlopen(3) those libraries, libdl crashes. So we shouldn't try to open those files.
* \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-04-02	13	-3511/+3701
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Revert "Make s60main static lib not depend on QtCore" Fix regression on Symbian Fix broken test case Cleanup the deployment code Fix 'make sis' finding the dll on symbian Re-add line that was lost during webkit update. Work around bad naming of exported class in symbian sdk causing conflict Fix building on public symbian SDK. Fix qmake with the symbian makespec failing when project has a dash in it Make s60main static lib not depend on QtCore Remove stray non-latin1 character Fix out-of-source symbian build for external apps Update EABI def files for 4.7 Exporting QFontDatabase::removeAllApplicationFonts() Adding QFontDatabase::removeAllApplicationFonts()
\| *	Revert "Make s60main static lib not depend on QtCore"	Iain	2010-04-02	2	-48/+5
\| \| \| \| \| \| \| \|	This reverts commit faff1c60a2a7f6ebef90249e759bdf822c8b17de.
\| *	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-04-01	14	-3516/+3749
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix regression on Symbian Fix broken test case Cleanup the deployment code Fix 'make sis' finding the dll on symbian Re-add line that was lost during webkit update. Work around bad naming of exported class in symbian sdk causing conflict Fix building on public symbian SDK. Fix qmake with the symbian makespec failing when project has a dash in it Make s60main static lib not depend on QtCore Remove stray non-latin1 character Fix out-of-source symbian build for external apps Update EABI def files for 4.7 Exporting QFontDatabase::removeAllApplicationFonts() Adding QFontDatabase::removeAllApplicationFonts()
\| \| *	Merge remote branch 'origin/4.7' into HEAD	Thiago Macieira	2010-04-01	23	-1114/+1251
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: demos/declarative/minehunt/minehunt.pro
\| \| * \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-04-01	14	-3516/+3749
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix regression on Symbian Fix broken test case Cleanup the deployment code Fix 'make sis' finding the dll on symbian Re-add line that was lost during webkit update. Work around bad naming of exported class in symbian sdk causing conflict Fix building on public symbian SDK. Fix qmake with the symbian makespec failing when project has a dash in it Make s60main static lib not depend on QtCore Remove stray non-latin1 character Fix out-of-source symbian build for external apps Update EABI def files for 4.7 Exporting QFontDatabase::removeAllApplicationFonts() Adding QFontDatabase::removeAllApplicationFonts()
\| \| \| * \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-04-01	14	-3516/+3749
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix regression on Symbian Fix broken test case Cleanup the deployment code Fix 'make sis' finding the dll on symbian Re-add line that was lost during webkit update. Work around bad naming of exported class in symbian sdk causing conflict Fix building on public symbian SDK. Fix qmake with the symbian makespec failing when project has a dash in it Make s60main static lib not depend on QtCore Remove stray non-latin1 character Fix out-of-source symbian build for external apps Update EABI def files for 4.7 Exporting QFontDatabase::removeAllApplicationFonts() Adding QFontDatabase::removeAllApplicationFonts()
\| \| \| \| * \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-03-31	14	-3516/+3749
\| \| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix regression on Symbian Fix broken test case Cleanup the deployment code Fix 'make sis' finding the dll on symbian Re-add line that was lost during webkit update. Work around bad naming of exported class in symbian sdk causing conflict Fix building on public symbian SDK. Fix qmake with the symbian makespec failing when project has a dash in it Make s60main static lib not depend on QtCore Remove stray non-latin1 character Fix out-of-source symbian build for external apps Update EABI def files for 4.7 Exporting QFontDatabase::removeAllApplicationFonts() Adding QFontDatabase::removeAllApplicationFonts()
\| \| \| \| \| * \|	Fix regression on Symbian	Shane Kearns	2010-03-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	commit c43400792b637c744ca840a4ecb339ffdb27c604 made "x:/" a root directory only on windows. It should be a root on symbian too. Reviewed-by: mread
\| \| \| \| \| * \|	Fix 'make sis' finding the dll on symbian	Thomas Zander	2010-03-31	4	-4/+4
\| \| \| \| \| \| \|
\| \| \| \| \| * \|	Merge commit 'origin/4.7' into symbian47	Thomas Zander	2010-03-31	183	-2391/+5303
\| \| \| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/3rdparty/webkit/WebCore/WebCore.pro src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
\| \| \| \| \| * \| \|	Re-add line that was lost during webkit update.	Thomas Zander	2010-03-30	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doing a 'make sis' expects the dll in the libdir, so place it there. This fixes out-of-source building to always put the dll in the exepcted dir. https://bugs.webkit.org/show_bug.cgi?id=36749
\| \| \| \| \| * \| \|	Make s60main static lib not depend on QtCore	Thomas Zander	2010-03-30	2	-5/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Inline all the code that is used from QtCore as we should not assume QtCore is present for a static library linked into random 3rd party applications.
\| \| \| \| \| * \| \|	Remove stray non-latin1 character	Thomas Zander	2010-03-30	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Update EABI def files for 4.7	Shane Kearns	2010-03-30	6	-3508/+3456
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| \| \| \| * \| \|	Merge remote branch 'qt/4.7' into 4.7	Shane Kearns	2010-03-30	370	-6604/+13998
\| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
\| \| \| \| \| * \| \| \|	Exporting QFontDatabase::removeAllApplicationFonts()	Alessandro Portale	2010-03-29	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It was missing and not covered by the standard autotests, so its missing was not detected for quite some time. Task-number: QTBUG-8423 Reviewed-By: Shane Kearns
\| \| \| \| \| * \| \| \|	Adding QFontDatabase::removeAllApplicationFonts()	Alessandro Portale	2010-03-29	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It was missing and not covered by the standard autotests, so its missing was not detected for quite some time. Task-number: QTBUG-8423 Reviewed-By: Shane Kearns
* \| \| \| \| \| \| \| \|	Fix QtDeclarative public headers to include <QtDeclarative/foo.h>	Thiago Macieira	2010-04-02	4	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All Qt public headers must do it like that.
* \| \| \| \| \| \| \| \|	Update #include of private headers in QtDeclarative	Thiago Macieira	2010-04-02	195	-580/+580
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always use private/. The WinSCW compiler doesn't search the current directory, for whatever reason.
* \| \| \| \| \| \| \|	Merge remote branch 'origin/4.7' into HEAD	Thiago Macieira	2010-04-01	86	-2410/+6521
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/declarative/proxywidgets/proxywidgets.pro examples/declarative/widgets/mywidgets.pro examples/declarative/widgets/widgets.pro
\| * \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration	Qt Continuous Integration System	2010-04-01	23	-1114/+1251
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (24 commits) Fix loading of _debug.dylib plugins under OSX. Remove strange binding loop in Repeater test. Improve Transform docs. Add media elements to the QML Elements docs. Doc fix typo Test cost of importing and resolving types (but not creating objects). Make QML 'hello world' tutorial less confusing. ModelNode::setObjectValue() must update the object cache. Doc improvements, fixes Remove references to deleted qmldebugger. Fix Rectangle::gradient rotation doc. Fix Flickable::visibleArea.xPosition, Flickable::visibleArea.yPosition docs import "." first - i.e. override it by everything else. Set positioner size to final size, rather than some random size mid animation Remove effects from element list. Fix imageprovider example compilation on Symbian arm Remove capability flag not available in public SDKs Fix plugin example compilation on Symbian arm Fix compilation on Symbian winscw ...
\| \| * \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration	Qt Continuous Integration System	2010-04-01	23	-1114/+1251
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (24 commits) Fix loading of _debug.dylib plugins under OSX. Remove strange binding loop in Repeater test. Improve Transform docs. Add media elements to the QML Elements docs. Doc fix typo Test cost of importing and resolving types (but not creating objects). Make QML 'hello world' tutorial less confusing. ModelNode::setObjectValue() must update the object cache. Doc improvements, fixes Remove references to deleted qmldebugger. Fix Rectangle::gradient rotation doc. Fix Flickable::visibleArea.xPosition, Flickable::visibleArea.yPosition docs import "." first - i.e. override it by everything else. Set positioner size to final size, rather than some random size mid animation Remove effects from element list. Fix imageprovider example compilation on Symbian arm Remove capability flag not available in public SDKs Fix plugin example compilation on Symbian arm Fix compilation on Symbian winscw ...
\| \| \| * \| \| \| \| \|	Fix loading of _debug.dylib plugins under OSX.	Roberto Raggi	2010-04-01	1	-1/+4
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Improve Transform docs.	Martin Jones	2010-04-01	1	-4/+11
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7	Martin Jones	2010-04-01	2	-2/+4
\| \| \| \|\ \ \ \ \ \
\| \| \| \| * \| \| \| \| \|	Doc fix	Bea Lam	2010-04-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7	Warwick Allison	2010-04-01	2	-2/+3
\| \| \| \| \|\ \ \ \ \ \
\| \| \| \| \| * \| \| \| \| \|	ModelNode::setObjectValue() must update the object cache.	Bea Lam	2010-04-01	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-9509
\| \| \| \| * \| \| \| \| \| \|	typo	Warwick Allison	2010-04-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	Add media elements to the QML Elements docs.	Martin Jones	2010-04-01	4	-10/+27
\| \| \| \| \|/ / / / / / \| \| \| \|/\| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Fix Rectangle::gradient rotation doc.	Martin Jones	2010-04-01	1	-2/+1
\| \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-9553
\| \| \| * \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7	Martin Jones	2010-04-01	1	-25/+25
\| \| \| \|\ \ \ \ \ \
\| \| \| \| * \ \ \ \ \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7	Warwick Allison	2010-04-01	4	-29/+37
\| \| \| \| \|\ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \|	import "." first - i.e. override it by everything else.	Warwick Allison	2010-04-01	1	-25/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise, simple things break, like having "image.qml" on a case-insensitive file system.
\| \| \| * \| \| \| \| \| \| \|	Fix Flickable::visibleArea.xPosition, Flickable::visibleArea.yPosition docs	Martin Jones	2010-04-01	1	-2/+4
\| \| \| \| \|/ / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-9499
\| \| \| * \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7	Martin Jones	2010-04-01	1	-2/+2
\| \| \| \|\ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \|	Fix compilation on Symbian winscw	Joona Petrell	2010-04-01	1	-2/+2
\| \| \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: Reviewed-by: Aaron Kennedy
\| \| \| * \| \| \| \| \| \|	Set positioner size to final size, rather than some random size mid animation	Martin Jones	2010-04-01	3	-27/+35
\| \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-9559
\| \| \| * \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration	Qt Continuous Integration System	2010-03-31	8	-1039/+1138
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \|/ / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fixed: Declared properties cannot be assigned in declaration
\| \| \| \| * \| \| \| \|	Fixed: Declared properties cannot be assigned in declaration	Roberto Raggi	2010-03-31	8	-1039/+1138
\| \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-7860
\| * \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-04-01	63	-1296/+5270
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (67 commits) Skip tst_QGraphicsItem::updateMicroFocus test on Windows and Mac as it does not passes QScript: more missing APIShim Fix compilation warnings QScript: fix compilation warning QScript: fix APIShim usage. QtScript: remove duplicated APIshim in QScriptValueIterator Attempt to fix the test. Total makeover of SVG image reader Add a QGraphicsItem::updateMicroFocus() to QGraphicsItem. Micro optimization after feedback from Jan-Arve. Show only one dialog when using QFileDialog on Mac. Re-fix compilation: re-add symbols introduced in Qt 4.6.3 to Qt 4.7 Fix bad merge from 4.6. Doc: Updated the qdoc manual with i18n info. Fixed a code example. Fix QStaticText test on Mac Support the pen set on the painter in QStaticText when using rich text Fix setting font for QStaticText on Linux and Mac Hack .pro files on windows to define QT_NO_EGL Fix QDate::isLeapYear() for years < 1 One more test for chinese codecs ...
\| \| * \| \| \| \| \|	QScript: more missing APIShim	Olivier Goffart	2010-04-01	1	-0/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix compilation warnings	Olivier Goffart	2010-04-01	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	qdialog.cpp:261: warning: enumeral and non-enumeral type in conditional expression Reviewed-by: Thiago
\| \| * \| \| \| \| \|	QScript: fix compilation warning	Olivier Goffart	2010-04-01	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	QScript: fix APIShim usage.	Olivier Goffart	2010-04-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	APIShim needs to be named, otherwise it is just a temporary and the destructor is called too early
\| \| * \| \| \| \| \|	QtScript: remove duplicated APIshim in QScriptValueIterator	Olivier Goffart	2010-04-01	1	-6/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added by both 7a11acd536d84ad22ef98a0fdbdb4322a55efafb and 3e5745ea75d73869918889cb374c3d651bed0991 in different branches. in ~QScriptValueIterator and ~QScriptValueIteratorPrivate Only one is required.