diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-07-26 10:13:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-07-26 10:13:06 +0200 |
| commit | bf08e0bbb28917f1965cd29ed449e553d1d1f4f1 (patch) | |
| tree | ed83933e4f6a9d40c546c85aa136f18ce927dfc8 /src/plugins/platforms | |
| parent | 547f216efdef3667b0b23ecddce93e5184806800 (diff) | |
| parent | 0ce3f7d62b93427ca5d0f4284ba774691cbbd4a7 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/network/access/qhttpthreaddelegate.cpp
Change-Id: Id47b977587e2d713c16ac17e63c5ec80c2f05ee9
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/winrt/qwinrtscreen.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/platforms/winrt/qwinrtscreen.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/src/plugins/platforms/winrt/qwinrtscreen.cpp b/src/plugins/platforms/winrt/qwinrtscreen.cpp index e611c7be24..342e142a74 100644 --- a/src/plugins/platforms/winrt/qwinrtscreen.cpp +++ b/src/plugins/platforms/winrt/qwinrtscreen.cpp @@ -669,12 +669,6 @@ QDpi QWinRTScreen::logicalDpi() const return QDpi(d->logicalDpi, d->logicalDpi); } -qreal QWinRTScreen::pixelDensity() const -{ - Q_D(const QWinRTScreen); - return qMax(1, qRound(d->logicalDpi / 96)); -} - qreal QWinRTScreen::scaleFactor() const { Q_D(const QWinRTScreen); diff --git a/src/plugins/platforms/winrt/qwinrtscreen.h b/src/plugins/platforms/winrt/qwinrtscreen.h index 63c254940d..6b57780fa1 100644 --- a/src/plugins/platforms/winrt/qwinrtscreen.h +++ b/src/plugins/platforms/winrt/qwinrtscreen.h @@ -96,7 +96,6 @@ public: QImage::Format format() const override; QSizeF physicalSize() const override; QDpi logicalDpi() const override; - qreal pixelDensity() const override; qreal scaleFactor() const; QPlatformCursor *cursor() const override; Qt::KeyboardModifiers keyboardModifiers() const; |