Move target to 3.22

qgis · Jul 6, 2021 · 927669d · 927669d
1 parent 5e83f5a
commit 927669d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/python/core/auto_generated/providers/qgsabstractdatabaseproviderconnection.sip.in b/python/core/auto_generated/providers/qgsabstractdatabaseproviderconnection.sip.in
@@ -405,7 +405,7 @@ Returns connection geometry column capabilities (Z, M, SinglePart, Curves).
 %Docstring
 Returns SQL layer definition capabilities (Filters, GeometryColumn, PrimaryKeys).
 
-.. versionadded:: 3.20
+.. versionadded:: 3.22
 %End
 
 
@@ -560,7 +560,7 @@ Raises a :py:class:`QgsProviderConnectionException` if any errors are encountere
 
 :raises QgsProviderConnectionException: 
 
-.. versionadded:: 3.20
+.. versionadded:: 3.22
 %End
 
     virtual QueryResult execSql( const QString &sql, QgsFeedback *feedback = 0 ) const throw( QgsProviderConnectionException );
@@ -685,7 +685,7 @@ The default implementation returns an list of common reserved words under the
 
 Subclasses should add provider- and/or connection- specific words.
 
-.. versionadded:: 3.20
+.. versionadded:: 3.22
 %End
 
   protected:

diff --git a/python/gui/auto_generated/codeeditors/qgscodeeditorsql.sip.in b/python/gui/auto_generated/codeeditors/qgscodeeditorsql.sip.in
@@ -61,7 +61,7 @@ Extra keywords are usually added
 from provider connections and represent function and other provider specific
 keywords.
 
-.. versionadded:: 3.20
+.. versionadded:: 3.22
 %End
 
     QStringList extraKeywords() const;
@@ -72,7 +72,7 @@ Extra keywords are usually added
 from provider connections and represent function and other provider specific
 keywords.
 
-.. versionadded:: 3.20
+.. versionadded:: 3.22
 %End
 
   protected:

diff --git a/src/core/providers/qgsabstractdatabaseproviderconnection.h b/src/core/providers/qgsabstractdatabaseproviderconnection.h
@@ -201,7 +201,7 @@ class CORE_EXPORT QgsAbstractDatabaseProviderConnection : public QgsAbstractProv
      * \brief The SqlVectorLayerOptions stores all information required to create a SQL (query) layer.
      * \see createSqlVectorLayer()
      *
-     * \since QGIS 3.20
+     * \since QGIS 3.22
      */
     struct CORE_EXPORT SqlVectorLayerOptions
     {
@@ -548,7 +548,7 @@ class CORE_EXPORT QgsAbstractDatabaseProviderConnection : public QgsAbstractProv
 
     /**
      * Returns SQL layer definition capabilities (Filters, GeometryColumn, PrimaryKeys).
-     * \since QGIS 3.20
+     * \since QGIS 3.22
      */
     virtual SqlLayerDefinitionCapabilities sqlLayerDefinitionCapabilities();
 
@@ -670,7 +670,7 @@ class CORE_EXPORT QgsAbstractDatabaseProviderConnection : public QgsAbstractProv
      * Creates and returns a (possibly invalid) vector layer based on the \a sql statement and optional \a options.
      * Raises a QgsProviderConnectionException if any errors are encountered or if SQL layer creation is not supported.
      * \throws QgsProviderConnectionException
-     * \since QGIS 3.20
+     * \since QGIS 3.22
      */
     virtual QgsVectorLayer *createSqlVectorLayer( const SqlVectorLayerOptions &options ) const SIP_THROW( QgsProviderConnectionException ) SIP_FACTORY;
 
@@ -790,7 +790,7 @@ class CORE_EXPORT QgsAbstractDatabaseProviderConnection : public QgsAbstractProv
     *
     * Subclasses should add provider- and/or connection- specific words.
     *
-    * \since QGIS 3.20
+    * \since QGIS 3.22
     */
     virtual QMap<QgsAbstractDatabaseProviderConnection::SqlKeywordCategory, QStringList> sqlDictionary();
 

diff --git a/src/gui/codeeditors/qgscodeeditorsql.h b/src/gui/codeeditors/qgscodeeditorsql.h
@@ -68,7 +68,7 @@ class GUI_EXPORT QgsCodeEditorSQL : public QgsCodeEditor
      * from provider connections and represent function and other provider specific
      * keywords.
      *
-     * \since QGIS 3.20
+     * \since QGIS 3.22
      */
     void setExtraKeywords( const QStringList &extraKeywords );
 
@@ -79,7 +79,7 @@ class GUI_EXPORT QgsCodeEditorSQL : public QgsCodeEditor
      * from provider connections and represent function and other provider specific
      * keywords.
      *
-     * \since QGIS 3.20
+     * \since QGIS 3.22
      */
     QStringList extraKeywords() const;
 

diff --git a/src/ui/qgsqueryresultwidgetbase.ui b/src/ui/qgsqueryresultwidgetbase.ui
@@ -140,15 +140,8 @@
         </item>
        </layout>
       </item>
-      <item row="3" column="1">
+      <item row="4" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <widget class="QLabel" name="mLayerNameLabel">
-          <property name="text">
-           <string>Layer name</string>
-          </property>
-         </widget>
-        </item>
         <item>
          <widget class="QLineEdit" name="mLayerNameLineEdit">
           <property name="text">
@@ -158,7 +151,7 @@
         </item>
        </layout>
       </item>
-      <item row="5" column="1">
+      <item row="6" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout_3">
         <item>
          <spacer name="horizontalSpacer_2">
@@ -182,7 +175,7 @@
         </item>
        </layout>
       </item>
-      <item row="4" column="1">
+      <item row="3" column="0">
        <widget class="QCheckBox" name="mAvoidSelectingAsFeatureIdCheckBox">
         <property name="toolTip">
          <string>Disable 'Fast Access to Features at ID' capability to force keeping the attribute table in memory (e.g. in case of expensive views)</string>
@@ -192,6 +185,13 @@
         </property>
        </widget>
       </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="mLayerNameLabel">
+        <property name="text">
+         <string>Layer name</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>