summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-12-04 13:54:34 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-12-04 14:03:15 (GMT)
commit599ffaef76eb92af2bbce6e5baff539958bfdd14 (patch)
treea48aa946b71bf2bd71d016af3701c2dfe4df61fb /tools
parent72edf630344a8625a6dd848a8655e685c536e009 (diff)
downloadQt-599ffaef76eb92af2bbce6e5baff539958bfdd14.zip
Qt-599ffaef76eb92af2bbce6e5baff539958bfdd14.tar.gz
Qt-599ffaef76eb92af2bbce6e5baff539958bfdd14.tar.bz2
make qdoc3 a proper tools subtarget and install it
needed for building qtmobility and qtcreator docs without magic. Reviewed-by: Daniel Molkentin
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/qdoc3.pro2
-rw-r--r--tools/tools.pro2
2 files changed, 4 insertions, 0 deletions
diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro
index bacef3f..441bf39 100644
--- a/tools/qdoc3/qdoc3.pro
+++ b/tools/qdoc3/qdoc3.pro
@@ -105,3 +105,5 @@ SOURCES += apigenerator.cpp \
webxmlgenerator.cpp \
yyindent.cpp
+target.path = $$[QT_INSTALL_BINS]
+INSTALLS += target
diff --git a/tools/tools.pro b/tools/tools.pro
index 87ba3c9..4cff507 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -31,5 +31,7 @@ contains(QT_CONFIG, dbus):SUBDIRS += qdbus
!wince*:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns xmlpatternsvalidator
embedded: SUBDIRS += makeqpf
+!wince*:!cross_compile:SUBDIRS += qdoc3
+
CONFIG+=ordered
QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)"