Sisyphus repository
Last update: 1 october 2023 | SRPMs: 18631 | Visits: 37037641
en ru br
ALT Linux repos
S:11.0.3-alt1
5.0: 1.1.0-alt2

Group :: Development/Tools
RPM: qt-creator

 Main   Changelog   Spec   Patches   Sources   Download   Gear   Bugs and FR  Repocop 

Patch: qt-creator-7.0.2-alt2.patch
Download


 .gear/rules                                        |   5 +
 .../tags/14c4d0e5d35c615df0dc10ecd7a4646d570f9007  |   6 +
 .gear/tags/list                                    |   3 +
 .gear/upstream/filter-tag                          |   1 +
 .gear/upstream/remotes                             |   3 +
 .gear/upstream/transform-tag                       |   1 +
 ...ectly-include-KSyntaxHighlighting-headers.patch | 369 +++++++++++++++
 qt-creator.spec                                    | 522 +++++++++++++++++++++
 .../applications/org.qt-project.qtcreator.desktop  |   1 +
 src/share/qtcreator/externaltools/lrelease.xml     |   2 +-
 src/share/qtcreator/externaltools/lupdate.xml      |   2 +-
 src/share/qtcreator/externaltools/qmlscene.xml     |   2 +-
 12 files changed, 914 insertions(+), 3 deletions(-)
diff --git a/.gear/rules b/.gear/rules
new file mode 100644
index 0000000000..b368b997aa
--- /dev/null
+++ b/.gear/rules
@@ -0,0 +1,5 @@
+copy?: *.patch
+tar: v@version@:.
+diff: v@version@:. .
+tar: qbs-sources:. name=qbs base=src/shared/qbs
+tar: perfparser:. name=perfparser base=src/tools/perfparser
diff --git a/.gear/tags/14c4d0e5d35c615df0dc10ecd7a4646d570f9007 b/.gear/tags/14c4d0e5d35c615df0dc10ecd7a4646d570f9007
new file mode 100644
index 0000000000..78b57c4911
--- /dev/null
+++ b/.gear/tags/14c4d0e5d35c615df0dc10ecd7a4646d570f9007
@@ -0,0 +1,6 @@
+object ac1e86fe74b6719171998c18a222658aa4252cbe
+type commit
+tag v7.0.2
+tagger Eike Ziller <eike.ziller@qt.io> 1653381226 +0200
+
+Qt Creator v7.0.2
diff --git a/.gear/tags/list b/.gear/tags/list
new file mode 100644
index 0000000000..03cabdafc4
--- /dev/null
+++ b/.gear/tags/list
@@ -0,0 +1,3 @@
+d494f98900b2cd880ce3450074c69f708962804f perfparser
+864f7ed09316e4f629423f1c4f2d05af244e2339 qbs-sources
+14c4d0e5d35c615df0dc10ecd7a4646d570f9007 v7.0.2
diff --git a/.gear/upstream/filter-tag b/.gear/upstream/filter-tag
new file mode 100755
index 0000000000..dc44a098c0
--- /dev/null
+++ b/.gear/upstream/filter-tag
@@ -0,0 +1 @@
+grep '^v[0-9.]\+$'
diff --git a/.gear/upstream/remotes b/.gear/upstream/remotes
new file mode 100644
index 0000000000..71a4692bb0
--- /dev/null
+++ b/.gear/upstream/remotes
@@ -0,0 +1,3 @@
+[remote "upstream"]
+	url = git://code.qt.io/qt-creator/qt-creator.git
+	fetch = +refs/heads/*:refs/remotes/upstream/*
diff --git a/.gear/upstream/transform-tag b/.gear/upstream/transform-tag
new file mode 100755
index 0000000000..9c1bb0fd90
--- /dev/null
+++ b/.gear/upstream/transform-tag
@@ -0,0 +1 @@
+sed 's/^v\([0-9.]\+\)\(-rc[0-9]\)\?$/\1/'
diff --git a/0001-Correctly-include-KSyntaxHighlighting-headers.patch b/0001-Correctly-include-KSyntaxHighlighting-headers.patch
new file mode 100644
index 0000000000..6e7bf086f8
--- /dev/null
+++ b/0001-Correctly-include-KSyntaxHighlighting-headers.patch
@@ -0,0 +1,369 @@
+From 4d9215e44d70c10be2c183592e8280c4d7292a83 Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57@gmail.com>
+Date: Wed, 18 May 2022 18:03:22 +0300
+Subject: [PATCH] Correctly include KSyntaxHighlighting headers
+
+In external KSyntaxHighlighting, these headers now have paths like
+/usr/include/KF5/KSyntaxHighlighting/KSyntaxHighlighting/AbstractHighlighter,
+where /usr/include/KF5/KSyntaxHighlighting is passed to compiler as include
+path.
+
+Old headers which had only one KSyntaxHighlighting fragment in path were
+removed in v5.94.0:
+https://invent.kde.org/frameworks/syntax-highlighting/-/merge_requests/305
+
+Adjust our vendored version to make the code work with both external and
+vendored versions.
+
+Change-Id: Iadcc668c3c705c563ae359301d227ee19eadca0f
+Reviewed-by: Orgad Shaneh <orgads@gmail.com>
+Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
+Reviewed-by: David Schulz <david.schulz@qt.io>
+---
+diff --git a/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt b/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt
+index 4d352af..b168de5 100644
+--- a/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt
++++ b/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt
+@@ -9,6 +9,7 @@ add_qtc_library(KSyntaxHighlighting SHARED
+   INCLUDES autogenerated/
+   PUBLIC_INCLUDES
+     src/lib
++    autogenerated/include
+     autogenerated/src/lib
+   DEFINES KF5SyntaxHighlighting_EXPORTS
+   DEPENDS Qt5::Network Qt5::Widgets
+@@ -43,7 +44,7 @@ add_qtc_library(KSyntaxHighlighting SHARED
+     src/lib/worddelimiters.cpp src/lib/worddelimiters_p.h
+     src/lib/xml_p.h
+ )
+-qtc_add_public_header(autogenerated/src/lib/State)
++qtc_add_public_header(autogenerated/include/KSyntaxHighlighting/State)
+ 
+ if(TARGET KSyntaxHighlighting)
+   install(
+diff --git a/src/libs/3rdparty/syntax-highlighting/autogenerated/src/lib/AbstractHighlighter b/src/libs/3rdparty/syntax-highlighting/autogenerated/include/KSyntaxHighlighting/AbstractHighlighter
+similarity index 100%
+rename from src/libs/3rdparty/syntax-highlighting/autogenerated/src/lib/AbstractHighlighter
+rename to src/libs/3rdparty/syntax-highlighting/autogenerated/include/KSyntaxHighlighting/AbstractHighlighter
+diff --git a/src/libs/3rdparty/syntax-highlighting/autogenerated/src/lib/Definition b/src/libs/3rdparty/syntax-highlighting/autogenerated/include/KSyntaxHighlighting/Definition
+similarity index 100%
+rename from src/libs/3rdparty/syntax-highlighting/autogenerated/src/lib/Definition
+rename to src/libs/3rdparty/syntax-highlighting/autogenerated/include/KSyntaxHighlighting/Definition
+diff --git a/src/libs/3rdparty/syntax-highlighting/autogenerated/src/lib/DefinitionDownloader b/src/libs/3rdparty/syntax-highlighting/autogenerated/include/KSyntaxHighlighting/DefinitionDownloader
+similarity index 100%
+rename from src/libs/3rdparty/syntax-highlighting/autogenerated/src/lib/DefinitionDownloader
+rename to src/libs/3rdparty/syntax-highlighting/autogenerated/include/KSyntaxHighlighting/DefinitionDownloader
+diff --git a/src/libs/3rdparty/syntax-highlighting/autogenerated/src/lib/FoldingRegion b/src/libs/3rdparty/syntax-highlighting/autogenerated/include/KSyntaxHighlighting/FoldingRegion
+similarity index 100%
+rename from src/libs/3rdparty/syntax-highlighting/autogenerated/src/lib/FoldingRegion
+rename to src/libs/3rdparty/syntax-highlighting/autogenerated/include/KSyntaxHighlighting/FoldingRegion
+diff --git a/src/libs/3rdparty/syntax-highlighting/autogenerated/src/lib/Format b/src/libs/3rdparty/syntax-highlighting/autogenerated/include/KSyntaxHighlighting/Format
+similarity index 100%
+rename from src/libs/3rdparty/syntax-highlighting/autogenerated/src/lib/Format
+rename to src/libs/3rdparty/syntax-highlighting/autogenerated/include/KSyntaxHighlighting/Format
+diff --git a/src/libs/3rdparty/syntax-highlighting/autogenerated/src/lib/Repository b/src/libs/3rdparty/syntax-highlighting/autogenerated/include/KSyntaxHighlighting/Repository
+similarity index 100%
+rename from src/libs/3rdparty/syntax-highlighting/autogenerated/src/lib/Repository
+rename to src/libs/3rdparty/syntax-highlighting/autogenerated/include/KSyntaxHighlighting/Repository
+diff --git a/src/libs/3rdparty/syntax-highlighting/autogenerated/src/lib/State b/src/libs/3rdparty/syntax-highlighting/autogenerated/include/KSyntaxHighlighting/State
+similarity index 100%
+rename from src/libs/3rdparty/syntax-highlighting/autogenerated/src/lib/State
+rename to src/libs/3rdparty/syntax-highlighting/autogenerated/include/KSyntaxHighlighting/State
+diff --git a/src/libs/3rdparty/syntax-highlighting/autogenerated/src/lib/SyntaxHighlighter b/src/libs/3rdparty/syntax-highlighting/autogenerated/include/KSyntaxHighlighting/SyntaxHighlighter
+similarity index 100%
+rename from src/libs/3rdparty/syntax-highlighting/autogenerated/src/lib/SyntaxHighlighter
+rename to src/libs/3rdparty/syntax-highlighting/autogenerated/include/KSyntaxHighlighting/SyntaxHighlighter
+diff --git a/src/libs/3rdparty/syntax-highlighting/autogenerated/src/lib/Theme b/src/libs/3rdparty/syntax-highlighting/autogenerated/include/KSyntaxHighlighting/Theme
+similarity index 100%
+rename from src/libs/3rdparty/syntax-highlighting/autogenerated/src/lib/Theme
+rename to src/libs/3rdparty/syntax-highlighting/autogenerated/include/KSyntaxHighlighting/Theme
+diff --git a/src/libs/3rdparty/syntax-highlighting/autogenerated/src/lib/WildcardMatcher b/src/libs/3rdparty/syntax-highlighting/autogenerated/include/KSyntaxHighlighting/WildcardMatcher
+similarity index 100%
+rename from src/libs/3rdparty/syntax-highlighting/autogenerated/src/lib/WildcardMatcher
+rename to src/libs/3rdparty/syntax-highlighting/autogenerated/include/KSyntaxHighlighting/WildcardMatcher
+diff --git a/src/libs/3rdparty/syntax-highlighting/patches/0003-Add-qmake-Qbs-files-and-files-generated-by-CMake.patch b/src/libs/3rdparty/syntax-highlighting/patches/0003-Add-qmake-Qbs-files-and-files-generated-by-CMake.patch
+index c35188f..2d74873 100644
+--- a/src/libs/3rdparty/syntax-highlighting/patches/0003-Add-qmake-Qbs-files-and-files-generated-by-CMake.patch
++++ b/src/libs/3rdparty/syntax-highlighting/patches/0003-Add-qmake-Qbs-files-and-files-generated-by-CMake.patch
+@@ -4,34 +4,34 @@ Date: Tue, 12 Feb 2019 19:45:08 +0100
+ Subject: [PATCH 3/6] Add qmake/Qbs files and files generated by CMake
+ 
+ ---
+- autogenerated/autogenerated.pri               |  9 ++
++ autogenerated/autogenerated.pri               | 10 +++
++ .../KSyntaxHighlighting/AbstractHighlighter   |  1 +
++ .../include/KSyntaxHighlighting/Definition    |  1 +
++ .../include/KSyntaxHighlighting/FoldingRegion |  1 +
++ .../include/KSyntaxHighlighting/Format        |  1 +
++ .../include/KSyntaxHighlighting/Repository    |  1 +
++ .../include/KSyntaxHighlighting/State         |  1 +
++ .../KSyntaxHighlighting/SyntaxHighlighter     |  1 +
++ .../include/KSyntaxHighlighting/Theme         |  1 +
+  autogenerated/ksyntaxhighlighting_version.h   | 12 +++
+- autogenerated/src/lib/AbstractHighlighter     |  1 +
+- autogenerated/src/lib/Definition              |  1 +
+- autogenerated/src/lib/FoldingRegion           |  1 +
+- autogenerated/src/lib/Format                  |  1 +
+- autogenerated/src/lib/Repository              |  1 +
+- autogenerated/src/lib/State                   |  1 +
+- autogenerated/src/lib/SyntaxHighlighter       |  1 +
+- autogenerated/src/lib/Theme                   |  1 +
+  .../src/lib/ksyntaxhighlighting_logging.cpp   | 11 +++
+  .../src/lib/ksyntaxhighlighting_logging.h     | 11 +++
+  data/data.pro                                 | 11 +++
+  src/lib/ksyntaxhighlighting_export.h          | 34 +++++++
+  syntax-highlighting.pro                       | 55 ++++++++++++
+- syntax-highlighting.qbs                       | 88 +++++++++++++++++++
++ syntax-highlighting.qbs                       | 90 +++++++++++++++++++
+  syntax-highlighting_dependencies.pri          |  3 +
+- 17 files changed, 242 insertions(+)
++ 17 files changed, 245 insertions(+)
+  create mode 100644 autogenerated/autogenerated.pri
++ create mode 100644 autogenerated/include/KSyntaxHighlighting/AbstractHighlighter
++ create mode 100644 autogenerated/include/KSyntaxHighlighting/Definition
++ create mode 100644 autogenerated/include/KSyntaxHighlighting/FoldingRegion
++ create mode 100644 autogenerated/include/KSyntaxHighlighting/Format
++ create mode 100644 autogenerated/include/KSyntaxHighlighting/Repository
++ create mode 100644 autogenerated/include/KSyntaxHighlighting/State
++ create mode 100644 autogenerated/include/KSyntaxHighlighting/SyntaxHighlighter
++ create mode 100644 autogenerated/include/KSyntaxHighlighting/Theme
+  create mode 100644 autogenerated/ksyntaxhighlighting_version.h
+- create mode 100644 autogenerated/src/lib/AbstractHighlighter
+- create mode 100644 autogenerated/src/lib/Definition
+- create mode 100644 autogenerated/src/lib/FoldingRegion
+- create mode 100644 autogenerated/src/lib/Format
+- create mode 100644 autogenerated/src/lib/Repository
+- create mode 100644 autogenerated/src/lib/State
+- create mode 100644 autogenerated/src/lib/SyntaxHighlighter
+- create mode 100644 autogenerated/src/lib/Theme
+  create mode 100644 autogenerated/src/lib/ksyntaxhighlighting_logging.cpp
+  create mode 100644 autogenerated/src/lib/ksyntaxhighlighting_logging.h
+  create mode 100644 data/data.pro
+@@ -42,10 +42,11 @@ Subject: [PATCH 3/6] Add qmake/Qbs files and files generated by CMake
+ 
+ diff --git a/autogenerated/autogenerated.pri b/autogenerated/autogenerated.pri
+ new file mode 100644
+-index 0000000..aee620a
++index 0000000..4121aaf
+ --- /dev/null
+ +++ b/autogenerated/autogenerated.pri
+-@@ -0,0 +1,9 @@
++@@ -0,0 +1,10 @@
+++INCLUDEPATH *= $$PWD/include
+ +INCLUDEPATH *= $$PWD/src/lib
+ +INCLUDEPATH *= $$PWD
+ +
+@@ -55,80 +56,80 @@ index 0000000..aee620a
+ +HEADERS +=  \
+ +    $$PWD/ksyntaxhighlighting_version.h \
+ +    $$PWD/src/lib/ksyntaxhighlighting_logging.h
+-diff --git a/autogenerated/ksyntaxhighlighting_version.h b/autogenerated/ksyntaxhighlighting_version.h
+-new file mode 100644
+-index 0000000..bd31a4d
+---- /dev/null
+-+++ b/autogenerated/ksyntaxhighlighting_version.h
+-@@ -0,0 +1,12 @@
+-+// This file was generated by ecm_setup_version(): DO NOT EDIT!
+-+
+-+#ifndef SyntaxHighlighting_VERSION_H
+-+#define SyntaxHighlighting_VERSION_H
+-+
+-+#define SyntaxHighlighting_VERSION_STRING "5.52.0"
+-+#define SyntaxHighlighting_VERSION_MAJOR 5
+-+#define SyntaxHighlighting_VERSION_MINOR 52
+-+#define SyntaxHighlighting_VERSION_PATCH 0
+-+#define SyntaxHighlighting_VERSION ((5<<16)|(52<<8)|(0))
+-+
+-+#endif
+-diff --git a/autogenerated/src/lib/AbstractHighlighter b/autogenerated/src/lib/AbstractHighlighter
++diff --git a/autogenerated/include/KSyntaxHighlighting/AbstractHighlighter b/autogenerated/include/KSyntaxHighlighting/AbstractHighlighter
+ new file mode 100644
+ index 0000000..b787873
+ --- /dev/null
+-+++ b/autogenerated/src/lib/AbstractHighlighter
+++++ b/autogenerated/include/KSyntaxHighlighting/AbstractHighlighter
+ @@ -0,0 +1 @@
+ +#include "abstracthighlighter.h"
+-diff --git a/autogenerated/src/lib/Definition b/autogenerated/src/lib/Definition
++diff --git a/autogenerated/include/KSyntaxHighlighting/Definition b/autogenerated/include/KSyntaxHighlighting/Definition
+ new file mode 100644
+ index 0000000..2c3241f
+ --- /dev/null
+-+++ b/autogenerated/src/lib/Definition
+++++ b/autogenerated/include/KSyntaxHighlighting/Definition
+ @@ -0,0 +1 @@
+ +#include "definition.h"
+-diff --git a/autogenerated/src/lib/FoldingRegion b/autogenerated/src/lib/FoldingRegion
++diff --git a/autogenerated/include/KSyntaxHighlighting/FoldingRegion b/autogenerated/include/KSyntaxHighlighting/FoldingRegion
+ new file mode 100644
+ index 0000000..005b829
+ --- /dev/null
+-+++ b/autogenerated/src/lib/FoldingRegion
+++++ b/autogenerated/include/KSyntaxHighlighting/FoldingRegion
+ @@ -0,0 +1 @@
+ +#include "foldingregion.h"
+-diff --git a/autogenerated/src/lib/Format b/autogenerated/src/lib/Format
++diff --git a/autogenerated/include/KSyntaxHighlighting/Format b/autogenerated/include/KSyntaxHighlighting/Format
+ new file mode 100644
+ index 0000000..b0d6a10
+ --- /dev/null
+-+++ b/autogenerated/src/lib/Format
+++++ b/autogenerated/include/KSyntaxHighlighting/Format
+ @@ -0,0 +1 @@
+ +#include "format.h"
+-diff --git a/autogenerated/src/lib/Repository b/autogenerated/src/lib/Repository
++diff --git a/autogenerated/include/KSyntaxHighlighting/Repository b/autogenerated/include/KSyntaxHighlighting/Repository
+ new file mode 100644
+ index 0000000..189dbc2
+ --- /dev/null
+-+++ b/autogenerated/src/lib/Repository
+++++ b/autogenerated/include/KSyntaxHighlighting/Repository
+ @@ -0,0 +1 @@
+ +#include "repository.h"
+-diff --git a/autogenerated/src/lib/State b/autogenerated/src/lib/State
++diff --git a/autogenerated/include/KSyntaxHighlighting/State b/autogenerated/include/KSyntaxHighlighting/State
+ new file mode 100644
+ index 0000000..e148d70
+ --- /dev/null
+-+++ b/autogenerated/src/lib/State
+++++ b/autogenerated/include/KSyntaxHighlighting/State
+ @@ -0,0 +1 @@
+ +#include "state.h"
+-diff --git a/autogenerated/src/lib/SyntaxHighlighter b/autogenerated/src/lib/SyntaxHighlighter
++diff --git a/autogenerated/include/KSyntaxHighlighting/SyntaxHighlighter b/autogenerated/include/KSyntaxHighlighting/SyntaxHighlighter
+ new file mode 100644
+ index 0000000..b429824
+ --- /dev/null
+-+++ b/autogenerated/src/lib/SyntaxHighlighter
+++++ b/autogenerated/include/KSyntaxHighlighting/SyntaxHighlighter
+ @@ -0,0 +1 @@
+ +#include "syntaxhighlighter.h"
+-diff --git a/autogenerated/src/lib/Theme b/autogenerated/src/lib/Theme
++diff --git a/autogenerated/include/KSyntaxHighlighting/Theme b/autogenerated/include/KSyntaxHighlighting/Theme
+ new file mode 100644
+ index 0000000..34a3e98
+ --- /dev/null
+-+++ b/autogenerated/src/lib/Theme
+++++ b/autogenerated/include/KSyntaxHighlighting/Theme
+ @@ -0,0 +1 @@
+ +#include "theme.h"
++diff --git a/autogenerated/ksyntaxhighlighting_version.h b/autogenerated/ksyntaxhighlighting_version.h
++new file mode 100644
++index 0000000..4336b19
++--- /dev/null
+++++ b/autogenerated/ksyntaxhighlighting_version.h
++@@ -0,0 +1,12 @@
+++// This file was generated by ecm_setup_version(): DO NOT EDIT!
+++
+++#ifndef SyntaxHighlighting_VERSION_H
+++#define SyntaxHighlighting_VERSION_H
+++
+++#define SyntaxHighlighting_VERSION_STRING "5.90.0"
+++#define SyntaxHighlighting_VERSION_MAJOR 5
+++#define SyntaxHighlighting_VERSION_MINOR 90
+++#define SyntaxHighlighting_VERSION_PATCH 0
+++#define SyntaxHighlighting_VERSION ((5<<16)|(90<<8)|(0))
+++
+++#endif
+ diff --git a/autogenerated/src/lib/ksyntaxhighlighting_logging.cpp b/autogenerated/src/lib/ksyntaxhighlighting_logging.cpp
+ new file mode 100644
+ index 0000000..4082ac4
+@@ -283,10 +284,10 @@ index 0000000..38127e1
+ +    src/lib/wildcardmatcher.cpp \
+ diff --git a/syntax-highlighting.qbs b/syntax-highlighting.qbs
+ new file mode 100644
+-index 0000000..248ebe0
++index 0000000..4f6de09
+ --- /dev/null
+ +++ b/syntax-highlighting.qbs
+-@@ -0,0 +1,88 @@
++@@ -0,0 +1,90 @@
+ +import qbs 1.0
+ +import qbs.File
+ +import qbs.FileInfo
+@@ -324,6 +325,7 @@ index 0000000..248ebe0
+ +        cpp.defines: base.concat("KSYNTAXHIGHLIGHTING_LIBRARY")
+ +        cpp.includePaths: [
+ +            product.sourceDirectory + "/src/lib/",
+++            product.sourceDirectory + "/autogenerated/include/",
+ +            product.sourceDirectory + "/autogenerated/src/lib/",
+ +            product.sourceDirectory + "/autogenerated/"
+ +        ]
+@@ -370,6 +372,7 @@ index 0000000..248ebe0
+ +            Depends { name: "cpp" }
+ +            cpp.includePaths: [
+ +                product.sourceDirectory + "/src/lib/",
+++                product.sourceDirectory + "/autogenerated/include/",
+ +                product.sourceDirectory + "/autogenerated/src/lib/",
+ +            ]
+ +        }
+diff --git a/src/libs/3rdparty/syntax-highlighting/syntax-highlighting.qbs b/src/libs/3rdparty/syntax-highlighting/syntax-highlighting.qbs
+index 82b5ea8..5dbb334 100644
+--- a/src/libs/3rdparty/syntax-highlighting/syntax-highlighting.qbs
++++ b/src/libs/3rdparty/syntax-highlighting/syntax-highlighting.qbs
+@@ -28,6 +28,7 @@ Project {
+         cpp.defines: base.concat("KF5SyntaxHighlighting_EXPORTS")
+         cpp.includePaths: [
+             product.sourceDirectory + "/src/lib/",
++            product.sourceDirectory + "/autogenerated/include/",
+             product.sourceDirectory + "/autogenerated/src/lib/",
+             product.sourceDirectory + "/autogenerated/"
+         ]
+@@ -122,6 +123,7 @@ Project {
+             Depends { name: "cpp" }
+             cpp.includePaths: [
+                 exportingProduct.sourceDirectory + "/src/lib/",
++                exportingProduct.sourceDirectory + "/autogenerated/include/",
+                 exportingProduct.sourceDirectory + "/autogenerated/src/lib/",
+             ]
+         }
+diff --git a/src/plugins/texteditor/highlighter.cpp b/src/plugins/texteditor/highlighter.cpp
+index 5a7cb01..50b8c6a 100644
+--- a/src/plugins/texteditor/highlighter.cpp
++++ b/src/plugins/texteditor/highlighter.cpp
+@@ -38,11 +38,11 @@
+ #include <utils/qtcassert.h>
+ #include <utils/stylehelper.h>
+ 
+-#include <DefinitionDownloader>
+-#include <FoldingRegion>
+-#include <Format>
+-#include <Repository>
+-#include <SyntaxHighlighter>
++#include <KSyntaxHighlighting/DefinitionDownloader>
++#include <KSyntaxHighlighting/FoldingRegion>
++#include <KSyntaxHighlighting/Format>
++#include <KSyntaxHighlighting/Repository>
++#include <KSyntaxHighlighting/SyntaxHighlighter>
+ 
+ #include <QLoggingCategory>
+ #include <QMetaEnum>
+diff --git a/src/plugins/texteditor/highlighter.h b/src/plugins/texteditor/highlighter.h
+index e18a67e..3127589 100644
+--- a/src/plugins/texteditor/highlighter.h
++++ b/src/plugins/texteditor/highlighter.h
+@@ -29,8 +29,8 @@
+ 
+ #include <utils/fileutils.h>
+ 
+-#include <AbstractHighlighter>
+-#include <Definition>
++#include <KSyntaxHighlighting/AbstractHighlighter>
++#include <KSyntaxHighlighting/Definition>
+ 
+ namespace TextEditor {
+ class TextDocument;
+diff --git a/src/plugins/texteditor/textdocumentlayout.h b/src/plugins/texteditor/textdocumentlayout.h
+index 69034bf..3bed9f7 100644
+--- a/src/plugins/texteditor/textdocumentlayout.h
++++ b/src/plugins/texteditor/textdocumentlayout.h
+@@ -32,7 +32,7 @@
+ 
+ #include <utils/id.h>
+ 
+-#include <State>
++#include <KSyntaxHighlighting/State>
+ 
+ #include <QTextBlockUserData>
+ #include <QPlainTextDocumentLayout>
+
diff --git a/qt-creator.spec b/qt-creator.spec
new file mode 100644
index 0000000000..2a4a8514b1
--- /dev/null
+++ b/qt-creator.spec
@@ -0,0 +1,522 @@
+%define _unpackaged_files_terminate_build 1
+
+%def_with ClangCodeModel
+%define llvm_version 12.0
+%define qt_version 5.15.2
+
+%add_findreq_skiplist  %_datadir/qtcreator/*
+%add_findprov_skiplist %_datadir/qtcreator/*
+
+Name:    qt-creator
+Version: 7.0.2
+Release: alt2
+
+Summary: Cross-platform IDE for Qt
+License: GPL-3.0 with Qt-GPL-exception-1.0 and MIT and LGPL-2.0 and LGPL-2.1 and LGPL-3.0 and BSD-3-Clause and BSL-1.0 and ALT-Public-Domain
+Group:   Development/Tools
+
+Url:     http://qt-project.org/wiki/Category:Tools::QtCreator
+Packager: Andrey Cherepanov <cas@altlinux.org>
+
+ExcludeArch: %not_qt5_qtwebengine_arches
+
+Source:  %name-%version.tar
+# VCS:   git://code.qt.io/qt-creator/qt-creator.git
+Source1: qbs.tar
+Source2: perfparser.tar
+
+Patch0: %name-%version-%release.patch
+Patch1: 0001-Correctly-include-KSyntaxHighlighting-headers.patch
+
+Provides: qtcreator = %EVR
+Obsoletes: qtcreator-clangcodemodel
+Provides: qtcreator-clangcodemodel = %EVR
+
+BuildRequires(pre): cmake
+BuildRequires(pre): rpm-build-ninja
+BuildRequires(pre): qt5-base-devel >= %qt_version
+BuildRequires(pre): rpm-build-python3
+BuildRequires(pre): rpm-macros-qt5-webengine
+BuildRequires: gcc-c++
+BuildRequires: qt5-designer >= %qt_version
+BuildRequires: qt5-script-devel >= %qt_version
+BuildRequires: qt5-declarative-devel >= %qt_version
+%ifnarch %e2k
+# NB: there's rpm-macros-qt5-webengine out there
+BuildRequires: qt5-webkit-devel >= %qt_version
+%endif
+BuildRequires: qt5-x11extras-devel >= %qt_version
+BuildRequires: qt5-xmlpatterns-devel >= %qt_version
+BuildRequires: qt5-tools-devel >= %qt_version
+BuildRequires: qt5-serialport-devel
+BuildRequires: qt5-webengine-devel >= %qt_version
+BuildRequires: qt5-svg-devel >= %qt_version
+BuildRequires: qt5-quickcontrols2-devel
+BuildRequires: kf5-syntax-highlighting-devel
+%if_with ClangCodeModel
+BuildRequires: clang%llvm_version
+BuildRequires: clang%llvm_version-devel
+BuildRequires: clang%llvm_version-devel-static
+BuildRequires: clang%llvm_version-tools
+BuildRequires: clangd%llvm_version
+BuildRequires: lld%llvm_version
+BuildRequires: llvm%llvm_version-devel
+BuildRequires: llvm%llvm_version-devel-static
+BuildRequires: llvm%llvm_version-tools
+%endif
+BuildRequires: libsystemd-devel
+BuildRequires: elfutils-devel
+BuildRequires: libzstd-devel
+BuildRequires: zlib-devel
+# Qbs documentation
+#BuildRequires: python3-module-lxml
+#BuildRequires: python3-module-bs4
+# Missing build requirements
+#BuildRequires: litehtml-devel
+
+Requires: %name-core = %EVR
+# Add Qt5 build environment to build Qt project
+Requires: qt5-base-devel
+Requires: qt5-tools
+
+%ifarch %e2k
+# error: cpio archive too big - 4446M
+%global __find_debuginfo_files %nil
+%endif
+
+%description
+Qt Creator (previously known as Project Greenhouse) is a new, lightweight,
+cross-platform integrated  development environment (IDE) designed to make
+development with the Qt application framework even faster and easier.
+
+This package contains IDE and Qt5 build environment.
+
+%package core
+Summary: Cross-platform IDE for Qt
+Group:   Development/Tools
+Requires: %name-data = %EVR
+Provides: qbs = 1.14.0
+Obsoletes: qbs < 1.14.0
+Requires: qt5-quickcontrols
+Requires: qt5-translations
+
+%description core
+Qt Creator (previously known as Project Greenhouse) is a new, lightweight,
+cross-platform integrated  development environment (IDE) designed to make
+development with the Qt application framework even faster and easier.
+
+This is core part of IDE without Qt5 build environment.
+
+%package doc
+Summary: %name docs
+Group: Documentation
+%ifnarch %not_qt5_qtwebengine_arches
+Requires: %name
+%endif
+Requires: qt5-base-doc
+Requires: qt5-tools
+
+%description doc
+Documentation for %name
+
+%package data
+Summary: Data files for %name
+Group: Development/Tools
+%ifnarch %not_qt5_qtwebengine_arches
+Requires: %name-core = %EVR
+%endif
+
+%description data
+Data files for %name
+
+%prep
+%setup
+# Unpack submodules content
+tar xf %SOURCE1
+tar xf %SOURCE2
+#sed -i 's,tools\/qdoc3,bin,' doc/doc.pri
+#subst 's,share\/doc\/qtcreator,share\/qtcreator\/doc,' doc/doc.pri src/plugins/help/helpplugin.cpp
+%patch0 -p1
+%patch1 -p1
+%ifarch %e2k
+# strip UTF-8 BOM, lcc 1.23 won't ignore it yet
+find src -type f -print0 -name '*.cpp' -o -name '*.h' |
+	xargs -r0 sed -ri 's,^\xEF\xBB\xBF,,'
+%endif
+# Use Python3 for Python scripts
+subst 's@#!.*python[23]\?@#!%__python3@' `find . -name \*.py` \
+	src/shared/qbs/src/3rdparty/python/bin/dmgbuild \
+	src/libs/qt-breakpad/qtbreakpadsymbols
+
+%build
+%global optflags_lto %optflags_lto -ffat-lto-objects
+export QTDIR=%_qt5_prefix
+export PATH="%{_qt5_bindir}:$PATH"
+export ALTWRAP_LLVM_VERSION="%llvm_version"
+%ifarch %e2k
+# fool sqlite into building with lcc
+sed -i 's,^QMAKE_CFLAGS_WARN_ON.*$,& -D__INTEL_COMPILER,' src/libs/3rdparty/sqlite/sqlite.pri
+%endif
+%if_with ClangCodeModel
+export LLVM_INSTALL_DIR="%_prefix"
+%remove_optflags -frecord-gcc-switches
+%endif
+
+%cmake -GNinja \
+    -Wno-dev \
+    -DWITH_DOCS=ON \
+    -Djournald=ON \
+    -DBUILD_DEVELOPER_DOCS=OFF \
+    -DCMAKE_INSTALL_LIBDIR=%_lib \
+    -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS -Wl,-rpath,%_libdir/qtcreator -Wl,-rpath,%_libdir/qtcreator/plugins" \
+    -DCMAKE_SHARED_LINKER_FLAGS="$LDFLAGS -Wl,-rpath,%_libdir/qtcreator -Wl,-rpath,%_libdir/qtcreator/plugins"
+
+%ninja_build -C "%_cmake__builddir"
+%ninja_build -C "%_cmake__builddir" qch_docs
+
+%install
+%ninja_install -C "%_cmake__builddir"
+# Unable to install documentstion using ninja-build
+#%%ninja_install -C "%_cmake__builddir" qch_docs
+install -Dpm0644 %_cmake__builddir/share/doc/qtcreator/qtcreator.qch %buildroot%_defaultdocdir/qtcreator/qtcreator.qch
+
+# Remove Windows cdb debugger support to prevent unmet python2.7(cdbext)
+rm -f %buildroot%_datadir/qtcreator/debugger/cdbbridge.py
+
+%files
+
+%files core
+%doc README* LICENSE*
+%_bindir/*
+%_libdir/qtcreator
+%_prefix/libexec/qtcreator
+%_iconsdir/hicolor/*/apps/QtProject-qtcreator.png
+%_desktopdir/*.desktop
+%_datadir/metainfo/*.xml
+
+%files doc
+%_defaultdocdir/qtcreator
+
+%files data
+%dir %_datadir/qtcreator
+%_datadir/qtcreator/*
+
+%changelog
+* Thu Jun 09 2022 Andrey Cherepanov <cas@altlinux.org> 7.0.2-alt2
+- Correctly include KSyntaxHighlighting headers (patch from OpenSUSE) (ALT #42956).
+
+* Wed May 25 2022 Andrey Cherepanov <cas@altlinux.org> 7.0.2-alt1
+- New version.
+
+* Thu Apr 28 2022 Andrey Cherepanov <cas@altlinux.org> 7.0.1-alt1
+- New version.
+
+* Fri Mar 25 2022 Andrey Cherepanov <cas@altlinux.org> 7.0.0-alt1
+- New version.
+
+* Fri Feb 18 2022 Sergey V Turchin <zerg@altlinux.org> 6.0.2-alt3
+- using not_qt5_qtwebengine_arches macro
+
+* Tue Feb 01 2022 Sergey V Turchin <zerg@altlinux.org> 6.0.2-alt2
+- fix requires
+
+* Tue Feb 01 2022 Andrey Cherepanov <cas@altlinux.org> 6.0.2-alt1
+- New version.
+
+* Mon Jan 31 2022 Sergey V Turchin <zerg@altlinux.org> 6.0.1-alt2
+- build according qtwebengine arches
+
+* Tue Dec 21 2021 Andrey Cherepanov <cas@altlinux.org> 6.0.1-alt1
+- New version.
+
+* Mon Dec 06 2021 Andrey Cherepanov <cas@altlinux.org> 6.0.0-alt1
+- New version.
+
+* Fri Nov 05 2021 Andrey Cherepanov <cas@altlinux.org> 5.0.3-alt1
+- New version.
+
+* Sun Oct 03 2021 Andrey Cherepanov <cas@altlinux.org> 5.0.2-alt1
+- New version.
+
+* Thu Sep 16 2021 Andrey Cherepanov <cas@altlinux.org> 5.0.1-alt1
+- New version.
+
+* Mon Aug 30 2021 Andrey Cherepanov <cas@altlinux.org> 5.0.0-alt2
+- Set ALTWRAP_LLVM_VERSION to select correct LLVM version.
+
+* Fri Aug 27 2021 Andrey Cherepanov <cas@altlinux.org> 5.0.0-alt1
+- New version (ALT #40822).
+- Build using ninja-build.
+
+* Wed Jul 14 2021 Andrey Cherepanov <cas@altlinux.org> 4.15.2-alt1
+- New version.
+
+* Tue Jun 15 2021 Andrey Cherepanov <cas@altlinux.org> 4.15.1-alt2
+- Package core part separately as qt-creator-core (ALT #40219).
+
+* Thu Jun 10 2021 Andrey Cherepanov <cas@altlinux.org> 4.15.1-alt1
+- New version.
+- Build by LLVM 12.0.
+
+* Thu May 06 2021 Andrey Cherepanov <cas@altlinux.org> 4.15.0-alt1
+- New version.
+
+* Mon Mar 22 2021 Andrey Cherepanov <cas@altlinux.org> 4.14.2-alt1
+- New version.
+
+* Thu Feb 25 2021 Andrey Cherepanov <cas@altlinux.org> 4.14.1-alt1
+- New version.
+
+* Mon Dec 21 2020 Andrey Cherepanov <cas@altlinux.org> 4.14.0-alt1
+- New version.
+- Add qt5-base-doc to qt-creator-doc requirements.
+
+* Fri Nov 20 2020 Andrey Cherepanov <cas@altlinux.org> 4.13.3-alt1
+- New version.
+
+* Sun Oct 04 2020 Andrey Cherepanov <cas@altlinux.org> 4.13.2-alt1
+- New version.
+
+* Thu Sep 17 2020 Andrey Cherepanov <cas@altlinux.org> 4.13.1-alt1
+- New version.
+
+* Mon Sep 14 2020 Andrey Cherepanov <cas@altlinux.org> 4.13.0-alt3
+- Update Russian translations from upstream.
+
+* Tue Sep 08 2020 Andrey Cherepanov <cas@altlinux.org> 4.13.0-alt2
+- Add changelog entry from p9 branch.
+
+* Thu Sep 03 2020 Andrey Cherepanov <cas@altlinux.org> 4.13.0-alt1
+- New version.
+- Enable journald support.
+
+* Thu Jul 09 2020 Andrey Cherepanov <cas@altlinux.org> 4.12.4-alt0.1.p9
+- Backport new version to p9 branch.
+
+* Thu Jul 09 2020 Andrey Cherepanov <cas@altlinux.org> 4.12.4-alt1
+- New version.
+
+* Thu Jun 18 2020 Andrey Cherepanov <cas@altlinux.org> 4.12.3-alt1
+- New version.
+
+* Wed Jun 03 2020 Andrey Cherepanov <cas@altlinux.org> 4.12.2-alt1
+- New version.
+
+* Thu May 28 2020 Andrey Cherepanov <cas@altlinux.org> 4.12.1-alt2
+- Build with LLVM 10.0.
+
+* Wed May 20 2020 Andrey Cherepanov <cas@altlinux.org> 4.12.1-alt1
+- New version.
+
+* Tue Apr 28 2020 Andrey Cherepanov <cas@altlinux.org> 4.12.0-alt1
+- New stable version.
+
+* Mon Apr 13 2020 Andrey Cherepanov <cas@altlinux.org> 4.12.0-alt0.1.rc1
+- New version (RC1).
+
+* Sat Apr 04 2020 Andrey Cherepanov <cas@altlinux.org> 4.11.2-alt1
+- New version.
+- Build with ClangCodeModel plugin.
+
+* Wed Feb 12 2020 Andrey Cherepanov <cas@altlinux.org> 4.11.1-alt2
+- Add Russian localization to desktop file (ALT #36851).
+
+* Fri Feb 07 2020 Andrey Cherepanov <cas@altlinux.org> 4.11.1-alt1
+- New version.
+
+* Mon Dec 16 2019 Andrey Cherepanov <cas@altlinux.org> 4.11.0-alt1
+- New version.
+- Build without ClangCodeModel due to the lack of LLVM 8.x in repository.
+- Fix license.
+- Set python3 as interpreter of Python scripts.
+
+* Fri Nov 08 2019 Andrey Cherepanov <cas@altlinux.org> 4.9.2-alt4
+- Add to requirements qt5-tran slations and qt5-tools.
+
+* Fri Nov 01 2019 Andrey Cherepanov <cas@altlinux.org> 4.9.2-alt3
+- Add Qt5 build environment to build Qt project (ALT #37403).
+
+* Wed Oct 02 2019 Michael Shigorin <mike@altlinux.org> 4.9.2-alt2
+- E2K:
+  + fix build with dummy-qt5-webkit-devel dropped
+  + fix BOM oneliner according to Secure Packaging Policy
+- Added explicit BR: qt5-declarative-devel.
+- Minor spec cleanup.
+
+* Mon Jul 01 2019 Andrey Cherepanov <cas@altlinux.org> 4.9.2-alt1
+- New version.
+
+* Tue Jun 18 2019 Andrey Cherepanov <cas@altlinux.org> 4.9.1-alt2
+- Build qbsprojectmanager plugin with bundled qbs (ALT #36917).
+- Use ALT-specific Qt5 utilities names.
+- Build perfparser from submodule.
+
+* Thu May 30 2019 Andrey Cherepanov <cas@altlinux.org> 4.9.1-alt1
+- New version.
+
+* Sun May 05 2019 Michael Shigorin <mike@altlinux.org> 4.9.0-alt2.1
+- E2K: fix build (and disable overly large debuginfo subpackage)
+
+* Mon Apr 22 2019 Aleksei Nikiforov <darktemplar@altlinux.org> 4.9.0-alt2
+- Updated build dependencies: libbotan is no longer required.
+
+* Tue Apr 16 2019 Andrey Cherepanov <cas@altlinux.org> 4.9.0-alt1
+- New version (ALT #36600).
+
+* Wed Mar 06 2019 Andrey Cherepanov <cas@altlinux.org> 4.8.2-alt1
+- New version.
+
+* Thu Jan 17 2019 Andrey Cherepanov <cas@altlinux.org> 4.8.1-alt1
+- New version.
+
+* Fri Dec 07 2018 Andrey Cherepanov <cas@altlinux.org> 4.8.0-alt1
+- New version.
+
+* Wed Oct 31 2018 Andrey Cherepanov <cas@altlinux.org> 4.7.2-alt1
+- New version.
+
+* Fri Sep 21 2018 Aleksei Nikiforov <darktemplar@altlinux.org> 4.7.1-alt1
+- Updated to upstream version 4.7.1.
+- Updated runtime dependencies.
+
+* Tue Sep 04 2018 Aleksei Nikiforov <darktemplar@altlinux.org> 4.7.0-alt1
+- Updated to upstream version 4.7.0.
+- Applied patch from upstream for supporting libbotan-2.
+- Removed clangcodemodel subpackage.
+- Spec cleanup.
+
+* Mon Jun 11 2018 Andrey Cherepanov <cas@altlinux.org> 4.6.2-alt1
+- New version.
+
+* Thu May 03 2018 Andrey Cherepanov <cas@altlinux.org> 4.6.1-alt1
+- New version.
+
+* Tue Apr 10 2018 Aleksei Nikiforov <darktemplar@altlinux.org> 4.6.0-alt1
+- Updated to upstream version 4.6.0.
+- Added debuginfo (Closes: #34153).
+- Enabled parallel build.
+
+* Sat Oct 14 2017 Andrey Cherepanov <cas@altlinux.org> 4.4.1-alt2
+- Package ClangCodeModel (ALT #33943)
+
+* Fri Oct 06 2017 Andrey Cherepanov <cas@altlinux.org> 4.4.1-alt1
+- New version
+- Add optional build ClangCodeModel plugin (disabled by default)
+
+* Thu Sep 07 2017 Andrey Cherepanov <cas@altlinux.org> 4.4.0-alt1
+- New version
+
+* Sat Jul 01 2017 Andrey Cherepanov <cas@altlinux.org> 4.3.1-alt1
+- New version
+
+* Thu May 25 2017 Andrey Cherepanov <cas@altlinux.org> 4.3.0-alt1
+- New version
+
+* Sun Apr 23 2017 Andrey Cherepanov <cas@altlinux.org> 4.2.2-alt1
+- New version
+
+* Tue Jan 24 2017 Andrey Cherepanov <cas@altlinux.org> 4.2.1-alt1
+- new version 4.2.1
+
+* Sat Dec 17 2016 Andrey Cherepanov <cas@altlinux.org> 4.2.0-alt1
+- new version 4.2.0
+- provides qtcreator
+- remove Windows cdb debugger support to prevent unmet python2.7(cdbext)
+
+* Fri Aug 26 2016 Andrey Cherepanov <cas@altlinux.org> 4.1.0-alt1
+- new version 4.1.0
+
+* Sun Jun 19 2016 Andrey Cherepanov <cas@altlinux.org> 4.0.2-alt1
+- new version 4.0.2
+
+* Fri Jun 10 2016 Andrey Cherepanov <cas@altlinux.org> 4.0.1-alt1
+- new version 4.0.1
+
+* Fri May 13 2016 Andrey Cherepanov <cas@altlinux.org> 4.0.0-alt1
+- New version
+
+* Tue Mar 29 2016 Sergey V Turchin <zerg@altlinux.org> 3.6.0-alt1.1
+- NMU: Rebuild with new Qt5
+
+* Mon Dec 28 2015 Andrey Cherepanov <cas@altlinux.org> 3.6.0-alt1
+- New version
+- Build with Qt5 (closes #31175)
+
+* Fri Feb 07 2014 Evgeny Sinelnikov <sin@altlinux.ru> 3.0.1-alt1
+- update to newest version with multiple improvements
+
+* Sun Feb 02 2014 Evgeny Sinelnikov <sin@altlinux.ru> 2.8.1-alt1
+- update to new version (closes #29569)
+
+* Thu Apr 11 2013 Anatoly Lyutin <vostok@altlinux.org> 2.7.0-alt1
+- new version (closes #28740)
+
+* Tue Dec 18 2012 Anatoly Lyutin <vostok@altlinux.org> 2.6.0-alt2
+- true 2.6.0 (closes #28152)
+
+* Mon Nov 26 2012 Anatoly Lyutin <vostok@altlinux.org> 2.6.0-alt1
+- new version (closes #27938)
+
+* Fri May 11 2012 Anatoly Lyutin <vostok@altlinux.org> 2.5.0-alt1
+- new version
+
+* Mon Jan 09 2012 Anatoly Lyutin <vostok@altlinux.org> 2.4.0-alt1
+- new version
+
+* Sat Oct 22 2011 Vitaly Kuznetsov <vitty@altlinux.ru> 2.3.0-alt1.1
+- Rebuild with Python-2.7
+
+* Thu Sep 22 2011 Anatoly Lyutin <vostok@altlinux.org> 2.3.0-alt1
+- new version (closes #26219)
+
+* Fri Aug 05 2011 Anatoly Lyutin <vostok@altlinux.org> 2.2.1-alt1
+- new version
+
+* Mon Jun 06 2011 Anatoly Lyutin <vostok@altlinux.org> 2.2.0-alt1
+- update to 2.2.0
+
+* Fri Mar 04 2011 Anatoly Lyutin <vostok@altlinux.org> 2.1.0-alt1
+- update to 2.1.0
+
+* Wed Jul 28 2010 Anatoly Lyutin <vostok@altlinux.org> 2.0.0-alt1
+- update to 2.0.0
+
+* Mon Mar 01 2010 Boris Savelev <boris@altlinux.org> 1.3.1-alt1
+- new version
+
+* Tue Dec 15 2009 Boris Savelev <boris@altlinux.org> 1.3.0-alt1
+- new version (closes: #22547)
+
+* Sun Aug 30 2009 Boris Savelev <boris@altlinux.org> 1.2.1-alt3.g26a3a3e
+- build from upstream git
+
+* Wed Aug 05 2009 Boris Savelev <boris@altlinux.org> 1.2.1-alt2.g0dbe82f
+- new version
+
+* Thu Jul 16 2009 Boris Savelev <boris@altlinux.org> 1.2.1-alt1.gba2a5a6
+- new version
+
+* Tue Jun 30 2009 Boris Savelev <boris@altlinux.org> 1.2.0-alt2.g6315f14
+- build from upstream git
+- add translations (closes:#20605)
+
+* Fri Jun 26 2009 Boris Savelev <boris@altlinux.org> 1.2.0-alt1.g934ee44
+- version up
+
+* Mon May 25 2009 Boris Savelev <boris@altlinux.org> 1.1.0-alt6.gcf7cd73
+- add %_bindir/qtcreator_process_stub (fix #20171)
+
+* Mon May 11 2009 Boris Savelev <boris@altlinux.org> 1.1.0-alt5.gcf7cd73
+- build from upstream git
+
+* Sun May 03 2009 Boris Savelev <boris@altlinux.org> 1.1.0-alt4.ga1dc8f5
+- build from upstream git
+
+* Tue Apr 28 2009 Boris Savelev <boris@altlinux.org> 1.1.0-alt3.git.124.g092d8ca
+- build from upstream git
+
+* Tue Apr 28 2009 Boris Savelev <boris@altlinux.org> 1.1.0-alt2
+- build doc (fix #19799)
+
+* Thu Apr 23 2009 Boris Savelev <boris@altlinux.org> 1.1.0-alt1
+- initial build for Sisyphus from Fedora
diff --git a/share/applications/org.qt-project.qtcreator.desktop b/share/applications/org.qt-project.qtcreator.desktop
index 034721891d..0a9b224587 100644
--- a/share/applications/org.qt-project.qtcreator.desktop
+++ b/share/applications/org.qt-project.qtcreator.desktop
@@ -3,6 +3,7 @@ Type=Application
 Exec=qtcreator %F
 Name=Qt Creator
 GenericName=C++ IDE for developing Qt applications
+GenericName[ru]=Среда разработки приложений на Qt
 X-KDE-StartupNotify=true
 Icon=QtProject-qtcreator
 StartupWMClass=qtcreator
diff --git a/src/share/qtcreator/externaltools/lrelease.xml b/src/share/qtcreator/externaltools/lrelease.xml
index f35d6d8186..639cee3405 100644
--- a/src/share/qtcreator/externaltools/lrelease.xml
+++ b/src/share/qtcreator/externaltools/lrelease.xml
@@ -32,8 +32,8 @@
     <category>Linguist</category>
     <order>2</order>
     <executable>
+        <path>lrelease-qt5</path>
         <path>%{CurrentDocument:Project:QT_INSTALL_BINS}/lrelease</path>
-        <path>lrelease</path>
         <arguments>%{CurrentDocument:Project:FilePath}</arguments>
         <workingdirectory>%{CurrentDocument:Project:Path}</workingdirectory>
         <baseEnvironmentId>CurrentDocument:Project:BuildConfig:Env</baseEnvironmentId>
diff --git a/src/share/qtcreator/externaltools/lupdate.xml b/src/share/qtcreator/externaltools/lupdate.xml
index 693d2c0601..3e01bb0401 100644
--- a/src/share/qtcreator/externaltools/lupdate.xml
+++ b/src/share/qtcreator/externaltools/lupdate.xml
@@ -32,8 +32,8 @@
     <category>Linguist</category>
     <order>1</order>
     <executable>
+        <path>lupdate-qt5</path>
         <path>%{CurrentDocument:Project:QT_INSTALL_BINS}/lupdate</path>
-        <path>lupdate</path>
         <arguments>%{CurrentDocument:Project:FilePath}</arguments>
         <workingdirectory>%{CurrentDocument:Project:Path}</workingdirectory>
         <baseEnvironmentId>CurrentDocument:Project:BuildConfig:Env</baseEnvironmentId>
diff --git a/src/share/qtcreator/externaltools/qmlscene.xml b/src/share/qtcreator/externaltools/qmlscene.xml
index a414a3f7cb..082d06368e 100644
--- a/src/share/qtcreator/externaltools/qmlscene.xml
+++ b/src/share/qtcreator/externaltools/qmlscene.xml
@@ -32,8 +32,8 @@
     <category>Qt Quick</category>
     <order>1</order>
     <executable>
+        <path>qmlscene-qt5</path>
         <path>%{CurrentDocument:Project:QT_INSTALL_BINS}/qmlscene</path>
-        <path>qmlscene</path>
         <arguments>%{CurrentDocument:FilePath}</arguments>
         <workingdirectory>%{CurrentDocument:Path}</workingdirectory>
         <environment>QT_LOGGING_TO_CONSOLE%3D1</environment>
 
design & coding: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
current maintainer: Michael Shigorin