From: Denys Dmytriyenko <[email protected]> This way only variables can be used from other places where inheriting rest of qt/qmake classes won't make sense.
Signed-off-by: Denys Dmytriyenko <[email protected]> --- meta-arago-distro/classes/qt-provider.bbclass | 12 +----------- meta-arago-distro/classes/qt-vars.bbclass | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 meta-arago-distro/classes/qt-vars.bbclass diff --git a/meta-arago-distro/classes/qt-provider.bbclass b/meta-arago-distro/classes/qt-provider.bbclass index c0f7184..a0dbdef 100644 --- a/meta-arago-distro/classes/qt-provider.bbclass +++ b/meta-arago-distro/classes/qt-provider.bbclass @@ -10,14 +10,4 @@ QT_PROVIDER ?= "qt4e" inherit ${QT_PROVIDER} - -# Build-time dependencies - those are now separate modules in Qt5 and -# require separate dependencies, unlike Qt4 that provides everything -# in a single qt4-embedded/qt4-x11 recipe -QT_DEPENDS_BASE = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtbase', 'qt4-embedded', d)}" -QT_DEPENDS_WEBKIT = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtwebkit', '', d)}" -QT_DEPENDS_SVG = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtsvg', '', d)}" -QT_DEPENDS_SCRIPT = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtscript', '', d)}" - -# Run-time dependencies -QT_RDEPENDS_FONTS = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtbase-fonts', 'qt4-embedded-fonts', d)}" +inherit qt-vars diff --git a/meta-arago-distro/classes/qt-vars.bbclass b/meta-arago-distro/classes/qt-vars.bbclass new file mode 100644 index 0000000..b5efee2 --- /dev/null +++ b/meta-arago-distro/classes/qt-vars.bbclass @@ -0,0 +1,16 @@ +# Class to define many useful variables that differ between Qt4 and Qt5 + +QT_PROVIDER ?= "qt4e" + +# Build-time dependencies - those are now separate modules in Qt5 and +# require separate dependencies, unlike Qt4 that provides everything +# in a single qt4-embedded/qt4-x11 recipe +QT_DEPENDS_BASE = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtbase', 'qt4-embedded', d)}" +QT_DEPENDS_WEBKIT = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtwebkit', '', d)}" +QT_DEPENDS_SVG = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtsvg', '', d)}" +QT_DEPENDS_SCRIPT = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtscript', '', d)}" + +# Run-time dependencies +QT_RDEPENDS_FONTS = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtbase-fonts', 'qt4-embedded-fonts', d)}" +QT_RDEPENDS_NATIVESDK_TOOLS = "${@base_conditional('QT_PROVIDER', 'qt5', 'nativesdk-qtbase-tools nativesdk-qttools', 'nativesdk-qt4-tools', d)}" +QT_RDEPENDS_MKSPECS = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtbase-mkspecs', 'qt4-embedded-mkspecs', d)}" -- 1.8.3.2 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
