diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-11-02 10:58:06 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-02 15:44:04 +0100 |
| commit | 7d560240fae18afa385b868f17121f80f33bfbb2 (patch) | |
| tree | 1172d2947a1227e2153c34eb2a61582b9aa904e4 /src/plugins/platforms | |
| parent | f3242864c3e8384aa1153a9044143265f3af0b62 (diff) | |
Windows platform plugin: Fix compiler warnings.
Change-Id: Id7111ca74455b93aabb803babff51c4393508dbc
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsintegration.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsscreen.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp index 28506771ee..1d10141256 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.cpp +++ b/src/plugins/platforms/windows/qwindowsintegration.cpp @@ -161,8 +161,7 @@ struct QWindowsIntegrationPrivate }; QWindowsIntegrationPrivate::QWindowsIntegrationPrivate() - : m_eventDispatcher(new QWindowsGuiEventDispatcher) - , m_fontDatabase(0) + : m_fontDatabase(0), m_eventDispatcher(new QWindowsGuiEventDispatcher) { } diff --git a/src/plugins/platforms/windows/qwindowsscreen.cpp b/src/plugins/platforms/windows/qwindowsscreen.cpp index c6784e5bf3..96f3917cf4 100644 --- a/src/plugins/platforms/windows/qwindowsscreen.cpp +++ b/src/plugins/platforms/windows/qwindowsscreen.cpp @@ -102,7 +102,7 @@ BOOL QT_WIN_CALLBACK monitorEnumCallback(HMONITOR hMonitor, HDC, LPRECT, LPARAM data.physicalSizeMM = QSizeF(GetDeviceCaps(hdc, HORZSIZE), GetDeviceCaps(hdc, VERTSIZE)); DeleteDC(hdc); } else { - qWarning("%s: Unable to obtain handle for monitor '%s', defaulting to %d DPI.", + qWarning("%s: Unable to obtain handle for monitor '%s', defaulting to %g DPI.", __FUNCTION__, qPrintable(QString::fromWCharArray(info.szDevice)), data.dpi.first); } |