rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#5389 Changed expected Qt version in script

This commit is contained in:
Jerry (Xinyu Hou) 2016-06-24 17:40:25 +01:00
parent f7d8ea9686
commit 091b7b98ef
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ext/toolchain/commands1.py
View File

@ -209,7 +209,7 @@ class InternalCommands:
make_cmd = 'make' make_cmd = 'make'
xcodebuild_cmd = 'xcodebuild' xcodebuild_cmd = 'xcodebuild'
w32_make_cmd = 'mingw32-make' w32_make_cmd = 'mingw32-make'
w32_qt_version = '4.6.2' w32_qt_version = '5.6.1'
defaultTarget = 'release' defaultTarget = 'release'
cmake_dir = 'res' cmake_dir = 'res'
@ -607,13 +607,12 @@ class InternalCommands:
print ( print (
'Suggestions:\n' 'Suggestions:\n'
'1. Ensure that qmake.exe exists in your system path.\n' '1. Ensure that qmake.exe exists in your system path.\n'
'2. Try to download Qt (check our dev FAQ for links):\n' '2. Try to download Qt 5.6\n')
' qt-sdk-win-opensource-2010.02.exe')
raise Exception('Cannot continue without qmake.') raise Exception('Cannot continue without qmake.')
stdout, stderr = p.communicate() stdout, stderr = p.communicate()
if p.returncode != 0: if p.returncode != 0:
raise Exception('Could not test for cmake: %s' % stderr) raise Exception('Could not test for qmake: %s' % stderr)
else: else:
m = re.search('.*Using Qt version (\d+\.\d+\.\d+).*', stdout) m = re.search('.*Using Qt version (\d+\.\d+\.\d+).*', stdout)
if m: if m: