From b78a292a584f084cc15715c3a68693b008ef6682 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 3 Apr 2013 21:52:54 +0200 Subject: 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 --- classes/qmake5_base.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes/qmake5_base.bbclass') 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" export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/uic" export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/moc" export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/rcc" +export OE_QMAKE_COMPILER = "${CC}" export OE_QMAKE_CC = "${CC}" export OE_QMAKE_CFLAGS = "${CFLAGS}" export OE_QMAKE_CXX = "${CXX}" -- cgit v1.2.3