diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-02 17:47:32 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-02 17:47:32 +0200 |
commit | bcbaa596815caf53c80f4a5220fb008000b3d897 (patch) | |
tree | bf639fe99579d951e85618f3bd0ff71b6b1e974c /examples | |
parent | 6bea7fb2dc597817fde7e16216220d2eacc48509 (diff) | |
parent | a79f70e2dfa1fa3d3a418310c7b8c8bb89c2d3c8 (diff) | |
download | qtwebchannel-bcbaa596815caf53c80f4a5220fb008000b3d897.tar.gz |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Ibbab64e34150e1131fadf37f2e84a0a3f618974f
Diffstat (limited to 'examples')
-rw-r--r-- | examples/examples.pro | 2 | ||||
-rw-r--r-- | examples/qwebchannel/doc/examples.qdoc | 49 | ||||
-rw-r--r-- | examples/webchannel/exampleassets.pri (renamed from examples/qwebchannel/exampleassets.pri) | 0 | ||||
-rw-r--r-- | examples/webchannel/nodejs/README (renamed from examples/qwebchannel/nodejs/README) | 0 | ||||
-rw-r--r-- | examples/webchannel/nodejs/chatclient.js (renamed from examples/qwebchannel/nodejs/chatclient.js) | 28 | ||||
-rw-r--r-- | examples/webchannel/nodejs/nodejs.pro (renamed from examples/qwebchannel/nodejs/nodejs.pro) | 0 | ||||
-rw-r--r-- | examples/webchannel/nodejs/package.json (renamed from examples/qwebchannel/nodejs/package.json) | 0 | ||||
-rw-r--r-- | examples/webchannel/standalone/dialog.ui (renamed from examples/qwebchannel/standalone/dialog.ui) | 0 | ||||
-rw-r--r-- | examples/webchannel/standalone/doc/images/standalone-screenshot.png (renamed from examples/qwebchannel/doc/standalone-screenshot.png) | bin | 30363 -> 30363 bytes | |||
-rw-r--r-- | examples/webchannel/standalone/doc/src/standalone.qdoc (renamed from examples/qwebchannel/doc/standalone.qdoc) | 48 | ||||
-rw-r--r-- | examples/webchannel/standalone/index.html (renamed from examples/qwebchannel/standalone/index.html) | 0 | ||||
-rw-r--r-- | examples/webchannel/standalone/main.cpp (renamed from examples/qwebchannel/standalone/main.cpp) | 28 | ||||
-rw-r--r-- | examples/webchannel/standalone/standalone.pro (renamed from examples/qwebchannel/standalone/standalone.pro) | 0 | ||||
-rw-r--r-- | examples/webchannel/standalone/websocketclientwrapper.cpp (renamed from examples/qwebchannel/standalone/websocketclientwrapper.cpp) | 28 | ||||
-rw-r--r-- | examples/webchannel/standalone/websocketclientwrapper.h (renamed from examples/qwebchannel/standalone/websocketclientwrapper.h) | 28 | ||||
-rw-r--r-- | examples/webchannel/standalone/websockettransport.cpp (renamed from examples/qwebchannel/standalone/websockettransport.cpp) | 28 | ||||
-rw-r--r-- | examples/webchannel/standalone/websockettransport.h (renamed from examples/qwebchannel/standalone/websockettransport.h) | 28 | ||||
-rw-r--r-- | examples/webchannel/webchannel.pro (renamed from examples/qwebchannel/qwebchannel.pro) | 0 |
18 files changed, 84 insertions, 183 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index 1cb6c9f..657e144 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -SUBDIRS += qwebchannel +SUBDIRS += webchannel diff --git a/examples/qwebchannel/doc/examples.qdoc b/examples/qwebchannel/doc/examples.qdoc deleted file mode 100644 index 613d760..0000000 --- a/examples/qwebchannel/doc/examples.qdoc +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com> -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtWebChannel module of the Qt Toolkit. -** -** $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 -** 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$ -** -****************************************************************************/ - -/*! - \title Qt WebChannel Examples - \group qtwebchannel-examples - \brief List of Qt WebChannel examples. - - The examples show how to use the QWebChannel C++ and WebChannel QML API. - -*/ diff --git a/examples/qwebchannel/exampleassets.pri b/examples/webchannel/exampleassets.pri index 035ca12..035ca12 100644 --- a/examples/qwebchannel/exampleassets.pri +++ b/examples/webchannel/exampleassets.pri diff --git a/examples/qwebchannel/nodejs/README b/examples/webchannel/nodejs/README index 07f8fd8..07f8fd8 100644 --- a/examples/qwebchannel/nodejs/README +++ b/examples/webchannel/nodejs/README diff --git a/examples/qwebchannel/nodejs/chatclient.js b/examples/webchannel/nodejs/chatclient.js index 03ce214..ac28d84 100644 --- a/examples/qwebchannel/nodejs/chatclient.js +++ b/examples/webchannel/nodejs/chatclient.js @@ -6,36 +6,28 @@ ** ** This file is part of the QtWebChannel module of the Qt Toolkit. ** -** $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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information +** 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 -** 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. +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** 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 +** 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$ ** ****************************************************************************/ diff --git a/examples/qwebchannel/nodejs/nodejs.pro b/examples/webchannel/nodejs/nodejs.pro index 4df94d2..4df94d2 100644 --- a/examples/qwebchannel/nodejs/nodejs.pro +++ b/examples/webchannel/nodejs/nodejs.pro diff --git a/examples/qwebchannel/nodejs/package.json b/examples/webchannel/nodejs/package.json index 2d863cc..2d863cc 100644 --- a/examples/qwebchannel/nodejs/package.json +++ b/examples/webchannel/nodejs/package.json diff --git a/examples/qwebchannel/standalone/dialog.ui b/examples/webchannel/standalone/dialog.ui index 056a3f5..056a3f5 100644 --- a/examples/qwebchannel/standalone/dialog.ui +++ b/examples/webchannel/standalone/dialog.ui diff --git a/examples/qwebchannel/doc/standalone-screenshot.png b/examples/webchannel/standalone/doc/images/standalone-screenshot.png Binary files differindex 3c55e19..3c55e19 100644 --- a/examples/qwebchannel/doc/standalone-screenshot.png +++ b/examples/webchannel/standalone/doc/images/standalone-screenshot.png diff --git a/examples/qwebchannel/doc/standalone.qdoc b/examples/webchannel/standalone/doc/src/standalone.qdoc index 1d81dad..a445bb9 100644 --- a/examples/qwebchannel/doc/standalone.qdoc +++ b/examples/webchannel/standalone/doc/src/standalone.qdoc @@ -5,60 +5,58 @@ ** ** This file is part of the QtWebChannel module of the Qt Toolkit. ** -** $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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information +** 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 -** 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. +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** 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 +** 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$ ** ****************************************************************************/ /*! \example standalone - \title Standalone Example + \title Qt WebChannel Standalone Example \ingroup qtwebchannel-examples \image standalone-screenshot.png \brief Shows how to use the QWebChannel C++ API to communicate with an external client. - The standalone example is a simple chat between a pure C++/Qt application and a remote HTML + The standalone example is a simple chat between a C++ application and a remote HTML client running in your default browser. - The C++ app sets up a QWebChannel and publishes a Dialog object over it. - For the remote client side, \c index.html is opened. Both show a dialog with the list of - received messages and an input box to send messages to the other end. + \include examples-run.qdocinc + + \section1 Overview - The Dialog emits the Dialog::sendText() signal when the user sents a message. The signal + The C++ application sets up a QWebChannel instance and publishes a Dialog object over it. + For the remote client side, \l {standalone/index.html}{index.html} is opened. Both show a + dialog with the list of received messages and an input box to send messages to the other end. + + The Dialog emits the Dialog::sendText() signal when the user sends a message. The signal automatically gets propagated to the HTML client. When the user enters a message on the HTML side, Dialog::receiveText() is called. - All communication between the HTML client and the C++/Qt server is done over a WebSocket. + All communication between the HTML client and the C++ server is done over a WebSocket. The C++ side instantiates a QWebSocketServer and wraps incoming QWebSocket connections in WebSocketTransport objects, which implement QWebChannelAbstractTransport. These objects are then connected to the QWebChannel instance. + + \sa {Qt WebChannel JavaScript API} */ diff --git a/examples/qwebchannel/standalone/index.html b/examples/webchannel/standalone/index.html index 778a502..778a502 100644 --- a/examples/qwebchannel/standalone/index.html +++ b/examples/webchannel/standalone/index.html diff --git a/examples/qwebchannel/standalone/main.cpp b/examples/webchannel/standalone/main.cpp index 2cbc6b8..6f0db3a 100644 --- a/examples/qwebchannel/standalone/main.cpp +++ b/examples/webchannel/standalone/main.cpp @@ -5,36 +5,28 @@ ** ** This file is part of the QtWebChannel module of the Qt Toolkit. ** -** $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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information +** 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 -** 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. +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** 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 +** 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$ ** ****************************************************************************/ diff --git a/examples/qwebchannel/standalone/standalone.pro b/examples/webchannel/standalone/standalone.pro index fdeb87a..fdeb87a 100644 --- a/examples/qwebchannel/standalone/standalone.pro +++ b/examples/webchannel/standalone/standalone.pro diff --git a/examples/qwebchannel/standalone/websocketclientwrapper.cpp b/examples/webchannel/standalone/websocketclientwrapper.cpp index 0e776e1..68ff1c0 100644 --- a/examples/qwebchannel/standalone/websocketclientwrapper.cpp +++ b/examples/webchannel/standalone/websocketclientwrapper.cpp @@ -5,36 +5,28 @@ ** ** This file is part of the QtWebChannel module of the Qt Toolkit. ** -** $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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information +** 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 -** 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. +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** 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 +** 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$ ** ****************************************************************************/ diff --git a/examples/qwebchannel/standalone/websocketclientwrapper.h b/examples/webchannel/standalone/websocketclientwrapper.h index 1f742f7..f49b8b9 100644 --- a/examples/qwebchannel/standalone/websocketclientwrapper.h +++ b/examples/webchannel/standalone/websocketclientwrapper.h @@ -5,36 +5,28 @@ ** ** This file is part of the QtWebChannel module of the Qt Toolkit. ** -** $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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information +** 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 -** 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. +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** 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 +** 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$ ** ****************************************************************************/ diff --git a/examples/qwebchannel/standalone/websockettransport.cpp b/examples/webchannel/standalone/websockettransport.cpp index 5714463..266563a 100644 --- a/examples/qwebchannel/standalone/websockettransport.cpp +++ b/examples/webchannel/standalone/websockettransport.cpp @@ -5,36 +5,28 @@ ** ** This file is part of the QtWebChannel module of the Qt Toolkit. ** -** $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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information +** 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 -** 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. +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** 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 +** 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$ ** ****************************************************************************/ diff --git a/examples/qwebchannel/standalone/websockettransport.h b/examples/webchannel/standalone/websockettransport.h index 828ac00..4d4a6cd 100644 --- a/examples/qwebchannel/standalone/websockettransport.h +++ b/examples/webchannel/standalone/websockettransport.h @@ -5,36 +5,28 @@ ** ** This file is part of the QtWebChannel module of the Qt Toolkit. ** -** $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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information +** 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 -** 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. +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** 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 +** 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$ ** ****************************************************************************/ diff --git a/examples/qwebchannel/qwebchannel.pro b/examples/webchannel/webchannel.pro index de6b4b8..de6b4b8 100644 --- a/examples/qwebchannel/qwebchannel.pro +++ b/examples/webchannel/webchannel.pro |