diff options
| author | Kimmo Ollila <kimmo.ollila@qt.io> | 2017-01-11 11:00:13 +0200 |
|---|---|---|
| committer | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2017-01-13 07:52:16 +0000 |
| commit | 01cade50509de392f06e6f5ee939421a576e06c1 (patch) | |
| tree | a7f3078efe96f824c88d38de4df009426f39b1ec /src | |
| parent | 2f08a1d6146ab3529baad839eb9dbfc1a1182720 (diff) | |
Fix build for INTEGRITY
Change-Id: I2c41295688e962eb263f2180bebfd1dd37613804
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/integrity/qintegrityfbscreen.cpp | 2 | ||||
| -rw-r--r-- | src/testlib/qtestcase.cpp | 6 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 4142c17b42..723611e1d8 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -354,6 +354,7 @@ # elif defined(__ghs) # define Q_CC_GHS # define Q_DECL_DEPRECATED __attribute__ ((__deprecated__)) +# define Q_PACKED __attribute__ ((__packed__)) # define Q_FUNC_INFO __PRETTY_FUNCTION__ # define Q_TYPEOF(expr) __typeof__(expr) # define Q_ALIGNOF(type) __alignof__(type) diff --git a/src/plugins/platforms/integrity/qintegrityfbscreen.cpp b/src/plugins/platforms/integrity/qintegrityfbscreen.cpp index 256cc117a2..6dc10890ce 100644 --- a/src/plugins/platforms/integrity/qintegrityfbscreen.cpp +++ b/src/plugins/platforms/integrity/qintegrityfbscreen.cpp @@ -206,7 +206,7 @@ QRegion QIntegrityFbScreen::doRedraw() (uint32_t)rects[i].width(), (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); } return touched; diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index e250d36e12..7485941c0f 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -99,7 +99,9 @@ #include <errno.h> #include <signal.h> #include <time.h> -#include <sys/resource.h> +# if !defined(Q_OS_INTEGRITY) +# include <sys/resource.h> +# endif #endif #if defined(Q_OS_MACX) @@ -186,7 +188,7 @@ static void disableCoreDump() bool ok = false; const int disableCoreDump = qEnvironmentVariableIntValue("QTEST_DISABLE_CORE_DUMP", &ok); if (ok && disableCoreDump == 1) { -#if defined(Q_OS_UNIX) +#if defined(Q_OS_UNIX) && !defined(Q_OS_INTEGRITY) struct rlimit limit; limit.rlim_cur = 0; limit.rlim_max = 0; |