Opened 10 years ago
Closed 10 years ago
Last modified 10 years ago
#12065 closed Patch - Feature (fixed)
Qt5 feature patch to resolve X11/Xlib.h Bool define issue
Reported by: | Owned by: | Stuart Auchterlonie | |
---|---|---|---|
Priority: | minor | Milestone: | 0.28 |
Component: | MythTV - Video Library | Version: | Master Head |
Severity: | medium | Keywords: | Qt5 |
Cc: | Ticket locked: | no |
Description
Qt5 has been released, and some distros are starting to provide it as an alternative to Qt4, although I would not expect Qt5 to be the default for quite some time. Regardless, one of the changes in Qt5 (5.2) is that in qjsonvalue.h there is an enum which includes a line of the form ".. Bool = 0x1 ..". Unfortunately, the X11/Xlib.h has a "#define Bool int" line, which results in the qjsonvalue enum looking like ".. int = 0x1 ..", which generates badness when Xlib.h is included before the appropriate Qt include (mythimage.h includes QImageReader.h which eventually includes qjsonobject.h and qjsonvalue.h). This patch rearranges the includes in the impacted MythTV source files to bypass the issue and allows compilation to proceed.
Github ref: https://github.com/garybuhrmaster/mythtv/commit/01d52e44ec41fb71bde841d2fbbbe248fe648272 Github git-am ref: https://github.com/garybuhrmaster/mythtv/commit/01d52e44ec41fb71bde841d2fbbbe248fe648272.patch
In be37aef1306a94995ed0c9fd9ac70a6117dc81f9/mythtv: