diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:43:56 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:43:56 +0100 |
commit | f9cfb3d4f11203e50dc0b6516fbbcb2d16d8b585 (patch) | |
tree | f42454c5d7121d798b6678a2b3acf3d710f32089 | |
parent | 6f5b2fae0923aa495876aa073bdc4192d2bcba09 (diff) | |
parent | 07446998a4d75ceb6376dd674b9e9426b170ae6b (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Change-Id: I8a9563bdc315764ccdd5087864c3a8186902411f
-rw-r--r-- | doc/snippets/plugins/doc_src_plugins-howto.pro | 16 | ||||
-rw-r--r-- | doc/src/platforms/apple-getting-started.qdocinc | 8 | ||||
-rw-r--r-- | doc/src/platforms/linux.qdoc | 15 | ||||
-rw-r--r-- | doc/src/platforms/osx.qdoc | 19 | ||||
-rw-r--r-- | doc/src/platforms/porting-notes.qdocinc | 10 | ||||
-rw-r--r-- | doc/src/platforms/supported-platforms.qdocinc | 10 | ||||
-rw-r--r-- | doc/src/platforms/windows.qdoc | 13 | ||||
-rw-r--r-- | doc/src/snippets/code/doc_src_appicon.pro | 16 | ||||
-rw-r--r-- | doc/src/snippets/code/doc_src_deployment.pro | 16 | ||||
-rw-r--r-- | doc/src/snippets/code/doc_src_emb-pointer.pro | 16 | ||||
-rw-r--r-- | doc/src/snippets/code/doc_src_linguist-manual.pro | 16 | ||||
-rw-r--r-- | doc/src/snippets/code/doc_src_mac-differences.pro | 16 | ||||
-rw-r--r-- | doc/src/snippets/code/doc_src_qtmultimedia.pro | 16 |
13 files changed, 140 insertions, 47 deletions
diff --git a/doc/snippets/plugins/doc_src_plugins-howto.pro b/doc/snippets/plugins/doc_src_plugins-howto.pro index e3c889cb5..4840c6d17 100644 --- a/doc/snippets/plugins/doc_src_plugins-howto.pro +++ b/doc/snippets/plugins/doc_src_plugins-howto.pro @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, 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 diff --git a/doc/src/platforms/apple-getting-started.qdocinc b/doc/src/platforms/apple-getting-started.qdocinc index 1f12a7399..68fd1f414 100644 --- a/doc/src/platforms/apple-getting-started.qdocinc +++ b/doc/src/platforms/apple-getting-started.qdocinc @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -11,8 +11,8 @@ ** 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 The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -20,7 +20,7 @@ ** Foundation and appearing in the file included in the packaging of ** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc index af0f568e5..9e72166b3 100644 --- a/doc/src/platforms/linux.qdoc +++ b/doc/src/platforms/linux.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -357,9 +357,16 @@ \section1 Step 1: Installing the License File (Commercially Licensed Qt Only) - If you have a commercial Qt license, download the license file - from your \l {Qt Account} Web portal and save it as - \c{$HOME/.qt-license}. + If you use Qt with a commercial license, the Qt tools look for a local license file. + If you are using a binary installer or the commercial Qt Creator, your licenses + are automatically fetched and stored in your local user profile + (\c{$XDG_DATA_HOME/Qt/qtlicenses.ini} file). + + If you do not use any binary installer or Qt Creator, you can download + the respective license file from your \l {Qt Account} Web portal and save + it to your user profile as \c{$HOME/.qt-license}. If you prefer a + different location or file name, you need to set the \c{QT_LICENSE_FILE} + environment variable to the respective file path. \section1 Step 2: Unpacking the Archive Unpack the archive if you have not done so already. For example, diff --git a/doc/src/platforms/osx.qdoc b/doc/src/platforms/osx.qdoc index 0f33eb858..8d758dd43 100644 --- a/doc/src/platforms/osx.qdoc +++ b/doc/src/platforms/osx.qdoc @@ -199,9 +199,18 @@ \section1 Step 1: Install the License File (Commercially Licensed Qt Only) - If you have a commercial Qt license, download the license file - from your \l {Qt Account} Web portal and save it as - \c{$HOME/.qt-license}. + If you use Qt with a commercial license, the Qt tools look for a local license file. + If you are using a binary installer or the commercial Qt Creator, your licenses + are automatically fetched and stored in your local user profile + (\c{$HOME/Library/Application Support/Qt/qtlicenses.ini} file). + + If you do not use any binary installer or Qt Creator, you can download + the respective license file from your \l {Qt Account} Web portal and save + it to your user profile as \c{$HOME/.qt-license}. If you prefer a + different location or file name, you need to set the \c{QT_LICENSE_FILE} + environment variable to the respective file path. + + \section1 Step 2: Unpack the Archive Unpack the archive if you have not done so already. For example, if you have the \c{qt-everywhere-opensource-src-%VERSION%.tar.gz} @@ -212,7 +221,7 @@ This creates the directory \c{/tmp/qt-everywhere-opensource-src-%VERSION%} containing the files from the archive. - \section1 Step 2: Build the Qt Library + \section1 Step 3: Build the Qt Library To configure the Qt library for your machine type, run the \c{./configure} script in the package directory. @@ -250,7 +259,7 @@ \note There is a potential race condition when running make install with multiple jobs. It is best to only run one make job (-j1) for the install. - \section1 Step 3: Set the Environment Variables + \section1 Step 4: Set the Environment Variables In order to use Qt, some environment variables need to be extended. diff --git a/doc/src/platforms/porting-notes.qdocinc b/doc/src/platforms/porting-notes.qdocinc index 9f5364798..1aac11763 100644 --- a/doc/src/platforms/porting-notes.qdocinc +++ b/doc/src/platforms/porting-notes.qdocinc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -11,8 +11,8 @@ ** 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 The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -20,7 +20,7 @@ ** Foundation and appearing in the file included in the packaging of ** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc index 239d42931..ee880b3fc 100644 --- a/doc/src/platforms/supported-platforms.qdocinc +++ b/doc/src/platforms/supported-platforms.qdocinc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -11,8 +11,8 @@ ** 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 The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -20,7 +20,7 @@ ** Foundation and appearing in the file included in the packaging of ** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc index 1823ceace..e5353cc05 100644 --- a/doc/src/platforms/windows.qdoc +++ b/doc/src/platforms/windows.qdoc @@ -1038,9 +1038,16 @@ \section1 Step 1: Install the License File (Commercially Licensed Qt Only) - If you have a commercial Qt license, download the license file - from your \l {Qt Account} Web portal and save it to your home directory - as \c{.qt-license}. + If you use Qt with a commercial license, the Qt tools look for a local license file. + If you are using a binary installer or the commercial Qt Creator, your licenses + are automatically fetched and stored in your local user profile + (\c{%USERPROFILE%\AppData\Roaming\Qt\qtlicenses.ini} file). + + If you do not use any binary installer or Qt Creator, you can download + the respective license file from your \l {Qt Account} Web portal and save + it to your user profile as \c{%USERPROFILE%\.qt-license}. If you prefer a + different location or file name, you need to set the \c{QT_LICENSE_FILE} + environment variable to the respective file path. \section1 Step 2: Unpack the Archive diff --git a/doc/src/snippets/code/doc_src_appicon.pro b/doc/src/snippets/code/doc_src_appicon.pro index c073c3695..09436ca84 100644 --- a/doc/src/snippets/code/doc_src_appicon.pro +++ b/doc/src/snippets/code/doc_src_appicon.pro @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, 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 diff --git a/doc/src/snippets/code/doc_src_deployment.pro b/doc/src/snippets/code/doc_src_deployment.pro index f790cd30f..d03128a28 100644 --- a/doc/src/snippets/code/doc_src_deployment.pro +++ b/doc/src/snippets/code/doc_src_deployment.pro @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, 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 diff --git a/doc/src/snippets/code/doc_src_emb-pointer.pro b/doc/src/snippets/code/doc_src_emb-pointer.pro index ef4665391..444f9b2ec 100644 --- a/doc/src/snippets/code/doc_src_emb-pointer.pro +++ b/doc/src/snippets/code/doc_src_emb-pointer.pro @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, 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 diff --git a/doc/src/snippets/code/doc_src_linguist-manual.pro b/doc/src/snippets/code/doc_src_linguist-manual.pro index 27ca4936f..ef4eb4045 100644 --- a/doc/src/snippets/code/doc_src_linguist-manual.pro +++ b/doc/src/snippets/code/doc_src_linguist-manual.pro @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, 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 diff --git a/doc/src/snippets/code/doc_src_mac-differences.pro b/doc/src/snippets/code/doc_src_mac-differences.pro index c4c3dbbea..07e0cfac7 100644 --- a/doc/src/snippets/code/doc_src_mac-differences.pro +++ b/doc/src/snippets/code/doc_src_mac-differences.pro @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, 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 diff --git a/doc/src/snippets/code/doc_src_qtmultimedia.pro b/doc/src/snippets/code/doc_src_qtmultimedia.pro index 03317ccf7..2c693ed6d 100644 --- a/doc/src/snippets/code/doc_src_qtmultimedia.pro +++ b/doc/src/snippets/code/doc_src_qtmultimedia.pro @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, 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 |