svn commit: r417439 - in head/devel/qtcreator: . files

[Kurt Jaeger]

Author: pi
Date: Fri Jun 24 18:05:02 2016
New Revision: 417439
URL: https://svnweb.freebsd.org/changeset/ports/417439

Log:
  devel/qtcreator: fix crashes under certain circumstances
  
  A regression was detected that causes crashes under certain conditions.
  This is fixed by
  
  https://codereview.qt-project.org/#/c/163443/
  
  incorporated with this updated patchset.
  
  PR:		210530
  Submitted by:	Ralf Nolden <nolden at kde.org> (kde)

Modified:
  head/devel/qtcreator/Makefile
  head/devel/qtcreator/files/patch-src_plugins_projectexplorer_runconfiguration.h

Modified: head/devel/qtcreator/Makefile
==============================================================================
--- head/devel/qtcreator/Makefile	Fri Jun 24 17:08:42 2016	(r417438)
+++ head/devel/qtcreator/Makefile	Fri Jun 24 18:05:02 2016	(r417439)
@@ -3,6 +3,7 @@
 
 PORTNAME=	qtcreator
 DISTVERSION=	4.0.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION}
 DISTNAME=	qt-creator-opensource-src-${DISTVERSION}

Modified: head/devel/qtcreator/files/patch-src_plugins_projectexplorer_runconfiguration.h
==============================================================================
--- head/devel/qtcreator/files/patch-src_plugins_projectexplorer_runconfiguration.h	Fri Jun 24 17:08:42 2016	(r417438)
+++ head/devel/qtcreator/files/patch-src_plugins_projectexplorer_runconfiguration.h	Fri Jun 24 18:05:02 2016	(r417439)
@@ -1,4 +1,4 @@
---- src/plugins/projectexplorer/runconfiguration.h.orig	2016-06-21 13:37:35 UTC
+--- src/plugins/projectexplorer/runconfiguration.h.orig	2016-06-24 12:44:00 UTC
 +++ src/plugins/projectexplorer/runconfiguration.h
 @@ -159,6 +159,7 @@ public:
      virtual ~ClonableConcept() = default;
@@ -8,7 +8,7 @@
  };
  
  template <class T>
-@@ -168,11 +169,14 @@ public:
+@@ -168,11 +169,16 @@ public:
      ClonableModel(const T &data) : m_data(data) { }
      ~ClonableModel() Q_DECL_NOEXCEPT { } // gcc 4.7.3
      ClonableConcept *clone() const override { return new ClonableModel(*this); }
@@ -18,6 +18,8 @@
      {
 -        auto that = dynamic_cast<const ClonableModel<T> *>(other.get());
 -        return that && m_data == that->m_data;
++        if (!other.get())
++            return false;
 +        if (other->typeId() != typeId())
 +            return false;
 +        auto that = static_cast<const ClonableModel<T> *>(other.get());
@@ -25,7 +27,7 @@
      }
  
      T m_data;
-@@ -189,7 +193,7 @@ public:
+@@ -189,7 +195,7 @@ public:
      void operator=(Runnable other) { d = std::move(other.d); }
  
      template <class T> bool is() const {
@@ -34,7 +36,7 @@
      }
  
      template <class T> const T &as() const {
-@@ -213,7 +217,7 @@ public:
+@@ -213,7 +219,7 @@ public:
      void operator=(Connection other) { d = std::move(other.d); }
  
      template <class T> bool is() const {