Skip to content

Commit

Permalink
merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
signedav committed Aug 7, 2018
1 parent ad086dc commit fea9de9
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
13 changes: 12 additions & 1 deletion python/core/auto_generated/qgsapplication.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -791,12 +791,23 @@ Do not include generated variables (like system name, user name etc.)
.. versionadded:: 3.0
%End


static void setCustomVariable( const QString &name, const QVariant &value );
%Docstring
Set a single custom expression variable.

.. versionadded:: 3.0
%End

int maxConcurrentConnectionsPerPool() const;
%Docstring
The maximum number of concurrent connections per connections pool.

.. note::

QGIS may in some situations allocate more than this amount
of connections to avoid deadlocks.

.. versionadded:: 3.4
%End

void collectTranslatableObjects( QgsTranslationContext *translationContext );
Expand Down
11 changes: 10 additions & 1 deletion src/core/qgsapplication.h
Original file line number Diff line number Diff line change
Expand Up @@ -725,14 +725,23 @@ class CORE_EXPORT QgsApplication : public QApplication
*/
static void setCustomVariables( const QVariantMap &customVariables );


/**
* Set a single custom expression variable.
*
* \since QGIS 3.0
*/
static void setCustomVariable( const QString &name, const QVariant &value );

/**
* The maximum number of concurrent connections per connections pool.
*
* \note QGIS may in some situations allocate more than this amount
* of connections to avoid deadlocks.
*
* \since QGIS 3.4
*/
int maxConcurrentConnectionsPerPool() const;

/**
* Emits the signal to collect all the strings of .qgs to be included in ts file
*
Expand Down

0 comments on commit fea9de9

Please sign in to comment.