From 091b7b98ef4c7acff96fcaf9a1d68ccf5169bbe5 Mon Sep 17 00:00:00 2001 From: "Jerry (Xinyu Hou)" Date: Fri, 24 Jun 2016 17:40:25 +0100 Subject: [PATCH] #5389 Changed expected Qt version in script --- ext/toolchain/commands1.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py index 54b2a663..444e5827 100644 --- a/ext/toolchain/commands1.py +++ b/ext/toolchain/commands1.py @@ -209,7 +209,7 @@ class InternalCommands: make_cmd = 'make' xcodebuild_cmd = 'xcodebuild' w32_make_cmd = 'mingw32-make' - w32_qt_version = '4.6.2' + w32_qt_version = '5.6.1' defaultTarget = 'release' cmake_dir = 'res' @@ -607,13 +607,12 @@ class InternalCommands: print ( 'Suggestions:\n' '1. Ensure that qmake.exe exists in your system path.\n' - '2. Try to download Qt (check our dev FAQ for links):\n' - ' qt-sdk-win-opensource-2010.02.exe') + '2. Try to download Qt 5.6\n') raise Exception('Cannot continue without qmake.') stdout, stderr = p.communicate() if p.returncode != 0: - raise Exception('Could not test for cmake: %s' % stderr) + raise Exception('Could not test for qmake: %s' % stderr) else: m = re.search('.*Using Qt version (\d+\.\d+\.\d+).*', stdout) if m: