diff options
author | Andrew Knight <andrew.knight@digia.com> | 2014-06-23 11:47:55 +0300 |
---|---|---|
committer | Andrew Knight <andrew.knight@digia.com> | 2014-06-25 16:33:55 +0200 |
commit | 1ae61e95e431e8fe5960bab6328fb18a0f10dab1 (patch) | |
tree | 4c48ffd3f26c801038e92f5a0c1d74de46023ed8 | |
parent | 1aac2527c7e0ced9565324d6a16c1707400ec694 (diff) |
winrt: Remove WP8.0 references from package manifest feature
Also, harmonize the qmake documentation.
Change-Id: I8722370f86982e33ccf97f631ae257c4c46cade2
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
-rw-r--r-- | mkspecs/features/winrt/package_manifest.prf | 41 | ||||
-rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 34 |
2 files changed, 18 insertions, 57 deletions
diff --git a/mkspecs/features/winrt/package_manifest.prf b/mkspecs/features/winrt/package_manifest.prf index 46fe1e57e4..b4242bfdaa 100644 --- a/mkspecs/features/winrt/package_manifest.prf +++ b/mkspecs/features/winrt/package_manifest.prf @@ -12,14 +12,11 @@ # WINRT_MANIFEST.name: The name of the package as displayed to the user. Defaults to TARGET. # WINRT_MANIFEST.architecture: The target architecture. Defaults to VCPROJ_ARCH. # WINRT_MANIFEST.version: The version number of the package. Defaults to "1.0.0.0". -# WINRT_MANIFEST.arguments: Allows arguments to be passed to the executable. # WINRT_MANIFEST.publisher: Display name of the publisher. Defaults to "Default publisher display name". -# WINRT_MANIFEST.publisher_id: On Windows 8/RT/Phone 8.1, the publisher's distinguished name (default: CN=MyCN). On Windows Phone 8.0, the publisher's UUID (default: invalid UUID string). -# WINRT_MANIFEST.phone_product_id): On Windows Phone 8.1, the GUID of the product. Defaults to the value of WINRT_MANIFEST.identity. -# WINRT_MANIFEST.phone_publisher_id: On Windows Phone 8.1, the GUID of the publiser. Defaults to an invalid GUID. +# WINRT_MANIFEST.publisher_id: The publisher's distinguished name (default: CN=MyCN). +# WINRT_MANIFEST.phone_product_id: The GUID of the product. Defaults to the value of WINRT_MANIFEST.identity. (Windows Phone only) +# WINRT_MANIFEST.phone_publisher_id: The GUID of the publisher. Defaults to an invalid GUID. (Windows Phone only) # WINRT_MANIFEST.description: Package description. Defaults to "Default package description". -# WINRT_MANIFEST.author: Package author (Windows Phone 8.0 only). Defaults to "Default package author". -# WINRT_MANIFEST.genre: Package genre (Windows Phone 8.0 only). Defaults to "apps.normal". # WINRT_MANIFEST.background: Tile background color. Defaults to "green". # WINRT_MANIFEST.foreground: Tile foreground (text) color (Windows 8/RT only). Defaults to "light". # WINRT_MANIFEST.logo_store: Logo image file for Windows Store. Default provided by the mkspec. @@ -30,7 +27,6 @@ # WINRT_MANIFEST.iconic_tile_icon: Image file for the "iconic" tile template icon. Default provided by the mkspec. # WINRT_MANIFEST.iconic_tile_small: Image file for the small "iconic" tile template logo. Default provided by the mkspec. # WINRT_MANIFEST.default_language: Specifies the default language of the application -# WINRT_MANIFEST.languages: Specifies the languages the application supports # WINRT_MANIFEST.capabilities: Specifies capabilities to add to the capability list. # WINRT_MANIFEST.capabilities_device: Specifies device capabilities to add to the capability list. (location, webcam...) # WINRT_MANIFEST.dependencies: Specifies dependencies required by the package. @@ -51,9 +47,7 @@ BUILD_DIR = $$dirname(QMAKE_RESOLVED_TARGET) } - winphone:equals(WINSDK_VER, 8.0): \ - manifest_file.output = $$BUILD_DIR/WMAppManifest.xml - else: contains(TEMPLATE, "vc.*"): \ + contains(TEMPLATE, "vc.*"): \ manifest_file.output = $$BUILD_DIR/Package.appxmanifest else: \ manifest_file.output = $$BUILD_DIR/AppxManifest.xml @@ -80,49 +74,30 @@ write_file($$UUID_CACHE, WINRT_UUID)|error("Unable to write the UUID cache; aborting.") eval($$WINRT_UUID) } - winphone:equals(WINSDK_VER, 8.0): WINRT_MANIFEST.identity = {$$WINRT_MANIFEST.identity} } isEmpty(WINRT_MANIFEST.name): WINRT_MANIFEST.name = $$TARGET isEmpty(WINRT_MANIFEST.architecture): WINRT_MANIFEST.architecture = $$VCPROJ_ARCH isEmpty(WINRT_MANIFEST.version): WINRT_MANIFEST.version = 1.0.0.0 isEmpty(WINRT_MANIFEST.publisher): WINRT_MANIFEST.publisher = Default publisher display name - isEmpty(WINRT_MANIFEST.publisherid) { - winphone:equals(WINSDK_VER, 8.0): WINRT_MANIFEST.publisherid = {00000000-0000-0000-0000-000000000000} - else: WINRT_MANIFEST.publisherid = CN=$$(USERNAME) - } + isEmpty(WINRT_MANIFEST.publisherid): WINRT_MANIFEST.publisherid = CN=$$(USERNAME) isEmpty(WINRT_MANIFEST.phone_product_id): WINRT_MANIFEST.phone_product_id = $$WINRT_MANIFEST.identity isEmpty(WINRT_MANIFEST.phone_publisher_id): WINRT_MANIFEST.phone_publisher_id = 00000000-0000-0000-0000-000000000000 isEmpty(WINRT_MANIFEST.description): WINRT_MANIFEST.description = Default package description - isEmpty(WINRT_MANIFEST.author): WINRT_MANIFEST.author = Default package author - isEmpty(WINRT_MANIFEST.genre): WINRT_MANIFEST.genre = apps.normal isEmpty(WINRT_MANIFEST.background): WINRT_MANIFEST.background = green isEmpty(WINRT_MANIFEST.foreground): WINRT_MANIFEST.foreground = light isEmpty(WINRT_MANIFEST.default_language): WINRT_MANIFEST.default_language = en - winphone:equals(WINSDK_VER, 8.0): INDENT = "$$escape_expand(\\r\\n) " - else: INDENT = "$$escape_expand(\\r\\n) " - - # Languages are given as a string list - WINRT_MANIFEST.languages = $$unique(WINRT_MANIFEST.languages) - winphone:equals(WINSDK_VER, 8.0):!isEmpty(WINRT_MANIFEST.languages) { - for(LANGUAGE, WINRT_MANIFEST.languages): \ - MANIFEST_LANGUAGES += "<Language code=\"$$LANGUAGE\" />" - - WINRT_MANIFEST.languages = \ - $$join(MANIFEST_LANGUAGES, $$INDENT, \ - "$$escape_expand(\\r\\n) <Languages xmlns=\"\">$$INDENT", \ - "$$escape_expand(\\r\\n) </Languages>") - } + INDENT = "$$escape_expand(\\r\\n) " # Capabilities are given as a string list and may change with the configuration (network, sensors, etc.) WINRT_MANIFEST.capabilities = $$unique(WINRT_MANIFEST.capabilities) WINRT_MANIFEST.capabilities_device = $$unique(WINRT_MANIFEST.capabilities_device) - !isEmpty(WINRT_MANIFEST.capabilities)|!isEmpty(WINRT_MANIFEST.capabilities_device)|winphone { + !isEmpty(WINRT_MANIFEST.capabilities)|!isEmpty(WINRT_MANIFEST.capabilities_device) { MANIFEST_CAPABILITIES += "<Capabilities>" for(CAPABILITY, WINRT_MANIFEST.capabilities): \ MANIFEST_CAPABILITIES += " <Capability Name=\"$$CAPABILITY\" />" - !winphone:for(CAPABILITY, WINRT_MANIFEST.capabilities_device): \ + for(CAPABILITY, WINRT_MANIFEST.capabilities_device): \ MANIFEST_CAPABILITIES += " <DeviceCapability Name=\"$$CAPABILITY\" />" MANIFEST_CAPABILITIES += "</Capabilities>" diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 2f43c8ad1f..26fe0d62f1 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -2405,13 +2405,6 @@ \li architecture \li The target architecture. Defaults to \c VCPROJ_ARCH. \row - \li arguments - \li Allows arguments to be passed to the executable. - \row - \li author - \li Package author. Defaults to \c{Default package author}. - This option is only available for Windows Phone. - \row \li background \li Tile background color. Defaults to \c{green}. \row @@ -2420,7 +2413,7 @@ \row \li capabilities_device \li Specifies device capabilities to add to the capability list - (location, webcam, and so on). This option is not available on Windows Phone. + (location, webcam, and so on). \row \li default_language \li The default language code of the application. Defaults to "en". @@ -2435,10 +2428,6 @@ \li Tile foreground (text) color. Defaults to \c{light}. This option is only available for Windows Store apps on Windows 8 and Windows RT. \row - \li genre - \li Package genre. Defaults to \c{apps.normal}. - This option is only available for Windows Phone. - \row \li iconic_tile_icon \li Image file for the \c{iconic} tile template icon. Default provided by the mkspec. @@ -2451,10 +2440,6 @@ \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 languages - \li A list of additional language codes supported by the application. This list - is empty by default. - \row \li logo_large \li Large logo image file. Default provided by the mkspec. \row @@ -2470,12 +2455,17 @@ \li name \li The name of the package as displayed to the user. Defaults to TARGET. \row + \li phone_product_id + \li The GUID of the product. Defaults to the value of WINRT_MANIFEST.identity. (Windows Phone only) + \row + \li phone_publisher_id + \li The GUID of the publisher. Defaults to an invalid GUID. (Windows Phone only) + \row \li publisher \li Display name of the publisher. Defaults to \c{Default publisher display name}. \row \li publisher_id - \li On Windows 8 or Windows RT, the publisher's distinguished name (default: \c{CN=MyCN}). - On Windows Phone, the publisher's UUID (default: invalid UUID string). + \li The publisher's distinguished name (default: \c{CN=MyCN}). \row \li splash_screen \li Splash screen image file. Default provided by the mkspec. @@ -2494,12 +2484,8 @@ \code WINRT_MANIFEST.publisher = MyCompany WINRT_MANIFEST.logo_store = someImage.png - winphone { - WINRT_MANIFEST.capabilities += ID_CAP_LOCATION ID_CAP_NETWORKING - } else { - WINRT_MANIFEST.capabilities += internetClient - WINRT_MANIFEST.device_capabilities += location - } + WINRT_MANIFEST.capabilities += internetClient + WINRT_MANIFEST.device_capabilities += location \endcode Additionally, an input manifest file can be specified by using WINRT_MANIFEST. |