blob: 56b9db8a76c1b96f3cf94d2786c47522d9a95fb7 (
plain)
1 diff -up qtbase-everywhere-src-5.14.2/src/corelib/global/qlibraryinfo.cpp.no_relocatable qtbase-everywhere-src-5.14.2/src/corelib/global/qlibraryinfo.cpp
2 --- qtbase-everywhere-src-5.14.2/src/corelib/global/qlibraryinfo.cpp.no_relocatable 2020-03-27 04:49:31.000000000 -0500
3 +++ qtbase-everywhere-src-5.14.2/src/corelib/global/qlibraryinfo.cpp 2020-04-13 15:13:44.075705226 -0500
4 @@ -671,8 +671,11 @@ static QString getPrefix(
5 # if QT_CONFIGURE_CROSSBUILD
6 if (group == QLibraryInfo::DevicePaths)
7 return QString::fromLocal8Bit(QT_CONFIGURE_PREFIX_PATH);
8 -# endif
9 +# elif 0 //QT_CONFIG(relocatable)
10 return getExtPrefixFromHostBinDir();
11 +# else
12 + return QString::fromLocal8Bit(QT_CONFIGURE_PREFIX_PATH);
13 +# endif
14 #elif QT_CONFIG(relocatable)
15 return getRelocatablePrefix();
16 #else
|
