diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-03 21:52:54 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-17 16:10:02 +0200 |
| commit | b78a292a584f084cc15715c3a68693b008ef6682 (patch) | |
| tree | 8c6c649c586d57b615b08e3e59241002e0d6c52d /recipes-qt/qt5/qt5.inc | |
| parent | de250e3d0e437df09a8f23ad7fdb5fc39f17f7e8 (diff) | |
qtbase: replace g++.conf and linux.conf with qmake.conf
* g++.conf and linux.conf were outdated a lot, lacking new options like
QMAKE_COMPILER causing a lot of warning like:
Project WARNING: qmake spec does not announce the compiler family. Guessed gcc.
* Instead of replacing whole common files, use custom qmake.conf which
overwrites common setting after including it
Diffstat (limited to 'recipes-qt/qt5/qt5.inc')
| -rw-r--r-- | recipes-qt/qt5/qt5.inc | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 2a0ae591..b8d09fe3 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -56,21 +56,9 @@ QT_CONFIG_FLAGS += " \ " do_configure() { -# set_arch + set_arch set_endian - if [ ! -e bin/qmake ]; then - ln -sf ${OE_QMAKE_QMAKE} bin/qmake - fi - - if [ ! -e mkspecs/${TARGET_OS}-oe-g++ ]; then - ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++ - fi - - # replace common files with our version - cp -f ${WORKDIR}/g++.conf mkspecs/common/g++-unix.conf - cp -f ${WORKDIR}/linux.conf mkspecs/common/linux.conf - # Avoid problems with the linkers, since we want the linker to be g++ unset LD } |