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
*	Merge remote branch 'remotes/lighthouse/4.7' into lighthouse-master	Paul Olav Tvete	2010-07-19	22	-25/+2040
\|\ \| \| \| \| \| \| \| \|	Conflicts: src/opengl/qgl_p.h
\| *	Merge remote branch 'qt/4.7' into lighthouse-4.7	Paul Olav Tvete	2010-07-14	17	-363/+703
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/image/image.pri src/gui/image/qpixmapdatafactory.cpp src/gui/painting/qgraphicssystem.cpp
\| * \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouse	Jørgen Lind	2010-06-24	6	-78/+38
\| \|\ \
\| * \| \|	Refactored classes and functions using lite	Jørgen Lind	2010-06-24	1	-1/+1
\| \| \| \|
\| * \| \|	Refactored QGraphicsSystemCursor -> QPlatformCursor	Jørgen Lind	2010-06-24	3	-40/+40
\| \| \| \|
\| * \| \|	Adding -qpa configure switch	Jørgen Lind	2010-06-24	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	also renaming the embedded_lite qmake switch to be qpa
\| * \| \|	Renamed files from _lite to _qpa	Jørgen Lind	2010-06-24	5	-5/+5
\| \| \| \|
\| * \| \|	Say hello to Q_WS_QPA!	Jørgen Lind	2010-06-24	9	-23/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename Q_WS_LITE -> Q_WS_QPA
\| * \| \|	Removing the default graphicsystem from lighthouse	Jørgen Lind	2010-06-23	3	-136/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: paul
\| * \| \|	Merge remote branch 'qt/4.7' into lighthouse	Paul Olav Tvete	2010-06-18	42	-436/+1215
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure mkspecs/common/qws.conf src/corelib/io/qresource.cpp src/gui/image/qpixmapdata_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/opengl/qgl_p.h src/plugins/mediaservices/gstreamer/gstreamer.pro
\| * \| \| \|	Add support for native children in QtGui again	Jørgen Lind	2010-06-11	1	-5/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	no pluginsupport though
\| * \| \| \|	Use the QBlittable::drawPixmap implementation for pixmaps when we can	Jørgen Lind	2010-06-02	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	just enable a few more states
\| * \| \| \|	Merge remote branch 'qt/4.7' into lighthouse-4.7	Paul Olav Tvete	2010-05-10	13	-849/+389
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/egl/egl.pri src/gui/painting/qwindowsurface_p.h
\| * \| \| \| \|	move cursor details into a private class	Jeremy Katz	2010-05-05	2	-4/+11
\| \| \| \| \| \|
\| * \| \| \| \|	allow multiple cursors	Jeremy Katz	2010-05-05	2	-7/+6
\| \| \| \| \| \|
\| * \| \| \| \|	some cursor documentation fixes, reduce public access to class internals	Jeremy Katz	2010-05-03	2	-11/+24
\| \| \| \| \| \|
\| * \| \| \| \|	Enable some faster text drawing for lighthouse when using raster	Jørgen Lind	2010-04-22	1	-2/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Avoid copying code.	Paul Olav Tvete	2010-04-22	1	-1/+7
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote branch 'origin/4.7' into lighthouse	Jørgen Lind	2010-04-21	31	-893/+1937
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure src/gui/kernel/qapplication.cpp src/gui/painting/qbackingstore.cpp src/opengl/qgl.cpp src/opengl/qgl_p.h src/plugins/plugins.pro tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir tools/tools.pro
\| * \| \| \| \| \|	Renamed createWindowSurfaceForWindow	Jørgen Lind	2010-04-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to createWindowSurface. Gave also a default dpi when there is no platform integration, ie. it has not been initialised yet or is being initialised.
\| * \| \| \| \| \|	Implement createWindowSurface, so that reparenting works	Paul Olav Tvete	2010-04-14	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Jørgen
\| * \| \| \| \| \|	Small optimalisation in DirectfbBlitter	Jørgen Lind	2010-04-12	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Cleaned up Blitter Paint engine and fixed a couple of bugs	Jørgen Lind	2010-04-12	2	-58/+54
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	This seems to fix the resize issues	Paul Olav Tvete	2010-04-09	1	-5/+14
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added QPlatformWindow	Jørgen Lind	2010-04-07	5	-51/+39
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Compile fix	Paul Olav Tvete	2010-03-31	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Refactoring GraphicsSystem to QPlatformIntegration	Jørgen Lind	2010-03-31	8	-85/+149
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QPlatformIntegration is the "main" integration class which needs to be subclassed. This is done so that we don't pollute GraphicsSystem with functionality that really does not belong there. In lighthouse applications needs now to be started with -platform some_platform
\| * \| \| \| \| \|	Compile fix from merging blitter examples.	Jørgen Lind	2010-03-29	1	-2/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Make sure the blitter api works with Raster GS(x11 and win) and QWS	Jørgen Lind	2010-03-29	8	-95/+179
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote branch 'qt/4.7' into lighthouse-4.7	Paul Olav Tvete	2010-03-18	6	-41/+28
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Revert "Add blendfunctions for "all" depths on all platforms"	Paul Olav Tvete	2010-03-18	2	-45/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Details: It turns out that the original code is more accurate and in most cases faster as well. This reverts commit a029628b5e626f4213031427aec0f62ffbef4cab.
\| * \| \| \| \| \| \|	Add blendfunctions for "all" depths on all platforms	Jørgen Lind	2010-03-15	2	-47/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and not only QWS
\| * \| \| \| \| \| \|	Merge remote branch 'origin/4.7' into 4.7-lighthouse	Jørgen Lind	2010-03-11	19	-90/+240
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp
\| * \| \| \| \| \| \| \|	QGraphcissystemCursor is now in a file with a _ in it	Jørgen Lind	2010-03-08	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So that syncqt does not generate an entry for it in QtGui
\| * \| \| \| \| \| \| \|	Compile after QStaticText introduction	Paul Olav Tvete	2010-03-01	2	-0/+13
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge remote branch 'qt/4.7' into lighthouse-4.7	Paul Olav Tvete	2010-03-01	39	-589/+1554
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure src/gui/egl/qegl.cpp src/gui/kernel/qdnd_p.h
\| * \| \| \| \| \| \| \| \|	Minimaldfb: try to make pixelformat of window the same as the layer	Jørgen Lind	2010-02-23	2	-0/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	added some documentation	Jeremy Katz	2010-02-17	1	-1/+75
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge remote branch 'remotes/qt/4.6' into lighthouse	Paul Olav Tvete	2010-02-10	14	-90/+151
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure tests/auto/qwidget/tst_qwidget.cpp
\| * \| \| \| \| \| \| \| \| \|	Added basic fps calculation in qbackingstore	Jørgen Lind	2010-02-10	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix release build-error in qpaintengine_blitter.cpp	Jørgen Lind	2010-02-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Second attemt on rasteroverlay in blitterpaintengine	Jørgen Lind	2010-02-09	2	-58/+49
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix QPixmap::fill autotest and cachekey autotest	Jørgen Lind	2010-01-27	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also make sure it didn't failed with a QFATAL when drawing bitmaps and tried to make sure all surfaces er unlocked when opperations are being performed on them from the windowsurface. There are still test failuers :(
\| * \| \| \| \| \| \| \| \| \|	Make the blitterpaintengine not create a path	Jørgen Lind	2010-01-19	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	but call the raster implementation instead (this is a workaround for the anti-pattern that the blitterpaintengine is)
\| * \| \| \| \| \| \| \| \| \|	Fixed QBlittablePixmapData::fill	Jørgen Lind	2010-01-18	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and a clipping error in the paintengine. Should prob. refactor engine state and clip calls.
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'lighthouse' of scm.dev.nokia.troll.no:qt/qt-lighthouse into ↵	Paul Olav Tvete	2010-01-14	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	lighthouse
\| \| * \| \| \| \| \| \| \| \| \|	minimaldfb: Set the correct SetDstBlendFunction	Jørgen Lind	2010-01-14	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge remote branch 'origin/4.6' into lighthouse	Paul Olav Tvete	2010-01-14	167	-282/+830
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure src/corelib/global/qglobal.cpp src/gui/dialogs/dialogs.pri
\| * \| \| \| \| \| \| \| \| \| \|	Make sure that premultiplied surfaces are used	Jørgen Lind	2010-01-05	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and clean up a bit. Also removed alot of unnecessary windowsurface code
\| * \| \| \| \| \| \| \| \| \| \|	fix application supplied image cursors	Jeremy Katz	2009-12-08	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \|