summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gl2engine-new-shaders' into graphics-masterTom Cooksey2009-05-06588-20203/+22257
|\
| * Big GL Extension CleanupTom Cooksey2009-05-068-252/+253
| * Fix OpenGL ES 2.0 breakagesTom Cooksey2009-05-053-3/+14
| * 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
| * | Rename uses of QGLShaderProgram::errors() to log()Rhys Weatherley2009-05-012-5/+5
| * | Merge branch 'shader-api' into gl2engine-new-shadersRhys Weatherley2009-05-01571-19210/+21874
| |\ \ | | |/
| | * qdoc fixesRhys Weatherley2009-05-011-12/+12
| | * Disable shaders on OpenGL/ES 1.1Rhys Weatherley2009-05-012-2/+2
| | * Samplers should be set via the GLuint override, not the GLint override.Rhys Weatherley2009-05-012-7/+35
| | * Make QGLShaderProgram::disable() static.Rhys Weatherley2009-05-012-2/+8
| | * Rename QGLShader(Program)::errors() to log()Rhys Weatherley2009-05-013-42/+42
| | * Add uniform setters for Qt data types to QGLShaderProgramTom Cooksey2009-05-012-0/+142
| | * Merge branch 'shaderprograms' of git@scm.dev.nokia.troll.no:qt/rweathers-shad...Rhys Weatherley2009-05-0117-1059/+3600
| | |\
| | | * 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
| | * | 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
| | * | | 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
| | | * | QTransform::map(const QRegion&) cut-off for single rect regions.Bjoern Erik Nilsen2009-04-291-0/+4
| | | * | Speed-up QPainter::clipRegion().Bjoern Erik Nilsen2009-04-291-11/+20
| | | * | Wrong clip in QWidget::render(QPainter *, ...) when using Qt::(Replace|No)Clip.Bjoern Erik Nilsen2009-04-292-2/+109
| | | * | Documented the flow layout example.Morten Engvoldsen2009-04-292-4/+113
| | | * | Corrected bugs in the flow layout exampleMorten Engvoldsen2009-04-294-6/+30
| | | * | Corrected typoMorten Engvoldsen2009-04-291-1/+1
| | | * | Corrected description of the QLayout::takeAt() functionMorten Engvoldsen2009-04-291-1/+1
| | * | | Compile.Bjoern Erik Nilsen2009-04-291-1/+1
| | * | | Port QStyleSheetStyle to the new qDrawBorderPixmap implementationOlivier Goffart2009-04-292-172/+19
| | * | | Test for border imagesOlivier Goffart2009-04-292-0/+125
| | * | | Add qDrawBorderPixmap() function, Qt::TileRules enum, QMargins struct and QTi...Marius Bugge Monsen2009-04-294-0/+346
| | * | | Use QLibrary instance to resolve Gtk symbolsJoão Abecasis2009-04-291-112/+112
| | * | | 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
| | | | * | Get rid of an unnecessary image copy when grabbing a GL framebuffer.Trond Kjernåsen2009-04-291-2/+10
| | | | * | 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
| | | | * | | Fix broken link in documentation.Jason McDonald2009-04-291-1/+1
| | | * | | | Fix a crash in case of setting invalid point sizeJarek Kobus2009-04-291-2/+8
| | * | | | | 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
| | * | | | | Improved performance for pixmaps containing 0-alpha pixels.Samuel Rødal2009-04-291-3/+2
| | * | | | | introduce Q_WS_WINCEMaurice Kalinowski2009-04-2955-265/+267
| | * | | | | 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
| | | * | | | Fixes performance degradation from precision fix in 4.5.1Bill King2009-04-291-20/+20
| | | | |/ / | | | |/| |
generated by cgit v0.12 at 2024-11-12 18:08:13 (GMT)