diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-23 22:12:54 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-23 22:12:54 +0100 |
commit | 7df08a8b63c8fc861a5e927eabf2405e1a2a01e1 (patch) | |
tree | 495ff2934465b02b01fc2ff694687344c909bf62 /src/gui/kernel/qscreen.cpp | |
parent | 06e4b1cff4c469d2fc3afbfe7a6b1954fedc90ff (diff) | |
parent | c608ec825410a9287f544a2ae3ce8154424e767d (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/kernel/qscreen.cpp')
-rw-r--r-- | src/gui/kernel/qscreen.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp index f5467ab742..2168cdf43a 100644 --- a/src/gui/kernel/qscreen.cpp +++ b/src/gui/kernel/qscreen.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -214,13 +214,12 @@ qreal QScreen::logicalDotsPerInch() const return (dpi.first + dpi.second) * qreal(0.5); } -/* +/*! Returns the ratio between physical pixels and device-independent pixels for the screen. - Common values are 1.0 on normal displays and 2.0 on Apple retina displays. + Common values are 1.0 on normal displays and 2.0 on Apple "retina" displays. - \sa QWindow::devicePixelRatio(); - \sa QGuiApplicaiton::devicePixelRatio(); + \sa QWindow::devicePixelRatio(), QGuiApplication::devicePixelRatio() */ qreal QScreen::devicePixelRatio() const { |