diff options
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 5 | ||||
| -rw-r--r-- | src/qt.pro | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 684a6442b..8d1dd8c43 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -1543,11 +1543,16 @@ UnixMakefileGenerator::writePkgConfigFile() // ### does make sense only for TQString includeDir = project->first("QMAKE_PKGCONFIG_INCDIR"); if(includeDir.isEmpty()) includeDir = prefix + "/include"; + TQString pluginsDir = project->first("QMAKE_PKGCONFIG_PLUGINS"); + if(pluginsDir.isEmpty()) + pluginsDir = prefix + "/plugins"; t << "prefix=" << prefix << endl; t << "exec_prefix=${prefix}\n" << "libdir=" << pkgConfigFixPath(libDir) << "\n" << "includedir=" << pkgConfigFixPath(includeDir) << endl; + // non-standard entry. Provides path for plugins + t << "pluginsdir=" << pkgConfigFixPath(pluginsDir) << endl; // non-standard entry. Provides useful info normally only // contained in the internal .qmake.cache file t << varGlue("CONFIG", "qt_config=", " ", "") << endl << endl; diff --git a/src/qt.pro b/src/qt.pro index f092d9935..b2e0d1afb 100644 --- a/src/qt.pro +++ b/src/qt.pro @@ -177,6 +177,7 @@ unix { CONFIG += create_libtool create_pc QMAKE_PKGCONFIG_LIBDIR = $$target.path QMAKE_PKGCONFIG_INCDIR = $$headers.path + QMAKE_PKGCONFIG_PLUGINS = $$plugins.path } wince-* { |