AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove overlapping variable names defined in VxWorks headers

Browse Source 
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
f7bd8652ca.

Change-Id: I994ac9d00ca223b9fa955dfcba8ad6c8dcbd0549
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
This commit is contained in:
Pasi Petäjäjärvi 2013-02-11 16:40:10 +02:00 committed by The Qt Project
parent 8840ad56a3
commit 8d2679673e
4 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/io/qresource.cpp
View File

@ -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

9
src/gui/painting/qbrush.h
View File

@ -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

4
src/gui/painting/qtextureglyphcache_p.h
View File

@ -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

4
src/gui/painting/qtransform.h
View File

@ -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