Patchwork [1/2] nativesdk-qt4-tools: create qt.conf file

login
register
mail settings
Submitter Laurentiu Palcu
Date Oct. 28, 2013, 3:46 p.m.
Message ID <9099fdcdc1f68910f4e8af56aec77a91e0b538f3.1382975017.git.laurentiu.palcu@intel.com>
Download mbox | patch
Permalink /patch/60569/
State Accepted
Commit 23f88695683a8e428375a8ccb6be935347a8768c
Headers show

Comments

Laurentiu Palcu - Oct. 28, 2013, 3:46 p.m.
When installing the SDK to another location than the default one, qmake
will look for libraries, headers, etc. in the default location. That's
because the paths are hard-coded in the binary itself. Luckily, QT
allows to override this using a qt.conf file installed in the same
directory with the application executable. However, we already have a
patch that allows for the installation of qt.conf in another place and
read the location from QT_CONF_PATH environment variable.

Hence, install qt.conf in ${sysconfdir}. This will allow other apps, that
use QLibraryInfo class, to find it.

[YOCTO #5339]

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 meta/recipes-qt/qt4/nativesdk-qt4-tools.inc |    6 ++++++
 1 file changed, 6 insertions(+)

Patch

diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
index a9ec61e..2c806e0 100644
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools.inc
@@ -118,4 +118,10 @@  do_install() {
     for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do \
         ln -s ${i}4 ${i}; \
     done)
+
+    install -d ${D}${sysconfdir}
+    cat >${D}${sysconfdir}/qt.conf <<EOF
+[Paths]
+Prefix = ${prefix}
+EOF
 }