diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-06-09 04:15:56 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-06-09 04:19:32 (GMT) |
| commit | 5ba8d0703d1b8388679473da1311e368ed0c3086 (patch) | |
| tree | 8bc251c236128cf1acad1d5b67fd5f65b244316a /src | |
| parent | 5c6501970c7b6805b7edc30f90187700f05d9f15 (diff) | |
| download | Qt-5ba8d0703d1b8388679473da1311e368ed0c3086.zip Qt-5ba8d0703d1b8388679473da1311e368ed0c3086.tar.gz Qt-5ba8d0703d1b8388679473da1311e368ed0c3086.tar.bz2 | |
Fixed `nmake clean' breaking declarative imports on Windows.
Generally, doing a `clean' ought to clean up space by deleting
intermediate objects, but leave the build in a working state
(as opposed to `distclean' which deletes intermediate and target
objects).
For this to work for declarative imports, the qmldir file should
be treated as a target, not an intermediate object.
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/qimportbase.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/qimportbase.pri b/src/imports/qimportbase.pri index 91f6552..02364af 100644 --- a/src/imports/qimportbase.pri +++ b/src/imports/qimportbase.pri @@ -17,6 +17,8 @@ copy2build.output = $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} copy2build.name = COPY ${QMAKE_FILE_IN} copy2build.CONFIG += no_link +# `clean' should leave the build in a runnable state, which means it shouldn't delete qmldir +copy2build.CONFIG += no_clean QMAKE_EXTRA_COMPILERS += copy2build TARGET = $$qtLibraryTarget($$TARGET) |