diff options
| author | kh1 <karsten.heimrich@digia.com> | 2014-06-02 09:46:41 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2014-06-02 09:57:13 +0200 |
| commit | e89721bce16d6486e47b5b88d24467face5a11aa (patch) | |
| tree | 268bad4a296f3dd02c83d1735fd7b76be38623d8 /doc | |
| parent | d5b02dd37312ee9a9682caff9fae925c04323e8f (diff) | |
Cleanup to support Qt5 only.
Change-Id: Ib8f61229ce2f07e52c22a15e10dc817aca860ead
Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc.pri | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index a460b3b3a..adf1bc56d 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -1,10 +1,6 @@ # Adapted from doc/doc.pri in Qt Creator. -greaterThan(QT_MAJOR_VERSION, 4) { - QDOC_BIN = $$[QT_INSTALL_BINS]/qdoc -} else { - QDOC_BIN = $$[QT_INSTALL_BINS]/qdoc3 -} +QDOC_BIN = $$[QT_INSTALL_BINS]/qdoc win32:QDOC_BIN = $$replace(QDOC_BIN, "/", "\\") IFW_VERSION_TAG = $$replace(IFW_VERSION, "[-.]", ) @@ -23,10 +19,7 @@ unix { # an unusual bug which causes qhelpgenerator.exe to do nothing HELPGENERATOR = cmd /C $$replace($$list($$[QT_INSTALL_BINS]/qhelpgenerator.exe), "/", "\\") } - -greaterThan(QT_MAJOR_VERSION, 4) { - HELPGENERATOR = $$HELPGENERATOR -platform minimal -} +HELPGENERATOR = $$HELPGENERATOR -platform minimal QHP_FILE = $$OUT_PWD/doc/html/ifw.qhp QCH_FILE = $$OUT_PWD/doc/ifw.qch |