diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-05 14:22:45 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-05 14:22:45 +0200 |
| commit | f2856875843efce9a00e90dad05bde358ab82197 (patch) | |
| tree | 93346c38504ce04f0bf02dfe4a21299feb1be8ed /mkspecs/common | |
| parent | a7b04275082d065f392e7f18c54ea9b41507ae40 (diff) | |
| parent | a2970719c26c946fd6fea7d902aad6706a4ca6ea (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
examples/corelib/ipc/ipc.pro
src/plugins/platforms/xcb/qxcbbackingstore.cpp
tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp
Change-Id: Ia006e10ff1732fe78f90138c41f05b59b49486cf
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/integrity/qplatformdefs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/common/integrity/qplatformdefs.h b/mkspecs/common/integrity/qplatformdefs.h index c4cd5c0782..91ec1cde12 100644 --- a/mkspecs/common/integrity/qplatformdefs.h +++ b/mkspecs/common/integrity/qplatformdefs.h @@ -75,7 +75,7 @@ // INTEGRITY doesn't have getpagesize() inline int getpagesize() { - return ::sysconf(_SC_PAGESIZE); + return sysconf(_SC_PAGESIZE); } // geteuid() is only available with multi-process posix, but we do not want @@ -97,4 +97,4 @@ inline uid_t getuid(void) #define QT_OPEN_LARGEFILE 0 #define PATH_MAX 1024 -#endif // Q_QNX_PLATFORMDEFS_H +#endif // Q_INTEGRITY_PLATFORMDEFS_H |