Skip to content

Commit

Permalink
correct license.
Browse files Browse the repository at this point in the history
  • Loading branch information
Lorn Potter committed Mar 19, 2013
1 parent 3fa0bda commit 4231fba
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 38 deletions.
5 changes: 4 additions & 1 deletion README.md
@@ -1,4 +1,7 @@
connectionagent
===============

Connectionagent is a daemon and declarative plugin for accessing connman's UserAgent. It allows multiple access to UserAgent
Connectionagent is a daemon and declarative plugin for accessing connman's UserAgent. It allows multiple access to UserAgent.

The daemon and QtDeclarative plugin are licensed un ther LGPL.

25 changes: 15 additions & 10 deletions connd/connadaptor.h
@@ -1,13 +1,18 @@
/*
* This file was generated by qdbusxml2cpp version 0.7
* Command line was: qdbusxml2cpp -c ConnAdaptor -a connadaptor.h:connadaptor.cpp com.jolla.Connectiond.xml
*
* qdbusxml2cpp is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
*
* This is an auto-generated file.
* This file may have been hand-edited. Look for HAND-EDIT comments
* before re-generating it.
*/
/****************************************************************************
**
** Copyright (C) 2013 Jolla Ltd
** Contact: lorn.potter@gmail.com
**
**
** GNU Lesser General Public License Usage
** 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
** 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.
**
****************************************************************************/

#ifndef CONNADAPTOR_H_1363412350
#define CONNADAPTOR_H_1363412350
Expand Down
29 changes: 2 additions & 27 deletions connd/qconnectionmanager.h
@@ -1,42 +1,17 @@
/****************************************************************************
**
** Copyright (C) 2012 Jolla Ltd.
** Copyright (C) 2013 Jolla Ltd
** Contact: lorn.potter@gmail.com
**
**
** $QT_BEGIN_LICENSE:LGPL$
** 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.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** 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
** 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
** 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
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
****************************************************************************/

#ifndef QCONNECTIONMANAGER_H
Expand Down

0 comments on commit 4231fba

Please sign in to comment.