summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-12-08 19:29:13 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-12-08 19:29:13 (GMT)
commit258bc1c288ec9be90a2a101b81f0a3c58d193bca (patch)
tree60dc482094a9dbf9d8182c4a2c3c0d820788fca6 /tools/qdoc3
parent3bce78f6e143883fdba413e134504485594e73b3 (diff)
parentaf9304af3c462e120373f864d637e9c1db0787e2 (diff)
downloadQt-258bc1c288ec9be90a2a101b81f0a3c58d193bca.zip
Qt-258bc1c288ec9be90a2a101b81f0a3c58d193bca.tar.gz
Qt-258bc1c288ec9be90a2a101b81f0a3c58d193bca.tar.bz2
Merge branch '4.6'
Diffstat (limited to 'tools/qdoc3')
-rw-r--r--tools/qdoc3/documentation.pri5
-rw-r--r--tools/qdoc3/qdoc3.pro2
2 files changed, 2 insertions, 5 deletions
diff --git a/tools/qdoc3/documentation.pri b/tools/qdoc3/documentation.pri
deleted file mode 100644
index d952183..0000000
--- a/tools/qdoc3/documentation.pri
+++ /dev/null
@@ -1,5 +0,0 @@
-# NOTE: THIS FILE IS SHARED BY qdoc3.pro AND projects.pro
-#
-# So while changing this file, please make sure to that your changes
-# work in root qt soure dir with (n)make docs and for building with qdoc
-#
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