diff options
| author | Andrew Stanley-Jones <andrew.stanley-jones@nokia.com> | 2010-11-22 15:19:08 +1000 |
|---|---|---|
| committer | Andrew Stanley-Jones <andrew.stanley-jones@nokia.com> | 2010-11-22 15:19:08 +1000 |
| commit | 92704c84cb3853b3fed328ef0de3c87140a23924 (patch) | |
| tree | 598db77c190df38ddad374854672c1c6b1352ae8 /qtmobility.pro | |
| parent | f9316b962dff6289e54400926224e2b03653be95 (diff) | |
| parent | ab9afab155b7d1f2fd0189e043b31102341b0312 (diff) | |
Merge remote branch 'origin/1.1' into master-from-1.1
Conflicts:
configure
dist/changes-1.1.1
doc/src/installation.qdoc
doc/src/qtmobility.qdocconf
plugins/declarative/multimedia/qdeclarativemediabase.cpp
plugins/declarative/systeminfo/qdeclarativenetworkinfo.cpp
src/systeminfo/qsystemdeviceinfo.cpp
src/systeminfo/qsysteminfo_maemo.cpp
Diffstat (limited to 'qtmobility.pro')
| -rw-r--r-- | qtmobility.pro | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/qtmobility.pro b/qtmobility.pro index eee0d5986b..1dff098117 100644 --- a/qtmobility.pro +++ b/qtmobility.pro @@ -94,7 +94,11 @@ contains(build_docs, yes) { SUBDIRS += doc include(doc/doc.pri) - OTHER_FILES += doc/src/*.qdoc doc/src/examples/*.qdoc + OTHER_FILES += \ + doc/src/*.qdoc \ + doc/src/legal/*.qdoc \ + doc/src/examples/*.qdoc \ + doc/src/plugins/*.qdoc } contains(build_unit_tests, yes):SUBDIRS+=tests |