diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-03-19 01:23:49 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-03-19 01:25:44 (GMT) |
| commit | cd47b6aad611dae7d143233013c48d48a5c0c192 (patch) | |
| tree | 40831c0efbbd1c26e8f346fff8bea1c745629b5c /src/imports | |
| parent | 0711dee01dac892b9eb56bbddaaf0fdf4cf7181d (diff) | |
| download | Qt-cd47b6aad611dae7d143233013c48d48a5c0c192.zip Qt-cd47b6aad611dae7d143233013c48d48a5c0c192.tar.gz Qt-cd47b6aad611dae7d143233013c48d48a5c0c192.tar.bz2 | |
Fixed install of qml imports when doing a vcproj build.
This qmake script had wrong logic as a result of a bad copy and paste
(probably from translations\translations.pro)
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/qimportbase.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/qimportbase.pri b/src/imports/qimportbase.pri index ea12356..91f6552 100644 --- a/src/imports/qimportbase.pri +++ b/src/imports/qimportbase.pri @@ -13,7 +13,7 @@ isEmpty(TARGET) { QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir copy2build.input = QMLDIRFILE copy2build.output = $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir -isEmpty(vcproj):copy2build.variable_out = PRE_TARGETDEPS +!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} copy2build.CONFIG += no_link |