From 5fd48d78d59128cf57a1c4eae3980c23497a8def Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 17 Dec 2018 16:22:39 +0100 Subject: Bump copyright year to 2019 Task-number: QTBUG-72635 Change-Id: Idc9bd97fe873b332d7ff72cb44a00334a472404f Reviewed-by: Friedemann Kleint Reviewed-by: Alex Blasche Reviewed-by: Paul Wicking --- mkspecs/features/qt_targets.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qt_targets.prf b/mkspecs/features/qt_targets.prf index 317d975b71..b3c289a90b 100644 --- a/mkspecs/features/qt_targets.prf +++ b/mkspecs/features/qt_targets.prf @@ -1,4 +1,4 @@ QMAKE_TARGET_COMPANY = The Qt Company Ltd. isEmpty(QMAKE_TARGET_PRODUCT): QMAKE_TARGET_PRODUCT = Qt5 isEmpty(QMAKE_TARGET_DESCRIPTION): QMAKE_TARGET_DESCRIPTION = C++ Application Development Framework -QMAKE_TARGET_COPYRIGHT = Copyright (C) 2018 The Qt Company Ltd. +QMAKE_TARGET_COPYRIGHT = Copyright (C) 2019 The Qt Company Ltd. -- cgit v1.2.3 From 69bd238ad86abfe725d90707f3b578f5d766ba3c Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 11 Jan 2019 16:10:54 +0100 Subject: Fix resolving of libraries on Apple platforms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Qt couldn't be configured with -system-zlib on macOS, because qmake failed to find "/usr/lib/libz.dylib". The library path is something along the lines of "/Applications/Xcode.app/.../MacOSX10.14.sdk/usr/lib" which doesn't contain "libz.dylib". But it contains "libz.tbd", which is a YAML-file pointing to "/usr/lib/libz.dylib". One can pass the absolute path to this tbd file to the linker, which will then pick up "/usr/lib/libz.dylib". Introduce a new variable QMAKE_EXTENSIONS_AUX_SHLIB, which is a list of auxiliary extensions for shared libs, and add the "tbd" extension to it on macOS. Change-Id: I083b79a69d00232e35f9d6164ffa86cb473f1742 Fixes: QTBUG-72745 Fixes: QTBUG-72964 Reviewed-by: Christian Kandeler Reviewed-by: Tor Arne Vestbø Reviewed-by: Edward Welbourne --- mkspecs/common/mac.conf | 1 + mkspecs/features/qt_configure.prf | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index 61bea952b2..b77494ec9b 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -14,6 +14,7 @@ include(unix.conf) QMAKE_RESOURCE = /Developer/Tools/Rez QMAKE_EXTENSION_SHLIB = dylib +QMAKE_EXTENSIONS_AUX_SHLIB = tbd QMAKE_LIBDIR = # sdk.prf will prefix the proper SDK sysroot diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 87190bc52a..c45439c3ef 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -531,8 +531,11 @@ defineTest(qtConfResolveLibs) { unix { # Under UNIX, we look for actual shared libraries, in addition # to static ones. + shexts = $$QMAKE_EXTENSION_SHLIB $$QMAKE_EXTENSIONS_AUX_SHLIB + for (ext, shexts) { + lcan += $${QMAKE_PREFIX_SHLIB}$${lib}.$${ext} + } lcan += \ - $${QMAKE_PREFIX_SHLIB}$${lib}.$${QMAKE_EXTENSION_SHLIB} \ $${QMAKE_PREFIX_STATICLIB}$${lib}.$${QMAKE_EXTENSION_STATICLIB} } else { # Under Windows, we look only for static libraries, as even for DLLs -- cgit v1.2.3 From af821f79cacbac0be9995a7eb4a0448a9a2958bf Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 16 Jan 2019 11:16:46 +0100 Subject: Remove duplicate windeployqt_clean target That target is added unconditionally at the end of windeployqt.prf. Fixes: QTBUG-73018 Change-Id: I8d29691c30df64bf5383daa10e169985d47592f2 Reviewed-by: Oliver Wolff --- mkspecs/features/win32/windeployqt.prf | 1 - 1 file changed, 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/win32/windeployqt.prf b/mkspecs/features/win32/windeployqt.prf index fb5b2c4234..1929b7000e 100644 --- a/mkspecs/features/win32/windeployqt.prf +++ b/mkspecs/features/win32/windeployqt.prf @@ -10,7 +10,6 @@ build_pass { windeployqt.commands = $$QMAKE_WINDEPLOYQT $$WINDEPLOYQT_OPTIONS -list target $$WINDEPLOYQT_TARGET > $$WINDEPLOYQT_OUTPUT windeployqt_clean.commands = if exist $$WINDEPLOYQT_OUTPUT for /f %i in ($$WINDEPLOYQT_OUTPUT) do $$QMAKE_DEL_FILE %~fi && $$QMAKE_DEL_DIR %~pi - QMAKE_EXTRA_TARGETS += windeployqt_clean DISTCLEAN_DEPS += windeployqt_clean QMAKE_DISTCLEAN += $$WINDEPLOYQT_OUTPUT } else { -- cgit v1.2.3