diff options
-rw-r--r-- | doc/config/qtsensors.qdocconf | 2 | ||||
-rw-r--r-- | doc/config/qtsensors_doc.pri | 41 | ||||
-rw-r--r-- | doc/doc.pro | 4 | ||||
-rw-r--r-- | qtsensors.pro | 2 | ||||
-rw-r--r-- | src/sensors/sensors.pro | 5 |
5 files changed, 2 insertions, 52 deletions
diff --git a/doc/config/qtsensors.qdocconf b/doc/config/qtsensors.qdocconf index 9499335..e6bb1a5 100644 --- a/doc/config/qtsensors.qdocconf +++ b/doc/config/qtsensors.qdocconf @@ -70,7 +70,7 @@ qhp.qtsensors.subprojects.classes.sortPages = true # Do NOT change the variables after this line unless you know what you are doing. -outputdir = $PWD/doc/html +outputdir = ../../doc/qtsensors outputformats = HTML examples.fileextensions = "*.cpp *.h *.js *.svg *.xml *.ui *.qml" diff --git a/doc/config/qtsensors_doc.pri b/doc/config/qtsensors_doc.pri deleted file mode 100644 index 7b879ef..0000000 --- a/doc/config/qtsensors_doc.pri +++ /dev/null @@ -1,41 +0,0 @@ - -win32:!win32-g++ { - unixstyle = false -} else:win32-g++:isEmpty(QMAKE_SH) { - unixstyle = false -} else { - unixstyle = true -} - -QDOC = $$QT.core.bins/qdoc3 - -ONLINE_CONF = $$PWD/qtsensors.qdocconf -DITA_CONF = $$PWD/qtsensors-dita.qdocconf -QCH_CONF = #nothing yet - -$$unixstyle { -} else { - QDOC = $$replace(QDOC, "qdoc", "qdoc3.exe") - ONLINE_CONF = $$replace(ONLINE_CONF, "/", "\\") - DITA_DOCS = $$replace(ONLINE_CONF, "/", "\\") -} - -# Build rules -docs.depends = dita_docs online_docs qch_docs - -online_docs.commands = $$QDOC $$ONLINE_CONF - -dita_docs.commands = $$QDOC $$DITA_CONF - -qch_docs.commands = #no commands yet - -QMAKE_EXTRA_TARGETS += docs dita_docs online_docs qch_docs -QMAKE_CLEAN += \ - "-r $$OUT_PWD/../html" \ - "-r $$OUT_PWD/../ditaxml" - - -OTHER_FILES += \ - doc/src/*.qdoc \ - doc/src/examples/*.qdoc \ - doc/src/imports/*.qdoc diff --git a/doc/doc.pro b/doc/doc.pro deleted file mode 100644 index 94ad926..0000000 --- a/doc/doc.pro +++ /dev/null @@ -1,4 +0,0 @@ -TEMPLATE = subdirs - -# Doc snippets use widgets -!isEmpty(QT.widgets.name): SUBDIRS += src/snippets diff --git a/qtsensors.pro b/qtsensors.pro index 113628b..575c226 100644 --- a/qtsensors.pro +++ b/qtsensors.pro @@ -25,8 +25,6 @@ module_qtsensors_snippets.subdir = doc/src/snippets module_qtsensors_snippets.target = module-qtsensors-snippets module_qtsensors_snippets.depends = module_qtsensors_src -include(doc/config/qtsensors_doc.pri) - # Commands to rebuild the plugin.qmltypes files for our imports # Run "make rebuild_qmltypes" after completing a build sensors_qmltypes.commands = qmlplugindump QtMobility.sensors 1.3 $$QT.sensors.imports > $$PWD/src/imports/sensors/plugin.qmltypes diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro index 6435ec0..c10e5b1 100644 --- a/src/sensors/sensors.pro +++ b/src/sensors/sensors.pro @@ -22,6 +22,7 @@ simulator { load(qt_module_config) HEADERS += qtsensorsversion.h +QMAKE_DOCS = $$PWD/../../doc/config/qtsensors.qdocconf symbian { TARGET.CAPABILITY = ALL -TCB @@ -40,10 +41,6 @@ symbian { } - -#INCLUDEPATH += . -#DEPENDPATH += . - PUBLIC_HEADERS += \ qsensorbackend.h\ qsensormanager.h\ |