From 7f7f5431a3d2248cbfc2bbec7be9d83e1a423595 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 29 Dec 2020 14:19:49 +1000 Subject: [PATCH] QtCreator: bump version --- ....2.patchset => qt_creator-4.14.0.patchset} | 81 ++++++++++++------- ...4.13.2.recipe => qt_creator-4.14.0.recipe} | 2 +- 2 files changed, 53 insertions(+), 30 deletions(-) rename dev-qt/qt_creator/patches/{qt_creator-4.13.2.patchset => qt_creator-4.14.0.patchset} (83%) rename dev-qt/qt_creator/{qt_creator-4.13.2.recipe => qt_creator-4.14.0.recipe} (97%) diff --git a/dev-qt/qt_creator/patches/qt_creator-4.13.2.patchset b/dev-qt/qt_creator/patches/qt_creator-4.14.0.patchset similarity index 83% rename from dev-qt/qt_creator/patches/qt_creator-4.13.2.patchset rename to dev-qt/qt_creator/patches/qt_creator-4.14.0.patchset index 4617d1047..4dc720e0f 100644 --- a/dev-qt/qt_creator/patches/qt_creator-4.13.2.patchset +++ b/dev-qt/qt_creator/patches/qt_creator-4.14.0.patchset @@ -1,14 +1,14 @@ -From 8f1c9d1ebc310b1a4b1f18678d0fd526759fff9b Mon Sep 17 00:00:00 2001 +From fedfecc4f277eccc2688161c917fd22ec54da05f 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. diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp -index defbf56..b8b3b81 100644 +index 93e6e78..514d6e5 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp -@@ -45,7 +45,7 @@ +@@ -47,7 +47,7 @@ namespace QmlDesigner { static void prioritizeDown() { @@ -18,10 +18,10 @@ index defbf56..b8b3b81 100644 #elif defined(Q_OS_WIN) SetPriorityClass(GetCurrentProcess(), BELOW_NORMAL_PRIORITY_CLASS); diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri -index f772fd8..186d63a 100644 +index 940047c..79ed19a 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri -@@ -29,7 +29,7 @@ RESOURCES += $$PWD/../qmlpuppet.qrc +@@ -30,7 +30,7 @@ RESOURCES += $$PWD/../qmlpuppet.qrc DISTFILES += Info.plist @@ -31,7 +31,7 @@ index f772fd8..186d63a 100644 osx { CONFIG -= app_bundle diff --git a/src/libs/sqlite/sqlite-lib.pri b/src/libs/sqlite/sqlite-lib.pri -index 8ded8ca..6a16c2e 100644 +index fd02c88..6ea88c1 100644 --- a/src/libs/sqlite/sqlite-lib.pri +++ b/src/libs/sqlite/sqlite-lib.pri @@ -6,7 +6,7 @@ shared { @@ -43,7 +43,7 @@ index 8ded8ca..6a16c2e 100644 include(../3rdparty/sqlite/sqlite.pri) -@@ -58,7 +58,7 @@ DEFINES += SQLITE_THREADSAFE=2 SQLITE_ENABLE_FTS5 SQLITE_ENABLE_UNLOCK_NOTIFY \ +@@ -60,7 +60,7 @@ DEFINES += SQLITE_THREADSAFE=2 SQLITE_ENABLE_FTS5 SQLITE_ENABLE_UNLOCK_NOTIFY \ SQLITE_MAX_EXPR_DEPTH=0 SQLITE_OMIT_SHARED_CACHE SQLITE_USE_ALLOCA \ SQLITE_ENABLE_MEMORY_MANAGEMENT SQLITE_ENABLE_NULL_TRIM SQLITE_OMIT_EXPLAIN \ SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_UTF16 SQLITE_DQS=0 \ @@ -80,7 +80,7 @@ index ef5921b..9be08ad 100644 return 0; } diff --git a/src/plugins/qmldesigner/qmldesignerplugin.pro b/src/plugins/qmldesigner/qmldesignerplugin.pro -index 6590dcb..1894edf 100644 +index 8f34f42..e95e673 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.pro +++ b/src/plugins/qmldesigner/qmldesignerplugin.pro @@ -4,7 +4,7 @@ CONFIG += exceptions @@ -109,17 +109,17 @@ index b27592f..ca5fcd6 100644 2.28.0 -From a3c6ee9a1d2a91607e2bf1f36f464ae87e96f6d1 Mon Sep 17 00:00:00 2001 +From 92fc6a3d1da896e35097fa2fcd0a47c206e447b8 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 a8cb39f..b77216e 100644 +index d2e9a74..53272c6 100644 --- a/qtcreator.pro +++ b/qtcreator.pro -@@ -45,7 +45,7 @@ exists(src/shared/qbs/qbs.pro) { +@@ -46,7 +46,7 @@ exists(src/shared/qbs/qbs.pro) { QBS_APPS_RPATH_DIR = @loader_path/../Frameworks } else { QBS_PLUGINS_BUILD_DIR = $$IDE_PLUGIN_PATH @@ -144,7 +144,7 @@ index ef0a6b7..49dfaf6 100644 + QMAKE_RPATHDIR += $ORIGIN/../$$IDE_LIBRARY_BASENAME/qtcreator } diff --git a/src/shared/qbs/src/app/app.pri b/src/shared/qbs/src/app/app.pri -index d0c94a7..cc35826 100644 +index 5cd9cb4..818df42 100644 --- a/src/shared/qbs/src/app/app.pri +++ b/src/shared/qbs/src/app/app.pri @@ -7,6 +7,7 @@ DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_PROCESS_COMBINED_ARGUMENT_START @@ -159,17 +159,17 @@ index d0c94a7..cc35826 100644 2.28.0 -From 18795889273f1561440151a97332273897004347 Mon Sep 17 00:00:00 2001 +From 875cab3924140f4651af21d5ccf1e6cec128cf34 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Mon, 25 Jun 2018 16:18:26 +0300 Subject: Enable Terminal on Haiku diff --git a/src/libs/utils/consoleprocess.cpp b/src/libs/utils/consoleprocess.cpp -index 0edcd13..f2ce8fc 100644 +index 7fe624a..5143feb 100644 --- a/src/libs/utils/consoleprocess.cpp +++ b/src/libs/utils/consoleprocess.cpp -@@ -148,6 +148,9 @@ void ConsoleProcess::setSettings(QSettings *settings) +@@ -149,6 +149,9 @@ void ConsoleProcess::setSettings(QSettings *settings) Q_GLOBAL_STATIC_WITH_ARGS(const QVector, knownTerminals, ( { @@ -179,7 +179,7 @@ index 0edcd13..f2ce8fc 100644 {"x-terminal-emulator", "", "-e"}, {"xdg-terminal", "", "", true}, {"xterm", "", "-e"}, -@@ -175,7 +178,11 @@ TerminalCommand ConsoleProcess::defaultTerminalEmulator() +@@ -176,7 +179,11 @@ TerminalCommand ConsoleProcess::defaultTerminalEmulator() defaultTerm = {"/usr/X11/bin/xterm", "", "-e"}; } else if (HostOsInfo::isAnyUnixHost()) { @@ -211,14 +211,14 @@ index 77daae6..4940d3e 100644 2.28.0 -From c388e265713c6658ff1339ef94aaad7d500af289 Mon Sep 17 00:00:00 2001 +From 93b3ab69e4bbc823dd95f02e2612ddf7583f7739 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 ed90cae..7c01d8a 100644 +index 6fb5e17..a434a19 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -135,6 +135,9 @@ MainWindow::MainWindow() @@ -240,10 +240,10 @@ index ed90cae..7c01d8a 100644 m_generalSettings->showShortcutsInContextMenu()); diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp -index d161753..3683057 100644 +index c043b05..bcea8de 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, +@@ -208,16 +208,20 @@ int ManhattanStyle::pixelMetric(PixelMetric metric, const QStyleOption *option, case PM_DockWidgetHandleExtent: case PM_DockWidgetSeparatorExtent: return 1; @@ -264,7 +264,7 @@ index d161753..3683057 100644 case PM_ToolBarItemMargin: case PM_ToolBarItemSpacing: if (panelWidget(widget)) -@@ -630,6 +634,7 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt +@@ -783,6 +787,7 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt } switch (element) { @@ -272,7 +272,7 @@ index d161753..3683057 100644 case CE_MenuItem: painter->save(); if (const auto mbi = qstyleoption_cast(option)) { -@@ -687,7 +692,7 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt +@@ -840,7 +845,7 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt } painter->restore(); break; @@ -281,7 +281,7 @@ index d161753..3683057 100644 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 +@@ -935,7 +940,7 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt painter->restore(); } break; @@ -290,7 +290,7 @@ index d161753..3683057 100644 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 +@@ -949,7 +954,7 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt painter->restore(); } break; @@ -303,14 +303,14 @@ index d161753..3683057 100644 2.28.0 -From 1042165b6cb8c639c80ac651b7e9d731d827b842 Mon Sep 17 00:00:00 2001 +From d5833872cc6290bbad5b15f5da82b87e30cd9cf3 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 46ac87c..be4350b 100644 +index 331e30f..b9a2b7f 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -510,7 +510,7 @@ Tasks BaseQtVersion::validateKit(const Kit *k) @@ -334,14 +334,14 @@ index 46ac87c..be4350b 100644 2.28.0 -From 307532174d86abf78d7fd79af448fe43588ddf01 Mon Sep 17 00:00:00 2001 +From e8c40c1884c74afc6632df5fe2faeb0f657fe311 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 8cc8bcb..b95a8f2 100644 +index b1d7574..13d3afd 100644 --- a/src/plugins/projectexplorer/abi.cpp +++ b/src/plugins/projectexplorer/abi.cpp @@ -1127,6 +1127,10 @@ Abi Abi::hostAbi() @@ -359,7 +359,7 @@ index 8cc8bcb..b95a8f2 100644 2.28.0 -From 398a6b915224b275db90ca172a29aa536f307398 Mon Sep 17 00:00:00 2001 +From 640c4fdd8097c9fa5c26e6a9c107950844cb5962 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 23 Oct 2020 09:14:22 +1000 Subject: Use fsync @@ -394,3 +394,26 @@ index e96845e..9d6f471 100644 -- 2.28.0 + +From 89211d2f67db35032494604691193dbc8e67566a Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Tue, 29 Dec 2020 14:16:57 +1000 +Subject: Fix build for clang 9 + + +diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp +index 8e11c15..e0eb282 100644 +--- a/src/plugins/clangformat/clangformatutils.cpp ++++ b/src/plugins/clangformat/clangformatutils.cpp +@@ -115,7 +115,7 @@ static clang::format::FormatStyle qtcStyle() + style.ExperimentalAutoDetectBinPacking = false; + style.FixNamespaceComments = true; + style.ForEachMacros = {"forever", "foreach", "Q_FOREACH", "BOOST_FOREACH"}; +- style.IncludeStyle.IncludeCategories = {{"^