Commit a30dbcae6b1b5ba0c2bcb821cfc981a6c1582030

Mark Kromis <greybird @Atomik…eath.local>
Thu Sep 24 11:53:25 CEST 2009

Tree SHA1: 1de7228
Parent SHA1: a27c796 (QMake tweaks for compile for iPhone)
raw diff | raw patch

Fixed mac compile

* configure - modified -embedded option for iphone
* qmake/generator/mac/pbuiilder_pbx.cpp
  Skip mac specific if building for phone
* src/corelib/global/global.cpp
  Added mac specific build header
* src/corelib/global/qglobal.h
  Added bsd4 compaitlbe flag for iphone
* src/corelib/io/qfileengine_unix.cpp
  Added mac specific header for mac, ignore phone.

Diff rendering mode:
inline
side by side


299	299	PLATFORM_MAC=no
300	300	PLATFORM_QWS=yes
301	301	fi
	302	elif [ "$PLATFORM_MAC" != "no" ]; then
	303	PLATFORM_X11=no
	304	PLATFORM_MAC=yes
	305	PLATFORM_QWS=no
	306	PLATFORM_IPHONE=yes
302	307	else
303	308	echo "No license exists to enable Qt for Embedded Linux. Disabling."
304	309	CFG_EMBEDDED=no
…	…
1177	1177	PLATFORM_MAC=no
1178	1178	PLATFORM_QWS=yes
1179	1179	fi
	1180	elif [ "$PLATFORM_MAC" != "no" ]; then
	1181	PLATFORM_X11=no
	1182	PLATFORM_MAC=yes
	1183	PLATFORM_QWS=no
	1184	PLATFORM_IPHONE=yes
1180	1185	else
1181	1186	echo "No license exists to enable Qt for Embedded Linux. Disabling."
1182	1187	CFG_EMBEDDED=no
…	…
4309	4309	done
4310	4310	fi
4311	4311	if [ "$PLATFORM_MAC" = "yes" ]; then
4312		echo "export MACOSX_DEPLOYMENT_TARGET = 10.4" >> "$mkfile"
4313		echo "CARBON_LFLAGS =-framework CoreFoundation" >>"$mkfile"
	4312	if [ "$PLATFORM_IPHONE" = "yes" ]; then
	4313	CFG_MAC_COCOA=yes
	4314	echo "export MACOSX_DEPLOYMENT_TARGET = 10.5" >> "$mkfile"
	4315	echo "CARBON_LFLAGS =-framework CoreFoundation" >>"$mkfile"
	4316	else
	4317	echo "export MACOSX_DEPLOYMENT_TARGET = 10.4" >> "$mkfile"
	4318	echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile"
	4319	fi
4314	4320	echo "CARBON_CFLAGS =-fconstant-cfstrings" >>"$mkfile"
4315	4321	EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)"
4316	4322	EXTRA_CFLAGS="$EXTRA_CFLAGS \$(CARBON_CFLAGS)"


53	53	# include <sys/types.h>
54	54	# include <sys/stat.h>
55	55	#endif
56		#ifdef Q_OS_DARWIN
57		// Minimize include for iPhone.
58		#include <CoreFoundation/CFBundle.h>
	56	#if defined(Q_OS_DARWIN) && !defined(Q_OS_IPHONE)
	57	// Skip include for iPhone.
	58	#include <ApplicationServices/ApplicationServices.h>
59	59	#include <private/qcore_mac_p.h>
60	60	#endif
61	61


82	82	_LIT(qt_S60SystemInstallDir, "z:\\system\\install\\");
83	83	#endif
84	84
	85	#if defined(Q_OS_MAC)
	86	#include <CoreServices/CoreServices.h>
	87	#endif
	88
85	89	QT_BEGIN_NAMESPACE
86	90
87	91


177	177	*/
178	178	#if defined(__IPHONE__)
179	179	# define Q_OS_IPHONE
	180	# define Q_OS_BSD4
180	181	# ifdef AUTODETECT_COCOA
181		# warning Using Cocoa
182	182	# define QT_MAC_USE_COCOA 1
183	183	# define QT_BUILD_KEY QT_BUILD_KEY_COCOA
184	184	# endif


62	62	#endif
63	63	#include <errno.h>
64	64	#if !defined(QWS) && defined(Q_OS_MAC)
	65	# include <CoreServices/CoreServices.h>
65	66	# include <private/qcore_mac_p.h>
66	67	#endif
67	68

Commit a30dbcae6b1b5ba0c2bcb821cfc981a6c1582030

Gitorious