Attachment 1638 Details for Bug 1151 – tqt : add pluginsdir to pkgconfig file

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] tqt : add pluginsdir to pkgconfig file

tqt-add-pkgconfig-pluginsdir.diff (text/plain), 1.36 KB, created by Slávek Banko on 2013-11-13 21:36:49 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Slávek Banko

Created: 2013-11-13 21:36:49 CST

Size: 1.36 KB

patch

obsolete

>diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
>index 684a644..0a58d97 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 f092d99..b2e0d1a 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-* {

Actions: View | Diff

Attachments on bug 1151: 763 | 1638 | 1640