859557c29f
See for the list of bugs fixed: http://www.qgis.org/en/about-qgis/qgis-releases/139-qgis-1-7-4-releasehtml.html (we cant update to 1.8.0 because our bison is too old, and newer bisons dont cope well with our m4)
32 lines
1.4 KiB
Plaintext
32 lines
1.4 KiB
Plaintext
$OpenBSD: patch-src_app_qgisapp_cpp,v 1.3 2012/11/01 07:25:36 landry Exp $
|
|
Fix paths to docs
|
|
--- src/app/qgisapp.cpp.orig Wed Feb 22 21:48:14 2012
|
|
+++ src/app/qgisapp.cpp Wed Oct 31 11:09:36 2012
|
|
@@ -855,7 +855,7 @@ void QgisApp::createActions()
|
|
mActionQgisHomePage->setShortcut( QString() );
|
|
#endif
|
|
|
|
- mActionHelpContents->setEnabled( QFileInfo( QgsApplication::pkgDataPath() + "/doc/index.html" ).exists() );
|
|
+ mActionHelpContents->setEnabled( QFileInfo( QgsApplication::pkgDataPath() + "/../doc/qgis/index.html" ).exists() );
|
|
|
|
connect( mActionHelpContents, SIGNAL( triggered() ), this, SLOT( helpContents() ) );
|
|
connect( mActionHelpAPI, SIGNAL( triggered() ), this, SLOT( apiDocumentation() ) );
|
|
@@ -4880,7 +4880,7 @@ void QgisApp::helpContents()
|
|
|
|
void QgisApp::apiDocumentation()
|
|
{
|
|
- if ( QFileInfo( QgsApplication::pkgDataPath() + "/doc/api/index.html" ).exists() )
|
|
+ if ( QFileInfo( QgsApplication::pkgDataPath() + "/../doc/qgis/api/index.html" ).exists() )
|
|
{
|
|
openURL( "api/index.html" );
|
|
}
|
|
@@ -4900,7 +4900,7 @@ void QgisApp::openURL( QString url, bool useQgisDocDir
|
|
// open help in user browser
|
|
if ( useQgisDocDirectory )
|
|
{
|
|
- url = "file://" + QgsApplication::pkgDataPath() + "/doc/" + url;
|
|
+ url = "file://" + QgsApplication::pkgDataPath() + "/../doc/qgis/" + url;
|
|
}
|
|
#ifdef Q_OS_MACX
|
|
/* Use Mac OS X Launch Services which uses the user's default browser
|