VirtualBox

Changeset 101559 in vbox


Ignore:
Timestamp:
Oct 23, 2023 3:51:00 PM (19 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
159636
Message:

FE/Qt: bugref:10450: Get rid of Qt5 stuff; This one is about device-pixel-ratio stuff.

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/UITakeSnapshotDialog.cpp

    r100075 r101559  
    318318{
    319319    const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize);
    320 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    321     m_pLabelIcon->setPixmap(m_icon.pixmap(windowHandle(), QSize(iIconMetric, iIconMetric)));
    322 #else
    323320    const qreal fDevicePixelRatio = windowHandle() ? windowHandle()->devicePixelRatio() : 1;
    324321    m_pLabelIcon->setPixmap(m_icon.pixmap(QSize(iIconMetric, iIconMetric), fDevicePixelRatio));
    325 #endif
    326 }
     322}

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.cpp

    r100075 r101559  
    153153    const QIcon icon = UIIconPool::iconSet(strPath);
    154154    m_size = QSize(640, 480);
    155 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    156     m_pixmap = icon.pixmap(windowHandle(), m_size);
    157 #else
    158155    QWidget *pParent = m_pPseudoParent ? m_pPseudoParent : parentWidget();
    159156    const qreal fDevicePixelRatio = pParent ? pParent->windowHandle()->devicePixelRatio() : 1;
    160157    m_pixmap = icon.pixmap(m_size, fDevicePixelRatio);
    161 #endif
    162158
    163159    /* Prepare main-layout: */

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.cpp

    r100075 r101559  
    102102        const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) * .625;
    103103        const int iShift = height() > iIconMetric ? (height() - iIconMetric) / 2 : 0;
    104 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    105         m_pIconLabel->setPixmap(m_markIcon.pixmap(windowHandle(), QSize(iIconMetric, iIconMetric)));
    106 #else
    107104        const qreal fDevicePixelRatio = window() && window()->windowHandle() ? window()->windowHandle()->devicePixelRatio() : 1;
    108105        m_pIconLabel->setPixmap(m_markIcon.pixmap(QSize(iIconMetric, iIconMetric), fDevicePixelRatio));
    109 #endif
    110106        m_pIconLabel->setToolTip(m_strErrorMessage);
    111107        m_pIconLabel->move(width() - iIconMetric - iShift, iShift);
    … …  
    252248    AssertReturnVoid(m_pIconLabel);
    253249    const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
    254 
    255 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    256     if (fError)
    257         m_pIconLabel->setPixmap(UIIconPool::iconSet(":/status_error_16px.png").pixmap(windowHandle(), QSize(iIconMetric, iIconMetric)));
    258     else
    259         m_pIconLabel->setPixmap(UIIconPool::iconSet(":/status_check_16px.png").pixmap(windowHandle(), QSize(iIconMetric, iIconMetric)));
    260 #else
    261250    const qreal fDevicePixelRatio = window() && window()->windowHandle() ? window()->windowHandle()->devicePixelRatio() : 1;
    262251    if (fError)
    … …  
    264253    else
    265254        m_pIconLabel->setPixmap(UIIconPool::iconSet(":/status_check_16px.png").pixmap(QSize(iIconMetric, iIconMetric), fDevicePixelRatio));
    266 #endif
    267255    m_pIconLabel->setToolTip(strErrorMessage);
    268256}

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBarIndicator.cpp

    r100344 r101559  
    131131    if (m_icons.contains(m_iState))
    132132    {
    133         if (window())
    134 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    135             pPainter->drawPixmap(contentsRect().topLeft(), m_icons.value(m_iState).pixmap(window()->windowHandle(), m_size));
    136 #else
    137         {
    138             const qreal fDevicePixelRatio = window()->windowHandle() ? window()->windowHandle()->devicePixelRatio() : 1;
    139             pPainter->drawPixmap(contentsRect().topLeft(), m_icons.value(m_iState).pixmap(m_size, fDevicePixelRatio));
    140         }
    141 #endif
    142         else
    143             pPainter->drawPixmap(contentsRect().topLeft(), m_icons.value(m_iState).pixmap(m_size));
     133        const qreal fDevicePixelRatio = window() && window()->windowHandle() ? window()->windowHandle()->devicePixelRatio() : 1;
     134        pPainter->drawPixmap(contentsRect().topLeft(), m_icons.value(m_iState).pixmap(m_size, fDevicePixelRatio));
    144135    }
    145136}

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp

    r101514 r101559  
    709709
    710710        /* Get pixmap of requested size (take into account the DPI of the main shown window, if possible): */
    711         if (windowManager().mainWindowShown() && windowManager().mainWindowShown()->windowHandle())
    712 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    713             pixmap = icon.pixmap(windowManager().mainWindowShown()->windowHandle(), iconSize);
    714 #else
    715         {
    716             const qreal fDevicePixelRatio = windowManager().mainWindowShown()->windowHandle()->devicePixelRatio();
    717             pixmap = icon.pixmap(iconSize, fDevicePixelRatio);
    718         }
    719 #endif
    720         else
    721             pixmap = icon.pixmap(iconSize);
     711        const qreal fDevicePixelRatio = windowManager().mainWindowShown() && windowManager().mainWindowShown()->windowHandle()
     712                                      ? windowManager().mainWindowShown()->windowHandle()->devicePixelRatio() : 1;
     713        pixmap = icon.pixmap(iconSize, fDevicePixelRatio);
    722714    }
    723715

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

    r100589 r101559  
    388388    /* Gather suitable dialog parent: */
    389389    QWidget *pDlgParent = windowManager().realParentWindow(pParent ? pParent : windowManager().mainWindowShown());
    390 #ifdef VBOX_IS_QT6_OR_LATER
    391     const qreal fDevicePixelRatio = pDlgParent && pDlgParent->windowHandle() ? pDlgParent->windowHandle()->devicePixelRatio() : 1;
    392 #endif
    393390
    394391    /* Prepare pixmap: */
    395392    QPixmap pixmap;
    396393    if (!strImage.isEmpty())
    397         pixmap = pDlgParent
    398 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    399                ? UIIconPool::iconSet(strImage).pixmap(pDlgParent->windowHandle(), QSize(90, 90))
    400 #else
    401                ? UIIconPool::iconSet(strImage).pixmap(QSize(90, 90), fDevicePixelRatio)
    402 #endif
    403                : UIIconPool::iconSet(strImage).pixmap(QSize(90, 90));
     394    {
     395        const qreal fDevicePixelRatio = pDlgParent && pDlgParent->windowHandle() ? pDlgParent->windowHandle()->devicePixelRatio() : 1;
     396        pixmap = UIIconPool::iconSet(strImage).pixmap(QSize(90, 90), fDevicePixelRatio);
     397    }
    404398
    405399    /* Create progress-dialog: */

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

    r101383 r101559  
    340340            m_pHelpViewer->setHidden(true);
    341341            m_pHelpViewer->setMinimumTextWidth(gpDesktop->screenGeometry(window()).width() / 5);
    342 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    343             m_pHelpViewer->registerPixmap(icon.pixmap(window()->windowHandle(), QSize(iMetric, iMetric)), "manager://copy");
    344 #else
    345342            const qreal fDevicePixelRatio = windowHandle() ? windowHandle()->devicePixelRatio() : 1;
    346343            m_pHelpViewer->registerPixmap(icon.pixmap(QSize(iMetric, iMetric), fDevicePixelRatio), "manager://copy");
    347 #endif
    348344            connect(m_pHelpViewer, &QIRichTextLabel::sigLinkClicked, this, &UIAcquirePublicKeyDialog::sltHandleHelpViewerLinkClick);
    349345            pLayout->addWidget(m_pHelpViewer, 2);

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIWelcomePane.cpp

    r100075 r101559  
    249249        const QList<QSize> sizes = m_icon.availableSizes();
    250250        const QSize firstOne = sizes.isEmpty() ? QSize(200, 200) : sizes.first();
    251 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    252         m_pLabelIcon->setPixmap(m_icon.pixmap(window()->windowHandle(), QSize(firstOne.width(), firstOne.height())));
    253 #else
    254251        const qreal fDevicePixelRatio = window() && window()->windowHandle() ? window()->windowHandle()->devicePixelRatio() : 1;
    255252        m_pLabelIcon->setPixmap(m_icon.pixmap(QSize(firstOne.width(), firstOne.height()), fDevicePixelRatio));
    256 #endif
    257253    }
    258254}

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp

    r101396 r101559  
    448448    /* Create new icon, then acquire pixmap: */
    449449    const QIcon icon = UIIconPool::iconSet(":/tools_global_32px.png");
    450 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    451     const QPixmap pixmap = icon.pixmap(gpManager->windowHandle(), pixmapSize);
    452 #else
    453450    const qreal fDevicePixelRatio = gpManager->windowHandle() ? gpManager->windowHandle()->devicePixelRatio() : 1;
    454451    const QPixmap pixmap = icon.pixmap(pixmapSize, fDevicePixelRatio);
    455 #endif
    456452
    457453    /* Update linked values: */
    … …  
    477473    AssertReturnVoid(!toolIcon.isNull());
    478474    const QSize toolPixmapSize = QSize(iIconMetric, iIconMetric);
    479 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    480     const QPixmap toolPixmap = toolIcon.pixmap(gpManager->windowHandle(), toolPixmapSize);
    481 #else
    482475    const qreal fDevicePixelRatio = gpManager->windowHandle() ? gpManager->windowHandle()->devicePixelRatio() : 1;
    483476    const QPixmap toolPixmap = toolIcon.pixmap(toolPixmapSize, fDevicePixelRatio);
    484 #endif
    485477    /* Update linked values: */
    486478    if (m_toolPixmapSize != toolPixmapSize)
    … …  
    504496    AssertReturnVoid(!pinIcon.isNull());
    505497    const QSize pinPixmapSize = QSize(iIconMetric, iIconMetric);
    506 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    507     const QPixmap pinPixmap = pinIcon.pixmap(gpManager->windowHandle(), pinPixmapSize);
    508 #else
    509498    const qreal fDevicePixelRatio = gpManager->windowHandle() ? gpManager->windowHandle()->devicePixelRatio() : 1;
    510499    const QPixmap pinPixmap = pinIcon.pixmap(pinPixmapSize, fDevicePixelRatio);
    511 #endif
    512500    /* Update linked values: */
    513501    if (m_pinPixmapSize != pinPixmapSize)

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp

    r101396 r101559  
    15421542{
    15431543    const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
    1544 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    1545     m_groupsPixmap = UIIconPool::iconSet(":/group_abstract_16px.png").pixmap(gpManager->windowHandle(),
    1546                                                                              QSize(iIconMetric, iIconMetric));
    1547     m_machinesPixmap = UIIconPool::iconSet(":/machine_abstract_16px.png").pixmap(gpManager->windowHandle(),
    1548                                                                                  QSize(iIconMetric, iIconMetric));
    1549 #else
    15501544    const qreal fDevicePixelRatio = gpManager->windowHandle() ? gpManager->windowHandle()->devicePixelRatio() : 1;
    15511545    m_groupsPixmap = UIIconPool::iconSet(":/group_abstract_16px.png").pixmap(QSize(iIconMetric, iIconMetric),
    … …  
    15531547    m_machinesPixmap = UIIconPool::iconSet(":/machine_abstract_16px.png").pixmap(QSize(iIconMetric, iIconMetric),
    15541548                                                                                 fDevicePixelRatio);
    1555 #endif
    15561549    m_pixmapSizeGroups = m_groupsPixmap.size() / m_groupsPixmap.devicePixelRatio();
    15571550    m_pixmapSizeMachines = m_machinesPixmap.size() / m_machinesPixmap.devicePixelRatio();

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp

    r101396 r101559  
    699699    AssertReturnVoid(!stateIcon.isNull());
    700700    const QSize statePixmapSize = QSize(iIconMetric, iIconMetric);
    701 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    702     const QPixmap statePixmap = stateIcon.pixmap(gpManager->windowHandle(), statePixmapSize);
    703 #else
    704701    const qreal fDevicePixelRatio = gpManager->windowHandle() ? gpManager->windowHandle()->devicePixelRatio() : 1;
    705702    const QPixmap statePixmap = stateIcon.pixmap(statePixmapSize, fDevicePixelRatio);
    706 #endif
    707703    /* Update linked values: */
    708704    if (m_statePixmapSize != statePixmapSize)
    … …  
    726722    AssertReturnVoid(!toolIcon.isNull());
    727723    const QSize toolPixmapSize = QSize(iIconMetric, iIconMetric);
    728 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    729     const QPixmap toolPixmap = toolIcon.pixmap(gpManager->windowHandle(), toolPixmapSize);
    730 #else
    731724    const qreal fDevicePixelRatio = gpManager->windowHandle() ? gpManager->windowHandle()->devicePixelRatio() : 1;
    732725    const QPixmap toolPixmap = toolIcon.pixmap(toolPixmapSize, fDevicePixelRatio);
    733 #endif
    734726    /* Update linked values: */
    735727    if (m_toolPixmapSize != toolPixmapSize)

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp

    r101286 r101559  
    823823        m_pixmapSize = QSize(iIconMetric, iIconMetric);
    824824        /* Acquire the icon of corresponding size (taking top-level widget DPI into account): */
    825 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    826         m_pixmap = icon.pixmap(gpManager->windowHandle(), m_pixmapSize);
    827 #else
    828825        const qreal fDevicePixelRatio = gpManager->windowHandle() ? gpManager->windowHandle()->devicePixelRatio() : 1;
    829826        m_pixmap = icon.pixmap(m_pixmapSize, fDevicePixelRatio);
    830 #endif
    831827    }
    832828

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp

    r101396 r101559  
    622622    /* Prepare new pixmap size: */
    623623    const QSize pixmapSize = QSize(iIconMetric, iIconMetric);
    624 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    625     const QPixmap pixmap = m_icon.pixmap(gpManager->windowHandle(), pixmapSize, isEnabled() ? QIcon::Normal : QIcon::Disabled);
    626 #else
    627624    const qreal fDevicePixelRatio = gpManager->windowHandle() ? gpManager->windowHandle()->devicePixelRatio() : 1;
    628625    const QPixmap pixmap = m_icon.pixmap(pixmapSize, fDevicePixelRatio, isEnabled() ? QIcon::Normal : QIcon::Disabled);
    629 #endif
    630626    /* Update linked values: */
    631627    if (m_pixmapSize != pixmapSize)

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp

    r100075 r101559  
    636636
    637637    /* Re-apply pixmap: */
    638 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    639     m_pLabelIcon->setPixmap(m_icon.pixmap(windowHandle(), QSize(iMetricLarge, iMetricLarge)));
    640 
    641     QIcon icon;
    642     icon = UIIconPool::iconSet(":/vm_create_shortcut_16px.png");
    643     m_pLabelIconDetach->setPixmap(icon.pixmap(windowHandle(), QSize(iMetricSmall, iMetricSmall)));
    644     icon = UIIconPool::iconSet(":/vm_save_state_16px.png");
    645     m_pLabelIconSave->setPixmap(icon.pixmap(windowHandle(), QSize(iMetricSmall, iMetricSmall)));
    646     icon = UIIconPool::iconSet(":/vm_shutdown_16px.png");
    647     m_pLabelIconShutdown->setPixmap(icon.pixmap(windowHandle(), QSize(iMetricSmall, iMetricSmall)));
    648     icon = UIIconPool::iconSet(":/vm_poweroff_16px.png");
    649     m_pLabelIconPowerOff->setPixmap(icon.pixmap(windowHandle(), QSize(iMetricSmall, iMetricSmall)));
    650 #else
    651638    const qreal fDevicePixelRatio = windowHandle() ? windowHandle()->devicePixelRatio() : 1;
    652639    m_pLabelIcon->setPixmap(m_icon.pixmap(QSize(iMetricLarge, iMetricLarge), fDevicePixelRatio));
    … …  
    661648    icon = UIIconPool::iconSet(":/vm_poweroff_16px.png");
    662649    m_pLabelIconPowerOff->setPixmap(icon.pixmap(QSize(iMetricSmall, iMetricSmall), fDevicePixelRatio));
    663 #endif
    664 }
     650}

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStatusBarEditor.cpp

    r101013 r101559  
    412412    /* Recache pixmap for assigned type: */
    413413    const QIcon icon = gpConverter->toIcon(m_enmType);
    414     if (window())
    415 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    416         m_pixmap = icon.pixmap(window()->windowHandle(), m_pixmapSize);
    417 #else
    418     {
    419         const qreal fDevicePixelRatio = window()->windowHandle() ? window()->windowHandle()->devicePixelRatio() : 1;
    420         m_pixmap = icon.pixmap(m_pixmapSize, fDevicePixelRatio);
    421     }
    422 #endif
    423     else
    424         m_pixmap = icon.pixmap(m_pixmapSize);
     414    const qreal fDevicePixelRatio = window() && window()->windowHandle() ? window()->windowHandle()->devicePixelRatio() : 1;
     415    m_pixmap = icon.pixmap(m_pixmapSize, fDevicePixelRatio);
    425416}
    426417

  • trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.cpp

    r101316 r101559  
    454454    /* Re-register icon in the element's text-document: */
    455455    const int iMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
    456 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    457     document()->addResource(
    458         QTextDocument::ImageResource,
    459         QUrl(QString("details://%1").arg(m_strName)),
    460         QVariant(m_icon.pixmap(window()->windowHandle(), QSize(iMetric, iMetric))));
    461 #else
    462456    const qreal fDevicePixelRatio = window() && window()->windowHandle() ? window()->windowHandle()->devicePixelRatio() : 1;
    463457    document()->addResource(
    … …  
    465459        QUrl(QString("details://%1").arg(m_strName)),
    466460        QVariant(m_icon.pixmap(QSize(iMetric, iMetric), fDevicePixelRatio)));
    467 #endif
    468461}
    469462

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp

    r100075 r101559  
    344344    /* Assign title-icon: */
    345345    const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
    346 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    347     m_pTitleIcon->setPixmap(m_titleIcon.pixmap(window()->windowHandle(), QSize(iIconMetric, iIconMetric)));
    348 #else
    349346    const qreal fDevicePixelRatio = window() && window()->windowHandle() ? window()->windowHandle()->devicePixelRatio() : 1;
    350347    m_pTitleIcon->setPixmap(m_titleIcon.pixmap(QSize(iIconMetric, iIconMetric), fDevicePixelRatio));
    351 #endif
    352348}
    353349
    … …  
    359355    /* Assign warning-icon: */
    360356    const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
    361 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    362     m_pWarningIcon->setPixmap(m_warningIcon.pixmap(window()->windowHandle(), QSize(iIconMetric, iIconMetric)));
    363 #else
    364357    const qreal fDevicePixelRatio = window() && window()->windowHandle() ? window()->windowHandle()->devicePixelRatio() : 1;
    365358    m_pWarningIcon->setPixmap(m_warningIcon.pixmap(QSize(iIconMetric, iIconMetric), fDevicePixelRatio));
    366 #endif
    367359}
    368360

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp

    r100344 r101559  
    597597    pDrag->setMimeData(pMimeData);
    598598    const int iMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
    599 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    600     pDrag->setPixmap(m_pAction->icon().pixmap(window()->windowHandle(), QSize(iMetric, iMetric)));
    601 #else
    602599    const qreal fDevicePixelRatio = window() && window()->windowHandle() ? window()->windowHandle()->devicePixelRatio() : 1;
    603600    pDrag->setPixmap(m_pAction->icon().pixmap(QSize(iMetric, iMetric), fDevicePixelRatio));
    604 #endif
    605601    pDrag->exec();
    606602}
    … …  
    741737    /* Configure label icon: */
    742738    const int iMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
    743 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    744     m_pLabelIcon->setPixmap(m_pAction->icon().pixmap(window()->windowHandle(), QSize(iMetric, iMetric)));
    745 #else
    746739    const qreal fDevicePixelRatio = window() && window()->windowHandle() ? window()->windowHandle()->devicePixelRatio() : 1;
    747740    m_pLabelIcon->setPixmap(m_pAction->icon().pixmap(QSize(iMetric, iMetric), fDevicePixelRatio));
    748 #endif
    749741}
    750742

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBox.cpp

    r100075 r101559  
    299299    }
    300300    const int iMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
    301 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    302     m_pIconLabel->setPixmap(icon.pixmap(windowHandle(), QSize(iMetric, iMetric)));
    303 #else
    304301    const qreal fDevicePixelRatio = window() && window()->windowHandle() ? window()->windowHandle()->devicePixelRatio() : 1;
    305302    m_pIconLabel->setPixmap(icon.pixmap(QSize(iMetric, iMetric), fDevicePixelRatio));
    306 #endif
    307303    m_pIconLabel->setToolTip(strToolTip);
    308304}
    … …  
    347343    }
    348344    const int iMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
    349 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    350     QPixmap basePixmap = m_expandCollapseIcon.pixmap(windowHandle(), QSize(iMetric, iMetric));
    351 #else
    352345    const qreal fDevicePixelRatio = window() && window()->windowHandle() ? window()->windowHandle()->devicePixelRatio() : 1;
    353346    QPixmap basePixmap = m_expandCollapseIcon.pixmap(QSize(iMetric, iMetric), fDevicePixelRatio);
    354 #endif
    355347    if (!m_fExpanded)
    356348        m_pTitleButton->setPixmap(basePixmap);

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizard.cpp

    r100075 r101559  
    769769    /* Acquire pixmap of required size and scale (on basis of parent-widget's device pixel ratio): */
    770770    const QSize standardSize(620, 440);
    771 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    772     const QPixmap pixmapOld = icon.pixmap(parentWidget()->windowHandle(), standardSize);
    773 #else
    774771    const qreal fDevicePixelRatio = parentWidget() && parentWidget()->windowHandle() ? parentWidget()->windowHandle()->devicePixelRatio() : 1;
    775772    const QPixmap pixmapOld = icon.pixmap(standardSize, fDevicePixelRatio);
    776 #endif
    777773
    778774    /* Assign background finally: */
    … …  
    790786    /* Acquire pixmap of required size and scale (on basis of parent-widget's device pixel ratio): */
    791787    const QSize standardSize(145, 290);
    792 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    793     const QPixmap pixmapOld = icon.pixmap(parentWidget()->windowHandle(), standardSize);
    794 #else
    795788    const qreal fDevicePixelRatio = parentWidget() && parentWidget()->windowHandle() ? parentWidget()->windowHandle()->devicePixelRatio() : 1;
    796789    const QPixmap pixmapOld = icon.pixmap(standardSize, fDevicePixelRatio);
    797 #endif
    798790
    799791    /* Convert watermark to image which allows to manage pixel data directly: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIUserNamePasswordEditor.cpp

    r100075 r101559  
    9494        const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) * .625;
    9595        const int iShift = height() > iIconMetric ? (height() - iIconMetric) / 2 : 0;
    96 #ifndef VBOX_IS_QT6_OR_LATER /* QIcon::pixmap taking QWindow is deprecated in Qt6 */
    97         m_pErrorIconLabel->setPixmap(m_markIcon.pixmap(windowHandle(), QSize(iIconMetric, iIconMetric)));
    98 #else
    9996        const qreal fDevicePixelRatio = window() && window()->windowHandle() ? window()->windowHandle()->devicePixelRatio() : 1;
    10097        m_pErrorIconLabel->setPixmap(m_markIcon.pixmap(QSize(iIconMetric, iIconMetric), fDevicePixelRatio));
    101 #endif
    10298        m_pErrorIconLabel->setToolTip(m_strErrorToolTip);
    10399        int iIconX = width() - iIconMetric - iShift;
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette