diff options
authorThiago Macieira <>2013-07-01 07:57:04 -0700
committerThe Qt Project <>2013-07-01 17:13:17 +0200
commit215f137e29ad9176fa1a5d4c446115379f5dbc0d (patch)
parentcb79be2076e3ba02b603f4ab65ca12cd99fa2eba (diff)
Restore header installation on Mac to always install to $includedirv5.1.0
We haven't fully agreed on whether headers should be in $includedir or not for builds with frameworks, since frameworks carry their headers inside. However, this change came too late for Qt 5.1 for us to assess the potential impacts -- it's known to break at least the cmake files we ship. So restore the build to the way it was. This is a partial revert of 6d61dfdbb74a2055438b999c6962f89cc3388eea. Partial because the old behavior was partially broken: it did not install headers for release builds. Now we always install (and in debug-and-release mode, we might do it twice). Task-number: QTBUG-32134 Change-Id: Ib84879c5a148d3717d16a7a90b2f5735fb5d80be Reviewed-by: Sean Harmer <> Reviewed-by: Oswald Buddenhagen <> Reviewed-by: Lars Knoll <>
1 files changed, 0 insertions, 1 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index da4de5fa1e..53a5499545 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -91,7 +91,6 @@ else: \
mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) {
CONFIG += lib_bundle qt_framework
- CONFIG -= qt_install_headers #no need to install these as well
!debug_and_release|if(build_all:CONFIG(release, debug|release)) {
FRAMEWORK_HEADERS.version = Versions