summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move 'final' contacts application to demos.Ian Walters2009-05-0723-537/+776
| | | | | | | | | | | Will finish the applicaiton in this directory to fully functional. Missing features - removing contacts, clearing search, key only access Known bugs - Scroll crashes if data changes while scrolling, VerticalLayout doesn't align horizontally correctly when in ListView delegate. ListView only shows one element on startup, even though query consistently indicates 1000 items as count.
* Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-05-0638-860/+869
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * DocMichael Brasser2009-05-061-6/+1
| |
| * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-061-5/+6
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * docWarwick Allison2009-05-061-5/+6
| | |
| * | Enable updating of XmlListModel from Qml.Michael Brasser2009-05-063-4/+15
| | | | | | | | | | | | Made the fetch() method a slot so it will be accessible from QML.
| * | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-0661-553/+2073
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-0615-3/+368
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-06237-2568/+6540
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | Beginings of an experimental QML debugger viewAaron Kennedy2009-05-0615-3/+368
| | | | |
| | * | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-0636-284/+1542
| | |\ \ \ | | | | |/ | | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-0632-238/+1494
| | | |\ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | docWarwick Allison2009-05-061-23/+36
| | | | | |
| | * | | | Don't process input events while waiting for network response.Martin Jones2009-05-061-1/+1
| | | | | |
| | * | | | Docs.Martin Jones2009-05-063-17/+17
| | | | | |
| * | | | | Merge branch 'shader-api' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team ↵Michael Brasser2009-05-0614-807/+431
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: demos/boxes/scene.cpp src/opengl/qglpixmapfilter.cpp src/opengl/qglshaderprogram.cpp src/opengl/qglshaderprogram.h
| | * | | | | Port boxes demo to use math3d throughoutRhys Weatherley2009-05-0112-732/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch originally by Ian Walters.
| | * | | | | 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
| | | | | | | |
* | | | | | | | Quote align center enum appropriatelyIan Walters2009-05-065-5/+5
| | | | | | | |
* | | | | | | | Use animated images where appropriate.Ian Walters2009-05-064-4/+3
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-05-06225-2821/+5228
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | docWarwick Allison2009-05-063-23/+12
| | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-06194-2158/+4862
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-06196-2051/+4877
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-0626-522/+228
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | | Add images for the Transform documentation.Michael Brasser2009-05-064-2/+11
| | | | | | |
| | | * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-0644-818/+1905
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui
| | | | * | | | Fixes crash when mysql_init() returns 0Bill King2009-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 250632
| | | | * | | | Cleaned up codeAnders Bakken2009-05-051-24/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put all variables in the same area for QDirectFBPaintEnginePrivate. Make QDirectFBPaintEngine a friend. Also, do away with setClipDirty and replace it with d->clipDirty = true; Reviewed-by: TrustMe
| | | | * | | | Cleaned up codeAnders Bakken2009-05-051-439/+443
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move private functions to the bottom of the file to be more in line with how most qt cpp files are structured. Reviewed-by: TrustMe
| | | | * | | | Refactored image cachingAnders Bakken2009-05-057-141/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make image caching a lot cleaner and more sensible. By default we do not cache images since creating a preallocated surface is quick and we don't really want to waste memory. In the case where the driver does not support preallocated surfaces you can enable image caching to speed up drawImage. Reviewed-by: TrustMe
| | | | * | | | Make sure image caching works with Qt3SupportAnders Bakken2009-05-052-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store whether qt was built with qt3support enabled in .qmake.cache. We need this info to decide if QT3_SUPPORT should be defined when we include qimage_p.h. Otherwise we get data corruption issues since the size of struct in Qt is larger than the one we include in libqdirectfb. Reviewed-by: Donald <qt-info@nokia.com>
| | | | * | | | Cleaned up code a littleAnders Bakken2009-05-051-41/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made SurfaceCache entirely inline for better readability. Reviewed-by: TrustMe
| | | | * | | | Don't call prepare more than necessaryAnders Bakken2009-05-053-22/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store the memory address of our last QRasterBuffer::prepare() call to make sure we reprepare if someone has unlocked and locked the device behind our back. Also optimize QDirectFBDevice::memory() since it might get called a fair bit. Reviewed-by: Donald <qt-info@nokia.com>
| | | | * | | | DirectFB can't handle "mirrored" scalesAnders Bakken2009-05-051-14/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fall back to raster engine when using a transform with m11 < 0 || m22 < 0. Task-number: 252921 Reviewed-by: Donald <qt-info@nokia.com>
| | | | * | | | Fix line encoding on PowerVR headersTom Cooksey2009-05-052-742/+742
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Paul
| | | | * | | | Fix infinite recursion with QT3_SUPPORTJoão Abecasis2009-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forward setDesktopBackground to setBackground as is mentioned in the docs. Reviewed-by: Paul
| | | | * | | | Extend change 759338df758ad16cdfd9521b270f7e379bbfa57c to cover extramae2009-05-051-14/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selections with different foreground but no background The main concern is to avoid double painting. With anti-aliasing turned on by default, we can not draw a piece of text on top of the same piece of text without artefacts. Task-number: 252310
| | | | * | | | QTextEdit::ExtraSelection failure with style sheetsmae2009-05-052-6/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the feature has to handle text with and without background, and extra selections with and without background, or even only with underline style. Trouble is that you sometimes want to accumulate styles, for example spell checking wiggly underline plus search result highlights or background markup from the css stylesheet. Task-number: 252310
| | | | * | | | Improved debug outputAnders Bakken2009-05-051-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Format the debug info on blitting, drawing and acceleration capabilities better. Reviewed-by: TrustMe
| | | | * | | | Syntax error on configure scriptJoão Abecasis2009-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported downstream to Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525570 Reviewed-by: Alexis Reviewed-by: Thiago
generated by cgit v0.12 at 2024-12-04 20:50:10 (GMT)