summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Collapse)AuthorAgeFilesLines
* Replace QGLDrawable with a new QGLPaintDeviceTom Cooksey2009-09-0810-83/+481
| | | | | | | | | | | | | | | | | This patch adds a new abstract base class which inherits from QPaintDevice called QGLPaintDevice. This base class will contain everything the GL paint engines need to know about the surface they are drawing onto. As such, new surfaces can be targeted by the GL paint engines without having to modify QtOpenGL. This is very useful for plugins, specifically QGraphicsSystem plugins. To unify things a little, the GL paint engines will use the same QGLPaintDevice API to render into existing target surfaces (QGLWidget, QGLPixelBuffer & QGLFrameBufferObject). Ideally we'd make QGLPaintDevice a common ancestor for these surfaces, but obviously that wil break B/C. This patch only implements QGLWidget using the new interface. Rendering to other surfaces will be fixed in following patches.
* Added a public function to enforce usage og the old GL engine.Trond Kjernåsen2009-09-083-9/+72
| | | | | | | | | | | Some applications that uses a mix of OpenGL and QPainter code may not work correctly with the new GL 2 engine (e.g. the composition demo). The same is most likely also true for user apps, therefore we need a way to enforce the usage of the old GL 1 engine for the sake of compatibility. Task-number: 260872 Reviewed-by: Samuel
* Add operator== and != to QGLFramebufferObjectFormatRhys Weatherley2009-09-083-6/+32
| | | | Reviewed-by: Sarah Smith
* Texture format must be GL_RGB when pixel type is GL_UNSIGNED_SHORT_5_6_5Rhys Weatherley2009-09-081-0/+1
| | | | | | | | | | | | QImage::Format_RGB16 textures were broken on some OpenGL/ES 1.1 systems because the "format" was set to GL_RGBA and the "texture_format" was set to GL_RGB, with a pixel type of GL_UNSIGNED_SHORT_5_6_5. OpenGL/ES 1.1, ES 2.0, and desktop GL all require the two format parameters to glTexImage2D() to be GL_RGB if the pixel type is GL_UNSIGNED_SHORT_5_6_5. Reviewed-by: Sarah Smith
* Make the matrix and viewport logic in renderText() a bit betterRhys Weatherley2009-09-081-50/+137
| | | | | | | The original renderText() was using the highly unportable (to OpenGL/ES) glGetDoublev() and glGetIntegerv() functions. Reviewed-by: Sarah Smith
* Convert QGLFramebufferObjectFormat to use implicit sharingRhys Weatherley2009-09-082-16/+59
| | | | Reviewed-by: Sarah Smith
* Remove extra invalid semi-colonThiago Macieira2009-09-071-1/+1
| | | | Reviewed-By: Trust Me
* Fixed compile failure on Mac OS X.Samuel Rødal2009-09-071-2/+1
|
* Fixed crash in print preview dialog with graphicssystem OpenGL.Kim Motoyoshi Kalland2009-09-071-17/+18
| | | | | | | | Avoid crashing when framebuffer object created in one context is used in a shared context after the original context is destroyed. Task-number: 260874 Reviewed-by: Samuel
* qdoc: improve the QGLFormat documentationRhys Weatherley2009-09-071-17/+20
| | | | Reviewed-by: trustme
* Performance: Convert QGLFormat to use implicit sharingRhys Weatherley2009-09-073-7/+56
| | | | | | | | | | | | QGLFormat was being deep-copied many times per frame because of code like this: if (context()->format().doubleBuffer()) { ... This change modifies QGLFormat to use implicit sharing to reduce the overhead of the above type of checks. Reviewed-by: Sarah Smith
* Update QGLFormat::operator== to include all fields.Rhys Weatherley2009-09-061-1/+6
| | | | | | | The documentation says "Returns true if all the options of the two QGLFormats are equal", but that's not what it was doing. Reviewed-by: Sarah Smith
* Code cleanup: remove friend declarations for non-existent functionsRhys Weatherley2009-09-061-4/+0
| | | | Reviewed-by: Alex
* Make QGraphicsShaderEffect private API for 4.6Rhys Weatherley2009-09-063-13/+24
| | | | | | | The custom shader code in the OpenGL2 paint engine needs time to mature before we make this official public API. Reviewed-by: trustme
* Make QGLFramebufferObject::isBound() check it is the bound fboTom Cooksey2009-09-041-5/+3
| | | | | | | | Previously, it was possible that painting using QPainter to a different GL target (E.g. QGLWidget) would unbind the FBO. In such cases, isBound returned true, even though the FBO wasn't bound to any context. Reviewed-by: Samuel
* Slightly improved QGLFramebufferObjectFormat API.Samuel Rødal2009-09-045-21/+22
| | | | | | | Renaming setInternalFormat() to setInternalTextureFormat() (and similarly for the accessor) makes the API a bit more explicit. Reviewed-by: Trond
* Modify QMatrix4x4 and QQuaternion to use qreal internallyRhys Weatherley2009-09-041-105/+92
| | | | | | | | | | | | | | | | | | | | | | | | Some concerns were expressed about the float precision of QMatrix4x4, which this change addresses by using qreal instead. The QVector2D/3D/4D classes still use float internally, so that they can be used directly in large arrays of vertex values to be uploaded to an OpenGL server. QQuaternion is a client-side class, and it should produce rotations that are consistent with QMatrix4x4. So its precision was changed too. A consequence of this change is that the following no longer works in a portable fashion: QMatrix4x4 mat; ... glLoadMatrixf(mat.constData()); The caller must now repack the argument to convert from qreal to GLfloat. Reviewed-by: Michael Goddard Reviewed-by: Andreas
* Fixed issues with using GLenum in public API on mac.Samuel Rødal2009-09-035-46/+50
| | | | | | | | | | The type of GLenum was changed between 10.4 and 10.5, so to support compiling on one and deploying on the other we need this hack. Also get rid of the complex QGLFramebufferObjectFormat constructor in favor of a simple default constructor and setters, which is more Qt-ish anyway, and avoids ambiguities on mac. Reviewed-by: Trond
* Fixed bindTexture() on bigendian and older implementationsGunnar Sletta2009-09-032-4/+37
| | | | Reviewed-by: Trond
* Fixed crash in tst_qgl.Samuel Rødal2009-09-031-3/+4
| | | | | | | The shader manager needs to be recreated since the context it was created with might not be valid any more. Reviewed-by: Kim
* Merge branch '4.5' into 4.6Thiago Macieira2009-09-031-0/+40
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/qtdbus.qdoc src/gui/accessible/qaccessible_mac_cocoa.mm src/gui/kernel/qapplication_win.cpp src/xmlpatterns/parser/createTokenLookup.sh tests/auto/linguist/lupdate/testdata/good/merge_versions/project.ui tests/auto/linguist/lupdate/testdata/good/mergeui/project.ui tests/auto/linguist/lupdate/testdata/good/parseui/project.ui tests/auto/runQtXmlPatternsTests.sh tests/auto/test.pl tests/auto/uic/baseline/batchtranslation.ui tests/auto/uic/baseline/batchtranslation.ui.h tests/auto/uic/baseline/config.ui tests/auto/uic/baseline/config.ui.h tests/auto/uic/baseline/finddialog.ui tests/auto/uic/baseline/finddialog.ui.h tests/auto/uic/baseline/formwindowsettings.ui tests/auto/uic/baseline/formwindowsettings.ui.h tests/auto/uic/baseline/helpdialog.ui tests/auto/uic/baseline/helpdialog.ui.h tests/auto/uic/baseline/listwidgeteditor.ui tests/auto/uic/baseline/listwidgeteditor.ui.h tests/auto/uic/baseline/mainwindowbase.ui tests/auto/uic/baseline/mainwindowbase.ui.h tests/auto/uic/baseline/newactiondialog.ui tests/auto/uic/baseline/newactiondialog.ui.h tests/auto/uic/baseline/newform.ui tests/auto/uic/baseline/newform.ui.h tests/auto/uic/baseline/orderdialog.ui tests/auto/uic/baseline/orderdialog.ui.h tests/auto/uic/baseline/paletteeditor.ui tests/auto/uic/baseline/paletteeditor.ui.h tests/auto/uic/baseline/paletteeditoradvancedbase.ui tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h tests/auto/uic/baseline/phrasebookbox.ui tests/auto/uic/baseline/phrasebookbox.ui.h tests/auto/uic/baseline/plugindialog.ui tests/auto/uic/baseline/plugindialog.ui.h tests/auto/uic/baseline/previewwidget.ui tests/auto/uic/baseline/previewwidget.ui.h tests/auto/uic/baseline/previewwidgetbase.ui tests/auto/uic/baseline/previewwidgetbase.ui.h tests/auto/uic/baseline/qfiledialog.ui tests/auto/uic/baseline/qfiledialog.ui.h tests/auto/uic/baseline/qtgradientdialog.ui tests/auto/uic/baseline/qtgradientdialog.ui.h tests/auto/uic/baseline/qtgradientviewdialog.ui tests/auto/uic/baseline/qtgradientviewdialog.ui.h tests/auto/uic/baseline/saveformastemplate.ui tests/auto/uic/baseline/saveformastemplate.ui.h tests/auto/uic/baseline/statistics.ui tests/auto/uic/baseline/statistics.ui.h tests/auto/uic/baseline/stringlisteditor.ui tests/auto/uic/baseline/stringlisteditor.ui.h tests/auto/uic/baseline/tabbedbrowser.ui tests/auto/uic/baseline/tabbedbrowser.ui.h tests/auto/uic/baseline/tablewidgeteditor.ui tests/auto/uic/baseline/tablewidgeteditor.ui.h tests/auto/uic/baseline/translatedialog.ui tests/auto/uic/baseline/translatedialog.ui.h tests/auto/uic/baseline/treewidgeteditor.ui tests/auto/uic/baseline/treewidgeteditor.ui.h tests/auto/uic/baseline/trpreviewtool.ui tests/auto/uic/baseline/trpreviewtool.ui.h tests/auto/uic3/baseline/about.ui tests/auto/uic3/baseline/about.ui.4 tests/auto/uic3/baseline/actioneditor.ui tests/auto/uic3/baseline/actioneditor.ui.4 tests/auto/uic3/baseline/config.ui tests/auto/uic3/baseline/config.ui.4 tests/auto/uic3/baseline/configtoolboxdialog.ui tests/auto/uic3/baseline/configtoolboxdialog.ui.4 tests/auto/uic3/baseline/connectiondialog.ui tests/auto/uic3/baseline/connectiondialog.ui.4 tests/auto/uic3/baseline/createtemplate.ui tests/auto/uic3/baseline/createtemplate.ui.4 tests/auto/uic3/baseline/customwidgeteditor.ui tests/auto/uic3/baseline/customwidgeteditor.ui.4 tests/auto/uic3/baseline/dbconnection.ui tests/auto/uic3/baseline/dbconnection.ui.4 tests/auto/uic3/baseline/dbconnectioneditor.ui tests/auto/uic3/baseline/dbconnectioneditor.ui.4 tests/auto/uic3/baseline/dbconnections.ui tests/auto/uic3/baseline/dbconnections.ui.4 tests/auto/uic3/baseline/editfunctions.ui tests/auto/uic3/baseline/editfunctions.ui.4 tests/auto/uic3/baseline/finddialog.ui tests/auto/uic3/baseline/finddialog.ui.4 tests/auto/uic3/baseline/formsettings.ui tests/auto/uic3/baseline/formsettings.ui.4 tests/auto/uic3/baseline/gotolinedialog.ui tests/auto/uic3/baseline/gotolinedialog.ui.4 tests/auto/uic3/baseline/helpdialog.ui tests/auto/uic3/baseline/helpdialog.ui.4 tests/auto/uic3/baseline/iconvieweditor.ui tests/auto/uic3/baseline/iconvieweditor.ui.4 tests/auto/uic3/baseline/listboxeditor.ui tests/auto/uic3/baseline/listboxeditor.ui.4 tests/auto/uic3/baseline/listeditor.ui tests/auto/uic3/baseline/listeditor.ui.4 tests/auto/uic3/baseline/listvieweditor.ui tests/auto/uic3/baseline/listvieweditor.ui.4 tests/auto/uic3/baseline/mainfilesettings.ui tests/auto/uic3/baseline/mainfilesettings.ui.4 tests/auto/uic3/baseline/mainwindowbase.ui tests/auto/uic3/baseline/mainwindowbase.ui.4 tests/auto/uic3/baseline/mainwindowwizard.ui tests/auto/uic3/baseline/mainwindowwizard.ui.4 tests/auto/uic3/baseline/multilineeditor.ui tests/auto/uic3/baseline/multilineeditor.ui.4 tests/auto/uic3/baseline/newform.ui tests/auto/uic3/baseline/newform.ui.4 tests/auto/uic3/baseline/paletteeditor.ui tests/auto/uic3/baseline/paletteeditor.ui.4 tests/auto/uic3/baseline/paletteeditoradvanced.ui tests/auto/uic3/baseline/paletteeditoradvanced.ui.4 tests/auto/uic3/baseline/paletteeditoradvancedbase.ui tests/auto/uic3/baseline/paletteeditoradvancedbase.ui.4 tests/auto/uic3/baseline/pixmapcollectioneditor.ui tests/auto/uic3/baseline/pixmapcollectioneditor.ui.4 tests/auto/uic3/baseline/pixmapfunction.ui tests/auto/uic3/baseline/pixmapfunction.ui.4 tests/auto/uic3/baseline/preferences.ui tests/auto/uic3/baseline/preferences.ui.4 tests/auto/uic3/baseline/previewwidget.ui tests/auto/uic3/baseline/previewwidget.ui.4 tests/auto/uic3/baseline/previewwidgetbase.ui tests/auto/uic3/baseline/previewwidgetbase.ui.4 tests/auto/uic3/baseline/projectsettings.ui tests/auto/uic3/baseline/projectsettings.ui.4 tests/auto/uic3/baseline/replacedialog.ui tests/auto/uic3/baseline/replacedialog.ui.4 tests/auto/uic3/baseline/richtextfontdialog.ui tests/auto/uic3/baseline/richtextfontdialog.ui.4 tests/auto/uic3/baseline/settingsdialog.ui tests/auto/uic3/baseline/settingsdialog.ui.4 tests/auto/uic3/baseline/sqlformwizard.ui tests/auto/uic3/baseline/sqlformwizard.ui.4 tests/auto/uic3/baseline/startdialog.ui tests/auto/uic3/baseline/startdialog.ui.4 tests/auto/uic3/baseline/statistics.ui tests/auto/uic3/baseline/statistics.ui.4 tests/auto/uic3/baseline/tabbedbrowser.ui tests/auto/uic3/baseline/tabbedbrowser.ui.4 tests/auto/uic3/baseline/tableeditor.ui tests/auto/uic3/baseline/tableeditor.ui.4 tests/auto/uic3/baseline/topicchooser.ui tests/auto/uic3/baseline/topicchooser.ui.4 tests/auto/uic3/baseline/variabledialog.ui tests/auto/uic3/baseline/variabledialog.ui.4 tests/auto/uic3/baseline/wizardeditor.ui.4 tests/auto/uiloader/baseline/batchtranslation.ui tests/auto/uiloader/baseline/config.ui tests/auto/uiloader/baseline/finddialog.ui tests/auto/uiloader/baseline/formwindowsettings.ui tests/auto/uiloader/baseline/helpdialog.ui tests/auto/uiloader/baseline/listwidgeteditor.ui tests/auto/uiloader/baseline/mainwindowbase.ui tests/auto/uiloader/baseline/newactiondialog.ui tests/auto/uiloader/baseline/newform.ui tests/auto/uiloader/baseline/orderdialog.ui tests/auto/uiloader/baseline/paletteeditor.ui tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui tests/auto/uiloader/baseline/phrasebookbox.ui tests/auto/uiloader/baseline/plugindialog.ui tests/auto/uiloader/baseline/previewwidget.ui tests/auto/uiloader/baseline/previewwidgetbase.ui tests/auto/uiloader/baseline/qfiledialog.ui tests/auto/uiloader/baseline/qtgradientdialog.ui tests/auto/uiloader/baseline/qtgradienteditor.ui tests/auto/uiloader/baseline/qtgradientviewdialog.ui tests/auto/uiloader/baseline/saveformastemplate.ui tests/auto/uiloader/baseline/statistics.ui tests/auto/uiloader/baseline/stringlisteditor.ui tests/auto/uiloader/baseline/tabbedbrowser.ui tests/auto/uiloader/baseline/tablewidgeteditor.ui tests/auto/uiloader/baseline/translatedialog.ui tests/auto/uiloader/baseline/treewidgeteditor.ui tests/auto/uiloader/baseline/trpreviewtool.ui tools/assistant/compat/mainwindow.cpp tools/assistant/tools/assistant/mainwindow.cpp tools/designer/src/designer/versiondialog.cpp tools/linguist/linguist/mainwindow.cpp tools/linguist/shared/make-qscript.sh tools/qdbus/qdbusviewer/qdbusviewer.cpp
| * Add missing license headersJason McDonald2009-09-031-0/+40
| | | | | | | | Reviewed-by: Trust Me
* | Fixed reparenting OpenGL widgets on Windows.Kim Motoyoshi Kalland2009-09-031-6/+1
| | | | | | | | | | Task-number: 260697 Reviewed-by: Trond
* | Fixed bug where QGLContext::isSharing() returned false while sharing.Kim Motoyoshi Kalland2009-09-021-1/+3
| | | | | | | | | | | | | | When creating a QGLPixelBuffer with context sharing, the sharing flag was only set on the pixel buffer, not the other context. Reviewed-by: Trond
* | Fixed a system clip issue in the GL 2 engine.Trond Kjernåsen2009-09-021-3/+9
| | | | | | | | | | | | | | | | QGraphicsView can set the system clip in order to handle clipping of QGraphicsView children, and we have to take that into account in the GL 2 engine, as we did in the GL 1 engine. Reviewed-by: Samuel
* | Split QGLEngineShaderManager into a shared and a per engine part.Kim Motoyoshi Kalland2009-09-027-301/+337
| | | | | | | | | | | | | | | | | | Both the shaders and the engine states were shared between OpenGL contexts, but the states should be only apply to one context, not a group of contexts. This commit separates the shaders and the states. Task-number: 257254 Reviewed-by: Samuel
* | Don't seg-fault when printing error message in shader managerTom Cooksey2009-09-011-11/+25
| | | | | | | | | | | | | | | | It's very likely that some of the shader objects in required program will be null, as not all are manditory. Check to see if they exist before de-referencing them and asking for their log string. Reviewed-by: Trustme
* | Unambiguated QGLFramebufferObject constructor on Mac OS X.Samuel Rødal2009-09-011-1/+1
| | | | | | | | Reviewed-by: Trond
* | Fixed toImage() not working on a multisample QGLFramebufferObject.Samuel Rødal2009-09-011-0/+10
| | | | | | | | | | | | | | Need to blit into a regular QGLFramebufferObject first to force a multisample resolve. Reviewed-by: Trond
* | Fixed QGLFramebufferObject::toImage() releasing the FBO if bound.Samuel Rødal2009-09-011-2/+5
| | | | | | | | Reviewed-by: Trond
* | Fixed poor utilization of depth buffer range in GL 2 paint engine.Samuel Rødal2009-09-012-29/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this patch we were only able to do 20 or so IntersectClips before failing, this patch instead adapts to the fixed point nature of typical depth buffer implementations and lets us do ~2^15 IntersectClip operations before failing, which should be a reasonable limit for any real-world application. Using the following mapping of old floating point depths to integer depths: -1.0 -> 0, -0.5 -> 1, 0.0 -> 2, 0.25 -> 3, 0.5 -> 4, 0.625 -> 5, etc.. Reviewed-by: Tom
* | Add #define's for highp/mediump after #version/#extension headersRhys Weatherley2009-09-011-1/+20
| | | | | | | | | | | | | | | | GLSL shaders require that #version and #extension must appear before any other code. The #define's we insert for highp/mediump/etc must therefore be moved down to just after them. Reviewed-by: Gunnar Sletta
* | OpenGL/ES 2.0 compilation problem since QGLContextGroup changesRhys Weatherley2009-08-311-0/+12
| | | | | | | | Reviewed-by: trustme
* | be51485f missed some instances of qt_get_extension_funcsRhys Weatherley2009-08-311-2/+2
| | | | | | | | Reviewed-by: trustme
* | Fixed initialization order in QGLContextGroup constructor.Kim Motoyoshi Kalland2009-08-311-1/+1
| | | | | | | | Reviewed-by: Trond
* | Remove unused variable in GL2 engine.Kim Motoyoshi Kalland2009-08-311-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Added context pointer to QGLContextGroupResources.Kim Motoyoshi Kalland2009-08-314-126/+151
| | | | | | | | | | | | | | | | | | | | | | | | I renamed QGLContextGroupResources to QGLContextGroup because we are using it to identify context groups. I also added a pointer to one of the contexts in the group. Together with qgl_share_reg(), the pointer can be used to find all contexts in a group. I renamed QGLContextPrivate::qt_get_extension_funcs() to QGLContextPrivate::extensionFuncs() to follow Qt's naming convention. Reviewed-by: Trond
* | Fixed a problem with corrupted text in the GL 2 engine.Trond Kjernåsen2009-08-311-0/+1
| | | | | | | | | | | | | | Blending should not be enabled when copying the font cache texture into the fbo. It *may* cause artifacts with some drivers. Reviewed-by: Samuel
* | Fixed rendering bug in blurpicker example with -graphicssystem openglSamuel Rødal2009-08-311-28/+25
| | | | | | | | | | | | | | | | | | | | | | Made the GL blur filter code slightly less hacky by not reusing the same paint engine for rendering both to the offscreen FBO and to the actual target device. This should make the code less reliant on paint engine implementation details and thus more robust with regards to changes in the paint engine. Task-number: 260402 Reviewed-by: Trond
* | Fixed having a QPainter active on several FBOs at the same time.Samuel Rødal2009-08-311-10/+29
| | | | | | | | | | | | | | It's insufficient to use a single paint engine to render to all FBOs. If the default engine is already in used we need to create our own engine. Reviewed-by: Trond
* | doc: Fixed several qdoc errors.Martin Smith2009-08-311-1/+1
| |
* | Fixed crash when sharing OpenGL contexts in the GL2 paint engine.Kim Motoyoshi Kalland2009-08-312-46/+155
| | | | | | | | | | | | | | | | | | | | | | Shader objects had a pointer to the context they were originally created in. If the context was destroyed, the shader would (on Windows) dereference an invalid pointer and cause the program to crash. I replaced the context pointer with a pointer to the context group. I also added checks in debug mode to make sure the context associated with the shader shares resources with the current context. Reviewed-by: Tom
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-08-311-0/+38
|\ \
| * | Fixed compile failure caused by merge error in fragmentprograms_p.h.Samuel Rødal2009-08-311-0/+38
| | |
* | | Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-318-104/+104
|/ / | | | | | | Reviewed-by: Trust Me
* | Fixed inverted pixmaps when using OpenGL graphics effects.Samuel Rødal2009-08-311-1/+3
| | | | | | | | | | | | | | QGL2PaintEngineExPrivate::drawTexture() texture coordinates have been inverted, so they need to be inverted here too. Reviewed-by: Kim
* | Merge branch '4.5' into 4.6Thiago Macieira2009-08-3150-637/+650
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 McDonald2009-08-3159-767/+767
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-08-1159-59/+59
| | | | | | | | Reviewed-by: Trust Me
* | Move QGLShareContextScope to qgl_p.h so other things can use it.Rhys Weatherley2009-08-312-37/+40
| | | | | | | | Reviewed-by: trustme
generated by cgit v0.12 at 2024-11-14 01:55:22 (GMT)