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 warning about unreferenced element.	Alessandro Portale	2009-08-21	1	-2/+1
\| \| \| \|	TimeQuery::query is static. No need for TimeQuery instance.
*	Fix double to float truncation warning.	Alessandro Portale	2009-08-21	1	-1/+1
\|
*	Add missing license headers and header guards.	Jason McDonald	2009-08-21	1	-0/+41
\| \| \| \|	Reviewed-by: Trust Me
*	Fix obsolete license headers.	Jason McDonald	2009-08-21	17	-34/+34
\| \| \| \|	Reviewed-by: Trust Me
*	renamed examplebase.pri to symbianpkgrules.pri	Espen Riskedal	2009-08-21	241	-326/+357
\| \| \| \| \| \| \| \|	examplesbase.pri sounded to generic and it was not obvious that this was only for Symbian. Also merged the different symbian rules if they were spread around in the .pro file. Reviewed-by: Aleksandar Sasha Babic
*	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60	axis	2009-08-21	44	-0/+1401
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h
\| *	Only compile shader effect example when having OpenGL.	Bjørn Erik Nilsen	2009-08-21	2	-3/+3
\| \|
\| *	Move shader effect example from examples/graphicsview to examples/effects	Bjørn Erik Nilsen	2009-08-21	20	-4/+10
\| \|
\| *	Merge commit 'qt/master' into kinetic-graphicseffect	Bjørn Erik Nilsen	2009-08-21	8	-30/+158
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/graphicsview/graphicsview.pri
\| * \|	Use pixmap filter for the drop shadow effect.	Bjørn Erik Nilsen	2009-08-21	2	-2/+5
\| \| \|
\| * \|	Merge commit 'qt/master-stable' into kinetic-graphicseffect	Bjørn Erik Nilsen	2009-08-20	7	-80/+76
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/graphicsview/qgraphicsscene.cpp
\| * \| \|	Rename QGraphicsShadowEffect to QGraphicsDropShadowEffect.	Bjørn Erik Nilsen	2009-08-20	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Discussed with Andreas.
\| * \| \|	Move examples/graphicsview/blurpicker\|lighting to examples/effects.	Bjørn Erik Nilsen	2009-08-19	26	-6/+17
\| \| \| \|
\| * \| \|	Merge commit 'qt/master' into kinetic-graphicseffect	Bjørn Erik Nilsen	2009-08-19	2	-69/+38
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/graphicsview/qgraphicsitem_p.h
\| * \ \ \	Merge commit 'qt/master' into kinetic-graphicseffect	Bjørn Erik Nilsen	2009-08-17	1078	-1137/+1137
\| \|\ \ \ \
\| * \ \ \ \	Merge commit 'qt/master' into kinetic-graphicseffect	Bjørn Erik Nilsen	2009-08-07	134	-8386/+2251
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/graphicsview/graphicsview.pri src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp tests/auto/auto.pro
\| * \| \| \| \| \|	Infinite recursion in examples/graphicsview/customshader	Bjørn Erik Nilsen	2009-07-31	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Compile examples/graphicsview/customshader.	Bjørn Erik Nilsen	2009-07-31	2	-5/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'kinetic-graphicseffect' of ↵	Bjørn Erik Nilsen	2009-07-29	26	-334/+457
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git@scm.dev.nokia.troll.no:qt/kinetic into graphicseffects Conflicts: src/gui/graphicsview/qgraphicseffect.cpp src/gui/graphicsview/qgraphicseffect_p.h
\| \| * \| \| \| \| \|	Update QGraphicsShaderEffect to match new API	Rhys Weatherley	2009-07-24	6	-28/+22
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'kinetic-graphicseffect' of ↵	Rhys Weatherley	2009-07-24	8	-42/+32
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-graphicseffect
\| \| * \| \| \| \| \| \|	Implement a variant on blurpicker that shows a custom shader.	Rhys Weatherley	2009-07-24	10	-0/+569
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'custom_shaders' of ../qt-graphics-team into custom-shaders	Rhys Weatherley	2009-07-23	19	-474/+34
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/graphicsview/qgraphicsitem_p.h
\| * \| \| \| \| \| \| \| \|	QGraphicsEffect cleanup.	Bjørn Erik Nilsen	2009-07-29	2	-107/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Make examples/graphicsview/lightning compatible the new effects API.	Bjørn Erik Nilsen	2009-07-29	2	-6/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add QGraphicsEffectSource::pixmap.	Bjørn Erik Nilsen	2009-07-29	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need a convenient way of getting the pixmap representation of the source.
\| * \| \| \| \| \| \| \| \|	Add QGraphicsSourceEffect.	Bjørn Erik Nilsen	2009-07-29	2	-2/+107
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Make QGraphicsEffect independent of QGraphicsItem.	Bjørn Erik Nilsen	2009-07-24	6	-35/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes it possible to basically implement support for graphics effects on pretty much everything, e.g. QWidget. We currently only support effects on QGraphicsItem, but there's more to come :-)
\| * \| \| \| \| \| \| \|	QGraphicsEffect API cleanup.	Bjørn Erik Nilsen	2009-07-23	8	-14/+8
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge commit 'qt/master' into graphicseffects	Bjørn Erik Nilsen	2009-07-21	122	-14524/+869
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/graphicsview/graphicsview.pri src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicsscene.h src/gui/graphicsview/qgraphicsview.cpp
\| * \ \ \ \ \ \ \	Merge commit 'master/master' into kinetic-graphicseffect	Ariya Hidayat	2009-06-30	1	-4/+32
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge commit 'master/master' into kinetic-graphicseffect	Ariya Hidayat	2009-06-29	1190	-2258/+19324
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/graphicsview/graphicsview.pri src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicsview.cpp
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵	Ariya Hidayat	2009-06-05	3	-3/+7
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kinetic-graphicseffect
\| * \| \| \| \| \| \| \| \| \| \|	Remove unused code in the blurpicker example.	Ariya Hidayat	2009-06-04	2	-15/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵	Ariya Hidayat	2009-06-04	6	-29/+4
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kinetic-graphicseffect
\| * \| \| \| \| \| \| \| \| \| \| \|	Source files for the blur picker example.	Ariya Hidayat	2009-06-03	7	-0/+440
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This should be in 295c3927eb236483e6fd2e59f7588f35baa75ea2, but I forgot them.
\| * \| \| \| \| \| \| \| \| \| \| \|	Simplify the examples, since effect is a QObject now.	Ariya Hidayat	2009-06-03	4	-10/+4
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Another QGraphicsEffect example: application chooser with blur effect.	Ariya Hidayat	2009-06-02	11	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use left and right arrow to rotate the icons wheel. The blur effect is applied to each icon, the farthest icon becomes the most blurry one.
\| * \| \| \| \| \| \| \| \| \| \| \|	First example using QGraphicsEffect class: drop shadows on items.	Ariya Hidayat	2009-06-02	7	-0/+403
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The shadow is casted from a moving light source. The shadow offset for each item is different, depending on the relative position of the item to the light source. The same goes for the shadow opacity.
* \| \| \| \| \| \| \| \| \| \| \| \|	Remove changes from bad merge.	Jason Barron	2009-08-21	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was related to e93ffdbb6fde611defc34fd27aec25c40da5a60e. Again, this most likely happened when switching between 4.5 and 4.6 and resolving some conflict incorrectly.
* \| \| \| \| \| \| \| \| \| \| \| \|	Remove commented-out code from examples.	axis	2009-08-21	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RevBy: Trust me
* \| \| \| \| \| \| \| \| \| \| \| \|	Removed an example that was listed twice.	axis	2009-08-21	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RevBy: Espen Riskedal
* \| \| \| \| \| \| \| \| \| \| \| \|	Fixes: Missing deployment of backends for phonon examples	axis	2009-08-21	2	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RevBy: Joerg Details: deployment of waveout and direct show backend Conflicts: examples/phonon/capabilities/capabilities.pro examples/phonon/musicplayer/musicplayer.pro (Cherry-pick of d6cfcd22472128cc68c75a7e24791a909082732f)
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit 'qt/master'	Jason Barron	2009-08-21	3	-1/+124
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/graphicsview/graphicsview.pro
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'anchorlayout' of ↵	Jan-Arve Sæther	2009-08-21	3	-1/+124
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git@gitorious.org:+openbossa-developers/qt/openbossa-clone Conflicts: src/gui/graphicsview/graphicsview.pri
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Remove the anchorlayoyt example that can load layouts.	Jan-Arve Sæther	2009-08-20	14	-1759/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We decided to remove it because it does not serve its purpose as an example.(Too much code, does not show how to use the API in a nice way)
\| \| * \| \| \| \| \| \| \| \| \| \| \|	update API to what was agreed on the API review meeting yesterday:	Jan-Arve Sæther	2009-08-19	3	-49/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The changes are: * Move enums in QGraphicsAnchorLayout::Edge to Qt::AnchorPoint. Prefix them with Anchor since they are not edges in general. * Rename anchor() to addAnchor() * Rename anchorCorner() -> addCornerAnchors() * Rename anchorWidth() -> addLeftAndRightAnchors() * Rename anchorHeight() -> addTopAndBottomAnchors() * Rename anchorGeometry() -> addAllAnchors() * remove the overloads that take a spacing argument, and add setAnchorSpacing() to accommodate for that. * Added anchorSpacing() (implementation missing) * Added unsetAnchorSpacing(). (implementation missing) * made sizeHint() protected. Updated all examples and autotest to reflect this API change.
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Clean up example	Jan-Arve Sæther	2009-08-17	2	-151/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Clean up public API: move dumpGraph() to private API.	Jan-Arve Sæther	2009-08-17	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hopefully we won't need it more...
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Make sure that internal center anchors are not simplified.	Jan-Arve Sæther	2009-07-22	1	-0/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \|