diff options
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 24afe719c1..484c7869a6 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -162,7 +162,7 @@ QSettings *QLibraryInfoPrivate::findConfiguration() if(!QFile::exists(qtconfig)) qtconfig = qmake_libraryInfoFile(); #else - if (!QFile::exists(qtconfig) && QCoreApplication::instance()) { + if (!QFile::exists(qtconfig)) { #ifdef Q_OS_MAC CFBundleRef bundleRef = CFBundleGetMainBundle(); if (bundleRef) { @@ -177,10 +177,12 @@ QSettings *QLibraryInfoPrivate::findConfiguration() } if (qtconfig.isEmpty()) #endif - { + { + if (QCoreApplication::instance()) { QDir pwd(QCoreApplication::applicationDirPath()); qtconfig = pwd.filePath(QLatin1String("qt.conf")); } + } } #endif if (QFile::exists(qtconfig)) |