summaryrefslogtreecommitdiffstats
path: root/demos/boxes
Commit message (Collapse)AuthorAgeFilesLines
* Update year in Nokia copyright messages.Jason McDonald2012-01-1124-24/+24
| | | | | | | | | 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-1324-410/+410
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1724-24/+24
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-1024-24/+24
| | | | | | | | Reviewed-by: Trust Me
* | Replace gluPerspective with qgluPerspective.Bjørn Erik Nilsen2010-08-104-2/+14
|/ | | | | | | | GLU dependency was removed in commit: c67b4cac2e53ae77c4e16487838c17be85e73aa3, so we have to implement the function ourselves. Reviewed-by: kim
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-081-2/+4
|\ | | | | | | | | Conflicts: src/multimedia/audio/qaudioformat.cpp
| * Fixed bug in boxes demo occuring with certain OpenGL drivers.Samuel Rødal2010-01-071-2/+4
| | | | | | | | | | | | | | | | | | Apparently glLoadMatrixf doesn't load the supplied data synchronously in certain drivers, so we make the arrays static to work around this issue. Really a GL driver bug but it's quite simple to work around it in this case. Reviewed-by: Kim
* | Update copyright year to 2010Jason McDonald2010-01-0624-24/+24
|/ | | | Reviewed-by: Trust Me
* Ran the script utils/normalizeOlivier Goffart2009-11-181-4/+4
| | | | Over src/ tools/ examples/ and demos/
* Modify QGLShader and QGLShaderProgram in response to API reviewRhys Weatherley2009-11-051-16/+18
| | | | Reviewed-by: Sarah Smith
* Incorporate API review feedback for math3d classes.Rhys Weatherley2009-11-042-3/+3
| | | | Reviewed-by: Sarah Smith
* Fixed a crash in the boxes demo when using -graphicssystem opengl.Trond Kjernaasen2009-09-281-3/+4
| | | | | | | | | | | | Several problems: 1. The demo leaked the scene contents, which caused cleanup problems. 2. The QGLContext::currentContext() could be changed behind Qt's back under Windows (the temp contexts never reset the current context). 3. QGLFormat::openGLVersionFlags() function would return uninitialized flags if the QGLWidget constructor happened to call qt_gl_preferGL2Engine(). Reviewed-by: Kim
* Update license headers again.Jason McDonald2009-09-0924-96/+96
| | | | Reviewed-by: Trust Me
* Fixes "Out of heap space" error when compiling on some setups.Bill King2009-09-081-2/+2
| | | | | The original fix was for "out of stack space" due to to low a value, this one is for too high a value.
* Make dynamic cube maps work again in boxesRhys Weatherley2009-09-071-1/+1
| | | | Reviewed-by: trustme
* Fixed object rotations in the boxes demo.Kim Motoyoshi Kalland2009-09-042-11/+8
| | | | | | | | When Math3D was introduced, the boxes demo was changed to use the classes in the new module, but the change caused some bugs with the object rotations. This commit should fix them. Reviewed-by: Samuel
* Modify QMatrix4x4 and QQuaternion to use qreal internallyRhys Weatherley2009-09-041-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | 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
* Make sure that the dialog in the boxes demo paints window decorations.Jan-Arve Sæther2009-09-031-0/+2
| | | | | | | tst_QGraphicsProxyWidget::windowFlags() demonstrates that this is intended behaviour. Reviewed-by: Kim
* Fixed rendering in boxes demo with GL2 paint engine.Kim Motoyoshi Kalland2009-09-022-0/+7
| | | | | | Added beginNativePainting() and endNativePainting() calls. Reviewed-by: Samuel
* dynamic_cast in the demo was failing to build without rttiThierry Bastian2009-09-012-6/+14
| | | | Reviewed-by: Kim Motoyoshi Kalland
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-3124-312/+312
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3127-351/+351
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-08-1127-27/+27
| | | | | | | | Reviewed-by: Trust Me
* | Fix compiler warningPrasanth Ullattil2009-08-131-2/+4
| | | | | | | | | | | | We need to remove Zm200 from compiler flags before adding Zm1200 Reviewed-by: Marius Storm-Olsen
* | Update contact URL in license headers.Jason McDonald2009-08-1224-24/+24
| | | | | | | | Reviewed-by: Trust Me
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-1624-48/+48
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-1627-54/+54
| | | | | | | | Reviewed-by: Trust Me
| * Fixed a compile failure on Solaris, really :)Trond Kjernåsen2009-06-101-9/+9
| | | | | | | | | | | | You can't static_cast from a signed to an unsigned type and vice versa. Reviewed-by: Kim
| * Fixed a compile issue on Solaris.Trond Kjernåsen2009-06-091-10/+10
| | | | | | | | | | | | GLchar is defined to be unsigned on Solaris for some reason. Reviewed-by: Tom
* | compile fix with namespaceshjk2009-06-042-0/+5
| |
* | Improvements to shader API in response to API reviewRhys Weatherley2009-06-041-1/+1
| | | | | | | | | | Task-number: QT-80 Reviewed-by: Ian Walters
* | Merge commit 'qt/master'Samuel Rødal2009-05-201-2/+5
|\ \ | |/
| * Compile on Solaris with broken GL headers.Trond Kjernåsen2009-05-201-2/+5
| | | | | | | | Reviewed-by: Samuel
* | Mac OSX compile errors in shader usageRhys Weatherley2009-05-101-9/+9
| |
* | Port boxes demo to use math3d throughoutRhys Weatherley2009-05-0112-732/+131
| | | | | | | | Patch originally by Ian Walters.
* | Rename QGLShader(Program)::errors() to log()Rhys Weatherley2009-05-011-3/+3
| | | | | | | | | | | | | | The shader compilers also report warnings, so it is more appropriate to call the string a log. Reviewed-by: trustme
* | Import shader implementation from before the history cut.Rhys Weatherley2009-03-237-550/+61
|/
* Long live Qt 4.5!Lars Knoll2009-03-2342-0/+5762
generated by cgit v0.12 at 2024-12-26 23:09:46 (GMT)