1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build for INTEGRITY

Browse Source 
Change-Id: I2c41295688e962eb263f2180bebfd1dd37613804
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
Kimmo Ollila 2017-01-11 11:00:13 +02:00 committed by Kimmo Ollila
parent 2f08a1d614
commit 01cade5050
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/corelib/global/qcompilerdetection.h
View File

@ -354,6 +354,7 @@
# elif defined(__ghs) # elif defined(__ghs)
# define Q_CC_GHS # define Q_CC_GHS
# define Q_DECL_DEPRECATED __attribute__ ((__deprecated__)) # define Q_DECL_DEPRECATED __attribute__ ((__deprecated__))
# define Q_PACKED __attribute__ ((__packed__))
# define Q_FUNC_INFO __PRETTY_FUNCTION__ # define Q_FUNC_INFO __PRETTY_FUNCTION__
# define Q_TYPEOF(expr) __typeof__(expr) # define Q_TYPEOF(expr) __typeof__(expr)
# define Q_ALIGNOF(type) __alignof__(type) # define Q_ALIGNOF(type) __alignof__(type)

2
src/plugins/platforms/integrity/qintegrityfbscreen.cpp
View File

@ -206,7 +206,7 @@ QRegion QIntegrityFbScreen::doRedraw()
(uint32_t)rects[i].width(), (uint32_t)rects[i].width(),
(uint32_t)rects[i].height() (uint32_t)rects[i].height()
}; };
mBlitter->drawImage(rects[i], *mScreenImage, rects[i]); mBlitter->drawImage(rects[i], mScreenImage, rects[i]);
gh_FB_expose(mFbh, &fbrect, NULL); gh_FB_expose(mFbh, &fbrect, NULL);
} }
return touched; return touched;

6
src/testlib/qtestcase.cpp
View File

@ -99,7 +99,9 @@
#include <errno.h> #include <errno.h>
#include <signal.h> #include <signal.h>
#include <time.h> #include <time.h>
#include <sys/resource.h> # if !defined(Q_OS_INTEGRITY)
# include <sys/resource.h>
# endif
#endif #endif
#if defined(Q_OS_MACX) #if defined(Q_OS_MACX)
@ -186,7 +188,7 @@ static void disableCoreDump()
bool ok = false; bool ok = false;
const int disableCoreDump = qEnvironmentVariableIntValue("QTEST_DISABLE_CORE_DUMP", &ok); const int disableCoreDump = qEnvironmentVariableIntValue("QTEST_DISABLE_CORE_DUMP", &ok);
if (ok && disableCoreDump == 1) { if (ok && disableCoreDump == 1) {
#if defined(Q_OS_UNIX) #if defined(Q_OS_UNIX) && !defined(Q_OS_INTEGRITY)
struct rlimit limit; struct rlimit limit;
limit.rlim_cur = 0; limit.rlim_cur = 0;
limit.rlim_max = 0; limit.rlim_max = 0;