diff options
| author | abcd <qt-info@nokia.com> | 2010-08-03 13:50:38 +1000 |
|---|---|---|
| committer | abcd <qt-info@nokia.com> | 2010-08-03 13:50:38 +1000 |
| commit | dfac73e30756dc9baef0c78feedd2a1334a164d0 (patch) | |
| tree | ddf8ccee922eb7a75e23e2b31604eb8c307c75eb /doc/src/snippets | |
| parent | ed1e055e3765f7ac423f5b27eb13ea850367fcdc (diff) | |
| parent | ffac691cf41a20599581d718a292794268bae352 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location
Diffstat (limited to 'doc/src/snippets')
6 files changed, 7 insertions, 23 deletions
diff --git a/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.pro b/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.pro index bf312ddb9f..b705149e47 100644 --- a/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.pro +++ b/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.pro @@ -6,16 +6,13 @@ TEMPLATE = lib TARGET = qtcontactsdocsample -include(../../../../common.pri) +include(../../../../features/basic_examples_setup.pri) INCLUDEPATH += ../../../../src/global \ ../../../../src/contacts \ ../../../../src/contacts/requests \ ../../../../src/contacts/filters \ ../../../../src/contacts/details -DESTDIR = $$QT_MOBILITY_BUILD_TREE/lib -QMAKE_RPATHDIR+=$$OUTPUT_DIR/lib - CONFIG += mobility console MOBILITY = contacts diff --git a/doc/src/snippets/qtfeedbackdocsample/qtfeedbackdocsample.pro b/doc/src/snippets/qtfeedbackdocsample/qtfeedbackdocsample.pro index 63ebe630a5..e4ad857c14 100644 --- a/doc/src/snippets/qtfeedbackdocsample/qtfeedbackdocsample.pro +++ b/doc/src/snippets/qtfeedbackdocsample/qtfeedbackdocsample.pro @@ -6,13 +6,10 @@ TEMPLATE = lib TARGET = qtfeedbackdocsample -include(../../../../common.pri) +include(../../../../features/basic_examples_setup.pri) INCLUDEPATH += ../../../../src/global \ ../../../../src/feedback -DESTDIR = $$QT_MOBILITY_BUILD_TREE/lib -QMAKE_RPATHDIR+=$$OUTPUT_DIR/lib - CONFIG += mobility MOBILITY = feedback diff --git a/doc/src/snippets/qtlandmarksdocsample/qtlandmarksdocsample.pro b/doc/src/snippets/qtlandmarksdocsample/qtlandmarksdocsample.pro index f99d1add17..440f6f44ed 100644 --- a/doc/src/snippets/qtlandmarksdocsample/qtlandmarksdocsample.pro +++ b/doc/src/snippets/qtlandmarksdocsample/qtlandmarksdocsample.pro @@ -1,13 +1,10 @@ TEMPLATE = app TARGET = qtlandmarksdocsample -include(../../../../common.pri) +include(../../../../features/basic_examples_setup.pri) INCLUDEPATH += ../../../../src/location \ ../../../../src/location/landmarks -DESTDIR = $$QT_MOBILITY_BUILD_TREE/bin/examples -QMAKE_RPATHDIR+=$$OUTPUT_DIR/lib - CONFIG += mobility MOBILITY += location diff --git a/doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.pro b/doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.pro index 2f3f94e942..12477c4c9f 100644 --- a/doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.pro +++ b/doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.pro @@ -6,7 +6,7 @@ TEMPLATE = app TARGET = qtorganizerdocsample -include(../../../../common.pri) +include(../../../../features/basic_examples_setup.pri) INCLUDEPATH += ../../../../src/global \ ../../../../src/organizer \ ../../../../src/organizer/details \ @@ -14,9 +14,6 @@ INCLUDEPATH += ../../../../src/global \ ../../../../src/organizer/items \ ../../../../src/organizer/filters -DESTDIR = $$QT_MOBILITY_BUILD_TREE/bin -QMAKE_RPATHDIR+=$$OUTPUT_DIR/lib - CONFIG += mobility console MOBILITY = organizer diff --git a/doc/src/snippets/qtversitdocsample/qtversitdocsample.pro b/doc/src/snippets/qtversitdocsample/qtversitdocsample.pro index 782c951b60..0425cef3fc 100644 --- a/doc/src/snippets/qtversitdocsample/qtversitdocsample.pro +++ b/doc/src/snippets/qtversitdocsample/qtversitdocsample.pro @@ -6,7 +6,7 @@ TEMPLATE = lib TARGET = qtversitdocsample -include(../../../../common.pri) +include(../../../../features/basic_examples_setup.pri) INCLUDEPATH += ../../../../src/global \ ../../../../src/contacts \ ../../../../src/contacts/requests \ @@ -14,9 +14,6 @@ INCLUDEPATH += ../../../../src/global \ ../../../../src/contacts/details \ ../../../../src/versit -DESTDIR = $$QT_MOBILITY_BUILD_TREE/lib -QMAKE_RPATHDIR+=$$OUTPUT_DIR/lib - CONFIG += mobility console MOBILITY = contacts versit diff --git a/doc/src/snippets/sensors/sensors.pro b/doc/src/snippets/sensors/sensors.pro index a2fe7dda3e..de2fc505e1 100644 --- a/doc/src/snippets/sensors/sensors.pro +++ b/doc/src/snippets/sensors/sensors.pro @@ -1,8 +1,7 @@ TEMPLATE=app -TARGET=sensors -include(../../../../common.pri) +TARGET=sensorsdocsnippet +include(../../../../features/basic_examples_setup.pri) INCLUDEPATH += ../../../../src/sensors -DESTDIR=$$PWD SOURCES+=main.cpp\ creating.cpp\ start.cpp\ |