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/global | |
| 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/global')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.h | 2 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index d180e63198..5666afbad8 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -88,7 +88,7 @@ public: #endif SettingsPath = 100 }; - static QString location(LibraryLocation); // ### Qt 5: consider renaming it to path() + static QString location(LibraryLocation); // ### Qt 6: consider renaming it to path() #ifdef QT_BUILD_QMAKE static QString rawLocation(LibraryLocation); #endif diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 4ea62c77a6..fa13bedab6 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -153,7 +153,7 @@ public: NoButton = 0x00000000, LeftButton = 0x00000001, RightButton = 0x00000002, - MidButton = 0x00000004, // ### Qt 5: remove me + MidButton = 0x00000004, // ### Qt 6: remove me MiddleButton = MidButton, XButton1 = 0x00000008, BackButton = XButton1, |