@@ -208,32 +208,35 @@ void QgsApplication::init( QString profileFolder )
208
208
}
209
209
else
210
210
{
211
- char *prefixPath = getenv ( " QGIS_PREFIX_PATH" );
212
- if ( !prefixPath )
211
+ if ( ABISYM ( mPrefixPath ).isNull () )
213
212
{
213
+ char *prefixPath = getenv ( " QGIS_PREFIX_PATH" );
214
+ if ( !prefixPath )
215
+ {
214
216
#if defined(Q_OS_MACX) || defined(Q_OS_WIN)
215
- setPrefixPath ( applicationDirPath (), true );
217
+ setPrefixPath ( applicationDirPath (), true );
216
218
#elif defined(ANDROID)
217
- // this is "/data/data/org.qgis.qgis" in android
218
- QDir myDir ( QDir::homePath () );
219
- myDir.cdUp ();
220
- QString myPrefix = myDir.absolutePath ();
221
- setPrefixPath ( myPrefix, true );
219
+ // this is "/data/data/org.qgis.qgis" in android
220
+ QDir myDir ( QDir::homePath () );
221
+ myDir.cdUp ();
222
+ QString myPrefix = myDir.absolutePath ();
223
+ setPrefixPath ( myPrefix, true );
222
224
#else
223
- QDir myDir ( applicationDirPath () );
224
- // Fix for server which is one level deeper in /usr/lib/cgi-bin
225
- if ( applicationDirPath ().contains ( QStringLiteral ( " cgi-bin" ) ) )
225
+ QDir myDir ( applicationDirPath () );
226
+ // Fix for server which is one level deeper in /usr/lib/cgi-bin
227
+ if ( applicationDirPath ().contains ( QStringLiteral ( " cgi-bin" ) ) )
228
+ {
229
+ myDir.cdUp ();
230
+ }
231
+ myDir.cdUp (); // Go from /usr/bin or /usr/lib (for server) to /usr
232
+ QString myPrefix = myDir.absolutePath ();
233
+ setPrefixPath ( myPrefix, true );
234
+ #endif
235
+ }
236
+ else
226
237
{
227
- myDir. cdUp ( );
238
+ setPrefixPath ( prefixPath, true );
228
239
}
229
- myDir.cdUp (); // Go from /usr/bin or /usr/lib (for server) to /usr
230
- QString myPrefix = myDir.absolutePath ();
231
- setPrefixPath ( myPrefix, true );
232
- #endif
233
- }
234
- else
235
- {
236
- setPrefixPath ( prefixPath, true );
237
240
}
238
241
}
239
242
0 commit comments