diff options
| author | Andrew Knight <andrew.knight@intopalo.com> | 2015-03-12 14:30:37 +0200 |
|---|---|---|
| committer | Andrew Knight <qt@panimo.net> | 2015-03-12 14:47:48 +0000 |
| commit | af90eec11c01043c23726b6af623d74a1ee0666c (patch) | |
| tree | e29d47b7d625f3e2e924da20062990c2f8ebcc30 /src/plugins | |
| parent | 37f326297d45564298a2c8cb1958a81b858de57c (diff) | |
eglfs: don't build the cursor atlas when QT_NO_CURSOR is defined
Change-Id: I675bc127296c016a40ec2edfdb6602908fec4c2f
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/eglfs/eglfs_device_lib.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/eglfs/qeglfsintegration.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
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 |