From 19a2c07ab47b7e43860623d09ebf15531d363961 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 29 May 2020 00:31:56 +1000 Subject: [PATCH] QtCreator: bump version --- ....0.patchset => qt_creator-4.12.1.patchset} | 157 +++++++++++++++++- ...4.12.0.recipe => qt_creator-4.12.1.recipe} | 4 +- 2 files changed, 154 insertions(+), 7 deletions(-) rename dev-qt/qt_creator/patches/{qt_creator-4.12.0.patchset => qt_creator-4.12.1.patchset} (58%) rename dev-qt/qt_creator/{qt_creator-4.12.0.recipe => qt_creator-4.12.1.recipe} (97%) diff --git a/dev-qt/qt_creator/patches/qt_creator-4.12.0.patchset b/dev-qt/qt_creator/patches/qt_creator-4.12.1.patchset similarity index 58% rename from dev-qt/qt_creator/patches/qt_creator-4.12.0.patchset rename to dev-qt/qt_creator/patches/qt_creator-4.12.1.patchset index 97107a55e..12c892c6b 100644 --- a/dev-qt/qt_creator/patches/qt_creator-4.12.0.patchset +++ b/dev-qt/qt_creator/patches/qt_creator-4.12.1.patchset @@ -1,4 +1,4 @@ -From 0843848366ec535dcb8f30b4a32855138a9fe68e Mon Sep 17 00:00:00 2001 +From ce83762bf243fca21602024e4efac7bc22bedf33 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 15 Jul 2017 15:42:32 +0200 Subject: apply patch from 4.1.0. @@ -100,14 +100,14 @@ index b27592f..ca5fcd6 100644 2.26.0 -From 7189970983e565d501147da787b066ee75157900 Mon Sep 17 00:00:00 2001 +From bb7dec1c7255e2a18f4f115c90e798d096458b1a Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 15 Jul 2017 18:20:31 +0200 Subject: Fix rpath handling. diff --git a/qtcreator.pro b/qtcreator.pro -index f59ec0a..612d2a5 100644 +index b17bad6..2a6416c 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -45,7 +45,7 @@ exists(src/shared/qbs/qbs.pro) { @@ -148,7 +148,7 @@ index d0c94a7..cc35826 100644 2.26.0 -From b13334e68897b69e3bbcd02367715bbc731cbb4f Mon Sep 17 00:00:00 2001 +From b1aac81b4c023e5fc9b0b7af7bb0fd1dad8f174c Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Mon, 25 Jun 2018 16:18:26 +0300 Subject: Enable Terminal on Haiku @@ -200,7 +200,7 @@ index 77daae6..4940d3e 100644 2.26.0 -From ddb793f906a32e06715d6368a4e8f8d69cf07b0b Mon Sep 17 00:00:00 2001 +From 5649c629ee535cc1d27b1fb8a004f0256efe1dc4 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 9 May 2020 20:00:50 +1000 Subject: Fix rpath @@ -225,3 +225,150 @@ index 6085af2..49dfaf6 100644 -- 2.26.0 + +From e83ef098417dd815dbcad786d3933b07259f7e3a Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Thu, 28 May 2020 14:42:59 +1000 +Subject: Don't using Manhattan style for QMenu and QMenuBar + + +diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp +index ea2e8db..f8990cf 100644 +--- a/src/plugins/coreplugin/mainwindow.cpp ++++ b/src/plugins/coreplugin/mainwindow.cpp +@@ -134,6 +134,9 @@ MainWindow::MainWindow() + && baseName == QLatin1String("windows")) { + baseName = QLatin1String("fusion"); + } ++#ifndef __HAIKU__ ++ baseName = QLatin1String("haiku"); ++#endif + + // if the user has specified as base style in the theme settings, + // prefer that +@@ -146,6 +149,7 @@ MainWindow::MainWindow() + } + + QApplication::setStyle(new ManhattanStyle(baseName)); ++ + m_generalSettings->setShowShortcutsInContextMenu( + m_generalSettings->showShortcutsInContextMenu()); + +diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp +index d161753..3683057 100644 +--- a/src/plugins/coreplugin/manhattanstyle.cpp ++++ b/src/plugins/coreplugin/manhattanstyle.cpp +@@ -200,16 +200,20 @@ int ManhattanStyle::pixelMetric(PixelMetric metric, const QStyleOption *option, + case PM_DockWidgetHandleExtent: + case PM_DockWidgetSeparatorExtent: + return 1; ++#ifndef __HAIKU__ + case PM_MenuPanelWidth: + case PM_MenuBarHMargin: + case PM_MenuBarVMargin: ++#endif + case PM_ToolBarFrameWidth: + if (panelWidget(widget)) + retval = 1; + break; + case PM_ButtonShiftVertical: + case PM_ButtonShiftHorizontal: ++#ifndef __HAIKU__ + case PM_MenuBarPanelWidth: ++#endif + case PM_ToolBarItemMargin: + case PM_ToolBarItemSpacing: + if (panelWidget(widget)) +@@ -630,6 +634,7 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt + } + + switch (element) { ++#ifndef __HAIKU__ + case CE_MenuItem: + painter->save(); + if (const auto mbi = qstyleoption_cast(option)) { +@@ -687,7 +692,7 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt + } + painter->restore(); + break; +- ++#endif + case CE_ComboBoxLabel: + if (const auto cb = qstyleoption_cast(option)) { + if (panelWidget(widget)) { +@@ -782,7 +787,7 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt + painter->restore(); + } + break; +- ++#ifndef __HAIKU__ + case CE_MenuBarEmptyArea: { + if (creatorTheme()->flag(Theme::FlatMenuBar)) + painter->fillRect(option->rect, StyleHelper::baseColor()); +@@ -796,7 +801,7 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt + painter->restore(); + } + break; +- ++#endif + case CE_ToolBar: + { + QRect rect = option->rect; +-- +2.26.0 + + +From ac774cc265374a435e1b93c9089b2b84dca3a1b1 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Thu, 28 May 2020 15:38:35 +1000 +Subject: Don't validate Qt toolkit + + +diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp +index 67cc6b8..3b38107 100644 +--- a/src/plugins/qtsupport/baseqtversion.cpp ++++ b/src/plugins/qtsupport/baseqtversion.cpp +@@ -511,6 +511,7 @@ Tasks BaseQtVersion::validateKit(const Kit *k) + result << BuildSystemTask(Task::Warning, tr("Device type is not supported by Qt version.")); + + ToolChain *tc = ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); ++#ifndef __HAIKU__ + if (tc) { + Abi targetAbi = tc->targetAbi(); + bool fuzzyMatch = false; +@@ -542,6 +543,7 @@ Tasks BaseQtVersion::validateKit(const Kit *k) + const QString message = tr("The kit has a Qt version, but no C++ compiler."); + result << BuildSystemTask(Task::Warning, message); + } ++#endif + return result; + } + +-- +2.26.0 + + +From 05f0223c49efdea26ef456bef6753b9a86e6de33 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Thu, 28 May 2020 17:26:06 +1000 +Subject: Make unknown host abi for Haiku + + +diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp +index fec9f69..2892419 100644 +--- a/src/plugins/projectexplorer/abi.cpp ++++ b/src/plugins/projectexplorer/abi.cpp +@@ -1015,6 +1015,10 @@ Abi Abi::hostAbi() + subos = WindowsMSysFlavor; + #endif + format = PEFormat; ++#elif defined (Q_OS_HAIKU) ++ os = UnknownOS; ++ subos = GenericFlavor; ++ format = UnknownFormat; + #elif defined (Q_OS_LINUX) + os = LinuxOS; + subos = GenericFlavor; +-- +2.26.0 + diff --git a/dev-qt/qt_creator/qt_creator-4.12.0.recipe b/dev-qt/qt_creator/qt_creator-4.12.1.recipe similarity index 97% rename from dev-qt/qt_creator/qt_creator-4.12.0.recipe rename to dev-qt/qt_creator/qt_creator-4.12.1.recipe index eea75152e..b0fa52ead 100644 --- a/dev-qt/qt_creator/qt_creator-4.12.0.recipe +++ b/dev-qt/qt_creator/qt_creator-4.12.1.recipe @@ -6,9 +6,9 @@ such as Android and iOS." HOMEPAGE="https://www.qt.io/ide/" COPYRIGHT="2020 The Qt Company Ltd" LICENSE="GNU GPL v3" -REVISION="2" +REVISION="1" SOURCE_URI="https://download.qt.io/official_releases/qtcreator/${portVersion%.*}/$portVersion/qt-creator-opensource-src-$portVersion.tar.xz" -CHECKSUM_SHA256="d76655799ad2af81fb15f85d412d74583659fb1b4cf27b758ad8aae73675948b" +CHECKSUM_SHA256="9ccee38b42854567eb7e3ea0419e635fbf9a9fe7035811fd62165e8d23436ab4" SOURCE_DIR="qt-creator-opensource-src-$portVersion" PATCHES="qt_creator-$portVersion.patchset" ADDITIONAL_FILES="qt_creator.rdef.in"