diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-07-27 17:25:07 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-08-05 11:03:12 +0200 |
| commit | 1a42aa78af040d0fbecc960e4f9dd3f180ccb404 (patch) | |
| tree | 8f824b3548f0af18b91ed4737b72bdf8a2bed7e1 /licenses | |
| parent | 85694b94aa0b1e536eda13e7239720bca114b000 (diff) | |
| download | meta-qt5-1a42aa78af040d0fbecc960e4f9dd3f180ccb404.tar.gz | |
qt5: upgrade to latest revisions in 5.7 branch
* LIC_FILES_CHKSUM were changed because of this small change:
commit 4343c4e731c3268614fc79c9c42b4e5e4d59d7e6
Author: Sze Howe Koh <szehowe.koh@gmail.com>
Date: Tue Jun 14 19:12:35 2016 +0800
Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"
* -no-nis option was removed from qtbase in:
commit 644d0e75240811212ed9fd0c21e3bd05db3ba5db
Author: Ralf Nolden <nolden@kde.org>
Date: Fri May 20 22:03:39 2016 +0200
Cleanup NIS support leftover from Qt 3/4
* allow to disable eglfs independently from gles2, because eglfs-egldevice
may be autodetected when libdrm was built before qtbase since this
upstream commit:
commit 5c6d27b8dfa695ab04766a1711b00421dba9c7d0
Author: Ralf Nolden <nolden@kde.org>
Date: Tue May 17 12:38:44 2016 +0200
Make eglfs-egldevice check work with pkgconfig as well
and then it fails to build, because libdrm could be removed from sysroot
and drm.h is missing.
* recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch
was resolved in upstream commit:
commit 26229cfa0b729313893af5674d604e8692dbb946
Author: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
Date: Tue Apr 26 15:08:34 2016 +0200
QDeclarativeTextInput: update API to use setBlinkingCursorEnabled
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'licenses')
| -rw-r--r-- | licenses/The-Qt-Company-Commercial | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/licenses/The-Qt-Company-Commercial b/licenses/The-Qt-Company-Commercial new file mode 100644 index 00000000..1c8cb00e --- /dev/null +++ b/licenses/The-Qt-Company-Commercial | |||
| @@ -0,0 +1,20 @@ | |||
| 1 | /****************************************************************************** | ||
| 2 | ** | ||
| 3 | ** Copyright (C) 2015 The Qt Company Ltd. | ||
| 4 | ** Contact: http://www.qt.io/licensing/ | ||
| 5 | ** | ||
| 6 | ** This file is part of the <Fill> module. | ||
| 7 | ** | ||
| 8 | ** $QT_BEGIN_LICENSE:COMM$ | ||
| 9 | ** | ||
| 10 | ** Commercial License Usage | ||
| 11 | ** Licensees holding valid commercial Qt licenses may use this file in | ||
| 12 | ** accordance with the commercial license agreement provided with the | ||
| 13 | ** Software or, alternatively, in accordance with the terms contained in | ||
| 14 | ** a written agreement between you and The Qt Company. For licensing terms | ||
| 15 | ** and conditions see http://www.qt.io/terms-conditions. For further | ||
| 16 | ** information use the contact form at http://www.qt.io/contact-us. | ||
| 17 | ** | ||
| 18 | ** $QT_END_LICENSE$ | ||
| 19 | ** | ||
| 20 | ******************************************************************************/ | ||
