2 files changed, 7 insertions, 7 deletions
diff --git a/qtinfo.py b/qtinfo.py
index 7c4cde76b..ebf781128 100644
--- a/qtinfo.py
+++ b/qtinfo.py
@@ -3,11 +3,11 @@ import subprocess
 from distutils.spawn import find_executable
 
 class QtInfo(object):
-    def __init__(self, qmake_path=None):
-        if qmake_path:
-            self._qmake_path = qmake_path
+    def __init__(self, qmake_command=None):
+        if qmake_command:
+            self._qmake_command = qmake_command
         else:
-            self._qmake_path = find_executable("qmake")
+            self._qmake_command = [find_executable("qmake"),]
 
     def getQMakePath(self):
         return self._qmake_path
@@ -37,7 +37,7 @@ class QtInfo(object):
         return self.getProperty("QT_INSTALL_DOCS")
 
     def getProperty(self, prop_name):
-        cmd = [self._qmake_path, "-query", prop_name]
+        cmd = self._qmake_command + ["-query", prop_name]
         proc = subprocess.Popen(cmd, stdout = subprocess.PIPE, shell=False)
         prop = proc.communicate()[0]
         proc.wait()
@@ -51,7 +51,7 @@ class QtInfo(object):
     bins_dir = property(getBinsPath)
     libs_dir = property(getLibsPath)
     plugins_dir = property(getPluginsPath)
-    qmake_path = property(getQMakePath)
+    qmake_command = property(getQMakePath)
     imports_dir = property(getImportsPath)
     translations_dir = property(getTranslationsPath)
     headers_dir = property(getHeadersPath)
diff --git a/setup.py b/setup.py
index 5a847527a..9f03120da 100644
--- a/setup.py
+++ b/setup.py
@@ -460,7 +460,7 @@ class pyside_build(_build):
                 log.error("Failed to locate a dynamic Python library, using %s"
                           % py_library)
 
-        qtinfo = QtInfo(OPTION_QMAKE)
+        qtinfo = QtInfo([OPTION_QMAKE,])
         qt_dir = os.path.dirname(OPTION_QMAKE)
         qt_version = qtinfo.version
         if not qt_version: