diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2015-01-27 06:53:51 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-18 16:52:01 +0100 |
commit | ce88fc4221a8f71cc8f37dec2213f797a5e366c4 (patch) | |
tree | 90dc3d51f164f06527d09c4cf4a61552ac8da210 /recipes-qt/qt5/qtbase | |
parent | 92b7b49934d0ab5accd14b44427c6df5194087d6 (diff) |
qtbase: build qmake for target with paths aligned
Proper qmake operation was tested with qt5-creator.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase')
-rw-r--r-- | recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch | 27 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase/0015-Set-paths-for-target-properly.patch | 72 |
2 files changed, 92 insertions, 7 deletions
diff --git a/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch index 21e0987b..4d4291cf 100644 --- a/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch +++ b/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch @@ -14,17 +14,17 @@ Signed-off-by: Yu Ke <ke.yu@intel.com> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- configure | 2 +- + qmake/qmake.pri | 3 ++- qmake/qmake.pro | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index bd43281..5d1b3aa 100755 +index 43be722..39516d2 100755 --- a/configure +++ b/configure -@@ -3724,7 +3724,7 @@ setBootstrapEvalVariable() - +@@ -3759,7 +3759,7 @@ setBootstrapVariable() + } # build qmake -if true; then ###[ '!' -f "$outpath/bin/qmake" ]; @@ -32,15 +32,28 @@ index bd43281..5d1b3aa 100755 echo "Creating qmake..." mkdir -p "$outpath/qmake" || exit +diff --git a/qmake/qmake.pri b/qmake/qmake.pri +index 57dcbb0..e2c5845 100644 +--- a/qmake/qmake.pri ++++ b/qmake/qmake.pri +@@ -82,7 +82,8 @@ bootstrap { #Qt code + qjsonparser.cpp \ + qjsonarray.cpp \ + qjsonobject.cpp \ +- qjsonvalue.cpp ++ qjsonvalue.cpp \ ++ qdebug.cpp + + HEADERS+= \ + qbitarray.h \ diff --git a/qmake/qmake.pro b/qmake/qmake.pro index 89d6ea5..7c605b9 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro -@@ -8,6 +8,8 @@ CONFIG -= qt +@@ -8,6 +8,7 @@ CONFIG -= qt DEFINES += \ QT_BUILD_QMAKE \ PROEVALUATOR_FULL -+DESTDIR = ../bin/ +TARGET = qmake VPATH += \ diff --git a/recipes-qt/qt5/qtbase/0015-Set-paths-for-target-properly.patch b/recipes-qt/qt5/qtbase/0015-Set-paths-for-target-properly.patch new file mode 100644 index 00000000..28512f0b --- /dev/null +++ b/recipes-qt/qt5/qtbase/0015-Set-paths-for-target-properly.patch @@ -0,0 +1,72 @@ +From d84b7386902e024a0cfe5a6689930e5548a60480 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Thu, 22 Jan 2015 16:09:35 +0100 +Subject: [PATCH] Set paths for target properly +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + configure | 42 +++++++++++++++++++++--------------------- + 1 file changed, 21 insertions(+), 21 deletions(-) + +diff --git a/configure b/configure +index 43be722..0e1a64a 100755 +--- a/configure ++++ b/configure +@@ -3634,28 +3634,27 @@ static const char qt_configure_prefix_path_strs[][512 + 12] = { + "qt_xmplpath=$QT_SYSROOT_EXAMPLES", + "qt_tstspath=$QT_SYSROOT_TESTS", + #else +- "qt_prfxpath=$QT_INSTALL_PREFIX", +- "qt_docspath=$QT_INSTALL_DOCS", +- "qt_hdrspath=$QT_INSTALL_HEADERS", +- "qt_libspath=$QT_INSTALL_LIBS", +- "qt_lbexpath=$QT_INSTALL_LIBEXECS", +- "qt_binspath=$QT_INSTALL_BINS", +- "qt_plugpath=$QT_INSTALL_PLUGINS", +- "qt_impspath=$QT_INSTALL_IMPORTS", +- "qt_qml2path=$QT_INSTALL_QML", +- "qt_adatpath=$QT_INSTALL_ARCHDATA", +- "qt_datapath=$QT_INSTALL_DATA", +- "qt_trnspath=$QT_INSTALL_TRANSLATIONS", +- "qt_xmplpath=$QT_INSTALL_EXAMPLES", +- "qt_tstspath=$QT_INSTALL_TESTS", +- "qt_ssrtpath=$CFG_SYSROOT", +- "qt_hpfxpath=$QT_HOST_PREFIX", +- "qt_hbinpath=$QT_HOST_BINS", +- "qt_hlibpath=$QT_HOST_LIBS", +- "qt_hdatpath=$QT_HOST_DATA", +- "qt_ebinpath=$QT_EXTERNAL_HOST_BINS", +- "qt_targspec=$shortxspec", +- "qt_hostspec=$shortspec", ++ "qt_prfxpath=$QT_SYSROOT_PREFIX", ++ "qt_docspath=$QT_SYSROOT_DOCS", ++ "qt_hdrspath=$QT_SYSROOT_HEADERS", ++ "qt_libspath=$QT_SYSROOT_LIBS", ++ "qt_lbexpath=$QT_SYSROOT_LIBEXECS", ++ "qt_binspath=$QT_SYSROOT_BINS", ++ "qt_plugpath=$QT_SYSROOT_PLUGINS", ++ "qt_impspath=$QT_SYSROOT_IMPORTS", ++ "qt_qml2path=$QT_SYSROOT_QML", ++ "qt_adatpath=$QT_SYSROOT_ARCHDATA", ++ "qt_datapath=$QT_SYSROOT_DATA", ++ "qt_trnspath=$QT_SYSROOT_TRANSLATIONS", ++ "qt_xmplpath=$QT_SYSROOT_EXAMPLES", ++ "qt_tstspath=$QT_SYSROOT_TESTS", ++ "qt_ssrtpath=", ++ "qt_hpfxpath=$QT_SYSROOT_PREFIX", ++ "qt_hbinpath=$QT_SYSROOT_BINS", ++ "qt_hlibpath=$QT_SYSROOT_LIBS", ++ "qt_hdatpath=$QT_SYSROOT_LIBS/qt5", ++ "qt_targspec=linux-g++", ++ "qt_hostspec=linux-g++", + #endif + }; + static const char qt_configure_settings_path_str[256 + 12] = "qt_stngpath=$QT_INSTALL_SETTINGS"; +-- +1.8.3.1 + |