summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/qbs/Makefile2
-rw-r--r--devel/qbs/distinfo6
-rw-r--r--devel/qbs/files/patch-src_lib_corelib_tools_tools.pri12
-rw-r--r--devel/qbs/pkg-plist3
-rw-r--r--devel/qtcreator/Makefile4
-rw-r--r--devel/qtcreator/distinfo6
6 files changed, 10 insertions, 23 deletions
diff --git a/devel/qbs/Makefile b/devel/qbs/Makefile
index 363038799589..d5d778e5ef2f 100644
--- a/devel/qbs/Makefile
+++ b/devel/qbs/Makefile
@@ -2,7 +2,7 @@
PORTNAME= qbs
DISTVERSIONPREFIX= src-
-DISTVERSION= 1.11.0
+DISTVERSION= 1.11.1
CATEGORIES= devel
MASTER_SITES= QT/official_releases/${PORTNAME}/${PORTVERSION}
DIST_SUBDIR= KDE/Qt/qbs
diff --git a/devel/qbs/distinfo b/devel/qbs/distinfo
index c4c4911b4634..c7dc45c58c8a 100644
--- a/devel/qbs/distinfo
+++ b/devel/qbs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522350498
-SHA256 (KDE/Qt/qbs/qbs-src-1.11.0.tar.gz) = 6ce30c468e688f6843468324a34a7191409b471c3ff6f3e834ef8bfa7b3467cd
-SIZE (KDE/Qt/qbs/qbs-src-1.11.0.tar.gz) = 4299668
+TIMESTAMP = 1525502657
+SHA256 (KDE/Qt/qbs/qbs-src-1.11.1.tar.gz) = 8a301e8e94169e44f2ca4ad65fc4d393215bf3b81bc51daa970f50ddb6231f5b
+SIZE (KDE/Qt/qbs/qbs-src-1.11.1.tar.gz) = 4299125
diff --git a/devel/qbs/files/patch-src_lib_corelib_tools_tools.pri b/devel/qbs/files/patch-src_lib_corelib_tools_tools.pri
deleted file mode 100644
index 01411cfeb0f7..000000000000
--- a/devel/qbs/files/patch-src_lib_corelib_tools_tools.pri
+++ /dev/null
@@ -1,12 +0,0 @@
-Add missing header.
-
---- src/lib/corelib/tools/tools.pri.orig 2018-03-29 21:31:25 UTC
-+++ src/lib/corelib/tools/tools.pri
-@@ -125,6 +125,7 @@ osx {
- $$PWD/generatorpluginmanager.h \
- $$PWD/installoptions.h \
- $$PWD/qbspluginmanager.h \
-+ $$PWD/projectgeneratormanager.h \
- $$PWD/setupprojectparameters.h \
- $$PWD/toolchains.h \
- $$PWD/version.h
diff --git a/devel/qbs/pkg-plist b/devel/qbs/pkg-plist
index 2e6a612d5887..06d3dfeee19b 100644
--- a/devel/qbs/pkg-plist
+++ b/devel/qbs/pkg-plist
@@ -33,7 +33,6 @@ include/qbs/tools/processresult.h
include/qbs/tools/profile.h
include/qbs/tools/projectgeneratormanager.h
include/qbs/tools/qbs_export.h
-include/qbs/tools/qbspluginmanager.h
include/qbs/tools/settings.h
include/qbs/tools/settingsmodel.h
include/qbs/tools/setupprojectparameters.h
@@ -103,7 +102,6 @@ man/man1/qbs.1.gz
%%PORTDOCS%%%%DOCSDIR%%/html/installing-files.html
%%PORTDOCS%%%%DOCSDIR%%/html/installing.html
%%PORTDOCS%%%%DOCSDIR%%/html/jsextension-binaryfile.html
-%%PORTDOCS%%%%DOCSDIR%%/html/jsextension-domxml.html
%%PORTDOCS%%%%DOCSDIR%%/html/jsextension-environment.html
%%PORTDOCS%%%%DOCSDIR%%/html/jsextension-file.html
%%PORTDOCS%%%%DOCSDIR%%/html/jsextension-fileinfo.html
@@ -112,6 +110,7 @@ man/man1/qbs.1.gz
%%PORTDOCS%%%%DOCSDIR%%/html/jsextension-temporarydir.html
%%PORTDOCS%%%%DOCSDIR%%/html/jsextension-textfile.html
%%PORTDOCS%%%%DOCSDIR%%/html/jsextension-utilities.html
+%%PORTDOCS%%%%DOCSDIR%%/html/jsextension-xml.html
%%PORTDOCS%%%%DOCSDIR%%/html/jsextensions-general.html
%%PORTDOCS%%%%DOCSDIR%%/html/language-introduction.html
%%PORTDOCS%%%%DOCSDIR%%/html/list-of-builtin-services.html
diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile
index 13d8617ad540..8932b3de05bc 100644
--- a/devel/qtcreator/Makefile
+++ b/devel/qtcreator/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= qtcreator
-DISTVERSION= 4.6.0
+DISTVERSION= 4.6.1
CATEGORIES= devel
MASTER_SITES= QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION}
DISTNAME= qt-creator-opensource-src-${DISTVERSION}
@@ -14,7 +14,7 @@ COMMENT= C++ and QML IDE for Qt development
# depend on the split out qbs
LIB_DEPENDS= libqbscore.so:devel/qbs
-USES= qmake compiler:c++11-lib tar:xz
+USES= qmake compiler:c++14-lang tar:xz
USE_LDCONFIG= ${LOCALBASE}/lib/${PORTNAME}
USE_GL= gl
USE_QT5= buildtools concurrent core designer gui help \
diff --git a/devel/qtcreator/distinfo b/devel/qtcreator/distinfo
index f1d4bb5e19ad..e89bfcdcc567 100644
--- a/devel/qtcreator/distinfo
+++ b/devel/qtcreator/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522361051
-SHA256 (KDE/Qt/qtcreator/qt-creator-opensource-src-4.6.0.tar.xz) = 36e6a9146fbd07f045ea19301176c66f8234afd42bae0a7a17c91e1832fc4882
-SIZE (KDE/Qt/qtcreator/qt-creator-opensource-src-4.6.0.tar.xz) = 23386172
+TIMESTAMP = 1525502745
+SHA256 (KDE/Qt/qtcreator/qt-creator-opensource-src-4.6.1.tar.xz) = e74dce61becc2a97199ff4a0e50a148e4dbafb6572587212323c470d70c137da
+SIZE (KDE/Qt/qtcreator/qt-creator-opensource-src-4.6.1.tar.xz) = 23403488