Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/qt-creator/Makefile,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 Makefile
--- Makefile 15 Mar 2018 20:04:34 -0000 1.35
+++ Makefile 31 Mar 2018 12:47:18 -0000
@@ -4,7 +4,7 @@
USE_WXNEEDED = Yes
COMMENT = cross-platform IDE for use with Qt
-V = 4.5.2
+V = 4.6.0
DISTNAME = qt-creator-opensource-src-${V}
PKGNAME = qt-creator-${V}
@@ -40,8 +40,8 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += ${COMPILER_LIBCXX} GL Qt5Concurrent Qt5Core Qt5Designer
WANTLIB += Qt5DesignerComponents Qt5Gui Qt5Help Qt5Network Qt5PrintSupport
-WANTLIB += Qt5Qml Qt5Quick Qt5QuickWidgets Qt5Sql Qt5Svg Qt5Widgets
-WANTLIB += Qt5Xml botan-1.10 c m qbscore qbsqtprofilesetup
+WANTLIB += Qt5Qml Qt5Quick Qt5QuickWidgets Qt5Script Qt5Sql Qt5Svg
+WANTLIB += Qt5Widgets Qt5Xml botan-1.10 c clang m
MASTER_SITES = https://download.qt.io/official_releases/qtcreator/${V:R}/${V}/
@@ -50,28 +50,30 @@ MODULES = x11/qt5 \
MODQMAKE_INSTALL_ROOT = ${PREFIX}
-MODQMAKE_ARGS = USE_SYSTEM_BOTAN=1
+MODQMAKE_ARGS = USE_SYSTEM_BOTAN=1 \
+ CONFIG+=qbs_enable_project_file_updates
# qtcreator.sh is created with custom LINK?= in Makefile
MODQT5_USE_CXX11 = No
COMPILER = base-clang ports-gcc
BUILD_DEPENDS = x11/qt5/qtquickcontrols \
- x11/qt5/qtscript
+ devel/qbs
RUN_DEPENDS = devel/gdb \
+ devel/qbs \
devel/gmake \
${MODGCC4_CPPDEP} \
x11/gtk+3,-guic \
x11/qt5/qtwebkit \
- x11/qt5/qtquickcontrols \
- x11/qt5/qtscript
+ x11/qt5/qtquickcontrols
LIB_DEPENDS = x11/qt5/qtdeclarative \
x11/qt5/qtsvg \
x11/qt5/qttools \
security/botan \
- devel/qbs
+ x11/qt5/qtscript \
+ devel/llvm
PORTHOME = ${WRKDIR}
@@ -81,7 +83,7 @@ NO_TEST = Yes
FAKE_FLAGS = INSTALL_ROOT=${WRKINST}${TRUEPREFIX}
-CONFIGURE_ENV = QBS_INSTALL_DIR=${LOCALBASE}
+CONFIGURE_ENV = QBS_INSTALL_DIR=${LOCALBASE}
GDB_ADJ_FILES = \
src/plugins/debugger/debuggeritemmanager.cpp \
@@ -92,6 +94,8 @@ GDB_ADJ_FILES = \
pre-configure:
cd ${WRKSRC}; sed -i 's,"gdb","egdb",g' ${GDB_ADJ_FILES}
+ # use system qbs (qtcreator.pro)
+ rm -rf ${WRKSRC}/src/shared/qbs
post-install:
.for _l _v in ${SHARED_LIBS}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/qt-creator/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo 15 Mar 2018 20:04:34 -0000 1.11
+++ distinfo 31 Mar 2018 12:47:18 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt-creator-opensource-src-4.5.2.tar.gz) = bafSaaQU78JQZiAxCKspb8qgGcw4Ba/Ux+lz85FBId0=
-SIZE (qt-creator-opensource-src-4.5.2.tar.gz) = 28604085
+SHA256 (qt-creator-opensource-src-4.6.0.tar.gz) = L3IF6T66Owhod8HfE33SUxT1kqn5UvlldA2XklMGuWw=
+SIZE (qt-creator-opensource-src-4.6.0.tar.gz) = 30855534
Index: patches/patch-src_libs_utils_buildablehelperlibrary_cpp
===================================================================
RCS file: /cvs/ports/devel/qt-creator/patches/patch-src_libs_utils_buildablehelperlibrary_cpp,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_libs_utils_buildablehelperlibrary_cpp
--- patches/patch-src_libs_utils_buildablehelperlibrary_cpp 28 Apr 2017 16:00:10 -0000 1.2
+++ patches/patch-src_libs_utils_buildablehelperlibrary_cpp 31 Mar 2018 12:47:18 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-src_libs_utils_buildable
Prefer qmake-qt5 to qmake4 by removing the QDir::Reversed flag.
---- src/libs/utils/buildablehelperlibrary.cpp.orig Wed Mar 22 09:25:13 2017
-+++ src/libs/utils/buildablehelperlibrary.cpp Mon Apr 24 18:05:10 2017
-@@ -86,8 +86,7 @@ FileName BuildableHelperLibrary::findSystemQt(const En
+Index: src/libs/utils/buildablehelperlibrary.cpp
+--- src/libs/utils/buildablehelperlibrary.cpp.orig
++++ src/libs/utils/buildablehelperlibrary.cpp
+@@ -87,8 +87,7 @@ FileName BuildableHelperLibrary::findSystemQt(const En
return FileName::fromString(qmakePath);
}
Index: patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp
===================================================================
RCS file: /cvs/ports/devel/qt-creator/patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_plugins_projectexplorer_gcctoolchain_cpp
--- patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp 14 Jan 2018 10:07:48 -0000 1.5
+++ patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp 31 Mar 2018 12:47:18 -0000
@@ -5,7 +5,7 @@ Append eg++ before g++ so eg++ is used b
Index: src/plugins/projectexplorer/gcctoolchain.cpp
--- src/plugins/projectexplorer/gcctoolchain.cpp.orig
+++ src/plugins/projectexplorer/gcctoolchain.cpp
-@@ -707,7 +707,7 @@ FileNameList GccToolChain::suggestedMkspecList() const
+@@ -726,7 +726,7 @@ FileNameList GccToolChain::suggestedMkspecList() const
QString GccToolChain::makeCommand(const Environment &environment) const
{
Index: patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
===================================================================
RCS file: /cvs/ports/devel/qt-creator/patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
--- patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp 14 Jan 2018 10:07:48 -0000 1.4
+++ patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp 31 Mar 2018 12:47:18 -0000
@@ -7,11 +7,11 @@ compile C++11 code.
Index: src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
--- src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp.orig
+++ src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
-@@ -679,6 +679,7 @@ void QmakeBuildConfigurationFactory::configureBuildCon
- buildSteps->insertStep(0, qmakeStep);
+@@ -126,6 +126,7 @@ void QmakeBuildConfiguration::initialize(const BuildIn
- MakeStep *makeStep = new MakeStep(buildSteps);
-+ makeStep->setUserArguments(QLatin1String("CXX=eg++ LINK=eg++"));
- buildSteps->insertStep(1, makeStep);
+ BuildStepList *buildSteps = stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
+ auto qmakeStep = new QMakeStep(buildSteps);
++ qmakeStep->setUserArguments(QLatin1String("CXX=eg++ LINK=eg++"));
+ buildSteps->appendStep(qmakeStep);
+ buildSteps->appendStep(new MakeStep(buildSteps));
- MakeStep *cleanStep = new MakeStep(cleanSteps);
Index: patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp
===================================================================
RCS file: patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp
diff -N patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp
--- patches/patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp 14 Jun 2017 17:11:20 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-$OpenBSD: patch-src_shared_qbs_src_lib_corelib_tools_processutils_cpp,v 1.3 2017/06/14 17:11:20 rsadowski Exp $
-Index: src/shared/qbs/src/lib/corelib/tools/processutils.cpp
---- src/shared/qbs/src/lib/corelib/tools/processutils.cpp.orig
-+++ src/shared/qbs/src/lib/corelib/tools/processutils.cpp
-@@ -49,6 +49,11 @@
- # include "fileinfo.h"
- # include <unistd.h>
- # include <cstdio>
-+#elif defined(Q_OS_OPENBSD)
-+# include <sys/param.h>
-+# include <sys/sysctl.h>
-+# include <fcntl.h>
-+# include <kvm.h>
- #elif defined(Q_OS_BSD4)
- # include <QtCore/qfile.h>
- # include <sys/cdefs.h>
-@@ -94,6 +99,19 @@ QString processNameByPid(qint64 pid)
- sprintf(exePath, "/proc/%lld/exe", pid);
- readlink(exePath, buf, sizeof(buf));
- return FileInfo::fileName(QString::fromUtf8(buf));
-+#elif defined(Q_OS_OPENBSD)
-+ kvm_t *kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL);
-+ if (!kd)
-+ return QString();
-+ int cnt;
-+ struct kinfo_proc *kp = kvm_getprocs(kd, KERN_PROC_PID, pid, sizeof(*kp), &cnt);
-+ if (!kp || cnt < 1) {
-+ kvm_close(kd);
-+ return QString();
-+ }
-+ QString name = QString::fromUtf8(kp->p_comm);
-+ kvm_close(kd);
-+ return name;
- #elif defined(Q_OS_BSD4)
- # if defined(Q_OS_NETBSD)
- struct kinfo_proc2 kp;
Index: patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri
===================================================================
RCS file: patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri
diff -N patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri
--- patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri 14 Jan 2018 10:07:48 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_shared_qbs_src_lib_corelib_tools_tools_pri,v 1.5 2018/01/14 10:07:48 rsadowski Exp $
-Index: src/shared/qbs/src/lib/corelib/tools/tools.pri
---- src/shared/qbs/src/lib/corelib/tools/tools.pri.orig
-+++ src/shared/qbs/src/lib/corelib/tools/tools.pri
-@@ -106,6 +106,10 @@ osx {
- LIBS += -framework Security
- }
-
-+openbsd {
-+ LIBS += -lkvm
-+}
-+
- !qbs_no_dev_install {
- tools_headers.files = \
- $$PWD/architectures.h \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/qt-creator/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST
--- pkg/PLIST 14 Jan 2018 10:07:48 -0000 1.7
+++ pkg/PLIST 31 Mar 2018 12:47:18 -0000
@@ -43,6 +43,9 @@ lib/qtcreator/plugins/libBinEditor.so
lib/qtcreator/plugins/libBookmarks.so
lib/qtcreator/plugins/libCMakeProjectManager.so
lib/qtcreator/plugins/libCVS.so
+lib/qtcreator/plugins/libClangCodeModel.so
+lib/qtcreator/plugins/libClangPchManager.so
+lib/qtcreator/plugins/libClangRefactoring.so
lib/qtcreator/plugins/libClangStaticAnalyzer.so
lib/qtcreator/plugins/libClassView.so
lib/qtcreator/plugins/libClearCase.so
@@ -97,6 +100,9 @@ lib/qtcreator/plugins/qmldesigner/libcom
lib/qtcreator/plugins/qmldesigner/libqtquickplugin.so
libexec/qtcreator/
@bin libexec/qtcreator/buildoutputparser
+@bin libexec/qtcreator/clangbackend
+@bin libexec/qtcreator/clangpchmanagerbackend
+@bin libexec/qtcreator/clangrefactoringbackend
@bin libexec/qtcreator/cpaster
@bin libexec/qtcreator/qml2puppet
@bin libexec/qtcreator/qtcreator_process_stub
@@ -172,6 +178,7 @@ share/qtcreator/modeleditor/standard.def
share/qtcreator/qml/
share/qtcreator/qml-type-descriptions/
share/qtcreator/qml-type-descriptions/builtins.qmltypes
+share/qtcreator/qml-type-descriptions/qbs-base.qmltypes
share/qtcreator/qml-type-descriptions/qbs-bundle.json
share/qtcreator/qml-type-descriptions/qbs.qmltypes
share/qtcreator/qml-type-descriptions/qmlproject-bundle.json
@@ -181,8 +188,6 @@ share/qtcreator/qml-type-descriptions/qm
share/qtcreator/qml-type-descriptions/qt-labs-folderlistmodel.qmltypes
share/qtcreator/qml-type-descriptions/qt-labs-gestures.qmltypes
share/qtcreator/qml-type-descriptions/qt-labs-particles.qmltypes
-share/qtcreator/qml-type-descriptions/qt4QtQuick1-bundle.json
-share/qtcreator/qml-type-descriptions/qt5QtQuick1-bundle.json
share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json
share/qtcreator/qml-type-descriptions/qtmobility-connectivity.qmltypes
share/qtcreator/qml-type-descriptions/qtmobility-contacts.qmltypes
@@ -591,6 +596,7 @@ share/qtcreator/templates/wizards/autote
share/qtcreator/templates/wizards/autotest/files/tst.qbs
share/qtcreator/templates/wizards/autotest/files/tst.txt
share/qtcreator/templates/wizards/autotest/files/tst_main.cpp
+share/qtcreator/templates/wizards/autotest/files/tst_qml.tmpl
share/qtcreator/templates/wizards/autotest/files/tst_src.cpp
share/qtcreator/templates/wizards/autotest/files/tst_src.h
share/qtcreator/templates/wizards/autotest/wizard.json
@@ -650,8 +656,12 @@ share/qtcreator/templates/wizards/files/
share/qtcreator/templates/wizards/files/js/file.js
share/qtcreator/templates/wizards/files/js/wizard.json
share/qtcreator/templates/wizards/files/modeling/
-share/qtcreator/templates/wizards/files/modeling/file.qmodel
-share/qtcreator/templates/wizards/files/modeling/wizard.json
+share/qtcreator/templates/wizards/files/modeling/model/
+share/qtcreator/templates/wizards/files/modeling/model/file.qmodel
+share/qtcreator/templates/wizards/files/modeling/model/wizard.json
+share/qtcreator/templates/wizards/files/modeling/scratch/
+share/qtcreator/templates/wizards/files/modeling/scratch/file.qmodel
+share/qtcreator/templates/wizards/files/modeling/scratch/wizard.json
share/qtcreator/templates/wizards/files/nim/
share/qtcreator/templates/wizards/files/nim/file.nim
share/qtcreator/templates/wizards/files/nim/wizard.json
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/qbs/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile 14 Feb 2018 06:59:09 -0000 1.5
+++ Makefile 31 Mar 2018 12:47:25 -0000
@@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.5 2018/02/14 06:59:09 rsadowski Exp $
COMMENT = declarative cross-platform build tool
-V = 1.10.1
+V = 1.11.0
DISTNAME = qbs-src-${V}
PKGNAME = qbs-${V}
-SHARED_LIBS = qbscore 3.0
-SHARED_LIBS += qbsqtprofilesetup 1.4
+SHARED_LIBS = qbscore 4.0
+SHARED_LIBS += qbsqtprofilesetup 2.0
CATEGORIES = devel
HOMEPAGE = https://doc.qt.io/qbs/
@@ -16,14 +16,15 @@ MAINTAINER = KDE porting team <openbsd-k
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Script
-WANTLIB += Qt5Widgets Qt5Xml c m
+WANTLIB += Qt5Widgets Qt5Xml c kvm m
MASTER_SITES = https://download.qt.io/official_releases/qbs/${V}/
MODULES = devel/qmake x11/qt5
MODQMAKE_PROJECTS = qbs.pro
-MODQMAKE_ARGS = CONFIG+=qbs_enable_unit_tests=1
+MODQMAKE_ARGS = CONFIG+=qbs_enable_unit_tests=1 \
+ CONFIG+=qbs_enable_project_file_updates
BUILD_DEPENDS = x11/qt5/qtdeclarative
RUN_DEPENDS = x11/qt5/qtdeclarative
@@ -32,6 +33,7 @@ LIB_DEPENDS = x11/qt5/qtbase \
TEST_DEPENDS = ${BUILD_PKGPATH}
+MAKE_ENV = LD_LIBRARY_PATH=${WRKBUILD}/lib
TEST_ENV = LD_LIBRARY_PATH=${WRKBUILD}/lib
do-test:
@@ -39,5 +41,10 @@ do-test:
for t in tst_*; do \
${SETENV} ${ALL_TEST_ENV} ./$$t; \
done
+
+pre-fake:
+ ${INSTALL_DATA_DIR} ${PREFIX}/include/qbs/tools
+ ${INSTALL_DATA} ${WRKSRC}/src/lib/corelib/tools/*.h \
+ ${PREFIX}/include/qbs/tools/
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/qbs/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 14 Feb 2018 06:59:09 -0000 1.4
+++ distinfo 31 Mar 2018 12:47:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (qbs-src-1.10.1.tar.gz) = 9sECq/yZ9tbBGidU6StlPV9XMoWNeCwKFd74pIGB7+4=
-SIZE (qbs-src-1.10.1.tar.gz) = 4140847
+SHA256 (qbs-src-1.11.0.tar.gz) = bOMMRo5oj2hDRoMko0pxkUCbRxw/9vPoNO+L+ns0Z80=
+SIZE (qbs-src-1.11.0.tar.gz) = 4299668
Index: patches/patch-doc_man_man_qbs
===================================================================
RCS file: /cvs/ports/devel/qbs/patches/patch-doc_man_man_qbs,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-doc_man_man_qbs
--- patches/patch-doc_man_man_qbs 28 Dec 2017 07:12:21 -0000 1.1
+++ patches/patch-doc_man_man_qbs 31 Mar 2018 12:47:25 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-doc_man_man_qbs,v 1.1 20
Index: doc/man/man.qbs
--- doc/man/man.qbs.orig
+++ doc/man/man.qbs
-@@ -18,7 +18,7 @@ Product {
+@@ -19,7 +19,7 @@ Product {
name: "man page"
files: ["qbs.1"]
qbs.install: qbsbuildconfig.installManPage
Index: patches/patch-src_lib_corelib_tools_processutils_cpp
===================================================================
RCS file: patches/patch-src_lib_corelib_tools_processutils_cpp
diff -N patches/patch-src_lib_corelib_tools_processutils_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_lib_corelib_tools_processutils_cpp 31 Mar 2018 12:47:25 -0000
@@ -0,0 +1,37 @@
+$OpenBSD$
+
+Index: src/lib/corelib/tools/processutils.cpp
+--- src/lib/corelib/tools/processutils.cpp.orig
++++ src/lib/corelib/tools/processutils.cpp
+@@ -49,6 +49,11 @@
+ # include "fileinfo.h"
+ # include <unistd.h>
+ # include <cstdio>
++#elif defined(Q_OS_OPENBSD)
++# include <sys/param.h>
++# include <sys/sysctl.h>
++# include <fcntl.h>
++# include <kvm.h>
+ #elif defined(Q_OS_BSD4)
+ # include <QtCore/qfile.h>
+ # include <sys/cdefs.h>
+@@ -94,6 +99,19 @@ QString processNameByPid(qint64 pid)
+ sprintf(exePath, "/proc/%lld/exe", pid);
+ readlink(exePath, buf, sizeof(buf));
+ return FileInfo::fileName(QString::fromUtf8(buf));
++#elif defined(Q_OS_OPENBSD)
++ kvm_t *kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL);
++ if (!kd)
++ return QString();
++ int cnt;
++ struct kinfo_proc *kp = kvm_getprocs(kd, KERN_PROC_PID, pid, sizeof(*kp), &cnt);
++ if (!kp || cnt < 1) {
++ kvm_close(kd);
++ return QString();
++ }
++ QString name = QString::fromUtf8(kp->p_comm);
++ kvm_close(kd);
++ return name;
+ #elif defined(Q_OS_BSD4)
+ # if defined(Q_OS_NETBSD)
+ struct kinfo_proc2 kp;
Index: patches/patch-src_lib_corelib_tools_tools_pri
===================================================================
RCS file: patches/patch-src_lib_corelib_tools_tools_pri
diff -N patches/patch-src_lib_corelib_tools_tools_pri
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_lib_corelib_tools_tools_pri 31 Mar 2018 12:47:25 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: src/lib/corelib/tools/tools.pri
+--- src/lib/corelib/tools/tools.pri.orig
++++ src/lib/corelib/tools/tools.pri
+@@ -107,6 +107,10 @@ osx {
+ LIBS += -framework Security
+ }
+
++openbsd {
++ LIBS += -lkvm
++}
++
+ !qbs_no_dev_install {
+ tools_headers.files = \
+ $$PWD/architectures.h \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/qbs/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST 14 Feb 2018 06:59:09 -0000 1.4
+++ pkg/PLIST 31 Mar 2018 12:47:25 -0000
@@ -4,7 +4,6 @@
@bin bin/qbs-config
@bin bin/qbs-config-ui
@bin bin/qbs-create-project
-@bin bin/qbs-qmltypes
@bin bin/qbs-setup-android
@bin bin/qbs-setup-qt
@bin bin/qbs-setup-toolchains
@@ -18,6 +17,9 @@ include/qbs/api/rulecommand.h
include/qbs/api/runenvironment.h
include/qbs/buildgraph/
include/qbs/buildgraph/forward_decls.h
+include/qbs/generators/
+include/qbs/generators/generator.h
+include/qbs/generators/generatordata.h
include/qbs/language/
include/qbs/language/forward_decls.h
include/qbs/logging/
@@ -27,24 +29,60 @@ include/qbs/qbs_version.pri
include/qbs/qtenvironment.h
include/qbs/qtprofilesetup.h
include/qbs/tools/
+include/qbs/tools/applecodesignutils.h
include/qbs/tools/architectures.h
+include/qbs/tools/buildgraphlocker.h
include/qbs/tools/buildoptions.h
include/qbs/tools/cleanoptions.h
include/qbs/tools/codelocation.h
include/qbs/tools/commandechomode.h
+include/qbs/tools/dynamictypecheck.h
include/qbs/tools/error.h
+include/qbs/tools/executablefinder.h
+include/qbs/tools/fileinfo.h
+include/qbs/tools/filesaver.h
+include/qbs/tools/filetime.h
include/qbs/tools/generateoptions.h
+include/qbs/tools/hostosinfo.h
+include/qbs/tools/id.h
include/qbs/tools/installoptions.h
+include/qbs/tools/iosutils.h
+include/qbs/tools/jsliterals.h
+include/qbs/tools/launcherinterface.h
+include/qbs/tools/launcherpackets.h
+include/qbs/tools/launchersocket.h
+include/qbs/tools/msvcinfo.h
+include/qbs/tools/pathutils.h
+include/qbs/tools/persistence.h
include/qbs/tools/preferences.h
include/qbs/tools/processresult.h
+include/qbs/tools/processresult_p.h
+include/qbs/tools/processutils.h
include/qbs/tools/profile.h
+include/qbs/tools/profiling.h
+include/qbs/tools/progressobserver.h
+include/qbs/tools/projectgeneratormanager.h
include/qbs/tools/qbs_export.h
+include/qbs/tools/qbsassert.h
include/qbs/tools/qbspluginmanager.h
+include/qbs/tools/qbsprocess.h
+include/qbs/tools/qttools.h
+include/qbs/tools/scannerpluginmanager.h
+include/qbs/tools/scripttools.h
+include/qbs/tools/set.h
include/qbs/tools/settings.h
+include/qbs/tools/settingscreator.h
include/qbs/tools/settingsmodel.h
include/qbs/tools/setupprojectparameters.h
+include/qbs/tools/shellutils.h
+include/qbs/tools/stlutils.h
+include/qbs/tools/stringconstants.h
+include/qbs/tools/stringutils.h
include/qbs/tools/toolchains.h
include/qbs/tools/version.h
+include/qbs/tools/visualstudioversioninfo.h
+include/qbs/tools/vsenvironmentdetector.h
+include/qbs/tools/weakpointer.h
include/qbs/use_installed_corelib.pri
include/qbs/use_installed_qtprofilesetup.pri
lib/libqbscore.prl
@@ -207,8 +245,10 @@ share/qbs/imports/qbs/Probes/AndroidNdkP
share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs
share/qbs/imports/qbs/Probes/BinaryProbe.qbs
share/qbs/imports/qbs/Probes/FrameworkProbe.qbs
+share/qbs/imports/qbs/Probes/GccBinaryProbe.qbs
share/qbs/imports/qbs/Probes/GccProbe.qbs
share/qbs/imports/qbs/Probes/GccVersionProbe.qbs
+share/qbs/imports/qbs/Probes/IcoUtilsVersionProbe.qbs
share/qbs/imports/qbs/Probes/IncludeProbe.qbs
share/qbs/imports/qbs/Probes/InnoSetupProbe.qbs
share/qbs/imports/qbs/Probes/JdkProbe.qbs
@@ -237,7 +277,6 @@ share/qbs/imports/qbs/base/CppApplicatio
share/qbs/imports/qbs/base/DynamicLibrary.qbs
share/qbs/imports/qbs/base/InnoSetup.qbs
share/qbs/imports/qbs/base/InstallPackage.qbs
-share/qbs/imports/qbs/base/Installer.qbs
share/qbs/imports/qbs/base/JavaClassCollection.qbs
share/qbs/imports/qbs/base/JavaJarFile.qbs
share/qbs/imports/qbs/base/Library.qbs
@@ -287,6 +326,7 @@ share/qbs/modules/cpp/ios-gcc.qbs
share/qbs/modules/cpp/macos-gcc.qbs
share/qbs/modules/cpp/msvc.js
share/qbs/modules/cpp/qnx-qcc.qbs
+share/qbs/modules/cpp/setuprunenv.js
share/qbs/modules/cpp/tvos-gcc.qbs
share/qbs/modules/cpp/watchos-gcc.qbs
share/qbs/modules/cpp/windows-mingw.qbs
@@ -299,6 +339,9 @@ share/qbs/modules/dmg/dmg.js
share/qbs/modules/ib/
share/qbs/modules/ib/IBModule.qbs
share/qbs/modules/ib/ib.js
+share/qbs/modules/ico/
+share/qbs/modules/ico/IcoModule.qbs
+share/qbs/modules/ico/ico.js
share/qbs/modules/innosetup/
share/qbs/modules/innosetup/InnoSetupModule.qbs
share/qbs/modules/java/
Hi All,
please find attached diffs to update qbs to 1.11.0 and qt-creator
to 4.6.0.
Disable the whole qbs build set by removing qbs directory in qt-creator
and merge useful patches from qt-creator to qbs.
Tested on amd64.
Ok? Comments?
Best regards,
Rafael Sadowski
No comments:
Post a Comment