diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-08-25 10:59:42 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-08-26 11:00:57 +0200 |
| commit | 78b642eb0c2bb631793a41110df09214dccba00a (patch) | |
| tree | 80785139a4d606427debb3ea46d64e90a553e664 /doc/doc.pri | |
| parent | 306ca6fce07fca984960c825178df3ae7eb46b6a (diff) | |
Remove pre-Qt 5.3.1 code paths from main Qt Creator pro and pri files
Change-Id: I71bee691a2b9bad7dbdb4ca9c0a938d4313305f7
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'doc/doc.pri')
| -rw-r--r-- | doc/doc.pri | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index c97bf0a02d..3ec1432b2d 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -1,15 +1,7 @@ -greaterThan(QT_MAJOR_VERSION, 4) { - HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator) -platform minimal - QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc) - QDOC_GLOBAL = QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS/src] QDOC_INDEX_DIR=$$[QT_INSTALL_DOCS] - COMPAT = -} else { - HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator) - QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc3) - QDOC_GLOBAL = QDOC_INDEX_DIR=dummy # this will be ignored. we don't link qt4 docs any more. - COMPAT = -qt4 -} - +HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator) -platform minimal +QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc) +QDOC_GLOBAL = QT_INSTALL_DOCS=$$[QT_INSTALL_DOCS/src] QDOC_INDEX_DIR=$$[QT_INSTALL_DOCS] +COMPAT = VERSION_TAG = $$replace(QTCREATOR_VERSION, "[-.]", ) |