Commit Graph

217 Commits

Author SHA1 Message Date
Ahmad Samir 75297454d6 Mark the whole repo with QT_NO_CONTEXTLESS_CONNECT
By adding it to the default build flags via .cmake.conf.

This amends commit 7390c505e6.

Task-number: QTBUG-116296
Change-Id: Ie766c862c20824630a62e7e111115c6bea26ea95
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-01-12 16:03:31 +02:00
Ahmad Samir 7390c505e6 Build with QT_NO_CONTEXTLESS_CONNECT
This disables the 3-arg QObject::connect() overload:
QObject::connect(sender, signal, functor)

For details see:
https://lists.qt-project.org/pipermail/development/2023-July/044141.html

No changes were required.

Change-Id: I8605b0927a147c3d9c22c60cc543d0b7af175d02
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-07-31 12:20:01 +03:00
Lucie Gérard bc9534b5f5 Change the license of all CMakeLists.txt and *.cmake files to BSD
Task-number: QTBUG-105718
Change-Id: I98da78de677349b0e4cdf8e8d988df7bb3990ddd
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-08-24 01:37:18 +02:00
Lucie Gérard 1d0c06c640 Add license headers to cmake files
CMakeLists.txt and .cmake files of significant size
(more than 2 lines according to our check in tst_license.pl)
now have the copyright and license header.

Existing copyright statements remain intact

Task-number: QTBUG-88621
Change-Id: I47400c953dbec676442d195cc32aba55c590741e
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-07-08 13:42:34 +02:00
Lucie Gérard 64e7372786 Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.

Pick-to: 6.4
Task-number: QTBUG-67283
Change-Id: Ibb797d52859b5c504f7300f4a5dc956a7b44ac11
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-06-16 10:24:16 +02:00
Kai Köhne 2c7fc4ca83 Remove .prev_CMakeLists.txt
Amends e5e3e1e5d5

Pick-to: 6.3
Change-Id: I8901bc0bbd6276d94cbacd205778c26415ce8df2
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-03-22 14:32:18 +00:00
Michal Klocek 7cec30a15f Add cmake build
Task-number: QTBUG-89091
Change-Id: Ie511e6bc262f197b2c21e52ec7696a0d50e06d18
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-01-06 14:30:18 +01:00
Michal Klocek 227020b118 Remove charts namespace for Qt6
This auto refactor to remove charts namespace, just use qt one.

[ChangeLog] Use QT_NAMESPACE as other modules.

Change-Id: I7722ed2ff5cd84c594ea96db15e5df50a24f06b4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-11-06 12:17:54 +01:00
Miikka Heikkinen 46147b040d Updated license
Change-Id: I7ad9838039b56b9e3a7fe2c42a2d8ff818f393fb
Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2016-01-13 12:28:51 +00:00
Titta Heikkala ae12522d47 Updated license headers
Change-Id: Ic72ee3c9723c2b3f3368c79219b7468f5d95aa84
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2015-10-20 08:45:41 +00:00
Miikka Heikkinen f83d776d38 Fix build against 5.6
Took Q_SIGNALS and Q_SLOTS macros into use where required.
Fixed chartsnamespace.h header for regular builds.

Task-number: QTRD-3609
Change-Id: I4bae1b88829105b60c8c1cf3b2e109da955f2328
Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
2015-09-03 07:37:28 +00:00
Titta Heikkala bc1f6aa59d Copyright header changes
Copyright header changes for Qt 5.5.

Change-Id: I2b8e9356997de2c87a7436bcefd4d0948d566259
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2015-04-23 14:18:54 +03:00
Titta Heikkala 197a8f828a Update license headers
Updated new license headers to files that weren't yet updated.

Change-Id: I193f5e46e019b5f82f0a333ee5d883fa193c2b20
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-11-14 09:02:38 +02:00
Titta Heikkala 82abd640ac Fix designer plugin target
The distinction between release and debug dlls for the Charts designer
plugin is done by adding 'd' to the dll name for debug version.

Change-Id: I7f3a52c94360889452e28a639fadab53b784ce60
Task-number: QTRD-1846
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-23 10:51:27 +03:00
Titta Heikkala 929d943d1a Fix include syntax
The includes for the whole project are changed to syntax:
'#include <module/class>

Change-Id: If32f8b6c3f47516ad6bc30ed40789ea9042d5664
Task-number: QTRD-3373
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-20 13:28:52 +03:00
Titta Heikkala c544258484 Qt Charts project file structure change
Charts repository structure is changed to follow the structure of a
Qt Add-On module. The task includes following changes:

- All macros and definitions named 'commercial' have been renamed.
- Compile errors related to QString and qSort usage have been fixed.
- Old demos are moved under examples. The QML examples now support only
  Qt Quick 2.0, the support for Qt Quick 1 is removed.
- The QML examples with multiple views are updated so that they are
  usable also with touch devices.
- Unnecessary version checks are removed from examples.
- The build stamp has been removed as it was only meant for Charts
  development purposes and it's no longer needed. Also development
  build related debug prints are removed as __DATE__ can't be used
  for all OS thus it doesn't make much sense.
- Documentation structure has been updated based on the new module
  structure. The raw HTML files have been removed. Demos are
  combined to examples.
- Unnecessary .qdocinc files are no longer needed. The content is
  moved to the corresponding .cpp files.
- The Charts widget designer plugin is updated according to the module
  change.
- The test cases updated according to the project structure change.
  Tests are added also for version 2.0.
- cmake modules generation is not needed with Qt 5.4 and Qt Charts
  so it's disabled.
- The new module name and version are updated to the plugin.qmltypes
  file.

Task-number: QTRD-2844, QTRD-3217, QTRD-3218, QTRD-3277, QTRD-3228,
QTRD-2526, QTRD-3233, QTRD-3222

Change-Id: Ib7fb26057cde710ffaf6bc780c8bf52a16f45160
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-10-14 13:04:52 +03:00
Miikka Heikkinen e26d82d56b Misc fixes
- Default value for localizeNumbers is now false, as it would look
  weird if numbers were localized in otherwise unlocalized app.
- Added locale property to qml ChartView.
- Added registrations for latest revisions of all QML types for 2.0,
  since apparently this is necessary to make them visible when
  importing Charts 2.0

Change-Id: I46997b3af4458c6dbf6755a19e01115d5393013a
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
2014-09-18 15:11:07 +03:00
Miikka Heikkinen b421e87aa0 Added QChart::locale property
This locale is used for localizing the numbers on various labels when
localizeNumbers is set to true. It is also the locale that
QDateTimeAxis labels use for month and day names.

Task-number: QTRD-3179
Change-Id: Ib9a9cad770c5a6890311fe45a1d4cabd5f40aff4
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
2014-09-17 13:35:01 +03:00
Miikka Heikkinen ef2ab40bd1 Added QChart::localizeNumbers
When this property is true, the default QLocale is used to convert
various values to strings for series and axis labels instead of
corresponding QString functions, which always use "C" locale.

Task-number: QTRD-3231
Change-Id: I95a936ae6d49c2589a7c53a481fd850c90846ae4
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
2014-09-17 10:14:31 +03:00
Andy Shaw fbb76bf1bd Add QVBoxPlotModelMapper and QBoxPlotModelMapper as types for QtQuick 2
Change-Id: I2683c981acee51d9929234d79e7da100cfc6a608
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
2014-09-10 13:37:19 +03:00
Maurice Kalinowski ee35574f0d Fix compilation on platforms without QtQuick1
WinRT is one of those, but you might want to configure Qt
in that way also on other platforms.

Change-Id: I40e5d0b8bc0c347f058d5f30d64ddbf55653f904
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
2014-06-16 10:43:31 +03:00
Titta Heikkala 0f386f5dd6 Add invokable clear() for QML bar category axis
Changed clear() method to invokable for QBarCategoryAxis.

Task-number: QTRD-2631
Change-Id: I0aa00a44ae5c6bd5b59ecf630d938b5cc484f62e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2014-05-30 07:46:10 +03:00
Titta Heikkala db3eff743f Added possibility to show series value
For line, spline and scatter series it is possible to show the point
values above the point. The format, color and the font of the label can
be set.
For bar series the format and position of the value label can be set.

Task-number: QTRD-2808
Change-Id: I0488d98c4d9060eaa8331e5b3c97dc83d86aeb0c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2014-05-27 08:32:02 +03:00
Titta Heikkala bdd8266c9c Update copyright year
Task-number: QTRD-3083
Change-Id: Ide516e5299d2363953d46bf9dc5e2f9ec277154e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2014-05-13 08:27:22 +03:00
Titta Heikkala ccb5e8a7f1 Fix DeclarativeChart::legend property
The DeclarativeChart::legend property should be marked as CONSTANT
because the legend can't be changed. This is to avoid unnecessary
message about a dependency to non-NOTIFYable property.

Change-Id: Ib7c832b3fcb034602e4c3271c211ab2fe9cdd076
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2014-05-12 10:05:54 +03:00
Titta Heikkala 7786daffde Add count property for QBoxPlotSeries
Changed set count to property for QBoxPlotSeries.

Task-number: QTRD-2504
Change-Id: Id65e0b2b6e43b3a6330fbb21c66e1cfa4d0db3d2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2014-05-05 13:33:01 +03:00
Titta Heikkala 8344a0102a Add possibility to set brush image via QML API
User can set a brush image for AreaSeries, BarSet, BoxPlotSeries,
BoxSet, PieSlice and ScatterSeries by specifying 'brushFilename'.

Task-number: QTRD-2603
Change-Id: Ie4b75cec1f64da513b1b85749c28984cb7f88e38
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2014-05-02 13:18:44 +03:00
Andy Shaw 743754a36d Fix build for iOS and for building the QtQuick 2 plugin statically
When building statically then static will be set not staticlib, therefore
we need to ensure we check for static in those cases. And also protect
against Mac specific flags when building for iOS.

Task-number: QTRD-3036
Change-Id: Ib2c534974ad9292e3634b8b692344c71e26e56cd
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2014-04-11 12:55:56 +03:00
Titta Heikkala 22efebecf8 Fix setting values for BarSet using Qt.point
It should be possible to set the values for a BarSet also as Qt.point
as documented.

Task-number: QTRD-2437
Change-Id: I1f9eb045b6abc155345cf703854d7d120d8270f8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2014-04-08 13:39:38 +03:00
Titta Heikkala 23bf915495 Add possibility to set markers in legend in reverse order
Added new property for legend which defines whether the markers in
legend are shown in reverse order or not.

Task-number: QTRD-2512
Change-Id: Ia6e6551be74a183c9f544d7cb9fff679150f4d7e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2014-04-04 08:41:30 +03:00
Andy Shaw 47d98b38e4 Install the plugins.qmltypes file as it is not possible to generate
Since it relies on QtWidgets for Qt Quick 2 then qmlplugindump is unable
to generate the plugins.qmltypes file on request by Qt Creator. So we
create it ourselves and copy it when installing the qmldir file.

Change-Id: I04370687ad18cd2fc03f65ffdf228800d4f2eaaa
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
2014-03-28 08:51:30 +02:00
Titta Heikkala 214b6c6d3a Fix documentation paths
The paths for qdocinc files and for images has been fixed so that
creating the documentation works also for Mac.

Task-number: QTRD-2492
Change-Id: Ibfefd06dfb4d85bbdb10b400aadda204ad50c21a
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
2013-11-01 07:12:12 +02:00
Titta Heikkala 8da9536b16 Fix Android build
Visibility attribute is not supported for Android X86. Therefore it's
removed for android.
Replace the slashes for declarative directories to copy files correctly.

Change-Id: I4be8a70cb7ef8f89040e455a61d27c2bb08d0a4d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2013-10-31 14:26:58 +02:00
Titta Heikkala 2ce3423968 Fix Charts documentation
The documentation structure is changed so that it can be generated with
both Qt5 and Qt4.
Also the erroneous VBarModelMapper is removed from VBoxPlotModelMapper
documentation.

Task-number: QTRD-2492, QTRD-2495
Change-Id: I45028915ca55f6ff1170db58518a8f08ac4158fb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2013-10-28 10:19:05 +02:00
Titta Heikkala 51946a166e Fix ChartView documentation
The documentation was missing remarks of deprecated properties.
A warning of using deprecated property is triggered when the property
in question is accessed therefore the documentation should mention it.

Change-Id: I5efa185fceb85a9375e41297ab18ce002f3239ed
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2013-10-15 13:28:07 +03:00
Titta Heikkala 3dc2625e2a Add new Qt theme template
Added new theme template ChartThemeQt. The colors are the ones
used in official Qt documentation.

Task-number: QTRD-1924
Change-Id: I2bb2d33b0198cad6275244d2e815908a2db033a3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2013-10-04 09:46:48 +03:00
Nico Vertriest 66fa88d106 Doc: language review of Qt Charts doc
Change-Id: I6bdf7b64851d1f0e2b98f37cbf9844aeb205bed1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2013-09-16 09:26:32 +03:00
Titta Heikkala 949e3e7093 Fix dynamic qml axis switch
The axis is set so that previously attached axes are deleted.

Task-number: QTRD-1936
Change-Id: I4fc486b3f2552eea168ba5fb44c1b82f1c5ebad0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2013-08-14 08:37:38 +03:00
Heikkinen Miikka 9206d177b8 Initialize m_updatePending
No explicit initialization resulted in this sometimes
initializing to true, which caused chart to never draw
in multithreaded rendering environments (linux/mac)

Change-Id: I5c9a4eb54c0a4aef7c1df171aa04d4b8c4c7fe05
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2013-06-19 09:08:55 +03:00
Mika Salmela 1dbaa17880 Property to control box width
Also fix bounding rect to get rid of some pen width related
drawing artifacts.

Change-Id: Ib498545cecd497d845031a3ccba572a9cba8e91d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2013-06-17 09:24:02 +03:00
Miikka Heikkinen 8fe6fadece Fix various documentation issues
Change-Id: I0963abda42a8273f058d51b3095740357f276ce9
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
2013-06-17 08:10:38 +03:00
Heikkinen Miikka f9087a25aa Fix case issue causing docs build to fail in linux
Change-Id: Ie3e4d0797927c3d2cacb1f5ccc4d1662b247d695
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2013-06-13 13:45:55 +03:00
Mika Salmela dee90918a1 In QML axisXTop didn't go top
It looked like the signal was connected to wrong slot. Probably copy&paste
bug.

Change-Id: Ie4887970891f3b902b71fb0b686c4adbbc1d48b1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2013-06-13 11:21:53 +03:00
Miikka Heikkinen f9a133cb3e Remove TODOs
No need to bring these back after release, tasks were created in
JIRA for relevant TODOs.

Change-Id: I4cf5fb09276ee720000329b9ac2a48021cfe0830
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
2013-06-13 11:18:26 +03:00
Miikka Heikkinen 599370d056 Qt Commercial -> Qt Enterprise
Also updated licenses.

Change-Id: Ie14327305207e14879c1f1223219fcdfa1669dc0
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
2013-06-13 08:03:50 +03:00
Mika Salmela 3880b19e77 Selectable outlines for box
Change-Id: Ic31fa26f914baaa6c26f52c73ca4328ec7523581
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2013-06-12 14:22:09 +03:00
Miikka Heikkinen 11500bb02e Fix Qt5 building of quick2 plugin
Recent boxplot changes broke the build.

Change-Id: I59a6215220a4fb018bb3c6a9674b4f82cd6fc62c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2013-06-04 09:49:17 +03:00
Miikka Heikkinen a58216ed76 Added API to set chart background roundness
Task-number: QTRD-1631

Change-Id: I8ac70b5ed157211b90aa1c9ef3d168bca78fb27c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2013-06-04 09:07:45 +03:00
Mika Salmela b76baa838f A new box-and-whiskers series type added to charts.
Change-Id: Iab7a05c44026db9925fa0d68afd2b533b3ea2f91
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2013-06-03 15:08:00 +03:00
Miikka Heikkinen 59c477efbe Further fixes to threaded rendering
- Antialiasing should now work with threaded rendering
- Optimize rendering to use old way if single threaded
  case is detected.

Change-Id: I6de87cbd04c108eae7ee55c5a0e27dd5fc07db89
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2013-05-13 13:21:26 +03:00