Merge remote-tracking branch 'origin/5.6' into 5.9

Change-Id: I79637555fbfbd596dee4313baf80149d03bb5206

1 files changed, 12 insertions, 0 deletions

diff --git a/qtinfo.py b/qtinfo.py
index f262f9b55..0105ba44e 100644
--- a/qtinfo.py
+++ b/qtinfo.py
@@ -67,9 +67,15 @@ class QtInfo(object):
     def getLibsPath(self):
         return self.getProperty("QT_INSTALL_LIBS")
 
+    def getLibsExecsPath(self):
+        return self.getProperty("QT_INSTALL_LIBEXECS")
+
     def getPluginsPath(self):
         return self.getProperty("QT_INSTALL_PLUGINS")
 
+    def getPrefixPath(self):
+        return self.getProperty("QT_INSTALL_PREFIX")
+
     def getImportsPath(self):
         return self.getProperty("QT_INSTALL_IMPORTS")
 
@@ -82,6 +88,9 @@ class QtInfo(object):
     def getDocsPath(self):
         return self.getProperty("QT_INSTALL_DOCS")
 
+    def getQmlPath(self):
+        return self.getProperty("QT_INSTALL_QML")
+
     def _getProperty(self, prop_name):
         cmd = self._qmake_command + ["-query", prop_name]
         proc = subprocess.Popen(cmd, stdout = subprocess.PIPE, shell=False)
@@ -101,9 +110,12 @@ class QtInfo(object):
     version = property(getVersion)
     bins_dir = property(getBinsPath)
     libs_dir = property(getLibsPath)
+    lib_execs_dir = property(getLibsExecsPath)
     plugins_dir = property(getPluginsPath)
+    prefix_dir = property(getPrefixPath)
     qmake_command = property(getQMakeCommand)
     imports_dir = property(getImportsPath)
     translations_dir = property(getTranslationsPath)
     headers_dir = property(getHeadersPath)
     docs_dir = property(getDocsPath)
+    qml_dir = property(getQmlPath)