Use the tqInstallPath* functions for all paths needed for the pkg-config file.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 38048ca615)
v3.5.13-sru
Slávek Banko 3 years ago
parent 5de39f7b4c
commit feeca8d3d1
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -1546,26 +1546,38 @@ UnixMakefileGenerator::writePkgConfigFile() // ### does make sense only for
project->variables()["ALL_DEPS"].append(fname); project->variables()["ALL_DEPS"].append(fname);
QTextStream t(&ft); QTextStream t(&ft);
QString prefix = pkgConfigPrefix(); QString prefix = pkgConfigPrefix();
QString libDir = project->first("QMAKE_PKGCONFIG_LIBDIR"); QString libDir = qInstallPathLibs();
if(libDir.isEmpty()) if (libDir.isEmpty())
libDir = prefix + "/lib"; {
QString includeDir = project->first("QMAKE_PKGCONFIG_INCDIR"); libDir = prefix + "/lib";
if(includeDir.isEmpty()) }
includeDir = prefix + "/include"; QString includeDir = qInstallPathHeaders();
QString pluginsDir = project->first("QMAKE_PKGCONFIG_PLUGINS"); if (includeDir.isEmpty())
if(pluginsDir.isEmpty()) {
pluginsDir = prefix + "/plugins"; includeDir = prefix + "/include";
QString translationsDir = qInstallPathTranslations(); }
if(translationsDir.isEmpty()) QString pluginsDir = qInstallPathPlugins();
translationsDir = prefix + "/translations"; if (pluginsDir.isEmpty())
{
t << "prefix=" << prefix << endl; pluginsDir = prefix + "/plugins";
t << "exec_prefix=${prefix}\n" }
<< "libdir=" << pkgConfigFixPath(libDir) << "\n" QString translationsDir = qInstallPathTranslations();
<< "includedir=" << pkgConfigFixPath(includeDir) << "\n" if (translationsDir.isEmpty())
<< "translationsdir=" << pkgConfigFixPath(translationsDir) << endl; {
t << "pluginsdir=" << pkgConfigFixPath(pluginsDir) << endl; // non-standard entry. Provides path for plugins translationsDir = prefix + "/translations";
}
t << "prefix=" << prefix << endl
<< "exec_prefix=${prefix}" << endl
<< "libdir=" << pkgConfigFixPath(libDir) << endl
<< "includedir=" << pkgConfigFixPath(includeDir) << endl
// non-standard entry. Provides path for plugins
<< "pluginsdir=" << pkgConfigFixPath(pluginsDir) << endl
// non-standard entry. Provides path for translations
<< "translationsdir=" << pkgConfigFixPath(translationsDir) << endl
<< endl;
// non-standard entry. Provides useful info normally only // non-standard entry. Provides useful info normally only
// contained in the internal .qmake.cache file // contained in the internal .qmake.cache file
t << varGlue("CONFIG", "qt_config=", " ", "") << endl << endl; t << varGlue("CONFIG", "qt_config=", " ", "") << endl << endl;

Loading…
Cancel
Save