Don't use QUCSDIR with QUCS-S

This commit is contained in:
Vadim Kuznetzov 2016-12-08 11:04:16 +03:00
parent e91e4b9088
commit d1bd120d41
4 changed files with 19 additions and 3 deletions

View File

@ -73,7 +73,11 @@ int main(int argc, char *argv[])
QucsSettings.showConsole = true;
// is application relocated?
char * var = getenv ("QUCSDIR");
#ifdef WITH_SPICE
char *var = NULL; // Don't use QUCSDIR with Qucs-S
#else
char* var = getenv("QUCSDIR");
#endif
QDir QucsDir;
if (var != NULL) {
QucsDir = QDir (var);

View File

@ -85,7 +85,11 @@ int main(int argc, char *argv[])
QucsSettings.font = QFont("Helvetica", 12);
// is application relocated?
char * var = getenv ("QUCSDIR");
#ifdef WITH_SPICE
char *var = NULL; // Don't use QUCSDIR with Qucs-S
#else
char* var = getenv("QUCSDIR");
#endif
QDir QucsDir;
if (var != NULL) {
QucsDir = QDir (var);

View File

@ -99,7 +99,11 @@ int main(int argc, char *argv[])
QucsSettings.QucsHomeDir.setPath(QDir::homePath() + "/.qucs");
// is application relocated?
char * var = getenv ("QUCSDIR");
#ifdef WITH_SPICE
char *var = NULL; // Don't use QUCSDIR with Qucs-S
#else
char* var = getenv("QUCSDIR");
#endif
QDir QucsDir;
if (var != NULL) {
QucsDir = QDir(QString(var));

View File

@ -790,7 +790,11 @@ int main(int argc, char *argv[])
// continue to set up overrides or default settings (some are saved on exit)
// check for relocation env variable
#ifdef WITH_SPICE
char *var = NULL; // Don't use QUCSDIR with Qucs-S
#else
char* var = getenv("QUCSDIR");
#endif
QDir QucsDir;
if (var!= NULL)
{