diff options
| author | Iikka Eklund <iikka.eklund@theqtcompany.com> | 2016-01-20 14:18:22 +0200 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@theqtcompany.com> | 2016-01-20 14:18:30 +0200 |
| commit | 2af57eb8c8351e09f3224128b3593aa160c6c424 (patch) | |
| tree | 410ee4a7da7485937f21fd2d11e0cb12cdfb61f8 /tests/test-framework/vmware/result.py | |
| parent | 8bf239c376285f9f5254d78ad263d46ceb944a33 (diff) | |
| parent | 0a54640535049bf5124a7b4414bb75a8b2075087 (diff) | |
Merge remote-tracking branch 'origin/2.0'
Conflicts:
installerfw.pri
src/libs/kdtools/kdgenericfactory.cpp
src/libs/kdtools/kdgenericfactory.h
src/libs/kdtools/kdupdaterapplication.cpp
src/libs/kdtools/kdupdaterapplication.h
src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp
src/libs/kdtools/kdupdaterupdatesourcesinfo.h
sync.profile
Change-Id: Ifdc8b065f89b7e241bd3788ed79768e21888161f
Diffstat (limited to 'tests/test-framework/vmware/result.py')
| -rw-r--r-- | tests/test-framework/vmware/result.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/test-framework/vmware/result.py b/tests/test-framework/vmware/result.py index b8e2decb1..62b519184 100644 --- a/tests/test-framework/vmware/result.py +++ b/tests/test-framework/vmware/result.py @@ -2,18 +2,18 @@ #!/usr/bin/env python ############################################################################# ## -## Copyright (C) 2015 The Qt Company Ltd. +## Copyright (C) 2016 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the Qt Installer Framework. ## -## $QT_BEGIN_LICENSE:LGPL$ +## $QT_BEGIN_LICENSE:LGPL21$ ## Commercial License Usage ## 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 The Qt Company. For licensing terms -## and conditions see http://qt.io/terms-conditions. For further +## 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 @@ -29,7 +29,6 @@ ## rights. These rights are described in The Qt Company LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## -## ## $QT_END_LICENSE$ ## ############################################################################# |