From f4fac16e1033b3f8679b94e258e8c5d276167946 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 7 Jan 2020 16:03:22 +0100 Subject: 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 --- ...-provide-default-for-SIDE_PANEL_TOOLBAR_T.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 qt5-layer/recipes-qt/qedit/files/0001-Options.cpp-provide-default-for-SIDE_PANEL_TOOLBAR_T.patch (limited to 'qt5-layer/recipes-qt/qedit/files/0001-Options.cpp-provide-default-for-SIDE_PANEL_TOOLBAR_T.patch') diff --git a/qt5-layer/recipes-qt/qedit/files/0001-Options.cpp-provide-default-for-SIDE_PANEL_TOOLBAR_T.patch b/qt5-layer/recipes-qt/qedit/files/0001-Options.cpp-provide-default-for-SIDE_PANEL_TOOLBAR_T.patch new file mode 100644 index 0000000..7c7f563 --- /dev/null +++ b/qt5-layer/recipes-qt/qedit/files/0001-Options.cpp-provide-default-for-SIDE_PANEL_TOOLBAR_T.patch @@ -0,0 +1,33 @@ +From 0c9e80df71bde69179edcb6847eb381eeec5cf7c Mon Sep 17 00:00:00 2001 +From: Max Krummenacher +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 +--- + 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( "SIDE_PANEL_TOOLBAR_TEXT_POSITION", 0 ); ++ + // toolbars default configuration + set( "TOOLBUTTON_ICON_SIZE", 0 ); + set( "TOOLBUTTON_TEXT_POSITION", -1 ); +-- +2.13.6 + -- cgit v1.2.3