summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2016-12-08 13:54:03 +0100
committerJani Heikkinen <jani.heikkinen@qt.io>2016-12-09 05:19:27 +0000
commit2ec70f14f961fdded5a65e68fb510db6fca41b41 (patch)
tree92a400656a88e7abb2c2902949df88baa4ce13e6
parent91010f426a05232c749843143c26731511fa1cb1 (diff)
Remove license acknowledgment for removed code
The code in question was part of the 'Qt Designer Easteregg' removed ages ago. Change-Id: I80fc6e936dfa8f9ae3ada4a965efde11dea32d89 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r--src/designer/src/designer/doc/src/designer-manual.qdoc40
1 files changed, 0 insertions, 40 deletions
diff --git a/src/designer/src/designer/doc/src/designer-manual.qdoc b/src/designer/src/designer/doc/src/designer-manual.qdoc
index 55fb81c32..8e8e3e6c7 100644
--- a/src/designer/src/designer/doc/src/designer-manual.qdoc
+++ b/src/designer/src/designer/doc/src/designer-manual.qdoc
@@ -84,18 +84,6 @@
\li \l{Qt Designer's UI File Format}
\endlist
\endlist
-
- \section1 Legal Notices
-
- Some source code in \QD is licensed under specific highly permissive
- licenses from the original authors. The Qt team gratefully acknowledges
- these contributions to \QD and all users of \QD should also acknowledge
- these contributions and quote the following license statements in an
- appendix to the documentation.
-
- \list
- \li \l{Qt Designer License Information}
- \endlist
*/
@@ -2811,31 +2799,3 @@ pixmap property in the property editor.
\quotefile ../../../../data/ui4.xsd
*/
-
-
-/*!
- \page designer-license-information.html
- \title Qt Designer License Information
- \contentspage {Qt Designer Manual}{Contents}
-
- \brief License information for contributions to specific parts of the Qt
- Designer source code.
-
- \section1 Implementation of the Recursive Shadow Casting Algorithm in Qt Designer
-
- \legalese
- Copyright (C) 2015 The Qt Company Ltd. \BR
- Copyright (C) 2005 Bjoern Bergstroem
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, modify, market, reproduce,
- grant sublicenses and distribute subject to the following conditions:
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software. These
- files are provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- WARRANTY OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- PURPOSE.
- \endlegalese
-*/