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
*	Compile fix for pbuffers under Linux	Rhys Weatherley	2009-10-01	2	-1/+2
\| \| \| \|	Reviewed-by: Sarah Smith
*	Remove display lists and refactor ready for ES/ES2 port	Sarah Smith	2009-10-01	6	-168/+649
\| \| \| \| \| \| \| \| \|	Display lists, and a few other features dont work in ES/ES2. Refaoctor to allow redo of lighting and other non-fixed-function pipeline features. Also use QAnimation* classes instead of timers, and correct a few minor bugs (flipped texture). Include new screenshot (old one manifested bug). Reviewed-by: Rhys Weatherley
*	Made hellogl example compile when GL_MULTISAMPLE is not defined.	Samuel Rødal	2009-09-21	1	-1/+5
\| \| \| \| \| \| \|	Also let the GL widget have sample buffers, otherwise using GL_MULTISAMPLE won't help much. Reviewed-by: Trond
*	Fixed a warning.	Trond Kjernaasen	2009-09-21	1	-1/+1
\| \| \| \|	Reviewed-by: Trust Me
*	Make OpenGL overpainting example compile under OpenGL/ES 1.1	Rhys Weatherley	2009-09-21	2	-5/+12
\| \| \| \|	Reviewed-by: trustme
*	remove display lists and qt3d-ize overpainting/hellogl example	Sarah Smith	2009-09-21	8	-231/+549
\| \| \| \| \| \| \| \|	On the way to making opengl examples portable, remove display lists and go to triangles only. Use QMatrix4x4. While on the job use Qt/3D stylee to make the QtLogo as an example of 3D programming more Qt-like. Reviewed-by: Rhys Weatherley
*	Don't have to glEnable(GL_TEXTURE_2D) when using shaders.	Rhys Weatherley	2009-09-14	1	-4/+0
\| \| \| \| \| \| \|	OpenGL/ES 2.0 systems were giving a GL error when GL_TEXTURE_2D was enabled and disabled. Reviewed-by: trustme
*	Port the textures example to OpenGL/ES 2.0	Rhys Weatherley	2009-09-11	3	-35/+91
\| \| \| \|	Reviewed-by: trustme
*	Updated the pbuffers2 example to make it work with the GL2 engine.	Kim Motoyoshi Kalland	2009-09-09	1	-0/+2
\| \| \| \| \| \|	Added begin/endNativePainting() calls. Reviewed-by: Trond
*	Update license headers again.	Jason McDonald	2009-09-09	59	-236/+236
\| \| \| \|	Reviewed-by: Trust Me
*	Port examples/opengl/textures to OpenGL/ES 1.1	Rhys Weatherley	2009-09-08	4	-38/+51
\| \| \| \|	Reviewed-by: Sarah Smith
*	Merge branch '4.5' into 4.6	Thiago Macieira	2009-08-31	59	-767/+767
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
\| *	Update tech preview license header.	Jason McDonald	2009-08-31	59	-767/+767
\| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| *	Eliminate some mentions of Trolltech.	Jason McDonald	2009-08-11	5	-19/+19
\| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| *	Update license headers.	Jason McDonald	2009-08-11	59	-59/+59
\| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \|	Ensured that the framebufferobject example has a stencil buffer.	Samuel Rødal	2009-08-28	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|	The stencil buffer is used for rasterization in the GL 2 paint engine. Reviewed-by: Trond
* \|	Fixed the bubbles.svg file after fixing some bugs in the SVG renderer.	Trond Kjernåsen	2009-08-26	2	-28/+28
\| \| \| \| \| \| \| \|	Reviewed-by: Kim
* \|	Made the opengl/overpainting example work with the GL 2 engine.	Trond Kjernåsen	2009-08-26	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since the GL 2 engine can't set/unset every single GL state that a user might possibly change, we have to make a rule that if something is changed from its default state, it needs to be reset before the GL 2 engine can draw correctly. Reviewed-by: Samuel
* \|	Improved QPainter API for allowing native painting in GL / VG.	Samuel Rødal	2009-08-26	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously we were using QPaintEngine::syncState() which is not ideal naming-wise, since it actually prepares for native painting instead of syncing the painter's state to native state. Reviewed-by: Trond
* \|	Fix double to float truncation warning.	Alessandro Portale	2009-08-24	1	-1/+1
\| \|
* \|	Fix double to float truncation warning.	Alessandro Portale	2009-08-21	1	-1/+1
\| \|
* \|	renamed examplebase.pri to symbianpkgrules.pri	Espen Riskedal	2009-08-21	11	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \|	Fix opengl examples after bad merge.	Jason Barron	2009-08-20	4	-28/+79
\| \| \| \| \| \| \| \| \| \| \| \|	Not sure when it happened, but these files were changed as a result of a merge conflict and at this point there should be no difference in these examples between the Qt/S60 and Qt master branches.
* \|	Merge commit 'qt/master'	Jason Barron	2009-08-13	59	-77/+84
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/opengl/samplebuffers/glwidget.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer.cpp src/gui/gui.pro tests/auto/qhttp/tst_qhttp.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp
\| * \|	Replace some mentions of Trolltech with more appropriate terms.	Jason McDonald	2009-08-12	5	-19/+19
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| * \|	Update contact URL in license headers.	Jason McDonald	2009-08-12	59	-59/+59
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \| \|	Merge commit 'qt/master-stable'	Jason Barron	2009-07-27	1	-0/+3
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.exe qmake/Makefile.unix qmake/generators/makefile.cpp src/corelib/global/qglobal.h src/corelib/kernel/kernel.pri src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/kernel/qaction.cpp src/gui/kernel/qaction.h src/gui/kernel/qaction_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget.h src/gui/kernel/qwidget_mac.mm src/gui/painting/qgraphicssystemfactory.cpp src/gui/styles/qwindowsstyle.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qabstractscrollarea_p.h src/network/access/qnetworkaccessdebugpipebackend.cpp src/network/socket/qlocalsocket_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp src/openvg/qpaintengine_vg.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfile/tst_qfile.cpp tests/auto/qobject/tst_qobject.cpp tests/auto/qpathclipper/qpathclipper.pro tests/auto/qprocess/tst_qprocess.cpp tests/auto/qsettings/tst_qsettings.cpp tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qsqlquerymodel/qsqlquerymodel.pro tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro tests/auto/qsqltablemodel/qsqltablemodel.pro tests/auto/qsqlthread/qsqlthread.pro tests/auto/qwidget/tst_qwidget.cpp
\| * \|	Made QPainter / OpenGL intermixing in hellogl_es2 work properly again.	Samuel Rødal	2009-07-01	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Need to call syncState() to let the paint engine set depth clipping state parameters back to their OpenGL defaults. Reviewed-by: Trond
* \| \|	Merge commit 'qt/master-stable' into 4.6-merged	Jason Barron	2009-06-30	59	-118/+118
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
\| * \|	Merge license header changes from 4.5	Volker Hilsheimer	2009-06-16	59	-118/+118
\| \|\ \ \| \| \|/
\| \| *	Update license headers as requested by the marketing department.	Jason McDonald	2009-06-16	59	-118/+118
\| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \| \|	Merge commit 'qt/master-stable' into 4.6-stable	Jason Barron	2009-06-25	5	-309/+146
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
\| * \|	Improvements to shader API in response to API review	Rhys Weatherley	2009-06-04	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QT-80 Reviewed-by: Ian Walters
\| * \|	Merge commit 'qt/master'	Samuel Rødal	2009-05-13	3	-6/+14
\| \|\ \
\| \| * \|	Replace all instances of "Ctrl+Q" with QKeySequence::Quit.	Norwegian Rock Cat	2009-05-12	1	-1/+1
\| \| \|/ \| \| \| \| \| \| \| \| \|	We introduce this new enum, we should be using it.
\| * \|	Import shader implementation from before the history cut.	Rhys Weatherley	2009-04-03	2	-303/+119
\| \| \|
\| * \|	Fixes: Use the blit/multisample FBO API in the framebuffer object example.	Samuel Rødal	2009-04-01	2	-5/+26
\| \| \| \| \| \| \| \| \| \| \| \|	RevBy: Trond
\| * \|	Long live Qt!	Lars Knoll	2009-03-23	94	-0/+8175
\| /
* \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	axis	2009-05-18	1	-5/+7
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.exe src/corelib/kernel/qcoreapplication.cpp Configure.exe not rebuilt because the changes are irrelevant for the S60 port. We'll rebuild it before merging back.
\| *	Only link against opengles .LIB files if on WinCE	Tom Cooksey	2009-05-11	1	-5/+7
\| \| \| \| \| \| \| \| \| \|	Task-number: 251685 Reviewed-by: mauricek
* \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	axis	2009-05-11	1	-0/+6
\|\ \ \| \|/ \| \| \| \| \| \|	Conflicts: tests/auto/qtemporaryfile/qtemporaryfile.pro
\| *	Fixing hellogl_es2 for Windows CE	Thomas Hartmann	2009-05-08	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|	We hardcode the lib names for 4.5 Reviewed-by: Maurice
\| *	Long live Qt 4.5!	Lars Knoll	2009-03-23	94	-0/+8175
\|
*	Long live Qt for S60!	axis	2009-04-24	94	-0/+8139