summaryrefslogtreecommitdiffstats
path: root/config.tests/unix/opengles2
Commit message (Collapse)AuthorAgeFilesLines
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-18/+18
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Compile fixes for GL ES and Maccon2011-04-052-1/+9
| | | | | | | | For QPA the unix tests are used to determine the availability of OpenGL ES, so they need to compile even on Mac. Similarly the includes in the OpenGL module have to be adapted on Mac. Acked-by: Jørgen Lind
* Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | Reviewed-by: Trust Me
* Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| | | | Reviewed-by: Trust Me
* Sanitize building Qt with OpenGL ES supportHarald Fernengel2009-11-021-3/+3
| | | | | | | | | | | | | | introduce QMAKE_LIBS_OPENGL_ES1, QMAKE_LIBS_OPENGL_ES1CL and QMAKE_LIBS_OPENGL_ES2 so we do not have to force users to copy/paste around entire mkspecs just to change the OpenGL backend. This should make the "-opengl es2" (and friends) configure option work out of the box with any mkspec on Linux+WinCE. Also removes a WinCE specific hack that is not required anymore. Reviewed-by: Tom Cooksey Reviewed-by: Trond Kjernåsen Approved-by: Lars Knoll
* Update license headers again.Jason McDonald2009-09-091-4/+4
| | | | Reviewed-by: Trust Me
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-311-13/+13
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.5' into 4.6Thiago Macieira2009-08-281-0/+41
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/opengles2/opengles2.cpp tests/auto/linguist/lupdate/testdata/recursivescan/bar.ts.result tests/auto/linguist/lupdate/testdata/recursivescan/foo.ts.result tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/windowsmobile/test/ddhelper.cpp tests/auto/windowsmobile/testQMenuBar/main.cpp tests/auto/xmlpatternsxqts/lib/ASTItem.cpp tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.cpp tests/auto/xmlpatternsxqts/lib/ErrorHandler.cpp tests/auto/xmlpatternsxqts/lib/ErrorItem.cpp tests/auto/xmlpatternsxqts/lib/ExpressionInfo.cpp tests/auto/xmlpatternsxqts/lib/ExpressionNamer.cpp tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.cpp tests/auto/xmlpatternsxqts/lib/Global.cpp tests/auto/xmlpatternsxqts/lib/ResultThreader.cpp tests/auto/xmlpatternsxqts/lib/TestBaseLine.cpp tests/auto/xmlpatternsxqts/lib/TestCase.cpp tests/auto/xmlpatternsxqts/lib/TestContainer.cpp tests/auto/xmlpatternsxqts/lib/TestGroup.cpp tests/auto/xmlpatternsxqts/lib/TestResult.cpp tests/auto/xmlpatternsxqts/lib/TestResultHandler.cpp tests/auto/xmlpatternsxqts/lib/TestSuite.cpp tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.cpp tests/auto/xmlpatternsxqts/lib/TestSuiteResult.cpp tests/auto/xmlpatternsxqts/lib/TreeItem.cpp tests/auto/xmlpatternsxqts/lib/TreeModel.cpp tests/auto/xmlpatternsxqts/lib/Worker.cpp tests/auto/xmlpatternsxqts/lib/XMLWriter.cpp tests/auto/xmlpatternsxqts/lib/XQTSTestCase.cpp tests/auto/xmlpatternsxqts/lib/XSLTTestSuiteHandler.cpp tests/benchmarks/qgraphicswidget/tst_qgraphicswidget.cpp tools/linguist/tests/data/main.cpp tools/linguist/tests/tst_linguist.cpp tools/linguist/tests/tst_lupdate.cpp tools/linguist/tests/tst_simtexth.cpp util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp util/qlalr/examples/lambda/main.cpp util/qlalr/examples/qparser/qparser.cpp
| * Add missing license headers.Jason McDonald2009-08-281-0/+41
| | | | | | | | Reviewed-by: Trust Me
* | Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-221-2/+0
|/ | | | | This change also moves the EGL support classes from QtOpenGL to QtGui so they can be shared between OpenGL and OpenVG.
* Use QMAKE_LIBS_OPENGL_QT in the GL ES config testsTom Cooksey2009-04-031-1/+1
| | | | | | | | | The OpenGL ES config tests are there to test if there's enough to build QtOpenGL, not OpenGL applications using Qt. Therefore we should use QMAKE_LIBS_OPENGL_QT rather than QMAKE_LIBS_OPENGL. This is mostely because Qt needs to link against EGL whereas Qt applications do not. Reviewed-by: TrustMe
* Long live Qt 4.5!Lars Knoll2009-03-232-0/+20