diff options
author | Pasi Petäjäjärvi <pasi.petajajarvi@digia.com> | 2013-02-11 16:40:10 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-12 09:40:48 +0100 |
commit | 8d2679673e6268f826abe6d4ef1734e9d69edab5 (patch) | |
tree | 3cb0d45b5f6391cf3e7743a00d0da355299d88a4 /src/gui/painting/qtextureglyphcache_p.h | |
parent | 8840ad56a3afb185b4e0b9158130d6e265161f4e (diff) |
Remove overlapping variable names defined in VxWorks headers
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>
Diffstat (limited to 'src/gui/painting/qtextureglyphcache_p.h')
-rw-r--r-- | src/gui/painting/qtextureglyphcache_p.h | 4 |
1 files changed, 0 insertions, 4 deletions
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 |