diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-03 21:06:13 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-17 16:10:02 +0200 |
commit | de250e3d0e437df09a8f23ad7fdb5fc39f17f7e8 (patch) | |
tree | 7ba32c25bda453bb42740ffcf47094fd7d155a0a /recipes-qt/qt5/qtbase.inc | |
parent | 85b0bb644509e04c0132dc027f288d6f22ffb19e (diff) | |
download | meta-qt5-de250e3d0e437df09a8f23ad7fdb5fc39f17f7e8.tar.gz |
qtbase: drop qmake.conf.sh and qplatformdefs
* defaults in linux-g++ are correct, we need only to modify common
linux.conf and g++-unix.conf
Diffstat (limited to 'recipes-qt/qt5/qtbase.inc')
-rw-r--r-- | recipes-qt/qt5/qtbase.inc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index f92d37ea..e42dc350 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc | |||
@@ -5,8 +5,6 @@ SRC_URI += " \ | |||
5 | file://0002-qmake-is-already-built-in-qt5-tools-native.patch \ | 5 | file://0002-qmake-is-already-built-in-qt5-tools-native.patch \ |
6 | file://0003-Allow-building-a-separate-qmake-for-the-target.patch \ | 6 | file://0003-Allow-building-a-separate-qmake-for-the-target.patch \ |
7 | file://0004-configure-eval-QMAKE_CXX.patch \ | 7 | file://0004-configure-eval-QMAKE_CXX.patch \ |
8 | file://qmake.conf.sh \ | ||
9 | file://qplatformdefs.h \ | ||
10 | " | 8 | " |
11 | 9 | ||
12 | DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU}" | 10 | DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU}" |
@@ -53,12 +51,6 @@ EOF | |||
53 | OE_XQMAKESPEC="${S}/mkspecs/${TARGET_OS}-oe-g++" | 51 | OE_XQMAKESPEC="${S}/mkspecs/${TARGET_OS}-oe-g++" |
54 | 52 | ||
55 | do_configure_append() { | 53 | do_configure_append() { |
56 | # qtbase is exception, create mkspecs for it | ||
57 | if [ ! -e ${OE_XQMAKESPEC} ]; then | ||
58 | mkdir -p ${OE_XQMAKESPEC} | ||
59 | bash ${WORKDIR}/qmake.conf.sh > ${OE_XQMAKESPEC}/qmake.conf | ||
60 | fi | ||
61 | |||
62 | ./configure -v \ | 54 | ./configure -v \ |
63 | -dont-process \ | 55 | -dont-process \ |
64 | -opensource -confirm-license \ | 56 | -opensource -confirm-license \ |