diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-29 04:09:01 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-29 04:09:01 (GMT) |
commit | 575ad2c60482b279f828cfa87186b5fbb10f76c6 (patch) | |
tree | 101df52cd4b769dc8d10ef60714f25d819636e70 /doc/src/index.qdoc | |
parent | a913e326409062bbc1cad4d5898181c7b81cba23 (diff) | |
parent | 638f46a96b68d21137c4903c68015752ebdf58dc (diff) | |
download | Qt-575ad2c60482b279f828cfa87186b5fbb10f76c6.zip Qt-575ad2c60482b279f828cfa87186b5fbb10f76c6.tar.gz Qt-575ad2c60482b279f828cfa87186b5fbb10f76c6.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
mkspecs/features/qt.prf
Diffstat (limited to 'doc/src/index.qdoc')
-rw-r--r-- | doc/src/index.qdoc | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 3e5aad5..480107a 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -43,24 +43,8 @@ \page index.html \keyword Qt Reference Documentation - \if defined(opensourceedition) - \title Qt Reference Documentation (Open Source Edition) - \endif - - \if defined(desktoplightedition) - \title Qt Reference Documentation (GUI Framework Edition) - \endif - - \if defined(desktopedition) - \title Qt Reference Documentation (Full Framework Edition) - \endif - - \if !defined(opensourceedition) \ - && !defined(desktoplightedition) \ - && !defined(desktopedition) \title Qt Reference Documentation - \endif - + \raw HTML <table cellpadding="2" cellspacing="1" border="0" width="95%" class="indextable" align="center"> <tr> |