diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-01-18 16:48:57 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-19 10:09:09 +0100 |
| commit | 114079e224af9a4148e9d2ad5f951e330857f154 (patch) | |
| tree | 9444fd56ec103de022d47de1ce47cbd0404830c8 /src | |
| parent | 2a742eba7a9be98354dc0e60c3644db484fe09db (diff) | |
Windows: Implement QPlatformScreen::name()
Change-Id: I04ec91b12936bdcc179b79558ac2285b70281dcd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsscreen.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsscreen.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowsscreen.cpp b/src/plugins/platforms/windows/qwindowsscreen.cpp index c8966f2ecc..aadc6ec986 100644 --- a/src/plugins/platforms/windows/qwindowsscreen.cpp +++ b/src/plugins/platforms/windows/qwindowsscreen.cpp @@ -108,6 +108,7 @@ BOOL QT_WIN_CALLBACK monitorEnumCallback(HMONITOR hMonitor, HDC, LPRECT, LPARAM data.geometry = QRect(QPoint(info.rcMonitor.left, info.rcMonitor.top), QPoint(info.rcMonitor.right - 1, info.rcMonitor.bottom - 1)); data.availableGeometry = QRect(QPoint(info.rcWork.left, info.rcWork.top), QPoint(info.rcWork.right - 1, info.rcWork.bottom - 1)); data.primary = (info.dwFlags & MONITORINFOF_PRIMARY) != 0; + data.name = QString::fromWCharArray(info.szDevice); result->append(data); return TRUE; } diff --git a/src/plugins/platforms/windows/qwindowsscreen.h b/src/plugins/platforms/windows/qwindowsscreen.h index dc1c8238d9..a7b9ba7fcc 100644 --- a/src/plugins/platforms/windows/qwindowsscreen.h +++ b/src/plugins/platforms/windows/qwindowsscreen.h @@ -61,6 +61,7 @@ struct QWindowsScreenData int depth; QImage::Format format; bool primary; + QString name; }; class QWindowsScreen : public QPlatformScreen @@ -76,6 +77,7 @@ public: virtual QImage::Format format() const { return m_data.format; } virtual QSizeF physicalSize() const { return m_data.physicalSizeMM; } virtual QDpi logicalDpi() const { return m_data.dpi; } + virtual QString name() const { return m_data.name; } virtual QWindow *topLevelAt(const QPoint &point) const { return QWindowsScreen::findTopLevelAt(point, CWP_SKIPINVISIBLE); } |