forked from qt-creator/qt-creator
Utils: Fix two deprecation warnings
QSize actualSize(const QSize &size, Mode mode = Normal, State state = Off) const;
QT_DEPRECATED_VERSION_X_6_0("Use actualSize(size) instead")
QSize actualSize(QWindow *window, const QSize &size, Mode mode = Normal, State state = Off) const;
Change-Id: Idfe068c7734ac92551b51c323e2cfb3bc221590d
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
@@ -36,8 +36,7 @@ void ShowPasswordButton::paintEvent(QPaintEvent *e)
|
||||
if (m_containsMouse && isEnabled())
|
||||
StyleHelper::drawPanelBgRect(&p, r, creatorTheme()->color(Theme::FancyToolButtonHoverColor));
|
||||
|
||||
QWindow *window = this->window()->windowHandle();
|
||||
QSize s = icon.actualSize(window, QSize(32, 16));
|
||||
QSize s = icon.actualSize(QSize(32, 16));
|
||||
|
||||
QPixmap px = icon.pixmap(s);
|
||||
QRect iRect(QPoint(), s);
|
||||
@@ -61,8 +60,7 @@ void ShowPasswordButton::leaveEvent(QEvent *e)
|
||||
|
||||
QSize ShowPasswordButton::sizeHint() const
|
||||
{
|
||||
QWindow *window = this->window()->windowHandle();
|
||||
QSize s = Utils::Icons::EYE_OPEN_TOOLBAR.icon().actualSize(window, QSize(32, 16)) + QSize(8, 8);
|
||||
QSize s = Utils::Icons::EYE_OPEN_TOOLBAR.icon().actualSize(QSize(32, 16)) + QSize(8, 8);
|
||||
|
||||
if (StyleHelper::toolbarStyle() == StyleHelper::ToolbarStyleRelaxed)
|
||||
s += QSize(5, 5);
|
||||
|
||||
Reference in New Issue
Block a user