Modify mkspecs/unsupported/macx-clang/qplatformdefs.h
Now mkspecs/unsupported/macx-clang/qplatformdefs.h includes mkspecs/common/mac/qplatformdefs.h. This patch fixes that Qt built with clang failes to load cocoa platform plugin without QT_QPA_PLATFORM environment variable. Change-Id: Id48268eaf7ba24403f91497539ef0dab6f22a9dc Reviewed-on: http://codereview.qt-project.org/4564 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>bb10
parent
449d1359ba
commit
3889f37dc7
|
|
@ -39,59 +39,5 @@
|
|||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef QPLATFORMDEFS_H
|
||||
#define QPLATFORMDEFS_H
|
||||
#include "../../common/mac/qplatformdefs.h"
|
||||
|
||||
// Get Qt defines/settings
|
||||
|
||||
#include "qglobal.h"
|
||||
|
||||
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
|
||||
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
// We are hot - unistd.h should have turned on the specific APIs we requested
|
||||
|
||||
|
||||
#include <pthread.h>
|
||||
#include <dirent.h>
|
||||
#include <fcntl.h>
|
||||
#include <grp.h>
|
||||
#include <pwd.h>
|
||||
#include <signal.h>
|
||||
#define QT_NO_LIBRARY_UNLOAD
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/ipc.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/shm.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/wait.h>
|
||||
#include <netinet/in.h>
|
||||
#ifndef QT_NO_IPV6IFNAME
|
||||
#include <net/if.h>
|
||||
#endif
|
||||
|
||||
#include "../../common/posix/qplatformdefs.h"
|
||||
|
||||
#undef QT_OPEN_LARGEFILE
|
||||
#undef QT_SOCKLEN_T
|
||||
#undef QT_SIGNAL_IGNORE
|
||||
|
||||
#define QT_OPEN_LARGEFILE 0
|
||||
|
||||
#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4)
|
||||
#define QT_SOCKLEN_T socklen_t
|
||||
#else
|
||||
#define QT_SOCKLEN_T int
|
||||
#endif
|
||||
|
||||
#define QT_SIGNAL_IGNORE (void (*)(int))1
|
||||
|
||||
#define QT_SNPRINTF ::snprintf
|
||||
#define QT_VSNPRINTF ::vsnprintf
|
||||
|
||||
#endif // QPLATFORMDEFS_H
|
||||
|
|
|
|||
Loading…
Reference in New Issue