diff options
Diffstat (limited to 'mkspecs/devices/linux-imx6-g++')
-rw-r--r-- | mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp | 101 | ||||
-rw-r--r-- | mkspecs/devices/linux-imx6-g++/qmake.conf | 19 | ||||
-rw-r--r-- | mkspecs/devices/linux-imx6-g++/qplatformdefs.h | 14 |
3 files changed, 12 insertions, 122 deletions
diff --git a/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp b/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp deleted file mode 100644 index 719d8511a4..0000000000 --- a/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp +++ /dev/null @@ -1,101 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the qmake spec of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qeglfshooks.h" -#include <EGL/eglvivante.h> -#include <QDebug> - -QT_BEGIN_NAMESPACE - -class QEglFSImx6Hooks : public QEglFSHooks -{ -public: - QEglFSImx6Hooks(); - virtual QSize screenSize() const; - virtual EGLNativeWindowType createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format); - virtual void destroyNativeWindow(EGLNativeWindowType window); - virtual EGLNativeDisplayType platformDisplay() const; - -private: - QSize mScreenSize; - EGLNativeDisplayType mNativeDisplay; -}; - - -QEglFSImx6Hooks::QEglFSImx6Hooks() -{ - int width, height; - - bool multiBufferNotEnabledYet = qEnvironmentVariableIsEmpty("FB_MULTI_BUFFER"); - bool multiBuffer = qEnvironmentVariableIsEmpty("QT_EGLFS_IMX6_NO_FB_MULTI_BUFFER"); - if (multiBufferNotEnabledYet && multiBuffer) { - qWarning() << "QEglFSImx6Hooks will set environment variable FB_MULTI_BUFFER=2 to enable double buffering and vsync.\n" - << "If this is not desired, you can override this via: export QT_EGLFS_IMX6_NO_FB_MULTI_BUFFER=1"; - qputenv("FB_MULTI_BUFFER", "2"); - } - - mNativeDisplay = fbGetDisplayByIndex(framebufferIndex()); - fbGetDisplayGeometry(mNativeDisplay, &width, &height); - mScreenSize.setHeight(height); - mScreenSize.setWidth(width); -} - -QSize QEglFSImx6Hooks::screenSize() const -{ - return mScreenSize; -} - -EGLNativeDisplayType QEglFSImx6Hooks::platformDisplay() const -{ - return mNativeDisplay; -} - -EGLNativeWindowType QEglFSImx6Hooks::createNativeWindow(QPlatformWindow *window, const QSize &size, const QSurfaceFormat &format) -{ - Q_UNUSED(window) - Q_UNUSED(format) - - EGLNativeWindowType eglWindow = fbCreateWindow(mNativeDisplay, 0, 0, size.width(), size.height()); - return eglWindow; -} - - -void QEglFSImx6Hooks::destroyNativeWindow(EGLNativeWindowType window) -{ - fbDestroyWindow(window); -} - -QEglFSImx6Hooks eglFSImx6Hooks; -QEglFSHooks *platformHooks = &eglFSImx6Hooks; - -QT_END_NAMESPACE diff --git a/mkspecs/devices/linux-imx6-g++/qmake.conf b/mkspecs/devices/linux-imx6-g++/qmake.conf index 4f464ffa83..1646c5fe77 100644 --- a/mkspecs/devices/linux-imx6-g++/qmake.conf +++ b/mkspecs/devices/linux-imx6-g++/qmake.conf @@ -1,23 +1,9 @@ # # qmake configuration for the Freescale iMX6 boards (single, dual and quad) # -# This mkspec is based and tested on the ltib-source-release 3.0.15 -# Building ltib including glib, gpu-drivers and what ever you want to use (e.g. dbus or fontconfig) -# This mkspec is tested with a framebuffer (eglfs) configuration (not testes with X11) -# A typical configure line looks like: -# /home/tsenyk/qt5/qt5/configure -opensource -confirm-license -make libs -device imx6 \ -# -device-option CROSS_COMPILE=/opt/freescale/usr/local/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/arm-fsl-linux-gnueabi- \ -# -sysroot <path-to-your-ltib-install>/rootfs -no-gcc-sysroot \ -# -prefix /usr/local/Qt-5.0.0/Qt5-imx6-1 -# -# NOTE: currently ltib doesn't produce a proper staging/sysroot-filessystem. -# If gcc's --sysroot is used, the toolchain doesn't find basic binaries (e.g. crt1.o), -# therefore you have to pass -no-gcc-sysroot to configure if you pass -sysroot to configure! include(../common/linux_device_pre.conf) -EGLFS_PLATFORM_HOOKS_SOURCES = $$PWD/qeglfshooks_imx6.cpp - QMAKE_INCDIR += $$[QT_SYSROOT]/usr/include QMAKE_LIBDIR += $$[QT_SYSROOT]/usr/lib @@ -31,6 +17,11 @@ IMX6_CFLAGS = -march=armv7-a -mfpu=neon -DLINUX=1 -DEGL_API_FB=1 QMAKE_CFLAGS += $$IMX6_CFLAGS QMAKE_CXXFLAGS += $$IMX6_CFLAGS +DISTRO_OPTS += hard-float + +# Preferred eglfs backend +EGLFS_DEVICE_INTEGRATION = eglfs_viv + include(../common/linux_arm_device_post.conf) load(qt_config) diff --git a/mkspecs/devices/linux-imx6-g++/qplatformdefs.h b/mkspecs/devices/linux-imx6-g++/qplatformdefs.h index 3e73e78f4b..5ae49b35dd 100644 --- a/mkspecs/devices/linux-imx6-g++/qplatformdefs.h +++ b/mkspecs/devices/linux-imx6-g++/qplatformdefs.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the qmake spec of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ |