diff -r 4ea83c148e84 -r 4203353e74ea qtmobility/features/mobility.prf.template --- a/qtmobility/features/mobility.prf.template Wed Jun 09 10:36:00 2010 +0300 +++ b/qtmobility/features/mobility.prf.template Mon Jun 21 16:36:26 2010 +0300 @@ -18,6 +18,10 @@ contains(MOBILITY, bearer) { DEFINES += QT_MOBILITY_BEARER qtAddLibrary(QtBearer) + !equals(QT_MAJOR_VERSION,4)|!equals(QT_MINOR_VERSION, 6) { + message(Qt Mobility Bearer API is deprecated when using Qt 4.7 or higher.) + message(Please use source compatible replacement Bearer API in QtNetwork.) + } } contains(MOBILITY, publishsubscribe) { @@ -39,9 +43,11 @@ } contains(MOBILITY, multimedia) { - QT += network multimedia + QT += network contains(QT_CONFIG, opengl): QT += opengl - qtAddLibrary(QtMedia) + mac:LIBS += -framework QtMultimedia + else:win32:contains(QT_CONFIG, debug):LIBS += -lQtMultimediad + else:LIBS += -lQtMultimedia } contains(MOBILITY, contacts) { @@ -66,7 +72,7 @@ symbian:contains(CONFIG, mobility):!contains(TARGET.UID3, 0x2002AC89):!contains(TARGET.UID3, 0xE002AC89) { mobility_default_deployment.pkg_prerules += \ "; Default dependency to QtMobility libraries" \ - "(0x2002AC89), 1, 0, 0, {\"QtMobility\"}" + "(0x2002AC89), 1, 0, 1, {\"QtMobility\"}" DEPLOYMENT += mobility_default_deployment }