diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-20 10:13:22 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-20 09:10:57 +0000 |
| commit | aeaef4d6f316870313ed8fa88e25d3f035c337e0 (patch) | |
| tree | 16bd99e3a69bb83e844a96666d6ddfbedf643a95 /src/gui | |
| parent | 264d3bc9ba886b3e71dc3bad98a382c0b090c2ce (diff) | |
Fix QPA headers for QtPrintSupport
Remove the special case in QtGui and instead handle this in a generic
way so that QtPrintSupport is covered, too. For now we do this in the
same function where we run the regular target install() commands. It
doesn't quite fit into per-target PUBLIC_HEADER or PRIVATE_HEADER
properties as the qpa headers sit _next_ to public and private in a
separate qpa sub-directory.
Change-Id: I30aadaf9496cf0236f39a7c36a5163e4270edecc
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/CMakeLists.txt | 13 |
1 files changed, 0 insertions, 13 deletions
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 |