diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-04-22 17:12:50 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-25 15:22:54 +0200 |
| commit | 5f0fb6f114bb907b7122c265ca120bca26dd60d5 (patch) | |
| tree | d1d40baf0926ce7d3711083f65e5b8e6e35fee28 /src/gui | |
| parent | a26e3ecc3ddb407b204df629f2d1561d2293e0ea (diff) | |
Fix definition of HRESULT in qwindowdefs_win.h.
Task-number: QTBUG-38435
Change-Id: I4a08cd0656fa5d6ecb0b94aa71ca000268835b89
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qwindowdefs_win.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qwindowdefs_win.h b/src/gui/kernel/qwindowdefs_win.h index fea995a0f5..0dd027e585 100644 --- a/src/gui/kernel/qwindowdefs_win.h +++ b/src/gui/kernel/qwindowdefs_win.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -107,7 +107,7 @@ Q_DECLARE_HANDLE(HRGN); #ifndef HMONITOR Q_DECLARE_HANDLE(HMONITOR); #endif -#ifndef HRESULT +#ifndef _HRESULT_DEFINED typedef long HRESULT; #endif |