From kdevelop-devel  Sat Mar 22 00:11:37 2003
From: Roland Krause <rokrau () yahoo ! com>
Date: Sat, 22 Mar 2003 00:11:37 +0000
To: kdevelop-devel
Subject: KDevelop-2.1.5 Qt documentation broken
X-MARC-Message: https://marc.info/?l=kdevelop-devel&m=104829200122904
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--0-2022328205-1048291897=:87398"

--0-2022328205-1048291897=:87398
Content-Type: text/plain; charset=us-ascii
Content-Id: 
Content-Disposition: inline

Since this seems to be broken for some of use I looked into it and made
a patch which works for me on RH-8. 

Maybe someone can check it out. 

Also it seems that the problem mainly occurs when there is no kdelibs
documentation installed. 

Patch attached. 

Time to bury this monster. 

Roland

__________________________________________________
Do you Yahoo!?
Yahoo! Platinum - Watch CBS' NCAA March Madness, live on your desktop!
http://platinum.yahoo.com
--0-2022328205-1048291897=:87398
Content-Type: text/x-diff; name="doctreeview.cpp.patch"
Content-Description: doctreeview.cpp.patch
Content-Disposition: inline; filename="doctreeview.cpp.patch"

Index: doctreeview.cpp
===================================================================
RCS file: /home/kde/kdevelop/kdevelop/Attic/doctreeview.cpp,v
retrieving revision 1.10.2.25.2.19.2.7
diff -u -p -u -3 -b -r1.10.2.25.2.19.2.7 doctreeview.cpp
--- doctreeview.cpp	19 Jan 2003 13:21:37 -0000	1.10.2.25.2.19.2.7
+++ doctreeview.cpp	22 Mar 2003 00:06:00 -0000
@@ -329,7 +329,7 @@ void DocTreeKDevelopFolder::refresh()
   (void) new DocTreeKDevelopBook(this, kdelibref,               "kde_libref/index.html",  true);
   KConfig* config=KGlobal::config();
   config->setGroup("Doc_Location");
-  QString designer = config->readEntry("doc_qt", QT_DOCDIR)+"designer/book1.html";
+  QString designer = config->readEntry("doc_qt", QT_DOCDIR)+"designer-manual.html";
   if(QFileInfo(designer).exists())
   (void) new ListViewBookItem(this, i18n("Qt Designer Manual"), designer);
   (void) new DocTreeKDevelopBook(this, i18n("C/C++ Reference"), "reference/C/cref.html");
@@ -847,7 +847,16 @@ void DocTreeKDELibsFolder::refresh()
 
     QString docu_dir, libname, msg, tagF;
     KConfig* config=KGlobal::config();
+
     config->setGroup("Doc_Location");
+    QString qt_path = config->readEntry("doc_qt", QT_DOCDIR);
+    if (!qt_path.isEmpty())
+    {
+      QDir d;
+      d.setPath(qt_path);
+      appendBooks(d); //append Qt docs first!
+    }
+
     docu_dir = config->readEntry("doc_kde", KDELIBS_DOCDIR);
     if (!docu_dir.isEmpty())
     {
@@ -884,8 +893,9 @@ void DocTreeKDELibsFolder::appendBooks(Q
   QString libname, msg, tagF;
 
    // insert Qt's docs first:
-   if( dir.absPath().right(15)== QString("kdelibs-apidocs") ){
-    tagF = dir.absPath() + "/qt/qt.tag";
+   //if( dir.absPath().right(15)== QString("kdelibs-apidocs") ){
+   if( dir.absPath().right(8)== QString("doc/html") ){
+    tagF = dir.absPath() + "/index.html";
     if( QFile::exists(tagF) )
       list.append(new DocTreeKDELibsBook(this, i18n("Qt Library"), 0, tagF));
     else if( QFile::exists(tagF+".gz") )

--0-2022328205-1048291897=:87398--

_______________________________________________
Kdevelop-devel mailing list
Kdevelop-devel@barney.cs.uni-potsdam.de
http://barney.cs.uni-potsdam.de/mailman/listinfo/kdevelop-devel