Index: head/devel/qtcreator/files/patch-src_plugins_android_androiddevice.cpp =================================================================== --- head/devel/qtcreator/files/patch-src_plugins_android_androiddevice.cpp (revision 418339) +++ head/devel/qtcreator/files/patch-src_plugins_android_androiddevice.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/plugins/android/androiddevice.cpp.orig 2016-06-21 13:37:35 UTC -+++ src/plugins/android/androiddevice.cpp -@@ -27,6 +27,8 @@ - #include "androidconstants.h" - #include "androidsignaloperation.h" - -+#include -+ - #include - - using namespace ProjectExplorer; Property changes on: head/devel/qtcreator/files/patch-src_plugins_android_androiddevice.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/qtcreator/files/patch-src_plugins_debugger_analyzer_analyzerstartparameters.h =================================================================== --- head/devel/qtcreator/files/patch-src_plugins_debugger_analyzer_analyzerstartparameters.h (revision 418339) +++ head/devel/qtcreator/files/patch-src_plugins_debugger_analyzer_analyzerstartparameters.h (nonexistent) @@ -1,11 +0,0 @@ ---- src/plugins/debugger/analyzer/analyzerstartparameters.h.orig 2016-06-21 13:37:35 UTC -+++ src/plugins/debugger/analyzer/analyzerstartparameters.h -@@ -42,6 +42,8 @@ public: - QString analyzerHost; - QString analyzerSocket; - quint16 analyzerPort = 0; -+ -+ static void *staticTypeId; - }; - - DEBUGGER_EXPORT bool operator==(const AnalyzerConnection &c1, const AnalyzerConnection &c2); Property changes on: head/devel/qtcreator/files/patch-src_plugins_debugger_analyzer_analyzerstartparameters.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/qtcreator/files/patch-src_plugins_projectexplorer_runnables.cpp =================================================================== --- head/devel/qtcreator/files/patch-src_plugins_projectexplorer_runnables.cpp (revision 418339) +++ head/devel/qtcreator/files/patch-src_plugins_projectexplorer_runnables.cpp (nonexistent) @@ -1,9 +0,0 @@ ---- src/plugins/projectexplorer/runnables.cpp.orig 2016-06-21 13:37:35 UTC -+++ src/plugins/projectexplorer/runnables.cpp -@@ -35,4 +35,6 @@ bool operator==(const StandardRunnable & - && r1.environment == r2.environment; - } - -+void *StandardRunnable::staticTypeId = &StandardRunnable::staticTypeId; -+ - } // namespace ProjectExplorer Property changes on: head/devel/qtcreator/files/patch-src_plugins_projectexplorer_runnables.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/qtcreator/files/patch-src_plugins_android_androidrunnable.h =================================================================== --- head/devel/qtcreator/files/patch-src_plugins_android_androidrunnable.h (revision 418339) +++ head/devel/qtcreator/files/patch-src_plugins_android_androidrunnable.h (nonexistent) @@ -1,11 +0,0 @@ ---- src/plugins/android/androidrunnable.h.orig 2016-06-21 13:37:35 UTC -+++ src/plugins/android/androidrunnable.h -@@ -40,6 +40,8 @@ struct ANDROID_EXPORT AndroidRunnable - QVector beforeStartADBCommands; - QVector afterFinishADBCommands; - QString deviceSerialNumber; -+ -+ static void *staticTypeId; - }; - - inline bool operator==(const AndroidRunnable &r1, const AndroidRunnable &r2) Property changes on: head/devel/qtcreator/files/patch-src_plugins_android_androidrunnable.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/qtcreator/files/patch-src_plugins_projectexplorer_runnables.h =================================================================== --- head/devel/qtcreator/files/patch-src_plugins_projectexplorer_runnables.h (revision 418339) +++ head/devel/qtcreator/files/patch-src_plugins_projectexplorer_runnables.h (nonexistent) @@ -1,25 +0,0 @@ ---- src/plugins/projectexplorer/runnables.h.orig 2016-06-21 13:37:35 UTC -+++ src/plugins/projectexplorer/runnables.h -@@ -43,8 +43,22 @@ public: - Utils::Environment environment; - ApplicationLauncher::Mode runMode = ApplicationLauncher::Gui; - IDevice::ConstPtr device; // Override the kit's device. Keep unset by default. -+ -+ static void *staticTypeId; - }; - - PROJECTEXPLORER_EXPORT bool operator==(const StandardRunnable &r1, const StandardRunnable &r2); - -+class PROJECTEXPLORER_EXPORT HostName -+{ -+public: -+ explicit HostName(const QString &host) : m_host(host) {} -+ QString host() const { return m_host; } -+ -+ static void *staticTypeId; -+ -+private: -+ QString m_host; -+}; -+ - } // namespace ProjectExplorer Property changes on: head/devel/qtcreator/files/patch-src_plugins_projectexplorer_runnables.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/qtcreator/files/patch-src_plugins_android_android.pro =================================================================== --- head/devel/qtcreator/files/patch-src_plugins_android_android.pro (revision 418339) +++ head/devel/qtcreator/files/patch-src_plugins_android_android.pro (nonexistent) @@ -1,12 +0,0 @@ ---- src/plugins/android/android.pro.orig 2016-06-21 13:37:35 UTC -+++ src/plugins/android/android.pro -@@ -89,7 +89,8 @@ SOURCES += \ - avddialog.cpp \ - androidbuildapkstep.cpp \ - androidbuildapkwidget.cpp \ -- androidqtsupport.cpp -+ androidqtsupport.cpp \ -+ androidrunnable.cpp - - FORMS += \ - androidsettingswidget.ui \ Property changes on: head/devel/qtcreator/files/patch-src_plugins_android_android.pro ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/qtcreator/files/patch-src_plugins_projectexplorer_devicesupport_desktopdevice.cpp =================================================================== --- head/devel/qtcreator/files/patch-src_plugins_projectexplorer_devicesupport_desktopdevice.cpp (revision 418339) +++ head/devel/qtcreator/files/patch-src_plugins_projectexplorer_devicesupport_desktopdevice.cpp (nonexistent) @@ -1,10 +0,0 @@ ---- src/plugins/projectexplorer/devicesupport/desktopdevice.cpp.orig 2016-06-21 13:37:35 UTC -+++ src/plugins/projectexplorer/devicesupport/desktopdevice.cpp -@@ -30,6 +30,7 @@ - #include "desktopdeviceconfigurationwidget.h" - #include "desktopprocesssignaloperation.h" - #include -+#include - - #include - Property changes on: head/devel/qtcreator/files/patch-src_plugins_projectexplorer_devicesupport_desktopdevice.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/qtcreator/files/patch-src_plugins_projectexplorer_customwizard_customwizard.cpp =================================================================== --- head/devel/qtcreator/files/patch-src_plugins_projectexplorer_customwizard_customwizard.cpp (revision 418339) +++ head/devel/qtcreator/files/patch-src_plugins_projectexplorer_customwizard_customwizard.cpp (nonexistent) @@ -1,13 +0,0 @@ ---- src/plugins/projectexplorer/customwizard/customwizard.cpp.orig 2016-06-21 13:37:35 UTC -+++ src/plugins/projectexplorer/customwizard/customwizard.cpp -@@ -28,8 +28,9 @@ - #include "customwizardpage.h" - #include "customwizardscriptgenerator.h" - --#include - #include -+#include -+#include - - #include - #include Property changes on: head/devel/qtcreator/files/patch-src_plugins_projectexplorer_customwizard_customwizard.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/qtcreator/files/patch-src_plugins_projectexplorer_devicesupport_idevice.cpp =================================================================== --- head/devel/qtcreator/files/patch-src_plugins_projectexplorer_devicesupport_idevice.cpp (revision 418339) +++ head/devel/qtcreator/files/patch-src_plugins_projectexplorer_devicesupport_idevice.cpp (nonexistent) @@ -1,17 +0,0 @@ ---- src/plugins/projectexplorer/devicesupport/idevice.cpp.orig 2016-06-21 13:37:35 UTC -+++ src/plugins/projectexplorer/devicesupport/idevice.cpp -@@ -30,6 +30,7 @@ - - #include "../kit.h" - #include "../kitinformation.h" -+#include "../runnables.h" - - #include - #include -@@ -466,4 +467,6 @@ DeviceEnvironmentFetcher::DeviceEnvironm - { - } - -+void *HostName::staticTypeId = &HostName::staticTypeId; -+ - } // namespace ProjectExplorer Property changes on: head/devel/qtcreator/files/patch-src_plugins_projectexplorer_devicesupport_idevice.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/qtcreator/files/patch-src_plugins_debugger_debuggerplugin.cpp =================================================================== --- head/devel/qtcreator/files/patch-src_plugins_debugger_debuggerplugin.cpp (revision 418339) +++ head/devel/qtcreator/files/patch-src_plugins_debugger_debuggerplugin.cpp (nonexistent) @@ -1,12 +0,0 @@ ---- src/plugins/debugger/debuggerplugin.cpp.orig 2016-06-21 13:37:35 UTC -+++ src/plugins/debugger/debuggerplugin.cpp -@@ -3834,6 +3834,9 @@ QList DebuggerPlugin::createT - #endif // if WITH_TESTS - - } // namespace Internal -+ -+void *AnalyzerConnection::staticTypeId = &AnalyzerConnection::staticTypeId; -+ - } // namespace Debugger - - #include "debuggerplugin.moc" Property changes on: head/devel/qtcreator/files/patch-src_plugins_debugger_debuggerplugin.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/qtcreator/files/patch-src_plugins_android_android.qbs =================================================================== --- head/devel/qtcreator/files/patch-src_plugins_android_android.qbs (revision 418339) +++ head/devel/qtcreator/files/patch-src_plugins_android_android.qbs (nonexistent) @@ -1,10 +0,0 @@ ---- src/plugins/android/android.qbs.orig 2016-06-21 13:37:35 UTC -+++ src/plugins/android/android.qbs -@@ -76,6 +76,7 @@ QtcPlugin { - "androidruncontrol.h", - "androidrunfactories.cpp", - "androidrunfactories.h", -+ "androidrunnable.cpp", - "androidrunnable.h", - "androidrunner.cpp", - "androidrunner.h", Property changes on: head/devel/qtcreator/files/patch-src_plugins_android_android.qbs ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/qtcreator/files/patch-src_plugins_projectexplorer_runconfiguration.h =================================================================== --- head/devel/qtcreator/files/patch-src_plugins_projectexplorer_runconfiguration.h (revision 418339) +++ head/devel/qtcreator/files/patch-src_plugins_projectexplorer_runconfiguration.h (nonexistent) @@ -1,47 +0,0 @@ ---- 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; - virtual ClonableConcept *clone() const = 0; - virtual bool equals(const std::unique_ptr &other) const = 0; -+ virtual void *typeId() const = 0; - }; - - template -@@ -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); } -+ void *typeId() const { return T::staticTypeId; } - - bool equals(const std::unique_ptr &other) const override - { -- auto that = dynamic_cast *>(other.get()); -- return that && m_data == that->m_data; -+ if (!other.get()) -+ return false; -+ if (other->typeId() != typeId()) -+ return false; -+ auto that = static_cast *>(other.get()); -+ return m_data == that->m_data; - } - - T m_data; -@@ -189,7 +195,7 @@ public: - void operator=(Runnable other) { d = std::move(other.d); } - - template bool is() const { -- return dynamic_cast *>(d.get()) != 0; -+ return d.get()->typeId() == T::staticTypeId; - } - - template const T &as() const { -@@ -213,7 +219,7 @@ public: - void operator=(Connection other) { d = std::move(other.d); } - - template bool is() const { -- return dynamic_cast *>(d.get()) != 0; -+ return d.get()->typeId() == T::staticTypeId; - } - - template const T &as() const { Property changes on: head/devel/qtcreator/files/patch-src_plugins_projectexplorer_runconfiguration.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/qtcreator/files/patch-src_plugins_android_androidrunnable.cpp =================================================================== --- head/devel/qtcreator/files/patch-src_plugins_android_androidrunnable.cpp (revision 418339) +++ head/devel/qtcreator/files/patch-src_plugins_android_androidrunnable.cpp (nonexistent) @@ -1,35 +0,0 @@ ---- src/plugins/android/androidrunnable.cpp.orig 2016-06-21 16:54:43 UTC -+++ src/plugins/android/androidrunnable.cpp -@@ -0,0 +1,32 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2016 The Qt Company Ltd. -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of Qt Creator. -+** -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 3 as published by the Free Software -+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-3.0.html. -+** -+****************************************************************************/ -+ -+#include "androidrunnable.h" -+ -+namespace Android { -+ -+void *AndroidRunnable::staticTypeId = &AndroidRunnable::staticTypeId; -+ -+} // namespace Android Property changes on: head/devel/qtcreator/files/patch-src_plugins_android_androidrunnable.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/qtcreator/Makefile =================================================================== --- head/devel/qtcreator/Makefile (revision 418339) +++ head/devel/qtcreator/Makefile (revision 418340) @@ -1,62 +1,61 @@ # Created by: Kris Moore # $FreeBSD$ PORTNAME= qtcreator -DISTVERSION= 4.0.2 -PORTREVISION= 2 +DISTVERSION= 4.0.3 CATEGORIES= devel MASTER_SITES= QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION} DISTNAME= qt-creator-opensource-src-${DISTVERSION} DIST_SUBDIR= KDE/Qt/qtcreator MAINTAINER= kde@FreeBSD.org COMMENT= C++ and QML IDE for Qt development # depend on the split out qbs BUILD_DEPENDS= qbs:devel/qbs RUN_DEPENDS= qbs:devel/qbs USE_LDCONFIG= ${LOCALBASE}/lib/${PORTNAME} USES= qmake compiler:c++11-lib USE_GL= gl USE_QT5= buildtools concurrent core declarative designer gui help \ linguist network printsupport qdoc qml quick quickcontrols \ script script sql svg webkit widgets xml xmlpatterns # be paranoid and do not extract qbs (devel/qbs) copy from source tree EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/src/shared/qbs' # Set QBS_INSTALL_DIR for QBS plugin build and set config parameter to build # the qbsprojectmanager plugin without compile error QMAKE_ARGS+= QBS_INSTALL_DIR=${PREFIX} CONFIG+=qbs_enable_project_file_updates # Enforce installation to ${PREFIX}. QMAKE_ARGS+= QTC_PREFIX=${PREFIX} # Required for building the port with GCC: the define below is required for # std::to_string() to exist. More details in ports/193528. QMAKE_ARGS+= DEFINES+=_GLIBCXX_USE_C99 DESKTOP_ENTRIES="Qt Creator" "" "QtProject-qtcreator" \ "${PREFIX}/bin/${PORTNAME}" "Development;Qt;" true OPTIONS_DEFINE= DOCS EXAMPLES DOCS_DESC= Install the Qt5 api documentation DOCS_USE= QT5=doc_run EXAMPLES_DESC= Install the Qt5 example projects EXAMPLES_USE= QT5=examples_run OPTIONS_DEFAULT= ${OPTIONS_DEFINE} ALL_TARGET= all INSTALL_TARGET= install DOCS_ALL_TARGET= docs DOCS_INSTALL_TARGET= install_docs # Fix paths for gnuplot and ant. post-patch: ${REINPLACE_CMD} -e 's|/usr/bin/gnuplot|${LOCALBASE}/bin/gnuplot|' \ ${WRKSRC}/share/qtcreator/debugger/dumper.py ${REINPLACE_CMD} -e 's|/usr/bin/ant|${LOCALBASE}/bin/ant|' \ ${WRKSRC}/src/plugins/android/androidsettingswidget.cpp .include Index: head/devel/qtcreator/distinfo =================================================================== --- head/devel/qtcreator/distinfo (revision 418339) +++ head/devel/qtcreator/distinfo (revision 418340) @@ -1,3 +1,3 @@ -TIMESTAMP = 1466350737 -SHA256 (KDE/Qt/qtcreator/qt-creator-opensource-src-4.0.2.tar.gz) = c2fce74fef0cc3a8f5c03d7ed1e95ccfe508d855ee750647896876824fcaee10 -SIZE (KDE/Qt/qtcreator/qt-creator-opensource-src-4.0.2.tar.gz) = 21651190 +TIMESTAMP = 1467899547 +SHA256 (KDE/Qt/qtcreator/qt-creator-opensource-src-4.0.3.tar.gz) = a213a9b66e7e0eb906036a1587256fc0f7bac33912d9ae5e6117459231f56449 +SIZE (KDE/Qt/qtcreator/qt-creator-opensource-src-4.0.3.tar.gz) = 21972901