From 1c8224511dee2794553da9dc8ed484d49dc78b45 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Fri, 5 Jan 2018 00:40:46 -0800 Subject: qmake: set COPY_PHASE_STRIP to NO in Xcode generator Since Xcode 6.3, this must be set to NO because stripping on copy is no longer fully supported due to the potential of input binaries being code signed. In this case Xcode will simply ignore the strip step and issue a warning since stripping would invalidate the code signature. This change silences that annoying warning for release builds. Also, the setting assignment is moved from being hardcoded in the generator, to a QMAKE_MAC_XCODE_SETTINGS value. Change-Id: If25511edddc12b7b0407e2992d80884b7d6437dc Reviewed-by: Gabriel de Dietrich --- mkspecs/features/mac/default_pre.prf | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mkspecs') diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf index 44636f2288..e3534561a5 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf @@ -54,3 +54,7 @@ macx-xcode:qtConfig(static): \ # feature, which allows Xcode to choose the Qt libraries to link to # at build time, depending on the current Xcode SDK and configuration. QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX + +xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP +xcode_copy_phase_strip_setting.value = NO +QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting -- cgit v1.2.3 From 0749ba2c5eacc4822cf9c7a31edf8d70c4ef6064 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Mon, 20 Nov 2017 23:49:34 -0800 Subject: Rewrite the Info.plist variable replacement handling This ensures that the same set of variables can be successfully replaced in both the Makefile and Xcode generators. It also switches the default templates to use the Xcode-style ${var} syntax instead of the @var@ syntax for better Info.plist compatibility across generators. Change-Id: Iff330bafd152773aafac9143c4a34e34f92f0ce6 Reviewed-by: Oswald Buddenhagen --- mkspecs/features/mac/default_post.prf | 23 +++++++++++++++++++++++ mkspecs/macx-clang/Info.plist.app | 10 ++++++---- mkspecs/macx-clang/Info.plist.lib | 10 +++++----- mkspecs/macx-g++/Info.plist.app | 10 ++++++---- mkspecs/macx-g++/Info.plist.lib | 10 +++++----- mkspecs/macx-icc/Info.plist.app | 10 ++++++---- mkspecs/macx-icc/Info.plist.lib | 10 +++++----- mkspecs/macx-ios-clang/Info.plist.app | 14 ++++++++------ mkspecs/macx-ios-clang/Info.plist.lib | 10 +++++----- mkspecs/macx-tvos-clang/Info.plist.app | 12 ++++++------ mkspecs/macx-tvos-clang/Info.plist.lib | 10 +++++----- mkspecs/macx-watchos-clang/Info.plist.app | 12 +++++++----- mkspecs/macx-watchos-clang/Info.plist.lib | 10 +++++----- 13 files changed, 92 insertions(+), 59 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf index e645ba5803..50a1ec6764 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -47,6 +47,29 @@ app_extension_api_only { } macx-xcode { + qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO + !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ + qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO + else: \ + qmake_pkginfo_typeinfo.value = "????" + QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo + + !isEmpty(VERSION) { + l = $$split(VERSION, '.') 0 0 # make sure there are at least three + VER_MAJ = $$member(l, 0, 0) + VER_MIN = $$member(l, 1, 1) + VER_PAT = $$member(l, 2, 2) + unset(l) + + qmake_full_version.name = QMAKE_FULL_VERSION + qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} + QMAKE_MAC_XCODE_SETTINGS += qmake_full_version + + qmake_short_version.name = QMAKE_SHORT_VERSION + qmake_short_version.value = $${VER_MAJ}.$${VER_MIN} + QMAKE_MAC_XCODE_SETTINGS += qmake_short_version + } + !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { debug_information_format.name = DEBUG_INFORMATION_FORMAT debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT diff --git a/mkspecs/macx-clang/Info.plist.app b/mkspecs/macx-clang/Info.plist.app index ebd108dadf..4d64a77704 100644 --- a/mkspecs/macx-clang/Info.plist.app +++ b/mkspecs/macx-clang/Info.plist.app @@ -3,17 +3,19 @@ CFBundleExecutable - @EXECUTABLE@ + ${EXECUTABLE_NAME} CFBundleGetInfoString Created by Qt/QMake CFBundleIconFile - @ICON@ + ${ASSETCATALOG_COMPILER_APPICON_NAME} CFBundleIdentifier - @BUNDLEIDENTIFIER@ + ${PRODUCT_BUNDLE_IDENTIFIER} CFBundlePackageType APPL CFBundleSignature - @TYPEINFO@ + ${QMAKE_PKGINFO_TYPEINFO} + LSMinimumSystemVersion + ${MACOSX_DEPLOYMENT_TARGET} NOTE This file was generated by Qt/QMake. NSPrincipalClass diff --git a/mkspecs/macx-clang/Info.plist.lib b/mkspecs/macx-clang/Info.plist.lib index 044cbd3393..ce28365500 100644 --- a/mkspecs/macx-clang/Info.plist.lib +++ b/mkspecs/macx-clang/Info.plist.lib @@ -3,19 +3,19 @@ CFBundleExecutable - @LIBRARY@ + ${EXECUTABLE_NAME} CFBundleGetInfoString Created by Qt/QMake CFBundleIdentifier - @BUNDLEIDENTIFIER@ + ${PRODUCT_BUNDLE_IDENTIFIER} CFBundlePackageType FMWK CFBundleShortVersionString - @SHORT_VERSION@ + ${QMAKE_SHORT_VERSION} CFBundleSignature - @TYPEINFO@ + ${QMAKE_PKGINFO_TYPEINFO} CFBundleVersion - @FULL_VERSION@ + ${QMAKE_FULL_VERSION} NOTE Please, do NOT change this file -- It was generated by Qt/QMake. diff --git a/mkspecs/macx-g++/Info.plist.app b/mkspecs/macx-g++/Info.plist.app index ebd108dadf..4d64a77704 100644 --- a/mkspecs/macx-g++/Info.plist.app +++ b/mkspecs/macx-g++/Info.plist.app @@ -3,17 +3,19 @@ CFBundleExecutable - @EXECUTABLE@ + ${EXECUTABLE_NAME} CFBundleGetInfoString Created by Qt/QMake CFBundleIconFile - @ICON@ + ${ASSETCATALOG_COMPILER_APPICON_NAME} CFBundleIdentifier - @BUNDLEIDENTIFIER@ + ${PRODUCT_BUNDLE_IDENTIFIER} CFBundlePackageType APPL CFBundleSignature - @TYPEINFO@ + ${QMAKE_PKGINFO_TYPEINFO} + LSMinimumSystemVersion + ${MACOSX_DEPLOYMENT_TARGET} NOTE This file was generated by Qt/QMake. NSPrincipalClass diff --git a/mkspecs/macx-g++/Info.plist.lib b/mkspecs/macx-g++/Info.plist.lib index 044cbd3393..ce28365500 100644 --- a/mkspecs/macx-g++/Info.plist.lib +++ b/mkspecs/macx-g++/Info.plist.lib @@ -3,19 +3,19 @@ CFBundleExecutable - @LIBRARY@ + ${EXECUTABLE_NAME} CFBundleGetInfoString Created by Qt/QMake CFBundleIdentifier - @BUNDLEIDENTIFIER@ + ${PRODUCT_BUNDLE_IDENTIFIER} CFBundlePackageType FMWK CFBundleShortVersionString - @SHORT_VERSION@ + ${QMAKE_SHORT_VERSION} CFBundleSignature - @TYPEINFO@ + ${QMAKE_PKGINFO_TYPEINFO} CFBundleVersion - @FULL_VERSION@ + ${QMAKE_FULL_VERSION} NOTE Please, do NOT change this file -- It was generated by Qt/QMake. diff --git a/mkspecs/macx-icc/Info.plist.app b/mkspecs/macx-icc/Info.plist.app index ebd108dadf..4d64a77704 100644 --- a/mkspecs/macx-icc/Info.plist.app +++ b/mkspecs/macx-icc/Info.plist.app @@ -3,17 +3,19 @@ CFBundleExecutable - @EXECUTABLE@ + ${EXECUTABLE_NAME} CFBundleGetInfoString Created by Qt/QMake CFBundleIconFile - @ICON@ + ${ASSETCATALOG_COMPILER_APPICON_NAME} CFBundleIdentifier - @BUNDLEIDENTIFIER@ + ${PRODUCT_BUNDLE_IDENTIFIER} CFBundlePackageType APPL CFBundleSignature - @TYPEINFO@ + ${QMAKE_PKGINFO_TYPEINFO} + LSMinimumSystemVersion + ${MACOSX_DEPLOYMENT_TARGET} NOTE This file was generated by Qt/QMake. NSPrincipalClass diff --git a/mkspecs/macx-icc/Info.plist.lib b/mkspecs/macx-icc/Info.plist.lib index 044cbd3393..ce28365500 100644 --- a/mkspecs/macx-icc/Info.plist.lib +++ b/mkspecs/macx-icc/Info.plist.lib @@ -3,19 +3,19 @@ CFBundleExecutable - @LIBRARY@ + ${EXECUTABLE_NAME} CFBundleGetInfoString Created by Qt/QMake CFBundleIdentifier - @BUNDLEIDENTIFIER@ + ${PRODUCT_BUNDLE_IDENTIFIER} CFBundlePackageType FMWK CFBundleShortVersionString - @SHORT_VERSION@ + ${QMAKE_SHORT_VERSION} CFBundleSignature - @TYPEINFO@ + ${QMAKE_PKGINFO_TYPEINFO} CFBundleVersion - @FULL_VERSION@ + ${QMAKE_FULL_VERSION} NOTE Please, do NOT change this file -- It was generated by Qt/QMake. diff --git a/mkspecs/macx-ios-clang/Info.plist.app b/mkspecs/macx-ios-clang/Info.plist.app index 4a7c527260..1acbf9d768 100644 --- a/mkspecs/macx-ios-clang/Info.plist.app +++ b/mkspecs/macx-ios-clang/Info.plist.app @@ -5,25 +5,27 @@ CFBundleDisplayName ${PRODUCT_NAME} CFBundleExecutable - @EXECUTABLE@ + ${EXECUTABLE_NAME} CFBundleGetInfoString Created by Qt/QMake CFBundleIconFile - @ICON@ + ${ASSETCATALOG_COMPILER_APPICON_NAME} CFBundleIdentifier - @BUNDLEIDENTIFIER@ + ${PRODUCT_BUNDLE_IDENTIFIER} CFBundleName ${PRODUCT_NAME} CFBundlePackageType APPL CFBundleShortVersionString - 1.0 + ${QMAKE_SHORT_VERSION} CFBundleSignature - @TYPEINFO@ + ${QMAKE_PKGINFO_TYPEINFO} CFBundleVersion - 1.0 + ${QMAKE_FULL_VERSION} LSRequiresIPhoneOS + MinimumOSVersion + ${IPHONEOS_DEPLOYMENT_TARGET} NOTE This file was generated by Qt/QMake. UILaunchStoryboardName diff --git a/mkspecs/macx-ios-clang/Info.plist.lib b/mkspecs/macx-ios-clang/Info.plist.lib index 044cbd3393..ce28365500 100644 --- a/mkspecs/macx-ios-clang/Info.plist.lib +++ b/mkspecs/macx-ios-clang/Info.plist.lib @@ -3,19 +3,19 @@ CFBundleExecutable - @LIBRARY@ + ${EXECUTABLE_NAME} CFBundleGetInfoString Created by Qt/QMake CFBundleIdentifier - @BUNDLEIDENTIFIER@ + ${PRODUCT_BUNDLE_IDENTIFIER} CFBundlePackageType FMWK CFBundleShortVersionString - @SHORT_VERSION@ + ${QMAKE_SHORT_VERSION} CFBundleSignature - @TYPEINFO@ + ${QMAKE_PKGINFO_TYPEINFO} CFBundleVersion - @FULL_VERSION@ + ${QMAKE_FULL_VERSION} NOTE Please, do NOT change this file -- It was generated by Qt/QMake. diff --git a/mkspecs/macx-tvos-clang/Info.plist.app b/mkspecs/macx-tvos-clang/Info.plist.app index a034826207..04aef816c2 100644 --- a/mkspecs/macx-tvos-clang/Info.plist.app +++ b/mkspecs/macx-tvos-clang/Info.plist.app @@ -7,7 +7,7 @@ CFBundleDisplayName ${PRODUCT_NAME} CFBundleExecutable - @EXECUTABLE@ + ${EXECUTABLE_NAME} CFBundleGetInfoString Created by Qt/QMake CFBundleIcons @@ -16,25 +16,25 @@ App Icon - Small CFBundleIdentifier - @BUNDLEIDENTIFIER@ + ${PRODUCT_BUNDLE_IDENTIFIER} CFBundleName ${PRODUCT_NAME} CFBundlePackageType APPL CFBundleShortVersionString - 1.0 + ${QMAKE_SHORT_VERSION} CFBundleSignature - @TYPEINFO@ + ${QMAKE_PKGINFO_TYPEINFO} CFBundleSupportedPlatforms AppleTVOS CFBundleVersion - 1.0 + ${QMAKE_FULL_VERSION} LSRequiresIPhoneOS MinimumOSVersion - 9.1 + ${TVOS_DEPLOYMENT_TARGET} NOTE This file was generated by Qt/QMake. diff --git a/mkspecs/macx-tvos-clang/Info.plist.lib b/mkspecs/macx-tvos-clang/Info.plist.lib index 044cbd3393..ce28365500 100644 --- a/mkspecs/macx-tvos-clang/Info.plist.lib +++ b/mkspecs/macx-tvos-clang/Info.plist.lib @@ -3,19 +3,19 @@ CFBundleExecutable - @LIBRARY@ + ${EXECUTABLE_NAME} CFBundleGetInfoString Created by Qt/QMake CFBundleIdentifier - @BUNDLEIDENTIFIER@ + ${PRODUCT_BUNDLE_IDENTIFIER} CFBundlePackageType FMWK CFBundleShortVersionString - @SHORT_VERSION@ + ${QMAKE_SHORT_VERSION} CFBundleSignature - @TYPEINFO@ + ${QMAKE_PKGINFO_TYPEINFO} CFBundleVersion - @FULL_VERSION@ + ${QMAKE_FULL_VERSION} NOTE Please, do NOT change this file -- It was generated by Qt/QMake. diff --git a/mkspecs/macx-watchos-clang/Info.plist.app b/mkspecs/macx-watchos-clang/Info.plist.app index d918704491..47f5a58d5e 100644 --- a/mkspecs/macx-watchos-clang/Info.plist.app +++ b/mkspecs/macx-watchos-clang/Info.plist.app @@ -7,21 +7,23 @@ CFBundleDisplayName ${PRODUCT_NAME} CFBundleExecutable - @EXECUTABLE@ + ${EXECUTABLE_NAME} CFBundleGetInfoString Created by Qt/QMake CFBundleIdentifier - @BUNDLEIDENTIFIER@ + ${PRODUCT_BUNDLE_IDENTIFIER} CFBundleName ${PRODUCT_NAME} CFBundlePackageType APPL CFBundleShortVersionString - 1.0 + ${QMAKE_SHORT_VERSION} CFBundleSignature - @TYPEINFO@ + ${QMAKE_PKGINFO_TYPEINFO} CFBundleVersion - 1.0 + ${QMAKE_FULL_VERSION} + MinimumOSVersion + ${WATCHOS_DEPLOYMENT_TARGET} NOTE This file was generated by Qt/QMake. UISupportedInterfaceOrientations diff --git a/mkspecs/macx-watchos-clang/Info.plist.lib b/mkspecs/macx-watchos-clang/Info.plist.lib index 044cbd3393..ce28365500 100644 --- a/mkspecs/macx-watchos-clang/Info.plist.lib +++ b/mkspecs/macx-watchos-clang/Info.plist.lib @@ -3,19 +3,19 @@ CFBundleExecutable - @LIBRARY@ + ${EXECUTABLE_NAME} CFBundleGetInfoString Created by Qt/QMake CFBundleIdentifier - @BUNDLEIDENTIFIER@ + ${PRODUCT_BUNDLE_IDENTIFIER} CFBundlePackageType FMWK CFBundleShortVersionString - @SHORT_VERSION@ + ${QMAKE_SHORT_VERSION} CFBundleSignature - @TYPEINFO@ + ${QMAKE_PKGINFO_TYPEINFO} CFBundleVersion - @FULL_VERSION@ + ${QMAKE_FULL_VERSION} NOTE Please, do NOT change this file -- It was generated by Qt/QMake. -- cgit v1.2.3 From 907a99f65b88cc5af85127ef8b665b173832b43e Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Tue, 19 Dec 2017 13:53:16 +0200 Subject: Fix license headers Old header.LGPL21 header was used at some files. Replase those with new header.LGPL one Remove old header.LGPL21 Task-number: QTBUG-57147 Change-Id: I650e39024ed4876bba27e954c7d61fdb025b46ef Reviewed-by: Kai Koehne Reviewed-by: Lars Knoll --- mkspecs/integrity-armv8-rcar/qplatformdefs.h | 30 +++++++++++++++++----------- 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/integrity-armv8-rcar/qplatformdefs.h b/mkspecs/integrity-armv8-rcar/qplatformdefs.h index 55afd0c3c7..a743326346 100644 --- a/mkspecs/integrity-armv8-rcar/qplatformdefs.h +++ b/mkspecs/integrity-armv8-rcar/qplatformdefs.h @@ -5,27 +5,33 @@ ** ** This file is part of the qmake spec of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL21$ +** $QT_BEGIN_LICENSE:LGPL$ ** 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 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 Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -- cgit v1.2.3