diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2014-10-29 11:45:04 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2014-10-29 15:31:19 +0100 |
| commit | 7c82e9f3f417564dff89b75c802e4bd91e4b1ca7 (patch) | |
| tree | 8460da11f9cef9ab2b622e833eed3a699d41289b /doc/doc.pri | |
| parent | 167950d064c6b1bd1fb6c9fdd390873ebc29ae97 (diff) | |
remove support for building qbs with Qt <= 5.1.0
Change-Id: I058eedd2d9dcaad1eaac1f4407f4f698133a774b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'doc/doc.pri')
| -rw-r--r-- | doc/doc.pri | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index f1ea69935..5d311f52f 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -2,19 +2,8 @@ defineReplace(targetPath) { return($$replace(1, /, $$QMAKE_DIR_SEP)) } -qt:greaterThan(QT_MAJOR_VERSION, 4) { - QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc) - QDOC_MAINFILE = $$PWD/qbs.qdocconf -} else { - QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc3) - QDOC_MAINFILE = $$PWD/qbs-qt4.qdocconf - - # cheap replacement of the Qt5 shell_quote function - defineReplace(shell_quote) { - return("\"$$1\"") - } -} - +QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc) +QDOC_MAINFILE = $$PWD/qbs.qdocconf HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator) VERSION_TAG = $$replace(QBS_VERSION, "[-.]", ) @@ -38,7 +27,6 @@ QHP_FILE = $$HTML_DOC_PATH/qbs.qhp QCH_FILE = $$OUT_PWD/doc/qbs.qch HELP_DEP_FILES = $$PWD/qbs.qdoc \ - $$PWD/config/compat-qt4.qdocconf \ $$PWD/config/macros.qdocconf \ $$PWD/config/qt-cpp-ignore.qdocconf \ $$PWD/config/qt-html-templates.qdocconf \ |