diff options
| -rw-r--r-- | src/corelib/io/qresource.cpp | 9 | ||||
| -rw-r--r-- | src/gui/painting/qbrush.h | 9 | ||||
| -rw-r--r-- | src/gui/painting/qtextureglyphcache_p.h | 4 | ||||
| -rw-r--r-- | src/gui/painting/qtransform.h | 4 |
4 files changed, 0 insertions, 26 deletions
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index 0ce3ce3611..7dfc9b977c 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -62,15 +62,6 @@ //#define DEBUG_RESOURCE_MATCH -#if defined(Q_OS_VXWORKS) -# if defined(m_data) -# undef m_data -# endif -# if defined(m_len) -# undef m_len -# endif -#endif - QT_BEGIN_NAMESPACE 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 diff --git a/src/gui/painting/qtextureglyphcache_p.h b/src/gui/painting/qtextureglyphcache_p.h index d0fe7ab8cb..d93f57ad80 100644 --- a/src/gui/painting/qtextureglyphcache_p.h +++ b/src/gui/painting/qtextureglyphcache_p.h @@ -60,10 +60,6 @@ #include <private/qfontengineglyphcache_p.h> -#if defined(Q_OS_VXWORKS) && defined(m_type) -# undef m_type -#endif - #ifndef QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH #define QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH 256 #endif diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h index 22fc82bb58..060362f63e 100644 --- a/src/gui/painting/qtransform.h +++ b/src/gui/painting/qtransform.h @@ -50,10 +50,6 @@ #include <QtCore/qpoint.h> #include <QtCore/qrect.h> -#if defined(Q_OS_VXWORKS) && defined(m_type) -# undef m_type -#endif - QT_BEGIN_NAMESPACE |