diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2020-01-07 16:03:22 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-01-09 19:49:58 +0100 |
| commit | f4fac16e1033b3f8679b94e258e8c5d276167946 (patch) | |
| tree | e79fac1b6964f40d82c5a0a91a5bbca08c9d9220 /recipes-qt/qedit | |
| parent | 888c731f3867e4f7bdcf851e6d81428295ac57eb (diff) | |
qt5: do not require meta-qt5
Move all qt5 relevant stuff where it only gets parsed if meta-qt5 is
available.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-qt/qedit')
| -rw-r--r-- | recipes-qt/qedit/files/0001-Options.cpp-provide-default-for-SIDE_PANEL_TOOLBAR_T.patch | 33 | ||||
| -rw-r--r-- | recipes-qt/qedit/files/qedit.desktop | 9 | ||||
| -rw-r--r-- | recipes-qt/qedit/qedit_2.8.2.bb | 33 |
3 files changed, 0 insertions, 75 deletions
diff --git a/recipes-qt/qedit/files/0001-Options.cpp-provide-default-for-SIDE_PANEL_TOOLBAR_T.patch b/recipes-qt/qedit/files/0001-Options.cpp-provide-default-for-SIDE_PANEL_TOOLBAR_T.patch deleted file mode 100644 index 7c7f563..0000000 --- a/recipes-qt/qedit/files/0001-Options.cpp-provide-default-for-SIDE_PANEL_TOOLBAR_T.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0c9e80df71bde69179edcb6847eb381eeec5cf7c Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Tue, 26 Dec 2017 20:05:37 +0100 -Subject: [PATCH] Options.cpp: provide default for - SIDE_PANEL_TOOLBAR_TEXT_POSITION - -prevents the following: - -| # qedit -| 2017/12/26 17:24:23 Options::_find - invalid option: SIDE_PANEL_TOOLBAR_TEXT_POSITION -| Segmentation fault (core dumped) - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - base/Options.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/base/Options.cpp b/base/Options.cpp -index 2fb2c9f..cd099c6 100644 ---- a/base/Options.cpp -+++ b/base/Options.cpp -@@ -62,6 +62,8 @@ void Options::installDefaultOptions() - set( "FIXED_FONT_NAME", "Sans Serif,10" ); - set( "FONT_NAME", "Monospace,10" ); - -+ set<int>( "SIDE_PANEL_TOOLBAR_TEXT_POSITION", 0 ); -+ - // toolbars default configuration - set<int>( "TOOLBUTTON_ICON_SIZE", 0 ); - set<int>( "TOOLBUTTON_TEXT_POSITION", -1 ); --- -2.13.6 - diff --git a/recipes-qt/qedit/files/qedit.desktop b/recipes-qt/qedit/files/qedit.desktop deleted file mode 100644 index 14f5669..0000000 --- a/recipes-qt/qedit/files/qedit.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=QEdit -Comment=A Qt Text editor -Exec=qedit %F -Terminal=false -Type=Application -MimeType=text/plain; -Icon=qedit -Categories=Utility;TextEditor;Qt;
\ No newline at end of file diff --git a/recipes-qt/qedit/qedit_2.8.2.bb b/recipes-qt/qedit/qedit_2.8.2.bb deleted file mode 100644 index 112a8c0..0000000 --- a/recipes-qt/qedit/qedit_2.8.2.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "QEdit Text Editor" -HOMEPAGE = "http://hugo.pereira.free.fr/software/index.php?page=package&package_list=software_list_qt&package=qedit&full=0" -SECTION = "x11" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=81bcece21748c91ba9992349a91ec11d" - -DEPENDS = "qtbase qtx11extras" - -inherit cmake_qt5 - -SRC_URI = " \ - http://hugo.pereira.free.fr/software/tgz/qedit-2.8.2.tar.gz \ - file://qedit.desktop \ - file://0001-Options.cpp-provide-default-for-SIDE_PANEL_TOOLBAR_T.patch \ -" -SRC_URI[md5sum] = "7cca177ea042b230678ba0bb36269665" -SRC_URI[sha256sum] = "cc0686927ec8ffe44527f682b3a8d9585f753d643543fae061cb023a3b71ddb0" - -EXTRA_OECMAKE = "-DUSE_QT5=ON" -#export EXTRA_OECMAKE = "-DCMAKE_INSTALL_PREFIX=/usr" -do_configure() { - # Ensure we get the cmake configure and not qmake - cmake_do_configure -} - -do_install_append () { - install -d ${D}/${datadir}/applications - install -m 755 ${WORKDIR}/qedit.desktop ${D}/${datadir}/applications/ -} - -FILES_${PN} += "" -FILES_${PN}-dev += "" |