Move Qt/X11 and Qt/Embedded (known as QtopiaCore) to a qt4 directory. We will see a great unification in this directory.

Besides the name Qt/X11 and Qt/Emebedded (QtopiaCore) are the same package
with a different configure script. The aim is to share configuring, compiling,
staging and packaging between these modules and making it more easy to try a bleeding
qt snapshot.

26 files changed, 11 insertions, 0 deletions

diff --git a/packages/qt/qt4-x11-free-4.1.2/.mtn2git_empty b/packages/qt4/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/qt/qt4-x11-free-4.1.2/.mtn2git_empty
+++ b/packages/qt4/.mtn2git_empty
diff --git a/packages/qt/qt4-x11-free-4.3.3/.mtn2git_empty b/packages/qt4/qt4-x11-free-4.1.2/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/qt/qt4-x11-free-4.3.3/.mtn2git_empty
+++ b/packages/qt4/qt4-x11-free-4.1.2/.mtn2git_empty
diff --git a/packages/qt/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch b/packages/qt4/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch
index ab943db1ff..ab943db1ff 100644
--- a/packages/qt/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch
+++ b/packages/qt4/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch
diff --git a/packages/qt/qt4-x11-free-4.1.2/cross-compile.patch b/packages/qt4/qt4-x11-free-4.1.2/cross-compile.patch
index 7c8665c9c1..7c8665c9c1 100644
--- a/packages/qt/qt4-x11-free-4.1.2/cross-compile.patch
+++ b/packages/qt4/qt4-x11-free-4.1.2/cross-compile.patch
diff --git a/packages/qt/qt4-x11-free-4.1.2/fix-asm-constraints.patch b/packages/qt4/qt4-x11-free-4.1.2/fix-asm-constraints.patch
index 93fc52d055..93fc52d055 100644
--- a/packages/qt/qt4-x11-free-4.1.2/fix-asm-constraints.patch
+++ b/packages/qt4/qt4-x11-free-4.1.2/fix-asm-constraints.patch
diff --git a/packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch b/packages/qt4/qt4-x11-free-4.1.2/fix-mkspecs.patch
index e927df9c7d..e927df9c7d 100644
--- a/packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch
+++ b/packages/qt4/qt4-x11-free-4.1.2/fix-mkspecs.patch
diff --git a/packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch b/packages/qt4/qt4-x11-free-4.1.2/fix-resinit-declaration.patch
index fcd5de6f97..fcd5de6f97 100644
--- a/packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch
+++ b/packages/qt4/qt4-x11-free-4.1.2/fix-resinit-declaration.patch
diff --git a/packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch b/packages/qt4/qt4-x11-free-4.1.2/gcc4_1.patch
index 392aaf4f5f..392aaf4f5f 100644
--- a/packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch
+++ b/packages/qt4/qt4-x11-free-4.1.2/gcc4_1.patch
diff --git a/packages/qt/qt4-x11-free-4.1.2/no-qmake.patch b/packages/qt4/qt4-x11-free-4.1.2/no-qmake.patch
index 324f44303a..324f44303a 100644
--- a/packages/qt/qt4-x11-free-4.1.2/no-qmake.patch
+++ b/packages/qt4/qt4-x11-free-4.1.2/no-qmake.patch
diff --git a/packages/qt/qt4-x11-free-4.1.2/no-tools.patch b/packages/qt4/qt4-x11-free-4.1.2/no-tools.patch
index 2bda49c9c5..2bda49c9c5 100644
--- a/packages/qt/qt4-x11-free-4.1.2/no-tools.patch
+++ b/packages/qt4/qt4-x11-free-4.1.2/no-tools.patch
diff --git a/packages/qte/qtopia-core/.mtn2git_empty b/packages/qt4/qt4-x11-free-4.3.3/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte/qtopia-core/.mtn2git_empty
+++ b/packages/qt4/qt4-x11-free-4.3.3/.mtn2git_empty
diff --git a/packages/qt/qt4-x11-free-4.3.3/0001-cross-compile.patch b/packages/qt4/qt4-x11-free-4.3.3/0001-cross-compile.patch
index 6e2b8e755e..6e2b8e755e 100644
--- a/packages/qt/qt4-x11-free-4.3.3/0001-cross-compile.patch
+++ b/packages/qt4/qt4-x11-free-4.3.3/0001-cross-compile.patch
diff --git a/packages/qt/qt4-x11-free-4.3.3/0002-fix-resinit-declaration.patch b/packages/qt4/qt4-x11-free-4.3.3/0002-fix-resinit-declaration.patch
index e479a64a2b..e479a64a2b 100644
--- a/packages/qt/qt4-x11-free-4.3.3/0002-fix-resinit-declaration.patch
+++ b/packages/qt4/qt4-x11-free-4.3.3/0002-fix-resinit-declaration.patch
diff --git a/packages/qt/qt4-x11-free-4.3.3/0003-no-tools.patch b/packages/qt4/qt4-x11-free-4.3.3/0003-no-tools.patch
index 5412c90377..5412c90377 100644
--- a/packages/qt/qt4-x11-free-4.3.3/0003-no-tools.patch
+++ b/packages/qt4/qt4-x11-free-4.3.3/0003-no-tools.patch
diff --git a/packages/qt/qt4-x11-free-4.3.3/0004-no-qmake.patch b/packages/qt4/qt4-x11-free-4.3.3/0004-no-qmake.patch
index 359f6df9d5..359f6df9d5 100644
--- a/packages/qt/qt4-x11-free-4.3.3/0004-no-qmake.patch
+++ b/packages/qt4/qt4-x11-free-4.3.3/0004-no-qmake.patch
diff --git a/packages/qt/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch b/packages/qt4/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch
index 93692699dc..93692699dc 100644
--- a/packages/qt/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch
+++ b/packages/qt4/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch
diff --git a/packages/qt/qt4-x11-free-4.3.3/0006-freetype-host-includes.patch b/packages/qt4/qt4-x11-free-4.3.3/0006-freetype-host-includes.patch
index cc8e115fee..cc8e115fee 100644
--- a/packages/qt/qt4-x11-free-4.3.3/0006-freetype-host-includes.patch
+++ b/packages/qt4/qt4-x11-free-4.3.3/0006-freetype-host-includes.patch
diff --git a/packages/qt/qt4-x11-free-4.3.3/0007-openssl-host-includes.patch b/packages/qt4/qt4-x11-free-4.3.3/0007-openssl-host-includes.patch
index 35b71d9694..35b71d9694 100644
--- a/packages/qt/qt4-x11-free-4.3.3/0007-openssl-host-includes.patch
+++ b/packages/qt4/qt4-x11-free-4.3.3/0007-openssl-host-includes.patch
diff --git a/packages/qt/qt4-x11-free_4.1.2.bb b/packages/qt4/qt4-x11-free_4.1.2.bb
index 77fa6dba12..77fa6dba12 100644
--- a/packages/qt/qt4-x11-free_4.1.2.bb
+++ b/packages/qt4/qt4-x11-free_4.1.2.bb
diff --git a/packages/qt/qt4-x11-free_4.3.3.bb b/packages/qt4/qt4-x11-free_4.3.3.bb
index 2fa53a4d54..2fa53a4d54 100644
--- a/packages/qt/qt4-x11-free_4.3.3.bb
+++ b/packages/qt4/qt4-x11-free_4.3.3.bb
diff --git a/packages/qt/qt4_arch.inc b/packages/qt4/qt4_arch.inc
index 6dcbd2bc4a..6dcbd2bc4a 100644
--- a/packages/qt/qt4_arch.inc
+++ b/packages/qt4/qt4_arch.inc
diff --git a/packages/qt4/qte-functions.inc b/packages/qt4/qte-functions.inc
new file mode 100644
index 0000000000..f0ffb0e612
--- /dev/null
+++ b/packages/qt4/qte-functions.inc
@@ -0,0 +1,11 @@
+def qte_arch(d):
+        import bb, re
+        arch = bb.data.getVar('TARGET_ARCH', d, 1)
+        if re.match("^i.86$", arch):
+                arch = "x86"
+        elif arch == "x86_64":
+                arch = "x86"
+        elif arch == "mipsel":
+                arch = "mips"
+        return arch
+
diff --git a/packages/qt4/qtopia-core/.mtn2git_empty b/packages/qt4/qtopia-core/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qt4/qtopia-core/.mtn2git_empty
diff --git a/packages/qte/qtopia-core/linux-oe-qmake.conf b/packages/qt4/qtopia-core/linux-oe-qmake.conf
index fc5ac6dc5c..fc5ac6dc5c 100644
--- a/packages/qte/qtopia-core/linux-oe-qmake.conf
+++ b/packages/qt4/qtopia-core/linux-oe-qmake.conf
diff --git a/packages/qte/qtopia-core_4.2.0.bb b/packages/qt4/qtopia-core_4.2.0.bb
index 509230f3ea..509230f3ea 100644
--- a/packages/qte/qtopia-core_4.2.0.bb
+++ b/packages/qt4/qtopia-core_4.2.0.bb
diff --git a/packages/qte/qtopia-core_4.3.3.bb b/packages/qt4/qtopia-core_4.3.3.bb
index 2995988b42..2995988b42 100644
--- a/packages/qte/qtopia-core_4.3.3.bb
+++ b/packages/qt4/qtopia-core_4.3.3.bb