diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2014-11-22 16:49:11 -0800 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-11-23 22:14:40 +0100 |
commit | 13b939c7f41bceb2061e549923eab242326e9bb5 (patch) | |
tree | 684e31bb187c012e1fc89aad3b5f862a36801ee0 /src/plugins/platforms/directfb | |
parent | 4fec31dcc003ccd107b447b2ee86dab1eedae642 (diff) | |
download | qtbase-13b939c7f41bceb2061e549923eab242326e9bb5.tar.gz |
Fix warning about QDeviceDiscovery violating ODR rule
When compiling with GCC 4.9's LTO, the compiler realizes that the class
looks different in two different compilation units and prints a warning.
Adding the necessary #define will make sure that the warning isn't
printed.
It's possible the warning indicates a real problem, if the class
actually got used in those two plugins. I wouldn't know.
QtPlatformSupport/private/.../qdevicediscovery_p.h:66:7: warning: type ‘struct QDeviceDiscovery’ violates one definition rule
.moc/.../qdevicediscovery_p.h:66:7: note: a type with the same name but different layout is defined in another translation unit
Change-Id: I73ca8e553e392b8d368f0deaa318d3e6635d73e1
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'src/plugins/platforms/directfb')
-rw-r--r-- | src/plugins/platforms/directfb/directfb.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro index 89d8d42cea..13481f6198 100644 --- a/src/plugins/platforms/directfb/directfb.pro +++ b/src/plugins/platforms/directfb/directfb.pro @@ -29,6 +29,8 @@ HEADERS = qdirectfbintegration.h \ qdirectfbscreen.h \ qdirectfbeglhooks.h +contains(QT_CONFIG, libudev): DEFINES += QDEVICEDISCOVERY_UDEV + # ### port the GL context contains(QT_CONFIG, directfb_egl) { HEADERS += qdirectfb_egl.h |