Merge pull request #182035 from veprbl/pr/qt515_base_fix
qt515: fix on darwin
This commit is contained in:
commit
4cf70782ef
|
@ -30,7 +30,54 @@ diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/defaul
|
|||
index 92a9112bca..b80ec1e801 100644
|
||||
--- a/mkspecs/features/mac/default_post.prf
|
||||
+++ b/mkspecs/features/mac/default_post.prf
|
||||
@@ -68,212 +68,6 @@ qt {
|
||||
@@ -1,9 +1,5 @@
|
||||
load(default_post)
|
||||
|
||||
-# Recompute SDK version in case the user set it explicitly
|
||||
-sdk_version = $$QMAKE_MAC_SDK_VERSION
|
||||
-QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion)
|
||||
-
|
||||
contains(TEMPLATE, .*app) {
|
||||
!macx-xcode:if(isEmpty(BUILDS)|build_pass) {
|
||||
# Detect changes to the platform SDK
|
||||
@@ -16,36 +12,6 @@ contains(TEMPLATE, .*app) {
|
||||
QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk)
|
||||
}
|
||||
|
||||
- # Detect incompatible SDK versions
|
||||
-
|
||||
- isEmpty(QT_MAC_SDK_VERSION_MIN): \
|
||||
- QT_MAC_SDK_VERSION_MIN = $$QT_MAC_SDK_VERSION
|
||||
-
|
||||
- !versionAtLeast(QMAKE_MAC_SDK_VERSION, $$QT_MAC_SDK_VERSION_MIN): \
|
||||
- warning("Qt requires at least version $$QT_MAC_SDK_VERSION_MIN of the platform SDK," \
|
||||
- "you're building against version $${QMAKE_MAC_SDK_VERSION}. Please upgrade.")
|
||||
-
|
||||
- !isEmpty(QT_MAC_SDK_VERSION_MAX) {
|
||||
- # For Qt developers only
|
||||
- !isEmpty($$list($$(QT_MAC_SDK_NO_VERSION_CHECK))): \
|
||||
- CONFIG += sdk_no_version_check
|
||||
-
|
||||
- QMAKE_MAC_SDK_MAJOR_VERSION = $$replace(QMAKE_MAC_SDK_VERSION, "(\\d+)(\\.\\d+)(\\.\\d+)?", \\1)
|
||||
-
|
||||
- !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_MAJOR_VERSION, $$QT_MAC_SDK_VERSION_MAX) {
|
||||
- warning("Qt has only been tested with version $$QT_MAC_SDK_VERSION_MAX"\
|
||||
- "of the platform SDK, you're using $${QMAKE_MAC_SDK_MAJOR_MINOR_VERSION}.")
|
||||
- warning("This is an unsupported configuration. You may experience build issues," \
|
||||
- "and by using")
|
||||
- warning("the $$QMAKE_MAC_SDK_VERSION SDK you are opting in to new features" \
|
||||
- "that Qt has not been prepared for.")
|
||||
-
|
||||
- warning("Please downgrade the SDK you use to build your app to version" \
|
||||
- "$$QT_MAC_SDK_VERSION_MAX, or configure")
|
||||
- warning("with CONFIG+=sdk_no_version_check when running qmake" \
|
||||
- "to silence this warning.")
|
||||
- }
|
||||
- }
|
||||
}
|
||||
|
||||
!no_objective_c:CONFIG += objective_c
|
||||
@@ -73,212 +39,6 @@ qt {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -308,37 +355,6 @@ index e3534561a5..3b01424e67 100644
|
|||
-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
|
||||
diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk
|
||||
--- a/mkspecs/features/mac/sdk.mk
|
||||
+++ b/mkspecs/features/mac/sdk.mk
|
||||
@@ -1,25 +0,0 @@
|
||||
-
|
||||
-ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),)
|
||||
- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>/dev/null
|
||||
- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND))
|
||||
- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION))
|
||||
- # We don't want to complain about out of date SDK unless the target needs to be remade.
|
||||
- # This covers use-cases such as running 'make check' after moving the build to a
|
||||
- # computer without Xcode or with a different Xcode version.
|
||||
- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0)
|
||||
- ifeq ($(TARGET_UP_TO_DATE),0)
|
||||
- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),)
|
||||
- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.)
|
||||
- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),)
|
||||
- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.)
|
||||
- else ifneq ($(CURRENT_MAC_SDK_VERSION),)
|
||||
- $(info The $(EXPORT_QMAKE_MAC_SDK) platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).)
|
||||
- else
|
||||
- $(info Unknown error resolving current platform SDK version.)
|
||||
- endif
|
||||
- $(info This requires a fresh build of your project. Please wipe the build directory)
|
||||
- ifneq ($(EXPORT__QMAKE_STASH_),)
|
||||
- $(info including the qmake cache in $(EXPORT__QMAKE_STASH_))
|
||||
- endif
|
||||
- $(error ^)
|
||||
- endif
|
||||
- endif
|
||||
-endif
|
||||
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
|
||||
deleted file mode 100644
|
||||
index 3a9c2778bb..0000000000
|
||||
|
@ -406,6 +422,14 @@ index 3a9c2778bb..0000000000
|
|||
- $$tool = $$sysrooted $$member(value, 1, -1)
|
||||
- cache($$tool_variable, set stash, $$tool)
|
||||
-}
|
||||
--
|
||||
2.25.4
|
||||
|
||||
diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf
|
||||
deleted file mode 100644
|
||||
index df191eb13c..0000000000
|
||||
--- a/mkspecs/features/mac/toolchain.prf
|
||||
+++ /dev/null
|
||||
@@ -1,5 +0,0 @@
|
||||
-# Ensure that we process sdk.prf first, as it will update QMAKE_CXX,
|
||||
-# which the default path determination uses.
|
||||
-sdk: load(sdk)
|
||||
-
|
||||
-load(toolchain)
|
||||
|
|
|
@ -195,7 +195,10 @@ stdenv.mkDerivation {
|
|||
# ignore "is only available on macOS 10.12.2 or newer" in obj-c code
|
||||
"-Wno-error=unguarded-availability"
|
||||
]
|
||||
++ lib.optionals withGtk3 [
|
||||
++ lib.optionals ((compareVersion "5.15.0" >= 0) && stdenv.isDarwin) [
|
||||
# .moc/moc_qprintdialog.cpp:96:31: error: no member named '_q_togglePageSetCombo' in 'QPrintDialogPrivate'
|
||||
"-DQ_OS_MAC"
|
||||
] ++ lib.optionals withGtk3 [
|
||||
''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"''
|
||||
''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"''
|
||||
]
|
||||
|
|
Loading…
Reference in a new issue