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

Remove a few usages of deprecated API

Browse Source 
Change-Id: I94bad0b8d3891c6b4a55178836cfff2a4312e330
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Shawn Rutledge 2019-06-07 13:02:03 +02:00
parent d2ed1074d0
commit dd3229e672
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qbasictimer.cpp
View File

@ -105,6 +105,7 @@ QT_BEGIN_NAMESPACE
\sa stop(), isActive(), swap()
*/
#if QT_DEPRECATED_SINCE(5, 14)
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
/*!
\internal
@ -125,6 +126,7 @@ QBasicTimer &QBasicTimer::operator=(const QBasicTimer &other)
return *this;
}
#endif
#endif
/*!
\fn QBasicTimer::~QBasicTimer()

2
src/corelib/mimetypes/qmimetype.h
View File

@ -48,11 +48,11 @@ QT_REQUIRE_CONFIG(mimetype);
#include <QtCore/qobjectdefs.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
#include <QtCore/qstringlist.h>
QT_BEGIN_NAMESPACE
class QMimeTypePrivate;
class QStringList;
class QMimeType;
Q_CORE_EXPORT uint qHash(const QMimeType &key, uint seed = 0) noexcept;

3
src/gui/image/qmovie.cpp
View File

@ -175,6 +175,7 @@
#include "qmovie.h"
#include "qglobal.h"
#include "qelapsedtimer.h"
#include "qimage.h"
#include "qimagereader.h"
#include "qpixmap.h"
@ -437,7 +438,7 @@ QFrameInfo QMoviePrivate::infoForFrame(int frameNumber)
*/
bool QMoviePrivate::next()
{
QTime time;
QElapsedTimer time;
time.start();
QFrameInfo info = infoForFrame(nextFrameNumber);
if (!info.isValid())

4
src/widgets/widgets/qcombobox.cpp
View File

@ -1881,12 +1881,11 @@ void QComboBox::setLineEdit(QLineEdit *edit)
d->updateFocusPolicy();
d->lineEdit->setFocusProxy(this);
d->lineEdit->setAttribute(Qt::WA_MacShowFocusRect, false);
#if QT_DEPRECATED_SINCE(5, 13)
#if QT_CONFIG(completer)
setAutoCompletion(d->autoCompletion);
#endif
#ifdef QT_KEYPAD_NAVIGATION
#if QT_CONFIG(completer)
if (QApplication::keypadNavigationEnabled()) {
// Editable combo boxes will have a completer that is set to UnfilteredPopupCompletion.
// This means that when the user enters edit mode they are immediately presented with a
@ -1898,6 +1897,7 @@ void QComboBox::setLineEdit(QLineEdit *edit)
}
}
#endif
#endif
#endif
setAttribute(Qt::WA_InputMethodEnabled);