diff options
Diffstat (limited to 'tools/scripts/version_resolver.py')
| -rw-r--r-- | tools/scripts/version_resolver.py | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index 2430555d9..419fb72d1 100644 --- a/tools/scripts/version_resolver.py +++ b/tools/scripts/version_resolver.py @@ -2,8 +2,8 @@ ############################################################################# # -# Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -# Contact: http://www.qt-project.org/legal +# Copyright (C) 2015 The Qt Company Ltd. +# Contact: http://www.qt.io/licensing/ # # This file is part of the QtWebEngine module of the Qt Toolkit. # @@ -12,27 +12,27 @@ # Licensees holding valid commercial Qt licenses may use this file in # accordance with the commercial license agreement provided with the # Software or, alternatively, in accordance with the terms contained in -# a written agreement between you and Digia. For licensing terms and -# conditions see http://qt.digia.com/licensing. For further information -# use the contact form at http://qt.digia.com/contact-us. +# a written agreement between you and The Qt Company. For licensing terms +# and conditions see http://www.qt.io/terms-conditions. For further +# information use the contact form at http://www.qt.io/contact-us. # # GNU Lesser General Public License Usage # Alternatively, this file may be used under the terms of the GNU Lesser # General Public License version 2.1 as published by the Free Software # Foundation and appearing in the file LICENSE.LGPL included in the -# packaging of this file. Please review the following information to +# packaging of this file. Please review the following information to # ensure the GNU Lesser General Public License version 2.1 requirements # will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. # -# In addition, as a special exception, Digia gives you certain additional -# rights. These rights are described in the Digia Qt LGPL Exception +# As a special exception, The Qt Company gives you certain additional +# rights. These rights are described in The Qt Company LGPL Exception # version 1.1, included in the file LGPL_EXCEPTION.txt in this package. # # GNU General Public License Usage # Alternatively, this file may be used under the terms of the GNU # General Public License version 3.0 as published by the Free Software # Foundation and appearing in the file LICENSE.GPL included in the -# packaging of this file. Please review the following information to +# packaging of this file. Please review the following information to # ensure the GNU General Public License version 3.0 requirements will be # met: http://www.gnu.org/copyleft/gpl.html. # @@ -51,8 +51,9 @@ import json import urllib2 import git_submodule as GitSubmodule -chromium_version = '37.0.2062.103' -chromium_branch = '2062' +chromium_version = '40.0.2214.115' +chromium_branch = '2214' +ninja_version = 'v1.5.3' json_url = 'http://omahaproxy.appspot.com/all.json' @@ -73,6 +74,9 @@ sys.path.append(os.path.join(qtwebengine_root, 'tools', 'scripts')) def currentVersion(): return chromium_version +def currentNinjaVersion(): + return ninja_version + def readReleaseChannels(): response = urllib2.urlopen(json_url) raw_json = response.read().strip() |