Haiku: Make corelib compile on Haiku
Change-Id: I66bc492390eedd723ab7866d3c7a38539d708727 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>bb10
parent
82413cd35f
commit
c2b86ade9e
|
|
@ -2471,6 +2471,9 @@ QString QSysInfo::productType()
|
|||
#elif defined(Q_OS_DARWIN)
|
||||
return QStringLiteral("darwin");
|
||||
|
||||
#elif defined(Q_OS_HAIKU)
|
||||
return QStringLiteral("haiku");
|
||||
|
||||
#elif defined(USE_ETC_OS_RELEASE) // Q_OS_UNIX
|
||||
QUnixOSVersion unixOsVersion;
|
||||
readEtcOsRelease(unixOsVersion);
|
||||
|
|
@ -2601,6 +2604,8 @@ QString QSysInfo::prettyProductName()
|
|||
return QLatin1String("Android ") + productVersion();
|
||||
#elif defined(Q_OS_BLACKBERRY)
|
||||
return QLatin1String("BlackBerry ") + productVersion();
|
||||
#elif defined(Q_OS_HAIKU)
|
||||
return QLatin1String("Haiku ") + productVersion();
|
||||
#elif defined(Q_OS_UNIX)
|
||||
# ifdef USE_ETC_OS_RELEASE
|
||||
QUnixOSVersion unixOsVersion;
|
||||
|
|
|
|||
|
|
@ -75,6 +75,7 @@
|
|||
BSD4 - Any BSD 4.4 system
|
||||
UNIX - Any UNIX BSD/SYSV system
|
||||
ANDROID - Android platform
|
||||
HAIKU - Haiku
|
||||
|
||||
The following operating systems have variants:
|
||||
LINUX - both Q_OS_LINUX and Q_OS_ANDROID are defined when building for Android
|
||||
|
|
@ -169,6 +170,8 @@
|
|||
# define Q_OS_INTEGRITY
|
||||
#elif defined(VXWORKS) /* there is no "real" VxWorks define - this has to be set in the mkspec! */
|
||||
# define Q_OS_VXWORKS
|
||||
#elif defined(__HAIKU__)
|
||||
# define Q_OS_HAIKU
|
||||
#elif defined(__MAKEDEPEND__)
|
||||
#else
|
||||
# error "Qt has not been ported to this OS - see http://www.qt-project.org/"
|
||||
|
|
|
|||
|
|
@ -75,6 +75,9 @@
|
|||
# if !defined(ST_RDONLY)
|
||||
# define ST_RDONLY 1 // hack for missing define on Android
|
||||
# endif
|
||||
#elif defined(Q_OS_HAIKU)
|
||||
# define QT_STATFSBUF struct statvfs
|
||||
# define QT_STATFS ::statvfs
|
||||
#else
|
||||
# if defined(QT_LARGEFILE_SUPPORT)
|
||||
# define QT_STATFSBUF struct statvfs64
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ void qt_initialize_pthread_cond(pthread_cond_t *cond, const char *where)
|
|||
pthread_condattr_t condattr;
|
||||
|
||||
pthread_condattr_init(&condattr);
|
||||
#if !defined(Q_OS_MAC) && !defined(Q_OS_ANDROID) && (_POSIX_MONOTONIC_CLOCK-0 >= 0)
|
||||
#if !defined(Q_OS_MAC) && !defined(Q_OS_ANDROID) && !defined(Q_OS_HAIKU) && (_POSIX_MONOTONIC_CLOCK-0 >= 0)
|
||||
if (QElapsedTimer::clockType() == QElapsedTimer::MonotonicClock)
|
||||
pthread_condattr_setclock(&condattr, CLOCK_MONOTONIC);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -214,7 +214,7 @@ INCLUDEPATH += ../3rdparty/md5 \
|
|||
../3rdparty/sha3
|
||||
|
||||
# Note: libm should be present by default becaue this is C++
|
||||
!macx-icc:!vxworks:unix:LIBS_PRIVATE += -lm
|
||||
!macx-icc:!vxworks:!haiku:unix:LIBS_PRIVATE += -lm
|
||||
|
||||
TR_EXCLUDE += ../3rdparty/*
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue