diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-04-02 22:17:36 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-10 22:47:37 +0200 |
| commit | 880cbf602701b0116ca1143d6d07ee8e7eb3f03f (patch) | |
| tree | de9eb090b3568443e95f7f3c26a9c35ec2a16bef /src/corelib/tools | |
| parent | 766498083a4d3f1db28604ea5d5f0da613f3839b (diff) | |
Bump some Qt 5 to-do's to Qt 6.
Source-incompatible changes are no longer desirable for Qt 5, so these
items must wait until at least Qt 6.
Task-number: QTBUG-23524
Change-Id: I0b9ae5f6f3a792e0169a4b0d3aefbdcb744acd2f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qbytearray.h | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qline.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h index 7711d7349e..dd35fcd9bc 100644 --- a/src/corelib/tools/qbytearray.h +++ b/src/corelib/tools/qbytearray.h @@ -339,7 +339,7 @@ public: QByteArray &setNum(qulonglong, int base = 10); QByteArray &setNum(float, char f = 'g', int prec = 6); QByteArray &setNum(double, char f = 'g', int prec = 6); - QByteArray &setRawData(const char *a, uint n); // ### Qt 5: use an int + QByteArray &setRawData(const char *a, uint n); // ### Qt 6: use an int static QByteArray number(int, int base = 10); static QByteArray number(uint, int base = 10); diff --git a/src/corelib/tools/qline.h b/src/corelib/tools/qline.h index 92ea4ea426..f2e0d4380a 100644 --- a/src/corelib/tools/qline.h +++ b/src/corelib/tools/qline.h @@ -245,7 +245,7 @@ public: QLineF unitVector() const; Q_DECL_CONSTEXPR inline QLineF normalVector() const; - // ### Qt 5: rename intersects() or intersection() and rename IntersectType IntersectionType + // ### Qt 6: rename intersects() or intersection() and rename IntersectType IntersectionType IntersectType intersect(const QLineF &l, QPointF *intersectionPoint) const; qreal angle(const QLineF &l) const; |