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:33:59 +0000 |
| commit | cb89d2b25b4edb1241bc5426a69a6bc44df9be2c (patch) | |
| tree | 778d1166be782fff08ccef8c2eca505aaa49d4f4 /meta/recipes-qt/meta | |
| parent | 95fced137a46dc98863fe5af7be5cbce708602f2 (diff) | |
| download | openembedded-core-contrib-cb89d2b25b4edb1241bc5426a69a6bc44df9be2c.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.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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 @@ -# Qt toolchain -QTNAME = "qt" -QT_DIR_NAME = "qt4" - -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 @@ -TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-${QTNAME}-toolchain-host packagegroup-cross-canadian-${MACHINE}" -TOOLCHAIN_TARGET_TASK = "packagegroup-${QTNAME}-toolchain-target" -TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-${QTNAME}-${DISTRO_VERSION}" - -require recipes-core/meta/meta-toolchain.bb - -QT_TOOLS_PREFIX = "$OECORE_NATIVE_SYSROOT${bindir_nativesdk}" - -create_sdk_files_append() { - mkdir -p ${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d/ - script=${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d/${QT_DIR_NAME}.sh - - echo 'export OE_QMAKE_CFLAGS="$CFLAGS"' > $script - echo 'export OE_QMAKE_CXXFLAGS="$CXXFLAGS"' >> $script - echo 'export OE_QMAKE_LDFLAGS="$LDFLAGS"' >> $script - echo 'export OE_QMAKE_CC=$CC' >> $script - echo 'export OE_QMAKE_CXX=$CXX' >> $script - echo 'export OE_QMAKE_LINK=$CXX' >> $script - echo 'export OE_QMAKE_AR=$AR' >> $script - echo 'export OE_QMAKE_LIBDIR_QT=$OECORE_TARGET_SYSROOT${libdir}' >> $script - echo 'export OE_QMAKE_INCDIR_QT=$OECORE_TARGET_SYSROOT${includedir}/${QT_DIR_NAME}' >> $script - echo 'export OE_QMAKE_MOC=${QT_TOOLS_PREFIX}/moc4' >> $script - echo 'export OE_QMAKE_UIC=${QT_TOOLS_PREFIX}/uic4' >> $script - echo 'export OE_QMAKE_UIC3=${QT_TOOLS_PREFIX}/uic34' >> $script - echo 'export OE_QMAKE_RCC=${QT_TOOLS_PREFIX}/rcc4' >> $script - echo 'export OE_QMAKE_QDBUSCPP2XML=${QT_TOOLS_PREFIX}/qdbuscpp2xml4' >> $script - echo 'export OE_QMAKE_QDBUSXML2CPP=${QT_TOOLS_PREFIX}/qdbusxml2cpp4' >> $script - echo 'export OE_QMAKE_QT_CONFIG=$OECORE_TARGET_SYSROOT${datadir}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script - echo 'export QMAKESPEC=$OECORE_TARGET_SYSROOT${datadir}/${QT_DIR_NAME}/mkspecs/linux-g++' >> $script - echo 'export QT_CONF_PATH=$OECORE_NATIVE_SYSROOT${sysconfdir}/qt.conf' >> $script - - # make a symbolic link to mkspecs for compatibility with Qt SDK - # and Qt Creator - (cd ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/..; ln -s ${SDKTARGETSYSROOT}/usr/share/${QT_DIR_NAME}/mkspecs mkspecs;) -} 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 @@ -# Qt Embedded toolchain -PR = "r6" -QTNAME = "qte" -QT_DIR_NAME = "qtopia" - -require meta-toolchain-qt.inc |