diff options
| author | Xizhi Zhu <xizhi.zhu@nokia.com> | 2011-06-27 16:48:29 +0300 |
|---|---|---|
| committer | Xizhi Zhu <xizhi.zhu@nokia.com> | 2011-06-27 16:48:29 +0300 |
| commit | d6c640d820f90edb329c2e5c8878a38fe79f2de7 (patch) | |
| tree | 9dc30922b3ab86c7a687657031a6d67ebad544d4 | |
| parent | cceb02ef696cc5bc1eb49c965f2c4437693265da (diff) | |
Fix copy2build output path for QML plugin.
| -rw-r--r-- | src/imports/location/location.pro | 2 | ||||
| -rw-r--r-- | src/imports/location/qlocationimport.pri (renamed from src/imports/qimportbase.pri) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/location/location.pro b/src/imports/location/location.pro index 48c999b7..6d72bdf1 100644 --- a/src/imports/location/location.pro +++ b/src/imports/location/location.pro @@ -4,7 +4,7 @@ TARGETPATH = Qt/location # Compatibility demands old path too. #TARGETPATH = QtMobility/location -include(../qimportbase.pri) +include(qlocationimport.pri) QT += declarative network location diff --git a/src/imports/qimportbase.pri b/src/imports/location/qlocationimport.pri index 405af24e..c4d502ed 100644 --- a/src/imports/qimportbase.pri +++ b/src/imports/location/qlocationimport.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.location.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} |