summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0Liang Qi2017-11-211-0/+24
|\ | | | | | | Change-Id: I6017d21c0adc1f05cba7292c65708508b41ffd04
| * Add changes file for Qt 5.9.3v5.9.3Jani Heikkinen2017-11-081-0/+24
| | | | | | | | | | | | Task-number: QTBUG-64209 Change-Id: Iee315c81ecd463e3a1b7e285a84b0b96cccfb48c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Doc: Update the list of highlighted examplesTopi Reinio2017-11-131-1/+2
| | | | | | | | | | | | | | | | Add highlighting for 'Qml Charts Example' Task-number: QTBUG-60662 Change-Id: Ieacba9fc6d00894bc24b3198bb81f4d5bbc1ea56 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Add changes file for Qt 5.10.0Jani Heikkinen2017-11-081-0/+22
| | | | | | | | | | Change-Id: Ie1ef4babce536589a0ffb14cf733cd3e05b38307 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into ↵v5.10.0-beta4Liang Qi2017-11-038-18/+179
|\ \ | | | | | | | | | refs/staging/5.10
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-038-18/+179
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf tests/manual/chartwidgettest/mainwidget.cpp tests/manual/wavechart/wavechart.cpp Change-Id: I18962ddc37a91daa23571eb04e35eec828aceef8
| | * Add shaders suitable for CoreProfile on declarativeMika Salmela2017-10-201-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | Adds shaders that work on CoreProfile. Task-number: QTBUG-63807 Change-Id: Ib446521f5f013ca5a6427295b301c9743dabf1ac Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | * Use proper math.h/cmath includesJake Petroules2017-10-072-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | This is necessary to use math functions with and without the std:: namespace qualifier. Change-Id: I2f404d0e57a71758ee070b8b752ebcc41c4e292c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | | | | | Change-Id: I25ff18c678de36073f7294d17569155a0178583b
| | * Add changes file for Qt 5.9.2v5.9.2Jani Heikkinen2017-09-221-0/+25
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-62766 Change-Id: Ie99d15cc0af2fa791048a89fb8ad0fc84c0ef962 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | * Select min of m_points and pointsMika Salmela2017-09-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On QXYSeriesPrivate::drawSeriesPointLabels the loop is based on m_points.size(), but points vector may have less items because of animation. This patch takes the min of vectors. Task-number: QTBUG-63123 Change-Id: I940fd5557abd3a28d064ab2c2737fae650fd7183 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | * Add change file for Qt 5.6.3 (charts 2.1.3)Jani Heikkinen2017-09-051-0/+5
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-62729 Change-Id: Icdb6c41adab448b6d5b9eabcbc6834110bbf79d4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| | * Account for very small numbers when setting the rangeAndy Shaw2017-08-233-14/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using qFuzzyCompare it would not allow for very small numbers so we remove that need and do a straight compare instead. This also includes a test to check that zooming and then resetting gets us back to the original range. Task-number: QTBUG-56097 Change-Id: I722be55f602c936e03fe3cc57c30ba15c0e0bed0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | Update to new QRandomGenerator APIThiago Macieira2017-11-0318-28/+28
|/ / | | | | | | | | Change-Id: I69f37f9304f24709a823fffd14e676c097712329 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Remove misleading .pro filev5.10.0-beta3Thiago Macieira2017-10-251-6/+0
| | | | | | | | | | | | | | | | | | This directory does not contain a unit test, but a file that is part of other unit tests. And the .pro file that was here did not compile anyway. Change-Id: Icaa86fc7b54d4b368c0efffd14f0b2178af7b0d2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Revamp QML Charts examplev5.10.0-beta2v5.10.0-beta1Titta Heikkala2017-09-1316-22/+15
| | | | | | | | | | | | | | | | | | | | Updated the example so that the same theme is used for all charts. The images for documentation are also updated. Added comments to code. Change-Id: Iaad648f42f5bb7edfa101f1202b56472aa511ca3 Task-number: QTBUG-60662 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Add .ui.qml file to Qml Charts Examplev5.10.0-alpha1Titta Heikkala2017-09-083-52/+92
| | | | | | | | | | | | | | | | | | MainForm.ui.qml file added to Qml Charts Example to make it work with Qt Quick Designer. Change-Id: I709dd460ac179b5d65db0ca29196351c89ade5eb Task-number: QTBUG-60662 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Improve the documentation of Chart Themes ExampleTitta Heikkala2017-09-062-5/+90
| | | | | | | | | | | | | | | | | | | | | | Added more detailed documentation and code snippets to Chart Themes Example. Change-Id: I206b65038b369d0eaa5fb128b872328ec43de7a2 Task-number: QTBUG-60662 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Update appearance of Chart Themes ExampleTitta Heikkala2017-09-054-20/+46
| | | | | | | | | | | | | | | | | | Default ranges are set to axes. Only one pie chart is shown. Space added to y-axis labels to add space between labels and axis. Change-Id: If64f68aad90ed9c3151b4cbfe7c4fa527871fb70 Task-number: QTBUG-60662 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Add Qt Designer UI file to Chart Themes ExampleTitta Heikkala2017-09-044-81/+155
| | | | | | | | | | | | | | | | | | Add a UI file to Chart Themes Example. The UI file includes widgets to change chart options along with signal slot connections. Change-Id: I194624e23ebb785271a054cf1b2891d134fd2656 Task-number: QTBUG-60662 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Fix window palette initialization in Chart Themes ExampleTitta Heikkala2017-08-301-27/+35
| | | | | | | | | | | | | | | | | | The default window palette needs to be set to the application object in initialization as the palette of the window is not valid by then. Change-Id: Iad18c255600b31b18f0030094dd9e57757001fa1 Task-number: QTBUG-62824 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Set window palette in Chart Themes ExampleTitta Heikkala2017-08-301-27/+27
| | | | | | | | | | | | | | | | | | Set the right colors for window palette based on theme in Chart Themes Example to help test automation. Change-Id: Ia7ed7fc05fc5193a916ebff29bba8aeceda5f97f Task-number: QTBUG-62824 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-1532-193/+321
|\| | | | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/charts/dynamicspline/chart.cpp examples/charts/piechartdrilldown/main.cpp Change-Id: I839e97bf377c7823f2f464c097656d58f279ed77
| * Use range-for instead of foreach in examplesMiikka Heikkinen2017-08-1113-53/+58
| | | | | | | | | | | | | | | | Task-number: QTBUG-60662 Change-Id: Ief9264e2b6670466bd74278dbd194a7be81d614f Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Blacklist the mousehovered test for CIAndy Shaw2017-08-111-0/+2
| | | | | | | | | | Change-Id: I8ef7bf79bd7e573016ec0e969e4dbca9dc2fba74 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * BarSeries: Account for labels when hovering over the barAndy Shaw2017-08-082-42/+70
| | | | | | | | | | | | | | | | | | | | If you hover over a label then it will send a hoverLeaveEvent() because the label is not accounted for. So we set the labels to not accept hover events to ensure they don't interfere with the bar. Task-number: QTBUG-62137 Change-Id: I59097d14a7ce73948eda7a8332f927d1d465b273 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Call the base implementation to ensure the mouse event is passed onAndy Shaw2017-08-071-1/+1
| | | | | | | | | | | | | | | | | | Since the event is only handled to do selection then we should still call the base implementation so that it can be handled by the scene and so on. This makes it easier to catch these events if desired. Change-Id: I5f11e137832633ae298576903623227f35f8fee5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Add some build system artifacts to .gitignoreMiikka Heikkinen2017-08-031-0/+6
| | | | | | | | | | | | Change-Id: Ie36dc05fd6d41415cb9023381479230e8387712e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Minor coding style fixes to examplesMiikka Heikkinen2017-08-0319-97/+158
| | | | | | | | | | | | | | | | Task-number: QTBUG-60662 Change-Id: I0edd88328b403d09faa27d30b89ac91c802121dc Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | | | | | Change-Id: I905f096abc21c6754e69b5b8df3b2a1da96a3f1b
| * Add changes file for 5.9.1v5.9.1Antti Kokko2017-06-231-0/+26
| | | | | | | | | | | | | | Listing important changes and bug-fixes. Change-Id: I5e9a2871b84d0a16cdb75df6ac71ff95229c6a08 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Enable tests for boot2qtSami Nurmenniemi2017-08-113-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests for boot2qt were disabled with commit 25e51976c3324630525346ccb785fafe48ea5ed9. The tests can be enabled since qtdeclarative now fallbacks to software renderer if OpenGL is not supported. Also fixed tst_QChart::zoomOut which was doing direct comparison of qreal variables. Changed it to use QCompare which internally uses qFuzzyCompare and does not suffer from float precision problems. Task-number: QTBUG-60268 Change-Id: I9e9de2e3c5cdbe725587e522be852d6cc5f7fd00 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Use QRandomGenerator instead of q?randThiago Macieira2017-07-0421-61/+47
| | | | | | | | | | Change-Id: Icd0e0d4b27cb4e5eb892fffd14b5285d43f4afbf Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Be (somewhat more) consistent about the value of piEdward Welbourne2017-06-146-15/+12
| | | | | | | | | | | | | | | | | | Use M_PI in C++ and Math.PI in JavaScript (including QML). Use qmath.h's value for M_PI where we can't avoid an explicit value. Task-number: QTBUG-58083 Change-Id: I80c81444c1867f8f0c07f192fa68de933f48bbc4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-078-13/+71
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8727ef26fff1c303df0653cd85a019b96de1b501
| * Remove commercial only licenseMiikka Heikkinen2017-06-051-9/+17
| | | | | | | | | | | | | | | | | | | | tst_qareaseries.cpp still had commercial only license, replaced it with similar license as all the other tests had. Task-number: QTBUG-61126 Change-Id: Ide96f43e8321a94e1c142beebcb242989c58fb62 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * fix for some QXYModelMapper sync issuesJohn Englund2017-06-011-3/+3
| | | | | | | | | | | | | | | | | | - QXYModelMapper was not handling the model's layoutChanged() signal, which could leave points out of order - QXYModelMapper handled dataChanged() by replacing points by value rather than index, which could cause the wrong point to be replaced. This was fixed. Change-Id: I77a49acc5fc6982dabf976a3811c644843d18bb2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-312-0/+36
| |\ | | | | | | | | | Change-Id: I1c047a599ec859e3ab322bc0688c65faa1f37b89
| | * Highlight chartthemes examplev5.9.0-rc2v5.9.0-rc1v5.9.0Miikka Heikkinen2017-05-171-0/+2
| | | | | | | | | | | | | | | Change-Id: If2cc659eaa203e3fd8cb87d474874ae9a8b88e14 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * Add changes file for 5.9.0Antti Kokko2017-05-091-0/+34
| | | | | | | | | | | | | | | | | | | | | Listing important changes and bug-fixes. Change-Id: Ia9a95ddde0633cf3fa2ed015af44d84121a64063 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * | Bump versionOswald Buddenhagen2017-05-101-1/+1
| |/ | | | | | | Change-Id: I2baff913ab4d017ece2db9035a58277db7f6ee74
| * Fix bundling of module for static buildsv5.9.0-beta4Julian Strobl2017-05-051-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this patch the module is not bundled in static builds correctly causing 'module "<QtModule>" is not installed' errors in during runtime. As reference: this happens, because 'QQmlMetaType::isAnyModule(importUri)' at 'qtdeclarative/src/qml/qml/qqmltypeloader.cpp:1422:' returns 'false', which indicates that the module was not registered. Task-number: QTBUG-59559 Change-Id: I6ca9c13b7467fae069d0ec3406a0e16fbb8f59d3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Disable/blacklist failing tests for boot2qtSami Nurmenniemi2017-04-272-0/+6
| | | | | | | | | | | | | | | | | | | | Currently boot2qt is tested with QEMU and the test crashes. Disabling for now to make it possible to enable qt5 tests for Coin. Task-number: QTBUG-60266 Change-Id: Ic11740de638b4783add72ee0bb19a5fbba086a68 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Calculate the available space for the title based on the heightAndy Shaw2017-04-241-1/+1
| | | | | | | | | | | | | | | | | | Since the VerticalAxis will rotate 90 degrees then it needs to check for the available height for the title and not the width. Otherwise it will end up eliding the title unnecessarily. Change-Id: I9dd651fdac9111277eb6137f4d9dabcf77330cab Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-04-2135-34/+505
|\| | | | | | | Change-Id: Ia087cc352a34245e6599e788622885a38137accb
| * Fix GCC warning about comparing the result of comparisonsv5.9.0-beta3v5.9.0-beta2Thiago Macieira2017-04-042-2/+2
| | | | | | | | | | | | | | stackedbarchartitem.cpp:66:23: warning: suggest parentheses around comparison in operand of ‘==’ [-Wparentheses] Change-Id: I27b55fdf514247549455fffd14b1abfb3e033b85 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Fix warning about unused variableThiago Macieira2017-04-042-4/+0
| | | | | | | | | | | | | | polarchartlayout.cpp:37:20: warning: unused variable 'golden_ratio' [-Wunused-const-variable] Change-Id: I27b55fdf514247549455fffd14b17aef1f958915 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Fix warning about && inside ||Thiago Macieira2017-04-042-4/+4
| | | | | | | | | | | | | | stackedbarchartitem.cpp:172:38: warning: '&&' within '||' [-Wlogical-op-parentheses] Change-Id: I27b55fdf514247549455fffd14b17b67ae3feb34 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Fix Clang warning about private member not used in a classThiago Macieira2017-04-041-0/+1
| | | | | | | | | | | | | | | | | | | | Since it looks like this member could be used in the future, we just mark it as unused for now. animations/pieanimation_p.h:65:19: warning: private field 'm_item' is not used [-Wunused-private-field] Change-Id: I27b55fdf514247549455fffd14b17b3ad8af1218 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Block mouse events for several charts itemsMika Salmela2017-04-033-1/+3
| | | | | | | | | | | | | | | | | | Block mouse events for abstractbarchartitem, boxblotchartitem and candlestickchartitem. Task-number: QTBUG-59835 Change-Id: I065b3429135a8c1195360a961271b287a72d2197 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 06:57:29 +0000