diff options
| author | Rolland Dudemaine <rolland@ghs.com> | 2016-03-23 11:17:13 +0100 |
|---|---|---|
| committer | Rolland Dudemaine <rolland@ghs.com> | 2016-03-23 15:38:27 +0000 |
| commit | 6be6d3bc1973f87e87936d6770c62cbda6193fbd (patch) | |
| tree | a40ea3c7aac5ddcac75d20e9eba91d8e9069997d | |
| parent | 8e2d3e3b90d7d35d2c91fc09ab5a9cccac0823e8 (diff) | |
Build SQLite including the platform header for INTEGRITY.
The platform header defines geteuid(), which is necessary for the SQLite
library. The common platform header is also modified to handle being
included from C, and resolves a typo on the way.
Change-Id: I8ace8a11ceac0f541b9c9b0d8112609579224884
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | mkspecs/common/integrity/qplatformdefs.h | 4 | ||||
| -rw-r--r-- | src/3rdparty/sqlite.pri | 1 |
2 files changed, 3 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 diff --git a/src/3rdparty/sqlite.pri b/src/3rdparty/sqlite.pri index 15f082b2ba..29968e323f 100644 --- a/src/3rdparty/sqlite.pri +++ b/src/3rdparty/sqlite.pri @@ -5,6 +5,7 @@ contains(QT_CONFIG, posix_fallocate):DEFINES += HAVE_POSIX_FALLOCATE=1 winrt: DEFINES += SQLITE_OS_WINRT winphone: DEFINES += SQLITE_WIN32_FILEMAPPING_API=1 qnx: DEFINES += _QNX_SOURCE +integrity: QMAKE_CFLAGS += -include qplatformdefs.h INCLUDEPATH += $$PWD/sqlite SOURCES += $$PWD/sqlite/sqlite3.c |