[gentoo-commits] gentoo-x86 commit in dev-qt/qthelp/files: qthelp-4.8.6-fix-compat.patch

[gentoo-commits] gentoo-x86 commit in dev-qt/qthelp/files: qthelp-4.8.6-fix-compat.patch

[Justin Lecher (jlec)]

jlec        15/01/25 18:20:27

  Added:                qthelp-4.8.6-fix-compat.patch
  Log:
  dev-qt/qthelp: Install compat headers
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

Revision  Changes    Path
1.1                  dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch?rev=1.1&content-type=text/plain

Index: qthelp-4.8.6-fix-compat.patch
===================================================================
 tools/assistant/compat/compat.pro  | 5 +++++
 tools/assistant/compat/lib/lib.pro | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/assistant/compat/compat.pro b/tools/assistant/compat/compat.pro
index 171106a..51b8d5b 100755
--- a/tools/assistant/compat/compat.pro
+++ b/tools/assistant/compat/compat.pro
@@ -14,6 +14,8 @@ QT += xml network
 
 PROJECTNAME = Assistant
 
+DESTDIR = ../../../bin
+
 FORMS += helpdialog.ui \
         mainwindow.ui \
         tabbedbrowser.ui \
@@ -59,6 +61,9 @@ mac {
     TARGET = Assistant_adp
 }
 
+target.path=$$[QT_INSTALL_BINS]
+INSTALLS += target
+
 TRANSLATIONS = translations/assistant_adp_de.ts \
     translations/assistant_adp_ja.ts \
     translations/assistant_adp_pl.ts \
diff --git a/tools/assistant/compat/lib/lib.pro b/tools/assistant/compat/lib/lib.pro
index e50d470..8973d43 100755
--- a/tools/assistant/compat/lib/lib.pro
+++ b/tools/assistant/compat/lib/lib.pro
@@ -31,7 +31,7 @@ contains(CONFIG, static) {
 
 #load up the headers info
 CONFIG += qt_install_headers
-HEADERS_PRI = $$QT_BUILD_TREE/include/QtAssistant/headers.pri
+HEADERS_PRI = $$QT_SOURCE_TREE/include/QtAssistant/headers.pri
 include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI)
 
 #mac frameworks