From 629d6eda5cf67122776981de9073857bbc3dcba2 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 20 Jan 2012 13:06:31 +1000 Subject: Update contact information in license headers. Replace Nokia contact email address with Qt Project website. Change-Id: I431bbbf76d7c27d8b502f87947675c116994c415 Reviewed-by: Rohan McGovern --- doc/src/snippets/code/doc_src_qplugin.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/src/snippets/code/doc_src_qplugin.pro') diff --git a/doc/src/snippets/code/doc_src_qplugin.pro b/doc/src/snippets/code/doc_src_qplugin.pro index 1609b9c0d66..6775f4b95c0 100644 --- a/doc/src/snippets/code/doc_src_qplugin.pro +++ b/doc/src/snippets/code/doc_src_qplugin.pro @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the documentation of the Qt Toolkit. ** -- cgit v1.2.3 From 48f9ba388b374d56764d9bd9455fda527f6bafba Mon Sep 17 00:00:00 2001 From: aavit Date: Tue, 24 Jan 2012 16:05:02 +0100 Subject: Remove support for the MNG file format and the bundled libmng The MNG file format is generally abandoned, and libmng has been unmaintained for several years. The MNG plugin and bundled libmng has been moved to the qtimageformats project on Gerrit. Task-number: QTBUG-21869 Change-Id: I946432347014ffde2b72307a5f8b166ca5553602 Reviewed-by: Lars Knoll Reviewed-by: Friedemann Kleint --- doc/src/snippets/code/doc_src_qplugin.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/src/snippets/code/doc_src_qplugin.pro') diff --git a/doc/src/snippets/code/doc_src_qplugin.pro b/doc/src/snippets/code/doc_src_qplugin.pro index 6775f4b95c0..096dc8e4ed9 100644 --- a/doc/src/snippets/code/doc_src_qplugin.pro +++ b/doc/src/snippets/code/doc_src_qplugin.pro @@ -40,5 +40,5 @@ #! [3] TEMPLATE = app -QTPLUGIN += qjpeg qgif qmng # image formats +QTPLUGIN += qjpeg qgif # image formats #! [3] -- cgit v1.2.3 From 5635823e17db3395d9b0fa8cfcc72f82fea583f4 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 24 Jan 2012 16:17:24 +1000 Subject: Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I311e001373776812699d6efc045b5f742890c689 Reviewed-by: Rohan McGovern --- doc/src/snippets/code/doc_src_qplugin.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/src/snippets/code/doc_src_qplugin.pro') diff --git a/doc/src/snippets/code/doc_src_qplugin.pro b/doc/src/snippets/code/doc_src_qplugin.pro index 096dc8e4ed9..e5e5311e5db 100644 --- a/doc/src/snippets/code/doc_src_qplugin.pro +++ b/doc/src/snippets/code/doc_src_qplugin.pro @@ -1,7 +1,6 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -34,6 +33,7 @@ ** 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." +** ** $QT_END_LICENSE$ ** ****************************************************************************/ -- cgit v1.2.3