diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-03-10 14:08:51 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-03-13 07:57:02 +0000 |
| commit | 0d2860d1ec6d62a7fc42dbbabd87c1116c252145 (patch) | |
| tree | 249b4dc7419c8eba0e6834ff1ebd1a26bd8219c6 /doc/doc.pri | |
| parent | 28f803d359c5f3102514d7817478cb4927114102 (diff) | |
Use $$shell_path instead of reimplementing that functionality
Change-Id: Ic4bab4383b476f57940d8a7d71b55053c447c1ca
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'doc/doc.pri')
| -rw-r--r-- | doc/doc.pri | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index 655897069..052790f2f 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -1,12 +1,8 @@ include(../src/install_prefix.pri) -defineReplace(targetPath) { - return($$replace(1, /, $$QMAKE_DIR_SEP)) -} - -QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc) +QDOC_BIN = $$shell_path($$[QT_INSTALL_BINS]/qdoc) QDOC_MAINFILE = $$PWD/qbs.qdocconf -HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator) +HELPGENERATOR = $$shell_path($$[QT_INSTALL_BINS]/qhelpgenerator) include(doc_targets.pri) @@ -25,7 +21,7 @@ QMAKE_EXTRA_TARGETS += \ qch_docs fixnavi.commands = \ - cd $$targetPath($$PWD) && \ + cd $$shell_path($$PWD) && \ perl fixnavi.pl -Dqcmanual -Dqtquick \ qbs.qdoc QMAKE_EXTRA_TARGETS += fixnavi |