diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-26 08:03:54 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-26 08:04:41 +0200 |
| commit | 9b01aae7777c7ccde9eed1a8c55aead1524e00e5 (patch) | |
| tree | c62834ca412f290485dd96d2a7522809b8fce6e1 /qtinfo.py | |
| parent | 2156651b39fbb6717ed936c94dcd28295436e0a4 (diff) | |
| parent | 0b842db3a95a44fbda3379d2093cb52f8ae2a1ff (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Change-Id: Id40dab17b02800199f70072115d7473041f683d8
Diffstat (limited to 'qtinfo.py')
| -rw-r--r-- | qtinfo.py | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -100,7 +100,9 @@ class QtInfo(object): return self.getProperty("QMAKE_MACOSX_DEPLOYMENT_TARGET") def getBuildType(self): - """ Return value is either debug, release, debug_release, or None. """ + """ + Return value is either debug, release, debug_release, or None. + """ return self.getProperty("BUILD_TYPE") def getSrcDir(self): @@ -168,8 +170,8 @@ class QtInfo(object): return None def _getOtherProperties(self): - # Get the src property separately, because it is not returned by qmake unless explicitly - # specified. + # Get the src property separately, because it is not returned by + # qmake unless explicitly specified. key = 'QT_INSTALL_PREFIX/src' result = self._getQMakeOutput(['-query', key]) self._query_dict[key] = result @@ -182,7 +184,8 @@ class QtInfo(object): if key in self._mkspecs_dict: self._query_dict[key] = self._mkspecs_dict[key] - # Figure out how Qt was built: debug mode, release mode, or both. + # Figure out how Qt was built: + # debug mode, release mode, or both. build_type = self._parseQtBuildType() if build_type: self._query_dict['BUILD_TYPE'] = build_type @@ -207,8 +210,8 @@ class QtInfo(object): value = found.group(2).strip() self._mkspecs_dict[key] = value - # We need to clean up after qmake, which always creates a .qmake.stash file after a -E - # invocation. + # We need to clean up after qmake, which always creates a + # .qmake.stash file after a -E invocation. qmake_stash_file = os.path.join(os.getcwd(), ".qmake.stash") if os.path.exists(qmake_stash_file): os.remove(qmake_stash_file) |