Skip to content
Permalink
Browse files

merge error

  • Loading branch information
signedav committed Aug 7, 2018
1 parent ad086dc commit fea9de9f150a8d01051abd21026a7cea78425d03
Showing with 22 additions and 2 deletions.
  1. +12 −1 python/core/auto_generated/qgsapplication.sip.in
  2. +10 −1 src/core/qgsapplication.h
@@ -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 );
@@ -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
*

0 comments on commit fea9de9

Please sign in to comment.
You can’t perform that action at this time.