AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iOS: fix build issue, dont link against cocoa

Browse Source 
Make sure the libraries dont depend on Cocoa. This will be
picked up by libtool, and make all apps and examples link
against cocoa too (which will ofcourse fail)

Change-Id: I5654bb08c4ed376fc7ee74da422d903270a8af38
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
This commit is contained in:
Richard Moe Gustavsen 2012-10-29 13:28:10 +01:00 committed by Tor Arne Vestbø
parent 8cbdb25ee6
commit 5d6c57fcba
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/gui.pro
View File

@ -18,9 +18,7 @@ testcocoon {
load(testcocoon)
}
mac {
LIBS_PRIVATE += -framework Cocoa
}
mac:!ios: LIBS_PRIVATE += -framework Cocoa
CONFIG += simd

2
src/plugins/platforms/ios/qioseventdispatcher.h
View File

@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the plugins of the Qt Toolkit.

2
src/plugins/platforms/ios/qioseventdispatcher.mm
View File

@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the plugins of the Qt Toolkit.

2
src/widgets/kernel/mac.pri
View File

@ -1,4 +1,4 @@
!x11::mac {
!x11:mac:!ios {
LIBS_PRIVATE += -framework Carbon -framework Cocoa -lz
*-mwerks:INCLUDEPATH += compat
}