whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove support for some very old compilers 

Remove code supporting gcc 4.0 and earlier, and MSVC 2005 and earlier.

Change-Id: I3304e11bb38c101f113c124e8e533c5578badf34
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
bb10
Allan Sandfeld Jensen 2015-01-30 12:22:37 +01:00
parent 4ad83407dd
commit 839f38bcfa
4 changed files with 0 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/tools/qbytearray.h
View File

@ -48,17 +48,6 @@
#error qbytearray.h must be included before any header file that defines truncate
#endif
#if defined(Q_CC_GNU) && (__GNUC__ == 4 && __GNUC_MINOR__ == 0)
//There is a bug in GCC 4.0 that tries to instantiate template of annonymous enum
# ifdef QT_USE_FAST_OPERATOR_PLUS
# undef QT_USE_FAST_OPERATOR_PLUS
# endif
# ifdef QT_USE_QSTRINGBUILDER
# undef QT_USE_QSTRINGBUILDER
# endif
#endif
#ifdef Q_OS_MAC
Q_FORWARD_DECLARE_CF_TYPE(CFData);
# ifdef __OBJC__

11
src/gui/painting/qdrawhelper_sse2.cpp
View File

@ -537,18 +537,7 @@ public:
static inline Int32x4 v_toInt(Float32x4 x) { return _mm_cvttps_epi32(x); }
// pre-VS 2008 doesn't have cast intrinsics, whereas 2008 and later requires it
// (same deal with gcc prior to 4.0)
#if (defined(Q_CC_MSVC) && _MSC_VER < 1500) || (defined(Q_CC_GNU) && __GNUC__ < 4)
static inline Int32x4 v_greaterOrEqual(Float32x4 a, Float32x4 b)
{
union Convert { Int32x4 vi; Float32x4 vf; } convert;
convert.vf = _mm_cmpgt_ps(a, b);
return convert.vi;
}
#else
static inline Int32x4 v_greaterOrEqual(Float32x4 a, Float32x4 b) { return _mm_castps_si128(_mm_cmpgt_ps(a, b)); }
#endif
};
const uint * QT_FASTCALL qt_fetch_radial_gradient_sse2(uint *buffer, const Operator *op, const QSpanData *data,

7
src/tools/uic/cpp/cppwriteinitialization.cpp
View File

@ -305,13 +305,6 @@ int IconHandle::compare(const IconHandle &rhs) const
return 0;
}
#if defined(Q_OS_MAC) && defined(Q_CC_GNU) && (__GNUC__ == 3 && __GNUC_MINOR__ == 3)
inline uint qHash(const SizePolicyHandle &handle) { return qHash(handle.m_domSizePolicy); }
inline uint qHash(const FontHandle &handle) { return qHash(handle.m_domFont); }
inline uint qHash(const IconHandle &handle) { return qHash(handle.m_domIcon); }
#endif
SizePolicyHandle::SizePolicyHandle(const DomSizePolicy *domSizePolicy) :
m_domSizePolicy(domSizePolicy)
{

18
src/tools/uic/cpp/cppwriteinitialization.h
View File

@ -61,9 +61,6 @@ namespace CPP {
int compare(const FontHandle &) const;
private:
const DomFont *m_domFont;
#if defined(Q_OS_MAC) && defined(Q_CC_GNU) && (__GNUC__ == 3 && __GNUC_MINOR__ == 3)
friend uint qHash(const FontHandle &);
#endif
};
inline bool operator ==(const FontHandle &f1, const FontHandle &f2) { return f1.compare(f2) == 0; }
inline bool operator <(const FontHandle &f1, const FontHandle &f2) { return f1.compare(f2) < 0; }
@ -75,9 +72,6 @@ namespace CPP {
int compare(const IconHandle &) const;
private:
const DomResourceIcon *m_domIcon;
#if defined(Q_OS_MAC) && defined(Q_CC_GNU) && (__GNUC__ == 3 && __GNUC_MINOR__ == 3)
friend uint qHash(const IconHandle &);
#endif
};
inline bool operator ==(const IconHandle &i1, const IconHandle &i2) { return i1.compare(i2) == 0; }
inline bool operator <(const IconHandle &i1, const IconHandle &i2) { return i1.compare(i2) < 0; }
@ -89,15 +83,9 @@ namespace CPP {
int compare(const SizePolicyHandle &) const;
private:
const DomSizePolicy *m_domSizePolicy;
#if defined(Q_OS_MAC) && defined(Q_CC_GNU) && (__GNUC__ == 3 && __GNUC_MINOR__ == 3)
friend uint qHash(const SizePolicyHandle &);
#endif
};
inline bool operator ==(const SizePolicyHandle &f1, const SizePolicyHandle &f2) { return f1.compare(f2) == 0; }
#if !(defined(Q_OS_MAC) && defined(Q_CC_GNU) && (__GNUC__ == 3 && __GNUC_MINOR__ == 3))
inline bool operator <(const SizePolicyHandle &f1, const SizePolicyHandle &f2) { return f1.compare(f2) < 0; }
#endif
struct WriteInitialization : public TreeWalker
@ -287,15 +275,9 @@ private:
ColorBrushHash m_colorBrushHash;
// Map from font properties to font variable name for reuse
// Map from size policy to variable for reuse
#if defined(Q_OS_MAC) && defined(Q_CC_GNU) && (__GNUC__ == 3 && __GNUC_MINOR__ == 3)
typedef QHash<FontHandle, QString> FontPropertiesNameMap;
typedef QHash<IconHandle, QString> IconPropertiesNameMap;
typedef QHash<SizePolicyHandle, QString> SizePolicyNameMap;
#else
typedef QMap<FontHandle, QString> FontPropertiesNameMap;
typedef QMap<IconHandle, QString> IconPropertiesNameMap;
typedef QMap<SizePolicyHandle, QString> SizePolicyNameMap;
#endif
FontPropertiesNameMap m_fontPropertiesNameMap;
IconPropertiesNameMap m_iconPropertiesNameMap;
SizePolicyNameMap m_sizePolicyNameMap;