From 9f04cb7bb6f9753e32988127038b648afbd9b974 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 27 Dec 2012 16:43:59 +0100
Subject: qt5: move module specific files to own directories

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes-qt/qt5/files/qmake.conf.sh                 | 39 ----------------------
 recipes-qt/qt5/files/qplatformdefs.h               |  1 -
 recipes-qt/qt5/qt5-native.inc                      |  2 +-
 .../qt5/qt5-native/0001-Always-build-uic.patch     | 31 +++++++++++++++++
 ...Allow-qt.conf-override-when-bootstrapping.patch | 31 +++++++++++++++++
 recipes-qt/qt5/qtbase/0001-Always-build-uic.patch  | 31 -----------------
 ...Allow-qt.conf-override-when-bootstrapping.patch | 31 -----------------
 recipes-qt/qt5/qtbase/qmake.conf.sh                | 39 ++++++++++++++++++++++
 recipes-qt/qt5/qtbase/qplatformdefs.h              |  1 +
 9 files changed, 103 insertions(+), 103 deletions(-)
 delete mode 100644 recipes-qt/qt5/files/qmake.conf.sh
 delete mode 100644 recipes-qt/qt5/files/qplatformdefs.h
 create mode 100644 recipes-qt/qt5/qt5-native/0001-Always-build-uic.patch
 create mode 100644 recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch
 delete mode 100644 recipes-qt/qt5/qtbase/0001-Always-build-uic.patch
 delete mode 100644 recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch
 create mode 100644 recipes-qt/qt5/qtbase/qmake.conf.sh
 create mode 100644 recipes-qt/qt5/qtbase/qplatformdefs.h

diff --git a/recipes-qt/qt5/files/qmake.conf.sh b/recipes-qt/qt5/files/qmake.conf.sh
deleted file mode 100644
index 52682396..00000000
--- a/recipes-qt/qt5/files/qmake.conf.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-cat <<EOF
-#
-# qmake configuration for building with openembedded
-#
-
-MAKEFILE_GENERATOR      = UNIX
-TARGET_PLATFORM         = unix
-TEMPLATE                = app
-CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
-QT                      += core gui
-QMAKE_INCREMENTAL_STYLE = sublib
-
-include(../common/linux.conf)
-include(../common/gcc-base-unix.conf)
-include(../common/g++-unix.conf)
-
-QMAKE_INCDIR_QT       = ${OE_QMAKE_INCDIR_QT}
-QMAKE_LIBDIR_QT       = ${OE_QMAKE_LIBDIR_QT}
-QMAKE_LIBS_X11        = ${OE_QMAKE_LIBS_X11}
-QMAKE_LIBS_X11SM      = ${OE_QMAKE_LIBS_X11SM}
-QMAKE_MOC             = ${OE_QMAKE_MOC}
-QMAKE_UIC             = ${OE_QMAKE_UIC}
-QMAKE_RCC             = ${OE_QMAKE_RCC}
-#QMAKE_AR              = ${OE_QMAKE_AR} cqs
-QMAKE_AR              = ${OE_QMAKE_AR}
-QMAKE_STRIP           = ${OE_QMAKE_STRIP}
-QMAKE_CFLAGS         += ${OE_QMAKE_CFLAGS}
-QMAKE_CXXFLAGS       += \$\$QMAKE_CFLAGS ${OE_QMAKE_CXXFLAGS}
-QMAKE_LFLAGS         += ${OE_QMAKE_LDFLAGS}
-QMAKE_CC              = ${OE_QMAKE_CC}
-QMAKE_LINK_C          = ${OE_QMAKE_LINK}
-QMAKE_LINK_C_SHLIB    = ${OE_QMAKE_LINK}
-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += ${OE_QMAKE_CFLAGS}
-QMAKE_CXX             = ${OE_QMAKE_CXX}
-QMAKE_LINK            = ${OE_QMAKE_LINK}
-QMAKE_LINK_SHLIB      = ${OE_QMAKE_LINK}
-
-load(qt_config)
-EOF
\ No newline at end of file
diff --git a/recipes-qt/qt5/files/qplatformdefs.h b/recipes-qt/qt5/files/qplatformdefs.h
deleted file mode 100644
index 5d22fb41..00000000
--- a/recipes-qt/qt5/files/qplatformdefs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../linux-g++/qplatformdefs.h"
diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc
index 11cfcff0..392508fa 100644
--- a/recipes-qt/qt5/qt5-native.inc
+++ b/recipes-qt/qt5/qt5-native.inc
@@ -10,7 +10,7 @@ inherit native
 
 QT_MODULE = "qtbase"
 
-FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/qtbase:"
 
 SRC_URI += " \
   file://0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch \
diff --git a/recipes-qt/qt5/qt5-native/0001-Always-build-uic.patch b/recipes-qt/qt5/qt5-native/0001-Always-build-uic.patch
new file mode 100644
index 00000000..3f2e3fd9
--- /dev/null
+++ b/recipes-qt/qt5/qt5-native/0001-Always-build-uic.patch
@@ -0,0 +1,31 @@
+From 1092de02d1ac256a8c56fb5b5e590a4df8188acb Mon Sep 17 00:00:00 2001
+From: Mikko Levonmaa <mikko.levonmaa@palm.com>
+Date: Tue, 27 Nov 2012 12:46:44 -0800
+Subject: [PATCH] Always build uic
+
+Even if we are not building gui or widgets. This tool is needed later
+as a native tool when compiling the target.
+
+Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
+---
+ src/tools/tools.pro |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/tools/tools.pro b/src/tools/tools.pro
+index c67d6bf..b6f3b39 100644
+--- a/src/tools/tools.pro
++++ b/src/tools/tools.pro
+@@ -1,8 +1,8 @@
+ TEMPLATE = subdirs
+ 
+-TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc
++TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc src_tools_uic
+ contains(QT_CONFIG, dbus): TOOLS_SUBDIRS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
+-!contains(QT_CONFIG, no-widgets): TOOLS_SUBDIRS += src_tools_uic
++
+ # Set subdir and respective target name
+ src_tools_bootstrap.subdir = $$PWD/bootstrap
+ src_tools_bootstrap.target = sub-tools-bootstrap
+-- 
+1.7.4.1
+
diff --git a/recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch b/recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch
new file mode 100644
index 00000000..6c9affae
--- /dev/null
+++ b/recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch
@@ -0,0 +1,31 @@
+From 40e6c0f88774b55111c63ed28bba626141797476 Mon Sep 17 00:00:00 2001
+From: Mikko Levonmaa <mikko.levonmaa@palm.com>
+Date: Tue, 4 Dec 2012 15:32:33 -0800
+Subject: [PATCH 3/3] qtbase: Allow qt.conf override when bootstrapping
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
+---
+ qmake/option.cpp |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/qmake/option.cpp b/qmake/option.cpp
+index 91c154a..a4f3a85 100644
+--- a/qmake/option.cpp
++++ b/qmake/option.cpp
+@@ -647,6 +647,11 @@ qmakeAddCacheClear(qmakeCacheClearFunc func, void **data)
+ 
+ QString qt_libraryInfoFile()
+ {
++    QString qtconfig = QFile::decodeName(getenv("QT_CONF_PATH"));
++    if (QFile::exists(qtconfig)) {
++        printf("Overriding with qt.conf from: %s\n", qtconfig.toLatin1().data());
++        return qtconfig;
++    }
+     if (!Option::globals->qmake_abslocation.isEmpty())
+         return QDir(QFileInfo(Option::globals->qmake_abslocation).absolutePath()).filePath("qt.conf");
+     return QString();
+-- 
+1.7.4.1
+
diff --git a/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch
deleted file mode 100644
index 3f2e3fd9..00000000
--- a/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1092de02d1ac256a8c56fb5b5e590a4df8188acb Mon Sep 17 00:00:00 2001
-From: Mikko Levonmaa <mikko.levonmaa@palm.com>
-Date: Tue, 27 Nov 2012 12:46:44 -0800
-Subject: [PATCH] Always build uic
-
-Even if we are not building gui or widgets. This tool is needed later
-as a native tool when compiling the target.
-
-Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
----
- src/tools/tools.pro |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/tools/tools.pro b/src/tools/tools.pro
-index c67d6bf..b6f3b39 100644
---- a/src/tools/tools.pro
-+++ b/src/tools/tools.pro
-@@ -1,8 +1,8 @@
- TEMPLATE = subdirs
- 
--TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc
-+TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc src_tools_uic
- contains(QT_CONFIG, dbus): TOOLS_SUBDIRS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
--!contains(QT_CONFIG, no-widgets): TOOLS_SUBDIRS += src_tools_uic
-+
- # Set subdir and respective target name
- src_tools_bootstrap.subdir = $$PWD/bootstrap
- src_tools_bootstrap.target = sub-tools-bootstrap
--- 
-1.7.4.1
-
diff --git a/recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch b/recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch
deleted file mode 100644
index 6c9affae..00000000
--- a/recipes-qt/qt5/qtbase/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 40e6c0f88774b55111c63ed28bba626141797476 Mon Sep 17 00:00:00 2001
-From: Mikko Levonmaa <mikko.levonmaa@palm.com>
-Date: Tue, 4 Dec 2012 15:32:33 -0800
-Subject: [PATCH 3/3] qtbase: Allow qt.conf override when bootstrapping
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
----
- qmake/option.cpp |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/qmake/option.cpp b/qmake/option.cpp
-index 91c154a..a4f3a85 100644
---- a/qmake/option.cpp
-+++ b/qmake/option.cpp
-@@ -647,6 +647,11 @@ qmakeAddCacheClear(qmakeCacheClearFunc func, void **data)
- 
- QString qt_libraryInfoFile()
- {
-+    QString qtconfig = QFile::decodeName(getenv("QT_CONF_PATH"));
-+    if (QFile::exists(qtconfig)) {
-+        printf("Overriding with qt.conf from: %s\n", qtconfig.toLatin1().data());
-+        return qtconfig;
-+    }
-     if (!Option::globals->qmake_abslocation.isEmpty())
-         return QDir(QFileInfo(Option::globals->qmake_abslocation).absolutePath()).filePath("qt.conf");
-     return QString();
--- 
-1.7.4.1
-
diff --git a/recipes-qt/qt5/qtbase/qmake.conf.sh b/recipes-qt/qt5/qtbase/qmake.conf.sh
new file mode 100644
index 00000000..52682396
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/qmake.conf.sh
@@ -0,0 +1,39 @@
+cat <<EOF
+#
+# qmake configuration for building with openembedded
+#
+
+MAKEFILE_GENERATOR      = UNIX
+TARGET_PLATFORM         = unix
+TEMPLATE                = app
+CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
+QT                      += core gui
+QMAKE_INCREMENTAL_STYLE = sublib
+
+include(../common/linux.conf)
+include(../common/gcc-base-unix.conf)
+include(../common/g++-unix.conf)
+
+QMAKE_INCDIR_QT       = ${OE_QMAKE_INCDIR_QT}
+QMAKE_LIBDIR_QT       = ${OE_QMAKE_LIBDIR_QT}
+QMAKE_LIBS_X11        = ${OE_QMAKE_LIBS_X11}
+QMAKE_LIBS_X11SM      = ${OE_QMAKE_LIBS_X11SM}
+QMAKE_MOC             = ${OE_QMAKE_MOC}
+QMAKE_UIC             = ${OE_QMAKE_UIC}
+QMAKE_RCC             = ${OE_QMAKE_RCC}
+#QMAKE_AR              = ${OE_QMAKE_AR} cqs
+QMAKE_AR              = ${OE_QMAKE_AR}
+QMAKE_STRIP           = ${OE_QMAKE_STRIP}
+QMAKE_CFLAGS         += ${OE_QMAKE_CFLAGS}
+QMAKE_CXXFLAGS       += \$\$QMAKE_CFLAGS ${OE_QMAKE_CXXFLAGS}
+QMAKE_LFLAGS         += ${OE_QMAKE_LDFLAGS}
+QMAKE_CC              = ${OE_QMAKE_CC}
+QMAKE_LINK_C          = ${OE_QMAKE_LINK}
+QMAKE_LINK_C_SHLIB    = ${OE_QMAKE_LINK}
+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += ${OE_QMAKE_CFLAGS}
+QMAKE_CXX             = ${OE_QMAKE_CXX}
+QMAKE_LINK            = ${OE_QMAKE_LINK}
+QMAKE_LINK_SHLIB      = ${OE_QMAKE_LINK}
+
+load(qt_config)
+EOF
\ No newline at end of file
diff --git a/recipes-qt/qt5/qtbase/qplatformdefs.h b/recipes-qt/qt5/qtbase/qplatformdefs.h
new file mode 100644
index 00000000..5d22fb41
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/qplatformdefs.h
@@ -0,0 +1 @@
+#include "../linux-g++/qplatformdefs.h"
-- 
cgit v1.2.3-54-g00ecf