diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-09-05 16:14:49 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-09-06 06:55:51 +0000 |
| commit | a5345fdb996b5494c4f4858297784d4314d35511 (patch) | |
| tree | 27bbbaa8b2cb74b25a2694fdf1dba87c32c37672 /basicsuite/qtwebbrowser/tqtc-qtwebbrowser/doc/doc.pro | |
| parent | d7e97310f2bb13818173afebd1f1d40c616250de (diff) | |
qtwebbrowser: merge changes from qtwebbrowser git repo
* origin/dev:
Show settings on center of the screen
Update url for engadget.com favicon
Don't anchor to item that is part of a layout
Doc: Switch to standard doc config and templates
Install binaries into $$INSTALL_PREFIX
Do not try to compile if the QtWebEngine is missing
Add tests/tests.pro for the ci
Fix missing override warning
Update window title
Fix build with Qt 5.7
Add documentation
Update Copyright header
Add GPLv3 license file
Task-number: QTBUG-70390
Change-Id: I5233923302d6136d2fef28a9e446fdd592ad5d28
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Diffstat (limited to 'basicsuite/qtwebbrowser/tqtc-qtwebbrowser/doc/doc.pro')
| -rw-r--r-- | basicsuite/qtwebbrowser/tqtc-qtwebbrowser/doc/doc.pro | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/doc/doc.pro b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/doc/doc.pro new file mode 100644 index 0000000..3966427 --- /dev/null +++ b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/doc/doc.pro @@ -0,0 +1,14 @@ +TEMPLATE = aux + +build_online_docs: \ + QMAKE_DOCS = $$PWD/online/qtwebbrowser.qdocconf +else: \ + QMAKE_DOCS = $$PWD/qtwebbrowser.qdocconf + +DISTFILES += \ + $$PWD/src/qtwebbrowser.qdoc \ + $$PWD/src/external-resources.qdoc \ + $$PWD/qtwebbrowser-project.qdocconf \ + $$PWD/qtwebbrowser.qdocconf \ + $$PWD/online/qtwebbrowser.qdocconf \ + $$PWD/images/src/block-diagram.qmodel |