[PATCH 0/2] QT toolchain relocation fix

[PATCH 0/2] QT toolchain relocation fix

[Laurentiu Palcu]

The following changes since commit 78b91ab23d9856525fc7ac1bb8da2975382813bf:

  pigz: bump to 2.3.1 (2013-10-26 16:08:41 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib lpalcu/b5339_qt_toolchain_issue
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=lpalcu/b5339_qt_toolchain_issue

Laurentiu Palcu (2):
  nativesdk-qt4-tools: create qt.conf file
  meta-toolchain-qt: put QT_CONF_PATH in environment script

 meta/recipes-qt/meta/meta-toolchain-qt.inc  |    1 +
 meta/recipes-qt/qt4/nativesdk-qt4-tools.inc |    6 ++++++
 2 files changed, 7 insertions(+)

-- 
1.7.9.5

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

[Laurentiu Palcu]

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(+)

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
 }
-- 
1.7.9.5

[PATCH 2/2] meta-toolchain-qt: put QT_CONF_PATH in environment script

[Laurentiu Palcu]

This will allow apps using QLibraryInfo class to find qt.conf.

[YOCTO #5339]

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

diff --git a/meta/recipes-qt/meta/meta-toolchain-qt.inc b/meta/recipes-qt/meta/meta-toolchain-qt.inc
index 14591a8..edebfe7 100644
--- a/meta/recipes-qt/meta/meta-toolchain-qt.inc
+++ b/meta/recipes-qt/meta/meta-toolchain-qt.inc
@@ -24,6 +24,7 @@ toolchain_create_sdk_env_script_append() {
     echo 'export OE_QMAKE_QDBUSXML2CPP=${QT_TOOLS_PREFIX}/qdbusxml2cpp4' >> $script
     echo 'export OE_QMAKE_QT_CONFIG=${SDKTARGETSYSROOT}/${datadir}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script
     echo 'export QMAKESPEC=${SDKTARGETSYSROOT}/${datadir}/${QT_DIR_NAME}/mkspecs/linux-g++' >> $script
+    echo 'export QT_CONF_PATH=${SDKPATHNATIVE}/${sysconfdir}' >> $script
 
     # make a symbolic link to mkspecs for compatibility with Nokia's SDK
     # and QTCreator
-- 
1.7.9.5