diff options
| author | Olli Werwolff <qt-info@nokia.com> | 2011-05-16 13:28:00 +0200 |
|---|---|---|
| committer | Olli Werwolff <qt-info@nokia.com> | 2011-05-16 13:29:33 +0200 |
| commit | 2d3b42d376c2d2137a5fb1b163d7ce30aa8a4584 (patch) | |
| tree | 671e01bccd07ddcb03f8fd25305c89bbe1fd48b3 | |
| parent | d6ef0afa6552489579e752adc80857e26b5791d5 (diff) | |
Fixed creation of docs
Reviewed-by: Rainer Keller
| -rw-r--r-- | doc/config/simulator-project.qdocconf | 4 | ||||
| -rw-r--r-- | doc/doc.pri | 4 | ||||
| -rw-r--r-- | doc/simulator.qdoc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/config/simulator-project.qdocconf b/doc/config/simulator-project.qdocconf index 3f84f3f..a61f106 100644 --- a/doc/config/simulator-project.qdocconf +++ b/doc/config/simulator-project.qdocconf @@ -9,14 +9,14 @@ headers = \ $$SRCDIR/../src/ui/systeminfogenericui.h \ $$SRCDIR/../src/ui/systeminfostorageui.h \ $$SRCDIR/../src/ui/systeminfonetworkui.h \ - $$SRCDIR/../src/ui/configurationwidget.h \ + $$SRCDIR/../src/ui/viewui.h \ $$SIMULATOR_DEPENDENCY_PATH/include/remotecontrolwidget/locationui.h sources = \ $$SRCDIR/../src/ui/sensorsui.cpp \ $$SRCDIR/../src/ui/systeminfogenericui.cpp \ $$SRCDIR/../src/ui/systeminfostorageui.cpp \ $$SRCDIR/../src/ui/systeminfonetworkui.cpp \ - $$SRCDIR/../src/ui/configurationwidget.cpp + $$SRCDIR/../src/ui/viewui.cpp headerdirs = sourcedirs = $SRCDIR imagedirs = $SRCDIR/images $SRCDIR/templates/images diff --git a/doc/doc.pri b/doc/doc.pri index e4524a1..db12d91 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -7,7 +7,7 @@ unix { QDOC = SIMULATOR_DEPENDENCY_PATH=$$SIMULATOR_DEPENDENCY_PATH SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html QT_MOBILITY_SOURCE_PATH=$$QT_MOBILITY_SOURCE_PATH $$QDOC_BIN HELPGENERATOR = $$[QT_INSTALL_BINS]/qhelpgenerator } else { - QDOC = set SIMULATOR_DEPENDENCY_PATH=$$SIMULATOR_DEPENDENCY_PATH && set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& set QT_MOBILITY_SOURCE_PATH=$$QT_MOBILITY_SOURCE_PATH&& $$QDOC_BIN + QDOC = set SIMULATOR_DEPENDENCY_PATH=$$SIMULATOR_DEPENDENCY_PATH&& set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& set QT_MOBILITY_SOURCE_PATH=$$QT_MOBILITY_SOURCE_PATH&& $$QDOC_BIN # Always run qhelpgenerator inside its own cmd; this is a workaround for # an unusual bug which causes qhelpgenerator.exe to do nothing HELPGENERATOR = cmd /C $$replace($$list($$[QT_INSTALL_BINS]/qhelpgenerator.exe), "/", "\\") @@ -61,4 +61,4 @@ macx { QMAKE_EXTRA_TARGETS += html_docs qch_docs docs } -OTHER_FILES = $$HELP_DEP_FILES
\ No newline at end of file +OTHER_FILES = $$HELP_DEP_FILES diff --git a/doc/simulator.qdoc b/doc/simulator.qdoc index 54e0c11..4256f03 100644 --- a/doc/simulator.qdoc +++ b/doc/simulator.qdoc @@ -839,7 +839,7 @@ The following objects and functions are added to the common JavaScript global scope: \list \o yield(ms): delay execution of this script for the given number of milliseconds - \o simulator: \l{SimulatorScriptInterface} + \o simulator: \l{ViewScriptInterface} \o location: \l{LocationScriptInterface} \o sensors: \l{SensorsScriptInterface} \o sysinfo.generic: \l{GenericSystemInfoScriptInterface} |