After x11/qt5 and devel/kf5 are updated we can update qbs and qt-creator
to the latest stable versions. qbs and qt-creator going hand in hand so
below you can find a diff to update both of them.
A lot has happened over the years, qt-creator looks good and works
stable on amd64.
Comments? Tests?
Rafael
diff --git a/devel/qbs/Makefile b/devel/qbs/Makefile
index be07bb5d99d..52c795d2ba3 100644
--- a/devel/qbs/Makefile
+++ b/devel/qbs/Makefile
@@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.12 2019/07/12 20:45:57 sthen Exp $
COMMENT = declarative cross-platform build tool
-V = 1.12.1
+V = 1.15.0
DISTNAME = qbs-src-${V}
PKGNAME = qbs-${V}
-REVISION = 1
-SHARED_LIBS = qbscore 5.0
-SHARED_LIBS += qbsqtprofilesetup 3.0
+SHARED_LIBS = qbscore 6.0
+SHARED_LIBS += qbsqtprofilesetup 4.0
CATEGORIES = devel
HOMEPAGE = https://doc.qt.io/qbs/
diff --git a/devel/qbs/distinfo b/devel/qbs/distinfo
index 660e04dbd2f..5c231742d48 100644
--- a/devel/qbs/distinfo
+++ b/devel/qbs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qbs-src-1.12.1.tar.gz) = iGkXfmFHrOX81Acg6oGxA0Xof2VWoXMyUhuf9bcpyZk=
-SIZE (qbs-src-1.12.1.tar.gz) = 4370590
+SHA256 (qbs-src-1.15.0.tar.gz) = 4d7ku+C2AcDaFrJ5uGxNyIGxuGpv8MNPxyBoWtwbjug=
+SIZE (qbs-src-1.15.0.tar.gz) = 4531882
diff --git a/devel/qbs/patches/patch-src_lib_corelib_tools_persistence_h
b/devel/qbs/patches/patch-src_lib_corelib_tools_persistence_h
deleted file mode 100644
index bec7b44bbce..00000000000
--- a/devel/qbs/patches/patch-src_lib_corelib_tools_persistence_h
+++ /dev/null
@@ -1,36 +0,0 @@
-$OpenBSD: patch-src_lib_corelib_tools_persistence_h,v 1.1 2018/10/16 14:35:42
rsadowski Exp $
-
-https://codereview.qt-project.org/#/c/241907/
-https://bugreports.qt.io/browse/QBS-1395
-
-Index: src/lib/corelib/tools/persistence.h
---- src/lib/corelib/tools/persistence.h.orig
-+++ src/lib/corelib/tools/persistence.h
-@@ -50,7 +50,6 @@
- #include <QtCore/qstring.h>
- #include <QtCore/qvariant.h>
-
--#include <ctime>
- #include <memory>
- #include <type_traits>
- #include <unordered_map>
-@@ -275,19 +274,6 @@ template<> struct PPHelper<long>
- qint64 v;
- pool->m_stream >> v;
- value = long(v);
-- }
--};
--
--template<typename T>
--struct PPHelper<T, std::enable_if_t<std::is_same<T, std::time_t>::value
-- && !std::is_same<T, long>::value>>
--{
-- static void store(std::time_t value, PersistentPool *pool) {
pool->m_stream << qint64(value); }
-- static void load(std::time_t &value, PersistentPool *pool)
-- {
-- qint64 v;
-- pool->m_stream >> v;
-- value = static_cast<std::time_t>(v);
- }
- };
-
diff --git a/devel/qbs/patches/patch-src_lib_corelib_tools_processutils_cpp
b/devel/qbs/patches/patch-src_lib_corelib_tools_processutils_cpp
index b94f6c570f2..4029fbcdffb 100644
--- a/devel/qbs/patches/patch-src_lib_corelib_tools_processutils_cpp
+++ b/devel/qbs/patches/patch-src_lib_corelib_tools_processutils_cpp
@@ -1,5 +1,7 @@
$OpenBSD: patch-src_lib_corelib_tools_processutils_cpp,v 1.1 2018/04/07
07:48:12 rsadowski Exp $
+TODO: Replace kvm
+
Index: src/lib/corelib/tools/processutils.cpp
--- src/lib/corelib/tools/processutils.cpp.orig
+++ src/lib/corelib/tools/processutils.cpp
diff --git a/devel/qbs/patches/patch-src_lib_corelib_tools_tools_pri
b/devel/qbs/patches/patch-src_lib_corelib_tools_tools_pri
index e25be639c08..f35d1fbcd58 100644
--- a/devel/qbs/patches/patch-src_lib_corelib_tools_tools_pri
+++ b/devel/qbs/patches/patch-src_lib_corelib_tools_tools_pri
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_lib_corelib_tools_tools_pri,v 1.2
2018/10/16 14:35:42 rsadow
Index: src/lib/corelib/tools/tools.pri
--- src/lib/corelib/tools/tools.pri.orig
+++ src/lib/corelib/tools/tools.pri
-@@ -114,6 +114,10 @@ osx {
+@@ -117,6 +117,10 @@ osx {
LIBS += -framework Security
}
diff --git a/devel/qbs/pkg/PLIST b/devel/qbs/pkg/PLIST
index 95cd3ce6a6d..1397f1bdd58 100644
--- a/devel/qbs/pkg/PLIST
+++ b/devel/qbs/pkg/PLIST
@@ -27,9 +27,6 @@ include/qbs/logging/
include/qbs/logging/ilogsink.h
include/qbs/qbs.h
include/qbs/qbs_version.pri
-include/qbs/qtenvironment.h
-include/qbs/qtmsvctools.h
-include/qbs/qtprofilesetup.h
include/qbs/tools/
include/qbs/tools/applecodesignutils.h
include/qbs/tools/architectures.h
@@ -49,7 +46,9 @@ include/qbs/tools/hostosinfo.h
include/qbs/tools/id.h
include/qbs/tools/installoptions.h
include/qbs/tools/iosutils.h
+include/qbs/tools/joblimits.h
include/qbs/tools/jsliterals.h
+include/qbs/tools/jsonhelper.h
include/qbs/tools/launcherinterface.h
include/qbs/tools/launcherpackets.h
include/qbs/tools/launchersocket.h
@@ -87,18 +86,17 @@ 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
@lib lib/libqbscore.so.${LIBqbscore_VERSION}
-lib/libqbsqtprofilesetup.prl
-@lib lib/libqbsqtprofilesetup.so.${LIBqbsqtprofilesetup_VERSION}
lib/qbs/
lib/qbs/plugins/
-lib/qbs/plugins/libclangcompilationdbgenerator.so
-lib/qbs/plugins/libmakefilegenerator.so
-lib/qbs/plugins/libqbs_cpp_scanner.so
-lib/qbs/plugins/libqbs_qt_scanner.so
-lib/qbs/plugins/libvisualstudiogenerator.so
+@so lib/qbs/plugins/libclangcompilationdbgenerator.so
+@so lib/qbs/plugins/libiarewgenerator.so
+@so lib/qbs/plugins/libkeiluvgenerator.so
+@so lib/qbs/plugins/libmakefilegenerator.so
+@so lib/qbs/plugins/libqbs_cpp_scanner.so
+@so lib/qbs/plugins/libqbs_qt_scanner.so
+@so lib/qbs/plugins/libvisualstudiogenerator.so
libexec/qbs/
libexec/qbs/dmgbuild
@bin libexec/qbs/qbs_processlauncher
@@ -114,6 +112,102 @@ share/qbs/examples/app-and-lib/lib/
share/qbs/examples/app-and-lib/lib/lib.cpp
share/qbs/examples/app-and-lib/lib/lib.h
share/qbs/examples/app-and-lib/lib/lib.qbs
+share/qbs/examples/baremetal/
+share/qbs/examples/baremetal/at90can128olimex/
+share/qbs/examples/baremetal/at90can128olimex/at90can128olimex.qbs
+share/qbs/examples/baremetal/at90can128olimex/redblink/
+share/qbs/examples/baremetal/at90can128olimex/redblink/README.md
+share/qbs/examples/baremetal/at90can128olimex/redblink/gpio.c
+share/qbs/examples/baremetal/at90can128olimex/redblink/gpio.h
+share/qbs/examples/baremetal/at90can128olimex/redblink/main.c
+share/qbs/examples/baremetal/at90can128olimex/redblink/redblink.qbs
+share/qbs/examples/baremetal/baremetal.qbs
+share/qbs/examples/baremetal/cc2540usbdongle/
+share/qbs/examples/baremetal/cc2540usbdongle/cc2540usbdongle.qbs
+share/qbs/examples/baremetal/cc2540usbdongle/greenblink/
+share/qbs/examples/baremetal/cc2540usbdongle/greenblink/README.md
+share/qbs/examples/baremetal/cc2540usbdongle/greenblink/gpio.c
+share/qbs/examples/baremetal/cc2540usbdongle/greenblink/gpio.h
+share/qbs/examples/baremetal/cc2540usbdongle/greenblink/greenblink.qbs
+share/qbs/examples/baremetal/cc2540usbdongle/greenblink/main.c
+share/qbs/examples/baremetal/cc2540usbdongle/greenblink/system.h
+share/qbs/examples/baremetal/cy7c68013a/
+share/qbs/examples/baremetal/cy7c68013a/cy7c68013a.qbs
+share/qbs/examples/baremetal/cy7c68013a/nes-gamepads/
+share/qbs/examples/baremetal/cy7c68013a/nes-gamepads/README.md
+share/qbs/examples/baremetal/cy7c68013a/nes-gamepads/core.c
+share/qbs/examples/baremetal/cy7c68013a/nes-gamepads/core.h
+share/qbs/examples/baremetal/cy7c68013a/nes-gamepads/defs.h
+share/qbs/examples/baremetal/cy7c68013a/nes-gamepads/gpio.c
+share/qbs/examples/baremetal/cy7c68013a/nes-gamepads/gpio.h
+share/qbs/examples/baremetal/cy7c68013a/nes-gamepads/hid.c
+share/qbs/examples/baremetal/cy7c68013a/nes-gamepads/hid.h
+share/qbs/examples/baremetal/cy7c68013a/nes-gamepads/hiddesc.c
+share/qbs/examples/baremetal/cy7c68013a/nes-gamepads/hidep0.c
+share/qbs/examples/baremetal/cy7c68013a/nes-gamepads/hidep1.c
+share/qbs/examples/baremetal/cy7c68013a/nes-gamepads/irqs.h
+share/qbs/examples/baremetal/cy7c68013a/nes-gamepads/main.c
+share/qbs/examples/baremetal/cy7c68013a/nes-gamepads/nes-gamepads.qbs
+share/qbs/examples/baremetal/cy7c68013a/nes-gamepads/regs.h
+share/qbs/examples/baremetal/cy7c68013a/nes-gamepads/usb.c
+share/qbs/examples/baremetal/cy7c68013a/nes-gamepads/usb.h
+share/qbs/examples/baremetal/msp430f5529/
+share/qbs/examples/baremetal/msp430f5529/msp430f5529.qbs
+share/qbs/examples/baremetal/msp430f5529/nes-gamepads/
+share/qbs/examples/baremetal/msp430f5529/nes-gamepads/README.md
+share/qbs/examples/baremetal/msp430f5529/nes-gamepads/gamepads.ld
+share/qbs/examples/baremetal/msp430f5529/nes-gamepads/gpio.c
+share/qbs/examples/baremetal/msp430f5529/nes-gamepads/gpio.h
+share/qbs/examples/baremetal/msp430f5529/nes-gamepads/hid.h
+share/qbs/examples/baremetal/msp430f5529/nes-gamepads/hiddesc.c
+share/qbs/examples/baremetal/msp430f5529/nes-gamepads/hidep0.c
+share/qbs/examples/baremetal/msp430f5529/nes-gamepads/hidep1.c
+share/qbs/examples/baremetal/msp430f5529/nes-gamepads/hwdefs.h
+share/qbs/examples/baremetal/msp430f5529/nes-gamepads/main.c
+share/qbs/examples/baremetal/msp430f5529/nes-gamepads/nes-gamepads.qbs
+share/qbs/examples/baremetal/msp430f5529/nes-gamepads/pmm.c
+share/qbs/examples/baremetal/msp430f5529/nes-gamepads/pmm.h
+share/qbs/examples/baremetal/msp430f5529/nes-gamepads/ucs.c
+share/qbs/examples/baremetal/msp430f5529/nes-gamepads/ucs.h
+share/qbs/examples/baremetal/msp430f5529/nes-gamepads/usb.c
+share/qbs/examples/baremetal/msp430f5529/nes-gamepads/usb.h
+share/qbs/examples/baremetal/msp430f5529/nes-gamepads/wdt_a.c
+share/qbs/examples/baremetal/msp430f5529/nes-gamepads/wdt_a.h
+share/qbs/examples/baremetal/msp430f5529/redblink/
+share/qbs/examples/baremetal/msp430f5529/redblink/README.md
+share/qbs/examples/baremetal/msp430f5529/redblink/gpio.c
+share/qbs/examples/baremetal/msp430f5529/redblink/gpio.h
+share/qbs/examples/baremetal/msp430f5529/redblink/main.c
+share/qbs/examples/baremetal/msp430f5529/redblink/redblink.qbs
+share/qbs/examples/baremetal/msp430f5529/redblink/system.c
+share/qbs/examples/baremetal/msp430f5529/redblink/system.h
+share/qbs/examples/baremetal/stm32f4discovery/
+share/qbs/examples/baremetal/stm32f4discovery/blueblink/
+share/qbs/examples/baremetal/stm32f4discovery/blueblink/README.md
+share/qbs/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs
+share/qbs/examples/baremetal/stm32f4discovery/blueblink/gcc/
+share/qbs/examples/baremetal/stm32f4discovery/blueblink/gcc/flash.ld
+share/qbs/examples/baremetal/stm32f4discovery/blueblink/gcc/startup.s
+share/qbs/examples/baremetal/stm32f4discovery/blueblink/gpio.c
+share/qbs/examples/baremetal/stm32f4discovery/blueblink/gpio.h
+share/qbs/examples/baremetal/stm32f4discovery/blueblink/iar/
+share/qbs/examples/baremetal/stm32f4discovery/blueblink/iar/flash.icf
+share/qbs/examples/baremetal/stm32f4discovery/blueblink/iar/startup.s
+share/qbs/examples/baremetal/stm32f4discovery/blueblink/keil/
+share/qbs/examples/baremetal/stm32f4discovery/blueblink/keil/flash.sct
+share/qbs/examples/baremetal/stm32f4discovery/blueblink/keil/startup.s
+share/qbs/examples/baremetal/stm32f4discovery/blueblink/main.c
+share/qbs/examples/baremetal/stm32f4discovery/blueblink/system.h
+share/qbs/examples/baremetal/stm32f4discovery/stm32f4discovery.qbs
+share/qbs/examples/baremetal/stm8s103f3/
+share/qbs/examples/baremetal/stm8s103f3/redblink/
+share/qbs/examples/baremetal/stm8s103f3/redblink/README.md
+share/qbs/examples/baremetal/stm8s103f3/redblink/gpio.c
+share/qbs/examples/baremetal/stm8s103f3/redblink/gpio.h
+share/qbs/examples/baremetal/stm8s103f3/redblink/main.c
+share/qbs/examples/baremetal/stm8s103f3/redblink/redblink.qbs
+share/qbs/examples/baremetal/stm8s103f3/redblink/system.h
+share/qbs/examples/baremetal/stm8s103f3/stm8s103f3.qbs
share/qbs/examples/cocoa-application/
share/qbs/examples/cocoa-application/CocoaApplication/
share/qbs/examples/cocoa-application/CocoaApplication.qbs
@@ -200,6 +294,11 @@ share/qbs/examples/compiled-qml/main.qml
share/qbs/examples/compiled-qml/myapp.qbs
share/qbs/examples/compiled-qml/qml.qrc
share/qbs/examples/examples.qbs
+share/qbs/examples/grpc/
+share/qbs/examples/grpc/client.cpp
+share/qbs/examples/grpc/ping-pong-grpc.proto
+share/qbs/examples/grpc/ping-pong-grpc.qbs
+share/qbs/examples/grpc/server.cpp
share/qbs/examples/helloworld-complex/
share/qbs/examples/helloworld-complex/hello.qbs
share/qbs/examples/helloworld-complex/src/
@@ -234,6 +333,20 @@ share/qbs/examples/install-bundle/main.cpp
share/qbs/examples/install-bundle/white.iconset/
share/qbs/examples/install-bundle/white.iconset/icon_16x16.png
share/qbs/examples/install-bundle/white.iconset/icon_16...@2x.png
+share/qbs/examples/protobuf/
+share/qbs/examples/protobuf/cpp/
+share/qbs/examples/protobuf/cpp/README.md
+share/qbs/examples/protobuf/cpp/addressbook.qbs
+share/qbs/examples/protobuf/cpp/main.cpp
+share/qbs/examples/protobuf/objc/
+share/qbs/examples/protobuf/objc/README.md
+share/qbs/examples/protobuf/objc/addressbook.qbs
+share/qbs/examples/protobuf/objc/main.m
+share/qbs/examples/protobuf/shared/
+share/qbs/examples/protobuf/shared/addressbook.proto
+share/qbs/examples/rule/
+share/qbs/examples/rule/lorem_ipsum.txt
+share/qbs/examples/rule/rule.qbs
share/qbs/imports/
share/qbs/imports/qbs/
share/qbs/imports/qbs/BundleTools/
@@ -248,20 +361,25 @@ share/qbs/imports/qbs/Probes/
share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs
share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs
share/qbs/imports/qbs/Probes/BinaryProbe.qbs
+share/qbs/imports/qbs/Probes/ClangClProbe.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/IarProbe.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
share/qbs/imports/qbs/Probes/JdkVersionProbe.qbs
+share/qbs/imports/qbs/Probes/KeilProbe.qbs
+share/qbs/imports/qbs/Probes/LibraryProbe.qbs
share/qbs/imports/qbs/Probes/MsvcProbe.qbs
share/qbs/imports/qbs/Probes/NodeJsProbe.qbs
share/qbs/imports/qbs/Probes/NpmProbe.qbs
share/qbs/imports/qbs/Probes/PathProbe.qbs
share/qbs/imports/qbs/Probes/PkgConfigProbe.qbs
+share/qbs/imports/qbs/Probes/SdccProbe.qbs
share/qbs/imports/qbs/Probes/TypeScriptProbe.qbs
share/qbs/imports/qbs/Probes/WiXProbe.qbs
share/qbs/imports/qbs/Probes/XcodeProbe.qbs
@@ -295,8 +413,35 @@ share/qbs/imports/qbs/base/StaticLibrary.qbs
share/qbs/imports/qbs/base/WindowsInstallerPackage.qbs
share/qbs/imports/qbs/base/WindowsSetupPackage.qbs
share/qbs/imports/qbs/base/XPCService.qbs
+share/qbs/module-providers/
+share/qbs/module-providers/Qt/
+share/qbs/module-providers/Qt/provider.qbs
+share/qbs/module-providers/Qt/setup-qt.js
+share/qbs/module-providers/Qt/templates/
+share/qbs/module-providers/Qt/templates/QtModule.qbs
+share/qbs/module-providers/Qt/templates/QtPlugin.qbs
+share/qbs/module-providers/Qt/templates/android_support.qbs
+share/qbs/module-providers/Qt/templates/core.qbs
+share/qbs/module-providers/Qt/templates/dbus.js
+share/qbs/module-providers/Qt/templates/dbus.qbs
+share/qbs/module-providers/Qt/templates/gui.qbs
+share/qbs/module-providers/Qt/templates/moc.js
+share/qbs/module-providers/Qt/templates/module.qbs
+share/qbs/module-providers/Qt/templates/plugin.qbs
+share/qbs/module-providers/Qt/templates/plugin_support.qbs
+share/qbs/module-providers/Qt/templates/qdoc.js
+share/qbs/module-providers/Qt/templates/qml.js
+share/qbs/module-providers/Qt/templates/qml.qbs
+share/qbs/module-providers/Qt/templates/qmlcache.qbs
+share/qbs/module-providers/Qt/templates/quick.js
+share/qbs/module-providers/Qt/templates/quick.qbs
+share/qbs/module-providers/Qt/templates/scxml.qbs
+share/qbs/module-providers/__fallback/
+share/qbs/module-providers/__fallback/fallback.qbs
+share/qbs/module-providers/__fallback/provider.qbs
share/qbs/modules/
share/qbs/modules/Android/
+share/qbs/modules/Android/android-utils.js
share/qbs/modules/Android/ndk/
share/qbs/modules/Android/ndk/ndk.qbs
share/qbs/modules/Android/ndk/utils.js
@@ -312,6 +457,8 @@ share/qbs/modules/Exporter/qbs/qbsexporter.js
share/qbs/modules/Exporter/qbs/qbsexporter.qbs
share/qbs/modules/archiver/
share/qbs/modules/archiver/archiver.qbs
+share/qbs/modules/autotest/
+share/qbs/modules/autotest/autotest.qbs
share/qbs/modules/bundle/
share/qbs/modules/bundle/BundleModule.qbs
share/qbs/modules/bundle/MacOSX-Package-Types.xcspec
@@ -327,6 +474,7 @@ share/qbs/modules/cpp/CppModule.qbs
share/qbs/modules/cpp/DarwinGCC.qbs
share/qbs/modules/cpp/GenericGCC.qbs
share/qbs/modules/cpp/LinuxGCC.qbs
+share/qbs/modules/cpp/MingwBaseModule.qbs
share/qbs/modules/cpp/UnixGCC.qbs
share/qbs/modules/cpp/android-gcc.qbs
share/qbs/modules/cpp/cpp.js
@@ -334,14 +482,23 @@ share/qbs/modules/cpp/darwin.js
share/qbs/modules/cpp/freebsd-gcc.qbs
share/qbs/modules/cpp/freebsd.js
share/qbs/modules/cpp/gcc.js
+share/qbs/modules/cpp/iar.js
+share/qbs/modules/cpp/iar.qbs
share/qbs/modules/cpp/ios-gcc.qbs
+share/qbs/modules/cpp/keil.js
+share/qbs/modules/cpp/keil.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/sdcc.js
+share/qbs/modules/cpp/sdcc.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-clang-cl.qbs
+share/qbs/modules/cpp/windows-clang-mingw.qbs
share/qbs/modules/cpp/windows-mingw.qbs
+share/qbs/modules/cpp/windows-msvc-base.qbs
share/qbs/modules/cpp/windows-msvc.qbs
share/qbs/modules/cpufeatures/
share/qbs/modules/cpufeatures/cpufeatures.qbs
@@ -379,13 +536,25 @@ share/qbs/modules/nodejs/NodeJS.qbs
share/qbs/modules/nodejs/nodejs.js
share/qbs/modules/nsis/
share/qbs/modules/nsis/NSISModule.qbs
+share/qbs/modules/pkgconfig/
+share/qbs/modules/pkgconfig/pkgconfig.qbs
+share/qbs/modules/protobuf/
+share/qbs/modules/protobuf/cpp/
+share/qbs/modules/protobuf/cpp/protobufcpp.qbs
+share/qbs/modules/protobuf/objc/
+share/qbs/modules/protobuf/objc/protobufobjc.qbs
+share/qbs/modules/protobuf/protobuf.js
+share/qbs/modules/protobuf/protobufbase.qbs
share/qbs/modules/qbs/
share/qbs/modules/qbs/common.qbs
share/qbs/modules/qnx/
share/qbs/modules/qnx/qnx.qbs
+share/qbs/modules/texttemplate/
+share/qbs/modules/texttemplate/texttemplate.qbs
share/qbs/modules/typescript/
share/qbs/modules/typescript/TypeScriptModule.qbs
share/qbs/modules/typescript/qbs-tsc-scan/
+share/qbs/modules/typescript/qbs-tsc-scan/.gitignore
share/qbs/modules/typescript/qbs-tsc-scan/qbs-tsc-scan.ts
share/qbs/modules/typescript/typescript.js
share/qbs/modules/vcs/
@@ -397,29 +566,21 @@ share/qbs/modules/xcode/xcode.js
share/qbs/modules/xcode/xcode.qbs
share/qbs/python/
share/qbs/python/biplist/
-share/qbs/python/biplist/LICENSE
share/qbs/python/biplist/__init__.py
-share/qbs/python/biplist/qt_attribution.json
share/qbs/python/dmgbuild/
-share/qbs/python/dmgbuild/LICENSE
share/qbs/python/dmgbuild/__init__.py
share/qbs/python/dmgbuild/badge.py
share/qbs/python/dmgbuild/colors.py
share/qbs/python/dmgbuild/core.py
share/qbs/python/dmgbuild/licensing.py
-share/qbs/python/dmgbuild/qt_attribution.json
share/qbs/python/dmgbuild/resources.py
share/qbs/python/ds_store/
-share/qbs/python/ds_store/LICENSE
share/qbs/python/ds_store/__init__.py
share/qbs/python/ds_store/buddy.py
-share/qbs/python/ds_store/qt_attribution.json
share/qbs/python/ds_store/store.py
share/qbs/python/mac_alias/
-share/qbs/python/mac_alias/LICENSE
share/qbs/python/mac_alias/__init__.py
share/qbs/python/mac_alias/alias.py
share/qbs/python/mac_alias/bookmark.py
share/qbs/python/mac_alias/osx.py
-share/qbs/python/mac_alias/qt_attribution.json
share/qbs/python/mac_alias/utils.py
diff --git a/devel/qt-creator/Makefile b/devel/qt-creator/Makefile
index 790d69d050e..c2893947a6b 100644
--- a/devel/qt-creator/Makefile
+++ b/devel/qt-creator/Makefile
@@ -4,10 +4,9 @@
USE_WXNEEDED = Yes
COMMENT = cross-platform IDE for use with Qt
-V = 4.8.2
+V = 4.11.1
DISTNAME = qt-creator-opensource-src-${V}
PKGNAME = qt-creator-${V}
-REVISION = 4
SHARED_LIBS += Aggregation 0.0 # 0.0
SHARED_LIBS += CPlusPlus 2.0 # 0.0
@@ -39,38 +38,42 @@ MAINTAINER = Rafael Sadowski <rsadow...@openbsd.org>
# GPLv3 with the "Qt Company GPL Exception 1.0"
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} GL Qt5Concurrent Qt5Core Qt5Designer
-WANTLIB += Qt5DesignerComponents Qt5Gui Qt5Help Qt5Network Qt5PrintSupport
-WANTLIB += Qt5Qml Qt5Quick Qt5QuickWidgets Qt5Script Qt5SerialPort
-WANTLIB += Qt5Sql Qt5Svg Qt5Widgets Qt5Xml botan-2 c clang m qbscore
-WANTLIB += qbsqtprofilesetup
+WANTLIB += ${COMPILER_LIBCXX} GL KF5SyntaxHighlighting Qt5Concurrent
+WANTLIB += Qt5Core Qt5Designer Qt5DesignerComponents Qt5Gui Qt5Help
+WANTLIB += Qt5Network Qt5PrintSupport Qt5Qml Qt5Quick Qt5QuickWidgets
+WANTLIB += Qt5Script Qt5SerialPort Qt5Sql Qt5Svg Qt5Widgets Qt5Xml
+WANTLIB += c clang m yaml-cpp
MASTER_SITES = https://download.qt.io/official_releases/qtcreator/${V:R}/${V}/
MODULES = x11/qt5 \
+ lang/python \
devel/qmake
+CONFIGURE_STYLE = qmake
+
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
+
MODQMAKE_INSTALL_ROOT = ${PREFIX}
-MODQMAKE_ARGS = QTC_ENABLE_CLANG_LIBTOOLING=Yes \
- CONFIG+=qbs_enable_project_file_updates
+MODQMAKE_ARGS = CONFIG+=qbs_enable_project_file_updates
BUILD_DEPENDS = x11/qt5/qtquickcontrols \
lang/clazy>=1.5 \
- devel/qbs
+ devel/qbs>=1.15.0
RUN_DEPENDS = ${MODGCC4_CPPDEP} \
devel/gdb \
devel/gmake \
- devel/qbs \
+ devel/qbs>=1.15.0 \
lang/clazy>=1.5 \
x11/gtk+3,-guic \
x11/qt5/qtquickcontrols \
- x11/qt5/qtquickcontrols \
x11/qt5/qtwebkit
LIB_DEPENDS = devel/llvm \
- security/botan2 \
+ devel/kf5/syntax-highlighting \
+ devel/yaml-cpp \
x11/qt5/qtdeclarative \
x11/qt5/qtserialport \
x11/qt5/qtscript \
@@ -85,7 +88,11 @@ FAKE_FLAGS = INSTALL_ROOT=${WRKINST}${TRUEPREFIX}
CONFIGURE_ENV = LLVM_INSTALL_DIR=${LOCALBASE} \
QBS_INSTALL_DIR=${LOCALBASE} \
- QTC_ENABLE_CLANG_LIBTOOLING=Yes
+ KSYNTAXHIGHLIGHTING_LIB_DIR="${LOCALBASE}/lib" \
+ PYTHON_INSTALL_DIR=${MODPY_BIN} \
+
KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${LOCALBASE}/include/KF5/KSyntaxHighlighting" \
+ QTC_DISABLE_CLANG_REFACTORING=0
+
GDB_ADJ_FILES = \
src/plugins/debugger/debuggeritemmanager.cpp \
@@ -96,8 +103,9 @@ GDB_ADJ_FILES = \
pre-configure:
cd ${WRKSRC}; sed -i 's,"gdb","egdb",g' ${GDB_ADJ_FILES}
- # use system qbs (qtcreator.pro)
+ # use system qbs/syntax-highlighting (qtcreator.pro)
rm -rf ${WRKSRC}/src/shared/qbs
+ rm -rf ${WRKSRC}/src/libs/{3rdparty/syntax-highlighting,yaml-cpp}
post-install:
.for _l _v in ${SHARED_LIBS}
diff --git a/devel/qt-creator/distinfo b/devel/qt-creator/distinfo
index 4a383ca14cf..9534e60cf1c 100644
--- a/devel/qt-creator/distinfo
+++ b/devel/qt-creator/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qt-creator-opensource-src-4.8.2.tar.gz) =
c1Ps4XsY1lhKvGBDCgd762Dbb2CfpVaMCEq3pGDA7XU=
-SIZE (qt-creator-opensource-src-4.8.2.tar.gz) = 32124568
+SHA256 (qt-creator-opensource-src-4.11.1.tar.gz) =
WpC4ZGMrlOzDhQjIdDM0oH6k9YBPqXGnzzov6ESGRXg=
+SIZE (qt-creator-opensource-src-4.11.1.tar.gz) = 35205212
diff --git a/devel/qt-creator/patches/patch-src_libs_libs_pro
b/devel/qt-creator/patches/patch-src_libs_libs_pro
deleted file mode 100644
index f85eb23bc4e..00000000000
--- a/devel/qt-creator/patches/patch-src_libs_libs_pro
+++ /dev/null
@@ -1,25 +0,0 @@
-$OpenBSD: patch-src_libs_libs_pro,v 1.2 2018/12/08 15:08:58 rsadowski Exp $
-
-use system botan2
-
-Index: src/libs/libs.pro
---- src/libs/libs.pro.orig
-+++ src/libs/libs.pro
-@@ -2,8 +2,6 @@ include(../../qtcreator.pri)
-
- TEMPLATE = subdirs
-
--!use_system_botan: SUBDIRS += botan
--
- SUBDIRS += \
- aggregation \
- extensionsystem \
-@@ -31,8 +29,6 @@ for(l, SUBDIRS) {
- lv = $${l}.depends
- $$lv = $$QTC_LIB_DEPENDS
- }
--
--!use_system_botan: ssh.depends += botan
-
- SUBDIRS += \
- utils/process_stub.pro
diff --git a/devel/qt-creator/patches/patch-src_libs_ssh_ssh_pro
b/devel/qt-creator/patches/patch-src_libs_ssh_ssh_pro
deleted file mode 100644
index 71c33082398..00000000000
--- a/devel/qt-creator/patches/patch-src_libs_ssh_ssh_pro
+++ /dev/null
@@ -1,23 +0,0 @@
-$OpenBSD: patch-src_libs_ssh_ssh_pro,v 1.1 2018/10/19 09:35:31 rsadowski Exp $
-
-use system botan2
-
-Index: src/libs/ssh/ssh.pro
---- src/libs/ssh/ssh.pro.orig
-+++ src/libs/ssh/ssh.pro
-@@ -83,13 +83,6 @@ FORMS = $$PWD/sshkeycreationdialog.ui
- RESOURCES += $$PWD/ssh.qrc
-
- include(../botan/botan.pri)
--use_system_botan {
-- CONFIG += link_pkgconfig
-- PKGCONFIG += botan-2
--} else {
-- BOTAN_BUILD_DIR = $$OUT_PWD/../botan/$$BOTAN_BUILD_DIR
-- INCLUDEPATH += $$BOTAN_BUILD_DIR/build/include
-- LIBS += $$BOTAN_BUILD_DIR/$$BOTAN_FULL_NAME
-- win32: LIBS += -ladvapi32 -luser32 -lws2_32
--}
-+CONFIG += link_pkgconfig
-+PKGCONFIG += botan-2
- msvc:QMAKE_CXXFLAGS += /wd4250
diff --git
a/devel/qt-creator/patches/patch-src_libs_utils_buildablehelperlibrary_cpp
b/devel/qt-creator/patches/patch-src_libs_utils_buildablehelperlibrary_cpp
index 006ab2b9a2b..c11ab4bfd70 100644
--- a/devel/qt-creator/patches/patch-src_libs_utils_buildablehelperlibrary_cpp
+++ b/devel/qt-creator/patches/patch-src_libs_utils_buildablehelperlibrary_cpp
@@ -5,13 +5,12 @@ Prefer qmake-qt5 to qmake4 by removing the QDir::Reversed
flag.
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);
- }
-
-- // Prefer qmake-qt5 to qmake-qt4 by sorting the filenames in reverse
order.
-- foreach (const QFileInfo &fi,
dir.entryInfoList(possibleQMakeCommands(), QDir::Files, QDir::Name |
QDir::Reversed)) {
-+ foreach (const QFileInfo &fi,
dir.entryInfoList(possibleQMakeCommands(), QDir::Files, QDir::Name)) {
- if (fi.fileName() == qmake)
- continue;
-
+@@ -89,7 +89,7 @@ static FilePath findQmakeInDir(const FilePath &path)
+ // Prefer qmake-qt5 to qmake-qt4 by sorting the filenames in reverse
order.
+ const QFileInfoList candidates = dir.entryInfoList(
+ BuildableHelperLibrary::possibleQMakeCommands(),
+- QDir::Files, QDir::Name | QDir::Reversed);
++ QDir::Files, QDir::Name);
+ for (const QFileInfo &fi : candidates) {
+ if (fi.fileName() == qmake)
+ continue;
diff --git
a/devel/qt-creator/patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp
b/devel/qt-creator/patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp
deleted file mode 100644
index 8fa7328fe9c..00000000000
---
a/devel/qt-creator/patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_plugins_projectexplorer_gcctoolchain_cpp,v 1.8 2018/12/08
15:08:58 rsadowski Exp $
-
-Append eg++ before g++ so eg++ is used by default.
-
-Index: src/plugins/projectexplorer/gcctoolchain.cpp
---- src/plugins/projectexplorer/gcctoolchain.cpp.orig
-+++ src/plugins/projectexplorer/gcctoolchain.cpp
-@@ -678,7 +678,7 @@ FileNameList GccToolChain::suggestedMkspecList() const
-
- QString GccToolChain::makeCommand(const Environment &environment) const
- {
-- QString make = "make";
-+ QString make = "gmake";
- FileName tmp = environment.searchInPath(make);
- return tmp.isEmpty() ? make : tmp.toString();
- }
diff --git
a/devel/qt-creator/patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
b/devel/qt-creator/patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
deleted file mode 100644
index 533778c3524..00000000000
---
a/devel/qt-creator/patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp,v
1.6 2018/12/08 15:08:58 rsadowski Exp $
-
-When calling gmake, override the CXX and LINK variables in Makefiles generated
-by qmake by setting gmake's command line arguments. Makes it possible to
-compile C++11 code.
-
-Index: src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
---- src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp.orig
-+++ src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
-@@ -129,6 +129,7 @@ void QmakeBuildConfiguration::initialize(const BuildIn
-
- 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 QmakeMakeStep(buildSteps));
-
diff --git
a/devel/qt-creator/patches/patch-src_tools_clangpchmanagerbackend_source_collectbuilddependencypreprocessorcallbacks_h
b/devel/qt-creator/patches/patch-src_tools_clangpchmanagerbackend_source_collectbuilddependencypreprocessorcallbacks_h
deleted file mode 100644
index 8a46dfb4be8..00000000000
---
a/devel/qt-creator/patches/patch-src_tools_clangpchmanagerbackend_source_collectbuilddependencypreprocessorcallbacks_h
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD:
patch-src_tools_clangpchmanagerbackend_source_collectbuilddependencypreprocessorcallbacks_h,v
1.1 2018/12/08 15:08:58 rsadowski Exp $
-
-clang: error: non-virtual member function marked 'override' hides virtual
member function
-
-Index:
src/tools/clangpchmanagerbackend/source/collectbuilddependencypreprocessorcallbacks.h
----
src/tools/clangpchmanagerbackend/source/collectbuilddependencypreprocessorcallbacks.h.orig
-+++
src/tools/clangpchmanagerbackend/source/collectbuilddependencypreprocessorcallbacks.h
-@@ -94,7 +94,7 @@ class CollectBuildDependencyPreprocessorCallbacks fina
- llvm::StringRef /*searchPath*/,
- llvm::StringRef /*relativePath*/,
- const clang::Module * /*imported*/,
-- clang::SrcMgr::CharacteristicKind fileType)
override
-+ clang::SrcMgr::CharacteristicKind fileType)
- {
- if (file) {
- addSourceDependency(file, hashLocation);
diff --git
a/devel/qt-creator/patches/patch-src_tools_clangrefactoringbackend_source_findcursorusr_h
b/devel/qt-creator/patches/patch-src_tools_clangrefactoringbackend_source_findcursorusr_h
deleted file mode 100644
index d176de56186..00000000000
---
a/devel/qt-creator/patches/patch-src_tools_clangrefactoringbackend_source_findcursorusr_h
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_tools_clangrefactoringbackend_source_findcursorusr_h,v 1.1
2019/07/05 17:01:45 jca Exp $
-
-Cope with upstream API change
-https://reviews.llvm.org/D50346
-
-Index: src/tools/clangrefactoringbackend/source/findcursorusr.h
---- src/tools/clangrefactoringbackend/source/findcursorusr.h.orig
-+++ src/tools/clangrefactoringbackend/source/findcursorusr.h
-@@ -161,7 +161,7 @@ std::vector<const clang::NamedDecl *> namedDeclaration
-
- auto declarations = Context.getTranslationUnitDecl()->decls();
- for (auto ¤tDeclation : declarations) {
-- const auto &fileLocation = currentDeclation->getLocStart();
-+ const auto &fileLocation = currentDeclation->getBeginLoc();
- const auto &fileName = sourceManager.getFilename(fileLocation);
- if (fileName == currentFile) {
- visitor.TraverseDecl(currentDeclation);
diff --git
a/devel/qt-creator/patches/patch-src_tools_clangrefactoringbackend_source_symbolscollector_cpp
b/devel/qt-creator/patches/patch-src_tools_clangrefactoringbackend_source_symbolscollector_cpp
deleted file mode 100644
index 675f85d1cf1..00000000000
---
a/devel/qt-creator/patches/patch-src_tools_clangrefactoringbackend_source_symbolscollector_cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$OpenBSD:
patch-src_tools_clangrefactoringbackend_source_symbolscollector_cpp,v 1.1
2019/07/05 17:01:45 jca Exp $
-
-Index: src/tools/clangrefactoringbackend/source/symbolscollector.cpp
---- src/tools/clangrefactoringbackend/source/symbolscollector.cpp.orig
-+++ src/tools/clangrefactoringbackend/source/symbolscollector.cpp
-@@ -26,6 +26,7 @@
- #include "symbolscollector.h"
-
- #include <clang/Frontend/FrontendActions.h>
-+#include <llvm/ADT/StringRef.h>
-
- namespace ClangBackEnd {
-
-@@ -91,7 +92,7 @@ newFrontendActionFactory(Factory *consumerFactory,
- {}
-
- std::unique_ptr<clang::ASTConsumer>
-- CreateASTConsumer(clang::CompilerInstance &instance,
StringRef inFile) override {
-+ CreateASTConsumer(clang::CompilerInstance &instance,
llvm::StringRef inFile) override {
- return m_consumerFactory->newASTConsumer(instance, inFile);
- }
-
diff --git a/devel/qt-creator/pkg/PLIST b/devel/qt-creator/pkg/PLIST
index 96857104f88..faa53841e68 100644
--- a/devel/qt-creator/pkg/PLIST
+++ b/devel/qt-creator/pkg/PLIST
@@ -33,83 +33,87 @@ lib/qtcreator/
@lib lib/qtcreator/libTracing.so.${LIBTracing_VERSION}
@lib lib/qtcreator/libUtils.so.${LIBUtils_VERSION}
lib/qtcreator/plugins/
-lib/qtcreator/plugins/libAndroid.so
-lib/qtcreator/plugins/libAutoTest.so
-lib/qtcreator/plugins/libAutotoolsProjectManager.so
-lib/qtcreator/plugins/libBareMetal.so
-lib/qtcreator/plugins/libBazaar.so
-lib/qtcreator/plugins/libBeautifier.so
-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/libClangFormat.so
-lib/qtcreator/plugins/libClangPchManager.so
-lib/qtcreator/plugins/libClangRefactoring.so
-lib/qtcreator/plugins/libClangTools.so
-lib/qtcreator/plugins/libClassView.so
-lib/qtcreator/plugins/libClearCase.so
-lib/qtcreator/plugins/libCodePaster.so
-lib/qtcreator/plugins/libCompilationDatabaseProjectManager.so
-lib/qtcreator/plugins/libCore.so
-lib/qtcreator/plugins/libCppEditor.so
-lib/qtcreator/plugins/libCppTools.so
-lib/qtcreator/plugins/libCppcheck.so
-lib/qtcreator/plugins/libDebugger.so
-lib/qtcreator/plugins/libDesigner.so
-lib/qtcreator/plugins/libDiffEditor.so
-lib/qtcreator/plugins/libEmacsKeys.so
-lib/qtcreator/plugins/libFakeVim.so
-lib/qtcreator/plugins/libGLSLEditor.so
-lib/qtcreator/plugins/libGenericProjectManager.so
-lib/qtcreator/plugins/libGit.so
-lib/qtcreator/plugins/libHelloWorld.so
-lib/qtcreator/plugins/libHelp.so
-lib/qtcreator/plugins/libImageViewer.so
-lib/qtcreator/plugins/libIos.so
-lib/qtcreator/plugins/libLanguageClient.so
-lib/qtcreator/plugins/libMacros.so
-lib/qtcreator/plugins/libMercurial.so
-lib/qtcreator/plugins/libModelEditor.so
-lib/qtcreator/plugins/libNim.so
-lib/qtcreator/plugins/libPerforce.so
-lib/qtcreator/plugins/libProjectExplorer.so
-lib/qtcreator/plugins/libPythonEditor.so
-lib/qtcreator/plugins/libQbsProjectManager.so
-lib/qtcreator/plugins/libQmakeAndroidSupport.so
-lib/qtcreator/plugins/libQmakeProjectManager.so
-lib/qtcreator/plugins/libQmlDesigner.so
-lib/qtcreator/plugins/libQmlJSEditor.so
-lib/qtcreator/plugins/libQmlJSTools.so
-lib/qtcreator/plugins/libQmlProfiler.so
-lib/qtcreator/plugins/libQmlProjectManager.so
-lib/qtcreator/plugins/libQnx.so
-lib/qtcreator/plugins/libQtSupport.so
-lib/qtcreator/plugins/libRemoteLinux.so
-lib/qtcreator/plugins/libResourceEditor.so
-lib/qtcreator/plugins/libScxmlEditor.so
-lib/qtcreator/plugins/libSerialTerminal.so
-lib/qtcreator/plugins/libSilverSearcher.so
-lib/qtcreator/plugins/libSubversion.so
-lib/qtcreator/plugins/libTaskList.so
-lib/qtcreator/plugins/libTextEditor.so
-lib/qtcreator/plugins/libTodo.so
-lib/qtcreator/plugins/libUpdateInfo.so
-lib/qtcreator/plugins/libValgrind.so
-lib/qtcreator/plugins/libVcsBase.so
-lib/qtcreator/plugins/libWelcome.so
-lib/qtcreator/plugins/libWinRt.so
+@so lib/qtcreator/plugins/libAndroid.so
+@so lib/qtcreator/plugins/libAutoTest.so
+@so lib/qtcreator/plugins/libAutotoolsProjectManager.so
+@so lib/qtcreator/plugins/libBareMetal.so
+@so lib/qtcreator/plugins/libBazaar.so
+@so lib/qtcreator/plugins/libBeautifier.so
+@so lib/qtcreator/plugins/libBinEditor.so
+@so lib/qtcreator/plugins/libBookmarks.so
+@so lib/qtcreator/plugins/libBoot2Qt.so
+@so lib/qtcreator/plugins/libCMakeProjectManager.so
+@so lib/qtcreator/plugins/libCVS.so
+@so lib/qtcreator/plugins/libClangCodeModel.so
+@so lib/qtcreator/plugins/libClangFormat.so
+@so lib/qtcreator/plugins/libClangTools.so
+@so lib/qtcreator/plugins/libClassView.so
+@so lib/qtcreator/plugins/libClearCase.so
+@so lib/qtcreator/plugins/libCodePaster.so
+@so lib/qtcreator/plugins/libCompilationDatabaseProjectManager.so
+@so lib/qtcreator/plugins/libCore.so
+@so lib/qtcreator/plugins/libCppEditor.so
+@so lib/qtcreator/plugins/libCppTools.so
+@so lib/qtcreator/plugins/libCppcheck.so
+@so lib/qtcreator/plugins/libCtfVisualizer.so
+@so lib/qtcreator/plugins/libDebugger.so
+@so lib/qtcreator/plugins/libDesigner.so
+@so lib/qtcreator/plugins/libDiffEditor.so
+@so lib/qtcreator/plugins/libEmacsKeys.so
+@so lib/qtcreator/plugins/libFakeVim.so
+@so lib/qtcreator/plugins/libGLSLEditor.so
+@so lib/qtcreator/plugins/libGenericProjectManager.so
+@so lib/qtcreator/plugins/libGit.so
+@so lib/qtcreator/plugins/libHelloWorld.so
+@so lib/qtcreator/plugins/libHelp.so
+@so lib/qtcreator/plugins/libImageViewer.so
+@so lib/qtcreator/plugins/libIos.so
+@so lib/qtcreator/plugins/libLanguageClient.so
+@so lib/qtcreator/plugins/libMacros.so
+@so lib/qtcreator/plugins/libMcuSupport.so
+@so lib/qtcreator/plugins/libMercurial.so
+@so lib/qtcreator/plugins/libModelEditor.so
+@so lib/qtcreator/plugins/libNim.so
+@so lib/qtcreator/plugins/libPerfProfiler.so
+@so lib/qtcreator/plugins/libPerforce.so
+@so lib/qtcreator/plugins/libProjectExplorer.so
+@so lib/qtcreator/plugins/libPython.so
+@so lib/qtcreator/plugins/libQbsProjectManager.so
+@so lib/qtcreator/plugins/libQmakeProjectManager.so
+@so lib/qtcreator/plugins/libQmlDesigner.so
+@so lib/qtcreator/plugins/libQmlJSEditor.so
+@so lib/qtcreator/plugins/libQmlJSTools.so
+@so lib/qtcreator/plugins/libQmlPreview.so
+@so lib/qtcreator/plugins/libQmlProfiler.so
+@so lib/qtcreator/plugins/libQmlProjectManager.so
+@so lib/qtcreator/plugins/libQnx.so
+@so lib/qtcreator/plugins/libQtSupport.so
+@so lib/qtcreator/plugins/libRemoteLinux.so
+@so lib/qtcreator/plugins/libResourceEditor.so
+@so lib/qtcreator/plugins/libScxmlEditor.so
+@so lib/qtcreator/plugins/libSerialTerminal.so
+@so lib/qtcreator/plugins/libSilverSearcher.so
+@so lib/qtcreator/plugins/libStudioWelcome.so
+@so lib/qtcreator/plugins/libSubversion.so
+@so lib/qtcreator/plugins/libTaskList.so
+@so lib/qtcreator/plugins/libTextEditor.so
+@so lib/qtcreator/plugins/libTodo.so
+@so lib/qtcreator/plugins/libUpdateInfo.so
+@so lib/qtcreator/plugins/libValgrind.so
+@so lib/qtcreator/plugins/libVcsBase.so
+@so lib/qtcreator/plugins/libWebAssembly.so
+@so lib/qtcreator/plugins/libWelcome.so
+@so lib/qtcreator/plugins/libWinRt.so
lib/qtcreator/plugins/qmldesigner/
-lib/qtcreator/plugins/qmldesigner/libcomponentsplugin.so
-lib/qtcreator/plugins/qmldesigner/libqtquickplugin.so
+@so lib/qtcreator/plugins/qmldesigner/libcomponentsplugin.so
+@so lib/qtcreator/plugins/qmldesigner/libqmlpreviewplugin.so
+@so 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/qtc-askpass
@bin libexec/qtcreator/qtcreator_process_stub
@bin libexec/qtcreator/qtpromaker
@bin libexec/qtcreator/sdktool
@@ -124,6 +128,7 @@ share/icons/hicolor/64x64/apps/QtProject-qtcreator.png
share/qtcreator/
share/qtcreator/cplusplus/
share/qtcreator/cplusplus/examples/
+share/qtcreator/cplusplus/examples/CMakeLists.txt
share/qtcreator/cplusplus/examples/clazy_example.cpp
share/qtcreator/cplusplus/examples/examples.pro
share/qtcreator/cplusplus/examples/tidy_example.cpp
@@ -157,25 +162,6 @@ share/qtcreator/fonts/SourceCodePro-Bold.ttf
share/qtcreator/fonts/SourceCodePro-It.ttf
share/qtcreator/fonts/SourceCodePro-Regular.ttf
share/qtcreator/fonts/SourceCodePro.txt
-share/qtcreator/generic-highlighter/
-share/qtcreator/generic-highlighter/alert.xml
-share/qtcreator/generic-highlighter/autoconf.xml
-share/qtcreator/generic-highlighter/bash.xml
-share/qtcreator/generic-highlighter/cmake.xml
-share/qtcreator/generic-highlighter/css.xml
-share/qtcreator/generic-highlighter/doxygen.xml
-share/qtcreator/generic-highlighter/dtd.xml
-share/qtcreator/generic-highlighter/html.xml
-share/qtcreator/generic-highlighter/ini.xml
-share/qtcreator/generic-highlighter/java.xml
-share/qtcreator/generic-highlighter/javadoc.xml
-share/qtcreator/generic-highlighter/json.xml
-share/qtcreator/generic-highlighter/makefile.xml
-share/qtcreator/generic-highlighter/perl.xml
-share/qtcreator/generic-highlighter/ruby.xml
-share/qtcreator/generic-highlighter/valgrind-suppression.xml
-share/qtcreator/generic-highlighter/xml.xml
-share/qtcreator/generic-highlighter/yacc.xml
share/qtcreator/glsl/
share/qtcreator/glsl/glsl_120.frag
share/qtcreator/glsl/glsl_120.vert
@@ -183,6 +169,12 @@ share/qtcreator/glsl/glsl_120_common.glsl
share/qtcreator/glsl/glsl_es_100.frag
share/qtcreator/glsl/glsl_es_100.vert
share/qtcreator/glsl/glsl_es_100_common.glsl
+share/qtcreator/indexer_preincludes/
+share/qtcreator/indexer_preincludes/QtCore/
+share/qtcreator/indexer_preincludes/QtCore/qconfig.h
+share/qtcreator/indexer_preincludes/QtCore/qglobal.h
+share/qtcreator/indexer_preincludes/qglobal.h
+share/qtcreator/indexer_preincludes/windows.h
share/qtcreator/modeleditor/
share/qtcreator/modeleditor/standard.def
share/qtcreator/qml/
@@ -224,6 +216,8 @@ share/qtcreator/qml/qmlpuppet/commands/changeidscommand.cpp
share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h
share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.cpp
share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
+share/qtcreator/qml/qmlpuppet/commands/changeselectioncommand.cpp
+share/qtcreator/qml/qmlpuppet/commands/changeselectioncommand.h
share/qtcreator/qml/qmlpuppet/commands/changestatecommand.cpp
share/qtcreator/qml/qmlpuppet/commands/changestatecommand.h
share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.cpp
@@ -243,6 +237,10 @@
share/qtcreator/qml/qmlpuppet/commands/createscenecommand.cpp
share/qtcreator/qml/qmlpuppet/commands/createscenecommand.h
share/qtcreator/qml/qmlpuppet/commands/debugoutputcommand.cpp
share/qtcreator/qml/qmlpuppet/commands/debugoutputcommand.h
+share/qtcreator/qml/qmlpuppet/commands/drop3dlibraryitemcommand.cpp
+share/qtcreator/qml/qmlpuppet/commands/drop3dlibraryitemcommand.h
+share/qtcreator/qml/qmlpuppet/commands/enable3dviewcommand.cpp
+share/qtcreator/qml/qmlpuppet/commands/enable3dviewcommand.h
share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.cpp
@@ -251,6 +249,8 @@
share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.cpp
share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.h
share/qtcreator/qml/qmlpuppet/commands/puppetalivecommand.cpp
share/qtcreator/qml/qmlpuppet/commands/puppetalivecommand.h
+share/qtcreator/qml/qmlpuppet/commands/puppettocreatorcommand.cpp
+share/qtcreator/qml/qmlpuppet/commands/puppettocreatorcommand.h
share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.cpp
share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.h
share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.cpp
@@ -265,8 +265,12 @@
share/qtcreator/qml/qmlpuppet/commands/synchronizecommand.cpp
share/qtcreator/qml/qmlpuppet/commands/synchronizecommand.h
share/qtcreator/qml/qmlpuppet/commands/tokencommand.cpp
share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
+share/qtcreator/qml/qmlpuppet/commands/update3dviewstatecommand.cpp
+share/qtcreator/qml/qmlpuppet/commands/update3dviewstatecommand.h
share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp
share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.h
+share/qtcreator/qml/qmlpuppet/commands/view3dclosedcommand.cpp
+share/qtcreator/qml/qmlpuppet/commands/view3dclosedcommand.h
share/qtcreator/qml/qmlpuppet/container/
share/qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp
share/qtcreator/qml/qmlpuppet/container/addimportcontainer.h
@@ -309,11 +313,100 @@
share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceglobal.h
share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.cpp
share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.h
share/qtcreator/qml/qmlpuppet/mockfiles/
+share/qtcreator/qml/qmlpuppet/mockfiles/Arrow.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/AutoScaleHelper.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/AxisHelper.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/AxisHelperArm.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/CameraGizmo.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/Dialog.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/DirectionalDraggable.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/EditCameraController.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml
share/qtcreator/qml/qmlpuppet/mockfiles/GenericBackend.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/HelperGrid.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/IconGizmo.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/LightGizmo.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/MoveGizmo.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/Overlay2D.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/PlanarDraggable.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/PlanarMoveHandle.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/PlanarScaleHandle.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/RotateGizmo.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/RotateRing.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/ScaleGizmo.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/ScaleRod.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/SelectionBox.qml
share/qtcreator/qml/qmlpuppet/mockfiles/SwipeView.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/ToggleButton.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/ToolBarButton.qml
share/qtcreator/qml/qmlpuppet/mockfiles/Window.qml
+share/qtcreator/qml/qmlpuppet/mockfiles/images/
+share/qtcreator/qml/qmlpuppet/mockfiles/images/area_light_gradient.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/area_light_gradi...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/directional_light_gradient.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/directional_light_gradi...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/edit_light_off.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/edit_light_...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/edit_light_on.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/edit_light...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/editor_camera.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/editor_cam...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/fit_active.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/fit_act...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/fit_selected.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/fit_selec...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/global.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/glo...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/group_selection_active.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/group_selection_act...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/group_selection_selected.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/group_selection_selec...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/item_selection_active.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/item_selection_act...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/item_selection_selected.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/item_selection_selec...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/light-pick-icon.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/light-pick-i...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/local.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/lo...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/move_active.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/move_act...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/move_selected.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/move_selec...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/ortho.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/or...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/persp.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/pe...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/point_light_gradient.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/point_light_gradi...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/rotate_active.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/rotate_act...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/rotate_selected.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/rotate_selec...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/scale_active.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/scale_act...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/scale_selected.png
+share/qtcreator/qml/qmlpuppet/mockfiles/images/scale_selec...@2x.png
+share/qtcreator/qml/qmlpuppet/mockfiles/meshes/
+share/qtcreator/qml/qmlpuppet/mockfiles/meshes/arrow.mesh
+share/qtcreator/qml/qmlpuppet/mockfiles/meshes/axishelper.mesh
+share/qtcreator/qml/qmlpuppet/mockfiles/meshes/ring.mesh
+share/qtcreator/qml/qmlpuppet/mockfiles/meshes/ringselect.mesh
+share/qtcreator/qml/qmlpuppet/mockfiles/meshes/scalerod.mesh
share/qtcreator/qml/qmlpuppet/qml2puppet/
share/qtcreator/qml/qmlpuppet/qml2puppet/Info.plist
+share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/
+share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/camerageometry.cpp
+share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/camerageometry.h
+share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/editor3d.pri
+share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.cpp
+share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.h
+share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/gridgeometry.cpp
+share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/gridgeometry.h
+share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/mousearea3d.cpp
+share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/mousearea3d.h
+share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/selectionboxgeometry.cpp
+share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/selectionboxgeometry.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
@@ -358,6 +451,8 @@
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.c
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.h
+share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.cpp
+share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
@@ -378,7 +473,6 @@
share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp
share/qtcreator/qml/qmlpuppet/qmlpuppet.qrc
share/qtcreator/qml/qmlpuppet/qmlpuppet_utilities.pri
share/qtcreator/qml/qmlpuppet/types/
-share/qtcreator/qml/qmlpuppet/types/enumeration.cpp
share/qtcreator/qml/qmlpuppet/types/enumeration.h
share/qtcreator/qml/qmlpuppet/types/types.pri
share/qtcreator/qmldesigner/
@@ -391,10 +485,13 @@ share/qtcreator/qmldesigner/propertyEditorQmlSources/
share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/
share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/BooleanEditorTemplate.template
share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/ColorEditorTemplate.template
+share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/FontEditorTemplate.template
share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/IntEditorTemplate.template
share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/RealEditorTemplate.template
+share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/RectangleEditorTemplate.template
share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/StringEditorTemplate.template
share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/TemplateTypes.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/TextEditorTemplate.template
share/qtcreator/qmldesigner/propertyEditorQmlSources/PropertyTemplates/UrlEditorTemplate.template
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AdvancedSection.qml
@@ -414,6 +511,7 @@
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/GridSpecifics.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/GridViewSpecifics.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ImageSpecifics.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/LayerSection.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/LayoutPoperties.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/LayoutSection.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/Layouts/
@@ -435,6 +533,8 @@
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/emptyPane.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/project.qmlproject
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/AbstractButton.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ActionIndicator.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/AligmentHorizontalButtons.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/AligmentVerticalButtons.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/AnchorButtons.qml
@@ -447,6 +547,7 @@
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Check
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorButton.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorCheckButton.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorLine.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorLogic.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Constants.js
@@ -454,19 +555,28 @@
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Custo
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CustomComboBoxStyle.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CustomSpinBoxStyle.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/DoubleSpinBox.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/EditableListView.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExpandingSpacer.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExpressionTextField.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExtendedFunctionButton.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ExtendedFunctionLogic.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FlickableSection.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontComboBox.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontSection.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/FontStyleButtons.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientDialogPopup.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientLine.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPopupIndicator.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPresetList.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPresetTabContent.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPropertySpinBox.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GroupBox.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/HueSlider.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/IconLabel.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ItemFilterComboBox.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Label.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LineEdit.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ListViewComboBox.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/MarginSection.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/OriginControl.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/PaddingSection.qml
@@ -475,6 +585,7 @@
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Scrol
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SecondColumnLayout.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SectionLayout.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SimpleColorPalette.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/StandardTextSection.qml
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Tab.qml
@@ -487,8 +598,11 @@
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/image
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/down-ar...@2x.png
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/expression.png
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/express...@2x.png
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/icon-gradient-list.png
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/icon_color_conical_gradient.png
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/icon_color_gradient.png
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/icon_color_none.png
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/icon_color_radial_gradient.png
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/icon_color_solid.png
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/placeholder.png
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/placehol...@2x.png
@@ -497,6 +611,46 @@
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/image
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/up-arrow.png
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/images/up-ar...@2x.png
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/qmldir
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ActionIndicator.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/Button.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ButtonGroup.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ButtonRow.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckBox.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckIndicator.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBoxInput.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ContextMenu.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ExpandingSpacer.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ItemDelegate.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/Menu.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/MenuItem.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/MenuSeparator.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSliderPopup.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSpinBox.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSpinBoxIndicator.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSpinBoxInput.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ScrollBar.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ScrollView.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/SecondColumnLayout.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/Section.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/SectionLabel.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/SectionLayout.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/Slider.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/SliderPopup.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/SpinBox.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/SpinBoxIndicator.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/SpinBoxInput.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TextArea.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TextField.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TranslationIndicator.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/qmldir
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Constants.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf
+share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/qmldir
share/qtcreator/qmldesigner/statesEditorQmlSources/
share/qtcreator/qmldesigner/statesEditorQmlSources/DesignerTextFieldStyle.qml
share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml
@@ -590,12 +744,6 @@
share/qtcreator/templates/qt4project/customwidgetwizard/tpl_widget.cpp
share/qtcreator/templates/qt4project/customwidgetwizard/tpl_widget.h
share/qtcreator/templates/qt4project/customwidgetwizard/tpl_widget_include.pri
share/qtcreator/templates/qt4project/customwidgetwizard/tpl_widget_lib.pro
-share/qtcreator/templates/qt4project/main.cpp
-share/qtcreator/templates/qt4project/mywidget.cpp
-share/qtcreator/templates/qt4project/mywidget.h
-share/qtcreator/templates/qt4project/mywidget_form.cpp
-share/qtcreator/templates/qt4project/mywidget_form.h
-share/qtcreator/templates/qt4project/widget.ui
share/qtcreator/templates/wizards/
share/qtcreator/templates/wizards/README.txt
share/qtcreator/templates/wizards/autotest/
@@ -682,6 +830,8 @@ share/qtcreator/templates/wizards/files/nimscript/file.nims
share/qtcreator/templates/wizards/files/nimscript/wizard.json
share/qtcreator/templates/wizards/files/python/
share/qtcreator/templates/wizards/files/python/file.py
+share/qtcreator/templates/wizards/files/python/icon.png
+share/qtcreator/templates/wizards/files/python/i...@2x.png
share/qtcreator/templates/wizards/files/python/wizard.json
share/qtcreator/templates/wizards/files/qrc/
share/qtcreator/templates/wizards/files/qrc/file.qrc
@@ -703,6 +853,8 @@
share/qtcreator/templates/wizards/global/consoleapplication.png
share/qtcreator/templates/wizards/global/consoleapplicat...@2x.png
share/qtcreator/templates/wizards/global/guiapplication.png
share/qtcreator/templates/wizards/global/guiapplicat...@2x.png
+share/qtcreator/templates/wizards/global/lib.png
+share/qtcreator/templates/wizards/global/l...@2x.png
share/qtcreator/templates/wizards/projects/
share/qtcreator/templates/wizards/projects/consoleapp/
share/qtcreator/templates/wizards/projects/consoleapp/CMakeLists.txt
@@ -710,6 +862,15 @@
share/qtcreator/templates/wizards/projects/consoleapp/file.pro
share/qtcreator/templates/wizards/projects/consoleapp/file.qbs
share/qtcreator/templates/wizards/projects/consoleapp/main.cpp
share/qtcreator/templates/wizards/projects/consoleapp/wizard.json
+share/qtcreator/templates/wizards/projects/cpplibrary/
+share/qtcreator/templates/wizards/projects/cpplibrary/CMakeLists.txt
+share/qtcreator/templates/wizards/projects/cpplibrary/lib.cpp
+share/qtcreator/templates/wizards/projects/cpplibrary/lib.h
+share/qtcreator/templates/wizards/projects/cpplibrary/lib_global.h
+share/qtcreator/templates/wizards/projects/cpplibrary/project.json
+share/qtcreator/templates/wizards/projects/cpplibrary/project.pro
+share/qtcreator/templates/wizards/projects/cpplibrary/project.qbs
+share/qtcreator/templates/wizards/projects/cpplibrary/wizard.json
share/qtcreator/templates/wizards/projects/git.ignore
share/qtcreator/templates/wizards/projects/nim/
share/qtcreator/templates/wizards/projects/nim/file.nimproject
@@ -733,6 +894,28 @@ share/qtcreator/templates/wizards/projects/qmake/
share/qtcreator/templates/wizards/projects/qmake/empty/
share/qtcreator/templates/wizards/projects/qmake/empty/file.pro
share/qtcreator/templates/wizards/projects/qmake/empty/wizard.json
+share/qtcreator/templates/wizards/projects/qtforpythonapplication/
+share/qtcreator/templates/wizards/projects/qtforpythonapplication/empty/
+share/qtcreator/templates/wizards/projects/qtforpythonapplication/empty/icon.png
+share/qtcreator/templates/wizards/projects/qtforpythonapplication/empty/i...@2x.png
+share/qtcreator/templates/wizards/projects/qtforpythonapplication/empty/wizard.json
+share/qtcreator/templates/wizards/projects/qtforpythonapplication/main.pyproject
+share/qtcreator/templates/wizards/projects/qtforpythonapplication/main_empty.py
+share/qtcreator/templates/wizards/projects/qtforpythonapplication/main_mainwindow.py
+share/qtcreator/templates/wizards/projects/qtforpythonapplication/mainwindow/
+share/qtcreator/templates/wizards/projects/qtforpythonapplication/mainwindow/icon.png
+share/qtcreator/templates/wizards/projects/qtforpythonapplication/mainwindow/i...@2x.png
+share/qtcreator/templates/wizards/projects/qtforpythonapplication/mainwindow/wizard.json
+share/qtcreator/templates/wizards/projects/qtquick2-extension/
+share/qtcreator/templates/wizards/projects/qtquick2-extension/lib.png
+share/qtcreator/templates/wizards/projects/qtquick2-extension/l...@2x.png
+share/qtcreator/templates/wizards/projects/qtquick2-extension/object.cpp
+share/qtcreator/templates/wizards/projects/qtquick2-extension/object.h
+share/qtcreator/templates/wizards/projects/qtquick2-extension/plugin.cpp
+share/qtcreator/templates/wizards/projects/qtquick2-extension/plugin.h
+share/qtcreator/templates/wizards/projects/qtquick2-extension/project.pro
+share/qtcreator/templates/wizards/projects/qtquick2-extension/qmldir
+share/qtcreator/templates/wizards/projects/qtquick2-extension/wizard.json
share/qtcreator/templates/wizards/projects/qtquickapplication/
share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt
share/qtcreator/templates/wizards/projects/qtquickapplication/app.pro
@@ -773,6 +956,16 @@
share/qtcreator/templates/wizards/projects/qtquickuiprototype/app.qmlproject
share/qtcreator/templates/wizards/projects/qtquickuiprototype/qtquickuiprototype.png
share/qtcreator/templates/wizards/projects/qtquickuiprototype/qtquickuiprotot...@2x.png
share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
+share/qtcreator/templates/wizards/projects/qtwidgetsapplication/
+share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt
+share/qtcreator/templates/wizards/projects/qtwidgetsapplication/main.cpp
+share/qtcreator/templates/wizards/projects/qtwidgetsapplication/project.pro
+share/qtcreator/templates/wizards/projects/qtwidgetsapplication/project.qbs
+share/qtcreator/templates/wizards/projects/qtwidgetsapplication/widget.cpp
+share/qtcreator/templates/wizards/projects/qtwidgetsapplication/widget.h
+share/qtcreator/templates/wizards/projects/qtwidgetsapplication/widget.ui
+share/qtcreator/templates/wizards/projects/qtwidgetsapplication/wizard.json
+share/qtcreator/templates/wizards/projects/translation.ts
share/qtcreator/templates/wizards/projects/vcs/
share/qtcreator/templates/wizards/projects/vcs/bazaar/
share/qtcreator/templates/wizards/projects/vcs/bazaar/icon.png
@@ -804,16 +997,6 @@
share/qtcreator/templates/wizards/qtcreatorplugin/mypluginconstants.h
share/qtcreator/templates/wizards/qtcreatorplugin/qtcreatorplugin.png
share/qtcreator/templates/wizards/qtcreatorplugin/qtcreatorplu...@2x.png
share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml
-share/qtcreator/templates/wizards/qtquick2-extension/
-share/qtcreator/templates/wizards/qtquick2-extension/lib.png
-share/qtcreator/templates/wizards/qtquick2-extension/l...@2x.png
-share/qtcreator/templates/wizards/qtquick2-extension/object.cpp
-share/qtcreator/templates/wizards/qtquick2-extension/object.h
-share/qtcreator/templates/wizards/qtquick2-extension/plugin.cpp
-share/qtcreator/templates/wizards/qtquick2-extension/plugin.h
-share/qtcreator/templates/wizards/qtquick2-extension/project.pro
-share/qtcreator/templates/wizards/qtquick2-extension/qmldir
-share/qtcreator/templates/wizards/qtquick2-extension/wizard.xml
share/qtcreator/templates/wizards/qtquickstyleicons/
share/qtcreator/templates/wizards/qtquickstyleicons/default.png
share/qtcreator/templates/wizards/qtquickstyleicons/defa...@2x.png
