diff options
author | Robin Burchell <robin.burchell@jollamobile.com> | 2014-01-21 10:19:06 +0100 |
---|---|---|
committer | Robin Burchell <robin+qt@viroteck.net> | 2014-01-23 19:51:24 +0100 |
commit | 8fd59a4d2f87c76dbd85d05cf81b96a4566ccc8c (patch) | |
tree | f930ebf22fbc7b99129baaf1546137c9abec37ea /doc | |
parent | 3abb395592bdac9c8166efa0e785c0424b9ca219 (diff) |
Convert qmfclient & qmfmessageserver into Qt modules: QmfClient & QmfMessageServer.
This was not possible prior to now due to Qt 4 support hanging around like the
undead vampire it is, but now we purged it with fire and light, and the build
system looks a lot less like a stinky, decomposed corpse.
There's still a lot of surprises lurking: qtmail is one such surprise. I don't
quite grasp why it's so heavy on plugins, and qmfutil also needs some...
attention. But at least it's a start.
As part of this work, we rename the qcop headers to fit the private convention.
This could have been done in a prior commit, but given that I didn't have an
easy way to build prior to this commit, I opted to roll them together.
Change-Id: Ia3e288ffc3639a7751c9040ceecb54fca77a31b1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Valerio Valerio <valerio.valerio@jollamobile.com>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/src/doc.pri | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/doc/src/doc.pri b/doc/src/doc.pri deleted file mode 100644 index 441f8676..00000000 --- a/doc/src/doc.pri +++ /dev/null @@ -1,46 +0,0 @@ -QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc) -HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator) - -equals(QMAKE_DIR_SEP, /) { # unix, mingw+msys - QDOC = SRCDIR=$$PWD OUTDIR=$$_PRO_FILE_PWD_/doc/html $$QDOC_BIN -} else:win32-g++* { # just mingw - # The lack of spaces in front of the && is necessary! - QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$_PRO_FILE_PWD_/doc/html&& $$QDOC_BIN -} else { # nmake - QDOC = set SRCDIR=$$PWD $$escape_expand(\\n\\t) \ - set OUTDIR=$$_PRO_FILE_PWD_/doc/html $$escape_expand(\\n\\t) \ - $$QDOC_BIN -} - -QHP_FILE = $$_PRO_FILE_PWD_/doc/html/qmf.qhp -QCH_FILE = $$_PRO_FILE_PWD_/doc/html/qmf.qch - -HELP_DEP_FILES = $$_PRO_FILE_PWD_/doc/src/index.qdoc \ - $$_PRO_FILE_PWD_/doc/src/messageserver.qdoc \ - $$_PRO_FILE_PWD_/doc/src/messaging.qdoc \ - $$_PRO_FILE_PWD_/doc/src/qtmail.qdoc \ - $$_PRO_FILE_PWD_/doc/src/qtopiamail.qdoc \ - $$_PRO_FILE_PWD_/doc/src/qtopiamail_messageserver.qdoc \ - $$_PRO_FILE_PWD_/doc/src/qtopiamail_qmfutil.qdoc \ - $$_PRO_FILE_PWD_/doc/src/qmf.qdocconf \ - -html_docs.commands = $$QDOC $$_PRO_FILE_PWD_/doc/src/qmf.qdocconf -html_docs.depends += $$HELP_DEP_FILES -html_docs.files = $$QHP_FILE - -qch_docs.commands = $$HELPGENERATOR -o \"$$QCH_FILE\" $$QHP_FILE -qch_docs.depends += html_docs -qch_docs.files = $$QCH_FILE - -unix:!macx { - qch_docs.path = $$QMF_INSTALL_ROOT/share/doc/qmf-qt5/qch - qch_docs.CONFIG += no_check_exist -} - -docs.depends = qch_docs -QMAKE_EXTRA_TARGETS += html_docs qch_docs docs - -OTHER_FILES = $$HELP_DEP_FILES \ - $$_PRO_FILE_PWD_/doc/src/api/api-pages.qdoc \ - $$_PRO_FILE_PWD_/doc/src/api/classhierarchy.qdoc \ - $$_PRO_FILE_PWD_/doc/src/api/groups.qdoc |