From 47c7ae25c6c6fccf00c027c0fcb2dab11e686c2b Mon Sep 17 00:00:00 2001 From: Rolland Dudemaine Date: Thu, 29 Oct 2015 15:59:48 +0100 Subject: Add INTEGRITY Framebuffer-based plugin as a platform plugin. The plugin builds as a static plugin. It is based on the Linuxfb plugin. It uses the INTEGRITY FB API for framebuffer for display, and HID API for input (mouse, keyboard, touch). Because this is the only supported plugin and requires to be included as a static plugin, automatically add the platform to any application through qmake.conf. Change-Id: Ic228afb59cb39dd02c2d538de46caf6e6ea7d153 Reviewed-by: Oswald Buddenhagen Reviewed-by: Andy Nichols --- configure | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'configure') diff --git a/configure b/configure index 87982e389d..1e8a7ff16a 100755 --- a/configure +++ b/configure @@ -695,6 +695,7 @@ CFG_EGLFS_VIV_WL=no CFG_DIRECTFB=auto CFG_GBM=auto CFG_LINUXFB=auto +CFG_INTEGRITYFB=no CFG_KMS=auto CFG_MIRCLIENT=auto CFG_LIBUDEV=auto @@ -4714,6 +4715,7 @@ if [ "$XPLATFORM_QNX" = "yes" ]; then fi if [ "$XPLATFORM_INTEGRITY" = "yes" ]; then + CFG_INTEGRITYFB=yes CFG_SHARED=no CFG_LARGEFILE=no fi @@ -5918,6 +5920,8 @@ if [ -z "$QT_QPA_DEFAULT_PLATFORM" ]; then QT_QPA_DEFAULT_PLATFORM="cocoa" elif [ "$UNAME_SYSTEM" = "QNX" ]; then QT_QPA_DEFAULT_PLATFORM="qnx" + elif [ "$XPLATFORM_INTEGRITY" = "yes" ]; then + QT_QPA_DEFAULT_PLATFORM="integrityfb" else QT_QPA_DEFAULT_PLATFORM="xcb" fi @@ -5940,6 +5944,9 @@ fi if [ "$CFG_LINUXFB" = "yes" ]; then QT_CONFIG="$QT_CONFIG linuxfb" fi +if [ "$CFG_INTEGRITYFB" = "yes" ]; then + QT_CONFIG="$QT_CONFIG integrityfb" +fi if [ "$CFG_KMS" = "yes" ]; then QT_CONFIG="$QT_CONFIG kms" fi @@ -7462,6 +7469,9 @@ report_support " EGLFS GBM .........." "$CFG_EGLFS_GBM" report_support " EGLFS Mali ........." "$CFG_EGLFS_MALI" report_support " EGLFS Raspberry Pi ." "$CFG_EGLFS_BRCM" report_support " EGLFS X11 .........." "$CFG_EGL_X" +if [ "$XPLATFORM_INTEGRITY" = "yes" ]; then + report_support " INTEGRITY Framebuffer " "$CFG_INTEGRITYFB" +fi report_support " LinuxFB .............." "$CFG_LINUXFB" report_support " Mir client............" "$CFG_MIRCLIENT" report_support " XCB .................." "$CFG_XCB" system "system library" qt "bundled copy" -- cgit v1.2.3 From dfb9b9e1f7ff723bbb082875962ddcf0d69d1db2 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Fri, 18 Mar 2016 12:30:33 +0100 Subject: configure: enable QSharedMemory when targeting windows. Change-Id: Ib20e7bab80c2207c50cc221eba5eae996a805242 Reviewed-by: hjk Reviewed-by: Oswald Buddenhagen --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 203155c819..8d7772ac5b 100755 --- a/configure +++ b/configure @@ -4580,7 +4580,7 @@ if ! compileTest unix/ipc_sysv "ipc_sysv" ; then if compileTest unix/ipc_posix "ipc_posix" ; then QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC" else - if [ "$XPLATFORM_ANDROID" = "no" ] ; then + if [ "$XPLATFORM_ANDROID" = "no" ] && [ "$XPLATFORM_MINGW" = "no" ] ; then QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SYSTEMSEMAPHORE QT_NO_SHAREDMEMORY" fi fi -- cgit v1.2.3 From d3d78c81754f2737b7686c8989460105a0a0c0e7 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Fri, 18 Mar 2016 08:45:27 +0100 Subject: configure: Appending compiler and linker flags... ...instead of overwriting when building qmake for windows. Change-Id: I89eb33439b03a0ad33d006d12c9896c87d271c4f Reviewed-by: Oswald Buddenhagen --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 8d7772ac5b..1cafa98c3b 100755 --- a/configure +++ b/configure @@ -4042,8 +4042,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; done fi if [ "$BUILD_ON_MSYS" = "yes" ]; then - EXTRA_CFLAGS="-DUNICODE" - EXTRA_CXXFLAGS="-DUNICODE" + EXTRA_CFLAGS="$EXTRA_CFLAGS -DUNICODE" + EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -DUNICODE" EXTRA_OBJS="qfilesystemengine_win.o \ qfilesystemiterator_win.o \ qfsfileengine_win.o \ @@ -4058,7 +4058,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_win.cpp\" \ \"\$(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp\" \ \"\$(SOURCE_PATH)/tools/shared/windows/registry.cpp\"" - EXTRA_LFLAGS="-static -s -lole32 -luuid -ladvapi32 -lkernel32" + EXTRA_LFLAGS="$EXTRA_LFLAGS -static -s -lole32 -luuid -ladvapi32 -lkernel32" EXEEXT=".exe" else EXTRA_OBJS="qfilesystemengine_unix.o \ -- cgit v1.2.3