diff options
| author | Shane Bradley <shane.bradley@nokia.com> | 2011-05-18 18:07:01 +1000 |
|---|---|---|
| committer | Shane Bradley <shane.bradley@nokia.com> | 2011-05-18 18:07:01 +1000 |
| commit | 772cbd997645bc73d0748ee2d048ed38404700f7 (patch) | |
| tree | 340765b3ef2c580107a4d51519231618a1d71570 /features | |
| parent | 1bbaa48ecae658c2cb56c30228166a16131d0bc5 (diff) | |
| parent | f77ee1912f3e104267ecf3740a7eba135f4bd7cc (diff) | |
Merge branch 'master' of /home/shbradle/depot/qtmobility/qtmobility
Conflicts:
plugins/contacts/symbian/contactsmodel/cntplsql/src/clplanalyserproxy.cpp
plugins/contacts/symbian/contactsmodel/groupsql/cntmodel.iby
Diffstat (limited to 'features')
| -rw-r--r-- | features/basic_examples_setup.pri | 1 | ||||
| -rw-r--r-- | features/mobility.prf.template | 9 | ||||
| -rw-r--r-- | features/qtservice.prf | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/features/basic_examples_setup.pri b/features/basic_examples_setup.pri index 963d6966e3..77b9a272f5 100644 --- a/features/basic_examples_setup.pri +++ b/features/basic_examples_setup.pri @@ -51,6 +51,7 @@ maemo6 { DEFINES+= QTM_EXAMPLES_PREFER_LANDSCAPE } maemo5 { + error(Maemo5/Freemantle not supported by QtMobility 1.2+ \(Not building any examples and demos\).) DEFINES+= Q_WS_MAEMO_5 DEFINES+= QTM_EXAMPLES_SMALL_SCREEN DEFINES+= QTM_EXAMPLES_PREFER_LANDSCAPE diff --git a/features/mobility.prf.template b/features/mobility.prf.template index ed42551bae..47ebecd756 100644 --- a/features/mobility.prf.template +++ b/features/mobility.prf.template @@ -5,7 +5,7 @@ defineTest(qtMobilityAddLibrary) { # include paths. It can't help since we haven't installed our headers yet, # and it may hurt since incompatible headers may be present from an # earlier build. - !mobility_build { + !mobility_build:!isEmpty(MOBILITY_INCLUDE) { INCLUDEPATH -= $${MOBILITY_INCLUDE}/$$1 INCLUDEPATH = $${MOBILITY_INCLUDE}/$$1 $$INCLUDEPATH } @@ -56,7 +56,7 @@ contains(MOBILITY, bearer) { } #for includes from src/global -!mobility_build:INCLUDEPATH += $${MOBILITY_INCLUDE}/QtMobility +!mobility_build:!isEmpty(MOBILITY_INCLUDE):INCLUDEPATH += $${MOBILITY_INCLUDE}/QtMobility contains(MOBILITY, publishsubscribe) { qtMobilityAddLibrary(QtPublishSubscribe) @@ -121,9 +121,10 @@ contains(MOBILITY, connectivity) { # Add dependency to QtMobility package to all projects besides QtMobility package itself. # Mobility libs have UID3 0x2002AC89 # self-signed Mobility libs have UID3 0xE002AC89 -symbian:contains(CONFIG, mobility):!isEmpty(default_deployment.pkg_prerules):!contains(TARGET.UID3, 0x2002AC89):!contains(TARGET.UID3, 0xE002AC89) { +symbian:contains(CONFIG, mobility)::contains(default_deployment.pkg_prerules, pkg_depends_qt):!contains(TARGET.UID3, 0x2002AC89):!contains(TARGET.UID3, 0xE002AC89) { + mobility_pkg_name = QtMobility mobility_default_deployment.pkg_prerules += \ "; Default dependency to QtMobility libraries" \ - "(0x2002AC89), 1, 2, 0, {\"QtMobility\"}" + "(0x2002AC89), 1, 2, 0, {$$addLanguageDependentPkgItem(mobility_pkg_name)}" DEPLOYMENT += mobility_default_deployment } diff --git a/features/qtservice.prf b/features/qtservice.prf index 6ae05a619c..ed7f522440 100644 --- a/features/qtservice.prf +++ b/features/qtservice.prf @@ -18,8 +18,8 @@ symbian { qtservice_descriptors = $$QTSERVICE.DESCRIPTOR for(descriptor, qtservice_descriptors) { BASENAME = $$basename(descriptor) - BLD_INF_RULES.prj_exports += "$$descriptor $${EPOCROOT}epoc32/winscw/c/private/2002AC7F/des/$$BASENAME" - BLD_INF_RULES.prj_exports += "$$descriptor $${EPOCROOT}epoc32/data/z/private/2002AC7F/des/$$BASENAME" + BLD_INF_RULES.prj_exports += "$$descriptor /epoc32/winscw/c/private/2002AC7F/des/$$BASENAME" + BLD_INF_RULES.prj_exports += "$$descriptor /epoc32/data/z/private/2002AC7F/des/$$BASENAME" } symbian-sbsv2{ |