summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add assert to make c++ type parsing work in Qt CreatorHEADmasterLasse Holmstedt2011-01-101-0/+1
|
* more hacks to get input workingmae2011-01-062-3/+7
|
* Merge branch 'master' of scm.dev.nokia.troll.no:research/qt-scene-graphYoann Lopes2011-01-0613-174/+441
|\
| * Fix PathView issues.Bjørn Erik Nilsen2011-01-063-71/+137
| |
| * Fix crash on QxListViewLasse Holmstedt2011-01-061-3/+5
| | | | | | | | currentItem was 0 when it was being referenced on line 2734.
| * Testcase for shader effects where one source is used twiceGunnar Sletta2011-01-061-0/+49
| |
| * Testcase for shader effect with two sourcesGunnar Sletta2011-01-061-0/+52
| |
| * Merge branch 'master' of scm.dev.nokia.troll.no:research/qt-scene-graphGunnar Sletta2011-01-0614-135/+242
| |\
| | * Add missing NOTIFY signals to FlipableLasse Holmstedt2011-01-052-2/+8
| | |
| | * Fix double click/tap issues.Bjørn Erik Nilsen2011-01-052-10/+24
| | |
| | * Fix some of the mouse/tap issues.Bjørn Erik Nilsen2011-01-053-97/+127
| | |
| * | simple, basic test cases for shader effectsGunnar Sletta2011-01-062-0/+48
| | |
* | | Distfieldgen: fixes output png size.Yoann Lopes2011-01-061-1/+5
| | |
* | | Use multiple threads for distfieldgen tool.Yoann Lopes2011-01-061-4/+33
| | |
* | | Added a tool to generate a distance field file from a font file.Yoann Lopes2011-01-063-1/+201
| |/ |/|
* | Amendment to 995e3ed3c72f9eb05a2fc6cecf325546289218c8Bjørn Erik Nilsen2011-01-041-1/+1
| | | | | | | | | | | | Make it a QPointer to avoid crashes when items are deleted. Yes, we could (and perhaps should) have used a QWeakPointer here, but that requires more work than I'm willing to put into a temporary hack.
* | Make Virtual Keyboard / TextInput working.Bjørn Erik Nilsen2011-01-045-28/+36
| | | | | | | | Not rock solid, but it's better than nothing.
* | Backported jump fix to FlickableThorbjørn Lindeijer2011-01-042-2/+9
| | | | | | | | | | Avoid Flickable view jumping when drag threashold is exceeded. (d630c627ed1dfbcfb48f907d2d37048b049830a5)
* | Backported two PathView fixesThorbjørn Lindeijer2011-01-041-4/+6
| | | | | | | | | | | | | | | | Fix dragging items within a PathView (eca7559542584a5675d22d619a7710e0f17cfba0) Ensure PathView doesn't jump when starting to drag. (1699e8240b8073241f1aaddc12ded6065ef520b9)
* | Added .gitignore fileThorbjørn Lindeijer2011-01-041-0/+9
| |
* | Amendment to 16977ad4af73ba31e6b80a8baf19f43a3729342cBjørn Erik Nilsen2010-12-292-0/+9
| | | | | | | | (make PathView usable with qt-scene-graph)
* | Make PathView usable with qt-scene-graph.Bjørn Erik Nilsen2010-12-293-1/+23
|/ | | | | We need this patch until we have a better replacement for QxPathView :-) It is almost impossible to flick without this patch.
* Fix clipping FlipableGunnar Sletta2010-12-221-10/+3
| | | | | | | | | The problem is that if we go from scissor clip to stencil clip, we don't unset the scissor until after we have completed the stencil drawing. The result is that the stencil drawing is clipped away by the scissor. Problem is solved by disabling scissor before applying the clip stack.
* flippable test and fix a crash bugGunnar Sletta2010-12-222-0/+119
|
* allow switching between different texture managersGunnar Sletta2010-12-222-12/+22
|
* Fixed gradient rectanglesGunnar Sletta2010-12-222-7/+21
|
* compile and workGunnar Sletta2010-12-222-3/+3
|
* convert images to ARGBPM prior to uploadGunnar Sletta2010-12-224-4/+5
|
* Threaded texture manager.Gunnar Sletta2010-12-215-2/+277
|
* Renamed ShaderEffectSource's static property to live.Gunnar Sletta2010-12-212-11/+12
|
* More sanity checks for the texture managerGunnar Sletta2010-12-217-19/+93
|
* Merge branch 'master' of scm.dev.nokia.troll.no:research/qt-scene-graphGunnar Sletta2010-12-2112-66/+228
|\
| * Fixes some compilation warnings.Yoann Lopes2010-12-208-30/+30
| |
| * Temporary fix to allow quitting when in fullscreen mode on Symbian.Yoann Lopes2010-12-201-1/+2
| | | | | | | | It should probably be fixed in Qt.
| * Added grab() function in ShaderEffectSource.Kim Motoyoshi Kalland2010-12-173-0/+53
| | | | | | | | | | Calling grab() on a ShaderEffectSource will force it to update its texture.
| * Added property 'hideOriginal' to ShaderEffectSource.Kim Motoyoshi Kalland2010-12-174-36/+144
| | | | | | | | | | | | | | | | | | When the ShaderEffectSource is used in an active ShaderEffectItem, the 'hideOriginal' property specifies whether the source item will be hidden or not. If it is hidden, the source item will only be rendered into a texture. If it's not hidden, the source item will be rendered both in its original position and into a texture.
* | pick the standard texture manager by defaultGunnar Sletta2010-12-211-6/+6
| |
* | got partial uploader workingGunnar Sletta2010-12-208-146/+432
| |
* | Start refactoring texture manager to make way for partial uploader and threadedGunnar Sletta2010-12-206-200/+161
| | | | | | | | Simple texture manager now works according to spec
* | updatesGunnar Sletta2010-12-171-8/+23
|/
* Fixed the last issue with caching issue...Gunnar Sletta2010-12-162-11/+91
|
* Merge branch 'master' of scm.dev.nokia.troll.no:research/qt-scene-graphGunnar Sletta2010-12-162-3/+4
|\
| * Export the XxxxNodeInterface classesPaul Olav Tvete2010-12-152-3/+4
| | | | | | | | | | | | also fix one small bug Reviewed-by: Gunnar
* | license header for the testGunnar Sletta2010-12-161-0/+41
| |
* | tests for mixing upload and requestUploadGunnar Sletta2010-12-162-2/+60
| |
* | some more autotests for texturemanagerGunnar Sletta2010-12-164-3/+150
| |
* | autotest for the texture managerGunnar Sletta2010-12-164-1/+126
| |
* | fix texture wrapping which lead to pixel errors on pixmap edgesGunnar Sletta2010-12-153-11/+22
|/
* Properly initialize the QGLContext to be used.Gunnar Sletta2010-12-151-1/+2
| | | | | | | If we don't call makeCurrent on the QGLContext, then we are not resolving the workarounds, such as the broken FBO readback used for the texture glyph cache. Without this, text will work randomly and mostly crash.
* Revert "disable text until it works..."Gunnar Sletta2010-12-151-1/+0
| | | | This reverts commit 3cbfe81be46feafe1335733855b3b787dd8265db.