diff options
| author | Alex <qt-info@nokia.com> | 2010-06-28 19:13:07 +1000 |
|---|---|---|
| committer | Alex <qt-info@nokia.com> | 2010-06-28 19:13:07 +1000 |
| commit | 2c876e6886d533d2933092be22a7985c44631e44 (patch) | |
| tree | 0f488fb79cf6e4b693b06e3e38eea2f8ca2d0d09 /plugins/declarative/sensors/sensors.pro | |
| parent | c005285cb0878d54df9e23ff9d2cab4cff660caf (diff) | |
| parent | 1b17c1ea5de3d3a2965dcb586033b73913969e88 (diff) | |
Merge branch '1.0'
Conflicts:
plugins/declarative/contacts/contacts.pro
src/systeminfo/qsysteminfo_linux_common.cpp
Diffstat (limited to 'plugins/declarative/sensors/sensors.pro')
| -rw-r--r-- | plugins/declarative/sensors/sensors.pro | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/declarative/sensors/sensors.pro b/plugins/declarative/sensors/sensors.pro index 71113fa181..2aa6f9214d 100644 --- a/plugins/declarative/sensors/sensors.pro +++ b/plugins/declarative/sensors/sensors.pro @@ -1,15 +1,15 @@ INCLUDEPATH += ../../../src/sensors INCLUDEPATH += ../../../src/global -TARGET = declarative_sensors +TARGET = $$qtLibraryTarget(declarative_sensors) +TEMPLATE = lib +CONFIG += plugin TARGETPATH = QtMobility/sensors -include(../../qimportbase.pri) +PLUGIN_TYPE = declarative include(../../../common.pri) QT += declarative -#HEADERS += qdeclarativeservice.h - SOURCES += sensors.cpp CONFIG += mobility |