Merge pull request #7001 from m-kuhn/userprofile-database-name

m-kuhn · web-flow · commit d5cec14699ea · 2018-05-17T08:31:32.000+02:00
Use connection name to avoid closing default connection
diff --git a/src/core/qgsuserprofile.cpp b/src/core/qgsuserprofile.cpp
@@ -67,7 +67,7 @@ const QString QgsUserProfile::alias() const
     return name();
   }
 
-  QSqlDatabase db = QSqlDatabase::addDatabase( QStringLiteral( "QSQLITE" ) );
+  QSqlDatabase db = QSqlDatabase::addDatabase( QStringLiteral( "QSQLITE" ), QStringLiteral( "userprofile" ) );
   db.setDatabaseName( qgisDB() );
   if ( !db.open() )
     return name();

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ const QString QgsUserProfile::alias() const`
`67`	`67`	`return name();`
`68`	`68`	`}`
`69`	`69`
`70`		`- QSqlDatabase db = QSqlDatabase::addDatabase( QStringLiteral( "QSQLITE" ) );`
	`70`	`+ QSqlDatabase db = QSqlDatabase::addDatabase( QStringLiteral( "QSQLITE" ), QStringLiteral( "userprofile" ) );`
`71`	`71`	`db.setDatabaseName( qgisDB() );`
`72`	`72`	`if ( !db.open() )`
`73`	`73`	`return name();`