equal
deleted
inserted
replaced
16 QMAKE_RPATHDIR+=$${MOBILITY_LIB} |
16 QMAKE_RPATHDIR+=$${MOBILITY_LIB} |
17 |
17 |
18 contains(MOBILITY, bearer) { |
18 contains(MOBILITY, bearer) { |
19 DEFINES += QT_MOBILITY_BEARER |
19 DEFINES += QT_MOBILITY_BEARER |
20 qtAddLibrary(QtBearer) |
20 qtAddLibrary(QtBearer) |
|
21 !equals(QT_MAJOR_VERSION,4)|!equals(QT_MINOR_VERSION, 6) { |
|
22 message(Qt Mobility Bearer API is deprecated when using Qt 4.7 or higher.) |
|
23 message(Please use source compatible replacement Bearer API in QtNetwork.) |
|
24 } |
21 } |
25 } |
22 |
26 |
23 contains(MOBILITY, publishsubscribe) { |
27 contains(MOBILITY, publishsubscribe) { |
24 qtAddLibrary(QtPublishSubscribe) |
28 qtAddLibrary(QtPublishSubscribe) |
25 } |
29 } |
37 QT += network |
41 QT += network |
38 qtAddLibrary(QtSystemInfo) |
42 qtAddLibrary(QtSystemInfo) |
39 } |
43 } |
40 |
44 |
41 contains(MOBILITY, multimedia) { |
45 contains(MOBILITY, multimedia) { |
42 QT += network multimedia |
46 QT += network |
43 contains(QT_CONFIG, opengl): QT += opengl |
47 contains(QT_CONFIG, opengl): QT += opengl |
44 qtAddLibrary(QtMedia) |
48 mac:LIBS += -framework QtMultimedia |
|
49 else:win32:contains(QT_CONFIG, debug):LIBS += -lQtMultimediad |
|
50 else:LIBS += -lQtMultimedia |
45 } |
51 } |
46 |
52 |
47 contains(MOBILITY, contacts) { |
53 contains(MOBILITY, contacts) { |
48 qtAddLibrary(QtContacts) |
54 qtAddLibrary(QtContacts) |
49 } |
55 } |
64 # Mobility libs have UID3 0x2002AC89 |
70 # Mobility libs have UID3 0x2002AC89 |
65 # self-signed Mobility libs have UID3 0xE002AC89 |
71 # self-signed Mobility libs have UID3 0xE002AC89 |
66 symbian:contains(CONFIG, mobility):!contains(TARGET.UID3, 0x2002AC89):!contains(TARGET.UID3, 0xE002AC89) { |
72 symbian:contains(CONFIG, mobility):!contains(TARGET.UID3, 0x2002AC89):!contains(TARGET.UID3, 0xE002AC89) { |
67 mobility_default_deployment.pkg_prerules += \ |
73 mobility_default_deployment.pkg_prerules += \ |
68 "; Default dependency to QtMobility libraries" \ |
74 "; Default dependency to QtMobility libraries" \ |
69 "(0x2002AC89), 1, 0, 0, {\"QtMobility\"}" |
75 "(0x2002AC89), 1, 0, 1, {\"QtMobility\"}" |
70 DEPLOYMENT += mobility_default_deployment |
76 DEPLOYMENT += mobility_default_deployment |
71 } |
77 } |
72 |
78 |