Merge pull request #1225 from rduivenvoorde/docurlfix

jef-n · jef-n · commit 8b6db498b395 · 2014-03-05T11:47:07.000+01:00
no html in the url anymore
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -7032,7 +7032,7 @@ void QgisApp::adjustBrightnessContrast( int delta, bool updateBrightness )
 void QgisApp::helpContents()
 {
   // We should really ship the HTML version of the docs local too.
-  openURL( QString( "http://docs.qgis.org/%1.%2/html/%3/docs/user_manual/" )
+  openURL( QString( "http://docs.qgis.org/%1.%2/%3/docs/user_manual/" )
            .arg( QGis::QGIS_VERSION_INT / 10000 )
            .arg( QGis::QGIS_VERSION_INT / 100 % 100 )
            .arg( tr( "en", "documentation language" ) ),

Original file line number	Diff line number	Diff line change
`@@ -7032,7 +7032,7 @@ void QgisApp::adjustBrightnessContrast( int delta, bool updateBrightness )`
`7032`	`7032`	`void QgisApp::helpContents()`
`7033`	`7033`	`{`
`7034`	`7034`	`// We should really ship the HTML version of the docs local too.`
`7035`		`- openURL( QString( "http://docs.qgis.org/%1.%2/html/%3/docs/user_manual/" )`
	`7035`	`+ openURL( QString( "http://docs.qgis.org/%1.%2/%3/docs/user_manual/" )`
`7036`	`7036`	`.arg( QGis::QGIS_VERSION_INT / 10000 )`
`7037`	`7037`	`.arg( QGis::QGIS_VERSION_INT / 100 % 100 )`
`7038`	`7038`	`.arg( tr( "en", "documentation language" ) ),`