AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump some Qt 5 to-do's to Qt 6.

Browse Source 
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>
This commit is contained in:
Jason McDonald 2012-04-02 22:17:36 +10:00 committed by Qt by Nokia
parent 766498083a
commit 880cbf6027
13 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qlibraryinfo.h
View File

@ -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

2
src/corelib/global/qnamespace.h
View File

@ -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,

2
src/corelib/io/qfileinfo.cpp
View File

@ -830,7 +830,7 @@ QString QFileInfo::suffix() const
QDir QFileInfo::dir() const
{
Q_D(const QFileInfo);
// ### Qt5: Maybe rename this to parentDirectory(), considering what it actually do?
// ### Qt 6: Maybe rename this to parentDirectory(), considering what it actually does?
return QDir(d->fileEntry.path());
}

2
src/corelib/io/qiodevice.h
View File

@ -102,7 +102,7 @@ public:
virtual bool open(OpenMode mode);
virtual void close();
// ### Qt 5: pos() and seek() should not be virtual, and
// ### Qt 6: pos() and seek() should not be virtual, and
// ### seek() should call a virtual seekData() function.
virtual qint64 pos() const;
virtual qint64 size() const;

4
src/corelib/io/qsettings.h
View File

@ -173,8 +173,8 @@ public:
static void setDefaultFormat(Format format);
static Format defaultFormat();
static void setSystemIniPath(const QString &dir); // ### remove in 5.0 (use setPath() instead)
static void setUserIniPath(const QString &dir); // ### remove in 5.0 (use setPath() instead)
static void setSystemIniPath(const QString &dir); // ### Qt 6: remove (use setPath() instead)
static void setUserIniPath(const QString &dir); // ### Qt 6: remove (use setPath() instead)
static void setPath(Format format, Scope scope, const QString &path);
typedef QMap<QString, QVariant> SettingsMap;

2
src/corelib/tools/qbytearray.h
View File

@ -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);

2
src/corelib/tools/qline.h
View File

@ -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;

2
src/widgets/dialogs/qwizard.h
View File

@ -130,7 +130,7 @@ public:
void removePage(int id);
QWizardPage *page(int id) const;
bool hasVisitedPage(int id) const;
QList<int> visitedPages() const; // ### visitedIds()?
QList<int> visitedPages() const; // ### Qt 6: visitedIds()?
QList<int> pageIds() const;
void setStartId(int id);
int startId() const;

6
src/widgets/styles/qstyle.h
View File

@ -194,7 +194,7 @@ public:
PE_IndicatorItemViewItemDrop,
PE_PanelItemViewItem,
PE_PanelItemViewRow, // ### Qt 5: remove
PE_PanelItemViewRow, // ### Qt 6: remove
PE_PanelStatusBar,
@ -303,7 +303,7 @@ public:
SE_ProgressBarContents,
SE_ProgressBarLabel,
// ### Qt 5: These values are unused; eliminate them
// ### Qt 6: These values are unused; eliminate them
SE_DialogButtonAccept,
SE_DialogButtonReject,
SE_DialogButtonApply,
@ -343,7 +343,7 @@ public:
SE_CheckBoxLayoutItem,
SE_ComboBoxLayoutItem,
SE_DateTimeEditLayoutItem,
SE_DialogButtonBoxLayoutItem, // ### remove
SE_DialogButtonBoxLayoutItem, // ### Qt 6: remove
SE_LabelLayoutItem,
SE_ProgressBarLayoutItem,
SE_PushButtonLayoutItem,

2
src/widgets/widgets/qcombobox.h
View File

@ -131,7 +131,7 @@ public:
enum SizeAdjustPolicy {
AdjustToContents,
AdjustToContentsOnFirstShow,
AdjustToMinimumContentsLength, // ### Qt 5: remove
AdjustToMinimumContentsLength, // ### Qt 6: remove
AdjustToMinimumContentsLengthWithIcon
};

2
src/widgets/widgets/qdockwidget.h
View File

@ -82,7 +82,7 @@ public:
DockWidgetVerticalTitleBar = 0x08,
DockWidgetFeatureMask = 0x0f,
AllDockWidgetFeatures = DockWidgetClosable|DockWidgetMovable|DockWidgetFloatable, // ### remove in 5.0
AllDockWidgetFeatures = DockWidgetClosable|DockWidgetMovable|DockWidgetFloatable, // ### Qt 6: remove
NoDockWidgetFeatures = 0x00,
Reserved = 0xff

2
src/widgets/widgets/qstatusbar.h
View File

@ -87,7 +87,7 @@ protected:
void paintEvent(QPaintEvent *);
void resizeEvent(QResizeEvent *);
// ### Qt 5: consider making reformat() and hideOrShow() private
// ### Qt 6: consider making reformat() and hideOrShow() private
void reformat();
void hideOrShow();
bool event(QEvent *);

2
tests/auto/xml/dom/qdom/tst_qdom.cpp
View File

@ -1405,7 +1405,7 @@ void tst_QDom::normalizeEndOfLine() const
const QString expected(QLatin1String("<a>\nc\nc\na\na</a>"));
// ### Qt 5: fix this, if we keep QDom at all
// ### Qt 6: fix this, if we keep QDom at all
QEXPECT_FAIL("", "The parser doesn't perform newline normalization. Fixing that would change behavior.", Continue);
QCOMPARE(doc.documentElement().text(), expected);
}