Commit Graph

9 Commits

Author SHA1 Message Date
Samuli Piippo
ca649e3f6f qt5: Update to Qt 5.14.0
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
2020-01-11 14:03:48 +01:00
Samuli Piippo
3e7da25564 qt5: update to Qt 5.11.2
Update The-Qt-Company-Commercial license to the actual commercial
license which also replaces preview license in qtbase. Remove old
licenses that are no longer used in any module.

Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
2018-09-25 09:34:49 +00:00
Martin Jansa
1a42aa78af 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>
2016-08-05 11:03:12 +02:00
Jonathan Liu
09c0d9ad1e licenses: update technology preview license to match upstream
The license has extra blank lines at the end so these are removed to
match LICENSE.PREVIEW.COMMERCIAL from upstream.

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-18 21:29:56 +02:00
Martin Jansa
bf2cafa909 qt5: upgrade to latest revisions in 5.7 branches
* these revisions are after v5.7.0-beta1 tags where available
* it's highly recommended to read:
  http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
  to find out how you're affected check which files/tools are
  included in your builds, e.g. for qtwebengine:
  OE @ ~/projects/qt-project/qtwebengine $ git grep QT_BEGIN_LICENSE | sed 's/^[^:]*://g' | sort | uniq -c
     11 ## $QT_BEGIN_LICENSE:GPL-EXCEPT$
     67 ** $QT_BEGIN_LICENSE:BSD$
     17 ** $QT_BEGIN_LICENSE:FDL$
     61 ** $QT_BEGIN_LICENSE:GPL-EXCEPT$
    261 ** $QT_BEGIN_LICENSE:LGPL$
* change in chromium's LICENSE is only copyright year update

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-02 15:16:18 +02:00
Julien Brianceau \(jbriance\)
67f94fb249 qt3d: Remove GFDL-1.3 & DIGIA-TPLA-2.4 from LICENSE list
* qt3d is not a technical preview anymore since 5.5
* Take the opportunity to update TPLA license, using
  LICENSE.PREVIEW.COMMERCIAL file from qtbase

Signed-off-by: Julien Brianceau <jbriance@cisco.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-09-07 17:05:42 +02:00
Martin Jansa
48ebff679e licenses: Add LGPL_Exception texts and reference them from LICENSE
* add the license text as they appear in qtbase 5.4 and 5.5
* The-Qt-Company-Qt-LGPL-Exception-1.1 will be used in 5.5 beta recipes
  I'll introduce shortly
* based on patch from Herb Kuta

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2015-04-20 12:25:00 +02:00
Jonathan Liu
1fa7f364f6 licenses: rename NOKIA-TPLA-2.4 to DIGIA-TPLA-2.4
The license agreement doesn't mention Nokia anymore after Qt was
acquired by Digia.

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-15 18:52:45 +01:00
Khem Raj
79fcaa9d61 licenses: Fix WARNING: qt3d: No generic license file exists for: PREVIEW.COMMERCIAL in any provider
* Provide the license text

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2014-03-15 14:47:28 +01:00