diff options
| author | juhvu <qt-info@nokia.com> | 2010-07-30 09:34:00 +1000 |
|---|---|---|
| committer | juhvu <qt-info@nokia.com> | 2010-07-30 09:34:00 +1000 |
| commit | c7633cbe2bd9d4088b83456fdb6a3c12897fe8da (patch) | |
| tree | 8d7617a65465f0317f42b4eed7b6f6f0bff30aff /plugins/declarative/sensors/sensors.pro | |
| parent | 84ef3246ba49b49a84fc7df78c7a0d36fffc6465 (diff) | |
| parent | 370d2e13389c48cebaaeb8d1b95ea6e3f6750749 (diff) | |
Merge branch '1.0' of ../qtmobility into 1.0
Conflicts:
plugins/declarative/sensors/sensors.pro
Diffstat (limited to 'plugins/declarative/sensors/sensors.pro')
| -rw-r--r-- | plugins/declarative/sensors/sensors.pro | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/plugins/declarative/sensors/sensors.pro b/plugins/declarative/sensors/sensors.pro index 20a349a0ce..0f4bf0725c 100644 --- a/plugins/declarative/sensors/sensors.pro +++ b/plugins/declarative/sensors/sensors.pro @@ -1,36 +1,36 @@ -INCLUDEPATH += ../../../src/sensors -INCLUDEPATH += ../../../src/global - -TARGET = $$qtLibraryTarget(declarative_sensors) -TEMPLATE = lib -CONFIG += plugin -TARGETPATH = QtMobility/sensors -PLUGIN_TYPE = declarative -include(../../../common.pri) - -QT += declarative - -SOURCES += sensors.cpp - -CONFIG += mobility -MOBILITY += sensors - -target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -qmldir.files += $$PWD/qmldir -qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -INSTALLS += target qmldir - -symbian { - # In Symbian, a library should enjoy _largest_ possible capability set. - TARGET.CAPABILITY = ALL -TCB - # Allow writable DLL data - TARGET.EPOCALLOWDLLDATA = 1 - # Target UID, makes every Symbian app unique - TARGET.UID3 = 0x20021324 - # Specifies what files shall be deployed: the plugin itself and the qmldir file. - importFiles.sources = $$DESTDIR/declarative_sensors$${QT_LIBINFIX}.dll qmldir - importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH - DEPLOYMENT = importFiles - }
\ No newline at end of file +INCLUDEPATH += ../../../src/sensors
+INCLUDEPATH += ../../../src/global
+
+TARGET = $$qtLibraryTarget(declarative_sensors)
+TEMPLATE = lib
+CONFIG += plugin
+TARGETPATH = QtMobility/sensors
+PLUGIN_TYPE = declarative
+include(../../../common.pri)
+
+QT += declarative
+
+SOURCES += sensors.cpp
+
+CONFIG += mobility
+MOBILITY += sensors
+
+target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
+
+qmldir.files += $$PWD/qmldir
+qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
+
+INSTALLS += target qmldir
+
+symbian {
+ # In Symbian, a library should enjoy _largest_ possible capability set.
+ TARGET.CAPABILITY = ALL -TCB
+ # Allow writable DLL data
+ TARGET.EPOCALLOWDLLDATA = 1
+ # Target UID, makes every Symbian app unique
+ TARGET.UID3 = 0x20021324
+ # Specifies what files shall be deployed: the plugin itself and the qmldir file.
+ importFiles.sources = $$DESTDIR/declarative_sensors$${QT_LIBINFIX}.dll qmldir
+ importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
+ DEPLOYMENT = importFiles
+ }
|