diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-20 01:14:52 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-20 01:14:52 (GMT) |
| commit | 91a2da396fb476401e3b2c55ca7672a8b462ceca (patch) | |
| tree | dc944bf7d6df0fc0e2b0bad290396084626dd898 /tools/qdoc3/test/qmake.qdocconf | |
| parent | 530fd3831f012337d7460c4387ce82083ab3e144 (diff) | |
| parent | 5f92bc9dd9f05f4824711b03406bdbe222ff73e9 (diff) | |
| download | Qt-91a2da396fb476401e3b2c55ca7672a8b462ceca.zip Qt-91a2da396fb476401e3b2c55ca7672a8b462ceca.tar.gz Qt-91a2da396fb476401e3b2c55ca7672a8b462ceca.tar.bz2 | |
Merge branch '4.6' of ../qt into kinetic-declarativeui
Conflicts:
src/corelib/kernel/qobject.cpp
Diffstat (limited to 'tools/qdoc3/test/qmake.qdocconf')
| -rw-r--r-- | tools/qdoc3/test/qmake.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf index ad27d75..0e7d960 100644 --- a/tools/qdoc3/test/qmake.qdocconf +++ b/tools/qdoc3/test/qmake.qdocconf @@ -17,7 +17,7 @@ qhp.qmake.namespace = com.trolltech.qmake.460 qhp.qmake.virtualFolder = qdoc qhp.qmake.indexTitle = QMake Manual qhp.qmake.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png -qhp.qmake.filterAttributes = qt 4.6.1 tools qmake +qhp.qmake.filterAttributes = qt 4.6.2 tools qmake qhp.qmake.customFilters.qmake.name = qmake Manual qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake qhp.qmake.subprojects = manual |