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 /classes | |
| parent | de250e3d0e437df09a8f23ad7fdb5fc39f17f7e8 (diff) | |
| download | meta-qt5-b78a292a584f084cc15715c3a68693b008ef6682.tar.gz | |
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 'classes')
| -rw-r--r-- | classes/qmake5_base.bbclass | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index ba13242c..ed25e739 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass | |||
| @@ -21,6 +21,7 @@ export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" | |||
| 21 | export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/uic" | 21 | export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/uic" |
| 22 | export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/moc" | 22 | export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/moc" |
| 23 | export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/rcc" | 23 | export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/rcc" |
| 24 | export OE_QMAKE_COMPILER = "${CC}" | ||
| 24 | export OE_QMAKE_CC = "${CC}" | 25 | export OE_QMAKE_CC = "${CC}" |
| 25 | export OE_QMAKE_CFLAGS = "${CFLAGS}" | 26 | export OE_QMAKE_CFLAGS = "${CFLAGS}" |
| 26 | export OE_QMAKE_CXX = "${CXX}" | 27 | export OE_QMAKE_CXX = "${CXX}" |