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 | |
parent | 1a272bc79d0e9aba9385d00b0aa1acf116552ad5 (diff) | |
download | meta-qt5-1a2ad7b702e5c79f92fb95f14d6c75fdf69241c7.tar.gz |
qmake5_base: drop unused exports
UIC/MOC/RCC are no longer defined in generated Makefiles
-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}'" | |||
9 | EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} -d -after \ | 9 | EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} -d -after \ |
10 | INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ | 10 | INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ |
11 | LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ | 11 | LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ |
12 | AR="${TARGET_PREFIX}ar cqs" \ | 12 | AR="${OE_QMAKE_AR}" \ |
13 | MOC="${OE_QMAKE_MOC}" \ | 13 | STRIP="${OE_QMAKE_STRIP}" \ |
14 | UIC="${OE_QMAKE_UIC}" \ | ||
15 | RCC="${OE_QMAKE_RCC}" \ | ||
16 | MAKE="make -e ${PARALLEL_MAKE}"' | 14 | MAKE="make -e ${PARALLEL_MAKE}"' |
17 | 15 | ||
18 | export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/${OE_QMAKE_PLATFORM_NATIVE}" | 16 | export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/${OE_QMAKE_PLATFORM_NATIVE}" |
19 | export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" | 17 | export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" |
20 | export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" | 18 | export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" |
21 | export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/uic" | ||
22 | export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/moc" | ||
23 | export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/rcc" | ||
24 | export OE_QMAKE_COMPILER = "${CC}" | 19 | export OE_QMAKE_COMPILER = "${CC}" |
25 | export OE_QMAKE_CC = "${CC}" | 20 | export OE_QMAKE_CC = "${CC}" |
26 | export OE_QMAKE_CFLAGS = "${CFLAGS}" | 21 | export OE_QMAKE_CFLAGS = "${CFLAGS}" |
@@ -28,8 +23,6 @@ export OE_QMAKE_CXX = "${CXX}" | |||
28 | export OE_QMAKE_LDFLAGS = "${LDFLAGS}" | 23 | export OE_QMAKE_LDFLAGS = "${LDFLAGS}" |
29 | export OE_QMAKE_AR = "${AR} cqs" | 24 | export OE_QMAKE_AR = "${AR} cqs" |
30 | export OE_QMAKE_STRIP = "echo" | 25 | export OE_QMAKE_STRIP = "echo" |
31 | export OE_QMAKE_RPATH = "-Wl,-rpath-link," | ||
32 | export OE_QMAKE_CONF_COMPILER = "g++" | ||
33 | export QT_CONF_PATH = "${WORKDIR}/qt.conf" | 26 | export QT_CONF_PATH = "${WORKDIR}/qt.conf" |
34 | export QT_DIR_NAME ?= "qt5" | 27 | export QT_DIR_NAME ?= "qt5" |
35 | 28 | ||