diff options
| author | Venugopal Shivashankar <venugopal.shivashankar@digia.com> | 2015-12-15 10:39:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-15 09:46:55 +0000 |
| commit | 2e27de456efb2c6a152cb60f254fbccb9c203a7e (patch) | |
| tree | 2fd318ec8dabd099437e6f7b07b71104245a2bef /src | |
| parent | 8cdd72afc11d96ec41f65577b38ffea63bc7294c (diff) | |
Doc: Rename the qdocconf to match the doc project name
qmake assumes that the conf file name and the project name
are same, so 'make docs' fail if they are different.
Change-Id: Ic4784524c50cd085096fbf8853138b48d818fd61
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/compositor/compositor.pro | 2 | ||||
| -rw-r--r-- | src/compositor/doc/qtwaylandcompositor.qdocconf (renamed from src/compositor/doc/compositor.qdocconf) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro index 6a64cd70a..24aa19716 100644 --- a/src/compositor/compositor.pro +++ b/src/compositor/compositor.pro @@ -11,7 +11,7 @@ CONFIG -= precompile_header CONFIG += link_pkgconfig DEFINES += QT_WAYLAND_WINDOWMANAGER_SUPPORT -QMAKE_DOCS = $$PWD/doc/compositor.qdocconf +QMAKE_DOCS = $$PWD/doc/qtwaylandcompositor.qdocconf !contains(QT_CONFIG, no-pkg-config) { PKGCONFIG_PRIVATE += wayland-server diff --git a/src/compositor/doc/compositor.qdocconf b/src/compositor/doc/qtwaylandcompositor.qdocconf index 125fb2b31..125fb2b31 100644 --- a/src/compositor/doc/compositor.qdocconf +++ b/src/compositor/doc/qtwaylandcompositor.qdocconf |