diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-02 13:41:31 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-02 13:41:58 +0100 |
| commit | 1ba68c8431d746b46bba1a0f117f3ff7cd2c6aea (patch) | |
| tree | 462bcde5696636851216be3ae33fb474a7cb2f6c /src/quick/items/qquickwindow.cpp | |
| parent | c170ea57ca5a927b22726a730a7eedd274abbcfc (diff) | |
| parent | d40fcf19f7768e6ae80532ff3d8a416132594f87 (diff) | |
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: I89bbb2977350a03c156d531f810d08a5560ffbb3
Diffstat (limited to 'src/quick/items/qquickwindow.cpp')
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 986aab3c8f..9b1fad7bcc 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -3947,7 +3947,7 @@ void QQuickWindow::runJobsAfterSwap() * * \sa QWindow::devicePixelRatio() */ -int QQuickWindow::effectiveDevicePixelRatio() const +qreal QQuickWindow::effectiveDevicePixelRatio() const { QWindow *w = QQuickRenderControl::renderWindowFor(const_cast<QQuickWindow *>(this)); return w ? w->devicePixelRatio() : devicePixelRatio(); |