Bug 225100 - qt5-core: qconfig.h missing include headerQtCore/modules/qconfig-multimedia.h
Summary: qt5-core: qconfig.h missing include headerQtCore/modules/qconfig-multimedia.h
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: kde
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-01-12 09:02 UTC by Roger Leigh
Modified: 2018-01-13 09:50 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Roger Leigh 2018-01-12 09:02:58 UTC
QtCore/modules/qconfig-multimedia.h is missing after updating the qt5 ports to 5.9.3.  This is included from QtCore/qconfig.h.

03:33:42 In file included from /usr/local/opt/hudson/workspace/OME-FILES-CPP-DEV-merge/BUILD_TYPE/Debug/node/perch/ome-qtwidgets/lib/ome/qtwidgets/GLContainer.cpp:39:
03:33:42 In file included from /usr/local/opt/hudson/workspace/OME-FILES-CPP-DEV-merge/BUILD_TYPE/Debug/node/perch/ome-qtwidgets/lib/ome/qtwidgets/GLContainer.h:42:
03:33:42 In file included from /usr/local/include/qt5/QtGui/QWindow:1:
03:33:42 In file included from /usr/local/include/qt5/QtGui/qwindow.h:43:
03:33:42 In file included from /usr/local/include/qt5/QtGui/qtguiglobal.h:43:
03:33:42 In file included from /usr/local/include/qt5/QtCore/qglobal.h:64:
03:33:42 In file included from /usr/local/include/qt5/QtCore/qconfig.h:1:
03:33:42 /usr/local/include/qt5/QtCore/qconfig-modules.h:9:10: fatal error: 'QtCore/modules/qconfig-multimedia.h' file not found
03:33:42 #include <QtCore/modules/qconfig-multimedia.h>
03:33:42          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
03:33:47 1 error generated.

Looking at /usr/local/include/qt5/QtCore/qconfig-modules.h it looks like most of its includes are missing entirely!$ ls -1 /usr/local/include/qt5/QtCore/modules
qconfig-concurrent.h
qconfig-core.h
qconfig-dbus.h
qconfig-gui.h
qconfig-network.h
qconfig-opengl.h
qconfig-printsupport.h
qconfig-quick.h
qconfig-widgets.h

$ grep -c include /usr/local/include/qt5/QtCore/qconfig-modules.h
130

121 headers are missing.
Comment 1 Roger Leigh 2018-01-12 09:09:37 UTC
Looking in more detail at qconfig-modules, the contents looks very wrong. Note the repetition of all the includes several times.  They are all present except for qtconfig-multimedia.h.

$ grep  include /usr/local/include/qt5/QtCore/qconfig-modules.h                                                                                                                                                                         #include <QtCore/modules/qconfig-core.h>
#include <QtCore/modules/qconfig-dbus.h>
#include <QtCore/modules/qconfig-gui.h>
#include <QtCore/modules/qconfig-network.h>
#include <QtCore/modules/qconfig-widgets.h>
#include <QtCore/modules/qconfig-quick.h>
#include <QtCore/modules/qconfig-printsupport.h>
#include <QtCore/modules/qconfig-opengl.h>
#include <QtCore/modules/qconfig-multimedia.h>
#include <QtCore/modules/qconfig-concurrent.h>
#include <QtCore/modules/qconfig-gui.h>
#include <QtCore/modules/qconfig-core.h>
#include <QtCore/modules/qconfig-dbus.h>
#include <QtCore/modules/qconfig-network.h>
#include <QtCore/modules/qconfig-gui.h>
#include <QtCore/modules/qconfig-widgets.h>
#include <QtCore/modules/qconfig-quick.h>
#include <QtCore/modules/qconfig-printsupport.h>
#include <QtCore/modules/qconfig-opengl.h>
#include <QtCore/modules/qconfig-multimedia.h>
#include <QtCore/modules/qconfig-concurrent.h>
#include <QtCore/modules/qconfig-gui.h>
#include <QtCore/modules/qconfig-core.h>
#include <QtCore/modules/qconfig-network.h>
#include <QtCore/modules/qconfig-gui.h>
#include <QtCore/modules/qconfig-quick.h>
#include <QtCore/modules/qconfig-printsupport.h>
#include <QtCore/modules/qconfig-multimedia.h>
#include <QtCore/modules/qconfig-gui.h>
#include <QtCore/modules/qconfig-gui.h>
#include <QtCore/modules/qconfig-gui.h>
#include <QtCore/modules/qconfig-widgets.h>
#include <QtCore/modules/qconfig-opengl.h>
#include <QtCore/modules/qconfig-multimedia.h>
#include <QtCore/modules/qconfig-core.h>
#include <QtCore/modules/qconfig-dbus.h>
#include <QtCore/modules/qconfig-gui.h>
#include <QtCore/modules/qconfig-printsupport.h>
#include <QtCore/modules/qconfig-core.h>
#include <QtCore/modules/qconfig-dbus.h>
#include <QtCore/modules/qconfig-network.h>
#include <QtCore/modules/qconfig-gui.h>
#include <QtCore/modules/qconfig-widgets.h>
#include <QtCore/modules/qconfig-quick.h>
#include <QtCore/modules/qconfig-printsupport.h>
#include <QtCore/modules/qconfig-opengl.h>
#include <QtCore/modules/qconfig-concurrent.h>
#include <QtCore/modules/qconfig-multimedia.h>
#include <QtCore/modules/qconfig-printsupport.h>
#include <QtCore/modules/qconfig-multimedia.h>
#include <QtCore/modules/qconfig-core.h>
#include <QtCore/modules/qconfig-gui.h>
#include <QtCore/modules/qconfig-widgets.h>
#include <QtCore/modules/qconfig-core.h>
#include <QtCore/modules/qconfig-network.h>
#include <QtCore/modules/qconfig-dbus.h>
#include <QtCore/modules/qconfig-gui.h>
#include <QtCore/modules/qconfig-widgets.h>
#include <QtCore/modules/qconfig-quick.h>
#include <QtCore/modules/qconfig-printsupport.h>
#include <QtCore/modules/qconfig-opengl.h>
#include <QtCore/modules/qconfig-concurrent.h>
#include <QtCore/modules/qconfig-multimedia.h>
#include <QtCore/modules/qconfig-core.h>
#include <QtCore/modules/qconfig-network.h>
#include <QtCore/modules/qconfig-dbus.h>
#include <QtCore/modules/qconfig-gui.h>
#include <QtCore/modules/qconfig-widgets.h>
#include <QtCore/modules/qconfig-quick.h>
#include <QtCore/modules/qconfig-printsupport.h>
#include <QtCore/modules/qconfig-opengl.h>
#include <QtCore/modules/qconfig-concurrent.h>
#include <QtCore/modules/qconfig-multimedia.h>
#include <QtCore/modules/qconfig-core.h>
#include <QtCore/modules/qconfig-network.h>
#include <QtCore/modules/qconfig-dbus.h>
#include <QtCore/modules/qconfig-gui.h>
#include <QtCore/modules/qconfig-widgets.h>
#include <QtCore/modules/qconfig-quick.h>
#include <QtCore/modules/qconfig-printsupport.h>
#include <QtCore/modules/qconfig-opengl.h>
#include <QtCore/modules/qconfig-concurrent.h>
#include <QtCore/modules/qconfig-multimedia.h>
#include <QtCore/modules/qconfig-core.h>
#include <QtCore/modules/qconfig-gui.h>
#include <QtCore/modules/qconfig-core.h>
#include <QtCore/modules/qconfig-network.h>
#include <QtCore/modules/qconfig-dbus.h>
#include <QtCore/modules/qconfig-gui.h>
#include <QtCore/modules/qconfig-widgets.h>
#include <QtCore/modules/qconfig-quick.h>
#include <QtCore/modules/qconfig-printsupport.h>
#include <QtCore/modules/qconfig-opengl.h>
#include <QtCore/modules/qconfig-concurrent.h>
#include <QtCore/modules/qconfig-multimedia.h>
#include <QtCore/modules/qconfig-core.h>
#include <QtCore/modules/qconfig-network.h>
#include <QtCore/modules/qconfig-dbus.h>
#include <QtCore/modules/qconfig-gui.h>
#include <QtCore/modules/qconfig-widgets.h>
#include <QtCore/modules/qconfig-quick.h>
#include <QtCore/modules/qconfig-printsupport.h>
#include <QtCore/modules/qconfig-opengl.h>
#include <QtCore/modules/qconfig-concurrent.h>
#include <QtCore/modules/qconfig-multimedia.h>
#include <QtCore/modules/qconfig-core.h>
#include <QtCore/modules/qconfig-network.h>
#include <QtCore/modules/qconfig-core.h>
#include <QtCore/modules/qconfig-dbus.h>
#include <QtCore/modules/qconfig-gui.h>
#include <QtCore/modules/qconfig-widgets.h>
#include <QtCore/modules/qconfig-quick.h>
#include <QtCore/modules/qconfig-printsupport.h>
#include <QtCore/modules/qconfig-opengl.h>
#include <QtCore/modules/qconfig-multimedia.h>
#include <QtCore/modules/qconfig-core.h>
#include <QtCore/modules/qconfig-concurrent.h>
#include <QtCore/modules/qconfig-multimedia.h>
#include <QtCore/modules/qconfig-core.h>
#include <QtCore/modules/qconfig-core.h>
#include <QtCore/modules/qconfig-multimedia.h>
#include <QtCore/modules/qconfig-core.h>
#include <QtCore/modules/qconfig-network.h>
#include <QtCore/modules/qconfig-dbus.h>
#include <QtCore/modules/qconfig-gui.h>
#include <QtCore/modules/qconfig-widgets.h>
#include <QtCore/modules/qconfig-quick.h>
#include <QtCore/modules/qconfig-concurrent.h>
#include <QtCore/modules/qconfig-printsupport.h>
#include <QtCore/modules/qconfig-opengl.h>
Comment 2 Roger Leigh 2018-01-12 09:11:40 UTC
$ sort /usr/local/include/qt5/QtCore/qconfig-modules.h | uniq -c
  10 #include <QtCore/modules/qconfig-concurrent.h>
  18 #include <QtCore/modules/qconfig-core.h>
  11 #include <QtCore/modules/qconfig-dbus.h>
  19 #include <QtCore/modules/qconfig-gui.h>
  14 #include <QtCore/modules/qconfig-multimedia.h>
  11 #include <QtCore/modules/qconfig-network.h>
  11 #include <QtCore/modules/qconfig-opengl.h>
  13 #include <QtCore/modules/qconfig-printsupport.h>
  11 #include <QtCore/modules/qconfig-quick.h>
  12 #include <QtCore/modules/qconfig-widgets.h>
Comment 3 commit-hook freebsd_committer 2018-01-12 22:54:05 UTC
A commit references this bug:

Author: rakuco
Date: Fri Jan 12 22:53:03 UTC 2018
New revision: 458882
URL: https://svnweb.freebsd.org/changeset/ports/458882

Log:
  Start setting QT_DEFINES again.

  The machinery in bsd.qt.mk's qt-post-install target does not seem to account
  for the case of a module no longer defining QT_DEFINES: the lines in
  qconfig-modules.h including said module's qconfig-<module>.h will remain.

  We did that to qt5-multimedia in r458338, and it results in build errors if
  qt5-multimedia had been previously installed. Set QT_DEFINES again to a dummy
  value until we figure out a proper solution.

  PR:		225100

Changes:
  head/multimedia/qt5-multimedia/Makefile