diff options
-rw-r--r-- | mkspecs/common/uikit/clang.conf (renamed from mkspecs/common/ios/clang.conf) | 4 | ||||
-rw-r--r-- | mkspecs/common/uikit/qmake.conf (renamed from mkspecs/common/ios/qmake.conf) | 2 | ||||
-rw-r--r-- | mkspecs/macx-ios-clang/qmake.conf | 4 | ||||
-rw-r--r-- | mkspecs/macx-tvos-clang/qmake.conf | 4 | ||||
-rw-r--r-- | mkspecs/macx-watchos-clang/qmake.conf | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/mkspecs/common/ios/clang.conf b/mkspecs/common/uikit/clang.conf index f45b89665f..0c22282c79 100644 --- a/mkspecs/common/ios/clang.conf +++ b/mkspecs/common/uikit/clang.conf @@ -1,8 +1,8 @@ # -# compiler settings for iOS clang compilers +# compiler settings for iOS/tvOS/watchOS clang compilers # -# iOS build flags +# build flags QMAKE_IOS_CFLAGS += -fvisibility=hidden -fpascal-strings -fmessage-length=0 QMAKE_IOS_CFLAGS += -Wno-trigraphs -Wreturn-type -Wparentheses -Wswitch -Wno-unused-parameter -Wunused-variable -Wunused-value -Wno-shorten-64-to-32 -Wno-sign-conversion QMAKE_IOS_CXXFLAGS += -fvisibility-inlines-hidden diff --git a/mkspecs/common/ios/qmake.conf b/mkspecs/common/uikit/qmake.conf index daf66ac5ea..e2e166cdad 100644 --- a/mkspecs/common/ios/qmake.conf +++ b/mkspecs/common/uikit/qmake.conf @@ -1,5 +1,5 @@ # -# Common build settings for all iOS configurations +# Common build settings for all iOS/tvOS/watchOS configurations # QT_QPA_DEFAULT_PLATFORM = ios diff --git a/mkspecs/macx-ios-clang/qmake.conf b/mkspecs/macx-ios-clang/qmake.conf index 94eff0d237..a119ca6fa2 100644 --- a/mkspecs/macx-ios-clang/qmake.conf +++ b/mkspecs/macx-ios-clang/qmake.conf @@ -14,7 +14,7 @@ include(../common/ios.conf) include(../common/gcc-base-mac.conf) include(../common/clang.conf) include(../common/clang-mac.conf) -include(../common/ios/clang.conf) -include(../common/ios/qmake.conf) +include(../common/uikit/clang.conf) +include(../common/uikit/qmake.conf) load(qt_config) diff --git a/mkspecs/macx-tvos-clang/qmake.conf b/mkspecs/macx-tvos-clang/qmake.conf index f389382450..57efe2bba0 100644 --- a/mkspecs/macx-tvos-clang/qmake.conf +++ b/mkspecs/macx-tvos-clang/qmake.conf @@ -15,7 +15,7 @@ include(../common/tvos.conf) include(../common/gcc-base-mac.conf) include(../common/clang.conf) include(../common/clang-mac.conf) -include(../common/ios/clang.conf) -include(../common/ios/qmake.conf) +include(../common/uikit/clang.conf) +include(../common/uikit/qmake.conf) load(qt_config) diff --git a/mkspecs/macx-watchos-clang/qmake.conf b/mkspecs/macx-watchos-clang/qmake.conf index bb9ab703b7..bfb6fc4e28 100644 --- a/mkspecs/macx-watchos-clang/qmake.conf +++ b/mkspecs/macx-watchos-clang/qmake.conf @@ -15,7 +15,7 @@ include(../common/watchos.conf) include(../common/gcc-base-mac.conf) include(../common/clang.conf) include(../common/clang-mac.conf) -include(../common/ios/clang.conf) -include(../common/ios/qmake.conf) +include(../common/uikit/clang.conf) +include(../common/uikit/qmake.conf) load(qt_config) |