diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2012-12-07 14:24:03 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-08 14:12:23 +0100 |
commit | 275ce55e1064d7fc7799f2c832991d052c071b19 (patch) | |
tree | 2df67e9cde559503a30af6169df2cae4eb0dc686 | |
parent | a089ad9241372cca61f0536b746515a9c3ae0656 (diff) |
be able to build ActiveQt's docs on non-Windows platforms
We're generating a fake project that only provides the docs target.
Change-Id: I69854b97193e0c001f840a5a154ff2170dec41f9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
-rw-r--r-- | qtactiveqt.pro | 4 | ||||
-rw-r--r-- | src/activeqt/activeqt.pro | 16 | ||||
-rw-r--r-- | src/src.pro | 4 |
3 files changed, 15 insertions, 9 deletions
diff --git a/qtactiveqt.pro b/qtactiveqt.pro index 0a97ef3..5543434 100644 --- a/qtactiveqt.pro +++ b/qtactiveqt.pro @@ -2,6 +2,6 @@ CONFIG += tests_need_tools load(qt_parts) !win32 { - message("ActiveQt is a Windows-only module - will not be built") - SUBDIRS = + message("ActiveQt is a Windows-only module. Will just generate a docs target.") + SUBDIRS = src } diff --git a/src/activeqt/activeqt.pro b/src/activeqt/activeqt.pro index b6d45e5..972ce7c 100644 --- a/src/activeqt/activeqt.pro +++ b/src/activeqt/activeqt.pro @@ -1,7 +1,13 @@ -TEMPLATE = subdirs +win32 { + TEMPLATE = subdirs -CONFIG += ordered -axshared.file = axshared.prx -SUBDIRS = axshared container -!wince*: SUBDIRS += control + CONFIG += ordered + axshared.file = axshared.prx + SUBDIRS = axshared container + !wince: SUBDIRS += control +} else { + # fake project for creating the documentation + TEMPLATE = aux + QMAKE_DOCS = $$PWD/doc/activeqt.qdocconf +} diff --git a/src/src.pro b/src/src.pro index 48eece3..f8c9d2c 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs - -SUBDIRS += activeqt tools +SUBDIRS = activeqt +win32: SUBDIRS += tools CONFIG += ordered |