diff options
| author | Martin Smith <martin.smith@nokia.com> | 2011-05-16 09:35:45 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2011-05-16 09:35:45 (GMT) |
| commit | bcea4e3bcefd5dd95e71b4ed3f272f8bf32e776d (patch) | |
| tree | 14d029547cbe671c8ff8bd4d0d166332330acfd1 /tools/qdoc3 | |
| parent | 1ea0e706981006c48ad16a1ff8051df03610f20b (diff) | |
| parent | 0dbbb137f432e99113ac513c542b4a8431b00b5d (diff) | |
| download | Qt-bcea4e3bcefd5dd95e71b4ed3f272f8bf32e776d.zip Qt-bcea4e3bcefd5dd95e71b4ed3f272f8bf32e776d.tar.gz Qt-bcea4e3bcefd5dd95e71b4ed3f272f8bf32e776d.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'tools/qdoc3')
| -rw-r--r-- | tools/qdoc3/qdoc3.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro index 3596349..bb5ff83 100644 --- a/tools/qdoc3/qdoc3.pro +++ b/tools/qdoc3/qdoc3.pro @@ -95,7 +95,7 @@ include(declarativeparser/parser.pri) qtPrepareTool(QDOC, qdoc3) qtPrepareTool(QHELPGENERATOR, qhelpgenerator) -$$unixstyle { +equals(QMAKE_DIR_SEP, /) { QDOC = QT_BUILD_TREE=$$QT_BUILD_TREE QT_SOURCE_TREE=$$QT_SOURCE_TREE $$QDOC } else { QDOC = set QT_BUILD_TREE=$$QT_BUILD_TREE&& set QT_SOURCE_TREE=$$QT_SOURCE_TREE&& $$QDOC |