Modified project files to be iOS compatible.

Removed some MacOS source code files from iOS build. Use unix standard
paths for now (iOS-specific implementation will come later).

Change-Id: I8b2731b431b3a379a1ec4ec07d227e886209e3e9
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
bb10
Qt4iOS 2012-03-24 14:00:56 +00:00 committed by Qt by Nokia
parent 89f6997e80
commit 62cda62c0c
6 changed files with 17 additions and 13 deletions

View File

@ -103,7 +103,11 @@ win32 {
SOURCES += io/qsettings_mac.cpp
}
macx-*: {
SOURCES += io/qstandardpaths_mac.cpp
contains(QT_CONFIG, coreservices) {
SOURCES += io/qstandardpaths_mac.cpp
} else {
SOURCES += io/qstandardpaths_unix.cpp
}
} else:standardpathsjson {
SOURCES += io/qstandardpaths_json.cpp
} else:blackberry {

View File

@ -34,6 +34,6 @@ win32: {
integrity:SOURCES += kernel/qdnslookup_unix.cpp kernel/qhostinfo_unix.cpp kernel/qnetworkinterface_unix.cpp
mac:LIBS_PRIVATE += -framework SystemConfiguration -framework CoreFoundation -framework CoreServices
mac:SOURCES += kernel/qnetworkproxy_mac.cpp
mac:contains(QT_CONFIG, coreservices):SOURCES += kernel/qnetworkproxy_mac.cpp
else:win32:SOURCES += kernel/qnetworkproxy_win.cpp
else:SOURCES += kernel/qnetworkproxy_generic.cpp

View File

@ -1,4 +1,4 @@
mac {
mac:contains(QT_CONFIG, coreservices) {
INCLUDEPATH += $$PWD
HEADERS += \

View File

@ -1,10 +1,12 @@
contains(QT_CONFIG,opengles2) {
HEADERS += \
$$PWD/qeglconvenience_p.h \
$$PWD/qeglplatformcontext_p.h
SOURCES += \
$$PWD/qeglconvenience.cpp \
$$PWD/qeglplatformcontext.cpp
contains(QT_CONFIG,egl) {
HEADERS += \
$$PWD/qeglconvenience_p.h \
$$PWD/qeglplatformcontext_p.h
SOURCES += \
$$PWD/qeglconvenience.cpp \
$$PWD/qeglplatformcontext.cpp
}
contains(QT_CONFIG,xlib) {
HEADERS += \

View File

@ -6,9 +6,7 @@ contains(QT_CONFIG, xcb) {
SUBDIRS += xcb
}
mac {
SUBDIRS += cocoa
}
mac:contains(QT_CONFIG, coreservices): SUBDIRS += cocoa
win32: SUBDIRS += windows

View File

@ -37,7 +37,7 @@ contains( styles, all ) {
styles = mac windows windowsxp windowsvista
}
!macx-*:styles -= mac
!macx-*|!contains(QT_CONFIG, coreservices):styles -= mac
x11{
QMAKE_CXXFLAGS += $$QT_CFLAGS_QGTKSTYLE