From cce64318108aef5b68c62b2352fa02d0a3894a85 Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Mon, 27 Mar 2017 11:12:29 +0200 Subject: Doc: Update doc config to enable building doc on Windows host MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I000dcb156f44aea769ed2b8624263d6d5d17b3bb Reviewed-by: Leena Miettinen Reviewed-by: Topi Reiniö Reviewed-by: Nedim Hadzic --- .qmake.conf | 3 +++ doc/doc.pri | 18 ++++++++++-------- neptuneui.pro | 5 ++--- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.qmake.conf b/.qmake.conf index b734f94..020bf4e 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1 +1,4 @@ #This empty file is required by qmake to generate the documentation targets. +VERSION = 1.1.0 + +CONFIG += prepare_docs qt_docs_targets diff --git a/doc/doc.pri b/doc/doc.pri index 5b56ae7..1d81e30 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -1,14 +1,16 @@ -isEmpty(VERSION): VERSION=1.0.0 build_online_docs: { QMAKE_DOCS = $$PWD/online/neptuneui.qdocconf } else { QMAKE_DOCS = $$PWD/neptuneui.qdocconf } -CONFIG += prepare_docs -load(qt_docs_targets) - -OTHER_FILES += \ - $$PWD/*.qdocconf \ - $$PWD/src/*.qdoc \ - $$PWD/src/images/*.png +DISTFILES += \ + $$PWD/neptuneui.qdocconf \ + $$PWD/online/neptuneui.qdocconf \ + $$PWD/src/neptuneui-index.qdoc \ + $$PWD/src/images/emulator-automotive.png \ + $$PWD/src/images/infotainment-cluster-apps.png \ + $$PWD/src/images/infotainment-cluster-carsettings.png \ + $$PWD/src/images/infotainment-cluster-mycar.png \ + $$PWD/src/images/infotainment-cluster-settings.png \ + $$PWD/src/images/infotainment-cluster.png diff --git a/neptuneui.pro b/neptuneui.pro index 7413263..481f7df 100644 --- a/neptuneui.pro +++ b/neptuneui.pro @@ -1,10 +1,9 @@ -include(doc/doc.pri) - TEMPLATE = subdirs SUBDIRS = plugins/datasource \ plugins/screenmanager \ - plugins/comtqci18ndemo + plugins/comtqci18ndemo \ + doc isEmpty(INSTALL_PREFIX) { INSTALL_PREFIX=/opt -- cgit v1.2.1