From fea9de9f150a8d01051abd21026a7cea78425d03 Mon Sep 17 00:00:00 2001
From: signedav <david@opengis.ch>
Date: Tue, 7 Aug 2018 17:08:56 +0200
Subject: [PATCH] merge error

---
 python/core/auto_generated/qgsapplication.sip.in | 13 ++++++++++++-
 src/core/qgsapplication.h                        | 11 ++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/python/core/auto_generated/qgsapplication.sip.in b/python/core/auto_generated/qgsapplication.sip.in
index ca19d6f36cea..0fb67e645695 100644
--- a/python/core/auto_generated/qgsapplication.sip.in
+++ b/python/core/auto_generated/qgsapplication.sip.in
@@ -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 );
diff --git a/src/core/qgsapplication.h b/src/core/qgsapplication.h
index 6a44ea33232d..c8679d5a2276 100644
--- a/src/core/qgsapplication.h
+++ b/src/core/qgsapplication.h
@@ -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
      *