summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-03 22:03:04 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-17 16:10:02 +0200
commit1a2ad7b702e5c79f92fb95f14d6c75fdf69241c7 (patch)
treee9878babb8c21c3699ed280201e626b3bf9342be
parent1a272bc79d0e9aba9385d00b0aa1acf116552ad5 (diff)
downloadmeta-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.bbclass11
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}'"
9EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} -d -after \ 9EXTRA_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
18export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/${OE_QMAKE_PLATFORM_NATIVE}" 16export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/${OE_QMAKE_PLATFORM_NATIVE}"
19export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" 17export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}"
20export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" 18export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake"
21export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/uic"
22export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/moc"
23export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/rcc"
24export OE_QMAKE_COMPILER = "${CC}" 19export OE_QMAKE_COMPILER = "${CC}"
25export OE_QMAKE_CC = "${CC}" 20export OE_QMAKE_CC = "${CC}"
26export OE_QMAKE_CFLAGS = "${CFLAGS}" 21export OE_QMAKE_CFLAGS = "${CFLAGS}"
@@ -28,8 +23,6 @@ export OE_QMAKE_CXX = "${CXX}"
28export OE_QMAKE_LDFLAGS = "${LDFLAGS}" 23export OE_QMAKE_LDFLAGS = "${LDFLAGS}"
29export OE_QMAKE_AR = "${AR} cqs" 24export OE_QMAKE_AR = "${AR} cqs"
30export OE_QMAKE_STRIP = "echo" 25export OE_QMAKE_STRIP = "echo"
31export OE_QMAKE_RPATH = "-Wl,-rpath-link,"
32export OE_QMAKE_CONF_COMPILER = "g++"
33export QT_CONF_PATH = "${WORKDIR}/qt.conf" 26export QT_CONF_PATH = "${WORKDIR}/qt.conf"
34export QT_DIR_NAME ?= "qt5" 27export QT_DIR_NAME ?= "qt5"
35 28