summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'gl2engine-new-shaders' into graphics-masterTom Cooksey2009-05-06588-20203/+22257
|\ | | | | | | | | Conflicts: src/gui/painting/qpaintengine_raster.cpp
| * Big GL Extension CleanupTom Cooksey2009-05-068-252/+253
| | | | | | | | | | | | | | | | | | Clean up the extension naming and make things build on OpenGL ES 2.0 again. All the extensions which made it into OpenGL 2.0 spec have have the EXT postfix removed. This also eliminates defines on ES 2.0 as the code now refers to the in-spec names. Reviewed-by: sroedal
| * Fix OpenGL ES 2.0 breakagesTom Cooksey2009-05-053-3/+14
| | | | | | | | | | Enable GL graphics system on ES 2.0 builds - it wont work, but now QGLDrawable is being used it's just easier to build the graphics system.
| * Merge branch 'shader-api' into gl2engine-new-shadersRhys Weatherley2009-05-0112-732/+131
| |\
| | * Port boxes demo to use math3d throughoutRhys Weatherley2009-05-0112-732/+131
| | | | | | | | | | | | Patch originally by Ian Walters.
| * | Rename uses of QGLShaderProgram::errors() to log()Rhys Weatherley2009-05-012-5/+5
| | | | | | | | | | | | Reviewed-by: trustme
| * | Merge branch 'shader-api' into gl2engine-new-shadersRhys Weatherley2009-05-01571-19210/+21874
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/opengl.pro src/opengl/qglextensions.cpp src/opengl/qglextensions_p.h src/opengl/qglshaderprogram.cpp src/opengl/qglshaderprogram.h
| | * qdoc fixesRhys Weatherley2009-05-011-12/+12
| | | | | | | | | | | | Reviewed-by: trustme
| | * Disable shaders on OpenGL/ES 1.1Rhys Weatherley2009-05-012-2/+2
| | | | | | | | | | | | Reviewed-by: trustme
| | * Samplers should be set via the GLuint override, not the GLint override.Rhys Weatherley2009-05-012-7/+35
| | | | | | | | | | | | Reviewed-by: trustme
| | * Make QGLShaderProgram::disable() static.Rhys Weatherley2009-05-012-2/+8
| | | | | | | | | | | | Reviewed-by: trustme
| | * Rename QGLShader(Program)::errors() to log()Rhys Weatherley2009-05-013-42/+42
| | | | | | | | | | | | | | | | | | | | | The shader compilers also report warnings, so it is more appropriate to call the string a log. Reviewed-by: trustme
| | * Add uniform setters for Qt data types to QGLShaderProgramTom Cooksey2009-05-012-0/+142
| | | | | | | | | | | | Reviewed-by: Rhys Weatherley
| | * Merge branch 'shaderprograms' of ↵Rhys Weatherley2009-05-0117-1059/+3600
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/rweathers-shaderprograms into shader-api Conflicts: src/gui/math3d/math3d.pri src/gui/math3d/qgenericmatrix.cpp src/gui/math3d/qgenericmatrix.h src/gui/math3d/qmatrix4x4.cpp src/gui/math3d/qmatrix4x4.h src/gui/math3d/qquaternion.cpp src/gui/math3d/qquaternion.h src/gui/math3d/qvector2d.cpp src/gui/math3d/qvector2d.h src/gui/math3d/qvector3d.cpp src/gui/math3d/qvector3d.h src/gui/math3d/qvector4d.cpp src/gui/math3d/qvector4d.h src/opengl/opengl.pro tests/auto/math3d/math3d.pro tests/auto/math3d/qmatrixnxn/tst_qmatrixnxn.cpp tests/auto/math3d/qquaternion/tst_qquaternion.cpp tests/auto/math3d/qvectornd/tst_qvectornd.cpp tests/auto/math3d/shared/math3dincludes.h
| | | * Fix loading of partial shaders from files.Rhys Weatherley2009-03-271-3/+0
| | | |
| | | * Bug in QGLShaderProgram::addShader() that stopped partial shaders working.Rhys Weatherley2009-03-271-3/+6
| | | |
| | | * Import shader implementation from before the history cut.Rhys Weatherley2009-03-2353-1063/+18061
| | | |
| | * | QDirModel now uses the same translations as QFileSystemModel toThierry Bastian2009-04-301-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | represent sizes Task-number: 251703
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtKavindra Devi Palaraja2009-04-302-0/+62
| | |\ \
| | | * | Fixed QFile::copy/rename fail after initial failed attemptJoão Abecasis2009-04-302-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These functions were checking the error state after calling close(), without first resetting the error state. Turns out close() only resets the error state if isOpen() returns false. Also, the fallback for the copy operation opens the file for reading but wasn't closing it again afterwards. Now fixed. Added autotests to cover these situations. Reviewed-by: MariusSO
| | * | | Doc - some cleanups on the documentation of QDrawUtilKavindra Devi Palaraja2009-04-301-24/+30
| | |/ /
| | * | Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-2912-28/+281
| | |\ \
| | | * | Stabilize tst_QWidget::render_systemClip2 and remove wrong ifdefBjoern Erik Nilsen2009-04-291-3/+3
| | | | | | | | | | | | | | | | | | | | We only want to dump images *if* RENDER_DEBUG is defined.
| | | * | QTransform::map(const QRegion&) cut-off for single rect regions.Bjoern Erik Nilsen2009-04-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid QRegion<->QPainterPath conversion if possible. Reviewed-by: Samuel
| | | * | Speed-up QPainter::clipRegion().Bjoern Erik Nilsen2009-04-291-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can speed up the calculation by using rect intersections if possible, i.e. QRegion &= QRect instead of QRegion &= QRegion. Then we'll get rid of one QRegion construction and the intersection itself is slightly faster. Reviewed-by: Samuel
| | | * | Wrong clip in QWidget::render(QPainter *, ...) when using Qt::(Replace|No)Clip.Bjoern Erik Nilsen2009-04-292-2/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that we didn't take the painter's clip into account when setting the system viewport ("hard clip"). We only used the system clip, but we have to use system clip + painter clip, which is the current engine clip. Unfortunately, we have to calculate it again since there's no cross-platform way of retrieving it. This was only a problem with Qt::(Replace|No)Clip, since we in all other cases combine the old clip with the new one. (Uber cool) auto test included. Task-number: 250482 Reviewed-by: Samuel
| | | * | Documented the flow layout example.Morten Engvoldsen2009-04-292-4/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrote documentation for the flowlayout class. Task-number: 252548 Rev-by: Geir Vattekar Rev-by: janarve
| | | * | Corrected bugs in the flow layout exampleMorten Engvoldsen2009-04-294-6/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected bugs in the example and added markers for snippets in the documentation. Task-number: 250616 Rev-by: Geir Vattekar
| | | * | Corrected typoMorten Engvoldsen2009-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed smae to same Taks number:251646
| | | * | Corrected description of the QLayout::takeAt() functionMorten Engvoldsen2009-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An item is not deleted when removed from the index. The remaining items get a new index. I changed deleted to removed. Tasknumber: 252547 Rev-by: janarve
| | * | | Compile.Bjoern Erik Nilsen2009-04-291-1/+1
| | | | |
| | * | | Port QStyleSheetStyle to the new qDrawBorderPixmap implementationOlivier Goffart2009-04-292-172/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add another constructor to QTileRules. Reviewed-by: Jens Bache-Wiig
| | * | | Test for border imagesOlivier Goffart2009-04-292-0/+125
| | | | |
| | * | | Add qDrawBorderPixmap() function, Qt::TileRules enum, QMargins struct and ↵Marius Bugge Monsen2009-04-294-0/+346
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTileRules struct. Implements a function to allow drawing CSS3-like border-images (also known as nine-grid images). Next step will be to convert the CSS-style code to use this function for drawing border-images. Task-number: none Reviewed-by: jbache
| | * | | Use QLibrary instance to resolve Gtk symbolsJoão Abecasis2009-04-291-112/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids repeated instantiation of QLibrary objects in the static QLibrary::resolve function. s/QLibrary::resolve(GTK_PATH, 0, /libgtk.resolve(/ Reviewed-by: jbache
| | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-295-6/+24
| | |\ \ \ | | | |/ /
| | | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jarek Kobus2009-04-2927-248/+419
| | | |\ \
| | | | * | Mac: Fixes a crash in tst_QWidget::updateOnDestroyedSignalBjoern Erik Nilsen2009-04-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addendum to change 9b674ddcea7c0ff7912f185474b7d98bc83bd39f. The problem was that QWidget::paintEngine() (pure virtual) was called while being in the destructor. The use-case itself (see above change) is very very corner case, but still, it shouldn't crash. Reviewed-by: bnilsen
| | | | * | Get rid of an unnecessary image copy when grabbing a GL framebuffer.Trond Kjernåsen2009-04-291-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Related to 241466 Reviewed-by: Samuel
| | | | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-04-293-27/+26
| | | | |\ \
| | | | | * | QNetworkAccessManager: do not segfault when using a network cacheBenjamin C Meyer2009-04-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't setfault when setting 0 for the network cache such as when you want to disable it. Reviewed-by: Peter Hartmann
| | | | * | | Fix broken link in documentation.Jason McDonald2009-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | | | Fix a crash in case of setting invalid point sizeJarek Kobus2009-04-291-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Asserts are replaced with warnings and the call is ignored. Task-number: 252414, 252416, 252502 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| | * | | | | make quote/escape parsing more qmake-compatibleOswald Buddenhagen2009-04-291-50/+67
| | | | | | |
| | * | | | | Fix incorrect size hint for QGroupBox Cleanlooks/GTKJens Bache-Wiig2009-04-291-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These styles render using a bigger font than the one set on the groupbox. We basically have to recalculate the minimum size to ensure text is not clipped. Task-number: 16483 Reviewed-by: ogoffart
| | * | | | | Improved performance for pixmaps containing 0-alpha pixels.Samuel Rødal2009-04-291-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Areas of 0-alpha are quite common in ARGB images/pixmaps, so special case them in the argb32 on argb32 image blend function. Reviewed-by: Trond
| | * | | | | introduce Q_WS_WINCEMaurice Kalinowski2009-04-2955-265/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 246130 Reviewed-by: joerg Introduce Q_WS_WINCE for Windows CE only windowing parts. So far we decided to stick with Q_WS_WIN32, but having a separate define makes the code more readable. In addition Q_WS_WINCE_WM is available for Windows Mobile only parts, where we do not check for the OS on runtime.
| | * | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-2925-252/+412
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Try and clean up ODBC 64/32 bit type disparityBill King2009-04-291-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that after approx version 2.7.0, microsoft changed the ODBC types of certain functions, to cater for 64bit architectures. This tries to be a little bit smarter about which types are used in which places.
| | | * | | | Fixes performance degradation from precision fix in 4.5.1Bill King2009-04-291-20/+20
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alleviates the performance hit of querying the database except when necessary, try and use XSQLVAR as much as possible, except for floating point fields. Task-number: 252426
generated by cgit v0.12 at 2024-11-15 11:06:19 (GMT)