[SCM] qtcreator packaging branch, master, updated. debian/4.2.0-1-14-ge06d8b1
Adam Majer
adamm at moszumanska.debian.org
Tue Jul 11 18:25:08 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtcreator.git;a=commitdiff;h=06a5c96
The following commit has been merged in the master branch:
commit 06a5c96ddd579a698cc79cfa78f6ddb7b70fcce3
Author: Adam Majer <adamm at zombino.com>
Date: Tue Jul 11 09:30:34 2017 +0000
Bump QBS dependency
It seems QBS changed API once more, making the
qbs_set.diff patch obsolete :/
---
debian/changelog | 2 +-
debian/control | 2 +-
debian/patches/qbs_set.diff | 34 ----------------------------------
debian/patches/series | 1 -
4 files changed, 2 insertions(+), 37 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e4139eb..9564bb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,8 @@ qtcreator (4.3.1-1) UNRELEASED; urgency=medium
+ Fix memory leak in code completion
+ Fix crash when requesting refactoring on invalid C++ code
* Remove qtscript5-private-dev as a BuildDepend
+ * Bump QBS dependency to 1.8.1
* remove_libexec.diff: refreshed
- * qbs_set.diff: fix compilation with Qt 4.7.1
* fix_documentation_path.diff: re-add. We are putting compiled
documentation in compiled directory instead of human readable
documentation directory
diff --git a/debian/control b/debian/control
index c6a5161..6001316 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 9),
libqt5webkit5-dev (>= 5.6.0~),
libqt5x11extras5-dev (>= 5.6.0~),
pkg-config,
- qbs-dev (>= 1.7.0~),
+ qbs-dev (>= 1.8.1~),
qml-module-qtquick2 (>= 5.6.0~),
qtbase5-dev (>= 5.6.0~),
qtbase5-private-dev (>= 5.6.0~),
diff --git a/debian/patches/qbs_set.diff b/debian/patches/qbs_set.diff
deleted file mode 100644
index 606ed73..0000000
--- a/debian/patches/qbs_set.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Author: Adam Majer <adamm at zombino.com>
-Date: Thu Jul 6 01:04:24 CEST 2017
-Summary: Compilation fails with Qt 4.7.1 otherwise
-
---- a/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp
-+++ b/src/plugins/qbsprojectmanager/qbsnodetreebuilder.cpp
-@@ -189,11 +189,11 @@ QStringList unreferencedBuildSystemFiles
- {
- QStringList result;
- if (!p.isValid())
- return result;
-
-- const std::set<QString> &available = p.buildSystemFiles();
-+ const QSet<QString> &available = p.buildSystemFiles();
- QList<QString> referenced = referencedBuildSystemFiles(p.projectData()).toList();
- Utils::sort(referenced);
- std::set_difference(available.begin(), available.end(), referenced.begin(), referenced.end(),
- std::back_inserter(result));
- return result;
---- a/src/plugins/qbsprojectmanager/qbsproject.cpp
-+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
-@@ -408,11 +408,11 @@ bool QbsProject::checkCancelStatus()
- m_qbsProjectParser = 0;
- parseCurrentBuildConfiguration();
- return true;
- }
-
--static QSet<QString> toQStringSet(const std::set<QString> &src)
-+static QSet<QString> toQStringSet(const QSet<QString> &src)
- {
- QSet<QString> result;
- result.reserve(int(src.size()));
- std::copy(src.begin(), src.end(), Utils::inserter(result));
- return result;
diff --git a/debian/patches/series b/debian/patches/series
index 388fc59..3299899 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,5 +7,4 @@ always_autotect_qt_versions
fix_qt_version_autodetection.diff
missing_header.diff
remove_libexec.diff
-qbs_set.diff
fix_documentation_path.diff
--
qtcreator packaging
More information about the pkg-kde-commits
mailing list