whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Detect qt.conf in bundle on OSX without QCoreApplication 

On OSX we don't need the applicationDirPath to find a qt.conf
located in the application bundle. Let's take advantage of this and
allow findConfiguration to use it.

Task-number: QTBUG-24541
Change-Id: I38c349a3bcd140fcf91352c88c24ca662e6e6f2e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
bb10
Ulf Hermann 2015-03-09 17:42:19 +01:00
parent d96c29a5d1
commit 1fc6056ff5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/global/qlibraryinfo.cpp
View File

@ -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))