diff options
| -rw-r--r-- | cmake/QtBuild.cmake | 3 | ||||
| -rw-r--r-- | src/gui/CMakeLists.txt | 13 |
2 files changed, 3 insertions, 13 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 6d6c6b9588..98c9c334cf 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -1118,6 +1118,9 @@ function(add_qt_module target) set_property(TARGET "${target}" APPEND PROPERTY PUBLIC_HEADER "${module_headers_public}") set_property(TARGET "${target}" APPEND PROPERTY PUBLIC_HEADER "${module_include_dir}/${module}Depends") set_property(TARGET "${target}" APPEND PROPERTY PRIVATE_HEADER "${module_headers_private}") + if(module_headers_qpa) + qt_install(FILES ${module_headers_qpa} DESTINATION ${INSTALL_INCLUDEDIR}/${module}/${PROJECT_VERSION}/${module}/qpa) + endif() endif() # Plugin types associated to a module diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 635af4faf4..a6a10faf12 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -688,19 +688,6 @@ extend_target(Gui CONDITION WASM platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h ) -# special case begin -# qpa headers are expected to be located right next to QtGui's private -# headers. So a private QtGui header is #include <private/qfoo_p.h> and -# a qpa header is #include <qpa/qplatformfoo.h>, both of them implying -# linkage against Qt::GuiPrivate. -qt_read_headers_pri("Gui" "module_headers") - -# No need to copy these in a non-prefix build, syncqt.pl takes care of generating the files -# in the build dir. -qt_install(FILES ${module_headers_qpa} - DESTINATION ${INSTALL_INCLUDEDIR}/QtGui/${PROJECT_VERSION}/QtGui/qpa) -# special case end - qt_create_tracepoints(Gui qtgui.tracepoints) add_qt_docs( doc/qtgui.qdocconf |