From 55f2a05a205adad12cf17f2dbfa37b434a303c23 Mon Sep 17 00:00:00 2001 From: axis Date: Wed, 18 May 2011 15:28:25 +0200 Subject: Install some headers that were previously missing from install. Change-Id: I58a5f58e6e03e3e266de23beee47de0c823f3240 Task: QTBUG-19585 Reviewed-on: http://codereview.qt.nokia.com/233 Reviewed-by: Qt Sanity Bot Reviewed-by: Marius Storm-Olsen --- src/corelib/tools/tools.pri | 4 ++++ src/uitools/uitools.pro | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index 0c2cf1619e..42cab84cc0 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -116,6 +116,10 @@ SOURCES += ../3rdparty/harfbuzz/src/harfbuzz-buffer.c \ tools/qharfbuzz.cpp HEADERS += tools/qharfbuzz_p.h +corelib_tools_private_headers.files = ../3rdparty/harfbuzz/src/*.h +corelib_tools_private_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET/$$eval(QT.$${MODULE}.VERSION)/$$TARGET +INSTALLS += corelib_tools_private_headers + INCLUDEPATH += ../3rdparty/md5 \ ../3rdparty/md4 diff --git a/src/uitools/uitools.pro b/src/uitools/uitools.pro index 0af26d9375..977fe50c09 100644 --- a/src/uitools/uitools.pro +++ b/src/uitools/uitools.pro @@ -34,7 +34,17 @@ SOURCES += quiloader.cpp include($$QT_BUILD_TREE/include/QtUiTools/headers.pri, "", true) quitools_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES quitools_headers.path = $$[QT_INSTALL_HEADERS]/QtUiTools -INSTALLS += quitools_headers +quitools_private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES +quitools_private_headers.path = $$[QT_INSTALL_HEADERS]/QtUiTools/$$QT.uitools.VERSION/QtUiTools/private +INSTALLS += quitools_headers quitools_private_headers + +# Uilib is from designer. +include($$QT_BUILD_TREE/include/QtDesigner/headers.pri, "", true) +quilib_headers.files = $$replace($$list($$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES), ^, ../../tools/uilib/) +quilib_headers.path = $$[QT_INSTALL_HEADERS]/QtDesigner +quilib_private_headers.files = $$replace($$list($$SYNCQT.PRIVATE_HEADER_FILES), ^, ../../tools/uilib/) +quilib_private_headers.path = $$[QT_INSTALL_HEADERS]/QtDesigner/$$QT.uilib.VERSION/QtDesigner/private +INSTALLS += quilib_headers quilib_private_headers target.path=$$[QT_INSTALL_LIBS] INSTALLS += target -- cgit v1.2.3