summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+26
| | | |/| | | | | | | | | | | | | | | | Change-Id: I2863c5a86ccc9203ec16ad647593515fae209efe
| | | | * Merge "Add changes file for Qt 5.12.4"v5.12.4Antti Kokko2019-05-281-0/+25
| | | | |\
| | | | | * Add changes file for Qt 5.12.4Antti Kokko2019-05-281-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iadff38b1b31b9142b65b99fb1cbd14d223439a1b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | | | * | Merge 5.12 into 5.12.4Frederik Gladhorn2019-05-273-15/+22
| | | | |\ \ | | | | | |/ | | | | |/| | | | | | | Change-Id: I2216af4ac7306e1b2328111b5778ccccbabc0532
| | | | * | Bump versionFrederik Gladhorn2019-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie408bf98f517779490cbd8c5cfc53a3e36c91150
| * | | | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: I62448038bba30de7a54e3719277783776c240f76 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-040-0/+0
|\ \ \ \ \
| * | | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-040-0/+0
|/| | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I61e45c79ce81c8691d12f30dd882b85a0c79d35e
| * | | | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I6e0e4883e93be8fe72a1b7a2b5179a26250a4791
* | | | | Eradicate Java-style iterators and mark the module free of themMarc Mutz2019-07-045-32/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and of QLinkedList. Unfortunately, the module contains more than 330 uses of Q_FOREACH, even though, according to my sources, its use was banned in Qt implementation from the get-go. So QT_NO_FOREACH is currently not an option. Java-style iterators are going to be deprecated, or at the very least banned from use in Qt code. Ditto QLinkedList. Change-Id: I505e3472b708fc18a3254dc742e46d14d095fcc1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | | | unblacklist passing testsDaniel Smith2019-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests have not failed on the removed platforms for at least 60 days Task-number: QTBUG-76608 Change-Id: I5e084eca4b723cbf63b35dbb4546d57135dc8f59 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-221-0/+18
|\ \ \ \ \
| * | | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-221-0/+18
|/| | | | | | |/ / / / | | | | | | | | | | Change-Id: I55039ddb3c6aa09b713afe043abf70eeb809e7f2
| * | | | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+18
| |\ \ \ \
| | * | | | Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+18
| |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I54736ff7476df83d3ebfd4f1ad0041ffa95ad78e
| | * | | | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.0Antti Kokko2019-05-081-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie5134826fd7113f9940217b227ab014d9e49410d Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | | | | Convert uses of QTime as a timer to QElapsedTimerEdward Welbourne2019-06-122-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2504b5a010d33a91676754f9a265725ce39438cb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-0312-118/+212
|\ \ \ \ \ \
| * | | | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-0312-118/+212
|/| | | | | | | |/ / / / / | | | | | | | | | | | | Change-Id: I4d0a887c45dbeb23f7bd826d1e90c823323eb198
| * | | | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-0212-118/+212
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-0212-118/+212
| |/| | | | | | |/ / / | | | | | | | | | | Change-Id: I63ae7b0300c441821be3043d5a7a3621f3582cca
| | * | | Fix deprecation warnings about QtCharts::setAxisX(), setAxisY()Friedemann Kleint2019-05-288-60/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use new API, fixing warnings like: tst_qchart.cpp:343:34: warning: 'void QtCharts::QChart::setAxisX(QtCharts::QAbstractAxis*, QtCharts::QAbstractSeries*)' is deprecated [-Wdeprecated-declarations] ... tst_qchart.cpp:361:34: warning: 'void QtCharts::QChart::setAxisY(QtCharts::QAbstractAxis*, QtCharts::QAbstractSeries*)' is deprecated [-Wdeprecated-declarations] ... Some test appear to be relying on the axes being removed in a certain order. Change-Id: I86fab08d661afcd1087a55f847133a9e90d758f9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | * | | Tests: Fix deprecation warnings about QtCharts::axisX(), axisY()Friedemann Kleint2019-05-282-43/+49
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use new API, fixing warnings like: tst_qchart.cpp:254:73: warning: 'QtCharts::QAbstractAxis* QtCharts::QChart::axisX(Q Charts::QAbstractSeries*) const' is deprecated [-Wdeprecated-declarations] tst_qchart.cpp:256:74: warning: 'QtCharts::QAbstractAxis* QtCharts::QChart::axisY(Q Charts::QAbstractSeries*) const' is deprecated [-Wdeprecated-declarations] Change-Id: I794c1460638c27fa7d44fc083cd7a6b4ee2e0987 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | * | Fix crash on ChartView component destroyKirill Burtsev2019-05-223-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QML engine expects that children of QML element are deleted through parent/child relationship, but deferring breaks this assumption and leads to crash later in destruction process. Fixes: QTBUG-70987 Change-Id: I9ae3cefc6ee158582d17709272d7d33f45c57cdf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| | * | QCandlestickSeries: remove sets on destroy to prevent leaksKirill Burtsev2019-05-211-0/+1
| | |/ | | | | | | | | | | | | | | | Change-Id: Id8214954b33d844b20044776655e600df34971a3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | QtChart: Remove deprecated QPainter::HighQualityAntialiasingChristian Ehrlicher2019-05-271-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPainter::HighQualityAntialiasing is deprecated and should be replaced by QPainter::Antialiasing Change-Id: Ib4eeea6c17d82d87fb4270f146a6604ce5c8d5fb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | Fix deprecation warningsFriedemann Kleint2019-05-279-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warnings: animations/axisanimation.cpp:117:51: warning: 'QVariant qVariantFromValue(const T&) [with T = QVector<double>]' is deprecated: Use QVariant::fromValue() instead. [-Wdeprecated-declarations] ... axis/chartaxiselement.cpp:385:64: warning: 'QString& QString::sprintf(const char*, ...)' is deprecated: Use asprintf(), arg() or QTextStream instead [-Wdeprecated-declarations] ... Change-Id: Ib36d7e09b737110323b816442b36ca2b2e79d6a5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-05-041-6/+1
|\| | | | | | | | | | | Change-Id: Ie99575de1ef24343069a8e445fbd46186cbbaec8
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-301-6/+1
| |\| | | | | | | | | | Change-Id: I3344f7fd254b0948f5399e650fb506386e1ca20f
| | * Doc: Fix empty page being displayed in Qt Assistant for Getting StartedLeena Miettinen2019-04-291-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems like a subproject needs a topic that has its own HTML file. This TOC entry is not necessary, because this section is easy to find on the doc front page. Task-number: QTBUG-53820 Change-Id: Ib5d46b27f9b70b241d6faaf8b43e0c4f426e6260 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-271-0/+24
|\| | | | | | | | | | | Change-Id: I0e52f586202a2f65ade0fe5e00967d6dbc32102a
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-201-0/+24
| |\| | | | | | | | | | Change-Id: Ibb913a2edf4c7b0f5eac7712495c508006afd2a2
| | * Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I3bd8b8f5fa7940e6020c01ac727efc7418dfca3a
| | | * Add changes file for Qt 5.12.3v5.12.3Antti Kokko2019-04-021-0/+24
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | + 203508d4aff39cfb7d8a7f3192884a190f203020 Doc: Set QChart functions as deprecated + b6fe3127201616fbbfd120be9c650445e583dd84 Bump version + c0f0d22a1ae85c7efafb4cee6d0e59effb68262c Fix static building of qml applications using charts Change-Id: Ib6bcf64a04db95ad69f57879131873967b00f2fb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-136-36/+9
|\| | | | | | | | | | | Change-Id: I8d5bdcf9d2f17f1a5c5f24000d19f81fe321cfd9
| * | Automatically register the latest import versionv5.13.0-beta3Kai Koehne2019-04-126-36/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This follows what was done in d28c9f6a for Qt Quick Controls 2. The latest import version (e.g. 1.14 in Qt 5.14) will automatically be registered whenever the Qt version is bumped. This avoids needing to wait until a new type is added (or a new revision is added to an existing type) before being able to use the newest Qt Quick version. Change-Id: I6d7ddfaa2c50598bf72f6f768bee25d716c29129 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-02213-231/+231
|\| | | | | | | | | | | Change-Id: I22883a8029f78ff2d85b2e910c218e37fe453b50
| * | Switch export macros to standard formv5.13.0-beta2Kai Koehne2019-04-01213-230/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | Qt expects the export macros to have Q_ prefixes, otherwise the symbol versioning script won't find them and mark them. Task-number: QTBUG-73752 Change-Id: I4ee654eadbbfc6f5c25f3bb0a8123c8c17235c12 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-261-1/+1
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1264624c5d68f41605409af89d4b1f05807a243a
| | * Fix static building of qml applications using chartsMiikka Heikkinen2019-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt_allocate_bar_set must be defined extern in static builds so that there won't be duplicate symbols. Dynamic builds still require QT_CHARTS_EXPORT on windows or they won't find the symbol at all. Task-number: QTBUG-74613 Change-Id: I94e2aa1f7610a49df1f9b18b3d25175ae0490bf3 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| | * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | | | | | Change-Id: Ia49e7bd7a6ed4b3a4d60a0e1a22238bb60954340
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-262-0/+10
|\| | | | | | | | | | | Change-Id: I932a92d9ad469c1de7a35f291bbdbc70aeb8858f
| * | doc: Add missing documentation for brush propertiesRainer Keller2019-03-202-0/+10
| | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-73695 Change-Id: I29e5bb02ca1e99fabf1434cab2abc35cc7b7f316 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-199-32/+72
|\| | | | | | | | | | | Change-Id: I97837ef41563e8c8dc8984b716e40144ecec69b8
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-169-32/+72
| |\| | | | | | | | | | Change-Id: Ib3461d1114a243140a62b41c372ff3d9c518b0ed
| | * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I1e434f285b4a9a9c1fbcd3b36e31e4e7e33b98fd
| | | * Add changes file for Qt 5.12.2v5.12.2Antti Kokko2019-02-211-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 9ea91c6e6cdcdb43cf45ddb6c96c2e39e8995904 Fix warning about unused variable + acbd92f90c139839277a60db84753a102dffbcf2 Bump version + 70baf5bc141d022f3cd99216c4628c9e38663d4d Fix the inclusion of MOC files before QT_CHARTS_END_NAMESPACE Change-Id: Ic6fc8d439d053355e0b29de696fcb1fc07631df5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | * | Doc: Set QChart functions as deprecatedTopi Reinio2019-03-058-32/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | axisX,Y and setAxisX,Y functions are now deprecated - mark them as such in the documentation. Example code was also fixed to not use deprecated functions, but example documentation was not updated to reflect that change. Task-number: QTBUG-74097 Change-Id: I2d4f283f1d0c62a02b33c373885e75bce34a1114 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-091-1/+5
|\| | | | | | | | | | | | | | | Change-Id: Ifa8bcc685b10a1261f93e054558b782cb3ced9f5
| * | | Update plugins.qmltypes for Qt 5.13v5.13.0-beta1Kai Koehne2019-03-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-73484 Change-Id: I7b07edddf18251c0c5d0e2dee98b3611229b821b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 06:38:40 +0000