diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-03 22:03:04 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-17 16:10:02 +0200 |
| commit | 1a2ad7b702e5c79f92fb95f14d6c75fdf69241c7 (patch) | |
| tree | e9878babb8c21c3699ed280201e626b3bf9342be /classes/qmake5_base.bbclass | |
| parent | 1a272bc79d0e9aba9385d00b0aa1acf116552ad5 (diff) | |
qmake5_base: drop unused exports
UIC/MOC/RCC are no longer defined in generated Makefiles
Diffstat (limited to 'classes/qmake5_base.bbclass')
| -rw-r--r-- | classes/qmake5_base.bbclass | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index ed25e739..92b3317f 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -9,18 +9,13 @@ EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} -d -after \ INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ - AR="${TARGET_PREFIX}ar cqs" \ - MOC="${OE_QMAKE_MOC}" \ - UIC="${OE_QMAKE_UIC}" \ - RCC="${OE_QMAKE_RCC}" \ + AR="${OE_QMAKE_AR}" \ + STRIP="${OE_QMAKE_STRIP}" \ MAKE="make -e ${PARALLEL_MAKE}"' export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/${OE_QMAKE_PLATFORM_NATIVE}" export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" 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}" @@ -28,8 +23,6 @@ export OE_QMAKE_CXX = "${CXX}" export OE_QMAKE_LDFLAGS = "${LDFLAGS}" export OE_QMAKE_AR = "${AR} cqs" export OE_QMAKE_STRIP = "echo" -export OE_QMAKE_RPATH = "-Wl,-rpath-link," -export OE_QMAKE_CONF_COMPILER = "g++" export QT_CONF_PATH = "${WORKDIR}/qt.conf" export QT_DIR_NAME ?= "qt5" |