aboutsummaryrefslogtreecommitdiffstats
path: root/qtinfo.py
diff options
context:
space:
mode:
Diffstat (limited to 'qtinfo.py')
-rw-r--r--qtinfo.py14
1 files changed, 6 insertions, 8 deletions
diff --git a/qtinfo.py b/qtinfo.py
index 68b7ab491..6f81cca7a 100644
--- a/qtinfo.py
+++ b/qtinfo.py
@@ -9,13 +9,11 @@ class QtInfo(object):
else:
self._qmake_command = [find_executable("qmake"),]
- def getQMakePath(self):
- qmake_path = self._qmake_command[0] # Guessing the first of the commands is qmake
- if not os.path.exists(qmake_path): # Making it here a bit more failsave.
- qmake_path = find_executable(qmake_path) # In case someone just passed the name of the executable I'll search for it now.
- if qmake_path == None: # If we couldn't resolv the location of the executable
- raise ValueError("Could not find the location of %s. Please pass the absolute path to qmake or please pass the correct name of the executable." %(qmake_path))
- return qmake_path
+ def getQMakeCommand(self):
+ qmake_command_string = self._qmake_command[0]
+ for entry in self._qmake_command[1:]:
+ qmake_command_string += " %s" %(entry)
+ return qmake_command_string
def getVersion(self):
return self.getProperty("QT_VERSION")
@@ -56,7 +54,7 @@ class QtInfo(object):
bins_dir = property(getBinsPath)
libs_dir = property(getLibsPath)
plugins_dir = property(getPluginsPath)
- qmake_command = property(getQMakePath)
+ qmake_command = property(getQMakeCommand)
imports_dir = property(getImportsPath)
translations_dir = property(getTranslationsPath)
headers_dir = property(getHeadersPath)