diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-29 10:06:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-29 10:54:41 +0200 |
| commit | 6a772fd201ac738dc86e71bd82e98f65158e6335 (patch) | |
| tree | 674007720f41d27b251bbcffd7a368a93f88eb96 /src/corelib/kernel/qcore_unix_p.h | |
| parent | 40206a9f6d7635bb19305d1c8d74908808e3529e (diff) | |
| parent | 4c346b6e2bfab976bc9b16275b8382aee38aefa4 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
mkspecs/common/msvc-desktop.conf
mkspecs/win32-g++/qmake.conf
mkspecs/win32-icc/qmake.conf
src/platformsupport/fontdatabases/mac/coretext.pri
src/plugins/platforms/cocoa/qcocoawindow.h
src/plugins/platforms/cocoa/qcocoawindow.mm
Change-Id: I74a6f7705c9547ed8bbac7260eb4645543e32655
Diffstat (limited to 'src/corelib/kernel/qcore_unix_p.h')
| -rw-r--r-- | src/corelib/kernel/qcore_unix_p.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h index c8771bfee5..eca575ba01 100644 --- a/src/corelib/kernel/qcore_unix_p.h +++ b/src/corelib/kernel/qcore_unix_p.h @@ -55,7 +55,6 @@ #include <QtCore/private/qglobal_p.h> #include "qplatformdefs.h" #include "qatomic.h" -#include "qhash.h" #ifndef Q_OS_UNIX # error "qcore_unix_p.h included on a non-Unix system" @@ -371,19 +370,6 @@ union qt_semun { unsigned short *array; /* array for GETALL, SETALL */ }; -#ifndef QT_POSIX_IPC -#if QT_CONFIG(sharedmemory) || QT_CONFIG(systemsemaphore) -#ifndef Q_OS_ANDROID -static inline key_t qt_safe_ftok(const QByteArray &filename, int proj_id) -{ - // Unfortunately ftok can return colliding keys even for different files. - // Try to add some more entropy via qHash. - return ::ftok(filename.constData(), qHash(filename, proj_id)); -} -#endif // !Q_OS_ANDROID -#endif // QT_CONFIG(sharedmemory) || QT_CONFIG(systemsemaphore) -#endif // !QT_POSIX_IPC - QT_END_NAMESPACE #endif |