sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-06-19 00:02:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

merge error

Browse Source
This commit is contained in:
signedav 2018-08-07 17:08:56 +02:00
parent ad086dc474
commit fea9de9f15
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
python/core/auto_generated/qgsapplication.sip.in
View File

@ -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 );

11
src/core/qgsapplication.h
View File

@ -725,7 +725,6 @@ class CORE_EXPORT QgsApplication : public QApplication
*/
static void setCustomVariables( const QVariantMap &customVariables );
/**
* Set a single custom expression variable.
*
@ -733,6 +732,16 @@ class CORE_EXPORT QgsApplication : public QApplication
*/
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
*