From af90eec11c01043c23726b6af623d74a1ee0666c Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Thu, 12 Mar 2015 14:30:37 +0200 Subject: eglfs: don't build the cursor atlas when QT_NO_CURSOR is defined MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I675bc127296c016a40ec2edfdb6602908fec4c2f Reviewed-by: Jørgen Lind Reviewed-by: Louai Al-Khanji --- src/plugins/platforms/eglfs/eglfs_device_lib.pro | 2 +- src/plugins/platforms/eglfs/qeglfsintegration.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/plugins/platforms/eglfs/eglfs_device_lib.pro b/src/plugins/platforms/eglfs/eglfs_device_lib.pro index d8ce421a69..729290706d 100644 --- a/src/plugins/platforms/eglfs/eglfs_device_lib.pro +++ b/src/plugins/platforms/eglfs/eglfs_device_lib.pro @@ -56,4 +56,4 @@ INCLUDEPATH += $$PWD CONFIG += egl qpa/genericunixfontdatabase -RESOURCES += $$PWD/cursor.qrc +!contains(DEFINES, QT_NO_CURSOR): RESOURCES += $$PWD/cursor.qrc diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/qeglfsintegration.cpp index 2da47db602..d1688df8f5 100644 --- a/src/plugins/platforms/eglfs/qeglfsintegration.cpp +++ b/src/plugins/platforms/eglfs/qeglfsintegration.cpp @@ -56,7 +56,9 @@ static void initResources() { +#ifndef QT_NO_CURSOR Q_INIT_RESOURCE(cursor); +#endif } QT_BEGIN_NAMESPACE -- cgit v1.2.3