diff options
| author | Robin Burchell <robin.burchell@jollamobile.com> | 2014-01-21 10:19:01 +0100 |
|---|---|---|
| committer | Robin Burchell <robin+qt@viroteck.net> | 2014-01-21 10:27:17 +0100 |
| commit | 2794726b6ee1659a631427c325229394a0312d05 (patch) | |
| tree | dbdb255b8c6bd069edf1449a92ab431045f16e95 /doc/src | |
| parent | 78c9582b11e9ea7f9e99bf0b89ee8db6cb276b12 (diff) | |
Remove Qt 4 support.
This has persisted long enough, and as far as I am aware, has no users. It is
also blocking potential build system cleanups and other good things.
Reviewed-by: Valerio Valerio <valerio.valerio@jollamobile.com>
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Change-Id: I5e0e0549ef6ffee31b5e60ec94a9e17f27e01436
Reviewed-by: John Brooks <john.brooks@dereferenced.net>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/doc.pri | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/doc/src/doc.pri b/doc/src/doc.pri index 7d21398a..441f8676 100644 --- a/doc/src/doc.pri +++ b/doc/src/doc.pri @@ -1,5 +1,4 @@ -equals(QT_MAJOR_VERSION, 4): QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc3) -equals(QT_MAJOR_VERSION, 5): QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc) +QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc) HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator) equals(QMAKE_DIR_SEP, /) { # unix, mingw+msys @@ -34,8 +33,7 @@ qch_docs.depends += html_docs qch_docs.files = $$QCH_FILE unix:!macx { - equals(QT_MAJOR_VERSION, 4): qch_docs.path = $$QMF_INSTALL_ROOT/share/doc/qmf/qch - equals(QT_MAJOR_VERSION, 5): qch_docs.path = $$QMF_INSTALL_ROOT/share/doc/qmf-qt5/qch + qch_docs.path = $$QMF_INSTALL_ROOT/share/doc/qmf-qt5/qch qch_docs.CONFIG += no_check_exist } |