Merge pull request #6503 from m-kuhn/variousFixes

m-kuhn · web-flow · commit b84f014d9e5f · 2018-03-02T17:02:38.000-05:00
Various fixes
diff --git a/python/core/geometry/qgsgeometry.sip.in b/python/core/geometry/qgsgeometry.sip.in
@@ -100,9 +100,9 @@ This is much faster then calling the non-const get() method.
 
 .. versionadded:: 3.0
 
-.. seealso:: :py:func:`primitive`
-
 .. seealso:: :py:func:`set`
+
+.. seealso:: :py:func:`get`
 %End
 
     QgsAbstractGeometry *get();
diff --git a/src/app/qgsabout.cpp b/src/app/qgsabout.cpp
@@ -275,7 +275,7 @@ void QgsAbout::btnQgisUser_clicked()
 
 void QgsAbout::btnQgisHome_clicked()
 {
-  openUrl( QStringLiteral( "http://qgis.org" ) );
+  openUrl( QStringLiteral( "https://qgis.org" ) );
 }
 
 void QgsAbout::openUrl( const QUrl &url )
diff --git a/src/core/geometry/qgsgeometry.h b/src/core/geometry/qgsgeometry.h
@@ -175,8 +175,8 @@ class CORE_EXPORT QgsGeometry
      * \note In QGIS 2.x this method was named geometry().
      *
      * \since QGIS 3.0
-     * \see primitive()
      * \see set()
+     * \see get()
     */
     const QgsAbstractGeometry *constGet() const;
 

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ void QgsAbout::btnQgisUser_clicked()`
`275`	`275`
`276`	`276`	`void QgsAbout::btnQgisHome_clicked()`
`277`	`277`	`{`
`278`		`- openUrl( QStringLiteral( "http://qgis.org" ) );`
	`278`	`+ openUrl( QStringLiteral( "https://qgis.org" ) );`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`void QgsAbout::openUrl( const QUrl &url )`
Original file line number	Diff line number	Diff line change
`@@ -175,8 +175,8 @@ class CORE_EXPORT QgsGeometry`
`175`	`175`	`* \note In QGIS 2.x this method was named geometry().`
`176`	`176`	`*`
`177`	`177`	`* \since QGIS 3.0`
`178`		`- * \see primitive()`
`179`	`178`	`* \see set()`
	`179`	`+ * \see get()`
`180`	`180`	`*/`
`181`	`181`	`const QgsAbstractGeometry *constGet() const;`
`182`	`182`