aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Tismer <tismer@stackless.com>2015-07-16 16:40:26 +0200
committerChristian Tismer <tismer@stackless.com>2015-07-16 16:40:26 +0200
commit5acd8ae260af22950024dd40f2e65da253cb6e26 (patch)
tree9ba33ea218554a792b04ca98b35f188fc3a88147
parent82d638b30b4bdee87faf5324108c9d0da6acc761 (diff)
support the location of the installed Qt5 docs.
This configuration needs to be set by setup.py and is then known in the make files.
-rw-r--r--qtinfo.py4
-rw-r--r--setup.py3
2 files changed, 7 insertions, 0 deletions
diff --git a/qtinfo.py b/qtinfo.py
index 631adb667..7c4cde76b 100644
--- a/qtinfo.py
+++ b/qtinfo.py
@@ -33,6 +33,9 @@ class QtInfo(object):
def getHeadersPath(self):
return self.getProperty("QT_INSTALL_HEADERS")
+ def getDocsPath(self):
+ return self.getProperty("QT_INSTALL_DOCS")
+
def getProperty(self, prop_name):
cmd = [self._qmake_path, "-query", prop_name]
proc = subprocess.Popen(cmd, stdout = subprocess.PIPE, shell=False)
@@ -52,3 +55,4 @@ class QtInfo(object):
imports_dir = property(getImportsPath)
translations_dir = property(getTranslationsPath)
headers_dir = property(getHeadersPath)
+ docs_dir = property(getDocsPath)
diff --git a/setup.py b/setup.py
index 020a53f0d..f9451d840 100644
--- a/setup.py
+++ b/setup.py
@@ -496,6 +496,7 @@ class pyside_build(_build):
log.info("Qt qmake: %s" % self.qmake_path)
log.info("Qt version: %s" % qtinfo.version)
log.info("Qt bins: %s" % qtinfo.bins_dir)
+ log.info("Qt docs: %s" % qtinfo.docs_dir)
log.info("Qt plugins: %s" % qtinfo.plugins_dir)
log.info("-" * 3)
log.info("OpenSSL libs: %s" % OPTION_OPENSSL)
@@ -569,6 +570,7 @@ class pyside_build(_build):
"-DQT_QMAKE_EXECUTABLE=%s" % self.qmake_path,
"-DBUILD_TESTS=%s" % self.build_tests,
"-DDISABLE_DOCSTRINGS=True",
+ "-DQt5Help_DIR=%s" % self.qtinfo.docs_dir,
"-DCMAKE_BUILD_TYPE=%s" % self.build_type,
"-DCMAKE_INSTALL_PREFIX=%s" % self.install_dir,
module_src_dir
@@ -639,6 +641,7 @@ class pyside_build(_build):
"py_version": self.py_version,
"qt_version": self.qtinfo.version,
"qt_bin_dir": self.qtinfo.bins_dir,
+ "qt_doc_dir": self.qtinfo.docs_dir,
"qt_lib_dir": self.qtinfo.libs_dir,
"qt_plugins_dir": self.qtinfo.plugins_dir,
"qt_imports_dir": self.qtinfo.imports_dir,