Juan Font Alonso · Juan Font Alonso
--- a/scripts/clang-format.py 0 → 100644
+++ b/scripts/clang-format.py 0 → 100644
+#!/usr/bin/env python3
+
+import os
+import subprocess
+import argparse
+from fnmatch import fnmatch
+
+
+def clang_format(root_dir: str) -> None:
+    clang_format_cmd = ['clang-format', '-i']
--- a/src/libs/conversion/asn1/SedsToAsn1Translator/interfacetypecreator.cpp
+++ b/src/libs/conversion/asn1/SedsToAsn1Translator/interfacetypecreator.cpp
 #include "interfacetypecreator.h"

 #include "datatypetranslationhelper.h"
-#include "generictypecreator.h"
+//#include "generictypecreator.h"
--- a/src/qtcreator/sedsplugin/sedsplugin.cpp
+++ b/src/qtcreator/sedsplugin/sedsplugin.cpp

 auto SedsPlugin::addFilesToCurrentProject(QStringList filenames, const QString &path) -> void
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
--- a/src/qtcreator/spacecreatorplugin/msc/mscmainwidget.cpp
+++ b/src/qtcreator/spacecreatorplugin/msc/mscmainwidget.cpp
        m_plugin->mainModel()->chartViewModel().updateLayout();
        m_plugin->chartView()->setZoom(100);
    }
-    connect(mainWidget, &msc::MscAppWidget::showAsn1File, this,
-            [&](const QString &asnFilename) { Core::EditorManager::instance()->openEditor(asnFilename); });
+    connect(mainWidget, &msc::MscAppWidget::showAsn1File, this, [&](const QString &asnFilename) {
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
--- a/tests/unittests/common/textcheckerandconsumer/textcheckerandconsumer.cpp
+++ b/tests/unittests/common/textcheckerandconsumer/textcheckerandconsumer.cpp

    const QByteArray expectedData = expectedOutFile.readAll();
    const QString expectedText = QString::fromStdString(expectedData.toStdString());
-    const QStringList expectedStringList = expectedText.split("\n");
-    const QVector<QString> expectedStringVector = expectedStringList.toVector();
-    std::vector<QString> expectedOutput = expectedStringVector.toStdVector();
+    QStringList expectedStringList = expectedText.split("\n");
+    // const QVector<QString> expectedStringVector = expectedStringList.toVector();
--- a/.clang-format
+++ b/.clang-format
 SortIncludes: true
 IncludeBlocks: Regroup
 AlignAfterOpenBracket: DontAlign
+
+# Spaces In Empty places is set to false to mimic clang-format version7 which runs on ESA CI
+#SpaceInEmptyBlock: false
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
    - apt install -y  build-essential git g++ cmake cmake-data ninja-build make gcovr lcov ccache cccc doxygen graphviz zip p7zip curl wget default-jre uuid-dev pkg-config fuse python3-pip clang-format spin python3-pygraphviz python3-singledispatch python3-stringtemplate3 python3-pexpect 
    # install OpenGEODE dependencies
    # *Python (both for OpenGEODE and sdl2promela)
-    - pip3 install black==21.10b0 multipledispatch pyside6 pytest
+    - pip3 install black==21.10b0 multipledispatch pyside6 pytest py7zr aqtinstall GitPython
    # install newest OpenGEODE (must be intalled in the same directory, removal is more robust than git clean/checkout/force)
    - pushd $HOME/tool-src; rm -r opengeode ; git clone https://gitrepos.estec.esa.int/taste/opengeode.git ; cd opengeode ; make install; popd
    # install sdl2promela
    - git clone https://github.com/n7space/sdl2promela.git
    - pushd sdl2promela ; make install ; popd
    # install qtcreator sources
-    - ./scripts/download_qtcreator.sh
-    - ./scripts/build_grantlee.sh
+    #- ./scripts/download_qtcreator.sh
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
    get_target_property(QtCore_location ${QT_CORE} LOCATION)
    get_filename_component(QT_DIR ${QtCore_location} DIRECTORY)
    get_filename_component(QT_DIR ${QT_DIR} DIRECTORY)
-    set(Grantlee5_DIR "${QT_DIR}/lib/cmake/Grantlee5")
+    # set(Grantlee5_DIR "${QT_DIR}/lib/cmake/Grantlee5")