summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOlli Werwolff <qt-info@nokia.com>2011-06-08 12:34:29 +0200
committerOlli Werwolff <qt-info@nokia.com>2011-06-08 13:57:30 +0200
commit2d09fe38ac9dd698d2259d9f0c973a82bf3b26c0 (patch)
treead334307c07c1ec9627cbc12330ebd9f3cf4398d /src
parent4b566e5db926470499bb9171b336f5e526e40bba (diff)
Undefine DrawText in qlineedit.cpp
There is a #define DrawText DrawTextW in winuser.h which is included in windows.h so that the enum value in line 1981 is seen as DrawTextW and thus is not a valid enum value on Windows. Reviewed-by: Samuel Reviewed-by: Lars Knoll
Diffstat (limited to 'src')
-rw-r--r--src/widgets/widgets/qlineedit.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp
index 8a93c286ac..3c401fd166 100644
--- a/src/widgets/widgets/qlineedit.cpp
+++ b/src/widgets/widgets/qlineedit.cpp
@@ -85,6 +85,9 @@
#endif
#include <limits.h>
+#ifdef DrawText
+#undef DrawText
+#endif
QT_BEGIN_NAMESPACE