From 76f40a3032c47019dff9c9da876a952b8e631a7e Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 8 May 2020 15:39:41 +1000 Subject: [PATCH] QtCreator: bump version --- ....0.patchset => qt_creator-4.12.0.patchset} | 82 +++++-------------- ...4.10.0.recipe => qt_creator-4.12.0.recipe} | 8 +- 2 files changed, 26 insertions(+), 64 deletions(-) rename dev-qt/qt_creator/patches/{qt_creator-4.10.0.patchset => qt_creator-4.12.0.patchset} (71%) rename dev-qt/qt_creator/{qt_creator-4.10.0.recipe => qt_creator-4.12.0.recipe} (93%) diff --git a/dev-qt/qt_creator/patches/qt_creator-4.10.0.patchset b/dev-qt/qt_creator/patches/qt_creator-4.12.0.patchset similarity index 71% rename from dev-qt/qt_creator/patches/qt_creator-4.10.0.patchset rename to dev-qt/qt_creator/patches/qt_creator-4.12.0.patchset index b5034d05d..9d85f86b9 100644 --- a/dev-qt/qt_creator/patches/qt_creator-4.10.0.patchset +++ b/dev-qt/qt_creator/patches/qt_creator-4.12.0.patchset @@ -18,10 +18,10 @@ index 449e4ff..5ddf877 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 3959938..198a607 100644 +index b801310..5433410 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri -@@ -18,7 +18,7 @@ RESOURCES += $$PWD/../qmlpuppet.qrc +@@ -20,7 +20,7 @@ RESOURCES += $$PWD/../qmlpuppet.qrc DISTFILES += Info.plist @@ -71,7 +71,7 @@ index 376473d..85bbca1 100644 return 0; } diff --git a/src/plugins/qmldesigner/qmldesignerplugin.pro b/src/plugins/qmldesigner/qmldesignerplugin.pro -index 52e3e19..35c7cb1 100644 +index ea017e3..8a79b58 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.pro +++ b/src/plugins/qmldesigner/qmldesignerplugin.pro @@ -4,7 +4,7 @@ CONFIG += exceptions @@ -84,7 +84,7 @@ index 52e3e19..35c7cb1 100644 include(../../qtcreatorplugin.pri) diff --git a/src/shared/qbs/src/lib/corelib/tools/processutils.cpp b/src/shared/qbs/src/lib/corelib/tools/processutils.cpp -index 04a061e..a384b3b 100644 +index b27592f..ca5fcd6 100644 --- a/src/shared/qbs/src/lib/corelib/tools/processutils.cpp +++ b/src/shared/qbs/src/lib/corelib/tools/processutils.cpp @@ -57,6 +57,8 @@ @@ -97,7 +97,7 @@ index 04a061e..a384b3b 100644 # error Missing implementation of processNameByPid for this platform. #endif -- -2.23.0 +2.26.0 From 1bbe86f642c4cc1e3c3532249a13731218fa45e1 Mon Sep 17 00:00:00 2001 @@ -107,7 +107,7 @@ Subject: Fix rpath handling. diff --git a/qtcreator.pro b/qtcreator.pro -index e22433d..5f8dcf6 100644 +index f59ec0a..612d2a5 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -45,7 +45,7 @@ exists(src/shared/qbs/qbs.pro) { @@ -119,26 +119,11 @@ index e22433d..5f8dcf6 100644 } cache(QBS_PLUGINS_BUILD_DIR) cache(QBS_APPS_RPATH_DIR) -diff --git a/src/qtcreatortool.pri b/src/qtcreatortool.pri -index ac00786..3d903c1 100644 ---- a/src/qtcreatortool.pri -+++ b/src/qtcreatortool.pri -@@ -11,8 +11,8 @@ REL_PATH_TO_PLUGINS = $$relative_path($$IDE_PLUGIN_PATH, $$IDE_LIBEXEC_PATH) - osx { - QMAKE_LFLAGS += -Wl,-rpath,@executable_path/$$REL_PATH_TO_LIBS,-rpath,@executable_path/$$REL_PATH_TO_PLUGINS - } else { -- QMAKE_RPATHDIR += \$\$ORIGIN/$$REL_PATH_TO_LIBS -- QMAKE_RPATHDIR += \$\$ORIGIN/$$REL_PATH_TO_PLUGINS -+ QMAKE_RPATHDIR += $ORIGIN/$$REL_PATH_TO_LIBS -+ QMAKE_RPATHDIR += $ORIGIN/$$REL_PATH_TO_PLUGINS - } - include(rpath.pri) - diff --git a/src/rpath.pri b/src/rpath.pri -index 0d8911a..03c86f4 100644 +index ef0a6b7..6085af2 100644 --- a/src/rpath.pri +++ b/src/rpath.pri -@@ -11,3 +11,8 @@ macx { +@@ -17,3 +17,8 @@ macos { QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\' QMAKE_RPATHDIR = } @@ -169,11 +154,11 @@ Date: Mon, 25 Jun 2018 16:18:26 +0300 Subject: Enable Terminal on Haiku -diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp -index 43afffa..7704640 100644 ---- a/src/libs/utils/consoleprocess_unix.cpp -+++ b/src/libs/utils/consoleprocess_unix.cpp -@@ -334,6 +334,9 @@ void ConsoleProcess::stubExited() +diff --git a/src/libs/utils/consoleprocess.cpp b/src/libs/utils/consoleprocess.cpp +index f4cde33..b2cb822 100644 +--- a/src/libs/utils/consoleprocess.cpp ++++ b/src/libs/utils/consoleprocess.cpp +@@ -143,6 +143,9 @@ void ConsoleProcess::setSettings(QSettings *settings) Q_GLOBAL_STATIC_WITH_ARGS(const QVector, knownTerminals, ( { @@ -181,20 +166,20 @@ index 43afffa..7704640 100644 + {"Terminal", "", ""}, +#endif {"x-terminal-emulator", "", "-e"}, + {"xdg-terminal", "", "", true}, {"xterm", "", "-e"}, - {"aterm", "", "-e"}, -@@ -363,7 +366,11 @@ TerminalCommand ConsoleProcess::defaultTerminalEmulator() - if (!result.isEmpty()) - return {result, term.openArgs, term.executeArgs}; - } +@@ -170,7 +173,11 @@ TerminalCommand ConsoleProcess::defaultTerminalEmulator() + defaultTerm = {"/usr/X11/bin/xterm", "", "-e"}; + + } else if (HostOsInfo::isAnyUnixHost()) { +#ifdef Q_OS_HAIKU + return {"/system/apps/Terminal", "", ""}; +#else - return {"xterm", "", "-e"}; + defaultTerm = {"xterm", "", "-e"}; +#endif - }(); - } - return defaultTerm; + const Environment env = Environment::systemEnvironment(); + for (const TerminalCommand &term : *knownTerminals) { + const QString result = env.searchInPath(term.command).toString(); diff --git a/src/libs/utils/unixutils.cpp b/src/libs/utils/unixutils.cpp index 77daae6..4940d3e 100644 --- a/src/libs/utils/unixutils.cpp @@ -214,26 +199,3 @@ index 77daae6..4940d3e 100644 -- 2.23.0 - -From 200afca60589b6b0f6ae8a29f02596376185c41f Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 23 Sep 2019 22:43:58 +1000 -Subject: Fix for llvm 9 - - -diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp -index 59c2b59..2ff79b4 100644 ---- a/src/plugins/clangformat/clangformatutils.cpp -+++ b/src/plugins/clangformat/clangformatutils.cpp -@@ -60,7 +60,7 @@ static clang::format::FormatStyle qtcStyle() - style.AllowShortBlocksOnASingleLine = false; - style.AllowShortCaseLabelsOnASingleLine = false; - style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline; -- style.AllowShortIfStatementsOnASingleLine = false; -+ style.AllowShortIfStatementsOnASingleLine = FormatStyle::SIS_Never; - style.AllowShortLoopsOnASingleLine = false; - style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_None; - style.AlwaysBreakBeforeMultilineStrings = false; --- -2.23.0 - diff --git a/dev-qt/qt_creator/qt_creator-4.10.0.recipe b/dev-qt/qt_creator/qt_creator-4.12.0.recipe similarity index 93% rename from dev-qt/qt_creator/qt_creator-4.10.0.recipe rename to dev-qt/qt_creator/qt_creator-4.12.0.recipe index b5e7a57fe..53fd59b50 100644 --- a/dev-qt/qt_creator/qt_creator-4.10.0.recipe +++ b/dev-qt/qt_creator/qt_creator-4.12.0.recipe @@ -4,11 +4,11 @@ development environment (IDE) for application developers to create \ applications for multiple desktop, embedded, and mobile device platforms, \ such as Android and iOS." HOMEPAGE="https://www.qt.io/ide/" -COPYRIGHT="2019 The Qt Company Ltd" +COPYRIGHT="2020 The Qt Company Ltd" LICENSE="GNU GPL v3" -REVISION="2" -SOURCE_URI="https://download.qt.io/official_releases/qtcreator/4.10/$portVersion/qt-creator-opensource-src-$portVersion.tar.xz" -CHECKSUM_SHA256="8f5d3abc522d8b8879adfa098e037f751b4311173f5f443fd1b5800f5feb0f8a" +REVISION="1" +SOURCE_URI="https://download.qt.io/official_releases/qtcreator/${portVersion%.*}/$portVersion/qt-creator-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256="d76655799ad2af81fb15f85d412d74583659fb1b4cf27b758ad8aae73675948b" SOURCE_DIR="qt-creator-opensource-src-$portVersion" PATCHES="qt_creator-$portVersion.patchset" ADDITIONAL_FILES="qt_creator.rdef.in"