diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-01 10:27:41 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-02 09:24:11 +0100 |
| commit | d7e4980132057aa10e54137114bf65e06c455030 (patch) | |
| tree | 9d6ae36efa0cf84a612bfec6cf3dd2ea7f7e3446 /mkspecs/features/uikit/sdk.prf | |
| parent | 44c402b4bfba44480382244b8409fb3cf34d7ac1 (diff) | |
| parent | a732576a66ff2bbd9c0b41cd5f3505a4d2fbf043 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Blacklist tst_QMenuBar::taskQTBUG46812_doNotLeaveMenubarHighlighted() on macOS.
Conflicts:
mkspecs/features/mac/default_post.prf
mkspecs/features/mac/sdk.prf
mkspecs/features/uikit/default_post.prf
mkspecs/features/uikit/sdk.prf
src/angle/src/libEGL/libEGL.pro
src/platformsupport/fontdatabases/fontdatabases.pro
src/platformsupport/platformsupport.pro
src/plugins/platforms/cocoa/qnswindowdelegate.mm
src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp
src/plugins/platforms/ios/ios.pro
src/plugins/platforms/ios/kernel.pro
tests/auto/widgets/widgets/qmenubar/BLACKLIST
tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
Task-number: QTBUG-56853
Change-Id: If58785210feee3550892fc7768cce90e75a2416c
Diffstat (limited to 'mkspecs/features/uikit/sdk.prf')
| -rw-r--r-- | mkspecs/features/uikit/sdk.prf | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/mkspecs/features/uikit/sdk.prf b/mkspecs/features/uikit/sdk.prf index 0ab553f587..0bfc26211a 100644 --- a/mkspecs/features/uikit/sdk.prf +++ b/mkspecs/features/uikit/sdk.prf @@ -1,15 +1,3 @@ - -# In case the user sets the SDK manually -contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*) { - !isEmpty(QT_VERSION):qtConfig(simulator_and_device): \ - error("Simulator is handled automatically for simulator_and_device") - - CONFIG += simulator $${simulator.sdk} -} - -build_pass:!simulator_and_device:simulator: \ - QMAKE_MAC_SDK ~= s,^$${device.sdk},$${simulator.sdk}, - load(sdk) macx-xcode { |