summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <j-p.nurmi@nokia.com>2012-08-21 17:18:19 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-22 15:47:11 +0200
commit58b8233d7e1051f6d970b60f178c5f8bd4dac754 (patch)
tree25a5cde930d5737dd529c0bb57b4b670f6430b11
parent3bbb3cf54ffe840bd7eea660611605fd14239877 (diff)
Use QMAKE_DOCSv5.0.0-beta1
Change-Id: I8f30072277864a6d9a42ffcd484d15c01a125f60 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
-rw-r--r--doc/doc.pri14
-rw-r--r--src/feedback/feedback.pro2
2 files changed, 2 insertions, 14 deletions
diff --git a/doc/doc.pri b/doc/doc.pri
deleted file mode 100644
index 459e9ba..0000000
--- a/doc/doc.pri
+++ /dev/null
@@ -1,14 +0,0 @@
-OTHER_FILES += \
- $$PWD/qt5.qdocconf \
- $$PWD/qt5-dita.qdocconf
-
-docs_target.target = docs
-docs_target.commands = qdoc3 $$PWD/qt5.qdocconf
-
-ditadocs_target.target = ditadocs
-ditadocs_target.commands = qdoc3 $$PWD/qt5-dita.qdocconf
-
-QMAKE_EXTRA_TARGETS = docs_target ditadocs_target
-QMAKE_CLEAN += \
- "-r $$PWD/html" \
- "-r $$PWD/ditaxml"
diff --git a/src/feedback/feedback.pro b/src/feedback/feedback.pro
index 0141b51..d64b6c6 100644
--- a/src/feedback/feedback.pro
+++ b/src/feedback/feedback.pro
@@ -5,6 +5,8 @@ QT = core
load(qt_module)
+QMAKE_DOCS = $$PWD/../../doc/qt5.qdocconf
+
PUBLIC_HEADERS += qfeedbackglobal.h \
qfeedbackactuator.h \
qfeedbackeffect.h \