1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix unused function warning for prefixFromQtCoreLibraryHelper

Browse Source 
Change-Id: Iedbe0e9363b6bd97071b38aa1d4546777b34139d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Tor Arne Vestbø 2019-09-27 12:28:49 +02:00
parent 91a869671e
commit d3be61d965
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -495,6 +495,8 @@ static QString prefixFromAppDirHelper()
#endif #endif
#if !defined(QT_BUILD_QMAKE) && QT_CONFIG(relocatable) #if !defined(QT_BUILD_QMAKE) && QT_CONFIG(relocatable)
#if !defined(QT_STATIC) && !(defined(Q_OS_DARWIN) && QT_CONFIG(framework)) \
&& (QT_CONFIG(dlopen) || defined(Q_OS_WIN))
static QString prefixFromQtCoreLibraryHelper(const QString &qtCoreLibraryPath) static QString prefixFromQtCoreLibraryHelper(const QString &qtCoreLibraryPath)
{ {
const QString qtCoreLibrary = QDir::fromNativeSeparators(qtCoreLibraryPath); const QString qtCoreLibrary = QDir::fromNativeSeparators(qtCoreLibraryPath);
@ -503,6 +505,7 @@ static QString prefixFromQtCoreLibraryHelper(const QString &qtCoreLibraryPath)
+ QLatin1String(QT_CONFIGURE_LIBLOCATION_TO_PREFIX_PATH); + QLatin1String(QT_CONFIGURE_LIBLOCATION_TO_PREFIX_PATH);
return QDir::cleanPath(prefixDir); return QDir::cleanPath(prefixDir);
} }
#endif
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
#if defined(Q_OS_WINRT) #if defined(Q_OS_WINRT)