1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move common/ios configurations into common/uikit

Browse Source 
These actually affect all UIKit platforms (tvOS, watchOS), not just iOS.

Change-Id: I2b45ebecb10d11e33d301071093b5342ce101816
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Jake Petroules 2016-08-19 18:20:15 -07:00
parent e0e9e196a7
commit 0b9acb3e32
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mkspecs/common/ios/clang.conf → mkspecs/common/uikit/clang.conf
View File

@ -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

2
mkspecs/common/ios/qmake.conf → mkspecs/common/uikit/qmake.conf
View File

@ -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

4
mkspecs/macx-ios-clang/qmake.conf
View File

@ -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)

4
mkspecs/macx-tvos-clang/qmake.conf
View File

@ -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)

4
mkspecs/macx-watchos-clang/qmake.conf
View File

@ -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)