diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-11-27 15:48:20 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-07 13:40:14 +0000 |
commit | 8b11ed8a75a15328bbd22d100a976cc669b84b58 (patch) | |
tree | 9b93d0fcd8fd973943ca61f126cae47066113922 /meta/recipes-qt/meta | |
parent | 0baadc8a98daa14090b04e728fb5a44af3f545c8 (diff) | |
download | poky-8b11ed8a75a15328bbd22d100a976cc669b84b58.tar.gz |
qt4: remove recipes and classes
Qt4 is no longer supportd upstream, but it is still needed for LSB compliancy.
Qt4 recipes have been moved to a separate meta-qt4 layer to be consistent with
meta-qt3 and meta-qt5.
(From OE-Core rev: cb89d2b25b4edb1241bc5426a69a6bc44df9be2c)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/meta')
-rw-r--r-- | meta/recipes-qt/meta/meta-toolchain-qt.bb | 5 | ||||
-rw-r--r-- | meta/recipes-qt/meta/meta-toolchain-qt.inc | 35 | ||||
-rw-r--r-- | meta/recipes-qt/meta/meta-toolchain-qte.bb | 6 |
3 files changed, 0 insertions, 46 deletions
diff --git a/meta/recipes-qt/meta/meta-toolchain-qt.bb b/meta/recipes-qt/meta/meta-toolchain-qt.bb deleted file mode 100644 index a10103a39f..0000000000 --- a/meta/recipes-qt/meta/meta-toolchain-qt.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | # Qt toolchain | ||
2 | QTNAME = "qt" | ||
3 | QT_DIR_NAME = "qt4" | ||
4 | |||
5 | require meta-toolchain-qt.inc | ||
diff --git a/meta/recipes-qt/meta/meta-toolchain-qt.inc b/meta/recipes-qt/meta/meta-toolchain-qt.inc deleted file mode 100644 index 7e75d93b14..0000000000 --- a/meta/recipes-qt/meta/meta-toolchain-qt.inc +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-${QTNAME}-toolchain-host packagegroup-cross-canadian-${MACHINE}" | ||
2 | TOOLCHAIN_TARGET_TASK = "packagegroup-${QTNAME}-toolchain-target" | ||
3 | TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-${QTNAME}-${DISTRO_VERSION}" | ||
4 | |||
5 | require recipes-core/meta/meta-toolchain.bb | ||
6 | |||
7 | QT_TOOLS_PREFIX = "$OECORE_NATIVE_SYSROOT${bindir_nativesdk}" | ||
8 | |||
9 | create_sdk_files_append() { | ||
10 | mkdir -p ${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d/ | ||
11 | script=${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d/${QT_DIR_NAME}.sh | ||
12 | |||
13 | echo 'export OE_QMAKE_CFLAGS="$CFLAGS"' > $script | ||
14 | echo 'export OE_QMAKE_CXXFLAGS="$CXXFLAGS"' >> $script | ||
15 | echo 'export OE_QMAKE_LDFLAGS="$LDFLAGS"' >> $script | ||
16 | echo 'export OE_QMAKE_CC=$CC' >> $script | ||
17 | echo 'export OE_QMAKE_CXX=$CXX' >> $script | ||
18 | echo 'export OE_QMAKE_LINK=$CXX' >> $script | ||
19 | echo 'export OE_QMAKE_AR=$AR' >> $script | ||
20 | echo 'export OE_QMAKE_LIBDIR_QT=$OECORE_TARGET_SYSROOT${libdir}' >> $script | ||
21 | echo 'export OE_QMAKE_INCDIR_QT=$OECORE_TARGET_SYSROOT${includedir}/${QT_DIR_NAME}' >> $script | ||
22 | echo 'export OE_QMAKE_MOC=${QT_TOOLS_PREFIX}/moc4' >> $script | ||
23 | echo 'export OE_QMAKE_UIC=${QT_TOOLS_PREFIX}/uic4' >> $script | ||
24 | echo 'export OE_QMAKE_UIC3=${QT_TOOLS_PREFIX}/uic34' >> $script | ||
25 | echo 'export OE_QMAKE_RCC=${QT_TOOLS_PREFIX}/rcc4' >> $script | ||
26 | echo 'export OE_QMAKE_QDBUSCPP2XML=${QT_TOOLS_PREFIX}/qdbuscpp2xml4' >> $script | ||
27 | echo 'export OE_QMAKE_QDBUSXML2CPP=${QT_TOOLS_PREFIX}/qdbusxml2cpp4' >> $script | ||
28 | echo 'export OE_QMAKE_QT_CONFIG=$OECORE_TARGET_SYSROOT${datadir}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script | ||
29 | echo 'export QMAKESPEC=$OECORE_TARGET_SYSROOT${datadir}/${QT_DIR_NAME}/mkspecs/linux-g++' >> $script | ||
30 | echo 'export QT_CONF_PATH=$OECORE_NATIVE_SYSROOT${sysconfdir}/qt.conf' >> $script | ||
31 | |||
32 | # make a symbolic link to mkspecs for compatibility with Qt SDK | ||
33 | # and Qt Creator | ||
34 | (cd ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/..; ln -s ${SDKTARGETSYSROOT}/usr/share/${QT_DIR_NAME}/mkspecs mkspecs;) | ||
35 | } | ||
diff --git a/meta/recipes-qt/meta/meta-toolchain-qte.bb b/meta/recipes-qt/meta/meta-toolchain-qte.bb deleted file mode 100644 index 9113f48ed8..0000000000 --- a/meta/recipes-qt/meta/meta-toolchain-qte.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | # Qt Embedded toolchain | ||
2 | PR = "r6" | ||
3 | QTNAME = "qte" | ||
4 | QT_DIR_NAME = "qtopia" | ||
5 | |||
6 | require meta-toolchain-qt.inc | ||