diff options
Diffstat (limited to 'qmake/doc/src/qmake-manual.qdoc')
-rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 71 |
1 files changed, 59 insertions, 12 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index e7d125a3a8..2def71c723 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** 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. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free ** Documentation License version 1.3 as published by the Free Software ** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure +** 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. ** $QT_END_LICENSE$ @@ -2556,18 +2556,64 @@ \li The unique ID of the app. Defaults to reusing the existing generated manifest's UUID, or generates a new UUID if none is present. \row + \li logo_30x30 + \li Logo image file of size 30x30 pixels. This is not supported on Windows Phone. + \row + \li logo_41x41 + \li Logo image file of size 41x41 pixels. This is only supported on Windows Phone. + \row + \li logo_70x70 + \li Logo image file of size 70x70 pixels. This is not supported on Windows Phone. + \row + \li logo_71x71 + \li Logo image file of size 71x71 pixels. This is only supported on Windows Phone. + \row + \li logo_150x150 + \li Logo image file of size 150x150 pixels. This is supported on all Windows + Store App platforms. + \row + \li logo_310x150 + \li Logo image file of size 310x150 pixels. This is supported on all Windows + Store App platforms. + \row + \li logo_310x310 + \li Logo image file of size 310x310 pixels. This is supported on all Windows + Store App platforms. + \row + \li logo_620x300 + \li Splash screen image file of size 620x300 pixels. This is not supported on + Windows Phone. + \row + \li logo_480x800 + \li Splash sceen image file of size 480x800 pixels. This is only supported on + Windows Phone. + \row \li logo_large - \li Large logo image file. Default provided by the mkspec. + \li Large logo image file. This has to be 150x150 pixels. Supported on all + Windows Store App platforms. Default provided by the mkspec. \row \li logo_medium - \li Medium logo image file. Default provided by the mkspec. + \li Medium logo image file. For Windows Phone the image must have a pixel size + of 71x71, for other Windows Store App platforms 70x70. Default provided by + the mkspec. \row \li logo_small - \li Small logo image file. Default provided by the mkspec. + \li Small logo image file. For Windows Phone the image must have a pixel size + of 44x44, for other Windows Store App platforms 30x30. Default provided by + the mkspec. + \row + \li logo_splash + \li Splash screen image file. For Windows Phone the image must have a pixel size + of 480x800, for other Windows Store App platforms 620x300. Default provided + by the mkspec. \row \li logo_store \li Logo image file for Windows Store. Default provided by the mkspec. \row + \li logo_wide + \li Wide logo image file. This has to be 310x150 pixels. Supported on all + Windows Store App platforms. Default provided by the mkspec. + \row \li name \li The name of the package as displayed to the user. Defaults to TARGET. \row @@ -2583,9 +2629,6 @@ \li publisher_id \li The publisher's distinguished name (default: \c{CN=MyCN}). \row - \li splash_screen - \li Splash screen image file. Default provided by the mkspec. - \row \li target \li The name of the target (.exe). Defaults to TARGET. \row @@ -2612,6 +2655,10 @@ WINRT_MANIFEST = someManifest.xml.in \endcode + \note The required image sizes of \e logo_small, \e logo_medium, and \e logo_large + depend on the target platform. The general descriptions are overwritten if a + description that specifies the size is provided. + \target YACCSOURCES \section1 YACCSOURCES |