diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-27 23:47:05 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-27 23:47:05 +1000 |
| commit | 1495f8434a7e18d256ab27d3f221ac6718ee162d (patch) | |
| tree | 02318fd4e48b5a4ed3823d9ae039d3a0568cc48e /src | |
| parent | 61d63f73443e82176f3ee98984cfa3132a3b416e (diff) | |
| parent | 93f6a06951debe4b520f5dce0079c7f82856cfb8 (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsensors-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtsensors-staging:
Fix copy2build output path for QML plugin.
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/sensors/qsensorsimport.pri (renamed from src/imports/qimportbase.pri) | 2 | ||||
| -rw-r--r-- | src/imports/sensors/sensors.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/qimportbase.pri b/src/imports/sensors/qsensorsimport.pri index 405af24e..d5cfeffc 100644 --- a/src/imports/qimportbase.pri +++ b/src/imports/sensors/qsensorsimport.pri @@ -15,7 +15,7 @@ isEmpty(TARGET) { QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir copy2build.input = QMLDIRFILE -copy2build.output = $$QT.declarative.imports/$$TARGETPATH/qmldir +copy2build.output = $$QT.sensors.imports/$$TARGETPATH/qmldir !contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} copy2build.name = COPY ${QMAKE_FILE_IN} diff --git a/src/imports/sensors/sensors.pro b/src/imports/sensors/sensors.pro index 1c462a08..fea1b0f0 100644 --- a/src/imports/sensors/sensors.pro +++ b/src/imports/sensors/sensors.pro @@ -4,7 +4,7 @@ TARGETPATH = Qt/sensors # Compatibility demands old path too. #TARGETPATH = QtMobility/sensors -include(../qimportbase.pri) +include(qsensorsimport.pri) QT += declarative sensors |