diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-13 09:49:38 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-13 09:49:38 +0200 |
| commit | dfc177e3a99dd593db4b1e9445d6243ce75ebf07 (patch) | |
| tree | 4e33c7be90a44642e672fff22ea163b500ff3aef /mkspecs/common | |
| parent | 72efb2e6f4af2fd909daaf9104f09fd1425acfb0 (diff) | |
| parent | 1d6eb70dcec105af28d6a5e9b59d56c895c70389 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
qmake/library/qmakeevaluator.cpp
(cherry picked from commit 1af6dc2c8fb4d91400fddc5050166f972ae57c9a in qttools)
src/corelib/kernel/qcore_mac_objc.mm
src/gui/painting/qcolor.h
src/plugins/platforms/cocoa/qcocoawindow.mm
Change-Id: I5b3ec468a5a9a73911b528d3d24ff8e19f339f31
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/linux.conf | 1 | ||||
| -rw-r--r-- | mkspecs/common/mac.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/qcc-base-qnx.conf | 3 | ||||
| -rw-r--r-- | mkspecs/common/uikit/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in | 2 |
5 files changed, 3 insertions, 7 deletions
diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf index 1a39c88425..13916a5646 100644 --- a/mkspecs/common/linux.conf +++ b/mkspecs/common/linux.conf @@ -36,7 +36,6 @@ QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 QMAKE_LIBS_OPENVG = -lOpenVG QMAKE_LIBS_THREAD = -lpthread -QMAKE_CFLAGS_WAYLAND = QMAKE_INCDIR_WAYLAND = QMAKE_LIBS_WAYLAND_CLIENT = -lwayland-client QMAKE_LIBS_WAYLAND_SERVER = -lwayland-server diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index 56b9574e19..5208379f9a 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -33,6 +33,8 @@ QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL QMAKE_LIBS_THREAD = +QMAKE_ACTOOL = actool + QMAKE_DSYMUTIL = dsymutil QMAKE_STRIP = strip QMAKE_STRIPFLAGS_LIB += -S -x diff --git a/mkspecs/common/qcc-base-qnx.conf b/mkspecs/common/qcc-base-qnx.conf index 7101435cb5..624bdd3656 100644 --- a/mkspecs/common/qcc-base-qnx.conf +++ b/mkspecs/common/qcc-base-qnx.conf @@ -6,9 +6,6 @@ include(qcc-base.conf) QMAKE_PLATFORM = qnx $$QMAKE_PLATFORM -#Choose qnx QPA Plugin as default -QT_QPA_DEFAULT_PLATFORM = qnx - QMAKE_LFLAGS_SHLIB += -shared QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME += -Wl,-soname, diff --git a/mkspecs/common/uikit/qmake.conf b/mkspecs/common/uikit/qmake.conf index e2e166cdad..45a4f0c806 100644 --- a/mkspecs/common/uikit/qmake.conf +++ b/mkspecs/common/uikit/qmake.conf @@ -2,8 +2,6 @@ # Common build settings for all iOS/tvOS/watchOS configurations # -QT_QPA_DEFAULT_PLATFORM = ios - QMAKE_XCODE_CODE_SIGN_IDENTITY = "iPhone Developer" # iOS build tools diff --git a/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in index 235fe96794..b989f41efe 100644 --- a/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in +++ b/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in @@ -1,5 +1,5 @@ <?xml version=\"1.0\" encoding=\"utf-8\"?> -<Package xmlns=\"http://schemas.microsoft.com/appx/2010/manifest\" xmlns:m3=\"http://schemas.microsoft.com/appx/2014/manifest\" xmlns:mp=\"http://schemas.microsoft.com/appx/2014/phone/manifest\"> +<Package xmlns=\"http://schemas.microsoft.com/appx/2010/manifest\" xmlns:m2=\"http://schemas.microsoft.com/appx/2013/manifest\" xmlns:m3=\"http://schemas.microsoft.com/appx/2014/manifest\" xmlns:mp=\"http://schemas.microsoft.com/appx/2014/phone/manifest\"> <Identity Name=\"$${WINRT_MANIFEST.identity}\" ProcessorArchitecture=\"$${WINRT_MANIFEST.architecture}\" |