diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-05-17 14:14:32 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-05-17 14:14:32 (GMT) |
| commit | 6126d5c033e669bd57fc26093eb9be368feb12e2 (patch) | |
| tree | 29390731d12d9e18177719e2ba11d8d5def0c6a1 /doc | |
| parent | 03eae990b1aea880ee863061e1429edc4a96c626 (diff) | |
| download | Qt-6126d5c033e669bd57fc26093eb9be368feb12e2.zip Qt-6126d5c033e669bd57fc26093eb9be368feb12e2.tar.gz Qt-6126d5c033e669bd57fc26093eb9be368feb12e2.tar.bz2 | |
qmake: added possibility to specify the type of an install target
Before this change:
target.CONFIG+=no_check_exist implies the file is a file, no way to
make an install rule for a non-existing directory.
Now, its possible to specify the type:
target.CONFIG+=no_check_exist directory
will install a directory.
target.CONFIG+=no_check_exist executable
will install an executable.
target.CONFIG+=no_check_exist data
will install a normal file.
The default case, if no type is given, like in
CONFIG+=no_check_exist
will call QFileInfo::isExecutable() to determine, if its a data file
or executable. This is the old behaviour.
Task-number: QTBUG-10624
Reviewed-by: ossi
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index 463c447..c6073f0 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -45,11 +45,11 @@ docs.depends = adp_docs qch_docs # Install rules htmldocs.files = $$QT_BUILD_TREE/doc/html htmldocs.path = $$[QT_INSTALL_DOCS] -htmldocs.CONFIG += no_check_exist +htmldocs.CONFIG += no_check_exist directory qchdocs.files= $$QT_BUILD_TREE/doc/qch qchdocs.path = $$[QT_INSTALL_DOCS] -qchdocs.CONFIG += no_check_exist +qchdocs.CONFIG += no_check_exist directory docimages.files = $$QT_BUILD_TREE/doc/src/images docimages.path = $$[QT_INSTALL_DOCS]/src |