From bd2ef8028dbe25ae0fbd36bb99600e9136238425 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Fri, 28 Feb 2014 09:33:56 +0100 Subject: Android: Add commercial license to BSD-licensed files These files should also be usable under the commercial license terms as an alternative to the BSD license. Change-Id: If211bb63789722f655843831073ed05ee69811ea Reviewed-by: BogDan Vatra Reviewed-by: Lars Knoll --- .../java/src/org/kde/necessitas/ministro/IMinistro.aidl | 10 ++++++++++ .../src/org/kde/necessitas/ministro/IMinistroCallback.aidl | 10 ++++++++++ .../src/org/qtproject/qt5/android/bindings/QtActivity.java | 10 ++++++++++ .../src/org/qtproject/qt5/android/bindings/QtApplication.java | 10 ++++++++++ 4 files changed, 40 insertions(+) (limited to 'src/android/java') diff --git a/src/android/java/src/org/kde/necessitas/ministro/IMinistro.aidl b/src/android/java/src/org/kde/necessitas/ministro/IMinistro.aidl index 236a62f63e..6c8af4f139 100644 --- a/src/android/java/src/org/kde/necessitas/ministro/IMinistro.aidl +++ b/src/android/java/src/org/kde/necessitas/ministro/IMinistro.aidl @@ -2,6 +2,16 @@ Copyright (c) 2011-2013, BogDan Vatra Contact: http://www.qt-project.org/legal + 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 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. + + BSD License Usage + Alternatively, this file may be used under the BSD license as follows: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/src/android/java/src/org/kde/necessitas/ministro/IMinistroCallback.aidl b/src/android/java/src/org/kde/necessitas/ministro/IMinistroCallback.aidl index 0bcb5285b8..82a18bb568 100644 --- a/src/android/java/src/org/kde/necessitas/ministro/IMinistroCallback.aidl +++ b/src/android/java/src/org/kde/necessitas/ministro/IMinistroCallback.aidl @@ -2,6 +2,16 @@ Copyright (c) 2011-2013, BogDan Vatra Contact: http://www.qt-project.org/legal + 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 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. + + BSD License Usage + Alternatively, this file may be used under the BSD license as follows: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java index 3a0eaa77d6..edfd2d606d 100644 --- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java +++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java @@ -2,6 +2,16 @@ Copyright (c) 2012-2013, BogDan Vatra Contact: http://www.qt-project.org/legal + 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 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. + + BSD License Usage + Alternatively, this file may be used under the BSD license as follows: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtApplication.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtApplication.java index 4de1c833f5..33485ac27b 100644 --- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtApplication.java +++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtApplication.java @@ -2,6 +2,16 @@ Copyright (c) 2012-2013, BogDan Vatra Contact: http://www.qt-project.org/legal + 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 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. + + BSD License Usage + Alternatively, this file may be used under the BSD license as follows: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -- cgit v1.2.3