Commit a27c79673fba220efbfab49c31624184eaa3eeeb

Mark Kromis <greybird @Atomik…eath.local>
Tue Sep 22 09:29:38 GMT 2009

Tree SHA1: ad9d2a7
Parent SHA1: ccaabe9 (Small optimisation in QFontMetrics multi-length-string)
raw diff | raw patch

QMake tweaks for compile for iPhone

* configure - Modify to use only CoreFoundation
* qmake/generators/mac/pbuilder_pbx.cpp 
  use only CoreFoundation, and skip
  autodetection with section with LS services

* src/corelib/global/qglobal.h include iphone id
* src/corelib/global/qcore_mac_p.h
  Use only CoreFoundation

Diff rendering mode:
inline
side by side


4300	4300	fi
4301	4301	if [ "$PLATFORM_MAC" = "yes" ]; then
4302	4302	echo "export MACOSX_DEPLOYMENT_TARGET = 10.4" >> "$mkfile"
4303		echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile"
	4303	echo "CARBON_LFLAGS =-framework CoreFoundation" >>"$mkfile"
4304	4304	echo "CARBON_CFLAGS =-fconstant-cfstrings" >>"$mkfile"
4305	4305	EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)"
4306	4306	EXTRA_CFLAGS="$EXTRA_CFLAGS \$(CARBON_CFLAGS)"


38	38	** $QT_END_LICENSE$
39	39	**
40	40	****************************************************************************/
41
	41	// platformdefs needed for iphone target inclusions
	42	#include "qplatformdefs.h"
42	43	#include "pbuilder_pbx.h"
43	44	#include "option.h"
44	45	#include "meta.h"
…	…
54	54	# include <sys/stat.h>
55	55	#endif
56	56	#ifdef Q_OS_DARWIN
57		#include <ApplicationServices/ApplicationServices.h>
	57	// Minimize include for iPhone.
	58	#include <CoreFoundation/CFBundle.h>
58	59	#include <private/qcore_mac_p.h>
59	60	#endif
60	61
…	…
1691	1691	} else {
1692	1692	QString version, version_plist = project->first("QMAKE_PBUILDER_VERSION_PLIST");
1693	1693	if(version_plist.isEmpty()) {
1694		#ifdef Q_OS_DARWIN
	1694
	1695	// iPhone does not have LSFindApplicaionForInfo, so use legacy section
	1696	#if defined(Q_OS_DARWIN) && !defined(Q_OS_IPHONE)
1695	1697	ret = QLatin1String("34");
1696	1698	QCFType<CFURLRef> cfurl;
1697	1699	OSStatus err = LSFindApplicationForInfo(0, CFSTR("com.apple.Xcode"), 0, 0, &cfurl);


143	143	/*
144	144	The operating system, must be one of: (Q_OS_x)
145	145
	146	IPHONE - iPhone OS
146	147	DARWIN - Darwin OS (synonym for Q_OS_MAC)
147	148	SYMBIAN - Symbian
148	149	MSDOS - MS-DOS and Windows
…	…
175	175	BSD4 - Any BSD 4.4 system
176	176	UNIX - Any UNIX BSD/SYSV system
177	177	*/
178
179		#if defined(__APPLE__) && (defined(__GNUC__) \|\| defined(__xlC__) \|\| defined(__xlc__))
	178	#if defined(__IPHONE__)
	179	# define Q_OS_IPHONE
	180	# ifdef AUTODETECT_COCOA
	181	# warning Using Cocoa
	182	# define QT_MAC_USE_COCOA 1
	183	# define QT_BUILD_KEY QT_BUILD_KEY_COCOA
	184	# endif
	185	#elif defined(__APPLE__) && (defined(__GNUC__) \|\| defined(__xlC__) \|\| defined(__xlc__))
180	186	# define Q_OS_DARWIN
181	187	# define Q_OS_BSD4
182	188	# ifdef __LP64__


68	68	# undef qDebug
69	69	#endif
70	70
71		#include <ApplicationServices/ApplicationServices.h>
	71	#include <CoreFoundation/CoreFoundation.h>
72	72
73	73	#undef DEBUG
74	74	#ifdef OLD_DEBUG

Commit a27c79673fba220efbfab49c31624184eaa3eeeb

Comments

Add a new comment:

Add your comment