parent
b9326bac16
commit
1563fad8d5
|
@ -0,0 +1,11 @@
|
|||
--- src/corelib/codecs/qiconvcodec.cpp.orig
|
||||
+++ src/corelib/codecs/qiconvcodec.cpp
|
||||
@@ -62,7 +62,7 @@
|
||||
#elif defined(Q_OS_AIX)
|
||||
# define NO_BOM
|
||||
# define UTF16 "UCS-2"
|
||||
-#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC)
|
||||
+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) || (defined(Q_OS_LINUX) && !defined(__GLIBC__))
|
||||
# define NO_BOM
|
||||
# if Q_BYTE_ORDER == Q_BIG_ENDIAN
|
||||
# define UTF16 "UTF-16BE"
|
|
@ -0,0 +1,14 @@
|
|||
--- mkspecs/linux-g++/qplatformdefs.h.orig
|
||||
+++ mkspecs/linux-g++/qplatformdefs.h
|
||||
@@ -86,11 +86,7 @@
|
||||
|
||||
#undef QT_SOCKLEN_T
|
||||
|
||||
-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
|
||||
#define QT_SOCKLEN_T socklen_t
|
||||
-#else
|
||||
-#define QT_SOCKLEN_T int
|
||||
-#endif
|
||||
|
||||
#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
|
||||
#define QT_SNPRINTF ::snprintf
|
Loading…
Reference in New Issue