Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta-digi-dey: remove QT4 support 

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2015-11-30 09:21:27 +01:00
parent 93a2e115db
commit 1240e259c1
9 changed files with 0 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
meta-digi-dey/recipes-core/images/dey-image-graphical.bb
View File

@ -23,46 +23,3 @@ IMAGE_INSTALL += " \
${SOC_IMAGE_INSTALL} \
pointercal-xinput \
"
# Do not install some of the 'RRECOMMENDS_qt4-demos' to save space:
# 'qt4-demos-doc' for all platforms and 'qt4-examples' for ccardimx28
BAD_RECOMMENDATIONS += "qt4-demos-doc"
BAD_RECOMMENDATIONS_append_ccardimx28 = " qt4-examples"
##
## Create a QT4-capable standalone toolchain.
##
## This is mostly copied from 'meta-toolchain-qt' (not included the
## recipe directly because we do not want to inherit populate_sdk)
##
TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-qt-toolchain-host"
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/qt4.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}/qt4' >> $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}/qt4/mkspecs/qconfig.pri' >> $script
echo 'export QMAKESPEC=$OECORE_TARGET_SYSROOT${datadir}/qt4/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;)
}

5
meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb
View File

@ -7,8 +7,3 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
RDEPENDS_${PN} = "\
packagegroup-core-qt-demoapps \
qt4-demos \
"

BIN
meta-digi-dey/recipes-qt/qt4/qt4-x11-free/hellogl_es2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.4 KiB

9
meta-digi-dey/recipes-qt/qt4/qt4-x11-free/qtbrowser.desktop
View File

@ -1,9 +0,0 @@
[Desktop Entry]
Name=QT Browser
Exec=/usr/bin/qt4/demos/browser/browser
Icon=webkit
Terminal=false
Type=Application
X-MB-SingleInstance=true
Comment=Qt Browser
StartupNotify=false

9
meta-digi-dey/recipes-qt/qt4/qt4-x11-free/qtdemo.desktop
View File

@ -1,9 +0,0 @@
[Desktop Entry]
Name=QT Demo Launcher
Exec=/usr/bin/qtdemo
Icon=qtdemo
Terminal=false
Type=Application
X-MB-SingleInstance=true
Comment=Qt Demo Launcher
StartupNotify=false

BIN
meta-digi-dey/recipes-qt/qt4/qt4-x11-free/qtdemo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

9
meta-digi-dey/recipes-qt/qt4/qt4-x11-free/qthellogles2.desktop
View File

@ -1,9 +0,0 @@
[Desktop Entry]
Name=QT OpenGL ES2 Hello World
Exec=/usr/bin/qt4/examples/opengl/hellogl_es2/hellogl_es2
Icon=hellogl_es2
Terminal=false
Type=Application
X-MB-SingleInstance=true
Comment=QT OpenGL ES2 Hello World
StartupNotify=false

BIN
meta-digi-dey/recipes-qt/qt4/qt4-x11-free/webkit.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 36 KiB

46
meta-digi-dey/recipes-qt/qt4/qt4-x11-free_%.bbappend
View File

@ -1,46 +0,0 @@
# Copyright (C) 2014 Digi International
#
# Desktop launchers for QT4 demo/example apps
#
# Origin: fsl-gui-extrafiles package (which was removed from meta-fsl-demos)
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
SRC_URI += " \
file://qtbrowser.desktop \
file://qtdemo.desktop \
file://qthellogles2.desktop \
file://hellogl_es2.png \
file://qtdemo.png \
file://webkit.png \
"
# Disable OpenGL for ccardimx28
QT_GLFLAGS_ccardimx28 = "-no-opengl"
do_install_append() {
install -d ${D}${datadir}/applications ${D}${datadir}/pixmaps
install -m 0644 ${WORKDIR}/qtbrowser.desktop ${D}${datadir}/applications
install -m 0644 ${WORKDIR}/qtdemo.desktop ${D}${datadir}/applications
install -m 0644 ${WORKDIR}/qtdemo.png ${D}${datadir}/pixmaps
install -m 0644 ${WORKDIR}/webkit.png ${D}${datadir}/pixmaps
}
do_install_append_ccimx6() {
install -m 0644 ${WORKDIR}/qthellogles2.desktop ${D}${datadir}/applications
install -m 0644 ${WORKDIR}/hellogl_es2.png ${D}${datadir}/pixmaps
}
FILES_${QT_BASE_NAME}-demos += " \
${datadir}/applications/qtbrowser.desktop \
${datadir}/applications/qtdemo.desktop \
${datadir}/pixmaps/qtdemo.png \
${datadir}/pixmaps/webkit.png \
"
FILES_${QT_BASE_NAME}-examples_append_ccimx6 = " \
${datadir}/applications/qthellogles2.desktop \
${datadir}/pixmaps/hellogl_es2.png \
"
PACKAGE_ARCH = "${MACHINE_ARCH}"