[Server 3.0] strict check for QgsApplication

elpaso · elpaso · commit b46d3379d884 · 2016-09-25T22:43:58.000+02:00
diff --git a/src/server/qgsserver.cpp b/src/server/qgsserver.cpp
@@ -74,9 +74,10 @@ bool QgsServer::sCaptureOutput = true;
 
 QgsServer::QgsServer( bool captureOutput )
 {
-  // Must be already instanciated
-  if ( qApp == nullptr )
+  // QgsApplication must exist
+  if ( qobject_cast<QgsApplication*>( qApp ) == nullptr )
   {
+    qFatal( "A QgsApplication must exist before a QgsServer instance can be created." );
     abort();
   }
   sCaptureOutput = captureOutput;

Original file line number	Diff line number	Diff line change
`@@ -74,9 +74,10 @@ bool QgsServer::sCaptureOutput = true;`
`74`	`74`
`75`	`75`	`QgsServer::QgsServer( bool captureOutput )`
`76`	`76`	`{`
`77`		`- // Must be already instanciated`
`78`		`- if ( qApp == nullptr )`
	`77`	`+ // QgsApplication must exist`
	`78`	`+ if ( qobject_cast<QgsApplication*>( qApp ) == nullptr )`
`79`	`79`	`{`
	`80`	`+ qFatal( "A QgsApplication must exist before a QgsServer instance can be created." );`
`80`	`81`	`abort();`
`81`	`82`	`}`
`82`	`83`	`sCaptureOutput = captureOutput;`