diff --git a/doc/doc.pri b/doc/doc.pri index dca6f96..9884760 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -1,10 +1,14 @@ -QDOC = qdoc3 +equals(QT_MAJOR_VERSION, 4): QDOC = qdoc3 +equals(QT_MAJOR_VERSION, 5): QDOC = qdoc QHELPGENERATOR = qhelpgenerator -QDOCCONF = doc/config/transfer-engine-project.qdocconf +equals(QT_MAJOR_VERSION, 4): QDOCCONF = doc/config/transfer-engine-project.qdocconf +equals(QT_MAJOR_VERSION, 5): QDOCCONF = transfer-engine-project.qdocconf QHELPFILE = doc/html/transferengine.qhp QCHFILE = doc/html/transferengine.qch -docs.commands = ($$QDOC $$QDOCCONF) && \ +equals(QT_MAJOR_VERSION, 4): docs.commands = ($$QDOC $$QDOCCONF) && \ + ($$QHELPGENERATOR $$QHELPFILE -o $$QCHFILE) +equals(QT_MAJOR_VERSION, 5): docs.commands = (cd doc/config; $$QDOC $$QDOCCONF; cd ../..) && \ ($$QHELPGENERATOR $$QHELPFILE -o $$QCHFILE) QMAKE_EXTRA_TARGETS += docs diff --git a/doc/html/.gitignore b/doc/html/.gitignore index 55df230..e89d8b0 100644 --- a/doc/html/.gitignore +++ b/doc/html/.gitignore @@ -1,2 +1,5 @@ *html *index* +*.qch +*.qhp* +*.tags diff --git a/rpm/transfer-engine-qt5.spec b/rpm/transfer-engine-qt5.spec index b0ff143..3b85b05 100644 --- a/rpm/transfer-engine-qt5.spec +++ b/rpm/transfer-engine-qt5.spec @@ -15,6 +15,9 @@ BuildRequires: desktop-file-utils BuildRequires: pkgconfig(mlite5) BuildRequires: pkgconfig(quillmetadata-qt5) BuildRequires: qt5-qttools-linguist +BuildRequires: qt5-qttools-qthelp-devel +BuildRequires: qt5-plugin-platform-minimal +BuildRequires: qt5-plugin-sqldriver-sqlite %description %{summary}.