diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-11-25 12:41:07 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-12-15 19:53:58 +0100 |
| commit | f16757db87862382e4240be4a58c809a745ca186 (patch) | |
| tree | e098a08d57bae91563bd4ed38d2f5f7b0e944592 | |
| parent | adf32d0c0a3ed7bc5d13cd74729a7cbde4624eef (diff) | |
| download | qt3-f16757db87862382e4240be4a58c809a745ca186.tar.gz qt3-f16757db87862382e4240be4a58c809a745ca186.zip | |
Add pluginsdir to pkgconfig file
(cherry picked from commit 3a89e057b7c76a7a5aee753d111bc63f5b8808ac)
| -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 cd1c829..354bcf6 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -1543,11 +1543,16 @@ UnixMakefileGenerator::writePkgConfigFile() // ### does make sense only for QString includeDir = project->first("QMAKE_PKGCONFIG_INCDIR"); if(includeDir.isEmpty()) includeDir = prefix + "/include"; + QString 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; @@ -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-* { |