summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop'v1.0.0-beta1Miikka Heikkinen2014-01-27369-4939/+9441
|\ | | | | | | Change-Id: I1c9a255eb8f30a24b665856d3711f0abe77c6ef4
| * Remove c++ examples from ios buildsMiikka Heikkinen2014-01-271-1/+1
| | | | | | | | | | Change-Id: Icc963dedb4651d70ccfdf61775e2c9236cd5b1bb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Fix readme for betaMiikka Heikkinen2014-01-271-6/+3
| | | | | | | | | | Change-Id: If2b60eea84f73e9ac4747a36a14a8705b4a5acc7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Doc: Renamed landing page filename to index.htmlJerome Pasion2014-01-272-2/+2
| | | | | | | | | | | | | | | | -convention for the web is index.html. This facilitates redirects. Change-Id: Ib74a949e5a0f0a6559af7f9daf30831bb9457bfb Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Valground betaMiikka Heikkinen2014-01-273-1/+3
| | | | | | | | | | Change-Id: I05867a256caea389fb1d2c19bccbf244732343a2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * iOS: Fixed crashesTomi Korpipää2014-01-272-0/+4
| | | | | | | | | | | | | | | | Added registering ShadowQuality metatype for C++ and QML Task-number: QTRD-2802 Change-Id: I794071dfe65bbae6f668306e78c6d1cd68684751 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Fix copyright yearMiikka Heikkinen2014-01-27299-299/+299
| | | | | | | | | | | | | | Task-number: QTRD-2803 Change-Id: If670633f52519741a096abe901d55fd084ddc9c5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Qmllegend snapshot updatedTomi Korpipää2014-01-271-0/+0
| | | | | | | | | | | | | | Task-number: QTRD-2635 Change-Id: I95d21acdae8a12df3865c491e0c50335054ca6bc Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Add degree symbol + 'C' to value axis format in legend exampleMiikka Heikkinen2014-01-271-0/+1
| | | | | | | | | | Change-Id: I855129834e158804aae97b8f2d5f4516682cefcd Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Add missing consts to public apisMiikka Heikkinen2014-01-279-25/+26
| | | | | | | | | | | | | | Task-number: QTRD-2807 Change-Id: I74a6735ab37a8b3d97548adba99ca79ce2c7975c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Added series rotation and bar item rotation supportMiikka Heikkinen2014-01-2724-48/+308
| | | | | | | | | | | | | | Task-number: QTRD-2654 Change-Id: I864d33bc173b35b8680eddb402bdf1817ecb031f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * iOS changesTomi Korpipää2014-01-272-12/+0
| | | | | | | | | | | | | | | | Removed unnecessary lines from examples and tests project includes Task-number: QTRD-2802 Change-Id: Ie4f546f432babce0c3a96abf5b35012f730102a2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Added qmlmultigraph snapshot Tomi Korpipää2014-01-271-0/+0
| | | | | | | | | | | | | | | | Task-number: QTRD-2635 Change-Id: I1afa27ba5ec792932428fb1f24a07bf2a90602b0 Change-Id: I1afa27ba5ec792932428fb1f24a07bf2a90602b0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * iOS fixesTomi Korpipää2014-01-273-6/+6
| | | | | | | | | | | | | | | | | | | | + texture power-of-two added + input handling changes - surface crashes, will be fixed in separate commit Task-number: QTRD-2802 Change-Id: I1913aec60c4e986b02f307d832dc55dea0be4348 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * iOS fix for qml examplesTomi Korpipää2014-01-242-28/+46
| | | | | | | | | | Change-Id: Ia8e70005c467746bccc9cc6023b2cb485d5a8e7e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Multiseries bars uniform scaling support addedTomi Korpipää2014-01-2414-32/+135
| | | | | | | | | | | | | | Task-number: QTRD-2805 Change-Id: I7172662b2bed0a222ceb7560718450bcabd2879d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Kinectsurface test fixed Tomi Korpipää2014-01-231-50/+51
| | | | | | | | | | | | | | | | Compiles ok, but not tested. Change-Id: I3762ff027e4afe74a2f74cbfb5f5f1be36190a72 Change-Id: I3762ff027e4afe74a2f74cbfb5f5f1be36190a72 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Move qmlmultigraphs to examplesMiikka Heikkinen2014-01-2322-260/+313
| | | | | | | | | | | | | | | | | | | | +Fix Q3DScene::isPointInPrimarySubView +Fix Q3DScene::isPointInSecondarySubView +Remove some unnecessary imports from examples Task-number: QTRD-2800 Change-Id: I5a9bc737c5ee92edbb514e76054adbb54076aef8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Added qmllegend snapshot Tomi Korpipää2014-01-231-0/+0
| | | | | | | | | | | | | | | | Task-number: QTRD-2635 Change-Id: I7beb4d2f150a8e125504ce58c88b6e488a32aa92 Change-Id: I7beb4d2f150a8e125504ce58c88b6e488a32aa92 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Updated audiolevels example image Tomi Korpipää2014-01-231-0/+0
| | | | | | | | | | | | | | | | Task-number: QTRD-2635 Change-Id: Ie8ad5dd54b15df6327f2d44cafb1c0511bbec1e8 Change-Id: Ie8ad5dd54b15df6327f2d44cafb1c0511bbec1e8 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Audiolevels example fixed for MacTomi Korpipää2014-01-231-6/+7
| | | | | | | | | | Change-Id: I92ac7b8a967a62bb229a9f31cbff3f8d4a8e540b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Add example for showing graph legendMiikka Heikkinen2014-01-2317-2/+958
| | | | | | | | | | | | | | | | +Fix default theme Task-number: QTRD-2653 Change-Id: Iccf4161cd19a9dfe6226189568efeb4565ba53ed Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Slice view positioning in qml fixed Tomi Korpipää2014-01-231-1/+2
| | | | | | | | | | | | | | | | Task-number: QTRD-2798 Change-Id: I287802424493435eaa54a14cace651b66a0f1a86 Change-Id: I287802424493435eaa54a14cace651b66a0f1a86 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Example images updated Tomi Korpipää2014-01-2311-0/+0
| | | | | | | | | | | | | | | | | | - audiolevels still to be done Task-number: QTRD-2635 Change-Id: I7f14baafbd816539423412079388b530d30cd57b Change-Id: I7f14baafbd816539423412079388b530d30cd57b Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Updated custom proxy example a bitTomi Korpipää2014-01-231-2/+4
| | | | | | | | | | Change-Id: I9eecfa920d22e928dbe394a3c8ddf649082d2af4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Minimal example images updated Tomi Korpipää2014-01-233-0/+0
| | | | | | | | | | | | | | | | Task-number: QTRD-2732 Change-Id: I0d0bd77609b422105cf1df3c155528e345316f31 Change-Id: I0d0bd77609b422105cf1df3c155528e345316f31 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Mac compilation fix for minimal examplesTomi Korpipää2014-01-233-3/+15
| | | | | | | | | | Change-Id: I5a157dee3942841b05622f67addabea2cd711171 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Example update Tomi Korpipää2014-01-221-2/+2
| | | | | | | | | | | | | | | | Task-number: QTRD-2635 Change-Id: Ia957c3512e528816d708c113b631acb298672dfa Change-Id: Ia957c3512e528816d708c113b631acb298672dfa Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Removed accessing series during render Tomi Korpipää2014-01-221-6/+2
| | | | | | | | | | | | | | | | Task-number: QTRD-2791 Change-Id: I85ada903072b31829fdd42510029373fcf791a35 Change-Id: I85ada903072b31829fdd42510029373fcf791a35 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Made jira tasks of TODOs, part 2 Tomi Korpipää2014-01-2263-286/+176
| | | | | | | | | | | | | | | | | | + commented-out code and qDebugs removed Task-number: QTRD-2398 Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86 Change-Id: Iab13e3ae9d672c0a3bcb4735b3fd1931b2eb7d86 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Made jira tasks of TODOs, part 1Tomi Korpipää2014-01-2220-85/+1
| | | | | | | | | | | | | | | | - commented-out code will be removed (and made tasks of, if necessary) in part 2 Task-number: QTRD-2398 Change-Id: Ib94a4a873ecd25f4040c74c42902e204f3f41943 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * InputState enum moved to private Tomi Korpipää2014-01-2210-111/+92
| | | | | | | | | | | | | | | | Task-number: QTRD-2784 Change-Id: Ibda5445cc9872e2a5bf234914f11d4c380447cf4 Change-Id: Ibda5445cc9872e2a5bf234914f11d4c380447cf4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * InputState enum dividedTomi Korpipää2014-01-2112-32/+86
| | | | | | | | | | | | | | Task-number: QTRD-2683 Change-Id: Ib05469ac1bf8c8ed828974a3adb91ecb5f8f1fc9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Selection correction for scatter when data changesMiikka Heikkinen2014-01-2119-98/+480
| | | | | | | | | | | | | | | | Implements item 3) in QTRD-2645 Task-number: QTRD-264 Change-Id: Ibe758bbfb3b4a74b55589a410b402bbdf07ea64f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Fixed disappearing of shadows on background Tomi Korpipää2014-01-205-75/+13
| | | | | | | | | | | | | | | | Task-number: QTRD-2627 Change-Id: Iac3ce3628382cc2416f842966591bc1b7f1dcbd2 Change-Id: Iac3ce3628382cc2416f842966591bc1b7f1dcbd2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * References to alpha and TP removedTomi Korpipää2014-01-2021-48/+106
| | | | | | | | | | | | | | | | + implemented the rest of lightColor Task-number: QTRD-2405 Change-Id: I38402b45cc4a567a79d07b23983567551d06b4fe Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Optimize theme updateMiikka Heikkinen2014-01-175-68/+24
| | | | | | | | | | | | | | | | | | | | | | Do not reinitialize shaders in theme update and only update drawer if label related items change. Also fix the bug automerge slipped in in recent rebase. Task-number: QTRD-2778 Change-Id: I4c4317dd36a8e8b60dcaec224f45df81c2ae7f54 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Slice view selection label update fixedTomi Korpipää2014-01-171-2/+4
| | | | | | | | | | | | | | Task-number: QTRD-2776 Change-Id: I7518d2598280bfa6bd77af6971e753d9415dae96 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Adjust selection in item removal and insertMiikka Heikkinen2014-01-178-8/+80
| | | | | | | | | | | | | | | | Implements item 1) in QTRD-2645 Task-number: QTRD-2645 Change-Id: I5c1cec438089520592a3526e1ff6095cc30afd34 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Qml enums added Tomi Korpipää2014-01-178-0/+19
| | | | | | | | | | | | | | | | Task-number: QTRD-2636 Change-Id: I90a123432172d32fab7efa2ef18ee79d06139b5b Change-Id: I90a123432172d32fab7efa2ef18ee79d06139b5b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Scatter selection label position fix Tomi Korpipää2014-01-171-5/+12
| | | | | | | | | | | | Change-Id: I96a0bfacd074152941618beb2c5a65a36781ceb3 Change-Id: I96a0bfacd074152941618beb2c5a65a36781ceb3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Reintroduced namespace macros, part 2Tomi Korpipää2014-01-1721-109/+65
| | | | | | | | | | | | | | | | Added changes lost in merge Task-number: QTRD-2594 Change-Id: Ib68b5d9294ad65f69443c475ba771dcfd09926bb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Synchronize clicked detection properlyMiikka Heikkinen2014-01-1716-61/+106
| | | | | | | | | | | | | | | | Implements item 2) in QTRD-2645 Task-number: QTRD-2645 Change-Id: I8b4b3a63eeeba3ba34b6865543380022a6d732ed Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Reintroduced namespace macros Tomi Korpipää2014-01-16163-968/+392
| | | | | | | | | | | | | | | | Task-number: QTRD-2594 Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Change-Id: I31e1ea20fd590d7bdf3d1218d696915c22c3426b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Implement generic clearSelection() method for graphsMiikka Heikkinen2014-01-1617-23/+115
| | | | | | | | | | | | | | | | | | Also fixed scene sync related bug on selection. Task-number: QTRD-2606 Task-number: QTRD-2773 Change-Id: I057fd83ae5bf5ee94e413287fb2b3cefa455b156 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Docs updated after namespace macro removalTomi Korpipää2014-01-1668-289/+622
| | | | | | | | | | | | | | | | - some links do not work Task-number: QTRD-2594 Change-Id: I255a4c12fe09e1a708c068a68073c1c99d6382b6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Better control of series ordering and 'primary' series for barsMiikka Heikkinen2014-01-1513-45/+433
| | | | | | | | | | | | Task-number: QTRD-2578 Change-Id: Icbd945596334afb03d81f3b1d6a72399077455db Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
| * Removed QDataVis and namespace macrosTomi Korpipää2014-01-15204-834/+784
| | | | | | | | | | | | | | | | | | - docs will be fixed in QTRD-2594 Task-number: QTRD-2699 Task-number: QTRD-2700 Change-Id: Ia89d365c2de5d9254b165feb4f0a54ec099084be Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Slice view fixes Tomi Korpipää2014-01-153-80/+117
| | | | | | | | | | | | | | | | | | | | | | | | + zero moves, grid doesn't + y-axis label moved closer to grid + label alignment changes Task-number: QTRD-2769 Task-number: QTRD-2738 Change-Id: Ie4d5a4c47472f1e61e02447847157c8ad8195c07 Change-Id: Ie4d5a4c47472f1e61e02447847157c8ad8195c07 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Documentation additionsMiikka Heikkinen2014-01-1410-2/+80
| | | | | | | | | | | | | | Task-number: QTRD-2735 Change-Id: I4b28ac2876ad025c262f861e7620aa4d6de6ff60 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>