From 62cda62c0c70a75de3f87cbd802a1be24d27ef18 Mon Sep 17 00:00:00 2001 From: Qt4iOS Date: Sat, 24 Mar 2012 14:00:56 +0000 Subject: [PATCH] Modified project files to be iOS compatible. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- src/corelib/io/io.pri | 6 +++++- src/network/kernel/kernel.pri | 2 +- src/platformsupport/cglconvenience/cglconvenience.pri | 2 +- src/platformsupport/eglconvenience/eglconvenience.pri | 14 ++++++++------ src/plugins/platforms/platforms.pro | 4 +--- src/widgets/styles/styles.pri | 2 +- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri index d24ea66..533938c 100644 --- a/src/corelib/io/io.pri +++ b/src/corelib/io/io.pri @@ -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 { diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri index f9ea606..f389809 100644 --- a/src/network/kernel/kernel.pri +++ b/src/network/kernel/kernel.pri @@ -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 diff --git a/src/platformsupport/cglconvenience/cglconvenience.pri b/src/platformsupport/cglconvenience/cglconvenience.pri index a367e4d..d4c1494 100644 --- a/src/platformsupport/cglconvenience/cglconvenience.pri +++ b/src/platformsupport/cglconvenience/cglconvenience.pri @@ -1,4 +1,4 @@ -mac { +mac:contains(QT_CONFIG, coreservices) { INCLUDEPATH += $$PWD HEADERS += \ diff --git a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri index f8500e2..db3ec20 100644 --- a/src/platformsupport/eglconvenience/eglconvenience.pri +++ b/src/platformsupport/eglconvenience/eglconvenience.pri @@ -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 += \ diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro index 442390f..1321270 100644 --- a/src/plugins/platforms/platforms.pro +++ b/src/plugins/platforms/platforms.pro @@ -6,9 +6,7 @@ contains(QT_CONFIG, xcb) { SUBDIRS += xcb } -mac { - SUBDIRS += cocoa -} +mac:contains(QT_CONFIG, coreservices): SUBDIRS += cocoa win32: SUBDIRS += windows diff --git a/src/widgets/styles/styles.pri b/src/widgets/styles/styles.pri index ef6827f..8f6996c 100644 --- a/src/widgets/styles/styles.pri +++ b/src/widgets/styles/styles.pri @@ -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 -- 2.7.4