From 969adab8f0b7be9321be7210e05db494a8b785fe Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Thu, 24 Jun 2010 14:03:59 +1000 Subject: Import Bluetooth API. --- examples/examples.pro | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'examples/examples.pro') diff --git a/examples/examples.pro b/examples/examples.pro index 15893a6425..b027c0971f 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -94,5 +94,10 @@ contains(mobility_modules,sensors) { SUBDIRS += sensors } +# Connectivity +contains(mobility_modules,connectivity) { + SUBDIRS += btscanner btchat +} + sources.path = $$QT_MOBILITY_PREFIX/bin INSTALLS += sources -- cgit v1.2.3 From 95810abca1b35ab3640a4331b20f96b2e36af650 Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Thu, 24 Jun 2010 16:15:46 +1000 Subject: Import NFC API. --- examples/examples.pro | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'examples/examples.pro') diff --git a/examples/examples.pro b/examples/examples.pro index 15893a6425..c7a4988efc 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -94,5 +94,9 @@ contains(mobility_modules,sensors) { SUBDIRS += sensors } +# Connectivity +contains(mobility_modules,connectivity) { +} + sources.path = $$QT_MOBILITY_PREFIX/bin INSTALLS += sources -- cgit v1.2.3 From fb349585d08b74623826391c65f241ed2fe08778 Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Tue, 19 Oct 2010 18:07:46 +1000 Subject: Add NFC example. --- examples/examples.pro | 1 + 1 file changed, 1 insertion(+) (limited to 'examples/examples.pro') diff --git a/examples/examples.pro b/examples/examples.pro index a26d084fd1..6d5e6f2e0a 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -145,6 +145,7 @@ contains(mobility_modules, feedback) { # Connectivity contains(mobility_modules,connectivity) { + SUBDIRS += connectivity } sources.path = $$QT_MOBILITY_EXAMPLES -- cgit v1.2.3 From 3293df3447fd964d9d6c7ae67b0f147561d980c7 Mon Sep 17 00:00:00 2001 From: David Laing Date: Tue, 2 Nov 2010 11:08:53 +1000 Subject: Attempt to get location examples using the correct Bearer code. For Qt 4.6.x the Qt Mobility Bearer code should be used, whereas with Qt 4.7.0 onwards the Bearer code from Qt should be used. --- examples/examples.pro | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'examples/examples.pro') diff --git a/examples/examples.pro b/examples/examples.pro index b85cbdd9b0..4f531fd8c8 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -33,22 +33,18 @@ contains(mobility_modules,location) { SUBDIRS += landmarkbrowser } -# contains(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 6) { -# SUBDIRS += geoservicedemo \ -# mapviewer -# -# } else { -# contains(mobility_modules,bearer) { -# SUBDIRS += geoservicedemo \ -# mapviewer -# } -# } - - contains(mobility_modules,bearer) { - SUBDIRS += flickrdemo \ + equals(QT_MAJOR_VERSION, 4):lessThan(QT_MINOR_VERSION, 7) { + contains(mobility_modules,bearer) { + SUBDIRS += flickrdemo \ + geoservicedemo \ + mapviewer + } + } else { + SUBDIRS += flickrdemo \ geoservicedemo \ mapviewer - } + } + contains(QT_CONFIG, declarative) { SUBDIRS += declarative-location } -- cgit v1.2.3 From 7c69b7dd84c0d0e42cf6fe71f19500a63cb57975 Mon Sep 17 00:00:00 2001 From: Andrew Stanley-Jones Date: Fri, 5 Nov 2010 10:32:57 +1000 Subject: Disable bluetooth on windows --- examples/examples.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/examples.pro') diff --git a/examples/examples.pro b/examples/examples.pro index 46ddca8e23..74d03b8824 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -155,7 +155,7 @@ contains(mobility_modules,connectivity) { # Connectivity contains(mobility_modules,connectivity) { - SUBDIRS += btscanner btchat + !win32:SUBDIRS += btscanner btchat } sources.path = $$QT_MOBILITY_EXAMPLES -- cgit v1.2.3 From 30ca09af7a07daa7e82dae8bf54bde32c80c32b5 Mon Sep 17 00:00:00 2001 From: Kalle Juhani Lehtonen Date: Thu, 18 Nov 2010 15:55:40 +1000 Subject: Remove querymessages from Symbian building querymessages is a console application and no use in Symbian environments. --- examples/examples.pro | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'examples/examples.pro') diff --git a/examples/examples.pro b/examples/examples.pro index 2d5b716dac..c7e8e967ca 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -98,9 +98,8 @@ contains(mobility_modules,multimedia) { contains(qmf_enabled,yes)|wince*|win32|symbian|maemo5|maemo6 { contains(mobility_modules,messaging) { !win32-g++ { - SUBDIRS += \ - querymessages \ - writemessage + SUBDIRS += writemessage + !symbian:SUBDIRS += querymessages contains(mobility_modules,contacts) { SUBDIRS += keepintouch -- cgit v1.2.3