summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop'v1.2.0Miikka Heikkinen2014-11-211-5/+13
|\
| * Once more crash fix on texture adding.Mika Salmela2014-11-211-5/+13
* | Merge branch 'develop'Miikka Heikkinen2014-11-211-5/+7
|\ \ | |/
| * Fix crash when adding a texture on QMLMika Salmela2014-11-211-5/+7
* | Merge branch 'develop'Miikka Heikkinen2014-11-217-13/+18
|\ \ | |/
| * Minor tweaks to texturesurface example.Miikka Heikkinen2014-11-212-1/+2
| * Fix flickering in android on some examples when zooming.Miikka Heikkinen2014-11-211-0/+5
| * Fix invalid enum error in OpenGL ES2 builds.Miikka Heikkinen2014-11-212-10/+4
| * Make customitems example actually show some custom items.Miikka Heikkinen2014-11-212-0/+5
| * Fix incorrect shader initialization for static optimized es2Miikka Heikkinen2014-11-211-2/+2
* | Merge branch 'develop'Miikka Heikkinen2014-11-1915-28/+28
|\ \ | |/
| * Fix WinRT issues.Miikka Heikkinen2014-11-1915-28/+28
* | Merge branch 'develop'Miikka Heikkinen2014-11-1817-128/+27
|\ \ | |/
| * Support larger custom meshes.Miikka Heikkinen2014-11-1814-126/+23
| * Some doc updatesMiikka Heikkinen2014-11-182-1/+3
| * Remove cpp autotests from android builds.Miikka Heikkinen2014-11-171-1/+1
* | Merge branch 'develop'Miikka Heikkinen2014-11-145-42/+42
|\ \ | |/
| * Fix the required creator versionMiikka Heikkinen2014-11-141-1/+1
| * renaming toolTip to tooltipThomas Hartmann2014-11-143-40/+40
| * Fix typo in docsMiikka Heikkinen2014-11-131-1/+1
* | Merge branch 'develop'Miikka Heikkinen2014-11-10463-3320/+3349
|\ \ | |/
| * Change copyright headers.Miikka Heikkinen2014-11-07462-3233/+3233
| * Fixed Valgrind reported issues in cpp testsMiikka Heikkinen2014-11-069-87/+116
* | Merge branch 'develop'Miikka Heikkinen2014-11-0623-105/+232
|\ \ | |/
| * Added flags to software renderer test Tomi Korpipää2014-11-052-0/+4
| * Fixed font size jumping in ES2 Tomi Korpipää2014-11-051-1/+1
| * Force software renderer to using ES2 Tomi Korpipää2014-11-054-11/+59
| * Qml perf data generation on cppMika Salmela2014-11-036-30/+104
| * Fix compiler warning on 64bit linuxMiikka Heikkinen2014-11-032-3/+3
| * Fix qmloscilloscope linking issue on some envsMiikka Heikkinen2014-11-031-1/+1
| * Fixed surface slice problemTomi Korpipää2014-10-311-1/+1
| * Allow small delay in scene test for viewport resizeMiikka Heikkinen2014-10-311-1/+1
| * Use QOffscreenSurface instead of QWindow for dummy surfaces.Miikka Heikkinen2014-10-303-9/+7
| * Fix crash on qmloscilloscope in Qt 5.4Miikka Heikkinen2014-10-302-2/+2
| * Fix another crash at app shutdown.Miikka Heikkinen2014-10-301-3/+2
| * Fix crash on application shutdown.Miikka Heikkinen2014-10-301-1/+1
| * Designer plugin bug fix Tomi Korpipää2014-10-302-2/+2
| * Fix crash when initializing QCustom3DLabel out of context.Miikka Heikkinen2014-10-293-45/+49
* | Merge branch 'develop'Miikka Heikkinen2014-10-291-0/+2
|\ \ | |/
| * Add missing includes to utils.cpp.Miikka Heikkinen2014-10-291-0/+2
| * Added the 1.1.1 changes file to develop branch.Miikka Heikkinen2014-10-291-0/+5
* | Merge branch 'develop'Miikka Heikkinen2014-10-29324-3104/+32714
|\ \ | |/
| * Support for dynamic opengl builds.Miikka Heikkinen2014-10-2929-1100/+1063
| * Squeeze labels on ES2Mika Salmela2014-10-283-10/+28
| * Added v1.2 properties to designer pluginTomi Korpipää2014-10-283-0/+228
| * Updated minimum Qt version to 5.2.1 Tomi Korpipää2014-10-271-1/+1
| * Mac touchpad support addedTomi Korpipää2014-10-274-1/+30
| * Make build check for existence of quick module.Miikka Heikkinen2014-10-244-36/+49
| * Release housekeepingMiikka Heikkinen2014-10-2412-80/+317
| * Autotests ES2 fix Tomi Korpipää2014-10-233-18/+45