From 8d2679673e6268f826abe6d4ef1734e9d69edab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pasi=20Pet=C3=A4j=C3=A4j=C3=A4rvi?=
 <pasi.petajajarvi@digia.com>
Date: Mon, 11 Feb 2013 16:40:10 +0200
Subject: Remove overlapping variable names defined in VxWorks headers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

VxWorks has defined variables with same name as in Qt's headers.
Remove these undefines because that has already done in file
src/corelib/kernel/qfunctions_vxworks.h. See related change
f7bd8652caab2f53ced739ce90c640924d4962dc.

Change-Id: I994ac9d00ca223b9fa955dfcba8ad6c8dcbd0549
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
---
 src/gui/painting/qbrush.h | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'src/gui/painting/qbrush.h')

diff --git a/src/gui/painting/qbrush.h b/src/gui/painting/qbrush.h
index 6a89db6a52..4d8c97e255 100644
--- a/src/gui/painting/qbrush.h
+++ b/src/gui/painting/qbrush.h
@@ -52,15 +52,6 @@
 #include <QtGui/qimage.h>
 #include <QtGui/qpixmap.h>
 
-#if defined(Q_OS_VXWORKS)
-#  if defined(m_data)
-#    undef m_data
-#  endif
-#  if defined(m_type)
-#    undef m_type
-#  endif
-#endif
-
 QT_BEGIN_NAMESPACE
 
 
-- 
cgit v1.2.3