diff options
| -rw-r--r-- | doc/src/platforms/linux.qdoc | 15 | ||||
| -rw-r--r-- | doc/src/platforms/osx.qdoc | 19 | ||||
| -rw-r--r-- | doc/src/platforms/windows.qdoc | 13 |
3 files changed, 35 insertions, 12 deletions
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 cc0933973..4a7c21f44 100644 --- a/doc/src/platforms/osx.qdoc +++ b/doc/src/platforms/osx.qdoc @@ -198,9 +198,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} @@ -211,7 +220,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. @@ -249,7 +258,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/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 |