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 | |
| parent | 95fced137a46dc98863fe5af7be5cbce708602f2 (diff) | |
| download | openembedded-core-cb89d2b25b4edb1241bc5426a69a6bc44df9be2c.tar.gz openembedded-core-cb89d2b25b4edb1241bc5426a69a6bc44df9be2c.tar.bz2 openembedded-core-cb89d2b25b4edb1241bc5426a69a6bc44df9be2c.zip | |
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')
62 files changed, 0 insertions, 3486 deletions
diff --git a/meta/recipes-qt/images/qt4e-demo-image.bb b/meta/recipes-qt/images/qt4e-demo-image.bb deleted file mode 100644 index 4451848656..0000000000 --- a/meta/recipes-qt/images/qt4e-demo-image.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "An image that will launch into the demo application for the embedded (not based on X11) version of Qt." -LICENSE = "MIT" -PR = "r3" - -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -IMAGE_INSTALL += "\ - ${CORE_IMAGE_BASE_INSTALL} \ - packagegroup-core-qt4e \ -" - -inherit core-image - 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 diff --git a/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qt-toolchain-host.bb b/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qt-toolchain-host.bb deleted file mode 100644 index b95cc5e594..0000000000 --- a/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qt-toolchain-host.bb +++ /dev/null @@ -1,3 +0,0 @@ -require nativesdk-packagegroup-qt-toolchain-host.inc - -SUMMARY = "Host packages for Qt SDK" diff --git a/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qt-toolchain-host.inc b/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qt-toolchain-host.inc deleted file mode 100644 index a3c275fd97..0000000000 --- a/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qt-toolchain-host.inc +++ /dev/null @@ -1,6 +0,0 @@ -require recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb - -DESCRIPTION = "Host packages for Qt Embedded SDK" -LICENSE = "MIT" - -RDEPENDS_${PN} += "nativesdk-qt4-tools" diff --git a/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb b/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb deleted file mode 100644 index 296e4b803c..0000000000 --- a/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb +++ /dev/null @@ -1,3 +0,0 @@ -require nativesdk-packagegroup-qt-toolchain-host.inc - -SUMMARY = "Host packages for Qt Embedded SDK" diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb deleted file mode 100644 index b81f8a3b33..0000000000 --- a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (C) 2010 Intel Corporation. All rights reserved -# - -SUMMARY = "Qt package groups" -LICENSE = "MIT" -PR = "r4" - -# Qt4 could NOT be built on MIPS64 with 64 bits userspace -COMPATIBLE_HOST_mips64 = "null" - -inherit packagegroup distro_features_check - -# The quicky and fotowall requires x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = "x11" - -PACKAGES = "${PN}-demoapps" - -QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall" - -SUMMARY_${PN}-demoapps = "Qt demo applications" -RDEPENDS_${PN}-demoapps = "${QTDEMOS}" diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb deleted file mode 100644 index eb5fa1ffe6..0000000000 --- a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Qt for Embedded Linux (Qt without X11)" -PR = "r2" -LICENSE = "MIT" - -# Qt4 could NOT be built on MIPS64 with 64 bits userspace -COMPATIBLE_HOST_mips64 = "null" - -inherit packagegroup - -TOUCH = ' ${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' - -RDEPENDS_${PN} = " \ - qt4-embedded \ - libqt-embedded3support4 \ - libqt-embeddedclucene4 \ - libqt-embeddedcore4 \ - libqt-embeddeddbus4 \ - libqt-embeddedgui4 \ - libqt-embeddedhelp4 \ - libqt-embeddedmultimedia4 \ - libqt-embeddednetwork4 \ - libqt-embeddedscript4 \ - libqt-embeddedscripttools4 \ - libqt-embeddedsql4 \ - libqt-embeddedsvg4 \ - libqt-embeddedtest4 \ - libqt-embeddedwebkit4 \ - libqt-embeddedxml4 \ - qt4-embedded-fonts-ttf-dejavu \ - qt4-embedded-fonts-ttf-vera \ - qt4-embedded-plugin-iconengine-svgicon \ - qt4-embedded-plugin-imageformat-gif \ - qt4-embedded-plugin-imageformat-ico \ - qt4-embedded-plugin-imageformat-jpeg \ - qt4-embedded-plugin-imageformat-mng \ - qt4-embedded-plugin-imageformat-svg \ - qt4-embedded-plugin-imageformat-tiff \ - qt4-embedded-plugin-mousedriver-tslib \ - qt4-embedded-plugin-script-dbus \ - qt4-embedded-plugin-sqldriver-sqlite \ - ${TOUCH} \ - qt4-embedded-demos \ - qt4-embedded-examples \ - qt-demo-init \ - qt4-embedded-assistant \ -" - -RRECOMMENDS_${PN} = " \ - libqt-embeddedxmlpatterns4 \ - qt4-embedded-plugin-phonon-backend-gstreamer \ -" - diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb deleted file mode 100644 index 772c151d25..0000000000 --- a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Target packages for Qt SDK" - -QTLIBPREFIX = "" - -require packagegroup-qt-toolchain-target.inc - -inherit distro_features_check -# depends on qt4-x11-free -REQUIRED_DISTRO_FEATURES = "x11" - -RDEPENDS_${PN} += " \ - qt4-x11-free-dev \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libqtopengl4-dev', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'openvg', 'libqtopenvg4-dev', '', d)} \ - " diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.inc b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.inc deleted file mode 100644 index e09782dab4..0000000000 --- a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.inc +++ /dev/null @@ -1,39 +0,0 @@ -LICENSE = "MIT" - -# Qt4 could NOT be built on MIPS64 with 64 bits userspace -COMPATIBLE_HOST_mips64 = "null" - -inherit packagegroup - -PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" - -RDEPENDS_${PN} += " \ - packagegroup-core-standalone-sdk-target \ - qt4${QTLIBPREFIX}-mkspecs \ - libqt${QTLIBPREFIX}multimedia4-dev \ - libqt${QTLIBPREFIX}3support4-dev \ - libqt${QTLIBPREFIX}clucene4-dev \ - libqt${QTLIBPREFIX}core4-dev \ - libqt${QTLIBPREFIX}dbus4-dev \ - libqt${QTLIBPREFIX}designercomponents4-dev \ - libqt${QTLIBPREFIX}designer4-dev \ - libqt${QTLIBPREFIX}uitools4-dev \ - libqt${QTLIBPREFIX}gui4-dev \ - libqt${QTLIBPREFIX}help4-dev \ - libqt${QTLIBPREFIX}network4-dev \ - libqt${QTLIBPREFIX}script4-dev \ - libqt${QTLIBPREFIX}scripttools4-dev \ - libqt${QTLIBPREFIX}sql4-dev \ - libqt${QTLIBPREFIX}svg4-dev \ - libqt${QTLIBPREFIX}test4-dev \ - libqt${QTLIBPREFIX}webkit4-dev \ - libqt${QTLIBPREFIX}xml4-dev \ - libqt${QTLIBPREFIX}declarative4-dev \ - libqt${QTLIBPREFIX}xmlpatterns4-dev \ - libsqlite3-dev \ - expat-dev \ - " - -RRECOMMENDS_${PN} += " \ - libqt${QTLIBPREFIX}phonon4-dev \ - " diff --git a/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb b/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb deleted file mode 100644 index 92ed237d3b..0000000000 --- a/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb +++ /dev/null @@ -1,7 +0,0 @@ -SUMMARY = "Target packages for Qt Embedded SDK" - -PR = "r7" - -QTLIBPREFIX = "-embedded" - -require packagegroup-qt-toolchain-target.inc diff --git a/meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch b/meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch deleted file mode 100644 index d8b2b2347b..0000000000 --- a/meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch +++ /dev/null @@ -1,18 +0,0 @@ -App/ExportWizard.cpp depends on wizard.h which depends on ui_wizard. The last one -should be already generated before compiling ExportWizard.cpp. - -Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> -Upstream-Status: Pending - -Index: Fotowall-0.9/App/ExportWizard.cpp -=================================================================== ---- Fotowall-0.9.orig/App/ExportWizard.cpp 2009-11-30 13:21:31.000000000 +0200 -+++ Fotowall-0.9/App/ExportWizard.cpp 2012-05-10 17:12:06.765230830 +0300 -@@ -23,6 +23,7 @@ - #include "imageloaderqt.h" - #include "posterazorcore.h" - #include "wizard.h" -+#include "ui_wizard.h" - - #include <QDesktopServices> - #include <QDesktopWidget> diff --git a/meta/recipes-qt/qt-apps/fotowall_0.9.bb b/meta/recipes-qt/qt-apps/fotowall_0.9.bb deleted file mode 100644 index 3af026525b..0000000000 --- a/meta/recipes-qt/qt-apps/fotowall_0.9.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Creative photo display application" -DESCRIPTION = "Fotowall is a creative tool that allows you to layout your photos or pictures \ -in a personal way. You can add pictures, then resize, move, change colors, text, shadows, etc.." - -HOMEPAGE = "http://www.enricoros.com/opensource/fotowall" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://GPL_V2;md5=79808397c3355f163c012616125c9e26 \ - file://main.cpp;beginline=6;endline=11;md5=b569acc2bf8974a3082b58fc53b9d8dc" -SECTION = "x11/apps" - -PR = "r4" - -SRCREV = "06d5a4142c599604d9a9fd64727b6945eb8cd3da" -SRC_URI = "git://github.com/enricoros/fotowall.git \ - file://ExportWizard-depends-on-ui_wizard.patch \ - " - -S = "${WORKDIR}/git" - -inherit qt4x11 - -EXTRA_QMAKEVARS_PRE = "CONFIG+=no-webcam" - -do_install() { - oe_runmake INSTALL_ROOT=${D} install -} - -# Ensure we have some plugins for some useful image formats -RRECOMMENDS_${PN} += "qt4-plugin-imageformat-gif qt4-plugin-imageformat-jpeg qt4-plugin-imageformat-tiff" diff --git a/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch b/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch deleted file mode 100644 index 2bb5bb11cc..0000000000 --- a/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch +++ /dev/null @@ -1,26 +0,0 @@ -Do not include /usr/include host paths - -These were added upstream apparently for freebsd support, but trigger -compiler warnings during the build and could be dangerous, so remove -them. - -Upstream-Status: Inappropriate [cross] - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> - -Update patch for version 0.7.4. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - ---- qmmp-0.7.4/CMakeLists.txt 2014-01-10 09:59:44.971837746 +0800 -+++ qmmp-0.7.4/CMakeLists.txt.new 2014-01-10 10:24:51.855837566 +0800 -@@ -1,9 +1,5 @@ - cmake_minimum_required(VERSION 2.6.0) - --#freebsd support --include_directories(SYSTEM /usr/local/include) --SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include) -- - #extract version from qmmp.h - FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/src/qmmp/qmmp.h" - QMMP_VERSION_DATA REGEX "^#define[ \t]+QMMP_VERSION_[A-Z]+[ \t]+[0-9]+.*$") diff --git a/meta/recipes-qt/qt-apps/qmmp_0.8.6.bb b/meta/recipes-qt/qt-apps/qmmp_0.8.6.bb deleted file mode 100644 index 6c1e2121cf..0000000000 --- a/meta/recipes-qt/qt-apps/qmmp_0.8.6.bb +++ /dev/null @@ -1,72 +0,0 @@ -SUMMARY = "Qt-based Multimedia Player" -DESCRIPTION = "Qmmp is an audio player, written with the help of the Qt library. The user interface is similar to Winamp or XMMS." -HOMEPAGE = "http://qmmp.ylsoftware.com" -LICENSE = "GPLv2" -LICENSE_FLAGS = "commercial" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SECTION = "multimedia" - -DEPENDS = "taglib libmad libvorbis libogg alsa-lib libsndfile1 libsamplerate0 curl" - -SRC_URI = "http://qmmp.ylsoftware.com/files/${BP}.tar.bz2 \ - file://no-host-paths.patch \ - " - -SRC_URI[md5sum] = "67e96e89c61b7432e5a12f555db702b1" -SRC_URI[sha256sum] = "0daea3f0a0df7b34089513c2c57413c82816ab8892bddabf49c18a7956255449" -inherit cmake qt4x11 - -QMMP_PLUGIN_OPTIONS ??= "\ - -DUSE_MMS:BOOL=FALSE \ - -DUSE_MPC:BOOL=FALSE \ - -DUSE_MODPLUG:BOOL=FALSE \ - -DUSE_WAVPACK:BOOL=FALSE \ - -DUSE_FFMPEG:BOOL=FALSE \ - -DUSE_AAC:BOOL=FALSE \ - -DUSE_CDA:BOOL=FALSE \ - -DUSE_MIDI:BOOL=FALSE \ - -DUSE_GME:BOOL=FALSE \ - -DUSE_OSS4:BOOL=FALSE \ - -DUSE_JACK:BOOL=FALSE \ - -DUSE_BS2B:BOOL=FALSE \ - -DUSE_PROJECTM:BOOL=FALSE \ - -DUSE_ENCA:BOOL=FALSE \ - " - -export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \ - -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \ - -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \ - -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \ - -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \ - -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \ - -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \ - -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \ - ${QMMP |
