summaryrefslogtreecommitdiffstats
path: root/src/activeqt/doc/src/qtaxserver.qdoc
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2017-12-04 13:16:53 +0100
committerAndy Shaw <andy.shaw@qt.io>2018-04-09 13:44:01 +0000
commitc095e6ad6f5dbf7bb7082ab822aaa114f83ccc44 (patch)
tree783f159173d551b2a7626ed4df5758ea2774d280 /src/activeqt/doc/src/qtaxserver.qdoc
parent51438b29b93e1f9a6233b16ffddc82510072250a (diff)
Update the doc about the license to reflect that it is dual licensedv5.11.0-beta4
Change-Id: I8728e32726fb45f04acfe878aca54a67f62961a9 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/activeqt/doc/src/qtaxserver.qdoc')
-rw-r--r--src/activeqt/doc/src/qtaxserver.qdoc40
1 files changed, 0 insertions, 40 deletions
diff --git a/src/activeqt/doc/src/qtaxserver.qdoc b/src/activeqt/doc/src/qtaxserver.qdoc
index a7996bf..1f1db10 100644
--- a/src/activeqt/doc/src/qtaxserver.qdoc
+++ b/src/activeqt/doc/src/qtaxserver.qdoc
@@ -37,46 +37,6 @@
QAxServer is part of the \l{Active Qt} module. The
\l{Building ActiveX servers in Qt} page contains information about
turning a Qt binary into a COM server
-
- \section1 License Information
-
- The QAxServer module is not covered by the \l{GNU General Public License (GPL)},
- the \l{GNU Lesser General Public License (LGPL)}, or the
- \l{Qt Commercial License}. Instead, it is distributed under
- the following license.
-
- \legalese
- Copyright (C) 2015 The Qt Company Ltd.\br
- Contact: http://www.qt.io/licensing/\br
-
- You may use this file under the terms of 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:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
- * Neither the name of The Qt Company Ltd nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
- \endlegalese
*/
/*!